|
@@ -1,13 +1,9 @@
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
|
|
|
-%if %{?_dist_release} != "vl6"
|
|
|
|
-%global with_http2 1
|
|
|
|
-%endif
|
|
|
|
-
|
|
|
|
Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
|
|
Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
|
|
Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
|
|
Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
|
|
Name: curl
|
|
Name: curl
|
|
-Version: 7.75.0
|
|
+Version: 7.76.0
|
|
Release: 1%{?_dist_release}
|
|
Release: 1%{?_dist_release}
|
|
Group: internet
|
|
Group: internet
|
|
Vendor: Project Vine
|
|
Vendor: Project Vine
|
|
@@ -18,38 +14,28 @@ License: MIT
|
|
URL: https://curl.haxx.se/
|
|
URL: https://curl.haxx.se/
|
|
Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
|
|
Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
|
|
|
|
|
|
-# avoid reporting spurious error in the HTTP2 framing layer (#1690971)
|
|
|
|
-Patch2: 0002-curl-7.65.3-h2-framing-layer-error.patch
|
|
|
|
-
|
|
|
|
# patch making libcurl multilib ready
|
|
# patch making libcurl multilib ready
|
|
Patch101: 0101-curl-7.73.0-multilib.patch
|
|
Patch101: 0101-curl-7.73.0-multilib.patch
|
|
|
|
|
|
# prevent configure script from discarding -g in CFLAGS (#496778)
|
|
# prevent configure script from discarding -g in CFLAGS (#496778)
|
|
Patch102: 0102-curl-7.36.0-debug.patch
|
|
Patch102: 0102-curl-7.36.0-debug.patch
|
|
|
|
|
|
-# migrate tests/http_pipe.py to Python 3
|
|
|
|
-Patch103: 0103-curl-7.59.0-python3.patch
|
|
|
|
-
|
|
|
|
-# use localhost6 instead of ip6-localhost in the curl test-suite
|
|
|
|
-Patch104: 0104-curl-7.73.0-localhost6.patch
|
|
|
|
-
|
|
|
|
# prevent valgrind from reporting false positives on x86_64
|
|
# prevent valgrind from reporting false positives on x86_64
|
|
Patch105: 0105-curl-7.63.0-lib1560-valgrind.patch
|
|
Patch105: 0105-curl-7.63.0-lib1560-valgrind.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
-BuildRequires: openssl-devel
|
|
+BuildRequires: brotli-devel
|
|
BuildRequires: gnutls-devel
|
|
BuildRequires: gnutls-devel
|
|
-BuildRequires: libidn-devel zlib-devel
|
|
+BuildRequires: libidn2-devel
|
|
|
|
+BuildRequires: libnghttp2-devel
|
|
|
|
+BuildRequires: libpsl-devel
|
|
|
|
+BuildRequires: libssh2-devel
|
|
BuildRequires: openldap-devel
|
|
BuildRequires: openldap-devel
|
|
BuildRequires: openssh-server
|
|
BuildRequires: openssh-server
|
|
BuildRequires: openssh-clients
|
|
BuildRequires: openssh-clients
|
|
|
|
+BuildRequires: openssl-devel
|
|
BuildRequires: pkgconfig
|
|
BuildRequires: pkgconfig
|
|
-%if "%{?_dist_release}" != "vl6"
|
|
+BuildRequires: zlib-devel
|
|
-BuildRequires: libssh2-devel
|
|
|
|
-%endif
|
|
|
|
-%if 0%{?with_http2}
|
|
|
|
-BuildRequires: libnghttp2-devel
|
|
|
|
-%endif
|
|
|
|
|
|
|
|
Requires: ca-certificates
|
|
Requires: ca-certificates
|
|
|
|
|
|
@@ -79,7 +65,7 @@ use cURL's capabilities internally.
|
|
%package -n compat32-%{name}
|
|
%package -n compat32-%{name}
|
|
Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
|
|
Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
|
|
Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
|
|
Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
|
|
-Group: system
|
|
+Group: system,legacy
|
|
|
|
|
|
%description -n compat32-%{name}
|
|
%description -n compat32-%{name}
|
|
cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
|
|
cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
|
|
@@ -91,7 +77,7 @@ authentication, FTP upload, HTTP post, and file transfer resume.
|
|
|
|
|
|
%package -n compat32-%{name}-devel
|
|
%package -n compat32-%{name}-devel
|
|
Summary: Files needed for building applications with libcurl.
|
|
Summary: Files needed for building applications with libcurl.
|
|
-Group: programming
|
|
+Group: programming,legacy
|
|
|
|
|
|
%description -n compat32-%{name}-devel
|
|
%description -n compat32-%{name}-devel
|
|
cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
|
|
cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and
|
|
@@ -106,22 +92,7 @@ use cURL's capabilities internally.
|
|
|
|
|
|
%prep
|
|
%prep
|
|
%setup -q
|
|
%setup -q
|
|
-
|
|
+%autopatch -p1
|
|
-# upstream patches
|
|
|
|
-
|
|
|
|
-# Fedora patches
|
|
|
|
-%patch101 -p1
|
|
|
|
-%patch102 -p1
|
|
|
|
-#patch103 -p1
|
|
|
|
-%patch104 -p1
|
|
|
|
-%patch105 -p1
|
|
|
|
-
|
|
|
|
-# make tests/*.py use Python 3
|
|
|
|
-sed -e '1 s|^#!/.*python|&3|' -i tests/*.py
|
|
|
|
-
|
|
|
|
-# regenerate Makefile.in files
|
|
|
|
-aclocal -I m4
|
|
|
|
-automake
|
|
|
|
|
|
|
|
# disable test 1112 (#565305), test 1455 (occasionally fails with 'bind failed
|
|
# disable test 1112 (#565305), test 1455 (occasionally fails with 'bind failed
|
|
# with errno 98: Address already in use' in Koji environment), and test 1801
|
|
# with errno 98: Address already in use' in Koji environment), and test 1801
|
|
@@ -143,23 +114,34 @@ echo "582" >> tests/data/DISABLED
|
|
# adapt test 323 for updated OpenSSL
|
|
# adapt test 323 for updated OpenSSL
|
|
sed -e 's/^35$/35,52/' -i tests/data/test323
|
|
sed -e 's/^35$/35,52/' -i tests/data/test323
|
|
|
|
|
|
|
|
+# use localhost6 instead of ip6-localhost in the curl test-suite
|
|
|
|
+(
|
|
|
|
+ # avoid glob expansion in the trace output of `bash -x`
|
|
|
|
+ { set +x; } 2>/dev/null
|
|
|
|
+ cmd="sed -e 's|ip6-localhost|localhost6|' -i tests/data/test[0-9]*"
|
|
|
|
+ printf "+ %s\n" "$cmd" >&2
|
|
|
|
+ eval "$cmd"
|
|
|
|
+)
|
|
|
|
+
|
|
|
|
+# regenerate the configure script and Makefile.in files
|
|
|
|
+autoreconf -fiv
|
|
|
|
+
|
|
|
|
|
|
%build
|
|
%build
|
|
%configure \
|
|
%configure \
|
|
- --with-ssl=%{_prefix} \
|
|
+ --disable-static \
|
|
- --with-libidn \
|
|
+ --enable-hidden-symbols \
|
|
--enable-ipv6 \
|
|
--enable-ipv6 \
|
|
|
|
+ --enable-ldap \
|
|
|
|
+ --enable-ldaps \
|
|
--enable-threaded-resolver \
|
|
--enable-threaded-resolver \
|
|
- --with-ssl --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
|
|
+ --with-brotli \
|
|
-%if "%{?_dist_release}" != "vl6"
|
|
+ --with-libidn2 \
|
|
|
|
+ --with-libpsl \
|
|
--with-libssh2 \
|
|
--with-libssh2 \
|
|
-%endif
|
|
|
|
-%if 0%{?with_http2}
|
|
|
|
--with-nghttp2 \
|
|
--with-nghttp2 \
|
|
-%endif
|
|
+ --with-ssl --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
|
|
- --enable-ldaps \
|
|
+ %{nil}
|
|
- --disable-static \
|
|
|
|
- --enable-hidden-symbols
|
|
|
|
|
|
|
|
make %{?_smp_mflags}
|
|
make %{?_smp_mflags}
|
|
|
|
|
|
@@ -174,9 +156,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.{a,la}
|
|
%clean
|
|
%clean
|
|
rm -rf $RPM_BUILD_ROOT
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
-%post -p /sbin/ldconfig
|
|
|
|
-%postun -p /sbin/ldconfig
|
|
|
|
-
|
|
|
|
|
|
|
|
%files
|
|
%files
|
|
%defattr(-,root,root)
|
|
%defattr(-,root,root)
|
|
@@ -201,7 +180,6 @@ rm -rf $RPM_BUILD_ROOT
|
|
%{_mandir}/man3/*
|
|
%{_mandir}/man3/*
|
|
%{_datadir}/aclocal/libcurl.m4
|
|
%{_datadir}/aclocal/libcurl.m4
|
|
|
|
|
|
-
|
|
|
|
## to build compat32 for x86_64 architecture support
|
|
## to build compat32 for x86_64 architecture support
|
|
%if %{build_compat32}
|
|
%if %{build_compat32}
|
|
%files -n compat32-%{name}
|
|
%files -n compat32-%{name}
|
|
@@ -215,6 +193,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Wed Apr 07 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.76.0-1
|
|
|
|
+- new upstream release.
|
|
|
|
+- dropped ldconfig scriptlets.
|
|
|
|
+- dropped Patch2, 102-104.
|
|
|
|
+
|
|
* Sat Feb 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.75.0-1
|
|
* Sat Feb 20 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.75.0-1
|
|
- new upstream release.
|
|
- new upstream release.
|
|
|
|
|
|
@@ -241,7 +224,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
* Thu Aug 29 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.65.3-1
|
|
* Thu Aug 29 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.65.3-1
|
|
- new upstream release.
|
|
- new upstream release.
|
|
- updated patches.
|
|
- updated patches.
|
|
-- imported Patch1, 2 and 105 from rawhide.
|
|
+- imported Patch1, 103 and 105 from rawhide.
|
|
|
|
|
|
* Sat Nov 03 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.62.0-1
|
|
* Sat Nov 03 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.62.0-1
|
|
- new upstream release.
|
|
- new upstream release.
|