rpms/curl/devel curl-7.19.7-nss-i686.patch, NONE, 1.1 curl.spec, 1.132, 1.133

[Kamil Dudka]

Author: kdudka

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

Modified Files:
	curl.spec 
Added Files:
	curl-7.19.7-nss-i686.patch 
Log Message:
- use different port numbers for 32bit and 64bit builds
- temporary workaround for #545779

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

--- NEW FILE curl-7.19.7-nss-i686.patch ---
diff --git a/lib/nss.c b/lib/nss.c
index 637663e..f439735 100644
--- a/lib/nss.c
+++ b/lib/nss.c
@@ -1047,7 +1047,7 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex)
       }
       else {
         char *certpath = PR_smprintf("%s%s",
-                         NSS_VersionCheck("3.12.0") ? "sql:" : "",
+                         /*NSS_VersionCheck("3.12.0") ? "sql:" :*/ "",
                          certDir);
         rv = NSS_Initialize(certpath, "", "", "", NSS_INIT_READONLY);
         PR_smprintf_free(certpath);


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -p -r1.132 -r1.133
--- curl.spec	8 Dec 2009 09:41:10 -0000	1.132
+++ curl.spec	9 Dec 2009 17:48:00 -0000	1.133
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.19.7
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -10,6 +10,7 @@ Patch1: curl-7.19.7-nss-nonblock.patch
 Patch2: curl-7.19.7-ssl-retry.patch
 Patch3: curl-7.19.7-modelfree.patch
 Patch4: curl-7.19.7-nss-warning.patch
+Patch5: curl-7.19.7-nss-i686.patch
 Patch101: curl-7.15.3-multilib.patch
 Patch102: curl-7.16.0-privlibs.patch
 Patch103: curl-7.19.4-debug.patch
@@ -86,6 +87,7 @@ use cURL's capabilities internally.
 %patch4 -p1
 
 # Fedora patches
+%patch5 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
@@ -122,7 +124,10 @@ make %{?_smp_mflags}
 export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}
 cd tests
 make %{?_smp_mflags}
-./runtests.pl -a -p -v
+
+# use different port range for 32bit and 64bit build, thus make it possible
+# to run both in parallel on the same machine
+./runtests.pl -a -b89%{?__isa_bits} -p -v
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -181,6 +186,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Dec 09 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-7
+- use different port numbers for 32bit and 64bit builds
+- temporary workaround for #545779
+
 * Tue Dec 08 2009 Kamil Dudka <kdudka at redhat.com> 7.19.7-6
 - make it possible to run test241
 - re-enable SCP/SFTP tests (#539444)