ports/90105: security/gnupg fix batch mode

[Thomas Vogt]

>Number:         90105
>Category:       ports
>Synopsis:       security/gnupg fix batch mode
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 08 16:10:03 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Thomas Vogt
>Release:        FreeBSD 4.11-RELEASE-p10 i386
>Organization:
>Environment:
System: FreeBSD conversation.bsdunix.ch 4.11-RELEASE-p10 FreeBSD 4.11-RELEASE-p10 #3: Fri Jun 17 15:54:34 CEST 2005 root at conversation.bsdunix.ch:/usr/obj/usr/src/sys/CONVERSATION i386


	
>Description:
	- gnupg 1.4.2 does not work properly with --batch. "Assertion failed: (pkt->pkt.generic), function build_packet, file build-packet.c , line 74.". This problem is fixed in the gnupg cvs and will be in the 1.4.3 release.
	- add sha256 checksum
>How-To-Repeat:
	Use BATCH mode
>Fix:



diff -u Makefile.orig Makefile
--- Makefile.orig	Thu Dec  8 16:54:22 2005
+++ Makefile	Thu Dec  8 16:54:31 2005
@@ -7,6 +7,7 @@
 
 PORTNAME=	gnupg
 PORTVERSION=	1.4.2
+PORTREVISION=   1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gnupg


diff -u distinfo distinfo
--- distinfo.orig	Thu Dec  8 15:03:38 2005
+++ distinfo	Thu Dec  8 15:06:06 2005
@@ -1,4 +1,6 @@
 MD5 (gnupg-1.4.2.tar.bz2) = c7afd50c7d01fcfada229326b3958404
+SHA256 (gnupg-1.4.2.tar.bz2) = 2e59787afe23102ebd8b05d32ce6abf165d2035958b200c2e330329c0a98b892
 SIZE (gnupg-1.4.2.tar.bz2) = 2891177
 MD5 (gnupg-1.4.2.tar.bz2.sig) = 9b2fba5c49d094b1f1b8219d354e61f5
+SHA256 (gnupg-1.4.2.tar.bz2.sig) = a6cc885af017aa0aa059230f246c30cb0adbe8a30bacbc6cc6e85347be6b6e34
 SIZE (gnupg-1.4.2.tar.bz2.sig) = 65


diff -ruN g10/keygen.c.orig g10/keygen.c
--- g10/keygen.c.orig	Thu Dec  8 14:52:16 2005
+++ g10/keygen.c	Thu Dec  8 14:53:55 2005
@@ -2688,7 +2688,14 @@
   PACKET *pkt;
 
   pkt=m_alloc_clear(sizeof(*pkt));
-  pkt->pkttype=PKT_NONE;
+  
+/* We're not acually using a user ID here - this is just an
+     arbitrary choice.  We delete it anyway. */
+
+  pkt->pkttype=PKT_USER_ID;
+  pkt->pkt.user_id=m_alloc_clear(sizeof *pkt->pkt.user_id);
+  pkt->pkt.user_id->ref=1;
+  
   *tree=new_kbnode(pkt);
   delete_kbnode(*tree);
 }
>Release-Note:
>Audit-Trail:
>Unformatted: