diff options
Diffstat (limited to 'security/gnome-keyring/files')
6 files changed, 33 insertions, 56 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 deleted file mode 100644 index ebc3f9680b4c..000000000000 --- a/security/gnome-keyring/files/patch-common_gkr-daemon-util.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 75016a356fcb..9aff6d9ebf19 100644 --- a/security/gnome-keyring/files/patch-configure +++ b/security/gnome-keyring/files/patch-configure @@ -1,24 +1,15 @@ ---- 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 - +--- configure.orig 2009-02-24 21:18:47.000000000 +0100 ++++ configure 2009-02-24 21:19:24.000000000 +0100 +@@ -18069,7 +18069,7 @@ + { echo "$as_me:$LINENO: checking build test tools, unit tests, and -Werror" >&5 + echo $ECHO_N "checking build test tools, unit tests, and -Werror... $ECHO_C" >&6; } -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 + #define WITH_TESTS 1 +@@ -18085,7 +18085,7 @@ tests_status="no" fi @@ -27,7 +18,7 @@ WITH_TESTS_TRUE= WITH_TESTS_FALSE='#' else -@@ -27029,7 +27029,7 @@ if test "${enable_coverage+set}" = set; +@@ -18100,7 +18100,7 @@ fi diff --git a/security/gnome-keyring/files/patch-egg_egg-asn1.h b/security/gnome-keyring/files/patch-egg_egg-asn1.h new file mode 100644 index 000000000000..a3d4296af2e4 --- /dev/null +++ b/security/gnome-keyring/files/patch-egg_egg-asn1.h @@ -0,0 +1,14 @@ +--- egg/egg-asn1.h.orig 2009-02-25 16:40:49.000000000 -0500 ++++ egg/egg-asn1.h 2009-02-25 16:41:21.000000000 -0500 +@@ -75,9 +75,9 @@ gchar* egg_asn1_read_dn + gchar* egg_asn1_read_dn_part (ASN1_TYPE asn, const gchar *part, const gchar *match); + + +-glong egg_asn1_time_parse_utc (const gchar* value); ++time_t egg_asn1_time_parse_utc (const gchar* value); + +-glong egg_asn1_time_parse_general (const gchar* value); ++time_t egg_asn1_time_parse_general (const gchar* value); + + + typedef void (*EggAsn1DnCallback) (guint index, GQuark oid, const guchar *value, 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 05a0306e6913..000000000000 --- a/security/gnome-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 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-module.c b/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c deleted file mode 100644 index 57d2f1888016..000000000000 --- a/security/gnome-keyring/files/patch-pkcs11_gkr-pkcs11-module.c +++ /dev/null @@ -1,10 +0,0 @@ ---- pkcs11/gkr-pkcs11-module.c.orig 2008-02-11 21:26:56.000000000 -0500 -+++ pkcs11/gkr-pkcs11-module.c 2008-02-11 21:27:08.000000000 -0500 -@@ -36,6 +36,7 @@ - #include <sys/socket.h> - #include <sys/un.h> - -+#include <string.h> - #include <stdlib.h> - #include <stdint.h> - #include <pthread.h> diff --git a/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in new file mode 100644 index 000000000000..32ffb1b09819 --- /dev/null +++ b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_Makefile.in @@ -0,0 +1,11 @@ +--- pkcs11/rpc-layer/Makefile.in.orig 2009-02-24 21:22:45.000000000 +0100 ++++ pkcs11/rpc-layer/Makefile.in 2009-02-24 21:22:52.000000000 +0100 +@@ -348,7 +348,7 @@ gck_rpc_daemon_standalone_SOURCES = \ + gck-rpc-daemon-standalone.c + + gck_rpc_daemon_standalone_LDADD = \ +- -ldl libgck-rpc-layer.la \ ++ libgck-rpc-layer.la \ + $(top_builddir)/common/libgkr-common.la + + all: all-am |