[72213] trunk/dports/gnome/gnome-keyring
devans at macports.org
devans at macports.org
Thu Oct 7 06:19:05 PDT 2010
Revision: 72213
http://trac.macports.org/changeset/72213
Author: devans at macports.org
Date: 2010-10-07 06:19:03 -0700 (Thu, 07 Oct 2010)
Log Message:
-----------
gnome-keyring: correctly detect PAM configuration and install PAM module in appropriate system directory. Closes #26127.
Modified Paths:
--------------
trunk/dports/gnome/gnome-keyring/Portfile
Added Paths:
-----------
trunk/dports/gnome/gnome-keyring/files/patch-configure.in.diff
trunk/dports/gnome/gnome-keyring/files/patch-pam-gkr-pam-module.c.diff
trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-secret-store-Makefile.am.diff
Removed Paths:
-------------
trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-secret-store-Makefile.in.diff
Modified: trunk/dports/gnome/gnome-keyring/Portfile
===================================================================
--- trunk/dports/gnome/gnome-keyring/Portfile 2010-10-07 01:35:21 UTC (rev 72212)
+++ trunk/dports/gnome/gnome-keyring/Portfile 2010-10-07 13:19:03 UTC (rev 72213)
@@ -5,6 +5,7 @@
name gnome-keyring
version 2.30.3
+revision 1
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers devans openmaintainer
categories gnome
@@ -25,7 +26,9 @@
sha1 0e0a2a1f4127dc6a01583fb3e81386370d9335f0 \
rmd160 9bd3cea25e10e1dcd93cfbc75a6a448e8ab338ca
-patchfiles patch-pkcs11-secret-store-Makefile.in.diff
+patchfiles patch-pkcs11-secret-store-Makefile.am.diff \
+ patch-configure.in.diff \
+ patch-pam-gkr-pam-module.c.diff
depends_build port:pkgconfig \
port:intltool
@@ -34,8 +37,11 @@
port:libtasn1 \
port:gconf
-configure.args --disable-schemas-install
+use_autoreconf yes
+configure.args --with-pam-dir=/usr/lib/pam \
+ --disable-schemas-install
+
test.run yes
test.target check
@@ -49,6 +55,12 @@
configure.args-append --enable-tests
}
+destroot.violate_mtree yes
+
+post-destroot {
+ file delete ${destroot}/usr/lib/pam/pam_gnome_keyring.la
+}
+
post-activate {
system "export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` && \
gconftool-2 --makefile-install-rule ${prefix}/etc/gconf/schemas/*.schemas"
Added: trunk/dports/gnome/gnome-keyring/files/patch-configure.in.diff
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-configure.in.diff (rev 0)
+++ trunk/dports/gnome/gnome-keyring/files/patch-configure.in.diff 2010-10-07 13:19:03 UTC (rev 72213)
@@ -0,0 +1,14 @@
+--- configure.in.orig 2010-06-21 06:51:38.000000000 -0700
++++ configure.in 2010-10-06 16:15:01.000000000 -0700
+@@ -235,7 +235,10 @@
+
+ pam_status="no"
+ if test "$enable_pam" != "no"; then
+- AC_CHECK_HEADER(security/pam_modules.h, have_pam=yes, have_pam=no)
++ AC_CHECK_HEADERS(security/pam_modules.h, have_pam=yes, have_pam=no)
++ if test "$have_pam" = "no"; then
++ AC_CHECK_HEADERS(pam/pam_modules.h, have_pam=yes, have_pam=no)
++ fi
+ if test "$enable_pam" = "yes" -a "$have_pam" = "no"; then
+ AC_MSG_ERROR(The PAM headers are missing)
+ elif test "$have_pam" = "yes"; then
Added: trunk/dports/gnome/gnome-keyring/files/patch-pam-gkr-pam-module.c.diff
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-pam-gkr-pam-module.c.diff (rev 0)
+++ trunk/dports/gnome/gnome-keyring/files/patch-pam-gkr-pam-module.c.diff 2010-10-07 13:19:03 UTC (rev 72213)
@@ -0,0 +1,17 @@
+--- pam/gkr-pam-module.c.orig 2010-06-12 15:33:24.000000000 -0700
++++ pam/gkr-pam-module.c 2010-10-06 15:44:21.000000000 -0700
+@@ -33,8 +33,14 @@
+
+ #include "daemon/control/gkd-control-codes.h"
+
++#if HAVE_SECURITY_PAM_MODULES_H
+ #include <security/pam_appl.h>
+ #include <security/pam_modules.h>
++#endif
++#if HAVE_PAM_PAM_MODULES_H
++#include <pam/pam_appl.h>
++#include <pam/pam_modules.h>
++#endif
+
+ #include <sys/types.h>
+ #include <sys/stat.h>
Added: trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-secret-store-Makefile.am.diff
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-secret-store-Makefile.am.diff (rev 0)
+++ trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-secret-store-Makefile.am.diff 2010-10-07 13:19:03 UTC (rev 72213)
@@ -0,0 +1,12 @@
+--- pkcs11/secret-store/Makefile.am.orig 2010-10-06 16:39:57.000000000 -0700
++++ pkcs11/secret-store/Makefile.am 2010-10-06 16:41:05.000000000 -0700
+@@ -47,7 +47,8 @@
+ $(GOBJECT_LIBS) \
+ $(GTHREAD_LIBS) \
+ $(GLIB_LIBS) \
+- $(LIBGCRYPT_LIBS)
++ $(LIBGCRYPT_LIBS) \
++ $(LIBTASN1_LIBS)
+
+ # -------------------------------------------------------------------------------
+
Deleted: trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-secret-store-Makefile.in.diff
===================================================================
--- trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-secret-store-Makefile.in.diff 2010-10-07 01:35:21 UTC (rev 72212)
+++ trunk/dports/gnome/gnome-keyring/files/patch-pkcs11-secret-store-Makefile.in.diff 2010-10-07 13:19:03 UTC (rev 72213)
@@ -1,12 +0,0 @@
---- pkcs11/secret-store/Makefile.in.orig 2010-08-09 08:47:19.000000000 -0700
-+++ pkcs11/secret-store/Makefile.in 2010-08-09 08:50:40.000000000 -0700
-@@ -387,7 +387,8 @@
- $(GOBJECT_LIBS) \
- $(GTHREAD_LIBS) \
- $(GLIB_LIBS) \
-- $(LIBGCRYPT_LIBS)
-+ $(LIBGCRYPT_LIBS) \
-+ $(LIBTASN1_LIBS)
-
- @WITH_TESTS_FALSE at TESTS_DIR =
-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101007/1d8ba3bb/attachment-0001.html>
More information about the macports-changes
mailing list