head 1.9; access; symbols pkgsrc-2013Q2:1.9.0.4 pkgsrc-2013Q2-base:1.9 pkgsrc-2012Q4:1.9.0.2 pkgsrc-2012Q4-base:1.9 pkgsrc-2012Q3:1.8.0.12 pkgsrc-2012Q3-base:1.8 pkgsrc-2012Q2:1.8.0.10 pkgsrc-2012Q2-base:1.8 pkgsrc-2012Q1:1.8.0.8 pkgsrc-2012Q1-base:1.8 pkgsrc-2011Q4:1.8.0.6 pkgsrc-2011Q4-base:1.8 pkgsrc-2011Q3:1.8.0.4 pkgsrc-2011Q3-base:1.8 pkgsrc-2011Q2:1.8.0.2 pkgsrc-2011Q2-base:1.8 pkgsrc-2011Q1:1.7.0.6 pkgsrc-2011Q1-base:1.7 pkgsrc-2010Q4:1.7.0.4 pkgsrc-2010Q4-base:1.7 pkgsrc-2010Q3:1.7.0.2 pkgsrc-2010Q3-base:1.7 pkgsrc-2010Q2:1.6.0.2 pkgsrc-2009Q4:1.4.0.4 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.2 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.3.0.6 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.4 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.2 pkgsrc-2008Q4-base:1.3; locks; strict; comment @# @; 1.9 date 2012.11.03.01.54.55; author ryoon; state dead; branches; next 1.8; 1.8 date 2011.05.21.15.33.00; author wiz; state Exp; branches; next 1.7; 1.7 date 2010.08.10.05.42.34; author tsutsui; state Exp; branches; next 1.6; 1.6 date 2010.07.24.12.51.09; author tron; state Exp; branches 1.6.2.1; next 1.5; 1.5 date 2010.02.01.15.05.58; author jmcneill; state dead; branches; next 1.4; 1.4 date 2009.09.18.09.59.54; author joerg; state Exp; branches; next 1.3; 1.3 date 2008.12.23.19.29.29; author jmcneill; state Exp; branches; next 1.2; 1.2 date 2008.12.23.02.15.27; author hasso; state Exp; branches; next 1.1; 1.1 date 2008.12.20.16.10.25; author ahoka; state Exp; branches; next ; 1.6.2.1 date 2010.07.24.12.51.09; author spz; state dead; branches; next 1.6.2.2; 1.6.2.2 date 2010.07.25.13.16.12; author spz; state Exp; branches; next ; desc @@ 1.9 log @Update to 2.1 * Tested on NetBSD/i386 5.1, /i386 6.0, and /amd64 6.99.13 * Also tested on OpenIndiana/i386 151a7, but my environment lacks audio device, so I cannot check audio output * Tested with multimedia/mplayer's -ao pulse option, works fine * Add gm4 to USE_TOOLS for OpenIndiana build Changelog: Many changes. See http://www.freedesktop.org/wiki/Software/PulseAudio . @ text @$NetBSD: patch-ba,v 1.8 2011/05/21 15:33:00 wiz Exp $ 1. chunk: 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) 2. chunk: Fix for security vulnerability reported in CVE-2009-1299, taken from here: http://git.0pointer.de/?p=pulseaudio.git;a=patch;h=d3efa43d85ac132c6a5a416a2b6f2115f5d577ee --- configure.ac.orig 2009-11-23 04:06:47.000000000 +0000 +++ 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 -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]) @ 1.8 log @Add comments to most patches. Also add a patch by drochner: pthread_key_create returns 0 on success; return values on failure are not defined. Remaining patches without comments: patch-ab: adding an ifdef notyet in src/daemon/main.c patch-a{c,e}: --start -> -D (no idea why) patch-af: allow some Linux-only code also on NetBSD @ text @d1 1 a1 1 $NetBSD: patch-ba,v 1.7 2010/08/10 05:42:34 tsutsui Exp $ @ 1.7 log @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) @ text @d1 1 a1 1 $NetBSD: patch-ba,v 1.6 2010/07/24 12:51:09 tron Exp $ d3 8 a14 2 Also handle atomic_ops for NetBSD/arm. @ 1.6 log @Add fix for symlink race reported in CVE-2009-1299 taken from Lennart Poettering's GIT repository. @ text @d1 1 a1 1 $NetBSD$ d7 2 d10 13 a22 2 +++ configure.ac 2010-07-24 13:33:30.000000000 +0100 @@@@ -424,7 +424,7 @@@@ @ 1.6.2.1 log @file patch-ba was added on branch pkgsrc-2010Q2 on 2010-07-25 13:16:12 +0000 @ text @d1 17 @ 1.6.2.2 log @Pullup ticket 3182 - requested by tron security patch Revisions pulled up: - pkgsrc/audio/pulseaudio/Makefile 1.38 - pkgsrc/audio/pulseaudio/distinfo 1.21 Files added: pkgsrc/audio/pulseaudio/patches/patch-ba pkgsrc/audio/pulseaudio/patches/patch-bb ------------------------------------------------------------------------- Module Name: pkgsrc Committed By: tron Date: Sat Jul 24 12:51:09 UTC 2010 Modified Files: pkgsrc/audio/pulseaudio: Makefile distinfo Added Files: pkgsrc/audio/pulseaudio/patches: patch-ba patch-bb Log Message: Add fix for symlink race reported in CVE-2009-1299 taken from Lennart Poettering's GIT repository. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 pkgsrc/audio/pulseaudio/Makefile cvs rdiff -u -r1.20 -r1.21 pkgsrc/audio/pulseaudio/distinfo cvs rdiff -u -r0 -r1.6 pkgsrc/audio/pulseaudio/patches/patch-ba cvs rdiff -u -r0 -r1.5 pkgsrc/audio/pulseaudio/patches/patch-bb @ text @a0 17 $NetBSD: patch-ba,v 1.6 2010/07/24 12:51:09 tron Exp $ Fix for security vulnerability reported in CVE-2009-1299, taken from here: http://git.0pointer.de/?p=pulseaudio.git;a=patch;h=d3efa43d85ac132c6a5a416a2b6f2115f5d577ee --- 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 @@@@ 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]) @ 1.5 log @gc old patches, no longer necessary for pa 0.9.21 @ text @d1 1 a1 1 $NetBSD: patch-ba,v 1.4 2009/09/18 09:59:54 joerg Exp $ d3 7 a9 68 --- configure.ac.orig 2009-01-13 00:44:27.000000000 +0100 +++ configure.ac @@@@ -125,7 +125,18 @@@@ AC_ARG_ENABLE([atomic-arm-memory-barrier no) ;; *) AC_MSG_ERROR(bad value ${enableval} for --disable-atomic-arm-linux-helpers) ;; esac - ],) + ],) + +AC_ARG_ENABLE([netbsd-atomic-ops], + AS_HELP_STRING([--enable-netbsd-atomic-ops],[Use the native NetBSD atomic_ops implementation]), + [ + case "${enableval}" in + yes) atomic_netbsd_helpers=yes ;; + no) atomic_netbsd_helpers=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-netbsd-atomic-ops) ;; + esac + ], + [atomic_netbsd_helpers=auto]) AC_MSG_CHECKING([target operating system]) case $host in @@@@ -133,6 +144,10 @@@@ case $host in AC_MSG_RESULT([linux]) pulse_target_os=linux ;; + *-*-netbsd*) + AC_MSG_RESULT([netbsd]) + pulse_target_os=netbsd + ;; *) AC_MSG_RESULT([unknown]) pulse_target_os=unknown @@@@ -193,7 +208,13 @@@@ else fi ;; *) - AC_MSG_RESULT([unknown]) + if 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([unknown]) + fi ;; esac fi @@@@ -263,7 +284,7 @@@@ AC_HEADER_STDC AC_CHECK_HEADERS([arpa/inet.h glob.h grp.h netdb.h netinet/in.h \ netinet/in_systm.h netinet/tcp.h poll.h pwd.h sched.h \ sys/mman.h sys/resource.h sys/select.h sys/socket.h sys/wait.h \ - syslog.h sys/dl.h dlfcn.h linux/sockios.h]) + sys/uio.h syslog.h sys/dl.h dlfcn.h linux/sockios.h]) AC_CHECK_HEADERS([netinet/ip.h], [], [], [#include #if HAVE_NETINET_IN_H @@@@ -292,6 +313,9 @@@@ AC_CHECK_HEADERS([sys/filio.h]) # Windows AC_CHECK_HEADERS([windows.h winsock2.h ws2tcpip.h]) +# NetBSD +AC_CHECK_HEADERS([sys/atomic.h]) + # Other AC_CHECK_HEADERS([sys/ioctl.h]) AC_CHECK_HEADERS([byteswap.h]) @@@@ -359,8 +383,8 @@@@ AC_CHECK_FUNCS([lrintf strtof]) d13 3 a15 4 -AC_CHECK_FUNCS([chmod chown clock_gettime getaddrinfo getgrgid_r \ - getpwuid_r gettimeofday getuid inet_ntop inet_pton mlock nanosleep \ +AC_CHECK_FUNCS([chmod chown clock_gettime getaddrinfo getgrgid_r getgrnam_r \ + getpwnam_r getpwuid_r gettimeofday getuid inet_ntop inet_pton mlock nanosleep \ d17 1 a17 13 sigaction sleep sysconf]) AC_CHECK_FUNCS([mkfifo], [HAVE_MKFIFO=1], [HAVE_MKFIFO=0]) @@@@ -1099,8 +1123,8 @@@@ fi AC_ARG_WITH( [module-dir], - AS_HELP_STRING([--with-module-dir],[Directory where to install the modules to (defaults to ${libdir}/pulse-${PA_MAJORMINOR}/modules/]), - [modlibexecdir=$withval], [modlibexecdir="${libdir}/pulse-${PA_MAJORMINOR}/modules/"]) + AS_HELP_STRING([--with-module-dir],[Directory where to install the modules to (defaults to ${libdir}/pulse-${PA_MAJORMINOR}/modules]), + [modlibexecdir=$withval], [modlibexecdir="${libdir}/pulse-${PA_MAJORMINOR}/modules"]) AC_SUBST(modlibexecdir) @ 1.4 log @Fix default module path to not include trailing slashes as it breaks libtool. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Fix build on NetBSD 4.0. @ text @d3 3 a5 3 --- configure.ac.orig 2008-10-05 20:39:37.000000000 -0400 +++ configure.ac 2008-12-23 12:38:28.000000000 -0500 @@@@ -125,7 +125,18 @@@@ d25 1 a25 1 @@@@ -133,6 +144,10 @@@@ d36 1 a36 1 @@@@ -193,7 +208,13 @@@@ d51 1 a51 1 @@@@ -263,7 +284,7 @@@@ d60 1 a60 1 @@@@ -292,6 +313,9 @@@@ d70 1 a70 1 @@@@ -359,8 +383,8 @@@@ d81 11 @ 1.2 log @Portability fixes to make it compile in DragonFly and possibly to help other platforms. @ text @d1 1 a1 1 $NetBSD: patch-ba,v 1.1 2008/12/20 16:10:25 ahoka Exp $ d3 3 a5 3 --- configure.ac.orig 2008-10-06 03:39:37 +0300 +++ configure.ac 2008-12-23 03:11:41 +0200 @@@@ -125,6 +125,16 @@@@ AC_ARG_ENABLE([atomic-arm-memory-barrier d9 1 d16 2 a17 2 + yes) AC_DEFINE_UNQUOTED(NETBSD_ATOMIC_OPS_ENABLED, 1, [Enable NetBSD atomic_ops]) ;; + no) ;; d20 2 a21 1 ],) d24 2 a25 1 @@@@ -133,6 +143,10 @@@@ case $host in d36 1 a36 1 @@@@ -193,7 +207,13 @@@@ else d41 1 a41 1 + if test "x$pulse_target_os" = "xnetbsd" && test "x$ac_cv_header_sys_atomic_h" != "xno"; then d51 1 a51 1 @@@@ -263,7 +283,7 @@@@ AC_HEADER_STDC d60 1 a60 1 @@@@ -292,6 +312,9 @@@@ AC_CHECK_HEADERS([sys/filio.h]) d70 1 a70 1 @@@@ -359,8 +382,8 @@@@ AC_CHECK_FUNCS([lrintf strtof]) @ 1.1 log @Implement support for atomic_ops(3) backend. This gives us native atomic operations on NetBSD 5.0 and later systems. Use GCC's builtin atomic operations when possible and libatomic_ops as a last case fallback. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- configure.ac.orig 2008-10-06 02:39:37.000000000 +0200 +++ configure.ac d48 9 d67 11 @