[curl] new upstream release - 7.28.0
Kamil Dudka
kdudka at fedoraproject.org
Wed Oct 31 10:49:58 UTC 2012
commit 0f5dbc27da0ca4c01ab7dc144f253e2426c0fa2b
Author: Kamil Dudka <kdudka at redhat.com>
Date: Wed Oct 31 11:45:28 2012 +0100
new upstream release - 7.28.0
0001-curl-7.27.0-1f8518c5.patch | 34 ----
0002-curl-7.27.0-f05e5136.patch | 197 --------------------
...7.0-debug.patch => 0102-curl-7.28.0-debug.patch | 15 ++-
....27.0-utf8.patch => 0108-curl-7.28.0-utf8.patch | 41 +++--
curl-7.27.0.tar.lzma.asc | 7 -
curl-7.28.0.tar.lzma.asc | 7 +
curl.spec | 24 +--
sources | 2 +-
8 files changed, 56 insertions(+), 271 deletions(-)
---
diff --git a/0102-curl-7.27.0-debug.patch b/0102-curl-7.28.0-debug.patch
similarity index 84%
rename from 0102-curl-7.27.0-debug.patch
rename to 0102-curl-7.28.0-debug.patch
index 0f10d40..c6a5277 100644
--- a/0102-curl-7.27.0-debug.patch
+++ b/0102-curl-7.28.0-debug.patch
@@ -1,12 +1,18 @@
+From 6710648c2b270c9ce68a7d9f1bba1222c7be8b58 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka at redhat.com>
+Date: Wed, 31 Oct 2012 11:38:30 +0100
+Subject: [PATCH] prevent configure script from discarding -g in CFLAGS (#496778)
+
+---
configure | 15 ++++-----------
m4/curl-compilers.m4 | 15 ++++-----------
2 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/configure b/configure
-index d3ecf69..6d8f085 100755
+index 8f079a3..53b4774 100755
--- a/configure
+++ b/configure
-@@ -15093,18 +15093,11 @@ $as_echo "yes" >&6; }
+@@ -15090,18 +15090,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`
@@ -30,7 +36,7 @@ index d3ecf69..6d8f085 100755
if test -z "$SED"; then
diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
-index 1ea4d17..868d65a 100644
+index 0cbba7a..9175b5b 100644
--- a/m4/curl-compilers.m4
+++ b/m4/curl-compilers.m4
@@ -148,18 +148,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [
@@ -56,3 +62,6 @@ index 1ea4d17..868d65a 100644
flags_opt_off="-O0"
CURL_CHECK_DEF([_WIN32], [], [silent])
else
+--
+1.7.1
+
diff --git a/0108-curl-7.27.0-utf8.patch b/0108-curl-7.28.0-utf8.patch
similarity index 72%
rename from 0108-curl-7.27.0-utf8.patch
rename to 0108-curl-7.28.0-utf8.patch
index b740b17..ac844bf 100644
--- a/0108-curl-7.27.0-utf8.patch
+++ b/0108-curl-7.28.0-utf8.patch
@@ -1,12 +1,29 @@
+From c6246783cf347652f70d95c0562dd411747e9d53 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka at redhat.com>
+Date: Wed, 31 Oct 2012 11:40:30 +0100
+Subject: [PATCH] Fix character encoding of docs
+
+..., which are of mixed encoding originally so a simple iconv can't
+fix them.
+---
CHANGES | 16 ++++++++--------
README | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/CHANGES b/CHANGES
-index 2335841..d4d37c2 100644
+index 4568408..5fc1652 100644
--- a/CHANGES
+++ b/CHANGES
-@@ -272,7 +272,7 @@ Daniel Stenberg (9 Jul 2012)
+@@ -338,7 +338,7 @@ Daniel Stenberg (8 Sep 2012)
+
+ - test1411: verify SMTP without SIZE support
+
+-- [František Kučera brought this change]
++- [FrantiÅ¡ek KuÄera brought this change]
+
+ SMTP: only send SIZE if supported
+
+@@ -1094,7 +1094,7 @@ Daniel Stenberg (9 Jul 2012)
- cookie: fixed typo in comment
@@ -15,7 +32,7 @@ index 2335841..d4d37c2 100644
https_getsock: provided for schannel backend as well
-@@ -454,7 +454,7 @@ Yang Tse (3 Jul 2012)
+@@ -1276,7 +1276,7 @@ Yang Tse (3 Jul 2012)
testcurl.pl: fix missing semicolon
Daniel Stenberg (2 Jul 2012)
@@ -24,7 +41,7 @@ index 2335841..d4d37c2 100644
unicode NTLM SSPI: heap corruption fixed
-@@ -2563,18 +2563,18 @@ Daniel Stenberg (1 Apr 2012)
+@@ -3385,18 +3385,18 @@ Daniel Stenberg (1 Apr 2012)
Reported by: Michael Wallner
Steve Holme (31 Mar 2012)
@@ -46,7 +63,7 @@ index 2335841..d4d37c2 100644
md5: Add support for calculating the md5 sum of buffers incrementally
-@@ -3866,7 +3866,7 @@ Daniel Stenberg (20 Dec 2011)
+@@ -4688,7 +4688,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.
@@ -55,7 +72,7 @@ index 2335841..d4d37c2 100644
curl.h: add __ANDROID__ macro check
-@@ -4079,7 +4079,7 @@ Daniel Stenberg (12 Dec 2011)
+@@ -4901,7 +4901,7 @@ Daniel Stenberg (12 Dec 2011)
linking with a static openssl requires a set of more libs to be linked
on Windows.
@@ -64,15 +81,6 @@ index 2335841..d4d37c2 100644
Bug: http://curl.haxx.se/mail/lib-2011-12/0063.html
Reported by: Ward Willats
-@@ -5333,7 +5333,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
diff --git a/README b/README
index 2ffacc3..cfd6760 100644
--- a/README
@@ -84,3 +92,6 @@ index 2ffacc3..cfd6760 100644
- 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.
+--
+1.7.1
+
diff --git a/curl-7.28.0.tar.lzma.asc b/curl-7.28.0.tar.lzma.asc
new file mode 100644
index 0000000..78c6110
--- /dev/null
+++ b/curl-7.28.0.tar.lzma.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+iEYEABECAAYFAlB11D8ACgkQeOEcayedXJFNwwCg6vTYyoB5HjHRmfk8qdCMfrfv
+HZ0AmgOtmiIPJvhrXxV7TtcByz9u5qm8
+=VJDk
+-----END PGP SIGNATURE-----
diff --git a/curl.spec b/curl.spec
index abfe50e..c34ef0e 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,24 +1,18 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl
-Version: 7.27.0
-Release: 3%{?dist}
+Version: 7.28.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
-# eliminate unnecessary inotify events on upload via file protocol (#844385)
-Patch1: 0001-curl-7.27.0-1f8518c5.patch
-
-# do not crash if MD5 fingerprint is not provided by libssh2
-Patch2: 0002-curl-7.27.0-f05e5136.patch
-
# patch making libcurl multilib ready
Patch101: 0101-curl-7.27.0-multilib.patch
# prevent configure script from discarding -g in CFLAGS (#496778)
-Patch102: 0102-curl-7.27.0-debug.patch
+Patch102: 0102-curl-7.28.0-debug.patch
# use localhost6 instead of ip6-localhost in the curl test-suite
Patch104: 0104-curl-7.19.7-localhost6.patch
@@ -31,7 +25,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.27.0-utf8.patch
+Patch108: 0108-curl-7.28.0-utf8.patch
Provides: webclient
URL: http://curl.haxx.se/
@@ -107,8 +101,6 @@ documentation of the library, too.
%setup -q
# upstream patches
-%patch1 -p1
-%patch2 -p1
# Fedora patches
%patch101 -p1
@@ -123,8 +115,9 @@ cd tests/data/
sed -i s/899\\\([0-9]\\\)/%{?__isa_bits}9\\1/ test*
cd -
-# disable test 1112 (#565305)
-echo "1112" >> tests/data/DISABLED
+# disable test 1112 (#565305) and test 2032
+# <http://thread.gmane.org/gmane.comp.web.curl.library/37087>
+printf "1112\n2032\n" >> tests/data/DISABLED
# disable test 1319 on ppc64 (server times out)
%ifarch ppc64
@@ -232,6 +225,9 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4
%changelog
+* Wed Oct 31 2012 Kamil Dudka <kdudka at redhat.com> 7.28.0-1
+- new upstream release
+
* Mon Oct 01 2012 Kamil Dudka <kdudka at redhat.com> 7.27.0-3
- use the upstream facility to disable problematic tests
- do not crash if MD5 fingerprint is not provided by libssh2
diff --git a/sources b/sources
index f8267ed..21c0b03 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1b669875527ba4b943a0cdb5b255a02c curl-7.27.0.tar.lzma
+f8a9f99d9db71d8ce1d2c4ccea3c3850 curl-7.28.0.tar.lzma
More information about the scm-commits
mailing list