diff options
author | shannonjr <shannonjr@pkgsrc.org> | 2008-04-28 14:54:27 +0000 |
---|---|---|
committer | shannonjr <shannonjr@pkgsrc.org> | 2008-04-28 14:54:27 +0000 |
commit | 8e0349434d73948305265e26bac77aed4a756c40 (patch) | |
tree | 4d610e45a5c0902bde784037849b935136f6621d /security | |
parent | 6a7c649d29b141e57b1ccb1733d0d4080736f2ed (diff) | |
download | pkgsrc-8e0349434d73948305265e26bac77aed4a756c40.tar.gz |
Update to 2.0.9. Changes:
* Enhanced gpg-connect-agent with a small scripting language.
* New option --list-config for gpgconf.
* Fixed a crash in gpgconf.
* The envvars XAUTHORITY and PINENTRY_USER_DATA are now passed to the
pinentry.
* Fixed the auto creation of the key stub for smartcards.
* Fixed a rare bug in decryption using the OpenPGP card.
* Creating DSA2 keys is now possible.
* New option --extra-digest-algo for gpgsm to allow verification of
broken signatures.
* Allow encryption with legacy Elgamal sign+encrypt keys with option
--rfc2440.
Diffstat (limited to 'security')
-rw-r--r-- | security/gnupg2/Makefile | 14 | ||||
-rw-r--r-- | security/gnupg2/distinfo | 18 | ||||
-rw-r--r-- | security/gnupg2/patches/patch-af | 6 | ||||
-rw-r--r-- | security/gnupg2/patches/patch-ah | 34 |
4 files changed, 36 insertions, 36 deletions
diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile index 8d0e1e6ffe2..c31d22f33bf 100644 --- a/security/gnupg2/Makefile +++ b/security/gnupg2/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.20 2008/04/28 14:21:27 shannonjr Exp $ +# $NetBSD: Makefile,v 1.21 2008/04/28 14:54:27 shannonjr Exp $ # -DISTNAME= gnupg-2.0.7 -PKGREVISION= 3 +DISTNAME= gnupg-2.0.9 +#PKGREVISION= 3 PKGNAME= ${DISTNAME:S/gnupg/gnupg2/} CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ @@ -10,8 +10,8 @@ EXTRACT_SUFX= .tar.bz2 DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DISTFILES+= pth-2.0.7.tar.gz SITES.pth-2.0.7.tar.gz= ${MASTER_SITE_GNU:=pth/} -DISTFILES+= libassuan-1.0.3.tar.bz2 -SITES.libassuan-1.0.3.tar.bz2= ftp://ftp.gnupg.org/gcrypt/libassuan/ +DISTFILES+= libassuan-1.0.4.tar.bz2 +SITES.libassuan-1.0.4.tar.bz2= ftp://ftp.gnupg.org/gcrypt/libassuan/ MAINTAINER= shannonjr@NetBSD.org HOMEPAGE= http://www.gnupg.org/ @@ -40,7 +40,7 @@ CONFIGURE_ARGS+= --without-included-gettext CONFIGURE_ARGS+= --with-pth-prefix=${WRKDIR}/pth CONFIGURE_ARGS+= --with-libassuan-prefix=${WRKDIR}/libassuan CONFIGURE_ARGS+= --with-pinentry-pgm=${BUILDLINK_PREFIX.pinentry}/bin/pinentry -CONFIGURE_ARGS+= --enable-maintainer-mode +#CONFIGURE_ARGS+= --enable-maintainer-mode CONFIGURE_ENV+= gnupg_cv_pth_is_sane=yes TEST_TARGET= check @@ -55,7 +55,7 @@ pre-configure: cd ${WRKDIR}/pth-2.0.7 && \ ./configure --prefix=${WRKDIR}/pth --enable-pthread --enable-static --disable-shared && \ ${MAKE} install - cd ${WRKDIR}/libassuan-1.0.3 && \ + cd ${WRKDIR}/libassuan-1.0.4 && \ ${SETENV} ${CONFIGURE_ENV} ./autogen.sh && \ ${SETENV} ${CONFIGURE_ENV} ./configure --prefix=${WRKDIR}/libassuan --with-pth-prefix=${WRKDIR}/pth && \ ${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} install diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo index 378c05a2d33..e80d8d8ea2e 100644 --- a/security/gnupg2/distinfo +++ b/security/gnupg2/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.10 2007/11/07 15:24:26 shannonjr Exp $ +$NetBSD: distinfo,v 1.11 2008/04/28 14:54:27 shannonjr Exp $ -SHA1 (gnupg-2.0.7.tar.bz2) = f7d9ae7695bd9b849475b482bb7b027ec6fadbae -RMD160 (gnupg-2.0.7.tar.bz2) = 70bd8dbf52fe2ccc9d89791c374a5507f6a61ee8 -Size (gnupg-2.0.7.tar.bz2) = 3609953 bytes -SHA1 (libassuan-1.0.3.tar.bz2) = 1a16c9d1086e2cda819a3f7d4e5ebd41eb350e5f -RMD160 (libassuan-1.0.3.tar.bz2) = fd4fa8bff29d8a7ee9901aa2ad665df989c5c82e -Size (libassuan-1.0.3.tar.bz2) = 292168 bytes +SHA1 (gnupg-2.0.9.tar.bz2) = 959bdb934e3a72d256bfbd0122d996a73adb5d1f +RMD160 (gnupg-2.0.9.tar.bz2) = 175f8d4e83dd6ae8e186b7c09bb8bdbb001a5799 +Size (gnupg-2.0.9.tar.bz2) = 3718925 bytes +SHA1 (libassuan-1.0.4.tar.bz2) = 4b720706a8e4251d8cb7a0f2336226907df1426c +RMD160 (libassuan-1.0.4.tar.bz2) = d9c46d02a5c3955f813cdac05953d779ed9f1992 +Size (libassuan-1.0.4.tar.bz2) = 297123 bytes SHA1 (pth-2.0.7.tar.gz) = 9a71915c89ff2414de69fe104ae1016d513afeee RMD160 (pth-2.0.7.tar.gz) = 80bc66777ba20d9648b7aaf3f58d593be6416910 Size (pth-2.0.7.tar.gz) = 652640 bytes -SHA1 (patch-af) = 97fbb195fa8ab33c4fddfee9b23ae2024f99c615 -SHA1 (patch-ah) = e31a1e863be10884e03bfcdceffcdad79d19e9ab +SHA1 (patch-af) = df9028d8476df0121698d6e89fecf41c63515184 +SHA1 (patch-ah) = 7c000c576a5329ea89df3a38551da46661efa362 SHA1 (patch-ai) = 555b8768c30f470e98e5be62a4a4bea29eefdf78 SHA1 (patch-aj) = 20be6b455167962ffa556979d8d0f167dd14131e diff --git a/security/gnupg2/patches/patch-af b/security/gnupg2/patches/patch-af index 1616325981d..0e00a648a66 100644 --- a/security/gnupg2/patches/patch-af +++ b/security/gnupg2/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.4 2007/11/07 15:24:27 shannonjr Exp $ +$NetBSD: patch-af,v 1.5 2008/04/28 14:54:27 shannonjr Exp $ ---- ../libassuan-1.0.3/src/Makefile.am.orig 2006-11-21 11:17:18.000000000 -0700 -+++ ../libassuan-1.0.3/src/Makefile.am +--- ../libassuan-1.0.4/src/Makefile.am.orig 2006-11-21 11:17:18.000000000 -0700 ++++ ../libassuan-1.0.4/src/Makefile.am @@ -26,6 +26,7 @@ MOSTLYCLEANFILES = assuan-errors.c if HAVE_PTH diff --git a/security/gnupg2/patches/patch-ah b/security/gnupg2/patches/patch-ah index 1572b17704c..522ed3cc283 100644 --- a/security/gnupg2/patches/patch-ah +++ b/security/gnupg2/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.3 2007/05/12 11:08:31 shannonjr Exp $ +$NetBSD: patch-ah,v 1.4 2008/04/28 14:54:27 shannonjr Exp $ ---- ./g10/encr-data.c.orig 2007-02-22 03:44:22.000000000 -0700 +--- ./g10/encr-data.c.orig 2007-12-12 02:43:38.000000000 -0700 +++ ./g10/encr-data.c -@@ -39,35 +39,14 @@ static int mdc_decode_filter ( void *opa +@@ -37,35 +37,14 @@ static int mdc_decode_filter ( void *opa static int decode_filter ( void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len); @@ -40,7 +40,7 @@ $NetBSD: patch-ah,v 1.3 2007/05/12 11:08:31 shannonjr Exp $ /**************** -@@ -83,11 +62,7 @@ decrypt_data( void *procctx, PKT_encrypt +@@ -81,11 +60,7 @@ decrypt_data( void *procctx, PKT_encrypt unsigned blocksize; unsigned nprefix; @@ -52,8 +52,8 @@ $NetBSD: patch-ah,v 1.3 2007/05/12 11:08:31 shannonjr Exp $ + memset( &dfx, 0, sizeof dfx ); if ( opt.verbose && !dek->algo_info_printed ) { - if (!gcry_cipher_test_algo (dek->algo)) -@@ -101,20 +76,20 @@ decrypt_data( void *procctx, PKT_encrypt + if (!openpgp_cipher_test_algo (dek->algo)) +@@ -100,20 +75,20 @@ decrypt_data( void *procctx, PKT_encrypt goto leave; blocksize = gcry_cipher_get_algo_blklen (dek->algo); if ( !blocksize || blocksize > 16 ) @@ -78,7 +78,7 @@ $NetBSD: patch-ah,v 1.3 2007/05/12 11:08:31 shannonjr Exp $ GCRY_CIPHER_MODE_CFB, (GCRY_CIPHER_SECURE | ((ed->mdc_method || dek->algo >= 100)? -@@ -128,7 +103,7 @@ decrypt_data( void *procctx, PKT_encrypt +@@ -127,7 +102,7 @@ decrypt_data( void *procctx, PKT_encrypt /* log_hexdump( "thekey", dek->key, dek->keylen );*/ @@ -87,7 +87,7 @@ $NetBSD: patch-ah,v 1.3 2007/05/12 11:08:31 shannonjr Exp $ if ( gpg_err_code (rc) == GPG_ERR_WEAK_KEY ) { log_info(_("WARNING: message was encrypted with" -@@ -147,7 +122,7 @@ decrypt_data( void *procctx, PKT_encrypt +@@ -146,7 +121,7 @@ decrypt_data( void *procctx, PKT_encrypt goto leave; } @@ -96,7 +96,7 @@ $NetBSD: patch-ah,v 1.3 2007/05/12 11:08:31 shannonjr Exp $ if ( ed->len ) { -@@ -168,8 +143,8 @@ decrypt_data( void *procctx, PKT_encrypt +@@ -167,8 +142,8 @@ decrypt_data( void *procctx, PKT_encrypt temp[i] = c; } @@ -107,7 +107,7 @@ $NetBSD: patch-ah,v 1.3 2007/05/12 11:08:31 shannonjr Exp $ p = temp; /* log_hexdump( "prefix", temp, nprefix+2 ); */ if (dek->symmetric -@@ -179,18 +154,17 @@ decrypt_data( void *procctx, PKT_encrypt +@@ -178,18 +153,17 @@ decrypt_data( void *procctx, PKT_encrypt goto leave; } @@ -132,7 +132,7 @@ $NetBSD: patch-ah,v 1.3 2007/05/12 11:08:31 shannonjr Exp $ rc = gpg_error (GPG_ERR_INV_PACKET); else if ( ed->mdc_method ) { -@@ -209,28 +183,26 @@ decrypt_data( void *procctx, PKT_encrypt +@@ -208,28 +182,26 @@ decrypt_data( void *procctx, PKT_encrypt bytes are appended. */ int datalen = gcry_md_get_algo_dlen (ed->mdc_method); @@ -170,7 +170,7 @@ $NetBSD: patch-ah,v 1.3 2007/05/12 11:08:31 shannonjr Exp $ return rc; } -@@ -241,7 +213,7 @@ static int +@@ -240,7 +212,7 @@ static int mdc_decode_filter (void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len) { @@ -179,7 +179,7 @@ $NetBSD: patch-ah,v 1.3 2007/05/12 11:08:31 shannonjr Exp $ size_t n, size = *ret_len; int rc = 0; int c; -@@ -253,11 +225,11 @@ mdc_decode_filter (void *opaque, int con +@@ -252,11 +224,11 @@ mdc_decode_filter (void *opaque, int con } else if( control == IOBUFCTRL_UNDERFLOW ) { @@ -194,7 +194,7 @@ $NetBSD: patch-ah,v 1.3 2007/05/12 11:08:31 shannonjr Exp $ { if( (c = iobuf_get(a)) == -1 ) break; -@@ -306,10 +278,8 @@ mdc_decode_filter (void *opaque, int con +@@ -305,10 +277,8 @@ mdc_decode_filter (void *opaque, int con if ( n ) { @@ -207,7 +207,7 @@ $NetBSD: patch-ah,v 1.3 2007/05/12 11:08:31 shannonjr Exp $ } else { -@@ -318,10 +288,6 @@ mdc_decode_filter (void *opaque, int con +@@ -317,10 +287,6 @@ mdc_decode_filter (void *opaque, int con } *ret_len = n; } @@ -218,7 +218,7 @@ $NetBSD: patch-ah,v 1.3 2007/05/12 11:08:31 shannonjr Exp $ else if ( control == IOBUFCTRL_DESC ) { *(char**)buf = "mdc_decode_filter"; -@@ -333,7 +299,7 @@ mdc_decode_filter (void *opaque, int con +@@ -332,7 +298,7 @@ mdc_decode_filter (void *opaque, int con static int decode_filter( void *opaque, int control, IOBUF a, byte *buf, size_t *ret_len) { @@ -227,7 +227,7 @@ $NetBSD: patch-ah,v 1.3 2007/05/12 11:08:31 shannonjr Exp $ size_t n, size = *ret_len; int rc = 0; -@@ -344,18 +310,11 @@ decode_filter( void *opaque, int control +@@ -343,18 +309,11 @@ decode_filter( void *opaque, int control if ( n == -1 ) n = 0; if ( n ) |