[Midnightbsd-cvs] mports [19089] trunk/x11/gdm: gdm 3.14.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat May 23 22:36:39 EDT 2015
Revision: 19089
http://svnweb.midnightbsd.org/mports/?rev=19089
Author: laffer1
Date: 2015-05-23 22:36:38 -0400 (Sat, 23 May 2015)
Log Message:
-----------
gdm 3.14.2
Modified Paths:
--------------
trunk/x11/gdm/Makefile
trunk/x11/gdm/distinfo
trunk/x11/gdm/files/gdm.in
trunk/x11/gdm/files/patch-common_Makefile.in
trunk/x11/gdm/files/patch-daemon_Makefile.in
trunk/x11/gdm/files/patch-data_Xsession.in
trunk/x11/gdm/pkg-plist
Added Paths:
-----------
trunk/x11/gdm/files/client.conf.in
trunk/x11/gdm/files/gdm-autologin.in
trunk/x11/gdm/files/gdm-launch-environment.in
trunk/x11/gdm/files/gdm-password.in
trunk/x11/gdm/files/locale.conf.in
trunk/x11/gdm/files/patch-daemon_gdm-xdmcp-display-factory.c
trunk/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop
trunk/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings
trunk/x11/gdm/files/patch-data_gdm.conf-custom.in
Removed Paths:
-------------
trunk/x11/gdm/files/patch-common_gdm-address.h
trunk/x11/gdm/files/patch-common_gdm-common.c
trunk/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
trunk/x11/gdm/files/patch-daemon_gdm-session-worker.c
trunk/x11/gdm/files/patch-data_gconf.path
trunk/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in
trunk/x11/gdm/files/patch-gui_simple-greeter_Makefile.in
trunk/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
trunk/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c
trunk/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
trunk/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c
trunk/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in
Modified: trunk/x11/gdm/Makefile
===================================================================
--- trunk/x11/gdm/Makefile 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/Makefile 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,53 +1,81 @@
# $MidnightBSD$
PORTNAME= gdm
-PORTVERSION= 2.30.7
-PORTREVISION= 3
+PORTVERSION= 3.14.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
-DIST_SUBDIR= gnome2
+DIST_SUBDIR= gnome3
MAINTAINER= ports at MidnightBSD.org
-COMMENT= GNOME 2 version of xdm display manager
+COMMENT= GNOME 3 version of xdm display manager
LICENSE= gpl2
-BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity \
- ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+BUILD_DEPENDS= zenity>=3.0.0:${PORTSDIR}/x11/zenity \
+ itstool:${PORTSDIR}/textproc/itstool \
+ iso-codes>=0:${PORTSDIR}/misc/iso-codes
LIB_DEPENDS= libck-connector.so:${PORTSDIR}/sysutils/consolekit \
- libpolkit-gtk-1.so:${PORTSDIR}/sysutils/polkit-gnome \
- libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
+ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
libupower-glib.so:${PORTSDIR}/sysutils/upower \
- libxklavier.so:${PORTSDIR}/x11/libxklavier \
- libcanberra-gtk.so:${PORTSDIR}/audio/libcanberra
-RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \
- ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \
- gnome-session:${PORTSDIR}/x11/gnome-session \
- ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
+ libnss3.so:${PORTSDIR}/security/nss \
+ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+ libaccountsservice.so:${PORTSDIR}/sysutils/accountsservice \
+ libcanberra-gtk3.so:${PORTSDIR}/audio/libcanberra-gtk3
+RUN_DEPENDS= zenity>=3.0.0:${PORTSDIR}/x11/zenity \
+ gnome-settings-daemon>=3.0.0:${PORTSDIR}/sysutils/gnome-settings-daemon \
+ gnome-keyring-3:${PORTSDIR}/security/gnome-keyring \
+ gnome-session>=3.0.0:${PORTSDIR}/x11/gnome-session \
+ gnome-icon-theme-symbolic>=0:${PORTSDIR}/x11-themes/gnome-icon-theme-symbolic \
+ polkit-gnome>=0.105:${PORTSDIR}/sysutils/polkit-gnome \
+ at-spi2-core>=0:${PORTSDIR}/accessibility/at-spi2-core \
+ iso-codes>=0:${PORTSDIR}/misc/iso-codes
+# used in scripts
+RUN_DEPENDS+= xrdb:${PORTSDIR}/x11/xrdb \
+ setxkbmap:${PORTSDIR}/x11/setxkbmap \
+ xmodmap:${PORTSDIR}/x11/xmodmap \
+ xterm:${PORTSDIR}/x11/xterm
-CONFLICTS= gdm-3.[0-9]*
-
USERS= gdm
GROUPS= gdm
+USES= execinfo gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME= dconf gnomeprefix intlhack introspection librsvg2
USE_LDCONFIG= yes
USE_XORG= dmx dmxproto
INSTALLS_ICONS= yes
USE_RC_SUBR= gdm
USE_GNOME_SUBR= yes
-USES= pathfix gettext gmake pkgconfig tar:xz
-USE_GNOME= intlhack gnomehier gconf2 librsvg2 \
- gnomedocutils gnomeprefix gnomepanel
-GCONF_SCHEMAS= gdm-simple-greeter.schemas
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-working-directory=${PREFIX}/etc/gdm/home \
- --with-at-spi-registryd-directory=${LOCALBASE}/libexec
-CONFIGURE_ENV= LIBS="-lm" \
- GTKDOC="false"
+GLIB_SCHEMAS= org.gnome.login-screen.gschema.xml
+CONFIGURE_ARGS= --disable-static \
+ --mandir=${PREFIX}/man \
+ --with-lang-file=${PREFIX}/etc/gdm/locale.conf \
+ --with-at-spi-registryd-directory=${LOCALBASE}/libexec \
+ --with-custom-conf=${PREFIX}/etc/gdm/custom.conf \
+ --with-dbus-sys=${PREFIX}/etc/dbus-1/system.d \
+ --with-log-dir=/var/log/gdm \
+ --with-working-directory=${PREFIX}/etc/gdm/home \
+ --with-sysconfsubdir=gdm \
+ --with-pid-file=/var/run/gdm.pid \
+ --with-dmconfdir=${LOCALBASE}/share/xsessions \
+ --with-screenshot-dir=/var/run/gdm/greeter \
+ --enable-authentication-scheme=pam \
+ --with-user=gdm \
+ --with-group=gdm \
+ --with-initial-vt=09 \
+ --with-systemd=no
+
+# this is a hack until we can get our own pam dir and dir in order.
+CONFIGURE_ARGS+=--with-default-pam-config=redhat
CPPFLAGS+= -I${LOCALBASE}/include -DHAS_SA_LEN
LDFLAGS+= -L${LOCALBASE}/lib
+INSTALL_TARGET= install-strip
-SUB_FILES+= gdm.pam
+SUB_FILES+= gdm-launch-environment \
+ gdm-password \
+ gdm-autologin \
+ client.conf \
+ locale.conf
GDMDIR?= ${PREFIX}/etc/gdm
PKGMESSAGE= ${WRKDIR}/pkg-message
@@ -56,51 +84,69 @@
OPTIONS_DEFINE= IPV6 KEYRING
OPTIONS_DEFAULT=KEYRING
-KEYRING_DESC= GnomeKeyring/PAM integration
+KEYRING_DESC= Gnomekeyring/PAM integration
+KEYRING_LIB_DEPENDS= libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
+IPV6_CONFIGURE_ENABLE= ipv6
.include <bsd.mport.options.mk>
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+= --enable-debug
+.endif
+
.if ${PORT_OPTIONS:MKEYRING}
-LIB_DEPENDS+= gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
- pam_gnome_keyring:${PORTSDIR}/security/gnome-keyring
SUB_LIST+= PAM_KEYRING=
.else
SUB_LIST+= PAM_KEYRING=\#
.endif
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+= --enable-ipv6
-.else
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
post-patch:
@${REINPLACE_CMD} -e 's|root:root|root:wheel|g' \
${WRKSRC}/data/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
- ${WRKSRC}/daemon/gdm-session-worker.c \
- ${WRKSRC}/data/gconf.path
- @${REINPLACE_CMD} -e 's|/bin/true|/usr/bin/true|g' \
- ${WRKSRC}/data/session-setup.entries
+ ${WRKSRC}/daemon/gdm-session-worker.c
@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
+ -e 's|/usr/bin/X|${LOCALBASE}/bin/X|g' \
+ -e 's|/usr/bin/Xorg|${LOCALBASE}/bin/Xorg|g' \
${WRKSRC}/configure ${WRKSRC}/daemon/*.c ${WRKSRC}/po/*.po
- @${REINPLACE_CMD} -e 's|/usr/lib|${LOCALBASE}/lib|g' \
- ${WRKSRC}/data/greeter-autostart/*.desktop.in*
+ @${REINPLACE_CMD} -e 's|/at-spi-registryd|/at-spi2-registryd|g' \
+ ${WRKSRC}/gui/simple-chooser/gdm-host-chooser.c \
+ ${WRKSRC}/gui/simple-chooser/chooser-main.c
+ @${REINPLACE_CMD} -e 's|/etc/X11|${LOCALBASE}/etc/X11|g' \
+ ${WRKSRC}/data/Init.in \
+ ${WRKSRC}/data/PostLogin \
+ ${WRKSRC}/data/PostSession.in \
+ ${WRKSRC}/data/PreSession.in \
+ ${WRKSRC}/data/Xsession.in
+ @${RM} ${WRKSRC}/data/applications/gdm-simple-greeter.desktop \
+ ${WRKSRC}/data/applications/gdm-simple-greeter.desktop.in \
+ ${WRKSRC}/data/applications/gnome-shell.desktop \
post-install:
- ${INSTALL_DATA} ${WRKSRC}/data/gconf.path \
- ${PREFIX}/share/gdm/gconf.path
- ${INSTALL_DATA} ${WRKSRC}/data/session-setup.entries \
- ${PREFIX}/share/gdm/session-setup.entries
-.if !defined(PACKAGE_BUILDING)
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
${INSTALL_DATA} ${WRKSRC}/data/gdm.conf-custom \
- ${PREFIX}/etc/gdm/custom.conf.default
- ${MKDIR} ${PREFIX}/share/xsessions
- ${INSTALL_DATA} ${WRKDIR}/gdm.pam ${PREFIX}/etc/pam.d/gdm
+ ${STAGEDIR}${PREFIX}/etc/gdm/custom.conf.default
+ ${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions
+ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/Sessions
+ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/dm/Sessions
+
+ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/home
+ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
+
+ ${INSTALL_DATA} ${WRKDIR}/gdm-autologin ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-autologin
+ ${INSTALL_DATA} ${WRKDIR}/gdm-launch-environment ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-launch-environment
+ ${INSTALL_DATA} ${WRKDIR}/gdm-password ${STAGEDIR}${PREFIX}/etc/pam.d/gdm-password
+
+ ${INSTALL_DATA} ${WRKDIR}/client.conf ${STAGEDIR}${PREFIX}/etc/gdm/home/.pulse/
+
+ ${INSTALL_DATA} ${WRKDIR}/locale.conf ${STAGEDIR}${PREFIX}/etc/gdm/
+
@${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${PKGDIR}/pkg-message \
| /usr/bin/fmt 75 79 > ${PKGMESSAGE}
+# logwtmp lives here.
+.if ${OSVERSION} < 4015
+CONFIGLIBS+= -lutil
+.endif
+
.include <bsd.port.mk>
Modified: trunk/x11/gdm/distinfo
===================================================================
--- trunk/x11/gdm/distinfo 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/distinfo 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gdm-2.30.7.tar.xz) = e5a098ebf0fdb5aff669dfca6e696433c4c8962c005bd13f296b7e13a60bc03b
-SIZE (gnome2/gdm-2.30.7.tar.xz) = 1715056
+SHA256 (gnome3/gdm-3.14.2.tar.xz) = e20eb61496161ad95b1058dbf8aea9b7b004df4d0ea6b0fab4401397d9db5930
+SIZE (gnome3/gdm-3.14.2.tar.xz) = 1490544
Added: trunk/x11/gdm/files/client.conf.in
===================================================================
--- trunk/x11/gdm/files/client.conf.in (rev 0)
+++ trunk/x11/gdm/files/client.conf.in 2015-05-24 02:36:38 UTC (rev 19089)
@@ -0,0 +1,2 @@
+autospawn = no
+daemon-binary = /usr/bin/true
Property changes on: trunk/x11/gdm/files/client.conf.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/gdm-autologin.in
===================================================================
--- trunk/x11/gdm/files/gdm-autologin.in (rev 0)
+++ trunk/x11/gdm/files/gdm-autologin.in 2015-05-24 02:36:38 UTC (rev 19089)
@@ -0,0 +1,12 @@
+# $OpenBSD: gdm-autologin,v 1.4 2012/10/10 08:47:14 ajacoutot Exp $
+#
+# gdm-autologin settings for pam(3)
+
+auth required pam_permit.so
+
+account required pam_nologin.so
+account include system
+
+password include system
+
+session include system
Property changes on: trunk/x11/gdm/files/gdm-autologin.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/gdm-launch-environment.in
===================================================================
--- trunk/x11/gdm/files/gdm-launch-environment.in (rev 0)
+++ trunk/x11/gdm/files/gdm-launch-environment.in 2015-05-24 02:36:38 UTC (rev 19089)
@@ -0,0 +1,12 @@
+# $OpenBSD: gdm-launch-environment,v 1.3 2012/10/10 08:47:14 ajacoutot Exp $
+#
+# gdm-launch-environment settings for pam(3)
+
+auth required pam_permit.so
+
+account required pam_nologin.so
+account include system
+
+password include system
+
+session include system
Property changes on: trunk/x11/gdm/files/gdm-launch-environment.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/gdm-password.in
===================================================================
--- trunk/x11/gdm/files/gdm-password.in (rev 0)
+++ trunk/x11/gdm/files/gdm-password.in 2015-05-24 02:36:38 UTC (rev 19089)
@@ -0,0 +1,15 @@
+# $OpenBSD: gdm-password,v 1.4 2012/10/10 08:47:14 ajacoutot Exp $
+#
+# gdm-password settings for pam(3)
+
+auth include system
+auth optional /usr/local/lib/pam_ck_connector.so
+%%PAM_KEYRING%%auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so
+
+account required pam_nologin.so
+account include system
+
+password include system
+
+session include system
+%%PAM_KEYRING%%session optional %%LOCALBASE%%/lib/pam_gnome_keyring.so auto_start
Property changes on: trunk/x11/gdm/files/gdm-password.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11/gdm/files/gdm.in
===================================================================
--- trunk/x11/gdm/files/gdm.in 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/files/gdm.in 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,5 +1,6 @@
#!/bin/sh
-# $MidnightBSD$
+# $FreeBSD$
+# $MCom: ports/trunk/x11/gdm3/files/gdm.in 18610 2013-06-30 16:33:05Z marcus $
# PROVIDE: gdm
# REQUIRE: LOGIN cleanvar moused syscons dbus
@@ -24,6 +25,7 @@
pidfile="/var/run/${name}.pid"
procname="%%PREFIX%%/sbin/gdm-binary"
start_cmd="gdm_start"
+stop_cmd="gdm_stop"
gdm_start()
{
@@ -32,6 +34,10 @@
fi
echo "Starting ${name}."
+ # we need to remove locking files under $gdm_home/.cache/gnome-shell/
+ # until XDG_RUNTIME_DIR can be set and used
+ rm -fr %%PREFIX%%/etc/gdm/home/.cache/gnome-shell/runtime-state*
+
# make sure there is no pam configuration for gdm service in base system
if ! checkyesno gdm_preserve_base_pam_conf && [ -f /etc/pam.d/gdm ]; then
cp -p /etc/pam.d/gdm /etc/pam.d/gdm_disabled
@@ -57,5 +63,14 @@
LANG=${gdm_lang} ${command} ${gdm_flags} ) &
}
+gdm_stop()
+{
+ /bin/kill -9 $(/bin/cat "${pidfile}")
+ pkill -9 -u gdm
+ pkill -9 X
+ pkill -9 gdm-session-worker
+
+}
+
load_rc_config ${name}
run_rc_command "$1"
Added: trunk/x11/gdm/files/locale.conf.in
===================================================================
--- trunk/x11/gdm/files/locale.conf.in (rev 0)
+++ trunk/x11/gdm/files/locale.conf.in 2015-05-24 02:36:38 UTC (rev 19089)
@@ -0,0 +1,3 @@
+LANG="en_US.UTF-8"
+LC_CTYPE="en_US.UTF-8"
+LC_MESSAGES="en_US.UTF-8"
Property changes on: trunk/x11/gdm/files/locale.conf.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11/gdm/files/patch-common_Makefile.in
===================================================================
--- trunk/x11/gdm/files/patch-common_Makefile.in 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/files/patch-common_Makefile.in 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,20 +1,10 @@
---- common/Makefile.in.orig 2008-08-20 14:34:16.000000000 -0400
-+++ common/Makefile.in 2008-08-20 14:36:50.000000000 -0400
-@@ -428,7 +428,8 @@ gdm_crash_logger_CPPFLAGS = \
- -DLOCALSTATEDIR=\"$(localstatedir)\" \
+--- common/Makefile.in.orig 2014-03-21 08:15:10.657611891 +0000
++++ common/Makefile.in 2014-03-21 08:17:08.641605278 +0000
+@@ -548,6 +548,7 @@
$(NULL)
--gdm_crash_logger_LDADD = $(GTHREAD_LIBS)
-+gdm_crash_logger_LDADD = $(GTHREAD_LIBS) \
-+ -lexecinfo
- @MKDTEMP_MISSING_FALSE at MKDTEMP_FILES =
- @MKDTEMP_MISSING_TRUE at MKDTEMP_FILES = mkdtemp.c mkdtemp.h
- libgdmcommon_la_SOURCES = \
-@@ -473,6 +474,7 @@ libgdmcommon_la_CFLAGS = \
- $(NULL)
-
libgdmcommon_la_LIBADD = \
-+ -lexecinfo \
++ -lexecinfo \
+ $(SYSTEMD_LIBS) \
$(NULL)
- libgdmcommon_la_LDFLAGS = \
Deleted: trunk/x11/gdm/files/patch-common_gdm-address.h
===================================================================
--- trunk/x11/gdm/files/patch-common_gdm-address.h 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/files/patch-common_gdm-address.h 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,11 +0,0 @@
---- common/gdm-address.h.orig 2009-05-09 21:08:07.000000000 -0400
-+++ common/gdm-address.h 2009-05-09 21:08:34.000000000 -0400
-@@ -36,6 +36,8 @@ G_BEGIN_DECLS
-
- #define GDM_TYPE_ADDRESS (gdm_address_get_type ())
-
-+#define gdm_sockaddr_len(sa) (((struct sockaddr *)sa)->sa_family == AF_INET6 ? sizeof(struct sockaddr_in6) : sizeof(struct sockaddr_in))
-+
- typedef struct _GdmAddress GdmAddress;
-
- GType gdm_address_get_type (void);
Deleted: trunk/x11/gdm/files/patch-common_gdm-common.c
===================================================================
--- trunk/x11/gdm/files/patch-common_gdm-common.c 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/files/patch-common_gdm-common.c 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,13 +0,0 @@
---- common/gdm-common.c.orig 2007-12-23 10:29:20.000000000 +0100
-+++ common/gdm-common.c 2007-12-23 10:29:34.000000000 +0100
-@@ -33,6 +33,10 @@
-
- #include "gdm-common.h"
-
-+#ifndef ENODATA
-+#define ENODATA EAGAIN
-+#endif
-+
- void
- gdm_set_fatal_warnings_if_unstable (void)
- {
Deleted: trunk/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c
===================================================================
--- trunk/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,48 +0,0 @@
---- daemon/gdm-xdmcp-display-factory.c.orig 2009-12-21 17:36:30.000000000 +0100
-+++ daemon/gdm-xdmcp-display-factory.c 2009-12-26 23:26:24.000000000 +0100
-@@ -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
-@@ -76,7 +77,7 @@
- #define DEFAULT_USE_MULTICAST FALSE
- #define DEFAULT_MULTICAST_ADDRESS "ff02::1"
- #define DEFAULT_HONOR_INDIRECT TRUE
--#define DEFAULT_MAX_DISPLAYS_PER_HOST 1
-+#define DEFAULT_MAX_DISPLAYS_PER_HOST 2
- #define DEFAULT_MAX_DISPLAYS 16
- #define DEFAULT_MAX_PENDING_DISPLAYS 4
- #define DEFAULT_MAX_WAIT 30
-@@ -404,6 +405,11 @@
- create_socket (struct addrinfo *ai)
- {
- int sock;
-+#ifdef ENABLE_IPV6
-+#ifdef IPV6_V6ONLY
-+ int off = 0;
-+#endif
-+#endif
-
- sock = socket (ai->ai_family, ai->ai_socktype, ai->ai_protocol);
- if (sock < 0) {
-@@ -411,6 +417,16 @@
- return sock;
- }
-
-+#ifdef ENABLE_IPV6
-+#ifdef IPV6_V6ONLY
-+ if (setsockopt (sock, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof (off)) < 0) {
-+ g_warning ("setsockopt: %s", g_strerror (errno));
-+ close (sock);
-+ return -1;
-+ }
-+#endif
-+#endif
-+
- if (bind (sock, ai->ai_addr, ai->ai_addrlen) < 0) {
- g_warning ("bind: %s", g_strerror (errno));
- close (sock);
Modified: trunk/x11/gdm/files/patch-daemon_Makefile.in
===================================================================
--- trunk/x11/gdm/files/patch-daemon_Makefile.in 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/files/patch-daemon_Makefile.in 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,14 +1,6 @@
---- daemon/Makefile.in.orig 2009-05-31 15:51:18.000000000 -0400
-+++ daemon/Makefile.in 2009-05-31 15:56:32.000000000 -0400
-@@ -525,6 +525,7 @@ test_session_LDADD = \
- $(XLIB_LIBS) \
- $(EXTRA_DAEMON_LIBS) \
- $(DAEMON_LIBS) \
-+ $(EXTRA_DAEMON_LIBS) \
- $(PAM_LIBS) \
- $(NULL)
-
-@@ -660,6 +661,7 @@ gdm_session_worker_SOURCES = session-wor
+--- daemon/Makefile.in.orig 2013-04-12 00:53:59.667693353 +0000
++++ daemon/Makefile.in 2013-04-12 00:54:27.682691596 +0000
+@@ -752,6 +752,7 @@
gdm_session_worker_LDFLAGS = \
$(XLIB_LIBS) \
$(PAM_LIBS) \
Deleted: trunk/x11/gdm/files/patch-daemon_gdm-session-worker.c
===================================================================
--- trunk/x11/gdm/files/patch-daemon_gdm-session-worker.c 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/files/patch-daemon_gdm-session-worker.c 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,68 +0,0 @@
---- daemon/gdm-session-worker.c.orig 2011-06-02 09:50:17.000000000 -0500
-+++ daemon/gdm-session-worker.c 2011-06-24 17:59:50.000000000 -0500
-@@ -31,6 +31,9 @@
- #include <errno.h>
- #include <grp.h>
- #include <pwd.h>
-+#ifdef HAVE_LOGINCAP
-+#include <login_cap.h>
-+#endif
-
- #ifdef HAVE_LOGINDEVPERM
- #include <libdevinfo.h>
-@@ -341,7 +344,7 @@
- * what to search if PATH is unset. POSIX may, dunno.
- */
-
-- path = "/bin:/usr/bin:.";
-+ path = "/bin:/usr/bin:%%LOCALBASE%%/bin:.";
- }
-
- len = strlen (file) + 1;
-@@ -2032,15 +2035,16 @@
- char *cachedirname;
- char *home_dir;
- int fd;
-+#ifdef HAVE_LOGINCAP
-+ char *login = worker->priv->username;
-+ struct passwd *pwent = getpwnam (login);
-+#endif
-
- /* Make sure cachedir gets created before we drop to user */
- cachedirname = gdm_session_worker_create_cachedir (worker);
- g_free (cachedirname);
-
-- if (setuid (worker->priv->uid) < 0) {
-- g_debug ("GdmSessionWorker: could not reset uid - %s", g_strerror (errno));
-- _exit (1);
-- }
-+ /* Call setsid() before setusercontext() */
-
- if (setsid () < 0) {
- g_debug ("GdmSessionWorker: could not set pid '%u' as leader of new session and process group - %s",
-@@ -2048,6 +2052,25 @@
- _exit (2);
- }
-
-+#ifdef HAVE_LOGINCAP
-+ if (setusercontext (NULL, pwent, pwent->pw_uid,
-+ LOGIN_SETALL & ~LOGIN_SETGROUP) < 0) {
-+ g_debug ("%s: setusercontext () failed for %s. "
-+ "Aborting.", "gdm_session_worker_start_user_session",
-+ login ? login : "(null)");
-+ }
-+
-+ /* Propagate PATH environment variable from user context to child processes */
-+
-+ gdm_session_worker_set_environment_variable (worker, "PATH", getenv ("PATH"));
-+
-+#else
-+ if (setuid (worker->priv->uid) < 0) {
-+ g_debug ("GdmSessionWorker: could not reset uid - %s", g_strerror (errno));
-+ _exit (1);
-+ }
-+#endif
-+
- environment = gdm_session_worker_get_environment (worker);
-
- g_assert (geteuid () == getuid ());
Added: trunk/x11/gdm/files/patch-daemon_gdm-xdmcp-display-factory.c
===================================================================
--- trunk/x11/gdm/files/patch-daemon_gdm-xdmcp-display-factory.c (rev 0)
+++ trunk/x11/gdm/files/patch-daemon_gdm-xdmcp-display-factory.c 2015-05-24 02:36:38 UTC (rev 19089)
@@ -0,0 +1,11 @@
+--- daemon/gdm-xdmcp-display-factory.c.orig 2014-03-21 08:21:57.405582553 +0000
++++ daemon/gdm-xdmcp-display-factory.c 2014-03-21 08:22:13.029582593 +0000
+@@ -77,7 +77,7 @@
+ #define DEFAULT_USE_MULTICAST FALSE
+ #define DEFAULT_MULTICAST_ADDRESS "ff02::1"
+ #define DEFAULT_HONOR_INDIRECT TRUE
+-#define DEFAULT_MAX_DISPLAYS_PER_HOST 1
++#define DEFAULT_MAX_DISPLAYS_PER_HOST 2
+ #define DEFAULT_MAX_DISPLAYS 16
+ #define DEFAULT_MAX_PENDING_DISPLAYS 4
+ #define DEFAULT_MAX_WAIT 30
Property changes on: trunk/x11/gdm/files/patch-daemon_gdm-xdmcp-display-factory.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/x11/gdm/files/patch-data_Xsession.in
===================================================================
--- trunk/x11/gdm/files/patch-data_Xsession.in 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/files/patch-data_Xsession.in 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,39 +1,21 @@
---- data/Xsession.in.orig 2008-05-12 20:25:54.000000000 -0400
-+++ data/Xsession.in 2008-06-09 01:29:59.000000000 -0400
-@@ -231,12 +231,31 @@ if [ "x$command" = "xdefault" ] ; then
+--- data/Xsession.in.orig 2014-05-08 18:53:58.000000000 +0200
++++ data/Xsession.in 2014-05-08 18:54:21.000000000 +0200
+@@ -184,6 +184,10 @@
fi
fi
-+is_gnome=0
-+if [ "x$command" = "xgnome-session" ]; then
-+ is_gnome=1
-+fi
-+
-+# add seahorse-agent if found
-+if [ ${is_gnome} = 1 ]; then
-+ seahorseagent="`gdmwhich seahorse-agent`"
-+ if [ -n "$seahorseagent" ] && [ -x "$seahorseagent" ] && [ -z "$GPG_AGENT_INFO" ] ; then
-+ command="dbus-launch --exit-with-session $seahorseagent --execute $command"
-+ elif [ -z "$seahorseagent" ] ; then
-+ echo "$0: seahorse-agent not found!"
-+ fi
-+fi
-+
++# Do not start ssh-agent(1) in case we run gnome-session (gnome-keyring
++# already provides the functionality of an SSH agent), see:
++# https://bugzilla.redhat.com/show_bug.cgi?id=441123
++if [ "x$command" != "xgnome-session" ]; then
# add ssh-agent if found
--sshagent="`gdmwhich ssh-agent`"
--if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
-- command="$sshagent -- $command"
--elif [ -z "$sshagent" ] ; then
-- echo "$0: ssh-agent not found!"
-+# ssh-agent functionality is handled by gnome-keyring-daemon which is launched
-+# from gnome-session
-+if [ ${is_gnome} != 1 ]; then
-+ sshagent="`gdmwhich ssh-agent`"
-+ if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
-+ command="$sshagent -- $command"
-+ elif [ -z "$sshagent" ] ; then
-+ echo "$0: ssh-agent not found!"
-+ fi
+ sshagent="`gdmwhich ssh-agent`"
+ if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then
+@@ -191,6 +195,7 @@
+ elif [ -z "$sshagent" ] ; then
+ echo "$0: ssh-agent not found!"
fi
++fi
echo "$0: Setup done, will execute: $command"
+
Added: trunk/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop
===================================================================
--- trunk/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop (rev 0)
+++ trunk/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop 2015-05-24 02:36:38 UTC (rev 19089)
@@ -0,0 +1,10 @@
+--- data/applications/mime-dummy-handler.desktop.orig 2013-08-26 10:09:17.171162980 +0000
++++ data/applications/mime-dummy-handler.desktop 2013-08-26 10:09:28.342160146 +0000
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Type=Application
+ Name=Dummy URI Handler
+-Exec=/bin/true %U
++Exec=/usr/bin/true %U
+ Terminal=false
+ StartupNotify=false
Property changes on: trunk/x11/gdm/files/patch-data_applications_mime-dummy-handler.desktop
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings
===================================================================
--- trunk/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings (rev 0)
+++ trunk/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings 2015-05-24 02:36:38 UTC (rev 19089)
@@ -0,0 +1,11 @@
+--- data/dconf/defaults/00-upstream-settings.orig 2014-03-21 08:45:14.698486081 +0000
++++ data/dconf/defaults/00-upstream-settings 2014-03-21 08:45:23.489485407 +0000
+@@ -13,7 +13,7 @@
+ show-desktop-icons=false
+
+ [org/gnome/desktop/default-applications/terminal]
+-exec='/bin/true'
++exec='/usr/bin/true'
+
+ [org/gnome/desktop/interface]
+ toolkit-accessibility=true
Property changes on: trunk/x11/gdm/files/patch-data_dconf_defaults_00-upstream-settings
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/x11/gdm/files/patch-data_gconf.path
===================================================================
--- trunk/x11/gdm/files/patch-data_gconf.path 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/files/patch-data_gconf.path 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,9 +0,0 @@
---- data/gconf.path.orig 2008-12-26 17:04:03.000000000 -0500
-+++ data/gconf.path 2008-12-26 17:04:13.000000000 -0500
-@@ -1,5 +1,5 @@
- # treat system-wide settings as mandatory
--xml:readonly:/etc/gconf/gconf.xml.system
-+xml:readonly:%%LOCALBASE%%/etc/gconf/gconf.xml.system
-
- # override some settings
- # we treat settings in this location as
Added: trunk/x11/gdm/files/patch-data_gdm.conf-custom.in
===================================================================
--- trunk/x11/gdm/files/patch-data_gdm.conf-custom.in (rev 0)
+++ trunk/x11/gdm/files/patch-data_gdm.conf-custom.in 2015-05-24 02:36:38 UTC (rev 19089)
@@ -0,0 +1,12 @@
+--- data/gdm.conf-custom.in.orig 2013-11-20 10:35:05.845253412 +0000
++++ data/gdm.conf-custom.in 2013-11-20 10:35:11.644252821 +0000
+@@ -2,6 +2,9 @@
+
+ [daemon]
+
++HaltCommand=/sbin/shutdown -p now
++RebootCommand=/sbin/shutdown -r now
++
+ [security]
+
+ [xdmcp]
Property changes on: trunk/x11/gdm/files/patch-data_gdm.conf-custom.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in
===================================================================
--- trunk/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,7 +0,0 @@
---- data/greeter-autostart/gdm-simple-greeter.desktop.in.in.orig 2008-11-23 22:22:04.000000000 -0500
-+++ data/greeter-autostart/gdm-simple-greeter.desktop.in.in 2008-11-23 22:22:09.000000000 -0500
-@@ -5,4 +5,3 @@ Exec=@LIBEXECDIR@/gdm-simple-greeter
- OnlyShowIn=GNOME;
- X-GNOME-Autostart-Phase=Application
- X-GNOME-Autostart-Notify=true
--X-GNOME-AutoRestart=true
Deleted: trunk/x11/gdm/files/patch-gui_simple-greeter_Makefile.in
===================================================================
--- trunk/x11/gdm/files/patch-gui_simple-greeter_Makefile.in 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/files/patch-gui_simple-greeter_Makefile.in 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,11 +0,0 @@
---- gui/simple-greeter/Makefile.in.orig 2008-02-13 01:57:37.000000000 -0500
-+++ gui/simple-greeter/Makefile.in 2008-02-13 01:57:44.000000000 -0500
-@@ -445,7 +445,7 @@ INCLUDES = \
- -DGDMCONFDIR=\"$(gdmconfdir)\" \
- -DDATADIR=\""$(datadir)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
-- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
-+ -DLIBLOCALEDIR=\""/usr/share/locale"\" \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DGLADEDIR=\""$(pkgdatadir)"\" \
- -DLIBEXECDIR=\""$(libexecdir)"\" \
Deleted: trunk/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c
===================================================================
--- trunk/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,11 +0,0 @@
---- gui/simple-greeter/gdm-languages.c.orig 2010-01-13 16:20:08.000000000 +0000
-+++ gui/simple-greeter/gdm-languages.c 2010-01-17 13:10:50.000000000 +0000
-@@ -365,7 +365,7 @@ add_locale (const char *language_name,
- if (is_utf8) {
- name = g_strdup (language_name);
- } else if (utf8_only) {
-- name = g_strdup_printf ("%s.utf8", language_name);
-+ name = g_strdup_printf ("%s.UTF-8", language_name);
-
- language_name_get_codeset_details (name, NULL, &is_utf8);
- if (is_utf8) {
Deleted: trunk/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c
===================================================================
--- trunk/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,10 +0,0 @@
---- gui/simple-greeter/gdm-remote-login-window.c.orig 2008-03-24 11:27:13.000000000 +0100
-+++ gui/simple-greeter/gdm-remote-login-window.c 2008-03-24 11:27:31.000000000 +0100
-@@ -25,6 +25,7 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <sys/signal.h>
- #include <errno.h>
-
- #include <glib.h>
Deleted: trunk/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c
===================================================================
--- trunk/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,57 +0,0 @@
---- gui/simple-greeter/gdm-user-manager.c.orig 2010-06-26 00:09:31.000000000 +0200
-+++ gui/simple-greeter/gdm-user-manager.c 2010-07-20 23:23:07.000000000 +0200
-@@ -62,6 +62,8 @@
-
- #ifdef __sun
- #define DEFAULT_MINIMAL_UID 100
-+#elif defined(__MidnightBSD__)
-+#define DEFAULT_MINIMAL_UID 1000
- #else
- #define DEFAULT_MINIMAL_UID 500
- #endif
-@@ -1678,12 +1680,17 @@ reload_passwd_file (GHashTable *valid_sh
- NULL,
- g_object_unref);
-
-+#ifdef __MidnightBSD__
-+ setpwent ();
-+#else
-+
- errno = 0;
- fp = fopen (PATH_PASSWD, "r");
- if (fp == NULL) {
- g_warning ("Unable to open %s: %s", PATH_PASSWD, g_strerror (errno));
- goto out;
- }
-+#endif
-
- /* Make sure we keep users who are logged in no matter what. */
- g_hash_table_iter_init (&iter, current_users_by_name);
-@@ -1733,9 +1740,15 @@ reload_passwd_file (GHashTable *valid_sh
-
- g_debug ("GdmUserManager: include_all is TRUE");
-
-+#ifdef __MidnightBSD__
-+ for (pwent = getpwent ();
-+ pwent != NULL;
-+ pwent = getpwent ()) {
-+#else
- for (pwent = fgetpwent (fp);
- pwent != NULL;
- pwent = fgetpwent (fp)) {
-+#endif
-
- /* Skip users below MinimalUID... */
- if (pwent->pw_uid < DEFAULT_MINIMAL_UID) {
-@@ -1810,7 +1823,11 @@ reload_passwd_file (GHashTable *valid_sh
- out:
- /* Cleanup */
-
-+#ifdef __MidnightBSD__
-+ endpwent ();
-+#else
- fclose (fp);
-+#endif
-
- g_hash_table_iter_init (&iter, new_users_by_name);
- while (g_hash_table_iter_next (&iter, (gpointer *) &name, (gpointer *) &user)) {
Deleted: trunk/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c
===================================================================
--- trunk/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,34 +0,0 @@
---- gui/simple-greeter/gdm-user.c.orig 2009-12-16 17:52:36.000000000 -0500
-+++ gui/simple-greeter/gdm-user.c 2009-12-18 21:43:38.000000000 -0500
-@@ -425,6 +425,7 @@ _gdm_user_update (GdmUser *u
- /* Display Name */
- if (pwent->pw_gecos && pwent->pw_gecos[0] != '\0') {
- gchar *first_comma = NULL;
-+ gchar *ampersand;
- gchar *valid_utf8_name = NULL;
-
- if (g_utf8_validate (pwent->pw_gecos, -1, NULL)) {
-@@ -449,6 +450,23 @@ _gdm_user_update (GdmUser *u
- g_free (real_name);
- real_name = NULL;
- }
-+
-+ while (real_name != NULL && (ampersand = strchr (real_name, '&')) != NULL) {
-+ gchar *temp_real_name1;
-+ gchar *temp_real_name2;
-+ gchar *temp_name;
-+
-+ temp_real_name1 = g_strndup (real_name,
-+ (ampersand - real_name));
-+ temp_real_name2 = g_strdup (ampersand + 1);
-+ temp_name = g_strdup (pwent->pw_name);
-+ temp_name[0] = toupper (temp_name[0]);
-+ g_free (real_name);
-+ real_name = g_strdup_printf ("%s%s%s", temp_real_name1, temp_name, temp_real_name2);
-+ g_free (temp_real_name1);
-+ g_free (temp_real_name2);
-+ g_free (temp_name);
-+ }
- } else {
- real_name = NULL;
- }
Deleted: trunk/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in
===================================================================
--- trunk/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,11 +0,0 @@
---- gui/user-switch-applet/Makefile.in.orig 2010-03-20 15:19:16.000000000 -0500
-+++ gui/user-switch-applet/Makefile.in 2010-03-20 15:20:28.000000000 -0500
-@@ -324,7 +324,7 @@
- -DLIBDIR=\""$(libdir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DSYSCONFDIR=\""$(sysconfdir)"\" \
-- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
-+ -DLIBLOCALEDIR=\""/usr/share/locale"\" \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DGLADEDIR=\""$(pkgdatadir)"\" \
- -DLIBEXECDIR=\""$(libexecdir)"\" \
Modified: trunk/x11/gdm/pkg-plist
===================================================================
--- trunk/x11/gdm/pkg-plist 2015-05-24 01:35:01 UTC (rev 19088)
+++ trunk/x11/gdm/pkg-plist 2015-05-24 02:36:38 UTC (rev 19089)
@@ -1,65 +1,89 @@
bin/gdm-screenshot
bin/gdmflexiserver
etc/dbus-1/system.d/gdm.conf
+etc/gdm/Xsession
+etc/gdm/custom.conf
+etc/gdm/custom.conf.default
+etc/gdm/locale.conf
etc/gdm/Init/Default
etc/gdm/PostLogin/Default.sample
etc/gdm/PostSession/Default
etc/gdm/PreSession/Default
-etc/gdm/Xsession
- at unexec if cmp -s %D/etc/gdm/custom.conf %D/etc/gdm/custom.conf.default; then rm -f %D/etc/gdm/custom.conf; fi
-etc/gdm/custom.conf.default
- at exec [ -f %B/custom.conf ] || cp %B/%f %B/custom.conf
-etc/gdm/gdm.schemas
-etc/gdm/home/.local/share/applications/mime-dummy-handler.desktop
-etc/gdm/home/.local/share/applications/mimeapps.list
-etc/pam.d/gdm
-libdata/bonobo/servers/GNOME_FastUserSwitchApplet.server
-libexec/gdm-crash-logger
-libexec/gdm-factory-slave
+etc/gdm/home/.pulse/client.conf
+etc/pam.d/gdm-autologin
+etc/pam.d/gdm-launch-environment
+etc/pam.d/gdm-password
+include/gdm/gdm-client-glue.h
+include/gdm/gdm-client.h
+include/gdm/gdm-sessions.h
+include/gdm/gdm-user-switching.h
+lib/libgdm.so
+lib/libgdm.so.1
+lib/libgdm.so.1.0.0
+lib/girepository-1.0/Gdm-1.0.typelib
+libdata/pkgconfig/gdm.pc
libexec/gdm-host-chooser
-libexec/gdm-product-slave
libexec/gdm-session-worker
libexec/gdm-simple-chooser
-libexec/gdm-simple-greeter
-libexec/gdm-simple-slave
-libexec/gdm-user-switch-applet
-libexec/gdm-xdmcp-chooser-slave
sbin/gdm
-sbin/gdm-binary
-%%DATADIR%%/autostart/LoginWindow/at-spi-registryd-wrapper.desktop
-%%DATADIR%%/autostart/LoginWindow/gdm-simple-greeter.desktop
-%%DATADIR%%/autostart/LoginWindow/gnome-mag.desktop
-%%DATADIR%%/autostart/LoginWindow/gnome-power-manager.desktop
-%%DATADIR%%/autostart/LoginWindow/gnome-settings-daemon.desktop
-%%DATADIR%%/autostart/LoginWindow/gok.desktop
-%%DATADIR%%/autostart/LoginWindow/metacity.desktop
-%%DATADIR%%/autostart/LoginWindow/orca-screen-reader.desktop
-%%DATADIR%%/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop
-%%DATADIR%%/gconf.path
+share/dconf/profile/gdm
+share/gir-1.0/Gdm-1.0.gir
%%DATADIR%%/gdb-cmd
-%%DATADIR%%/gdm-greeter-login-window.ui
+%%DATADIR%%/gdm.schemas
+%%DATADIR%%/greeter/autostart/caribou-autostart.desktop
+%%DATADIR%%/greeter-dconf-defaults
+%%DATADIR%%/greeter/applications/gnome-shell.desktop
+%%DATADIR%%/greeter/applications/mime-dummy-handler.desktop
+%%DATADIR%%/greeter/applications/mimeapps.list
+%%DATADIR%%/greeter/autostart/orca-autostart.desktop
%%DATADIR%%/locale.alias
-%%DATADIR%%/session-setup.entries
-share/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
-share/gnome/help/gdm/C/gdm.xml
-share/gnome/help/gdm/C/legal.xml
-share/gnome/help/gdm/de/gdm.xml
-share/gnome/help/gdm/el/gdm.xml
-share/gnome/help/gdm/en_GB/gdm.xml
-share/gnome/help/gdm/es/gdm.xml
-share/gnome/help/gdm/fr/gdm.xml
-share/gnome/help/gdm/it/gdm.xml
-share/gnome/help/gdm/ko/gdm.xml
-share/gnome/help/gdm/oc/gdm.xml
-share/gnome/help/gdm/ru/gdm.xml
-share/gnome/help/gdm/sv/gdm.xml
-share/gnome/help/gdm/uk/gdm.xml
-share/gnome/help/gdm/zh_CN/gdm.xml
+share/gnome-session/sessions/gdm-shell.session
+share/help/C/gdm/index.docbook
+share/help/C/gdm/legal.xml
+share/help/ca/gdm/index.docbook
+share/help/ca/gdm/legal.xml
+share/help/de/gdm/index.docbook
+share/help/de/gdm/legal.xml
+share/help/el/gdm/index.docbook
+share/help/el/gdm/legal.xml
+share/help/en_GB/gdm/index.docbook
+share/help/en_GB/gdm/legal.xml
+share/help/es/gdm/index.docbook
+share/help/es/gdm/legal.xml
+share/help/fr/gdm/index.docbook
+share/help/fr/gdm/legal.xml
+share/help/gl/gdm/index.docbook
+share/help/gl/gdm/legal.xml
+share/help/hu/gdm/index.docbook
+share/help/hu/gdm/legal.xml
+share/help/id/gdm/index.docbook
+share/help/id/gdm/legal.xml
+share/help/it/gdm/index.docbook
+share/help/it/gdm/legal.xml
+share/help/ko/gdm/index.docbook
+share/help/ko/gdm/legal.xml
+share/help/oc/gdm/index.docbook
+share/help/oc/gdm/legal.xml
+share/help/pt_BR/gdm/index.docbook
+share/help/pt_BR/gdm/legal.xml
+share/help/ru/gdm/index.docbook
+share/help/ru/gdm/legal.xml
+share/help/sl/gdm/index.docbook
+share/help/sl/gdm/legal.xml
+share/help/sv/gdm/index.docbook
+share/help/sv/gdm/legal.xml
+share/help/te/gdm/index.docbook
+share/help/te/gdm/legal.xml
+share/help/uk/gdm/index.docbook
+share/help/uk/gdm/legal.xml
+share/help/zh_CN/gdm/index.docbook
+share/help/zh_CN/gdm/legal.xml
share/icons/hicolor/16x16/apps/gdm-xnest.png
share/icons/hicolor/32x32/apps/gdm-setup.png
share/icons/hicolor/32x32/apps/gdm-xnest.png
share/locale/af/LC_MESSAGES/gdm.mo
share/locale/am/LC_MESSAGES/gdm.mo
+share/locale/an/LC_MESSAGES/gdm.mo
share/locale/ar/LC_MESSAGES/gdm.mo
share/locale/as/LC_MESSAGES/gdm.mo
share/locale/ast/LC_MESSAGES/gdm.mo
@@ -75,14 +99,15 @@
share/locale/ca at valencia/LC_MESSAGES/gdm.mo
share/locale/crh/LC_MESSAGES/gdm.mo
share/locale/cs/LC_MESSAGES/gdm.mo
+share/locale/csb/LC_MESSAGES/gdm.mo
share/locale/cy/LC_MESSAGES/gdm.mo
share/locale/da/LC_MESSAGES/gdm.mo
share/locale/de/LC_MESSAGES/gdm.mo
share/locale/dz/LC_MESSAGES/gdm.mo
share/locale/el/LC_MESSAGES/gdm.mo
+share/locale/en at shaw/LC_MESSAGES/gdm.mo
share/locale/en_CA/LC_MESSAGES/gdm.mo
share/locale/en_GB/LC_MESSAGES/gdm.mo
-share/locale/en at shaw/LC_MESSAGES/gdm.mo
share/locale/eo/LC_MESSAGES/gdm.mo
share/locale/es/LC_MESSAGES/gdm.mo
share/locale/et/LC_MESSAGES/gdm.mo
@@ -91,9 +116,12 @@
share/locale/fi/LC_MESSAGES/gdm.mo
share/locale/fr/LC_MESSAGES/gdm.mo
share/locale/fur/LC_MESSAGES/gdm.mo
+share/locale/fy/LC_MESSAGES/gdm.mo
share/locale/ga/LC_MESSAGES/gdm.mo
+share/locale/gd/LC_MESSAGES/gdm.mo
share/locale/gl/LC_MESSAGES/gdm.mo
share/locale/gu/LC_MESSAGES/gdm.mo
+share/locale/gv/LC_MESSAGES/gdm.mo
share/locale/he/LC_MESSAGES/gdm.mo
share/locale/hi/LC_MESSAGES/gdm.mo
share/locale/hr/LC_MESSAGES/gdm.mo
@@ -105,9 +133,11 @@
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
+share/locale/ky/LC_MESSAGES/gdm.mo
share/locale/lt/LC_MESSAGES/gdm.mo
share/locale/lv/LC_MESSAGES/gdm.mo
share/locale/mai/LC_MESSAGES/gdm.mo
@@ -143,6 +173,7 @@
share/locale/sv/LC_MESSAGES/gdm.mo
share/locale/ta/LC_MESSAGES/gdm.mo
share/locale/te/LC_MESSAGES/gdm.mo
+share/locale/tg/LC_MESSAGES/gdm.mo
share/locale/th/LC_MESSAGES/gdm.mo
share/locale/tr/LC_MESSAGES/gdm.mo
share/locale/ug/LC_MESSAGES/gdm.mo
@@ -156,43 +187,6 @@
share/locale/zh_HK/LC_MESSAGES/gdm.mo
share/locale/zh_TW/LC_MESSAGES/gdm.mo
share/locale/zu/LC_MESSAGES/gdm.mo
-share/omf/gdm/gdm-C.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-it.omf
-share/omf/gdm/gdm-ko.omf
-share/omf/gdm/gdm-oc.omf
-share/omf/gdm/gdm-ru.omf
-share/omf/gdm/gdm-sv.omf
-share/omf/gdm/gdm-uk.omf
-share/omf/gdm/gdm-zh_CN.omf
-share/pixmaps/faces/astronaut.jpg
-share/pixmaps/faces/baseball.png
-share/pixmaps/faces/butterfly.png
-share/pixmaps/faces/cat-eye.jpg
-share/pixmaps/faces/chess.jpg
-share/pixmaps/faces/coffee.jpg
-share/pixmaps/faces/dice.jpg
-share/pixmaps/faces/energy-arc.jpg
-share/pixmaps/faces/fish.jpg
-share/pixmaps/faces/flake.jpg
-share/pixmaps/faces/flower.jpg
-share/pixmaps/faces/grapes.jpg
-share/pixmaps/faces/guitar.jpg
-share/pixmaps/faces/launch.jpg
-share/pixmaps/faces/leaf.jpg
-share/pixmaps/faces/lightning.jpg
-share/pixmaps/faces/penguin.jpg
-share/pixmaps/faces/puppy.jpg
-share/pixmaps/faces/sky.jpg
-share/pixmaps/faces/soccerball.png
-share/pixmaps/faces/sunflower.jpg
-share/pixmaps/faces/sunset.jpg
-share/pixmaps/faces/tennis-ball.png
-share/pixmaps/faces/yellow-rose.jpg
share/pixmaps/gdm-foot-logo.png
share/pixmaps/gdm-setup.png
share/pixmaps/gdm-xnest.png
@@ -200,101 +194,19 @@
share/pixmaps/nobody.png
share/pixmaps/nohost.png
@exec mkdir -p %D/share/xsessions
- at dirrmtry share/xsessions
- at dirrm share/pixmaps/faces
- at dirrm share/omf/gdm
- at dirrm share/gnome/help/gdm/zh_CN
- at dirrm share/gnome/help/gdm/uk
- at dirrm share/gnome/help/gdm/sv
- at dirrm share/gnome/help/gdm/ru
- at dirrm share/gnome/help/gdm/oc
- at dirrm share/gnome/help/gdm/ko
- at dirrm share/gnome/help/gdm/it
- at dirrm share/gnome/help/gdm/fr
- at dirrm share/gnome/help/gdm/es
- at dirrm share/gnome/help/gdm/en_GB
- at dirrm share/gnome/help/gdm/el
- at dirrm share/gnome/help/gdm/de
- at dirrm share/gnome/help/gdm/C
- at dirrm share/gnome/help/gdm
- at dirrm %%DATADIR%%/autostart/LoginWindow
- at dirrm %%DATADIR%%/autostart
- at dirrm %%DATADIR%%
- at dirrm etc/gdm/Sessions
- at dirrm etc/gdm/PreSession
- at dirrm etc/gdm/PostSession
- at dirrm etc/gdm/PostLogin
- at dirrm etc/gdm/Init
- at dirrmtry etc/gdm/home/.local/share/applications
- at dirrmtry etc/gdm/home/.local/share
- at dirrmtry etc/gdm/home/.local
+ at exec dconf update
+ at unexec dconf update
+ at mode 1775
+ at dir etc/gdm/home
+ at mode
@unexec rm -rf %D/etc/gdm/home/.gconf*
- at dirrmtry etc/gdm/home
- at dirrmtry etc/gdm
- at dirrmtry etc/dm/Sessions
- at dirrmtry etc/dm
- at dirrmtry share/log/gdm
- at dirrmtry share/log
- at unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
- at unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true
- at unexec /bin/rm -rf /var/run/gdm 2>/dev/null || /usr/bin/true
- at unexec rmdir /var/cache/gdm 2>/dev/null || /usr/bin/true
- at unexec rmdir /var/cache 2>/dev/null || /usr/bin/true
- at dirrmtry share/locale/zu/LC_MESSAGES
- at dirrmtry share/locale/zu
- at dirrmtry share/locale/zh_HK/LC_MESSAGES
- at dirrmtry share/locale/zh_HK
- at dirrmtry share/locale/xh/LC_MESSAGES
- at dirrmtry share/locale/xh
- at dirrmtry share/locale/uz at cyrillic/LC_MESSAGES
- at dirrmtry share/locale/uz at cyrillic
- at dirrmtry share/locale/ug/LC_MESSAGES
- at dirrmtry share/locale/ug
- at dirrmtry share/locale/te/LC_MESSAGES
- at dirrmtry share/locale/te
- at dirrmtry share/locale/sr at latin/LC_MESSAGES
- at dirrmtry share/locale/sr at latin
- at dirrmtry share/locale/si/LC_MESSAGES
- at dirrmtry share/locale/si
- at dirrmtry share/locale/rw/LC_MESSAGES
- at dirrmtry share/locale/rw
- at dirrmtry share/locale/ps/LC_MESSAGES
- at dirrmtry share/locale/ps
- at dirrmtry share/locale/oc/LC_MESSAGES
- at dirrmtry share/locale/oc
- at dirrmtry share/locale/nso/LC_MESSAGES
- at dirrmtry share/locale/nso
- at dirrmtry share/locale/nds/LC_MESSAGES
- at dirrmtry share/locale/nds
- at dirrmtry share/locale/mr/LC_MESSAGES
- at dirrmtry share/locale/mr
- at dirrmtry share/locale/mi/LC_MESSAGES
- at dirrmtry share/locale/mi
- at dirrmtry share/locale/mg/LC_MESSAGES
- at dirrmtry share/locale/mg
- at dirrmtry share/locale/mai/LC_MESSAGES
- at dirrmtry share/locale/mai
- at dirrmtry share/locale/ku/LC_MESSAGES
- at dirrmtry share/locale/ku
- at dirrmtry share/locale/kk/LC_MESSAGES
- at dirrmtry share/locale/kk
- at dirrmtry share/locale/hy/LC_MESSAGES
- at dirrmtry share/locale/hy
- at dirrmtry share/locale/fur/LC_MESSAGES
- at dirrmtry share/locale/fur
- at dirrmtry share/locale/en at shaw/LC_MESSAGES
- at dirrmtry share/locale/en at shaw
- at dirrmtry share/locale/dz/LC_MESSAGES
- at dirrmtry share/locale/dz
- at dirrmtry share/locale/crh/LC_MESSAGES
- at dirrmtry share/locale/crh
- at dirrmtry share/locale/ca at valencia/LC_MESSAGES
- at dirrmtry share/locale/ca at valencia
- at dirrmtry share/locale/bn_IN/LC_MESSAGES
- at dirrmtry share/locale/bn_IN
- at dirrmtry share/locale/be at latin/LC_MESSAGES
- at dirrmtry share/locale/be at latin
- at dirrmtry share/locale/ast/LC_MESSAGES
- at dirrmtry share/locale/ast
- at dirrmtry share/locale/as/LC_MESSAGES
- at dirrmtry share/locale/as
+ at dir %%ETCDIR%%/Sessions
+ at dir %%ETCDIR%%/home/.local/share/applications
+ at dir etc/dm
+ at dir etc/dm/Sessions
+ at dir share/xsessions
+ at dir /var/cache/gdm/
+ at dir /var/run/gdm/greeter
+ at dir /var/run/gdm/
+ at dir /var/log/gdm/
+ at unexec rm -fr /var/gdm
More information about the Midnightbsd-cvs
mailing list