rpms/curl/F-9 curl-7.18.2-nssproxy.patch, NONE, 1.1 .cvsignore, 1.30, 1.31 curl.spec, 1.75, 1.76 sources, 1.30, 1.31

[Jindrich Novy (jnovy)]

Author: jnovy

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

Modified Files:
	.cvsignore curl.spec sources 
Added Files:
	curl-7.18.2-nssproxy.patch 
Log Message:
* Wed Jun 18 2008 Jindrich Novy <jnovy at redhat.com> 7.18.2-2
- update to 7.18.2
- fix curl_multi_perform() over a proxy (#450140), thanks to
  Rob Crittenden
- spec cleanup, thanks to Paul Howarth (#225671)
  - drop BR: libtool
  - convert CHANGES and README to UTF-8
  - _GNU_SOURCE in CFLAGS is no more needed
  - remove bogus rpath


curl-7.18.2-nssproxy.patch:

--- NEW FILE curl-7.18.2-nssproxy.patch ---
diff -up curl-7.18.2/lib/nss.c.nssproxy curl-7.18.2/lib/nss.c
--- curl-7.18.2/lib/nss.c.nssproxy	2008-05-26 17:02:49.000000000 +0200
+++ curl-7.18.2/lib/nss.c	2008-06-18 07:59:52.000000000 +0200
@@ -804,6 +804,9 @@ CURLcode Curl_nss_connect(struct connect
 
   curlerr = CURLE_SSL_CONNECT_ERROR;
 
+  if (connssl->state == ssl_connection_complete)
+    return CURLE_OK;
+
   /* FIXME. NSS doesn't support multiple databases open at the same time. */
   if(!initialized) {
     initialized = 1;


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/curl/F-9/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- .cvsignore	31 Mar 2008 07:47:59 -0000	1.30
+++ .cvsignore	18 Jun 2008 06:16:34 -0000	1.31
@@ -1 +1 @@
-curl-7.18.1.tar.bz2
+curl-7.18.2.tar.bz2


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/F-9/curl.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- curl.spec	19 May 2008 18:20:03 -0000	1.75
+++ curl.spec	18 Jun 2008 06:16:34 -0000	1.76
@@ -1,17 +1,18 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
-Version: 7.18.1
-Release: 1%{?dist}.1
+Version: 7.18.2
+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
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libtool, pkgconfig, libidn-devel, zlib-devel
+BuildRequires: pkgconfig, libidn-devel, zlib-devel
 BuildRequires: nss-devel >= 3.11.7-7, openldap-devel, krb5-devel
 
 %description
@@ -48,15 +49,27 @@
 %patch1 -p1 -b .multilib
 %patch2 -p1 -b .privlibs
 %patch3 -p1 -b .badsocket
+%patch4 -p1 -b .nssproxy
+
+# Convert docs to UTF-8
+for f in CHANGES README; do
+	iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
+	mv -f ${f}.utf8 ${f}
+done
 
 %build
-export CPPFLAGS="$(pkg-config --cflags nss) -DHAVE_PK11_CREATEGENERICOBJECT -D_GNU_SOURCE=1"
+export CPPFLAGS="$(pkg-config --cflags nss) -DHAVE_PK11_CREATEGENERICOBJECT"
 %configure --without-ssl --with-nss=%{_prefix} --enable-ipv6 \
 	--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
 	--with-gssapi=%{_prefix}/kerberos --with-libidn \
 	--enable-ldaps --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
+# Remove bogus rpath
+sed -i \
+	-e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
+	-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
 make %{?_smp_mflags}
 
 %install
@@ -104,6 +117,16 @@
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Jun 18 2008 Jindrich Novy <jnovy at redhat.com> 7.18.2-2
+- update to 7.18.2
+- fix curl_multi_perform() over a proxy (#450140), thanks to
+  Rob Crittenden
+- spec cleanup, thanks to Paul Howarth (#225671)
+  - drop BR: libtool
+  - convert CHANGES and README to UTF-8
+  - _GNU_SOURCE in CFLAGS is no more needed
+  - remove bogus rpath
+
 * Mon May 19 2008 Dennis Gilmore <dennis at ausil.us> 7.18.1-1.1
 - rebuild for sparc
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/curl/F-9/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	31 Mar 2008 07:47:59 -0000	1.30
+++ sources	18 Jun 2008 06:16:34 -0000	1.31
@@ -1 +1 @@
-805834fc1136ff7600d2179bc0386c5a  curl-7.18.1.tar.bz2
+c389be5b0525276e58865956b7465562  curl-7.18.2.tar.bz2