Codebase list vlc / df885ce
Merge tag 'debian/2.0.3-5' Debian release 2.0.3-5 Conflicts: debian/changelog debian/gbp.conf debian/patches/series Reinhard Tartler 11 years ago
9 changed file(s) with 163 addition(s) and 24 deletion(s). Raw diff Collapse all Expand all
+41
-0
debian/changelog less more
0 vlc (2.0.3-5~bpo60+1) squeeze-backports; urgency=low
1
2 * Rebuild for squeeze-backports.
3
4 -- Reinhard Tartler <siretart@tauware.de> Fri, 12 Apr 2013 17:45:33 +0200
5
6 vlc (2.0.3-5) testing; urgency=low
7
8 * vlc-plugin-*: Break vlc-nox (<< 2.0.0) to workaround running an outdated
9 vlc-cache-gen. (Closes: #685243)
10
11 -- Benjamin Drung <bdrung@debian.org> Mon, 04 Mar 2013 16:15:02 +0100
12
13 vlc (2.0.3-4) testing; urgency=low
14
15 * SECURITY UPDATE: denial of service via crafted PNG file (Closes: #692130)
16 - CVE-2012-5470
17
18 -- Benjamin Drung <bdrung@debian.org> Thu, 06 Dec 2012 21:55:05 +0100
19
20 vlc (2.0.3-3) unstable; urgency=low
21
22 * debian/vlc.postinst: Fix directory to symlink upgrade in postinst.
23 Thanks to David Prévot <taffit@debian.org> (Closes: #687657)
24 * debian/vlc.preinst: Remove insufficient fix to #613121 (similar issue).
25 Thanks to David Prévot for the patch.
26 * Cherry-pick fix for VLC hang caused by the notify plugin. (Closes: #662628,
27 LP: #970447)
28 * Drop alternative dependency on transitional ttf-freefont.
29
30 -- Benjamin Drung <bdrung@debian.org> Thu, 04 Oct 2012 20:59:21 +0200
31
32 vlc (2.0.3-2) unstable; urgency=low
33
34 * debian/rules: Use xz compression for binary packages.
35 Thanks to Ansgar Burchardt <ansgar@debian.org> (Closes: #683836)
36 * Add version to vlc-nox dependency of vlc-plugin-sdl (consistent with other
37 plug-ins).
38
39 -- Benjamin Drung <bdrung@debian.org> Sat, 18 Aug 2012 17:45:01 +0200
40
041 vlc (2.0.3-1~bpo60+1) squeeze-backports; urgency=low
142
243 [ Edward Wang ]
+29
-8
debian/control less more
110110 Package: libvlc-dev
111111 Section: libdevel
112112 Architecture: any
113 Pre-Depends: dpkg (>= 1.15.6~)
113114 Depends: libvlc5 (= ${binary:Version}),
114115 libvlccore-dev,
115116 pkg-config,
126127 Package: libvlc5
127128 Section: libs
128129 Architecture: any
130 Pre-Depends: dpkg (>= 1.15.6~)
129131 Depends: ${misc:Depends}, ${shlibs:Depends}
130132 Replaces: vlc (<< 0.8.6.c-6)
131133 Description: multimedia player and streamer library
139141 Package: libvlccore-dev
140142 Section: libdevel
141143 Architecture: any
144 Pre-Depends: dpkg (>= 1.15.6~)
142145 Depends: libvlccore5 (= ${binary:Version}), pkg-config, ${misc:Depends}
143146 Description: development files for libvlccore
144147 This package contains headers and a static library required to build plugins
151154 Package: libvlccore5
152155 Section: libs
153156 Architecture: any
157 Pre-Depends: dpkg (>= 1.15.6~)
154158 Depends: vlc-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}
155159 Description: base library for VLC and its modules
156160 This package contains the shared library required by VLC modules and libvlc.
161165
162166 Package: vlc
163167 Architecture: any
164 Depends: fonts-freefont-ttf | ttf-freefont,
168 Pre-Depends: dpkg (>= 1.15.6~)
169 Depends: fonts-freefont-ttf,
165170 vlc-nox (= ${binary:Version}),
166171 ${misc:Depends},
167172 ${shlibs:Depends}
188193 or video plugins (vlc-plugin-sdl).
189194
190195 Package: vlc-data
196 Pre-Depends: dpkg (>= 1.15.6~)
191197 Depends: ${misc:Depends}
192198 Architecture: all
193199 Breaks: vlc-nox (<< 2.0.1-3)
205211 Section: debug
206212 Priority: extra
207213 Architecture: any
214 Pre-Depends: dpkg (>= 1.15.6~)
208215 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}
209216 Description: debugging symbols for vlc
210217 VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4,
215222
216223 Package: vlc-nox
217224 Architecture: any
225 Pre-Depends: dpkg (>= 1.15.6~)
218226 Depends: ${misc:Depends}, ${shlibs:Depends}
219227 Replaces: vlc (<< 1.1.0)
220228 Provides: mp3-decoder
238246
239247 Package: vlc-plugin-fluidsynth
240248 Architecture: any
249 Pre-Depends: dpkg (>= 1.15.6~)
241250 Depends: fluid-soundfont-gm | musescore-soundfont-gm,
242251 vlc-nox (= ${binary:Version}),
243252 ${misc:Depends},
244253 ${shlibs:Depends}
254 Breaks: vlc-nox (<< 2.0.0)
245255 Description: FluidSynth plugin for VLC
246256 This plugin adds support for playing MIDI file via the FluidSynth software
247257 synthesizer to the VLC media player.
252262
253263 Package: vlc-plugin-jack
254264 Architecture: any
255 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
265 Pre-Depends: dpkg (>= 1.15.6~)
266 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
267 Breaks: vlc-nox (<< 2.0.0)
256268 Description: Jack audio plugins for VLC
257269 These plugins add support for JACK to the VLC media player. To
258270 activate the audio output module, use the `--aout jack' flag or
265277
266278 Package: vlc-plugin-notify
267279 Architecture: any
268 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
269 Breaks: vlc-nox (<< 1.1.2)
280 Pre-Depends: dpkg (>= 1.15.6~)
281 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
282 Breaks: vlc-nox (<< 2.0.0)
270283 Replaces: vlc-nox (<< 1.1.2)
271284 Description: LibNotify plugin for VLC
272285 This plugin adds support for libnotify track change notification to the
278291
279292 Package: vlc-plugin-pulse
280293 Architecture: any
281 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
294 Pre-Depends: dpkg (>= 1.15.6~)
295 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
296 Breaks: vlc-nox (<< 2.0.0)
282297 Description: PulseAudio plugin for VLC
283298 This plugin adds support for PulseAudio to the VLC media player. To
284299 activate the audio output module, use the `--aout pulse' flag or
290305
291306 Package: vlc-plugin-sdl
292307 Architecture: any
293 Depends: vlc-nox, ${misc:Depends}, ${shlibs:Depends}
308 Pre-Depends: dpkg (>= 1.15.6~)
309 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
310 Breaks: vlc-nox (<< 2.0.0)
294311 Description: SDL video and audio output plugin for VLC
295312 This plugin adds support for the Simple DirectMedia Layer library to
296313 the VLC media player. To activate it, use the `--vout sdl' or
303320
304321 Package: vlc-plugin-svg
305322 Architecture: any
306 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
323 Pre-Depends: dpkg (>= 1.15.6~)
324 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
325 Breaks: vlc-nox (<< 2.0.0)
307326 Description: SVG plugin for VLC
308327 This plugin allows you to render SVG graphics on top of the video. It is a text
309328 renderer, and must be activated through the '--text-renderer svg' option. When
316335
317336 Package: vlc-plugin-zvbi
318337 Architecture: any
319 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
338 Pre-Depends: dpkg (>= 1.15.6~)
339 Depends: vlc-nox (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
340 Breaks: vlc-nox (<< 2.0.0)
320341 Description: VBI teletext plugin for VLC
321342 This plugin adds support for VBI teletext to the VLC media player.
322343 .
+1
-1
debian/gbp.conf less more
00 [DEFAULT]
1 debian-branch = squeeze-backports
1 debian-branch = wheezy
22 pristine-tar = True
33 compression = xz
44
+38
-0
debian/patches/CVE-2012-5470.patch less more
0 From 47d4631ac62900484fac206abdfc33a2920b07bf Mon Sep 17 00:00:00 2001
1 From: Edward Wang <edward.c.wang@compdigitec.com>
2 Date: Sun, 14 Oct 2012 18:58:18 -0400
3 Subject: [PATCH] png: Check length before read
4
5 Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
6 (cherry picked from commit b3b751cb99df71e3c0a18bcb38b4691cf98265fe)
7
8 Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
9 ---
10 modules/codec/png.c | 8 +++++---
11 1 file changed, 5 insertions(+), 3 deletions(-)
12
13 diff --git a/modules/codec/png.c b/modules/codec/png.c
14 index acd5694..ced4016 100644
15 --- a/modules/codec/png.c
16 +++ b/modules/codec/png.c
17 @@ -91,12 +91,14 @@ static int OpenDecoder( vlc_object_t *p_this )
18 static void user_read( png_structp p_png, png_bytep data, png_size_t i_length )
19 {
20 block_t *p_block = (block_t *)png_get_io_ptr( p_png );
21 - png_size_t i_read = __MIN( p_block->i_buffer, i_length );
22 + if( i_length > p_block->i_buffer ) {
23 + png_error( p_png, "not enough data" );
24 + return;
25 + }
26 +
27 memcpy( data, p_block->p_buffer, i_length );
28 p_block->p_buffer += i_length;
29 p_block->i_buffer -= i_length;
30 -
31 - if( i_length != i_read ) png_error( p_png, "not enough data" );
32 }
33
34 static void user_error( png_structp p_png, png_const_charp error_msg )
35 --
36 1.7.10.4
37
+39
-0
debian/patches/bp-fix-hang-caused-by-notify.patch less more
0 From: Rémi Denis-Courmont <remi@remlab.net>
1 Subject: [PATCH] Revert "Notify: add a callback to match telepathy, msn"
2 .
3 The "item-change" callback is called with the playlist lock held in
4 at least one case: when the now playing meta is cleared while a new
5 input is created by the playlist.
6 .
7 playlist_CurrentInput() acquires the playlist lock. So the
8 "item-change" callback cannot call it. This bug is present in the
9 Growl, MSN and Telepathy modules since version 1.0.0. It got copied
10 into Notify in version 2.0.0.
11 .
12 This reverts commit fc56b92af1636c53a0545109a74476fe74c054a5.
13 This should fix #6641.
14 (cherry picked from commit 1e5f4b465a82745e8e7e5a5de491deac39554ed3)
15 Origin: http://git.videolan.org/?p=vlc/vlc-2.0.git;a=commitdiff;h=e89f4296
16 Applied-Upstream: 2.0.4
17 Bug: http://trac.videolan.org/vlc/ticket/6641
18 Bug-Debian: http://bugs.debian.org/662628
19 Bug-Ubuntu: https://launchpad.net/bugs/970447
20
21 --- a/modules/notify/notify.c
22 +++ b/modules/notify/notify.c
23 @@ -122,7 +122,6 @@
24
25 /* */
26 var_AddCallback( pl_Get( p_intf ), "item-current", ItemChange, p_intf );
27 - var_AddCallback( pl_Get( p_intf ), "item-change", ItemChange, p_intf );
28
29 return VLC_SUCCESS;
30 }
31 @@ -136,7 +135,6 @@
32 intf_sys_t *p_sys = p_intf->p_sys;
33
34 var_DelCallback( pl_Get( p_this ), "item-current", ItemChange, p_this );
35 - var_DelCallback( pl_Get( p_this ), "item-change", ItemChange, p_this );
36
37 if( p_sys->notification )
38 {
+2
-0
debian/patches/series less more
11 link-vlc-cache-gen-with-c++.patch
22 link-vlc-with-c++.patch
33 unbreak-with-gcc-4.4.patch
4 bp-fix-hang-caused-by-notify.patch
5 CVE-2012-5470.patch
+1
-1
debian/vlc.lintian-overrides less more
11 vlc binary: desktop-command-not-in-package usr/share/applications/vlc.desktop usr/bin/vlc
22 # The icon is in vlc-data (the arch=all package)
33 vlc binary: menu-icon-missing usr/share/icons/hicolor/32x32/apps/vlc.xpm
4 # Lintian fails to detect UTF-8 names
4 # Lintian fails to detect UTF-8 names (bug #588661)
55 vlc binary: spelling-error-in-binary usr/lib/vlc/plugins/gui/libqt4_plugin.so ment meant
+12
-0
debian/vlc.postinst less more
0 #!/bin/sh
1 set -e
2
3 # Replace documentation directory with symlink
4 docdir="/usr/share/doc/vlc"
5 if [ -d $docdir ] && [ ! -L $docdir ]; then
6 if rmdir $docdir 2>/dev/null; then
7 ln -sf vlc-nox $docdir
8 fi
9 fi
10
11 #DEBHELPER#
+0
-14
debian/vlc.preinst less more
0 #! /bin/sh
1 set -e
2
3 case "$1" in
4 upgrade)
5 # Make sure /usr/share/doc/vlc doesn't exist or is a symlink
6 # before the unpacking (which will put the link back) - #613121
7 if dpkg --compare-versions "$2" le "2.0.1-2~" && test ! -L "/usr/share/doc/vlc"; then
8 rm -rf /usr/share/doc/vlc/
9 fi
10 ;;
11 esac
12
13 #DEBHELPER#