Clean up after 2.32 got committed. Only gdm 2.32 isn't committed because of

focus issues. And it doesn't seem it getting any traction upstream.

Next stop GNOME 3.0.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14916 df743ca5-7f9a-e211-a948-0013205c9059

7 files changed, 0 insertions, 130 deletions

diff --git a/security/gnome-keyring/files/patch-configure b/security/gnome-keyring/files/patch-configure
deleted file mode 100644
index 7e8ec000a..000000000
--- 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 6cdb0ca6a..000000000
--- 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 30828f3f6..000000000
--- a/security/gnome-keyring/files/patch-egg_egg-asn1x.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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-egg_egg-unix-credentials.c b/security/gnome-keyring/files/patch-egg_egg-unix-credentials.c
deleted file mode 100644
index 5ae53f8b0..000000000
--- 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 bdf10bf14..000000000
--- 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-pam_gkr-pam-client.c b/security/gnome-keyring/files/patch-pam_gkr-pam-client.c
deleted file mode 100644
index 05a0306e6..000000000
--- 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_rpc-layer_gkm-rpc-dispatch.c b/security/gnome-keyring/files/patch-pkcs11_rpc-layer_gkm-rpc-dispatch.c
deleted file mode 100644
index 146d8b69d..000000000
--- 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"));
-