Accepting request 775228 from devel:libraries:c_c++
OBS-URL: https://build.opensuse.org/request/show/775228 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/curl?expand=0&rev=153
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
23e53a8a36
3974
curl-mini.changes
3974
curl-mini.changes
File diff suppressed because it is too large
Load Diff
232
curl-mini.spec
232
curl-mini.spec
@ -1,232 +0,0 @@
|
||||
#
|
||||
# spec file for package curl-mini
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
##### WARNING: please do not edit this auto generated spec file. Use the curl.spec! #####
|
||||
%define bootstrap 1
|
||||
##### WARNING: please do not edit this auto generated spec file. Use the curl.spec! #####
|
||||
%define mini -mini
|
||||
%if 0%{?bootstrap}
|
||||
%bcond_with testsuite
|
||||
%else
|
||||
%bcond_without testsuite
|
||||
%endif
|
||||
%bcond_with mozilla_nss
|
||||
# need ssl always for python-pycurl
|
||||
%bcond_without openssl
|
||||
Name: curl-mini
|
||||
Version: 7.68.0
|
||||
Release: 0
|
||||
Summary: A Tool for Transferring Data from URLs
|
||||
License: curl
|
||||
URL: https://curl.haxx.se/
|
||||
Source: https://curl.haxx.se/download/curl-%{version}.tar.xz
|
||||
Source2: https://curl.haxx.se/download/curl-%{version}.tar.xz.asc
|
||||
Source3: baselibs.conf
|
||||
Source4: https://daniel.haxx.se/mykey.asc#/curl.keyring
|
||||
Patch0: libcurl-ocloexec.patch
|
||||
Patch1: dont-mess-with-rpmoptflags.diff
|
||||
Patch2: curl-secure-getenv.patch
|
||||
Patch3: ignore_runtests_failure.patch
|
||||
# PATCH-FIX-OPENSUSE bsc#1076446 protocol redirection not supported or disabled
|
||||
Patch4: curl-disabled-redirect-protocol-message.patch
|
||||
Patch5: curl-use_OPENSSL_config.patch
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
Requires: libcurl4%{?mini} = %{version}
|
||||
%if !0%{?bootstrap}
|
||||
BuildRequires: groff
|
||||
BuildRequires: lzma
|
||||
BuildRequires: openldap2-devel
|
||||
BuildRequires: pkgconfig(krb5)
|
||||
BuildRequires: pkgconfig(libidn2)
|
||||
BuildRequires: pkgconfig(libmetalink)
|
||||
BuildRequires: pkgconfig(libnghttp2)
|
||||
BuildRequires: pkgconfig(libpsl)
|
||||
BuildRequires: pkgconfig(libssh)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
# avoid our own libcurl4 pulled in by cmake
|
||||
#!BuildRequires: libcurl4-mini
|
||||
%else
|
||||
Requires: this-is-only-for-build-envs
|
||||
Conflicts: curl
|
||||
# The -mini package is sufficient for the build hosts
|
||||
Provides: curl = %{version}
|
||||
%endif
|
||||
%if %{with openssl}
|
||||
BuildRequires: pkgconfig(libssl)
|
||||
%endif
|
||||
%if %{with mozilla_nss}
|
||||
BuildRequires: mozilla-nss-devel
|
||||
%endif
|
||||
#BuildRequires: openssh
|
||||
%if 0%{?_with_stunnel:1}
|
||||
# used by the testsuite
|
||||
BuildRequires: stunnel
|
||||
%endif
|
||||
|
||||
%description
|
||||
Curl is a client to get documents and files from or send documents to a
|
||||
server using any of the supported protocols (HTTP, HTTPS, FTP, FTPS,
|
||||
TFTP, DICT, TELNET, LDAP, or FILE). The command is designed to work
|
||||
without user interaction or any kind of interactivity.
|
||||
|
||||
%package -n libcurl4%{?mini}
|
||||
Summary: Library for transferring data from URLs
|
||||
%if 0%{?bootstrap}
|
||||
Requires: this-is-only-for-build-envs
|
||||
Conflicts: libcurl4
|
||||
Provides: libcurl4 = %{version}
|
||||
%endif
|
||||
|
||||
%description -n libcurl4%{?mini}
|
||||
The cURL shared library for accessing data using different
|
||||
network protocols.
|
||||
|
||||
%package -n libcurl%{?mini}-devel
|
||||
Summary: Development files for the curl library
|
||||
Requires: glibc-devel
|
||||
Requires: libcurl4%{?mini} = %{version}
|
||||
# curl-devel (v 7.15.5) was last used in 10.2
|
||||
Provides: curl-devel <= 7.15.5
|
||||
Obsoletes: curl-devel < 7.16.2
|
||||
%if 0%{?bootstrap}
|
||||
Requires: this-is-only-for-build-envs
|
||||
Conflicts: libcurl-devel
|
||||
Provides: libcurl-devel = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%description -n libcurl%{?mini}-devel
|
||||
Curl is a client to get documents and files from or send documents to a
|
||||
server using any of the supported protocols (HTTP, HTTPS, FTP, GOPHER,
|
||||
DICT, TELNET, LDAP, or FILE). The command is designed to work without
|
||||
user interaction or any kind of interactivity.
|
||||
|
||||
%prep
|
||||
%setup -q -n curl-%{version}
|
||||
%patch0 -p1
|
||||
%patch1
|
||||
%patch2
|
||||
%ifarch ppc ppc64 ppc64le
|
||||
%patch3 -p1
|
||||
%endif
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
# disable new failing test 1165
|
||||
echo "1165" >> tests/data/DISABLED
|
||||
|
||||
%build
|
||||
# curl complains if macro definition is contained in CFLAGS
|
||||
# see m4/xc-val-flgs.m4
|
||||
CPPFLAGS="-D_FORTIFY_SOURCE=2"
|
||||
CFLAGS=$(echo "%{optflags}" | sed -e 's/-D_FORTIFY_SOURCE=2//')
|
||||
export CPPFLAGS CFLAGS
|
||||
export CFLAGS="$CFLAGS -fPIE"
|
||||
export LDFLAGS="$LDFLAGS -pie"
|
||||
autoreconf -fiv
|
||||
# local hack to make curl-config --libs stop printing libraries it depends on
|
||||
# (currently, libtool sets link_all_deplibs=(yes|unknown) everywhere,
|
||||
# will hopefully change in the future)
|
||||
sed -i 's/\(link_all_deplibs=\)unknown/\1no/' configure
|
||||
%configure \
|
||||
--enable-ipv6 \
|
||||
%if %{with openssl}
|
||||
--with-ssl \
|
||||
--with-ca-fallback \
|
||||
--without-ca-path \
|
||||
--without-ca-bundle \
|
||||
%else
|
||||
--without-ssl \
|
||||
%if %{with mozilla_nss}
|
||||
--with-nss \
|
||||
%endif
|
||||
%endif
|
||||
%if !0%{?bootstrap}
|
||||
--with-gssapi=%{_libexecdir}/mit \
|
||||
--with-libidn2 \
|
||||
--with-libssh \
|
||||
--with-libmetalink \
|
||||
%endif
|
||||
--enable-hidden-symbols \
|
||||
--disable-static \
|
||||
--enable-threaded-resolver
|
||||
|
||||
# if this fails, the above sed hack did not work
|
||||
./libtool --config | grep -q link_all_deplibs=no
|
||||
# enable-hidden-symbols needs gcc4 and causes that curl exports only its API
|
||||
make %{?_smp_mflags} V=1
|
||||
|
||||
%if %{with testsuite}
|
||||
%check
|
||||
pushd tests
|
||||
make %{?_smp_mflags}
|
||||
# make sure the testsuite runs don't race on MP machines in autobuild
|
||||
if test -z "$BUILD_INCARNATION" -a -r /.buildenv; then
|
||||
. /.buildenv
|
||||
fi
|
||||
if test -z "$BUILD_INCARNATION"; then
|
||||
BUILD_INCARNATION=0
|
||||
fi
|
||||
|
||||
base=$((8990 + $BUILD_INCARNATION * 20))
|
||||
# bug940009 do not run flaky tests for any architecture
|
||||
# at least test 1510 do fail for i586 and ppc64le
|
||||
perl ./runtests.pl -a -b$base '!flaky' || exit
|
||||
|
||||
popd
|
||||
%endif
|
||||
|
||||
%install
|
||||
%make_install
|
||||
rm -f %{buildroot}%{_libdir}/libcurl.la
|
||||
install -Dm 0644 docs/libcurl/libcurl.m4 %{buildroot}%{_datadir}/aclocal/libcurl.m4
|
||||
pushd scripts
|
||||
%make_install
|
||||
popd
|
||||
|
||||
%post -n libcurl4%{?mini} -p /sbin/ldconfig
|
||||
%postun -n libcurl4%{?mini} -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%doc README RELEASE-NOTES
|
||||
%doc docs/{BUGS,FAQ,FEATURES,RESOURCES,TODO,TheArtOfHttpScripting}
|
||||
%{_bindir}/curl
|
||||
%{_datadir}/zsh/site-functions/_curl
|
||||
%{_mandir}/man1/curl.1%{?ext_man}
|
||||
%dir %{_datadir}/zsh
|
||||
%dir %{_datadir}/zsh/site-functions
|
||||
%dir %{_datadir}/fish/
|
||||
%dir %{_datadir}/fish/vendor_completions.d/
|
||||
%{_datadir}/fish/vendor_completions.d/curl.fish
|
||||
|
||||
%files -n libcurl4%{?mini}
|
||||
%license COPYING
|
||||
%{_libdir}/libcurl.so.4*
|
||||
|
||||
%files -n libcurl%{?mini}-devel
|
||||
%{_bindir}/curl-config
|
||||
%{_includedir}/curl
|
||||
%dir %{_datadir}/aclocal/
|
||||
%{_datadir}/aclocal/libcurl.m4
|
||||
%{_libdir}/libcurl.so
|
||||
%{_libdir}/pkgconfig/libcurl.pc
|
||||
%{_mandir}/man1/curl-config.1%{?ext_man}
|
||||
%{_mandir}/man3/*
|
||||
%doc docs/libcurl/symbols-in-versions
|
||||
|
||||
%changelog
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 18 14:11:29 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Eliminate curl-mini: The reason for this to exist was that cmake
|
||||
pulled in curl into too many places, causing build cycles. A new
|
||||
cmake-mini was generated, eliminating that need.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 8 09:54:50 UTC 2020 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
|
||||
|
||||
@ -8,7 +15,7 @@ Wed Jan 8 09:54:50 UTC 2020 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com
|
||||
- curl: add --etag-compare and --etag-save
|
||||
- curl: add --parallel-immediate
|
||||
- multi: add curl_multi_wakeup()
|
||||
- openssl: CURLSSLOPT_NO_PARTIALCHAIN can disable partial cert chains
|
||||
- openssl: CURLSSLOPT_NO_PARTIALCHAIN can disable partial cert chains
|
||||
* Bugfixes:
|
||||
- CVE-2019-15601: file: on Windows, refuse paths that start with \\
|
||||
- Azure Pipelines: add several builds
|
||||
|
||||
47
curl.spec
47
curl.spec
@ -16,13 +16,7 @@
|
||||
#
|
||||
|
||||
|
||||
%define bootstrap 0
|
||||
%define mini %{nil}
|
||||
%if 0%{?bootstrap}
|
||||
%bcond_with testsuite
|
||||
%else
|
||||
%bcond_without testsuite
|
||||
%endif
|
||||
%bcond_with mozilla_nss
|
||||
# need ssl always for python-pycurl
|
||||
%bcond_without openssl
|
||||
@ -45,8 +39,7 @@ Patch4: curl-disabled-redirect-protocol-message.patch
|
||||
Patch5: curl-use_OPENSSL_config.patch
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
Requires: libcurl4%{?mini} = %{version}
|
||||
%if !0%{?bootstrap}
|
||||
Requires: libcurl4 = %{version}
|
||||
BuildRequires: groff
|
||||
BuildRequires: lzma
|
||||
BuildRequires: openldap2-devel
|
||||
@ -57,14 +50,6 @@ BuildRequires: pkgconfig(libnghttp2)
|
||||
BuildRequires: pkgconfig(libpsl)
|
||||
BuildRequires: pkgconfig(libssh)
|
||||
BuildRequires: pkgconfig(zlib)
|
||||
# avoid our own libcurl4 pulled in by cmake
|
||||
#!BuildRequires: libcurl4-mini
|
||||
%else
|
||||
Requires: this-is-only-for-build-envs
|
||||
Conflicts: curl
|
||||
# The -mini package is sufficient for the build hosts
|
||||
Provides: curl = %{version}
|
||||
%endif
|
||||
%if %{with openssl}
|
||||
BuildRequires: pkgconfig(libssl)
|
||||
%endif
|
||||
@ -83,32 +68,22 @@ server using any of the supported protocols (HTTP, HTTPS, FTP, FTPS,
|
||||
TFTP, DICT, TELNET, LDAP, or FILE). The command is designed to work
|
||||
without user interaction or any kind of interactivity.
|
||||
|
||||
%package -n libcurl4%{?mini}
|
||||
%package -n libcurl4
|
||||
Summary: Library for transferring data from URLs
|
||||
%if 0%{?bootstrap}
|
||||
Requires: this-is-only-for-build-envs
|
||||
Conflicts: libcurl4
|
||||
Provides: libcurl4 = %{version}
|
||||
%endif
|
||||
|
||||
%description -n libcurl4%{?mini}
|
||||
%description -n libcurl4
|
||||
The cURL shared library for accessing data using different
|
||||
network protocols.
|
||||
|
||||
%package -n libcurl%{?mini}-devel
|
||||
%package -n libcurl-devel
|
||||
Summary: Development files for the curl library
|
||||
Requires: glibc-devel
|
||||
Requires: libcurl4%{?mini} = %{version}
|
||||
Requires: libcurl4 = %{version}
|
||||
# curl-devel (v 7.15.5) was last used in 10.2
|
||||
Provides: curl-devel <= 7.15.5
|
||||
Obsoletes: curl-devel < 7.16.2
|
||||
%if 0%{?bootstrap}
|
||||
Requires: this-is-only-for-build-envs
|
||||
Conflicts: libcurl-devel
|
||||
Provides: libcurl-devel = %{version}-%{release}
|
||||
%endif
|
||||
|
||||
%description -n libcurl%{?mini}-devel
|
||||
%description -n libcurl-devel
|
||||
Curl is a client to get documents and files from or send documents to a
|
||||
server using any of the supported protocols (HTTP, HTTPS, FTP, GOPHER,
|
||||
DICT, TELNET, LDAP, or FILE). The command is designed to work without
|
||||
@ -154,12 +129,10 @@ sed -i 's/\(link_all_deplibs=\)unknown/\1no/' configure
|
||||
--with-nss \
|
||||
%endif
|
||||
%endif
|
||||
%if !0%{?bootstrap}
|
||||
--with-gssapi=%{_libexecdir}/mit \
|
||||
--with-libidn2 \
|
||||
--with-libssh \
|
||||
--with-libmetalink \
|
||||
%endif
|
||||
--enable-hidden-symbols \
|
||||
--disable-static \
|
||||
--enable-threaded-resolver
|
||||
@ -197,8 +170,8 @@ pushd scripts
|
||||
%make_install
|
||||
popd
|
||||
|
||||
%post -n libcurl4%{?mini} -p /sbin/ldconfig
|
||||
%postun -n libcurl4%{?mini} -p /sbin/ldconfig
|
||||
%post -n libcurl4 -p /sbin/ldconfig
|
||||
%postun -n libcurl4 -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%doc README RELEASE-NOTES
|
||||
@ -212,11 +185,11 @@ popd
|
||||
%dir %{_datadir}/fish/vendor_completions.d/
|
||||
%{_datadir}/fish/vendor_completions.d/curl.fish
|
||||
|
||||
%files -n libcurl4%{?mini}
|
||||
%files -n libcurl4
|
||||
%license COPYING
|
||||
%{_libdir}/libcurl.so.4*
|
||||
|
||||
%files -n libcurl%{?mini}-devel
|
||||
%files -n libcurl-devel
|
||||
%{_bindir}/curl-config
|
||||
%{_includedir}/curl
|
||||
%dir %{_datadir}/aclocal/
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# This script is based on libcdio_spec-prepare.sh (thanks to sbrabec@suse.cz)
|
||||
# create a -mini spec for systemd for bootstrapping
|
||||
|
||||
ORIG_SPEC=curl
|
||||
EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the ${ORIG_SPEC}.spec! #####\n"
|
||||
sed "s/^%define bootstrap .*$/${EDIT_WARNING}%define bootstrap 1/;
|
||||
s/^%define mini .*$/${EDIT_WARNING}%define mini -mini/;
|
||||
s/^Name:.*/&-mini/
|
||||
" < ${ORIG_SPEC}.spec > ${ORIG_SPEC}-mini.spec
|
||||
cp ${ORIG_SPEC}.changes ${ORIG_SPEC}-mini.changes
|
||||
#cp ${ORIG_SPEC}-rpmlintrc ${ORIG_SPEC}-mini-rpmlintrc
|
||||
|
||||
osc service localrun format_spec_file
|
||||
Loading…
Reference in New Issue
Block a user