rpms/curl/devel curl-7.19.3-nss-fix.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 curl-7.17.1-badsocket.patch, 1.1, 1.2 curl.spec, 1.84, 1.85 sources, 1.31, 1.32 curl-7.18.2-nss-init.patch, 1.1, NONE curl-7.18.2-nssproxy.patch, 1.1, NONE

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26698

Modified Files:
	.cvsignore curl-7.17.1-badsocket.patch curl.spec sources 
Added Files:
	curl-7.19.3-nss-fix.patch 
Removed Files:
	curl-7.18.2-nss-init.patch curl-7.18.2-nssproxy.patch 
Log Message:
update to 7.19.3, patch fixing 7.19.3 curl/nss bugs

curl-7.19.3-nss-fix.patch:

--- NEW FILE curl-7.19.3-nss-fix.patch ---
diff -ruNp curl-7.19.3.orig/lib/nss.c curl-7.19.3/lib/nss.c
--- curl-7.19.3.orig/lib/nss.c	2009-01-07 15:12:01.000000000 +0100
+++ curl-7.19.3/lib/nss.c	2009-02-16 11:39:41.912075708 +0100
@@ -1140,7 +1140,7 @@ CURLcode Curl_nss_connect(struct connect
       n = strrchr(data->set.str[STRING_CERT], '/');
       if(n) {
         n++; /* skip last slash */
-        nickname = aprintf(nickname, "PEM Token #%d:%s", 1, n);
+        nickname = aprintf("PEM Token #%d:%s", 1, n);
         if(!nickname)
           return CURLE_OUT_OF_MEMORY;
 
@@ -1171,7 +1171,8 @@ CURLcode Curl_nss_connect(struct connect
 
     if(SSL_GetClientAuthDataHook(model,
                                  (SSLGetClientAuthData) SelectClientCert,
-                                 (void *)connssl) != SECSuccess) {
+                                 (void *)connssl->client_nickname) !=
+       SECSuccess) {
       curlerr = CURLE_SSL_CERTPROBLEM;
       goto error;
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	4 Jun 2008 17:30:58 -0000	1.31
+++ .cvsignore	17 Feb 2009 11:31:20 -0000	1.32
@@ -1 +1,2 @@
 curl-7.18.2.tar.bz2
+curl-7.19.3.tar.bz2

curl-7.17.1-badsocket.patch:

Index: curl-7.17.1-badsocket.patch
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl-7.17.1-badsocket.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- curl-7.17.1-badsocket.patch	8 Jan 2008 14:18:28 -0000	1.1
+++ curl-7.17.1-badsocket.patch	17 Feb 2009 11:31:20 -0000	1.2
@@ -1,13 +1,13 @@
-diff -up curl-7.17.1/lib/ftp.c.badsocket curl-7.17.1/lib/ftp.c
---- curl-7.17.1/lib/ftp.c.badsocket	2007-10-27 00:25:19.000000000 +0200
-+++ curl-7.17.1/lib/ftp.c	2008-01-08 15:09:03.000000000 +0100
-@@ -3228,7 +3228,8 @@ static CURLcode Curl_ftp_done(struct con
-     /* Note that we keep "use" set to TRUE since that (next) connection is
-        still requested to use SSL */
-   }
--  sclose(conn->sock[SECONDARYSOCKET]);
-+  if(CURL_SOCKET_BAD != conn->sock[SECONDARYSOCKET])
-+    sclose(conn->sock[SECONDARYSOCKET]);
- 
-   conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD;
+diff -ruNp curl-7.19.3.orig/lib/ftp.c curl-7.19.3/lib/ftp.c
+--- curl-7.19.3.orig/lib/ftp.c	2009-02-11 10:57:33.334280000 +0100
++++ curl-7.19.3/lib/ftp.c	2009-02-11 10:59:43.957585266 +0100
+@@ -3222,7 +3222,8 @@ static CURLcode ftp_done(struct connectd
+       /* Note that we keep "use" set to TRUE since that (next) connection is
+          still requested to use SSL */
+     }
+-    sclose(conn->sock[SECONDARYSOCKET]);
++    if(CURL_SOCKET_BAD != conn->sock[SECONDARYSOCKET])
++      sclose(conn->sock[SECONDARYSOCKET]);
  
+     conn->sock[SECONDARYSOCKET] = CURL_SOCKET_BAD;
+   }


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- curl.spec	15 Dec 2008 13:22:55 -0000	1.84
+++ curl.spec	17 Feb 2009 11:31:20 -0000	1.85
@@ -1,15 +1,14 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
-Version: 7.18.2
-Release: 9%{?dist}
+Version: 7.19.3
+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.17.1-badsocket.patch
-Patch4: curl-7.18.2-nssproxy.patch
-Patch5: curl-7.18.2-nss-init.patch
+Patch4: curl-7.19.3-nss-fix.patch
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,8 +49,7 @@
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .privlibs
 %patch3 -p1 -b .badsocket
-%patch4 -p1 -b .nssproxy
-%patch5 -p1 -b .nssinit
+%patch4 -p1 -b .nssfix
 
 # Convert docs to UTF-8
 for f in CHANGES README; do
@@ -120,6 +118,10 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Tue Feb 17 2009 Kamil Dudka <kdudka at redhat.com> 7.19.3-1
+- update to 7.19.3, dropped applied nss patches
+- add patch fixing 7.19.3 curl/nss bugs
+
 * Mon Dec 15 2008 Jindrich Novy <jnovy at redhat.com> 7.18.2-9
 - rebuild for f10/rawhide cvs tag clashes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	4 Jun 2008 17:30:58 -0000	1.31
+++ sources	17 Feb 2009 11:31:20 -0000	1.32
@@ -1 +1 @@
-c389be5b0525276e58865956b7465562  curl-7.18.2.tar.bz2
+10eb8c13350c735eff20d7b4530be8cd  curl-7.19.3.tar.bz2


--- curl-7.18.2-nss-init.patch DELETED ---


--- curl-7.18.2-nssproxy.patch DELETED ---