From 75a2b900c32c3b8b4653b668ffe1917786b9f7a4 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Thu, 15 Feb 2001 12:04:37 +0000
Subject: Update to 1.0.4nb3: incorporate a security fix by the author. (Which
 also includes completely unrelated patch-ac.) Closes pkg/12208.

---
 security/gnupg/Makefile         |  8 ++++++--
 security/gnupg/files/md5        |  3 ++-
 security/gnupg/files/patch-sum  |  3 +--
 security/gnupg/patches/patch-ac | 13 -------------
 4 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 security/gnupg/patches/patch-ac

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 88ef1c9eee5..b9999e6de80 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,14 +1,18 @@
-# $NetBSD: Makefile,v 1.20 2001/01/29 11:53:02 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2001/02/15 12:04:37 wiz Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/08/27 13:06:01 ache Exp
 #
 
 DISTNAME=	gnupg-1.0.4
-PKGNAME=	${DISTNAME}nb2
+PKGNAME=	${DISTNAME}nb3
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/gnupg/
 # don't remove this -- we may add idea.c to it below
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
+PATCHFILES=	gnupg-1.0.4.security-patch1.diff
+PATCH_SITES=	ftp://ftp.gnupg.org/pub/gcrypt/gnupg/
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://www.gnupg.org/
 
diff --git a/security/gnupg/files/md5 b/security/gnupg/files/md5
index 4577ab26bc5..1c47bb8d290 100644
--- a/security/gnupg/files/md5
+++ b/security/gnupg/files/md5
@@ -1,4 +1,5 @@
-$NetBSD: md5,v 1.9 2001/01/29 11:53:02 wiz Exp $
+$NetBSD: md5,v 1.10 2001/02/15 12:04:38 wiz Exp $
 
 MD5 (gnupg-1.0.4.tar.gz) = bef2267bfe9b74a00906a78db34437f9
+MD5 (gnupg-1.0.4.security-patch1.diff) = 4d7b547a7b85a877ad165a3a29ae08e5
 MD5 (idea.c) = 7d0557459e0a41da099ddbd837d4bd40
diff --git a/security/gnupg/files/patch-sum b/security/gnupg/files/patch-sum
index 34c04b66b19..f25e305cb9a 100644
--- a/security/gnupg/files/patch-sum
+++ b/security/gnupg/files/patch-sum
@@ -1,5 +1,4 @@
-$NetBSD: patch-sum,v 1.10 2001/01/29 11:53:02 wiz Exp $
+$NetBSD: patch-sum,v 1.11 2001/02/15 12:04:38 wiz Exp $
 
 MD5 (patch-aa) = 4fe53ce94604cb81a997dfe571550308
 MD5 (patch-ab) = 8e1056e7c48bd2cce13b3e4ffb90d945
-MD5 (patch-ac) = b1b05e17d925ddcf7bcc92eca9279ff7
diff --git a/security/gnupg/patches/patch-ac b/security/gnupg/patches/patch-ac
deleted file mode 100644
index 44c35b4bdef..00000000000
--- a/security/gnupg/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.8 2001/01/29 11:53:03 wiz Exp $
-
---- g10/openfile.c.orig	Tue Sep  5 17:31:57 2000
-+++ g10/openfile.c
-@@ -329,7 +329,7 @@
- 
-     if ( ( *defhome == '~'
-            && ( strlen(fname) >= strlen (defhome+1)
--                && !strcmp(fname+strlen(defhome+1)-strlen(defhome+1),
-+                && !strcmp(fname+strlen(fname)-strlen(defhome+1),
-                            defhome+1 ) ))
-          || ( *defhome != '~'
-               && !compare_filenames( fname, defhome ) )
-- 
cgit v1.2.3