diff options
author | tnn <tnn@pkgsrc.org> | 2018-12-18 15:53:46 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2018-12-18 15:53:46 +0000 |
commit | 2b24b1253ada7c59d52bfdb64452090b375bae83 (patch) | |
tree | 7610a5879cd976ebf749051396d5f9c19505f22f /x11/x11vnc | |
parent | adf0a174de2323ec1196f5942c35b7a333a62681 (diff) | |
download | pkgsrc-2b24b1253ada7c59d52bfdb64452090b375bae83.tar.gz |
x11vnc: update to 0.9.15
x11vnc 0.9.15 2018-02-04
Misc. buffer overflow and memleak fixes.
Support for OpenSSL 1.1.0.
Fix for Debian bug #672435.
x11vnc 0.9.14 2015-11-14
Added support for the X Composite Extension.
Added XInput 2 multi-pointer support
Separated x11vnc sources from LibVNCServer.
The project is now hosted at GitHub.
Diffstat (limited to 'x11/x11vnc')
-rw-r--r-- | x11/x11vnc/Makefile | 15 | ||||
-rw-r--r-- | x11/x11vnc/PLIST | 15 | ||||
-rw-r--r-- | x11/x11vnc/distinfo | 17 | ||||
-rw-r--r-- | x11/x11vnc/options.mk | 13 | ||||
-rw-r--r-- | x11/x11vnc/patches/patch-configure | 163 | ||||
-rw-r--r-- | x11/x11vnc/patches/patch-configure.ac | 32 | ||||
-rw-r--r-- | x11/x11vnc/patches/patch-enc.h | 24 | ||||
-rw-r--r-- | x11/x11vnc/patches/patch-rfbconfig.h.in | 39 | ||||
-rw-r--r-- | x11/x11vnc/patches/patch-x11vnc_unixpw.c | 20 |
9 files changed, 43 insertions, 295 deletions
diff --git a/x11/x11vnc/Makefile b/x11/x11vnc/Makefile index 709c5a51ec0..d8abdabb8b2 100644 --- a/x11/x11vnc/Makefile +++ b/x11/x11vnc/Makefile @@ -1,20 +1,19 @@ -# $NetBSD: Makefile,v 1.75 2018/11/14 22:22:51 kleink Exp $ +# $NetBSD: Makefile,v 1.76 2018/12/18 15:53:46 tnn Exp $ # -DISTNAME= x11vnc-0.9.13 -PKGREVISION= 37 +DISTNAME= x11vnc-0.9.15 CATEGORIES= x11 net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libvncserver/} +MASTER_SITES= ${MASTER_SITE_GITHUB:=LibVNC/} +GITHUB_PROJECT= x11vnc MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.karlrunge.com/x11vnc/ COMMENT= VNC server for real X displays LICENSE= gnu-gpl-v2 +USE_TOOLS+= autoconf automake autoreconf gmake pkg-config GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-system-libvncserver - PTHREAD_AUTO_VARS= yes SUBST_CLASSES+= pthread SUBST_STAGE.pthread= pre-configure @@ -23,8 +22,8 @@ SUBST_SED.pthread= -e 's|-lpthread||g' .include "options.mk" -BUILD_DIRS= x11vnc -INSTALL_DIRS= x11vnc classes +pre-configure: + cd ${WRKSRC} && autoreconf -vif .include "../../security/openssl/buildlink3.mk" .include "../../net/libvncserver/buildlink3.mk" diff --git a/x11/x11vnc/PLIST b/x11/x11vnc/PLIST index 450c291b9c2..1b862b979b1 100644 --- a/x11/x11vnc/PLIST +++ b/x11/x11vnc/PLIST @@ -1,16 +1,5 @@ -@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:25:09 joerg Exp $ +@comment $NetBSD: PLIST,v 1.7 2018/12/18 15:53:46 tnn Exp $ +bin/Xdummy bin/x11vnc man/man1/x11vnc.1 share/applications/x11vnc.desktop -share/x11vnc/classes/VncViewer.jar -share/x11vnc/classes/index.vnc -share/x11vnc/classes/ssl/README -share/x11vnc/classes/ssl/SignedUltraViewerSSL.jar -share/x11vnc/classes/ssl/SignedVncViewer.jar -share/x11vnc/classes/ssl/UltraViewerSSL.jar -share/x11vnc/classes/ssl/VncViewer.jar -share/x11vnc/classes/ssl/index.vnc -share/x11vnc/classes/ssl/proxy.vnc -share/x11vnc/classes/ssl/ss_vncviewer -share/x11vnc/classes/ssl/ultra.vnc -share/x11vnc/classes/ssl/ultrasigned.vnc diff --git a/x11/x11vnc/distinfo b/x11/x11vnc/distinfo index 015497fc5ed..280808a35a6 100644 --- a/x11/x11vnc/distinfo +++ b/x11/x11vnc/distinfo @@ -1,11 +1,8 @@ -$NetBSD: distinfo,v 1.21 2015/11/04 03:28:57 agc Exp $ +$NetBSD: distinfo,v 1.22 2018/12/18 15:53:46 tnn Exp $ -SHA1 (x11vnc-0.9.13.tar.gz) = f011d81488ac94dc8dce2d88739c23bd85a976fa -RMD160 (x11vnc-0.9.13.tar.gz) = 5819a4ae85b25b41fb747ccafd27e228c3ee888e -SHA512 (x11vnc-0.9.13.tar.gz) = 7b24e495f29122032e1c8ced7f7d8e0a56a2a8263e761a50725320742c99a0fcd5680d13038dd5d47e1c05d3b889d0caa13ba0b1aeda6fa42d5fb5ef3c43f908 -Size (x11vnc-0.9.13.tar.gz) = 2853769 bytes -SHA1 (patch-configure) = 784f76c158745da985a210f2035957e7135dd4e6 -SHA1 (patch-configure.ac) = 7d31042b1e1d44b98394614ba80cdc3ac0eaf198 -SHA1 (patch-enc.h) = 82b004715cb2e7aa1e81e0aaebc2161cab20973b -SHA1 (patch-rfbconfig.h.in) = 77e025890e868ce7c62c6609b5386ebbe54491c8 -SHA1 (patch-x11vnc_unixpw.c) = 108529f9d53f887e48e2ede07d85e6b2ff326341 +SHA1 (x11vnc-0.9.15.tar.gz) = 7ff05cd501a276a14535a3e64898ff2573d3a458 +RMD160 (x11vnc-0.9.15.tar.gz) = ad543e22c69adc0ebcf71f52e20e243901188732 +SHA512 (x11vnc-0.9.15.tar.gz) = d5db90f87ba4b9801e8f6bb2c0821657c6388ce2c64e1565aeeabe41edf63b56ad72dc7be4cf874b817dacd7de5988eddd466df5b9396c13d69340ac90a1ca4d +Size (x11vnc-0.9.15.tar.gz) = 1701821 bytes +SHA1 (patch-configure.ac) = 8ec2a6c8727614aacec4fb18340b16a215902ca5 +SHA1 (patch-x11vnc_unixpw.c) = bb611f4b307a54ef2898de635acde59da9102074 diff --git a/x11/x11vnc/options.mk b/x11/x11vnc/options.mk index be781cd6b4e..f1ca2ce1fc4 100644 --- a/x11/x11vnc/options.mk +++ b/x11/x11vnc/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.5 2012/11/08 12:56:21 sborrill Exp $ +# $NetBSD: options.mk,v 1.6 2018/12/18 15:53:46 tnn Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.x11vnc -PKG_SUPPORTED_OPTIONS= avahi inet6 x11 -PKG_SUGGESTED_OPTIONS= inet6 x11 +PKG_SUPPORTED_OPTIONS= avahi x11 +PKG_SUGGESTED_OPTIONS= x11 .include "../../mk/bsd.options.mk" @@ -14,15 +14,12 @@ CONFIGURE_ARGS+= --with-avahi=${BUILDLINK_PREFIX.avahi} CONFIGURE_ARGS+= --without-avahi .endif -.if empty(PKG_OPTIONS:Minet6) -CONFIGURE_ARGS+= --without-ipv6 -CPPFLAGS+= -DX11VNC_IPV6=0 -.endif - .if !empty(PKG_OPTIONS:Mx11) CONFIGURE_ARGS+= --with-x BUILDLINK_DEPMETHOD.libXt?= build .include "../../x11/libX11/buildlink3.mk" +.include "../../x11/libXcomposite/buildlink3.mk" +.include "../../x11/libXcursor/buildlink3.mk" .include "../../x11/libXdamage/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" diff --git a/x11/x11vnc/patches/patch-configure b/x11/x11vnc/patches/patch-configure deleted file mode 100644 index 1f0d446193b..00000000000 --- a/x11/x11vnc/patches/patch-configure +++ /dev/null @@ -1,163 +0,0 @@ -$NetBSD: patch-configure,v 1.1 2013/11/02 07:32:28 obache Exp $ - -* check openpty(3) - ---- configure.orig 2011-08-10 22:35:10.000000000 +0000 -+++ configure -@@ -9866,7 +9866,10 @@ if test "$build_x11vnc" = "yes"; then - - - --for ac_header in pwd.h sys/wait.h utmpx.h termios.h sys/ioctl.h sys/stropts.h -+ -+ -+ -+for ac_header in pwd.h sys/wait.h utmpx.h termios.h sys/ioctl.h sys/stropts.h pty.h libutil.h util.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` - if eval "test \"\${$as_ac_Header+set}\" = set"; then -@@ -13523,6 +13526,8 @@ if test "$build_x11vnc" = "yes"; then - - - -+ -+ - for ac_func in setsid setpgrp getpwuid getpwnam getspnam getuid geteuid setuid setgid seteuid setegid initgroups waitpid setutxent grantpt shmat - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -@@ -13624,6 +13629,135 @@ _ACEOF - fi - done - -+ echo "$as_me:$LINENO: checking for library containing openpty" >&5 -+echo $ECHO_N "checking for library containing openpty... $ECHO_C" >&6 -+if test "${ac_cv_search_openpty+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+ac_cv_search_openpty=no -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char openpty (); -+int -+main () -+{ -+openpty (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_search_openpty="none required" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+if test "$ac_cv_search_openpty" = no; then -+ for ac_lib in util bsd; do -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char openpty (); -+int -+main () -+{ -+openpty (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_search_openpty="-l$ac_lib" -+break -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ done -+fi -+LIBS=$ac_func_search_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_search_openpty" >&5 -+echo "${ECHO_T}$ac_cv_search_openpty" >&6 -+if test "$ac_cv_search_openpty" != no; then -+ test "$ac_cv_search_openpty" = "none required" || LIBS="$ac_cv_search_openpty $LIBS" -+ cat >>confdefs.h <<\_ACEOF -+#define HAVE_OPENPTY 1 -+_ACEOF -+ -+fi -+ - fi - - # check, if shmget is in cygipc.a diff --git a/x11/x11vnc/patches/patch-configure.ac b/x11/x11vnc/patches/patch-configure.ac index 2c8b2e0ceca..f07bfc4f7a4 100644 --- a/x11/x11vnc/patches/patch-configure.ac +++ b/x11/x11vnc/patches/patch-configure.ac @@ -1,25 +1,17 @@ -$NetBSD: patch-configure.ac,v 1.1 2013/11/02 07:32:28 obache Exp $ +$NetBSD: patch-configure.ac,v 1.2 2018/12/18 15:53:46 tnn Exp $ * check openpty(3) ---- configure.ac.orig 2011-08-10 22:34:57.000000000 +0000 +--- configure.ac.orig 2018-02-04 21:43:38.000000000 +0000 +++ configure.ac -@@ -730,7 +730,7 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h ne +@@ -511,6 +511,10 @@ case `(uname -sr) 2>/dev/null` in + ;; + esac - # x11vnc only: - if test "$build_x11vnc" = "yes"; then -- AC_CHECK_HEADERS([pwd.h sys/wait.h utmpx.h termios.h sys/ioctl.h sys/stropts.h]) -+ AC_CHECK_HEADERS([pwd.h sys/wait.h utmpx.h termios.h sys/ioctl.h sys/stropts.h pty.h libutil.h util.h]) - fi - - # Checks for typedefs, structures, and compiler characteristics. -@@ -777,7 +777,9 @@ fi - AC_CHECK_FUNCS([ftime gethostbyname gethostname gettimeofday inet_ntoa memmove memset mmap mkfifo select socket strchr strcspn strdup strerror strstr]) - # x11vnc only: - if test "$build_x11vnc" = "yes"; then -+ AH_TEMPLATE(HAVE_OPENPTY, [Define to `1' if you have the `openpty' function.]) - AC_CHECK_FUNCS([setsid setpgrp getpwuid getpwnam getspnam getuid geteuid setuid setgid seteuid setegid initgroups waitpid setutxent grantpt shmat]) -+ AC_SEARCH_LIBS(openpty, util bsd, [AC_DEFINE(HAVE_OPENPTY)]) - fi - - # check, if shmget is in cygipc.a ++AC_CHECK_HEADERS([pty.h libutil.h util.h]) ++AH_TEMPLATE(HAVE_OPENPTY, [Define to `1' if you have the `openpty' function.]) ++AC_SEARCH_LIBS(openpty, util bsd, [AC_DEFINE(HAVE_OPENPTY)]) ++ + # Check for rpm SOURCES path + printf "checking for rpm sources path... " + RPMSOURCEDIR="NOT-FOUND" diff --git a/x11/x11vnc/patches/patch-enc.h b/x11/x11vnc/patches/patch-enc.h deleted file mode 100644 index 6065cc591ea..00000000000 --- a/x11/x11vnc/patches/patch-enc.h +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-enc.h,v 1.2 2013/11/02 07:32:28 obache Exp $ - -Respect IPv6 build option used throughout rest of x11vnc - ---- x11vnc/enc.h.orig 2011-08-10 22:31:32.000000000 +0000 -+++ x11vnc/enc.h -@@ -1733,7 +1733,7 @@ static void enc_connections(int listen_p - } - - try6: --#ifdef AF_INET6 -+#if X11VNC_IPV6 && defined(AF_INET6) - if (!getenv("ULTRAVNC_DSM_HELPER_NOIPV6")) { - struct sockaddr_in6 sin; - int one = 1, sock = -1; -@@ -1826,7 +1826,7 @@ static void enc_connections(int listen_p - exit(1); - } - } else if (FD_ISSET(listen_fd6, &fds)) { --#ifdef AF_INET6 -+#if X11VNC_IPV6 && defined(AF_INET6) - struct sockaddr_in6 addr; - socklen_t addrlen = sizeof(addr); - diff --git a/x11/x11vnc/patches/patch-rfbconfig.h.in b/x11/x11vnc/patches/patch-rfbconfig.h.in deleted file mode 100644 index 5e2547eb0f0..00000000000 --- a/x11/x11vnc/patches/patch-rfbconfig.h.in +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-rfbconfig.h.in,v 1.1 2013/11/02 07:32:28 obache Exp $ - -* check openpty(3) - ---- rfbconfig.h.in.orig 2011-08-10 22:35:32.000000000 +0000 -+++ rfbconfig.h.in -@@ -99,6 +99,9 @@ - /* openssl libssl library present */ - #undef HAVE_LIBSSL - -+/* Define to 1 if you have the <libutil.h> header file. */ -+#undef HAVE_LIBUTIL_H -+ - /* XDAMAGE extension build environment present */ - #undef HAVE_LIBXDAMAGE - -@@ -156,6 +159,12 @@ - /* Define to 1 if you have the <netinet/in.h> header file. */ - #undef HAVE_NETINET_IN_H - -+/* Define to `1' if you have the `openpty' function. */ -+#undef HAVE_OPENPTY -+ -+/* Define to 1 if you have the <pty.h> header file. */ -+#undef HAVE_PTY_H -+ - /* Define to 1 if you have the <pwd.h> header file. */ - #undef HAVE_PWD_H - -@@ -271,6 +280,9 @@ - /* Define to 1 if you have the <unistd.h> header file. */ - #undef HAVE_UNISTD_H - -+/* Define to 1 if you have the <util.h> header file. */ -+#undef HAVE_UTIL_H -+ - /* Define to 1 if you have the <utmpx.h> header file. */ - #undef HAVE_UTMPX_H - diff --git a/x11/x11vnc/patches/patch-x11vnc_unixpw.c b/x11/x11vnc/patches/patch-x11vnc_unixpw.c index 52ec58c506c..2056f1cc51f 100644 --- a/x11/x11vnc/patches/patch-x11vnc_unixpw.c +++ b/x11/x11vnc/patches/patch-x11vnc_unixpw.c @@ -1,21 +1,21 @@ -$NetBSD: patch-x11vnc_unixpw.c,v 1.1 2013/11/02 07:32:28 obache Exp $ +$NetBSD: patch-x11vnc_unixpw.c,v 1.2 2018/12/18 15:53:46 tnn Exp $ * Use openpty(3) if available ---- x11vnc/unixpw.c.orig 2011-08-10 22:31:32.000000000 +0000 -+++ x11vnc/unixpw.c +--- src/unixpw.c.orig 2018-02-04 21:43:38.000000000 +0000 ++++ src/unixpw.c @@ -92,6 +92,18 @@ extern char *crypt(const char*, const ch #define IS_BSD #endif -+#if LIBVNCSERVER_HAVE_OPENPTY -+#if LIBVNCSERVER_HAVE_UTIL_H ++#if HAVE_OPENPTY ++#if HAVE_UTIL_H +#include <util.h> +#endif -+#if LIBVNCSERVER_HAVE_LIBUTIL_H ++#if HAVE_LIBUTIL_H +#include <libutil.h> +#endif -+#if LIBVNCSERVER_HAVE_PTY_H ++#if HAVE_PTY_H +#include <pty.h> +#endif +#endif @@ -27,7 +27,7 @@ $NetBSD: patch-x11vnc_unixpw.c,v 1.1 2013/11/02 07:32:28 obache Exp $ #endif /* GRANTPT */ } -+#if LIBVNCSERVER_HAVE_OPENPTY ++#if HAVE_OPENPTY +char *get_pty_openpty(int *fd_p) { + int fd, sfd; + @@ -37,7 +37,7 @@ $NetBSD: patch-x11vnc_unixpw.c,v 1.1 2013/11/02 07:32:28 obache Exp $ + return NULL; + } + -+#if LIBVNCSERVER_HAVE_SYS_IOCTL_H && defined(TIOCFLUSH) ++#if HAVE_SYS_IOCTL_H && defined(TIOCFLUSH) + ioctl(fd, TIOCFLUSH, (char *) 0); +#endif + *fd_p = fd; @@ -51,7 +51,7 @@ $NetBSD: patch-x11vnc_unixpw.c,v 1.1 2013/11/02 07:32:28 obache Exp $ if (getenv("BSD_PTY")) { return get_pty_loop(fd_p); } -+#if LIBVNCSERVER_HAVE_OPENPTY ++#if HAVE_OPENPTY + return get_pty_openpty(fd_p); +#else #ifdef IS_BSD |