Page MenuHomeFreeBSD
Files F148571381

D3096.id6965.diff
No OneTemporary
Actions

D3096.id6965.diff
View Options

Index: security/gnupg/Makefile
===================================================================
--- security/gnupg/Makefile
+++ security/gnupg/Makefile
@@ -2,14 +2,14 @@
PORTNAME= gnupg
PORTVERSION= 2.1.6
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= GNUPG
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= kuriyama@FreeBSD.org
-COMMENT= The GNU Privacy Guard
+COMMENT= GNU Privacy Guard
LICENSE= GPLv3 LGPL3
LICENSE_COMB= multi
@@ -31,7 +31,7 @@
# Otherwise, $PREFIX/lib/libreadline.so.6 will be linked when
# devel/readline is installed.
CONFIGURE_ARGS+= --disable-ntbtls --enable-symcryptrun --with-readline=/usr
-CONFLICTS= gnupg-2.0.* dirmngr-*
+CONFLICTS= gnupg-2.0.* dirmngr-[0-9]*
CPE_VENDOR= gnupg
OPTIONS_DEFINE= GNUTLS LDAP SCDAEMON KDNS NLS DOCS SUID_GPG
Index: security/gnupg/files/patch-agent_agent.h
===================================================================
--- /dev/null
+++ security/gnupg/files/patch-agent_agent.h
@@ -0,0 +1,36 @@
+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(+)
+
+--- agent/agent.h.orig 2015-06-30 20:26:08 UTC
++++ agent/agent.h
+@@ -300,6 +300,7 @@ typedef int (*lookup_ttl_t)(const char *
+ 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 *
+ return ctrl? i18n_localegettext (ctrl->lc_messages, string) \
+ /* */: gettext (string); \
+ }
++#else
++#define L_(a) (a)
++#endif
+
+
+ /*-- gpg-agent.c --*/
Index: security/gnupg/files/patch-doc-Makefile.in
===================================================================
--- security/gnupg/files/patch-doc-Makefile.in
+++ security/gnupg/files/patch-doc-Makefile.in
@@ -1,6 +1,6 @@
---- 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-07-01 12:17:03 UTC
++++ doc/Makefile.in
+@@ -498,7 +498,7 @@ myman_sources = gnupg7.texi gpg.texi gpg
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 \

File Metadata

Mime Type
text/plain
Expires
Thu, Mar 19, 8:41 PM (7 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29978537
Default Alt Text
D3096.id6965.diff (2 KB)

Event Timeline