Split pulseaudio access in pulse-access group, as suggested by upstream, use a different script to initialise system-wide pulseaudio, so that the default is the same as in other distributions and in vanilla, allowing users to set the system-wide mode if they want, disable module loading at runtime for systemwide setup, and explain everythign in a postinst message.

Package-Manager: portage-2.1.1_pre3-r1

5 files changed, 55 insertions, 30 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index e74ba0580944..bacc20c6ff6b 100644
--- a/media-sound/pulseaudio/ChangeLog
+++ b/media-sound/pulseaudio/ChangeLog
@@ -1,6 +1,14 @@
 # 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.7 2006/07/18 17:43:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.8 2006/07/18 22:22:05 flameeyes Exp $
+
+  18 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/pulseaudio.conf.d, files/pulseaudio.init.d, pulseaudio-0.9.2.ebuild:
+  Split pulseaudio access in pulse-access group, as suggested by upstream, use
+  a different script to initialise system-wide pulseaudio, so that the default
+  is the same as in other distributions and in vanilla, allowing users to set
+  the system-wide mode if they want, disable module loading at runtime for
+  systemwide setup, and explain everythign in a postinst message.
 
   18 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/pulseaudio-0.9.2-moduledetect.patch, pulseaudio-0.9.2.ebuild:
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index a2e02f856548..d8ad8d08335a 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -9,23 +9,23 @@ AUX pulseaudio-0.9.2-moduledetect.patch 1345 RMD160 21f145ac391f707819b2f68386e8
 MD5 c5e0f26882cdaba00e98d218a364e04e files/pulseaudio-0.9.2-moduledetect.patch 1345
 RMD160 21f145ac391f707819b2f68386e8fa23060a2af9 files/pulseaudio-0.9.2-moduledetect.patch 1345
 SHA256 e0b148d7aa99b2826f06da6a451683206f328553403dd4f690d722a7387b3e91 files/pulseaudio-0.9.2-moduledetect.patch 1345
-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
+AUX pulseaudio.conf.d 151 RMD160 7d7a735f8b6cec8484c6339be86cf7cdbcf38309 SHA1 689340a72e46269861a4d24dff8a0b1f8a0acace SHA256 99f8e923e249ad64a8dcc3084a3300988a42412f8160476184115d5f3580a667
+MD5 11af5c707a0734a787dbf776b3f52dda files/pulseaudio.conf.d 151
+RMD160 7d7a735f8b6cec8484c6339be86cf7cdbcf38309 files/pulseaudio.conf.d 151
+SHA256 99f8e923e249ad64a8dcc3084a3300988a42412f8160476184115d5f3580a667 files/pulseaudio.conf.d 151
+AUX pulseaudio.init.d 694 RMD160 31d11fccff2fadff2d21f4c859babac465a65415 SHA1 05132d5a773f9714e0e84b14bd12e72802267858 SHA256 23c924e4898ee544bf8f095bd49e3ffdcbe52323a71305f46cf14e46948a3336
+MD5 da99524f55d4fbbf386501ef117c1a5c files/pulseaudio.init.d 694
+RMD160 31d11fccff2fadff2d21f4c859babac465a65415 files/pulseaudio.init.d 694
+SHA256 23c924e4898ee544bf8f095bd49e3ffdcbe52323a71305f46cf14e46948a3336 files/pulseaudio.init.d 694
 DIST pulseaudio-0.9.2.tar.gz 1100971 RMD160 32005e876868a507963d6ced53722dd9dd52cc78 SHA1 726a54651656c7d2bcfc6e4d45c7e0839c0519ff SHA256 b0e39ffffa19e0745da6ef2be1df353c3466991c82a191d83bdf4421387a463a
