Advertisement
darkxst

gnome-keyring 3.7.5

Feb 12th, 2013
59
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.08 KB | None | 0 0
  1. --- gnome-keyring-3.7.2/debian/changelog    2012-12-04 08:31:06.000000000 +1100
  2. +++ gnome-keyring-3.7.5/debian/changelog    2013-02-13 07:14:01.000000000 +1100
  3. @@ -1,3 +1,10 @@
  4. +gnome-keyring (3.7.5-0ubuntu1~raring1) raring; urgency=low
  5. +
  6. +  * New upstream release
  7. +  * debian/patches/kfreebsd.patch: refreshed
  8. +
  9. + -- Tim Lunn <tim@feathertop.org>  Mon, 11 Feb 2013 07:18:44 +1100
  10. +
  11.  gnome-keyring (3.7.2-0ubuntu1~raring1) raring; urgency=low
  12.  
  13.    * New upstream release
  14. --- gnome-keyring-3.7.2/debian/patches/03_kfreebsd.patch    2012-12-04 08:31:06.000000000 +1100
  15. +++ gnome-keyring-3.7.5/debian/patches/03_kfreebsd.patch    2013-02-13 07:12:49.000000000 +1100
  16. @@ -1,8 +1,6 @@
  17. -Index: gnome-keyring-3.2.0/egg/egg-unix-credentials.c
  18. -===================================================================
  19. ---- gnome-keyring-3.2.0.orig/egg/egg-unix-credentials.c    2011-09-15 10:57:03.000000000 +0200
  20. -+++ gnome-keyring-3.2.0/egg/egg-unix-credentials.c 2011-09-29 17:13:54.211741623 +0200
  21. -@@ -37,6 +37,10 @@
  22. +--- a/egg/egg-unix-credentials.c
  23. ++++ b/egg/egg-unix-credentials.c
  24. +@@ -48,6 +48,10 @@
  25.   #include <ucred.h>
  26.   #endif
  27.  
  28. @@ -13,7 +11,7 @@
  29.   int
  30.   egg_unix_credentials_read (int sock, pid_t *pid, uid_t *uid)
  31.   {
  32. -@@ -45,7 +49,7 @@
  33. +@@ -56,7 +60,7 @@
  34.     char buf;
  35.     int ret;
  36.    
  37. @@ -22,7 +20,7 @@
  38.     /* Prefer CMSGCRED over LOCAL_CREDS because the former provides the
  39.      * remote PID. */
  40.   #if defined(HAVE_CMSGCRED)
  41. -@@ -73,7 +77,7 @@
  42. +@@ -84,7 +88,7 @@
  43.     msg.msg_iov = &iov;
  44.     msg.msg_iovlen = 1;
  45.    
  46. @@ -31,7 +29,7 @@
  47.     memset (&cmsg, 0, sizeof (cmsg));
  48.     msg.msg_control = (caddr_t) &cmsg;
  49.     msg.msg_controllen = CMSG_SPACE(sizeof *cred);
  50. -@@ -97,7 +101,7 @@
  51. +@@ -108,7 +112,7 @@
  52.         return -1;
  53.     }
  54.  
  55. @@ -40,7 +38,7 @@
  56.     if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof *cred) ||
  57.         cmsg.hdr.cmsg_type != SCM_CREDS) {
  58.         fprintf (stderr, "message from recvmsg() was not SCM_CREDS\n");
  59. -@@ -121,6 +125,18 @@
  60. +@@ -132,6 +136,18 @@
  61.         } else {
  62.             fprintf (stderr, "failed to getsockopt() credentials, returned len %d/%d\n",
  63.                      cr_len, (int) sizeof (cr));
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement