From 9b8b0832f7f658d7b554094e2275d91d925a02aae66703d393a32e102a30bed4 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 22 May 2024 07:46:34 +0000 Subject: [PATCH] Accepting request 1175607 from home:AndreasStieger:branches:devel:libraries:c_c++ neon 0.33.0, breaks davfs2, see SR#1175564 OBS-URL: https://build.opensuse.org/request/show/1175607 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/neon?expand=0&rev=71 --- fix_timeout_tests_for_ppc64le.patch | 11 ------ neon-0.28.4-bloat.patch | 6 ++-- neon-0.32.5.tar.gz | 3 -- neon-0.33.0.tar.gz | 3 ++ neon.changes | 14 ++++++++ neon.spec | 55 +++++++++++++---------------- replace_manpage_with_links.sh | 18 ---------- 7 files changed, 44 insertions(+), 66 deletions(-) delete mode 100644 fix_timeout_tests_for_ppc64le.patch delete mode 100644 neon-0.32.5.tar.gz create mode 100644 neon-0.33.0.tar.gz delete mode 100644 replace_manpage_with_links.sh diff --git a/fix_timeout_tests_for_ppc64le.patch b/fix_timeout_tests_for_ppc64le.patch deleted file mode 100644 index 29a8f46..0000000 --- a/fix_timeout_tests_for_ppc64le.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- test/socket.c.orig 2018-03-19 14:39:27.095824143 +0100 -+++ test/socket.c 2018-03-19 15:14:52.733528116 +0100 -@@ -835,7 +835,7 @@ - { - to_finish = time(NULL); - reap_server(); /* hopefully it's hung. */ -- ONN("timeout ignored, or very slow machine", to_finish - to_start > 3); -+ ONN("timeout ignored, or very slow machine", to_finish - to_start > 10); - ONN("close failed", ne_sock_close(sock)); - return OK; - } diff --git a/neon-0.28.4-bloat.patch b/neon-0.28.4-bloat.patch index 0a532a3..b0e7ad7 100644 --- a/neon-0.28.4-bloat.patch +++ b/neon-0.28.4-bloat.patch @@ -1,7 +1,7 @@ -Index: neon-config.in +Index: neon-0.33.0/neon-config.in =================================================================== ---- neon-config.in.orig -+++ neon-config.in +--- neon-0.33.0.orig/neon-config.in ++++ neon-0.33.0/neon-config.in @@ -73,7 +73,7 @@ while test $# -gt 0; do ;; diff --git a/neon-0.32.5.tar.gz b/neon-0.32.5.tar.gz deleted file mode 100644 index bfa5333..0000000 --- a/neon-0.32.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4872e12f802572dedd4b02f870065814b2d5141f7dbdaf708eedab826b51a58a -size 896177 diff --git a/neon-0.33.0.tar.gz b/neon-0.33.0.tar.gz new file mode 100644 index 0000000..957552f --- /dev/null +++ b/neon-0.33.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8 +size 912146 diff --git a/neon.changes b/neon.changes index 3ae8673..4d8d45f 100644 --- a/neon.changes +++ b/neon.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri May 17 16:53:16 UTC 2024 - Andreas Stieger + +- update to 0.33.0: + * Interface clarifications + * added DAV:lockroot support per RFC 4918 + * Improved handling of interim (1xx) responses, headers in + interim responses are now accessible + * TLS name verification updated to match RFC 9110/6125, added + strict handling of IP literals vs DNS names + * bug fixes +- drop fix_timeout_tests_for_ppc64le.patch +- replace replace_manpage_with_links.sh with fdupes + ------------------------------------------------------------------- Thu Feb 22 13:58:54 UTC 2024 - Dominique Leuenberger diff --git a/neon.spec b/neon.spec index 13a10e2..090f3ee 100644 --- a/neon.spec +++ b/neon.spec @@ -2,6 +2,7 @@ # spec file for package neon # # Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 Andreas Stieger # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,8 +17,9 @@ # +%define sover 27 Name: neon -Version: 0.32.5 +Version: 0.33.0 Release: 0 Summary: An HTTP and WebDAV Client Library License: GPL-2.0-or-later @@ -25,40 +27,35 @@ Group: Development/Libraries/Other URL: https://notroj.github.io/neon/ Source0: https://notroj.github.io/neon/neon-%{version}.tar.gz Source3: baselibs.conf -Source10: replace_manpage_with_links.sh -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches Patch0: neon-0.28.4-bloat.patch -Patch1: fix_timeout_tests_for_ppc64le.patch -BuildRequires: krb5-devel -BuildRequires: libexpat-devel -BuildRequires: libproxy-devel -BuildRequires: libtool +BuildRequires: fdupes BuildRequires: openssl BuildRequires: pkgconfig BuildRequires: xmlto -BuildRequires: zlib-devel +BuildRequires: pkgconfig(expat) +BuildRequires: pkgconfig(krb5-gssapi) +BuildRequires: pkgconfig(libproxy-1.0) BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(zlib) %description neon is an HTTP and WebDAV client library with a C interface. -%package -n libneon27 +%package -n libneon%{sover} Summary: An HTTP and WebDAV Client Library # Drop the main package. It avoids the lib from being installed in different versions # and generally only contained coders doc anyhow. Group: Development/Libraries/Other Provides: neon = %{version} Obsoletes: neon < %{version} -# -%description -n libneon27 +%description -n libneon%{sover} neon is an HTTP and WebDAV client library with a C interface. %package -n libneon-devel Summary: An HTTP and WebDAV Client Library Group: Development/Libraries/Other -Requires: glibc-devel -Requires: libneon27 = %{version} +Requires: libneon%{sover} = %{version} # renamed after openSUSE 10.3 Provides: neon-devel = %{version} Obsoletes: neon-devel < %{version} @@ -67,15 +64,9 @@ Obsoletes: neon-devel < %{version} neon is an HTTP and WebDAV client library with a C interface. %prep -%setup -q -%patch -P 0 -%ifarch ppc64le ppc64 -%patch -P 1 -%endif +%autosetup -p1 %build -rm -f aclocal.m4 ltmain.sh -sh autogen.sh %configure \ --with-ssl \ --enable-threadsafe-ssl=posix \ @@ -88,28 +79,30 @@ sh autogen.sh %make_build %install -make DESTDIR=%{buildroot} docdir=%{_defaultdocdir}/%{name} install install-man install-html %{?_smp_mflags} +%make_install \ + docdir=%{_defaultdocdir}/%{name} \ + %{nil} find %{buildroot} -type f -name "*.la" -delete -print -find %{buildroot}%{_mandir} -type f -exec bash %{SOURCE10} {} \; +%fdupes -s %{buildroot}/%{_mandir} %check export TEST_QUIET=0 %make_build check -%post -n libneon27 -p /sbin/ldconfig -%postun -n libneon27 -p /sbin/ldconfig +%ldconfig_scriptlets -n libneon%{sover} -%files -n libneon27 -%doc AUTHORS BUGS ChangeLog NEWS THANKS TODO -%{_libdir}/*.so.27* +%files -n libneon%{sover} %license src/COPYING.LIB +%doc AUTHORS BUGS NEWS THANKS TODO +%{_libdir}/*.so.%{sover} +%{_libdir}/*.so.%{sover}.* %files -n libneon-devel +%license src/COPYING.LIB %doc %{_defaultdocdir}/%{name} %{_bindir}/neon-config -%dir %{_includedir}/neon -%{_includedir}/neon/*.h -%{_mandir}/*/* +%{_includedir}/neon +%{_mandir}/man*/*%{?ext_man} %{_libdir}/*.so %{_libdir}/pkgconfig/neon.pc diff --git a/replace_manpage_with_links.sh b/replace_manpage_with_links.sh deleted file mode 100644 index 3d496cb..0000000 --- a/replace_manpage_with_links.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# Is this just a linked manpage? -echo "Processing $1" -grep '^\.so man\([0-7]\?\)/.*\1$' "$1" || exit 0 - -# extract target name -TARGET=`sed -e 's/^\.so man\([0-7]\?\)\///' "$1"` -MANDIR=`dirname "$1"` - -# verify that target exists -[ -e "$MANDIR"/"$TARGET" ] || exit 1 - -# replace manpage reload with symlink -echo " -> $TARGET" -rm "$1" -ln -s $TARGET "$1" -