From 1c363236977479be50721027b876f9d1c3467a3c Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Feb 10 2020 08:03:50 +0000
Subject: fix FTBFS (#1799679)

Resolves: rhbz#1799679

---

diff --git a/neon-0.30.2-fixtests.patch b/neon-0.30.2-fixtests.patch
new file mode 100644
index 0000000..6308d08
--- /dev/null
+++ b/neon-0.30.2-fixtests.patch
@@ -0,0 +1,28 @@
+commit 1678726ca3198f0a495a26647cdc7c8ed2e3c709
+Author: Joe Orton <jorton@redhat.com>
+Date:   Wed Aug 14 15:47:48 2019 +0100
+
+    * test/ssl.c: Update failures since the nul*.pem certs expired.
+
+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);
diff --git a/neon.spec b/neon.spec
index 6130432..994ebfd 100644
--- a/neon.spec
+++ b/neon.spec
@@ -3,7 +3,7 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
 Version: 0.30.2
-Release: 13%{?dist}
+Release: 14%{?dist}
 License: LGPLv2+
 URL: http://www.webdav.org/neon/
 Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz
@@ -11,6 +11,7 @@ Patch0: neon-0.27.0-multilib.patch
 Patch1: neon-0.30.2-sysuioh.patch
 Patch2: neon-0.30.2-lockprintf.patch
 Patch3: neon-0.30.2-openssl11.patch
+Patch4: neon-0.30.2-fixtests.patch
 BuildRequires:  gcc-c++
 BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel, libproxy-devel
 BuildRequires: pkgconfig, pakchois-devel
@@ -43,6 +44,7 @@ The development library for the C language HTTP and WebDAV client library.
 %patch1 -p1 -b .sysuioh
 %patch2 -p1 -b .lockprintf
 %patch3 -p1 -b .openssl11
+%patch4 -p1 -b .fixtests
 
 # prevent installation of HTML docs
 sed -ibak '/^install-docs/s/install-html//' Makefile.in
@@ -86,6 +88,9 @@ make %{?_smp_mflags} check
 %{_libdir}/*.so
 
 %changelog
+* Mon Feb 10 2020 Joe Orton <jorton@redhat.com> - 0.30.2-14
+- fix FTBFS (#1799679)
+
 * Mon Feb 03 2020 Kalev Lember <klember@redhat.com> - 0.30.2-13
 - Avoid using bindir macro in buildrequires