[45484] trunk/dports/gnome/gdm

jmr at macports.org jmr at macports.org
Fri Jan 16 07:38:30 PST 2009


Revision: 45484
          http://trac.macports.org/changeset/45484
Author:   jmr at macports.org
Date:     2009-01-16 07:38:29 -0800 (Fri, 16 Jan 2009)
Log Message:
-----------
gdm: update to 2.24.1, fix livecheck

Modified Paths:
--------------
    trunk/dports/gnome/gdm/Portfile

Added Paths:
-----------
    trunk/dports/gnome/gdm/files/fgetpwent.diff
    trunk/dports/gnome/gdm/files/fink-gdm.diff

Modified: trunk/dports/gnome/gdm/Portfile
===================================================================
--- trunk/dports/gnome/gdm/Portfile	2009-01-16 15:21:52 UTC (rev 45483)
+++ trunk/dports/gnome/gdm/Portfile	2009-01-16 15:38:29 UTC (rev 45484)
@@ -6,8 +6,8 @@
 PortSystem	1.0
 
 name		gdm
-version		2.18.3
-revision	0
+version		2.24.1
+set branch  [join [lrange [split ${version} .] 0 1] .]
 description	The Gnome Display Manager is a re-implementation of the well known xdm program.
 long_description	\
 	The Gnome Display Manager is a re-implementation of the well \
@@ -16,8 +16,10 @@
 categories	gnome
 platforms	darwin
 homepage	http://www.gnome.org/
