Update to libssh-0.8.7

Related: #1666342

.gitignore

@@ -41,16 +41,3 @@ libssh-0.4.4.tar.gz.asc
 /libssh-0.8.6.tar.xz.asc
 /libssh-0.8.7.tar.xz
 /libssh-0.8.7.tar.xz.asc
-/libssh-0.8.91.tar.xz
-/libssh_client.config
-/libssh_server.config
-/libssh-0.9.0.tar.xz
-/libssh-0.9.0.tar.xz.asc
-/libssh-0.9.2.tar.xz
-/libssh-0.9.2.tar.xz.asc
-/libssh-0.9.3.tar.xz
-/libssh-0.9.3.tar.xz.asc
-/libssh-0.9.4.tar.xz
-/libssh-0.9.4.tar.xz.asc
-/libssh-0.9.5.tar.xz
-/libssh-0.9.5.tar.xz.asc

gating.yml

@@ -1,14 +0,0 @@
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_testing
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
---- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-subject_type: koji_build
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

libssh.spec

@@ -1,17 +1,16 @@
 Name:           libssh
-Version:        0.9.5
+Version:        0.8.7
 Release:        1%{?dist}
 Summary:        A library implementing the SSH protocol
 License:        LGPLv2+
 URL:            http://www.libssh.org
 
-Source0:        https://www.libssh.org/files/0.9/%{name}-%{version}.tar.xz
-Source1:        https://www.libssh.org/files/0.9/%{name}-%{version}.tar.xz.asc
+Source0:        https://www.libssh.org/files/0.8/%{name}-%{version}.tar.xz
+Source1:        https://www.libssh.org/files/0.8/%{name}-%{version}.tar.xz.asc
 Source2:        https://cryptomilk.org/gpgkey-8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D.gpg#/%{name}.keyring
-Source3:        libssh_client.config
-Source4:        libssh_server.config
 
 BuildRequires:  cmake
+BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  gnupg2
 BuildRequires:  openssl-devel
@@ -19,17 +18,6 @@ BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel
 BuildRequires:  krb5-devel
 BuildRequires:  libcmocka-devel
-BuildRequires:  pam_wrapper
-BuildRequires:  socket_wrapper
-BuildRequires:  nss_wrapper
-BuildRequires:  uid_wrapper
-BuildRequires:  openssh-clients
-BuildRequires:  openssh-server
-BuildRequires:  nmap-ncat
-
-Requires:       %{name}-config = %{version}-%{release}
-
-Recommends:     crypto-policies
 
 %ifarch aarch64 ppc64 ppc64le s390x x86_64
 Provides: libssh_threads.so.4()(64bit)
@@ -53,33 +41,26 @@ Requires:       %{name}%{?_isa} = %{version}-%{release}
 The %{name}-devel package contains libraries and header files for developing
 applications that use %{name}.
 
-%package config
-Summary:        Configuration files for %{name}
-BuildArch:      noarch
-Obsoletes:      %{name} < 0.9.0-3
-
-%description config
-The %{name}-config package provides the default configuration files for %{name}.
-
 %prep
 gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %autosetup -p1
 
 %build
-%cmake \
-    -DUNIT_TESTING=ON \
-    -DCLIENT_TESTING=ON \
-    -DSERVER_TESTING=ON \
-    -DGLOBAL_CLIENT_CONFIG="%{_sysconfdir}/libssh/libssh_client.config" \
-    -DGLOBAL_BIND_CONFIG="%{_sysconfdir}/libssh/libssh_server.config"
+if test ! -e "obj"; then
+  mkdir obj
+fi
+pushd obj
 
-%cmake_build
+%cmake .. \
+    -DUNIT_TESTING=ON
+
+%make_build VERBOSE=1
+make docs
+
+popd
 
 %install
-%cmake_install
-install -d -m755 %{buildroot}%{_sysconfdir}/libssh
-install -m644 %{SOURCE3} %{buildroot}%{_sysconfdir}/libssh/libssh_client.config
-install -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/libssh/libssh_server.config
+make DESTDIR=%{buildroot} install/fast -C obj
 
 #
 # Workaround for the removal of libssh_threads.so
@@ -102,9 +83,9 @@ popd
 %ldconfig_scriptlets
 
 %check
-# Tests are randomly failing when run in parallel
-%global _smp_build_ncpus 1
-%ctest
+pushd obj
+ctest --output-on-failure
+popd
 
 %files
 %doc AUTHORS BSD ChangeLog README
@@ -113,6 +94,7 @@ popd
 %{_libdir}/libssh_threads.so.4*
 
 %files devel
+%doc obj/doc/html
 %{_includedir}/libssh/
 # own this to avoid dep on cmake -- rex
 %dir  %{_libdir}/cmake/
@@ -121,92 +103,11 @@ popd
 %{_libdir}/libssh.so
 %{_libdir}/libssh_threads.so
 
-%files config
-%attr(0755,root,root) %dir %{_sysconfdir}/libssh
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/libssh/libssh_client.config
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/libssh/libssh_server.config
-
 %changelog
