diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-07-27 00:25:14 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-07-27 00:25:14 +0800 |
| commit | cdda2fd464bfb59b35bb53d6d206212db604033f (patch) | |
| tree | 4ac82342313e087daaa897c7c917fdbbc19bdf43 | |
| parent | 9d3503de408b1488472e19cf3619673d1d83ec5a (diff) | |
| download | marcuscom-ports-cdda2fd464bfb59b35bb53d6d206212db604033f.tar marcuscom-ports-cdda2fd464bfb59b35bb53d6d206212db604033f.tar.gz marcuscom-ports-cdda2fd464bfb59b35bb53d6d206212db604033f.tar.bz2 marcuscom-ports-cdda2fd464bfb59b35bb53d6d206212db604033f.tar.lz marcuscom-ports-cdda2fd464bfb59b35bb53d6d206212db604033f.tar.xz marcuscom-ports-cdda2fd464bfb59b35bb53d6d206212db604033f.tar.zst marcuscom-ports-cdda2fd464bfb59b35bb53d6d206212db604033f.zip | |
gdm 2.30.4.
gdm3 2.31.2
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14374 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11/gdm/Makefile | 9 | ||||
| -rw-r--r-- | x11/gdm/distinfo | 6 | ||||
| -rw-r--r-- | x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c | 20 |
3 files changed, 18 insertions, 17 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index ccb409176..b00622964 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -2,12 +2,12 @@ # Date created: 20 May 2002 # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # -# $FreeBSD: ports/x11/gdm/Makefile,v 1.134 2010/07/25 19:35:04 kwm Exp $ -# $MCom: ports-stable/x11/gdm/Makefile,v 1.10 2010/07/21 13:50:45 kwm Exp $ +# $FreeBSD$ +# $MCom: ports/x11/gdm/Makefile,v 1.176 2010/06/05 20:47:56 kwm Exp $ # PORTNAME= gdm -PORTVERSION= 2.30.4 +PORTVERSION= 2.31.2 CATEGORIES= x11 gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 @@ -31,6 +31,7 @@ RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ USERS= gdm GROUPS= gdm +LATEST_LINK= gdm3 USE_BZIP2= yes USE_GETTEXT= yes USE_LDCONFIG= yes @@ -64,7 +65,7 @@ OPTIONS= IPV6 "Enable IPv6 support" off \ .if defined(WITHOUT_KEYRING) SUB_LIST+= PAM_KEYRING=\# .else -RUN_DEPENDS+= ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/gnome-keyring +RUN_DEPENDS+= ${LOCALBASE}/lib/pam_gnome_keyring.so:${PORTSDIR}/security/libgnome-keyring SUB_LIST+= PAM_KEYRING= .endif diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo index b871a3519..0506082c1 100644 --- a/x11/gdm/distinfo +++ b/x11/gdm/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gdm-2.30.4.tar.bz2) = f5e0ff54522f005d7593ac6686772988 -SHA256 (gnome2/gdm-2.30.4.tar.bz2) = 3a1c7fd590622d5291584d98ce5cf3e7888adf949655041549561f3a5983b5a9 -SIZE (gnome2/gdm-2.30.4.tar.bz2) = 2402222 +MD5 (gnome2/gdm-2.31.2.tar.bz2) = 8158a555cc478be617237f78b9727192 +SHA256 (gnome2/gdm-2.31.2.tar.bz2) = 5e8ff63fbc1932d524166c363d8cff7fc40785caed6b086533edfa3572ef84aa +SIZE (gnome2/gdm-2.31.2.tar.bz2) = 2378650 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 index a7bfbc883..670db9545 100644 --- a/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c +++ b/x11/gdm/files/patch-gui_simple-greeter_gdm-user-manager.c @@ -1,15 +1,15 @@ ---- 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 @@ +--- gui/simple-greeter/gdm-user-manager.c.orig 2010-07-12 23:17:16.000000000 +0200 ++++ gui/simple-greeter/gdm-user-manager.c 2010-07-26 18:19:57.000000000 +0200 +@@ -60,6 +60,8 @@ #ifdef __sun - #define DEFAULT_MINIMAL_UID 100 + #define FALLBACK_MINIMAL_UID 100 +#elif defined(__FreeBSD__) -+#define DEFAULT_MINIMAL_UID 1000 ++#define FALLBACK_MINIMAL_UID 1000 #else - #define DEFAULT_MINIMAL_UID 500 + #define FALLBACK_MINIMAL_UID 500 #endif -@@ -1678,12 +1680,17 @@ reload_passwd_file (GHashTable *valid_sh +@@ -1548,12 +1550,17 @@ reload_passwd_file (GHashTable *valid_sh NULL, g_object_unref); @@ -27,7 +27,7 @@ /* 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 +@@ -1603,9 +1610,15 @@ reload_passwd_file (GHashTable *valid_sh g_debug ("GdmUserManager: include_all is TRUE"); @@ -42,8 +42,8 @@ +#endif /* Skip users below MinimalUID... */ - if (pwent->pw_uid < DEFAULT_MINIMAL_UID) { -@@ -1810,7 +1823,11 @@ reload_passwd_file (GHashTable *valid_sh + if (pwent->pw_uid < FALLBACK_MINIMAL_UID) { +@@ -1680,7 +1693,11 @@ reload_passwd_file (GHashTable *valid_sh out: /* Cleanup */ |