[pkgsrc/trunk]: pkgsrc/x11/x11vnc x11vnc: update to 0.9.15

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/x11vnc x11vnc: update to 0.9.15
From: tnn <tnn%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 10:24:49 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/93e9feb89622
branches:  trunk
changeset: 389052:93e9feb89622
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue Dec 18 15:53:46 2018 +0000

description:
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:

 x11/x11vnc/Makefile                      |   15 +-
 x11/x11vnc/PLIST                         |   15 +--
 x11/x11vnc/distinfo                      |   17 +-
 x11/x11vnc/options.mk                    |   13 +-
 x11/x11vnc/patches/patch-configure       |  163 -------------------------------
 x11/x11vnc/patches/patch-configure.ac    |   32 ++---
 x11/x11vnc/patches/patch-enc.h           |   24 ----
 x11/x11vnc/patches/patch-rfbconfig.h.in  |   39 -------
 x11/x11vnc/patches/patch-x11vnc_unixpw.c |   20 +-
 9 files changed, 43 insertions(+), 295 deletions(-)

diffs (truncated from 456 to 300 lines):

diff -r 585c923be80c -r 93e9feb89622 x11/x11vnc/Makefile
--- a/x11/x11vnc/Makefile       Tue Dec 18 15:51:02 2018 +0000
+++ b/x11/x11vnc/Makefile       Tue Dec 18 15:53:46 2018 +0000
@@ -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@localhost
 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 @@
 
 .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 -r 585c923be80c -r 93e9feb89622 x11/x11vnc/PLIST
--- a/x11/x11vnc/PLIST  Tue Dec 18 15:51:02 2018 +0000
+++ b/x11/x11vnc/PLIST  Tue Dec 18 15:53:46 2018 +0000
@@ -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 -r 585c923be80c -r 93e9feb89622 x11/x11vnc/distinfo
--- a/x11/x11vnc/distinfo       Tue Dec 18 15:51:02 2018 +0000
+++ b/x11/x11vnc/distinfo       Tue Dec 18 15:53:46 2018 +0000
@@ -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 -r 585c923be80c -r 93e9feb89622 x11/x11vnc/options.mk
--- a/x11/x11vnc/options.mk     Tue Dec 18 15:51:02 2018 +0000
+++ b/x11/x11vnc/options.mk     Tue Dec 18 15:53:46 2018 +0000
@@ -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+=       --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 -r 585c923be80c -r 93e9feb89622 x11/x11vnc/patches/patch-configure
--- a/x11/x11vnc/patches/patch-configure        Tue Dec 18 15:51:02 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 585c923be80c -r 93e9feb89622 x11/x11vnc/patches/patch-configure.ac
--- a/x11/x11vnc/patches/patch-configure.ac     Tue Dec 18 15:51:02 2018 +0000
+++ b/x11/x11vnc/patches/patch-configure.ac     Tue Dec 18 15:53:46 2018 +0000
@@ -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
- 
- # x11vnc only:
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated x11/x11vnc to 0.9.15
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Added emulators/libretro-beetle-psx-hw versio...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated x11/x11vnc to 0.9.15
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Added emulators/libretro-beetle-psx-hw versio...
Indexes:
Home | Main Index | Thread Index | Old Index