diff options
author | explorer <explorer@pkgsrc.org> | 2003-09-05 19:16:23 +0000 |
---|---|---|
committer | explorer <explorer@pkgsrc.org> | 2003-09-05 19:16:23 +0000 |
commit | a7ad50ecd4e3c774a747299848391b6cd4be6320 (patch) | |
tree | 346924890ccdcaf31c8830770572df0b9b440417 | |
parent | 2cf4779abede6b18e0f86b928a11a8acc5617fcb (diff) | |
download | pkgsrc-a7ad50ecd4e3c774a747299848391b6cd4be6320.tar.gz |
add a patch to stop crashing on -d '' or -G '' which abcde wants to use when
a date or genre is unknown
-rw-r--r-- | audio/vorbis-tools/Makefile | 4 | ||||
-rw-r--r-- | audio/vorbis-tools/distinfo | 3 | ||||
-rw-r--r-- | audio/vorbis-tools/patches/patch-ac | 47 |
3 files changed, 51 insertions, 3 deletions
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile index b0f89df31ac..3e5db9fdfad 100644 --- a/audio/vorbis-tools/Makefile +++ b/audio/vorbis-tools/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2003/07/17 21:23:39 grant Exp $ +# $NetBSD: Makefile,v 1.26 2003/09/05 19:16:36 explorer Exp $ DISTNAME= vorbis-tools-1.0 PKGNAME= vorbis-tools-1.0.0.8 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= audio MASTER_SITES= http://www.vorbis.com/files/1.0/unix/ diff --git a/audio/vorbis-tools/distinfo b/audio/vorbis-tools/distinfo index 526e3ab0fdb..fd3427e005c 100644 --- a/audio/vorbis-tools/distinfo +++ b/audio/vorbis-tools/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.10 2003/07/13 21:04:21 wiz Exp $ +$NetBSD: distinfo,v 1.11 2003/09/05 19:16:37 explorer Exp $ SHA1 (vorbis-tools-1.0.tar.gz) = 5c2508786cf6a2a270c697d3debe66ee83df376d Size (vorbis-tools-1.0.tar.gz) = 425404 bytes SHA1 (patch-aa) = 96f0f0239d23df2bec7a7ec30477974ef713105d SHA1 (patch-ab) = 7005d73f3fffb1762fdc52177a8411a1db1b74fe +SHA1 (patch-ac) = 0a0e19efd7135fedd6f67a1d772e27b06fbfd694 diff --git a/audio/vorbis-tools/patches/patch-ac b/audio/vorbis-tools/patches/patch-ac new file mode 100644 index 00000000000..e6060d6bff3 --- /dev/null +++ b/audio/vorbis-tools/patches/patch-ac @@ -0,0 +1,47 @@ +$NetBSD: patch-ac,v 1.5 2003/09/05 19:16:23 explorer Exp $ + +diff -ur oggenc/oggenc.c.orig oggenc/oggenc.c +--- oggenc/oggenc.c.orig 2002-07-11 19:55:11.000000000 -0700 ++++ oggenc/oggenc.c 2003-09-05 12:09:59.000000000 -0700 +@@ -613,6 +613,8 @@ + + break; + case 'a': ++ if (strlen(optarg) == 0) ++ break; + opt->artist = realloc(opt->artist, (++opt->artist_count)*sizeof(char *)); + opt->artist[opt->artist_count - 1] = strdup(optarg); + break; +@@ -625,10 +627,14 @@ + opt->comments[opt->comment_count - 1] = strdup(optarg); + break; + case 'd': ++ if (strlen(optarg) == 0) ++ break; + opt->dates = realloc(opt->dates, (++opt->date_count)*sizeof(char *)); + opt->dates[opt->date_count - 1] = strdup(optarg); + break; + case 'G': ++ if (strlen(optarg) == 0) ++ break; + opt->genre = realloc(opt->genre, (++opt->genre_count)*sizeof(char *)); + opt->genre[opt->genre_count - 1] = strdup(optarg); + break; +@@ -637,6 +643,8 @@ + exit(0); + break; + case 'l': ++ if (strlen(optarg) == 0) ++ break; + opt->album = realloc(opt->album, (++opt->album_count)*sizeof(char *)); + opt->album[opt->album_count - 1] = strdup(optarg); + break; +@@ -647,6 +655,8 @@ + opt->serial = 0; /* Failed, so just set to zero */ + break; + case 't': ++ if (strlen(optarg) == 0) ++ break; + opt->title = realloc(opt->title, (++opt->title_count)*sizeof(char *)); + opt->title[opt->title_count - 1] = strdup(optarg); + break; |