updated self-build-ffmpeg-vl.spec

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3763 ec354946-7b23-47d6-9f5a-488ba84defc7

nonfree/self-build-ffmpeg/ffmpeg-vl.spec

@@ -12,7 +12,7 @@
 
 Summary:	Digital VCR and streaming server
 Name:		ffmpeg
-Version:	0.6.2
+Version:	0.6.3
 Release:	1%{?svndate:.%svndate}%{?_dist_release}
 Source:		http://ffmpeg.org/releases/%{name}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 Source1:        %{name}-snapshot.sh
@@ -206,6 +206,9 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 
 
 %changelog
+* Sun May 01 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.6.3-1
+- new upstream release
+
 * Tue Apr 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.6.2-1
 - new upstream release
 

nonfree/self-build-ffmpeg/ffmpeg-vl5.spec

@@ -1,8 +1,8 @@
 #TODO: Build with openjpeg
 %define name	ffmpeg
-%define version	0.5.3
+%define version	0.5.4
 #% define svndate	20090227
-%define release	1%{?svndate:.%svndate}%{?_dist_release}
+%define release	2%{?svndate:.%svndate}%{?_dist_release}
 
 Summary:	Digital VCR and streaming server
 Name:		%{name}
@@ -22,6 +22,14 @@ Patch0:         %{name}-textrel.patch
 
 Patch10:        ffmpeg-0.5-disable-texi2html.patch
 
+# upstreamed patches: 
+# AMV: Fix possibly exploitable crash.
+# http://git.videolan.org/gitweb.cgi?p=ffmpeg.git;a=commit;h=8210ee22e2f69d540f8835523dd78a205ae6c2a6
+Patch51: ffmpeg-0.5.4-fix-possibly-exploitable-crash.patch
+# Fix apparently exploitable race condition.
+# http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=24cd7c5df78c53c1d1a36b81fb130594e84b3f12
+Patch52: ffmpeg-0.5.4-fix-apparently-exploitable-race-condition.patch
+
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://ffmpeg.org/
@@ -91,6 +99,10 @@ This package contains development files for %{name}.
 %patch0 -p1 -b .textrel
 %patch10 -p1 -b .texi2html
 
+## upstreamed patches
+%patch51 -p1 -b .orig
+%patch52 -p1 -b .orig
+
 %build
 %ifarch ppc
 # compile with -mlongcall on ppc/ppc64 (rf804)
@@ -179,6 +191,17 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 
 
 %changelog
+* Sun May 01 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.5.4-2
+- applied some upstreamed/security patches:
+  - AMV: fix possibly exploitable crash
+  - fix apparently exploitable race condition
+
+* Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.5.4-1
+- new upstream release
+
+* Sat Oct 30 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.5.3-2
+- change release to sync with self-build-ffmpeg
+
 * Sat Oct 30 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.5.3-1
 - new upstream release
 

nonfree/self-build-ffmpeg/self-build-ffmpeg-vl.spec

@@ -6,7 +6,7 @@
 
 %define pkgname ffmpeg
 %define name	self-build-%{pkgname}
-%define version 0.6.2
+%define version 0.6.3
 #% define svndate	20110326
 %define release	1%{?svndate:.%svndate}%{?_dist_release}
 
@@ -187,6 +187,9 @@ Rebuild_gpac_$LOCALE
 %{_datadir}/%{name}
 
 %changelog
+* Sun May 01 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.6.3-1
+- new upstream release
+
 * Tue Apr 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.6.2-1
 - new upstream release
 

nonfree/self-build-ffmpeg/self-build-ffmpeg-vl5.spec

@@ -5,7 +5,7 @@
 
 %define pkgname ffmpeg
 %define name	self-build-%{pkgname}
-%define version 0.5.3
+%define version 0.5.4
 #% define svndate	20090202
 %define release	2%{?svndate:.%svndate}%{?_dist_release}
 
@@ -26,6 +26,10 @@ Source92:	ffserver.1.gz
 Source100:      %{pkgname}-textrel.patch
 Source110:      ffmpeg-0.5-disable-texi2html.patch
 
+# upstreamed patches: 
+Source151: ffmpeg-0.5.4-fix-possibly-exploitable-crash.patch
+Source152: ffmpeg-0.5.4-fix-apparently-exploitable-race-condition.patch
+
 License:	GPLv2+
 Group:		Restricted Software
 
@@ -140,6 +144,8 @@ MPEG4, h263, ac3, asf, avi, real, mjpeg, flash を含む
     ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE100} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE110} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+%{__install} -m 644 %{SOURCE151} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+%{__install} -m 644 %{SOURCE152} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
@@ -176,6 +182,14 @@ Rebuild_gpac_$LOCALE
 %{_datadir}/%{name}
 
 %changelog
+* Sun May 01 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.5.4-2
+- applied some upstreamed/security patches:
+  - AMV: fix possibly exploitable crash
+  - fix apparently exploitable race condition
+
+* Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.5.4-1
+- new upstream release
+
 * Sat Oct 30 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.5.3-2
 - collected Source0: tag