diff --git a/neon-0.30.2-nulcert.patch b/neon-0.30.2-nulcert.patch deleted file mode 100644 index 874d92a..0000000 --- a/neon-0.30.2-nulcert.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1678726ca3198f0a495a26647cdc7c8ed2e3c709 Mon Sep 17 00:00:00 2001 -From: Joe Orton -Date: Wed, 14 Aug 2019 15:47:48 +0100 -Subject: [PATCH] * test/ssl.c: Update failures since the nul*.pem certs - expired. - ---- - test/ssl.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/ssl.c b/test/ssl.c -index 870a3de..266b2a5 100644 ---- a/test/ssl.c -+++ b/test/ssl.c -@@ -889,7 +889,7 @@ static int fail_nul_cn(void) - CALL(fail_ssl_request_with_error2(nul_cn_fn, key, ca, - "www.bank.com", "localhost", - "certificate with incorrect CN was accepted", -- NE_SSL_IDMISMATCH, -+ NE_SSL_IDMISMATCH|NE_SSL_EXPIRED|NE_SSL_BADCHAIN, - "certificate issued for a different hostname")); - ne_free(key); - ne_free(ca); -@@ -904,7 +904,7 @@ static int fail_nul_san(void) - CALL(fail_ssl_request_with_error2(cert, key, ca, - "www.bank.com", "localhost", - "certificate with incorrect CN was accepted", -- NE_SSL_IDMISMATCH, -+ NE_SSL_IDMISMATCH|NE_SSL_EXPIRED|NE_SSL_BADCHAIN, - "certificate issued for a different hostname")); - ne_free(cert); - ne_free(key); --- -2.16.4 - diff --git a/neon-0.30.2.tar.gz b/neon-0.30.2.tar.gz deleted file mode 100644 index 07a0837..0000000 --- a/neon-0.30.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca -size 932779 diff --git a/neon-0.30.2.tar.gz.asc b/neon-0.30.2.tar.gz.asc deleted file mode 100644 index d4ce5ab..0000000 --- a/neon-0.30.2.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAABCAAGBQJX7jFwAAoJEGCKht+YM8xJnVMP+wceuBon9W/KF2Qie7O+WcO1 -NIUCfHM12nFZy1hzIYioLJoJQ0fefqQbF1s6ttKfywZsPrh+XRlPPOLCAaSHn3d5 -cUy3C62BuCt47/UDzXW21kwJ0o1wtevCAcEYzwbAeLcwJM184zrzaq6OL1IViKau -SDvTM+CeUVSHeM2JNuFBZUBOPTyr16KVVBM9OCryjYxh1J+rnYK47vYH1YgaGefP -N1+kVGVPHGEOg+HvXIy9MdxZAR1koxNrl39tRO+OwbFOBI98xY5RDrktt6a5G/pb -pnS4oBXTgqhSzU9LX2GosvUI0tFUEEJeBm3TA3qUo0182vSdgKu1PPcGsoRchFP5 -aylYEpRImWHRjj5oWP1BUGTpKThZ1UktJLoEOCawA8NDXHKtE90raW/lc8FgqAxa -rwTied3FDBaRUlaar8doPqOYjGXbk5HjHNTp742blaids4XALxNlFyb/YeVkSdLz -Q8dMHeyk6Fw8QZLKTRXy1Fy+Ortc33l0p0srE1X14/z9jxeSFWXNuS1r6OtxjoVO -hKOSVJK1AEEAoMPaFlFUrL3LnGih4WwgMkRxp1hwfE/zRdDtplSNtGVBPw/67oTO -rCMDWUhgSTFO/iHo4dg6tQRE0Kl1PysMukCpQnhwzsfL/sHXClF6dokL6Bm9rGmZ -wkEA8Va6TyiNmBtB1SrY -=kecl ------END PGP SIGNATURE----- diff --git a/neon-0.30.2_ssl-fix_timeout_retvals.patch b/neon-0.30.2_ssl-fix_timeout_retvals.patch deleted file mode 100644 index a3ecbac..0000000 --- a/neon-0.30.2_ssl-fix_timeout_retvals.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: neon-0.30.2/test/ssl.c -=================================================================== ---- neon-0.30.2.orig/test/ssl.c -+++ neon-0.30.2/test/ssl.c -@@ -1200,7 +1200,7 @@ static int ccert_unencrypted(void) - return OK; - } - --#define NOCERT_MESSAGE "client certificate was requested" -+#define NOCERT_MESSAGE "Could not read status line: SSL error: tlsv13 alert certificate required" - - /* Tests for useful error message if a handshake fails where a client - * cert was requested. */ -Index: neon-0.30.2/test/socket.c -=================================================================== ---- neon-0.30.2.orig/test/socket.c -+++ neon-0.30.2/test/socket.c -@@ -1506,7 +1506,6 @@ ne_test tests[] = { - T(large_writes), - T(large_writev), - T(echo_lines), -- T(blocking), - T(prebind), - T(error), - #ifdef SOCKET_SSL -@@ -1519,11 +1518,6 @@ ne_test tests[] = { - #if TEST_CONNECT_TIMEOUT - T(connect_timeout), - #endif -- T(read_timeout), -- T(peek_timeout), -- T(readline_timeout), -- T(fullread_timeout), -- T(block_timeout), - T(socks_proxy), - T(fail_socks), - T(NULL) diff --git a/neon-0.31.1.tar.gz b/neon-0.31.1.tar.gz new file mode 100644 index 0000000..ea5f1d6 --- /dev/null +++ b/neon-0.31.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9dfcee723050df37ce18ba449d7707b78e7ab8230f3a4c59d9112e17dc2718d +size 867810 diff --git a/neon.changes b/neon.changes index df4c1b6..10920dd 100644 --- a/neon.changes +++ b/neon.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Mon Jun 1 09:04:45 UTC 2020 - Vítězslav Čížek + +- Update to 0.31.1 + ADMIN: The neon website has moved to https://notroj.github.io/neon/ + Restore ne_md5_read_ctx() in OpenSSL build. + Fix gcc warnings on Ubuntu (Jan-Marek Glogowski). + Fix various spelling mistakes in docs and headers (thanks to FOSSIES). + Fix ne_asctime_parse() (Eugenij-W). + Fix build with LibreSSL (Juan RP). + Interface changes: + none, API and ABI backwards-compatible with 0.27.x and later + New interfaces and features: + add more gcc “nonnull” attributes to ne_request_* functions. + for OpenSSL builds, ne_md5 code uses the OpenSSL implementation + add NE_SESSFLAG_SHAREPOINT session flag which enables workarounds + for RFC non-compliance issues in Sharepoint + ne_uri.h: add ne_path_escapef() in support of above + ne_207.h: add ne_207_set_flags() likewise in support of above + API clarification: + ne_version_match() behaviour now matches actual 0.27+ ABI history + Bug fixes: + fixes for OpenSSL 1.1.1 and TLSv1.3 support + fix crash with GnuTLS in client cert support (Henrik Holst) + fix possible crash in ne_set_request_flag() + fix build with libxml2 2.9.10 and later + fix handling lock timeouts >LONG_MAX (Giuseppe Castagno) +- Upstream has moved to https://notroj.github.io/neon/ + * tarball checksums are no longer provided +- Drop upstreamed patches: + * neon-0.30.2-nulcert.patch + * neon-0.30.2_ssl-fix_timeout_retvals.patch + ------------------------------------------------------------------- Thu Sep 12 10:44:58 UTC 2019 - Vítězslav Čížek diff --git a/neon.spec b/neon.spec index 2a4992a..f825f17 100644 --- a/neon.spec +++ b/neon.spec @@ -1,7 +1,7 @@ # # spec file for package neon # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,23 +17,19 @@ Name: neon -Version: 0.30.2 +Version: 0.31.1 Release: 0 Summary: An HTTP and WebDAV Client Library License: GPL-2.0-or-later Group: Development/Libraries/Other -Url: http://www.webdav.org/neon -Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz -Source1: http://www.webdav.org/neon/neon-%{version}.tar.gz.asc +URL: https://notroj.github.io/neon/ +Source0: https://notroj.github.io/neon/neon-%{version}.tar.gz Source2: %{name}.keyring Source3: baselibs.conf Source10: replace_manpage_with_links.sh # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches Patch0: %{name}-0.28.4-bloat.patch Patch1: fix_timeout_tests_for_ppc64le.patch -Patch2: neon-0.30.2_ssl-fix_timeout_retvals.patch -# backport from upstream -Patch3: neon-0.30.2-nulcert.patch BuildRequires: krb5-devel BuildRequires: libexpat-devel BuildRequires: libproxy-devel @@ -76,10 +72,6 @@ neon is an HTTP and WebDAV client library with a C interface. %ifarch ppc64le ppc64 %patch1 %endif -if pkg-config --atleast-version=1.1.1 openssl; then -%patch2 -p1 -fi -%patch3 -p1 %build rm -f aclocal.m4 ltmain.sh @@ -107,7 +99,7 @@ make %{?_smp_mflags} check %postun -n libneon27 -p /sbin/ldconfig %files -n libneon27 -%doc AUTHORS BUGS ChangeLog NEWS README THANKS TODO +%doc AUTHORS BUGS ChangeLog NEWS THANKS TODO %{_libdir}/*.so.27* %license src/COPYING.LIB