Update to 3.6.2.

Submitted by:	Gustau Perez


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

5 files changed, 6 insertions, 73 deletions

diff --git a/security/gnome-keyring3/Makefile b/security/gnome-keyring3/Makefile
index 59706bfa4..08d70e98b 100644
--- a/security/gnome-keyring3/Makefile
+++ b/security/gnome-keyring3/Makefile
@@ -1,10 +1,9 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/security/gnome-keyring3/Makefile 17268 2013-04-01 05:13:11Z marcus $
+#   $MCom$
 
 PORTNAME=	gnome-keyring
-PORTVERSION=	3.4.1
-PORTREVISION=	1
+PORTVERSION=	3.6.2
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -13,7 +12,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program that keeps passwords and other secrets
 
 BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
-		gcr>=3.4.1:${PORTSDIR}/security/gcr
+		gcr>=3.5.3:${PORTSDIR}/security/gcr
 LIB_DEPENDS=	gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
 		dbus-1:${PORTSDIR}/devel/dbus \
 		gcr:${PORTSDIR}/security/gcr \
@@ -41,8 +40,6 @@ GLIB_SCHEMAS=	org.gnome.crypto.cache.gschema.xml
 post-patch:
 	@${REINPLACE_CMD} -e 's|make --version|${GMAKE} --version|g' \
 		${WRKSRC}/configure
-	@${MV} ${WRKSRC}/pkcs11/rpc-layer/gnome-keyring-module.in \
-		${WRKSRC}/pkcs11/rpc-layer/gnome-keyring.module.in
 	@${REINPLACE_CMD} -e 's|gnome-keyring-module|gnome-keyring.module|g' \
 		${WRKSRC}/pkcs11/rpc-layer/Makefile.in \
 		${WRKSRC}/configure
diff --git a/security/gnome-keyring3/distinfo b/security/gnome-keyring3/distinfo
index 8bb47990c..c3a25a259 100644
--- a/security/gnome-keyring3/distinfo
+++ b/security/gnome-keyring3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-keyring-3.4.1.tar.xz) = 9e90267721198cbe6ebc08f6390d24901d9c0de39b180cd2ad1bbcdd7b30b249
-SIZE (gnome3/gnome-keyring-3.4.1.tar.xz) = 1107820
+SHA256 (gnome3/gnome-keyring-3.6.2.tar.xz) = ae60558d60171325ddd90603328393d35d7b560a70b7ab45c4d2718d01130cd6
+SIZE (gnome3/gnome-keyring-3.6.2.tar.xz) = 1139836
diff --git a/security/gnome-keyring3/files/patch-egg_egg-unix-credentials.c b/security/gnome-keyring3/files/patch-egg_egg-unix-credentials.c
deleted file mode 100644
index 5ae53f8b0..000000000
--- a/security/gnome-keyring3/files/patch-egg_egg-unix-credentials.c
+++ /dev/null
@@ -1,44 +0,0 @@
---- egg/egg-unix-credentials.c.orig	2010-01-13 00:21:23.000000000 -0500
-+++ egg/egg-unix-credentials.c	2010-01-13 00:25:46.000000000 -0500
-@@ -27,6 +27,7 @@
- 
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <sys/param.h>
- #include <sys/uio.h>
- #include <sys/un.h>
- #include <errno.h>
-@@ -37,6 +38,33 @@
- #include <ucred.h>
- #endif
- 
-+#if __FreeBSD_version < 701101
-+static char *
-+strndup (const char *s, size_t n)
-+{
-+	size_t nAvail;
-+	char *p;
-+
-+	if (s == NULL)
-+		return NULL;
-+
-+	if (memchr (s, '\0', n) != NULL) {
-+		nAvail = strlen(s);
-+		if (nAvail > n)
-+			nAvail = n;
-+	} else{
-+		nAvail = n;
-+	}
-+	p = malloc (nAvail + 1);
-+	if (p == NULL)
-+		return NULL;
-+	memcpy (p, s, nAvail);
-+	p[nAvail] = '\0';
-+
-+	return p;
-+}
-+#endif
-+
- int
- egg_unix_credentials_read (int sock, pid_t *pid, uid_t *uid)
- {
diff --git a/security/gnome-keyring3/files/patch-pam_gkr-pam-client.c b/security/gnome-keyring3/files/patch-pam_gkr-pam-client.c
deleted file mode 100644
index 05a0306e6..000000000
--- a/security/gnome-keyring3/files/patch-pam_gkr-pam-client.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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-keyring3/pkg-plist b/security/gnome-keyring3/pkg-plist
index c9d3ab686..41540e0aa 100644
--- a/security/gnome-keyring3/pkg-plist
+++ b/security/gnome-keyring3/pkg-plist
@@ -1,7 +1,6 @@
 bin/gnome-keyring
 bin/gnome-keyring-3
 bin/gnome-keyring-daemon
-etc/pkcs11/modules/gnome-keyring.module
 etc/xdg/autostart/gnome-keyring-gpg.desktop
 etc/xdg/autostart/gnome-keyring-pkcs11.desktop
 etc/xdg/autostart/gnome-keyring-secrets.desktop
@@ -114,6 +113,7 @@ 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
+share/p11-kit/modules/gnome-keyring.module
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -155,5 +155,3 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrmtry lib/pkcs11
 @dirrm lib/gnome-keyring/devel
 @dirrm lib/gnome-keyring
-@dirrmtry etc/pkcs11/modules
-@dirrmtry etc/pkcs11