pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

tigervnc: update to 1.11.0.1.20.11.

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Wed Apr 28 19:27:33 2021 +0200
Changeset:	0a639bef1abc395d63b19b1261ac0b947570729c

Modified Files:
	tigervnc/Makefile
	tigervnc/PLIST
	tigervnc/distinfo
	tigervnc/patches/patch-CMakeLists.txt
	tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
Added Files:
	tigervnc/patches/patch-common_rfb_util.h
	tigervnc/patches/patch-unix_vncserver_vncserver.in
	tigervnc/patches/patch-unix_vncserver_vncsession.c
Removed Files:
	tigervnc/patches/patch-unix_vncserver

Log Message:
tigervnc: update to 1.11.0.1.20.11.

1.11.0

TigerVNC 1.11.0 is now available. This is a new major release of
TigerVNC, but also a security release. Users that rely on the TLS
feature in the viewers are recommended to upgrade as soon as possible.

Lots of changes have been made since the last release, but the
highlights are:

- A security issue has been fixed in how the viewers handle TLS
certificate exceptions
- vncserver has gotten a major redesign to be compatible with modern
distributions
- The native viewer now has touch gestures to handle certain mouse
actions (e.g. scroll wheel)
- Middle mouse button emulation in the native viewer, for devices
with only two mouse buttons
- The Java viewer now supports Java 9+, but also now requires Java 8+
- Support for alpha cursors in the Java viewer (a feature already
supported in the native viewer)
- The password and username can now be specified via the environment
for the native viewer
- Support for building Xvnc/libvnc.so with Xorg 1.20.7+ and deprecate
support for Xorg older than 1.16
- The official builds have been fixed to work on the upcoming macOS 11
- The Windows server (WinVNC) is now packaged separately as it is
unmaintained and buggy

1.10.1

This is a security release to fix a number of issues that were found by
Kaspersky Lab. These issues affect both the client and server and could
theoretically allow an malicious peer to take control over the software
on the other side.

No working exploit is known at this time, and the issues require the
peer to first be authenticated. We still urge users to upgrade when
possible.

1.10.0

TigerVNC 1.10.0 is now available. Lots of changes have been made since
the last release, but the highlights are:

* The clipboard now supports full Unicode in the native viewer, WinVNC
and Xvnc/libvnc.so
* The native client will now respect the system trust store when
verifying server certificates
* Improved compatibility with VMware's VNC server
* Improved compatibility with some input methods on macOS
* Improvements to the automatic "repair" of JPEG artefacts
* Better handling of the Alt keys in some corner cases
* The Java web server has been removed as applets are no longer support
by most browsers
* x0vncserver can now be configured to only allow local connections
* x0vncserver has received fixes for when only part of the display is shared
* Polling is now default in WinVNC as that works better for most

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=0a639bef1abc395d63b19b1261ac0b947570729c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 tigervnc/Makefile                                  | 26 +++++++++++++++---
 tigervnc/PLIST                                     | 20 ++++++++++----
 tigervnc/distinfo                                  | 16 ++++++-----
 tigervnc/patches/patch-CMakeLists.txt              | 23 +++++-----------
 tigervnc/patches/patch-common_rfb_util.h           | 13 +++++++++
 tigervnc/patches/patch-unix_vncserver              | 31 ----------------------
 tigervnc/patches/patch-unix_vncserver_vncserver.in | 13 +++++++++
 tigervnc/patches/patch-unix_vncserver_vncsession.c | 15 +++++++++++
 .../patches/patch-unix_xserver_hw_vnc_Makefile.am  |  8 +++---
 9 files changed, 98 insertions(+), 67 deletions(-)

diffs:
diff --git a/tigervnc/Makefile b/tigervnc/Makefile
index 0984924ad5..f67265054c 100644
--- a/tigervnc/Makefile
+++ b/tigervnc/Makefile
@@ -1,10 +1,10 @@
 # $NetBSD: Makefile,v 1.37 2021/04/21 13:25:14 adam Exp $
 
-DISTNAME=		tigervnc-1.9.0
+DISTNAME=		tigervnc-1.11.0
 PKGNAME=		${DISTNAME}.1.20.11
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_GITHUB:=TigerVNC/}
-GITHUB_TAG=		v${PKGVERSION_NOREV}
+GITHUB_TAG=		v1.11.0
 XORG_SERVER_FILE=	xorg-server-1.20.11
 SITES.${XORG_SERVER_FILE}.tar.bz2=	${MASTER_SITE_XORG:=xserver/}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${XORG_SERVER_FILE}.tar.bz2
