cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SECURITY update to vlc-2.2.6.

Browse Source 
from Brad (maintainer) and a few tweaks by myself
This commit is contained in:
ajacoutot 2017-05-27 08:40:13 +00:00
parent 1d9c03ad5a
commit de7de5d7a8
7 changed files with 50 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
x11/vlc/Makefile
View File

@ -1,17 +1,15 @@
# $OpenBSD: Makefile,v 1.209 2017/05/22 10:22:25 espie Exp $
# $OpenBSD: Makefile,v 1.210 2017/05/27 08:40:13 ajacoutot Exp $
COMMENT-main= VideoLAN client; multimedia player
COMMENT-jack= JACK audio output module for VLC
V= 2.2.4
V= 2.2.6
DISTNAME= vlc-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-jack= vlc-jack-${V}
CATEGORIES= x11
MASTER_SITES= https://download.videolan.org/pub/videolan/vlc/${V}/
EXTRACT_SUFX= .tar.xz
REVISION-main= 1
REVISION-jack= 1
SHARED_LIBS= vlc 3.0 \
vlccore 3.0
@ -25,7 +23,6 @@ PERMIT_PACKAGE_CDROM= patents
PERMIT_PACKAGE_FTP= Yes
WANTLIB-common= c dbus-1 idn m pthread ${MODGETTEXT_WANTLIB}
# v4l2 is dlopen'd
WANTLIB-main= EGL GL ICE lib/qt4/QtGui QtCore SM SDL SDL_image X11 \
Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama Xpm \
Xrender Xrandr ass atk-1.0 avcodec avformat avutil bluray \
@ -33,14 +30,17 @@ WANTLIB-main= EGL GL ICE lib/qt4/QtGui QtCore SM SDL SDL_image X11 \
ffi fontconfig freetype fribidi gcrypt gdk-x11-2.0 \
gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gmp gnutls \
gobject-2.0 gpg-error graphite2 gthread-2.0 gtk-x11-2.0 \
harfbuzz hogweed jpeg lzma matroska nettle notify opus \
harfbuzz hogweed idn2 jpeg lzma matroska nettle notify opus \
ogg p11-kit pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre \
pixman-1 png postproc pthread-stubs rsvg-2 samplerate sndio \
speex speexdsp ${LIBCXX} swscale tag tar tasn1 tiff usbhid \
v4l2 vorbis vorbisenc webp x264 x265 xcb-composite xcb-keysyms \
xcb-randr xcb-render xcb-shape xcb-shm xcb-xfixes xcb-xv \
xcb xml2 z X11-xcb Xxf86vm drm gbm glapi xcb-dri2 xcb-glx \
idn2 unistring ${WANTLIB-common}
speex speexdsp swscale tag tar tasn1 tiff unistring usbhid \
vorbis vorbisenc webp x264 x265 xcb-composite xcb-keysyms \
xcb-randr xcb-render xcb-shm xcb-xfixes xcb-xv xcb xml2 z \
X11-xcb Xxf86vm drm gbm glapi xcb-dri2 xcb-glx \
${WANTLIB-common}
# v4l2 is dlopen'd
WANTLIB-main += v4l2
WANTLIB-jack= db jack vlccore ${WANTLIB-common}
AUTOCONF_VERSION= 2.69
@ -52,6 +52,12 @@ MODULES= devel/gettext \
WANT_CXX = base clang
MODCLANG_ARCHS= amd64 i386
.if ${MODCLANG_ARCHS:M${MACHINE_ARCH}}
WANTLIB-main += ${LIBECXX}
.else
WANTLIB-main += ${LIBCXX}
.endif
LIB_DEPENDS-main= ${MODQT4_LIB_DEPENDS} \
${MODGETTEXT_LIB_DEPENDS} \
archivers/libtar \

4
x11/vlc/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (vlc-2.2.4.tar.xz) = FjLpHSoAh+DvTD+0yVw8KJD3cVqdHUP/1GMp9CjPU74=
SIZE (vlc-2.2.4.tar.xz) = 22199316
SHA256 (vlc-2.2.6.tar.xz) = xAPTrM2aQA6yGByVjz57xVJP5XOEJfQlPUKIO0JaQqg=
SIZE (vlc-2.2.6.tar.xz) = 22198720

9
x11/vlc/patches/patch-Makefile_in
View File

@ -1,7 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.1 2017/05/22 10:22:25 espie Exp $
--- Makefile.in.orig Tue Jun 30 21:47:49 2015
+++ Makefile.in Tue Jun 30 21:48:12 2015
@@ -2915,6 +2915,7 @@ vlc$(EXEEXT):
$OpenBSD: patch-Makefile_in,v 1.2 2017/05/27 08:40:14 ajacoutot Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -2918,6 +2918,7 @@ vlc$(EXEEXT):
install-exec-hook:
if test "$(build)" = "$(host)"; then \
PATH="$(DESTDIR)$(bindir):$$PATH" \