-* Thu Sep 10 2020 Anderson Sasaki <ansasaki@redhat.com> - 0.9.5-1
-- Update to version 0.9.5
-  https://www.libssh.org/2020/09/10/libssh-0-9-5/
-- Removed patch to re-enable algorithms using sha1 in sshd for testing
-- The algorithms supported by sshd are now automatically detected for testing
-- Resolves: #1862457 - CVE-2020-16135
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.4-5
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon Jun 22 2020 Anderson Sasaki <ansasaki@redhat.com> - 0.9.4-3
-- Do not return error when server properly closed the channel (#1849069)
-- Add a test for CVE-2019-14889
-- Do not parse configuration file in torture_knownhosts test
-
-* Wed Apr 15 2020 Anderson Sasaki <ansasaki@redhat.com> - 0.9.4-2
-- Added patch to fix returned version
-
-* Thu Apr 09 2020 Anderson Sasaki <ansasaki@redhat.com> - 0.9.4-1
-- Update to version 0.9.4
-  https://www.libssh.org/2020/04/09/libssh-0-9-4-and-libssh-0-8-9-security-release/
-- Removed inclusion of OpenSSH server configuration file from
-  libssh_server.config
-- Added patch to re-enable algorithms using sha1 in sshd for testing
-- resolves: #1822529 - CVE-2020-1730
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Dec 10 2019 Andreas Schneider <asn@redhat.com> - 0.9.3-1
-- Update to version 0.9.3
-- resolves: #1781780 - Fixes CVE-2019-14889
-
-* Thu Nov 07 2019 Andreas Schneider <asn@redhat.com> - 0.9.2-1
-- Upate to version 0.9.2
-- resolves #1769370 - Remove the docs, they can be found on https://api.libssh.org/
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jul 11 2019 Anderson Sasaki <ansasaki@redhat.com> - 0.9.0-5
-- Add Obsoletes in libssh-config to avoid conflict with old libssh which
-  installed the configuration files.
-
-* Wed Jul 10 2019 Anderson Sasaki <ansasaki@redhat.com> - 0.9.0-4
-- Eliminate circular dependency with libssh-config subpackage
-
-* Wed Jul 10 2019 Anderson Sasaki <ansasaki@redhat.com> - 0.9.0-3
-- Provide the configuration files in a separate libssh-config subpackage
-
-* Thu Jul 04 2019 Anderson Sasaki <ansasaki@redhat.com> - 0.9.0-2
-- Do not ignore keys from known_hosts when SSH_OPTIONS_HOSTKEYS is set
-
-* Fri Jun 28 2019 Anderson Sasaki <ansasaki@redhat.com> - 0.9.0-1
-- Fixed Release number to released format
-
-* Fri Jun 28 2019 Anderson Sasaki <ansasaki@redhat.com> - 0.9.0-0.1
-- Update to version 0.9.0
-  https://www.libssh.org/2019/06/28/libssh-0-9-0/
-
-* Wed Jun 19 2019 Anderson Sasaki <ansasaki@redhat.com> - 0.8.91-0.1
-- Update to 0.9.0 pre release version (0.8.91)
-- Added default configuration files for client and server
-- Follow system-wide crypto configuration (crypto-policies)
-- Added Recommends for crypto-policies
-- Use OpenSSL implementation for KDF, DH, and signatures.
-- Detect FIPS mode and use only allowed algorithms
-- Run client and server tests during build
-
 * Mon Feb 25 2019 Anderson Sasaki <ansasaki@redhat.com> - 0.8.7-1
 - Update to version 0.8.7
   https://www.libssh.org/2019/02/25/libssh-0-8-7/
 
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.6-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
 * Tue Jan 15 2019 Anderson Sasaki <ansasaki@redhat.com> - 0.8.6-2
 - Fix rsa-sha2 extension handling (#1666342)
 

libssh_client.config

@@ -1,4 +0,0 @@
-# Parse system-wide crypto configuration file
-Include /etc/crypto-policies/back-ends/libssh.config
-# Parse OpenSSH configuration file for consistency
-Include /etc/ssh/ssh_config

libssh_server.config

@@ -1,2 +0,0 @@
-# Parse system-wide crypto configuration file
-Include /etc/crypto-policies/back-ends/libssh.config

sources

@@ -1,2 +1,2 @@
-SHA512 (libssh-0.9.5.tar.xz) = 64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18
-SHA512 (libssh-0.9.5.tar.xz.asc) = f0b76cdccf26144b9cc9ad3f7e1605b50473fc5c686d0d9a2419b13382440776c09428d717253a918f7347b90e4a562fd88d8ea85a6e54f06b149826295b4f8e
+SHA512 (libssh-0.8.7.tar.xz) = 13c3dccad81d521edf29c8a5e2c5f7fdd90507a0eda652b2b040a0a17bab88860873e089a46e181907ea3f449ca1847b1c84453b1960f456e391eefe5be983c5
+SHA512 (libssh-0.8.7.tar.xz.asc) = c7c33fba67216d429269d8fe0353eb85e0e4bc6848d006cb349720ecf7bf1699da495098b0d5441aaef057fe0fda0c5cb0cf95d3834f5ef7e57de90919793b3f

tests/tests.yml

@@ -1,10 +0,0 @@
----
-- hosts: localhost
-  roles:
-  - role: standard-test-beakerlib
-    tags:
-    - classic
-    repositories:
-    - repo: "https://gitlab.com/redhat-crypto/tests/libssh.git"
-      dest: "libssh"
-      fmf_filter: "tier: 0,1,2,3"