r1023 - /videolan/vlc/debian/

xtophe-guest at users.alioth.debian.org xtophe-guest at users.alioth.debian.org
Mon Jan 14 23:34:19 UTC 2008 

Author: xtophe-guest
Date: Mon Jan 14 23:34:15 2008
New Revision: 1023

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1023
Log:
Incorporate change from 0.8.6.d-4.1 and 0.8.6.d-5 (r1003:1019)

Removed:
    videolan/vlc/debian/libvlc1-dev.dirs
    videolan/vlc/debian/libvlc1.dirs
    videolan/vlc/debian/mozilla-plugin-vlc.dirs
    videolan/vlc/debian/vlc-nox.dirs
    videolan/vlc/debian/vlc-plugin-alsa.dirs
    videolan/vlc/debian/vlc-plugin-alsa.links
    videolan/vlc/debian/vlc-plugin-arts.dirs
    videolan/vlc/debian/vlc-plugin-esd.dirs
    videolan/vlc/debian/vlc-plugin-ggi.dirs
    videolan/vlc/debian/vlc-plugin-glide.dirs
    videolan/vlc/debian/vlc-plugin-jack.dirs
    videolan/vlc/debian/vlc-plugin-sdl.dirs
    videolan/vlc/debian/vlc-plugin-svgalib.dirs
    videolan/vlc/debian/vlc.dirs
    videolan/vlc/debian/wxvlc.links
Modified:
    videolan/vlc/debian/changelog
    videolan/vlc/debian/compat
    videolan/vlc/debian/control
    videolan/vlc/debian/rules
    videolan/vlc/debian/vlc.menu

Modified: videolan/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/changelog?rev=1023&op=diff
==============================================================================
--- videolan/vlc/debian/changelog (original)
+++ videolan/vlc/debian/changelog Mon Jan 14 23:34:15 2008
@@ -11,8 +11,6 @@
       transition between sid and nightlies.
     + Build-depends on libshout3-dev, libqt4-dev and libqt4-dev-tools
     + wrap Depends
