Fix MIDI support via portsmf. The patches we had were integrated in 1.3.5,

(CVE-2007-6061) so they're no longer relevant.

5 files changed, 3 insertions, 83 deletions

diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index 719981c152e..31cdff19c23 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2015/04/21 01:33:38 rodent Exp $
+# $NetBSD: Makefile,v 1.91 2015/04/21 03:22:58 rodent Exp $
 
 DISTNAME=		audacity-minsrc-2.1.0
 PKGNAME=		${DISTNAME:S/-minsrc//1}
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=	--with-vorbis=system --with-sbsms=system
 CONFIGURE_ARGS+=	--with-libsamplerate=system --with-soundtouch=system
 CONFIGURE_ARGS+=	--with-twolame=system --with-lv2=system
 CONFIGURE_ARGS+=	--with-libsndfile=system --with-portaudio=local
-CONFIGURE_ARGS+=	--enable-nyquist=yes --without-midi # portsmf is BROKEN
+CONFIGURE_ARGS+=	--enable-nyquist=yes --with-midi=local
 
 CONFIG_GUESS_OVERRIDE=		\
 	config.guess */config.guess */*/config.guess */*/*/config.guess
diff --git a/audio/audacity/distinfo b/audio/audacity/distinfo
index 593d9ae744d..fd9a9850848 100644
--- a/audio/audacity/distinfo
+++ b/audio/audacity/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.25 2015/04/21 01:33:38 rodent Exp $
+$NetBSD: distinfo,v 1.26 2015/04/21 03:22:58 rodent Exp $
 
 SHA1 (audacity-minsrc-2.1.0.tar.xz) = a53bce0276240bb56f2e3fd1bf235a4ef688caa3
 RMD160 (audacity-minsrc-2.1.0.tar.xz) = 16b0e91222b91b47eeb533d4725b68e5548c057f
 Size (audacity-minsrc-2.1.0.tar.xz) = 5104924 bytes
 SHA1 (patch-aa) = 67c0ec5ff99004d9035de13f0263add46ed8c994
 SHA1 (patch-am) = 23ffc055ee81fad7b3aab8f7dd447e641644be96
-SHA1 (patch-ba) = 4fca5002ba31e9831f7f7447ac909bd865543f76
-SHA1 (patch-bb) = 29dfe1333ac6428d9b3d40a54a996b12d8766932
-SHA1 (patch-bc) = a19ccf7e7ae048f430d59e1fc17bc9e8ff80b0da
 SHA1 (patch-lib-src_libnyquist_nyquist_nyqsrc_sndread.c) = c7a6c6a7f0dbb3828a4d5780ec94908b40d974d2
 SHA1 (patch-lib-src_libnyquist_nyquist_sys_unix_switches.h) = d313f137f11d3e0fafa383ddeccbc89021e9ddee
 SHA1 (patch-lib-src_libnyquist_nyquist_xlisp_xlfio.c) = a55127d6173d3ffb729fde7358bedd7c1320bf09
diff --git a/audio/audacity/patches/patch-ba b/audio/audacity/patches/patch-ba
deleted file mode 100644
index 23b33102b1b..00000000000
--- a/audio/audacity/patches/patch-ba
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ba,v 1.2 2015/04/20 13:38:23 rodent Exp $
-
-Bounds checking.
-
---- lib-src/portsmf/strparse.cpp.orig	2015-03-02 01:07:05.000000000 +0000
-+++ lib-src/portsmf/strparse.cpp
-@@ -19,8 +19,9 @@ char String_parse::peek()
- }
- 
- 
--void String_parse::get_nonspace_quoted(string &field)
-+void String_parse::get_nonspace_quoted(string &field, int flen)
- {
-+    char *ofield = field;
-     field.clear();
-     skip_space();
-     bool quoted = false;
-@@ -29,7 +30,7 @@ void String_parse::get_nonspace_quoted(s
-         field.append(1, '"');
-         pos = pos + 1;
-     }
--    while ((*str)[pos] && (quoted || !isspace((*str)[pos]))) {
-+    while ((*str)[pos] && (quoted || !isspace((*str)[pos])) && (field - ofield) < (flen - 2)) {
-         if ((*str)[pos] == '"') {
-             if (quoted) {
-                 field.append(1, '"');
diff --git a/audio/audacity/patches/patch-bb b/audio/audacity/patches/patch-bb
deleted file mode 100644
index 87389bc3044..00000000000
--- a/audio/audacity/patches/patch-bb
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-bb,v 1.2 2015/04/20 13:38:23 rodent Exp $
-
-Bounds checking.
-
---- lib-src/portsmf/strparse.h.orig	2015-03-02 01:07:05.000000000 +0000
-+++ lib-src/portsmf/strparse.h
-@@ -10,7 +10,7 @@ public:
-     }
-     void skip_space();
-     char peek();
--    void get_nonspace_quoted(std::string &field);
-+    void get_nonspace_quoted(std::string &field, int flen);
-     // get the remaining characters, skipping initial spaces and final return
-     void get_remainder(std::string &field);
- };
diff --git a/audio/audacity/patches/patch-bc b/audio/audacity/patches/patch-bc
deleted file mode 100644
index 50c1649d4ec..00000000000
--- a/audio/audacity/patches/patch-bc
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-bc,v 1.2 2015/04/20 13:38:23 rodent Exp $
-
-Bounds checking.
-
---- lib-src/portsmf/allegrord.cpp.orig	2015-03-02 01:07:05.000000000 +0000
-+++ lib-src/portsmf/allegrord.cpp
-@@ -169,9 +169,9 @@ bool Alg_reader::parse()
-         Alg_parameters_ptr attributes = NULL;
-         if (line_parser.peek() == '#') {
-             // look for #track
--            line_parser.get_nonspace_quoted(field);
-+            line_parser.get_nonspace_quoted(field, field_max);
-             if (streql(field.c_str(), "#track")) {
--                line_parser.get_nonspace_quoted(field); // number
-+                line_parser.get_nonspace_quoted(field, field_max - strlen(field)); // number
-                 field.insert(0, " "); // need char at beginning because
-                 // parse_int ignores the first character of the argument
-                 track_num = parse_int(field);
-@@ -204,7 +204,7 @@ bool Alg_reader::parse()
-                     parse_error(field, 0, "#offset specified twice");
-                 }
-                 offset_found = true;
--                line_parser.get_nonspace_quoted(field); // number
-+                line_parser.get_nonspace_quoted(field, field_max); // number
-                 field.insert(0, " "); // need char at beginning because
-                 // parse_real ignores first character in the argument
-                 offset = parse_real(field);
-@@ -212,7 +212,7 @@ bool Alg_reader::parse()
-         } else {
-             // we must have a track to insert into
-             if (seq->tracks() == 0) seq->add_track(0);
--            line_parser.get_nonspace_quoted(field);
-+            line_parser.get_nonspace_quoted(field, field_max - strlen(field));
-             char pk = line_parser.peek();
-             // attributes are parsed as two adjacent nonspace_quoted tokens
-             // so we have to conditionally call get_nonspace_quoted() again