-master_sites	gnome:sources/gdm/[strsed ${version} {/\.[0-9]*$//}]/
-checksums	md5 08555fce34d247062625c1a451a4d5a6
+master_sites	gnome:sources/${name}/${branch}/
+checksums           md5     31139d7a79096463b127b4790058b056 \
+                    sha1    efc93353ce4ba18aec7c45a69768937b31c0d5f8 \
+                    rmd160  dfae04847795160a1870d271fe0a3e514bc32960
 depends_build	\
 	port:gzip \
 	port:p5-xml-parser \
@@ -25,16 +27,15 @@
 	port:gnome-doc-utils
 depends_lib	\
 	port:dbus-glib \
+	port:gconf \
 	port:gtk2 \
-	port:howl \
-	port:libart_lgpl \
+	port:gnome-panel \
 	port:libglade2 \
-	port:libgnomecanvas \
-	port:libiconv \
-	port:libxml2 \
-	port:openssl 
+	port:libxklavier
 use_bzip2	yes
 
+patchfiles  fink-gdm.diff fgetpwent.diff
+
 configure.args	--mandir=${prefix}/share/man --disable-scrollkeeper
 configure.cppflags-append	"-I${x11prefix}/include"
 configure.ldflags-append	"-lresolv"
@@ -48,14 +49,12 @@
 
 pre-configure {
 	reinplace	"s|security/pam|pam/pam|g" ${worksrcpath}/configure
-	reinplace	"s|security/pam|pam/pam|g" ${worksrcpath}/daemon/verify-pam.c
-	reinplace	"s|security/pam|pam/pam|g" ${worksrcpath}/gui/gdmlogin.c
-	reinplace	"s|security/pam|pam/pam|g" ${worksrcpath}/utils/gdmaskpass.c
-	reinplace	"s|security/pam|pam/pam|g" ${worksrcpath}/gui/greeter/greeter.c
+	reinplace	"s|security/pam|pam/pam|g" ${worksrcpath}/daemon/gdm-session-worker.c
+	reinplace	"s|security/pam|pam/pam|g" ${worksrcpath}/gui/simple-greeter/gdm-greeter-login-window.c
 }
 
 post-configure {
-	reinplace	"s|security/pam|pam/pam|g" ${worksrcpath}/config/Makefile
+	reinplace	"s|security/pam|pam/pam|g" ${worksrcpath}/data/Makefile
 }
 
 post-destroot	{
@@ -73,3 +72,7 @@
 	file mkdir ${prefix}/var/gdm
 	file attributes ${prefix}/var/gdm -owner gdm -group gdm
 }
+
+livecheck.check regex
+livecheck.url   http://ftp.gnome.org/pub/gnome/sources/${name}/${branch}/
+livecheck.regex {LATEST-IS-(\d+(?:\.\d+)*)}

Added: trunk/dports/gnome/gdm/files/fgetpwent.diff
===================================================================
--- trunk/dports/gnome/gdm/files/fgetpwent.diff	                        (rev 0)
+++ trunk/dports/gnome/gdm/files/fgetpwent.diff	2009-01-16 15:38:29 UTC (rev 45484)
@@ -0,0 +1,38 @@
+--- gui/simple-greeter/gdm-user-manager.c.orig	2008-11-19 09:38:43.000000000 +1100
++++ gui/simple-greeter/gdm-user-manager.c	2009-01-17 02:26:07.000000000 +1100
+@@ -1274,17 +1274,11 @@
+         GSList        *old_users;
+         GSList        *new_users;
+         GSList        *list;
+-        FILE          *fp;
+ 
+         old_users = NULL;
+         new_users = NULL;
+ 
+         errno = 0;
+-        fp = fopen (PATH_PASSWD, "r");
+-        if (fp == NULL) {
+-                g_warning ("Unable to open %s: %s", PATH_PASSWD, g_strerror (errno));
+-                goto out;
+-        }
+ 
+         g_hash_table_foreach (manager->priv->users, listify_hash_values_hfunc, &old_users);
+         g_slist_foreach (old_users, (GFunc) g_object_ref, NULL);
+@@ -1297,7 +1291,7 @@
+                 }
+         }
+ 
+-        for (pwent = fgetpwent (fp); pwent != NULL; pwent = fgetpwent (fp)) {
++        for (pwent = getpwent(); pwent != NULL; pwent = getpwent()) {
+                 GdmUser *user;
+ 
+                 user = NULL;
+@@ -1360,7 +1354,7 @@
+  out:
+         /* Cleanup */
+ 
+-        fclose (fp);
++        setpwent();
+ 
+         g_slist_foreach (new_users, (GFunc) g_object_thaw_notify, NULL);
+         g_slist_foreach (new_users, (GFunc) g_object_unref, NULL);

Added: trunk/dports/gnome/gdm/files/fink-gdm.diff
===================================================================
--- trunk/dports/gnome/gdm/files/fink-gdm.diff	                        (rev 0)
+++ trunk/dports/gnome/gdm/files/fink-gdm.diff	2009-01-16 15:38:29 UTC (rev 45484)
@@ -0,0 +1,26 @@
+diff -Nurd -x'*~' gdm-2.20.3.orig/daemon/gdm-xdmcp-manager.c gdm-2.20.3/daemon/gdm-xdmcp-manager.c
+--- daemon/gdm-xdmcp-display-factory.c	2008-01-07 14:39:37.000000000 -0500
++++ daemon/gdm-xdmcp-display-factory.c	2008-01-09 17:33:11.000000000 -0500
+@@ -368,7 +368,7 @@
+                 if (ai->ai_flags & AI_NUMERICHOST) {
+                         g_string_append (str, "numhost ");
+                 }
+-                if (ai->ai_flags & AI_NUMERICSERV) {
++                if (ai->ai_flags & NI_NUMERICSERV) {
+                         g_string_append (str, "numserv ");
+                 }
+                 if (ai->ai_flags & AI_V4MAPPED) {
+diff -Nurd -x'*~' gdm-2.20.3.orig/daemon/slave.c gdm-2.20.3/daemon/slave.c
+--- daemon/gdm-session-record.c	2008-01-07 14:39:38.000000000 -0500
++++ daemon/gdm-session-record.c	2008-01-09 17:33:11.000000000 -0500
+@@ -322,8 +322,10 @@
+ #elif defined(HAVE_UT_UT_TIME)
+                 u->ut_time = session_record.ut_time;
+ #endif
++#ifndef __APPLE__
+                 u->ut_exit.e_termination = 0;
+                 u->ut_exit.e_exit = 0;
++#endif
+ 
+                 pututxline (u);
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090116/3c1c82d9/attachment-0001.html>


More information about the macports-changes mailing list