Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- gnome-keyring-3.7.2/debian/changelog 2012-12-04 08:31:06.000000000 +1100
- +++ gnome-keyring-3.7.5/debian/changelog 2013-02-13 07:14:01.000000000 +1100
- @@ -1,3 +1,10 @@
- +gnome-keyring (3.7.5-0ubuntu1~raring1) raring; urgency=low
- +
- + * New upstream release
- + * debian/patches/kfreebsd.patch: refreshed
- +
- + -- Tim Lunn <tim@feathertop.org> Mon, 11 Feb 2013 07:18:44 +1100
- +
- gnome-keyring (3.7.2-0ubuntu1~raring1) raring; urgency=low
- * New upstream release
- --- gnome-keyring-3.7.2/debian/patches/03_kfreebsd.patch 2012-12-04 08:31:06.000000000 +1100
- +++ gnome-keyring-3.7.5/debian/patches/03_kfreebsd.patch 2013-02-13 07:12:49.000000000 +1100
- @@ -1,8 +1,6 @@
- -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 @@
- +--- a/egg/egg-unix-credentials.c
- ++++ b/egg/egg-unix-credentials.c
- +@@ -48,6 +48,10 @@
- #include <ucred.h>
- #endif
- @@ -13,7 +11,7 @@
- int
- egg_unix_credentials_read (int sock, pid_t *pid, uid_t *uid)
- {
- -@@ -45,7 +49,7 @@
- +@@ -56,7 +60,7 @@
- char buf;
- int ret;
- @@ -22,7 +20,7 @@
- /* Prefer CMSGCRED over LOCAL_CREDS because the former provides the
- * remote PID. */
- #if defined(HAVE_CMSGCRED)
- -@@ -73,7 +77,7 @@
- +@@ -84,7 +88,7 @@
- msg.msg_iov = &iov;
- msg.msg_iovlen = 1;
- @@ -31,7 +29,7 @@
- memset (&cmsg, 0, sizeof (cmsg));
- msg.msg_control = (caddr_t) &cmsg;
- msg.msg_controllen = CMSG_SPACE(sizeof *cred);
- -@@ -97,7 +101,7 @@
- +@@ -108,7 +112,7 @@
- return -1;
- }
- @@ -40,7 +38,7 @@
- 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");
- -@@ -121,6 +125,18 @@
- +@@ -132,6 +136,18 @@
- } else {
- fprintf (stderr, "failed to getsockopt() credentials, returned len %d/%d\n",
- cr_len, (int) sizeof (cr));
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement