Improve support for system-wide pulseaudio daemon, let it work with users in audio group.

Package-Manager: portage-2.1.1_pre3

5 files changed, 48 insertions, 23 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index 554a329dfdf0..1a31e70e2367 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,11 @@
 # 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.5 2006/07/16 23:33:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.6 2006/07/17 15:38:20 flameeyes Exp $
+
+  17 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/pulseaudio.conf.d, files/pulseaudio.init.d, pulseaudio-0.9.2.ebuild:
+  Improve support for system-wide pulseaudio daemon, let it work with users in
+  audio group.
 
   16 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   files/pulseaudio-0.9.2-fbsd.patch:
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index ca755e93e460..8c03707308e5 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -5,23 +5,23 @@ AUX pulseaudio-0.9.2-fbsd.patch 7798 RMD160 9539fc01a304ad7336cc738ebf0e0cc7cbe3
 MD5 8adda20be20f1e0443ff9d404a51ff4a files/pulseaudio-0.9.2-fbsd.patch 7798
 RMD160 9539fc01a304ad7336cc738ebf0e0cc7cbe3eb76 files/pulseaudio-0.9.2-fbsd.patch 7798
 SHA256 b3a6d9b5cebceaed986d2aaf06af34846efe9819cb12f4dae2c8d838dbc3ee4e files/pulseaudio-0.9.2-fbsd.patch 7798
-AUX pulseaudio.conf.d 124 RMD160 babcad4822a894279bac64bbebe7e5a58b36926e SHA1 53c2b560be8fb6e6193150688ef216b57ba3bf28 SHA256 492b96f10b5b9cd49ffe3f9a33faf9bd7e019a0b261a9f2ef3a6e9c9960880d0
-MD5 14c88a597c921ba8c4ea3fcc73af2131 files/pulseaudio.conf.d 124
-RMD160 babcad4822a894279bac64bbebe7e5a58b36926e files/pulseaudio.conf.d 124
-SHA256 492b96f10b5b9cd49ffe3f9a33faf9bd7e019a0b261a9f2ef3a6e9c9960880d0 files/pulseaudio.conf.d 124
-AUX pulseaudio.init.d 427 RMD160 77d8b270ee44f776687c2f4e3bb44b559485710d SHA1 962d1a28c13cc384c413e5d73ef7aa244423bc1d SHA256 f612a99022cc49ed818327d041ff303ab220640864ec6dc3adc525a65566fc14
-MD5 9bbd35df663a162cdd31f699c4dd91e1 files/pulseaudio.init.d 427
-RMD160 77d8b270ee44f776687c2f4e3bb44b559485710d files/pulseaudio.init.d 427
-SHA256 f612a99022cc49ed818327d041ff303ab220640864ec6dc3adc525a65566fc14 files/pulseaudio.init.d 427
+AUX pulseaudio.conf.d 123 RMD160 bfbfaf15e5a7cac1e15ef34471b68ed7bf5a0883 SHA1 5f2a0b7791daacc23f3dbe56c8b2382e37137fd5 SHA256 64e2d11a13c31cd5c7cfad0fe07f2e80edcc15e23261b09ba73632a673ce3d45
+MD5 e714ef8f8dc4b4640fb0cbf247de6381 files/pulseaudio.conf.d 123
+RMD160 bfbfaf15e5a7cac1e15ef34471b68ed7bf5a0883 files/pulseaudio.conf.d 123
+SHA256 64e2d11a13c31cd5c7cfad0fe07f2e80edcc15e23261b09ba73632a673ce3d45 files/pulseaudio.conf.d 123
+AUX pulseaudio.init.d 550 RMD160 af150a878919b31cf5f575ee9fe440936c5a15c2 SHA1 249bca31698a44943ed41e90c807c98c9947fffd SHA256 818f1ac8b1740d64818bac2e3c82b0ba42984a12469f51c374ef45aa7debc911
+MD5 bc446921841aebd5e18d8a03f8ccf1c3 files/pulseaudio.init.d 550
+RMD160 af150a878919b31cf5f575ee9fe440936c5a15c2 files/pulseaudio.init.d 550
+SHA256 818f1ac8b1740d64818bac2e3c82b0ba42984a12469f51c374ef45aa7debc911 files/pulseaudio.init.d 550
 DIST pulseaudio-0.9.2.tar.gz 1100971 RMD160 32005e876868a507963d6ced53722dd9dd52cc78 SHA1 726a54651656c7d2bcfc6e4d45c7e0839c0519ff SHA256 b0e39ffffa19e0745da6ef2be1df353c3466991c82a191d83bdf4421387a463a
