cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ugly update to gdm-3.4.1; still totally broken but needed by robert@ for

Browse Source 
his openpam port.
This commit is contained in:
ajacoutot 2012-09-10 13:19:03 +00:00
parent dc4004efb1
commit a9eac4d516
11 changed files with 65 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
x11/gnome/gdm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.122 2012/09/01 14:36:59 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.123 2012/09/10 13:19:03 ajacoutot Exp $
BROKEN= needs PAM(7)
@ -7,9 +7,7 @@ SHARED_ONLY= Yes
COMMENT= GNOME display manager
GNOME_PROJECT= gdm
GNOME_VERSION= 3.2.1.1
REVISION= 3
GNOME_VERSION= 3.4.1
HOMEPAGE= http://projects.gnome.org/gdm/
@ -25,10 +23,10 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender Xxf86vm accountsservice
WANTLIB += atk-1.0 c cairo cairo-gobject canberra canberra-gtk3
WANTLIB += crypto dbus-1 dbus-glib-1 drm execinfo expat ffi fontconfig
WANTLIB += dbus-1 dbus-glib-1 drm execinfo expat ffi fontconfig
WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gthread-2.0 gtk-3 ltdl m nspr4 nss3 nssutil3
WANTLIB += ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += ogg pam pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 plc4 plds4 png pthread pthread-stubs smime3
WANTLIB += softokn3 sqlite3 ssl3 stdc++ upower-glib util vorbis
WANTLIB += vorbisfile wrap xcb xcb-render xcb-shm xkbfile xklavier
@ -43,19 +41,17 @@ BUILD_DEPENDS= x11/gnome/zenity
# sysutils/consolekit
LIB_DEPENDS= audio/libcanberra,-gtk3 \
sysutils/upower \
sysutils/accountsservice \
x11/gnome/libxklavier \
devel/libexecinfo \
security/nss
security/nss \
security/pam \
sysutils/accountsservice \
sysutils/upower \
x11/gnome/libxklavier
MODULES= devel/gettext \
devel/gconf2 \
x11/gnome \
devel/dconf
MODGCONF2_SCHEMAS_DIR= gdm
MODGNOME_TOOLS= yelp
MODGNOME_ICON_CACHE= Yes
@ -68,9 +64,7 @@ CONFIGURE_ARGS= --mandir=${PREFIX}/man \
--with-dbus-sys=${SYSCONFDIR}/dbus-1/system.d \
--with-log-dir=/var/log/gdm \
--with-working-directory=/var/db/gdm \
--with-selinux=no \
--with-xevie=no \
--with-libaudit=no \
--with-sysconfsubdir=X11/gdm \
--with-pid-file=/var/run/gdm.pid \
--with-dmconfdir="${LOCALBASE}/share/xsessions" \
@ -85,6 +79,7 @@ CONFIGURE_ARGS= --mandir=${PREFIX}/man \
--with-console-kit \
--with-xauth-dir=/var/run/gdm \
--with-screenshot-dir=/var/run/gdm/greeter \
--without-systemd \
--enable-authentication-scheme=crypt \
--disable-console-helper
@ -112,21 +107,7 @@ pre-configure:
${WRKSRC}/data/applications/gdm-simple-greeter.desktop.in
.endfor
pre-fake:
# cf. gconftool-2 below
${INSTALL_DATA_DIR} ${WRKINST}/var/db/gdm/.gconf.mandatory
touch ${WRKINST}/var/db/gdm/.gconf.mandatory/%gconf-tree.xml
post-install:
# PATH is modified by the gconf2 MODULE, so give the full path
# to the real gconftool-2 binary.
${LOCALBASE}/bin/gconftool-2 --direct \
--config-source=xml:merged:${WRKINST}/var/db/gdm/.gconf.mandatory \
--recursive-unset /
${LOCALBASE}/bin/gconftool-2 --direct \
--config-source=xml:merged:${WRKINST}/var/db/gdm/.gconf.mandatory \
--load ${WRKSRC}/data/session-setup.entries
# clean up the mess
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gdm/db
mv ${WRKINST}/etc/dbus-1 ${PREFIX}/share/examples/gdm
mv ${WRKINST}/etc/X11/ ${PREFIX}/share/examples/gdm/

