- add support for the NSS PKCS#11 pem reader so the command-line is the
same for both OpenSSL and NSS by Rob Crittenden (rcritten@redhat.com) - switch to NSS again
This commit is contained in:
parent
c13f5712fe
commit
aa662ab645
23
curl.spec
23
curl.spec
@ -4,17 +4,18 @@
|
|||||||
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)
|
||||||
Name: curl
|
Name: curl
|
||||||
Version: 7.16.4
|
Version: 7.16.4
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
|
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
|
||||||
Patch1: curl-7.15.3-multilib.patch
|
Patch1: curl-7.15.3-multilib.patch
|
||||||
Patch2: curl-7.16.0-privlibs.patch
|
Patch2: curl-7.16.0-privlibs.patch
|
||||||
Patch3: curl-7.16.4-ftp.patch
|
Patch3: curl-7.16.4-ftp.patch
|
||||||
|
Patch4: curl-7.16.4-nsspem.patch
|
||||||
URL: http://curl.haxx.se/
|
URL: http://curl.haxx.se/
|
||||||
Requires: openssl
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: openssl-devel, libtool, pkgconfig, libidn-devel
|
BuildRequires: libtool, pkgconfig, libidn-devel
|
||||||
|
BuildRequires: nss-devel >= 3.11.7-7
|
||||||
|
|
||||||
%description
|
%description
|
||||||
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
|
||||||
@ -26,7 +27,7 @@ authentication, FTP upload, HTTP post, and file transfer resume.
|
|||||||
%package devel
|
%package devel
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Requires: openssl-devel, libidn-devel, pkgconfig, automake
|
Requires: libidn-devel, pkgconfig, automake
|
||||||
Summary: Files needed for building applications with libcurl
|
Summary: Files needed for building applications with libcurl
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
@ -40,13 +41,14 @@ use cURL's capabilities internally.
|
|||||||
%patch1 -p1 -b .multilib
|
%patch1 -p1 -b .multilib
|
||||||
%patch2 -p1 -b .privlibs
|
%patch2 -p1 -b .privlibs
|
||||||
%patch3 -p1 -b .ftp
|
%patch3 -p1 -b .ftp
|
||||||
|
%patch4 -p1 -b .nsspem
|
||||||
|
|
||||||
%build
|
%build
|
||||||
if pkg-config openssl ; then
|
if pkg-config nss ; then
|
||||||
CPPFLAGS=`pkg-config --cflags openssl`; export CPPFLAGS
|
CPPFLAGS=`pkg-config --cflags nss`; export CPPFLAGS
|
||||||
LDFLAGS=`pkg-config --libs openssl`; export LDFLAGS
|
LDFLAGS=`pkg-config --libs nss`; export LDFLAGS
|
||||||
fi
|
fi
|
||||||
%configure --with-ssl=%{_prefix} --enable-ipv6 \
|
%configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
|
||||||
--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
|
--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
|
||||||
--with-gssapi=%{_prefix}/kerberos --with-libidn \
|
--with-gssapi=%{_prefix}/kerberos --with-libidn \
|
||||||
--with-ldap-lib=libldap-%{ldap_version}.so.0 \
|
--with-ldap-lib=libldap-%{ldap_version}.so.0 \
|
||||||
@ -100,6 +102,11 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_datadir}/aclocal/libcurl.m4
|
%{_datadir}/aclocal/libcurl.m4
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 6 2007 Jindrich Novy <jnovy@redhat.com> 7.16.4-5
|
||||||
|
- add support for the NSS PKCS#11 pem reader so the command-line is the
|
||||||
|
same for both OpenSSL and NSS by Rob Crittenden (rcritten@redhat.com)
|
||||||
|
- switch to NSS again
|
||||||
|
|
||||||
* Mon Sep 3 2007 Jindrich Novy <jnovy@redhat.com> 7.16.4-4
|
* Mon Sep 3 2007 Jindrich Novy <jnovy@redhat.com> 7.16.4-4
|
||||||
- revert back to use OpenSSL (#266021)
|
- revert back to use OpenSSL (#266021)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user