Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b9ac22a7a4a3bca317e4d5d8b6a79b5362be27a3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b9ac22a7a4a3bca317e4d5d8b6a79b5362be27a3)
  • Date: Thu, 22 Aug 2019 18:01:46 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

x11/libvncserver/DETAILS | 4 -
x11/libvncserver/HISTORY | 3 +
x11/x11vnc/DETAILS | 4 -
x11/x11vnc/HISTORY | 4 +
x11/x11vnc/PRE_BUILD | 3 +
x11/x11vnc/patches/0001-libressl.patch | 86
+++++++++++++++++++++++++++++++++
6 files changed, 100 insertions(+), 4 deletions(-)

New commits:
commit b9ac22a7a4a3bca317e4d5d8b6a79b5362be27a3
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

x11vnc: Fix build against libressl

commit 9db6fd0f6ff4aacf9c507de56baa6760abb6cb6b
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

x11vnc 0.9.16

commit 82423fdc443acdd6d422d15af44618e91a4492e0
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libvncserver 0.9.12

diff --git a/x11/libvncserver/DETAILS b/x11/libvncserver/DETAILS
index a35a757..e48045c 100755
--- a/x11/libvncserver/DETAILS
+++ b/x11/libvncserver/DETAILS
@@ -1,8 +1,8 @@
SPELL=libvncserver
- VERSION=0.9.11
+ VERSION=0.9.12
SOURCE=LibVNCServer-$VERSION.tar.gz
SOURCE_URL[0]=https://github.com/LibVNC/$SPELL/archive/$SOURCE
-
SOURCE_HASH=sha512:e473c081b68dd3cdd96a1756b4f4945ece79d3c8e4cef62140be1699671555fc16d3080e81d764197a14ea83203ffcd0e18c3cc182e012d036e3faae943003fb
+
SOURCE_HASH=sha512:60ff1cc93a937d6f8f97449bc58b763095846207112f7b1b3c43eb2d74448b595d6da949903a764bd484ee54e38ff6277e882adbe965dd6d26ba15ef6ff6fcb8
WEB_SITE=http://libvncserver.sourceforge.net/
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-LibVNCServer-$VERSION"
ENTERED=20040404
diff --git a/x11/libvncserver/HISTORY b/x11/libvncserver/HISTORY
index c51fc83..2b84ea8 100644
--- a/x11/libvncserver/HISTORY
+++ b/x11/libvncserver/HISTORY
@@ -1,3 +1,6 @@
+2019-08-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.9.12
+
2018-08-29 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: added missing dependency on cmake
* DETAILS: updated spell to 0.9.11
diff --git a/x11/x11vnc/DETAILS b/x11/x11vnc/DETAILS
index 26c6d18..bb48712 100755
--- a/x11/x11vnc/DETAILS
+++ b/x11/x11vnc/DETAILS
@@ -1,6 +1,6 @@
SPELL=x11vnc
- VERSION=0.9.15
-
SOURCE_HASH=sha512:d5db90f87ba4b9801e8f6bb2c0821657c6388ce2c64e1565aeeabe41edf63b56ad72dc7be4cf874b817dacd7de5988eddd466df5b9396c13d69340ac90a1ca4d
+ VERSION=0.9.16
+
SOURCE_HASH=sha512:69f65ee312f8dede6051b401304987502a213c6c28c7f41e855734f11de1fae14d5d493dc9c28b2e4b7c0be55f8dbd3b35dd2610aae910183772c3e626736fec
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_URL[0]=https://github.com/LibVNC/$SPELL/archive/$VERSION.tar.gz
WEB_SITE=http://www.karlrunge.com/x11vnc/
diff --git a/x11/x11vnc/HISTORY b/x11/x11vnc/HISTORY
index 134628c..e402882 100644
--- a/x11/x11vnc/HISTORY
+++ b/x11/x11vnc/HISTORY
@@ -1,3 +1,7 @@
+2019-08-22 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 0.9.16
+ * PRE_BUILD, patches/0001-libressl.patch: Fixed build against libressl
+
2018-08-29 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: libvncserver dependency is now mandatory
switched from xorg-server to XSERVER
diff --git a/x11/x11vnc/PRE_BUILD b/x11/x11vnc/PRE_BUILD
new file mode 100755
index 0000000..c230ad1
--- /dev/null
+++ b/x11/x11vnc/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches
diff --git a/x11/x11vnc/patches/0001-libressl.patch
b/x11/x11vnc/patches/0001-libressl.patch
new file mode 100644
index 0000000..b5a40af
--- /dev/null
+++ b/x11/x11vnc/patches/0001-libressl.patch
@@ -0,0 +1,86 @@
+Taken from OpenBSD; modified to apply with -p1.
+
+$OpenBSD: patch-src_sslhelper_c,v 1.1 2018/08/09 15:04:21 sthen Exp $
+
+--- a/src/sslhelper.c
++++ b/src/sslhelper.c
+@@ -803,7 +803,7 @@ static int pem_passwd_callback(char *buf, int size, in
+ static int crl_callback(X509_STORE_CTX *callback_ctx) {
+ const ASN1_INTEGER *revoked_serial;
+ X509_STORE_CTX *store_ctx;
+-#if OPENSSL_VERSION_NUMBER > 0x10100000L
++#if OPENSSL_VERSION_NUMBER > 0x10100000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT *obj;
+ #else
+ X509_OBJECT obj;
+@@ -829,7 +829,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx)
+ * the current certificate in order to verify it's integrity. */
+ store_ctx = X509_STORE_CTX_new();
+ X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
+-#if OPENSSL_VERSION_NUMBER > 0x10100000L
++#if OPENSSL_VERSION_NUMBER > 0x10100000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ obj = X509_OBJECT_new();
+ rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, subject, obj);
+ crl = X509_OBJECT_get0_X509_CRL(obj);
+@@ -865,7 +865,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx)
+ rfbLog("Invalid signature on CRL\n");
+ X509_STORE_CTX_set_error(callback_ctx,
+ X509_V_ERR_CRL_SIGNATURE_FAILURE);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+@@ -883,7 +883,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx)
+ rfbLog("Found CRL has invalid nextUpdate field\n");
+ X509_STORE_CTX_set_error(callback_ctx,
+ X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+@@ -894,14 +894,14 @@ static int crl_callback(X509_STORE_CTX *callback_ctx)
+ rfbLog("Found CRL is expired - "
+ "revoking all certificates until you get
updated CRL\n");
+ X509_STORE_CTX_set_error(callback_ctx,
X509_V_ERR_CRL_HAS_EXPIRED);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+ #endif
+ return 0; /* Reject connection */
+ }
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+@@ -912,7 +912,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx)
+ * the current certificate in order to check for revocation. */
+ store_ctx = X509_STORE_CTX_new();
+ X509_STORE_CTX_init(store_ctx, revocation_store, NULL, NULL);
+-#if OPENSSL_VERSION_NUMBER > 0x10100000L
++#if OPENSSL_VERSION_NUMBER > 0x10100000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ obj = X509_OBJECT_new();
+ rc=X509_STORE_get_by_subject(store_ctx, X509_LU_CRL, issuer, obj);
+ crl = X509_OBJECT_get0_X509_CRL(obj);
+@@ -942,7 +942,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx)
+ "revoked per CRL from issuer %s\n",
serial, serial, cp);
+ OPENSSL_free(cp);
+ X509_STORE_CTX_set_error(callback_ctx,
X509_V_ERR_CERT_REVOKED);
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);
+@@ -950,7 +950,7 @@ static int crl_callback(X509_STORE_CTX *callback_ctx)
+ return 0; /* Reject connection */
+ }
+ }
+-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if OPENSSL_VERSION_NUMBER >= 0x10100000L &&
!defined(LIBRESSL_VERSION_NUMBER)
+ X509_OBJECT_free(obj);
+ #else
+ X509_OBJECT_free_contents(&obj);



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (b9ac22a7a4a3bca317e4d5d8b6a79b5362be27a3), Ismael Luceno, 08/22/2019

Archive powered by MHonArc 2.6.24.

Top of Page