Add support for esd wrapper when using system-wide mode, by enabling anonymous authentication for esound protocol and relying once again on filesystem access for being able to use it.

Package-Manager: portage-2.1.1_pre3-r1

4 files changed, 30 insertions, 18 deletions

diff --git a/media-sound/pulseaudio/ChangeLog b/media-sound/pulseaudio/ChangeLog
index fcfc9a8f186a..30847a7bc246 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.11 2006/07/19 01:23:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/ChangeLog,v 1.12 2006/07/19 11:58:24 flameeyes Exp $
+
+  19 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
+  files/pulseaudio.init.d, pulseaudio-0.9.2.ebuild:
+  Add support for esd wrapper when using system-wide mode, by enabling
+  anonymous authentication for esound protocol and relying once again on
+  filesystem access for being able to use it.
 
   19 Jul 2006; Diego Pettenò <flameeyes@gentoo.org>
   files/pulseaudio-0.9.2-esdcompat.patch:
diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest
index c1d0c3be8caa..d865820879b8 100644
--- a/media-sound/pulseaudio/Manifest
+++ b/media-sound/pulseaudio/Manifest
@@ -17,19 +17,19 @@ AUX pulseaudio.conf.d 151 RMD160 7d7a735f8b6cec8484c6339be86cf7cdbcf38309 SHA1 6
 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
+AUX pulseaudio.init.d 902 RMD160 88ce25e76a738cbd03af92f283ae52c28cc0d871 SHA1 9321ec6de848ddc8d73bdeec02b35f5146eda5d7 SHA256 2b75e9e60ecd0a40ef32d15720430fccbacdb39cbd1fc21a778018f8fee68c8c
+MD5 1a47348d1e4c15c4c844f532f36bc57b files/pulseaudio.init.d 902
+RMD160 88ce25e76a738cbd03af92f283ae52c28cc0d871 files/pulseaudio.init.d 902
+SHA256 2b75e9e60ecd0a40ef32d15720430fccbacdb39cbd1fc21a778018f8fee68c8c files/pulseaudio.init.d 902
 DIST pulseaudio-0.9.2.tar.gz 1100971 RMD160 32005e876868a507963d6ced53722dd9dd52cc78 SHA1 726a54651656c7d2bcfc6e4d45c7e0839c0519ff SHA256 b0e39ffffa19e0745da6ef2be1df353c3466991c82a191d83bdf4421387a463a
-EBUILD pulseaudio-0.9.2.ebuild 4032 RMD160 59475afd95a487b4365a07dbe3c2e1321b55b182 SHA1 90b8b9163dede1abdc67f05b65230752f2f80ff6 SHA256 6153664c8858eb71ea6453e82dd9fa736169d976ad493f705a510bed4e0f080a
-MD5 cf8f6a307c0bee2dcf3fc65c2fca5f20 pulseaudio-0.9.2.ebuild 4032
-RMD160 59475afd95a487b4365a07dbe3c2e1321b55b182 pulseaudio-0.9.2.ebuild 4032
-SHA256 6153664c8858eb71ea6453e82dd9fa736169d976ad493f705a510bed4e0f080a pulseaudio-0.9.2.ebuild 4032
-MISC ChangeLog 2654 RMD160 aa07db0ca173530403cb3235ec1e59d0e79c99b2 SHA1 f1cace9b89a00e9720094eaa150cf16090fda2fe SHA256 6587731f7233dee723d5825c82bca9d881061f333f36bd9b009f5fdfb024826b
-MD5 6b13c6cf5057b60f5b5b18f2849a444d ChangeLog 2654
-RMD160 aa07db0ca173530403cb3235ec1e59d0e79c99b2 ChangeLog 2654
-SHA256 6587731f7233dee723d5825c82bca9d881061f333f36bd9b009f5fdfb024826b ChangeLog 2654
+EBUILD pulseaudio-0.9.2.ebuild 4044 RMD160 5467e94f92b9ac33deb20c8a94bcd3b8e0add59f SHA1 2c60c13624d453452eb505f669fe35f4893236e0 SHA256 30c99f7072aed3eb2a1213a1f8e534126aa54008451721aadd8cbedd7cad5cfa
+MD5 8885c635a9d6a658ff4ea0ea9b1d04f3 pulseaudio-0.9.2.ebuild 4044
+RMD160 5467e94f92b9ac33deb20c8a94bcd3b8e0add59f pulseaudio-0.9.2.ebuild 4044
+SHA256 30c99f7072aed3eb2a1213a1f8e534126aa54008451721aadd8cbedd7cad5cfa pulseaudio-0.9.2.ebuild 4044
+MISC ChangeLog 2950 RMD160 17bd10d0ce8a9d9723898310fd2821edcffbda70 SHA1 50d7821ee77a9c8ae15464741c1c158e431e7d92 SHA256 06e6e4efc960292d500012d378b7cd09a031d86a3f7a73da74b3c8c4b4aa9355
+MD5 4ab551dfec09f22b0c41801416cb457c ChangeLog 2950
+RMD160 17bd10d0ce8a9d9723898310fd2821edcffbda70 ChangeLog 2950
+SHA256 06e6e4efc960292d500012d378b7cd09a031d86a3f7a73da74b3c8c4b4aa9355 ChangeLog 2950
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
@@ -40,7 +40,7 @@ SHA256 1b50b0a6de74d80653dd9c4ef669d42e2ffb109e12b3e125a7e9b7f6573aee9b files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFEvYmCAiZjviIA2XgRAtntAKC3yxNWuOXBXNuG+1X2d5rZEXRwowCbBTC2
-XDRk1/pjR/yStmA9Lt4M1V8=
-=pG49
+iD8DBQFEvh5yAiZjviIA2XgRAsbdAJ0cgtJ/CwH+fbLHNajuziiT69mlRgCfcnA6
+HV5tvAiyMz+BG7Gm4NoftSc=
+=5ICp
 -----END PGP SIGNATURE-----
diff --git a/media-sound/pulseaudio/files/pulseaudio.init.d b/media-sound/pulseaudio/files/pulseaudio.init.d
index d039bf5443f2..65a947466c01 100644
--- a/media-sound/pulseaudio/files/pulseaudio.init.d
+++ b/media-sound/pulseaudio/files/pulseaudio.init.d
@@ -22,6 +22,12 @@ start() {
 		chmod 0750 /var/run/pulse
 		chmod 0660 /var/run/pulse/native
 	fi
+
+        if [[ $(readlink /usr/bin/esd | xargs basename) == "esdcompat" ]] && [[ -S /tmp/.esd/socket ]]; then
+		chgrp -R pulse-access /tmp/.esd
+		chmod 0750 /tmp/.esd
+		chmod 0660 /tmp/.esd/socket
+        fi
 }
 
 stop() {
diff --git a/media-sound/pulseaudio/pulseaudio-0.9.2.ebuild b/media-sound/pulseaudio/pulseaudio-0.9.2.ebuild
index 3384cee2dcc3..efc448c17232 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.8 2006/07/19 00:35:10 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/pulseaudio/pulseaudio-0.9.2.ebuild,v 1.9 2006/07/19 11:58:24 flameeyes Exp $
 
 inherit eutils libtool autotools
 
@@ -106,7 +106,7 @@ 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 -e '/load-module module-native-protocol-unix/s:$: auth-anonymous=1 socket=/var/run/pulse/native:' \
+	sed -e '/load-module module-\(native\|esound\)-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"