update to 0.32.5

neon-0.30.2-backport-mak-Replace-GX-with-EHsc.patch

@@ -1,32 +0,0 @@
-From 6d33a725679c2fca903621c67db03d1b4857cfe3 Mon Sep 17 00:00:00 2001
-From: Chun-wei Fan <fanchunwei@src.gnome.org>
-Date: Wed, 23 Mar 2022 11:18:04 +0800
-Subject: [PATCH] neon.mak: Replace /GX with /EHsc
-
-The /GX option has been deprecated and replaced with /EHsc, so use that to
-eliminate a cl.exe command line warning.
----
- neon.mak | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/neon.mak b/neon.mak
-index ce53a30..1d26d3b 100644
---- a/neon.mak
-+++ b/neon.mak
-@@ -12,11 +12,11 @@ NULL=nul
- # Debug vs. Release build
- !IF "$(DEBUG_BUILD)" == ""
- INTDIR = Release
--CFLAGS = /MD /W3 /GX /O2 /D "NDEBUG"
-+CFLAGS = /MD /W3 /EHsc /O2 /D "NDEBUG"
- TARGET = .\libneon.lib
- !ELSE
- INTDIR = Debug
--CFLAGS = /MDd /W3 /Gm /GX /Zi /Od /D "_DEBUG"
-+CFLAGS = /MDd /W3 /Gm /EHsc /Zi /Od /D "_DEBUG"
- TARGET = .\libneonD.lib
- !ENDIF
- 
--- 
-2.27.0
-

neon-0.30.2-backport-neon.mak-Silence-deprecation-POSIX-warnings.patch

@@ -1,30 +0,0 @@
-From 0d797e36ed4478fb8c780a7c327673de01b68439 Mon Sep 17 00:00:00 2001
-From: Chun-wei Fan <fanchunwei@src.gnome.org>
-Date: Wed, 23 Mar 2022 11:48:04 +0800
-Subject: [PATCH] neon.mak: Silence deprecation/POSIX warnings
-
-Define the appropriate macros so that we can see less compiler warnings on
-using deprecated or POSIX-ish CRT/system APIs, which actually should not really
-matter.
----
- neon.mak | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/neon.mak b/neon.mak
-index 1d26d3b..5d6e24e 100644
---- a/neon.mak
-+++ b/neon.mak
-@@ -20,6 +20,10 @@ CFLAGS = /MDd /W3 /Gm /EHsc /Zi /Od /D "_DEBUG"
- TARGET = .\libneonD.lib
- !ENDIF
- 
-+# Silence deprecation warnings on later Visual Studio versions, which
-+# actually can be ignored
-+CFLAGS = $(CFLAGS) /D _CRT_SECURE_NO_WARNINGS /D _CRT_NONSTDC_NO_WARNINGS /D _WINSOCK_DEPRECATED_NO_WARNINGS
-+
- ########
- # Whether to build SSPI
- !IF "$(SSPI_BUILD)" != ""
--- 
-2.27.0
-

neon-0.30.2-lockprintf.patch

@@ -1,22 +0,0 @@
-
-Supress gcc warnings.
-
---- neon-0.30.2/test/lock.c.lockprintf
-+++ neon-0.30.2/test/lock.c
-@@ -73,11 +73,11 @@
- 			   const char *token_href)
- {
-     static char buf[BUFSIZ];
--    sprintf(buf, 
--	    "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
--	    "<D:prop xmlns:D=\"DAV:\">"
--	    "<D:lockdiscovery>%s</D:lockdiscovery></D:prop>\n",
--	    activelock(scope, depth, owner, timeout, token_href));
-+    ne_snprintf(buf, sizeof buf,
-+                "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"
-+                "<D:prop xmlns:D=\"DAV:\">"
-+                "<D:lockdiscovery>%s</D:lockdiscovery></D:prop>\n",
-+                activelock(scope, depth, owner, timeout, token_href));
-     return buf;
- }
- 

neon-0.30.2-sysuioh.patch

@@ -1,14 +0,0 @@
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1572180
-
---- neon-0.30.2/src/ne_socket.c.sysuioh
-+++ neon-0.30.2/src/ne_socket.c
-@@ -27,7 +27,7 @@
- #include "config.h"
- 
- #include <sys/types.h>
--#ifdef HAVE_SYS_UIO_h
-+#ifdef HAVE_SYS_UIO_H
- #include <sys/uio.h> /* writev(2) */
- #endif
- #ifdef HAVE_SYS_TIME_H

neon-0.30.2-test-.c-Switch-to-destroy_and_wait-in-various-places.patch

