svn commit: r363080 - head/security/shishi/files

[Kurt Jaeger]

Author: pi
Date: Sun Jul 27 16:21:34 2014
New Revision: 363080
URL: http://svnweb.freebsd.org/changeset/ports/363080
QAT: https://qat.redports.org/buildarchive/r363080/

Log:
  security/shishi: fix build with libgcrypt 1.6.x
  
  PR:		192164
  Approved by:	johans at FreeBSD.org (maintainer)

Added:
  head/security/shishi/files/patch-Makefile.in   (contents, props changed)
  head/security/shishi/files/patch-configure   (contents, props changed)

Added: head/security/shishi/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/shishi/files/patch-Makefile.in	Sun Jul 27 16:21:34 2014	(r363080)
@@ -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; \

Added: head/security/shishi/files/patch-configure
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/shishi/files/patch-configure	Sun Jul 27 16:21:34 2014	(r363080)
@@ -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
+