diff options
| author | Jun Kuriyama <kuriyama@FreeBSD.org> | 2006-04-03 12:57:58 +0000 |
|---|---|---|
| committer | Jun Kuriyama <kuriyama@FreeBSD.org> | 2006-04-03 12:57:58 +0000 |
| commit | ff8f727e0b5383fc0c671277402c4514e271c418 (patch) | |
| tree | d50ee689207d5c27dff0f1f4e19ac62f46cab606 /security/gnupg1 | |
| parent | UNBREAK: Make it fetchable again (diff) | |
- Upgrade to 1.4.3.
- Handle hidden dependency on libusb (1).
Submitted by: Peter Pentchev <roam@ringlet.net> (1)
Notes
Notes:
svn path=/head/; revision=158721
Diffstat (limited to 'security/gnupg1')
| -rw-r--r-- | security/gnupg1/Makefile | 8 | ||||
| -rw-r--r-- | security/gnupg1/distinfo | 12 | ||||
| -rw-r--r-- | security/gnupg1/files/patch-keygen.c | 16 | ||||
| -rw-r--r-- | security/gnupg1/pkg-plist | 3 |
4 files changed, 15 insertions, 24 deletions
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile index 78f231fc67dc..0f1e8888734c 100644 --- a/security/gnupg1/Makefile +++ b/security/gnupg1/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnupg -PORTVERSION= 1.4.2.2 +PORTVERSION= 1.4.3 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= gnupg @@ -40,6 +40,12 @@ INFO= gpg gpgv .if defined(WITH_LIBICONV) || exists(${PREFIX}/lib/libiconv.so) USE_ICONV= yes .endif +.if defined(WITH_LIBUSB) +CONFIGURE_ARGS+= --with-libusb=${LOCALBASE} +LIB_DEPENDS+= usb-0.1.8:${PORTSDIR}/devel/libusb +.else +CONFIGURE_ARGS+= --without-libusb +.endif .if defined(WITH_LDAP) USE_OPENLDAP= yes PLIST_SUB+= WITH_LDAP="" diff --git a/security/gnupg1/distinfo b/security/gnupg1/distinfo index 746bcd2f6ed7..9bdf9524e761 100644 --- a/security/gnupg1/distinfo +++ b/security/gnupg1/distinfo @@ -1,6 +1,6 @@ -MD5 (gnupg-1.4.2.2.tar.bz2) = c34736eb7cb687f9e5b6d4df48aaf7c8 -SHA256 (gnupg-1.4.2.2.tar.bz2) = 174e7f78c670d76984c4c4bd6077a0b9fec7b4be700b9f3e40c6889b78110c57 -SIZE (gnupg-1.4.2.2.tar.bz2) = 3034652 -MD5 (gnupg-1.4.2.2.tar.bz2.sig) = 6065155c588b50af0b13d616944a6bb3 -SHA256 (gnupg-1.4.2.2.tar.bz2.sig) = eb4e7c829c07f51feef32a8c065d20877a8f644fb08fce93ffbf103265c6af1f -SIZE (gnupg-1.4.2.2.tar.bz2.sig) = 158 +MD5 (gnupg-1.4.3.tar.bz2) = d237d8fe1c4afa379f56dbda0e0b40e4 +SHA256 (gnupg-1.4.3.tar.bz2) = 1d8d65e43751d833d4d49fa86df6fe97cebd00162dd0ced743470dca7e520da6 +SIZE (gnupg-1.4.3.tar.bz2) = 3114088 +MD5 (gnupg-1.4.3.tar.bz2.sig) = 97fd298bfb5f71df85b4e5303561f508 +SHA256 (gnupg-1.4.3.tar.bz2.sig) = 4d308a94e3aca4596d3c3e2237009d6a3fea7bacc23deaeda4dada649ced412f +SIZE (gnupg-1.4.3.tar.bz2.sig) = 158 diff --git a/security/gnupg1/files/patch-keygen.c b/security/gnupg1/files/patch-keygen.c deleted file mode 100644 index 2024ed3f567c..000000000000 --- a/security/gnupg1/files/patch-keygen.c +++ /dev/null @@ -1,16 +0,0 @@ ---- 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/pkg-plist b/security/gnupg1/pkg-plist index 8f80c4a594cf..e3f8d417be5a 100644 --- a/security/gnupg1/pkg-plist +++ b/security/gnupg1/pkg-plist @@ -1,10 +1,11 @@ bin/gpg +bin/gpg-zip bin/gpgsplit bin/gpgv %%WITH_LDAP%%libexec/gnupg/gpgkeys_ldap +libexec/gnupg/gpgkeys_curl libexec/gnupg/gpgkeys_finger libexec/gnupg/gpgkeys_hkp -libexec/gnupg/gpgkeys_http @dirrm libexec/gnupg %%DATADIR%%/FAQ %%DATADIR%%/faq.html |