diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/Manifest index cc743c6038..3607da7094 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/Manifest @@ -1,3 +1,2 @@ -DIST libksba-1.5.0.tar.bz2 656518 BLAKE2B 077655031f82ff13c596ad0be0d0f15408a5b793f00e3af3516f4f207285f7d76096216c7bf11d2c46c28eb332cc74df39bef84afb0f47184c8ebdd8cb92a86d SHA512 84383e8b084bf47ac646a9aacb174e510ffcab4b966b649e4351990eaf7ce78cc9d199e6c4f3a1be697888c857ee86ecef949c06156790c7d8d0bd0fb0142721 -DIST libksba-1.5.1.tar.bz2 659280 BLAKE2B f247a2c9545e3c3ae3bbcf50344ca530ef320d12b9a1e301bca086b0e1a69e6b7a88b912b14f862d82e7ad45bf588754db601d987ee42579d8042e68b5108d33 SHA512 156fe6a36daa7b11ce580366ab36a5fceda253413f0057ace791e4f028fd3158a70a3f6ba1d0c824fafee4420d1076864dbd0911606fb65e14c8b2332b6cc92b -DIST libksba-1.6.0.tar.bz2 662120 BLAKE2B 59bee23f764ab3e0f79fae6074ffe568845b6089ff29b8c5112973490ff5e1436834d5d0b50954ba9fbd6be655f47043a6345181c5c7e552322ceb331d030780 SHA512 a7c76d41dfd8ec6383ac2de3c53848cd9f066b538f6f3cd43175e3c8095df51b96d0a24a573481c0c4856b09b7c224e2b562d88f5c0801e7acfb582ea2739c2b +DIST libksba-1.6.2.tar.bz2 667846 BLAKE2B 93abe745fe951ead0d1c05a1006e8ec20ab68fbfea075fe828dd0885d6f245c59639b18af6c6593054cd0008b06b1f6e4418c8874b0b59feb77b24fc7940db07 SHA512 50533887942921f8009cedd636915c2b27f231151a3b8316af6801a5f8637d66896ba5a24207bf82d8b03e26624133e80c6dd69f1196f06ada929090ef0f178c +DIST libksba-1.6.2.tar.bz2.sig 119 BLAKE2B 5ce2bd1065996ecb2a6e687eaf96ce52ba807f5ae487612c43a8da8da78a91985f37257396f1d179a4a38a8d1efb8cae8c7a57f5f1b4eb92c33d70559e3c2186 SHA512 e84f653ee64a6769145df3e4b8e36f9c19983771d63c14e1a27a7f27b8cbed00af44f46db69a47ab9b282c405c21a9445569630b7b7f7ee7cb91b4d836524fc4 diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/files/libksba-1.6.0-no-fgrep-ksba-config.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/files/libksba-1.6.0-no-fgrep-ksba-config.patch new file mode 100644 index 0000000000..7c5f7e85cd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/files/libksba-1.6.0-no-fgrep-ksba-config.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/868384 +--- a/src/ksba-config.in ++++ b/src/ksba-config.in +@@ -126,7 +126,7 @@ if test "$echo_cflags" = "yes"; then + fi + tmp="" + for i in $includes $cflags; do +- if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then ++ if echo "$tmp" | grep -F -v -- "$i" >/dev/null; then + tmp="$tmp $i" + fi + done +@@ -140,7 +140,7 @@ if test "$echo_libs" = "yes"; then + fi + tmp="" + for i in $libdirs $libs; do +- if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then ++ if echo "$tmp" | grep -F -v -- "$i" >/dev/null; then + tmp="$tmp $i" + fi + done diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.5.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.5.0.ebuild deleted file mode 100644 index 32f6d92671..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.5.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="X.509 and CMS (PKCS#7) library" -HOMEPAGE="http://www.gnupg.org/related_software/libksba" -SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2" - -LICENSE="LGPL-3+ GPL-2+ GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="static-libs" - -RDEPEND=">=dev-libs/libgpg-error-1.8" -DEPEND="${RDEPEND}" -BDEPEND="sys-devel/bison" - -src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" - LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config" - $("${S}/configure" --help | grep -o -- '--without-.*-prefix') - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - # ppl need to use lib*-config for --cflags and --libs - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.5.1.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.5.1.ebuild deleted file mode 100644 index 32f6d92671..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.5.1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="X.509 and CMS (PKCS#7) library" -HOMEPAGE="http://www.gnupg.org/related_software/libksba" -SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2" - -LICENSE="LGPL-3+ GPL-2+ GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~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="static-libs" - -RDEPEND=">=dev-libs/libgpg-error-1.8" -DEPEND="${RDEPEND}" -BDEPEND="sys-devel/bison" - -src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" - LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config" - $("${S}/configure" --help | grep -o -- '--without-.*-prefix') - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - # ppl need to use lib*-config for --cflags and --libs - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.0.ebuild deleted file mode 100644 index 35ee0c1d47..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="X.509 and CMS (PKCS#7) library" -HOMEPAGE="http://www.gnupg.org/related_software/libksba" -SRC_URI="mirror://gnupg/libksba/${P}.tar.bz2" - -LICENSE="LGPL-3+ GPL-2+ GPL-3" -SLOT="0" -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="static-libs" - -RDEPEND=">=dev-libs/libgpg-error-1.8" -DEPEND="${RDEPEND}" -BDEPEND="sys-devel/bison" - -src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" - LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config" - $("${S}/configure" --help | grep -o -- '--without-.*-prefix') - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - # ppl need to use lib*-config for --cflags and --libs - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.2.ebuild new file mode 100644 index 0000000000..a939ec97fd --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/libksba-1.6.2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Maintainers should: +# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/ +# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159 +# (find the one for the current release then subscribe to it + +# any subsequent ones linked within so you're covered for a while.) + +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc +inherit toolchain-funcs verify-sig + +DESCRIPTION="X.509 and CMS (PKCS#7) library" +HOMEPAGE="https://www.gnupg.org/related_software/libksba" +SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" +SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" + +LICENSE="LGPL-3+ GPL-2+ GPL-3" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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="static-libs" + +RDEPEND=">=dev-libs/libgpg-error-1.8" +DEPEND="${RDEPEND}" +BDEPEND=" + sys-devel/bison + verify-sig? ( sec-keys/openpgp-keys-gnupg ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.6.0-no-fgrep-ksba-config.patch +) + +src_configure() { + export CC_FOR_BUILD="$(tc-getBUILD_CC)" + + local myeconfargs=( + $(use_enable static-libs static) + + GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config" + LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config" + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # People need to use ksba-config for --cflags and --libs + find "${ED}" -type f -name '*.la' -delete || die +} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/metadata.xml index 965999a77a..b0d83aa2e4 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libksba/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libksba/metadata.xml @@ -1,8 +1,8 @@ - - Lars Wendler - polynomial-c@gentoo.org + + base-system@gentoo.org + Gentoo Base System - +