From 07941a43979db7dcebe6c4942a80262d82b8fbc0 Mon Sep 17 00:00:00 2001
From: Ting-Wei Lan <lantw44@gmail.com>
Date: Mon, 14 Jun 2021 23:53:44 +0800
Subject: guix: Fix guile-ssh tests on Fedora 33 and later

https://github.com/artyom-poptsov/guile-ssh/issues/26
---
 .../guile-ssh-0.13.1-tests-sssh-ecdsa.patch        | 24 ++++++++++++++++++++++
 guix/guile-ssh/guile-ssh.spec                      | 12 +++++------
 2 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 guix/guile-ssh/guile-ssh-0.13.1-tests-sssh-ecdsa.patch

(limited to 'guix')

diff --git a/guix/guile-ssh/guile-ssh-0.13.1-tests-sssh-ecdsa.patch b/guix/guile-ssh/guile-ssh-0.13.1-tests-sssh-ecdsa.patch
new file mode 100644
index 0000000..c461815
--- /dev/null
+++ b/guix/guile-ssh/guile-ssh-0.13.1-tests-sssh-ecdsa.patch
@@ -0,0 +1,24 @@
+From 79e51857d4ce98dc13b723c874b6793cb68a4254 Mon Sep 17 00:00:00 2001
+From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
+Date: Sat, 22 May 2021 07:26:35 +0300
+Subject: [PATCH] tests/sssh-ssshd: Use an ECDSA key for SSSH
+
+* tests/sssh-ssshd.scm: Use an ECDSA key for SSSH as using RSA is prohibited
+  by the cryptographic policies in Fedora GNU/Linux.
+---
+ tests/sssh-ssshd.scm | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/sssh-ssshd.scm b/tests/sssh-ssshd.scm
+index edb53fc..1dec4ef 100644
+--- a/tests/sssh-ssshd.scm
++++ b/tests/sssh-ssshd.scm
+@@ -48,7 +48,7 @@
+ (define *sssh-cmd*
+   (string-append
+    %topbuilddir "/examples/sssh.scm"
+-   " --identity-file=" %rsakey
++   " --identity-file=" %ecdsakey
+    " --port=" (number->string *srv-port*)
+    " --known-hosts-file=''"
+    " " (inet-ntop AF_INET *srv-address*)
diff --git a/guix/guile-ssh/guile-ssh.spec b/guix/guile-ssh/guile-ssh.spec
index 0a23f58..5cf0021 100644
--- a/guix/guile-ssh/guile-ssh.spec
+++ b/guix/guile-ssh/guile-ssh.spec
@@ -1,12 +1,14 @@
 Name:           guile-ssh
 Version:        0.13.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A library that provides access to the SSH protocol for GNU Guile
 
 License:        GPLv3+
 URL:            https://github.com/artyom-poptsov/guile-ssh
 Source0:        https://github.com/artyom-poptsov/guile-ssh/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
+Patch0:         guile-ssh-0.13.1-tests-sssh-ecdsa.patch
+
 %global guile_source_dir %{_datadir}/guile/site/2.2
 %global guile_ccache_dir %{_libdir}/guile/2.2/site-ccache
 
@@ -24,11 +26,6 @@ written in GNU Guile interpreter. It is built upon the libssh library.
 
 %prep
 %autosetup -p1
-%if 0%{?fedora} >= 33
-# This test fails with the crypto policy of Fedora 33.
-# https://github.com/artyom-poptsov/guile-ssh/issues/26
-sed -i '/^	sssh-ssshd\.scm \\$/d' tests/Makefile.am
-%endif
 
 
 %build
@@ -81,6 +78,9 @@ fi
 
 
 %changelog
+* Mon Jun 14 2021 Ting-Wei Lan <lantw44@gmail.com> - 0.13.1-3
+- Fix sssh-ssshd.scm on Fedora 33 and later
+
 * Sat Mar 13 2021 Ting-Wei Lan <lantw44@gmail.com> - 0.13.1-2
 - Rebuilt for Fedora 34 and 35
 
-- 
cgit v1.2.3