|
@@ -5,7 +5,7 @@
|
|
|
|
|
|
%define pkgname ffmpeg
|
|
%define pkgname ffmpeg
|
|
%define name self-build-%{pkgname}
|
|
%define name self-build-%{pkgname}
|
|
-%define version 0.5.3
|
|
|
|
|
|
+%define version 0.5.4
|
|
#% define svndate 20090202
|
|
#% define svndate 20090202
|
|
%define release 2%{?svndate:.%svndate}%{?_dist_release}
|
|
%define release 2%{?svndate:.%svndate}%{?_dist_release}
|
|
|
|
|
|
@@ -26,6 +26,10 @@ Source92: ffserver.1.gz
|
|
Source100: %{pkgname}-textrel.patch
|
|
Source100: %{pkgname}-textrel.patch
|
|
Source110: ffmpeg-0.5-disable-texi2html.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+
|
|
License: GPLv2+
|
|
Group: Restricted Software
|
|
Group: Restricted Software
|
|
|
|
|
|
@@ -140,6 +144,8 @@ MPEG4, h263, ac3, asf, avi, real, mjpeg, flash を含む
|
|
${RPM_BUILD_ROOT}/%{_datadir}/%{name}
|
|
${RPM_BUILD_ROOT}/%{_datadir}/%{name}
|
|
%{__install} -m 644 %{SOURCE100} ${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 %{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
|
|
%clean
|
|
%{__rm} -rf ${RPM_BUILD_ROOT}
|
|
%{__rm} -rf ${RPM_BUILD_ROOT}
|
|
@@ -176,6 +182,14 @@ Rebuild_gpac_$LOCALE
|
|
%{_datadir}/%{name}
|
|
%{_datadir}/%{name}
|
|
|
|
|
|
%changelog
|
|
%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
|
|
* Sat Oct 30 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.5.3-2
|
|
- collected Source0: tag
|
|
- collected Source0: tag
|
|
|
|
|