Bump to 0.9.22-r2 since we need one more patch for newer xcb-util (fixes segv+leaks). Remove -r1 since the first patch is not enough.

Package-Manager: portage-2.2.0_alpha31/cvs/Linux x86_64

4 files changed, 144 insertions, 9 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index e1539f52604b..252345abd591 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.222 2011/04/27 08:36:22 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.223 2011/05/13 04:57:57 ford_prefect Exp $
+
+*pulseaudio-0.9.22-r2 (13 May 2011)
+
+  13 May 2011; Arun Raghavan <ford_prefect@gentoo.org>
+  -pulseaudio-0.9.22-r1.ebuild, +pulseaudio-0.9.22-r2.ebuild,
+  +files/pulseaudio-0.9.22-xcb-atom-2.patch, pulseaudio-9999.ebuild:
+  Bump to 0.9.22-r2 since we need one more patch for newer xcb-util (fixes
+  segv+leaks). Remove -r1 since the first patch is not enough.
 
   27 Apr 2011; Christoph Mende <angelos@gentoo.org> pulseaudio-0.9.22.ebuild:
   Restrict xcb-util dep to <0.3.8
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index beb33fe2c2cc..6d3821e88761 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX pulseaudio-0.9.21-armv5-build-fix.patch 3387 RMD160 a3c3d2cd97478fc7ee53eb9aa6054d7c09271ec4 SHA1 1a3747c5e24c2cc26e43348a12627725b5d6242f SHA256 4734ffb3b038194911627c20959f75609da76e8e071da0833a794f264c243000
+AUX pulseaudio-0.9.22-xcb-atom-2.patch 4381 RMD160 9f46c2d75c7c89f23919ef890829af4533166304 SHA1 c427582c9724b034c0e72f76685e32e44f281868 SHA256 7c256858654529302ec242dadf2a6123da7077154fe31adc26ca96f8824becd4
 AUX pulseaudio-0.9.22-xcb-atom.patch 3026 RMD160 3b88da261896e393294e6d11ebdc0986fb7cedde SHA1 23ea548e6a3853c1052c8e4516d396132cfb7221 SHA256 b7c528c3f20743d4337878138b0d0f12073a50b4d435c72812d06c472ebb1104
 AUX pulseaudio.conf.d 275 RMD160 6317cb5be41a768428056c0057d8f5b1f189e804 SHA1 22ed7f1de0f2a18a608c5e9a91635ee66addac4d SHA256 c03661e8cc902d27ff6b52f291207f2b008957571b942abdd92a873a52aae0dd
 AUX pulseaudio.init.d-4 2493 RMD160 9f6b2f487298a5576b60b53095ee697095b88c89 SHA1 80f0e5e621d9312a7b24129fe843dd7ce085756d SHA256 dc8caa43aa297d2ca4019eef5b3cb64b3a57741e611620490f8d79091790f363
 AUX pulseaudio.init.d-5 2352 RMD160 36a3732386617f5436a60d0d9248a69da9804c5d SHA1 4b2fa2f0437b78b0a7fd5a54e8a83b02c99af579 SHA256 60e4571a8af0437bd99cfd858fde1e6223544a60e591febf25e55e4a2918ff59
 DIST pulseaudio-0.9.22.tar.gz 2076785 RMD160 31199c497f7b1cce2285a6369d43fc1f66cd41a4 SHA1 f5fc14d7a62ae9f9ee9745026e3f13f4c130140a SHA256 c6019324395117a258c048a6db5e9734551cc2c61dc35b46403ff00d64be55f0
-EBUILD pulseaudio-0.9.22-r1.ebuild 6698 RMD160 8bb68295d1320af1c64f985d360dba7a8223d97b SHA1 aa30391c1b5ae902e0e3d5d0a339bfd0e4cdf83e SHA256 7231dcac0678c04c2727a9d17b7273c60949e9a7b96e4a833ac72363b4f69830
+EBUILD pulseaudio-0.9.22-r2.ebuild 6784 RMD160 bfeabd92e5e3f53c9d38afc5a70c07b5b43d1c89 SHA1 0f7626cb16402da43672da35145ae519e4623541 SHA256 e97aeb1fc6a910ca4145e20f2d7f3f6f9c1d192c06df283fda126b90df285a2e
 EBUILD pulseaudio-0.9.22.ebuild 6642 RMD160 8d2e71646e6692914a848bd238734141a91208f3 SHA1 940c01232332ab413cca6ac9b0648231ce68bb46 SHA256 7b9192cd195040aefc82ef0d2c53d173b81a478f362a550254a992c28755ba9b
 EBUILD pulseaudio-9999.ebuild 6500 RMD160 cb03241428dc5a1c9c22db3e50e051070fc45888 SHA1 5a4d603cd9ce8017b883ff4fefe745fcfa34697c SHA256 a7a88a84999d111e5c0b0801250191ea5cadc1e738a5b98dfc28fca9fed30bc2
