diff options
Diffstat (limited to 'security/mate-keyring/files')
5 files changed, 0 insertions, 95 deletions
diff --git a/security/mate-keyring/files/patch-configure.ac b/security/mate-keyring/files/patch-configure.ac deleted file mode 100644 index fcd5bab38705..000000000000 --- a/security/mate-keyring/files/patch-configure.ac +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.ac.orig 2013-03-24 01:28:30.000000000 -0500 -+++ configure.ac 2013-03-24 01:29:26.000000000 -0500 -@@ -284,7 +284,7 @@ - - pam_status="no" - if test "$enable_pam" != "no"; then -- AC_CHECK_HEADERS(security/pam_modules.h pam/pam_modules.h, [have_pam=yes; break], have_pam=no) -+ AC_CHECK_HEADERS(security/pam_modules.h, [have_pam=yes; break], have_pam=no) - if test "$enable_pam" = "yes" -a "$have_pam" = "no"; then - AC_MSG_ERROR(The PAM headers are missing) - elif test "$have_pam" = "yes"; then diff --git a/security/mate-keyring/files/patch-daemon_control_gkd-control-client.c b/security/mate-keyring/files/patch-daemon_control_gkd-control-client.c deleted file mode 100644 index 6cdb0ca6a213..000000000000 --- a/security/mate-keyring/files/patch-daemon_control_gkd-control-client.c +++ /dev/null @@ -1,11 +0,0 @@ ---- daemon/control/gkd-control-client.c.orig 2009-12-21 18:43:16.000000000 -0500 -+++ daemon/control/gkd-control-client.c 2009-12-21 18:44:17.000000000 -0500 -@@ -31,6 +31,8 @@ - #include <errno.h> - #include <fcntl.h> - -+#include <string.h> -+#include <sys/stat.h> - #include <sys/socket.h> - #include <sys/types.h> - #include <sys/un.h> diff --git a/security/mate-keyring/files/patch-egg_egg-unix-credentials.c b/security/mate-keyring/files/patch-egg_egg-unix-credentials.c deleted file mode 100644 index 5ae53f8b02cc..000000000000 --- a/security/mate-keyring/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/mate-keyring/files/patch-pam_gkr-pam-client.c b/security/mate-keyring/files/patch-pam_gkr-pam-client.c deleted file mode 100644 index c4c0ad88e944..000000000000 --- a/security/mate-keyring/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 mate-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/mate-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c b/security/mate-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c deleted file mode 100644 index 146d8b69da05..000000000000 --- a/security/mate-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c +++ /dev/null @@ -1,11 +0,0 @@ ---- pkcs11/rpc-layer/gkm-rpc-dispatch.c.orig 2010-09-04 12:06:44.000000000 +0200 -+++ pkcs11/rpc-layer/gkm-rpc-dispatch.c 2010-09-04 12:07:12.000000000 +0200 -@@ -784,7 +784,7 @@ rpc_C_Finalize (CallState *cs) - { - CK_SLOT_ID_PTR slots; - CK_ULONG n_slots, i; -- CK_RV ret; -+ CK_RV ret = CKR_OK; - - debug (("C_Finalize: enter")); - |