[curl] new upstream release
Kamil Dudka
kdudka at fedoraproject.org
Fri May 25 07:42:46 UTC 2012
commit 23fcdc59a10746d053fdffb92ee362f5ff30067f
Author: Kamil Dudka <kdudka at redhat.com>
Date: Fri May 25 09:17:42 2012 +0200
new upstream release
0001-curl-7.25.0-20cb12db.patch | 588 --------------------
0002-curl-7.25.0-a60edcc6.patch | 100 ----
...5.0-debug.patch => 0102-curl-7.26.0-debug.patch | 8 +-
...atch => 0105-curl-7.26.0-disable-test1112.patch | 2 +-
0108-curl-7.25.0-utf8.patch | 41 --
0108-curl-7.26.0-utf8.patch | 95 ++++
curl-7.24.0.tar.lzma.asc | 7 -
curl-7.26.0.tar.lzma.asc | 7 +
curl.spec | 23 +-
sources | 2 +-
10 files changed, 116 insertions(+), 757 deletions(-)
---
diff --git a/0102-curl-7.25.0-debug.patch b/0102-curl-7.26.0-debug.patch
similarity index 93%
rename from 0102-curl-7.25.0-debug.patch
rename to 0102-curl-7.26.0-debug.patch
index 8056f53..6d8f6ce 100644
--- a/0102-curl-7.25.0-debug.patch
+++ b/0102-curl-7.26.0-debug.patch
@@ -6,7 +6,7 @@ diff --git a/configure b/configure
index d3ecf69..6d8f085 100755
--- a/configure
+++ b/configure
-@@ -15045,18 +15045,11 @@ $as_echo "yes" >&6; }
+@@ -15084,18 +15084,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`
@@ -27,8 +27,8 @@ index d3ecf69..6d8f085 100755
+ flags_opt_all=""
+ flags_opt_yes=""
flags_opt_off="-O0"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+
+ if test -z "$SED"; then
diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
index 1ea4d17..868d65a 100644
--- a/m4/curl-compilers.m4
@@ -54,5 +54,5 @@ index 1ea4d17..868d65a 100644
+ flags_opt_all=""
+ flags_opt_yes=""
flags_opt_off="-O0"
+ CURL_CHECK_DEF([_WIN32], [], [silent])
else
- AC_MSG_RESULT([no])
diff --git a/0105-curl-7.21.3-disable-test1112.patch b/0105-curl-7.26.0-disable-test1112.patch
similarity index 96%
rename from 0105-curl-7.21.3-disable-test1112.patch
rename to 0105-curl-7.26.0-disable-test1112.patch
index d2367a9..51320b6 100644
--- a/0105-curl-7.21.3-disable-test1112.patch
+++ b/0105-curl-7.26.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
-@@ -326,7 +326,7 @@ test1078 test1079 test1080 test1081 test1082 test1083 test1084 test1085 \
+@@ -332,7 +332,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.26.0-utf8.patch
new file mode 100644
index 0000000..e4f309c
--- /dev/null
+++ b/0108-curl-7.26.0-utf8.patch
@@ -0,0 +1,95 @@
+ CHANGES | 18 +++++++++---------
+ README | 2 +-
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/CHANGES b/CHANGES
+index 2335841..d4d37c2 100644
+--- a/CHANGES
++++ b/CHANGES
+@@ -604,18 +604,18 @@ Daniel Stenberg (1 Apr 2012)
+ Reported by: Michael Wallner
+
+ Steve Holme (31 Mar 2012)
+-- [Gökhan Şengün brought this change]
++- [Gökhan Åengün brought this change]
+
+ smtp: Add support for DIGEST-MD5 authentication
+
+-- [Gökhan Şengün brought this change]
++- [Gökhan Åengün brought this change]
+
+ smtp: Cody tidy up of md5 digest length
+
+ Replaced the hard coded md5 digest length (16) with a preprocessor
+ constant
+
+-- [Gökhan Şengün brought this change]
++- [Gökhan Åengün brought this change]
+
+ md5: Add support for calculating the md5 sum of buffers incrementally
+
+@@ -1913,7 +1913,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.
+
+-- [Cédric Deltheil brought this change]
++- [CeÌdric Deltheil brought this change]
+
+ curl.h: add __ANDROID__ macro check
+
+@@ -2126,7 +2126,7 @@ Daniel Stenberg (12 Dec 2011)
+ linking with a static openssl requires a set of more libs to be linked
+ on Windows.
+
+- Thanks also to Steve Holme and Martin Storsjö for additional feedback.
++ Thanks also to Steve Holme and Martin Storsjö for additional feedback.
+
+ Bug: http://curl.haxx.se/mail/lib-2011-12/0063.html
+ Reported by: Ward Willats
+@@ -3386,7 +3386,7 @@ Daniel Stenberg (25 Sep 2011)
+ damaging.
+
+ Bug: http://curl.haxx.se/bug/view.cgi?id=3413181
+- Reported by: Taneli Vähäkangas
++ Reported by: Taneli Vähäkangas
+
+ 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
++++ b/README
+@@ -45,5 +45,5 @@ GIT
+ NOTICE
+
+ Curl contains pieces of source code that is Copyright (c) 1998, 1999
+- Kungliga Tekniska Högskolan. This notice is included here to comply with the
++ Kungliga Tekniska Högskolan. This notice is included here to comply with the
+ distribution terms.
diff --git a/curl-7.26.0.tar.lzma.asc b/curl-7.26.0.tar.lzma.asc
new file mode 100644
index 0000000..1570d24
--- /dev/null
+++ b/curl-7.26.0.tar.lzma.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iEYEABECAAYFAk++XP4ACgkQeOEcayedXJGItwCgtc6ECD4l6E7Q4ZEJDOzBB5bQ
+LWoAoLFWWUbcd+sBu/+s6fOGxgETHqT2
+=4I4f
+-----END PGP SIGNATURE-----
diff --git a/curl.spec b/curl.spec
index 49a0638..72f8a72 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,30 +1,24 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl
-Version: 7.25.0
-Release: 3%{?dist}
+Version: 7.26.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 NSS_InitContext() to initialize NSS if available (#738456)
-Patch1: 0001-curl-7.25.0-20cb12db.patch
-
-# provide human-readable names for NSS errors (upstream commit a60edcc6)
-Patch2: 0002-curl-7.25.0-a60edcc6.patch
-
# patch making libcurl multilib ready
Patch101: 0101-curl-7.25.0-multilib.patch
# prevent configure script from discarding -g in CFLAGS (#496778)
-Patch102: 0102-curl-7.25.0-debug.patch
+Patch102: 0102-curl-7.26.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.21.3-disable-test1112.patch
+Patch105: 0105-curl-7.26.0-disable-test1112.patch
# disable valgrind for certain test-cases (libssh2 problem)
Patch106: 0106-curl-7.21.0-libssh2-valgrind.patch
@@ -34,7 +28,7 @@ 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.25.0-utf8.patch
+Patch108: 0108-curl-7.26.0-utf8.patch
Provides: webclient
URL: http://curl.haxx.se/
@@ -109,10 +103,6 @@ documentation of the library, too.
%prep
%setup -q
-# upstream patches
-%patch1 -p1
-%patch2 -p1
-
# Fedora patches
%patch101 -p1
%patch102 -p1
@@ -228,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4
%changelog
+* Fri May 25 2012 Kamil Dudka <kdudka at redhat.com> 7.26.0-1
+- new upstream release
+
* Wed Apr 25 2012 Karsten Hopp <karsten at redhat.com> 7.25.0-3
- valgrind on ppc64 works fine, disable ppc32 only
diff --git a/sources b/sources
index 71365ee..44e0158 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0f63a8a14db21e1abdc4862d4ba4a1a curl-7.25.0.tar.lzma
+2ba226ced5d6ef539df970ac77627623 curl-7.26.0.tar.lzma
More information about the scm-commits
mailing list