@@ -20,12 +20,15 @@ BUILD_DEPENDS+=	tradcpp-[0-9]*:../../devel/tradcpp
 
 DEPENDS+=	mcookie-[0-9]*:../../x11/mcookie
 
+REPLACE_BASH+=	unix/vncserver/vncsession-start.in
+REPLACE_PERL+=	unix/vncserver/vncserver.in
+
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 USE_CMAKE=	yes
 USE_LIBTOOL=	yes
 USE_LANGUAGES=	c c++
-USE_TOOLS+=	intltool msgfmt msgmerge patch perl:run autoconf automake autoreconf pkg-config gmake bash
+USE_TOOLS+=	intltool msgfmt msgmerge patch perl:run autoconf automake autoreconf pkg-config gmake bash:run
 BUILD_DIRS=	. unix/xserver
 INSTALL_DIRS=	. unix/xserver/hw/vnc
 
@@ -41,7 +44,7 @@ LIBTOOL_OVERRIDE=		unix/xserver/libtool
 SUBST_CLASSES+=		hpath
 SUBST_STAGE.hpath=	pre-configure
 SUBST_MESSAGE.hpath=	fixing hardcoded paths
-SUBST_FILES.hpath=	unix/vncserver
+SUBST_FILES.hpath=	unix/vncserver/vncserver.in
 SUBST_SED.hpath+=	-e 's|/usr/local/vnc/classes|${PREFIX}/share/vnc/classes|g'
 SUBST_VARS.hpath+=	PREFIX X11BASE
 
@@ -54,6 +57,21 @@ post-extract:
 post-patch:
 	cd ${WRKSRC}/unix/xserver && ${PATCH} --batch -p1 <../xserver120.patch
 
+# suggested by BUILDING.txt:
+#./configure --with-pic --without-dtrace --disable-static --disable-dri \
+#      --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg \
+#      --disable-dmx --disable-xwin --disable-xephyr --disable-kdrive \
+#      --disable-config-dbus --disable-config-hal --disable-config-udev \
+#      --disable-dri2 --enable-install-libxf86config --enable-glx \
+#      --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \
+#      --with-fontdir=/usr/share/X11/fonts \
+#      --with-xkb-path=/usr/share/X11/xkb \
+#      --with-xkb-output=/var/lib/xkb \
+#      --with-xkb-bin-directory=/usr/bin \
+#      --with-serverconfig-path=/usr/lib[64]/xorg \
+#      --with-dri-driver-path=/usr/lib[64]/dri \
+#      {additional configure options}
+
 XORG_CONFIGURE_ARGS+=	--prefix=${PREFIX} --mandir=${PREFIX}/${PKGMANDIR}
 XORG_CONFIGURE_ARGS+=	--disable-xwayland --disable-kdrive --disable-xephyr
 XORG_CONFIGURE_ARGS+=	--disable-static --disable-xinerama --without-dtrace
diff --git a/tigervnc/PLIST b/tigervnc/PLIST
index 18ed2e3a83..43de4486b7 100644
--- a/tigervnc/PLIST
+++ b/tigervnc/PLIST
@@ -1,20 +1,28 @@
-@comment $NetBSD: PLIST,v 1.7 2020/04/17 11:37:24 wiz Exp $
+@comment $NetBSD$
 bin/Xvnc
 bin/vncconfig
 bin/vncpasswd
-bin/vncserver
 bin/vncviewer
 bin/x0vncserver
+etc/pam.d/tigervnc
+etc/tigervnc/vncserver-config-defaults
+etc/tigervnc/vncserver-config-mandatory
+etc/tigervnc/vncserver.users
+lib/systemd/system/vncserver@.service
 lib/xorg/modules/extensions/libvnc.la
+libexec/vncserver
+libexec/vncsession-start
 man/man1/Xvnc.1
 man/man1/vncconfig.1
 man/man1/vncpasswd.1
-man/man1/vncserver.1
 man/man1/vncviewer.1
 man/man1/x0vncserver.1
+man/man8/vncserver.8
+man/man8/vncsession.8
+sbin/vncsession
 share/applications/vncviewer.desktop
-share/doc/tigervnc-1.9.0/LICENCE.TXT
-share/doc/tigervnc-1.9.0/README.rst
+share/doc/tigervnc/LICENCE.TXT
+share/doc/tigervnc/README.rst
 share/icons/hicolor/16x16/apps/tigervnc.png
 share/icons/hicolor/22x22/apps/tigervnc.png
 share/icons/hicolor/24x24/apps/tigervnc.png
