Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

neon: update to 0.33.0 #11484

Open
wants to merge 5 commits into
base: 3.0-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- neon-0.27.0/neon-config.in.multilib
+++ neon-0.27.0/neon-config.in
--- neon-0.32.2/neon-config.in.multilib
+++ neon-0.32.2/neon-config.in
@@ -5,7 +5,11 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
Expand All @@ -22,7 +22,7 @@
i18n [@NE_FLAG_I18N@], ts_ssl [@NE_FLAG_TS_SSL@]

EOF
@@ -69,11 +73,10 @@
@@ -69,16 +73,11 @@
;;

--cflags)
Expand All @@ -32,10 +32,16 @@

--libs)
- LIBS="-lneon @NEON_LIBS@"
# Don't add standard library paths
if test "$prefix" != "/usr"; then
LIBS="-L${libdir} ${LIBS}"
@@ -93,7 +96,7 @@
- # Don't add standard library paths
- if test "$prefix" != "/usr"; then
- LIBS="-L${libdir} ${LIBS}"
- 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@ ;;
Expand All @@ -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.27.0/neon.pc.in
--- neon-0.32.2/neon.pc.in.multilib
+++ neon-0.32.2/neon.pc.in
@@ -2,6 +2,7 @@
exec_prefix=@exec_prefix@
libdir=@libdir@
Expand Down
2 changes: 1 addition & 1 deletion SPECS-EXTENDED/neon/neon.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"neon-0.31.2.tar.gz": "cf1ee3ac27a215814a9c80803fcee4f0ede8466ebead40267a9bd115e16a8678"
"neon-0.33.0.tar.gz": "659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8"
}
}
57 changes: 42 additions & 15 deletions SPECS-EXTENDED/neon/neon.spec
Original file line number Diff line number Diff line change
@@ -1,19 +1,40 @@
Vendor: Microsoft Corporation
Distribution: Azure Linux

%bcond_without tests

%bcond_with pkcs11

%bcond_with libproxy

# Disable automatic .la file removal
%global __brp_remove_la_files %nil

Summary: An HTTP and WebDAV client library
Name: neon
Version: 0.31.2
Release: 2%{?dist}
License: LGPLv2+
Version: 0.33.0
Release: 1%{?dist}
License: LGPL-2.0-or-later
URL: https://notroj.github.io/neon/
Source0: https://notroj.github.io/neon/neon-%{version}.tar.gz
Patch0: neon-0.27.0-multilib.patch
BuildRequires: gcc-c++
BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel, libproxy-devel
BuildRequires: pkgconfig, pakchois-devel
Requires: ca-certificates
Patch0: neon-0.32.2-multilib.patch
BuildRequires: expat-devel
BuildRequires: openssl-devel
BuildRequires: zlib-devel
BuildRequires: krb5-devel

BuildRequires: pkgconfig
BuildRequires: make
BuildRequires: gcc
BuildRequires: xmlto


%if %{with pkcs11}
BuildRequires: pakchois-devel
%endif
%if %{with libproxy}
BuildRequires: libproxy-devel
%endif
%if %{with tests}
# SSL tests require openssl binary, PKCS#11 testing need certutil
BuildRequires: /usr/bin/perl, /usr/bin/openssl, /usr/bin/certutil
Expand All @@ -31,29 +52,31 @@ Summary: Development libraries and C header files for the neon library
Requires: neon = %{version}-%{release}, openssl-devel, zlib-devel, expat-devel
Requires: pkgconfig
# Documentation is GPLv2+
License: LGPLv2+ and GPLv2+
License: LGPL-2.0-or-later AND GPL-2.0-or-later

%description devel
The development library for the C language HTTP and WebDAV client library.

%prep
%setup -q
%patch 0 -p1 -b .multilib
%autosetup -p1

# prevent installation of HTML docs
sed -ibak '/^install-docs/s/install-html//' Makefile.in
sed -i '/^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 \
%if %{with libproxy}
--with-libproxy
make %{?_smp_mflags}
%else
--without-libproxy
%endif
%make_build

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%make_install

sed -ri "/^dependency_libs/{s,-l[^ ']*,,g}" \
$RPM_BUILD_ROOT%{_libdir}/libneon.la
Expand Down Expand Up @@ -82,6 +105,10 @@ make %{?_smp_mflags} check
%{_libdir}/*.so

%changelog
* Tue Dec 17 2024 Durga Jagadeesh Palli <[email protected]> - 0.33.0-1
- Update to 0.33.0
- License verified

* Fri Oct 15 2021 Pawel Winogrodzki <[email protected]> - 0.31.2-2
- Initial CBL-Mariner import from Fedora 32 (license: MIT).

Expand Down
4 changes: 2 additions & 2 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -13862,8 +13862,8 @@
"type": "other",
"other": {
"name": "neon",
"version": "0.31.2",
"downloadUrl": "https://notroj.github.io/neon/neon-0.31.2.tar.gz"
"version": "0.33.0",
"downloadUrl": "https://notroj.github.io/neon/neon-0.33.0.tar.gz"
}
}
},
Expand Down