From owner-svn-ports-head@FreeBSD.ORG Sun Jul 27 16:21:35 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 73EEAFCA; Sun, 27 Jul 2014 16:21:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 479FD2A87; Sun, 27 Jul 2014 16:21:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6RGLZDQ090909; Sun, 27 Jul 2014 16:21:35 GMT (envelope-from pi@svn.freebsd.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6RGLYrI090907; Sun, 27 Jul 2014 16:21:34 GMT (envelope-from pi@svn.freebsd.org) Message-Id: <201407271621.s6RGLYrI090907@svn.freebsd.org> From: Kurt Jaeger Date: Sun, 27 Jul 2014 16:21:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r363080 - head/security/shishi/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 27 Jul 2014 16:21:35 -0000 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@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 +