Wed Jun 16 13:36:47 UTC 2010

Author: kdudka

Update of /cvs/extras/rpms/curl/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6400

Modified Files:
	curl.spec 
Added Files:
	0000-curl-7.20.0-e32fe30.patch 0101-curl-7.20.0-multilib.patch 
	0102-curl-7.20.0-lrt.patch 0103-curl-7.19.4-debug.patch 
	0104-curl-7.19.7-localhost6.patch 
	0105-curl-7.20.0-disable-test1112.patch 
Removed Files:
	curl-7.19.4-debug.patch curl-7.19.7-localhost6.patch 
	curl-7.20.0-disable-test1112.patch curl-7.20.0-e32fe30.patch 
	curl-7.20.0-lrt.patch curl-7.20.0-multilib.patch 
Log Message:
mass rename of patches

0000-curl-7.20.0-e32fe30.patch:
 test623 |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--- NEW FILE 0000-curl-7.20.0-e32fe30.patch ---
>From e32fe30d0cf7c1f7045ac0bd29322e7fb4feb5c8 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel at haxx.se>
Date: Tue, 23 Mar 2010 23:25:04 +0100
Subject: [PATCH] enabled valgrind

I ran it now successfully and it helped to pinpoint a libssh2
memory leak!
---
 tests/data/test623 |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/tests/data/test623 b/tests/data/test623
index 38a41d2..19e505b 100644
--- a/tests/data/test623
+++ b/tests/data/test623
@@ -36,8 +36,6 @@ for ssh upload test
 <errorcode>
 79
 </errorcode>
-<valgrind>
-disable
-</valgrind>
+
 </verify>
 </testcase>
-- 
1.6.6.1


0101-curl-7.20.0-multilib.patch:
 b/curl-config.in |   22 ++++------------------
 libcurl.pc.in    |    1 +
 2 files changed, 5 insertions(+), 18 deletions(-)

--- NEW FILE 0101-curl-7.20.0-multilib.patch ---
 curl-config.in |   18 ++----------------
 1 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/curl-config.in b/curl-config.in
index ebda129..b404827 100644
--- a/curl-config.in
+++ b/curl-config.in
@@ -42,7 +42,6 @@ Available values for OPTION include:
   --libs      library linking information
   --prefix    curl install prefix
   --protocols newline separated list of enabled protocols
-  --static-libs static libcurl library linking information
   --version   output version information
   --vernum    output the version information as a number (hexadecimal)
 EOF
@@ -69,7 +68,7 @@ while test $# -gt 0; do
 	;;
 
     --cc)
-	echo "@CC@"
+	echo "gcc"
 	;;
 
     --prefix)
@@ -130,25 +129,12 @@ while test $# -gt 0; do
        	;;
 
     --libs)
-	if test "X at libdir@" != "X/usr/lib" -a "X at libdir@" != "X/usr/lib64"; then
-	   CURLLIBDIR="-L at libdir@ "
-	else
-	   CURLLIBDIR=""
-	fi
-	if test "X at REQUIRE_LIB_DEPS@" = "Xyes"; then
-	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
-	else
-	  echo ${CURLLIBDIR}-lcurl @LDFLAGS@ @LIBS@
-	fi
-	;;
-
-    --static-libs)
-	echo @libdir@/libcurl. at libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
+	pkg-config libcurl --libs
 	;;
 
     --configure)
-      echo @CONFIGURE_OPTIONS@
-    ;;
+	pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//'
+	;;
 
     *)
         echo "unknown option: $1"
--- a/libcurl.pc.in
+++ b/libcurl.pc.in
@@ -29,6 +29,7 @@ libdir=@libdir@
 includedir=@includedir@
 supported_protocols="@SUPPORT_PROTOCOLS@"
 supported_features="@SUPPORT_FEATURES@"
+configure_options=@CONFIGURE_OPTIONS@
 
 Name: libcurl
 URL: http://curl.haxx.se/

0102-curl-7.20.0-lrt.patch:
 src/Makefile.am           |    2 +-
 tests/libtest/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE 0102-curl-7.20.0-lrt.patch ---
 src/Makefile.am           |    2 +-
 tests/libtest/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 3672458..890893d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -46,7 +46,7 @@ bin_PROGRAMS = curl
 
 include Makefile.inc
 
-curl_LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@
+curl_LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@ -lrt
 curl_DEPENDENCIES = $(top_builddir)/lib/libcurl.la
 BUILT_SOURCES = hugehelp.c
 CLEANFILES = hugehelp.c
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index 70b0f12..6512ce4 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -54,7 +54,7 @@ EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl	\
 test1022.pl Makefile.inc
 
 # Dependencies (may need to be overriden)
-LDADD = $(top_builddir)/lib/libcurl.la
+LDADD = $(top_builddir)/lib/libcurl.la -lrt
 DEPENDENCIES = $(top_builddir)/lib/libcurl.la
 
 # Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES, noinst_PROGRAMS, lib*_SOURCES, and lib*_CFLAGS)

0103-curl-7.19.4-debug.patch:
 configure.ac |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- NEW FILE 0103-curl-7.19.4-debug.patch ---
 configure.ac |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index af30b8a..ca6c7cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -253,7 +253,10 @@ dnl **********************************************************************
 
 CURL_CHECK_COMPILER
 CURL_SET_COMPILER_BASIC_OPTS
