[curl] new upstream release - 7.27.0

Kamil Dudka kdudka at fedoraproject.org
Sat Jul 28 07:21:09 UTC 2012


commit c9fa3c1968a830eba5fc318ad97c4322f85e302f
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Sat Jul 28 09:18:15 2012 +0200

    new upstream release - 7.27.0

 0001-curl-7.26.0-72f4b534.patch                    |  253 --------------------
 0002-curl-7.26.0-68857e40.patch                    |   42 ----
 0003-curl-7.26.0-d317ca50.patch                    |   95 --------
 ...ltilib.patch => 0101-curl-7.27.0-multilib.patch |    4 +-
 ...6.0-debug.patch => 0102-curl-7.27.0-debug.patch |    2 +-
 ...atch => 0105-curl-7.27.0-disable-test1112.patch |    2 +-
 ....26.0-utf8.patch => 0108-curl-7.27.0-utf8.patch |   57 ++---
 ...atch => 0109-curl-7.27.0-disable-test1319.patch |   28 ++-
 curl-7.26.0.tar.lzma.asc                           |    7 -
 curl-7.27.0.tar.lzma.asc                           |    7 +
 curl.spec                                          |   30 +--
 sources                                            |    2 +-
 12 files changed, 64 insertions(+), 465 deletions(-)
---
diff --git a/0101-curl-7.25.0-multilib.patch b/0101-curl-7.27.0-multilib.patch
similarity index 95%
rename from 0101-curl-7.25.0-multilib.patch
rename to 0101-curl-7.27.0-multilib.patch
index b49c955..09acf78 100644
--- a/0101-curl-7.25.0-multilib.patch
+++ b/0101-curl-7.27.0-multilib.patch
@@ -7,7 +7,7 @@ diff --git a/curl-config.in b/curl-config.in
 index 150004d..95d0759 100644
 --- a/curl-config.in
 +++ b/curl-config.in
-@@ -74,7 +74,7 @@ while test $# -gt 0; do
+@@ -75,7 +75,7 @@ while test $# -gt 0; do
  	;;
  
      --cc)
@@ -16,7 +16,7 @@ index 150004d..95d0759 100644
  	;;
  
      --prefix)
-@@ -136,24 +136,14 @@ while test $# -gt 0; do
+@@ -142,24 +142,14 @@ while test $# -gt 0; do
         	;;
  
      --libs)
diff --git a/0102-curl-7.26.0-debug.patch b/0102-curl-7.27.0-debug.patch
similarity index 97%
rename from 0102-curl-7.26.0-debug.patch
rename to 0102-curl-7.27.0-debug.patch
index 6d8f6ce..0f10d40 100644
--- a/0102-curl-7.26.0-debug.patch
+++ b/0102-curl-7.27.0-debug.patch
@@ -6,7 +6,7 @@ diff --git a/configure b/configure
 index d3ecf69..6d8f085 100755
 --- a/configure
 +++ b/configure
-@@ -15084,18 +15084,11 @@ $as_echo "yes" >&6; }
+@@ -15093,18 +15093,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/0105-curl-7.26.0-disable-test1112.patch b/0105-curl-7.27.0-disable-test1112.patch
similarity index 96%
rename from 0105-curl-7.26.0-disable-test1112.patch
rename to 0105-curl-7.27.0-disable-test1112.patch
index 51320b6..f6574e5 100644
--- a/0105-curl-7.26.0-disable-test1112.patch
+++ b/0105-curl-7.27.0-disable-test1112.patch
@@ -19,7 +19,7 @@ diff --git a/tests/data/Makefile.in b/tests/data/Makefile.in
 index 435b126..1d71c4e 100644
 --- a/tests/data/Makefile.in
 +++ b/tests/data/Makefile.in
-@@ -332,7 +332,7 @@ test1078 test1079 test1080 test1081 test1082 test1083 test1084 test1085	\
+@@ -338,7 +338,7 @@ test1078 test1079 test1080 test1081 test1082 test1083 test1084 test1085	\
  test1086 test1087 test1088 test1089 test1090 test1091 test1092 test1093	\
  test1094 test1095 test1096 test1097 test1098 test1099 test1100 test1101	\
  test1102 test1103 test1104 test1105 test1106 test1107 test1108 test1109	\
