summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authormarkd <markd>2007-05-05 21:31:09 +0000
committermarkd <markd>2007-05-05 21:31:09 +0000
commit78918f2143478da92bcddd11adb85f9edf1d4fad (patch)
tree2c7ee2152e3e309b589d61cf9049b30a83827654 /audio
parent8bf9e456d4e0f147e231b462817c2f128214fd71 (diff)
downloadpkgsrc-78918f2143478da92bcddd11adb85f9edf1d4fad.tar.gz
Update nas to 1.9
Fixes to several DOS attacks that could be carried out aginst a nasd server, ANSI'fication of most of the server and client code, and significant rework of input and output mixer handling in the voxware (OSS) server.
Diffstat (limited to 'audio')
-rw-r--r--audio/nas-auscope/Makefile6
-rw-r--r--audio/nas-auscope/distinfo8
-rw-r--r--audio/nas/Makefile5
-rw-r--r--audio/nas/distinfo14
-rw-r--r--audio/nas/patches/patch-ab8
-rw-r--r--audio/nas/patches/patch-ad44
-rw-r--r--audio/nas/patches/patch-ag6
7 files changed, 45 insertions, 46 deletions
diff --git a/audio/nas-auscope/Makefile b/audio/nas-auscope/Makefile
index 8d3844e5960..e2202455d20 100644
--- a/audio/nas-auscope/Makefile
+++ b/audio/nas-auscope/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2007/03/24 20:27:19 markd Exp $
+# $NetBSD: Makefile,v 1.3 2007/05/05 21:31:10 markd Exp $
-DISTNAME= nas-1.8.src
-PKGNAME= nas-auscope-1.8
+DISTNAME= nas-1.9.src
+PKGNAME= nas-auscope-1.9
CATEGORIES= audio
MASTER_SITES= http://nas.codebrilliance.com/nas/ \
ftp://ftp.uni-duisburg.de/Sound/NAS/
diff --git a/audio/nas-auscope/distinfo b/audio/nas-auscope/distinfo
index 4c22ab6ffdb..d17a4bc6234 100644
--- a/audio/nas-auscope/distinfo
+++ b/audio/nas-auscope/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/24 13:47:48 markd Exp $
+$NetBSD: distinfo,v 1.2 2007/05/05 21:31:10 markd Exp $
-SHA1 (nas-1.8.src.tar.gz) = 6752861196f0b11db93572d935dc87bc6c0da348
-RMD160 (nas-1.8.src.tar.gz) = c7c99d7c3f66d8255bd5708325bd5c71c73b0a47
-Size (nas-1.8.src.tar.gz) = 1290578 bytes
+SHA1 (nas-1.9.src.tar.gz) = 2ee3151c71a6667bd996a0f1cda18a8b9d7cb0c7
+RMD160 (nas-1.9.src.tar.gz) = a691f10d557bd676bbc2e9f0db949169815446aa
+Size (nas-1.9.src.tar.gz) = 1471635 bytes
SHA1 (patch-aa) = 1b504906166df26b57d39c8c7e0099ddad7308b2
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 24c7ef07847..292276ff486 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.74 2007/05/02 12:51:43 gdt Exp $
+# $NetBSD: Makefile,v 1.75 2007/05/05 21:31:09 markd Exp $
-DISTNAME= nas-1.8.src
+DISTNAME= nas-1.9.src
PKGNAME= ${DISTNAME:S/.src//}
-PKGREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://nas.codebrilliance.com/nas/ \
ftp://ftp.uni-duisburg.de/Sound/NAS/
diff --git a/audio/nas/distinfo b/audio/nas/distinfo
index 019c6b49922..31eb1813101 100644
--- a/audio/nas/distinfo
+++ b/audio/nas/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.19 2007/03/24 13:45:05 markd Exp $
+$NetBSD: distinfo,v 1.20 2007/05/05 21:31:09 markd Exp $
-SHA1 (nas-1.8.src.tar.gz) = 6752861196f0b11db93572d935dc87bc6c0da348
-RMD160 (nas-1.8.src.tar.gz) = c7c99d7c3f66d8255bd5708325bd5c71c73b0a47
-Size (nas-1.8.src.tar.gz) = 1290578 bytes
+SHA1 (nas-1.9.src.tar.gz) = 2ee3151c71a6667bd996a0f1cda18a8b9d7cb0c7
+RMD160 (nas-1.9.src.tar.gz) = a691f10d557bd676bbc2e9f0db949169815446aa
+Size (nas-1.9.src.tar.gz) = 1471635 bytes
SHA1 (patch-aa) = 4026d90594cf31b15624a3c8cb72316978224113
-SHA1 (patch-ab) = f86037dc3a52cff543ee077d7f0d0a97cf24d9ff
+SHA1 (patch-ab) = d424b0970bd23584629f6a9bebea8b8c014462b5
SHA1 (patch-ac) = 36f8ee0ec494e9d6a7994780c608c7a5fbf2114d
-SHA1 (patch-ad) = 5918e8188c8400fc7133c3ae4016d99c7c7594fa
+SHA1 (patch-ad) = d749d1e6f0ede2a848cb663ed8dddcb7ee9f8c48
SHA1 (patch-ae) = f8ec2cb1809937aa7366ab65bee294e8affce543
SHA1 (patch-af) = c08e0e2e6bfe6fd3aed7171dfd16a4df99a0b66a
-SHA1 (patch-ag) = fe8e2eed681f94499aaa1bbd19b158d2047a29fd
+SHA1 (patch-ag) = 99a8c9af8385d0ce9c4c08f09b4ae41a2ba268ab
diff --git a/audio/nas/patches/patch-ab b/audio/nas/patches/patch-ab
index 8ebe6cb88b2..e63e99dd76c 100644
--- a/audio/nas/patches/patch-ab
+++ b/audio/nas/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.12 2006/01/11 11:32:38 markd Exp $
+$NetBSD: patch-ab,v 1.13 2007/05/05 21:31:10 markd Exp $
---- server/Imakefile.orig 2005-06-04 16:40:58.000000000 +1200
+--- server/Imakefile.orig 2006-08-14 13:04:17.000000000 +1200
+++ server/Imakefile
@@ -61,7 +61,7 @@ XCOMM $NCDId: @(#)Imakefile,v 1.17 1995/
#endif
@@ -15,8 +15,8 @@ $NetBSD: patch-ab,v 1.12 2006/01/11 11:32:38 markd Exp $
#endif
--#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
-+#if defined(i386SVR4Architecture) || defined(__FreeBSD__) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
+-#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
++#if defined(i386SVR4Architecture) || defined(__FreeBSD_kernel__) || defined(__FreeBSD__) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(LinuxArchitecture) || defined(i386BsdArchitecture) || defined(USLArchitecture) || defined(cygwinArchitecture) || defined(__DragonFly__)
# define CanBuildAuServer YES
# if defined(cygwinArchitecture)
diff --git a/audio/nas/patches/patch-ad b/audio/nas/patches/patch-ad
index a5d14f63795..3df5721084c 100644
--- a/audio/nas/patches/patch-ad
+++ b/audio/nas/patches/patch-ad
@@ -1,30 +1,30 @@
-$NetBSD: patch-ad,v 1.10 2004/11/23 08:50:24 adam Exp $
+$NetBSD: patch-ad,v 1.11 2007/05/05 21:31:10 markd Exp $
---- server/dda/voxware/auvoxware.c.orig 2004-10-22 21:44:47.000000000 +0000
+--- server/dda/voxware/auvoxware.c.orig 2007-03-18 17:05:55.000000000 +1200
+++ server/dda/voxware/auvoxware.c
-@@ -242,8 +242,13 @@ SndStat sndStatIn =
- 256, /* fragSize */
- 3, /* minFrags */
- 32, /* maxFrags */
+@@ -249,8 +249,13 @@ SndStat sndStatIn = {
+ 256, /* fragSize */
+ 3, /* minFrags */
+ 32, /* maxFrags */
+#if defined(__NetBSD__)
-+ "@DEVOSSAUDIO@", /* device */
-+ "/dev/mixer", /* mixer */
++ "@DEVOSSAUDIO@", /* device */
++ "/dev/mixer", /* mixer */
+#else
- "/dev/dsp1", /* device */
- "/dev/mixer1", /* mixer */
+ "/dev/dsp1", /* device */
+ "/dev/mixer1", /* mixer */
+#endif
- #if defined(__CYGWIN__)
- O_RDONLY, /* howToOpen */
- #else
-@@ -264,7 +269,11 @@ SndStat sndStatIn =
- 256, /* fragSize */
- 3, /* minFrags */
- 32, /* maxFrags */
+ O_RDONLY, /* howToOpen */
+ 1, /* autoOpen */
+ 0, /* forceRate */
+@@ -270,7 +275,11 @@ SndStat sndStatOut = {
+ 256, /* fragSize */
+ 3, /* minFrags */
+ 32, /* maxFrags */
+#if defined(__NetBSD__)
-+ "@DEVOSSAUDIO@", /* device */
++ "@DEVOSSAUDIO@", /* device */
+#else
- "/dev/dsp", /* device */
+ "/dev/dsp", /* device */
+#endif
- "/dev/mixer", /* mixer */
- #if defined(__CYGWIN__)
- O_WRONLY, /* howToOpen */
+ "/dev/mixer", /* mixer */
+ O_WRONLY, /* howToOpen */
+ 1, /* autoOpen */
diff --git a/audio/nas/patches/patch-ag b/audio/nas/patches/patch-ag
index 6a82b3b512b..7fb86743fda 100644
--- a/audio/nas/patches/patch-ag
+++ b/audio/nas/patches/patch-ag
@@ -1,10 +1,10 @@
-$NetBSD: patch-ag,v 1.4 2006/01/11 11:32:38 markd Exp $
+$NetBSD: patch-ag,v 1.5 2007/05/05 21:31:10 markd Exp $
---- config/NetAudio.tmpl.orig 2006-01-11 23:44:25.000000000 +1300
+--- config/NetAudio.tmpl.orig 2006-11-28 08:41:42.000000000 +1300
+++ config/NetAudio.tmpl
@@ -287,6 +287,8 @@ AuComplexProgramTarget(program)
release.h: $(TOP)/RELEASE @@\
- @echo "static char *release = \"@(#)`cat $(TOP)/RELEASE`\";" > $@ @@\
+ @echo "static const char *release = \"`cat $(TOP)/RELEASE`\";" > $@ @@\
@@\
+includes:: release.h @@\
+ @@\