[curl] new upstream release - 7.32.0
Kamil Dudka
kdudka at fedoraproject.org
Mon Aug 12 13:40:16 UTC 2013
commit c12a28f9b8beeadd7316558fb4d556e47910c2b6
Author: Kamil Dudka <kdudka at redhat.com>
Date: Mon Aug 12 13:50:13 2013 +0200
new upstream release - 7.32.0
0001-curl-7.31.0-02964ed6.patch | 26 ----
0002-curl-7.31.0-abca89aa.patch | 37 ------
0003-curl-7.31.0-3a0e931f.patch | 129 --------------------
...ltilib.patch => 0101-curl-7.32.0-multilib.patch | 12 +-
...1.0-debug.patch => 0102-curl-7.32.0-debug.patch | 2 +-
...talink.patch => 0103-curl-7.32.0-metalink.patch | 2 +-
0108-curl-7.31.0-utf8.patch | 39 ------
0108-curl-7.32.0-utf8.patch | 25 ++++
curl-7.31.0.tar.lzma.asc | 7 -
curl-7.32.0.tar.lzma.asc | 7 +
curl.spec | 29 ++---
sources | 2 +-
12 files changed, 51 insertions(+), 266 deletions(-)
---
diff --git a/0101-curl-7.31.0-multilib.patch b/0101-curl-7.32.0-multilib.patch
similarity index 91%
rename from 0101-curl-7.31.0-multilib.patch
rename to 0101-curl-7.32.0-multilib.patch
index 57cd565..9e9b56b 100644
--- a/0101-curl-7.31.0-multilib.patch
+++ b/0101-curl-7.32.0-multilib.patch
@@ -40,12 +40,12 @@ index 150004d..95d0759 100644
;;
--static-libs)
-- if test "X at ENABLE_STATIC@" != "Xno" ; then
-- echo @libdir@/libcurl. at libext@ @LDFLAGS@ @LIBCURL_LIBS@
-- else
-- echo "curl was built with static libraries disabled" >&2
-- exit 1
-- fi
+- if test "X at ENABLE_STATIC@" != "Xno" ; then
+- echo @libdir@/libcurl. at libext@ @LDFLAGS@ @LIBCURL_LIBS@
+- else
+- echo "curl was built with static libraries disabled" >&2
+- exit 1
+- fi
;;
--configure)
diff --git a/0102-curl-7.31.0-debug.patch b/0102-curl-7.32.0-debug.patch
similarity index 97%
rename from 0102-curl-7.31.0-debug.patch
rename to 0102-curl-7.32.0-debug.patch
index b2ef40a..1ca6cdb 100644
--- a/0102-curl-7.31.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
-@@ -16020,18 +16020,11 @@ $as_echo "yes" >&6; }
+@@ -16030,18 +16030,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.31.0-metalink.patch b/0103-curl-7.32.0-metalink.patch
similarity index 98%
rename from 0103-curl-7.31.0-metalink.patch
rename to 0103-curl-7.32.0-metalink.patch
index 650eb26..3bb0af7 100644
--- a/0103-curl-7.31.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
-@@ -15485,13 +15485,9 @@ fi
+@@ -15495,13 +15495,9 @@ fi
diff --git a/0108-curl-7.32.0-utf8.patch b/0108-curl-7.32.0-utf8.patch
new file mode 100644
index 0000000..c6d0cc7
--- /dev/null
+++ b/0108-curl-7.32.0-utf8.patch
@@ -0,0 +1,25 @@
+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.
+---
+ README | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+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.
+--
+1.7.1
+
diff --git a/curl-7.32.0.tar.lzma.asc b/curl-7.32.0.tar.lzma.asc
new file mode 100644
index 0000000..53a4e45
--- /dev/null
+++ b/curl-7.32.0.tar.lzma.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.14 (GNU/Linux)
+
+iEYEABECAAYFAlIIDT4ACgkQeOEcayedXJFOBwCfSGwELnEOcuFSS7Witjk2EFwM
+gdcAoPi/rwCi3U6B73B5p+/jR360V2e6
+=VRTg
+-----END PGP SIGNATURE-----
diff --git a/curl.spec b/curl.spec
index 7753dcb..438bb8b 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,29 +1,20 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl
-Version: 7.31.0
-Release: 5%{?dist}
+Version: 7.32.0
+Release: 1%{?dist}
License: MIT
Group: Applications/Internet
Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
Source2: curlbuild.h
-# test1230: avoid using hard-wired port number
-Patch1: 0001-curl-7.31.0-02964ed6.patch
-
-# restore the functionality of 'curl -u :'
-Patch2: 0002-curl-7.31.0-abca89aa.patch
-
-# mention all option listed in 'curl --help' in curl.1 man page
-Patch3: 0003-curl-7.31.0-3a0e931f.patch
-
# patch making libcurl multilib ready
-Patch101: 0101-curl-7.31.0-multilib.patch
+Patch101: 0101-curl-7.32.0-multilib.patch
# prevent configure script from discarding -g in CFLAGS (#496778)
-Patch102: 0102-curl-7.31.0-debug.patch
+Patch102: 0102-curl-7.32.0-debug.patch
# make the curl tool link SSL libraries also used by src/tool_metalink.c
-Patch103: 0103-curl-7.31.0-metalink.patch
+Patch103: 0103-curl-7.32.0-metalink.patch
# use localhost6 instead of ip6-localhost in the curl test-suite
Patch104: 0104-curl-7.19.7-localhost6.patch
@@ -36,7 +27,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.31.0-utf8.patch
+Patch108: 0108-curl-7.32.0-utf8.patch
Provides: webclient
URL: http://curl.haxx.se/
@@ -113,9 +104,6 @@ documentation of the library, too.
%setup -q
# upstream patches
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
# Fedora patches
%patch101 -p1
@@ -237,13 +225,16 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/aclocal/libcurl.m4
%changelog
+* Mon Aug 12 2013 Kamil Dudka <kdudka at redhat.com> 7.32.0-1
+- new upstream release
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.31.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Tue Jul 09 2013 Kamil Dudka <kdudka at redaht.com> 7.31.0-4
- mention all option listed in 'curl --help' in curl.1 man page
-* Tue Jul 01 2013 Kamil Dudka <kdudka at redhat.com> 7.31.0-3
+* Tue Jul 02 2013 Kamil Dudka <kdudka at redhat.com> 7.31.0-3
- restore the functionality of 'curl -u :'
* Wed Jun 26 2013 Kamil Dudka <kdudka at redhat.com> 7.31.0-2
diff --git a/sources b/sources
index 891eca4..986f50f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-996c1a5004d96cb4baa3f4e1985058b8 curl-7.31.0.tar.lzma
+db5948f44e7ef3edbf9a7907af9556ac curl-7.32.0.tar.lzma
More information about the scm-commits
mailing list