4
x11/gnome/gdm/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnome/gdm-3.2.1.1.tar.xz) = haE4P5OHD7XUepOMwuBLbw10y2EaK12U2WUbeKXM/70=
SIZE (gnome/gdm-3.2.1.1.tar.xz) = 1632116
SHA256 (gnome/gdm-3.4.1.tar.xz) = YpKWjf9fyJh3teGqo8fRSE3T7S1POI6TWEHQU0Ob5mU=
SIZE (gnome/gdm-3.4.1.tar.xz) = 1615612

10
x11/gnome/gdm/patches/patch-common_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-common_Makefile_in,v 1.2 2011/10/07 14:04:18 ajacoutot Exp $
--- common/Makefile.in.orig Tue Sep 27 00:50:03 2011
+++ common/Makefile.in Fri Oct 7 14:44:39 2011
@@ -478,7 +478,7 @@ gdm_crash_logger_CPPFLAGS = \
$OpenBSD: patch-common_Makefile_in,v 1.3 2012/09/10 13:19:04 ajacoutot Exp $
--- common/Makefile.in.orig Sat Apr 14 20:55:28 2012
+++ common/Makefile.in Mon Sep 10 14:58:05 2012
@@ -488,7 +488,7 @@ gdm_crash_logger_CPPFLAGS = \
-DLOCALSTATEDIR=\"$(localstatedir)\" \
$(NULL)
@ -10,7 +10,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.2 2011/10/07 14:04:18 ajacoutot Exp $
@MKDTEMP_MISSING_FALSE@MKDTEMP_FILES =
@MKDTEMP_MISSING_TRUE@MKDTEMP_FILES = mkdtemp.c mkdtemp.h
libgdmcommon_la_SOURCES = \
@@ -522,6 +522,7 @@ libgdmcommon_la_CFLAGS = \
@@ -532,6 +532,7 @@ libgdmcommon_la_CFLAGS = \
$(NULL)
libgdmcommon_la_LIBADD = \

10
x11/gnome/gdm/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.20 2011/10/07 14:04:18 ajacoutot Exp $
--- configure.orig Tue Sep 27 00:50:02 2011
+++ configure Fri Oct 7 14:44:39 2011
@@ -22996,6 +22996,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
$OpenBSD: patch-configure,v 1.21 2012/09/10 13:19:04 ajacoutot Exp $
--- configure.orig Sat Apr 14 20:55:27 2012
+++ configure Mon Sep 10 14:58:05 2012
@@ -22896,6 +22896,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
#ifdef __cplusplus
extern "C"
#endif
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.20 2011/10/07 14:04:18 ajacoutot Exp $
char hosts_ctl ();
int
main ()
@@ -24662,6 +24664,12 @@ else
@@ -24704,6 +24706,12 @@ else
am__EXEEXT_TRUE='#'
am__EXEEXT_FALSE=
fi

