From feab39b3c31e1f9e4085fcd6bc711204dca9239b Mon Sep 17 00:00:00 2001 From: Matthew Seaman Date: Sat, 21 Jan 2017 21:47:21 +0000 Subject: [PATCH] Update to 0.9.11 This includes a security fix for CVE-2016-9941 and CVE-2016-9942 * Drop files/patch-libvncclient_h264.c -- upstream has dropped h264 support * Switch from USE_OPENSSL to USES+=ssl * PORTREVISION bump in ports that link against libvncserver.so (with their default OPTIONS settings) due to change in ABI version of libvncserver.so PR: 215802 Submitted by: vlad-fbsd@acheronmedia.com MFH: 2017Q1 Security: 64be967a-d379-11e6-a071-001e67f15f5a --- emulators/kcemu/Makefile | 2 +- emulators/virtualbox-ose/Makefile | 1 + net/guacamole-server/Makefile | 2 +- net/krdc/Makefile | 2 +- net/libvncserver/Makefile | 5 ++--- net/libvncserver/distinfo | 6 +++--- net/libvncserver/files/patch-libvncclient_h264.c | 13 ------------- net/libvncserver/pkg-plist | 9 ++++----- net/remmina-plugin-vnc/Makefile | 1 + 9 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 net/libvncserver/files/patch-libvncclient_h264.c diff --git a/emulators/kcemu/Makefile b/emulators/kcemu/Makefile index 5ad15493b7bb..c391d6864681 100644 --- a/emulators/kcemu/Makefile +++ b/emulators/kcemu/Makefile @@ -3,7 +3,7 @@ PORTNAME= kcemu PORTVERSION= 0.5.1 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/KCemu/KCemu-${PORTVERSION} DISTNAME= KCemu-${PORTVERSION} diff --git a/emulators/virtualbox-ose/Makefile b/emulators/virtualbox-ose/Makefile index 32f74a21fc0d..cb03b32d3d33 100644 --- a/emulators/virtualbox-ose/Makefile +++ b/emulators/virtualbox-ose/Makefile @@ -3,6 +3,7 @@ PORTNAME= virtualbox-ose PORTVERSION= 5.1.14 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${PORTVERSION}/ DISTFILES= VirtualBox-${PORTVERSION}${EXTRACT_SUFX} ${GUESTADDITIONS} diff --git a/net/guacamole-server/Makefile b/net/guacamole-server/Makefile index 65708ac1d13a..338079fbbd70 100644 --- a/net/guacamole-server/Makefile +++ b/net/guacamole-server/Makefile @@ -3,7 +3,7 @@ PORTNAME= guacamole-server PORTVERSION= 0.9.9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MAINTAINER= ultima1252@gmail.com diff --git a/net/krdc/Makefile b/net/krdc/Makefile index 32e5e4494608..8248303f4115 100644 --- a/net/krdc/Makefile +++ b/net/krdc/Makefile @@ -2,7 +2,7 @@ PORTNAME= krdc PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net kde kde-kde4 MAINTAINER= kde@FreeBSD.org diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile index 7ae357d6892b..dac21f7d9438 100644 --- a/net/libvncserver/Makefile +++ b/net/libvncserver/Makefile @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= libvncserver -PORTVERSION= 0.9.10 +PORTVERSION= 0.9.11 DISTVERSIONPREFIX= LibVNCServer- -PORTREVISION= 1 CATEGORIES= net devel MAINTAINER= ports@FreeBSD.org @@ -35,7 +34,7 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls GNUTLS_CONFIGURE_WITH= gnutls OPENSSL_CONFIGURE_WITH= crypto ssl -OPENSSL_USE= OPENSSL=yes +OPENSSL_USES= ssl GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error diff --git a/net/libvncserver/distinfo b/net/libvncserver/distinfo index 679576c573c3..ce60bf65f078 100644 --- a/net/libvncserver/distinfo +++ b/net/libvncserver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1466709748 -SHA256 (LibVNC-libvncserver-LibVNCServer-0.9.10_GH0.tar.gz) = ed10819a5bfbf269969f97f075939cc38273cc1b6d28bccfb0999fba489411f7 -SIZE (LibVNC-libvncserver-LibVNCServer-0.9.10_GH0.tar.gz) = 1415191 +TIMESTAMP = 1483637975 +SHA256 (LibVNC-libvncserver-LibVNCServer-0.9.11_GH0.tar.gz) = 193d630372722a532136fd25c5326b2ca1a636cbb8bf9bb115ef869c804d2894 +SIZE (LibVNC-libvncserver-LibVNCServer-0.9.11_GH0.tar.gz) = 1413739 diff --git a/net/libvncserver/files/patch-libvncclient_h264.c b/net/libvncserver/files/patch-libvncclient_h264.c deleted file mode 100644 index f81e0ece8350..000000000000 --- a/net/libvncserver/files/patch-libvncclient_h264.c +++ /dev/null @@ -1,13 +0,0 @@ ---- libvncclient/h264.c.orig 2016-06-26 17:53:47 UTC -+++ libvncclient/h264.c -@@ -20,6 +20,10 @@ - #ifdef LIBVNCSERVER_CONFIG_LIBVA - - #include -+#include -+#if VA_CHECK_VERSION(0,39,2) -+#include -+#endif - #include - - enum _slice_types { diff --git a/net/libvncserver/pkg-plist b/net/libvncserver/pkg-plist index f79756a7b652..3c12a1792837 100644 --- a/net/libvncserver/pkg-plist +++ b/net/libvncserver/pkg-plist @@ -4,16 +4,15 @@ include/rfb/keysym.h include/rfb/rfb.h include/rfb/rfbclient.h include/rfb/rfbconfig.h -include/rfb/rfbint.h include/rfb/rfbproto.h include/rfb/rfbregion.h lib/libvncclient.a lib/libvncclient.so -lib/libvncclient.so.0 -lib/libvncclient.so.0.0.0 +lib/libvncclient.so.1 +lib/libvncclient.so.1.0.0 lib/libvncserver.a lib/libvncserver.so -lib/libvncserver.so.0 -lib/libvncserver.so.0.0.0 +lib/libvncserver.so.1 +lib/libvncserver.so.1.0.0 libdata/pkgconfig/libvncclient.pc libdata/pkgconfig/libvncserver.pc diff --git a/net/remmina-plugin-vnc/Makefile b/net/remmina-plugin-vnc/Makefile index ec024ef771f4..5e58309313fa 100644 --- a/net/remmina-plugin-vnc/Makefile +++ b/net/remmina-plugin-vnc/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PKGNAMESUFFIX= -vnc +PORTREVISION= 1 COMMENT= Remmina plugin for VNC protocol