Update to 2.27.4.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12444 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 337 insertions, 0 deletions

diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile
new file mode 100644
index 000000000..e32007b51
--- /dev/null
+++ b/security/gnome-keyring/Makefile
@@ -0,0 +1,43 @@
+# New ports collection makefile for:   gnomekeyring
+# Date Created:			08 December 2003
+# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom$
+#
+
+PORTNAME=	gnome-keyring
+PORTVERSION=	2.27.4
+CATEGORIES=	security gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A program that keeps passwords and other secrets
+
+LIB_DEPENDS=	tasn1.4:${PORTSDIR}/security/libtasn1 \
+    		gcrypt.16:${PORTSDIR}/security/libgcrypt
+
+USE_BZIP2=	yes
+USE_GNOME=	gnomehack gnomeprefix gtk20 ltverhack intlhack gconf2
+USE_GMAKE=	yes
+USE_GETTEXT=	yes
+USE_AUTOTOOLS=	libtool:15
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS=	--with-pam-dir="${PREFIX}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+GCONF_SCHEMAS=	gnome-keyring.schemas
+
+OPTIONS=	HAL "Use HAL for keys on removable drives" on
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_HAL)
+LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
+CONFIGURE_ARGS+=--enable-hal
+.else
+CONFIGURE_ARGS+=--disable-hal
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo
new file mode 100644
index 000000000..beb66b15b
--- /dev/null
+++ b/security/gnome-keyring/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gnome-keyring-2.27.4.tar.bz2) = 04a94e96f75805e47a6b90a938a7862e
+SHA256 (gnome2/gnome-keyring-2.27.4.tar.bz2) = 9baa37e0fb16d858ca978bd38f2bf9b9b764bcdf5faa11aa1a83aa97ee11cb75
+SIZE (gnome2/gnome-keyring-2.27.4.tar.bz2) = 2696339
diff --git a/security/gnome-keyring/files/patch-pam_gkr-pam-client.c b/security/gnome-keyring/files/patch-pam_gkr-pam-client.c
new file mode 100644
index 000000000..05a0306e6
--- /dev/null
+++ b/security/gnome-keyring/files/patch-pam_gkr-pam-client.c
@@ -0,0 +1,18 @@
+--- pam/gkr-pam-client.c.orig	2008-10-07 12:25:23.000000000 -0400
++++ pam/gkr-pam-client.c	2008-10-07 12:38:36.000000000 -0400
+@@ -96,12 +96,12 @@ check_peer_same_uid (int sock)
+         struct xucred xuc;
+         socklen_t xuc_len = sizeof (xuc);
+ 
+-	if (getsockopt (sock, SOL_SOCKET, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && 
+-	    xuc_len == sizeof (xuc)) {
++	if (getsockopt (sock, 0, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && 
++	    xuc.cr_version == XUCRED_VERSION) {
+ 	    	uid = xuc.cr_uid;
+ 	} else {
+ 		syslog (GKR_LOG_ERR, "could not get gnome-keyring-daemon socket credentials, "
+-		        "(returned len %d/%d)\n", xuc_len, (int)sizeof (xuc));
++		        "(returned version %d/%d)\n", xuc.cr_version, XUCRED_VERSION);
+ 		return -1;   
+ 	}
+ 	
diff --git a/security/gnome-keyring/files/patch-pam_gkr-pam-module.c b/security/gnome-keyring/files/patch-pam_gkr-pam-module.c
new file mode 100644
index 000000000..1b3add92d
--- /dev/null
+++ b/security/gnome-keyring/files/patch-pam_gkr-pam-module.c
@@ -0,0 +1,24 @@
+--- pam/gkr-pam-module.c.orig	2009-07-09 04:01:56.000000000 +0200
++++ pam/gkr-pam-module.c	2009-07-18 22:17:40.000000000 +0200
+@@ -229,8 +229,10 @@ evaluate_inlist (const char *needle, con
+ 	const char *item;
+ 	const char *remaining;
+ 
++#if defined(PAM_BAD_ITEM)
+ 	if (!needle)
+ 		return PAM_BAD_ITEM;
++#endif
+ 
+ 	remaining = haystack;
+ 
+@@ -255,7 +257,10 @@ evaluate_inlist (const char *needle, con
+ 		++remaining;
+         }
+ 
++#if defined(PAM_BAD_ITEM)
+         return PAM_BAD_ITEM;
++#endif
++
+ }
+ 
+ /* -----------------------------------------------------------------------------
diff --git a/security/gnome-keyring/pkg-descr b/security/gnome-keyring/pkg-descr
new file mode 100644
index 000000000..75ce77c6d
--- /dev/null
+++ b/security/gnome-keyring/pkg-descr
@@ -0,0 +1,17 @@
+Gnome-keyring is a program that keep password and other secrets for
+users. It is run as a damon in the session, similar to ssh-agent, and
+other applications can locate it by an environment variable.
+
+The program can manage several keyrings, each with its own master
+password, and there is also a session keyring which is never stored to
+disk, but forgotten when the session ends.
+
+The library libgnome-keyring is used by applications to integrate with
+the gnome keyring system. However, at this point the library hasn't been
+tested and used enought to consider the API to be publically
+exposed. Therefore use of libgnome-keyring is at the moment limited to
+internal use in the gnome desktop. However, we hope that the
+gnome-keyring API will turn out useful and good, so that later it
+can be made public for any application to use.
+
+-- Gnome-keyring README
diff --git a/security/gnome-keyring/pkg-plist b/security/gnome-keyring/pkg-plist
new file mode 100644
index 000000000..25da7d593
--- /dev/null
+++ b/security/gnome-keyring/pkg-plist
@@ -0,0 +1,232 @@
+bin/gnome-keyring
+bin/gnome-keyring-daemon
+etc/xdg/autostart/gnome-keyring-daemon.desktop
+include/gcr/gcr-certificate-basics-widget.h
+include/gcr/gcr-certificate-details-widget.h
+include/gcr/gcr-certificate.h
+include/gcr/gcr-importer.h
+include/gcr/gcr-parser.h
+include/gcr/gcr-types.h
+include/gcr/gcr.h
+include/gnome-keyring-1/gnome-keyring-memory.h
+include/gnome-keyring-1/gnome-keyring-result.h
+include/gnome-keyring-1/gnome-keyring.h
+include/gp11/gp11.h
+include/gp11/pkcs11.h
+include/gp11/pkcs11g.h
+include/gp11/pkcs11n.h
+lib/gnome-keyring/devel/gck-ssh-store-standalone.a
+lib/gnome-keyring/devel/gck-ssh-store-standalone.la
+lib/gnome-keyring/devel/gck-ssh-store-standalone.so
+lib/gnome-keyring/devel/gck-user-store-standalone.a
+lib/gnome-keyring/devel/gck-user-store-standalone.la
+lib/gnome-keyring/devel/gck-user-store-standalone.so
+lib/gnome-keyring/gnome-keyring-pkcs11.a
+lib/gnome-keyring/gnome-keyring-pkcs11.la
+lib/gnome-keyring/gnome-keyring-pkcs11.so
+lib/gnome-keyring/standalone/gck-roots-store-standalone.a
+lib/gnome-keyring/standalone/gck-roots-store-standalone.la
+lib/gnome-keyring/standalone/gck-roots-store-standalone.so
+lib/libgcr.a
+lib/libgcr.la
+lib/libgcr.so
+lib/libgcr.so.0
+lib/libgnome-keyring.a
+lib/libgnome-keyring.la
+lib/libgnome-keyring.so
+lib/libgnome-keyring.so.0
+lib/libgp11.a
+lib/libgp11.la
+lib/libgp11.so
+lib/libgp11.so.0
+lib/pam_gnome_keyring.a
+lib/pam_gnome_keyring.la
+lib/pam_gnome_keyring.so
+libdata/pkgconfig/gcr-0.pc
+libdata/pkgconfig/gnome-keyring-1.pc
+libdata/pkgconfig/gp11-0.pc
+libexec/gnome-keyring-ask
+share/dbus-1/services/org.gnome.keyring.service
+share/doc/gcr/GcrCertificateBasicsWidget.html
+share/doc/gcr/GcrCertificateDetailsWidget.html
+share/doc/gcr/GcrImporter.html
+share/doc/gcr/GcrParser.html
+share/doc/gcr/GcrSimpleCertificate.html
+share/doc/gcr/ch01.html
+share/doc/gcr/gcr-GcrImportDialog.html
+share/doc/gcr/gcr-GcrTokenManager.html
+share/doc/gcr/gcr-GcrXxx.html
+share/doc/gcr/gcr-gcr-certificate.html
+share/doc/gcr/gcr-gcr-types.html
+share/doc/gcr/gcr.devhelp
+share/doc/gcr/gcr.devhelp2
+share/doc/gcr/home.png
+share/doc/gcr/index.html
+share/doc/gcr/index.sgml
+share/doc/gcr/left.png
+share/doc/gcr/right.png
+share/doc/gcr/style.css
+share/doc/gcr/up.png
+%%DOCSDIR%%/ch01.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-acl.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-attributes.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-daemon.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-find.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-item-info.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-items.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-keyrings.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-memory.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-misc.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-network.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-password.html
+%%DOCSDIR%%/gnome-keyring-gnome-keyring-result.html
+%%DOCSDIR%%/gnome-keyring.devhelp
+%%DOCSDIR%%/gnome-keyring.devhelp2
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
+share/doc/gp11/ch01.html
+share/doc/gp11/gp11-gp11-attribute.html
+share/doc/gp11/gp11-gp11-attributes.html
+share/doc/gp11/gp11-gp11-error.html
+share/doc/gp11/gp11-gp11-misc.html
+share/doc/gp11/gp11-gp11-module.html
+share/doc/gp11/gp11-gp11-object.html
+share/doc/gp11/gp11-gp11-session.html
+share/doc/gp11/gp11-gp11-slot.html
+share/doc/gp11/gp11.devhelp
+share/doc/gp11/gp11.devhelp2
+share/doc/gp11/home.png
+share/doc/gp11/index.html
+share/doc/gp11/index.sgml
+share/doc/gp11/left.png
+share/doc/gp11/right.png
+share/doc/gp11/style.css
+share/doc/gp11/up.png
+share/gcr/ui/gcr-certificate-basics-widget.ui
+share/gcr/ui/gcr-import-dialog.ui
+share/locale/ar/LC_MESSAGES/gnome-keyring.mo
+share/locale/as/LC_MESSAGES/gnome-keyring.mo
+share/locale/ast/LC_MESSAGES/gnome-keyring.mo
+share/locale/az/LC_MESSAGES/gnome-keyring.mo
+share/locale/be/LC_MESSAGES/gnome-keyring.mo
+share/locale/be@latin/LC_MESSAGES/gnome-keyring.mo
+share/locale/bg/LC_MESSAGES/gnome-keyring.mo
+share/locale/bn/LC_MESSAGES/gnome-keyring.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-keyring.mo
+share/locale/bs/LC_MESSAGES/gnome-keyring.mo
+share/locale/ca/LC_MESSAGES/gnome-keyring.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-keyring.mo
+share/locale/cs/LC_MESSAGES/gnome-keyring.mo
+share/locale/cy/LC_MESSAGES/gnome-keyring.mo
+share/locale/da/LC_MESSAGES/gnome-keyring.mo
+share/locale/de/LC_MESSAGES/gnome-keyring.mo
+share/locale/dz/LC_MESSAGES/gnome-keyring.mo
+share/locale/el/LC_MESSAGES/gnome-keyring.mo
+share/locale/en_CA/LC_MESSAGES/gnome-keyring.mo
+share/locale/en_GB/LC_MESSAGES/gnome-keyring.mo
+share/locale/es/LC_MESSAGES/gnome-keyring.mo
+share/locale/et/LC_MESSAGES/gnome-keyring.mo
+share/locale/eu/LC_MESSAGES/gnome-keyring.mo
+share/locale/fa/LC_MESSAGES/gnome-keyring.mo
+share/locale/fi/LC_MESSAGES/gnome-keyring.mo
+share/locale/fr/LC_MESSAGES/gnome-keyring.mo
+share/locale/gl/LC_MESSAGES/gnome-keyring.mo
+share/locale/gu/LC_MESSAGES/gnome-keyring.mo
+share/locale/he/LC_MESSAGES/gnome-keyring.mo
+share/locale/hi/LC_MESSAGES/gnome-keyring.mo
+share/locale/hr/LC_MESSAGES/gnome-keyring.mo
+share/locale/hu/LC_MESSAGES/gnome-keyring.mo
+share/locale/id/LC_MESSAGES/gnome-keyring.mo
+share/locale/is/LC_MESSAGES/gnome-keyring.mo
+share/locale/it/LC_MESSAGES/gnome-keyring.mo
+share/locale/ja/LC_MESSAGES/gnome-keyring.mo
+share/locale/ka/LC_MESSAGES/gnome-keyring.mo
+share/locale/kn/LC_MESSAGES/gnome-keyring.mo
+share/locale/ko/LC_MESSAGES/gnome-keyring.mo
+share/locale/lt/LC_MESSAGES/gnome-keyring.mo
+share/locale/lv/LC_MESSAGES/gnome-keyring.mo
+share/locale/mai/LC_MESSAGES/gnome-keyring.mo
+share/locale/mg/LC_MESSAGES/gnome-keyring.mo
+share/locale/mk/LC_MESSAGES/gnome-keyring.mo
+share/locale/ml/LC_MESSAGES/gnome-keyring.mo
+share/locale/mn/LC_MESSAGES/gnome-keyring.mo
+share/locale/mr/LC_MESSAGES/gnome-keyring.mo
+share/locale/ms/LC_MESSAGES/gnome-keyring.mo
+share/locale/nb/LC_MESSAGES/gnome-keyring.mo
+share/locale/ne/LC_MESSAGES/gnome-keyring.mo
+share/locale/nl/LC_MESSAGES/gnome-keyring.mo
+share/locale/nn/LC_MESSAGES/gnome-keyring.mo
+share/locale/oc/LC_MESSAGES/gnome-keyring.mo
+share/locale/or/LC_MESSAGES/gnome-keyring.mo
+share/locale/pa/LC_MESSAGES/gnome-keyring.mo
+share/locale/pl/LC_MESSAGES/gnome-keyring.mo
+share/locale/pt/LC_MESSAGES/gnome-keyring.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-keyring.mo
+share/locale/ro/LC_MESSAGES/gnome-keyring.mo
+share/locale/ru/LC_MESSAGES/gnome-keyring.mo
+share/locale/rw/LC_MESSAGES/gnome-keyring.mo
+share/locale/si/LC_MESSAGES/gnome-keyring.mo
+share/locale/sk/LC_MESSAGES/gnome-keyring.mo
+share/locale/sl/LC_MESSAGES/gnome-keyring.mo
+share/locale/sq/LC_MESSAGES/gnome-keyring.mo
+share/locale/sr/LC_MESSAGES/gnome-keyring.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-keyring.mo
+share/locale/sv/LC_MESSAGES/gnome-keyring.mo
+share/locale/ta/LC_MESSAGES/gnome-keyring.mo
+share/locale/te/LC_MESSAGES/gnome-keyring.mo
+share/locale/th/LC_MESSAGES/gnome-keyring.mo
+share/locale/tr/LC_MESSAGES/gnome-keyring.mo
+share/locale/uk/LC_MESSAGES/gnome-keyring.mo
+share/locale/vi/LC_MESSAGES/gnome-keyring.mo
+share/locale/xh/LC_MESSAGES/gnome-keyring.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
+@dirrm share/doc/gp11
+@dirrm %%DOCSDIR%%
+@dirrm share/doc/gcr
+@dirrm lib/gnome-keyring/standalone
+@dirrm lib/gnome-keyring/devel
+@dirrm lib/gnome-keyring
+@dirrm include/gp11
+@dirrm include/gnome-keyring-1
+@dirrm include/gcr
+@dirrm share/gcr/ui
+@dirrm share/gcr
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/mai/LC_MESSAGES
+@dirrmtry share/locale/mai
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/ast/LC_MESSAGES
+@dirrmtry share/locale/ast
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as