diff options
| -rw-r--r-- | security/gnome-keyring/Makefile | 4 | ||||
| -rw-r--r-- | security/gnome-keyring/distinfo | 6 | ||||
| -rw-r--r-- | security/gnome-keyring/files/patch-common_gkr-secure-memory.c | 11 | ||||
| -rw-r--r-- | security/gnome-keyring/files/patch-pam_gkr-pam-client.c | 23 | ||||
| -rw-r--r-- | security/gnome-keyring/files/patch-pam_gkr-pam-module.c | 24 |
5 files changed, 5 insertions, 63 deletions
diff --git a/security/gnome-keyring/Makefile b/security/gnome-keyring/Makefile index 1310e5af4..eae46176c 100644 --- a/security/gnome-keyring/Makefile +++ b/security/gnome-keyring/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/security/gnome-keyring/Makefile,v 1.41 2007/07/31 04:51:03 marcus Exp $ +# $MCom: ports/security/gnome-keyring/Makefile,v 1.42 2007/08/12 20:46:50 marcus Exp $ # PORTNAME= gnome-keyring -PORTVERSION= 2.19.90 +PORTVERSION= 2.19.91 CATEGORIES= security gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/security/gnome-keyring/distinfo b/security/gnome-keyring/distinfo index c59677b22..d7bf4d785 100644 --- a/security/gnome-keyring/distinfo +++ b/security/gnome-keyring/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-keyring-2.19.90.tar.bz2) = 4a33ec4a99d0bafb791ca37740987e0a -SHA256 (gnome2/gnome-keyring-2.19.90.tar.bz2) = 28bfa335ffcc8d64f22e4d20832e646d28e9f6a96f6a2a1e7f62d34042c8ef1e -SIZE (gnome2/gnome-keyring-2.19.90.tar.bz2) = 539640 +MD5 (gnome2/gnome-keyring-2.19.91.tar.bz2) = 31859dc08b8034fe95a32d461904ce52 +SHA256 (gnome2/gnome-keyring-2.19.91.tar.bz2) = fd63bd8075b9842794beee18c08aed748efeed586629212ace99de4ad88bc422 +SIZE (gnome2/gnome-keyring-2.19.91.tar.bz2) = 558814 diff --git a/security/gnome-keyring/files/patch-common_gkr-secure-memory.c b/security/gnome-keyring/files/patch-common_gkr-secure-memory.c deleted file mode 100644 index 8b368a526..000000000 --- a/security/gnome-keyring/files/patch-common_gkr-secure-memory.c +++ /dev/null @@ -1,11 +0,0 @@ ---- common/gkr-secure-memory.c.orig Mon Jun 18 21:08:53 2007 -+++ common/gkr-secure-memory.c Mon Jun 18 21:09:11 2007 -@@ -409,7 +409,7 @@ get_locked_pages (unsigned long *sz) - lock_warning = 0; - return NULL; - #else -- pages = mmap (0, *sz, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); -+ pages = mmap (0, *sz, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0); - if (pages == MAP_FAILED) { - if (lock_warning) - fprintf (stderr, "couldn't map %lu bytes of private memory: %s\n", diff --git a/security/gnome-keyring/files/patch-pam_gkr-pam-client.c b/security/gnome-keyring/files/patch-pam_gkr-pam-client.c deleted file mode 100644 index d9300d7cd..000000000 --- a/security/gnome-keyring/files/patch-pam_gkr-pam-client.c +++ /dev/null @@ -1,23 +0,0 @@ ---- pam/gkr-pam-client.c.orig 2007-08-10 15:28:07.000000000 -0400 -+++ pam/gkr-pam-client.c 2007-08-15 19:37:52.000000000 -0400 -@@ -47,6 +47,11 @@ - #include <ucred.h> - #endif - -+#if defined(LOCAL_PEERCRED) -+#include <sys/param.h> -+#include <sys/ucred.h> -+#endif -+ - #define PAM_APP_NAME "Auto Login (PAM)" - #define PAM_APP_NAME_LEN (sizeof (PAM_APP_NAME) - 1) - -@@ -90,7 +95,7 @@ check_peer_same_uid (int sock) - socklen_t xuc_len = sizeof (xuc); - - if (getsockopt (sock, SOL_SOCKET, LOCAL_PEERCRED, &xuc, &xuc_len) == 0 && -- xuc_len == sizeof (xuc) { -+ xuc_len == sizeof (xuc)) { - uid = xuc.cr_uid; - } else { - syslog (GKR_LOG_ERR, "could not get gnome-keyring-daemon socket credentials, " diff --git a/security/gnome-keyring/files/patch-pam_gkr-pam-module.c b/security/gnome-keyring/files/patch-pam_gkr-pam-module.c deleted file mode 100644 index e4afbb8f8..000000000 --- a/security/gnome-keyring/files/patch-pam_gkr-pam-module.c +++ /dev/null @@ -1,24 +0,0 @@ ---- pam/gkr-pam-module.c.orig 2007-08-10 15:46:32.000000000 -0400 -+++ pam/gkr-pam-module.c 2007-08-14 01:19:49.000000000 -0400 -@@ -41,6 +41,8 @@ - #include <sys/stat.h> - #include <sys/wait.h> - -+#include <security/pam_appl.h> -+ - #include <assert.h> - #include <ctype.h> - #include <errno.h> -@@ -73,8 +75,10 @@ enum { - #define STDERR 2 - - /* Linux/BSD compatibility */ --#ifndef PAM_AUTHTOK_RECOVERY_ERR --#define PAM_AUTHTOK_RECOVERY_ERR PAM_AUTHTOK_RECOVER_ERR -+#ifndef PAM_AUTHTOK_RECOVER_ERR -+#ifdef PAM_AUTHTOK_RECOVERY_ERR -+#define PAM_AUTHTOK_RECOVER_ERR PAM_AUTHTOK_RECOVERY_ERR -+#endif - #endif - - /* ----------------------------------------------------------------------------- |