diff --git a/0108-curl-7.26.0-utf8.patch b/0108-curl-7.27.0-utf8.patch
similarity index 62%
rename from 0108-curl-7.26.0-utf8.patch
rename to 0108-curl-7.27.0-utf8.patch
index e4f309c..b740b17 100644
--- a/0108-curl-7.26.0-utf8.patch
+++ b/0108-curl-7.27.0-utf8.patch
@@ -1,12 +1,30 @@
- CHANGES |   18 +++++++++---------
+ CHANGES |   16 ++++++++--------
  README  |    2 +-
- 2 files changed, 10 insertions(+), 10 deletions(-)
+ 2 files changed, 9 insertions(+), 9 deletions(-)
 
 diff --git a/CHANGES b/CHANGES
 index 2335841..d4d37c2 100644
 --- a/CHANGES
 +++ b/CHANGES
-@@ -604,18 +604,18 @@ Daniel Stenberg (1 Apr 2012)
+@@ -272,7 +272,7 @@ Daniel Stenberg (9 Jul 2012)
+ 
+ - cookie: fixed typo in comment
+ 
+-- [Christian Hägele brought this change]
++- [Christian Hägele brought this change]
+ 
+   https_getsock: provided for schannel backend as well
+   
+@@ -454,7 +454,7 @@ Yang Tse (3 Jul 2012)
+   testcurl.pl: fix missing semicolon
+ 
+ Daniel Stenberg (2 Jul 2012)
+-- [Christian Hägele brought this change]
++- [Christian Hägele brought this change]
+ 
+   unicode NTLM SSPI: heap corruption fixed
+   
+@@ -2563,18 +2563,18 @@ Daniel Stenberg (1 Apr 2012)
    Reported by: Michael Wallner
  
  Steve Holme (31 Mar 2012)
@@ -28,7 +46,7 @@ index 2335841..d4d37c2 100644
  
    md5: Add support for calculating the md5 sum of buffers incrementally
    
-@@ -1913,7 +1913,7 @@ Daniel Stenberg (20 Dec 2011)
+@@ -3866,7 +3866,7 @@ Daniel Stenberg (20 Dec 2011)
    This offers an alternative to the existing Curl_socket_ready() API which
    only checks one socket for read and one for write.
  
@@ -37,7 +55,7 @@ index 2335841..d4d37c2 100644
  
    curl.h: add __ANDROID__ macro check
    
-@@ -2126,7 +2126,7 @@ Daniel Stenberg (12 Dec 2011)
+@@ -4079,7 +4079,7 @@ Daniel Stenberg (12 Dec 2011)
    linking with a static openssl requires a set of more libs to be linked
    on Windows.
    
@@ -46,7 +64,7 @@ index 2335841..d4d37c2 100644
    
    Bug: http://curl.haxx.se/mail/lib-2011-12/0063.html
    Reported by: Ward Willats
-@@ -3386,7 +3386,7 @@ Daniel Stenberg (25 Sep 2011)
+@@ -5333,7 +5333,7 @@ Daniel Stenberg (25 Sep 2011)
    damaging.
    
    Bug: http://curl.haxx.se/bug/view.cgi?id=3413181
@@ -55,33 +73,6 @@ index 2335841..d4d37c2 100644
  
  Yang Tse (24 Sep 2011)
  - curl tool: fix a compiler warning
