From 73e8ed95e8ca2766c52836c510258355b56e3b2f Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Sep 20 2021 14:42:49 +0000
Subject: update to 0.32.0


---

diff --git a/.gitignore b/.gitignore
index 5496f49..0b4c568 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ neon-0.29.2.tar.gz
 /neon-0.31.1.tar.gz
 /results_neon
 /neon-0.31.2.tar.gz
+/neon-0.32.0.tar.gz
diff --git a/neon-0.31.2-lesstests.patch b/neon-0.31.2-lesstests.patch
deleted file mode 100644
index 1a88766..0000000
--- a/neon-0.31.2-lesstests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-
-The fail_nul_* tests are broken with OpenSSL configured to reject SHA-1 digests.
-
---- neon-0.31.2/test/ssl.c.lesstests
-+++ neon-0.31.2/test/ssl.c
-@@ -1932,7 +1932,7 @@
-     T(fail_ca_expired),
- 
-     T(nulcn_identity),
--#ifndef HAVE_GNUTLS
-+#if 0
-     /* These certs were created with a SHA#1 digest so are rejected by GnuTLS. */
-     T(fail_nul_cn),
-     T(fail_nul_san),
diff --git a/neon-0.32.0-cflags.patch b/neon-0.32.0-cflags.patch
new file mode 100644
index 0000000..2d9e018
--- /dev/null
+++ b/neon-0.32.0-cflags.patch
@@ -0,0 +1,22 @@
+--- neon-0.32.0/macros/neon.m4.cflags
++++ neon-0.32.0/macros/neon.m4
+@@ -1106,8 +1106,8 @@
+ AC_DEFUN([NEON_GSSAPI], [
+ AC_ARG_WITH(gssapi, AS_HELP_STRING(--without-gssapi, disable GSSAPI support))
+ if test "$with_gssapi" != "no"; then
+-  ne_save_CFLAGS=$CFLAGS
+-  ne_save_LIBS=$NEON_LIBS
++  ne_save_CFLAGS="$CFLAGS"
++  ne_save_LIBS="$NEON_LIBS"
+   NE_PKG_CONFIG(NE_GSSAPI, [krb5-gssapi],
+     [AC_MSG_NOTICE(using GSSAPI configuration from pkg-config)
+      KRB5_CONF_TOOL=pkgconf],
+@@ -1142,7 +1142,7 @@
+ #endif])])
+      break
+    ])
+-   CFLAGS=$ne_save_CPPFLAGS
++   CFLAGS=$ne_save_CFLAGS
+    NEON_LIBS=$ne_save_LIBS
+ fi])
+ 
diff --git a/neon.spec b/neon.spec
index 36410f0..e1d46c7 100644
--- a/neon.spec
+++ b/neon.spec
@@ -7,15 +7,15 @@
 
 Summary: An HTTP and WebDAV client library
 Name: neon
-Version: 0.31.2
-Release: 8%{?dist}
+Version: 0.32.0
+Release: 1%{?dist}
 License: LGPLv2+
 URL: https://notroj.github.io/neon/
 Source0: https://notroj.github.io/neon/neon-%{version}.tar.gz
 Patch0: neon-0.27.0-multilib.patch
-Patch1: neon-0.31.2-lesstests.patch
+Patch1: neon-0.32.0-cflags.patch
 BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel, libproxy-devel
-BuildRequires: pkgconfig, make, gcc
+BuildRequires: pkgconfig, make, gcc, autoconf, xmlto
 %if %{with pkcs11}
 BuildRequires: pakchois-devel
 %endif
@@ -44,14 +44,13 @@ The development library for the C language HTTP and WebDAV client library.
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
-%patch1 -p1 -b .lesstests
-
+%patch1 -p1 -b .cflags
+autoconf
 
 # prevent installation of HTML docs
 sed -ibak '/^install-docs/s/install-html//' Makefile.in
 
 %build
-export CC="%{__cc} -pthread"
 %configure --with-expat --enable-shared --disable-static \
         --enable-warnings \
         --with-ssl=openssl --enable-threadsafe-ssl=posix \
@@ -89,6 +88,9 @@ make %{?_smp_mflags} check
 %{_libdir}/*.so
 
 %changelog
+* Mon Sep 20 2021 Joe Orton <jorton@redhat.com> - 0.32.0-1
+- update to 0.32.0
+
 * Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 0.31.2-8
 - Rebuilt with OpenSSL 3.0.0
 
diff --git a/sources b/sources
index 4d34138..c9abfba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (neon-0.31.2.tar.gz) = 1e402b40a0445f68ed24d2697ee60d21636f61ebc98edcde37ff9e26c54430acabf3969ac22a942d1dd51bddee0f312c04073b423b0af3a3e7c9bf60cd53e48c
+SHA512 (neon-0.32.0.tar.gz) = c5f27b41379955736730cd6bb8908e21e3fd3a1379730deceaec5a46ab22c7c3c08fca591d15e6c2ca91b7be66c6c3f73479b97608637710eba5959f16511338