diff options
| author | pi <pi@FreeBSD.org> | 2014-07-28 00:21:34 +0800 |
|---|---|---|
| committer | pi <pi@FreeBSD.org> | 2014-07-28 00:21:34 +0800 |
| commit | 089fb87f3981f49e66cf641e0f9f91346257759f (patch) | |
| tree | b79fa8c1d9adb8844ab78a940c63ba074133a583 /security/shishi | |
| parent | c6a82179a92847d2e067c7f96f32be35040190b8 (diff) | |
| download | freebsd-ports-gnome-089fb87f3981f49e66cf641e0f9f91346257759f.tar.gz freebsd-ports-gnome-089fb87f3981f49e66cf641e0f9f91346257759f.tar.zst freebsd-ports-gnome-089fb87f3981f49e66cf641e0f9f91346257759f.zip | |
security/shishi: fix build with libgcrypt 1.6.x
PR: 192164
Approved by: johans@FreeBSD.org (maintainer)
Diffstat (limited to 'security/shishi')
| -rw-r--r-- | security/shishi/files/patch-Makefile.in | 24 | ||||
| -rw-r--r-- | security/shishi/files/patch-configure | 11 |
2 files changed, 35 insertions, 0 deletions
diff --git a/security/shishi/files/patch-Makefile.in b/security/shishi/files/patch-Makefile.in new file mode 100644 index 000000000000..96365de27fd9 --- /dev/null +++ b/security/shishi/files/patch-Makefile.in @@ -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 --git a/security/shishi/files/patch-configure b/security/shishi/files/patch-configure new file mode 100644 index 000000000000..cc1f6f6de9af --- /dev/null +++ b/security/shishi/files/patch-configure @@ -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 + |