rpms/curl/devel curl-7.17.1-sslgen.patch, NONE, 1.1 .cvsignore, 1.27, 1.28 curl.spec, 1.63, 1.64 sources, 1.27, 1.28 curl-7.16.4-ftp.patch, 1.1, NONE
Jindrich Novy (jnovy)
fedora-extras-commits at redhat.com
Sat Nov 17 16:06:57 UTC 2007
- Previous message: rpms/yum-presto/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 yum-presto.spec, 1.5, 1.6
- Next message: rpms/wlassistant/F-7 wlassistant.pamd, 1.1, 1.2 wlassistant.spec, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jnovy
Update of /cvs/extras/rpms/curl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30988
Modified Files:
.cvsignore curl.spec sources
Added Files:
curl-7.17.1-sslgen.patch
Removed Files:
curl-7.16.4-ftp.patch
Log Message:
- update to curl 7.17.1
- include patch to enable SSL usage in NSS when a socket is opened
nonblocking, thanks to Rob Crittenden (rcritten at redhat.com)
curl-7.17.1-sslgen.patch:
--- NEW FILE curl-7.17.1-sslgen.patch ---
--- curl-7.17.1/lib/sslgen.c.orig 2007-11-16 22:48:48.000000000 -0500
+++ curl-7.17.1/lib/sslgen.c 2007-11-16 22:49:19.000000000 -0500
@@ -243,6 +243,7 @@
#else
#ifdef USE_NSS
*done = TRUE; /* fallback to BLOCKING */
+ conn->ssl[sockindex].use = TRUE;
return Curl_nss_connect(conn, sockindex);
#else
#ifdef USE_QSOSSL
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- .cvsignore 24 Oct 2007 14:15:06 -0000 1.27
+++ .cvsignore 17 Nov 2007 16:06:24 -0000 1.28
@@ -6,3 +6,4 @@
curl-7.16.3.tar.bz2
curl-7.16.4.tar.bz2
curl-7.17.0.tar.bz2
+curl-7.17.1.tar.bz2
Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- curl.spec 24 Oct 2007 22:02:12 -0000 1.63
+++ curl.spec 17 Nov 2007 16:06:24 -0000 1.64
@@ -3,16 +3,15 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl
-Version: 7.16.4
-Release: 10%{?dist}
+Version: 7.17.1
+Release: 1%{?dist}
License: MIT
Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
Patch1: curl-7.15.3-multilib.patch
Patch2: curl-7.16.0-privlibs.patch
-Patch3: curl-7.16.4-ftp.patch
-Patch4: curl-7.16.4-nsspem.patch
-Patch5: curl-7.16.4-curl-config.patch
+Patch3: curl-7.16.4-curl-config.patch
+Patch4: curl-7.17.1-sslgen.patch
Provides: webclient
URL: http://curl.haxx.se/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,9 +51,8 @@
%setup -q
%patch1 -p1 -b .multilib
%patch2 -p1 -b .privlibs
-%patch3 -p1 -b .ftp
-%patch4 -p1 -b .nsspem
-%patch5 -p1 -b .curl-config
+%patch3 -p1 -b .curl-config
+%patch4 -p1 -b .sslgen
%build
if pkg-config nss ; then
@@ -69,7 +67,7 @@
--disable-static
sed -i -e 's,-L/usr/lib ,,g;s,-L/usr/lib64 ,,g;s,-L/usr/lib$,,g;s,-L/usr/lib64$,,g' \
Makefile libcurl.pc
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+make CFLAGS="$RPM_OPT_FLAGS -DHAVE_PK11_CREATEGENERICOBJECT" %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ -116,6 +114,11 @@
%{_datadir}/aclocal/libcurl.m4
%changelog
+* Sat Nov 17 2007 Jindrich Novy <jnovy at redhat.com> 7.17.1-1
+- update to curl 7.17.1
+- include patch to enable SSL usage in NSS when a socket is opened
+ nonblocking, thanks to Rob Crittenden (rcritten at redhat.com)
+
* Wed Oct 24 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-10
- correctly provide/obsolete curl-devel (#130251)
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources 11 Jul 2007 07:47:08 -0000 1.27
+++ sources 17 Nov 2007 16:06:24 -0000 1.28
@@ -1 +1 @@
-ffa6d1f4e28ca493a43f9dc17882c4d8 curl-7.16.4.tar.bz2
+1fa635d1dfde8337c98c82749d75c1de curl-7.17.1.tar.bz2
--- curl-7.16.4-ftp.patch DELETED ---
- Previous message: rpms/yum-presto/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 yum-presto.spec, 1.5, 1.6
- Next message: rpms/wlassistant/F-7 wlassistant.pamd, 1.1, 1.2 wlassistant.spec, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list