Update to 1.4.1:

Noteworthy changes in version 1.4.1 (2005-03-15)
------------------------------------------------

    * New --rfc2440-text option which controls how text is handled in
      signatures.  This is in response to some problems seen with
      certain PGP/MIME mail clients and GnuPG version 1.4.0.  More
      details about this are available at
      <http://lists.gnupg.org/pipermail/gnupg-users/2005-January/024408.html>.

    * New "import-unusable-sigs" and "export-unusable-sigs" tags for
      --import-options and --export-options.  These are off by
      default, and cause GnuPG to not import or export key signatures
      that are not usable (e.g. expired signatures).

    * New experimental HTTP, HTTPS, FTP, and FTPS keyserver helper
      that uses the cURL library <http://curl.haxx.se> to retrieve
      keys.  This is disabled by default, but may be enabled with the
      configure option --with-libcurl.  Without this option, the
      existing HTTP code is used for HTTP, and HTTPS, FTP, and FTPS
      are not supported.

      [enabled with the "curl" option for the package]

    * When running a --card-status or --card-edit and a public key is
      available, missing secret key stubs will be created on the fly.
      Details of the key are listed too.

    * The implicit packet dumping in double verbose mode is now sent
      to stderr and not to stdout.

    * Added countermeasures against the Mister/Zuccherato CFB attack
      <http://eprint.iacr.org/2005/033>.

    * Add new --edit-key command "bkuptocard" to allow restoring a
      card key from a backup.

    * The "fetch" command of --card-edit now retrieves the key using
      the default keyserver if no URL has been stored on the card.

    * New configure option --enable-noexecstack.

Also, gpgkeys_mailto is not installed any longer, dropping the
dependency on perl.

4 files changed, 26 insertions, 36 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 319c1a29da5..ccab18fb5ac 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2005/02/09 11:35:50 markd Exp $
+# $NetBSD: Makefile,v 1.74 2005/03/22 17:50:55 wiz Exp $
 
-DISTNAME=	gnupg-1.4.0
+DISTNAME=	gnupg-1.4.1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gnupg/ \
 		ftp://ftp.planetmirror.com/pub/gnupg/ \
@@ -16,9 +16,10 @@ MAINTAINER=	wiz@NetBSD.org
 HOMEPAGE=	http://www.gnupg.org/
 COMMENT=	GNU Privacy Guard, public-Key encryption and digital signatures
 
+BUILD_USES_MSGFMT=	yes
+
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-BUILD_USES_MSGFMT=	yes
 CRYPTO=			yes
 GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
@@ -59,6 +60,5 @@ post-install:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gnupg/PLIST b/security/gnupg/PLIST
index 8bb28b905cd..b89899503b5 100644
--- a/security/gnupg/PLIST
+++ b/security/gnupg/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.14 2004/12/25 02:54:13 wiz Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/03/22 17:50:55 wiz Exp $
 bin/gpg
 bin/gpgsplit
 bin/gpgv
+${CURL}libexec/gnupg/gpgkeys_curl
 libexec/gnupg/gpgkeys_finger
 libexec/gnupg/gpgkeys_hkp
-libexec/gnupg/gpgkeys_http
-libexec/gnupg/gpgkeys_mailto
+${NOCURL}libexec/gnupg/gpgkeys_http
 ${OPENLDAP}libexec/gnupg/gpgkeys_ldap
 man/man1/gpg.1
 man/man1/gpg.ru.1
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index e7dc902480f..222f2a1576f 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.33 2005/02/24 13:10:06 agc Exp $
+$NetBSD: distinfo,v 1.34 2005/03/22 17:50:55 wiz Exp $
 
-SHA1 (gnupg-1.4.0.tar.bz2) = 0054635a131b7af383e956fa9e1520ac44cad116
-RMD160 (gnupg-1.4.0.tar.bz2) = 75a2a2008c9c7136e37c6ff7d34ab75346717cca
-Size (gnupg-1.4.0.tar.bz2) = 2722669 bytes
+SHA1 (gnupg-1.4.1.tar.bz2) = ebd16ef9d3fd3c38e38cf39e6347ed058fd12840
+RMD160 (gnupg-1.4.1.tar.bz2) = 90680d388ba49f6f434edebcdb66cb39bf281bda
+Size (gnupg-1.4.1.tar.bz2) = 2822791 bytes
 SHA1 (idea.c.gz) = 82fded4ec31b97b3b2dd22741880b67cfee40f84
+RMD160 (idea.c.gz) = e35be5a031d10d52341ac5f029d28f811edd908d
 Size (idea.c.gz) = 5216 bytes
 SHA1 (patch-aa) = 2916ba7403fea027d872fe62ce271c2e8b8ac3be
 SHA1 (patch-ab) = 29a7d0b736322eb1ecf0925a2419b513f323000e
diff --git a/security/gnupg/options.mk b/security/gnupg/options.mk
index 58642c25802..f7545c9481a 100644
--- a/security/gnupg/options.mk
+++ b/security/gnupg/options.mk
@@ -1,26 +1,7 @@
-# $NetBSD: options.mk,v 1.1 2004/12/25 02:54:49 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2005/03/22 17:50:55 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.gnupg
-PKG_SUPPORTED_OPTIONS=	i586-optimized idea ldap m68060-optimized
-
-.include "../../mk/bsd.prefs.mk"
-
-# legacy options -- remove after 2005Q1
-.if defined(USE_I586) && !empty(USE_I586:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	i586-optimized
-.endif
-
-.if defined(M68060) && !empty(M68060:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	m68060-optimized
-.endif
-
-.if defined(USE_IDEA) && !empty(USE_IDEA:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	idea
-.endif
-
-.if defined(USE_OPENLDAP) && !empty(USE_OPENLDAP:M[yY][eE][sS])
-PKG_DEFAULT_OPTIONS+=	ldap
-.endif
+PKG_SUPPORTED_OPTIONS=	i586-optimized curl idea ldap m68060-optimized
 
 .include "../../mk/bsd.options.mk"
 
@@ -30,10 +11,12 @@ ONLY_FOR_PLATFORM=	*-*-i386
 MACHINE_GNU_ARCH=	i586
 .endif
 
-.if !empty(PKG_OPTIONS:Mm68060-optimized)
-# be more efficient on M68060 machines
-CONFIGURE_ENV+=                M68060=${M68060}
-CFLAGS+=                       -m68060
+.if !empty(PKG_OPTIONS:Mcurl)
+.include "../../www/curl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-libcurl
+PLIST_SUBST+=	CURL="" NOCURL="@comment "
+.else
+PLIST_SUBST+=	CURL="@comment " NOCURL=""
 .endif
 
 .if !empty(PKG_OPTIONS:Midea)
@@ -54,3 +37,9 @@ PLIST_SUBST+=	OPENLDAP=""
 CONFIGURE_ARGS+=--disable-ldap
 PLIST_SUBST+=	OPENLDAP="@comment "
 .endif
+
+.if !empty(PKG_OPTIONS:Mm68060-optimized)
+# be more efficient on M68060 machines
+CONFIGURE_ENV+=                M68060=${M68060}
+CFLAGS+=                       -m68060
+.endif