diff options
author | drochner <drochner> | 2010-09-01 16:46:41 +0000 |
---|---|---|
committer | drochner <drochner> | 2010-09-01 16:46:41 +0000 |
commit | 5610adaf035125207d2b33c8c0e92ebf1824a08b (patch) | |
tree | ce247b567e03de125aa793f05802a6942ab0a728 /security | |
parent | cb4149c89954c674c753909b265ca5204dec8c61 (diff) | |
download | pkgsrc-5610adaf035125207d2b33c8c0e92ebf1824a08b.tar.gz |
update to 2.0.16
changes:
-bugfixes
-New command --passwd for GPG
-Make use of libassuan 2.0 which is available as a DSO
-The gpg-agent commands KILLAGENT and RELOADAGENT are now available
on all platforms
Diffstat (limited to 'security')
-rw-r--r-- | security/gnupg2/Makefile | 29 | ||||
-rw-r--r-- | security/gnupg2/PLIST.gpgsm | 3 | ||||
-rw-r--r-- | security/gnupg2/distinfo | 16 | ||||
-rw-r--r-- | security/gnupg2/patches/patch-af | 12 | ||||
-rw-r--r-- | security/gnupg2/patches/patch-am | 43 |
5 files changed, 10 insertions, 93 deletions
diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile index 4d08455cc52..5d8ed798bb5 100644 --- a/security/gnupg2/Makefile +++ b/security/gnupg2/Makefile @@ -1,17 +1,11 @@ -# $NetBSD: Makefile,v 1.30 2010/08/03 19:14:42 drochner Exp $ +# $NetBSD: Makefile,v 1.31 2010/09/01 16:46:41 drochner Exp $ # -DISTNAME= gnupg-2.0.14 +DISTNAME= gnupg-2.0.16 PKGNAME= ${DISTNAME:S/gnupg/gnupg2/} -PKGREVISION= 3 CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ 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.5.tar.bz2 -SITES.libassuan-1.0.5.tar.bz2= ftp://ftp.gnupg.org/gcrypt/libassuan/ MAINTAINER= shannonjr@NetBSD.org HOMEPAGE= http://www.gnupg.org/ @@ -34,33 +28,17 @@ CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q} CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-static-rnd=auto 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_ENV+= gnupg_cv_pth_is_sane=yes TEST_TARGET= check .include "options.mk" -# We are building a static pth library and linking against it -# While this is not very satisfying, gpgme hangs in its gpgsm tests -# if we depend on the shared (pkgsrc) pth library -# We are also building libassuan here to get libassuan-pth. -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.5 && \ - ${SETENV} ${CONFIGURE_ENV} ./autogen.sh && \ - ${SETENV} ${CONFIGURE_ENV} ./configure --prefix=${WRKDIR}/libassuan --with-pth-prefix=${WRKDIR}/pth && \ - ${SETENV} ${PKGSRC_MAKE_ENV} ${MAKE} install - cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh - BUILDLINK_API_DEPENDS.libgpg-error+= libgpg-error>=1.4 BUILDLINK_API_DEPENDS.libksba+= libksba>=1.0.2 +.include "../../devel/pth/buildlink3.mk" .include "../../databases/openldap-client/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -68,6 +46,7 @@ BUILDLINK_API_DEPENDS.libksba+= libksba>=1.0.2 .include "../../security/libgcrypt/buildlink3.mk" .include "../../security/libgpg-error/buildlink3.mk" .include "../../security/libksba/buildlink3.mk" +.include "../../security/libassuan2/buildlink3.mk" .include "../../www/curl/buildlink3.mk" .include "../../security/pinentry/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/gnupg2/PLIST.gpgsm b/security/gnupg2/PLIST.gpgsm index ad05a42af2c..3821da1b0ec 100644 --- a/security/gnupg2/PLIST.gpgsm +++ b/security/gnupg2/PLIST.gpgsm @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.gpgsm,v 1.8 2009/12/16 18:52:49 drochner Exp $ +@comment $NetBSD: PLIST.gpgsm,v 1.9 2010/09/01 16:46:41 drochner Exp $ bin/gpg-connect-agent bin/gpg2 bin/gpgconf @@ -21,6 +21,7 @@ libexec/gpg-check-pattern man/man1/gpg-agent.1 man/man1/gpg-connect-agent.1 man/man1/gpg-preset-passphrase.1 +man/man1/gpg-zip.1 man/man1/gpg2.1 man/man1/gpgconf.1 man/man1/gpgparsemail.1 diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo index 3813e907c62..78fc01d4776 100644 --- a/security/gnupg2/distinfo +++ b/security/gnupg2/distinfo @@ -1,19 +1,11 @@ -$NetBSD: distinfo,v 1.18 2010/08/03 19:14:42 drochner Exp $ +$NetBSD: distinfo,v 1.19 2010/09/01 16:46:41 drochner Exp $ -SHA1 (gnupg-2.0.14.tar.bz2) = cc5e4637f37f5bc82b00c73fc094ddadb7401821 -RMD160 (gnupg-2.0.14.tar.bz2) = 3e5ecf0108b65f7d2ecfd6f61b81e04e526ba52f -Size (gnupg-2.0.14.tar.bz2) = 3982080 bytes -SHA1 (libassuan-1.0.5.tar.bz2) = f6c36e9d99736883a8ce5b80b0a51d854cbbbc70 -RMD160 (libassuan-1.0.5.tar.bz2) = 7c4a75c71a3117cf140ea66ca89765349f39218e -Size (libassuan-1.0.5.tar.bz2) = 297786 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) = 908fd76d67f837367121e493d239f8b377eb1c3f +SHA1 (gnupg-2.0.16.tar.bz2) = e7eb4f60026884bd90803b531472bc518804b95d +RMD160 (gnupg-2.0.16.tar.bz2) = 3a0ed7a3ebb28fdb875533ff3368f6af3a0bb742 +Size (gnupg-2.0.16.tar.bz2) = 4004033 bytes SHA1 (patch-ah) = 0c9e061611ebfe22441a161aca016436a70ccc60 SHA1 (patch-ai) = 555b8768c30f470e98e5be62a4a4bea29eefdf78 SHA1 (patch-aj) = 20be6b455167962ffa556979d8d0f167dd14131e SHA1 (patch-ak) = 74b26ce441ea99ff28a09a3f0c643456daf48f35 SHA1 (patch-al) = ef7c698ed102c4e27bbf707ae5d1fce4c2b5d8d4 -SHA1 (patch-am) = 999cd57b90177df9d7c0510e3b8d11def7b47613 SHA1 (patch-an) = 17e6f789af2853884eb6dd8488a2b91c9b06188d diff --git a/security/gnupg2/patches/patch-af b/security/gnupg2/patches/patch-af deleted file mode 100644 index 9594c6e44ef..00000000000 --- a/security/gnupg2/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.6 2009/12/15 20:10:41 drochner Exp $ - ---- ../libassuan-1.0.5/src/Makefile.am.orig 2006-11-21 11:17:18.000000000 -0700 -+++ ../libassuan-1.0.5/src/Makefile.am -@@ -26,6 +26,7 @@ MOSTLYCLEANFILES = assuan-errors.c - - if HAVE_PTH - libassuan_pth = libassuan-pth.a -+AM_CFLAGS=$(PTH_CFLAGS) - else - libassuan_pth = - endif diff --git a/security/gnupg2/patches/patch-am b/security/gnupg2/patches/patch-am deleted file mode 100644 index c7c820d18f1..00000000000 --- a/security/gnupg2/patches/patch-am +++ /dev/null @@ -1,43 +0,0 @@ -$NetBSD: patch-am,v 1.1 2010/02/03 10:58:11 drochner Exp $ - ---- agent/protect.c.orig 2009-12-14 18:51:50.000000000 +0000 -+++ agent/protect.c -@@ -360,19 +360,25 @@ do_encryption (const unsigned char *prot - - in canoncical format of course. We use asprintf and %n modifier - and dummy values as placeholders. */ -- p = xtryasprintf -- ("(9:protected%d:%s((4:sha18:%n_8bytes_2:96)%d:%n%*s)%d:%n%*s)", -- (int)strlen (modestr), modestr, -- &saltpos, -- blklen, &ivpos, blklen, "", -- enclen, &encpos, enclen, ""); -- if (!p) -- { -- gpg_error_t tmperr = out_of_core (); -- xfree (iv); -- xfree (outbuf); -- return tmperr; -- } -+ { -+ char countbuf[35]; -+ -+ snprintf (countbuf, sizeof countbuf, "%lu", get_standard_s2k_count ()); -+ p = xtryasprintf -+ ("(9:protected%d:%s((4:sha18:%n_8bytes_%u:%s)%d:%n%*s)%d:%n%*s)", -+ (int)strlen (modestr), modestr, -+ &saltpos, -+ (unsigned int)strlen (countbuf), countbuf, -+ blklen, &ivpos, blklen, "", -+ enclen, &encpos, enclen, ""); -+ if (!p) -+ { -+ gpg_error_t tmperr = out_of_core (); -+ xfree (iv); -+ xfree (outbuf); -+ return tmperr; -+ } -+ } - *resultlen = strlen (p); - *result = (unsigned char*)p; - memcpy (p+saltpos, iv+2*blklen, 8); |