-    + new vlc-plugin-jack pkg with jack audio_output and access modules
-      (fix #402252)
     + add Homepage field
   * debian/rules
     + activate QT4 interface
@@ -20,7 +18,7 @@
     + make libvlc is enough to produce libvlc.a
     + store libvlc.a not in src/ to avoid the linker using it.
     + enable-fast-install to have a real vlc executable
-    + enable jack and v4l2 modules
+    + enable v4l2 modules
     + explicitely disable the update checker
     + Temporaly disable libdca until a pkg with the new API get into sid
   * vlc-nox.install
@@ -45,9 +43,8 @@
     + osd_parser
     + rvlc, cvlc, nvlc
   * Install libvlc-control.so in libvlc1
-  * vlc-plugin-jack.*
-    + new vlc-plugin-jack pkg with jack audio_output and access modules
-      (fix #402252)
+  * vlc-plugin-jack.install
+    + Add the jack access module
   * bug/*  + relevant symlinks
     + Add reportbug magic to avoid bug being reported to Debian's BTS
   * patches/100_no_wx_updates.diff: no longer needed as upstream provides a
@@ -57,13 +54,64 @@
   * Add a vlc-dbg package with debugging symbols for vlc.
      + debian/control:
          * add a vlc-dbg entry
-         * bump dependency on debhelper to 5
      + debian/rules:
          * call dh_strip with --dbg-package=vlc-dbg
          * add --enable-debug flag
-     + debian/compat: bump to compatibility 5
 
  -- Christophe Mutricy <xtophe at videolan.org>  Sat, 22 Dec 2007 23:24:05 +0100
+
+vlc (0.8.6.c-5) unstable; urgency=low
+
+  [ Christophe Mutricy ]
+  * New vlc-plugin-jack pkg with jack audio_output module
+      (closes: #402252, #444992)
+  * Make all the symlink for /usr/share/${pkg} point to /usr/share/doc/vlc-nox
+    as the plugins depends on vlc-nox and not vlc
+  * debian/control: dpkg-shlibdeps gives the correct depends for
+    vlc-plugin-glide. So drop the hardcoded depends on libglide2
+  * debian/rules: dpkg-shlibdeps now behaves better with libraries without
+    versionned symbol file.
+
+  [ Sam Hocevar ]
+  * debian/control:
+    + Dropped the libcdio-dev versioned build-dep to ease backports.
+
+  [ Loic Minier ]
+  * Ack NMU by Nico Golde; thanks!
+  * Wrap more deps.
+  * Also build vlc-plugin-svgalib package on amd64 as well; build-dep on
+    libsvga1-dev on amd64 too; --enable-svgalib on amd64.
+  * Drop debian/*.dirs.
+  * Only pass --host to configure if DEB_BUILD_GNU_TYPE and DEB_HOST_GNU_TYPE
+    differ.
+  * Pass --quiltrc /dev/null to quilt and use $(QUILT) to invoke quilt.
+  * Bump up Debhelper compatibility level to 6; drop dpkg-dev build-dep.
+  * Add /svn to Vcs-Svn.
+  * Don't run ./vlc as a test if nocheck is given.
+  * Cleanup rules.
+  * Drop vlc-plugin-alsa and wxvlc /u/s/d symlinks as these are dummy packages
+    anyway.
+  * Update menu file.
+
+ -- Loic Minier <lool at dooz.org>  Fri, 11 Jan 2008 17:32:36 +0100
+
+vlc (0.8.6.c-4.1) unstable; urgency=high
+
+  * Non-maintainer upload by security team.
+  * This update addresses the following security issues
+    (CVE ids pending; Closes: #458318):
+    - Fix format string issue in internal webserver that could lead to
+      to arbitrary code execution (sec-httpd_formatstring.diff).
+    - Disable m3u EXTVLCOPT parsing if no command line option is specified
+      (--m3u-extvlcopt) to prevent browser plugins to control stream output
+      and thus overwriting arbitrary files of the user running vlc
+      (sec-vlcopt_support.diff).
+    - Fix stack-based buffer overflow in subtitle parsing
+      (sec-subtitle_buffer_overflow.diff).
+    - Fix NULL pointer dereference in the rtsp/rtp module by checking return
+      of the httpd_MsgGet function (sec-rtsp_remote_dos.diff).
+
+ -- Nico Golde <nion at debian.org>  Fri, 11 Jan 2008 15:05:10 +0100
 
 vlc (0.8.6.c-4) unstable; urgency=high
 

Modified: videolan/vlc/debian/compat
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/compat?rev=1023&op=diff
==============================================================================
--- videolan/vlc/debian/compat (original)
+++ videolan/vlc/debian/compat Mon Jan 14 23:34:15 2008
@@ -1,1 +1,1 @@
-5
+6

Modified: videolan/vlc/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/control?rev=1023&op=diff
==============================================================================
--- videolan/vlc/debian/control (original)
+++ videolan/vlc/debian/control Mon Jan 14 23:34:15 2008
@@ -3,8 +3,7 @@
 Priority: optional
 Maintainer: VideoLAN <vlc-devel at videolan.org>
 Uploaders: Christophe Mutricy <xtophe at videolan.org>
-Build-Depends: dpkg-dev (>= 1.13.19),
-               debhelper (>= 5.0),
+Build-Depends: debhelper (>= 6),
                dh-buildinfo,
                quilt,
                nasm,
@@ -51,7 +50,7 @@
                libpng12-dev,
                libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3),
                libsmbclient-dev,
-               libsvga1-dev [i386],
+               libsvga1-dev [amd64 i386],
                libsysfs-dev,
                libtar-dev,
                libtheora-dev,
@@ -79,7 +78,7 @@
 #Build-Conflicts-Indep: libvlc0
 Standards-Version: 3.7.3
 Homepage: http://www.videolan.org/vlc
-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/videolan/vlc/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-multimedia/videolan/vlc/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/
 
 Package: vlc
@@ -89,7 +88,8 @@
          ${shlibs:Depends}, 
          ${misc:Depends},
          ttf-dejavu-core
-Suggests: mozilla-plugin-vlc, videolan-doc
+Suggests: mozilla-plugin-vlc,
+          videolan-doc
 Replaces: vlc-nox (<<${Source-Version}),
           vlc-plugin-dvb (<< 0.5.2-2),
           vlc-plugin-xosd (<< 0.5.2-2),
@@ -153,7 +153,8 @@
 Package: vlc-nox
 Section: net
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Replaces: vlc (<<${Source-Version}),
           vlc-plugin-dvb (<< 0.5.2-2),
           vlc-plugin-xosd (<< 0.5.2-2),
@@ -208,7 +209,8 @@
 Package: libvlc1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Replaces: vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3), libvlc0
 Conflicts: vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3), libvlc0
 Description: multimedia player and streamer library
@@ -329,7 +331,7 @@
  streams from various network sources.
 
 Package: vlc-plugin-svgalib
-Architecture: i386
+Architecture: amd64 i386
 Depends: vlc-nox (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: SVGAlib video output plugin for VLC
  This plugin adds support for SVGAlib to the VLC media player. To
@@ -353,11 +355,13 @@
 
 
 Package: vlc-plugin-jack
-Architecture: all
-Depends: vlc-nox (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Architecture: any
+Depends: vlc-nox (= ${binary:Version}),
+         ${shlibs:Depends},
+         ${misc:Depends}
 Description: Jack audio plugins for VLC
  These plugins add support for JACK to the VLC media player. To
- activate the audio output module, use the `--aout jack' flag or 
+ activate the audio output module, use the `--aout jack' flag or
  select the `jack' audio output plugin from the preferences menu.
  For the jack input, use `vlc jack://channels=...:ports=...'
  .

Modified: videolan/vlc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/rules?rev=1023&op=diff
==============================================================================
--- videolan/vlc/debian/rules (original)
+++ videolan/vlc/debian/rules Mon Jan 14 23:34:15 2008
@@ -1,21 +1,19 @@
 #!/usr/bin/make -f
-# debian/rules for the VLC media player - uses debhelper.
-# $Id$
-# based on Joey Hess's one.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
+
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_ARCH_OS    ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-confflags = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) 
-
-#
-# Compilation options
-#
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+confflags := --build=$(DEB_BUILD_GNU_TYPE)
+else
+confflags := --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
+endif
+
+# how to call quilt
+QUILT := QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
+
+# configure flags
 confflags += --enable-maintaner-mode --enable-release --prefix=/usr
 confflags += \
 	--enable-libtool \
@@ -86,14 +84,18 @@
 
 #	--enable-dts \
 
-# These ones are only for Linux
+# Linux specific flags
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 confflags += --enable-alsa --enable-dv --enable-v4l --enable-v4l2 --enable-pvr
 endif
 
-# Glide and svgalib are only for x86
-ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
+# Glide is only for x86 on Linux
+ifeq ($(DEB_BUILD_ARCH),i386)
 confflags += --enable-glide
+endif
+
+# svgalib is only for x86 and x86-64 on Linux
+ifneq ($(filter $(DEB_BUILD_ARCH), amd64 i386),)
 confflags += --enable-svgalib
 endif
 
@@ -101,30 +103,32 @@
 confflags += --enable-dvd --without-dvdcss
 
 # A few shortcuts
-VIDDIR = usr/share/vlc
-PIXDIR = usr/share/pixmaps
+VIDDIR := usr/share/vlc
+PIXDIR := usr/share/pixmaps
 
 build: build-stamp
 build-stamp:
 	dh_testdir
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	$(QUILT) push -a || test $$? = 2
 	./configure --enable-static --mandir=$${prefix}/share/man $(confflags)
 	$(MAKE) libvlc
 	mkdir -p tmp
 	cp src/.libs/libvlc.a tmp/libvlc.a
 	./configure --mandir=$${prefix}/share/man $(confflags)
 	$(MAKE)
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
 	# Check which plugins were built and whether they load properly.
 	./vlc --reset-plugins-cache -l --no-color  
 endif
-	touch build-stamp
+endif
+	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
 	sed -e '/lib\(alsa\|dvb\|v4l\|pvr\)_/d' debian/vlc-nox.install \
-	  > debian/vlc-nox.install.kfreebsd-i386
+	  >debian/vlc-nox.install.kfreebsd-i386
 	cp debian/vlc-nox.install.kfreebsd-i386 \
 	  debian/vlc-nox.install.kfreebsd-amd64
 	rm -f build-stamp
@@ -139,7 +143,7 @@
 	# Remove spurious autotools stuff
 	rm -f config.log confdefs.h
 	# Unpatch package
-	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	$(QUILT) pop -a -R || test $$? = 2
 	dh_clean
 
 install: build
@@ -147,7 +151,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) install DESTDIR=`pwd`/debian/tmp/
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
 	cp tmp/libvlc.a debian/tmp/usr/lib
 	# Clean up libtool crap
 	find debian/tmp -name '*.la' -exec rm '{}' ';'
@@ -217,5 +221,4 @@
 	dh_builddeb -s
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
+.PHONY: build clean install binary-indep binary-arch binary

Modified: videolan/vlc/debian/vlc.menu
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/vlc.menu?rev=1023&op=diff
==============================================================================
--- videolan/vlc/debian/vlc.menu (original)
+++ videolan/vlc/debian/vlc.menu Mon Jan 14 23:34:15 2008
@@ -1,3 +1,3 @@
 ?package(vlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
-              section="Apps/Viewers" title="VLC media player" \
+              section="Applications/Viewers" title="VLC media player" \
               icon="/usr/share/vlc/vlc.xpm" hints="Video"

More information about the pkg-multimedia-commits mailing list