-EBUILD pulseaudio-0.9.2.ebuild 2541 RMD160 7f66a55a4b1eddc0b6938bd48175b5f830bf86ce SHA1 0212c608bfcdeaffb4517100cc5332290b86612d SHA256 272634df48ba963fac0fc3922ddae20adaa08221c29e736a736df86cdc70aff4
-MD5 4d98eb3b52eec25fb7404a84741c43a0 pulseaudio-0.9.2.ebuild 2541
-RMD160 7f66a55a4b1eddc0b6938bd48175b5f830bf86ce pulseaudio-0.9.2.ebuild 2541
-SHA256 272634df48ba963fac0fc3922ddae20adaa08221c29e736a736df86cdc70aff4 pulseaudio-0.9.2.ebuild 2541
-MISC ChangeLog 1259 RMD160 598d1971849a2f03741c5cba58dfd4d66572d93a SHA1 c35cc4509760d6e8a2512ef92ff44542708470ab SHA256 24453500b3db5cee40c4dd397e882059d598b52164ef0085af3394fcc5e6c01c
-MD5 e9b33a891b5694facfe627e59b7019d4 ChangeLog 1259
-RMD160 598d1971849a2f03741c5cba58dfd4d66572d93a ChangeLog 1259
-SHA256 24453500b3db5cee40c4dd397e882059d598b52164ef0085af3394fcc5e6c01c ChangeLog 1259
+EBUILD pulseaudio-0.9.2.ebuild 3248 RMD160 f66c57dad3a106eac79e782fd046d86b53c5d6a0 SHA1 52950eacba41fae767cae2933eb7efeb2398f28b SHA256 416497250b7b138d205ba555026e24536ed8ea153ca2a6610316546fc7a1ad49
+MD5 67e46fdef0b991e7c3323d47b732478c pulseaudio-0.9.2.ebuild 3248
+RMD160 f66c57dad3a106eac79e782fd046d86b53c5d6a0 pulseaudio-0.9.2.ebuild 3248
+SHA256 416497250b7b138d205ba555026e24536ed8ea153ca2a6610316546fc7a1ad49 pulseaudio-0.9.2.ebuild 3248
+MISC ChangeLog 1484 RMD160 b81532fc345288e1c2b7a18e175901e60b1b31fa SHA1 4ca1a2cee1ca1245852c9e78633d851f59401602 SHA256 6424e6a515dfaf60e00fdf4a7bb6a9c25f1a2d24834b55d9810ed7bd2d29eebe
+MD5 132b9b98f3a4bf049e4368ff97a46869 ChangeLog 1484
+RMD160 b81532fc345288e1c2b7a18e175901e60b1b31fa ChangeLog 1484
+SHA256 6424e6a515dfaf60e00fdf4a7bb6a9c25f1a2d24834b55d9810ed7bd2d29eebe ChangeLog 1484
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -32,7 +32,7 @@ SHA256 1b50b0a6de74d80653dd9c4ef669d42e2ffb109e12b3e125a7e9b7f6573aee9b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEusyyAiZjviIA2XgRAk77AJ9p42U0qZUkLtIKmUI6s8O2WdznCgCgsgux
-BLHl1za9lcp3L0gVaSbHFls=
-=WWjd
+iD8DBQFEu67+AiZjviIA2XgRApwLAJ9hV/cdTnL4wn/BF0qDg7TXxGLLggCeL5/F
+YBi7YuODAim0jjx/jU5NDSM=
+=0mGj
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/pulseaudio.conf.d b/media-sound/pulseaudio/files/pulseaudio.conf.d
index 620443bfedf3..01521ede4aee 100644
--- a/media-sound/pulseaudio/files/pulseaudio.conf.d
+++ b/media-sound/pulseaudio/files/pulseaudio.conf.d
@@ -4,4 +4,3 @@
 
 # Startup options
 PA_OPTS="--log-target=syslog"
-
diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d b/media-sound/pulseaudio/files/pulseaudio.init.d
index 66165fa2f556..08dbadfe2f57 100644
--- a/media-sound/pulseaudio/files/pulseaudio.init.d
+++ b/media-sound/pulseaudio/files/pulseaudio.init.d
@@ -9,8 +9,14 @@ depend() {
 
 start() {
 	ebegin "Starting pulseaudio"
-	start-stop-daemon --start --quiet --background --exec /usr/bin/pulseaudio -- ${PA_OPTS} --fail=true
+	HOME=/var/run/pulse
+	start-stop-daemon --start --chuid pulse:pulse \
+			  --exec /usr/bin/pulseaudio -- ${PA_OPTS} --fail=true -D
 	eend $?
+
+	chgrp -R audio /var/run/pulse
+	chmod 0750 /var/run/pulse
+	chmod 0660 /var/run/pulse/native
 }
 
 stop() {
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.2.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.2.ebuild
index 4a564e3cda8c..227eb3d36ee1 100644
--- a/media-sound/pulseaudio/pulseaudio-0.9.2.ebuild
+++ b/media-sound/pulseaudio/pulseaudio-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.3 2006/07/16 21:37:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.2.ebuild,v 1.4 2006/07/17 15:38:20 flameeyes Exp $
 
 inherit eutils libtool autotools
 
@@ -39,6 +39,10 @@ pkg_setup() {
 		eerror "avahi, and then emerge polypaudio."
 		die "net-dns/avahi is missing the HOWL compatibility layer."
 	fi
+
+	enewgroup audio 18 # Just make sure it exists
+	enewgroup pulse
+	enewuser pulse -1 -1 /var/run/pulse pulse,audio
 }
 
 src_unpack() {
@@ -93,6 +97,17 @@ src_install() {
 	sed -e "s/@extradepend@/$extradepend/" "${FILESDIR}/pulseaudio.init.d" > "${T}/pulseaudio"
 	doinitd "${T}/pulseaudio"
 
+	# This section changes the configuration files so that they are ready for
+	# the system-wide pulseaudio daemon. The changes are:
+	#  - use socket at /var/run/pulse/native
+	#  - enable anonymous access (relies on filesystem-level access to the socket)
+	#  - changes the dafault server path for the clients
+	sed -i -e '/load-module module-native-protocol-unix/s:$: auth-anonymous=1 socket=/var/run/pulse/native:' \
+		"${D}/etc/pulse/default.pa"
+	sed -i -e '/default-server/d' "${D}/etc/pulse/client.conf"
+	echo "default-server = unix:/var/run/pulse/native" >> \
+		"${D}/etc/pulse/client.conf"
+
 	dohtml -r doc
 	dodoc README doc/todo
 }