[arch-commits] Commit in x11vnc/repos (12 files)

[Jan de Groot]

Date: Saturday, March 4, 2017 @ 22:08:15
  Author: jgc
Revision: 289997

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  x11vnc/repos/staging-i686/
  x11vnc/repos/staging-i686/0001-Fix-openssl-1.1.x-detection.patch
(from rev 289996, x11vnc/trunk/0001-Fix-openssl-1.1.x-detection.patch)
  x11vnc/repos/staging-i686/0002-Support-openssl-1.1.0.patch
(from rev 289996, x11vnc/trunk/0002-Support-openssl-1.1.0.patch)
  x11vnc/repos/staging-i686/PKGBUILD
(from rev 289996, x11vnc/trunk/PKGBUILD)
  x11vnc/repos/staging-i686/fix-buffer-overflows.patch
(from rev 289996, x11vnc/trunk/fix-buffer-overflows.patch)
  x11vnc/repos/staging-i686/service
(from rev 289996, x11vnc/trunk/service)
  x11vnc/repos/staging-x86_64/
  x11vnc/repos/staging-x86_64/0001-Fix-openssl-1.1.x-detection.patch
(from rev 289996, x11vnc/trunk/0001-Fix-openssl-1.1.x-detection.patch)
  x11vnc/repos/staging-x86_64/0002-Support-openssl-1.1.0.patch
(from rev 289996, x11vnc/trunk/0002-Support-openssl-1.1.0.patch)
  x11vnc/repos/staging-x86_64/PKGBUILD
(from rev 289996, x11vnc/trunk/PKGBUILD)
  x11vnc/repos/staging-x86_64/fix-buffer-overflows.patch
(from rev 289996, x11vnc/trunk/fix-buffer-overflows.patch)
  x11vnc/repos/staging-x86_64/service
(from rev 289996, x11vnc/trunk/service)

---+
 staging-i686/0001-Fix-openssl-1.1.x-detection.patch   |   34 +
 staging-i686/0002-Support-openssl-1.1.0.patch |  481 
 staging-i686/PKGBUILD |   48 +
 staging-i686/fix-buffer-overflows.patch   |   26 
 staging-i686/service  |7 
 staging-x86_64/0001-Fix-openssl-1.1.x-detection.patch |   34 +
 staging-x86_64/0002-Support-openssl-1.1.0.patch   |  481 
 staging-x86_64/PKGBUILD   |   48 +
 staging-x86_64/fix-buffer-overflows.patch |   26 
 staging-x86_64/service|7 
 10 files changed, 1192 insertions(+)

Copied: x11vnc/repos/staging-i686/0001-Fix-openssl-1.1.x-detection.patch (from 
rev 289996, x11vnc/trunk/0001-Fix-openssl-1.1.x-detection.patch)
===
--- staging-i686/0001-Fix-openssl-1.1.x-detection.patch 
(rev 0)
+++ staging-i686/0001-Fix-openssl-1.1.x-detection.patch 2017-03-04 22:08:15 UTC 
(rev 289997)
@@ -0,0 +1,34 @@
+From 5889645bd3e63cf02c3fcad942d7edef1b4df472 Mon Sep 17 00:00:00 2001
+From: Bert van Hall 
+Date: Wed, 7 Dec 2016 10:56:24 +0100
+Subject: [PATCH 1/2] Fix openssl 1.1.x detection
+
+The SSL_library_init function has been renamed to OPENSSL_init_ssl from
+openssl 1.1.0 on. While the old name still exists as a define for
+backwards compatibility, this breaks detection in the library itself.
+Update configure.ac to just detect the library instead of specific
+functions.
+
+Signed-off-by: Bert van Hall 
+---
+ configure.ac |7 +++
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+--- a/configure.ac
 b/configure.ac
