7 files changed, 0 insertions, 172 deletions

diff --git a/security/gnome-keyring/files/patch-configure b/security/gnome-keyring/files/patch-configure
deleted file mode 100644
index 7e8ec000a1bb..000000000000
--- a/security/gnome-keyring/files/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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_control_gkd-control-client.c b/security/gnome-keyring/files/patch-daemon_control_gkd-control-client.c
deleted file mode 100644
index 6cdb0ca6a213..000000000000
--- a/security/gnome-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/gnome-keyring/files/patch-egg_egg-asn1x.c b/security/gnome-keyring/files/patch-egg_egg-asn1x.c
deleted file mode 100644
index e581016941f3..000000000000
--- a/security/gnome-keyring/files/patch-egg_egg-asn1x.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- egg/egg-asn1x.c.orig	2010-10-19 06:11:38.000000000 +0400
-+++ egg/egg-asn1x.c	2013-11-04 22:37:43.000000000 +0400
-@@ -1988,8 +1988,8 @@
- 	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;
- 	}
- 
-@@ -3746,7 +3746,7 @@
-  * TIME PARSING
-  */
- 
--glong
-+time_t
- egg_asn1x_parse_time_general (const gchar *time, gssize n_time)
- {
- 	gboolean ret;
-@@ -3777,7 +3777,7 @@
- 	return value;
- }
- 
--glong
-+time_t
- egg_asn1x_parse_time_utc (const gchar *time, gssize n_time)
- {
- 	gboolean ret;
diff --git a/security/gnome-keyring/files/patch-egg_egg-asn1x.h b/security/gnome-keyring/files/patch-egg_egg-asn1x.h
deleted file mode 100644
index dd0c4049f58d..000000000000
--- a/security/gnome-keyring/files/patch-egg_egg-asn1x.h
+++ /dev/null
@@ -1,42 +0,0 @@
---- egg/egg-asn1x.h.orig	2010-10-19 06:11:38.000000000 +0400
-+++ egg/egg-asn1x.h	2013-11-04 08:27:50.000000000 +0400
-@@ -25,6 +25,7 @@
- #define EGG_ASN1X_H_
- 
- #include <glib.h>
-+#include <libtasn1.h>
- 
- #ifndef HAVE_EGG_ALLOCATOR
- typedef void* (*EggAllocator) (void* p, gsize);
-@@ -33,15 +34,13 @@
- 
- typedef gboolean (*EggAsn1xEncoder) (gpointer data, guchar *buf, gsize n_buf);
- 
--struct static_struct_asn;
--
--GNode*              egg_asn1x_create                 (const struct static_struct_asn *defs,
-+GNode*              egg_asn1x_create                 (const ASN1_ARRAY_TYPE *defs,
-                                                       const gchar *type);
- 
--GNode*              egg_asn1x_create_quark           (const struct static_struct_asn *defs,
-+GNode*              egg_asn1x_create_quark           (const ASN1_ARRAY_TYPE *defs,
-                                                       GQuark type);
- 
--GNode*              egg_asn1x_create_and_decode      (const struct static_struct_asn *defs,
-+GNode*              egg_asn1x_create_and_decode      (const ASN1_ARRAY_TYPE *defs,
-                                                       const gchar *type,
-                                                       gconstpointer data,
-                                                       gsize n_data);
-@@ -167,10 +166,10 @@
- 
- void                egg_asn1x_destroy                (gpointer asn);
- 
--glong               egg_asn1x_parse_time_general     (const gchar *time,
-+time_t               egg_asn1x_parse_time_general     (const gchar *time,
-                                                       gssize n_time);
- 
--glong               egg_asn1x_parse_time_utc         (const gchar *time,
-+time_t               egg_asn1x_parse_time_utc         (const gchar *time,
-                                                       gssize n_time);
- 
- gssize              egg_asn1x_element_length         (gconstpointer data,
diff --git a/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c b/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c
deleted file mode 100644
index 5ae53f8b02cc..000000000000
--- a/security/gnome-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/gnome-keyring/files/patch-gcr_gcr-certificate.c b/security/gnome-keyring/files/patch-gcr_gcr-certificate.c
deleted file mode 100644
index bdf10bf14628..000000000000
--- a/security/gnome-keyring/files/patch-gcr_gcr-certificate.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
- 	guint key_size = 0, n_bits;
--	guchar *key;
-+	guchar *key = NULL;
- 	GQuark oid;
- 
- 	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_gkm-rpc-dispatch.c b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c
deleted file mode 100644
index 146d8b69da05..000000000000
--- a/security/gnome-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"));
-