Attachment 145028 Details for Bug 192164 – patch to fix build with libgcrypt 1.6.x

[patch] patch to fix build with libgcrypt 1.6.x

shishi.diff (text/plain), 2.31 KB, created by Kurt Jaeger on 2014-07-27 13:14:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2014-07-27 13:14:20 UTC

Size: 2.31 KB

patch

obsolete

>diff -r -u -N security/shishi/files/patch-Makefile.in /usr/home/pi/myp/security/shishi/files/patch-Makefile.in
>--- security/shishi/files/patch-Makefile.in	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/home/pi/myp/security/shishi/files/patch-Makefile.in	2014-07-27 15:09:47.000000000 +0200
>@@ -0,0 +1,24 @@
>+--- Makefile.in-orig	2014-07-27 15:08:30.000000000 +0200
>++++ Makefile.in	2014-07-27 15:09:35.000000000 +0200
>+@@ -1808,19 +1808,10 @@
>+ 
>+ 
>+ install-data-hook:
>+-	@echo Initializing database and creating host key...
>++	@echo Initializing database...
>+ 	if test ! -d $(DESTDIR)$(DBDIR); then \
>+ 	  if mkdir -m 0700 -p $(DESTDIR)$(DBDIR); then \
>+-	    if test ! -f $(DESTDIR)$(KEYDIR)/shishi.keys; then \
>+-	      if $(DESTDIR)$(bindir)/shisa$(EXEEXT) -a > \
>+-			$(DESTDIR)$(KEYDIR)/shishi.keys; then \
>+-		echo Successfully created database and host key.; \
>+-	      else \
>+-		echo Unable to create database, see $(DESTDIR)$(KEYDIR)/shishi.keys.; \
>+-	      fi; \
>+-	    else \
>+-	      echo Key file $(DESTDIR)$(KEYDIR)/shishi.keys already exist.; \
>+-	    fi; \
>++	    echo Created directory root$(DESTDIR)$(DBDIR).; \
>+ 	  else \
>+ 	    echo Could not create directory root$(DESTDIR)$(DBDIR).; \
>+ 	  fi; \
>diff -r -u -N security/shishi/files/patch-configure /usr/home/pi/myp/security/shishi/files/patch-configure
>--- security/shishi/files/patch-configure	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/home/pi/myp/security/shishi/files/patch-configure	2014-07-27 15:02:13.000000000 +0200
>@@ -0,0 +1,11 @@
>+--- configure-orig	2014-07-27 15:01:15.000000000 +0200
>++++ configure	2014-07-27 15:01:50.000000000 +0200
>+@@ -24494,7 +24494,7 @@
>+ /* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c
>+    will fail on startup if we don't have 1.4.4 or later, so
>+    test for it early. */
>+-#if !defined GCRY_MODULE_ID_USER
>++#if GCRYPT_VERSION_NUMBER < 0x010404
>+ error too old libgcrypt
>+ #endif
>+ 
>diff -r -u -N security/shishi/pkg-plist /usr/home/pi/myp/security/shishi/pkg-plist
>--- security/shishi/pkg-plist	2014-07-08 12:43:45.000000000 +0200
>+++ /usr/home/pi/myp/security/shishi/pkg-plist	2014-07-27 15:10:46.000000000 +0200
>@@ -6,7 +6,6 @@
> etc/shishi/shisa.conf
> etc/shishi/shishi.conf
> etc/shishi/shishi.skel
>-@comment etc/shishi/shishi.keys intentionally left out - see pkg-message
> include/shisa.h
> include/shishi-int.h
> include/shishi.h

Actions: View | Diff

Attachments on bug 192164: 145028