@@ -34,6 +42,7 @@ share/locale/fur/LC_MESSAGES/tigervnc.mo
 share/locale/hu/LC_MESSAGES/tigervnc.mo
 share/locale/id/LC_MESSAGES/tigervnc.mo
 share/locale/it/LC_MESSAGES/tigervnc.mo
+share/locale/ko/LC_MESSAGES/tigervnc.mo
 share/locale/nl/LC_MESSAGES/tigervnc.mo
 share/locale/pl/LC_MESSAGES/tigervnc.mo
 share/locale/pt_BR/LC_MESSAGES/tigervnc.mo
@@ -45,3 +54,4 @@ share/locale/tr/LC_MESSAGES/tigervnc.mo
 share/locale/uk/LC_MESSAGES/tigervnc.mo
 share/locale/vi/LC_MESSAGES/tigervnc.mo
 share/locale/zh_CN/LC_MESSAGES/tigervnc.mo
+share/locale/zh_TW/LC_MESSAGES/tigervnc.mo
diff --git a/tigervnc/distinfo b/tigervnc/distinfo
index fecc8ecf9a..e70959d8b5 100644
--- a/tigervnc/distinfo
+++ b/tigervnc/distinfo
@@ -1,17 +1,19 @@
 $NetBSD: distinfo,v 1.17 2020/04/17 11:37:24 wiz Exp $
 
-SHA1 (tigervnc-1.9.0.tar.gz) = c56656c596fb863bb2c4b67fb62b4165011d181f
-RMD160 (tigervnc-1.9.0.tar.gz) = 990e872addf459432584c176b3565504e994899e
-SHA512 (tigervnc-1.9.0.tar.gz) = 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d
-Size (tigervnc-1.9.0.tar.gz) = 1506520 bytes
+SHA1 (tigervnc-1.11.0.tar.gz) = 6f6b621a76b734888748de10c32c2b5b59d40b19
+RMD160 (tigervnc-1.11.0.tar.gz) = 516a6eee866ef221ae52d759b465032a51510dc3
+SHA512 (tigervnc-1.11.0.tar.gz) = 262676f065de6dfb72b1482c0ef1e6d8b764f53360ae6114debbe0986eede45d27e283e1452a72cb9b7540657ab347fd36df5b30b72d6db4a0f8cbea5b591025
+Size (tigervnc-1.11.0.tar.gz) = 1346992 bytes
 SHA1 (xorg-server-1.20.11.tar.bz2) = 86ae4add5719e6026a569f5559d51e8707171d5d
 RMD160 (xorg-server-1.20.11.tar.bz2) = 9b451d5523e9384df37e0e91f52d843090590d23
 SHA512 (xorg-server-1.20.11.tar.bz2) = 1017015b9fd5d53788abe3641d877e6df8609841fa5c1847c0a5e133ddcc1b758a5d695304ebd36828099ec201a85b6b70b46f5ea4f81c5bd3a16fa6e175e3c2
 Size (xorg-server-1.20.11.tar.bz2) = 6476116 bytes
-SHA1 (patch-CMakeLists.txt) = 42a364f898784a9c4da46bea8ef6bc37838815b9
+SHA1 (patch-CMakeLists.txt) = e844bee9fa5e1ce755d65333fadd3654a207aee4
+SHA1 (patch-common_rfb_util.h) = 73d5fc206e192b936c224cedf5857980fca69eb0
 SHA1 (patch-media_CMakeLists.txt) = cd50f9b7a9405aa523412ef823a32437a3c19ffa
-SHA1 (patch-unix_vncserver) = 9c71ad02c6657f537bcb2abaa116a831b555d7c0
-SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = 29b33e6d94a070bb0a55a264cd1c4e120c9b1b3c
+SHA1 (patch-unix_vncserver_vncserver.in) = 715f16a4be6806778fd0a9d781e920771e35d0ca
+SHA1 (patch-unix_vncserver_vncsession.c) = 78f623b2ed7e34d9478032a02d20917fdbf2c0ca
+SHA1 (patch-unix_xserver_hw_vnc_Makefile.am) = df31836e27bb535b307404adb55e239f10bbe6c4
 SHA1 (patch-unix_xserver_hw_vnc_vncBlockHandler.c) = 534a621aab793625c27737d42c5bf12c9574a414
 SHA1 (patch-unix_xserver_hw_vnc_vncModule.c) = 77aff6c2bb19e6936302c783b72d581e7d6388f5
 SHA1 (patch-unix_xserver_os_inputthread.c) = da8f1a6ab905d2569f61e92d8cf9891ed14ec42a
