diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-05-12 23:49:19 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-05-12 23:49:19 +0800 |
commit | 926382e09698007dc3472481164045c6b0b9754a (patch) | |
tree | d0ae60e8f02a2f6b230176c1f2dd549262359efb /x11/gdm/files | |
parent | 42048341091e3810049dedfc96d4b312013ab048 (diff) | |
download | marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar.gz marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar.bz2 marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar.lz marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar.xz marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.tar.zst marcuscom-ports-926382e09698007dc3472481164045c6b0b9754a.zip |
Post 2.30.1 commit clean up.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14135 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm/files')
21 files changed, 0 insertions, 522 deletions
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in deleted file mode 100644 index 2e1e7dca5..000000000 --- a/x11/gdm/files/gdm.in +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/sh -# $FreeBSD$ -# $MCom: ports/x11/gdm/files/gdm.in,v 1.42 2010/03/16 19:33:11 mezz Exp $ - -# PROVIDE: gdm -# REQUIRE: LOGIN cleanvar moused syscons dbus -# -# Add the following to /etc/rc.conf to start GDM at boot time: -# -# gdm_enable="YES" -# - -. /etc/rc.subr -. %%GNOME_SUBR%% - -gdm_enable=${gdm_enable-${gnome_enable}} -gdm_preserve_base_pam_conf=${gdm_preserve_base_pam_conf-NO} -gdm_lang=${gdm_lang-${LANG}} - -export PATH=/bin:/sbin:/usr/bin:/usr/sbin:%%LOCALBASE%%/bin:%%LOCALBASE%%/sbin - -name="gdm" -rcvar=`set_rcvar` -command="%%PREFIX%%/sbin/${name}" -pidfile="/var/run/${name}.pid" -procname="%%PREFIX%%/sbin/gdm-binary" -start_cmd="gdm_start" - -gdm_start() -{ - if ! checkyesno gdm_enable ; then - return 0 - fi - echo "Starting ${name}." - - # 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 - rm -f /etc/pam.d/gdm - fi - - ( iter=0 - while ! ps -axoargs | grep "^/usr/libexec/getty " | grep -qv grep >/dev/null 2>&1; do - if [ ${iter} -eq 60 ]; then - break - fi - sleep 1 - iter=$(expr ${iter} + 1) - done - iter=0 - while ! %%LOCALBASE%%/bin/lshal >/dev/null 2>&1 ; do - if [ ${iter} -eq 60 ]; then - break - fi - sleep 1 - iter=$(expr ${iter} + 1) - done - LANG=${gdm_lang} ${command} ${gdm_flags} ) & -} - -load_rc_config ${name} -run_rc_command "$1" diff --git a/x11/gdm/files/gdm.pam.in b/x11/gdm/files/gdm.pam.in deleted file mode 100644 index 66a0a2741..000000000 --- a/x11/gdm/files/gdm.pam.in +++ /dev/null @@ -1,22 +0,0 @@ -# -# $FreeBSD$ -# $MCom: ports/x11/gdm/files/gdm.pam.in,v 1.10 2010/01/02 19:53:23 kwm Exp $ -# -# PAM configuration for the "gdm" service -# - -# auth -#auth sufficient pam_krb5.so no_warn try_first_pass -#auth sufficient pam_ssh.so no_warn try_first_pass -auth required pam_unix.so no_warn try_first_pass -%%PAM_KEYRING%%auth optional %%LOCALBASE%%/lib/pam_gnome_keyring.so - -# account -account required pam_nologin.so -#account required pam_krb5.so -account required pam_unix.so - -# session -#session optional pam_ssh.so -session required pam_permit.so -%%PAM_KEYRING%%session optional %%LOCALBASE%%/lib/pam_gnome_keyring.so auto_start diff --git a/x11/gdm/files/patch-common_Makefile.in b/x11/gdm/files/patch-common_Makefile.in deleted file mode 100644 index 2ab0a5001..000000000 --- a/x11/gdm/files/patch-common_Makefile.in +++ /dev/null @@ -1,20 +0,0 @@ ---- 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)\" \ - $(NULL) - --gdm_crash_logger_LDADD = $(GTHREAD_LIBS) -+gdm_crash_logger_LDADD = $(GTHREAD_LIBS) \ -+ -lexecinfo - @MKDTEMP_MISSING_FALSE@MKDTEMP_FILES = - @MKDTEMP_MISSING_TRUE@MKDTEMP_FILES = mkdtemp.c mkdtemp.h - libgdmcommon_la_SOURCES = \ -@@ -473,6 +474,7 @@ libgdmcommon_la_CFLAGS = \ - $(NULL) - - libgdmcommon_la_LIBADD = \ -+ -lexecinfo \ - $(NULL) - - libgdmcommon_la_LDFLAGS = \ diff --git a/x11/gdm/files/patch-common_gdm-address.c b/x11/gdm/files/patch-common_gdm-address.c deleted file mode 100644 index 9a4e620ba..000000000 --- a/x11/gdm/files/patch-common_gdm-address.c +++ /dev/null @@ -1,27 +0,0 @@ ---- common/gdm-address.c.orig 2010-01-13 17:32:59.000000000 +0000 -+++ common/gdm-address.c 2010-01-17 12:55:48.000000000 +0000 -@@ -29,6 +29,8 @@ - #include <stropts.h> - #endif - #include <string.h> -+#include <sys/types.h> -+#include <sys/param.h> - #ifdef HAVE_SYS_SOCKET_H - #include <sys/socket.h> - #endif -@@ -37,7 +39,6 @@ - #endif - #include <netdb.h> - #include <sys/ioctl.h> --#include <net/if.h> - - #ifndef G_OS_WIN32 - #include <sys/select.h> -@@ -47,6 +48,7 @@ - #include <winsock2.h> - #include <ws2tcpip.h> - #endif -+#include <net/if.h> - - #include <glib-object.h> - diff --git a/x11/gdm/files/patch-common_gdm-address.h b/x11/gdm/files/patch-common_gdm-address.h deleted file mode 100644 index a4fd39310..000000000 --- a/x11/gdm/files/patch-common_gdm-address.h +++ /dev/null @@ -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); diff --git a/x11/gdm/files/patch-common_gdm-common.c b/x11/gdm/files/patch-common_gdm-common.c deleted file mode 100644 index 9fa4acafa..000000000 --- a/x11/gdm/files/patch-common_gdm-common.c +++ /dev/null @@ -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) - { diff --git a/x11/gdm/files/patch-config.h.in b/x11/gdm/files/patch-config.h.in deleted file mode 100644 index d17901da1..000000000 --- a/x11/gdm/files/patch-config.h.in +++ /dev/null @@ -1,12 +0,0 @@ ---- config.h.in.orig 2007-11-02 20:48:28.000000000 -0400 -+++ config.h.in 2007-11-02 20:49:39.000000000 -0400 -@@ -23,6 +23,9 @@ - #undef HAVE_LC_MESSAGES - #undef HAVE_LIBSM - #undef HAVE_LIBXDMCP -+#undef HAVE_LOGIN -+#undef HAVE_LOGOUT -+#undef HAVE_LOGWTMP - #undef HAVE_LOGINCAP - #undef HAVE_LOGINDEVPERM - #undef HAVE_LOGINRESTRICTIONS diff --git a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c b/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c deleted file mode 100644 index ede7f2c2f..000000000 --- a/x11/gdm/files/patch-daemon-gdm-xdmcp-display-factory.c +++ /dev/null @@ -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); diff --git a/x11/gdm/files/patch-daemon_Makefile.in b/x11/gdm/files/patch-daemon_Makefile.in deleted file mode 100644 index 137352970..000000000 --- a/x11/gdm/files/patch-daemon_Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 - gdm_session_worker_LDFLAGS = \ - $(XLIB_LIBS) \ - $(PAM_LIBS) \ -+ $(EXTRA_DAEMON_LIBS) \ - $(NULL) - - gdm_session_worker_LDADD = \ diff --git a/x11/gdm/files/patch-daemon_gdm-session-worker.c b/x11/gdm/files/patch-daemon_gdm-session-worker.c deleted file mode 100644 index 362a116ea..000000000 --- a/x11/gdm/files/patch-daemon_gdm-session-worker.c +++ /dev/null @@ -1,71 +0,0 @@ ---- daemon/gdm-session-worker.c.orig 2009-09-21 22:05:27.000000000 +0200 -+++ daemon/gdm-session-worker.c 2009-09-22 12:33:59.000000000 +0200 -@@ -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> -@@ -340,7 +343,7 @@ gdm_session_execute (const char *file, - * what to search if PATH is unset. POSIX may, dunno. - */ - -- path = "/bin:/usr/bin:."; -+ path = "/bin:/usr/bin:/usr/local/bin:."; - } - - len = strlen (file) + 1; -@@ -1995,15 +1998,16 @@ gdm_session_worker_start_user_session (G - 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", -@@ -2011,6 +2015,28 @@ gdm_session_worker_start_user_session (G - _exit (2); - } - -+#ifdef HAVE_LOGINCAP -+ if (setusercontext (NULL, pwent, pwent->pw_uid, -+ LOGIN_SETLOGIN | LOGIN_SETPATH | -+ LOGIN_SETPRIORITY | LOGIN_SETRESOURCES | -+ LOGIN_SETUMASK | LOGIN_SETUSER | -+ LOGIN_SETENV) < 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 ()); diff --git a/x11/gdm/files/patch-data_Xsession.in b/x11/gdm/files/patch-data_Xsession.in deleted file mode 100644 index 894c97d16..000000000 --- a/x11/gdm/files/patch-data_Xsession.in +++ /dev/null @@ -1,39 +0,0 @@ ---- 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 - 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 -+ - # 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 - fi - - echo "$0: Setup done, will execute: $command" diff --git a/x11/gdm/files/patch-data_gconf.path b/x11/gdm/files/patch-data_gconf.path deleted file mode 100644 index 2efdb3cc9..000000000 --- a/x11/gdm/files/patch-data_gconf.path +++ /dev/null @@ -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 diff --git a/x11/gdm/files/patch-data_gdm.schemas.in.in b/x11/gdm/files/patch-data_gdm.schemas.in.in deleted file mode 100644 index f52dd8bd5..000000000 --- a/x11/gdm/files/patch-data_gdm.schemas.in.in +++ /dev/null @@ -1,11 +0,0 @@ ---- data/gdm.schemas.in.in.orig 2009-05-16 18:17:53.000000000 -0400 -+++ data/gdm.schemas.in.in 2009-05-16 18:18:01.000000000 -0400 -@@ -77,7 +77,7 @@ - <schema> - <key>xdmcp/DisplaysPerHost</key> - <signature>i</signature> -- <default>1</default> -+ <default>2</default> - </schema> - <schema> - <key>xdmcp/Port</key> diff --git a/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in b/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in deleted file mode 100644 index 7febf5165..000000000 --- a/x11/gdm/files/patch-data_greeter-autostart_gdm-simple-greeter.desktop.in.in +++ /dev/null @@ -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 diff --git a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c b/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c deleted file mode 100644 index b7ed32318..000000000 --- a/x11/gdm/files/patch-gui_simple-chooser_gdm-host-chooser-widget.c +++ /dev/null @@ -1,11 +0,0 @@ ---- gui/simple-chooser/gdm-host-chooser-widget.c.orig 2010-01-13 14:29:00.000000000 +0000 -+++ gui/simple-chooser/gdm-host-chooser-widget.c 2010-01-17 13:04:14.000000000 +0000 -@@ -543,6 +543,8 @@ xdmcp_init (GdmHostChooserWidget *widget - #ifdef ENABLE_IPV6 - widget->priv->socket_fd = socket (AF_INET6, SOCK_DGRAM, 0); - if (widget->priv->socket_fd != -1) { -+ int off = 0; -+ setsockopt(widget->priv->socket_fd, IPPROTO_IPV6, IPV6_V6ONLY, (void *)&off, sizeof (off)); - widget->priv->have_ipv6 = TRUE; - } - #endif diff --git a/x11/gdm/files/patch-gui_simple-greeter_Makefile.in b/x11/gdm/files/patch-gui_simple-greeter_Makefile.in deleted file mode 100644 index e8a958e66..000000000 --- a/x11/gdm/files/patch-gui_simple-greeter_Makefile.in +++ /dev/null @@ -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)"\" \ diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c deleted file mode 100644 index cd8a0f496..000000000 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-languages.c +++ /dev/null @@ -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) { diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c deleted file mode 100644 index 059d72cf4..000000000 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-remote-login-window.c +++ /dev/null @@ -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> diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c deleted file mode 100644 index b0b8ed37d..000000000 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c +++ /dev/null @@ -1,64 +0,0 @@ ---- gui/simple-greeter/gdm-user-manager.c.orig 2009-12-21 17:36:30.000000000 +0100 -+++ gui/simple-greeter/gdm-user-manager.c 2009-12-27 22:34:26.000000000 +0100 -@@ -66,6 +66,8 @@ - - #ifdef __sun - #define DEFAULT_MINIMAL_UID 100 -+#elif defined(__FreeBSD__) -+#define DEFAULT_MINIMAL_UID 1000 - #else - #define DEFAULT_MINIMAL_UID 500 - #endif -@@ -1414,17 +1416,24 @@ reload_passwd (GdmUserManager *manager) - GSList *new_users; - GSList *list; - GSList *dup; -+#ifndef __FreeBSD__ - FILE *fp; -+#endif - - old_users = NULL; - new_users = NULL; - -+#ifdef __FreeBSD__ -+ 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 - - g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users); - g_slist_foreach (old_users, (GFunc) g_object_ref, NULL); -@@ -1443,9 +1452,15 @@ reload_passwd (GdmUserManager *manager) - } else { - g_debug ("GdmUserManager: include_all is TRUE"); - -+#ifdef __FreeBSD__ -+ for (pwent = getpwent (); -+ pwent != NULL; -+ pwent = getpwent()) { -+#else - for (pwent = fgetpwent (fp); - pwent != NULL; - pwent = fgetpwent (fp)) { -+#endif - GdmUser *user; - - user = NULL; -@@ -1521,7 +1536,11 @@ reload_passwd (GdmUserManager *manager) - out: - /* Cleanup */ - -+#ifdef __FreeBSD__ -+ endpwent (); -+#else - fclose (fp); -+#endif - - g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL); - g_slist_foreach (new_users, (GFunc) g_object_unref, NULL); diff --git a/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c b/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c deleted file mode 100644 index e5fb649c6..000000000 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user.c +++ /dev/null @@ -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; - } diff --git a/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in b/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in deleted file mode 100644 index d14791f00..000000000 --- a/x11/gdm/files/patch-gui_user-switch-applet_Makefile.in +++ /dev/null @@ -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)"\" \ |