[68203] trunk/dports/gnome/gdm
jmr at macports.org
jmr at macports.org
Fri May 28 17:06:57 PDT 2010
Revision: 68203
http://trac.macports.org/changeset/68203
Author: jmr at macports.org
Date: 2010-05-28 17:06:54 -0700 (Fri, 28 May 2010)
Log Message:
-----------
gdm: fix build on 10.6 (#21684), remove unused patchfile
Modified Paths:
--------------
trunk/dports/gnome/gdm/Portfile
trunk/dports/gnome/gdm/files/patch-fink-gdm-modified.diff
Added Paths:
-----------
trunk/dports/gnome/gdm/files/pam_location.diff
Removed Paths:
-------------
trunk/dports/gnome/gdm/files/fink-gdm.diff
Modified: trunk/dports/gnome/gdm/Portfile
===================================================================
--- trunk/dports/gnome/gdm/Portfile 2010-05-28 23:47:58 UTC (rev 68202)
+++ trunk/dports/gnome/gdm/Portfile 2010-05-29 00:06:54 UTC (rev 68203)
@@ -35,6 +35,9 @@
patch-configure.diff \
patch-daemon-gdm-display-access-file.c.diff \
fgetpwent.diff
+if {${os.major} <= 9 && ${os.platform} == "darwin"} {
+ patchfiles-append pam_location.diff
+}
post-patch {
reinplace "s|@MP_PREFIX@|${prefix}|" ${worksrcpath}/configure
Deleted: trunk/dports/gnome/gdm/files/fink-gdm.diff
===================================================================
--- trunk/dports/gnome/gdm/files/fink-gdm.diff 2010-05-28 23:47:58 UTC (rev 68202)
+++ trunk/dports/gnome/gdm/files/fink-gdm.diff 2010-05-29 00:06:54 UTC (rev 68203)
@@ -1,128 +0,0 @@
-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 ");
- }
-- if (ai->ai_flags & AI_NUMERICSERV) {
-+ if (ai->ai_flags & NI_NUMERICSERV) {
- g_string_append (str, "numserv ");
- }
- if (ai->ai_flags & AI_V4MAPPED) {
-@@ -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"
-
- #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
Added: trunk/dports/gnome/gdm/files/pam_location.diff
===================================================================
--- trunk/dports/gnome/gdm/files/pam_location.diff (rev 0)
+++ trunk/dports/gnome/gdm/files/pam_location.diff 2010-05-29 00:06:54 UTC (rev 68203)
@@ -0,0 +1,24 @@
+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/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"
+
+ #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
Modified: trunk/dports/gnome/gdm/files/patch-fink-gdm-modified.diff
===================================================================
--- trunk/dports/gnome/gdm/files/patch-fink-gdm-modified.diff 2010-05-28 23:47:58 UTC (rev 68202)
+++ trunk/dports/gnome/gdm/files/patch-fink-gdm-modified.diff 2010-05-29 00:06:54 UTC (rev 68203)
@@ -46,18 +46,6 @@
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
@@ -103,15 +91,3 @@
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"
-
- #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/20100528/221d4472/attachment.html>
More information about the macports-changes
mailing list