[SCM] vlc/experimental: Merge branch 'master' into experimental

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sat Apr 25 10:05:33 UTC 2015 

Remove debian/patches dir
Remove codec-schroedinger-fix-potential-buffer-overflow.patch
new upstream release
Merge tag 'upstream/2.2.1'
Imported Upstream version 2.2.1
Update debian/changelog for upload
upload to unstable
Update changelog
Drop removed --enable-glx configure flag
Fix disabling samba plugin in hurd
Update changelog
Disable build samba plugin on hurd for fix FTBFS. (Closes: #765578)
Point Vcs-Browser to cgit instead of gitweb
Drop patches included upstream
New upstream release
Merge tag 'upstream/2.2.0'
Imported Upstream version 2.2.0
Fix changelog
Add versioned depends on libvlccore8 to libvlc5 which shares /usr/share/doc to comply with Debian policy 12.3. (Closes: #779251)
Finalize changelog
Add upstream patches for CVEs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/experimental
X-Git-Reftype: branch
X-Git-Oldrev: fdd19367807514d9217e0fed0ab90b6f44ebcd72
X-Git-Newrev: d4d2ff4ffac6eed42de7c70e3750381c798ced7e

The following commit has been merged in the experimental branch:
commit d4d2ff4ffac6eed42de7c70e3750381c798ced7e
Merge: 530e486936d1c166ad670a8f3e6fb7bf7aa802df 0aad8cfed06658b8113b283a6c83757a866191d4
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Apr 22 20:55:43 2015 +0200

    Merge branch 'master' into experimental
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index d0b7519,ee62c02..078fe48
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,22 -1,46 +1,60 @@@
- vlc (2.2.0~rc2-1+exp1) UNRELEASED; urgency=medium
+ vlc (2.2.1-1) UNRELEASED; urgency=medium
  
 +  [ Sebastian Ramacher ]
 +  * Regenerate plugin cache using triggers. (Closes: #755154) (LP: #1328466)
 +    - debian/vlc-nox.postinst: Run vlc-cache-gen.
 +    - debian/vlc-nox.postrm: Remove generated cache.
 +    - debian/rules: remove plugins.dat generated during the build.
 +    - debian/vlc-nox.install.in: Do not install pre-generated plugins.dat.
 +  * debian/control: Add libx265-dev to Build-Depends.
 +  * debian/rules:
 +    - Build with -Wl,--as-needed.
 +    - Enable x265 plugin.
 +  * debian/vlc-nox.install.in:
 +    - Install x265 plugin.
 +
 +  [ Mateusz Łukasik ]
+   * New upstream release.
+   * debian/patches:
+     - Remove codec-schroedinger-fix-potential-buffer-overflow.patch
+     -- included upstream.
+ 
+  -- Mateusz Łukasik <mati75 at linuxmint.pl>  Thu, 16 Apr 2015 19:37:11 +0200
+ 
+ vlc (2.2.0-1) unstable; urgency=medium
+ 
+   [ Helmut Grohne ]
+   * Add versioned depends on libvlccore8 to libvlc5 which shares
+     /usr/share/doc to comply with Debian policy 12.3. (Closes: #779251)
+ 
+   [ Mateusz Łukasik ]
+   * New upstream release. (Closes: #757462, #780476)
+     - Fix various (potentially exploitable) heap overflows and heap buffer
+       overflows in different demuxers (LP: #1390491)
+   * Drop patches included upstream:
+     - demux-mp4-fix-buffer-overflow-in-parsing-of-string-b.patch
+     - stream_out-rtp-don-t-use-VLA-for-user-controlled-dat.patch
    * Disable build samba plugin on hurd for fix FTBFS. (Closes: #765578)
  
-  -- Sebastian Ramacher <sramacher at debian.org>  Sun, 16 Nov 2014 02:52:58 +0100
+   [ Benjamin Drung ]
+   * Point Vcs-Browser to cgit instead of gitweb.
+   * Drop removed --enable-glx configure flag.
+ 
+  -- Benjamin Drung <bdrung at debian.org>  Mon, 06 Apr 2015 21:27:42 +0200
+ 
+ vlc (2.2.0~rc2-2) unstable; urgency=medium
+ 
+   * debian/patches: Apply upstream patches for security vulnerabilities.
+     (Closes: #775866)
+     - codec-schroedinger-fix-potential-buffer-overflow.patch: fix potential
+       buffer overflow. (CVE-2014-9629)
+     - demux-mp4-fix-buffer-overflow-in-parsing-of-string-b.patch: fix buffer
+       overflow in parsing of string boxes. (CVE-2014-9626, CVE-2014-9627,
+       CVE-2014-9628)
+     - stream_out-rtp-don-t-use-VLA-for-user-controlled-dat.patch: don't use
+       VLA for user controlled data. (CVE-2014-9630)
+ 
+  -- Sebastian Ramacher <sramacher at debian.org>  Wed, 21 Jan 2015 22:41:57 +0100
  
  vlc (2.2.0~rc2-1) unstable; urgency=medium
  
diff --combined debian/control
index f13ff73,6d2d583..f69479e
--- a/debian/control
+++ b/debian/control
@@@ -99,7 -99,6 +99,7 @@@ Build-Depends: autopoint
                 libvorbis-dev,
                 libx11-dev,
                 libx264-dev (>= 2:0.86),
 +               libx265-dev,
                 libxcb-composite0-dev,
                 libxcb-keysyms1-dev (>= 0.3.4),
                 libxcb-randr0-dev (>= 1.3),
@@@ -118,7 -117,7 +118,7 @@@
  Standards-Version: 3.9.6
  Homepage: http://www.videolan.org/vlc/
  Vcs-Git: git://anonscm.debian.org/pkg-multimedia/vlc.git
- Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/vlc.git
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/vlc.git
  
  Package: libvlc-dev
  Section: libdevel
@@@ -135,7 -134,7 +135,7 @@@ Description: development files for libv
  Package: libvlc5
  Section: libs
  Architecture: any
- Depends: ${misc:Depends}, ${shlibs:Depends}
+ Depends: ${misc:Depends}, ${shlibs:Depends}, libvlccore8 (= ${binary:Version})
  Description: multimedia player and streamer library
   This package contains the shared library required by applications using VLC
   features.
@@@ -258,7 -257,6 +258,7 @@@ Depends: fluid-soundfont-gm | musescore
           vlc-nox (= ${binary:Version}),
           ${misc:Depends},
           ${shlibs:Depends}
 +Enhances: vlc
  Description: FluidSynth plugin for VLC
   This plugin adds support for playing MIDI file via the FluidSynth software
   synthesizer to the VLC media player.
@@@ -270,7 -268,6 +270,7 @@@
  Package: vlc-plugin-jack
  Architecture: any
  Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 +Enhances: vlc
  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
@@@ -286,7 -283,6 +286,7 @@@ Architecture: an
  Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
  Breaks: vlc-nox (<< 1.1.2)
  Replaces: vlc-nox (<< 1.1.2)
 +Enhances: vlc
  Description: LibNotify plugin for VLC
   This plugin adds support for libnotify track change notification to the
   VLC media player.
@@@ -298,7 -294,6 +298,7 @@@
  Package: vlc-plugin-sdl
  Architecture: any
  Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 +Enhances: vlc
  Description: SDL video and audio output plugin for VLC
   This plugin adds support for the Simple DirectMedia Layer library to
   the VLC media player. To activate it, use the `--vout sdl' or
@@@ -312,7 -307,6 +312,7 @@@
  Package: vlc-plugin-svg
  Architecture: any
  Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 +Enhances: vlc
  Description: SVG plugin for VLC
   This plugin allows you to render SVG graphics on top of the video. It is a text
   renderer, and must be activated through the '--text-renderer svg' option. When
@@@ -326,7 -320,6 +326,7 @@@
  Package: vlc-plugin-zvbi
  Architecture: any
  Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 +Enhances: vlc
  Description: VBI teletext plugin for VLC
   This plugin adds support for VBI teletext to the VLC media player.
   .
@@@ -339,7 -332,6 +339,7 @@@ Architecture: linux-any kfreebsd-an
  Breaks: vlc-nox (<< 2.2.0~pre2-2~)
  Replaces: vlc-nox (<< 2.2.0~pre2-2~)
  Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 +Enhances: vlc
  Description: Samba plugin for VLC
   This plugin adds support to access Samba shares from the VLC media player.
   .
diff --combined debian/rules
index c226ea4,b678de9..3d82d6a
--- a/debian/rules
+++ b/debian/rules
@@@ -1,7 -1,5 +1,7 @@@
  #!/usr/bin/make -f
  
 +export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed
 +
  DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
  DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
  DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
@@@ -63,7 -61,6 +63,6 @@@ confflags += 
  	--enable-fribidi \
  	--enable-gles1 \
  	--enable-gles2 \
- 	--enable-glx \
  	--enable-gnutls \
  	--enable-jack \
  	--enable-kate \
@@@ -92,7 -89,6 +91,6 @@@
  	--enable-shine \
  	--enable-shout \
  	--enable-skins2 \
- 	--enable-smbclient \
  	--enable-speex \
  	--enable-svg \
  	--enable-taglib \
@@@ -104,7 -100,6 +102,7 @@@
  	--enable-vnc \
  	--enable-vorbis \
  	--enable-x264 \
 +	--enable-x265 \
  	--enable-zvbi \
  	--with-kde-solid=/usr/share/kde4/apps/solid/actions/ \
  	$(NULL)
@@@ -185,10 -180,10 +183,10 @@@ endi
  
  # Linux and kFreeBSD specific flags (disabled on Hurd)
  ifeq (,$(filter-out linux kfreebsd,$(DEB_HOST_ARCH_OS)))
- confflags += --enable-libva --enable-vcd
+ confflags += --enable-libva --enable-vcd --enable-smbclient
  else
- confflags += --disable-libva --disable-vcd
- removeplugins += cdda libvaapi vcd
+ confflags += --disable-libva --disable-vcd --disable-smbclient
+ removeplugins += cdda libvaapi smbclient vcd
  endif
  
  # kFreeBSD specific flags
@@@ -239,15 -234,6 +237,15 @@@ CFLAGS += -mtune=854
  CXXFLAGS += -mtune=8548
  endif
  
 +# Disable samba on hurd
 +ifneq (,$(filter-out $(DEB_HOST_ARCH),hurd-i386))
 +confflags += --enable-smbclient
 +else
 +confflags += --disable-smbclient
 +removeplugins += smbclient
 +endif
 +
 +
  confflags += \
  	CFLAGS="$(CFLAGS)" \
  	CXXFLAGS="$(CXXFLAGS)" \
@@@ -281,8 -267,6 +279,8 @@@ endi
  endif
  
  override_dh_install:
 +	# Remove plugin cache
 +	rm debian/tmp/usr/lib/vlc/plugins/plugins.dat
  	# Remove disabled plugins
  	sed "/\($(shell echo $(removeplugins) | sed 's/ /\\|/g')\)_/d" debian/vlc.install.in > debian/vlc.install
  	sed "/\($(shell echo $(removeplugins) | sed 's/ /\\|/g')\)_/d" debian/vlc-nox.install.in > debian/vlc-nox.install

-- 
VLC media player packaging

More information about the pkg-multimedia-commits mailing list