From 19eb8a0706b760b51997a87ab1514ec1a7c04b18 Mon Sep 17 00:00:00 2001 From: Juergen Buchmueller Date: Thu, 6 Oct 2016 00:22:26 +0200 Subject: [PATCH] neon: more fixes for libressl support --- srcpkgs/neon/patches/fix-libressl.patch | 22 ++++++++++++++++++++-- srcpkgs/neon/template | 2 +- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/srcpkgs/neon/patches/fix-libressl.patch b/srcpkgs/neon/patches/fix-libressl.patch index f1365588c3f..385e056acae 100644 --- a/srcpkgs/neon/patches/fix-libressl.patch +++ b/srcpkgs/neon/patches/fix-libressl.patch @@ -1,7 +1,7 @@ -Extend the guard to be also true for libressl. +Version number juggling for libressl --- src/ne_openssl.c 2016-09-30 10:46:00.000000000 +0200 -+++ src/ne_openssl.c 2016-10-04 12:57:24.507084147 +0200 ++++ src/ne_openssl.c 2016-10-06 00:19:58.366044580 +0200 @@ -66,7 +66,7 @@ typedef const unsigned char ne_d2i_uchar; #endif @@ -11,3 +11,21 @@ Extend the guard to be also true for libressl. #define X509_up_ref(x) x->references++ #define EVP_PKEY_up_ref(x) x->references++ #define EVP_PKEY_get0_RSA(evp) (evp->pkey.rsa) +@@ -1199,7 +1199,7 @@ + + int ne__ssl_init(void) + { +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) + CRYPTO_malloc_init(); + SSL_load_error_strings(); + SSL_library_init(); +@@ -1242,7 +1242,7 @@ + "for %" NE_FMT_SIZE_T " locks.\n", num_locks); + } + #endif +-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */ ++#endif /* (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) */ + + return 0; + } diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template index dc6a0e14a80..bd537f0d209 100644 --- a/srcpkgs/neon/template +++ b/srcpkgs/neon/template @@ -1,7 +1,7 @@ # Template file for 'neon' pkgname=neon version=0.30.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-expat --with-ssl=openssl --enable-shared --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static"