Accepting request 36441 from multimedia:libs

Copy from multimedia:libs/pulseaudio based on submit request 36441 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/36441
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pulseaudio?expand=0&rev=58

0063-core-util-ensure-that-we-chmod-only-the-dir-we-ours.patch

@@ -0,0 +1,89 @@
+From d3efa43d85ac132c6a5a416a2b6f2115f5d577ee Mon Sep 17 00:00:00 2001
+From: Kees Cook <kees@ubuntu.com>
+Date: Tue, 2 Mar 2010 21:33:34 -0800
+Subject: [PATCH] core-util: ensure that we chmod only the dir we ourselves created
+
+---
+ configure.ac              |    2 +-
+ src/pulsecore/core-util.c |   39 ++++++++++++++++++++++++++++++++++-----
+ 2 files changed, 35 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1b80788..abcce13 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -424,7 +424,7 @@ AC_CHECK_FUNCS_ONCE([lrintf strtof])
+ AC_FUNC_FORK
+ AC_FUNC_GETGROUPS
+ AC_FUNC_SELECT_ARGTYPES
+-AC_CHECK_FUNCS_ONCE([chmod chown clock_gettime getaddrinfo getgrgid_r getgrnam_r \
++AC_CHECK_FUNCS_ONCE([chmod chown fstat fchown fchmod clock_gettime getaddrinfo getgrgid_r getgrnam_r \
+     getpwnam_r getpwuid_r gettimeofday getuid inet_ntop inet_pton mlock nanosleep \
+     pipe posix_fadvise posix_madvise posix_memalign setpgid setsid shm_open \
+     sigaction sleep sysconf pthread_setaffinity_np])
+diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
+index d6017b9..a642553 100644
+--- a/src/pulsecore/core-util.c
++++ b/src/pulsecore/core-util.c
+@@ -199,7 +199,7 @@ void pa_make_fd_cloexec(int fd) {
+ /** Creates a directory securely */
+ int pa_make_secure_dir(const char* dir, mode_t m, uid_t uid, gid_t gid) {
+     struct stat st;
+-    int r, saved_errno;
++    int r, saved_errno, fd;
+ 
+     pa_assert(dir);
+ 
+@@ -217,16 +217,45 @@ int pa_make_secure_dir(const char* dir, mode_t m, uid_t uid, gid_t gid) {
+     if (r < 0 && errno != EEXIST)
+         return -1;
+ 
+-#ifdef HAVE_CHOWN
++#ifdef HAVE_FSTAT
++    if ((fd = open(dir,
++#ifdef O_CLOEXEC
++                   O_CLOEXEC|
++#endif
++#ifdef O_NOCTTY
++                   O_NOCTTY|
++#endif
++#ifdef O_NOFOLLOW
++                   O_NOFOLLOW|
++#endif
++                   O_RDONLY)) < 0)
++        goto fail;
++
++    if (fstat(fd, &st) < 0) {
++        pa_assert_se(pa_close(fd) >= 0);
++        goto fail;
++    }
++
++    if (!S_ISDIR(st.st_mode)) {
++        pa_assert_se(pa_close(fd) >= 0);
++        errno = EEXIST;
++        goto fail;
++    }
++
++#ifdef HAVE_FCHOWN
+     if (uid == (uid_t)-1)
+         uid = getuid();
+     if (gid == (gid_t)-1)
+         gid = getgid();
+-    (void) chown(dir, uid, gid);
++    (void) fchown(fd, uid, gid);
++#endif
++
++#ifdef HAVE_FCHMOD
++    (void) fchmod(fd, m);
+ #endif
+ 
+-#ifdef HAVE_CHMOD
+-    chmod(dir, m);
++    pa_assert_se(pa_close(fd) >= 0);
++
+ #endif
+ 
+ #ifdef HAVE_LSTAT
+-- 
+1.6.0.2
+

pulseaudio.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Mar 29 07:10:31 UTC 2010 - per@osbeck.com
+
+- add support for phonon in setup-pulseaudio
+
+-------------------------------------------------------------------
+Mon Mar  8 22:24:00 UTC 2010 - sreeves@novell.com
+
+- Add 0063-core-util-ensure-that-we-chmod-only-the-dir-we-ours.patch
+    Fix bnc#584938 - chmod only the dir we ourselves created. 
+
 -------------------------------------------------------------------
 Mon Mar  1 21:26:48 UTC 2010 - sreeves@novell.com
 

pulseaudio.spec

@@ -22,7 +22,7 @@
 Name:           pulseaudio
 Summary:        A Networked Sound Server
 Version:        0.9.21
-Release:        3
+Release:        4
 License:        LGPLv2.1+
 Group:          System/Sound Daemons
 Source:         %{name}-%{version}.tar.bz2
@@ -92,6 +92,7 @@ Patch59:        0059-alsa-reset-max_rewind-max_request-while-suspending.patch
 Patch60:        0060-core-util-introduce-generic-function-pa_strip.patch
 Patch61:        0061-esd-simple-use-pa_memblockq_pop_missing.patch
 Patch62:        0062-core-rework-how-stream-volumes-affect-sink-volumes.patch
+Patch63:        0063-core-util-ensure-that-we-chmod-only-the-dir-we-ours.patch
 Url:            http://pulseaudio.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  alsa-devel
@@ -364,6 +365,7 @@ This package contains GDM integration hooks for the PulseAudio sound server.
 %patch60 -p1
 %patch61 -p1
 %patch62 -p1
+%patch63 -p1
 
 %build
 autoreconf

setup-pulseaudio

@@ -25,6 +25,11 @@ check_root() {
     fi
 }
 
+enable_phonon() {
+    echo "Enabling PulseAudio for Phonon..."
+    perl -pi -e "s|PHONON_PULSEAUDIO_DISABLE=1||g;" /etc/environment
+}
+
 enable_alsa() {
     echo "Enabling PulseAudio for ALSA..."
     if grep "ALSA_CONFIG_PATH" /etc/environment; then
@@ -125,6 +130,15 @@ disable_alsa() {
     perl -pi -e "s|ALSA_CONFIG_PATH=/etc/alsa-pulse.conf||g;" /etc/environment
 }
 
+disable_phonon() {
+    echo "Disabling PulseAudio for Phonon..."
+    if grep "PHONON_PULSEAUDIO_DISABLE" /etc/environment; then
+	echo "PulseAudio config for Phonon already in use"
+    else
+	echo "PHONON_PULSEAUDIO_DISABLE=1" >> /etc/environment
+    fi
+}
+
 disable_libao() {
     if test -f /etc/libao.conf; then
 	echo "Disabling PulseAudio for libao..."
@@ -199,6 +213,7 @@ case $1 in
 	enable_timidity
 	enable_xine
 	enable_autospawn
+	enable_phonon
 	;;
     --disable)
 	check_root || exit
@@ -212,6 +227,7 @@ case $1 in
 	disable_timidity
 	disable_xine
 	disable_autospawn
+	disable_phonon
 	;;
     --status)
 	STATUS=`grep PULSEAUDIO_ENABLE /etc/sysconfig/sound | cut -f2 -d= | cut -f2 -d\"`