Subject: [alpine-aports] [PATCH] testing/x11vnc: move from unmaintained, take maintainership

From: "Tuan M. Hoang" <[email-masked]>
Date: Fri, 24 Mar 2017 17:23:44 -0400

---
 {unmaintained => testing}/x11vnc/APKBUILD | 20 ++++++++++----------
 testing/x11vnc/libressl.patch             | 15 +++++++++++++++
 2 files changed, 25 insertions(+), 10 deletions(-)
 rename {unmaintained => testing}/x11vnc/APKBUILD (53%)
 create mode 100644 testing/x11vnc/libressl.patch

diff --git a/unmaintained/x11vnc/APKBUILD b/testing/x11vnc/APKBUILD
similarity index 53%
rename from unmaintained/x11vnc/APKBUILD
rename to testing/x11vnc/APKBUILD
index d7c2402..c7f721d 100644
--- a/unmaintained/x11vnc/APKBUILD
+++ b/testing/x11vnc/APKBUILD
@@ -1,19 +1,19 @@
 # Contributor: Carlo Landmeter <[email-masked]>
-# Maintainer:
+# Maintainer: Tuan M. Hoang <[email-masked]>
 pkgname=x11vnc
-pkgver=0.9.13
+pkgver=0.9.14
 pkgrel=0
 pkgdesc="VNC server for real X displays"
 url="http://www.karlrunge.com/x11vnc/"
 arch="all"
 license="GPL2"
 depends=""
-depends_dev="openssl-dev libjpeg-turbo-dev libxtst-dev libxinerama-dev libxdamage-dev
-	libxrandr-dev avahi-dev"
-makedepends="$depends_dev"
+makedepends="libressl-dev libjpeg-turbo-dev avahi-dev libvncserver-dev"
 install=""
-subpackages="$pkgname-dev $pkgname-doc"
-source="http://cznic.dl.sourceforge.net/project/libvncserver/x11vnc/$pkgver/x11vnc-$pkgver.tar.gz"
+subpackages="$pkgname-doc"
+source="x11vnc-$pkgver.tar.gz::https://github.com/LibVNC/x11vnc/archive/$pkgver.tar.gz
+	libressl.patch
+	"
 
 _builddir="$srcdir"/x11vnc-$pkgver
 prepare() {
@@ -29,6 +29,7 @@ prepare() {
 
 build() {
 	cd "$_builddir"
+	autoreconf -v --install
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -46,6 +47,5 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="a372ec4fe8211221547b1c108cf56e4c  x11vnc-0.9.13.tar.gz"
-sha256sums="f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b  x11vnc-0.9.13.tar.gz"
-sha512sums="7b24e495f29122032e1c8ced7f7d8e0a56a2a8263e761a50725320742c99a0fcd5680d13038dd5d47e1c05d3b889d0caa13ba0b1aeda6fa42d5fb5ef3c43f908  x11vnc-0.9.13.tar.gz"
+sha512sums="5d18e5ff493fbc4f6f1efe952812c1acd3087e855a2a9f2c99f3b2606cfa40a20b83e2d0c736e12b453b47f7ff7746069a1b6718d842d1a8f73b00d5c4c4a93f  x11vnc-0.9.14.tar.gz
+5e797f86717f312bb3d227df6b1493723bde4fae8c16591334237701ab0e43a550391aba4b82435d301e95b7cc2050315537549ca717eed3156475c27b8c5ad6  libressl.patch"
diff --git a/testing/x11vnc/libressl.patch b/testing/x11vnc/libressl.patch
new file mode 100644
index 0000000..e650c92
--- /dev/null
+++ b/testing/x11vnc/libressl.patch
@@ -0,0 +1,15 @@
+diff --git a/src/enc.h b/src/enc.h
+index 55d49bb..edf8f6b 100644
+--- a/src/enc.h
++++ b/src/enc.h
+@@ -454,8 +454,10 @@ extern void enc_do(char *ciph, char *keyfile, char *lport, char *rhp) {
+ 		p++;
+ 		if (strstr(p, "md5+") == p) {
+ 			Digest = EVP_md5();        p += strlen("md5+");
++#ifndef OPENSSL_NO_SHA0
+ 		} else if (strstr(p, "sha+") == p) {
+ 			Digest = EVP_sha();        p += strlen("sha+");
++#endif
+ 		} else if (strstr(p, "sha1+") == p) {
+ 			Digest = EVP_sha1();       p += strlen("sha1+");
+ 		} else if (strstr(p, "ripe+") == p) {
-- 
2.11.0

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---