-@@ -4386,7 +4386,7 @@ Daniel Stenberg (8 Aug 2011)
-   Update the phrasing to reflect our more strict interpretation:
-   http://curl.haxx.se/mail/lib-2011-08/0064.html
- 
--- [Cristian Rodríguez brought this change]
-+- [Cristian Rodríguez brought this change]
- 
-   OpenSSL: Use SSL_MODE_RELEASE_BUFFERS if available, reduces memory use
-   
-@@ -4394,7 +4394,7 @@ Daniel Stenberg (8 Aug 2011)
-   http://www.openssl.org/docs/ssl/SSL_CTX_set_mode.html
-   http://www.imperialviolet.org/2010/06/25/overclocking-ssl.html
-   
--  Signed-off-by: Cristian Rodríguez <crrodriguez at opensuse.org>
-+  Signed-off-by: Cristian Rodríguez <crrodriguez at opensuse.org>
- 
- - TODO-RELEASE: close issue #292
-   
-@@ -4428,7 +4428,7 @@ Daniel Stenberg (6 Aug 2011)
-         provided" by Christian H<E4>gele
-         http://curl.haxx.se/mail/lib-2011-08/0009.html
- 
--- [Christian Hägele brought this change]
-+- [Christian Hägele brought this change]
- 
-   asyn-thread: check for dotted addresses before thread starts
- 
 diff --git a/README b/README
 index 2ffacc3..cfd6760 100644
 --- a/README
diff --git a/0109-curl-7.26.0-disable-test1319.patch b/0109-curl-7.27.0-disable-test1319.patch
similarity index 50%
rename from 0109-curl-7.26.0-disable-test1319.patch
rename to 0109-curl-7.27.0-disable-test1319.patch
index a4c2cc2..fb7c639 100644
--- a/0109-curl-7.26.0-disable-test1319.patch
+++ b/0109-curl-7.27.0-disable-test1319.patch
@@ -1,6 +1,11 @@
-diff -up curl-7.26.0/tests/data/Makefile.am.ppc1319 curl-7.26.0/tests/data/Makefile.am
---- curl-7.26.0/tests/data/Makefile.am.ppc1319	2012-05-30 12:32:16.396720278 +0200
-+++ curl-7.26.0/tests/data/Makefile.am	2012-05-30 12:32:40.475870630 +0200
+ tests/data/Makefile.am |    2 +-
+ tests/data/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am
+index bb4722e..d6879c9 100644
+--- a/tests/data/Makefile.am
++++ b/tests/data/Makefile.am
 @@ -81,7 +81,7 @@ test1208 test1209 test1210 test1211 \
  test1220 \
  test1300 test1301 test1302 test1303 test1304 test1305	\
@@ -8,17 +13,18 @@ diff -up curl-7.26.0/tests/data/Makefile.am.ppc1319 curl-7.26.0/tests/data/Makef
 -test1314 test1315 test1316 test1317 test1318 test1319 test1320 test1321 \
 +test1314 test1315 test1316 test1317 test1318 test1320 test1321 \
  test1322 test1323 test1324 test1325 test1326 test1327 test1328 test1329 \
- test1331 test1332 test1333 \
- test1400 test1401 test1402 test1403 test1404 test1405 test1406 test1407 \
-diff -up curl-7.26.0/tests/data/Makefile.in.ppc1319 curl-7.26.0/tests/data/Makefile.in
---- curl-7.26.0/tests/data/Makefile.in.ppc1319	2012-05-30 12:32:24.891420536 +0200
-+++ curl-7.26.0/tests/data/Makefile.in	2012-05-30 12:32:47.225632459 +0200
-@@ -340,7 +340,7 @@ test1208 test1209 test1210 test1211 \
+ test1331 test1332 test1333 test1334 test1335 test1336 test1337 test1338 \
+ test1339 test1340 test1341 test1342 test1343 test1344 test1345 test1346 \
+diff --git a/tests/data/Makefile.in b/tests/data/Makefile.in
+index c7e9d96..ec70dce 100644
+--- a/tests/data/Makefile.in
++++ b/tests/data/Makefile.in
+@@ -346,7 +346,7 @@ test1208 test1209 test1210 test1211 \
  test1220 \
  test1300 test1301 test1302 test1303 test1304 test1305	\
  test1306 test1307 test1308 test1309 test1310 test1311 test1312 test1313 \
 -test1314 test1315 test1316 test1317 test1318 test1319 test1320 test1321 \
 +test1314 test1315 test1316 test1317 test1318 test1320 test1321 \
  test1322 test1323 test1324 test1325 test1326 test1327 test1328 test1329 \
