diff options
| -rw-r--r-- | community/x11vnc/APKBUILD | 18 | ||||
| -rw-r--r-- | community/x11vnc/libressl.patch | 15 |
2 files changed, 5 insertions, 28 deletions
diff --git a/community/x11vnc/APKBUILD b/community/x11vnc/APKBUILD index 98334fefdf6..365911685fe 100644 --- a/community/x11vnc/APKBUILD +++ b/community/x11vnc/APKBUILD @@ -1,28 +1,23 @@ # Contributor: Carlo Landmeter <clandmeter@gmail.com> # Maintainer: Tuan M. Hoang <tmhoang@flatglobe.org> pkgname=x11vnc -pkgver=0.9.14 -pkgrel=5 +pkgver=0.9.16 +pkgrel=0 pkgdesc="VNC server for real X displays" url="http://www.karlrunge.com/x11vnc/" arch="all" -license="GPL-2.0" +license="GPL-2.0-or-later" makedepends="openssl-dev libjpeg-turbo-dev avahi-dev libvncserver-dev automake autoconf" subpackages="$pkgname-doc" -source="x11vnc-$pkgver.tar.gz::https://github.com/LibVNC/x11vnc/archive/$pkgver.tar.gz - libressl.patch - " -builddir="$srcdir"/x11vnc-$pkgver +source="x11vnc-$pkgver.tar.gz::https://github.com/LibVNC/x11vnc/archive/$pkgver.tar.gz" prepare() { - cd "$builddir" default_prepare autoreconf -v --install } build() { - cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -35,14 +30,11 @@ build() { } package() { - cd "$builddir" make -j1 DESTDIR="$pkgdir" install } check() { - cd "$builddir" make check } -sha512sums="5d18e5ff493fbc4f6f1efe952812c1acd3087e855a2a9f2c99f3b2606cfa40a20b83e2d0c736e12b453b47f7ff7746069a1b6718d842d1a8f73b00d5c4c4a93f x11vnc-0.9.14.tar.gz -5e797f86717f312bb3d227df6b1493723bde4fae8c16591334237701ab0e43a550391aba4b82435d301e95b7cc2050315537549ca717eed3156475c27b8c5ad6 libressl.patch" +sha512sums="69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec x11vnc-0.9.16.tar.gz" diff --git a/community/x11vnc/libressl.patch b/community/x11vnc/libressl.patch deleted file mode 100644 index e650c92d7bf..00000000000 --- a/community/x11vnc/libressl.patch +++ /dev/null @@ -1,15 +0,0 @@ -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) { |