diff options
Diffstat (limited to 'security/gnome-keyring/files')
6 files changed, 53 insertions, 29 deletions
diff --git a/security/gnome-keyring/files/patch-configure b/security/gnome-keyring/files/patch-configure new file mode 100644 index 000000000000..7e8ec000a1bb --- /dev/null +++ b/security/gnome-keyring/files/patch-configure @@ -0,0 +1,22 @@ +--- configure.orig 2010-09-19 12:45:34.000000000 +0000 ++++ configure 2010-09-19 12:50:50.000000000 +0000 +@@ -14454,8 +14454,8 @@ + .SECONDARY: $(gsettings_SCHEMAS) + + gsettings__base_list = \ +- sed "$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g" | \ +- sed "$$!N;$$!N;$$!N;$$!N;s/\n/ /g" ++ sed '\''$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' | \ ++ sed '\''$$!N;$$!N;$$!N;$$!N;s/\n/ /g'\'' + + install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) + @$(NORMAL_INSTALL) +@@ -15058,7 +15058,7 @@ + + pam_status="no" + if test "$enable_pam" != "no"; then +- for ac_header in security/pam_modules.h pam/pam_modules.h ++ for ac_header in security/pam_modules.h + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` + ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" diff --git a/security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c b/security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c deleted file mode 100644 index 1c4cb9ae4a1b..000000000000 --- a/security/gnome-keyring/files/patch-daemon_prompt_gkd-prompt.c +++ /dev/null @@ -1,11 +0,0 @@ ---- daemon/prompt/gkd-prompt.c.orig 2009-12-21 19:17:13.000000000 -0500 -+++ daemon/prompt/gkd-prompt.c 2009-12-21 19:17:23.000000000 -0500 -@@ -21,6 +21,8 @@ - - #include "config.h" - -+#include <sys/wait.h> -+ - #include "gkd-prompt.h" - #include "gkd-prompt-marshal.h" - #include "gkd-prompt-util.h" diff --git a/security/gnome-keyring/files/patch-egg_egg-asn1x.c b/security/gnome-keyring/files/patch-egg_egg-asn1x.c new file mode 100644 index 000000000000..30828f3f61c8 --- /dev/null +++ b/security/gnome-keyring/files/patch-egg_egg-asn1x.c @@ -0,0 +1,13 @@ +--- egg/egg-asn1x.c.orig 2010-09-04 12:08:41.000000000 +0200 ++++ egg/egg-asn1x.c 2010-09-04 12:10:05.000000000 +0200 +@@ -1988,8 +1988,8 @@ anode_write_integer_ulong (gulong value, + guchar buf[sizeof (gulong)]; + gint bytes, i, off; + +- for (i = 0; i < sizeof (ulong); ++i) { +- off = sizeof (ulong) - (i + 1); ++ for (i = 0; i < sizeof (gulong); ++i) { ++ off = sizeof (gulong) - (i + 1); + buf[i] = (value >> (off * 8)) & 0xFF; + } + diff --git a/security/gnome-keyring/files/patch-gcr_gcr-certificate.c b/security/gnome-keyring/files/patch-gcr_gcr-certificate.c index 0c910a4c453a..bdf10bf14628 100644 --- a/security/gnome-keyring/files/patch-gcr_gcr-certificate.c +++ b/security/gnome-keyring/files/patch-gcr_gcr-certificate.c @@ -1,11 +1,11 @@ ---- gcr/gcr-certificate.c.orig 2009-12-16 23:36:19.000000000 -0500 -+++ gcr/gcr-certificate.c 2009-12-16 23:36:28.000000000 -0500 -@@ -156,7 +156,7 @@ calculate_key_size (GcrCertificateInfo * +--- gcr/gcr-certificate.c.orig 2010-09-04 12:04:30.000000000 +0200 ++++ gcr/gcr-certificate.c 2010-09-04 12:04:42.000000000 +0200 +@@ -158,7 +158,7 @@ calculate_key_size (GcrCertificateInfo * const guchar *data, *params; - gsize n_data, n_params, n_key; - guint key_size = 0; + gsize n_data, n_params; + guint key_size = 0, n_bits; - guchar *key; + guchar *key = NULL; GQuark oid; - - data = egg_asn1_read_element (info->asn1, info->der, info->n_der, "tbsCertificate.subjectPublicKeyInfo", &n_data); + + data = egg_asn1x_get_raw_element (egg_asn1x_node (info->asn1, "tbsCertificate", "subjectPublicKeyInfo", NULL), &n_data); diff --git a/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gck-rpc-dispatch.c b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gck-rpc-dispatch.c deleted file mode 100644 index 0fdeef6bc040..000000000000 --- a/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gck-rpc-dispatch.c +++ /dev/null @@ -1,11 +0,0 @@ ---- pkcs11/rpc-layer/gck-rpc-dispatch.c.orig 2009-12-16 23:37:26.000000000 -0500 -+++ pkcs11/rpc-layer/gck-rpc-dispatch.c 2009-12-16 23:38:10.000000000 -0500 -@@ -783,7 +783,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")); - diff --git a/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c new file mode 100644 index 000000000000..146d8b69da05 --- /dev/null +++ b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c @@ -0,0 +1,11 @@ +--- 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")); + |