+@@ -351,12 +351,11 @@ fi
+ AH_TEMPLATE(HAVE_X509_PRINT_EX_FP, [open ssl X509_print_ex_fp available])
+ if test "x$with_ssl" != "xno"; then
+   if test "x$HAVE_LIBCRYPTO" = "xtrue"; then
+-  AC_CHECK_LIB(ssl, SSL_library_init,
++  PKG_CHECK_MODULES(OPENSSL, [openssl >= 1.0.0],
+   SSL_LIBS="-lssl -lcrypto"
+-  [AC_DEFINE(HAVE_LIBSSL) HAVE_LIBSSL="true"], ,
+-  -lcrypto)
++  [AC_DEFINE(HAVE_LIBSSL) HAVE_LIBSSL="true"], ,)
+   else
+-  AC_CHECK_LIB(ssl, SSL_library_init,
++  PKG_CHECK_MODULES(OPENSSL, [openssl >= 1.0.0],
+   SSL_LIBS="-lssl"
+   [AC_DEFINE(HAVE_LIBSSL) HAVE_LIBSSL="true"], ,)
+   fi

Copied: x11vnc/repos/staging-i686/0002-Support-openssl-1.1.0.patch (from rev 
289996, x11vnc/trunk/0002-Support-openssl-1.1.0.patch)
===
--- staging-i686/0002-Support-openssl-1.1.0.patch   
(rev 0)
+++ staging-i686/0002-Support-openssl-1.1.0.patch   2017-03-04 22:08:15 UTC 
(rev 289997)
@@ -0,0 +1,481 @@
+From d37dac6963c2fb65cf577a6413657621cbcb406a Mon Sep 17 00:00:00 2001
+From: Bert van Hall 
+Date: Wed, 7 Dec 2016 14:43:57 +0100
+Subject: [PATCH 2/2] Support openssl 1.1.0
+
+Compatibility patch for openssl 1.1.0 and later. The 1.0.2 API should
+still work. Note that openssl 1.1.0 builds now have SSLv3 disabled per
+default, so clients will have to support TLS to connect securely.
+
+Signed-off-by: Bert van Hall 
+---
+ README |   16 +++
+ x11vnc/enc.h   |   88 +++
+ x11vnc/sslhelper.c |  

[arch-commits] Commit in x11vnc/repos (12 files)

[Gaetan Bisson]

Date: Tuesday, September 13, 2011 @ 16:01:54
  Author: bisson
Revision: 137979

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  x11vnc/repos/extra-i686/PKGBUILD
(from rev 137978, x11vnc/trunk/PKGBUILD)
  x11vnc/repos/extra-i686/conf.d
(from rev 137978, x11vnc/trunk/conf.d)
  x11vnc/repos/extra-i686/rc.d
(from rev 137978, x11vnc/trunk/rc.d)
  x11vnc/repos/extra-x86_64/PKGBUILD
(from rev 137978, x11vnc/trunk/PKGBUILD)
  x11vnc/repos/extra-x86_64/conf.d
(from rev 137978, x11vnc/trunk/conf.d)
  x11vnc/repos/extra-x86_64/rc.d
(from rev 137978, x11vnc/trunk/rc.d)
Deleted:
  x11vnc/repos/extra-i686/PKGBUILD
  x11vnc/repos/extra-i686/x11vnc.conf
  x11vnc/repos/extra-i686/x11vnc.rc
  x11vnc/repos/extra-x86_64/PKGBUILD
  x11vnc/repos/extra-x86_64/x11vnc.conf
  x11vnc/repos/extra-x86_64/x11vnc.rc

--+
 extra-i686/PKGBUILD  |   72 ++---
 extra-i686/conf.d|5 +++
 extra-i686/rc.d  |   37 +++
 extra-i686/x11vnc.conf   |5 ---
 extra-i686/x11vnc.rc |   37 ---
 extra-x86_64/PKGBUILD|   72 ++---
 extra-x86_64/conf.d  |5 +++
 extra-x86_64/rc.d|   37 +++
 extra-x86_64/x11vnc.conf |5 ---
 extra-x86_64/x11vnc.rc   |   37 ---
 10 files changed, 156 insertions(+), 156 deletions(-)

Deleted: extra-i686/PKGBUILD
===
--- extra-i686/PKGBUILD 2011-09-13 20:01:23 UTC (rev 137978)
+++ extra-i686/PKGBUILD 2011-09-13 20:01:54 UTC (rev 137979)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson bis...@archlinux.org
-# Contributor: damir da...@archlinux.org
-
-pkgname=x11vnc
-pkgver=0.9.12
-pkgrel=1
-pkgdesc='VNC server for real X displays'
-arch=('i686' 'x86_64')
-url='http://www.karlrunge.com/x11vnc/'
-license=('GPL2')
-depends=('openssl' 'libjpeg' 'zlib' 'libx11' 'libxtst' 'libxinerama' 
'libxdamage' 'libxrandr' 'avahi')
-optdepends=('tk: for GUI support')
-backup=('etc/conf.d/x11vnc')
-source=(http://downloads.sourceforge.net/libvncserver/${pkgname}-${pkgver}.tar.gz;
-   'x11vnc.rc'
-   'x11vnc.conf')
-sha1sums=('cf4e24bee5962b52d8f2a5442a7c44943a9cc0bb'
-  '3abb3fcadff32662ab847a9e772cd23cfdfe3d1a'
-  '11011cce06511e9ba61672a1c80bb63a3a187539')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
-
-  rm -fr ${pkgdir}/usr/include/rfb # provided by libvncserver
-
-  install -D -m 755 ${srcdir}/x11vnc.rc ${pkgdir}/etc/rc.d/x11vnc
-  install -D -m 644 ${srcdir}/x11vnc.conf ${pkgdir}/etc/conf.d/x11vnc
-}

