rpms/curl/F-11 curl-7.19.7-modelfree.patch, NONE, 1.1 curl.spec, 1.98, 1.99 curl-7.19.6-verifyhost.patch, 1.1, NONE

[Kamil Dudka]

Author: kdudka

Update of /cvs/extras/rpms/curl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3152

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.7-modelfree.patch 
Removed Files:
	curl-7.19.6-verifyhost.patch 
Log Message:
- new upstream release, dropped applied patches
- fix crash on doubly closed NSPR descriptor, patch contributed
  by Kevin Baughman (#534176)

curl-7.19.7-modelfree.patch:
 nss.c |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE curl-7.19.7-modelfree.patch ---
diff --git a/lib/nss.c b/lib/nss.c
index ea904af..addc165 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -1222,6 +1222,7 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
   if(!connssl->handle)
     goto error;
   PR_Close(model); /* We don't need this any more */
+  model = NULL;
 
   /* This is the password associated with the cert that we're using */
   if (data->set.str[STRING_KEY_PASSWD]) {


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-11/curl.spec,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- curl.spec	14 Aug 2009 09:38:25 -0000	1.98
+++ curl.spec	12 Nov 2009 12:41:14 -0000	1.99
@@ -1,11 +1,11 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
-Version: 7.19.6
+Version: 7.19.7
 Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
-Patch1: curl-7.19.6-verifyhost.patch
+Patch1: curl-7.19.7-modelfree.patch
 Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
@@ -66,7 +66,7 @@ done
 %build
 autoconf
 export CPPFLAGS="$(pkg-config --cflags nss) -DHAVE_PK11_CREATEGENERICOBJECT"
-%configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
+%configure --without-ssl --with-nss --enable-ipv6 \
 	--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
 	--with-gssapi=%{_prefix}/kerberos --with-libidn \
 	--enable-ldaps --disable-static --with-libssh2
@@ -148,6 +148,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Thu Nov 12 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-1
+- new upstream release, dropped applied patches
+- fix crash on doubly closed NSPR descriptor, patch contributed
+  by Kevin Baughman (#534176)
+
 * Fri Aug 14 2009 Kamil Dudka <kdudka at redhat.com> 7.19.6-1
 - new upstream release, dropped applied patches
 - changed NSS code to not ignore the value of ssl.verifyhost and produce more


--- curl-7.19.6-verifyhost.patch DELETED ---