8 files changed, 12 insertions, 110 deletions

diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 1d15b2da2af8..8601a1cddf31 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gnupg
-PORTVERSION=	1.4.0
-PORTREVISION?=	1
+PORTVERSION=	1.4.1
+PORTREVISION?=	0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
diff --git a/security/gnupg/distinfo b/security/gnupg/distinfo
index 199b5d41c751..278ce7415163 100644
--- a/security/gnupg/distinfo
+++ b/security/gnupg/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnupg-1.4.0.tar.bz2) = 8c303606aaf73b7756b9fe6f3d8b58c2
-SIZE (gnupg-1.4.0.tar.bz2) = 2722669
-MD5 (gnupg-1.4.0.tar.bz2.sig) = bdfb7093cf5d76d1b69e9b577e9d8514
-SIZE (gnupg-1.4.0.tar.bz2.sig) = 65
+MD5 (gnupg-1.4.1.tar.bz2) = fdfc5553d0904cd65011e47a42a9532c
+SIZE (gnupg-1.4.1.tar.bz2) = 2822791
+MD5 (gnupg-1.4.1.tar.bz2.sig) = 440038771606d59e9cbc153cccdbac55
+SIZE (gnupg-1.4.1.tar.bz2.sig) = 65
diff --git a/security/gnupg/files/patch-cfb b/security/gnupg/files/patch-cfb
deleted file mode 100644
index 5355e5d71569..000000000000
--- a/security/gnupg/files/patch-cfb
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: include/cipher.h
-===================================================================
-RCS file: /cvs/gnupg/gnupg/include/cipher.h,v
-retrieving revision 1.63
-diff -u -r1.63 cipher.h
---- include/cipher.h	29 Nov 2004 21:14:18 -0000	1.63
-+++ include/cipher.h	8 Feb 2005 04:10:29 -0000
-@@ -75,6 +75,7 @@
-     int keylen;
-     int algo_info_printed;
-     int use_mdc;
-+    int symmetric;
-     byte key[32]; /* this is the largest used keylen (256 bit) */
- } DEK;
-
-Index: g10/mainproc.c
-===================================================================
-RCS file: /cvs/gnupg/gnupg/g10/mainproc.c,v
-retrieving revision 1.161
-diff -u -r1.161 mainproc.c
---- g10/mainproc.c	21 Oct 2004 19:18:47 -0000	1.161
-+++ g10/mainproc.c	8 Feb 2005 04:10:30 -0000
-@@ -330,6 +330,8 @@
-
- 	    if(c->dek)
- 	      {
-+		c->dek->symmetric=1;
-+
- 		/* FIXME: This doesn't work perfectly if a symmetric
- 		   key comes before a public key in the message - if
- 		   the user doesn't know the passphrase, then there is
-Index: g10/encr-data.c
-===================================================================
-RCS file: /cvs/gnupg/gnupg/g10/encr-data.c,v
-retrieving revision 1.30
-diff -u -r1.30 encr-data.c
---- g10/encr-data.c	8 Oct 2004 21:54:26 -0000	1.30
-+++ g10/encr-data.c	8 Feb 2005 04:10:30 -0000
-@@ -125,7 +125,7 @@
-     cipher_sync( dfx.cipher_hd );
-     p = temp;
- /* log_hexdump( "prefix", temp, nprefix+2 ); */
--    if( p[nprefix-2] != p[nprefix] || p[nprefix-1] != p[nprefix+1] ) {
-+    if( dek->symmetric && (p[nprefix-2] != p[nprefix] || p[nprefix-1] != p[nprefix+1]) ) {
- 	rc = G10ERR_BAD_KEY;
- 	goto leave;
-     }
-
diff --git a/security/gnupg/pkg-plist b/security/gnupg/pkg-plist
index 74ec7130b4f9..c3d185c8136b 100644
--- a/security/gnupg/pkg-plist
+++ b/security/gnupg/pkg-plist
@@ -5,7 +5,6 @@ bin/gpgv
 libexec/gnupg/gpgkeys_finger
 libexec/gnupg/gpgkeys_hkp
 libexec/gnupg/gpgkeys_http
-libexec/gnupg/gpgkeys_mailto
 @dirrm libexec/gnupg
 %%DATADIR%%/FAQ
 %%DATADIR%%/faq.html
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 1d15b2da2af8..8601a1cddf31 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	gnupg
-PORTVERSION=	1.4.0
-PORTREVISION?=	1
+PORTVERSION=	1.4.1
+PORTREVISION?=	0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
diff --git a/security/gnupg1/distinfo b/security/gnupg1/distinfo
index 199b5d41c751..278ce7415163 100644
--- a/security/gnupg1/distinfo
+++ b/security/gnupg1/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnupg-1.4.0.tar.bz2) = 8c303606aaf73b7756b9fe6f3d8b58c2
-SIZE (gnupg-1.4.0.tar.bz2) = 2722669
-MD5 (gnupg-1.4.0.tar.bz2.sig) = bdfb7093cf5d76d1b69e9b577e9d8514
-SIZE (gnupg-1.4.0.tar.bz2.sig) = 65
+MD5 (gnupg-1.4.1.tar.bz2) = fdfc5553d0904cd65011e47a42a9532c
+SIZE (gnupg-1.4.1.tar.bz2) = 2822791
+MD5 (gnupg-1.4.1.tar.bz2.sig) = 440038771606d59e9cbc153cccdbac55
+SIZE (gnupg-1.4.1.tar.bz2.sig) = 65
diff --git a/security/gnupg1/files/patch-cfb b/security/gnupg1/files/patch-cfb
deleted file mode 100644
index 5355e5d71569..000000000000
--- a/security/gnupg1/files/patch-cfb
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: include/cipher.h
-===================================================================
-RCS file: /cvs/gnupg/gnupg/include/cipher.h,v
-retrieving revision 1.63
-diff -u -r1.63 cipher.h
---- include/cipher.h	29 Nov 2004 21:14:18 -0000	1.63
-+++ include/cipher.h	8 Feb 2005 04:10:29 -0000
-@@ -75,6 +75,7 @@
-     int keylen;
-     int algo_info_printed;
-     int use_mdc;
-+    int symmetric;
-     byte key[32]; /* this is the largest used keylen (256 bit) */
- } DEK;
-
-Index: g10/mainproc.c
-===================================================================
-RCS file: /cvs/gnupg/gnupg/g10/mainproc.c,v
-retrieving revision 1.161
-diff -u -r1.161 mainproc.c
---- g10/mainproc.c	21 Oct 2004 19:18:47 -0000	1.161
-+++ g10/mainproc.c	8 Feb 2005 04:10:30 -0000
-@@ -330,6 +330,8 @@
-
- 	    if(c->dek)
- 	      {
-+		c->dek->symmetric=1;
-+
- 		/* FIXME: This doesn't work perfectly if a symmetric
- 		   key comes before a public key in the message - if
- 		   the user doesn't know the passphrase, then there is
-Index: g10/encr-data.c
-===================================================================
-RCS file: /cvs/gnupg/gnupg/g10/encr-data.c,v
-retrieving revision 1.30
-diff -u -r1.30 encr-data.c
---- g10/encr-data.c	8 Oct 2004 21:54:26 -0000	1.30
-+++ g10/encr-data.c	8 Feb 2005 04:10:30 -0000
-@@ -125,7 +125,7 @@
-     cipher_sync( dfx.cipher_hd );
-     p = temp;
- /* log_hexdump( "prefix", temp, nprefix+2 ); */
--    if( p[nprefix-2] != p[nprefix] || p[nprefix-1] != p[nprefix+1] ) {
-+    if( dek->symmetric && (p[nprefix-2] != p[nprefix] || p[nprefix-1] != p[nprefix+1]) ) {
- 	rc = G10ERR_BAD_KEY;
- 	goto leave;
-     }
-
diff --git a/security/gnupg1/pkg-plist b/security/gnupg1/pkg-plist
index 74ec7130b4f9..c3d185c8136b 100644
--- a/security/gnupg1/pkg-plist
+++ b/security/gnupg1/pkg-plist
@@ -5,7 +5,6 @@ bin/gpgv
 libexec/gnupg/gpgkeys_finger
 libexec/gnupg/gpgkeys_hkp
 libexec/gnupg/gpgkeys_http
-libexec/gnupg/gpgkeys_mailto
 @dirrm libexec/gnupg
 %%DATADIR%%/FAQ
 %%DATADIR%%/faq.html