CVS commit: pkgsrc/x11/x11vnc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/x11/x11vnc
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Tue, 18 Dec 2018 15:53:46 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Dec 18 15:53:46 UTC 2018

Modified Files:
        pkgsrc/x11/x11vnc: Makefile PLIST distinfo options.mk
        pkgsrc/x11/x11vnc/patches: patch-configure.ac patch-x11vnc_unixpw.c
Removed Files:
        pkgsrc/x11/x11vnc/patches: patch-configure patch-enc.h
            patch-rfbconfig.h.in

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 pkgsrc/x11/x11vnc/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/x11vnc/PLIST
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/x11vnc/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/x11/x11vnc/options.mk
cvs rdiff -u -r1.1 -r0 pkgsrc/x11/x11vnc/patches/patch-configure \
    pkgsrc/x11/x11vnc/patches/patch-rfbconfig.h.in
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/x11vnc/patches/patch-configure.ac \
    pkgsrc/x11/x11vnc/patches/patch-x11vnc_unixpw.c
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/x11vnc/patches/patch-enc.h

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

Modified files:

Index: pkgsrc/x11/x11vnc/Makefile
diff -u pkgsrc/x11/x11vnc/Makefile:1.75 pkgsrc/x11/x11vnc/Makefile:1.76
--- pkgsrc/x11/x11vnc/Makefile:1.75     Wed Nov 14 22:22:51 2018
+++ pkgsrc/x11/x11vnc/Makefile  Tue Dec 18 15:53:46 2018
@@ -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 @@ 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"

Index: pkgsrc/x11/x11vnc/PLIST
diff -u pkgsrc/x11/x11vnc/PLIST:1.6 pkgsrc/x11/x11vnc/PLIST:1.7
--- pkgsrc/x11/x11vnc/PLIST:1.6 Sun Jun 14 18:25:09 2009
+++ pkgsrc/x11/x11vnc/PLIST     Tue Dec 18 15:53:46 2018
@@ -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

Index: pkgsrc/x11/x11vnc/distinfo
diff -u pkgsrc/x11/x11vnc/distinfo:1.21 pkgsrc/x11/x11vnc/distinfo:1.22
--- pkgsrc/x11/x11vnc/distinfo:1.21     Wed Nov  4 03:28:57 2015
+++ pkgsrc/x11/x11vnc/distinfo  Tue Dec 18 15:53:46 2018
@@ -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

Index: pkgsrc/x11/x11vnc/options.mk
diff -u pkgsrc/x11/x11vnc/options.mk:1.5 pkgsrc/x11/x11vnc/options.mk:1.6
--- pkgsrc/x11/x11vnc/options.mk:1.5    Thu Nov  8 12:56:21 2012
+++ pkgsrc/x11/x11vnc/options.mk        Tue Dec 18 15:53:46 2018
@@ -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=${BUILDLIN
 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"

Index: pkgsrc/x11/x11vnc/patches/patch-configure.ac
diff -u pkgsrc/x11/x11vnc/patches/patch-configure.ac:1.1 pkgsrc/x11/x11vnc/patches/patch-configure.ac:1.2
--- pkgsrc/x11/x11vnc/patches/patch-configure.ac:1.1    Sat Nov  2 07:32:28 2013
+++ pkgsrc/x11/x11vnc/patches/patch-configure.ac        Tue Dec 18 15:53:46 2018
@@ -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"
Index: pkgsrc/x11/x11vnc/patches/patch-x11vnc_unixpw.c
diff -u pkgsrc/x11/x11vnc/patches/patch-x11vnc_unixpw.c:1.1 pkgsrc/x11/x11vnc/patches/patch-x11vnc_unixpw.c:1.2
--- pkgsrc/x11/x11vnc/patches/patch-x11vnc_unixpw.c:1.1 Sat Nov  2 07:32:28 2013
+++ pkgsrc/x11/x11vnc/patches/patch-x11vnc_unixpw.c     Tue Dec 18 15:53:46 2018
@@ -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 201
  #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 201
 +              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 201
        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

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index