rpms/pulseaudio/F-11 0001-Remove-exploitable-LD_BIND_NOW-hack-CVE-2009-1894.patch, 1.1, 1.2

[Lennart Poettering]

Author: lennart

Update of /cvs/pkgs/rpms/pulseaudio/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5442

Modified Files:
	0001-Remove-exploitable-LD_BIND_NOW-hack-CVE-2009-1894.patch 
Log Message:
fix patch

0001-Remove-exploitable-LD_BIND_NOW-hack-CVE-2009-1894.patch:
 configure.ac      |    6 ++++++
 src/Makefile.am   |    4 ++--
 src/daemon/main.c |   23 -----------------------
 3 files changed, 8 insertions(+), 25 deletions(-)

Index: 0001-Remove-exploitable-LD_BIND_NOW-hack-CVE-2009-1894.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/F-11/0001-Remove-exploitable-LD_BIND_NOW-hack-CVE-2009-1894.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-Remove-exploitable-LD_BIND_NOW-hack-CVE-2009-1894.patch	28 Jul 2009 20:52:33 -0000	1.1
+++ 0001-Remove-exploitable-LD_BIND_NOW-hack-CVE-2009-1894.patch	28 Jul 2009 21:06:38 -0000	1.2
@@ -1,4 +1,4 @@
-From 84200b423ebfa7e2dad9b1b65f64eac7bf3d2114 Mon Sep 17 00:00:00 2001
+From abf6dfbc625006f08fb30fef5814d0c7eb57e2ee Mon Sep 17 00:00:00 2001
 From: =?utf-8?q?Diego=20Elio=20'Flameeyes'=20Petten=C3=B2?= <flameeyes at gmail.com>
 Date: Tue, 7 Jul 2009 20:51:53 +0200
 Subject: [PATCH] Remove exploitable LD_BIND_NOW hack (CVE-2009-1894).
@@ -15,10 +15,10 @@ Reduce the amount of compiled and execut
  3 files changed, 8 insertions(+), 24 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 9c96d1c..cc7f674 100644
+index 25cee57..690c2a8 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -113,6 +113,12 @@ CC_CHECK_LDFLAGS([${tmp_ldflag}],
+@@ -114,6 +114,12 @@ CC_CHECK_LDFLAGS([${tmp_ldflag}],
      [VERSIONING_LDFLAGS='-Wl,-version-script=$(srcdir)/map-file'])
  AC_SUBST([VERSIONING_LDFLAGS])
  
@@ -28,14 +28,14 @@ index 9c96d1c..cc7f674 100644
 +CC_CHECK_LDFLAGS([-Wl,-z,now], [IMMEDIATE_LDFLAGS="-Wl,-z,now"])
 +AC_SUBST([IMMEDIATE_LDFLAGS])
 +
- dnl Check for the proper way to build libraries that have no undefined
- dnl symbols; on some hosts this needs to be avoided but the macro
- dnl takes care of it.
+ dnl Check whether to build tests by default (as compile-test) or not
+ AC_ARG_ENABLE([default-build-tests],
+     AS_HELP_STRING([--disable-default-build-tests], [Build test programs only during make check]))
 diff --git a/src/Makefile.am b/src/Makefile.am
-index 7ebf1f8..ac627c8 100644
+index 0d4f53a..413cae1 100644
 --- a/src/Makefile.am
 +++ b/src/Makefile.am
-@@ -183,9 +183,9 @@ PREOPEN_LIBS = $(modlibexec_LTLIBRARIES)
+@@ -153,9 +153,9 @@ PREOPEN_LIBS = $(modlibexec_LTLIBRARIES)
  endif
  
  if FORCE_PREOPEN
@@ -46,12 +46,12 @@ index 7ebf1f8..ac627c8 100644
 +pulseaudio_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS) $(IMMEDIATE_LDFLAGS) -dlopen force $(foreach f,$(PREOPEN_LIBS),-dlopen $(f))
  endif
  
- ###################################
+ if HAVE_POLKIT
 diff --git a/src/daemon/main.c b/src/daemon/main.c
-index eb378d2..0f6fc90 100644
+index c456e6d..4499ea3 100644
 --- a/src/daemon/main.c
 +++ b/src/daemon/main.c
-@@ -401,28 +401,6 @@ int main(int argc, char *argv[]) {
+@@ -399,28 +399,6 @@ int main(int argc, char *argv[]) {
      pa_log_set_level(PA_LOG_NOTICE);
      pa_log_set_flags(PA_LOG_COLORS|PA_LOG_PRINT_FILE|PA_LOG_PRINT_LEVEL, PA_LOG_RESET);
  
@@ -77,9 +77,9 @@ index eb378d2..0f6fc90 100644
 -    }
 -#endif
 -
-     if ((e = getenv("PULSE_PASSED_FD"))) {
-         passed_fd = atoi(e);
- 
+ #ifdef HAVE_GETUID
+     real_root = getuid() == 0;
+     suid_root = !real_root && geteuid() == 0;
 -- 
 1.6.3.3