From dd3d62ceab46c9cf2a7f4d1f307b950d5a4505f8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Wed, 3 Jan 2007 16:10:56 +0000 Subject: [PATCH] Add patch to fix security bug #159845. Package-Manager: portage-2.1.2_rc4-r4 --- media-video/vlc/ChangeLog | 9 +- media-video/vlc/Manifest | 24 +- media-video/vlc/files/digest-vlc-0.8.6-r1 | 6 + media-video/vlc/vlc-0.8.6-r1.ebuild | 282 ++++++++++++++++++++++ 4 files changed, 311 insertions(+), 10 deletions(-) create mode 100644 media-video/vlc/files/digest-vlc-0.8.6-r1 create mode 100644 media-video/vlc/vlc-0.8.6-r1.ebuild diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog index 5eb195c54bf7..71d6634cf8cd 100644 --- a/media-video/vlc/ChangeLog +++ b/media-video/vlc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-video/vlc -# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.201 2006/12/30 19:55:27 flameeyes Exp $ +# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.202 2007/01/03 16:10:56 flameeyes Exp $ + +*vlc-0.8.6-r1 (03 Jan 2007) + + 03 Jan 2007; Diego Pettenò +vlc-0.8.6-r1.ebuild: + Add patch to fix security bug #159845. 30 Dec 2006; Diego Pettenò vlc-0.8.6.ebuild: Update patchlevel to add a patch to build live555 as plugin when using diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index fb62e9781f77..f0cf8f42eeea 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -8,6 +8,7 @@ DIST vlc-patches-16.tar.bz2 10206 RMD160 e9edce6e298a74cb08eec00bcadac6097f772cb DIST vlc-patches-25.tar.bz2 11370 RMD160 ee95b5698cff2f3ccf347b0ed5bc7c43c0c13502 SHA1 5b72ce53fced638747228f9eedb3eec80ce32b2b SHA256 be82dbf2ceb476b1dc035ee90e7c1bb01f6efe52c3679751416c2133ba3c0dde DIST vlc-patches-28.tar.bz2 12689 RMD160 32e0c7a35e8492b4885e3ca41af1dc4563a383c8 SHA1 80fd57a0aaa1f2fc3a57b2c7f44ceedac2aa6233 SHA256 5b7d4e3b14682e889e0ec00d66999d24bf4d4494b88887f3fb7c32e360dd5393 DIST vlc-patches-32.tar.bz2 9409 RMD160 b38a5c6df7d68b58379f53614bcc9366aed92d81 SHA1 f9e74133ba0cfc861cbd4f1775fd3164771a638e SHA256 52af8539833331104e07b9b7f2bb082ea5cb35eb7671164b3bca0ad954796e52 +DIST vlc-patches-33.tar.bz2 10189 RMD160 b5951d9528d53d740bc5dd41282d4b603bcb4682 SHA1 f20c7cd3aaa78ecc3b60eae456e8a9ea08fe424f SHA256 0508fee2afadf4c9bfd05b28098f81fe35c60bb60c26c040c1bb3de0b2df7d2c EBUILD vlc-0.8.4a-r1.ebuild 7123 RMD160 7c33c38b070daff71acb59f83655d5c64b05b54a SHA1 767f5a46624002488571a443bc776a6efc72d330 SHA256 e3621a1941a365c4e5ee8d257b4d0d0878ac40d5a021627513cc4402053e5028 MD5 661adeff1292bb17ab516387be301479 vlc-0.8.4a-r1.ebuild 7123 RMD160 7c33c38b070daff71acb59f83655d5c64b05b54a vlc-0.8.4a-r1.ebuild 7123 @@ -20,14 +21,18 @@ EBUILD vlc-0.8.5-r5.ebuild 7479 RMD160 d87443d301afdc32f29b74beb908852bd309c737 MD5 81ff77133353f46a2181354d2978d73e vlc-0.8.5-r5.ebuild 7479 RMD160 d87443d301afdc32f29b74beb908852bd309c737 vlc-0.8.5-r5.ebuild 7479 SHA256 9a7e6659a999ac2749b9222d58ed8816ab7f0bae848a588f618837ed927f0761 vlc-0.8.5-r5.ebuild 7479 +EBUILD vlc-0.8.6-r1.ebuild 8193 RMD160 f7c183ecdec38cd895500dcf38b4453fecf3232f SHA1 bbe68b67c7c2f6dde73a21ef4f437fe254996504 SHA256 f805d79ca185ed47fc8eabeb98aaa083eb8886c5f49be567f78fbc8f84910706 +MD5 904716adcb17ac7b2f0747364a01e227 vlc-0.8.6-r1.ebuild 8193 +RMD160 f7c183ecdec38cd895500dcf38b4453fecf3232f vlc-0.8.6-r1.ebuild 8193 +SHA256 f805d79ca185ed47fc8eabeb98aaa083eb8886c5f49be567f78fbc8f84910706 vlc-0.8.6-r1.ebuild 8193 EBUILD vlc-0.8.6.ebuild 8190 RMD160 98a81e11dc0df7e913c64b3c032143cb07861547 SHA1 bd0549cc843a1304250e6900290595b210108c6c SHA256 ed9b24ea048fe27768948aa1c8c121ae944c0c962f5bbec95e789aa6b16e21f7 MD5 078b11431b7c0ce0a036f5f948761091 vlc-0.8.6.ebuild 8190 RMD160 98a81e11dc0df7e913c64b3c032143cb07861547 vlc-0.8.6.ebuild 8190 SHA256 ed9b24ea048fe27768948aa1c8c121ae944c0c962f5bbec95e789aa6b16e21f7 vlc-0.8.6.ebuild 8190 -MISC ChangeLog 37682 RMD160 f53f33d9a813718ca755ace86d3fbeb9e420a9c7 SHA1 1b5d12e5a2aefdecdbdf7ad1c7486c725519a64d SHA256 c04e7ee546c3d7eaca12da0231130a115c8548dfe1f6b117df1aaebeb8f7884c -MD5 3af5429a9e41e145a059d6e341e08cc3 ChangeLog 37682 -RMD160 f53f33d9a813718ca755ace86d3fbeb9e420a9c7 ChangeLog 37682 -SHA256 c04e7ee546c3d7eaca12da0231130a115c8548dfe1f6b117df1aaebeb8f7884c ChangeLog 37682 +MISC ChangeLog 37828 RMD160 34d0c4166ad1633927318fcf637ac19073122e0d SHA1 81300981a8463b6e8d4d9663e28e101735833957 SHA256 c3cbfcd2b8f37fbe9a6db15d02535c7f1ee61ad530ffe379363a9722a6efc202 +MD5 3d23eb0a26e49001c2180572c3bb4b32 ChangeLog 37828 +RMD160 34d0c4166ad1633927318fcf637ac19073122e0d ChangeLog 37828 +SHA256 c3cbfcd2b8f37fbe9a6db15d02535c7f1ee61ad530ffe379363a9722a6efc202 ChangeLog 37828 MISC metadata.xml 158 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 SHA1 9ac37da489ebe6e58e32fe8e037b1ef2d99c6638 SHA256 f9dd4fb4a7f368e776ea0d7d394dad8f3a674e67f6103d6fb58a8a98971eeee4 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158 RMD160 d91ff64b3e5f86657b8b6ba02c41a26247a2fac7 metadata.xml 158 @@ -44,10 +49,13 @@ SHA256 71ab8cd26defa0b2ab1517c7fc93188a38657475a9099907c87f7ed03dca32b4 files/di MD5 b03752e8602e576b0593a45d81e041d5 files/digest-vlc-0.8.6 479 RMD160 61ca14042a4d8424710aa00593d6ad543899ccbb files/digest-vlc-0.8.6 479 SHA256 2dc21d46ee9e9d307410c1cd4bbe2700962d4e5e48efe8111f724929425ef41b files/digest-vlc-0.8.6 479 +MD5 2c5bd9432c8b97f895fe5837dec270fc files/digest-vlc-0.8.6-r1 482 +RMD160 57f2c20ccd4c9f38e52edb6991aba0960dca069a files/digest-vlc-0.8.6-r1 482 +SHA256 46e3bae591b10b274bd7453a4d44edecc31286f0429609bcc134ddb03e8f9965 files/digest-vlc-0.8.6-r1 482 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.1 (GNU/Linux) -iD8DBQFFlsRFAiZjviIA2XgRApLIAJ4yvt8zBsZD84guSNkzw7KmQKbCiQCgw+MX -dkkIIj62ZDMG2XF1nXhVTNM= -=djCK +iD8DBQFFm9WXAiZjviIA2XgRAqLeAKDfTCZEGxGNE2XUoFMbwWJz0Za8eACcDDJj ++tW14z87VJHpLh7Gpy0ovXM= +=yxvN -----END PGP SIGNATURE----- diff --git a/media-video/vlc/files/digest-vlc-0.8.6-r1 b/media-video/vlc/files/digest-vlc-0.8.6-r1 new file mode 100644 index 000000000000..4b2fda19ac0c --- /dev/null +++ b/media-video/vlc/files/digest-vlc-0.8.6-r1 @@ -0,0 +1,6 @@ +MD5 77a275f3408c4c9feae451d4eae47f89 vlc-0.8.6.tar.bz2 10506025 +RMD160 0ec4cea5562d0aeaada9a9c533caa5489764d52d vlc-0.8.6.tar.bz2 10506025 +SHA256 17b114d1fe0177c6639b3fb0985c47362bcf1a405bf5fb401aeffb5dc9b3dba7 vlc-0.8.6.tar.bz2 10506025 +MD5 6d6cae37cb7a9219db522929236c9215 vlc-patches-33.tar.bz2 10189 +RMD160 b5951d9528d53d740bc5dd41282d4b603bcb4682 vlc-patches-33.tar.bz2 10189 +SHA256 0508fee2afadf4c9bfd05b28098f81fe35c60bb60c26c040c1bb3de0b2df7d2c vlc-patches-33.tar.bz2 10189 diff --git a/media-video/vlc/vlc-0.8.6-r1.ebuild b/media-video/vlc/vlc-0.8.6-r1.ebuild new file mode 100644 index 000000000000..fec987b68ce8 --- /dev/null +++ b/media-video/vlc/vlc-0.8.6-r1.ebuild @@ -0,0 +1,282 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6-r1.ebuild,v 1.1 2007/01/03 16:10:56 flameeyes Exp $ + +WANT_AUTOMAKE=latest +WANT_AUTOCONF=latest + +inherit eutils wxwidgets multilib autotools toolchain-funcs gnome2 nsplugins + +RESTRICT="confcache" + +MY_PV="${PV/_/-}" +MY_PV="${MY_PV/-beta/-test}" +MY_P="${PN}-${MY_PV}" + +PATCHLEVEL="33" +DESCRIPTION="VLC media player - Video player and streamer" +HOMEPAGE="http://www.videolan.org/vlc/" + +[[ ${MY_P} != "${P}" ]] && \ + SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_PV}/${MY_P}.tar.bz2" \ + || SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2" + +SRC_URI="${SRC_URI} + mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="a52 3dfx debug altivec httpd vlm gnutls live v4l cdda ogg matroska +dvb dvd vcd dts flac mpeg vorbis theora X opengl truetype svg fbcon svga +oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc stream +mp3 xv bidi sdl png xml samba daap corba mod speex shout rtsp +win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey +optimisememory libnotify" + +RDEPEND=" + >=media-video/ffmpeg-0.4.9_p20050226-r1 + cdda? ( >=dev-libs/libcdio-0.71 + cddb? ( >=media-libs/libcddb-1.2.0 ) ) + live? ( >=media-plugins/live-2005.01.29 ) + dvd? ( media-libs/libdvdread + media-libs/libdvdcss + >=media-libs/libdvdnav-0.1.9 + media-libs/libdvdplay ) + esd? ( media-sound/esound ) + ogg? ( media-libs/libogg ) + matroska? ( + >=dev-libs/libebml-0.7.6 + >=media-libs/libmatroska-0.8.0 ) + mp3? ( media-libs/libmad ) + a52? ( >=media-libs/a52dec-0.7.4-r3 ) + dts? ( >=media-libs/libdts-0.0.2-r3 ) + flac? ( media-libs/libogg + >=media-libs/flac-1.1.2 ) + mpeg? ( >=media-libs/libmpeg2-0.3.2 ) + vorbis? ( media-libs/libvorbis ) + theora? ( media-libs/libtheora ) + truetype? ( media-libs/freetype + media-fonts/ttf-bitstream-vera ) + svga? ( media-libs/svgalib ) + ggi? ( media-libs/libggi ) + aalib? ( media-libs/aalib ) + libcaca? ( media-libs/libcaca ) + arts? ( kde-base/arts ) + alsa? ( media-libs/alsa-lib ) + wxwindows? ( >=x11-libs/wxGTK-2.6.2-r1 ) + ncurses? ( sys-libs/ncurses ) + xosd? ( x11-libs/xosd ) + lirc? ( app-misc/lirc ) + 3dfx? ( media-libs/glide-v3 ) + bidi? ( >=dev-libs/fribidi-0.10.4 ) + gnutls? ( >=net-libs/gnutls-1.0.17 ) + sys-libs/zlib + png? ( media-libs/libpng ) + media-libs/libdvbpsi + sdl? ( >=media-libs/libsdl-1.2.8 ) + xml? ( dev-libs/libxml2 ) + samba? ( net-fs/samba ) + vcd? ( >=dev-libs/libcdio-0.72 + >=media-video/vcdimager-0.7.21 ) + daap? ( >=media-libs/libopendaap-0.3.0 ) + corba? ( >=gnome-base/orbit-2.8.0 + >=dev-libs/glib-2.3.2 ) + v4l? ( sys-kernel/linux-headers ) + dvb? ( sys-kernel/linux-headers ) + mod? ( media-libs/libmodplug ) + speex? ( media-libs/speex ) + svg? ( >=gnome-base/librsvg-2.5.0 ) + shout? ( media-libs/libshout ) + win32codecs? ( media-libs/win32codecs ) + hal? ( sys-apps/hal ) + avahi? ( >=net-dns/avahi-0.6 ) + X? ( || ( ( + x11-libs/libX11 + x11-libs/libXext + xv? ( x11-libs/libXv ) + xinerama? ( x11-libs/libXinerama ) + ) =net-misc/upnp-1.2 ) + nsplugin? ( + !seamonkey? ( www-client/mozilla-firefox ) + seamonkey? ( www-client/seamonkey ) + ) + libnotify? ( x11-libs/libnotify )" + +DEPEND="${RDEPEND} + X? ( xinerama? ( || ( x11-proto/xineramaproto =dev-libs/libcdio-0.78' || \ + export EPATCH_EXCLUDE="230_all_libcdio-0.78.2.patch" + + EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches" + AT_M4DIR="m4" eautoreconf + + # Replace install-sh with libtool's copy + cp /usr/share/libtool/install-sh "${S}/autotools" +} + +src_compile () { + local XPIDL="" + local MOZILLA_CONFIG="" + + use wxwindows && \ + myconf="${myconf} --with-wx-config=$(basename ${WX_CONFIG}) --with-wx-config-path=$(dirname ${WX_CONFIG})" + + use vlm && \ + myconf="${myconf} --enable-vlm --enable-sout" || \ + myconf="${myconf} --disable-vlm" + + if use directfb; then + myconf="${myconf} --enable-directfb --with-directfb=/usr" + append-flags "-I /usr/include/directfb" + else + myconf="${myconf} --disable-directfb" + fi + + if use nsplugin; then + if use seamonkey; then + XPIDL=/usr/lib/seamonkey + MOZILLA_CONFIG=/usr/lib/seamonkey/seamonkey-config + else + XPIDL=/usr/lib/mozilla-firefox + MOZILLA_CONFIG=/usr/lib/mozilla-firefox/firefox-config + fi + fi + + if use live && ! has_version '>=media-plugins/live-2006.12.08'; then + myconf="--enable-live555 --with-live555-tree=/usr/$(get_libdir)/live" + else + myconf="$(use_enable live live555)" + fi + + econf \ + $(use_enable altivec) \ + $(use_enable stream sout) \ + $(use_enable httpd) \ + $(use_enable gnutls) \ + $(use_enable v4l) \ + $(use_enable cdda) $(use_enable cdda cddax)\ + $(use_enable cddb libcddb) \ + $(use_enable vcd) $(use_enable vcd vcdx) \ + $(use_enable dvb) $(use_enable dvb pvr) \ + $(use_enable ogg) \ + $(use_enable matroska mkv) \ + $(use_enable flac) \ + $(use_enable vorbis) \ + $(use_enable theora) \ + $(use_enable X x11) \ + $(use_enable xv xvideo) \ + $(use_enable xinerama) \ + $(use_enable opengl glx) $(use_enable opengl) \ + $(use_enable truetype freetype) \ + $(use_enable bidi fribidi) \ + $(use_enable dvd dvdread) $(use_enable dvd dvdplay) $(use_enable dvd dvdnav) \ + $(use_enable fbcon fb) \ + $(use_enable svga svgalib) \ + $(use_enable 3dfx glide) \ + $(use_enable aalib aa) \ + $(use_enable libcaca caca) \ + $(use_enable oss) \ + $(use_enable esd) \ + $(use_enable arts) \ + $(use_enable alsa) \ + $(use_enable wxwindows wxwidgets) \ + $(use_enable ncurses) \ + $(use_enable xosd) \ + $(use_enable lirc) \ + $(use_enable mp3 mad) \ + $(use_enable a52) \ + $(use_enable dts) \ + $(use_enable mpeg libmpeg2) \ + $(use_enable ggi) \ + $(use_enable 3dfx glide) \ + $(use_enable sdl) \ + $(use_enable png) \ + $(use_enable xml libxml2) \ + $(use_enable samba smb) \ + $(use_enable daap) \ + $(use_enable corba) \ + $(use_enable mod) \ + $(use_enable speex) \ + $(use_enable shout) \ + $(use_enable rtsp) $(use_enable rtsp realrtsp) \ + $(use_enable win32codecs loader) \ + $(use_enable skins skins2) \ + $(use_enable hal) \ + $(use_enable avahi bonjour) \ + $(use_enable upnp) \ + $(use_enable optimisememory optimize-memory) \ + $(use_enable libnotify) \ + --enable-ffmpeg \ + --disable-faad \ + --disable-jack \ + --disable-dv \ + --disable-libvc1 \ + --disable-snapshot \ + --disable-growl \ + --disable-pth \ + --disable-portaudio \ + --disable-x264 \ + --enable-utf8 \ + --enable-libtool \ + $(use_enable nsplugin mozilla) \ + XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \ + ${myconf} || die "configuration failed" + + if [[ $(gcc-major-version) == 2 ]]; then + sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed" + fi + + emake || die "make of VLC failed" +} + +src_install() { + # First install the library, to avoid screwups during relinking.select + emake -j1 DESTDIR="${D}" install || die "make install failed" + + dodoc AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \ + doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt + + if use nsplugin; then + dodir "/usr/$(get_libdir)/${PLUGINS_DIR}" + mv "${D}"/usr/$(get_libdir)/mozilla/{components,plugins}/* \ + "${D}/usr/$(get_libdir)/${PLUGINS_DIR}/" + + rm -rf "${D}/usr/share/doc/vlc" \ + "${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico} + fi + + use skins || rm -rf "${D}/usr/share/vlc/skins2" + + for res in 16 32 48; do + insinto /usr/share/icons/hicolor/${res}x${res}/apps/ + newins "${S}"/share/vlc${res}x${res}.png vlc.png + done + + use wxwindows && domenu "${S}/debian/vlc.desktop" +} -- 2.26.2