[arch-commits] Commit in libvncserver/repos (6 files)
Evangelos Foutras
foutrelis at archlinux.org
Wed Mar 2 18:18:52 UTC 2016
Date: Wednesday, March 2, 2016 @ 19:18:52
Author: foutrelis
Revision: 260523
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
libvncserver/repos/staging-i686/
libvncserver/repos/staging-i686/PKGBUILD
(from rev 260522, libvncserver/trunk/PKGBUILD)
libvncserver/repos/staging-i686/initialize-libgcrypt.patch
(from rev 260522, libvncserver/trunk/initialize-libgcrypt.patch)
libvncserver/repos/staging-x86_64/
libvncserver/repos/staging-x86_64/PKGBUILD
(from rev 260522, libvncserver/trunk/PKGBUILD)
libvncserver/repos/staging-x86_64/initialize-libgcrypt.patch
(from rev 260522, libvncserver/trunk/initialize-libgcrypt.patch)
-------------------------------------------+
staging-i686/PKGBUILD | 37 ++++++++++++++++++++++++++
staging-i686/initialize-libgcrypt.patch | 39 ++++++++++++++++++++++++++++
staging-x86_64/PKGBUILD | 37 ++++++++++++++++++++++++++
staging-x86_64/initialize-libgcrypt.patch | 39 ++++++++++++++++++++++++++++
4 files changed, 152 insertions(+)
Copied: libvncserver/repos/staging-i686/PKGBUILD (from rev 260522, libvncserver/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2016-03-02 18:18:52 UTC (rev 260523)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=libvncserver
+pkgver=0.9.10
+pkgrel=4
+pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server"
+arch=('i686' 'x86_64')
+url="https://libvnc.github.io/"
+license=('GPL')
+depends=('libpng' 'libjpeg' 'gnutls' 'libgcrypt' 'openssl')
+makedepends=('sdl')
+source=("https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${pkgver}.tar.gz"
+ initialize-libgcrypt.patch)
+md5sums=('e1b888fae717b06896f8aec100163d27'
+ 'e22024d3a81c45129411e39e7d143835')
+
+prepare() {
+ cd ${pkgname}-LibVNCServer-${pkgver}
+ # Fix crashing when connecting to Mac hosts
+ # Suggested by upstream: https://github.com/LibVNC/libvncserver/pull/51#issuecomment-68884516
+ patch -p1 -i ../initialize-libgcrypt.patch
+}
+
+build() {
+ cd ${pkgname}-LibVNCServer-${pkgver}
+ ./autogen.sh
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-LibVNCServer-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Copied: libvncserver/repos/staging-i686/initialize-libgcrypt.patch (from rev 260522, libvncserver/trunk/initialize-libgcrypt.patch)
===================================================================
--- staging-i686/initialize-libgcrypt.patch (rev 0)
+++ staging-i686/initialize-libgcrypt.patch 2016-03-02 18:18:52 UTC (rev 260523)
@@ -0,0 +1,39 @@
+From 4674d4632b9ffc6779d9c9f79b8ebb53c12e29b2 Mon Sep 17 00:00:00 2001
+From: Floris Bos <bos at je-eigen-domein.nl>
+Date: Fri, 2 Jan 2015 16:36:05 +0100
+Subject: [PATCH] Initialize libgcrypt before use
+
+https://www.gnupg.org/documentation/manuals/gcrypt/Initializing-the-library.html
+"Before the library can be used, it must initialize itself.
+This is achieved by invoking the function gcry_check_version"
+
+Closes issue #45
+Tested with krdc + libgcrypt 1.6.1 (libgcrypt20-dev Ubunutu package)
+connecting to a Mac Mini.
+
+Signed-off-by: Floris Bos <bos at je-eigen-domein.nl>
+---
+ libvncclient/rfbproto.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c
+index f653850..aa74c23 100644
+--- a/libvncclient/rfbproto.c
++++ b/libvncclient/rfbproto.c
+@@ -857,6 +857,16 @@ HandleARDAuth(rfbClient *client)
+ rfbCredential *cred = NULL;
+ rfbBool result = FALSE;
+
++ if (!gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P))
++ {
++ /* Application did not initialize gcrypt, so we should */
++ if (!gcry_check_version(GCRYPT_VERSION))
++ {
++ /* Older version of libgcrypt is installed on system than compiled against */
++ rfbClientLog("libgcrypt version mismatch.\n");
++ }
++ }
++
+ while (1)
+ {
+ if (!ReadFromRFBServer(client, (char *)gen, 2))
Copied: libvncserver/repos/staging-x86_64/PKGBUILD (from rev 260522, libvncserver/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2016-03-02 18:18:52 UTC (rev 260523)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=libvncserver
+pkgver=0.9.10
+pkgrel=4
+pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server"
+arch=('i686' 'x86_64')
+url="https://libvnc.github.io/"
+license=('GPL')
+depends=('libpng' 'libjpeg' 'gnutls' 'libgcrypt' 'openssl')
+makedepends=('sdl')
+source=("https://github.com/LibVNC/libvncserver/archive/LibVNCServer-${pkgver}.tar.gz"
+ initialize-libgcrypt.patch)
+md5sums=('e1b888fae717b06896f8aec100163d27'
+ 'e22024d3a81c45129411e39e7d143835')
+
+prepare() {
+ cd ${pkgname}-LibVNCServer-${pkgver}
+ # Fix crashing when connecting to Mac hosts
+ # Suggested by upstream: https://github.com/LibVNC/libvncserver/pull/51#issuecomment-68884516
+ patch -p1 -i ../initialize-libgcrypt.patch
+}
+
+build() {
+ cd ${pkgname}-LibVNCServer-${pkgver}
+ ./autogen.sh
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd ${pkgname}-LibVNCServer-${pkgver}
+ make DESTDIR="${pkgdir}" install
+}
Copied: libvncserver/repos/staging-x86_64/initialize-libgcrypt.patch (from rev 260522, libvncserver/trunk/initialize-libgcrypt.patch)
===================================================================
--- staging-x86_64/initialize-libgcrypt.patch (rev 0)
+++ staging-x86_64/initialize-libgcrypt.patch 2016-03-02 18:18:52 UTC (rev 260523)
@@ -0,0 +1,39 @@
+From 4674d4632b9ffc6779d9c9f79b8ebb53c12e29b2 Mon Sep 17 00:00:00 2001
+From: Floris Bos <bos at je-eigen-domein.nl>
+Date: Fri, 2 Jan 2015 16:36:05 +0100
+Subject: [PATCH] Initialize libgcrypt before use
+
+https://www.gnupg.org/documentation/manuals/gcrypt/Initializing-the-library.html
+"Before the library can be used, it must initialize itself.
+This is achieved by invoking the function gcry_check_version"
+
+Closes issue #45
+Tested with krdc + libgcrypt 1.6.1 (libgcrypt20-dev Ubunutu package)
+connecting to a Mac Mini.
+
+Signed-off-by: Floris Bos <bos at je-eigen-domein.nl>
+---
+ libvncclient/rfbproto.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/libvncclient/rfbproto.c b/libvncclient/rfbproto.c
+index f653850..aa74c23 100644
+--- a/libvncclient/rfbproto.c
++++ b/libvncclient/rfbproto.c
+@@ -857,6 +857,16 @@ HandleARDAuth(rfbClient *client)
+ rfbCredential *cred = NULL;
+ rfbBool result = FALSE;
+
++ if (!gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P))
++ {
++ /* Application did not initialize gcrypt, so we should */
++ if (!gcry_check_version(GCRYPT_VERSION))
++ {
++ /* Older version of libgcrypt is installed on system than compiled against */
++ rfbClientLog("libgcrypt version mismatch.\n");
++ }
++ }
++
+ while (1)
+ {
+ if (!ReadFromRFBServer(client, (char *)gen, 2))
More information about the arch-commits
mailing list