Your message dated Thu, 25 May 2017 20:37:00 +0000 with message-id <52fbb7ab-aa83-c684-f562-fb001b6f4a3b@thykier.net> and subject line Re: Bug#863347: unblock: vlc/2.2.6-1~deb9u1 has caused the Debian Bug report #863347, regarding unblock: vlc/2.2.6-1~deb9u1 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 863347: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863347 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: vlc/2.2.6-1~deb9u1
- From: Sebastian Ramacher <sramacher@debian.org>
- Date: Thu, 25 May 2017 18:52:50 +0200
- Message-id: <[🔎] 20170525165250.6pvhaxobhuboq74i@ramacher.at>
Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package vlc version 2.2.6-1~deb9u1. It is the latest stable bug fix release including a fix for CVE-2017-8312. The upstream changes are attached as vlc-2.2.6.diff (updates to the translations have been stripped). The changes in debian (vlc-debian.stretch.diff) includes the usual bump of the versions in *.maintscripts and in Breaks + Repalces. The Breaks + Replaces from libvlc-bin have been removed as they are not necessary. unblock vlc/2.2.6-1~deb9u1 Cheers -- Sebastian Ramacherdiff --git a/NEWS b/NEWS index 4c34a5d8..88321824 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,15 @@ +Changes between 2.2.5.1 and 2.2.6: +---------------------------------- + +Video output: + * Fix systematic green line on nvidia + * Fix direct3d SPU texture offsets handling + +Demuxer: + * Fix heap buffer overflows + Changes between 2.2.5 and 2.2.5.1: --------------------------------- +---------------------------------- Security hardening for DLL hijacking environments diff --git a/configure b/configure index 57cbc4d5..c0ce4fb4 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for vlc 2.2.5.1. +# Generated by GNU Autoconf 2.69 for vlc 2.2.6. # # Copyright 1999-2017 VLC authors and VideoLAN # @@ -589,8 +589,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='vlc' PACKAGE_TARNAME='vlc' -PACKAGE_VERSION='2.2.5.1' -PACKAGE_STRING='vlc 2.2.5.1' +PACKAGE_VERSION='2.2.6' +PACKAGE_STRING='vlc 2.2.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -2532,7 +2532,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures vlc 2.2.5.1 to adapt to many kinds of systems. +\`configure' configures vlc 2.2.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2607,7 +2607,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of vlc 2.2.5.1:";; + short | recursive ) echo "Configuration of vlc 2.2.6:";; esac cat <<\_ACEOF @@ -3263,7 +3263,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -vlc configure 2.2.5.1 +vlc configure 2.2.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3976,7 +3976,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by vlc $as_me 2.2.5.1, which was +It was created by vlc $as_me 2.2.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4327,8 +4327,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu VERSION_MAJOR=2 VERSION_MINOR=2 -VERSION_REVISION=5 -VERSION_EXTRA=1 +VERSION_REVISION=6 +VERSION_EXTRA=0 VERSION_DEV= PKGDIR="vlc" @@ -4931,7 +4931,7 @@ fi # Define the identity of the package. PACKAGE='vlc' - VERSION='2.2.5.1' + VERSION='2.2.6' cat >>confdefs.h <<_ACEOF @@ -53803,7 +53803,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by vlc $as_me 2.2.5.1, which was +This file was extended by vlc $as_me 2.2.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -53869,7 +53869,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -vlc config.status 2.2.5.1 +vlc config.status 2.2.6 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index d3f8685d..235edf57 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ dnl Autoconf settings for vlc AC_COPYRIGHT([Copyright 1999-2017 VLC authors and VideoLAN]) -AC_INIT(vlc, 2.2.5.1) +AC_INIT(vlc, 2.2.6) VERSION_MAJOR=2 VERSION_MINOR=2 -VERSION_REVISION=5 -VERSION_EXTRA=1 +VERSION_REVISION=6 +VERSION_EXTRA=0 VERSION_DEV= PKGDIR="vlc" diff --git a/modules/demux/subtitle.c b/modules/demux/subtitle.c index 1614e860..9f0b953e 100644 --- a/modules/demux/subtitle.c +++ b/modules/demux/subtitle.c @@ -2,7 +2,7 @@ * subtitle.c: Demux for subtitle text files. ***************************************************************************** * Copyright (C) 1999-2007 VLC authors and VideoLAN - * $Id: 3e790fd307ff08f92fd3b754863f7a91f34fd85f $ + * $Id: c4402edfb9b9c02121b7037c4ae907a9eb914439 $ * * Authors: Laurent Aimar <fenrir@via.ecp.fr> * Derk-Jan Hartman <hartman at videolan dot org> @@ -1667,7 +1667,7 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) demux_sys_t *p_sys = p_demux->p_sys; text_t *txt = &p_sys->txt; - char *psz_text, *psz_orig; + char *psz_text, *psz_orig = NULL; char *psz_text2, *psz_orig2; int h1, h2, m1, m2, s1, s2, f1, f2; @@ -1683,11 +1683,13 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) /* Parse the main lines */ for( ;; ) { + free(psz_orig); const char *s = TextGetLine( txt ); if( !s ) return VLC_EGENERIC; - psz_orig = malloc( strlen( s ) + 1 ); + size_t line_length = strlen( s ); + psz_orig = malloc( line_length + 1 ); if( !psz_orig ) return VLC_ENOMEM; psz_text = psz_orig; @@ -1727,6 +1729,8 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) { case 'S': shift = isalpha( (unsigned char)psz_text[2] ) ? 6 : 2 ; + if ( shift > line_length ) + continue; if( sscanf( &psz_text[shift], "%d", &h ) ) { @@ -1764,20 +1768,16 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) case 'T': shift = isalpha( (unsigned char)psz_text[2] ) ? 8 : 2 ; + if ( shift > line_length ) + continue; sscanf( &psz_text[shift], "%d", &p_sys->jss.i_time_resolution ); break; } - free( psz_orig ); - continue; - } - else - /* Unkown type line, probably a comment */ - { - free( psz_orig ); - continue; } } + free( psz_orig ); + psz_orig = NULL; while( psz_text[ strlen( psz_text ) - 1 ] == '\\' ) { @@ -1881,8 +1881,8 @@ static int ParseJSS( demux_t *p_demux, subtitle_t *p_subtitle, int i_idx ) if( (*(psz_text + 1 ) ) == '~' || (*(psz_text + 1 ) ) == '{' || (*(psz_text + 1 ) ) == '\\' ) psz_text++; - else if( *(psz_text + 1 ) == '\r' || *(psz_text + 1 ) == '\n' || - *(psz_text + 1 ) == '\0' ) + else if( ( *(psz_text + 1 ) == '\r' || *(psz_text + 1 ) == '\n' ) && + *(psz_text + 1 ) != '\0' ) { psz_text++; } diff --git a/modules/video_output/msw/direct3d.c b/modules/video_output/msw/direct3d.c index 886f5571..10272cce 100644 --- a/modules/video_output/msw/direct3d.c +++ b/modules/video_output/msw/direct3d.c @@ -2,7 +2,7 @@ * direct3d.c: Windows Direct3D video output module ***************************************************************************** * Copyright (C) 2006-2014 VLC authors and VideoLAN - *$Id: f395fad23686b5e71c76b66bbc6036767669f5e4 $ + *$Id: 98e9eef368bd4472392f95e979079b40a4d73e45 $ * * Authors: Damien Fouilleul <damienf@videolan.org>, * Sasha Koruga <skoruga@gmail.com>, @@ -1399,7 +1399,6 @@ static void Direct3DSetupVertices(CUSTOMVERTEX *vertices, { dst.right, dst.bottom }, { dst.left, dst.bottom }, }; - bool has_src = src != NULL && src_clipped != NULL; /* Compute index remapping necessary to implement the rotation. */ int vertex_order[4]; @@ -1410,17 +1409,22 @@ static void Direct3DSetupVertices(CUSTOMVERTEX *vertices, vertices[i].y = vertices_coords[vertex_order[i]][1]; } - vertices[0].tu = .0f; - vertices[0].tv = .0f; + float right = (float)src_clipped->right / (float)src->right; + float left = (float)src_clipped->left / (float)src->right; + float top = (float)src_clipped->top / (float)src->bottom; + float bottom = (float)src_clipped->bottom / (float)src->bottom; - vertices[1].tu = has_src ? (float)src_clipped->right / (float)src->right : 1.0f; - vertices[1].tv = .0f; + vertices[0].tu = left; + vertices[0].tv = top; - vertices[2].tu = has_src ? (float)src_clipped->right / (float)src->right : 1.0f; - vertices[2].tv = has_src ? ((float)src_clipped->bottom) / (float)src->bottom : 1.0f; + vertices[1].tu = right; + vertices[1].tv = top; - vertices[3].tu = .0f; - vertices[3].tv = has_src ? ((float)src_clipped->bottom) / (float)src->bottom : 1.0f; + vertices[2].tu = right; + vertices[2].tv = bottom; + + vertices[3].tu = left; + vertices[3].tv = bottom; for (int i = 0; i < 4; i++) { /* -0.5f is a "feature" of DirectX and it seems to apply to Direct3d also */ @@ -1459,7 +1463,14 @@ static int Direct3DImportPicture(vout_display_t *vd, /* Copy picture surface into texture surface * color space conversion happen here */ - hr = IDirect3DDevice9_StretchRect(sys->d3ddev, source, &vd->sys->rect_src, destination, NULL, D3DTEXF_NONE ); + RECT copy_rect = vd->sys->rect_src_clipped; + // On nVidia & AMD, StretchRect will fail if the visible size isn't even. + // When copying the entire buffer, the margin end up being blended in the actual picture + // on nVidia (regardless of even/odd dimensions) + if ( copy_rect.right & 1 ) copy_rect.right++; + if ( copy_rect.bottom & 1 ) copy_rect.bottom++; + hr = IDirect3DDevice9_StretchRect(sys->d3ddev, source, ©_rect, destination, + ©_rect, D3DTEXF_NONE); IDirect3DSurface9_Release(destination); if (FAILED(hr)) { msg_Dbg(vd, "%s:%d (hr=0x%0lX)", __FUNCTION__, __LINE__, hr); @@ -1579,12 +1590,24 @@ static void Direct3DImportSubpicture(vout_display_t *vd, RECT dst; dst.left = video.left + scale_w * r->i_x, - dst.right = dst.left + scale_w * r->fmt.i_width, + dst.right = dst.left + scale_w * r->fmt.i_visible_width, dst.top = video.top + scale_h * r->i_y, - dst.bottom = dst.top + scale_h * r->fmt.i_height, - Direct3DSetupVertices(d3dr->vertex, NULL, NULL, - dst, - subpicture->i_alpha * r->i_alpha / 255, ORIENT_NORMAL); + dst.bottom = dst.top + scale_h * r->fmt.i_visible_height; + + RECT src; + src.left = 0; + src.right = r->fmt.i_width; + src.top = 0; + src.bottom = r->fmt.i_height; + + RECT src_clipped; + src_clipped.left = r->fmt.i_x_offset; + src_clipped.right = r->fmt.i_x_offset + r->fmt.i_visible_width; + src_clipped.top = r->fmt.i_y_offset; + src_clipped.bottom = r->fmt.i_y_offset + r->fmt.i_visible_height; + + Direct3DSetupVertices(d3dr->vertex, &src, &src_clipped, + dst, subpicture->i_alpha * r->i_alpha / 255, ORIENT_NORMAL); } } diff --git a/src/revision.c b/src/revision.c index 101a2bcc..b087b901 100644 --- a/src/revision.c +++ b/src/revision.c @@ -1 +1 @@ -const char psz_vlc_changeset[] = "2.2.5.1-14-g05b653355c"; +const char psz_vlc_changeset[] = "2.2.6-0-g1aae78981c"; diff --git a/src/revision.txt b/src/revision.txt index 7514b353..40db8d1c 100644 --- a/src/revision.txt +++ b/src/revision.txt @@ -1 +1 @@ -2.2.5.1-14-g05b653355c +2.2.6-0-g1aae78981cdiff --git a/debian/changelog b/debian/changelog index 9de73242e4..8feadff5a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +vlc (2.2.6-1~deb9u1) unstable; urgency=high + + * New upstream release. + - demux: Fix heap buffer overflows (CVE-2017-8312) + * debian/*.maintscript: Bump all versions to 2.2.6-1~z. This is necessary to + properly handle symlink to directory conversions once 2.2.6 is available + in jessie. + * debian/control: Bump Breaks + Replaces to 2.2.6-1~deb9u1 where necessary + to ensure proper upgrades from jessie. + + -- Sebastian Ramacher <sramacher@debian.org> Wed, 24 May 2017 18:00:59 +0200 + +vlc (2.2.5.1-1~deb9u2) unstable; urgency=medium + + * debian/control: + - Bump Breaks + Replaces to 2.2.5.1-1~deb9u1 also in vlc-plugin-qt and + vlc-plugin-skins2. Files moved from vlc to those two packages since + jessie. + - Remove Breaks + Replaces from libvlc-bin. While files moved from vlc-nox + to libvlc-bin, they also changed their path. + + -- Sebastian Ramacher <sramacher@debian.org> Sat, 20 May 2017 10:41:05 +0200 + vlc (2.2.5.1-1~deb9u1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index aab82eafff..345ae6b11f 100644 --- a/debian/control +++ b/debian/control @@ -242,8 +242,6 @@ Architecture: any Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} -Breaks: vlc-nox (<< 2.2.4-7~) -Replaces: vlc-nox (<< 2.2.4-7~) Description: tools for VLC's base library VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4, DivX, MOV, WMV, QuickTime, WebM, FLAC, MP3, Ogg/Vorbis files, DVDs, VCDs, @@ -256,8 +254,8 @@ Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libvlc-bin (= ${binary:Version}) -Breaks: vlc-nox (<< 2.2.5.1-1~deb9u1) -Replaces: vlc-nox (<< 2.2.5.1-1~deb9u1) +Breaks: vlc-nox (<< 2.2.6-1~deb9u1) +Replaces: vlc-nox (<< 2.2.6-1~deb9u1) Description: binaries from VLC VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4, DivX, MOV, WMV, QuickTime, WebM, FLAC, MP3, Ogg/Vorbis files, DVDs, VCDs, @@ -282,8 +280,8 @@ Section: localization Architecture: all Multi-Arch: foreign Depends: ${misc:Depends} -Breaks: vlc-data (<< 2.2.5.1-1~deb9u1) -Replaces: vlc-data (<< 2.2.5.1-1~deb9u1) +Breaks: vlc-data (<< 2.2.6-1~deb9u1) +Replaces: vlc-data (<< 2.2.6-1~deb9u1) Description: Translations for VLC VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4, DivX, MOV, WMV, QuickTime, WebM, FLAC, MP3, Ogg/Vorbis files, DVDs, VCDs, @@ -370,8 +368,8 @@ Depends: ${misc:Depends}, vlc-plugin-qt (= ${binary:Version}) Recommends: vlc-bin Enhances: vlc -Breaks: vlc (<< 2.2.4-10~), vlc-data (<< 2.2.5.1-1~deb9u1) -Replaces: vlc (<< 2.2.4-10~), vlc-data (<< 2.2.5.1-1~deb9u1) +Breaks: vlc (<< 2.2.6-1~deb9u1), vlc-data (<< 2.2.6-1~deb9u1) +Replaces: vlc (<< 2.2.6-1~deb9u1), vlc-data (<< 2.2.6-1~deb9u1) Description: multimedia player and streamer (Skins2 plugin) VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4, DivX, MOV, WMV, QuickTime, WebM, FLAC, MP3, Ogg/Vorbis files, DVDs, VCDs, @@ -385,8 +383,8 @@ Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends} Recommends: vlc-bin -Breaks: vlc (<< 2.2.4-10~) -Replaces: vlc (<< 2.2.4-10~) +Breaks: vlc (<< 2.2.6-1~deb9u1) +Replaces: vlc (<< 2.2.6-1~deb9u1) Description: multimedia player and streamer (Qt plugin) VLC is the VideoLAN project's media player. It plays MPEG, MPEG-2, MPEG-4, DivX, MOV, WMV, QuickTime, WebM, FLAC, MP3, Ogg/Vorbis files, DVDs, VCDs, diff --git a/debian/libvlc-dev.maintscript b/debian/libvlc-dev.maintscript index 8a87633ada..2afdc844e6 100644 --- a/debian/libvlc-dev.maintscript +++ b/debian/libvlc-dev.maintscript @@ -1,2 +1,2 @@ -symlink_to_dir /usr/share/doc/libvlc-dev libvlc5 2.2.5.1-1~z -symlink_to_dir /usr/share/bug/libvlc-dev libvlc5 2.2.5.1-1~z +symlink_to_dir /usr/share/doc/libvlc-dev libvlc5 2.2.6-1~z +symlink_to_dir /usr/share/bug/libvlc-dev libvlc5 2.2.6-1~z diff --git a/debian/libvlc5.maintscript b/debian/libvlc5.maintscript index 16a91f49c7..8419546c65 100644 --- a/debian/libvlc5.maintscript +++ b/debian/libvlc5.maintscript @@ -1,2 +1,2 @@ -symlink_to_dir /usr/share/doc/libvlc5 libvlccore8 2.2.5.1-1~z -symlink_to_dir /usr/share/bug/libvlc5 libvlccore8 2.2.5.1-1~z +symlink_to_dir /usr/share/doc/libvlc5 libvlccore8 2.2.6-1~z +symlink_to_dir /usr/share/bug/libvlc5 libvlccore8 2.2.6-1~z diff --git a/debian/libvlccore-dev.maintscript b/debian/libvlccore-dev.maintscript index 94eba47ead..1396074330 100644 --- a/debian/libvlccore-dev.maintscript +++ b/debian/libvlccore-dev.maintscript @@ -1,2 +1,2 @@ -symlink_to_dir /usr/share/doc/libvlccore-dev libvlccore8 2.2.5.1-1~z -symlink_to_dir /usr/share/bug/libvlccore-dev libvlccore8 2.2.5.1-1~z +symlink_to_dir /usr/share/doc/libvlccore-dev libvlccore8 2.2.6-1~z +symlink_to_dir /usr/share/bug/libvlccore-dev libvlccore8 2.2.6-1~z diff --git a/debian/libvlccore8.maintscript b/debian/libvlccore8.maintscript index 2e304b4934..c8f2fca0be 100644 --- a/debian/libvlccore8.maintscript +++ b/debian/libvlccore8.maintscript @@ -1 +1 @@ -symlink_to_dir /usr/share/doc/libvlccore8 vlc-data 2.2.5.1-1~z +symlink_to_dir /usr/share/doc/libvlccore8 vlc-data 2.2.6-1~z diff --git a/debian/vlc-nox.maintscript b/debian/vlc-nox.maintscript index 9668bee50a..839b54c75e 100644 --- a/debian/vlc-nox.maintscript +++ b/debian/vlc-nox.maintscript @@ -1 +1 @@ -symlink_to_dir /usr/share/bug/vlc-nox libvlccore8 2.2.5.1-1~z +symlink_to_dir /usr/share/bug/vlc-nox libvlccore8 2.2.6-1~z diff --git a/debian/vlc-plugin-fluidsynth.maintscript b/debian/vlc-plugin-fluidsynth.maintscript index 7f62c67eeb..430cb95997 100644 --- a/debian/vlc-plugin-fluidsynth.maintscript +++ b/debian/vlc-plugin-fluidsynth.maintscript @@ -1 +1 @@ -symlink_to_dir /usr/share/bug/vlc-plugin-fluidsynth vlc-nox 2.2.5.1-1~z +symlink_to_dir /usr/share/bug/vlc-plugin-fluidsynth vlc-nox 2.2.6-1~z diff --git a/debian/vlc-plugin-jack.maintscript b/debian/vlc-plugin-jack.maintscript index 170c0f4eb6..7021aea6d3 100644 --- a/debian/vlc-plugin-jack.maintscript +++ b/debian/vlc-plugin-jack.maintscript @@ -1 +1 @@ -symlink_to_dir /usr/share/bug/vlc-plugin-jack vlc-nox 2.2.5.1-1~z +symlink_to_dir /usr/share/bug/vlc-plugin-jack vlc-nox 2.2.6-1~z diff --git a/debian/vlc-plugin-notify.maintscript b/debian/vlc-plugin-notify.maintscript index b8f188d935..d4202c8b38 100644 --- a/debian/vlc-plugin-notify.maintscript +++ b/debian/vlc-plugin-notify.maintscript @@ -1 +1 @@ -symlink_to_dir /usr/share/bug/vlc-plugin-notify vlc-nox 2.2.5.1-1~z +symlink_to_dir /usr/share/bug/vlc-plugin-notify vlc-nox 2.2.6-1~z diff --git a/debian/vlc-plugin-samba.maintscript b/debian/vlc-plugin-samba.maintscript index ec5ff5480b..2bdf88dd68 100644 --- a/debian/vlc-plugin-samba.maintscript +++ b/debian/vlc-plugin-samba.maintscript @@ -1 +1 @@ -symlink_to_dir /usr/share/bug/vlc-plugin-samba vlc-nox 2.2.5.1-1~z +symlink_to_dir /usr/share/bug/vlc-plugin-samba vlc-nox 2.2.6-1~z diff --git a/debian/vlc-plugin-sdl.maintscript b/debian/vlc-plugin-sdl.maintscript index b7ae6f80aa..6dd3bd7a64 100644 --- a/debian/vlc-plugin-sdl.maintscript +++ b/debian/vlc-plugin-sdl.maintscript @@ -1 +1 @@ -symlink_to_dir /usr/share/bug/vlc-plugin-sdl vlc-nox 2.2.5.1-1~z +symlink_to_dir /usr/share/bug/vlc-plugin-sdl vlc-nox 2.2.6-1~z diff --git a/debian/vlc-plugin-svg.maintscript b/debian/vlc-plugin-svg.maintscript index febc0fb793..27b520ed92 100644 --- a/debian/vlc-plugin-svg.maintscript +++ b/debian/vlc-plugin-svg.maintscript @@ -1 +1 @@ -symlink_to_dir /usr/share/bug/vlc-plugin-svg vlc-nox 2.2.5.1-1~z +symlink_to_dir /usr/share/bug/vlc-plugin-svg vlc-nox 2.2.6-1~z diff --git a/debian/vlc-plugin-zvbi.maintscript b/debian/vlc-plugin-zvbi.maintscript index b5b10d8e58..24fb38e001 100644 --- a/debian/vlc-plugin-zvbi.maintscript +++ b/debian/vlc-plugin-zvbi.maintscript @@ -1 +1 @@ -symlink_to_dir /usr/share/bug/vlc-plugin-zvbi vlc-nox 2.2.5.1-1~z +symlink_to_dir /usr/share/bug/vlc-plugin-zvbi vlc-nox 2.2.6-1~z diff --git a/debian/vlc.maintscript b/debian/vlc.maintscript index 4aedf5891a..eb4e8b03aa 100644 --- a/debian/vlc.maintscript +++ b/debian/vlc.maintscript @@ -1,2 +1,2 @@ -symlink_to_dir /usr/share/doc/vlc vlc-nox 2.2.5.1-1~z -symlink_to_dir /usr/share/bug/vlc vlc-nox 2.2.5.1-1~z +symlink_to_dir /usr/share/doc/vlc vlc-nox 2.2.6-1~z +symlink_to_dir /usr/share/bug/vlc vlc-nox 2.2.6-1~zAttachment: signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
- To: Sebastian Ramacher <sramacher@debian.org>, 863347-done@bugs.debian.org
- Subject: Re: Bug#863347: unblock: vlc/2.2.6-1~deb9u1
- From: Niels Thykier <niels@thykier.net>
- Date: Thu, 25 May 2017 20:37:00 +0000
- Message-id: <52fbb7ab-aa83-c684-f562-fb001b6f4a3b@thykier.net>
- In-reply-to: <[🔎] 20170525165250.6pvhaxobhuboq74i@ramacher.at>
- References: <[🔎] 20170525165250.6pvhaxobhuboq74i@ramacher.at>
Sebastian Ramacher: > Package: release.debian.org > Severity: normal > User: release.debian.org@packages.debian.org > Usertags: unblock > > Please unblock package vlc version 2.2.6-1~deb9u1. It is the latest stable bug > fix release including a fix for CVE-2017-8312. > > The upstream changes are attached as vlc-2.2.6.diff (updates to the translations > have been stripped). The changes in debian (vlc-debian.stretch.diff) includes > the usual bump of the versions in *.maintscripts and in Breaks + Repalces. The > Breaks + Replaces from libvlc-bin have been removed as they are not necessary. > > unblock vlc/2.2.6-1~deb9u1 > > Cheers > Unblocked, thanks. To be honest, it is a bit problematic that we have to bump the version of breaks/replaces + conffile handling for every upload. ~Niels
--- End Message ---