From 39924b93fa7c676b8a3c401a07ca05c5b9daabe4 Mon Sep 17 00:00:00 2001 From: tigro Date: Wed, 25 Dec 2024 11:59:46 +0300 Subject: [PATCH] import libssh2-1.11.0-8.el10 --- .gitignore | 4 +- .libssh2.metadata | 1 + SOURCES/1433.patch | 28 +++++++ .../libssh2-1.11.0-ssh-rsa-test.patch | 0 .../libssh2-1.11.0-strict-modes.patch | 0 SOURCES/libssh2-1.11.0.tar.gz.asc | 11 +++ SOURCES/mykey.asc | 77 +++++++++++++++++++ libssh2.spec => SPECS/libssh2.spec | 39 +++++++++- sources | 2 - 9 files changed, 156 insertions(+), 6 deletions(-) create mode 100644 .libssh2.metadata create mode 100644 SOURCES/1433.patch rename libssh2-1.11.0-ssh-rsa-test.patch => SOURCES/libssh2-1.11.0-ssh-rsa-test.patch (100%) rename libssh2-1.11.0-strict-modes.patch => SOURCES/libssh2-1.11.0-strict-modes.patch (100%) create mode 100644 SOURCES/libssh2-1.11.0.tar.gz.asc create mode 100644 SOURCES/mykey.asc rename libssh2.spec => SPECS/libssh2.spec (94%) delete mode 100644 sources diff --git a/.gitignore b/.gitignore index 7483adc..9e129d5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -/libssh2-[0-9.]*/ -/libssh2-[0-9.]*.tar.gz -/libssh2-[0-9.]*.tar.gz.asc +SOURCES/libssh2-1.11.0.tar.gz diff --git a/.libssh2.metadata b/.libssh2.metadata new file mode 100644 index 0000000..fcdd05e --- /dev/null +++ b/.libssh2.metadata @@ -0,0 +1 @@ +fbdb4751a4bc93e895e9c3426f7f80b437d250fe SOURCES/libssh2-1.11.0.tar.gz diff --git a/SOURCES/1433.patch b/SOURCES/1433.patch new file mode 100644 index 0000000..e6f900c --- /dev/null +++ b/SOURCES/1433.patch @@ -0,0 +1,28 @@ +From e337b0e90399b59c76e1b5ed4547b28311d89fb1 Mon Sep 17 00:00:00 2001 +From: Jose Quaresma +Date: Thu, 25 Jul 2024 14:02:00 +0100 +Subject: [PATCH] test: drop ssh-dss openssh_server config + +The ssh-dss was deprecated [1] in the OpenSSH 9.8p1 + +Support for ssh-dss, ssh-dss-cert-* host and user keys is disabled +by default at run-time. These may be re-enabled using the +instructions at http://www.openssh.com/legacy.html + +[1] https://www.openssh.com/releasenotes.html + +Signed-off-by: Jose Quaresma +--- + tests/openssh_server/sshd_config | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/openssh_server/sshd_config b/tests/openssh_server/sshd_config +index 1069566f2a..5cd2b89816 100644 +--- a/tests/openssh_server/sshd_config ++++ b/tests/openssh_server/sshd_config +@@ -1,4 +1,4 @@ + HostKeyAlgorithms +ssh-rsa +-PubkeyAcceptedKeyTypes +ssh-rsa,ssh-dss,ssh-rsa-cert-v01@openssh.com ++PubkeyAcceptedKeyTypes +ssh-rsa,ssh-rsa-cert-v01@openssh.com + MACs +hmac-sha1,hmac-sha1-96,hmac-sha2-256,hmac-sha2-512,hmac-md5,hmac-md5-96,umac-64@openssh.com,umac-128@openssh.com,hmac-sha1-etm@openssh.com,hmac-sha1-96-etm@openssh.com,hmac-sha2-256-etm@openssh.com,hmac-sha2-512-etm@openssh.com,hmac-md5-etm@openssh.com,hmac-md5-96-etm@openssh.com,umac-64-etm@openssh.com,umac-128-etm@openssh.com + Ciphers +3des-cbc,aes128-cbc,aes192-cbc,aes256-cbc,aes128-ctr,aes192-ctr,aes256-ctr,aes128-gcm@openssh.com,aes256-gcm@openssh.com,chacha20-poly1305@openssh.com diff --git a/libssh2-1.11.0-ssh-rsa-test.patch b/SOURCES/libssh2-1.11.0-ssh-rsa-test.patch similarity index 100% rename from libssh2-1.11.0-ssh-rsa-test.patch rename to SOURCES/libssh2-1.11.0-ssh-rsa-test.patch diff --git a/libssh2-1.11.0-strict-modes.patch b/SOURCES/libssh2-1.11.0-strict-modes.patch similarity index 100% rename from libssh2-1.11.0-strict-modes.patch rename to SOURCES/libssh2-1.11.0-strict-modes.patch diff --git a/SOURCES/libssh2-1.11.0.tar.gz.asc b/SOURCES/libssh2-1.11.0.tar.gz.asc new file mode 100644 index 0000000..e2565f2 --- /dev/null +++ b/SOURCES/libssh2-1.11.0.tar.gz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEEJ+3q8i86vOtQ25oSXMkI/bceEsIFAmR2HV4ACgkQXMkI/bce +EsKbRAf9Fml7NsRVwE88yB0xvF4CBcAEBKf8gJ4tcz9nqY8MiCydZUuRYHqZzCvz +PjpNUvOk0lHHk57fcPF5bnUR8Xm3zwjV80pHlHvW2ZrW9wMBbrK7qW27Etqz5Re5 +CfSkf6eF1DJ/pVVrTVL9BNoOIfmi7pfoRKoRn8XxvYfwqGwW3S55iZbM3mg46Jee +bzWJQ2dUi/TJ15q1R4fusmvPg1zDPXZzLkAXuAmoP7nUWW2dMt/gVzEbWuSbZXZQ +6JIjGmQ9F0bX/ktrl1qpr2t5oRb0a+aY2CpELN3f5IylCAUopMHCsL8758RZNJ1T +5qT50RePH78xoXecxFSyrRZTKi3Zqg== +=y9hn +-----END PGP SIGNATURE----- diff --git a/SOURCES/mykey.asc b/SOURCES/mykey.asc new file mode 100644 index 0000000..0c77721 --- /dev/null +++ b/SOURCES/mykey.asc @@ -0,0 +1,77 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +mQGiBD6tnnoRBACRPnFBVoapBrTpPrCNZ2rq3DcmW6n/soQJW47+zP+vcrcxQ1WJ +QiWSzLGO+QOIUZSYfnliR22r8HkFX9EUSW3IAcRMJMsaO3wMJ0a+78a9QqWLp6RV +0arcQkuuCvG79h+yJ6NnoAXe1geRt8vNGsaWtsS91CtYlTSs6JVtaRLnYwCg/Ly1 +EFgvNZ6SJRc/8I5rRv0lrz8D/0goih2kZ5z4SI+r2hgABNcN7g565YwGKaQDbIch +soh3OBzgETWc3wuAZqmCzQXPXMpMx+ziqX6XDzDKNiGL1CdrBJQd0II8UutWVDje +f9UxLfo02YQ8diGYeq0u9k1RezC13w4TVUmQfg0Uqn4xM6DNzO1O6yCK8rlNwsvL +gHNJA/9m1pfzjpvdxtmJNKRU3C4cRCjXhxNdM7laSEj0/wOGaR2QWWEge51orWwo +SLQUIe4BDPvtRStQHC+tI7qr7d12rMMEBXviJC5EkGBOzlgWr9virjM/u/pkGMc2 +m5r3pVuWH/JSsHsV952y2kWP64uP4zdLXOpVzX/xs0sYJ9nOPLQnRGFuaWVsIFN0 +ZW5iZXJnIChIYXh4KSA8ZGFuaWVsQGhheHguc2U+iF4EExECAB4CHgECF4AFAlQU +ki4FCwkIBwMFFQoJCAsFFgIDAQAACgkQeOEcayedXJEOOwCggCsNHdAQPAlPte3w +i2IZEekkM0YAoOXXPFAWjUwIHjZY41l7WgzACbANiFkEExECABkFAj6tnnoECwcD +AgMVAgMDFgIBAh4BAheAAAoJEHjhHGsnnVyRjngAoO1y3LoSOEgD8vR062cdYDmv +jLvVAJ0dmp1UiuQp+oMyq2VbWyw8LXN1XLkBDQQ+rZ59EAQAmYsA8gPjJ75gOIPb +XNg9Z31QzIz65qS9XdNsFNAdKxnY4b72nhc0oaS9/7Dcdf2Q+1mDa2p72DWk+9iz +7knmBL++csBP2z9eMe5h8oV53prqNOHDHyL3WLOa25ga9381gZnzWoQME74iSBBM +wDw8vbLEgIZ34JaQ7Oe+9N3+6n8AAwcD/Av+Ms+3gCc5pLp4nx36qqi36fodaG9+ +dwIcMbr9bivEtjmDHeuPsD6X1J9+Y/ikUBIDpMPv33lJxLoubOtpLhEuN2XN/ojT +rueVPDKA1f+GyfHnyfpf/78IgX1hGVqu/3RBWKPpXFwSZA4q8vFR+FaPC5WbU68t +FLJpYuC9ZO/LiEYEGBECAAYFAj6tnn0ACgkQeOEcayedXJGtPQCgxrbd59afemZ9 +OIadZD8kUGC29dUAoJ94aGUkWCwoEiPyEZRGXv9XRlfxmQENBFcGhyIBCAC79AIx +5hHixKmNtqbryuZTDwlt9XXkEn/QSrQD3pzgbsbBiWyqOV4hfscvtmoqA7koOw4h +zZ/b8pJPA36eNzqMFIbkWpIit/BwA5bTKRkKXeD2kBFkjIN+iDuXawwhv7eNKH9O +poAUe0K/esK/kvbMO721q24IgkOjB1Vtr/Y4Xkg7+VWVP0LFh7C/2Nwq6n2bktsA +Ey9uCDD1hl8BdckN/XxpuUqSfxbF85GvYzzON67zOxxo6jqRXXcJ2PdPq0o9Ak0d +6Fe7g9ZxOAeuYEbFTCZHBBccx84K0Bhn5tpqoq8Mq3f3mZfGBoe4J6wr17cxEDC8 +tTHUpDqk0CoLERUxABEBAAG0IERhbmllbCBTdGVuYmVyZyA8ZGFuaWVsQGhheHgu +c2U+iQE3BBMBCgAhBQJXBociAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJ +EPn+r/nTShvbHoAIAJDwb7dcAX4VGPa2oSuQqVnHsjDE7g8ATmcZq2IAzAG6bZg1 +svuhNyPQnL7kNrsz6Ew+yE4vH8mOjDUbc3feY4MzmtEMaB6VS0Xlna6cdtWkv4Y+ +Us4TuYSdftPZuZgI3nN/sXLlxWJCZgCPJJaGM6dXgyTFatk2P1LE98Qif7+ZMqfv ++BA5L6cy2cAwJ5qbvLtuT25rTxooN54JETfwdhUD1NEIqTQxeC4E5lFvwedjAjLh +Gswau8WMCdM/HzGbuQ9Gp3/RafYoAvMV6r6sskvUrWubCHj0u+uNgOpUHvlrwcFg +rBirzQdElumCWqbJVCH0V5NcP/zSz1U1W8wSRqS5AQ0EVwaHIgEIALyCqpnax0cL +y7EK3UiU2Kkryb7LPsZkia9hTcIZjNg0B8XAdqDYpHiquYtX0cz5I1sSZMBJ/xJP +BF2ce/bmOTJtyW3GaF9a+M2zboZSzx9nlv9xx0o3bXBrBlL2vaG2TW+x2G53GA0/ +0chbj35PR+fvJx8ob/fHwCkfzGb1qCzwovhwGVUNHqI5bxK/xVwXfiycbllE3Hmf +09BGeXKR7gQtaal8byKKlqCtayteEaPNQt6czYxZkVAOvY4ZDQKSZJUNwGFog3bG +6rHr1J/0un6nAvX+wMuvRkUDiQxZZCel7e0Qcg3gPrYh+adlr0Tn7wyCP7/BULz8 +67fQfzc2ENkAEQEAAYkBHwQYAQoACQUCVwaHIgIbDAAKCRD5/q/500ob27KaB/9H +a+iDip6mxFdoqy7TAefBy7KgbMQxxT926IcFqf70aJDzeVQI3lGCqN9GW03d+wPr +LoyeQBQKNxxfQ9fEOvp1AXGWFIYYtEZIvQBpIqaSaA7W5IzqfDuO9xG89DNn8zKK +nh/mbYJov/fywhBU6JH7bqdFSHbqoG9TY64s0BkV6shIVOubXLSG5G7LxXhw+xrb +0zl4ie2wCeCBOLdbGHc+o2sKo1rBEz6UBK2DesPfkzxBO7lfa9HTcN03UJPHXmzb +2mCbeFV8yPsTAoaGv4qZH1+FX+9Lv374xTSXa4CjQzSxd0dkZGG+YQjocoPftgsC +OVsiqW0WhRVIEJ+hBAMUmQENBFcGiPEBCAC7sCnaZqWxfXNgBC7P28BSDUs9w4y/ +PEFsOv9bpgbgZagX1FnhG0eV71nm0p8v9T8Bft1eXaBd977Dq9pgk5qKO0xZo8fC +8prFqB5db7fMUvPZCuJTTb6lGMz4OdfT6aHqUvJ+LFF1mKn8Eqt1Q4snHGSL1PI3 +/+435qDRQsU15GdYrj1waNJKk79aes9oguaI2/OTQqzIcOFK5tJjlSOD1ryOIH1e +8vD+5MMpGvsRxv3sQHeTZkfZbkzSLFg/LKpoiQkyql1+BLNhBYq8oaE/jlvQrTEk +bAyKpMScdyHwmkWWKjyZtXTrAtlComnki4yC2lAV9MXINHHvNJBcIXvVABEBAAG0 +IERhbmllbCBTdGVuYmVyZyA8ZGFuaWVsQGhheHguc2U+iQE3BBMBCgAhBQJXBojx +AhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEFzJCP23HhLCOKkH/1CyoKiN +2PCgTlWoYQspv/AAmsj+cFwZobI167KowA+o3zxQqxg0MV3ds8G+iig9OIuYurlQ +L5Jr3CbDltaiXdWtVteRh/VKp61EwyXq77vjJbx81hvOuaXWWLSlU0KB3w7Hj6aD +/mt16DpOcY9Aw90mKyvafRTqMF7TcT7J5HeGn2NL45dPkAhiMDEgEnw9yBTxK/x6 +UoQGPgiOWxSSN7Foj3mhUOflp8W0rnkLbJ4icpym6WuLKRMKAefDvk8GVlAWuXAb +9gloL1P6u3uNHllq/IODR2bZUBI0QNKhvt0iSj7WKsc/kaqscl+AE9jd/6kXd6vh +TNFWdzeco/2mGlaIRgQQEQoABgUCVwaJ/AAKCRB44RxrJ51ckWcaAKCJ6+arS/3k +IMcO14Jz8dVf2BH3OACgwTenVSsK66qi+VfGCoALpzpiLDO5AQ0EVwaI8QEIAOxQ +AEvF3idxcn80tbUhJg1J98fAS7Hx3WhlFG74uAikZQl1KZrprBu70RWTb7Nm1tvZ +eXW65IlY7kk42bhfYDs1JrIPWOWKvVwKWDxoEbYgW/yvy1TOuXH276zbxLl5OEE8 +sQuOfXZsFSX2IPF9hsgNGaNzor8Ke7Y5BuCQLcGZWW5dLFbbKRKjXG8CaWmsJVoI +c2nyXCAss2q9oCJ13X/5z+Ei392rwi1d3NxAYkSiDQan+fkWkCvZH+dHmFjQ1AND +KielxcW1VfilK1hu9ziBBDf8TCEud/q0woIAH7rvIft4i3CqjymonByE4/OjfH8j +4EteQ8qoknMCjjwNVqkAEQEAAYkBHwQYAQoACQUCVwaI8QIbDAAKCRBcyQj9tx4S +wupjB/9TV4anbZK58bN7QJ5qGnU3GNjlvWFZXMw1u1xVc7abDJyqmFeJcJ4qLUkv +BA0OsvlVnMWmeCmzsXhlQVM4Bv6IWyr7JBWgkK5q2CWVB59V7v7znf5kWnMGFhDF +PlLsGbxDWLMoZGH+Iy84whMJFgferwCJy1dND/bHXPztfhvFXi8NNlJUFJa8Xtmu +gm78C+nwNHcFpVC70HPr3oa8U1ODXMp7L8W/dL3eLYXmRCNd0urHgYrzDt6V/zf5 +ymvPk5w4HBocn2oRCJj/FXKhFAUptmpTE3g1yvYULmuFcNGAnPAExmAmd6NqsCmb +j/qx4ytjt5uxt6Jm6IXV9cry8i6x +=Phs/ +-----END PGP PUBLIC KEY BLOCK----- diff --git a/libssh2.spec b/SPECS/libssh2.spec similarity index 94% rename from libssh2.spec rename to SPECS/libssh2.spec index e762f87..4a2c7d4 100644 --- a/libssh2.spec +++ b/SPECS/libssh2.spec @@ -1,6 +1,12 @@ +# OpenSSL ENGINE support deprecated in Fedora 41 onwards +# https://fedoraproject.org/wiki/Changes/OpensslDeprecateEngine +%if 0%{?fedora} > 40 || 0%{?rhel} > 9 +%global _preprocessor_defines %{?_preprocessor_defines} -DOPENSSL_NO_ENGINE +%endif + Name: libssh2 Version: 1.11.0 -Release: 1%{?dist} +Release: 8%{?dist} Summary: A library implementing the SSH2 protocol License: BSD-3-Clause URL: https://www.libssh2.org/ @@ -10,6 +16,7 @@ Source1: https://libssh2.org/download/libssh2-%{version}.tar.gz.asc Source2: https://daniel.haxx.se/mykey.asc Patch1: libssh2-1.11.0-strict-modes.patch Patch2: libssh2-1.11.0-ssh-rsa-test.patch +Patch3: https://patch-diff.githubusercontent.com/raw/libssh2/libssh2/pull/1433.patch BuildRequires: coreutils BuildRequires: findutils @@ -74,6 +81,11 @@ developing applications that use libssh2. %patch -P 2 %endif +# Support for ssh-dss, ssh-dss-cert-* host and user keys is disabled +# by default in OpenSSH 9.8p1 +# https://github.com/libssh2/libssh2/pull/1433 +%patch -P 3 -p1 + # Replace hard wired port number in the test suite to avoid collisions # between 32-bit and 64-bit builds running on a single build-host sed -i s/4711/47%{?__isa_bits}/ tests/{openssh_fixture.c,test_ssh{2.c,d.test}} @@ -82,6 +94,7 @@ sed -i s/4711/47%{?__isa_bits}/ tests/{openssh_fixture.c,test_ssh{2.c,d.test}} # Test suite fails to compile if we use --disable-static # https://github.com/libssh2/libssh2/issues/1056 %configure \ + --disable-rpath \ --disable-silent-rules \ --enable-shared \ --disable-docker-tests @@ -131,6 +144,30 @@ LC_ALL=en_US.UTF-8 make -C tests check %{_libdir}/pkgconfig/libssh2.pc %changelog +* Wed Dec 25 2024 Arkady L. Shane - 1.11.0-8 +- Rebuilt for MSVSphere 10 + +* Sat Jul 27 2024 Paul Howarth - 1.11.0-8 +- Fix test suite failures with OpenSSH 9.8p1 + +* Thu Jul 18 2024 Fedora Release Engineering - 1.11.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Wed Jul 10 2024 Paul Howarth - 1.11.0-6 +- Build without OpenSSL ENGINE support from Fedora 41 onwards + +* Tue Apr 02 2024 Zhao Jiasheng - 1.11.0-5 +- Fix rpath on riscv64 + +* Thu Jan 25 2024 Fedora Release Engineering - 1.11.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 1.11.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 1.11.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jun 1 2023 Paul Howarth - 1.11.0-1 - Update to 1.11.0 (rhbz#2211200) - Adds support for encrypt-then-mac (ETM) MACs diff --git a/sources b/sources deleted file mode 100644 index bc2ad57..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (libssh2-1.11.0.tar.gz) = ef85e152dc252bd9b1c05276972b9c22313f5d492743dde090235742746d67f634f2a419eff9162132e2274c8582113b75279b074e0c7b34b2526b92fd1a1e8e -SHA512 (libssh2-1.11.0.tar.gz.asc) = 6187582a94be24d9ca68963b6d139982e8527378aee7ef8a4cbc0f5c2bae8aee4552e32ec85eb290ec4e940f1d6ebf6737f92468215e0b43b245762753bb2647