r29859 - in /desktop/unstable/gnome-keyring/debian/patches: 03_kfreebsd.patch 99_ltmain_as-needed.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Sep 29 15:28:56 2011
New Revision: 29859

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29859
Log:
Unfuzz patches

Modified:
    desktop/unstable/gnome-keyring/debian/patches/03_kfreebsd.patch
    desktop/unstable/gnome-keyring/debian/patches/99_ltmain_as-needed.patch

Modified: desktop/unstable/gnome-keyring/debian/patches/03_kfreebsd.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/03_kfreebsd.patch?rev=29859&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/03_kfreebsd.patch [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/03_kfreebsd.patch [utf-8] Thu Sep 29 15:28:56 2011
@@ -1,5 +1,7 @@
---- gnome-keyring-2.28.1-orig/egg/egg-unix-credentials.c	2009-10-18 01:27:22.000000000 +0200
-+++ gnome-keyring-2.28.1/egg/egg-unix-credentials.c	2009-12-07 01:13:17.000000000 +0100
+Index: gnome-keyring-3.2.0/egg/egg-unix-credentials.c
+===================================================================
+--- gnome-keyring-3.2.0.orig/egg/egg-unix-credentials.c	2011-09-15 10:57:03.000000000 +0200
++++ gnome-keyring-3.2.0/egg/egg-unix-credentials.c	2011-09-29 17:13:54.211741623 +0200
 @@ -37,6 +37,10 @@
  #include <ucred.h>
  #endif
@@ -38,10 +40,12 @@
  	if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof *cred) ||
  	    cmsg.hdr.cmsg_type != SCM_CREDS) {
  		fprintf (stderr, "message from recvmsg() was not SCM_CREDS\n");
-@@ -119,6 +123,18 @@
+@@ -121,6 +125,18 @@
+ 		} else {
+ 			fprintf (stderr, "failed to getsockopt() credentials, returned len %d/%d\n",
  				     cr_len, (int) sizeof (cr));
- 			return -1;
- 		}
++			return -1;
++		}
 +#elif defined(LOCAL_PEERCRED) /* GNU/kFreeBSD */
 +		struct xucred cr;
 +		socklen_t cr_len = sizeof(cr);
@@ -52,8 +56,6 @@
 +		} else {
 +			fprintf (stderr, "failed to getsockopt() credentials, returned len %d/%d\n",
 +				     cr_len, (int) sizeof (cr));
-+			return -1;
-+		}
+ 			return -1;
+ 		}
  #elif defined(HAVE_CMSGCRED)
- 		cred = (struct cmsgcred *) CMSG_DATA (&cmsg.hdr);
- 		*pid = cred->cmcred_pid;

Modified: desktop/unstable/gnome-keyring/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-keyring/debian/patches/99_ltmain_as-needed.patch?rev=29859&op=diff
==============================================================================
--- desktop/unstable/gnome-keyring/debian/patches/99_ltmain_as-needed.patch [utf-8] (original)
+++ desktop/unstable/gnome-keyring/debian/patches/99_ltmain_as-needed.patch [utf-8] Thu Sep 29 15:28:56 2011
@@ -1,8 +1,8 @@
-Index: b/ltmain.sh
+Index: gnome-keyring-3.2.0/ltmain.sh
 ===================================================================
---- a/ltmain.sh	2010-06-21 00:44:16.000000000 +0200
-+++ b/ltmain.sh	2010-07-20 04:05:47.745473196 +0200
-@@ -4716,6 +4716,11 @@
+--- gnome-keyring-3.2.0.orig/ltmain.sh	2011-09-26 07:25:09.000000000 +0200
++++ gnome-keyring-3.2.0/ltmain.sh	2011-09-29 17:13:59.099680173 +0200
+@@ -5787,6 +5787,11 @@
  	arg=$func_stripname_result
  	;;
  
@@ -14,7 +14,7 @@
        -Wl,*)
  	func_stripname '-Wl,' '' "$arg"
  	args=$func_stripname_result
-@@ -5070,6 +5075,15 @@
+@@ -6147,6 +6152,15 @@
  	lib=
  	found=no
  	case $deplib in