commit: fa6b7f8f578edae6463fe154351e559f58a4b942 Author: Jonathan Davies <jpds <AT> protonmail <DOT> com> AuthorDate: Thu Mar 24 14:35:58 2022 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Thu Mar 24 18:07:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa6b7f8f
app-arch/libarchive: Added verify-sig integration. Signed-off-by: Jonathan Davies <jpds <AT> protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/24735 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> app-arch/libarchive/Manifest | 2 ++ app-arch/libarchive/libarchive-3.5.3.ebuild | 17 +++++++++++++---- app-arch/libarchive/libarchive-3.6.0.ebuild | 17 +++++++++++++---- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/app-arch/libarchive/Manifest b/app-arch/libarchive/Manifest index e108d5b3b85b..fc9529fe433a 100644 --- a/app-arch/libarchive/Manifest +++ b/app-arch/libarchive/Manifest @@ -1,2 +1,4 @@ DIST libarchive-3.5.3.tar.gz 7038767 BLAKE2B a9f8b44c42efadb29cba2597c201bf9064d69632db92dad07df3f1bc9667257d8578c2ae7fae65ffc53e075466e3d326e4fe77d18d3f06656a4a255324a81fba SHA512 889879e869f7391e3b85b5e3c2bbad3c1a5e50ec7b62c0be8f2817e2dfa8410e6eb409a3c4dce2675b9e7134bae3f129475e331bc3d15d637b91412c7eb026a2 +DIST libarchive-3.5.3.tar.gz.asc 833 BLAKE2B 2a2af61d25201feef727d05554b3b1553779afeb155d1d68a3e2b64e71eca6ca06cd6d9c77cc98c2d40c0d654c7de535d9901e55f527cb74dc8933a402207553 SHA512 1a6c930e62961ee97d2983ad7f7aded61dd65668737cc7fc42b3f2f32a699931fe74c1b7abe4686e061e7b39500a67adea929f390a8dcb2037d0d58f3b30441d DIST libarchive-3.6.0.tar.gz 8570393 BLAKE2B 57a8e1681485a489dc9d3823cc8c9b0d68e7d84510a3eff0b6adc268825bb9aa6179d8a810b249c3f72e3674e1df6e5ba2ed0043196458bedc3c1d880c5d4a0b SHA512 700579c5dd15b61333cc4dbf01ebfbd26d6e8c20d5cbe6525683634418fec5c87a5a1e28a81cc59ad7c94218682e406aa3b55d81036bd9fa31d83d989c6d764c +DIST libarchive-3.6.0.tar.gz.asc 833 BLAKE2B 0b3600e998ccf3e3862523116db071f5c43165a422f292053d7be14a67a294b4b9ed76a939156ad0f494443d9a6a6dde46e73c1107d50c7e150030c7627d8851 SHA512 2450a3463ec1b4b2c590139ea2b6f0db0afbd8ff7939da5d90c5adfb3d27618ca36b03596b707211de82341ca157acaf510fc51ee26d6901d46e15341406acd2 diff --git a/app-arch/libarchive/libarchive-3.5.3.ebuild b/app-arch/libarchive/libarchive-3.5.3.ebuild index 8e9ae0485b26..d49753f59e9f 100644 --- a/app-arch/libarchive/libarchive-3.5.3.ebuild +++ b/app-arch/libarchive/libarchive-3.5.3.ebuild @@ -2,16 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit multilib-minimal toolchain-funcs +inherit multilib-minimal toolchain-funcs verify-sig DESCRIPTION="Multi-format archive and compression library" HOMEPAGE="https://www.libarchive.org/"; -SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"; +SRC_URI=" + https://www.libarchive.org/downloads/${P}.tar.gz + verify-sig? ( https://www.libarchive.org/downloads/${P}.tar.gz.asc ) +" LICENSE="BSD BSD-2 BSD-4 public-domain" SLOT="0/13" 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="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd" +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc RDEPEND=" sys-libs/zlib[${MULTILIB_USEDEP}] @@ -29,12 +33,17 @@ RDEPEND=" lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] ) lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )" + zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] ) +" DEPEND="${RDEPEND} kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs ) - )" + ) +" +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-libarchive ) +" multilib_src_configure() { export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923 diff --git a/app-arch/libarchive/libarchive-3.6.0.ebuild b/app-arch/libarchive/libarchive-3.6.0.ebuild index ab2dcccb7b74..b6f30c10198e 100644 --- a/app-arch/libarchive/libarchive-3.6.0.ebuild +++ b/app-arch/libarchive/libarchive-3.6.0.ebuild @@ -2,16 +2,20 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit multilib-minimal toolchain-funcs +inherit multilib-minimal toolchain-funcs verify-sig DESCRIPTION="Multi-format archive and compression library" HOMEPAGE="https://www.libarchive.org/"; -SRC_URI="https://www.libarchive.org/downloads/${P}.tar.gz"; +SRC_URI=" + https://www.libarchive.org/downloads/${P}.tar.gz + verify-sig? ( https://www.libarchive.org/downloads/${P}.tar.gz.asc ) +" LICENSE="BSD BSD-2 BSD-4 public-domain" SLOT="0/13" 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="acl blake2 +bzip2 +e2fsprogs expat +iconv lz4 +lzma lzo nettle static-libs xattr zstd" +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libarchive.org.asc RDEPEND=" sys-libs/zlib[${MULTILIB_USEDEP}] @@ -29,12 +33,17 @@ RDEPEND=" lzma? ( >=app-arch/xz-utils-5.2.5-r1[${MULTILIB_USEDEP}] ) lzo? ( >=dev-libs/lzo-2[${MULTILIB_USEDEP}] ) nettle? ( dev-libs/nettle:0=[${MULTILIB_USEDEP}] ) - zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] )" + zstd? ( app-arch/zstd[${MULTILIB_USEDEP}] ) +" DEPEND="${RDEPEND} kernel_linux? ( virtual/os-headers e2fsprogs? ( sys-fs/e2fsprogs ) - )" + ) +" +BDEPEND=" + verify-sig? ( sec-keys/openpgp-keys-libarchive ) +" multilib_src_configure() { export ac_cv_header_ext2fs_ext2_fs_h=$(usex e2fsprogs) #354923