19
x11/vlc/patches/patch-configure_ac
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.32 2016/03/03 12:01:17 ajacoutot Exp $
--- configure.ac.orig Mon Jan 18 16:29:29 2016
+++ configure.ac Wed Mar 2 19:49:15 2016
$OpenBSD: patch-configure_ac,v 1.33 2017/05/27 08:40:14 ajacoutot Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -134,8 +134,6 @@ case "${host_os}" in
;;
openbsd*)
@ -10,7 +11,7 @@ $OpenBSD: patch-configure_ac,v 1.32 2016/03/03 12:01:17 ajacoutot Exp $
;;
netbsd*)
SYS=netbsd
@@ -949,35 +947,6 @@ AC_ARG_ENABLE(optimizations,
@@ -952,35 +950,6 @@ AC_ARG_ENABLE(optimizations,
dnl Check for various optimization flags
AS_IF([test "${enable_optimizations}" != "no"], [
@ -43,10 +44,10 @@ $OpenBSD: patch-configure_ac,v 1.32 2016/03/03 12:01:17 ajacoutot Exp $
- ])
- ])
-
dnl Check for -ffast-math
VLC_SAVE_FLAGS
CFLAGS="${CFLAGS} -ffast-math"
@@ -1611,7 +1580,7 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"
dnl Check for fast maths
RDC_PROG_CC_FFLAGS([no-math-errno unsafe-math-optimizations no-rounding-math no-signaling-nans cx-limited-range])
AC_LANG_PUSH(C++)
@@ -1605,7 +1574,7 @@ AS_IF([test "${enable_live555}" != "no" -a -n "${CXX}"
], [
AS_IF([test "${SYS}" != "os2"], [
LIVE555_PREFIX=${LIVE555_PREFIX-"/usr"}
@ -55,7 +56,7 @@ $OpenBSD: patch-configure_ac,v 1.32 2016/03/03 12:01:17 ajacoutot Exp $
], [
LIVE555_PREFIX=${LIVE555_PREFIX-"/usr/lib/live"}
CPPFLAGS_live555="-I${LIVE555_PREFIX}/liveMedia/include -I${LIVE555_PREFIX}/groupsock/include -I${LIVE555_PREFIX}/BasicUsageEnvironment/include -I${LIVE555_PREFIX}/UsageEnvironment/include"
@@ -3736,47 +3705,18 @@ AC_ARG_ENABLE(qt, [
@@ -3730,47 +3699,18 @@ AC_ARG_ENABLE(qt, [
])
])
AS_IF([test "${enable_qt}" != "no"], [

6
x11/vlc/patches/patch-modules_gui_qt4_dialogs_messages_cpp
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-modules_gui_qt4_dialogs_messages_cpp,v 1.1 2017/05/22 10:22:25 espie Exp $
$OpenBSD: patch-modules_gui_qt4_dialogs_messages_cpp,v 1.2 2017/05/27 08:40:14 ajacoutot Exp $
Use qt4 atomics there, they're portable (taken from FreeBSD)
Index: modules/gui/qt4/dialogs/messages.cpp
--- modules/gui/qt4/dialogs/messages.cpp.orig
+++ modules/gui/qt4/dialogs/messages.cpp
@@ -143,7 +143,7 @@ MessagesDialog::~MessagesDialog()
@@ -145,7 +145,7 @@ MessagesDialog::~MessagesDialog()
void MessagesDialog::changeVerbosity( int i_verbosity )
{
@ -13,7 +13,7 @@ Index: modules/gui/qt4/dialogs/messages.cpp
}
void MessagesDialog::updateConfig()
@@ -337,7 +337,7 @@ void MessagesDialog::MsgCallback( void *self, int type
@@ -339,7 +339,7 @@ void MessagesDialog::MsgCallback( void *self, int type
{
MessagesDialog *dialog = (MessagesDialog *)self;
char *str;

21
x11/vlc/patches/patch-share_Makefile_am
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-share_Makefile_am,v 1.3 2015/05/24 07:16:31 ajacoutot Exp $
--- share/Makefile.am.orig Sun Nov 16 13:57:59 2014
+++ share/Makefile.am Fri May 8 19:20:57 2015
$OpenBSD: patch-share_Makefile_am,v 1.4 2017/05/27 08:40:14 ajacoutot Exp $
Index: share/Makefile.am
--- share/Makefile.am.orig
+++ share/Makefile.am
@@ -46,7 +46,6 @@ EXTRA_DIST += \
nobase_vlcdata_DATA =
@ -9,14 +10,16 @@ $OpenBSD: patch-share_Makefile_am,v 1.3 2015/05/24 07:16:31 ajacoutot Exp $
nobase_vlcdata_DATA += $(DIST_skins2)
endif
if KDE_SOLID
@@ -77,10 +76,6 @@ skins2_default_vlt_FILES = \
@@ -77,12 +76,6 @@ skins2_default_vlt_FILES = \
skins2/default.vlt: $(skins2_default_vlt_FILES)
mkdir -p skins2
- (cd "$(srcdir)/skins2"; find default -print0 | \
- LC_ALL=C sort -z | \
- tar cvv --exclude .svn --no-recursion --null -T -) | \
- gzip -n > skins2/default.vlt
$(AM_V_at)mkdir -p skins2
- $(AM_V_at)rm -f -- skins2/default.vlt.tmp
- $(AM_V_GEN)GZIP=--no-name \
- tar cvvzf skins2/default.vlt.tmp \
- --owner=root --group=root --directory="$(srcdir)/skins2" \
- default/
- $(AM_V_at)mv -f -- skins2/default.vlt.tmp skins2/default.vlt
#
# LUA

4
x11/vlc/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.40 2016/03/03 12:01:18 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.41 2017/05/27 08:40:14 ajacoutot Exp $
@pkgpath x11/vlc
%%amd64%%
%%i386%%
@ -453,8 +453,6 @@ share/icons/hicolor/32x32/apps/vlc.png
share/icons/hicolor/32x32/apps/vlc.xpm
share/icons/hicolor/48x48/apps/vlc-xmas.png
share/icons/hicolor/48x48/apps/vlc.png
share/locale/ach/
share/locale/ach/LC_MESSAGES/
share/locale/ach/LC_MESSAGES/vlc.mo
share/locale/af/LC_MESSAGES/vlc.mo
share/locale/am/LC_MESSAGES/vlc.mo