diff options
Diffstat (limited to 'security/gnome-keyring/files')
6 files changed, 58 insertions, 42 deletions
diff --git a/security/gnome-keyring/files/patch-common_gkr-daemon-util.h b/security/gnome-keyring/files/patch-common_gkr-daemon-util.h new file mode 100644 index 000000000000..ebc3f9680b4c --- /dev/null +++ b/security/gnome-keyring/files/patch-common_gkr-daemon-util.h @@ -0,0 +1,11 @@ +--- common/gkr-daemon-util.h.orig 2008-08-04 13:36:06.000000000 -0400 ++++ common/gkr-daemon-util.h 2008-08-04 13:36:18.000000000 -0400 +@@ -26,6 +26,8 @@ + + G_BEGIN_DECLS + ++#include <sys/types.h> ++ + #include <glib.h> + #include <glib-object.h> + diff --git a/security/gnome-keyring/files/patch-configure b/security/gnome-keyring/files/patch-configure index 235656df1b7e..75016a356fcb 100644 --- a/security/gnome-keyring/files/patch-configure +++ b/security/gnome-keyring/files/patch-configure @@ -1,7 +1,25 @@ ---- configure.orig 2008-02-11 21:29:42.000000000 -0500 -+++ configure 2008-02-11 21:29:51.000000000 -0500 -@@ -23793,7 +23793,7 @@ else - tests_status="no" +--- configure.orig 2008-07-22 21:14:15.000000000 -0400 ++++ configure 2008-07-22 21:14:35.000000000 -0400 +@@ -25963,7 +25963,7 @@ fi + + dbus_status=$DBUS_VERSION + fi +- if test "$enable_dbus" == "yes"; then ++ if test "$enable_dbus" = "yes"; then + WITH_DBUS_TRUE= + WITH_DBUS_FALSE='#' + else +@@ -27001,7 +27001,7 @@ if test "${enable_tests+set}" = set; the + fi + + +-if test "$enable_tests" == "yes"; then ++if test "$enable_tests" = "yes"; then + echo "building tests and unit tests" + + cat >>confdefs.h <<_ACEOF +@@ -27014,7 +27014,7 @@ else + tests_status="no" fi - if test "$enable_tests" == "yes"; then @@ -9,12 +27,12 @@ WITH_TESTS_TRUE= WITH_TESTS_FALSE='#' else -@@ -25228,7 +25228,7 @@ fi +@@ -27029,7 +27029,7 @@ if test "${enable_coverage+set}" = set; + fi - dbus_status=$DBUS_VERSION + +-if test "$enable_coverage" == "yes"; then ++if test "$enable_coverage" = "yes"; then + CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage" + LDFLAGS="$LDFLAGS -fprofile-arcs -ftest-coverage" fi -- if test "$enable_dbus" == "yes"; then -+ if test "$enable_dbus" = "yes"; then - WITH_DBUS_TRUE= - WITH_DBUS_FALSE='#' - else diff --git a/security/gnome-keyring/files/patch-keyrings_gkr-keyrings.c b/security/gnome-keyring/files/patch-keyrings_gkr-keyrings.c deleted file mode 100644 index 185e929dd298..000000000000 --- a/security/gnome-keyring/files/patch-keyrings_gkr-keyrings.c +++ /dev/null @@ -1,10 +0,0 @@ ---- keyrings/gkr-keyrings.c.orig 2008-02-11 21:30:10.000000000 -0500 -+++ keyrings/gkr-keyrings.c 2008-02-11 21:30:19.000000000 -0500 -@@ -35,6 +35,7 @@ - #include <unistd.h> - #include <fcntl.h> - #include <errno.h> -+#include <string.h> - #include <stdlib.h> - #include <stdio.h> - #include <sys/types.h> diff --git a/security/gnome-keyring/files/patch-library_gnome-keyring.c b/security/gnome-keyring/files/patch-library_gnome-keyring.c deleted file mode 100644 index 625a65cc72c0..000000000000 --- a/security/gnome-keyring/files/patch-library_gnome-keyring.c +++ /dev/null @@ -1,11 +0,0 @@ ---- library/gnome-keyring.c.orig 2008-02-26 22:05:10.000000000 -0600 -+++ library/gnome-keyring.c 2008-02-26 22:05:30.000000000 -0600 -@@ -50,6 +50,8 @@ - #include <dbus/dbus.h> - #endif - -+extern char **environ; -+ - typedef enum { - CALLBACK_DONE, - CALLBACK_GET_STRING, 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 000000000000..05a0306e6913 --- /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-pkcs11_gkr-pkcs11-daemon.c b/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-daemon.c deleted file mode 100644 index 4bd5a923f4f4..000000000000 --- a/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-daemon.c +++ /dev/null @@ -1,10 +0,0 @@ ---- pkcs11/gkr-pkcs11-daemon.c.orig 2008-02-11 21:30:48.000000000 -0500 -+++ pkcs11/gkr-pkcs11-daemon.c 2008-02-11 21:30:58.000000000 -0500 -@@ -35,6 +35,7 @@ - #include <sys/types.h> - #include <sys/socket.h> - #include <sys/un.h> -+#include <string.h> - #include <errno.h> - #include <unistd.h> - |