rpms/curl/devel curl-7.21.0.tar.lzma.asc, NONE, 1.1 .cvsignore, 1.40, 1.41 curl-7.19.4-debug.patch, 1.4, 1.5 curl-7.20.0-disable-test1112.patch, 1.3, 1.4 curl.spec, 1.158, 1.159 sources, 1.40, 1.41 curl-7.20.1-47dda4a.patch, 1.1, NONE curl-7.20.1-82e9b78.patch, 1.1, NONE curl-7.20.1-crl-test.patch, 1.2, NONE curl-7.20.1-crl.patch, 1.1, NONE curl-7.20.1-d487ade.patch, 1.1, NONE curl-7.20.1-test-delay.patch, 1.1, NONE curl-7.20.1-threaded-dns.patch, 1.2, NONE

[Kamil Dudka]

Author: kdudka

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

Modified Files:
	.cvsignore curl-7.19.4-debug.patch 
	curl-7.20.0-disable-test1112.patch curl.spec sources 
Added Files:
	curl-7.21.0.tar.lzma.asc 
Removed Files:
	curl-7.20.1-47dda4a.patch curl-7.20.1-82e9b78.patch 
	curl-7.20.1-crl-test.patch curl-7.20.1-crl.patch 
	curl-7.20.1-d487ade.patch curl-7.20.1-test-delay.patch 
	curl-7.20.1-threaded-dns.patch 
Log Message:
- new upstream release, drop applied patches


--- NEW FILE curl-7.21.0.tar.lzma.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEABECAAYFAkwYupcACgkQeOEcayedXJFKYACfX1AQNaGZ6d4OGhozLjT2C7vR
rIwAnRxAbyuCg4K1FIBhcKhHjLpQs9Zm
=AHBg
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	19 Apr 2010 16:15:42 -0000	1.40
+++ .cvsignore	16 Jun 2010 13:24:17 -0000	1.41
@@ -1 +1 @@
-curl-7.20.1.tar.lzma
+curl-7.21.0.tar.lzma

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

Index: curl-7.19.4-debug.patch
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl-7.19.4-debug.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- curl-7.19.4-debug.patch	19 Apr 2010 16:15:52 -0000	1.4
+++ curl-7.19.4-debug.patch	16 Jun 2010 13:24:18 -0000	1.5
@@ -2,10 +2,10 @@
  1 files changed, 4 insertions(+), 1 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 2d394e1..39cc418 100644
+index af30b8a..ca6c7cc 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -252,7 +252,10 @@ dnl **********************************************************************
+@@ -253,7 +253,10 @@ dnl **********************************************************************
  
  CURL_CHECK_COMPILER
  CURL_SET_COMPILER_BASIC_OPTS

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

Index: curl-7.20.0-disable-test1112.patch
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl-7.20.0-disable-test1112.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- curl-7.20.0-disable-test1112.patch	11 May 2010 14:23:11 -0000	1.3
+++ curl-7.20.0-disable-test1112.patch	16 Jun 2010 13:24:18 -0000	1.4
@@ -2,15 +2,15 @@
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
-index 66ada48..454da4b 100644
+index 61b1b48..90d5084 100644
 --- a/tests/data/Makefile.am
 +++ b/tests/data/Makefile.am
-@@ -64,7 +64,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46	   \
+@@ -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 test804 test572 test313
+  test568 test569 test570 test571 test572 test804 test805 test806 test807 \
+  test573 test313 test1115
  
- filecheck:


Index: curl.spec
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/curl.spec,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -p -r1.158 -r1.159
--- curl.spec	25 May 2010 15:36:27 -0000	1.158
+++ curl.spec	16 Jun 2010 13:24:18 -0000	1.159
@@ -1,7 +1,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
-Version: 7.20.1
-Release: 6%{?dist}
+Version: 7.21.0
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
@@ -11,26 +11,6 @@ Source3: hide_selinux.c
 # upstream commit e32fe30d0cf7c1f7045ac0bd29322e7fb4feb5c8
 Patch0: curl-7.20.0-e32fe30.patch
 
