[45930] trunk/dports/gnome/gdm
jmr at macports.org
jmr at macports.org
Sun Jan 25 11:05:44 PST 2009
Revision: 45930
http://trac.macports.org/changeset/45930
Author: jmr at macports.org
Date: 2009-01-25 11:05:41 -0800 (Sun, 25 Jan 2009)
Log Message:
-----------
gdm: add latest fink patch. Should fix #18178.
Modified Paths:
--------------
trunk/dports/gnome/gdm/Portfile
trunk/dports/gnome/gdm/files/fink-gdm.diff
Modified: trunk/dports/gnome/gdm/Portfile
===================================================================
--- trunk/dports/gnome/gdm/Portfile 2009-01-25 17:52:28 UTC (rev 45929)
+++ trunk/dports/gnome/gdm/Portfile 2009-01-25 19:05:41 UTC (rev 45930)
@@ -47,16 +47,6 @@
startupitem.stop ${prefix}/sbin/gdm-stop
startupitem.restart ${prefix}/sbin/gdm-restart
-pre-configure {
- reinplace "s|security/pam|pam/pam|g" ${worksrcpath}/configure
- 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}/data/Makefile
-}
-
post-destroot {
xinstall -m 644 ${filespath}/pam.sample ${destroot}${prefix}/etc/gdm
xinstall ${filespath}/macports-gdm-util ${destroot}${prefix}/bin
Modified: trunk/dports/gnome/gdm/files/fink-gdm.diff
===================================================================
--- trunk/dports/gnome/gdm/files/fink-gdm.diff 2009-01-25 17:52:28 UTC (rev 45929)
+++ trunk/dports/gnome/gdm/files/fink-gdm.diff 2009-01-25 19:05:41 UTC (rev 45930)
@@ -1,6 +1,77 @@
-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
+diff -Nurd -x'*~' gdm-2.24.1.orig/common/gdm-signal-handler.c gdm-2.24.1/common/gdm-signal-handler.c
+--- common/gdm-signal-handler.c 2008-11-18 17:38:43.000000000 -0500
++++ common/gdm-signal-handler.c 2009-01-20 16:53:43.000000000 -0500
+@@ -27,7 +27,9 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <signal.h>
++#if HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+ #include <syslog.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+@@ -160,6 +162,7 @@
+ static void
+ fallback_get_backtrace (void)
+ {
++#ifdef HAVE_EXECINFO_H
+ void * frames[64];
+ size_t size;
+ char ** strings;
+@@ -173,9 +176,10 @@
+ }
+ free (strings);
+ syslog (LOG_CRIT, "******************* END **********************************");
+- } else {
+- g_warning ("GDM crashed, but symbols couldn't be retrieved.");
++ return;
+ }
++#endif
++ g_warning ("GDM crashed, but symbols couldn't be retrieved.");
+ }
+
+
+diff -Nurd -x'*~' gdm-2.24.1.orig/configure gdm-2.24.1/configure
+--- configure 2008-11-18 18:06:46.000000000 -0500
++++ configure 2009-01-20 22:21:52.000000000 -0500
+@@ -31654,6 +31654,7 @@
+ fi
+
+
++ac_pam_includes="/usr/include"
+ if test "x$have_pam" = "xyes"; then
+ pam_appl_h="$ac_pam_includes/security/pam_appl.h"
+ { $as_echo "$as_me:$LINENO: checking for const pam_message" >&5
+diff -Nurd -x'*~' gdm-2.24.1.orig/daemon/gdm-session-record.c gdm-2.24.1/daemon/gdm-session-record.c
+--- daemon/gdm-session-record.c 2008-11-18 17:38:44.000000000 -0500
++++ daemon/gdm-session-record.c 2009-01-20 16:29:30.000000000 -0500
+@@ -322,8 +322,10 @@
+ #elif defined(HAVE_UT_UT_TIME)
+ u->ut_time = session_record.ut_time;
+ #endif
++#ifdef HAVE_UT_UT_EXIT_E_TERMINATION
+ u->ut_exit.e_termination = 0;
+ u->ut_exit.e_exit = 0;
++#endif
+
+ pututxline (u);
+
+diff -Nurd -x'*~' gdm-2.24.1.orig/daemon/gdm-session-worker.c gdm-2.24.1/daemon/gdm-session-worker.c
+--- daemon/gdm-session-worker.c 2008-11-18 17:38:44.000000000 -0500
++++ daemon/gdm-session-worker.c 2009-01-20 22:14:05.000000000 -0500
+@@ -32,7 +32,7 @@
+ #include <grp.h>
+ #include <pwd.h>
+
+-#include <security/pam_appl.h>
++#include <pam/pam_appl.h>
+
+ #include <glib.h>
+ #include <glib/gi18n.h>
+diff -Nurd -x'*~' gdm-2.24.1.orig/daemon/gdm-xdmcp-display-factory.c gdm-2.24.1/daemon/gdm-xdmcp-display-factory.c
+--- daemon/gdm-xdmcp-display-factory.c 2008-11-18 17:38:44.000000000 -0500
++++ daemon/gdm-xdmcp-display-factory.c 2009-01-20 22:48:05.000000000 -0500
@@ -368,7 +368,7 @@
if (ai->ai_flags & AI_NUMERICHOST) {
g_string_append (str, "numhost ");
@@ -10,17 +81,48 @@
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;
+@@ -600,20 +597,22 @@
+ return TRUE;
+ }
+
++#ifdef HAVE_TCPWRAPPERS
++
++/*
++ * Avoids a warning, my tcpd.h file doesn't include this prototype, even
++ * though the library does include the function and the manpage mentions it
++ */
++extern int hosts_ctl (char *daemon,
++ char *client_name,
++ char *client_addr,
++ char *client_user);
+#endif
++
+ static gboolean
+ gdm_xdmcp_host_allow (GdmAddress *address)
+ {
+ #ifdef HAVE_TCPWRAPPERS
+-
+- /*
+- * Avoids a warning, my tcpd.h file doesn't include this prototype, even
+- * though the library does include the function and the manpage mentions it
+- */
+- extern int hosts_ctl (char *daemon,
+- char *client_name,
+- char *client_addr,
+- char *client_user);
+-
+ char *client;
+ char *host;
+ gboolean ret;
+diff -Nurd -x'*~' gdm-2.24.1.orig/gui/simple-greeter/gdm-greeter-login-window.c gdm-2.24.1/gui/simple-greeter/gdm-greeter-login-window.c
+--- gui/simple-greeter/gdm-greeter-login-window.c 2008-11-18 17:49:12.000000000 -0500
++++ gui/simple-greeter/gdm-greeter-login-window.c 2009-01-20 22:14:20.000000000 -0500
+@@ -68,7 +68,7 @@
+ #include "gdm-user-chooser-widget.h"
- pututxline (u);
-
+ #ifdef HAVE_PAM
+-#include <security/pam_appl.h>
++#include <pam/pam_appl.h>
+ #define PW_ENTRY_SIZE PAM_MAX_RESP_SIZE
+ #else
+ #define PW_ENTRY_SIZE GDM_MAX_PASS
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090125/0e810361/attachment.html>
More information about the macports-changes
mailing list