rpms/curl/F-8 curl-7.17.1-sslgen.patch, NONE, 1.1 curl.spec, 1.61, 1.62 sources, 1.27, 1.28 curl-7.16.4-ftp.patch, 1.1, NONE curl-7.16.4-nsspem.patch, 1.1, NONE

[Jindrich Novy (jnovy)]

Author: jnovy

Update of /cvs/extras/rpms/curl/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17305

Modified Files:
	curl.spec sources 
Added Files:
	curl-7.17.1-sslgen.patch 
Removed Files:
	curl-7.16.4-ftp.patch curl-7.16.4-nsspem.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) (#387991)


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: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-8/curl.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- curl.spec	11 Oct 2007 14:56:46 -0000	1.61
+++ curl.spec	18 Nov 2007 16:57:00 -0000	1.62
@@ -3,16 +3,15 @@
 
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
-Version: 7.16.4
-Release: 8%{?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)
@@ -42,9 +41,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
@@ -59,7 +57,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
@@ -105,6 +103,11 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Sun Nov 18 2007 Jindrich Novy <jnovy at redhat.com> 7.17.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) (#387991)
+
 * Thu Oct 11 2007 Jindrich Novy <jnovy at redhat.com> 7.16.4-8
 - list features correctly when curl is compiled against NSS (#316191)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/curl/F-8/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	18 Nov 2007 16:57:00 -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 ---


--- curl-7.16.4-nsspem.patch DELETED ---