-# upstream commit d487ade72c5f31703ce097e8460e0225fad80348
-Patch1: curl-7.20.1-d487ade.patch
-
-# upstream commit 82e9b78a388ab539c8784cd853adf6e4a97d52c5
-Patch2: curl-7.20.1-82e9b78.patch
-
-# rhbz #581926
-#   upstream commit 2e8b21833a581cc5389833ec4fdeeaa6fb7be538
-#   upstream commit 3e759f4fb6018b353bd4a1d608be3a3d7b2c9645
-#   upstream commit 016ce4b1daa0f8d44a0da7105e1e1c97531e8b87
-Patch3: curl-7.20.1-crl.patch
-
-# rhbz #581926 - test-case
-#   http://curl.haxx.se/mail/lib-2010-04/0214.html
-#   (the CA pass phrase used in the patch is 'libcurl')
-Patch4: curl-7.20.1-crl-test.patch
-
-# upstream commit 47dda4a1d43c9341753388ab3babb0d27cf34840
-Patch5: curl-7.20.1-47dda4a.patch
-
 # patch making libcurl multilib ready
 Patch101: curl-7.20.0-multilib.patch
 
@@ -40,17 +20,9 @@ Patch102: curl-7.20.0-lrt.patch
 # prevent configure script from discarding -g in CFLAGS (#496778)
 Patch103: curl-7.19.4-debug.patch
 
-# suppress occasional failure of curl test-suite on s390; caused more likely
-# by the test-suite infrastructure than (lib)curl itself
-# http://curl.haxx.se/mail/lib-2009-12/0031.html
-Patch104: curl-7.20.1-test-delay.patch
-
 # use localhost6 instead of ip6-localhost in the curl test-suite
 Patch105: curl-7.19.7-localhost6.patch
 
-# experimentally enabled threaded DNS lookup
-Patch106: curl-7.20.1-threaded-dns.patch
-
 # exclude test1112 from the test suite (#565305)
 Patch107: curl-7.20.0-disable-test1112.patch
 
@@ -122,22 +94,11 @@ done
 # revert an upstream commit which breaks Fedora builds
 %patch0 -p1 -R
 
-# upstream patches (already applied)
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch5 -p1
-
-# upstream patches (not yet applied)
-%patch4 -p1
-
 # Fedora patches
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
-%patch104 -p1
 %patch105 -p1
-%patch106 -p1
 
 # exclude test1112 from the test suite (#565305)
 %patch107 -p1
@@ -153,6 +114,7 @@ sed -i s/899\\\([0-9]\\\)/%{?__isa_bits}
     --enable-ipv6 \
     --enable-ldaps \
     --enable-manual \
+    --enable-threaded-resolver \
     --with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
     --with-gssapi \
     --with-libidn \
@@ -244,6 +206,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Wed Jun 16 2010 Kamil Dudka <kdudka at redhat.com> 7.21.0-1
+- new upstream release, drop applied patches
+
 * Tue May 25 2010 Kamil Dudka <kdudka at redhat.com> 7.20.1-6
 - fix -J/--remote-header-name to strip CR-LF (upstream patch)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/curl/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	19 Apr 2010 16:16:09 -0000	1.40
+++ sources	16 Jun 2010 13:24:18 -0000	1.41
@@ -1 +1 @@
-e259b58aab40dd4e7b72f52e96a498e4  curl-7.20.1.tar.lzma
+de2820f567c29f895a2b36fcfa2c1178  curl-7.21.0.tar.lzma


--- curl-7.20.1-47dda4a.patch DELETED ---


--- curl-7.20.1-82e9b78.patch DELETED ---


--- curl-7.20.1-crl-test.patch DELETED ---


--- curl-7.20.1-crl.patch DELETED ---


--- curl-7.20.1-d487ade.patch DELETED ---


--- curl-7.20.1-test-delay.patch DELETED ---


--- curl-7.20.1-threaded-dns.patch DELETED ---