[arch-commits] Commit in x11vnc/trunk (3 files)

[Gaëtan Bisson]

    Date: Monday, March 13, 2017 @ 18:19:19
  Author: bisson
Revision: 290800

upstream update

Modified:
  x11vnc/trunk/0002-Support-openssl-1.1.0.patch
  x11vnc/trunk/PKGBUILD
  x11vnc/trunk/fix-buffer-overflows.patch

----------------------------------+
 0002-Support-openssl-1.1.0.patch |   14 +++++++-------
 PKGBUILD                         |   19 +++++++++----------
 fix-buffer-overflows.patch       |   12 ++++++------
 3 files changed, 22 insertions(+), 23 deletions(-)

Modified: 0002-Support-openssl-1.1.0.patch
===================================================================
--- 0002-Support-openssl-1.1.0.patch	2017-03-13 17:51:23 UTC (rev 290799)
+++ 0002-Support-openssl-1.1.0.patch	2017-03-13 18:19:19 UTC (rev 290800)
@@ -9,9 +9,9 @@
 
 Signed-off-by: Bert van Hall <bert.vanhall at avionic-design.de>
 ---
- README             |   16 +++++++
- x11vnc/enc.h       |   88 +++++++++++++++++++++++++++++++--------
- x11vnc/sslhelper.c |  119 +++++++++++++++++++++++++++++++++++++++++------------
+ README          |   16 +++++++
+ src/enc.h       |   88 +++++++++++++++++++++++++++++++--------
+ src/sslhelper.c |  119 +++++++++++++++++++++++++++++++++++++++++------------
  3 files changed, 179 insertions(+), 44 deletions(-)
 
 --- a/README
@@ -46,8 +46,8 @@
  
     SSL VNC Viewers:. Viewer-side will need to use SSL as well. See the
     next FAQ and here for SSL enabled VNC Viewers, including SSVNC, to
---- a/x11vnc/enc.h
-+++ b/x11vnc/enc.h
+--- a/src/enc.h
++++ b/src/enc.h
 @@ -454,8 +454,10 @@ extern void enc_do(char *ciph, char *key
  		p++;
  		if (strstr(p, "md5+") == p) {
@@ -250,8 +250,8 @@
  
  		signature = (unsigned char *) calloc(RSA_size(client_rsa), 1);
  		RSA_sign(NID_sha1, digest, ndig, signature, &nsig, client_rsa);
---- a/x11vnc/sslhelper.c
-+++ b/x11vnc/sslhelper.c
+--- a/src/sslhelper.c
++++ b/src/sslhelper.c
 @@ -799,8 +799,13 @@ static int pem_passwd_callback(char *buf
  
  /* based on mod_ssl */

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-03-13 17:51:23 UTC (rev 290799)
+++ PKGBUILD	2017-03-13 18:19:19 UTC (rev 290800)
@@ -4,25 +4,25 @@
 
 pkgname=x11vnc
 epoch=1
-pkgver=0.9.13
-pkgrel=10
+pkgver=0.9.14
+pkgrel=1
 pkgdesc='VNC server for real X displays'
-url='http://www.karlrunge.com/x11vnc/'
+url='https://github.com/LibVNC/x11vnc'
 arch=('i686' 'x86_64')
 license=('GPL2')
 optdepends=('tk: GUI support'
             'net-tools: -auth guess'
             'xf86-video-dummy: Xdummy script')
-depends=('openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi')
-source=("http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+depends=('libvncserver' 'openssl' 'libjpeg' 'libxtst' 'libxinerama' 'libxdamage' 'libxrandr' 'avahi')
+source=("https://github.com/LibVNC/x11vnc/archive/${pkgver}.tar.gz"
         'fix-buffer-overflows.patch'
         '0001-Fix-openssl-1.1.x-detection.patch'
         '0002-Support-openssl-1.1.0.patch'
         'service')
-sha256sums=('f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b'
-            '21fe10bee45d6fcf3a41aba546cd1134a858dc78ee3f95f5137d50c22d566912'
+sha256sums=('45f87c5e4382988c73e8c7891ac2bfb45d8f9ce1196ae06651c84636684ea143'
+            '1d19edf54c6216b830150e5b05175a81ee8be3288d8584d3de0276df9a38384e'
             'f356009176a11a793fef4514b26468c04908c961e6be226a83b631b6df5a2fdc'
-            'eaf92da28276273c1892631b063b0477148b9e2f7dd14645e82b4afbfe02c0c2'
+            'f9cafe56cb878b067bc95c6bd84aa8d480af6400bea836d87a08e24e0c4eca0b'
             'cfb19d44e09e960e2fdb958c9258bccf23c2677715314985f7e819f1dcedb6e4')
 
 prepare() {
@@ -42,7 +42,6 @@
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
-	install x11vnc/misc/{rx11vnc,Xdummy} "${pkgdir}"/usr/bin
+	install misc/{rx11vnc,Xdummy} "${pkgdir}"/usr/bin
 	install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/x11vnc.service"
-	rm -fr "${pkgdir}"/usr/include/rfb # provided by libvncserver
 }

Modified: fix-buffer-overflows.patch
===================================================================
--- fix-buffer-overflows.patch	2017-03-13 17:51:23 UTC (rev 290799)
+++ fix-buffer-overflows.patch	2017-03-13 18:19:19 UTC (rev 290800)
@@ -1,6 +1,6 @@
-diff -Naur x11vnc-0.9.13-ori/x11vnc/win_utils.c x11vnc-0.9.13/x11vnc/win_utils.c
---- x11vnc-0.9.13-ori/x11vnc/win_utils.c	2016-10-07 23:26:03.248600761 +0200
-+++ x11vnc-0.9.13/x11vnc/win_utils.c	2016-10-07 23:26:51.919256706 +0200
+diff -Naur x11vnc-0.9.13-ori/src/win_utils.c x11vnc-0.9.13/src/win_utils.c
+--- x11vnc-0.9.13-ori/src/win_utils.c	2016-10-07 23:26:03.248600761 +0200
++++ x11vnc-0.9.13/src/win_utils.c	2016-10-07 23:26:51.919256706 +0200
 @@ -262,8 +262,8 @@
  	}
  
@@ -12,9 +12,9 @@
  		free(stack_list);
  		stack_list = (winattr_t *) malloc(n*sizeof(winattr_t));
  		stack_list_len = n;
-diff -Naur x11vnc-0.9.13-ori/x11vnc/xrecord.c x11vnc-0.9.13/x11vnc/xrecord.c
---- x11vnc-0.9.13-ori/x11vnc/xrecord.c	2016-10-07 23:26:03.248600761 +0200
-+++ x11vnc-0.9.13/x11vnc/xrecord.c	2016-10-07 23:27:49.566700470 +0200
+diff -Naur x11vnc-0.9.13-ori/src/xrecord.c x11vnc-0.9.13/src/xrecord.c
+--- x11vnc-0.9.13-ori/src/xrecord.c	2016-10-07 23:26:03.248600761 +0200
++++ x11vnc-0.9.13/src/xrecord.c	2016-10-07 23:27:49.566700470 +0200
 @@ -964,7 +964,7 @@
  	data = (char *)req;
  	data += sz_xConfigureWindowReq;