From ea8fc9039daa37e6d33de49362a0803ebc6f630f Mon Sep 17 00:00:00 2001 From: pea Date: Mon, 17 Jan 2011 15:42:08 +0000 Subject: [PATCH] Update to 2.0.17 ok jasper@ --- security/gnupg2/Makefile | 8 ++-- security/gnupg2/distinfo | 10 ++--- .../gnupg2/patches/patch-g10_call-agent_c | 42 ------------------- .../gnupg2/patches/patch-kbx_keybox-blob_c | 17 -------- security/gnupg2/pkg/PLIST | 4 +- 5 files changed, 11 insertions(+), 70 deletions(-) delete mode 100644 security/gnupg2/patches/patch-g10_call-agent_c delete mode 100644 security/gnupg2/patches/patch-kbx_keybox-blob_c diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile index 3b8bf02ed31..fd2ff704dec 100644 --- a/security/gnupg2/Makefile +++ b/security/gnupg2/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.9 2010/11/22 09:34:10 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2011/01/17 15:42:08 pea Exp $ COMMENT = gnu privacy guard - a free PGP replacement -DISTNAME = gnupg-2.0.16 -REVISION = 0 +DISTNAME = gnupg-2.0.17 CATEGORIES = security MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/ \ @@ -62,7 +61,8 @@ USE_GROFF = Yes CONFIGURE_STYLE = gnu CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS = docdir=${LOCALBASE}/share/doc/gnupg2 +CONFIGURE_ARGS = docdir=${LOCALBASE}/share/doc/gnupg2 \ + --enable-gpgtar # Avoid conflict with gnupg-1.x post-install: diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo index 0c8376bbd7e..d63120cb8e4 100644 --- a/security/gnupg2/distinfo +++ b/security/gnupg2/distinfo @@ -1,5 +1,5 @@ -MD5 (gnupg-2.0.16.tar.bz2) = iKTUbeymPS7KKbK2ETBK+w== -RMD160 (gnupg-2.0.16.tar.bz2) = Og7Xo+uyj9uHVTP/M2j2rzoLt0I= -SHA1 (gnupg-2.0.16.tar.bz2) = 5+tPYAJohL2QgDtTFHK8UYgEuV0= -SHA256 (gnupg-2.0.16.tar.bz2) = DVq7l3wC67D2ziWlunHI35CDWqZmqFrNc6m3+d81qAs= -SIZE (gnupg-2.0.16.tar.bz2) = 4004033 +MD5 (gnupg-2.0.17.tar.bz2) = EjrwmXQP0VnHOgNSonTsgQ== +RMD160 (gnupg-2.0.17.tar.bz2) = +RmUehiWrCDEVVNNkaPi0+W2DB8= +SHA1 (gnupg-2.0.17.tar.bz2) = Qe9UYEF8oKETH8cwhJ/jr9Sa0t4= +SHA256 (gnupg-2.0.17.tar.bz2) = 6mSdXssvl8yNgcV5bGrY19hYH5VUJBw50rEasSE57qY= +SIZE (gnupg-2.0.17.tar.bz2) = 3997356 diff --git a/security/gnupg2/patches/patch-g10_call-agent_c b/security/gnupg2/patches/patch-g10_call-agent_c deleted file mode 100644 index b6ae7bd0d20..00000000000 --- a/security/gnupg2/patches/patch-g10_call-agent_c +++ /dev/null @@ -1,42 +0,0 @@ -$OpenBSD: patch-g10_call-agent_c,v 1.1 2010/11/12 11:58:36 dcoppa Exp $ - -Patch from upstream: allow more hash algorithms when using scdaemon. -Needed to use SHA2-family of functions with OpenPGPv2 cards, that do -support them. - ---- g10/call-agent.c.orig Wed Feb 17 09:55:45 2010 -+++ g10/call-agent.c Wed Nov 3 14:59:39 2010 -@@ -892,6 +892,23 @@ membuf_data_cb (void *opaque, const void *buffer, size - return 0; - } - -+ -+static const char * -+hash_algo_option (int algo) -+{ -+ switch (algo) -+ { -+ case GCRY_MD_RMD160: return "--hash=rmd160 "; -+ case GCRY_MD_SHA1 : return "--hash=sha1 "; -+ case GCRY_MD_SHA224: return "--hash=sha224 "; -+ case GCRY_MD_SHA256: return "--hash=sha256 "; -+ case GCRY_MD_SHA384: return "--hash=sha384 "; -+ case GCRY_MD_SHA512: return "--hash=sha512 "; -+ case GCRY_MD_MD5 : return "--hash=md5 "; -+ default: return ""; -+ } -+} -+ - /* Send a sign command to the scdaemon via gpg-agent's pass thru - mechanism. */ - int -@@ -938,8 +955,7 @@ agent_scd_pksign (const char *serialno, int hashalgo, - else - #endif - snprintf (line, DIM(line)-1, "SCD PKSIGN %s%s", -- hashalgo == GCRY_MD_RMD160? "--hash=rmd160 " : "", -- serialno); -+ hash_algo_option (hashalgo), serialno); - line[DIM(line)-1] = 0; - rc = assuan_transact (agent_ctx, line, membuf_data_cb, &data, - default_inq_cb, NULL, NULL, NULL); diff --git a/security/gnupg2/patches/patch-kbx_keybox-blob_c b/security/gnupg2/patches/patch-kbx_keybox-blob_c deleted file mode 100644 index b647ceb2bb9..00000000000 --- a/security/gnupg2/patches/patch-kbx_keybox-blob_c +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-kbx_keybox-blob_c,v 1.1 2010/08/21 11:03:21 jasper Exp $ - -Security fix for CVE-2010-2547: -Patch from upstream CVS: - -http://lists.gnupg.org/pipermail/gnupg-announce/2010q3/000302.html - ---- kbx/keybox-blob.c.orig Mon Aug 16 13:52:38 2010 -+++ kbx/keybox-blob.c Mon Aug 16 13:52:59 2010 -@@ -898,6 +898,7 @@ _keybox_create_x509_blob (KEYBOXBLOB *r_blob, ksba_cer - rc = gpg_error_from_syserror (); - goto leave; - } -+ names = tmp; - } - names[blob->nuids++] = p; - if (!i && (p=x509_email_kludge (p))) diff --git a/security/gnupg2/pkg/PLIST b/security/gnupg2/pkg/PLIST index 0fe2f754718..4cd3a5a0ae8 100644 --- a/security/gnupg2/pkg/PLIST +++ b/security/gnupg2/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2010/11/12 11:58:36 dcoppa Exp $ +@comment $OpenBSD: PLIST,v 1.3 2011/01/17 15:42:08 pea Exp $ @option no-default-conflict @bin bin/gpg-agent @bin bin/gpg-connect-agent @@ -8,6 +8,7 @@ @bin bin/gpgparsemail @bin bin/gpgsm bin/gpgsm-gencert.sh +@bin bin/gpgtar @bin bin/gpgv2 @bin bin/kbxutil @bin bin/scdaemon @@ -51,7 +52,6 @@ share/doc/gnupg2/examples/gpgconf.conf share/doc/gnupg2/examples/pwpattern.list share/doc/gnupg2/examples/scd-event share/doc/gnupg2/examples/trustlist.txt -share/doc/gnupg2/faq.html share/gnupg/ share/gnupg/com-certs.pem share/gnupg/gpg-conf.skel