Remove patch files left behind

The patches were removed from the spec file in previous commit, but the
files were left behind.

.gitignore

@@ -46,3 +46,11 @@ libssh-0.4.4.tar.gz.asc
 /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

@@ -0,0 +1,14 @@
+--- !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,6 +1,6 @@
 Name:           libssh
-Version:        0.9.0
-Release:        6%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        A library implementing the SSH protocol
 License:        LGPLv2+
 URL:            http://www.libssh.org
@@ -11,10 +11,7 @@ Source2:        https://cryptomilk.org/gpgkey-8DFF53E18F2ABC8D8F3C92237EE0FC4DCC
 Source3:        libssh_client.config
 Source4:        libssh_server.config
 
-Patch0:         libssh-0.9.0-do-not-ignore-known-hosts-keys.patch
-
 BuildRequires:  cmake
-BuildRequires:  doxygen
 BuildRequires:  gcc-c++
 BuildRequires:  gnupg2
 BuildRequires:  openssl-devel
@@ -69,25 +66,17 @@ gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
 %autosetup -p1
 
 %build
-if test ! -e "obj"; then
-  mkdir obj
-fi
-pushd obj
-
-%cmake .. \
+%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"
 
-%make_build VERBOSE=1
-make docs
-
-popd
+%cmake_build
 
 %install
-make DESTDIR=%{buildroot} install/fast -C obj
+%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
@@ -113,9 +102,9 @@ popd
 %ldconfig_scriptlets
 
 %check
-pushd obj
-ctest --output-on-failure
-popd
+# Tests are randomly failing when run in parallel
+%global _smp_build_ncpus 1
+%ctest
 
 %files
 %doc AUTHORS BSD ChangeLog README
@@ -124,7 +113,6 @@ 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/
@@ -139,6 +127,47 @@ popd
 %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
 

libssh_server.config

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

sources

@@ -1,4 +1,2 @@
-SHA512 (libssh-0.9.0.tar.xz) = 8c91b31e49652d93c295ca62c2ff1ae30f26c263195a8bc2390e44f6e688959507f609125d342ee8180fc03cec2d73258ac72f864696281b53ba9ad244060865
-SHA512 (libssh-0.9.0.tar.xz.asc) = 6d2c516c42bf52dc213a35ba82718ca775291cff3bbb13ff35773d484d7e49202857350345c2efdccc7f42085caef3b7dd20e77610132615c7c0b45de100106c
-SHA512 (libssh_client.config) = b04fbfda339c4e53df8dd12cc89d4b92bdc94dd79af5799af2e675216fcd071f99bb12e5aed4b5e9848d93faf0e8407019def189eabbeef31a3c20ec799a6868
-SHA512 (libssh_server.config) = 30cd80669701ff4a7960a193fb141f850cea74c3bdadaec0f63633ff151d8b05430451307237cb88d2eb20000737091a191b06ea62754a2664a8717a11f9a420
+SHA512 (libssh-0.9.5.tar.xz) = 64e692a0bfa7f73585ea7b7b8b1d4c9a7f9be59565bfd4de32ca8cd9db121f87e7ad51f5c80269fbd99545af34dcf1894374ed8a6d6c1ac5f8601c026572ac18
+SHA512 (libssh-0.9.5.tar.xz.asc) = f0b76cdccf26144b9cc9ad3f7e1605b50473fc5c686d0d9a2419b13382440776c09428d717253a918f7347b90e4a562fd88d8ea85a6e54f06b149826295b4f8e

tests/tests.yml

@@ -0,0 +1,10 @@
+---
+- 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"