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 B487E138334 for ; Sun, 28 Apr 2019 21:03:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF8D7E087D; Sun, 28 Apr 2019 21:03:53 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 A1B07E087D for ; Sun, 28 Apr 2019 21:03:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 74A9E341E0F for ; Sun, 28 Apr 2019 21:03:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C60DB55B for ; Sun, 28 Apr 2019 21:03:50 +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: <1556485423.c6f1c2b40e99605ac42b97c0ad9376d91d0504ff.robbat2@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/gnupg/gnupg-2.2.15-r1.ebuild X-VCS-Directories: app-crypt/gnupg/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: c6f1c2b40e99605ac42b97c0ad9376d91d0504ff X-VCS-Branch: master Date: Sun, 28 Apr 2019 21:03:50 +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: d4f5ed74-1c23-4070-8196-4179874a411b X-Archives-Hash: 7f9e2ff74bdf53511cdb14a4d8c63018 commit: c6f1c2b40e99605ac42b97c0ad9376d91d0504ff Author: Robin H. Johnson gentoo org> AuthorDate: Sun Apr 28 20:50:52 2019 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Apr 28 21:03:43 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6f1c2b4 app-crypt/gnupg: drop virtual/mta requirement due to stage3 impact In the previous fix for bug 648606, virtual/mta was made a hard DEPEND of gnupg. This has the side-effect of adding the default virtual/mta (nullmailer) and the default virtual/logger (app-admin/metalog) to all stage3 builds. As a better fix, ensure the path to the mailprog is hardcoded and does not depend on the presence of the virtual/mta package, using /usr/libexec/sendmail, as that's what is provided by all virtual/mta providers. Thereafter, drop the direct virtual/mta dependency and add a pkg_postinst describing the tiny piece of functionality that depends on the presence of virtual/mta: 'gpg-wks-client --send' 'gpg-wks-server' also uses virtual/mta, but is already behind a USE flag, so ensure it's present there instead. See-Also: https://bugs.gentoo.org/648606 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Robin H. Johnson gentoo.org> app-crypt/gnupg/gnupg-2.2.15-r1.ebuild | 153 +++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/app-crypt/gnupg/gnupg-2.2.15-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.15-r1.ebuild new file mode 100644 index 00000000000..e49781cae18 --- /dev/null +++ b/app-crypt/gnupg/gnupg-2.2.15-r1.ebuild @@ -0,0 +1,153 @@ +# 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 )" + +RDEPEND="${DEPEND} + app-crypt/pinentry + nls? ( virtual/libintl ) + selinux? ( sec-policy/selinux-gpg ) + wks-server? ( virtual/mta )" + +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 + + # Hardcode mailprog to /usr/libexec/sendmail even if it does not exist. + # As of GnuPG 2.3, the mailprog substitution is used for the binary called + # by wks-client & wks-server; and if it's autodetected but not not exist at + # build time, then then 'gpg-wks-client --send' functionality will not + # work. This has an unwanted side-effect in stage3 builds: there was a + # [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating + # the build where the install guide previously make the user chose the + # logger & mta early in the install. + + 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) \ + --with-mailprog=/usr/libexec/sendmail \ + --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} +} + +pkg_postinst() { + elog "See https://wiki.gentoo.org/wiki/GnuPG for documentation on gnupg" + elog + elog "If you wish to use 'gpg-wks-client --send', you must install an MTA!" +}