From 1013f838181556002c0afa155af511dfc87d2257 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@fedoraproject.org>
Date: Jun 15 2010 10:49:14 +0000
Subject: - fix SIGSEGV of vorbiscomment --tag (#602904)


---

diff --git a/vorbis-tools-1.2.0-vcomment-tag.patch b/vorbis-tools-1.2.0-vcomment-tag.patch
new file mode 100644
index 0000000..f20f01c
--- /dev/null
+++ b/vorbis-tools-1.2.0-vcomment-tag.patch
@@ -0,0 +1,13 @@
+diff --git a/vorbiscomment/vcomment.c b/vorbiscomment/vcomment.c
+index d37ba08..83ce1db 100644
+--- a/vorbiscomment/vcomment.c
++++ b/vorbiscomment/vcomment.c
+@@ -34,7 +34,7 @@
+ struct option long_options[] = {
+ 	{"list",0,0,'l'},
+ 	{"append",0,0,'a'},
+-	{"tag",0,0,'t'},
++	{"tag",required_argument,0,'t'},
+ 	{"write",0,0,'w'},
+ 	{"help",0,0,'h'},
+ 	{"quiet",0,0,'q'}, /* unused */
diff --git a/vorbis-tools.spec b/vorbis-tools.spec
index 0cd8adb..0bc92bf 100644
--- a/vorbis-tools.spec
+++ b/vorbis-tools.spec
@@ -1,14 +1,20 @@
 Summary:	The Vorbis General Audio Compression Codec tools
 Name:		vorbis-tools
 Version:	1.2.0
-Release:	7%{?dist}
+Release:	8%{?dist}
 Epoch:		1
 Group:		Applications/Multimedia
 License:	GPLv2
 URL:		http://www.xiph.org/
 Source:		http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.gz
 Patch0:		vorbis-tools-1.2.0-non-block.patch
+
+# fix for #526653
 Patch1:		vorbis-tools-1.2.0-oggenc-resample.patch
+
+# fix for #602904
+Patch2:		vorbis-tools-1.2.0-vcomment-tag.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libvorbis-devel libao-devel curl-devel speex-devel flac-devel
 Obsoletes:	vorbis < %{epoch}:%{version}-%{release}
@@ -27,6 +33,7 @@ comment editor.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure
@@ -51,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 15 2010 Kamil Dudka <kdudka@redhat.com> - 1:1.2.0-8
+- fix SIGSEGV of vorbiscomment --tag (#602904)
+
 * Wed Nov 25 2009 Kamil Dudka <kdudka@redhat.com> - 1:1.2.0-7
 - fix source URL