diff --git a/0105-curl-7.61.0-tests-ssh-keygen.patch b/0105-curl-7.61.0-tests-ssh-keygen.patch deleted file mode 100644 index b8b9ffb..0000000 --- a/0105-curl-7.61.0-tests-ssh-keygen.patch +++ /dev/null @@ -1,33 +0,0 @@ -From daded1aff280104d16e405fcd1be1a857c74b191 Mon Sep 17 00:00:00 2001 -From: Kamil Dudka -Date: Mon, 27 Aug 2018 15:53:35 +0200 -Subject: [PATCH] tests: make ssh-keygen always produce PEM format - -The default format produced by openssh-7.8p1 cannot be consumed -by currently available versions of libssh and libssh2. ---- - tests/sshserver.pl | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/sshserver.pl b/tests/sshserver.pl -index 9b3d122..d477a02 100755 ---- a/tests/sshserver.pl -+++ b/tests/sshserver.pl -@@ -372,12 +372,12 @@ if((! -e $hstprvkeyf) || (! -s $hstprvkeyf) || - # Make sure all files are gone so ssh-keygen doesn't complain - unlink($hstprvkeyf, $hstpubkeyf, $cliprvkeyf, $clipubkeyf); - logmsg 'generating host keys...' if($verbose); -- if(system "\"$sshkeygen\" -q -t rsa -f $hstprvkeyf -C 'curl test server' -N ''") { -+ if(system "\"$sshkeygen\" -q -t rsa -f $hstprvkeyf -C 'curl test server' -N '' -m PEM") { - logmsg 'Could not generate host key'; - exit 1; - } - logmsg 'generating client keys...' if($verbose); -- if(system "\"$sshkeygen\" -q -t rsa -f $cliprvkeyf -C 'curl test client' -N ''") { -+ if(system "\"$sshkeygen\" -q -t rsa -f $cliprvkeyf -C 'curl test client' -N '' -m PEM") { - logmsg 'Could not generate client key'; - exit 1; - } --- -2.17.1 - diff --git a/curl.spec b/curl.spec index d4edfd9..93e2d57 100644 --- a/curl.spec +++ b/curl.spec @@ -1,7 +1,7 @@ Summary: A utility for getting files from remote servers (FTP, HTTP, and others) Name: curl Version: 7.61.1 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz @@ -17,9 +17,6 @@ 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 -# tests: make ssh-keygen always produce PEM format (#1622594) -Patch105: 0105-curl-7.61.0-tests-ssh-keygen.patch - Provides: curl-full = %{version}-%{release} Provides: webclient URL: https://curl.haxx.se/ @@ -164,7 +161,6 @@ be installed. %patch102 -p1 %patch103 -p1 %patch104 -p1 -%patch105 -p1 # make tests/*.py use Python 3 sed -e '1 s|^#!/.*python|#!%{__python3}|' -i tests/*.py @@ -325,6 +321,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la %{_libdir}/libcurl.so.4.[0-9].[0-9].minimal %changelog +* Thu Oct 04 2018 Kamil Dudka - 7.61.1-2 +- drop 0105-curl-7.61.0-tests-ssh-keygen.patch no longer needed (#1622594) + * Wed Sep 05 2018 Kamil Dudka - 7.61.1-1 - new upstream release, which fixes the following vulnerability CVE-2018-14618 - NTLM password overflow via integer overflow