Update to release 1.9.15. This is a bug fix release.

3 files changed, 12 insertions, 25 deletions

diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index 62eb5a9b2ee..29a54bdccb8 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.7 2005/01/04 13:52:01 shannonjr Exp $
+# $NetBSD: Makefile,v 1.8 2005/01/17 18:32:47 shannonjr Exp $
 #
 
-DISTNAME=		gnupg-1.9.14
+DISTNAME=		gnupg-1.9.15
 PKGNAME=		${DISTNAME:S/gnupg/gnupg-devel/}
-PKGREVISION=		1
+#PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
-DISTFILES+=		pth-2.0.0.tar.gz
-SITES_pth-2.0.0.tar.gz=	${MASTER_SITE_GNU:=pth/}
+DISTFILES+=		pth-2.0.3.tar.gz
+SITES_pth-2.0.3.tar.gz=	${MASTER_SITE_GNU:=pth/}
 
 MAINTAINER=		shannonjr@NetBSD.org
 HOMEPAGE=		ftp://ftp.gnupg.org/gcrypt/alpha/gnupg/
@@ -25,6 +25,7 @@ USE_PKGLOCALEDIR=	yes
 CONFIGURE_ARGS+=	--with-static-rnd=auto
 CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ARGS+=	--with-pth-prefix=${WRKDIR}/pth
+CONFIGURE_ENV+=		gnupg_cv_pth_is_sane=yes
 
 TEST_TARGET=		check
 
@@ -50,7 +51,7 @@ PLIST_SRC+=	${.CURDIR}/PLIST.gpgsm
 # We are building a static pth library and linking against it
 # While this is not very satisfying, gpgme hangs in it's gpgsm tests if we depend on the shared (pkgsrc) pth library
 pre-configure:
-	cd  ${WRKDIR}/pth-2.0.0 && ./configure --prefix=${WRKDIR}/pth --enable-pthread --enable-static --disable-shared && ${MAKE} install
+	cd  ${WRKDIR}/pth-2.0.3 && ./configure --prefix=${WRKDIR}/pth --enable-pthread --enable-static --disable-shared && ${MAKE} install
 
 BUILDLINK_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
 
diff --git a/security/gnupg-devel/distinfo b/security/gnupg-devel/distinfo
index 14383c07b40..37d51817467 100644
--- a/security/gnupg-devel/distinfo
+++ b/security/gnupg-devel/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/01/04 13:52:01 shannonjr Exp $
+$NetBSD: distinfo,v 1.6 2005/01/17 18:32:47 shannonjr Exp $
 
-SHA1 (gnupg-1.9.14.tar.gz) = 6e5a3b27a4eb6a781bc8d8ad9458ea3e99449b48
-Size (gnupg-1.9.14.tar.gz) = 1925582 bytes
-SHA1 (pth-2.0.0.tar.gz) = 91b7593e5435604090c3974a8584478877194533
-Size (pth-2.0.0.tar.gz) = 536605 bytes
+SHA1 (gnupg-1.9.15.tar.gz) = a00a688dc33f1f22743eb857a16e8506f8d765d9
+Size (gnupg-1.9.15.tar.gz) = 1928702 bytes
+SHA1 (pth-2.0.3.tar.gz) = c2445bcf24ce3615cfbfbd58b79bbab36542617d
+Size (pth-2.0.3.tar.gz) = 639243 bytes
 SHA1 (patch-aa) = 4fdedc1f98dbe717fd5a1229944703f19c3c10e5
 SHA1 (patch-ab) = 2bd1b553cc45ed66e3f95364058b227dfcc74be5
 SHA1 (patch-ac) = 82cae75a7fed505bf2e358d6471b85951513976c
-SHA1 (patch-ad) = 698e585fd554d3581792e0e613d43d20d2ffda77
diff --git a/security/gnupg-devel/patches/patch-ad b/security/gnupg-devel/patches/patch-ad
deleted file mode 100644
index d85758a46f8..00000000000
--- a/security/gnupg-devel/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2005/01/04 13:52:01 shannonjr Exp $
-
---- ./common/asshelp.c.orig	2004-12-18 02:35:31.000000000 -0700
-+++ ./common/asshelp.c
-@@ -150,7 +150,7 @@ send_pinentry_environment (assuan_contex
- #endif
-   if (opt_lc_messages || (dft_ttyname && dft_lc))
-     {
--      err = send_one_option (ctx, errsource, "display", 
-+      err = send_one_option (ctx, errsource, "lc-messages", 
-                              opt_lc_messages ? opt_lc_messages : dft_lc);
-     }
- #if defined(HAVE_SETLOCALE) && defined(LC_MESSAGES)