Add patch from upstream to fix using capabilities.

Package-Manager: portage-2.1.1_pre4

5 files changed, 163 insertions, 8 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index ae7f502b6ed2..91a7446aba11 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/pulseaudio
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.19 2006/07/29 15:34:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.20 2006/07/30 13:45:08 flameeyes Exp $
+
+*pulseaudio-0.9.4-r1 (30 Jul 2006)
+
+  30 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/pulseaudio-0.9.4-r1170.patch, +pulseaudio-0.9.4-r1.ebuild:
+  Add patch from upstream to fix using capabilities.
 
   29 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   files/pulseaudio.init.d-2, files/pulseaudio.conf.d,
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index 30215cabc089..98bd9f888be6 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -5,6 +5,10 @@ AUX pulseaudio-0.9.2-esdcompat.patch 1047 RMD160 6fe3a3dfaa8fcbb85f6d765c703a0b6
 MD5 9a380dd5a93494a7c1df3ac2f40a6452 files/pulseaudio-0.9.2-esdcompat.patch 1047
 RMD160 6fe3a3dfaa8fcbb85f6d765c703a0b67fa4036b8 files/pulseaudio-0.9.2-esdcompat.patch 1047
 SHA256 1b96565a6a7bbe185cbd21452470e9b8a1b8e256be994abf58791a986df60172 files/pulseaudio-0.9.2-esdcompat.patch 1047
+AUX pulseaudio-0.9.4-r1170.patch 542 RMD160 29f8969ba3fe5abd27fd5c52bf2acd4179af92d2 SHA1 6f929408a807256c3644be5e5b6f60145ccdab63 SHA256 275a5ec4bed49585d76e7cd64288caae57dbe61d6ade4c27ebbe87f82b7f4281
+MD5 cd0b71d4a1b1358807a1ccd83e15e0d6 files/pulseaudio-0.9.4-r1170.patch 542
+RMD160 29f8969ba3fe5abd27fd5c52bf2acd4179af92d2 files/pulseaudio-0.9.4-r1170.patch 542
+SHA256 275a5ec4bed49585d76e7cd64288caae57dbe61d6ade4c27ebbe87f82b7f4281 files/pulseaudio-0.9.4-r1170.patch 542
 AUX pulseaudio.conf.d 275 RMD160 6317cb5be41a768428056c0057d8f5b1f189e804 SHA1 22ed7f1de0f2a18a608c5e9a91635ee66addac4d SHA256 c03661e8cc902d27ff6b52f291207f2b008957571b942abdd92a873a52aae0dd
 MD5 bf7487ba2c48fc8a56bca41c97a18934 files/pulseaudio.conf.d 275
 RMD160 6317cb5be41a768428056c0057d8f5b1f189e804 files/pulseaudio.conf.d 275
@@ -14,14 +18,18 @@ MD5 13ba9b43823aef4b2ad4fdc137bfc7a4 files/pulseaudio.init.d-2 581
 RMD160 6990a5d0104622e4d9385c74932807bde493e987 files/pulseaudio.init.d-2 581
 SHA256 6febaaaa4b158ea3c9523d0382bee34f65e9c8a95ada0d47e477839df2c55264 files/pulseaudio.init.d-2 581
 DIST pulseaudio-0.9.4.tar.gz 1111744 RMD160 5a5f270ed9e2ec5ebc89e9592eb19cc6d8450e8b SHA1 d40fc9ea0dd7c32823635059515bbe92acc0401c SHA256 2e3f7e7d7177a6383acbe624bdb29d110459ac3c9d4a5ef07531836507a519fd
+EBUILD pulseaudio-0.9.4-r1.ebuild 3309 RMD160 0fc400e101a8e34581791ddfb8cb7d54990bce1f SHA1 10dcc74ca10b96845fbcdd7e34510fea417f9fa0 SHA256 bdd8a7fb65918bce3d7c33f0bff8a99a7add95002e8cfa328409bb3725bd6b55
+MD5 4fe03df44feed9caedccd23576e2ecfa pulseaudio-0.9.4-r1.ebuild 3309
+RMD160 0fc400e101a8e34581791ddfb8cb7d54990bce1f pulseaudio-0.9.4-r1.ebuild 3309
+SHA256 bdd8a7fb65918bce3d7c33f0bff8a99a7add95002e8cfa328409bb3725bd6b55 pulseaudio-0.9.4-r1.ebuild 3309
 EBUILD pulseaudio-0.9.4.ebuild 3242 RMD160 92ccf180a8b312950a52fb9f80bf4a2af1d45de1 SHA1 5452648ec0cf37e12f81e695f15d380ccacb0ff4 SHA256 cb221991422da7397dd8864e2640ca9e04b58ea484f079aa67bc0d506c44eb6d
 MD5 08f266239b6eaf7ccecebfabebe1a92a pulseaudio-0.9.4.ebuild 3242
 RMD160 92ccf180a8b312950a52fb9f80bf4a2af1d45de1 pulseaudio-0.9.4.ebuild 3242
 SHA256 cb221991422da7397dd8864e2640ca9e04b58ea484f079aa67bc0d506c44eb6d pulseaudio-0.9.4.ebuild 3242