- test1331 test1332 test1333 \
- test1400 test1401 test1402 test1403 test1404 test1405 test1406 test1407 \
+ test1331 test1332 test1333 test1334 test1335 test1336 test1337 test1338 \
+ test1339 test1340 test1341 test1342 test1343 test1344 test1345 test1346 \
diff --git a/curl-7.27.0.tar.lzma.asc b/curl-7.27.0.tar.lzma.asc
new file mode 100644
index 0000000..eef182a
--- /dev/null
+++ b/curl-7.27.0.tar.lzma.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iEYEABECAAYFAlATBJgACgkQeOEcayedXJG7qwCgpx6vCgDNTRZ2th1SnQw+V8WD
+eIQAn1FrMLQyxZIF/9oDW67e4jnctUV4
+=31wG
+-----END PGP SIGNATURE-----
diff --git a/curl.spec b/curl.spec
index 76cd42f..93b923c 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,33 +1,24 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
-Version: 7.26.0
-Release: 6%{?dist}
+Version: 7.27.0
+Release: 1%{?dist}
 License: MIT
 Group: Applications/Internet
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
 Source2: curlbuild.h
 Source3: hide_selinux.c
 
-# use human-readable error messages provided by NSS
-Patch1: 0001-curl-7.26.0-72f4b534.patch
-
-# fix duplicated SSL handshake with multi interface and proxy (#788526)
-Patch2: 0002-curl-7.26.0-68857e40.patch
-
-# print reason phrase from HTTP status line on error (#676596)
-Patch3: 0003-curl-7.26.0-d317ca50.patch
-
 # patch making libcurl multilib ready
-Patch101: 0101-curl-7.25.0-multilib.patch
+Patch101: 0101-curl-7.27.0-multilib.patch
 
 # prevent configure script from discarding -g in CFLAGS (#496778)
-Patch102: 0102-curl-7.26.0-debug.patch
+Patch102: 0102-curl-7.27.0-debug.patch
 
 # use localhost6 instead of ip6-localhost in the curl test-suite
 Patch104: 0104-curl-7.19.7-localhost6.patch
 
 # exclude test1112 from the test suite (#565305)
-Patch105: 0105-curl-7.26.0-disable-test1112.patch
+Patch105: 0105-curl-7.27.0-disable-test1112.patch
 
 # disable valgrind for certain test-cases (libssh2 problem)
 Patch106: 0106-curl-7.21.0-libssh2-valgrind.patch
@@ -37,10 +28,10 @@ Patch107: 0107-curl-7.21.4-libidn-valgrind.patch
 
 # Fix character encoding of docs, which are of mixed encoding originally so
 # a simple iconv can't fix them
-Patch108: 0108-curl-7.26.0-utf8.patch
+Patch108: 0108-curl-7.27.0-utf8.patch
 
 # server timeout on ppc64
-Patch109: 0109-curl-7.26.0-disable-test1319.patch
+Patch109: 0109-curl-7.27.0-disable-test1319.patch
 
 Provides: webclient
 URL: http://curl.haxx.se/
@@ -116,9 +107,7 @@ documentation of the library, too.
 %setup -q
 
 # upstream patches
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+
 
 # Fedora patches
 %patch101 -p1
@@ -241,6 +230,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/libcurl.m4
 
 %changelog
+* Sat Jul 28 2012 Kamil Dudka <kdudka at redhat.com> 7.27.0-1
+- new upstream release
+
 * Mon Jul 23 2012 Kamil Dudka <kdudka at redhat.com> 7.26.0-6
 - print reason phrase from HTTP status line on error (#676596)
 
diff --git a/sources b/sources
index 44e0158..f8267ed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ba226ced5d6ef539df970ac77627623  curl-7.26.0.tar.lzma
+1b669875527ba4b943a0cdb5b255a02c  curl-7.27.0.tar.lzma


More information about the scm-commits mailing list