diff options
Diffstat (limited to 'security/gnupg')
| -rw-r--r-- | security/gnupg/Makefile | 2 | ||||
| -rw-r--r-- | security/gnupg/distinfo | 8 | ||||
| -rw-r--r-- | security/gnupg/files/patch-agent_agent.h | 41 | ||||
| -rw-r--r-- | security/gnupg/files/patch-doc-Makefile.in | 10 | ||||
| -rw-r--r-- | security/gnupg/pkg-plist | 2 |
5 files changed, 10 insertions, 53 deletions
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 0aaae5055b92..cc7b15f8f4f9 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gnupg -PORTVERSION= 2.1.6 +PORTVERSION= 2.1.7 #PORTREVISION= 0 CATEGORIES= security MASTER_SITES= GNUPG diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo index 455fab7a6cc4..05c93e8026a0 100644 --- a/security/gnupg/distinfo +++ b/security/gnupg/distinfo @@ -1,4 +1,4 @@ -SHA256 (gnupg-2.1.6.tar.bz2) = 5e599ad542199f3bd733eed2b88a539d1b4c3beda2dbab0ff69f1896f52e92fd -SIZE (gnupg-2.1.6.tar.bz2) = 4917722 -SHA256 (gnupg-2.1.6.tar.bz2.sig) = 44ca68757e7ae6dc8d5c2c1122015b195b366c32e06537b4d29ccdc3e5139c7b -SIZE (gnupg-2.1.6.tar.bz2.sig) = 287 +SHA256 (gnupg-2.1.7.tar.bz2) = c18a3776d47fec98892d51d28b6574ef16bf0a25eabb0956231058aaf2e7846e +SIZE (gnupg-2.1.7.tar.bz2) = 4918583 +SHA256 (gnupg-2.1.7.tar.bz2.sig) = 242db38327b5520b45a9243735b8584d0d319cca4131db6f1522abb6350228bc +SIZE (gnupg-2.1.7.tar.bz2.sig) = 287 diff --git a/security/gnupg/files/patch-agent_agent.h b/security/gnupg/files/patch-agent_agent.h deleted file mode 100644 index f4ea1bc9a6d5..000000000000 --- a/security/gnupg/files/patch-agent_agent.h +++ /dev/null @@ -1,41 +0,0 @@ -From b3286af36d452fc801be573a057b0838d53a2edd Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka <gniibe@fsij.org> -Date: Fri, 10 Jul 2015 09:21:32 +0900 -Subject: [PATCH] agent: Support non-NLS build. - -* agent/agent.h: Use ENABLE_NLS and define L_() macro. - --- - -GnuPG-bug-id: 2032 - -This is a fix for e76d4c05b24211f3981ab69cddb3fccc17d21e0e. ---- - agent/agent.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git agent/agent.h agent/agent.h -index 2948bff..5a09254 100644 ---- agent/agent.h -+++ agent/agent.h -@@ -300,6 +300,7 @@ typedef int (*lookup_ttl_t)(const char *hexgrip); - and uses that to translate a string according to the locale set for - the connection. The macro LunderscoreIMPL is used by i18n to - actually define the inline function when needed. */ -+#ifdef ENABLE_NLS - #define L_(a) agent_Lunderscore (ctrl, (a)) - #define LunderscorePROTO \ - static inline const char *agent_Lunderscore (ctrl_t ctrl, \ -@@ -312,6 +313,9 @@ typedef int (*lookup_ttl_t)(const char *hexgrip); - return ctrl? i18n_localegettext (ctrl->lc_messages, string) \ - /* */: gettext (string); \ - } -+#else -+#define L_(a) (a) -+#endif - - - /*-- gpg-agent.c --*/ --- -2.1.4 - diff --git a/security/gnupg/files/patch-doc-Makefile.in b/security/gnupg/files/patch-doc-Makefile.in index b025b0690786..81db9dc723e3 100644 --- a/security/gnupg/files/patch-doc-Makefile.in +++ b/security/gnupg/files/patch-doc-Makefile.in @@ -1,11 +1,11 @@ ---- doc/Makefile.in.orig 2014-11-22 17:40:32.499461775 +0900 -+++ doc/Makefile.in 2014-11-22 17:41:10.997462066 +0900 -@@ -415,7 +415,7 @@ +--- doc/Makefile.in.orig 2015-08-11 20:57:21.000000000 +0900 ++++ doc/Makefile.in 2015-08-12 01:06:54.960781832 +0900 +@@ -498,7 +498,7 @@ myman_pages = gpg2.1 gpgsm.1 gpg-agent.1 dirmngr.8 scdaemon.1 gpgv2.1 \ watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \ gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \ -- gpgsm-gencert.sh.1 applygnupgdefaults.8 gpg-zip.1 \ -+ gpgsm-gencert.sh.1 applygnupgdefaults.8 \ +- applygnupgdefaults.8 gpg-zip.1 \ ++ applygnupgdefaults.8 \ dirmngr-client.1 man_MANS = $(myman_pages) gnupg.7 diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist index 44def926abb4..04adb6812a0e 100644 --- a/security/gnupg/pkg-plist +++ b/security/gnupg/pkg-plist @@ -12,7 +12,6 @@ bin/gpg2 bin/gpgconf bin/gpgkey2ssh bin/gpgparsemail -bin/gpgsm-gencert.sh bin/gpgv2 bin/symcryptrun bin/watchgnupg @@ -28,7 +27,6 @@ libexec/gpg-protect-tool %%PORTDOCS%%man/man1/gpg2.1.gz %%PORTDOCS%%man/man1/gpgconf.1.gz %%PORTDOCS%%man/man1/gpgparsemail.1.gz -%%PORTDOCS%%man/man1/gpgsm-gencert.sh.1.gz %%PORTDOCS%%man/man1/gpgsm.1.gz %%PORTDOCS%%man/man1/gpgv2.1.gz %%PORTDOCS%%man/man1/scdaemon.1.gz |