diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/gnupg/Manifest b/sdk_container/src/third_party/coreos-overlay/app-crypt/gnupg/Manifest index c7e6dd6cb8..e2a729dfe8 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/gnupg/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/gnupg/Manifest @@ -1 +1,5 @@ -DIST gnupg-2.2.20.tar.bz2 6786913 BLAKE2B 43cf9402a26e67d6c7c2444eb2faaee3f06ea0bf6c07708a50834c5d7424db2f9c38e1f0046dd3a35082abc08d401b2951655e7e068f0873db297560b87d2667 SHA512 3e69f102366ec3415f439ab81aae2458182fa1a18dfb86565b1d9dc638f3fc4c179a5947f0042b7c5a813345676285a662793664a1803ea9ad8328f0548e0edc +DIST gnupg-2.2.16-scdaemon_shared-access.patch 2586 BLAKE2B 42fd5482c4e86751ce62836125997c2295c44bc5db0671a06460fd306b2ed93f290fb898fc1b1e463a863eddf9ab5f99ea3c90a55499ef45ca1ed6edf2854663 SHA512 38abaa4200114ae6b6f220fabc0a84a056761949c97bd0564557f4411a299b9a1939893555c27e26da2d8e8da4bc97a298fa7e68f1e80fe99c3f88cc329eaa84 +DIST gnupg-2.2.27.tar.bz2 7191555 BLAKE2B d652aad382cf07cc458b29ff82718edd47457d8236dcbeee51f22d88503be141f009e9ea45b6dafe614115d9558fe371509579e58ce17a5f04540a31aa406ea3 SHA512 cf336962116c9c08ac80b1299654b94948033ef51d6d5e7f54c2f07bbf7d92c7b0bddb606ceee2cdd837063f519b8d59af5a82816b840a0fc47d90c07b0e95ab +DIST gnupg-2.2.29.tar.bz2 7215986 BLAKE2B 04b777730b8fcbe8d93dfc8985aadd6bc7385ac2ac9684e6248cb3ae6d008daae5aa976ffa3bae27fe9e89bc2c4c1d4ae81dcaa259fb08d13f894f00f12072e9 SHA512 12645e230fc6aa4811420ef33def6baa590e847ecdf7e5f8b96eb49122e6406cbdba4595d0b52fa26700d5d5def67acb4ed7dfe7f778e496d4d21ccbef3c476b +DIST gnupg-2.2.31.tar.bz2 7212188 BLAKE2B 57a2b6c6ea491137a708e18a0119502621b7bdf0591818d19beb8b08a521a7dbf60472243e1723f53acbfb9a5de612b8e5040c45dc847bdda26012244edb11be SHA512 2f6fa200e08d6b8993b482e5825bea6083afc8686c4e1ae80386b36ae49e1c2d73066c508edaa359a7794cb26ba7a00f81555a906fa422d1117e41415cfa2fea +DIST gnupg-2.3.2.tar.bz2 7589445 BLAKE2B f7e35ed553ea89cdb073abb1432f67fa00bb625f6e686e534f96bca11d88f09ea272b3cb0d6706e4bce2c023f8c5b8d628742aa2f60752a2e605132cd32f62ed SHA512 2747cbe38546f500d165f024ebb2dc5be70fa68d20702af3f61e97db685eba94caf65307293137c76ea6cfcc189ed24aaee025c80cd33f26609e5fe512bdda73 diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/gnupg/gnupg-2.2.20.ebuild b/sdk_container/src/third_party/coreos-overlay/app-crypt/gnupg/gnupg-2.2.29.ebuild similarity index 71% rename from sdk_container/src/third_party/coreos-overlay/app-crypt/gnupg/gnupg-2.2.20.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-crypt/gnupg/gnupg-2.2.29.ebuild index d13716c7de..c7231c63b2 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/gnupg/gnupg-2.2.20.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/gnupg/gnupg-2.2.29.ebuild @@ -1,6 +1,7 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Flatcar: use EAPI=7, until EAPI 8 could be fully supported EAPI=7 inherit flag-o-matic systemd toolchain-funcs @@ -13,14 +14,13 @@ 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 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 +DEPEND=">=dev-libs/libassuan-2.5.0 + >=dev-libs/libgcrypt-1.8.0 + >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 @@ -71,19 +71,36 @@ src_prepare() { } src_configure() { - local myconf=() + local myconf=( + $(use_enable bzip2) + $(use_enable nls) + $(use_enable smartcard scdaemon) + $(use_enable ssl gnutls) + $(use_enable tofu) + $(use smartcard && use_enable usb ccid-driver || echo '--disable-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="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" + KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config" + LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config" + LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config" + NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config" + $("${S}/configure" --help | grep -o -- '--without-.*-prefix') + ) 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 ) @@ -102,30 +119,7 @@ src_configure() { # 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 smartcard && use_enable usb ccid-driver || echo '--disable-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') + econf "${myconf[@]}" } src_compile() { @@ -161,9 +155,3 @@ src_install() { 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!" -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-crypt/gnupg/metadata.xml b/sdk_container/src/third_party/coreos-overlay/app-crypt/gnupg/metadata.xml index eac23b93cc..f6fc64ff0b 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-crypt/gnupg/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/app-crypt/gnupg/metadata.xml @@ -1,15 +1,24 @@ - + - k_f@gentoo.org - Kristian Fiskerstrand + zlogene@gentoo.org + Mikle Kolyada + + + polynomial-c@gentoo.org + Lars Wendler + + + base-system@gentoo.org + Gentoo Base System - - GnuPG is a complete and free implementation of the OpenPGP standard as - defined by RFC4880. - + + Allow concurrent access to scdaemon by multiple apps from same + user. Useful if you want to use scdaemon with gnupg and for + example NitroKey. + Build scdaemon software. Enables usage of OpenPGP cards. For other type of smartcards, try app-crypt/gnupg-pkcs11-scd. diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 4245eaec68..1b9cd96419 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -52,7 +52,6 @@ dev-util/checkbashisms =cross-x86_64-cros-linux-gnu/gcc-9.3.0-r1 ~amd64 # Force upgrades to work around catalyst problems while upgrading ncurses. -=app-crypt/gnupg-2.2.20 ~amd64 ~arm64 =sys-apps/gptfdisk-1.0.3 ~amd64 ~arm64 =sys-apps/util-linux-2.32 ~amd64 ~arm64