ports/80157: Update port: security/gnupg to 1.4.1

[Vasil Dimov]

>Number:         80157
>Category:       ports
>Synopsis:       Update port: security/gnupg to 1.4.1
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 20 16:20:19 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Vasil Dimov
>Release:        FreeBSD 5.4-STABLE i386
>Organization:
DataMax
>Environment:
System: FreeBSD sinanica.bg.datamax 5.4-STABLE FreeBSD 5.4-STABLE #5: Mon Apr 11 14:07:32 EEST 2005 root at sinanica.bg.datamax:/usr/obj/usr/src/sys/SINANICA-SMP i386


	
>Description:
	files/patch-cfb is not needed anymore - same changes applied in
	the distribution.

	keyserver/gpgkeys_mailto is not installed anymore (by default) so
	remove it from pkg-plist. If we need this file then more work
	must be done before updating the port.
>How-To-Repeat:
	
>Fix:

	

--- gnupg_update-1.4.0-1.4.1.diff begins here ---
diff -urN gnupg-1.4.0/Makefile gnupg/Makefile
--- gnupg-1.4.0/Makefile	Wed Apr 13 02:22:03 2005
+++ gnupg/Makefile	Wed Apr 20 18:09:47 2005
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnupg
-PORTVERSION=	1.4.0
-PORTREVISION?=	1
+PORTVERSION=	1.4.1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg
diff -urN gnupg-1.4.0/distinfo gnupg/distinfo
--- gnupg-1.4.0/distinfo	Tue Feb  1 10:38:58 2005
+++ gnupg/distinfo	Wed Apr 20 18:13:43 2005
@@ -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 -urN gnupg-1.4.0/files/patch-cfb gnupg/files/patch-cfb
--- gnupg-1.4.0/files/patch-cfb	Sat Feb 12 11:29:35 2005
+++ gnupg/files/patch-cfb	Thu Jan  1 02:00:00 1970
@@ -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 -urN gnupg-1.4.0/pkg-plist gnupg/pkg-plist
--- gnupg-1.4.0/pkg-plist	Tue Feb  1 10:38:58 2005
+++ gnupg/pkg-plist	Wed Apr 20 18:58:38 2005
@@ -5,7 +5,6 @@
 libexec/gnupg/gpgkeys_finger
 libexec/gnupg/gpgkeys_hkp
 libexec/gnupg/gpgkeys_http
-libexec/gnupg/gpgkeys_mailto
 @dirrm libexec/gnupg
 %%DATADIR%%/FAQ
 %%DATADIR%%/faq.html
--- gnupg_update-1.4.0-1.4.1.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: