From c88a6aff3021debacb21f4639b36b23886d0c962 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Wed, 29 Apr 2020 09:51:03 +0200 Subject: [PATCH] new upstream release - 7.70.0 --- 0001-curl-7.69.1-ssh-ecdsa-keys.patch | 47 ------------------ 0001-curl-7.70.0-tests-build-dir.patch | 63 +++++++++++++++++++++++++ 0102-curl-7.36.0-debug.patch | 53 +-------------------- 0103-curl-7.59.0-python3.patch | 34 ------------- 0105-curl-7.63.0-lib1560-valgrind.patch | 2 +- curl-7.69.1.tar.xz.asc | 11 ----- curl-7.70.0.tar.xz.asc | 11 +++++ curl.spec | 23 +++++---- sources | 2 +- 9 files changed, 89 insertions(+), 157 deletions(-) delete mode 100644 0001-curl-7.69.1-ssh-ecdsa-keys.patch create mode 100644 0001-curl-7.70.0-tests-build-dir.patch delete mode 100644 0103-curl-7.59.0-python3.patch delete mode 100644 curl-7.69.1.tar.xz.asc create mode 100644 curl-7.70.0.tar.xz.asc diff --git a/0001-curl-7.69.1-ssh-ecdsa-keys.patch b/0001-curl-7.69.1-ssh-ecdsa-keys.patch deleted file mode 100644 index e354299..0000000 --- a/0001-curl-7.69.1-ssh-ecdsa-keys.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e7bd08d289e55c9080590c1147df6584ec881523 Mon Sep 17 00:00:00 2001 -From: Anderson Toshiyuki Sasaki -Date: Thu, 16 Apr 2020 19:26:06 +0200 -Subject: [PATCH] libssh: Use new ECDSA key types to check known hosts - -From libssh 0.9.0, ssh_key_type() returns different key types for ECDSA -keys depending on the curve. - -Signed-off-by: Anderson Toshiyuki Sasaki -Fixes #5252 -Closes #5253 - -Upstream-commit: 14bf7eb6e526f7ce0c60c1c972b4d935c1c5132d -Signed-off-by: Kamil Dudka ---- - lib/vssh/libssh.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/lib/vssh/libssh.c b/lib/vssh/libssh.c -index 08d9f9e0f..54bc5e019 100644 ---- a/lib/vssh/libssh.c -+++ b/lib/vssh/libssh.c -@@ -403,6 +403,9 @@ static int myssh_is_known(struct connectdata *conn) - knownkey.keytype = CURLKHTYPE_RSA1; - break; - case SSH_KEYTYPE_ECDSA: -+ case SSH_KEYTYPE_ECDSA_P256: -+ case SSH_KEYTYPE_ECDSA_P384: -+ case SSH_KEYTYPE_ECDSA_P521: - knownkey.keytype = CURLKHTYPE_ECDSA; - break; - case SSH_KEYTYPE_ED25519: -@@ -470,6 +473,11 @@ static int myssh_is_known(struct connectdata *conn) - foundkey.keytype = CURLKHTYPE_RSA1; - break; - case SSH_KEYTYPE_ECDSA: -+#if LIBSSH_VERSION_INT >= SSH_VERSION_INT(0,9,0) -+ case SSH_KEYTYPE_ECDSA_P256: -+ case SSH_KEYTYPE_ECDSA_P384: -+ case SSH_KEYTYPE_ECDSA_P521: -+#endif - foundkey.keytype = CURLKHTYPE_ECDSA; - break; - #if LIBSSH_VERSION_INT >= SSH_VERSION_INT(0,7,0) --- -2.21.1 - diff --git a/0001-curl-7.70.0-tests-build-dir.patch b/0001-curl-7.70.0-tests-build-dir.patch new file mode 100644 index 0000000..b4c2d16 --- /dev/null +++ b/0001-curl-7.70.0-tests-build-dir.patch @@ -0,0 +1,63 @@ +From a6d36d6795d18895a63ced7b01a2b1ba2e9e04e5 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Wed, 29 Apr 2020 13:26:14 +0200 +Subject: [PATCH 1/2] tests: look for preprocessed tests in build directory + +... which is not always the same directory as source directory + +Closes #5310 + +Upstream-commit: 1066f5f0d4b304f7ba46f912cf13e12f45e39553 +Signed-off-by: Kamil Dudka +--- + tests/server/util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/server/util.c b/tests/server/util.c +index f576b9c..09bb515 100644 +--- a/tests/server/util.c ++++ b/tests/server/util.c +@@ -199,7 +199,7 @@ FILE *test2fopen(long testno) + FILE *stream; + char filename[256]; + /* first try the alternative, preprocessed, file */ +- msnprintf(filename, sizeof(filename), ALTTEST_DATA_PATH, path, testno); ++ msnprintf(filename, sizeof(filename), ALTTEST_DATA_PATH, ".", testno); + stream = fopen(filename, "rb"); + if(stream) + return stream; +-- +2.21.1 + + +From 540709d145c875c4cf67ce0c7acd6416c05f773c Mon Sep 17 00:00:00 2001 +From: Kamil Dudka +Date: Wed, 29 Apr 2020 13:27:20 +0200 +Subject: [PATCH 2/2] test1177: look for curl.h in source directory + +If we use a separate build directory, there is no copy of the header. + +Closes #5310 + +Upstream-commit: 68774da9ca5f39dbb403d63a7d9326b28263bdcb +Signed-off-by: Kamil Dudka +--- + tests/data/test1177 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/data/test1177 b/tests/data/test1177 +index 75a1ab3..85b520c 100644 +--- a/tests/data/test1177 ++++ b/tests/data/test1177 +@@ -18,7 +18,7 @@ Verify that CURL_VERSION_* in headers and docs are in sync + + + +-%SRCDIR/version-scan.pl %SRCDIR/../docs/libcurl/curl_version_info.3 ../include/curl/curl.h ++%SRCDIR/version-scan.pl %SRCDIR/../docs/libcurl/curl_version_info.3 %SRCDIR/../include/curl/curl.h + + + +-- +2.21.1 + diff --git a/0102-curl-7.36.0-debug.patch b/0102-curl-7.36.0-debug.patch index 10180bf..c096d67 100644 --- a/0102-curl-7.36.0-debug.patch +++ b/0102-curl-7.36.0-debug.patch @@ -5,58 +5,9 @@ Subject: [PATCH] prevent configure script from discarding -g in CFLAGS (#496778) --- - configure | 26 ++++++-------------------- m4/curl-compilers.m4 | 26 ++++++-------------------- - 2 files changed, 12 insertions(+), 40 deletions(-) + 1 file changed, 6 insertions(+), 20 deletions(-) -diff --git a/configure b/configure -index d6d125f49..3eba7b15f 100755 ---- a/configure -+++ b/configure -@@ -16269,18 +16269,11 @@ $as_echo "no" >&6; } - clangvhi=`echo $clangver | cut -d . -f1` - clangvlo=`echo $clangver | cut -d . -f2` - compiler_num=`(expr $clangvhi "*" 100 + $clangvlo) 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="" -- flags_opt_all="-O -O0 -O1 -O2 -Os -O3 -O4" -- flags_opt_yes="-Os" -+ flags_opt_all="" -+ flags_opt_yes="" - flags_opt_off="-O0" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -@@ -16343,18 +16336,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="" -- flags_opt_all="-O -O0 -O1 -O2 -O3 -Os -Og -Ofast" -- flags_opt_yes="-O2" -+ flags_opt_all="" -+ flags_opt_yes="" - flags_opt_off="-O0" - - OLDCPPFLAGS=$CPPFLAGS diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4 index c64db4bc6..d115a4aed 100644 --- a/m4/curl-compilers.m4 @@ -83,7 +34,7 @@ index c64db4bc6..d115a4aed 100644 flags_opt_off="-O0" else AC_MSG_RESULT([no]) -@@ -166,18 +159,11 @@ AC_DEFUN([CURL_CHECK_COMPILER_GNU_C], [ +@@ -175,18 +168,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` diff --git a/0103-curl-7.59.0-python3.patch b/0103-curl-7.59.0-python3.patch deleted file mode 100644 index 55bf4a9..0000000 --- a/0103-curl-7.59.0-python3.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 3c4c7340e455b7256c0786759422f34ec3e2d440 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Thu, 15 Mar 2018 14:49:56 +0100 -Subject: [PATCH] tests/{negtelnet,smb}server.py: migrate to Python 3 - -Unfortunately, smbserver.py does not work with Python 3 because -there is no 'impacket' module available for Python 3: - -https://github.com/CoreSecurity/impacket/issues/61 ---- - tests/negtelnetserver.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/negtelnetserver.py b/tests/negtelnetserver.py -index 8cfd409..72ee771 100755 ---- a/tests/negtelnetserver.py -+++ b/tests/negtelnetserver.py -@@ -73,11 +73,11 @@ class NegotiatingTelnetHandler(socketserver.BaseRequestHandler): - response_data = response.encode('ascii') - else: - log.debug("Received normal request - echoing back") -- response_data = data.strip() -+ response_data = data.decode('utf8').strip() - - if response_data: - log.debug("Sending %r", response_data) -- self.request.sendall(response_data) -+ self.request.sendall(response_data.encode('utf8')) - - except IOError: - log.exception("IOError hit during request") --- -2.14.3 - diff --git a/0105-curl-7.63.0-lib1560-valgrind.patch b/0105-curl-7.63.0-lib1560-valgrind.patch index 49a3bdd..933b289 100644 --- a/0105-curl-7.63.0-lib1560-valgrind.patch +++ b/0105-curl-7.63.0-lib1560-valgrind.patch @@ -26,7 +26,7 @@ diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index 080421b..ea3b806 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc -@@ -562,6 +562,7 @@ lib1559_SOURCES = lib1559.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +@@ -583,6 +583,7 @@ lib1559_SOURCES = lib1559.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1559_LDADD = $(TESTUTIL_LIBS) lib1560_SOURCES = lib1560.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) diff --git a/curl-7.69.1.tar.xz.asc b/curl-7.69.1.tar.xz.asc deleted file mode 100644 index 7607e60..0000000 --- a/curl-7.69.1.tar.xz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEJ+3q8i86vOtQ25oSXMkI/bceEsIFAl5oh44ACgkQXMkI/bce -EsL/5QgAlK2oYZTG3OQziHD8RtvjcRZyVfSPgH+UCEe12o+pqrWncWG5kVbFPjoX -USq8EEmRLaTdPPVY+lLZjrll0LgAHa5fyOYV5IFeKHHlRtGUsurMx+IW7NXg1kWn -lZXV/xzcogVeaqTZtJS1QQeyBxV55BEzwbO7WI7U3dQHKspE2724IqaGwHAj7BaL -K3hmHpBHuuGNpP5wsmnA0GXVLYSfqTJhc2itcupG8ZveNeEjCXPoRxGq/aewqUCH -UoT0tLu/LJ/D4FW1zGYdQXkli4MHKzTP9l2Tp/6ounEc+WpEirIRJLWRE8Wn/bmH -JjmSkls5sMCsmLl5DNoSUEw4Jco0oQ== -=+Rw4 ------END PGP SIGNATURE----- diff --git a/curl-7.70.0.tar.xz.asc b/curl-7.70.0.tar.xz.asc new file mode 100644 index 0000000..06df293 --- /dev/null +++ b/curl-7.70.0.tar.xz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEJ+3q8i86vOtQ25oSXMkI/bceEsIFAl6pGOwACgkQXMkI/bce +EsJJvggAoWbMdK1FfuTzNORxiW/UoJmT2HCjuN5nLzlObJbhYQWnKWRfE09c2j3C +g1GQJ6vUq452DFAYiWFnml4u1E9UVjmLVrsOzsBZD1EvbVaFQF9cP1UoURU7h9n/ +uTcNZ4oxuvnxYX0oDStEx9mVw63Gw+CtyUJoDNmzmVAk0sBfcCa3mRBZwhNnYPXU +dUxb6bpelcdTDJZGCJIzcmoidbS214GAGomLYrLhKlcYwU4aSKpERAnXK4TbiZjR +l30qG0HkrP1vQ1UKkUKLbuC4Fy27WgSqYBq/dY9ljmwAXb1txrsbHqA1RE3L4NyA +7uE/as3hskrUuVFidsTPwoAOPljJpw== +=g8R9 +-----END PGP SIGNATURE----- diff --git a/curl.spec b/curl.spec index 6b1e006..9d5932f 100644 --- a/curl.spec +++ b/curl.spec @@ -1,12 +1,12 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl -Version: 7.69.1 -Release: 3%{?dist} +Version: 7.70.0 +Release: 1%{?dist} License: MIT Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz -# SSH: use new ECDSA key types to check known hosts (#1824926) -Patch1: 0001-curl-7.69.1-ssh-ecdsa-keys.patch +# make test-suite work with separate build dir +Patch1: 0001-curl-7.70.0-tests-build-dir.patch # patch making libcurl multilib ready Patch101: 0101-curl-7.32.0-multilib.patch @@ -14,9 +14,6 @@ Patch101: 0101-curl-7.32.0-multilib.patch # prevent configure script from discarding -g in CFLAGS (#496778) Patch102: 0102-curl-7.36.0-debug.patch -# migrate tests/http_pipe.py to Python 3 -Patch103: 0103-curl-7.59.0-python3.patch - # use localhost6 instead of ip6-localhost in the curl test-suite Patch104: 0104-curl-7.19.7-localhost6.patch @@ -37,6 +34,7 @@ BuildRequires: libmetalink-devel BuildRequires: libnghttp2-devel BuildRequires: libpsl-devel BuildRequires: libssh-devel +BuildRequires: libtool BuildRequires: make BuildRequires: openldap-devel BuildRequires: openssh-clients @@ -172,23 +170,21 @@ be installed. %prep %setup -q -%patch1 -p1 # upstream patches +%patch1 -p1 # Fedora patches %patch101 -p1 %patch102 -p1 -%patch103 -p1 %patch104 -p1 %patch105 -p1 # make tests/*.py use Python 3 sed -e '1 s|^#!/.*python|#!%{__python3}|' -i tests/*.py -# regenerate Makefile.in files -aclocal -I m4 -automake +# regenerate the configure script and Makefile.in files +autoreconf -fiv # disable test 1112 (#565305), test 1455 (occasionally fails with 'bind failed # with errno 98: Address already in use' in Koji environment), and test 1801 @@ -350,6 +346,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la %{_libdir}/libcurl.so.4.[0-9].[0-9].minimal %changelog +* Wed Apr 29 2020 Kamil Dudka - 7.70.0-1 +- new upstream release + * Mon Apr 20 2020 Kamil Dudka - 7.69.1-3 - SSH: use new ECDSA key types to check known hosts (#1824926) diff --git a/sources b/sources index af5828c..8f47dc0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (curl-7.69.1.tar.xz) = dcb917ce9a6f34b30adae10e2e635d7a8c67781d69789cc5617ab2b49e898394ecfeee546453b14ab168d4b3b52baf974b2ec07e7a4b199addbc1ba57274d8fa +SHA512 (curl-7.70.0.tar.xz) = ab8796af1bd6f35ae704fd5e3639a8153482615a05c24e2e6d0b9cef8ed9a1e0d497ead2dbf5972cc53f632c2d87f0bf79e9e7cac625452dd24e6c7d8045cfc6