aboutsummaryrefslogtreecommitdiff
path: root/security/gnupg
diff options
context:
space:
mode:
authorJun Kuriyama <kuriyama@FreeBSD.org>2010-07-23 13:43:26 +0000
committerJun Kuriyama <kuriyama@FreeBSD.org>2010-07-23 13:43:26 +0000
commit4c32bda1a6f8c7b325740ef1d5afede95b3946c7 (patch)
tree4cd720a4226b575c255af3f25c3a3b30148b6a31 /security/gnupg
parent73d1320ed3f0bf03df903b43cf9287ba127178cb (diff)
downloadports-4c32bda1a6f8c7b325740ef1d5afede95b3946c7.tar.gz
ports-4c32bda1a6f8c7b325740ef1d5afede95b3946c7.zip
- Fix $LICENSE_FILE [1].
- Fix realloc bug in GPGSM (not affected GPG itself) [2]. PR: ports/148817 [1] Submitted by: Anonymous <swell.k@gmail.com> [1] Security: http://lists.gnupg.org/pipermail/gnupg-announce/2010q3/000302.html [2]
Notes
Notes: svn path=/head/; revision=258095
Diffstat (limited to 'security/gnupg')
-rw-r--r--security/gnupg/Makefile4
-rw-r--r--security/gnupg/files/patch-keybox-blob.c10
2 files changed, 13 insertions, 1 deletions
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index cd89b897c257..0038b1378e7c 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gnupg
PORTVERSION= 2.0.16
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gnupg
@@ -25,7 +26,8 @@ LIB_DEPENDS= assuan.0:${PORTSDIR}/security/libassuan \
LICENSE= GPLv3 LGPL3
LICENSE_COMB= multi
-LICENSE_FILE= ${WRKSRC}/COPYING ${WRKSRC}/COPYING.LIB
+LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING
+LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LIB
USE_BZIP2= YES
USE_GMAKE= YES
GNU_CONFIGURE= YES
diff --git a/security/gnupg/files/patch-keybox-blob.c b/security/gnupg/files/patch-keybox-blob.c
new file mode 100644
index 000000000000..538114db83e8
--- /dev/null
+++ b/security/gnupg/files/patch-keybox-blob.c
@@ -0,0 +1,10 @@
+--- kbx/keybox-blob.c.orig 2010-07-23 22:18:31.450982300 +0900
++++ kbx/keybox-blob.c 2010-07-23 22:18:53.264465242 +0900
+@@ -898,6 +898,7 @@
+ rc = gpg_error_from_syserror ();
+ goto leave;
+ }
++ names = tmp;
+ }
+ names[blob->nuids++] = p;
+ if (!i && (p=x509_email_kludge (p)))