[mingw-curl] Update to 7.25.0
Erik van Pienbroek
epienbro at fedoraproject.org
Sun Apr 8 11:28:29 UTC 2012
commit 9424c5715385881d4c170d1b9bc532ee0cb7d02e
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Sun Apr 8 13:28:09 2012 +0200
Update to 7.25.0
- Update to 7.25.0
- Dropped upstreamed patches
- Dropped unneeded RPM tags
0101-curl-7.25.0-multilib.patch | 72 ++
0102-curl-7.25.0-debug.patch | 58 ++
0104-curl-7.19.7-localhost6.patch | 51 +
0105-curl-7.21.3-disable-test1112.patch | 30 +
0106-curl-7.21.0-libssh2-valgrind.patch | 31 +
0107-curl-7.21.4-libidn-valgrind.patch | 26 +
curl-7.19.4-debug.patch | 19 -
curl-7.20.0-disable-test1112.patch | 16 -
curl-7.20.0-e32fe30.patch | 28 -
curl-7.20.0-multilib.patch | 63 --
curl-7.20.1-82e9b78.patch | 51 -
curl-7.20.1-crl-test.patch | 1543 -------------------------------
curl-7.20.1-crl.patch | 222 -----
curl-7.20.1-d487ade.patch | 236 -----
curl-7.20.1-test-delay.patch | 24 -
curl-7.20.1-threaded-dns.patch | 35 -
mingw-curl.spec | 99 +--
17 files changed, 292 insertions(+), 2312 deletions(-)
---
diff --git a/0101-curl-7.25.0-multilib.patch b/0101-curl-7.25.0-multilib.patch
new file mode 100644
index 0000000..b49c955
--- /dev/null
+++ b/0101-curl-7.25.0-multilib.patch
@@ -0,0 +1,72 @@
+ curl-config.in | 16 +++-------------
+ docs/curl-config.1 | 4 +++-
+ libcurl.pc.in | 1 +
+ 3 files changed, 7 insertions(+), 14 deletions(-)
+
+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
+ ;;
+
+ --cc)
+- echo "@CC@"
++ echo "gcc"
+ ;;
+
+ --prefix)
+@@ -136,24 +136,14 @@ while test $# -gt 0; do
+ ;;
+
+ --libs)
+- if test "X at libdir@" != "X/usr/lib" -a "X at libdir@" != "X/usr/lib64"; then
+- CURLLIBDIR="-L at libdir@ "
+- else
+- CURLLIBDIR=""
+- fi
+- if test "X at REQUIRE_LIB_DEPS@" = "Xyes"; then
+- echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@ @LIBS@
+- else
+- echo ${CURLLIBDIR}-lcurl @LIBS@
+- fi
++ pkg-config libcurl --libs
+ ;;
+
+ --static-libs)
+- echo @libdir@/libcurl. at libext@ @LDFLAGS@ @LIBCURL_LIBS@ @LIBS@
+ ;;
+
+ --configure)
+- echo @CONFIGURE_OPTIONS@
++ pkg-config libcurl --variable=configure_options | sed 's/^"//;s/"$//'
+ ;;
+
+ *)
+diff --git a/docs/curl-config.1 b/docs/curl-config.1
+index c4f4e2b..3e0ea60 100644
+--- a/docs/curl-config.1
++++ b/docs/curl-config.1
+@@ -65,7 +65,9 @@ be listed using uppercase and are separa
+ one, or several protocols in the list. (Added in 7.13.0)
+ .IP "--static-libs"
+ Shows the complete set of libs and other linker options you will need in order
+-to link your application with libcurl statically. (Added in 7.17.1)
++to link your application with libcurl statically. Note that Fedora/RHEL libcurl
++packages do not provide any static libraries, thus cannot be linked statically.
++(Added in 7.17.1)
+ .IP "--version"
+ Outputs version information about the installed libcurl.
+ .IP "--vernum"
+diff --git a/libcurl.pc.in b/libcurl.pc.in
+index 2ba9c39..f8f8b00 100644
+--- a/libcurl.pc.in
++++ b/libcurl.pc.in
+@@ -29,6 +29,7 @@ libdir=@libdir@
+ includedir=@includedir@
+ supported_protocols="@SUPPORT_PROTOCOLS@"
+ supported_features="@SUPPORT_FEATURES@"
++configure_options=@CONFIGURE_OPTIONS@
+
+ Name: libcurl
+ URL: http://curl.haxx.se/
diff --git a/0102-curl-7.25.0-debug.patch b/0102-curl-7.25.0-debug.patch
new file mode 100644
index 0000000..8056f53
--- /dev/null
+++ b/0102-curl-7.25.0-debug.patch
@@ -0,0 +1,58 @@
+ configure | 15 ++++-----------
+ m4/curl-compilers.m4 | 15 ++++-----------
+ 2 files changed, 8 insertions(+), 22 deletions(-)
+
+diff --git a/configure b/configure
+index d3ecf69..6d8f085 100755
+--- a/configure
++++ b/configure
+@@ -15045,18 +15045,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`
+- flags_dbg_all="-g -g0 -g1 -g2 -g3"
+- flags_dbg_all="$flags_dbg_all -ggdb"
+- flags_dbg_all="$flags_dbg_all -gstabs"
+- flags_dbg_all="$flags_dbg_all -gstabs+"
+- flags_dbg_all="$flags_dbg_all -gcoff"
+- flags_dbg_all="$flags_dbg_all -gxcoff"
+- flags_dbg_all="$flags_dbg_all -gdwarf-2"
+- flags_dbg_all="$flags_dbg_all -gvms"
++ flags_dbg_all=""
+ flags_dbg_yes="-g"
+- flags_dbg_off="-g0"
+- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
+- flags_opt_yes="-O2"
++ flags_dbg_off=""
++ flags_opt_all=""
++ flags_opt_yes=""
+ flags_opt_off="-O0"
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
+index 1ea4d17..868d65a 100644
+--- a/m4/curl-compilers.m4
++++ b/m4/curl-compilers.m4
+@@ -148,18 +148,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [
+ gccvhi=`echo $gccver | cut -d . -f1`
+ gccvlo=`echo $gccver | cut -d . -f2`
+ compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
+- flags_dbg_all="-g -g0 -g1 -g2 -g3"
+- flags_dbg_all="$flags_dbg_all -ggdb"
+- flags_dbg_all="$flags_dbg_all -gstabs"
+- flags_dbg_all="$flags_dbg_all -gstabs+"
+- flags_dbg_all="$flags_dbg_all -gcoff"
+- flags_dbg_all="$flags_dbg_all -gxcoff"
+- flags_dbg_all="$flags_dbg_all -gdwarf-2"
+- flags_dbg_all="$flags_dbg_all -gvms"
++ flags_dbg_all=""
+ flags_dbg_yes="-g"
+- flags_dbg_off="-g0"
+- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os"
+- flags_opt_yes="-O2"
++ flags_dbg_off=""
++ flags_opt_all=""
++ flags_opt_yes=""
+ flags_opt_off="-O0"
+ else
+ AC_MSG_RESULT([no])
diff --git a/0104-curl-7.19.7-localhost6.patch b/0104-curl-7.19.7-localhost6.patch
new file mode 100644
index 0000000..4f664d3
--- /dev/null
+++ b/0104-curl-7.19.7-localhost6.patch
@@ -0,0 +1,51 @@
+diff --git a/tests/data/test1083 b/tests/data/test1083
+index e441278..b0958b6 100644
+--- a/tests/data/test1083
++++ b/tests/data/test1083
+@@ -33,13 +33,13 @@ ipv6
+ http-ipv6
+ </server>
+ <name>
+-HTTP-IPv6 GET with ip6-localhost --interface
++HTTP-IPv6 GET with localhost6 --interface
+ </name>
+ <command>
+--g "http://%HOST6IP:%HTTP6PORT/1083" --interface ip6-localhost
++-g "http://%HOST6IP:%HTTP6PORT/1083" --interface localhost6
+ </command>
+ <precheck>
+-perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test server host address';} else {exec './server/resolve --ipv6 ip6-localhost'; print 'Cannot run precheck resolve';}"
++perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test server host address';} else {exec './server/resolve --ipv6 localhost6'; print 'Cannot run precheck resolve';}"
+ </precheck>
+ </client>
+
+diff --git a/tests/data/test241 b/tests/data/test241
+index 46eae1f..4e1632c 100644
+--- a/tests/data/test241
++++ b/tests/data/test241
+@@ -30,13 +30,13 @@ ipv6
+ http-ipv6
+ </server>
+ <name>
+-HTTP-IPv6 GET (using ip6-localhost)
++HTTP-IPv6 GET (using localhost6)
+ </name>
+ <command>
+--g "http://ip6-localhost:%HTTP6PORT/241"
++-g "http://localhost6:%HTTP6PORT/241"
+ </command>
+ <precheck>
+-./server/resolve --ipv6 ip6-localhost
++./server/resolve --ipv6 localhost6
+ </precheck>
+ </client>
+
+@@ -48,7 +48,7 @@ HTTP-IPv6 GET (using ip6-localhost)
+ </strip>
+ <protocol>
+ GET /241 HTTP/1.1
+-Host: ip6-localhost:%HTTP6PORT
++Host: localhost6:%HTTP6PORT
+ Accept: */*
+
+ </protocol>
diff --git a/0105-curl-7.21.3-disable-test1112.patch b/0105-curl-7.21.3-disable-test1112.patch
new file mode 100644
index 0000000..d2367a9
--- /dev/null
+++ b/0105-curl-7.21.3-disable-test1112.patch
@@ -0,0 +1,30 @@
+ 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 9370974..b553f54 100644
+--- a/tests/data/Makefile.am
++++ b/tests/data/Makefile.am
+@@ -73,7 +73,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 \
+-test1110 test1111 test1112 test1113 test1114 test1115 test1116 test1117 \
++test1110 test1111 test1113 test1114 test1115 test1116 test1117 \
+ test1118 test1119 test1120 test1121 test1122 test1123 test1124 test1125 \
+ test1126 test1127 test1128 test1129 test1130 test1131 \
+ test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \
+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 \
+ test1086 test1087 test1088 test1089 test1090 test1091 test1092 test1093 \
+ test1094 test1095 test1096 test1097 test1098 test1099 test1100 test1101 \
+ test1102 test1103 test1104 test1105 test1106 test1107 test1108 test1109 \
+-test1110 test1111 test1112 test1113 test1114 test1115 test1116 test1117 \
++test1110 test1111 test1113 test1114 test1115 test1116 test1117 \
+ test1118 test1119 test1120 test1121 test1122 test1123 test1124 test1125 \
+ test1126 test1127 test1128 test1129 test1130 test1131 \
+ test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \
diff --git a/0106-curl-7.21.0-libssh2-valgrind.patch b/0106-curl-7.21.0-libssh2-valgrind.patch
new file mode 100644
index 0000000..2b8cb38
--- /dev/null
+++ b/0106-curl-7.21.0-libssh2-valgrind.patch
@@ -0,0 +1,31 @@
+ tests/data/test604 | 3 +++
+ tests/data/test623 | 4 +++-
+ 2 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/tests/data/test604 b/tests/data/test604
+index af0259f..2bcf7d1 100644
+--- a/tests/data/test604
++++ b/tests/data/test604
+@@ -26,5 +26,8 @@ SFTP retrieval of nonexistent file
+ <errorcode>
+ 78
+ </errorcode>
++<valgrind>
++disable
++</valgrind>
+ </verify>
+ </testcase>
+diff --git a/tests/data/test623 b/tests/data/test623
+index 19e505b..38a41d2 100644
+--- a/tests/data/test623
++++ b/tests/data/test623
+@@ -36,6 +36,8 @@ for ssh upload test
+ <errorcode>
+ 79
+ </errorcode>
+-
++<valgrind>
++disable
++</valgrind>
+ </verify>
+ </testcase>
diff --git a/0107-curl-7.21.4-libidn-valgrind.patch b/0107-curl-7.21.4-libidn-valgrind.patch
new file mode 100644
index 0000000..719b3a6
--- /dev/null
+++ b/0107-curl-7.21.4-libidn-valgrind.patch
@@ -0,0 +1,26 @@
+From d6c42a5bf66d4d458b20836573d6989e53f7d423 Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka at redhat.com>
+Date: Fri, 18 Feb 2011 17:49:59 +0100
+Subject: [PATCH] curl: work around valgrind bug (RHBZ#678518)
+
+https://bugs.kde.org/show_bug.cgi?id=264936
+---
+ tests/data/test165 | 3 +++
+ 1 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/tests/data/test165 b/tests/data/test165
+index ddfe1e9..b2cbc4f 100644
+--- a/tests/data/test165
++++ b/tests/data/test165
+@@ -54,5 +54,8 @@ Accept: */*
+ Proxy-Connection: Keep-Alive
+
+ </protocol>
++<valgrind>
++disable
++</valgrind>
+ </verify>
+ </testcase>
+--
+1.7.4
+
diff --git a/mingw-curl.spec b/mingw-curl.spec
index cfcb1f2..7b863aa 100644
--- a/mingw-curl.spec
+++ b/mingw-curl.spec
@@ -3,8 +3,8 @@
%define __debug_install_post %{mingw32_debug_install_post}
Name: mingw-curl
-Version: 7.20.1
-Release: 7%{?dist}
+Version: 7.25.0
+Release: 1%{?dist}
Summary: MinGW Windows port of curl and libcurl
License: MIT
@@ -18,57 +18,27 @@ BuildArch: noarch
# Patches from native Fedora package.
#
-# upstream commit e32fe30d0cf7c1f7045ac0bd29322e7fb4feb5c8
-Patch0: curl-7.20.0-e32fe30.patch
-
-# upstream commit d487ade72c5f31703ce097e8460e0225fad80348
-Patch1: curl-7.20.1-d487ade.patch
-
-# upstream commit 82e9b78a388ab539c8784cd853adf6e4a97d52c5
-Patch2: curl-7.20.1-82e9b78.patch
-
-# rhbz #581926
-# upstream commit 2e8b21833a581cc5389833ec4fdeeaa6fb7be538
-# upstream commit 3e759f4fb6018b353bd4a1d608be3a3d7b2c9645
-# upstream commit 016ce4b1daa0f8d44a0da7105e1e1c97531e8b87
-Patch3: curl-7.20.1-crl.patch
-
-# rhbz #581926 - test-case
-# http://curl.haxx.se/mail/lib-2010-04/0214.html
-# (the CA pass phrase used in the patch is 'libcurl')
-Patch4: curl-7.20.1-crl-test.patch
-
# patch making libcurl multilib ready
-Patch101: curl-7.20.0-multilib.patch
-
-# force -lrt when linking the curl tool and test-cases
-#Patch102: curl-7.20.0-lrt.patch
+Patch101: 0101-curl-7.25.0-multilib.patch
# prevent configure script from discarding -g in CFLAGS (#496778)
-Patch103: curl-7.19.4-debug.patch
-
-# suppress occasional failure of curl test-suite on s390; caused more likely
-# by the test-suite infrastructure than (lib)curl itself
-# http://curl.haxx.se/mail/lib-2009-12/0031.html
-Patch104: curl-7.20.1-test-delay.patch
+Patch102: 0102-curl-7.25.0-debug.patch
# use localhost6 instead of ip6-localhost in the curl test-suite
-Patch105: curl-7.19.7-localhost6.patch
-
-# experimentally enabled threaded DNS lookup
-Patch106: curl-7.20.1-threaded-dns.patch
+Patch104: 0104-curl-7.19.7-localhost6.patch
# exclude test1112 from the test suite (#565305)
-Patch107: curl-7.20.0-disable-test1112.patch
+Patch105: 0105-curl-7.21.3-disable-test1112.patch
+
+# disable valgrind for certain test-cases (libssh2 problem)
+Patch106: 0106-curl-7.21.0-libssh2-valgrind.patch
-# Curl tries to implement the ftruncate64 function while mingw-w64 already
-# provides an implementation for this function
-Patch108: curl-dont-implement-ftruncate64.patch
+# work around valgrind bug (#678518)
+Patch107: 0107-curl-7.21.4-libidn-valgrind.patch
-# Curl wants to map various errno/WSA error codes to its own interpration
-# Let curl do this without conflicting with the errno/WSA error codes defined
-# in the mingw-w64 headers
-Patch109: curl-undef-mingw-error-codes.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
#
# End of native patches
@@ -132,41 +102,17 @@ Static version of the MinGW Windows Curl library.
%prep
%setup -q -n curl-%{version}
-# Convert docs to UTF-8
-# NOTE: we do this _before_ applying of all patches, which are already UTF-8
-for f in CHANGES README; do
- iconv -f iso-8859-1 -t utf8 < ${f} > ${f}.utf8
- mv -f ${f}.utf8 ${f}
-done
-
-# revert an upstream commit which breaks Fedora builds
-%patch0 -p1 -R
-
-# upstream patches (already applied)
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-# upstream patches (not yet applied)
-%patch4 -p1
-
-# Fedora patches
%patch101 -p1
#%patch102 -p1
-%patch103 -p1
%patch104 -p1
-%patch105 -p1
%patch106 -p1
+%patch107 -p1
+%patch108 -p1
# exclude test1112 from the test suite (#565305)
-%patch107 -p1
+%patch105 -p1
rm -f tests/data/test1112
-%patch108 -p0
-%patch109 -p0
-
-autoreconf
-
# replace hard wired port numbers in the test suite
sed -i s/899\\\([0-9]\\\)/%{?__isa_bits}9\\1/ tests/data/test*
@@ -197,10 +143,10 @@ sed -i s/899\\\([0-9]\\\)/%{?__isa_bits}9\\1/ tests/data/test*
# The ./configure scripts lacks a check for Win32 threads
# As this breaks compilation of async DNS resolving we add a small hack here
-echo "#define USE_THREADS_WIN32 1" >> lib/curl_config.h
+#echo "#define USE_THREADS_WIN32 1" >> lib/curl_config.h
# Prevent a possible conflict when mingw32-pthreads is installed
-sed -i s/'#define USE_THREADS_POSIX 1'// lib/curl_config.h
+#sed -i s/'#define USE_THREADS_POSIX 1'// lib/curl_config.h
make %{?_smp_mflags}
@@ -220,7 +166,6 @@ rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/curl.exe
%files -n mingw32-curl
-%defattr(-,root,root,-)
%doc COPYING
%{mingw32_bindir}/curl-config
%{mingw32_bindir}/libcurl-4.dll
@@ -230,11 +175,15 @@ rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/curl.exe
%files -n mingw32-curl-static
-%defattr(-,root,root,-)
%{mingw32_libdir}/libcurl.a
%changelog
+* Sun Apr 08 2012 Erik van Pienbroek <epienbro at fedoraproject.org> - 7.25.0-1
+- Update to 7.25.0
+- Dropped upstreamed patches
+- Dropped unneeded RPM tags
+
* Fri Mar 09 2012 Kalev Lember <kalevlember at gmail.com> - 7.20.1-7
- Remove .la files
More information about the scm-commits
mailing list