diff options
| author | kuriyama <kuriyama@FreeBSD.org> | 2005-12-16 10:16:11 +0800 |
|---|---|---|
| committer | kuriyama <kuriyama@FreeBSD.org> | 2005-12-16 10:16:11 +0800 |
| commit | 6fdf90d83680dc8c2c752777167ad2919c3fd9f0 (patch) | |
| tree | daf31dca953abace8008f196b5422b2849369a6f /security | |
| parent | 9e92b259f12afa259348b37e86d3d191f6ac6fd2 (diff) | |
| download | freebsd-ports-gnome-6fdf90d83680dc8c2c752777167ad2919c3fd9f0.tar.gz freebsd-ports-gnome-6fdf90d83680dc8c2c752777167ad2919c3fd9f0.tar.zst freebsd-ports-gnome-6fdf90d83680dc8c2c752777167ad2919c3fd9f0.zip | |
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>
Diffstat (limited to 'security')
| -rw-r--r-- | security/gnupg/Makefile | 1 | ||||
| -rw-r--r-- | security/gnupg/files/patch-keygen.c | 16 | ||||
| -rw-r--r-- | security/gnupg1/Makefile | 1 | ||||
| -rw-r--r-- | security/gnupg1/files/patch-keygen.c | 16 |
4 files changed, 34 insertions, 0 deletions
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile index 446a3708c492..330f5b2e283e 100644 --- a/security/gnupg/Makefile +++ b/security/gnupg/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnupg PORTVERSION= 1.4.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gnupg diff --git a/security/gnupg/files/patch-keygen.c b/security/gnupg/files/patch-keygen.c new file mode 100644 index 000000000000..2024ed3f567c --- /dev/null +++ b/security/gnupg/files/patch-keygen.c @@ -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; diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile index 446a3708c492..330f5b2e283e 100644 --- a/security/gnupg1/Makefile +++ b/security/gnupg1/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnupg PORTVERSION= 1.4.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gnupg diff --git a/security/gnupg1/files/patch-keygen.c b/security/gnupg1/files/patch-keygen.c new file mode 100644 index 000000000000..2024ed3f567c --- /dev/null +++ b/security/gnupg1/files/patch-keygen.c @@ -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; |