-CURL_SET_COMPILER_DEBUG_OPTS
+
+dnl do not perturb CFLAGS given by the build system
+dnl CURL_SET_COMPILER_DEBUG_OPTS
+
 CURL_SET_COMPILER_OPTIMIZE_OPTS
 CURL_SET_COMPILER_WARNING_OPTS
 

0104-curl-7.19.7-localhost6.patch:
 test1083 |    6 +++---
 test241  |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE 0104-curl-7.19.7-localhost6.patch ---
diff --git a/tests/data/test1083 b/tests/data/test1083
index e441278..b0958b6 100644
--- a/tests/data/test1083
+++ b/tests/data/test1083
@@ -33,13 +33,13 @@ ipv6
 http-ipv6
 </server>
  <name>
-HTTP-IPv6 GET with ip6-localhost --interface
+HTTP-IPv6 GET with localhost6 --interface
  </name>
  <command>
--g "http://%HOST6IP:%HTTP6PORT/1083" --interface ip6-localhost
+-g "http://%HOST6IP:%HTTP6PORT/1083" --interface localhost6
 </command>
 <precheck>
-perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test server host address';} else {exec './server/resolve --ipv6 ip6-localhost'; print 'Cannot run precheck resolve';}"
+perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test server host address';} else {exec './server/resolve --ipv6 localhost6'; print 'Cannot run precheck resolve';}"
 </precheck>
 </client>
 
diff --git a/tests/data/test241 b/tests/data/test241
index 46eae1f..4e1632c 100644
--- a/tests/data/test241
+++ b/tests/data/test241
@@ -30,13 +30,13 @@ ipv6
 http-ipv6
 </server>
  <name>
-HTTP-IPv6 GET (using ip6-localhost)
+HTTP-IPv6 GET (using localhost6)
  </name>
  <command>
--g "http://ip6-localhost:%HTTP6PORT/241"
+-g "http://localhost6:%HTTP6PORT/241"
 </command>
 <precheck>
-./server/resolve --ipv6 ip6-localhost
+./server/resolve --ipv6 localhost6
 </precheck>
 </client>
 
@@ -48,7 +48,7 @@ HTTP-IPv6 GET (using ip6-localhost)
 </strip>
 <protocol>
 GET /241 HTTP/1.1
-Host: ip6-localhost:%HTTP6PORT
+Host: localhost6:%HTTP6PORT
 Accept: */*
 
 </protocol>

0105-curl-7.20.0-disable-test1112.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE 0105-curl-7.20.0-disable-test1112.patch ---
 tests/data/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
index 61b1b48..90d5084 100644
--- a/tests/data/Makefile.am
+++ b/tests/data/Makefile.am
@@ -65,7 +65,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
  test1097 test560 test561 test1098 test1099 test562 test563 test1100       \
  test564 test1101 test1102 test1103 test1104 test299 test310 test311       \
  test312 test1105 test565 test800 test1106 test801 test566 test802 test803 \
- test1107 test1108 test1109 test1110 test1111 test1112 test129 test567     \
+ test1107 test1108 test1109 test1110 test1111 test129 test567              \
  test568 test569 test570 test571 test572 test804 test805 test806 test807 \
  test573 test313 test1115
 


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- curl.spec	16 Jun 2010 13:24:18 -0000	1.159
+++ curl.spec	16 Jun 2010 13:36:47 -0000	1.160
@@ -9,22 +9,22 @@ Source2: curlbuild.h
 Source3: hide_selinux.c
 
 # upstream commit e32fe30d0cf7c1f7045ac0bd29322e7fb4feb5c8
-Patch0: curl-7.20.0-e32fe30.patch
+Patch0: 0000-curl-7.20.0-e32fe30.patch
 
 # patch making libcurl multilib ready
-Patch101: curl-7.20.0-multilib.patch
+Patch101: 0101-curl-7.20.0-multilib.patch
 
 # force -lrt when linking the curl tool and test-cases
-Patch102: curl-7.20.0-lrt.patch
+Patch102: 0102-curl-7.20.0-lrt.patch
 
 # prevent configure script from discarding -g in CFLAGS (#496778)
-Patch103: curl-7.19.4-debug.patch
+Patch103: 0103-curl-7.19.4-debug.patch
 
 # use localhost6 instead of ip6-localhost in the curl test-suite
-Patch105: curl-7.19.7-localhost6.patch
+Patch104: 0104-curl-7.19.7-localhost6.patch
 
 # exclude test1112 from the test suite (#565305)
-Patch107: curl-7.20.0-disable-test1112.patch
+Patch105: 0105-curl-7.20.0-disable-test1112.patch
 
 Provides: webclient
 URL: http://curl.haxx.se/
@@ -98,10 +98,10 @@ done
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
-%patch105 -p1
+%patch104 -p1
 
 # exclude test1112 from the test suite (#565305)
-%patch107 -p1
+%patch105 -p1
 rm -f tests/data/test1112
 
 autoreconf


--- curl-7.19.4-debug.patch DELETED ---


--- curl-7.19.7-localhost6.patch DELETED ---


--- curl-7.20.0-disable-test1112.patch DELETED ---


--- curl-7.20.0-e32fe30.patch DELETED ---


--- curl-7.20.0-lrt.patch DELETED ---


--- curl-7.20.0-multilib.patch DELETED ---