Copied: x11vnc/repos/extra-i686/PKGBUILD (from rev 137978, 
x11vnc/trunk/PKGBUILD)
===
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-09-13 20:01:54 UTC (rev 137979)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Gaetan Bisson bis...@archlinux.org
+# Contributor: damir da...@archlinux.org
+
+pkgname=x11vnc
+pkgver=0.9.13
+pkgrel=1
+pkgdesc='VNC server for real X displays'
+arch=('i686' 'x86_64')
+url='http://www.karlrunge.com/x11vnc/'
+license=('GPL2')
+depends=('openssl' 'libjpeg' 'zlib' 'libx11' 'libxtst' 'libxinerama' 
'libxdamage' 'libxrandr' 'avahi')
+optdepends=('tk: for GUI support')
+backup=('etc/conf.d/x11vnc')
+source=(http://downloads.sourceforge.net/project/libvncserver/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz;
+   'conf.d'
+   'rc.d')
+sha1sums=('f011d81488ac94dc8dce2d88739c23bd85a976fa'
+  '11011cce06511e9ba61672a1c80bb63a3a187539'
+  '477892cf0f0020043444b7493c80684762ded506')
+
+build() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   ./configure --prefix=/usr --mandir=/usr/share/man
+   make
+}
+
+package() {
+   cd ${srcdir}/${pkgname}-${pkgver}
+   make DESTDIR=${pkgdir} install
+
+   rm -fr ${pkgdir}/usr/include/rfb # provided by libvncserver
+
+   install -D -m 755 ${srcdir}/rc.d ${pkgdir}/etc/rc.d/x11vnc
+   install -D -m 644 ${srcdir}/conf.d ${pkgdir}/etc/conf.d/x11vnc
+}

Copied: x11vnc/repos/extra-i686/conf.d (from rev 137978, x11vnc/trunk/conf.d)
===
--- extra-i686/conf.d   (rev 0)
+++ extra-i686/conf.d   2011-09-13 20:01:54 UTC (rev 137979)
@@ -0,0 +1,5 @@
+#
+# Parameters to be passed to x11vnc
+#
+
+X11VNC_ARGS=

Copied: x11vnc/repos/extra-i686/rc.d (from rev 137978, x11vnc/trunk/rc.d)
===
--- extra-i686/rc.d (rev 0)
+++ extra-i686/rc.d 2011-09-13 20:01:54 UTC (rev 137979)
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/x11vnc
+