From 0b5b86fdd5f29cce3dd6a04b286c1190a11b26be Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 10 May 2023 16:17:48 +0200 Subject: [PATCH] dev-libs/libgpg-error: Sync with Gentoo It's from Gentoo commit 601813af1925476e8afee2ea7ebfc68d2fa386a7. --- .../dev-libs/libgpg-error/Manifest | 8 +-- .../libgpg-error-1.38-cross_compile.patch | 40 ----------- .../libgpg-error-1.42-cross_compile.patch | 32 --------- ...bgpg-error-1.44-remove_broken_check.patch} | 8 +-- .../libgpg-error/libgpg-error-1.38.ebuild | 68 ------------------- ....41.ebuild => libgpg-error-1.46-r1.ebuild} | 41 ++++++++--- ...r-1.42.ebuild => libgpg-error-1.47.ebuild} | 42 +++++++++--- .../dev-libs/libgpg-error/metadata.xml | 6 +- 8 files changed, 73 insertions(+), 172 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch rename sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/{libgpg-error-1.37-remove_broken_check.patch => libgpg-error-1.44-remove_broken_check.patch} (78%) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.38.ebuild rename sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/{libgpg-error-1.41.ebuild => libgpg-error-1.46-r1.ebuild} (53%) rename sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/{libgpg-error-1.42.ebuild => libgpg-error-1.47.ebuild} (53%) diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/Manifest b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/Manifest index 26f4a58b08..0d24db09ec 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/Manifest @@ -1,4 +1,4 @@ -DIST gen-lock-obj-1.38.sh 2643 BLAKE2B 5040b027a95f10bac4a0ba463c8bb8387514ca9136e019fc647183456593df27473eb79af1d79e803984dd2b93166c286809b376968584cc320679de95fcfbba SHA512 d60999a08f70f5bcf1b66099c5d7b5f715dbd881bd0d75dbdde3a8932e9b064166f0524a45ae88b5b182c620aee526e14095ffdee68403b5d3b087b4dc4c0c2c -DIST libgpg-error-1.38.tar.bz2 957637 BLAKE2B 9532402466748503805366b94c82c9adfe5b448f885c26b33ebf7ba9957161ca046b4057f5ca862224accb9f2af731652a55d20e7a4ab69107190a58c8e11ad6 SHA512 b936a4738c2cee111d855b1ba3ec433da8c77799a87d1f71275f974f871ebfa593c9db06ea53f0490b6cd6b94bef34f6052a587a4d13d839ec0128500c2dd9de -DIST libgpg-error-1.41.tar.bz2 967117 BLAKE2B 9dc95bc09f55915d904e0f956ecf9281615028b8b8d876dbc786b752068fefea56adfb5dd5db65bad656ab664d567e56541e44a584c7f8672c30537ed05c4db0 SHA512 578d1d8090b9f6e6cbe59d9aeebec7df81aae492f75ec343f8df530950d30866fa0a7903ca050bf7bf721413f7b2708abe34f7467e2b208cc1447ffc9bd5b9a5 -DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B eb3381ec7106cfe5dca333391f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8 SHA512 f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4 +DIST libgpg-error-1.46.tar.bz2 1014291 BLAKE2B 6748c463256b7d0a05fe89a63c5f3abda1975d861c35821248664f2f09cd2273ef619d12408b6107a99519939ca7214f492e705c29f52f7bbdc422237281c1ca SHA512 b06223bb2b0f67d3db5d0d9ab116361a0eda175d4667352b5c0941408d37f2b0ba8e507297e480ccebb88cbba9d0a133820b896914b07d264fb3edaac7b8c99d +DIST libgpg-error-1.46.tar.bz2.sig 238 BLAKE2B c9f48969dc5b51c4d6c0c643a510e442b883af319f4bd9db3d1f9d9b56e4003f020131ace28d5e6d3db1d3f62c63ac083f159d545e601e7c47391bd16e4411d6 SHA512 c71be3ab3b2fe6c0932faad3df42c67a861a789a09e0b084da06fbf723c37e3bf28047ff4475a9b26bf622434517235c2677a832eebb611a47330ccc7887a7cf +DIST libgpg-error-1.47.tar.bz2 1020862 BLAKE2B bc04efa0686b1b7d7cdce045fc080c090c1abec60349b673c2e1ce27900483aea090eb6ebcb3fb49a4eed36f18156a12413d5446f739475632f4ed2a2481ff27 SHA512 bbb4b15dae75856ee5b1253568674b56ad155524ae29a075cb5b0a7e74c4af685131775c3ea2226fff2f84ef80855e77aa661645d002b490a795c7ae57b66a30 +DIST libgpg-error-1.47.tar.bz2.sig 119 BLAKE2B d23ea6c38621407c8f9f0c6bde71abd0e50c136d2e5de9a6cef64627f5d398c344a3438995a2405c4ef148ad8638ef7125f34670819957acd7d597370f1630e5 SHA512 09343016eaf7fcc455f8ce533847153a8a9b7c36f375a8ebe71ef5fc2923edf7b70842f834f52c51874e427869487b74a2286ea0112cffad0d72f79cb6d4eceb diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch deleted file mode 100644 index 7ddd51f9a5..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.38-cross_compile.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: David Michael -Date: Mon, 1 Jun 2020 14:24:53 +0000 (-0400) -Subject: build: Fix cross-compiling into a separate build dir. -X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=commitdiff_plain;h=013720333c6ec1d38791689bc49ba039d98e16b3 - -build: Fix cross-compiling into a separate build dir. - -* configure.ac: Create the src directory before writing into it. -* src/Makefile.am (EXTRA_DIST): Add gen-lock-obj.sh. - --- - -Signed-off-by: David Michael ---- - -diff --git a/configure.ac b/configure.ac -index 6bd634b..1dd6489 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -598,6 +598,7 @@ if test x$cross_compiling = xyes; then - case $host in - *-*-linux*) - lock_obj_h_generated=yes -+ mkdir src - LOCK_ABI_VERSION=1 host=$host host_alias=$host_alias \ - CC=$CC OBJDUMP=$host_alias-objdump \ - ac_ext=$ac_ext ac_objext=$ac_objext \ -diff --git a/src/Makefile.am b/src/Makefile.am -index 7e36d69..b2bffd2 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -102,7 +102,7 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ - gpg-error.vers gpg-error.def.in \ - versioninfo.rc.in gpg-error.w32-manifest.in \ - gpg-error-config-test.sh gpg-error.pc.in \ -- $(lock_obj_pub) -+ gen-lock-obj.sh $(lock_obj_pub) - - BUILT_SOURCES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h \ - code-to-errno.h code-from-errno.h \ diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch deleted file mode 100644 index 78d98dd7b3..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 33593864cd54143db594c4237bba41e14179061c Mon Sep 17 00:00:00 2001 -From: David Michael -Date: Fri, 26 Mar 2021 16:06:50 +0900 -Subject: [PATCH] build: Fix generation of lock-obj-pub.native.h for cross - build. - -* src/gen-lock-obj.sh: Capture echo output with quotes. - --- - -Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374 -Signed-off-by: David Michael ---- - src/gen-lock-obj.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh -index a710f0c..258eec6 100755 ---- a/src/gen-lock-obj.sh -+++ b/src/gen-lock-obj.sh -@@ -38,7 +38,7 @@ - # AWK=gawk ./gen-lock-obj.sh - # - --if test -n `echo -n`; then -+if test -n "`echo -n`"; then - ECHO_C='\c' - ECHO_N='' - else --- -2.11.0 - diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.44-remove_broken_check.patch similarity index 78% rename from sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch rename to sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.44-remove_broken_check.patch index 2919a9d73b..043099c097 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/files/libgpg-error-1.44-remove_broken_check.patch @@ -3,12 +3,12 @@ This breaks our multilib builds: Confirm gpg-error-config works... no *** Please report to with gpg-error-config-test.log ---- libgpg-error-1.37/src/Makefile.am -+++ libgpg-error-1.37/src/Makefile.am -@@ -338,14 +338,6 @@ +--- libgpg-error-1.44/src/Makefile.am ++++ libgpg-error-1.44/src/Makefile.am +@@ -347,14 +347,6 @@ cp gpg-error.h gpgrt.h - gpg-error-config: gpgrt-config gpg-error-config-old + gpg-error-config: gpgrt-config gpg-error-config-old gpg-error-config-test.sh - @echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)" - @if ./gpg-error-config-test.sh --old-new; then \ - echo "good"; \ diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.38.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.38.ebuild deleted file mode 100644 index e5d788d142..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.38.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools multilib-minimal toolchain-funcs prefix - -DESCRIPTION="Contains error handling functions used by GnuPG software" -HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error" -SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2 - https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob_plain;f=src/gen-lock-obj.sh;hb=libgpg-error-1.38 -> gen-lock-obj-1.38.sh" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="common-lisp nls static-libs" - -RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gpg-error-config -) -MULTILIB_WRAPPED_HEADERS=( - /usr/include/gpg-error.h - /usr/include/gpgrt.h -) - -PATCHES=( - "${FILESDIR}/${PN}-1.37-remove_broken_check.patch" - "${FILESDIR}/${P}-cross_compile.patch" #726520 -) - -src_unpack() { - [[ ${PV} == 1.38 ]] || die "Please remove gen-lock-obj.sh from SRC_URI and drop src_unpack" - unpack ${P}.tar.bz2 - cp "${DISTDIR}"/gen-lock-obj-1.38.sh "${S}"/src/gen-lock-obj.sh || die - chmod +x "${S}"/src/gen-lock-obj.sh || die -} - -src_prepare() { - default - # only necessary for as long as we run eautoreconf, configure.ac - # uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is - # not a pure /bin/sh script, so it fails on some hosts - hprefixify -w 1 autogen.sh - eautoreconf -} - -multilib_src_configure() { - local myeconfargs=( - $(multilib_is_native_abi || echo --disable-languages) - $(use_enable common-lisp languages) - $(use_enable nls) - # required for sys-power/suspend[crypt], bug 751568 - $(use_enable static-libs static) - --enable-threads - CC_FOR_BUILD="$(tc-getBUILD_CC)" - $("${S}/configure" --help | grep -o -- '--without-.*-prefix') - ) - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" -} - -multilib_src_install_all() { - einstalldocs - find "${ED}" -type f -name '*.la' -delete || die -} diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.41.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.46-r1.ebuild similarity index 53% rename from sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.41.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.46-r1.ebuild index b83de2c2f4..ca248e9c46 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.41.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.46-r1.ebuild @@ -1,33 +1,47 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools multilib-minimal toolchain-funcs prefix +# 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 autotools multilib-minimal toolchain-funcs prefix verify-sig DESCRIPTION="Contains error handling functions used by GnuPG software" HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error" SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" +SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="GPL-2 LGPL-2.1" 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="common-lisp nls static-libs" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="common-lisp nls static-libs test" +RESTRICT="!test? ( test )" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" +BDEPEND=" + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-gnupg ) +" -MULTILIB_CHOST_TOOLS=( - /usr/bin/gpg-error-config -) MULTILIB_WRAPPED_HEADERS=( /usr/include/gpg-error.h /usr/include/gpgrt.h ) +MULTILIB_CHOST_TOOLS=( + /usr/bin/gpg-error-config + /usr/bin/gpgrt-config +) + PATCHES=( - "${FILESDIR}/${PN}-1.37-remove_broken_check.patch" + "${FILESDIR}/${PN}-1.44-remove_broken_check.patch" ) src_prepare() { @@ -52,6 +66,13 @@ multilib_src_configure() { $(use_enable nls) # required for sys-power/suspend[crypt], bug 751568 $(use_enable static-libs static) + $(use_enable test tests) + + # See bug #699206 and its duplicates wrt gpgme-config + # Upstream no longer install this by default and we should + # seek to disable it at some point. + --enable-install-gpg-error-config + --enable-threads CC_FOR_BUILD="$(tc-getBUILD_CC)" $("${S}/configure" --help | grep -o -- '--without-.*-prefix') diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.42.ebuild b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.47.ebuild similarity index 53% rename from sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.42.ebuild rename to sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.47.ebuild index 2168705cf7..4ab32fea59 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.42.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/libgpg-error-1.47.ebuild @@ -1,34 +1,47 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit autotools multilib-minimal toolchain-funcs prefix +# 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 autotools multilib-minimal toolchain-funcs prefix verify-sig DESCRIPTION="Contains error handling functions used by GnuPG software" HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error" SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" +SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )" LICENSE="GPL-2 LGPL-2.1" 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="common-lisp nls static-libs" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="common-lisp nls static-libs test" +RESTRICT="!test? ( test )" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" -BDEPEND="nls? ( sys-devel/gettext )" +BDEPEND=" + nls? ( sys-devel/gettext ) + verify-sig? ( sec-keys/openpgp-keys-gnupg ) +" -MULTILIB_CHOST_TOOLS=( - /usr/bin/gpg-error-config -) MULTILIB_WRAPPED_HEADERS=( /usr/include/gpg-error.h /usr/include/gpgrt.h ) +MULTILIB_CHOST_TOOLS=( + /usr/bin/gpg-error-config + /usr/bin/gpgrt-config +) + PATCHES=( - "${FILESDIR}/${PN}-1.37-remove_broken_check.patch" - "${FILESDIR}/${P}-cross_compile.patch" + "${FILESDIR}/${PN}-1.44-remove_broken_check.patch" ) src_prepare() { @@ -53,6 +66,13 @@ multilib_src_configure() { $(use_enable nls) # required for sys-power/suspend[crypt], bug 751568 $(use_enable static-libs static) + $(use_enable test tests) + + # See bug #699206 and its duplicates wrt gpgme-config + # Upstream no longer install this by default and we should + # seek to disable it at some point. + --enable-install-gpg-error-config + --enable-threads CC_FOR_BUILD="$(tc-getBUILD_CC)" $("${S}/configure" --help | grep -o -- '--without-.*-prefix') diff --git a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/metadata.xml index 6cb5d85f10..0c03a7f547 100644 --- a/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-libs/libgpg-error/metadata.xml @@ -1,9 +1,9 @@ - - Lars Wendler - polynomial-c@gentoo.org + + base-system@gentoo.org + Gentoo Base System Install common-lisp files