summaryrefslogtreecommitdiffstats
path: root/security/gnome-keyring/files
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2007-08-27 11:49:59 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2007-08-27 11:49:59 +0800
commitb3eba9a56491117b971a5035cb773d4d88d85e0f (patch)
tree624574c27ffd908047e8f153fbbc9242fd4daeb2 /security/gnome-keyring/files
parentb1504db38c9a375e972f86d8522245adedb6c6eb (diff)
downloadmarcuscom-ports-b3eba9a56491117b971a5035cb773d4d88d85e0f.tar.gz
marcuscom-ports-b3eba9a56491117b971a5035cb773d4d88d85e0f.tar.zst
marcuscom-ports-b3eba9a56491117b971a5035cb773d4d88d85e0f.zip
Update to 2.19.91.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9452 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'security/gnome-keyring/files')
-rw-r--r--security/gnome-keyring/files/patch-common_gkr-secure-memory.c11
-rw-r--r--security/gnome-keyring/files/patch-pam_gkr-pam-client.c23
-rw-r--r--security/gnome-keyring/files/patch-pam_gkr-pam-module.c24
3 files changed, 0 insertions, 58 deletions
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
-
- /* -----------------------------------------------------------------------------