pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/libvncserver Update to 0.9.11
details: https://anonhg.NetBSD.org/pkgsrc/rev/c3801ddf157f
branches: trunk
changeset: 356967:c3801ddf157f
user: ryoon <ryoon%pkgsrc.org@localhost>
date: Mon Jan 09 07:55:15 2017 +0000
description:
Update to 0.9.11
* Update buildlink3.mk
* Update HOMEPAGE and MASTER_SITES
Changelog:
0.9.11:
Overall changes:
LibVNCServer/LibVNCClient development now uses continous intregration, provided by TravisCI.
LibVNCClient:
Now initializes libgcrypt before use if the application did not do it. Fixes a crash when connection to Mac hosts (#45).
Various fixes that result in more stable handling of malicious or broken servers.
Removed broken and unmaintained H264 decoding.
Some documentation fixes.
Added hooks to WriteToTLS() for optional protection by mutex.
LibVNCServer:
Stability fixes for the WebSocket implementation.
Replaced SHA1 implementation with the one from RFC 6234.
The built-in HTTP server does not allow directory traversals anymore.
The built-in HTTP now sends correct MIME types for CSS and SVG.
Added support for systemd socket activation.
Made it possible to get autoPort behavior with either ipv4 or ipv6 disabled.
Fixed starting of an onHold-client in threaded mode.
0.9.10:
Overall changes:
Moved the whole project from sourceforge to https://libvnc.github.io/.
Cleaned out the autotools build system which now uses autoreconf.
Updated noVNC HTML5 client to latest version.
Split out x11vnc sources into separate repository at https://github.com/LibVNC/x11vnc
Split out vncterm sources into separate repository at https://github.com/LibVNC/vncterm
Split out VisualNaCro sources into separate repository at https://github.com/LibVNC/VisualNaCro
Merged Debian patches.
LibVNCServer/LibVNCClient:
Fixed some security-related buffer overflow cases.
Added compatibility headers to make LibVNCServer/LibVNCClient build on native Windows 8.
Update LZO to version 2.07, fixing CVE-2014-4607.
LibVNCServer:
Merged patches from KDE/krfb.
Can now do IPv6 without IPv4.
Fixed a use-after-free issue in scale.c.
diffstat:
net/libvncserver/Makefile | 21 +++-
net/libvncserver/PLIST | 3 +-
net/libvncserver/buildlink3.mk | 20 +----
net/libvncserver/distinfo | 13 +--
net/libvncserver/patches/patch-configure | 44 ------------
net/libvncserver/patches/patch-libvncserver_sockets.c | 19 -----
net/libvncserver/patches/patch-libvncserver_websockets.c | 57 ----------------
7 files changed, 23 insertions(+), 154 deletions(-)
diffs (250 lines):
diff -r 027cff064dda -r c3801ddf157f net/libvncserver/Makefile
--- a/net/libvncserver/Makefile Mon Jan 09 07:24:33 2017 +0000
+++ b/net/libvncserver/Makefile Mon Jan 09 07:55:15 2017 +0000
@@ -1,19 +1,21 @@
-# $NetBSD: Makefile,v 1.22 2016/09/19 13:04:18 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2017/01/09 07:55:15 ryoon Exp $
#
-DISTNAME= LibVNCServer-0.9.9
-PKGNAME= libVNCServer-0.9.9
-PKGREVISION= 6
+DISTNAME= libvncserver-LibVNCServer-0.9.11
+PKGNAME= libVNCServer-0.9.11
CATEGORIES= net
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvncserver/}
+MASTER_SITES= ${MASTER_SITE_GITHUB:=LibVNC/}
+GITHUB_PROJECT= libvncserver
+GITHUB_TAG= LibVNCServer-${PKGVERSION_NOREV}
MAINTAINER= pierrick%bs-network.net@localhost
-HOMEPAGE= http://libvncserver.sourceforge.net/
+HOMEPAGE= https://libvnc.github.io/
COMMENT= Easy API to write one's own vnc server
LICENSE= gnu-gpl-v2
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
+USE_TOOLS+= automake
PKGCONFIG_OVERRIDE+= libvncserver.pc.in
PKGCONFIG_OVERRIDE+= libvncclient.pc.in
@@ -25,12 +27,17 @@
PTHREAD_AUTO_VARS= yes
SUBST_CLASSES+= pthread
SUBST_STAGE.pthread= pre-configure
-SUBST_FILES.pthread= configure
+SUBST_FILES.pthread= configure.ac
SUBST_SED.pthread= -e 's|-lpthread||g'
.include "options.mk"
+pre-configure:
+ set -e; cd ${WRKSRC}; \
+ libtoolize; aclocal; autoheader; automake -a --foreign -i; autoconf
+
.include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 027cff064dda -r c3801ddf157f net/libvncserver/PLIST
--- a/net/libvncserver/PLIST Mon Jan 09 07:24:33 2017 +0000
+++ b/net/libvncserver/PLIST Mon Jan 09 07:55:15 2017 +0000
@@ -1,10 +1,9 @@
-@comment $NetBSD: PLIST,v 1.4 2011/04/04 09:13:44 obache Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/01/09 07:55:15 ryoon Exp $
bin/libvncserver-config
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.la
diff -r 027cff064dda -r c3801ddf157f net/libvncserver/buildlink3.mk
--- a/net/libvncserver/buildlink3.mk Mon Jan 09 07:24:33 2017 +0000
+++ b/net/libvncserver/buildlink3.mk Mon Jan 09 07:55:15 2017 +0000
@@ -1,28 +1,14 @@
-# $NetBSD: buildlink3.mk,v 1.13 2016/09/19 13:04:18 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2017/01/09 07:55:15 ryoon Exp $
BUILDLINK_TREE+= libVNCServer
.if !defined(LIBVNCSERVER_BUILDLINK3_MK)
LIBVNCSERVER_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.libVNCServer+= libVNCServer>=0.9.1
-BUILDLINK_ABI_DEPENDS.libVNCServer+= libVNCServer>=0.9.9nb6
+BUILDLINK_API_DEPENDS.libVNCServer+= libVNCServer>=0.9.11
+BUILDLINK_ABI_DEPENDS.libVNCServer+= libVNCServer>=0.9.11
BUILDLINK_PKGSRCDIR.libVNCServer?= ../../net/libvncserver
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-
-pkgbase := libVNCServer
-.include "../../mk/pkg-build-options.mk"
-
-.if !empty(PKG_BUILD_OPTIONS.libVNCServer:Mgnutls)
-.include "../../security/gnutls/buildlink3.mk"
-.endif
-
-.if !empty(PKG_BUILD_OPTIONS.libVNCServer:Mlibgcrypt)
-.include "../../security/libgcrypt/buildlink3.mk"
-.endif
-
.endif # LIBVNCSERVER_BUILDLINK3_MK
BUILDLINK_TREE+= -libVNCServer
diff -r 027cff064dda -r c3801ddf157f net/libvncserver/distinfo
--- a/net/libvncserver/distinfo Mon Jan 09 07:24:33 2017 +0000
+++ b/net/libvncserver/distinfo Mon Jan 09 07:55:15 2017 +0000
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.12 2015/12/08 17:23:20 jperkin Exp $
+$NetBSD: distinfo,v 1.13 2017/01/09 07:55:15 ryoon Exp $
-SHA1 (LibVNCServer-0.9.9.tar.gz) = 2004c6ae493baeff3da40b61e0a0f73c83182dad
-RMD160 (LibVNCServer-0.9.9.tar.gz) = e62e0903124abb85746bcac6498214fe09c3b4d7
-SHA512 (LibVNCServer-0.9.9.tar.gz) = a37a1aa7a8d38d1a734b22d55d5fbfd07332e64a22067eb937e04256e3034691b7a9506b13f2d73e10d1e4f1e9fc05e66b35321c93225505297ef0a9beba0458
-Size (LibVNCServer-0.9.9.tar.gz) = 1678609 bytes
-SHA1 (patch-configure) = 0ab9513b3528830587d4474cc21ba2cee65dd349
-SHA1 (patch-libvncserver_sockets.c) = 6af391ad441f561632ba2fea747006fa702776a1
-SHA1 (patch-libvncserver_websockets.c) = 6b9e25e3f54af967d8f6581a2c1e3250b8772693
+SHA1 (libvncserver-LibVNCServer-0.9.11.tar.gz) = d844a2c9e69465d104a8468dce515a49e4db9585
+RMD160 (libvncserver-LibVNCServer-0.9.11.tar.gz) = a26da5e88d6571d112dfc48ef94a527b19760a36
+SHA512 (libvncserver-LibVNCServer-0.9.11.tar.gz) = e473c081b68dd3cdd96a1756b4f4945ece79d3c8e4cef62140be1699671555fc16d3080e81d764197a14ea83203ffcd0e18c3cc182e012d036e3faae943003fb
+Size (libvncserver-LibVNCServer-0.9.11.tar.gz) = 1413739 bytes
diff -r 027cff064dda -r c3801ddf157f net/libvncserver/patches/patch-configure
--- a/net/libvncserver/patches/patch-configure Mon Jan 09 07:24:33 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-$NetBSD: patch-configure,v 1.3 2015/12/08 17:23:21 jperkin Exp $
-
-Use $as_echo to support escape sequences correctly.
-
---- configure.orig 2015-12-08 11:18:14.016272933 +0000
-+++ configure
-@@ -26310,26 +26310,26 @@ else
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&5
- $as_echo "$as_me: creating $ac_prefix_conf_OUT - prefix $ac_prefix_conf_UPP for $ac_prefix_conf_INP defines" >&6;}
- if test -f $ac_prefix_conf_INP ; then
-- echo "s/#undef *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
-+ $as_echo "s/#undef *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_]\\)/#undef $ac_prefix_conf_UPP""_\\1/" > conftest.prefix
- # no! these are things like socklen_t, const, vfork
- # echo "s/#undef *\\([m4_cr_letters]\\)/#undef $_LOW""_\\1/" >> _script
-- echo "s/#define *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
-- echo "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
-- echo "#endif/" >>conftest.prefix
-+ $as_echo "s/#define *\\([ABCDEFGHIJKLMNOPQRSTUVWXYZ_][abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*\\)\\(.*\\)/#ifndef $ac_prefix_conf_UPP""_\\1 \\" >> conftest.prefix
-+ $as_echo "#define $ac_prefix_conf_UPP""_\\1 \\2 \\" >> conftest.prefix
-+ $as_echo "#endif/" >>conftest.prefix
- # no! these are things like socklen_t, const, vfork
- # echo "s/#def[]ine *\\([m4_cr_letters][_symbol]*\\)\\(.*\\)/#ifndef $_LOW""_\\1 \\" >> _script
- # echo "#define $_LOW""_\\1 \\2 \\" >> _script
- # echo "#endif/" >> _script
- # now executing _script on _DEF input to create _OUT output file
-- echo "#ifndef $ac_prefix_conf_DEF" >$tmp/pconfig.h
-- echo "#define $ac_prefix_conf_DEF 1" >>$tmp/pconfig.h
-- echo ' ' >>$tmp/pconfig.h
-- echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
-+ $as_echo "#ifndef $ac_prefix_conf_DEF" >$tmp/pconfig.h
-+ $as_echo "#define $ac_prefix_conf_DEF 1" >>$tmp/pconfig.h
-+ $as_echo ' ' >>$tmp/pconfig.h
-+ $as_echo /'*' $ac_prefix_conf_OUT. Generated automatically at end of configure. '*'/ >>$tmp/pconfig.h
-
- sed -f conftest.prefix $ac_prefix_conf_INP >>$tmp/pconfig.h
-- echo ' ' >>$tmp/pconfig.h
-- echo '/* once:' $ac_prefix_conf_DEF '*/' >>$tmp/pconfig.h
-- echo "#endif" >>$tmp/pconfig.h
-+ $as_echo ' ' >>$tmp/pconfig.h
-+ $as_echo '/* once:' $ac_prefix_conf_DEF '*/' >>$tmp/pconfig.h
-+ $as_echo "#endif" >>$tmp/pconfig.h
- if cmp -s $ac_prefix_conf_OUT $tmp/pconfig.h 2>/dev/null; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_prefix_conf_OUT is unchanged" >&5
- $as_echo "$as_me: $ac_prefix_conf_OUT is unchanged" >&6;}
diff -r 027cff064dda -r c3801ddf157f net/libvncserver/patches/patch-libvncserver_sockets.c
--- a/net/libvncserver/patches/patch-libvncserver_sockets.c Mon Jan 09 07:24:33 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-libvncserver_sockets.c,v 1.1 2013/12/17 16:27:18 prlw1 Exp $
-
-Don't segfault when using PKG_OPTIONS.libVNCServer=-inet6
-From commit 66282f5800
-
---- libvncserver/sockets.c.orig 2012-05-04 14:19:00.000000000 +0000
-+++ libvncserver/sockets.c
-@@ -402,9 +402,9 @@ rfbProcessNewConnection(rfbScreenInfoPtr
- rfbLogPerror("rfbProcessNewConnection: error in select");
- return FALSE;
- }
-- if (FD_ISSET(rfbScreen->listenSock, &listen_fds))
-+ if (rfbScreen->listenSock >= 0 && FD_ISSET(rfbScreen->listenSock, &listen_fds))
- chosen_listen_sock = rfbScreen->listenSock;
-- if (FD_ISSET(rfbScreen->listen6Sock, &listen_fds))
-+ if (rfbScreen->listen6Sock >= 0 && FD_ISSET(rfbScreen->listen6Sock, &listen_fds))
- chosen_listen_sock = rfbScreen->listen6Sock;
-
- if ((sock = accept(chosen_listen_sock,
diff -r 027cff064dda -r c3801ddf157f net/libvncserver/patches/patch-libvncserver_websockets.c
--- a/net/libvncserver/patches/patch-libvncserver_websockets.c Mon Jan 09 07:24:33 2017 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-$NetBSD: patch-libvncserver_websockets.c,v 1.2 2013/02/27 18:24:51 jperkin Exp $
-
-* byte-order handling for !Linux.
-
---- libvncserver/websockets.c.orig 2012-05-04 14:19:00.000000000 +0000
-+++ libvncserver/websockets.c
-@@ -31,12 +31,41 @@
- /* errno */
- #include <errno.h>
-
--#include <byteswap.h>
- #include <string.h>
- #include "rfbconfig.h"
- #include "rfbssl.h"
- #include "rfbcrypto.h"
-
-+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+#include <sys/endian.h>
-+#define WS_NTOH64(n) be64toh(n)
-+#define WS_NTOH32(n) be32toh(n)
-+#define WS_NTOH16(n) be16toh(n)
-+#define WS_HTON64(n) htobe64(n)
-+#define WS_HTON16(n) htobe16(n)
-+#elif defined(__OpenBSD__)
-+#include <sys/types.h>
-+#define WS_NTOH64(n) betoh64(n)
-+#define WS_NTOH32(n) betoh32(n)
-+#define WS_NTOH16(n) betoh16(n)
-+#define WS_HTON64(n) htobe64(n)
-+#define WS_HTON16(n) htobe16(n)
-+#elif defined(__APPLE__)
-+#include <libkern/OSByteOrder.h>
-+#define WS_NTOH64(n) OSSwapBigToHostInt64(n)
-+#define WS_NTOH32(n) OSSwapBigToHostInt32(n)
-+#define WS_NTOH16(n) OSSwapBigToHostInt16(n)
-+#define WS_HTON64(n) OSSwapHostToBigInt64(n)
-+#define WS_HTON16(n) OSSwapHostToBitInt16(n)
-+#elif defined(__sun)
-+#include <sys/byteorder.h>
-+#define WS_NTOH64(n) ntohll(n)
-+#define WS_NTOH32(n) ntohl(n)
-+#define WS_NTOH16(n) ntohs(n)
-+#define WS_HTON64(n) htonll(n)
-+#define WS_HTON16(n) htons(n)
-+#else
-+#include <byteswap.h>
- #if defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && __BYTE_ORDER == __BIG_ENDIAN
- #define WS_NTOH64(n) (n)
- #define WS_NTOH32(n) (n)
-@@ -50,6 +79,7 @@
- #define WS_HTON64(n) bswap_64(n)
- #define WS_HTON16(n) bswap_16(n)
- #endif
-+#endif
-
- #define B64LEN(__x) (((__x + 2) / 3) * 12 / 3)
- #define WSHLENMAX 14 /* 2 + sizeof(uint64_t) + sizeof(uint32_t) */
Home |
Main Index |
Thread Index |
Old Index