summaryrefslogtreecommitdiff
path: root/audio/pulseaudio/patches/patch-ba
diff options
context:
space:
mode:
authortsutsui <tsutsui@pkgsrc.org>2010-08-10 05:42:33 +0000
committertsutsui <tsutsui@pkgsrc.org>2010-08-10 05:42:33 +0000
commit688557b4d0dedc89e7495c34a66a06b2f1b7b34e (patch)
treea0599ddff1c5fca209ffe11a3907e8d0e921f5f3 /audio/pulseaudio/patches/patch-ba
parent801b59522d3e37c496593acbaf8ca0009c4c9c5e (diff)
downloadpkgsrc-688557b4d0dedc89e7495c34a66a06b2f1b7b34e.tar.gz
Fix build failure on NetBSD/arm.
patch-ah (new): Fix wrong placed #else clause against #if defined(__linux__) in cpu-arm.c. patch-ba: Check NetBSD's native atomic_ops in configure even in arm case. configure checks $host_cpu first, not $host_os on checks for native atomic operations. (In upstream it seems fixed to see $host_os first but it might still have problem around NetBSD version checks)
Diffstat (limited to 'audio/pulseaudio/patches/patch-ba')
-rw-r--r--audio/pulseaudio/patches/patch-ba19
1 files changed, 16 insertions, 3 deletions
diff --git a/audio/pulseaudio/patches/patch-ba b/audio/pulseaudio/patches/patch-ba
index d5f82f315e2..5002749e53e 100644
--- a/audio/pulseaudio/patches/patch-ba
+++ b/audio/pulseaudio/patches/patch-ba
@@ -1,12 +1,25 @@
-$NetBSD: patch-ba,v 1.6 2010/07/24 12:51:09 tron Exp $
+$NetBSD: patch-ba,v 1.7 2010/08/10 05:42:34 tsutsui Exp $
Fix for security vulnerability reported in CVE-2009-1299, taken from here:
http://git.0pointer.de/?p=pulseaudio.git;a=patch;h=d3efa43d85ac132c6a5a416a2b6f2115f5d577ee
+Also handle atomic_ops for NetBSD/arm.
+
--- configure.ac.orig 2009-11-23 04:06:47.000000000 +0000
-+++ configure.ac 2010-07-24 13:33:30.000000000 +0100
-@@ -424,7 +424,7 @@
++++ configure.ac 2010-08-07 08:06:57.000000000 +0000
+@@ -220,6 +220,10 @@
+ AC_MSG_RESULT([yes])
+ AC_DEFINE_UNQUOTED(ATOMIC_ARM_LINUX_HELPERS, 1, [special arm linux implementation])
+ need_libatomic_ops=no
++ elif test "x$pulse_target_os" = "xnetbsd" && test "x$atomic_netbsd_helpers" = "xyes"; then
++ AC_MSG_RESULT([yes])
++ AC_DEFINE_UNQUOTED(NETBSD_ATOMIC_OPS, 1, [netbsd implementation])
++ need_libatomic_ops=no
+ else
+ AC_MSG_RESULT([no])
+ AC_CACHE_CHECK([compiler support for arm inline asm atomic operations],
+@@ -424,7 +428,7 @@
AC_FUNC_FORK
AC_FUNC_GETGROUPS
AC_FUNC_SELECT_ARGTYPES