-MISC ChangeLog 4168 RMD160 5d104468ce5a57506bd117244d502cd0c51aa23d SHA1 4b7cb0c988aad4bc9f8af4af66796a7ce882402e SHA256 314212b876177b6bff12481f56e118221465918f2ccef8ca1605185015080bf5
-MD5 10f228882e015012a050f0a69e8d94b2 ChangeLog 4168
-RMD160 5d104468ce5a57506bd117244d502cd0c51aa23d ChangeLog 4168
-SHA256 314212b876177b6bff12481f56e118221465918f2ccef8ca1605185015080bf5 ChangeLog 4168
+MISC ChangeLog 4379 RMD160 3a3bd4d5ccc24185df4f62c7284e8620c4ed491a SHA1 ba930dd78abdb5910df1d483e21d68a92fa1726c SHA256 8f384cca09e173b72f8b174c478f2c0101d2bb63b2bac12631f7bc63a38c72d7
+MD5 36d47eaebc35bcff5cd6830896be41f9 ChangeLog 4379
+RMD160 3a3bd4d5ccc24185df4f62c7284e8620c4ed491a ChangeLog 4379
+SHA256 8f384cca09e173b72f8b174c478f2c0101d2bb63b2bac12631f7bc63a38c72d7 ChangeLog 4379
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -29,10 +37,13 @@ SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata
 MD5 afeb92e5b3d14e829e730d37ab72006c files/digest-pulseaudio-0.9.4 253
 RMD160 2241eb6958b54525d99b1a38ea30dace97aeb8a0 files/digest-pulseaudio-0.9.4 253
 SHA256 66f3b356b175d77ac6b4e26f8696c126a4f1bb8eb61d150876f768c963c079ef files/digest-pulseaudio-0.9.4 253
