From 8aeea8e8bb59aa252554e86abca1ff533155d177 Mon Sep 17 00:00:00 2001
From: Jindrich Novy <jnovy@fedoraproject.org>
Date: Thu, 11 Oct 2007 14:56:46 +0000
Subject: [PATCH] - list features correctly when curl is compiled against NSS
 (#316191)

---
 curl-7.16.4-curl-config.patch | 42 +++++++++++++++++++++++++++++++++++
 curl.spec                     |  7 +++++-
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 curl-7.16.4-curl-config.patch

diff --git a/curl-7.16.4-curl-config.patch b/curl-7.16.4-curl-config.patch
new file mode 100644
index 0000000..f0481aa
--- /dev/null
+++ b/curl-7.16.4-curl-config.patch
@@ -0,0 +1,42 @@
+Patch for #316191 curl-config doesn't advertise support of SSL and HTTPS when
+built against nss	(Lubomir Kundrak <lkundrak@redhat.com>)
+
+--- curl-7.16.4/curl-config.in.sslconfig	2007-10-02 22:55:15.000000000 +0200
++++ curl-7.16.4/curl-config.in	2007-10-02 22:58:19.000000000 +0200
+@@ -56,6 +56,8 @@
+     usage 1
+ fi
+ 
++USE_SSL="@USE_SSLEAY@@USE_GNUTLS@@USE_NSS@"
++
+ while test $# -gt 0; do
+     case "$1" in
+     # this deals with options in the style
+@@ -80,9 +82,9 @@
+ 
+     --feature|--features)
+ 	if test "@USE_SSLEAY@" = "1"; then
+-          echo "SSL"
+           NTLM=1 # OpenSSL implies NTLM
+-        elif test -n "@USE_GNUTLS@"; then
++	fi
++        if test -n "$USE_SSL"; then
+           echo "SSL"
+         fi
+ 	if test "@KRB4_ENABLED@" = "1"; then
+@@ -112,13 +114,13 @@
+     --protocols)
+ 	if test "@CURL_DISABLE_HTTP@" != "1"; then
+           echo "HTTP"
+-	  if test "@USE_SSLEAY@" = "1"; then
++	  if test "$USE_SSL" = "1"; then
+             echo "HTTPS"
+           fi
+         fi
+ 	if test "@CURL_DISABLE_FTP@" != "1"; then
+           echo "FTP"
+-	  if test "@USE_SSLEAY@" = "1"; then
++	  if test "$USE_SSL" = "1"; then
+             echo "FTPS"
+           fi
+         fi
diff --git a/curl.spec b/curl.spec
index 502f5d6..fdbe3ad 100644
--- a/curl.spec
+++ b/curl.spec
@@ -4,7 +4,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl 
 Version: 7.16.4
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.bz2
@@ -12,6 +12,7 @@ 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
 Provides: webclient
 URL: http://curl.haxx.se/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +44,7 @@ use cURL's capabilities internally.
 %patch2 -p1 -b .privlibs
 %patch3 -p1 -b .ftp
 %patch4 -p1 -b .nsspem
+%patch5 -p1 -b .curl-config
 
 %build
 if pkg-config nss ; then
@@ -103,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Thu Oct 11 2007 Jindrich Novy <jnovy@redhat.com> 7.16.4-8
+- list features correctly when curl is compiled against NSS (#316191)
+
 * Mon Sep 17 2007 Jindrich Novy <jnovy@redhat.com> 7.16.4-7
 - add zlib-devel BR to enable gzip compressed transfers in curl (#292211)