- fix building with nettle 3.5 and guile 2.2.5

- rel 6

diff --git a/guile.patch b/guile.patch
new file mode 100644 (file)
index 0000000..65fe03b
--- /dev/null
+++ b/guile.patch
@@ -0,0 +1,8 @@
+--- lsh-2.1/src/scm/guile-compat.scm~  2013-03-09 16:20:21.000000000 +0800
++++ lsh-2.1/src/scm/guile-compat.scm   2019-06-30 22:53:31.886255706 +0800
+@@ -20,5 +20,4 @@
+ ;; along with this program; if not, write to the Free Software
+ ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ 
+-(use-syntax (ice-9 syncase))
+ (use-modules (ice-9 rdelim))

diff --git a/lsh.spec b/lsh.spec
index 960039622b54da7b445def460e0cfde9b323338b..99183e566b2a20c2b8d467a4516da98459f8bb11 100644 (file)
--- a/lsh.spec
+++ b/lsh.spec
@@ -6,7 +6,7 @@ Summary:        GNU implementation of the Secure Shell protocols
 Summary(pl.UTF-8):     Implementacja GNU bezpiecznego shella
 Name:          lsh
 Version:       2.1
-Release:       5
+Release:       6
 License:       GPL v2+
 Group:         Networking/Daemons
 Source0:       http://www.lysator.liu.se/~nisse/archive/%{name}-%{version}.tar.gz
@@ -16,6 +16,8 @@ Source1:      http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.
 Patch0:                %{name}-info.patch
 Patch1:                skip-argp.patch
 Patch2:                nettle3.patch
+Patch3:                nettle35.patch
+Patch4:                guile.patch
 URL:           http://www.lysator.liu.se/~nisse/lsh/
 BuildRequires: autoconf >= 2.52
 BuildRequires: automake
@@ -61,6 +63,8 @@ należy zainstalować odpowiedniego demona (openssh-server lub SSH.COM
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 cd src/spki

diff --git a/nettle35.patch b/nettle35.patch
new file mode 100644 (file)
index 0000000..8be7000
--- /dev/null
+++ b/nettle35.patch
@@ -0,0 +1,28 @@
+--- lsh-2.1/src/dummy.c.orig   2019-06-30 22:45:07.000000000 +0800
++++ lsh-2.1/src/dummy.c        2019-06-30 22:49:29.383304776 +0800
+@@ -113,14 +113,14 @@
+ 
+ size_t
+ base64_encode_update(struct base64_encode_ctx *ctx UNUSED,
+-                   uint8_t *dst UNUSED,
++                   char *dst UNUSED,
+                    size_t length UNUSED,
+                    const uint8_t *src UNUSED)
+ { abort(); }
+ 
+ size_t
+ base64_encode_final(struct base64_encode_ctx *ctx UNUSED,
+-                  uint8_t *dst UNUSED)
++                  char *dst UNUSED)
+ { abort(); }
+ 
+ void
+@@ -132,7 +132,7 @@
+                    size_t *dst_length UNUSED,
+                    uint8_t *dst UNUSED,
+                    size_t src_length UNUSED,
+-                   const uint8_t *src UNUSED)
++                   const char *src UNUSED)
+ { abort(); }
+ 
+ int