+MD5 afeb92e5b3d14e829e730d37ab72006c files/digest-pulseaudio-0.9.4-r1 253
+RMD160 2241eb6958b54525d99b1a38ea30dace97aeb8a0 files/digest-pulseaudio-0.9.4-r1 253
+SHA256 66f3b356b175d77ac6b4e26f8696c126a4f1bb8eb61d150876f768c963c079ef files/digest-pulseaudio-0.9.4-r1 253
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEy4AIAiZjviIA2XgRAq+9AKDCpLpwEJlEnEcxKc6fhE2urJMUVwCg4Oat
-pdhHcO9ZkGVmuzxOQzy07/Y=
-=PC21
+iD8DBQFEzLfxAiZjviIA2XgRAozoAKCK+mmjCo/scgY7zTVoiukLZtUZsACgx49P
+xMSSu89UPluM2OOmuY4hNg4=
+=hpOX
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/digest-pulseaudio-0.9.4-r1 b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.4-r1
new file mode 100644
index 000000000000..2a357881d328
--- /dev/null
+++ b/media-sound/pulseaudio/files/digest-pulseaudio-0.9.4-r1
@@ -0,0 +1,3 @@
+MD5 aadbbc68306653f9052872c11e0cc707 pulseaudio-0.9.4.tar.gz 1111744
+RMD160 5a5f270ed9e2ec5ebc89e9592eb19cc6d8450e8b pulseaudio-0.9.4.tar.gz 1111744
+SHA256 2e3f7e7d7177a6383acbe624bdb29d110459ac3c9d4a5ef07531836507a519fd pulseaudio-0.9.4.tar.gz 1111744
diff --git a/media-sound/pulseaudio/files/pulseaudio-0.9.4-r1170.patch b/media-sound/pulseaudio/files/pulseaudio-0.9.4-r1170.patch
new file mode 100644
index 000000000000..03f7fac3fa72
--- /dev/null
+++ b/media-sound/pulseaudio/files/pulseaudio-0.9.4-r1170.patch
@@ -0,0 +1,22 @@
+Index: src/daemon/caps.c
+===================================================================
+--- src/daemon/caps.c	(revision 1169)
++++ src/daemon/caps.c	(revision 1170)
+@@ -82,7 +82,7 @@
+     cap_value_t nice_cap = CAP_SYS_NICE;
+ 
+     /* Only drop caps when called SUID */
+-    if (getuid() != 0)
++    if (getuid() == 0)
+         return 0;
+ 
+     caps = cap_init();
+@@ -112,7 +112,7 @@
+     int r = -1;
+ 
+     /* Only drop caps when called SUID */
+-    if (getuid() != 0)
++    if (getuid() == 0)
+         return 0;
+ 
+     caps = cap_init();
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.4-r1.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..0e6a083bb7aa
--- /dev/null
+++ b/media-sound/pulseaudio/pulseaudio-0.9.4-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.4-r1.ebuild,v 1.1 2006/07/30 13:45:08 flameeyes Exp $
+
+inherit eutils libtool # autotools
+
+DESCRIPTION="A networked sound server with an advanced plugin system"
+HOMEPAGE="http://0pointer.de/lennart/projects/pulseaudio/"
+SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86-fbsd ~x86"
+
+IUSE="alsa avahi caps jack lirc oss tcpd X"
+
+RDEPEND="X? ( || ( x11-libs/libX11 <virtual/x11-7 ) )
+	caps? ( sys-libs/libcap )
+	>=media-libs/audiofile-0.2.6-r1
+	>=media-libs/libsamplerate-0.1.1-r1
+	>=media-libs/libsndfile-1.0.10
+	>=dev-libs/liboil-0.3.6
+	alsa? ( >=media-libs/alsa-lib-1.0.10 )
+	>=dev-libs/glib-2.4.0
+	avahi? ( >=net-dns/avahi-0.6.12 )
+	>=dev-libs/liboil-0.3.0
+	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	tcpd? ( sys-apps/tcp-wrappers )
+	lirc? ( app-misc/lirc )
+	app-admin/eselect-esd"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+pkg_setup() {
+	if use avahi && ! built_with_use net-dns/avahi dbus ; then
+		echo
+		eerror "In order to compile pulseaudio with avahi support, you need to have"
+		eerror "net-dns/avahi emerged with 'dbus' in your USE flag. Please add that"
+		eerror "flag, re-emerge avahi, and then emerge pulseaudio again."
+		die "net-dns/avahi is missing the D-Bus bindings."
+	fi
+
+	enewgroup audio 18 # Just make sure it exists
+	enewgroup pulse-access
+	enewgroup pulse
+	enewuser pulse -1 -1 /var/run/pulse pulse,audio
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-0.9.2-esdcompat.patch"
+	# Fix working with caps
+	epatch "${FILESDIR}/${P}-r1170.patch"
+
+	# eautoreconf
+	elibtoolize
+}
+
+src_compile() {
+	econf \
+		--enable-largefile \
+		--enable-glib2 \
+		--disable-solaris \
+		--disable-asyncns \
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable lirc) \
+		$(use_enable tcpd tcpwrap) \
+		$(use_enable jack) \
+		$(use_enable lirc) \
+		$(use_enable avahi) \
+		$(use_with caps) \
+		$(use_with X x) \
+		--disable-ltdl-install \
+		--localstatedir=/var \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	newconfd "${FILESDIR}/pulseaudio.conf.d" pulseaudio
+
+	local extradepend
+	use alsa && extradepend="$extradepend alsasound"
+	use avahi && extradepend="$extradepend avahi"
+	sed -e "s/@extradepend@/$extradepend/" "${FILESDIR}/pulseaudio.init.d-2" > "${T}/pulseaudio"
+	doinitd "${T}/pulseaudio"
+
+	dohtml -r doc
+	dodoc README
+
+	# Create the state directory
+	diropts -o pulse -g pulse -m0755
+	keepdir /var/run/pulse
+}
+
+pkg_postinst() {
+	elog "PulseAudio in Gentoo can use a system-wide pulseaudio daemon."
+	elog "This support is enabled by starting the pulsedaemon init.d ."
+	elog "To be able to access that you need to be in the group pulse-access."
+	elog "For more information about system-wide support, please refer to"
+	elog "	 http://pulseaudio.org/wiki/SystemWideInstance"
+
+	elog "To use the ESounD wrapper while using a system-wide daemon, you also"
+	elog "need to enable auth-anonymous for the esound-unix module, or to copy"
+	elog "/var/run/pulse/.esd_auth into each home directory."
+
+	eselect esd update --if-unset
+}