-EBUILD pulseaudio-0.9.2.ebuild 3294 RMD160 ae50639cd692ca60622acc2e938ed71379acc0f8 SHA1 9c9602b69b6f3d35779fc19d5ba47c02e8f2b3ef SHA256 34118050d53a2a2e1790e71ce93582ffa117d4fe27b182e60cbba5803ba4543b
-MD5 1467ae7ce453c2d6b0df545a320d7090 pulseaudio-0.9.2.ebuild 3294
-RMD160 ae50639cd692ca60622acc2e938ed71379acc0f8 pulseaudio-0.9.2.ebuild 3294
-SHA256 34118050d53a2a2e1790e71ce93582ffa117d4fe27b182e60cbba5803ba4543b pulseaudio-0.9.2.ebuild 3294
-MISC ChangeLog 1664 RMD160 a8ea51cadb51fc317aa65994837db9f3c42af82f SHA1 ec94c7c735b959ed9f135722289fb2a4fc15a131 SHA256 4ddcf9326d0402aaddcd10a528ba64fbbacbb0148f9e69d261c8453fdfe5ce3e
-MD5 234bb6004e6430c6cf81aa39139280e2 ChangeLog 1664
-RMD160 a8ea51cadb51fc317aa65994837db9f3c42af82f ChangeLog 1664
-SHA256 4ddcf9326d0402aaddcd10a528ba64fbbacbb0148f9e69d261c8453fdfe5ce3e ChangeLog 1664
+EBUILD pulseaudio-0.9.2.ebuild 3934 RMD160 da0bf6d3da81ad95dafefcf4a8054d477ab883bd SHA1 1c2870b663d13f05787f34495ab7863082cfcdbd SHA256 c4b6d0ad931eea2d9c575ccaaededba764374b60afb1e7e8da24d1582f720ec6
+MD5 d5ec001cf8e8d0f4d19640ef55c20a69 pulseaudio-0.9.2.ebuild 3934
+RMD160 da0bf6d3da81ad95dafefcf4a8054d477ab883bd pulseaudio-0.9.2.ebuild 3934
+SHA256 c4b6d0ad931eea2d9c575ccaaededba764374b60afb1e7e8da24d1582f720ec6 pulseaudio-0.9.2.ebuild 3934
+MISC ChangeLog 2172 RMD160 3adf0431b77b1891622ed6d1300dc721765a3d7b SHA1 e16123df4633f7bbdd371e6e77572c6cec76353c SHA256 56f9d6718460ac8a2f0e9c9f54dad0c646788fbb4085a18b76f6452f90d155a4
+MD5 c4e4a913c3b6d2ca9d174c9469e9edbb ChangeLog 2172
+RMD160 3adf0431b77b1891622ed6d1300dc721765a3d7b ChangeLog 2172
+SHA256 56f9d6718460ac8a2f0e9c9f54dad0c646788fbb4085a18b76f6452f90d155a4 ChangeLog 2172
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -36,7 +36,7 @@ SHA256 1b50b0a6de74d80653dd9c4ef669d42e2ffb109e12b3e125a7e9b7f6573aee9b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEvR3YAiZjviIA2XgRAgeiAJ4lRGYZgHV1347nn2FRbUMO6y9rgwCgx9nL
-Y1Oxgn9MGLcA7a/S0sidHLA=
-=9azB
+iD8DBQFEvV8pAiZjviIA2XgRAooBAKCS5Li4fJr3rUfWfMRZj/Yn3K8oYgCfaQNK
+RZPJYjTGwOUaftQaNEZarNI=
+=B28h
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/pulseaudio.conf.d b/media-sound/pulseaudio/files/pulseaudio.conf.d
index 01521ede4aee..9e7245344a57 100644
--- a/media-sound/pulseaudio/files/pulseaudio.conf.d
+++ b/media-sound/pulseaudio/files/pulseaudio.conf.d
@@ -3,4 +3,4 @@
 # For more see "pulseaudio -h".
 
 # Startup options
-PA_OPTS="--log-target=syslog"
+PA_OPTS="--log-target=syslog --disallow-module-loading=1"
diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d b/media-sound/pulseaudio/files/pulseaudio.init.d
index 08dbadfe2f57..d039bf5443f2 100644
--- a/media-sound/pulseaudio/files/pulseaudio.init.d
+++ b/media-sound/pulseaudio/files/pulseaudio.init.d
@@ -10,13 +10,18 @@ depend() {
 start() {
 	ebegin "Starting pulseaudio"
 	HOME=/var/run/pulse
+
+	PA_ALL_OPTS="${PA_OPTS} --fail=1 --daemonize=1 --use-pid-file=0
+		    -n -F /etc/pulse/system.pa"
 	start-stop-daemon --start --chuid pulse:pulse \
-			  --exec /usr/bin/pulseaudio -- ${PA_OPTS} --fail=true -D
+			  --exec /usr/bin/pulseaudio -- ${PA_ALL_OPTS}
 	eend $?
 
-	chgrp -R audio /var/run/pulse
-	chmod 0750 /var/run/pulse
-	chmod 0660 /var/run/pulse/native
+	if [[ -S /var/run/pulse/native ]]; then
+		chgrp -R pulse-access /var/run/pulse
+		chmod 0750 /var/run/pulse
+		chmod 0660 /var/run/pulse/native
+	fi
 }
 
 stop() {
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.2.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.2.ebuild
index d8924d3e6b6e..003f002f47b4 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.5 2006/07/18 17:43:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.2.ebuild,v 1.6 2006/07/18 22:22:05 flameeyes Exp $
 
 inherit eutils libtool autotools
 
@@ -41,6 +41,7 @@ pkg_setup() {
 	fi
 
 	enewgroup audio 18 # Just make sure it exists
+	enewgroup pulse-access
 	enewgroup pulse
 	enewuser pulse -1 -1 /var/run/pulse pulse,audio
 }
@@ -103,12 +104,23 @@ src_install() {
 	#  - 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"
+	sed -e '/load-module module-native-protocol-unix/s:$: auth-anonymous=1 socket=/var/run/pulse/native:' \
+		"${D}/etc/pulse/default.pa" > "${D}/etc/pulse/system.pa"
+	cp "${D}"/etc/pulse/client.conf{,.system}
+	sed -i -e '/default-server/d' "${D}/etc/pulse/client.conf.system"
 	echo "default-server = unix:/var/run/pulse/native" >> \
-		"${D}/etc/pulse/client.conf"
+		"${D}/etc/pulse/client.conf.system"
 
 	dohtml -r doc
 	dodoc README doc/todo
 }
+
+pkg_postinst() {
+	elog "PulseAudio in Gentoo can use a system-wide pulseaudio daemon."
+	elog "This support is enabled by starting the pulsedaemon init.d and is configured"
+	elog "to read the settings from /etc/pulse/system.pa ."
+	elog "To be able to use that global daemon, you need also to replace the configuration"
+	elog "file /etc/pulse/client.conf with the copy in /etc/pulse/client.conf.system"
+	elog "(or to put it in your ~/.pulse/client.conf)."
+	elog "To be able to access that you need to be in the group pulse-access."
+}