[curl] new upstream release - 7.33.0

[Kamil Dudka]

commit 7b8437e3a1dc2ab6ed0896c591433a3e38c16b6d
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Mon Oct 14 22:51:57 2013 +0200

    new upstream release - 7.33.0
    
    FIXME: test906 fails if compiled against NSS

 0001-curl-7.32.0-204126a5.patch   |   42 ------------------------------------
 0002-curl-7.32.0-c639d725.patch   |   43 -------------------------------------
 0102-curl-7.32.0-debug.patch      |    2 +-
 0103-curl-7.32.0-metalink.patch   |    4 +-
 0105-curl-7.32.0-scp-upload.patch |   42 ------------------------------------
 curl-7.32.0.tar.lzma.asc          |    7 ------
 curl-7.33.0.tar.lzma.asc          |    7 ++++++
 curl.spec                         |   21 ++++-------------
 sources                           |    2 +-
 9 files changed, 16 insertions(+), 154 deletions(-)
---
diff --git a/0102-curl-7.32.0-debug.patch b/0102-curl-7.32.0-debug.patch
index 1ca6cdb..e93616d 100644
--- a/0102-curl-7.32.0-debug.patch
+++ b/0102-curl-7.32.0-debug.patch
@@ -12,7 +12,7 @@ diff --git a/configure b/configure
 index 8f079a3..53b4774 100755
 --- a/configure
 +++ b/configure
-@@ -16030,18 +16030,11 @@ $as_echo "yes" >&6; }
+@@ -16000,18 +16000,11 @@ $as_echo "yes" >&6; }
      gccvhi=`echo $gccver | cut -d . -f1`
      gccvlo=`echo $gccver | cut -d . -f2`
      compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
diff --git a/0103-curl-7.32.0-metalink.patch b/0103-curl-7.32.0-metalink.patch
index 3bb0af7..f00d874 100644
--- a/0103-curl-7.32.0-metalink.patch
+++ b/0103-curl-7.32.0-metalink.patch
@@ -12,7 +12,7 @@ diff --git a/configure b/configure
 index a466175..cb63075 100755
 --- a/configure
 +++ b/configure
-@@ -15495,13 +15495,9 @@ fi
+@@ -15465,13 +15465,9 @@ fi
  
  
  
@@ -33,7 +33,7 @@ diff --git a/configure.ac b/configure.ac
 index 49309e6..90c56b5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -243,13 +243,17 @@ fi
+@@ -242,13 +242,17 @@ fi
  AC_SUBST([CPPFLAG_CURL_STATICLIB])
  
  
diff --git a/curl-7.33.0.tar.lzma.asc b/curl-7.33.0.tar.lzma.asc
new file mode 100644
index 0000000..44e1b73
--- /dev/null
+++ b/curl-7.33.0.tar.lzma.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.15 (GNU/Linux)
+
+iEYEABECAAYFAlJcAyIACgkQeOEcayedXJGmzgCgiGvAZ1jUvbBw/ywZSday3J9j
+KucAn2xv4XLijiR4cDH6z8bnN0zH+lpk
+=o6A/
+-----END PGP SIGNATURE-----
diff --git a/curl.spec b/curl.spec
index d2e4fcb..2e5a704 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,18 +1,12 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
-Version: 7.32.0
-Release: 3%{?dist}
+Version: 7.33.0
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
 Source2: curlbuild.h
 
-# make sure that NSS is initialized prior to calling PK11_GenerateRandom()
-Patch1: 0001-curl-7.32.0-204126a5.patch
-
-# avoid delay if FTP is aborted in CURLOPT_HEADERFUNCTION callback (#1005686)
-Patch2: 0002-curl-7.32.0-c639d725.patch
-
 # patch making libcurl multilib ready
 Patch101: 0101-curl-7.32.0-multilib.patch
 
@@ -28,9 +22,6 @@ Patch104: 0104-curl-7.19.7-localhost6.patch
 # disable valgrind for certain test-cases (libssh2 problem)
 Patch106: 0106-curl-7.21.0-libssh2-valgrind.patch
 
-# http://thread.gmane.org/gmane.comp.web.curl.library/40551/focus=40561
-Patch105: 0105-curl-7.32.0-scp-upload.patch
-
 # work around valgrind bug (#678518)
 Patch107: 0107-curl-7.21.4-libidn-valgrind.patch
 
@@ -113,11 +104,6 @@ documentation of the library, too.
 %setup -q
 
 # upstream patches
-%patch1 -p1
-%patch2 -p1
-
-# patches not yet upstream
-%patch105 -p1
 
 # Fedora patches
 %patch101 -p1
@@ -236,6 +222,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Mon Oct 14 2013 Kamil Dudka <kdudka at redhat.com> 7.33.0-1
+- new upstream release
+
 * Fri Oct 11 2013 Kamil Dudka <kdudka at redhat.com> 7.32.0-3
 - do not limit the speed of SCP upload on a fast connection
 
diff --git a/sources b/sources
index 986f50f..7e556ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-db5948f44e7ef3edbf9a7907af9556ac  curl-7.32.0.tar.lzma
+eb463192f37c260163e006d6c4d3f114  curl-7.33.0.tar.lzma