diff options
author | wiz <wiz> | 2015-09-09 18:15:34 +0000 |
---|---|---|
committer | wiz <wiz> | 2015-09-09 18:15:34 +0000 |
commit | d593aa0a2e3cfb6e164a113a27cf48c2856ecf84 (patch) | |
tree | c4b20b5c6926ab91d573fc6aa3d6df2ff47f33e0 /security | |
parent | 6e2eb339eae7a8374fb9d05caa21980311624767 (diff) | |
download | pkgsrc-d593aa0a2e3cfb6e164a113a27cf48c2856ecf84.tar.gz |
Update security/gnupg2 to 2.0.29.
While here, clean up patches. They looked pretty cargo-culty to me and
were not commented.
File a bug report for one of the remaining ones and link to it from comment.
Changes in 2.0.29:
Noteworthy changes in version 2.0.29 (2015-09-08)
-------------------------------------------------
* gpg: Print a PGP-2 fingerprint again instead of a row of "0".
* gpg: Fixed a race condition from multiple several "gpg --verify".
* gpg: Print FAILURE status lines to help GPGME.
* gpgsm: Fixed a regression in CSR generation.
* scdaemon: Fixed problems with some pinpads.
* Fixed a few other bugs.
Diffstat (limited to 'security')
-rw-r--r-- | security/gnupg2/Makefile | 4 | ||||
-rw-r--r-- | security/gnupg2/distinfo | 13 | ||||
-rw-r--r-- | security/gnupg2/patches/patch-ai | 17 | ||||
-rw-r--r-- | security/gnupg2/patches/patch-aj | 13 | ||||
-rw-r--r-- | security/gnupg2/patches/patch-al | 17 | ||||
-rw-r--r-- | security/gnupg2/patches/patch-ao | 12 |
6 files changed, 9 insertions, 67 deletions
diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile index 3409804ad57..475983f5d88 100644 --- a/security/gnupg2/Makefile +++ b/security/gnupg2/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.62 2015/07/15 20:45:57 szptvlfn Exp $ +# $NetBSD: Makefile,v 1.63 2015/09/09 18:15:34 wiz Exp $ -DISTNAME= gnupg-2.0.28 +DISTNAME= gnupg-2.0.29 PKGNAME= ${DISTNAME:S/gnupg/gnupg2/} CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo index 66a34945485..203c0503e5d 100644 --- a/security/gnupg2/distinfo +++ b/security/gnupg2/distinfo @@ -1,10 +1,7 @@ -$NetBSD: distinfo,v 1.35 2015/06/03 21:00:39 wiz Exp $ +$NetBSD: distinfo,v 1.36 2015/09/09 18:15:34 wiz Exp $ -SHA1 (gnupg-2.0.28.tar.bz2) = 9a1050f72b6c9afe2b4a0a3f2e9dca2abba8e4ef -RMD160 (gnupg-2.0.28.tar.bz2) = ba35deebf89284f5e2debc0bd82b229f594d0306 -Size (gnupg-2.0.28.tar.bz2) = 4435779 bytes -SHA1 (patch-ai) = 4445d30150518f71f996e3b368a81523daded2e2 -SHA1 (patch-aj) = bfd21504e0d55f99df543912b1cdf2c573de2f98 -SHA1 (patch-al) = ef7c698ed102c4e27bbf707ae5d1fce4c2b5d8d4 -SHA1 (patch-ao) = 2f91b33271d5e79d48b392cc58978da08ee46e8a +SHA1 (gnupg-2.0.29.tar.bz2) = 87eb0df18f9953675f979405a1af10ab6c5322b3 +RMD160 (gnupg-2.0.29.tar.bz2) = 364388c339b4bb9bb040ddbcbe3fa4d66ec62cb5 +Size (gnupg-2.0.29.tar.bz2) = 4416251 bytes +SHA1 (patch-ao) = b0d0dfb9234ec332f826e3c93008c2fbb1c955f5 SHA1 (patch-tools_gpgkey2ssh.c) = 38ccb1980d6248b11316ccc49cd3dda06bab0d3b diff --git a/security/gnupg2/patches/patch-ai b/security/gnupg2/patches/patch-ai deleted file mode 100644 index 671b4cc6c82..00000000000 --- a/security/gnupg2/patches/patch-ai +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-ai,v 1.4 2011/01/20 08:54:56 adam Exp $ - ---- autogen.sh.orig 2007-06-22 10:18:30.000000000 -0600 -+++ autogen.sh -@@ -184,9 +184,9 @@ fi - if check_version $AUTOMAKE $automake_vers_num $automake_vers; then - check_version $ACLOCAL $automake_vers_num $autoconf_vers automake - fi --if check_version $GETTEXT $gettext_vers_num $gettext_vers; then -- check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext --fi -+#if check_version $GETTEXT $gettext_vers_num $gettext_vers; then -+# check_version $MSGMERGE $gettext_vers_num $gettext_vers gettext -+#fi - - if test "$DIE" = "yes"; then - cat <<EOF diff --git a/security/gnupg2/patches/patch-aj b/security/gnupg2/patches/patch-aj deleted file mode 100644 index 97268cbcdcf..00000000000 --- a/security/gnupg2/patches/patch-aj +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aj,v 1.3 2011/01/20 08:54:56 adam Exp $ - ---- po/Makefile.in.in.orig 2007-05-07 11:56:51.000000000 -0600 -+++ po/Makefile.in.in -@@ -39,7 +39,7 @@ INSTALL_DATA = @INSTALL_DATA@ - # In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined - # either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake - # versions, $(mkinstalldirs) and $(install_sh) are unused. --mkinstalldirs = $(SHELL) @install_sh@ -d -+mkinstalldirs = @install_sh@ -d - install_sh = $(SHELL) @install_sh@ - MKDIR_P = @MKDIR_P@ - mkdir_p = @mkdir_p@ diff --git a/security/gnupg2/patches/patch-al b/security/gnupg2/patches/patch-al deleted file mode 100644 index 5a89be13df2..00000000000 --- a/security/gnupg2/patches/patch-al +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-al,v 1.1 2009/12/18 17:49:51 drochner Exp $ - ---- g10/seckey-cert.c.orig 2009-08-06 17:32:40.000000000 +0000 -+++ g10/seckey-cert.c -@@ -209,6 +209,12 @@ do_check( PKT_secret_key *sk, const char - csum += checksum (buffer, ndata); - gcry_mpi_release (sk->skey[i]); - -+/* http://www.kfwebs.net/articles/article/42/GnuPG-2.0---IDEA-support */ -+ if (sk->protect.algo == CIPHER_ALGO_IDEA) { -+ buffer[0] = 0; -+ buffer[1] = 0; -+ } -+ - err = gcry_mpi_scan( &sk->skey[i], GCRYMPI_FMT_PGP, - buffer, ndata, &ndata ); - xfree (buffer); diff --git a/security/gnupg2/patches/patch-ao b/security/gnupg2/patches/patch-ao index 981c759ad70..24e8ded5760 100644 --- a/security/gnupg2/patches/patch-ao +++ b/security/gnupg2/patches/patch-ao @@ -1,7 +1,8 @@ -$NetBSD: patch-ao,v 1.3 2011/05/05 08:55:23 adam Exp $ +$NetBSD: patch-ao,v 1.4 2015/09/09 18:15:34 wiz Exp $ gpg-zip script will not be installed, so man page also should not be installed. If will introduce conflict with security/gnupg. +https://bugs.gnupg.org/gnupg/issue2095 --- doc/Makefile.in.orig 2010-07-19 07:05:40.000000000 +0000 +++ doc/Makefile.in @@ -14,12 +15,3 @@ If will introduce conflict with security/gnupg. man_MANS = $(myman_pages) noinst_MANS = gnupg.7 -@@ -905,7 +905,7 @@ uninstall-man: uninstall-man1 uninstall- - - - yat2m: yat2m.c -- $(CC_FOR_BUILD) -o $@ $(srcdir)/yat2m.c -+ $(CC_FOR_BUILD) $(CPPFLAGS) -o $@ $(srcdir)/yat2m.c - - .fig.png: - fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@ |