From bd1cc3b82943cbd42ec5fcc61af83077db98b518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 30 Mar 2008 18:50:26 +0000 Subject: [PATCH] =?UTF-8?q?*=20Sun=20Mar=2030=202008=20Ville=20Skytt=C3=A4?= =?UTF-8?q?=20=20-=201.1.11.1-1=20-=201.1.11.1?= =?UTF-8?q?=20(security=20update,=20#438663,=20CVE-2008-1482).=20-=20Provi?= =?UTF-8?q?de=20versioned=20xine-lib(plugin-abi)=20so=203rd=20party=20pack?= =?UTF-8?q?ages=20installing=20=20=20plugins=20can=20use=20it=20instead=20?= =?UTF-8?q?of=20requiring=20a=20version=20of=20xine-lib.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 4 +- sources | 4 +- xine-lib.spec | 206 ++++++++++++++++++++++++++------------------------ 3 files changed, 111 insertions(+), 103 deletions(-) diff --git a/.cvsignore b/.cvsignore index b01f673..907cc99 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -xine-lib-1.1.11-pruned.tar.bz2 -xine-lib-1.1.11-autotools.patch.bz2 +xine-lib-1.1.11.1-pruned.tar.bz2 +xine-lib-1.1.11.1-autotools.patch.bz2 diff --git a/sources b/sources index 9f141e7..7c8f9d9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -40d8c51a914ed20b8499c5da9cf57bc0 xine-lib-1.1.11-pruned.tar.bz2 -bb30e6af99e5abfcb6133fbe347be7eb xine-lib-1.1.11-autotools.patch.bz2 +b6a4fe9dd2ec80452870a8bfbb3974f0 xine-lib-1.1.11.1-pruned.tar.bz2 +c257bf0b964d25592f1c612149ae2c7a xine-lib-1.1.11.1-autotools.patch.bz2 diff --git a/xine-lib.spec b/xine-lib.spec index e65a622..383882d 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -8,7 +8,8 @@ # 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 codecdir %{_libdir}/codecs +%define abiver 1.20 +%define codecdir %{_libdir}/codecs %ifarch %{ix86} %define have_vidix 1 @@ -30,7 +31,7 @@ Summary: Xine library Name: xine-lib -Version: 1.1.11 +Version: 1.1.11.1 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -46,6 +47,8 @@ Patch0: %{name}-%{version}-autotools.patch.bz2 Patch1: %{name}-1.1.4-optflags.patch Patch6: %{name}-1.1.1-deepbind-939.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Provides: xine-lib(plugin-abi) = %{abiver} # X11 BuildRequires: libX11-devel BuildRequires: libXv-devel @@ -243,132 +246,132 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/xine.5* %dir %{_libdir}/xine/ %dir %{_libdir}/xine/plugins/ -%dir %{_libdir}/xine/plugins/*/ -%{_libdir}/xine/plugins/*/mime.types +%dir %{_libdir}/xine/plugins/%{abiver}/ +%{_libdir}/xine/plugins/%{abiver}/mime.types # Listing every plugin separately for better control over binary packages # containing exactly the plugins we want, nothing accidentally snuck in # nor dropped. -%dir %{_libdir}/xine/plugins/*/post/ -%{_libdir}/xine/plugins/*/post/xineplug_post_audio_filters.so -%{_libdir}/xine/plugins/*/post/xineplug_post_goom.so -%{_libdir}/xine/plugins/*/post/xineplug_post_mosaico.so -%{_libdir}/xine/plugins/*/post/xineplug_post_switch.so -%{_libdir}/xine/plugins/*/post/xineplug_post_visualizations.so +%dir %{_libdir}/xine/plugins/%{abiver}/post/ +%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_audio_filters.so +%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_goom.so +%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_mosaico.so +%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_switch.so +%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_visualizations.so %if %{have_vidix} -%dir %{_libdir}/xine/plugins/*/vidix/ -%{_libdir}/xine/plugins/*/vidix/cyberblade_vid.so -%{_libdir}/xine/plugins/*/vidix/mach64_vid.so -%{_libdir}/xine/plugins/*/vidix/mga_crtc2_vid.so -%{_libdir}/xine/plugins/*/vidix/mga_vid.so -%{_libdir}/xine/plugins/*/vidix/nvidia_vid.so -%{_libdir}/xine/plugins/*/vidix/pm2_vid.so -%{_libdir}/xine/plugins/*/vidix/pm3_vid.so -%{_libdir}/xine/plugins/*/vidix/radeon_vid.so -%{_libdir}/xine/plugins/*/vidix/rage128_vid.so -%{_libdir}/xine/plugins/*/vidix/savage_vid.so -%{_libdir}/xine/plugins/*/vidix/sis_vid.so -%{_libdir}/xine/plugins/*/vidix/unichrome_vid.so +%dir %{_libdir}/xine/plugins/%{abiver}/vidix/ +%{_libdir}/xine/plugins/%{abiver}/vidix/cyberblade_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/mach64_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/mga_crtc2_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/mga_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/nvidia_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/pm2_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/pm3_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/radeon_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/rage128_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/savage_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/sis_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/unichrome_vid.so %endif # vidix -%{_libdir}/xine/plugins/*/xineplug_ao_out_alsa.so -%{_libdir}/xine/plugins/*/xineplug_ao_out_file.so -%{_libdir}/xine/plugins/*/xineplug_ao_out_none.so -%{_libdir}/xine/plugins/*/xineplug_ao_out_oss.so -%{_libdir}/xine/plugins/*/xineplug_decode_bitplane.so -%{_libdir}/xine/plugins/*/xineplug_decode_gsm610.so -%{_libdir}/xine/plugins/*/xineplug_decode_lpcm.so -%{_libdir}/xine/plugins/*/xineplug_decode_mpc.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_alsa.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_file.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_none.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_oss.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_bitplane.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gsm610.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_lpcm.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_mpc.so %ifarch %ix86 -%{_libdir}/xine/plugins/*/xineplug_decode_qt.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_qt.so %endif # ix86 -%{_libdir}/xine/plugins/*/xineplug_decode_real.so -%{_libdir}/xine/plugins/*/xineplug_decode_rgb.so -%{_libdir}/xine/plugins/*/xineplug_decode_speex.so -%{_libdir}/xine/plugins/*/xineplug_decode_spu.so -%{_libdir}/xine/plugins/*/xineplug_decode_spucc.so -%{_libdir}/xine/plugins/*/xineplug_decode_spucmml.so -%{_libdir}/xine/plugins/*/xineplug_decode_spudvb.so -%{_libdir}/xine/plugins/*/xineplug_decode_sputext.so -%{_libdir}/xine/plugins/*/xineplug_decode_theora.so -%{_libdir}/xine/plugins/*/xineplug_decode_vorbis.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_real.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_rgb.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_speex.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spu.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucc.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucmml.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spudvb.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_sputext.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_theora.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_vorbis.so %ifarch %ix86 -%{_libdir}/xine/plugins/*/xineplug_decode_w32dll.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_w32dll.so %endif # ix86 -%{_libdir}/xine/plugins/*/xineplug_decode_yuv.so -%{_libdir}/xine/plugins/*/xineplug_dmx_audio.so -%{_libdir}/xine/plugins/*/xineplug_dmx_avi.so -%{_libdir}/xine/plugins/*/xineplug_dmx_fli.so -%{_libdir}/xine/plugins/*/xineplug_dmx_flv.so -%{_libdir}/xine/plugins/*/xineplug_dmx_games.so -%{_libdir}/xine/plugins/*/xineplug_dmx_iff.so -%{_libdir}/xine/plugins/*/xineplug_dmx_image.so -%{_libdir}/xine/plugins/*/xineplug_dmx_matroska.so -%{_libdir}/xine/plugins/*/xineplug_dmx_mng.so -%{_libdir}/xine/plugins/*/xineplug_dmx_nsv.so -%{_libdir}/xine/plugins/*/xineplug_dmx_ogg.so -%{_libdir}/xine/plugins/*/xineplug_dmx_pva.so -%{_libdir}/xine/plugins/*/xineplug_dmx_qt.so -%{_libdir}/xine/plugins/*/xineplug_dmx_rawdv.so -%{_libdir}/xine/plugins/*/xineplug_dmx_real.so -%{_libdir}/xine/plugins/*/xineplug_dmx_slave.so -%{_libdir}/xine/plugins/*/xineplug_dmx_sputext.so -%{_libdir}/xine/plugins/*/xineplug_dmx_yuv_frames.so -%{_libdir}/xine/plugins/*/xineplug_flac.so -%{_libdir}/xine/plugins/*/xineplug_inp_cdda.so -%{_libdir}/xine/plugins/*/xineplug_inp_dvb.so -%{_libdir}/xine/plugins/*/xineplug_inp_file.so -%{_libdir}/xine/plugins/*/xineplug_inp_http.so -%{_libdir}/xine/plugins/*/xineplug_inp_net.so -%{_libdir}/xine/plugins/*/xineplug_inp_pnm.so -%{_libdir}/xine/plugins/*/xineplug_inp_pvr.so -%{_libdir}/xine/plugins/*/xineplug_inp_rtp.so -%{_libdir}/xine/plugins/*/xineplug_inp_rtsp.so -%{_libdir}/xine/plugins/*/xineplug_inp_stdin_fifo.so -%{_libdir}/xine/plugins/*/xineplug_inp_v4l.so -%{_libdir}/xine/plugins/*/xineplug_vo_out_fb.so -%{_libdir}/xine/plugins/*/xineplug_vo_out_none.so -%{_libdir}/xine/plugins/*/xineplug_vo_out_opengl.so -%{_libdir}/xine/plugins/*/xineplug_vo_out_syncfb.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_yuv.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_audio.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_avi.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_fli.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_flv.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_games.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_iff.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_image.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_matroska.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mng.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_nsv.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_ogg.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_pva.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_qt.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_rawdv.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_real.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_slave.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_sputext.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv_frames.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_flac.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_cdda.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_dvb.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_file.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_http.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_net.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pnm.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pvr.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtp.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtsp.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_stdin_fifo.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_v4l.so +%{_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_syncfb.so %if %{have_vidix} -%{_libdir}/xine/plugins/*/xineplug_vo_out_vidix.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_vidix.so %endif # vidix %if %{with_xcb} -%{_libdir}/xine/plugins/*/xineplug_vo_out_xcbshm.so -%{_libdir}/xine/plugins/*/xineplug_vo_out_xcbxv.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbshm.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbxv.so %endif # xcb -%{_libdir}/xine/plugins/*/xineplug_vo_out_xshm.so -%{_libdir}/xine/plugins/*/xineplug_vo_out_xv.so -%{_libdir}/xine/plugins/*/xineplug_vo_out_xvmc.so -%{_libdir}/xine/plugins/*/xineplug_vo_out_xxmc.so -%{_libdir}/xine/plugins/*/xineplug_wavpack.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xshm.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xv.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xvmc.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xxmc.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_wavpack.so %files arts %defattr(-,root,root,-) -%{_libdir}/xine/plugins/*/xineplug_ao_out_arts.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_arts.so %files extras %defattr(-,root,root,-) -%{_libdir}/xine/plugins/*/xineplug_ao_out_esd.so -%{_libdir}/xine/plugins/*/xineplug_ao_out_jack.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_esd.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_jack.so %if %{with_pa} -%{_libdir}/xine/plugins/*/xineplug_ao_out_pulseaudio.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_pulseaudio.so %endif # pa -%{_libdir}/xine/plugins/*/xineplug_decode_gdk_pixbuf.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gdk_pixbuf.so %if 0%{!?_without_imagemagick:1} -%{_libdir}/xine/plugins/*/xineplug_decode_image.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_image.so %endif # imagemagick -%{_libdir}/xine/plugins/*/xineplug_inp_gnome_vfs.so -%{_libdir}/xine/plugins/*/xineplug_inp_smb.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_gnome_vfs.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_smb.so %if %{with_aalib} -%{_libdir}/xine/plugins/*/xineplug_vo_out_aa.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so %endif # aalib %if %{with_caca} -%{_libdir}/xine/plugins/*/xineplug_vo_out_caca.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so %endif # caca %if 0%{!?_without_directfb:1} -%{_libdir}/xine/plugins/*/xineplug_vo_out_directfb.so -%{_libdir}/xine/plugins/*/xineplug_vo_out_xdirectfb.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_directfb.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xdirectfb.so %endif # directfb -%{_libdir}/xine/plugins/*/xineplug_vo_out_sdl.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_sdl.so %files devel %defattr(-,root,root,-) @@ -383,6 +386,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Mar 30 2008 Ville Skyttä - 1.1.11.1-1 +- 1.1.11.1 (security update, #438663, CVE-2008-1482). +- Provide versioned xine-lib(plugin-abi) so 3rd party packages installing + plugins can use it instead of requiring a version of xine-lib. + * Wed Mar 19 2008 Ville Skyttä - 1.1.11-1 - 1.1.11 (security update, #438182, CVE-2008-0073). - Drop jack and wavpack build conditionals.