rpms/xine-lib/F-8 xine-lib-1.1.12-CVE-2008-1878.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 xine-lib.spec, 1.37, 1.38 xine-lib-1.1.11.1-mkv.patch, 1.1, NONE xine-lib-1.1.11.1-qt.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Thu Apr 24 15:23:46 UTC 2008
Author: rdieter
Update of /cvs/pkgs/rpms/xine-lib/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27081
Modified Files:
.cvsignore sources xine-lib.spec
Added Files:
xine-lib-1.1.12-CVE-2008-1878.patch
Removed Files:
xine-lib-1.1.11.1-mkv.patch xine-lib-1.1.11.1-qt.patch
Log Message:
* Thu Apr 24 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.12-2
- CVE-2008-1878 (#443055)
* Wed Apr 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.12-1
- 1.1.12 (plugin ABI 1.21); qt, mkv, and pulseaudio patches applied upstream.
xine-lib-1.1.12-CVE-2008-1878.patch:
--- NEW FILE xine-lib-1.1.12-CVE-2008-1878.patch ---
diff -up xine-lib-1.1.12/src/demuxers/demux_nsf.c.CVE-2008-1878 xine-lib-1.1.12/src/demuxers/demux_nsf.c
--- xine-lib-1.1.12/src/demuxers/demux_nsf.c.CVE-2008-1878 2008-03-28 09:24:50.000000000 -0500
+++ xine-lib-1.1.12/src/demuxers/demux_nsf.c 2008-04-24 06:52:45.000000000 -0500
@@ -106,9 +106,9 @@ static int open_nsf_file(demux_nsf_t *th
this->total_songs = header[6];
this->current_song = header[7];
- this->title = strdup(&header[0x0E]);
- this->artist = strdup(&header[0x2E]);
- this->copyright = strdup(&header[0x4E]);
+ this->title = strndup((char*)&header[0x0E], 0x20);
+ this->artist = strndup((char*)&header[0x2E], 0x20);
+ this->copyright = strndup((char*)&header[0x4E], 0x20);
this->filesize = this->input->get_length(this->input);
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-8/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 30 Mar 2008 18:50:08 -0000 1.15
+++ .cvsignore 24 Apr 2008 15:23:09 -0000 1.16
@@ -1,2 +1,2 @@
-xine-lib-1.1.11.1-pruned.tar.bz2
-xine-lib-1.1.11.1-autotools.patch.bz2
+xine-lib-1.1.12-pruned.tar.bz2
+xine-lib-1.1.12-autotools.patch.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-8/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 30 Mar 2008 18:50:08 -0000 1.15
+++ sources 24 Apr 2008 15:23:09 -0000 1.16
@@ -1,2 +1,2 @@
-b6a4fe9dd2ec80452870a8bfbb3974f0 xine-lib-1.1.11.1-pruned.tar.bz2
-c257bf0b964d25592f1c612149ae2c7a xine-lib-1.1.11.1-autotools.patch.bz2
+3f918af93f52e486fb8fd4dfec04f98f xine-lib-1.1.12-pruned.tar.bz2
+771565628e4dfcfc8657b1256b9f41ef xine-lib-1.1.12-autotools.patch.bz2
Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-8/xine-lib.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xine-lib.spec 9 Apr 2008 19:35:56 -0000 1.37
+++ xine-lib.spec 24 Apr 2008 15:23:09 -0000 1.38
@@ -2,13 +2,13 @@
# - libstk: http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog
# - drop the opengl video out plugin?
# http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html
-# - move pulseaudio to main package from -extras?
+# - move -pulseaudio to main package?
# http://fedoraproject.org/wiki/Releases/FeaturePulseaudio
# --> not yet:
# http://www.redhat.com/archives/fedora-devel-list/2007-August/msg01411.html
# - external dvdnav - not compatible as of 1.1.11 and 4.1.1
-%define abiver 1.20
+%define abiver 1.21
%define codecdir %{_libdir}/codecs
%ifarch %{ix86}
@@ -31,8 +31,8 @@
Summary: Xine library
Name: xine-lib
-Version: 1.1.11.1
-Release: 1%{?dist}.1
+Version: 1.1.12
+Release: 2%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://xinehq.de/
@@ -46,12 +46,9 @@
Patch0: %{name}-%{version}-autotools.patch.bz2
Patch1: %{name}-1.1.4-optflags.patch
Patch6: %{name}-1.1.1-deepbind-939.patch
+Patch7: %{name}-1.1.12-CVE-2008-1878.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# upstream patches
-Patch101: %{name}-1.1.11.1-mkv.patch
-Patch102: %{name}-1.1.11.1-qt.patch
-
Provides: xine-lib(plugin-abi) = %{abiver}
# X11
BuildRequires: libX11-devel
@@ -123,6 +120,7 @@
%description devel
This package contains development files for xine-lib.
+# TODO: consider removing and/or marking as deprecated for F9+ -- Rex
%package arts
Summary: aRts plugin for xine-lib
Group: System Environment/Libraries
@@ -133,6 +131,16 @@
%description arts
This package contains the aRts extra plugin for xine-lib.
+%package pulseaudio
+Summary: Pulseaudio plugin for xine-lib
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+# -pulseaudio was split off -extras at 1.1.11.1-2
+#Obsoletes: xine-lib-extras < 1.1.11.1-2
+
+%description pulseaudio
+This package contains the pulseaudio plugin for xine-lib.
+
%package extras
Summary: Additional plugins for xine-lib
Group: System Environment/Libraries
@@ -142,9 +150,6 @@
This package contains extra plugins for xine-lib:
- EsounD
- JACK
-%if %{with_pa}
- - Pulseaudio
-%endif # pa
- GDK-Pixbuf
- GNOME VFS
- SMB
@@ -172,9 +177,7 @@
touch -r m4/optimizations.m4.stamp m4/optimizations.m4
# Patch6 needed at least when compiling with external ffmpeg, #939.
%patch6 -p1 -b .deepbind
-
-%patch101 -p1 -b .mkv
-%patch102 -p1 -b .qt
+%patch7 -p1 -b .CVE-2008-1878
# Avoid standard rpaths on lib64 archs:
sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -337,6 +340,7 @@
%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_fb.so
%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_none.so
%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_opengl.so
+%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_raw.so
%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_syncfb.so
%if %{have_vidix}
%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_vidix.so
@@ -355,13 +359,16 @@
%defattr(-,root,root,-)
%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_arts.so
+%if %{with_pa}
+%files pulseaudio
+%defattr(-,root,root,-)
+%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_pulseaudio.so
+%endif
+
%files extras
%defattr(-,root,root,-)
%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_esd.so
%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_jack.so
-%if %{with_pa}
-%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_pulseaudio.so
-%endif # pa
%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gdk_pixbuf.so
%if 0%{!?_without_imagemagick:1}
%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_image.so
@@ -384,15 +391,27 @@
%defattr(-,root,root,-)
%doc __docs/hackersguide/*
%{_bindir}/xine-config
+%{_bindir}/xine-list*
%{_datadir}/aclocal/xine.m4
%{_includedir}/xine.h
%{_includedir}/xine/
%{_libdir}/libxine.so
%{_libdir}/pkgconfig/libxine.pc
%{_mandir}/man1/xine-config.1*
+%{_mandir}/man1/xine-list*.1*
%changelog
+* Thu Apr 24 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.12-2
+- CVE-2008-1878 (#443055)
+
+* Wed Apr 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.12-1
+- 1.1.12 (plugin ABI 1.21); qt, mkv, and pulseaudio patches applied upstream.
+
+* Mon Apr 9 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.11.1-2
+- pulse-rework2 patch (#439731)
+- -pulseaudio subpkg (#439731)
+
* Wed Apr 9 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11.1-1.1
- Apply upstream fixes for Quicktime (#441705) and Matroska regressions
introduced in 1.1.11.1.
--- xine-lib-1.1.11.1-mkv.patch DELETED ---
--- xine-lib-1.1.11.1-qt.patch DELETED ---
More information about the scm-commits
mailing list