Fix the problem in --batch mode.

Obtained from:	http://cvs.gnupg.org/cgi-bin/viewcvs.cgi/trunk/g10/keygen.c?rev=3853&r1=3852&r2=3853
PR:		ports/90105
Submitted by:	Thomas Vogt <thomas@bsdunix.ch>
This commit is contained in:
Jun Kuriyama 2005-12-16 02:16:11 +00:00
parent 1e29810185
commit 1b09038d56
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=151278
4 changed files with 34 additions and 0 deletions

View file

@ -7,6 +7,7 @@
PORTNAME= gnupg
PORTVERSION= 1.4.2
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gnupg

View file

@ -0,0 +1,16 @@
--- g10/keygen.c.orig Tue Jun 21 21:22:17 2005
+++ g10/keygen.c Fri Dec 16 11:03:19 2005
@@ -3244,11 +3244,13 @@
write_keyblock( IOBUF out, KBNODE node )
{
for( ; node ; node = node->next ) {
+ if(!is_deleted_kbnode(node)) {
int rc = build_packet( out, node->pkt );
if( rc ) {
log_error("build_packet(%d) failed: %s\n",
node->pkt->pkttype, g10_errstr(rc) );
return G10ERR_WRITE_FILE;
+ }
}
}
return 0;

View file

@ -7,6 +7,7 @@
PORTNAME= gnupg
PORTVERSION= 1.4.2
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gnupg

View file

@ -0,0 +1,16 @@
--- g10/keygen.c.orig Tue Jun 21 21:22:17 2005
+++ g10/keygen.c Fri Dec 16 11:03:19 2005
@@ -3244,11 +3244,13 @@
write_keyblock( IOBUF out, KBNODE node )
{
for( ; node ; node = node->next ) {
+ if(!is_deleted_kbnode(node)) {
int rc = build_packet( out, node->pkt );
if( rc ) {
log_error("build_packet(%d) failed: %s\n",
node->pkt->pkttype, g10_errstr(rc) );
return G10ERR_WRITE_FILE;
+ }
}
}
return 0;