-MISC ChangeLog 43074 RMD160 2cf1b401a79f8a7900f9db134f5fca8261ae3dbc SHA1 1f99e757858d1c8b644dc530ed89256e760f4444 SHA256 4f21d5698bf997aed2e79602fc75fbe9514ad3793dabb5c33289f18f98f26536
-MISC ChangeLog.orig 553 RMD160 43e528d0d69831c4f3816e1d24dc1ca19bb2eba7 SHA1 385e6240b3a400aa3902339334fb00d660fa9b92 SHA256 c70f69330aaf37cab38c333dc71600af9329434f62651cffec9e1ba7f37db673
+MISC ChangeLog 43441 RMD160 048b85e7df1b3b167cdf19e5ff899c1e20a89122 SHA1 7f836101f1a4729b8aff86bb8eed58710f7eedc8 SHA256 32a8f6c7a1ad7ac13843126b0abf176f65935a978f06bcb66987e20f711fd683
 MISC metadata.xml 2225 RMD160 270fc66edbe5134853cc06c1feaca8d94a8c50fd SHA1 1c8edb3e83bb3791d860e3b007e7dab37bdf3459 SHA256 57429e87e6e2902c0a81aa480f603ffa894234434c03da1ffef89d52493d848b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk231YAACgkQmWq1bYTyC0MCDQEAwLyPE+XiY1HV5+PAGQEFVMco
-UWtdacJjcBvEncm4gssA/332/9p3Gn+iKZra6X3KQUgn/cHxfEB6sNs0TDYutF1t
-=4pMI
+iEYEARECAAYFAk3MumsACgkQ+Vqt1inD4uwg9ACcDPb+Yaeu3JfWjcBxguF2CQJy
+FXMAnRzdGfs2oYoId5/EDXgo+oxMvBFM
+=suYy
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.22-xcb-atom-2.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.22-xcb-atom-2.patch
new file mode 100644
index 000000000000..8e9dc8db3b1e
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-0.9.22-xcb-atom-2.patch
@@ -0,0 +1,124 @@
+From b72fc9b4f158bafb66a7de28ce038986d96ce850 Mon Sep 17 00:00:00 2001
+From: Arnaud Fontaine <arnau@debian.org>
+Date: Tue, 29 Mar 2011 22:56:28 +0159
+Subject: [PATCH] x11: More XCB fixes.
+
+Commit 65ef80b fixed building with xcb-util >= 0.3.8, but the reply is never
+checked (possible SIGSEGV if the reply is NULL) nor freed (memory leak at each
+call of the functions).
+
+Also, remove include and dependencies on xcb-atom, as it was only meaningful
+for xcb_atom_get() and STRING, and depend instead on xcb >= 1.6 for
+XCB_ATOM_STRING.
+---
+ configure.ac            |    2 +-
+ src/pulsecore/x11prop.c |   38 +++++++++++++++++++++++++-------------
+ 2 files changed, 26 insertions(+), 14 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 299dd49..ed9bd17 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -547,7 +547,7 @@ AC_ARG_ENABLE([x11],
+         [x11=auto])
+ 
+ if test "x${x11}" != xno ; then
+-    PKG_CHECK_MODULES(X11, [ x11-xcb ice sm xtst xcb-atom ],
++    PKG_CHECK_MODULES(X11, [ x11-xcb xcb >= 1.6 ice sm xtst ],
+         HAVE_X11=1,
+         [
+             HAVE_X11=0
+diff --git a/src/pulsecore/x11prop.c b/src/pulsecore/x11prop.c
+index d66c48f..8fca219 100644
+--- a/src/pulsecore/x11prop.c
++++ b/src/pulsecore/x11prop.c
+@@ -30,7 +30,6 @@
+ #include <pulsecore/macro.h>
+ 
+ #include <xcb/xproto.h>
+-#include <xcb/xcb_atom.h>
+ 
+ #define PA_XCB_FORMAT 8
+ 
+@@ -50,7 +49,6 @@ static xcb_screen_t *screen_of_display(xcb_connection_t *xcb, int screen)
+ 
+ void pa_x11_set_prop(xcb_connection_t *xcb, int screen, const char *name, const char *data) {
+     xcb_screen_t *xs;
+-    xcb_intern_atom_cookie_t cookie;
+     xcb_intern_atom_reply_t *reply;
+ 
+     pa_assert(xcb);
+@@ -58,26 +56,36 @@ void pa_x11_set_prop(xcb_connection_t *xcb, int screen, const char *name, const
+     pa_assert(data);
+ 
+     if ((xs = screen_of_display(xcb, screen))) {
+-        cookie = xcb_intern_atom(xcb, 0, strlen(name), name);
+-        reply = xcb_intern_atom_reply(xcb, cookie, NULL);
++        reply = xcb_intern_atom_reply(xcb,
++                                      xcb_intern_atom(xcb, 0, strlen(name), name),
++                                      NULL);
+ 
+-        xcb_change_property(xcb, XCB_PROP_MODE_REPLACE, xs->root, reply->atom, XCB_ATOM_STRING, PA_XCB_FORMAT, (int) strlen(data), (const void*) data);
++        if (reply) {
++            xcb_change_property(xcb, XCB_PROP_MODE_REPLACE, xs->root, reply->atom,
++                                XCB_ATOM_STRING, PA_XCB_FORMAT,
++                                (int) strlen(data), (const void*) data);
++
++            free(reply);
++        }
+     }
+ }
+ 
+ void pa_x11_del_prop(xcb_connection_t *xcb, int screen, const char *name) {
+     xcb_screen_t *xs;
+-    xcb_intern_atom_cookie_t cookie;
+     xcb_intern_atom_reply_t *reply;
+ 
+     pa_assert(xcb);
+     pa_assert(name);
+ 
+     if ((xs = screen_of_display(xcb, screen))) {
+-        cookie = xcb_intern_atom(xcb, 0, strlen(name), name);
+-        reply = xcb_intern_atom_reply(xcb, cookie, NULL);
+-
+-        xcb_delete_property(xcb, xs->root, reply->atom);
++        reply = xcb_intern_atom_reply(xcb,
++                                      xcb_intern_atom(xcb, 0, strlen(name), name),
++                                      NULL);
++
++        if (reply) {
++            xcb_delete_property(xcb, xs->root, reply->atom);
++            free(reply);
++        }
+     }
+ }
+ 
+@@ -87,7 +95,6 @@ char* pa_x11_get_prop(xcb_connection_t *xcb, int screen, const char *name, char
+     xcb_get_property_cookie_t req;
+     xcb_get_property_reply_t* prop = NULL;
+     xcb_screen_t *xs;
+-    xcb_intern_atom_cookie_t cookie;
+     xcb_intern_atom_reply_t *reply;
+ 
+     pa_assert(xcb);
+@@ -106,10 +113,15 @@ char* pa_x11_get_prop(xcb_connection_t *xcb, int screen, const char *name, char
+         xs = screen_of_display(xcb, 0);
+ 
+     if (xs) {
+-        cookie = xcb_intern_atom(xcb, 0, strlen(name), name);
+-        reply = xcb_intern_atom_reply(xcb, cookie, NULL);
++        reply = xcb_intern_atom_reply(xcb,
++                                      xcb_intern_atom(xcb, 0, strlen(name), name),
++                                      NULL);
++
++        if (!reply)
++            goto finish;
+ 
+         req = xcb_get_property(xcb, 0, xs->root, reply->atom, XCB_ATOM_STRING, 0, (uint32_t)(l-1));
++        free(reply);
+         prop = xcb_get_property_reply(xcb, req, NULL);
+ 
+         if (!prop)
+-- 
+1.6.3.3
+
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.22-r1.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.22-r2.ebuild
index a0793cb12e7e..f63d7ffed9a4 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.22-r1.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.22-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22-r1.ebuild,v 1.1 2011/04/27 07:18:47 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.22-r2.ebuild,v 1.1 2011/05/13 04:57:57 ford_prefect Exp $
 
 EAPI=3
 
@@ -19,6 +19,7 @@ IUSE="+alsa avahi +caps jack lirc oss tcpd +X dbus libsamplerate gnome bluetooth
 RDEPEND="app-admin/eselect-esd
 	X? (
 		|| ( >=x11-libs/libX11-1.4.0 <x11-libs/libX11-1.4.0[xcb] )
+		>=x11-libs/libxcb-1.6
 		>=x11-libs/xcb-util-0.3.1
 		x11-libs/libSM
 		x11-libs/libICE
@@ -83,6 +84,8 @@ src_prepare() {
 	fi
 
 	epatch "${FILESDIR}"/${P}-xcb-atom.patch
+	epatch "${FILESDIR}"/${P}-xcb-atom-2.patch
+	eautoreconf
 
 	elibtoolize
 }