diff --git a/tigervnc/patches/patch-CMakeLists.txt b/tigervnc/patches/patch-CMakeLists.txt
index 89d0ec631a..c77d6f6786 100644
--- a/tigervnc/patches/patch-CMakeLists.txt
+++ b/tigervnc/patches/patch-CMakeLists.txt
@@ -1,21 +1,12 @@
-$NetBSD: patch-CMakeLists.txt,v 1.3 2016/04/21 12:47:58 jperkin Exp $
+$NetBSD$
 
---- CMakeLists.txt.orig	2015-07-11 13:00:36.000000000 +0000
+--- CMakeLists.txt.orig	2021-04-28 15:26:55.658924359 +0000
 +++ CMakeLists.txt
-@@ -26,7 +26,7 @@ set(RCVERSION 1,5,0,0)
- # Installation paths
- set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")
- set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
--set(MAN_DIR "${DATA_DIR}/man")
-+set(MAN_DIR "${CMAKE_INSTALL_MANDIR}")
- set(LOCALE_DIR "${DATA_DIR}/locale")
- set(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${CMAKE_PROJECT_NAME}-${VERSION}")
- 
-@@ -268,6 +268,7 @@ else()
-   if(NOT APPLE)
-     add_subdirectory(unix)
+@@ -250,6 +250,7 @@ if(UNIX AND NOT APPLE)
+   if(X11_Xrender_FOUND)
+     set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xrender_LIB})
    endif()
-+  set(FLTK_LIBRARIES ${FLTK_LIBRARIES} -lpng -ljpeg)
++  set(FLTK_LIBRARIES ${FLTK_LIBRARIES} -lpng)
  endif()
  
