diff options
| author | sbd <sbd> | 2011-06-18 01:21:38 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2011-06-18 01:21:38 +0000 |
| commit | d5b7810d1f18a674f525763ae4d02e833f9e629c (patch) | |
| tree | 0ef419dffdf215130540780c7d6eb5123b5d4394 | |
| parent | c32f0ec59a19dcf39e0ae67b48c849c02d221564 (diff) | |
| download | pkgsrc-d5b7810d1f18a674f525763ae4d02e833f9e629c.tar.gz | |
Pullup ticket #3458 - requested by tez
sysutils/dbus security update
Revisions pulled up:
- sysutils/dbus/Makefile 1.52
- sysutils/dbus/distinfo 1.37
- sysutils/dbus/patches/patch-CVE-2011-2200 1.1
---
Module Name: pkgsrc
Committed By: tez
Date: Mon Jun 13 22:06:39 UTC 2011
Modified Files:
pkgsrc/sysutils/dbus: Makefile distinfo
Added Files:
pkgsrc/sysutils/dbus/patches: patch-CVE-2011-2200
Log Message:
Add patch for CVE-2011-2200 (SA44896) from
http://cgit.freedesktop.org/dbus/dbus/commit/?h=dbus-1.2&id=6519a1f77c61d753d4c97efd6e15630eb275336e
| -rw-r--r-- | sysutils/dbus/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/dbus/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/dbus/patches/patch-CVE-2011-2200 | 27 |
3 files changed, 31 insertions, 3 deletions
diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile index 57a5e479dae..5900ae8120a 100644 --- a/sysutils/dbus/Makefile +++ b/sysutils/dbus/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.50 2010/12/29 10:49:21 tron Exp $ +# $NetBSD: Makefile,v 1.50.4.1 2011/06/18 01:21:38 sbd Exp $ DISTNAME= dbus-1.2.4.6permissive PKGNAME= dbus-1.2.4.6 -PKGREVISION= 2 +PKGREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://dbus.freedesktop.org/releases/dbus/ diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo index b2f00c608f0..4309c1bb567 100644 --- a/sysutils/dbus/distinfo +++ b/sysutils/dbus/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.36 2010/12/29 10:49:21 tron Exp $ +$NetBSD: distinfo,v 1.36.4.1 2011/06/18 01:21:38 sbd Exp $ SHA1 (dbus-1.2.4.6permissive.tar.gz) = f71219624885fe2ec1990bb8bdd599e184dd5774 RMD160 (dbus-1.2.4.6permissive.tar.gz) = 05d1c5fae8ae763a9beb8c7d6f390f3ff54e9c30 @@ -7,6 +7,7 @@ SHA1 (patch-CVE-2010-4352-1) = bc83f7a2b56558b6514de8de2d6319ad84f84fce SHA1 (patch-CVE-2010-4352-2) = 1427c2c4aea6cd21f5d19aa8fad90b87282b232b SHA1 (patch-CVE-2010-4352-3) = d5598dab11bad66c2f586e418a8b409ac5fc67d5 SHA1 (patch-CVE-2010-4352-4) = 82a43bc19bf4ef73d6e2909dd1c948798585135d +SHA1 (patch-CVE-2011-2200) = 99e991dd51312fb7181f12c1c5d3b87897e417ac SHA1 (patch-aa) = fd7cc2e11e15e13885e882e8de51e17af8a63d70 SHA1 (patch-ab) = b2761914edfe2c7666c5412abf79c5d7b87a2006 SHA1 (patch-ac) = 63aab0ffac02a9cb85a80e31bbb1234534db378b diff --git a/sysutils/dbus/patches/patch-CVE-2011-2200 b/sysutils/dbus/patches/patch-CVE-2011-2200 new file mode 100644 index 00000000000..65bd7eed1b0 --- /dev/null +++ b/sysutils/dbus/patches/patch-CVE-2011-2200 @@ -0,0 +1,27 @@ +$NetBSD: patch-CVE-2011-2200,v 1.1.2.2 2011/06/18 01:21:38 sbd Exp $ + +Patch for CVE-2011-2200 from http://cgit.freedesktop.org/dbus/dbus/commit/?h=dbus-1.2&id=6519a1f77c61d753d4c97efd6e15630eb275336e + +--- dbus/dbus-marshal-header.c.orig 2011-06-13 16:48:26.166342800 -0500 ++++ dbus/dbus-marshal-header.c 2011-06-13 16:52:02.755479400 -0500 +@@ -1462,14 +1462,20 @@ + _dbus_header_byteswap (DBusHeader *header, + int new_order) + { ++ unsigned char byte_order; ++ + if (header->byte_order == new_order) + return; + ++ byte_order = _dbus_string_get_byte (&header->data, BYTE_ORDER_OFFSET); ++ _dbus_assert (header->byte_order == byte_order); ++ + _dbus_marshal_byteswap (&_dbus_header_signature_str, + 0, header->byte_order, + new_order, + &header->data, 0); + ++ _dbus_string_set_byte (&header->data, BYTE_ORDER_OFFSET, new_order); + header->byte_order = new_order; + } + |