guix: Fix guile-ssh build on libssh 0.8 with upstream patches

https://github.com/artyom-poptsov/guile-ssh/issues/12

4 files changed, 57 insertions, 2 deletions

diff --git a/guix/guile-ssh/guile-ssh-0.11.3-libssh-0.9-ecdsa-fixup-1.patch b/guix/guile-ssh/guile-ssh-0.11.3-libssh-0.9-ecdsa-fixup-1.patch
new file mode 100644
index 0000000..6dbbe98
--- /dev/null
+++ b/guix/guile-ssh/guile-ssh-0.11.3-libssh-0.9-ecdsa-fixup-1.patch
@@ -0,0 +1,23 @@
+From a15543f7114b3f1ade8cce2cd1065e6aa60c14cc Mon Sep 17 00:00:00 2001
+From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
+Date: Tue, 17 Sep 2019 22:31:50 +0300
+Subject: [PATCH] configure.ac: Add missing AM_CONDITIONAL
+
+* configure.ac: Add missing AM_CONDITIONAL for 'HAVE_LIBSSH_0_8' constant.
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 99d35af..1d8baf2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -69,6 +69,8 @@ PKG_CHECK_MODULES([LIBSSH_0_8], [libssh >= 0.8.0],
+                                 [AC_DEFINE(HAVE_LIBSSH_0_8, 1, [Use libssh 0.8])],
+                                 [AC_DEFINE(HAVE_LIBSSH_0_8, 0, [Use libssh < 0.8])])
+ 
++AM_CONDITIONAL(HAVE_LIBSSH_0_8, $HAVE_LIBSSH_0_8)
++
+ PKG_CHECK_MODULES([LIBSSH_0_9], [libssh >= 0.9.0],
+                                 [AC_DEFINE(HAVE_LIBSSH_0_9, 1, [Use libssh 0.9])],
+                                 [AC_DEFINE(HAVE_LIBSSH_0_9, 0, [Use libssh < 0.9])])
diff --git a/guix/guile-ssh/guile-ssh-0.11.3-libssh-0.9-ecdsa-fixup-2.patch b/guix/guile-ssh/guile-ssh-0.11.3-libssh-0.9-ecdsa-fixup-2.patch
new file mode 100644
index 0000000..d3a98eb
--- /dev/null
+++ b/guix/guile-ssh/guile-ssh-0.11.3-libssh-0.9-ecdsa-fixup-2.patch
@@ -0,0 +1,27 @@
+From 75cec44f60e07730cbd25157b4a19c98fc8583fb Mon Sep 17 00:00:00 2001
+From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
+Date: Thu, 19 Sep 2019 20:09:30 +0300
+Subject: [PATCH] libguile-ssh/key-type.c: Fix libssh 9.0 check
+
+Reported by lantw44 in
+<https://github.com/artyom-poptsov/guile-ssh/issues/12>
+
+* libguile-ssh/key-type.c: Use 'if' instead of 'ifdef' to check the presence
+  of libssh 9.0.
+---
+ libguile-ssh/key-type.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libguile-ssh/key-type.c b/libguile-ssh/key-type.c
+index 12617ce..10e7c4a 100644
+--- a/libguile-ssh/key-type.c
++++ b/libguile-ssh/key-type.c
+@@ -44,7 +44,7 @@ static const struct symbol_mapping key_types[] = {
+   { "rsa1",    SSH_KEYTYPE_RSA1    },
+   { "ecdsa",   SSH_KEYTYPE_ECDSA   }, /* Deprecated in libssh 0.9 */
+ 
+-#ifdef HAVE_LIBSSH_0_9
++#if HAVE_LIBSSH_0_9
+   { "ecdsa-p256",        SSH_KEYTYPE_ECDSA_P256        },
+   { "ecdsa-p384",        SSH_KEYTYPE_ECDSA_P384        },
+   { "ecdsa-p521",        SSH_KEYTYPE_ECDSA_P521        },
diff --git a/guix/guile-ssh/guile-ssh-0.11.3-libssh-0.9-ecdsa.patch b/guix/guile-ssh/guile-ssh-0.11.3-libssh-0.9-ecdsa.patch
index 1817c8b..c8e85c5 100644
--- a/guix/guile-ssh/guile-ssh-0.11.3-libssh-0.9-ecdsa.patch
+++ b/guix/guile-ssh/guile-ssh-0.11.3-libssh-0.9-ecdsa.patch
@@ -29,7 +29,7 @@ index 74271f7..99d35af 100644
 +                                [AC_DEFINE(HAVE_LIBSSH_0_9, 1, [Use libssh 0.9])],
 +                                [AC_DEFINE(HAVE_LIBSSH_0_9, 0, [Use libssh < 0.9])])
 +
-+AM_CONDITIONAL(HAVE_LIBSSH_0_8, $HAVE_LIBSSH_0_8)
++AM_CONDITIONAL(HAVE_LIBSSH_0_9, $HAVE_LIBSSH_0_9)
  
  # -------------------------------------------------------------------------------
  
diff --git a/guix/guile-ssh/guile-ssh.spec b/guix/guile-ssh/guile-ssh.spec
index e0e3006..daa3b54 100644
--- a/guix/guile-ssh/guile-ssh.spec
+++ b/guix/guile-ssh/guile-ssh.spec
@@ -1,6 +1,6 @@
 Name:           guile-ssh
 Version:        0.11.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A library that provides access to the SSH protocol for GNU Guile
 
 License:        GPLv3+
@@ -11,6 +11,8 @@ Patch0:         guile-ssh-0.11.3-fix-segfault.patch
 Patch1:         guile-ssh-0.11.3-libssh-0.8-name.patch
 Patch2:         guile-ssh-0.11.3-libssh-0.8-tests.patch
 Patch3:         guile-ssh-0.11.3-libssh-0.9-ecdsa.patch
+Patch4:         guile-ssh-0.11.3-libssh-0.9-ecdsa-fixup-1.patch
+Patch5:         guile-ssh-0.11.3-libssh-0.9-ecdsa-fixup-2.patch
 
 %global guile_source_dir %{_datadir}/guile/site/2.2
 %global guile_ccache_dir %{_libdir}/guile/2.2/site-ccache
@@ -81,6 +83,9 @@ fi
 
 
 %changelog
+* Fri Sep 20 2019 Ting-Wei Lan <lantw44@gmail.com> - 0.11.3-6
+- Fix build with libssh 0.8
+
 * Tue Sep 17 2019 Ting-Wei Lan <lantw44@gmail.com> - 0.11.3-5
 - Fix get-key-type test on libssh 0.9