[Pkg-utopia-commits] r3166 - in /packages/unstable/dbus/debian: changelog patches/20_kbsd_cmsgcred.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Jul 15 23:56:21 2009
New Revision: 3166

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3166
Log:
* debian/patches/20_kbsd_cmsgcred.patch
  - Fix incorrect usage of cmsgcred on kFreeBSD. Thanks to Aurelien Jarno
    for the patch.

Added:
    packages/unstable/dbus/debian/patches/20_kbsd_cmsgcred.patch
Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/patches/series

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=3166&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Wed Jul 15 23:56:21 2009
@@ -2,8 +2,11 @@
 
   * Rebuild against debhelper (>= 7.2.23) that fixes a regression in
     dh_install which did not correctly strip debian/tmp. (Closes: #537125)
-
- -- Michael Biebl <biebl at debian.org>  Thu, 16 Jul 2009 01:33:18 +0200
+  * debian/patches/20_kbsd_cmsgcred.patch
+    - Fix incorrect usage of cmsgcred on kFreeBSD. Thanks to Aurelien Jarno
+      for the patch.
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 16 Jul 2009 01:43:46 +0200
 
 dbus (1.2.16-1) unstable; urgency=low
 

Added: packages/unstable/dbus/debian/patches/20_kbsd_cmsgcred.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/patches/20_kbsd_cmsgcred.patch?rev=3166&op=file
==============================================================================
--- packages/unstable/dbus/debian/patches/20_kbsd_cmsgcred.patch (added)
+++ packages/unstable/dbus/debian/patches/20_kbsd_cmsgcred.patch Wed Jul 15 23:56:21 2009
@@ -1,0 +1,13 @@
+diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
+index 2ae7909..4730c8e 100644
+--- a/dbus/dbus-sysdeps-unix.c
++++ b/dbus/dbus-sysdeps-unix.c
+@@ -1247,7 +1247,7 @@ _dbus_read_credentials_socket  (int              client_fd,
+ #elif defined(HAVE_CMSGCRED)
+     struct cmsgcred *cred;
+ 
+-    cred = (struct cmsgcred *) CMSG_DATA (&cmsg);
++    cred = (struct cmsgcred *) CMSG_DATA (&cmsg.hdr);
+     pid_read = cred->cmcred_pid;
+     uid_read = cred->cmcred_euid;
+ #elif defined(LOCAL_CREDS)

Modified: packages/unstable/dbus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/patches/series?rev=3166&op=diff
==============================================================================
--- packages/unstable/dbus/debian/patches/series (original)
+++ packages/unstable/dbus/debian/patches/series Wed Jul 15 23:56:21 2009
@@ -2,3 +2,4 @@
 01_no-fatal-warnings.patch
 02_dbus_monitor_no_sigint_handler.patch
 10_dbus-1.0.1-generate-xml-docs.patch
+20_kbsd_cmsgcred.patch