- if(ENABLE_NLS)
+ # Check for GNUTLS library
diff --git a/tigervnc/patches/patch-common_rfb_util.h b/tigervnc/patches/patch-common_rfb_util.h
new file mode 100644
index 0000000000..9bec1f0330
--- /dev/null
+++ b/tigervnc/patches/patch-common_rfb_util.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- common/rfb/util.h.orig	2020-09-08 12:16:08.000000000 +0000
++++ common/rfb/util.h
+@@ -31,7 +31,7 @@
+ #include <limits.h>
+ #include <string.h>
+ 
+-struct timeval;
++#include <sys/time.h>
+ 
+ #ifdef __GNUC__
+ #  define __printf_attr(a, b) __attribute__((__format__ (__printf__, a, b)))
diff --git a/tigervnc/patches/patch-unix_vncserver b/tigervnc/patches/patch-unix_vncserver
deleted file mode 100644
index 152a13b1f1..0000000000
--- a/tigervnc/patches/patch-unix_vncserver
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-unix_vncserver,v 1.2 2016/02/19 10:14:48 wiz Exp $
-
---- unix/vncserver.orig	2015-12-24 20:18:02.000000000 +0000
-+++ unix/vncserver
-@@ -101,6 +101,8 @@ if (-d "/etc/X11/fontpath.d") {
- }
- 
- @fontpaths = ('/usr/share/X11/fonts', '/usr/share/fonts', '/usr/share/fonts/X11/');
-+if (! -l "@PREFIX@/share/fonts/X11") {push(@fontpaths, '@PREFIX@/share/fonts/X11');}
-+if (! -l "@X11BASE@/lib/X11/fonts") {push(@fontpaths, '@X11BASE@/lib/X11/fonts');}
- if (! -l "/usr/lib/X11") {push(@fontpaths, '/usr/lib/X11/fonts');}
- if (! -l "/usr/X11") {push(@fontpaths, '/usr/X11/lib/X11/fonts');}
- if (! -l "/usr/X11R6") {push(@fontpaths, '/usr/X11R6/lib/X11/fonts');}
-@@ -485,7 +487,7 @@ sub CheckDisplayNumber
- 
-     socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: $!\n";
-     eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))';
--    if (!bind(S, pack('S n x12', $AF_INET, 6000 + $n))) {
-+    if (!bind(S, sockaddr_in(6000 + $n, &INADDR_ANY))) {
- 	close(S);
- 	return 0;
-     }
-@@ -493,7 +495,7 @@ sub CheckDisplayNumber
- 
-     socket(S, $AF_INET, $SOCK_STREAM, 0) || die "$prog: socket failed: $!\n";
-     eval 'setsockopt(S, &SOL_SOCKET, &SO_REUSEADDR, pack("l", 1))';
--    if (!bind(S, pack('S n x12', $AF_INET, 5900 + $n))) {
-+    if (!bind(S, sockaddr_in(5900 + $n, &INADDR_ANY))) {
- 	close(S);
- 	return 0;
-     }
diff --git a/tigervnc/patches/patch-unix_vncserver_vncserver.in b/tigervnc/patches/patch-unix_vncserver_vncserver.in
new file mode 100644
index 0000000000..005dc0b0c8
--- /dev/null
+++ b/tigervnc/patches/patch-unix_vncserver_vncserver.in
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- unix/vncserver/vncserver.in.orig	2020-09-08 12:16:08.000000000 +0000
++++ unix/vncserver/vncserver.in
+@@ -51,6 +51,8 @@ if (-d "/etc/X11/fontpath.d") {
+ }
+ 
+ @fontpaths = ('/usr/share/X11/fonts', '/usr/share/fonts', '/usr/share/fonts/X11/');
++if (! -l "@PREFIX@/share/fonts/X11") {push(@fontpaths, '@PREFIX@/share/fonts/X11');}
++if (! -l "@X11BASE@/lib/X11/fonts") {push(@fontpaths, '@X11BASE@/lib/X11/fonts');}
+ if (! -l "/usr/lib/X11") {push(@fontpaths, '/usr/lib/X11/fonts');}
+ if (! -l "/usr/X11") {push(@fontpaths, '/usr/X11/lib/X11/fonts');}
+ if (! -l "/usr/X11R6") {push(@fontpaths, '/usr/X11R6/lib/X11/fonts');}
diff --git a/tigervnc/patches/patch-unix_vncserver_vncsession.c b/tigervnc/patches/patch-unix_vncserver_vncsession.c
new file mode 100644
index 0000000000..c749dca763
--- /dev/null
+++ b/tigervnc/patches/patch-unix_vncserver_vncsession.c
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- unix/vncserver/vncsession.c.orig	2020-09-08 12:16:08.000000000 +0000
++++ unix/vncserver/vncsession.c
+@@ -37,6 +37,10 @@
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ 
++#ifndef HOST_NAME_MAX
++#define HOST_NAME_MAX 255
++#endif
++
+ extern char **environ;
+ 
+ // PAM service name
diff --git a/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am b/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
index 8a91415d93..c83ee31048 100644
--- a/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
+++ b/tigervnc/patches/patch-unix_xserver_hw_vnc_Makefile.am
@@ -1,10 +1,10 @@
 $NetBSD: patch-unix_xserver_hw_vnc_Makefile.am,v 1.4 2018/08/17 12:36:05 wiz Exp $
 
---- unix/xserver/hw/vnc/Makefile.am.orig	2018-07-16 14:08:55.000000000 +0000
+--- unix/xserver/hw/vnc/Makefile.am.orig	2020-09-08 12:16:08.000000000 +0000
 +++ unix/xserver/hw/vnc/Makefile.am
-@@ -9,6 +9,9 @@ XREGION_LIB=$(TIGERVNC_BUILDDIR)/common/
+@@ -8,6 +8,9 @@ NETWORK_LIB=$(TIGERVNC_BUILDDIR)/common/
  UNIXCOMMON_LIB=$(TIGERVNC_BUILDDIR)/unix/common/libunixcommon.la
- COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(XREGION_LIB) $(OS_LIB) $(UNIXCOMMON_LIB)
+ COMMON_LIBS=$(NETWORK_LIB) $(RFB_LIB) $(RDR_LIB) $(OS_LIB) $(UNIXCOMMON_LIB)
  
 +# Hack to get the C headers to work when included from C++ code
 +AM_CXXFLAGS = -fpermissive
@@ -12,7 +12,7 @@ $NetBSD: patch-unix_xserver_hw_vnc_Makefile.am,v 1.4 2018/08/17 12:36:05 wiz Exp
  noinst_LTLIBRARIES = libvnccommon.la
  
  HDRS = vncExtInit.h vncHooks.h \
-@@ -68,6 +71,6 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
+@@ -67,6 +70,6 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I
  
  libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now
Home | Main Index | Thread Index | Old Index