From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3BB98138334 for ; Tue, 9 Apr 2019 17:50:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F978E08D4; Tue, 9 Apr 2019 17:50:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DF957E08D4 for ; Tue, 9 Apr 2019 17:50:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B61A3335D2B for ; Tue, 9 Apr 2019 17:50:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 28E3E55B for ; Tue, 9 Apr 2019 17:50:45 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1554832220.4b084d956b9bc167ec1887cb7717573b5a4f077d.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/, app-crypt/gnupg/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/gnupg/Manifest app-crypt/gnupg/files/gnupg-2.2.14-quiet-sending.patch app-crypt/gnupg/gnupg-2.2.15.ebuild X-VCS-Directories: app-crypt/gnupg/files/ app-crypt/gnupg/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 4b084d956b9bc167ec1887cb7717573b5a4f077d X-VCS-Branch: master Date: Tue, 9 Apr 2019 17:50:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e1a0a61f-1a1e-4cff-91d4-c94b8ce34635 X-Archives-Hash: f5a8ce38aa5f541cbde4f71e14d2249a commit: 4b084d956b9bc167ec1887cb7717573b5a4f077d Author: Robin H. Johnson gentoo org> AuthorDate: Tue Apr 9 17:49:17 2019 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Tue Apr 9 17:50:20 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b084d95 app-crypt/gnupg: bump Also adds one-line delta patch for --quiet in --send-key, submitted to upstream for inclusion. Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Robin H. Johnson gentoo.org> app-crypt/gnupg/Manifest | 1 + .../gnupg/files/gnupg-2.2.14-quiet-sending.patch | 34 +++++ app-crypt/gnupg/gnupg-2.2.15.ebuild | 137 +++++++++++++++++++++ 3 files changed, 172 insertions(+) diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest index d9d42130a4f..ffc0c9cfd34 100644 --- a/app-crypt/gnupg/Manifest +++ b/app-crypt/gnupg/Manifest @@ -2,3 +2,4 @@ DIST gnupg-1.4.21.tar.bz2 3689305 BLAKE2B 0c26c9c3aeae2bf2eafa858bc3bd15cc2702bc DIST gnupg-2.2.10.tar.bz2 6659484 BLAKE2B d0270ca40bd70fe113fa4283c307d7d04370beec77ffba0abb7862defdab2d5a82b1508284961e30e7d0aab82bffdf09fe796741603e843a062073f179f0bfc2 SHA512 a4477828f268fa69125cf1822f8a721e67f8f4008bd9817b701989393bd93689aac8fee1f4d34d918911d53afabdcbb1c84d40e8a4489d7a29b5a769d330fddd DIST gnupg-2.2.12.tar.bz2 6682303 BLAKE2B 8470ab8bf386d3524ce57ef1a1f6ac74d8cf2d7c35062b95c668b37586603c8e0817e410f4a0a807256e42896c11116897b7118b29e471184b2fa871ad4ba048 SHA512 30de9757bb60a5cb6bf0dc2c8da5f4742c54affec3fcd0bcbf66f28f2812149afec5db70dcb6ba592101de4bdc479d1ba0b47c53c8b8d4765ddff32fa51c26c8 DIST gnupg-2.2.14.tar.bz2 6707735 BLAKE2B feedb1c776e8d43e43905e8a8c1487bd88e8effc59e94baf308cb29a5feea5d9c666c78b50147d65a259dc89af241c2a2bf07a72c417617e5238e0fdbbc2b17f SHA512 9d5216dee085efe6de300579d8fb773a5a55df639d5a435708611a974df522dd60dc995fbfcaad98065475dbeb731bbba19ecc3273e78b9b45fccff640dde69b +DIST gnupg-2.2.15.tar.bz2 6705912 BLAKE2B 145bd174cb74c6a1180de76a6d46b40d2434ced61bb9aa3eaddeb0079cd05634529c9b062e475d3ca9d35b3af3b62b39a79ef0efbb476cb9ebb9e2099ad13ae0 SHA512 7c6f0092d384fd71fc7a1c905ce23ae98df42ce131ee09fc190c275f9c8d0912be344b0782244cccb5b3938322ef3cfff8ed1ec7e949e761478b8c5110dde36a diff --git a/app-crypt/gnupg/files/gnupg-2.2.14-quiet-sending.patch b/app-crypt/gnupg/files/gnupg-2.2.14-quiet-sending.patch new file mode 100644 index 00000000000..1f7a561d3f7 --- /dev/null +++ b/app-crypt/gnupg/files/gnupg-2.2.14-quiet-sending.patch @@ -0,0 +1,34 @@ +From d8db73615e68d1c549b3ed50057a49d84a31b334 Mon Sep 17 00:00:00 2001 +From: "Robin H. Johnson" +Date: Tue, 9 Apr 2019 10:27:11 -0700 +Subject: [PATCH] g10: support --quiet for --send-key + +The --recv-key command supports --quiet, but --send-key does not. +Add support for it for parity and better scripting. + +Signed-off-by: Robin H. Johnson +--- + g10/keyserver.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/g10/keyserver.c b/g10/keyserver.c +index 66900f7a9..e5fc011c0 100644 +--- a/g10/keyserver.c ++++ b/g10/keyserver.c +@@ -1814,9 +1814,10 @@ keyserver_put (ctrl_t ctrl, strlist_t keyspecs) + log_error (_("skipped \"%s\": %s\n"), kspec->d, gpg_strerror (err)); + else + { +- log_info (_("sending key %s to %s\n"), +- keystr (keyblock->pkt->pkt.public_key->keyid), +- ksurl?ksurl:"[?]"); ++ if (!opt.quiet) ++ log_info (_("sending key %s to %s\n"), ++ keystr (keyblock->pkt->pkt.public_key->keyid), ++ ksurl?ksurl:"[?]"); + + err = gpg_dirmngr_ks_put (ctrl, data, datalen, keyblock); + release_kbnode (keyblock); +-- +2.21.0 + diff --git a/app-crypt/gnupg/gnupg-2.2.15.ebuild b/app-crypt/gnupg/gnupg-2.2.15.ebuild new file mode 100644 index 00000000000..1c68f3982ce --- /dev/null +++ b/app-crypt/gnupg/gnupg-2.2.15.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic systemd toolchain-funcs + +MY_P="${P/_/-}" + +DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" +HOMEPAGE="http://www.gnupg.org/" +SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server" + +# Existence of executables is checked during configuration. +DEPEND="!app-crypt/dirmngr + >=dev-libs/libassuan-2.5.0 + >=dev-libs/libgcrypt-1.7.3 + >=dev-libs/libgpg-error-1.28 + >=dev-libs/libksba-1.3.4 + >=dev-libs/npth-1.2 + >=net-misc/curl-7.10 + bzip2? ( app-arch/bzip2 ) + ldap? ( net-nds/openldap ) + readline? ( sys-libs/readline:0= ) + smartcard? ( usb? ( virtual/libusb:1 ) ) + ssl? ( >=net-libs/gnutls-3.0:0= ) + sys-libs/zlib + tofu? ( >=dev-db/sqlite-3.7 ) + virtual/mta" + +RDEPEND="${DEPEND} + app-crypt/pinentry + nls? ( virtual/libintl ) + selinux? ( sec-policy/selinux-gpg )" + +BDEPEND="virtual/pkgconfig + doc? ( sys-apps/texinfo ) + nls? ( sys-devel/gettext )" + +S="${WORKDIR}/${MY_P}" + +DOCS=( + ChangeLog NEWS README THANKS TODO VERSION + doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER +) + +PATCHES=( + "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" + "${FILESDIR}/${PN}-2.2.14-quiet-sending.patch" +) + +src_configure() { + local myconf=() + + if use prefix && use usb; then + # bug #649598 + append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0" + fi + + if use elibc_SunOS || use elibc_AIX; then + myconf+=( --disable-symcryptrun ) + else + myconf+=( --enable-symcryptrun ) + fi + + #bug 663142 + if use user-socket; then + myconf+=( --enable-run-gnupg-user-socket ) + fi + + # glib fails and picks up clang's internal stdint.h causing weird errors + [[ ${CC} == *clang ]] && \ + export gl_cv_absolute_stdint_h=/usr/include/stdint.h + + econf \ + "${myconf[@]}" \ + $(use_enable bzip2) \ + $(use_enable nls) \ + $(use_enable smartcard scdaemon) \ + $(use_enable ssl gnutls) \ + $(use_enable tofu) \ + $(use_enable usb ccid-driver) \ + $(use_enable wks-server wks-tools) \ + $(use_with ldap) \ + $(use_with readline) \ + --disable-ntbtls \ + --enable-all-tests \ + --enable-gpg \ + --enable-gpgsm \ + --enable-large-secmem \ + CC_FOR_BUILD="$(tc-getBUILD_CC)" \ + GPG_ERROR_CONFIG="${EROOT}/usr/bin/${CHOST}-gpg-error-config" \ + KSBA_CONFIG="${EROOT}/usr/bin/ksba-config" \ + LIBASSUAN_CONFIG="${EROOT}/usr/bin/libassuan-config" \ + LIBGCRYPT_CONFIG="${EROOT}/usr/bin/${CHOST}-libgcrypt-config" \ + NPTH_CONFIG="${EROOT}/usr/bin/npth-config" \ + $("${S}/configure" --help | grep -- '--without-.*-prefix' | sed -e 's/^ *\([^ ]*\) .*/\1/g') +} + +src_compile() { + default + + use doc && emake -C doc html +} + +src_test() { + #Bug: 638574 + use tofu && export TESTFLAGS=--parallel + default +} + +src_install() { + default + + use tools && + dobin \ + tools/{convert-from-106,gpg-check-pattern} \ + tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \ + tools/make-dns-cert + + dosym gpg /usr/bin/gpg2 + dosym gpgv /usr/bin/gpgv2 + echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die + echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die + + dodir /etc/env.d + echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die + + use doc && dodoc doc/gnupg.html/* doc/*.png + + systemd_douserunit doc/examples/systemd-user/*.{service,socket} +}