@@ -1,118 +0,0 @@
-From be7ff12178dcba9641c28dcbea0803632c81ad7d Mon Sep 17 00:00:00 2001
-From: Joe Orton <jorton@redhat.com>
-Date: Thu, 13 Jan 2022 10:50:48 +0000
-Subject: [PATCH] * test/*.c: Switch to destroy_and_wait() in various places,
- no   functional change.
-
----
- test/acl3744.c   | 5 +----
- test/largefile.c | 5 ++---
- test/oldacl.c    | 5 +----
- test/redirect.c  | 8 ++------
- test/xmlreq.c    | 6 ++----
- 5 files changed, 8 insertions(+), 21 deletions(-)
-
-diff --git a/test/acl3744.c b/test/acl3744.c
-index 5f0bf8b..be2edba 100644
---- a/test/acl3744.c
-+++ b/test/acl3744.c
-@@ -36,10 +36,7 @@ static int test_acl(const char *uri, ne_acl_entry *es, int nume)
-     
-     ON(ne_acl3744_set(sess, uri, es, nume));
-     
--    CALL(await_server());
--    ne_session_destroy(sess);
--    
--    return OK;
-+    return destroy_and_wait(sess);
- }
- 
- static int grant_all(void)
-diff --git a/test/largefile.c b/test/largefile.c
-index e99e960..eb8eb38 100644
---- a/test/largefile.c
-+++ b/test/largefile.c
-@@ -181,9 +181,8 @@ static int read_large_response(void)
-     ne_request_destroy(req);
- 
-     CALL(any_2xx_request(sess, "/bar"));
--    CALL(await_server());
--    ne_session_destroy(sess);
--    return OK;
-+
-+    return destroy_and_wait(sess);
- }
- 
- ne_test tests[] = {
-diff --git a/test/oldacl.c b/test/oldacl.c
-index 2e72caa..5c0a671 100644
---- a/test/oldacl.c
-+++ b/test/oldacl.c
-@@ -36,10 +36,7 @@ static int test_acl(const char *uri, ne_acl_entry *es, int nume)
-     
-     ON(ne_acl_set(sess, uri, es, nume));
-     
--    CALL(await_server());
--    ne_session_destroy(sess);
--    
--    return OK;
-+    return destroy_and_wait(sess);
- }
- 
- static int grant_all(void)
-diff --git a/test/redirect.c b/test/redirect.c
-index 682097d..69e39f9 100644
---- a/test/redirect.c
-+++ b/test/redirect.c
-@@ -99,11 +99,9 @@ static int check_redir(struct redir_args *args, const char *expect)
-     ONV(strcmp(unp, expect), ("redirected to `%s' not `%s'", unp, expect));
-     ne_free(unp);
- 
--    ne_session_destroy(sess);
--    CALL(await_server());
-     if (full_expect) ne_free(full_expect);
- 
--    return OK;
-+    return destroy_and_wait(sess);
- }
- 
- #define DEST "http://foo.com/blah/blah/bar"
-@@ -191,10 +189,8 @@ static int no_redirect(void)
-     ONN("redirect non-NULL after non-redir req", ne_redirect_location(sess));
- 
-     CALL(process_redir(sess, "/foo", &loc));
--    CALL(await_server());
- 
--    ne_session_destroy(sess);
--    return OK;
-+    return destroy_and_wait(sess);
- }
- 
- ne_test tests[] = {
-diff --git a/test/xmlreq.c b/test/xmlreq.c
-index 1c3344d..ff5d54b 100644
---- a/test/xmlreq.c
-+++ b/test/xmlreq.c
-@@ -75,8 +75,7 @@ static int success(void)
-     
-     ne_xml_destroy(parser);
-     ne_request_destroy(req);
--    ne_session_destroy(sess);
--    return await_server();
-+    return destroy_and_wait(sess);
- }
- 
- static int failure(void)
-@@ -105,8 +104,7 @@ static int failure(void)
- 
-     ne_xml_destroy(parser);
-     ne_request_destroy(req);
--    ne_session_destroy(sess);
--    return await_server();
-+    return destroy_and_wait(sess);
- }
- 
- static int types(void)
--- 
-2.27.0
-

neon-0.32.2-multilib.patch

@@ -1,5 +1,5 @@
---- neon-0.27.0/neon-config.in.multilib
+--- neon-0.32.2/neon-config.in.multilib
-+++ neon-0.27.0/neon-config.in
++++ neon-0.32.2/neon-config.in
 @@ -5,7 +5,11 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
@@ -22,7 +22,7 @@
      i18n [@NE_FLAG_I18N@], ts_ssl [@NE_FLAG_TS_SSL@]
  
  EOF
-@@ -69,11 +73,10 @@
+@@ -69,16 +73,11 @@
  	;;
  
      --cflags)
@@ -32,10 +32,16 @@
  
      --libs)
 -        LIBS="-lneon @NEON_LIBS@"
- 	# Don't add standard library paths
+-	# Don't add standard library paths
-         if test "$prefix" != "/usr"; then
+-        if test "$prefix" != "/usr"; then
-            LIBS="-L${libdir} ${LIBS}"
+-           LIBS="-L${libdir} ${LIBS}"
-@@ -93,7 +96,7 @@
+-        fi
+-	echo @user_LDFLAGS@ ${LIBS}
++	echo ${LIBS}
+ 	;;
+ 
+     --la-file)
+@@ -93,7 +92,7 @@
  	zlib|ZLIB) support @NE_FLAG_ZLIB@ ;;
  	ipv6|IPV6) support @NE_FLAG_IPV6@ ;;
  	dav|DAV) support @NE_FLAG_DAV@ ;;
@@ -44,8 +50,8 @@
  	i18n|I18N) support @NE_FLAG_I18N@ ;;
  	ts_ssl|TS_SSL) support @NE_FLAG_TS_SSL@ ;;
  	*) support no ;;
---- neon-0.27.0/neon.pc.in.multilib
+--- neon-0.32.2/neon.pc.in.multilib
-+++ neon-0.27.0/neon.pc.in
++++ neon-0.32.2/neon.pc.in
 @@ -2,6 +2,7 @@
  exec_prefix=@exec_prefix@
  libdir=@libdir@

neon.spec

@@ -1,21 +1,17 @@
+# Disable automatic .la file removal
+%global __brp_remove_la_files %nil
+
 Name:		neon
-Version:	0.30.2
+Version:	0.32.5
-Release: 	15
+Release: 	1
 Summary:	An HTTP and WebDAV client library
 License:	LGPLv2+
-URL:		http://www.webdav.org/neon/
+URL:            https://notroj.github.io/neon/
-Source0:	http://www.webdav.org/neon/neon-%{version}.tar.gz
+Source0:        https://notroj.github.io/neon/%{name}-%{version}.tar.gz
+Patch0:         neon-0.32.2-multilib.patch
 
-# These patches are from fedora: https://src.fedoraproject.org/rpms/neon/tree/f29
+BuildRequires:  gcc openssl-devel expat-devel gdb-headless zlib-devel krb5-devel
-Patch0:		neon-0.27.0-multilib.patch
+BuildRequires:  pkgconfig  make xmlto pakchois-devel libproxy-devel
-Patch1:		neon-0.30.2-sysuioh.patch
-Patch2:		neon-0.30.2-lockprintf.patch
-Patch3:		neon-0.30.2-test-.c-Switch-to-destroy_and_wait-in-various-places.patch
-Patch4:		neon-0.30.2-backport-mak-Replace-GX-with-EHsc.patch
-Patch5:		neon-0.30.2-backport-neon.mak-Silence-deprecation-POSIX-warnings.patch
-
-BuildRequires:  gcc openssl-devel expat-devel gdb-headless
-Requires:	ca-certificates
 
 %description
 neon is an HTTP and WebDAV client library, with a C interface. Features:\
@@ -50,7 +46,7 @@ The %{name}-help package conatins man manual etc
 
 %prep
 %autosetup -n %{name}-%{version} -p1
-sed -ibak '/^install-docs/s/install-html//' Makefile.in
+sed -i '/^install-docs/s/install-html//' Makefile.in
 
 %build
 export CC="%{__cc} -pthread"
@@ -62,15 +58,17 @@ export CC="%{__cc} -pthread"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%make_install INSTALL="install -p"
+%make_install
 
 sed -ri "/^dependency_libs/{s,-l[^ ']*,,g}" \
       $RPM_BUILD_ROOT%{_libdir}/libneon.la
 
 %find_lang %{name}
 
+%ldconfig_scriptlets
+
 %files -f %{name}.lang
-%doc BUGS TODO NEWS README THANKS
+%doc BUGS TODO NEWS README* THANKS
 %license AUTHORS src/COPYING.LIB
 %{_libdir}/*.so.*
 
@@ -86,6 +84,9 @@ sed -ri "/^dependency_libs/{s,-l[^ ']*,,g}" \
 %{_mandir}/man3/*
 
 %changelog
+* Thu May 18 2023 liyanan <thistleslyn@163.com> - 0.32.5-1
+- update to 0.32.5
+
 * Fri Dec 30 2022 Guangzhong Yao <yaoguangzhong@xfusion.com> - 0.30.2-15
 - DESC: backport neon.mak: Silence deprecation/POSIX warnings