From a3b411a45548d9ca4d20dac7924f234398eb537c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Mon, 1 Mar 2021 15:48:44 +0100 Subject: [PATCH] neon: update to 0.31.2 --- srcpkgs/neon/patches/libressl.patch | 22 ---------------------- srcpkgs/neon/template | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 29 deletions(-) delete mode 100644 srcpkgs/neon/patches/libressl.patch diff --git a/srcpkgs/neon/patches/libressl.patch b/srcpkgs/neon/patches/libressl.patch deleted file mode 100644 index 8619476430a..00000000000 --- a/srcpkgs/neon/patches/libressl.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- src/ne_openssl.c.orig 2020-04-02 09:38:00.420981981 +0200 -+++ src/ne_openssl.c 2020-04-02 09:38:33.876330855 +0200 -@@ -578,7 +578,7 @@ ne_ssl_context *ne_ssl_context_create(in - /* enable workarounds for buggy SSL server implementations */ - SSL_CTX_set_options(ctx->ctx, SSL_OP_ALL); - SSL_CTX_set_verify(ctx->ctx, SSL_VERIFY_PEER, verify_callback); --#if OPENSSL_VERSION_NUMBER >= 0x10101000L -+#if !defined(LIBRESSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10101000L - SSL_CTX_set_post_handshake_auth(ctx->ctx, 1); - #endif - } else if (mode == NE_SSL_CTX_SERVER) { ---- src/ne_socket.c.orig 2020-04-02 09:39:23.413847326 +0200 -+++ src/ne_socket.c 2020-04-02 09:45:41.358787728 +0200 -@@ -610,7 +610,7 @@ static int error_ossl(ne_socket *sock, i - /* OpenSSL I/O function implementations. */ - static int readable_ossl(ne_socket *sock, int secs) - { --#if OPENSSL_VERSION_NUMBER < 0x10101000L -+#if defined(LIBRESSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10101000L - /* Sufficient for TLSv1.2 and earlier. */ - if (SSL_pending(sock->ssl)) - return 0; diff --git a/srcpkgs/neon/template b/srcpkgs/neon/template index ae99ef69353..125a1e158b9 100644 --- a/srcpkgs/neon/template +++ b/srcpkgs/neon/template @@ -1,20 +1,26 @@ # Template file for 'neon' pkgname=neon -version=0.31.0 -revision=3 +version=0.31.2 +revision=1 build_style=gnu-configure configure_args="--with-expat --with-ssl=openssl --enable-shared - --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static" -hostmakedepends="pkg-config" + --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --disable-static + --disable-nls" +make_build_args="all docs" +make_install_args="install" +hostmakedepends="automake libtool pkg-config xmlto" makedepends="zlib-devel expat-devel libressl-devel libproxy-devel" depends="ca-certificates" short_desc="HTTP and WebDAV client library, with a C interface" maintainer="Orphaned " license="LGPL-2.0-or-later" homepage="http://www.webdav.org/neon/" -distfiles="http://download.openpkg.org/components/cache/${pkgname}/${pkgname}-${version}.tar.gz" -distfiles="http://www.webdav.org/neon/${pkgname}-${version}.tar.gz" -checksum=80556f10830431476d1394c1f0af811f96109c4c4d119f0a9569b28c7526bda5 +distfiles="https://github.com/notroj/neon/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz" +checksum=c6513d20c0affca6f4b45e2414a86cce951709cf4448b6b64ccdf3579fda0ce5 + +pre_configure() { + ./autogen.sh +} neon-devel_package() { depends="${makedepends} neon>=${version}_${revision}"