10
x11/gnome/gdm/patches/patch-daemon_Makefile_in
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-daemon_Makefile_in,v 1.1 2011/10/07 14:04:18 ajacoutot Exp $
$OpenBSD: patch-daemon_Makefile_in,v 1.2 2012/09/10 13:19:04 ajacoutot Exp $
undefined reference to `logwtmp'
--- daemon/Makefile.in.orig Fri Oct 7 14:53:52 2011
+++ daemon/Makefile.in Fri Oct 7 14:54:38 2011
@@ -676,6 +676,7 @@ gdm_factory_slave_LDFLAGS = \
--- daemon/Makefile.in.orig Sat Apr 14 20:55:28 2012
+++ daemon/Makefile.in Mon Sep 10 14:58:05 2012
@@ -691,6 +691,7 @@ gdm_factory_slave_LDFLAGS = \
gdm_factory_slave_LDADD = \
$(top_builddir)/common/libgdmcommon.la \
$(XLIB_LIBS) \
+ $(EXTRA_DAEMON_LIBS) \
$(DAEMON_LIBS) \
$(SYSTEMD_LIBS) \
$(NULL)

14
x11/gnome/gdm/patches/patch-daemon_gdm-xdmcp-display-factory_c
View File

@ -1,6 +1,14 @@
$OpenBSD: patch-daemon_gdm-xdmcp-display-factory_c,v 1.2 2012/06/26 14:54:29 jasper Exp $
--- daemon/gdm-xdmcp-display-factory.c.orig Fri Feb 18 04:27:53 2011
+++ daemon/gdm-xdmcp-display-factory.c Fri Jun 17 15:13:52 2011
$OpenBSD: patch-daemon_gdm-xdmcp-display-factory_c,v 1.3 2012/09/10 13:19:04 ajacoutot Exp $
--- daemon/gdm-xdmcp-display-factory.c.orig Sat Apr 14 20:52:00 2012
+++ daemon/gdm-xdmcp-display-factory.c Mon Sep 10 15:03:45 2012
@@ -35,6 +35,7 @@
#include <netdb.h>
#include <arpa/inet.h>
#include <net/if.h>
+#include <netinet/in.h>
#ifdef HAVE_SYS_SOCKIO_H
#include <sys/sockio.h>
#endif
@@ -64,7 +65,7 @@
* On Sun, we need to define allow_severity and deny_severity to link
* against libwrap.

10
x11/gnome/gdm/patches/patch-data_gconf_path
View File

@ -1,10 +0,0 @@
$OpenBSD: patch-data_gconf_path,v 1.1 2011/09/12 07:39:21 ajacoutot Exp $
--- data/gconf.path.orig Thu Jun 16 15:28:36 2011
+++ data/gconf.path Thu Jun 16 15:28:49 2011
@@ -1,5 +1,5 @@
# treat system-wide settings as mandatory
-xml:readonly:/etc/gconf/gconf.xml.system
+xml:readonly:/var/db/gconf/gconf.xml.system
# override some settings
# we treat settings in this location as

10
x11/gnome/gdm/patches/patch-gui_simple-chooser_chooser-main_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gui_simple-chooser_chooser-main_c,v 1.1 2011/10/07 14:04:18 ajacoutot Exp $
--- gui/simple-chooser/chooser-main.c.orig Fri Oct 7 14:45:29 2011
+++ gui/simple-chooser/chooser-main.c Fri Oct 7 14:45:38 2011
@@ -53,7 +53,7 @@ assistive_registry_launch (void)
$OpenBSD: patch-gui_simple-chooser_chooser-main_c,v 1.2 2012/09/10 13:19:04 ajacoutot Exp $
--- gui/simple-chooser/chooser-main.c.orig Sat Apr 14 20:52:00 2012
+++ gui/simple-chooser/chooser-main.c Mon Sep 10 14:58:05 2012
@@ -52,7 +52,7 @@ assistive_registry_launch (void)
char **argv;
gboolean res;
@ -10,7 +10,7 @@ $OpenBSD: patch-gui_simple-chooser_chooser-main_c,v 1.1 2011/10/07 14:04:18 ajac
argv = NULL;
error = NULL;
@@ -82,7 +82,7 @@ assistive_registry_launch (void)
@@ -81,7 +81,7 @@ assistive_registry_launch (void)
}
if (kill (pid, 0) < 0) {

10
x11/gnome/gdm/patches/patch-gui_simple-chooser_gdm-host-chooser_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gui_simple-chooser_gdm-host-chooser_c,v 1.1 2011/10/07 14:04:18 ajacoutot Exp $
--- gui/simple-chooser/gdm-host-chooser.c.orig Fri Oct 7 14:45:11 2011
+++ gui/simple-chooser/gdm-host-chooser.c Fri Oct 7 14:45:24 2011
@@ -54,7 +54,7 @@ assistive_registry_launch (void)
$OpenBSD: patch-gui_simple-chooser_gdm-host-chooser_c,v 1.2 2012/09/10 13:19:04 ajacoutot Exp $
--- gui/simple-chooser/gdm-host-chooser.c.orig Sat Apr 14 20:52:00 2012
+++ gui/simple-chooser/gdm-host-chooser.c Mon Sep 10 14:58:05 2012
@@ -53,7 +53,7 @@ assistive_registry_launch (void)
char **argv;
gboolean res;
@ -10,7 +10,7 @@ $OpenBSD: patch-gui_simple-chooser_gdm-host-chooser_c,v 1.1 2011/10/07 14:04:18
argv = NULL;
error = NULL;
@@ -83,7 +83,7 @@ assistive_registry_launch (void)
@@ -82,7 +82,7 @@ assistive_registry_launch (void)
}
if (kill (pid, 0) < 0) {

8
x11/gnome/gdm/patches/patch-gui_simple-greeter_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gui_simple-greeter_Makefile_in,v 1.2 2011/10/07 14:04:18 ajacoutot Exp $
--- gui/simple-greeter/Makefile.in.orig Tue Sep 27 00:50:04 2011
+++ gui/simple-greeter/Makefile.in Fri Oct 7 14:44:41 2011
@@ -527,7 +527,7 @@ AM_CPPFLAGS = \
$OpenBSD: patch-gui_simple-greeter_Makefile_in,v 1.3 2012/09/10 13:19:04 ajacoutot Exp $
--- gui/simple-greeter/Makefile.in.orig Sat Apr 14 20:55:29 2012
+++ gui/simple-greeter/Makefile.in Mon Sep 10 14:58:05 2012
@@ -534,7 +534,7 @@ AM_CPPFLAGS = \
-DGDMCONFDIR=\"$(gdmconfdir)\" \
-DDATADIR=\""$(datadir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \

39
x11/gnome/gdm/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.40 2012/06/15 08:30:19 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.41 2012/09/10 13:19:04 ajacoutot Exp $
@newgroup _gdm:676
@newuser _gdm:676:_gdm:daemon:GNOME Display Manager:/var/db/gdm:/sbin/nologin
@unexec-delete rm -f ${SYSCONFDIR}/dconf/db/gdm
@ -6,8 +6,6 @@
@extraunexec rm -rf /var/db/gdm/.aucat_cookie
@extraunexec rm -rf /var/db/gdm/.cache
@extraunexec rm -rf /var/db/gdm/.dbus
@extraunexec rm -rf /var/db/gdm/.gconf
@extraunexec rm -rf /var/db/gdm/.gconfd
@extraunexec rm -rf /var/db/gdm/.pulse-cookie
@extraunexec rm -rf /var/db/gdm/.config/dconf/*
@extraunexec rm -rf /var/db/gdm/*
@ -103,20 +101,6 @@ share/examples/gdm/db/gdm/.config/dconf/
@sample /var/db/gdm/.config/dconf/
@owner
@group
share/examples/gdm/db/gdm/.gconf.mandatory/
@mode 1750
@group _gdm
@sample /var/db/gdm/.gconf.mandatory/
@mode
@group
share/examples/gdm/db/gdm/.gconf.mandatory/%gconf-tree.xml
@mode 1640
@group _gdm
@sample /var/db/gdm/.gconf.mandatory/%gconf-tree.xml
@mode
@group
share/examples/gdm/db/gdm/.gconf.path
@sample /var/db/gdm/.gconf.path
share/examples/gdm/db/gdm/.local/
@group _gdm
@sample /var/db/gdm/.local/
@ -180,6 +164,8 @@ share/gnome/help/gdm/
share/gnome/help/gdm/C/
share/gnome/help/gdm/C/gdm.xml
share/gnome/help/gdm/C/legal.xml
share/gnome/help/gdm/ca/
share/gnome/help/gdm/ca/gdm.xml
share/gnome/help/gdm/de/
share/gnome/help/gdm/de/gdm.xml
share/gnome/help/gdm/el/
@ -190,6 +176,8 @@ share/gnome/help/gdm/es/
share/gnome/help/gdm/es/gdm.xml
share/gnome/help/gdm/fr/
share/gnome/help/gdm/fr/gdm.xml
share/gnome/help/gdm/gl/
share/gnome/help/gdm/gl/gdm.xml
share/gnome/help/gdm/id/
share/gnome/help/gdm/id/gdm.xml
share/gnome/help/gdm/it/
@ -204,6 +192,8 @@ share/gnome/help/gdm/sl/
share/gnome/help/gdm/sl/gdm.xml
share/gnome/help/gdm/sv/
share/gnome/help/gdm/sv/gdm.xml
share/gnome/help/gdm/te/
share/gnome/help/gdm/te/gdm.xml
share/gnome/help/gdm/uk/
share/gnome/help/gdm/uk/gdm.xml
share/gnome/help/gdm/zh_CN/
@ -217,8 +207,6 @@ share/icons/hicolor/48x48/apps/gdm-fingerprint.png
share/icons/hicolor/48x48/apps/gdm-smartcard.png
share/locale/af/LC_MESSAGES/gdm.mo
share/locale/am/LC_MESSAGES/gdm.mo
share/locale/an/
share/locale/an/LC_MESSAGES/
share/locale/an/LC_MESSAGES/gdm.mo
share/locale/ar/LC_MESSAGES/gdm.mo
share/locale/as/LC_MESSAGES/gdm.mo
@ -269,6 +257,7 @@ share/locale/it/LC_MESSAGES/gdm.mo
share/locale/ja/LC_MESSAGES/gdm.mo
share/locale/ka/LC_MESSAGES/gdm.mo
share/locale/kk/LC_MESSAGES/gdm.mo
share/locale/km/LC_MESSAGES/gdm.mo
share/locale/kn/LC_MESSAGES/gdm.mo
share/locale/ko/LC_MESSAGES/gdm.mo
share/locale/ku/LC_MESSAGES/gdm.mo
@ -323,11 +312,13 @@ share/locale/zu/LC_MESSAGES/gdm.mo
share/omf/
share/omf/gdm/
share/omf/gdm/gdm-C.omf
share/omf/gdm/gdm-ca.omf
share/omf/gdm/gdm-de.omf
share/omf/gdm/gdm-el.omf
share/omf/gdm/gdm-en_GB.omf
share/omf/gdm/gdm-es.omf
share/omf/gdm/gdm-fr.omf
share/omf/gdm/gdm-gl.omf
share/omf/gdm/gdm-id.omf
share/omf/gdm/gdm-it.omf
share/omf/gdm/gdm-ko.omf
@ -335,18 +326,17 @@ share/omf/gdm/gdm-oc.omf
share/omf/gdm/gdm-ru.omf
share/omf/gdm/gdm-sl.omf
share/omf/gdm/gdm-sv.omf
share/omf/gdm/gdm-te.omf
share/omf/gdm/gdm-uk.omf
share/omf/gdm/gdm-zh_CN.omf
share/pixmaps/
share/pixmaps/gdm-foot-logo.png
share/pixmaps/gdm-setup.png
share/pixmaps/gdm-xnest.png
share/pixmaps/gdm.png
share/pixmaps/nobody.png
share/pixmaps/nohost.png
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/gdm-simple-greeter.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
@rcscript ${RCDIR}/gdm
@mode 0755
@sample /var/log/gdm/
@mode 1755
@ -354,11 +344,8 @@ ${SCHEMAS_INSTDIR}/gdm-simple-greeter.schemas
@sample /var/cache/gdm/
@mode 1770
@sample /var/gdm/
@mode
@group
@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
@exec %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@unexec-delete %D/bin/glib-compile-schemas %D/share/glib-2.0/schemas >/dev/null
@exec %D/bin/dconf update
@rcscript ${RCDIR}/gdm