commit: 2562c4c75a1b4f5e1b64e7f4dcfec84dc0c7126e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Jun 11 01:09:25 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Jun 11 01:52:28 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2562c4c7
sys-apps/file: add 5.42 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/file/Manifest | 2 ++ .../file/{file-9999.ebuild => file-5.42.ebuild} | 40 ++++++++++++++-------- sys-apps/file/file-9999.ebuild | 37 +++++++++++++------- 3 files changed, 52 insertions(+), 27 deletions(-) diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest index 8ae92ee49bed..39e70ed0adab 100644 --- a/sys-apps/file/Manifest +++ b/sys-apps/file/Manifest @@ -1 +1,3 @@ DIST file-5.41.tar.gz 1064097 BLAKE2B 56fe8a58d9497bb1bfe3ed6b3ce5df70dd27cc308eb0cfdac8e91ba81c733a96aa622c120ac59079986c6d84901c6f2d82fa24f698d481d7f77e6cfdd432d648 SHA512 bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654 +DIST file-5.42.tar.gz 1105846 BLAKE2B c557facb066ae0599db832ddbbc3fed7db2e057faefe832cb4bed8f860b63456217bee39f0c82b17902c3b91426e522681216d2d3ed689501fa00d69a4a09832 SHA512 33c3c339a561c6cf787cc06a16444a971c62068b01827612c948207a9714107b617bed8148cd67e6280cb1c62ad4dfb1205fb8486ea9c042ce7e19b067d3bb05 +DIST file-5.42.tar.gz.asc 195 BLAKE2B 9b930bcd6b98878e60cd72d8d71b40201ebbf3ab1dda7d2b0e3228abdc0c1e21473a012b9799dcac8638ded1bdbe03865c5e41ed4086076a7df6bf6aadbfe29d SHA512 a7105c48f6c671638f5fb7f18f9b193d108456655b4c734208e00aca36fab54dd330ec2fdc3ff29fb78adbc16874af4fb0916c560e50228f82003a8cd258491a diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-5.42.ebuild similarity index 73% copy from sys-apps/file/file-9999.ebuild copy to sys-apps/file/file-5.42.ebuild index dbb7e47df16d..0b9cc3af8dba 100644 --- a/sys-apps/file/file-9999.ebuild +++ b/sys-apps/file/file-5.42.ebuild @@ -9,15 +9,21 @@ PYTHON_COMPAT=( python3_{8..11} ) inherit distutils-r1 libtool toolchain-funcs multilib-minimal -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/glensc/file.git"; inherit autotools git-r3 else + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/file.asc + inherit verify-sig SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"; - 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" + SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )" + + 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" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )" fi -DESCRIPTION="identify a file's format by scanning binary data for patterns" +DESCRIPTION="Identify a file's format by scanning binary data for patterns" HOMEPAGE="https://www.darwinsys.com/file/"; LICENSE="BSD-2" @@ -36,7 +42,7 @@ DEPEND=" RDEPEND="${DEPEND} python? ( !dev-python/python-magic ) seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )" -BDEPEND=" +BDEPEND+=" python? ( ${PYTHON_DEPS} ${DISTUTILS_DEPS} @@ -44,6 +50,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978 + "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet ) src_prepare() { @@ -51,13 +58,14 @@ src_prepare() { if [[ ${PV} == 9999 ]] ; then eautoreconf + else + elibtoolize fi - elibtoolize - - # don't let python README kill main README #60043 + # don't let python README kill main README, bug ##60043 mv python/README.md python/README.python.md || die - sed 's...@readme.md@README.python.md@' -i python/setup.py || die #662090 + # bug #662090 + sed 's...@readme.md@README.python.md@' -i python/setup.py || die } multilib_src_configure() { @@ -80,13 +88,14 @@ build_src_configure() { --disable-xzlib --disable-zlib ) + econf_build "${myeconfargs[@]}" } need_build_file() { # when cross-compiling, we need to build up our own file # because people often don't keep matching host/target - # file versions #362941 + # file versions, bug #362941 tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}" } @@ -106,18 +115,20 @@ multilib_src_compile() { if multilib_is_native_abi ; then emake else - cd src || die - emake magic.h #586444 - emake libmagic.la + # bug #586444 + emake -C src magic.h + emake -C src libmagic.la fi } src_compile() { if need_build_file ; then - emake -C "${WORKDIR}"/build/src magic.h #586444 + # bug #586444 + emake -C "${WORKDIR}"/build/src magic.h emake -C "${WORKDIR}"/build/src file local -x PATH="${WORKDIR}/build/src:${PATH}" fi + multilib-minimal_src_compile if use python ; then @@ -135,7 +146,7 @@ multilib_src_install() { } multilib_src_install_all() { - dodoc ChangeLog MAINT README + dodoc ChangeLog MAINT # README # Required for `file -C` insinto /usr/share/misc/magic @@ -145,5 +156,6 @@ multilib_src_install_all() { cd python || die distutils-r1_src_install fi + find "${ED}" -type f -name "*.la" -delete || die } diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild index dbb7e47df16d..7f27cf37781f 100644 --- a/sys-apps/file/file-9999.ebuild +++ b/sys-apps/file/file-9999.ebuild @@ -9,15 +9,21 @@ PYTHON_COMPAT=( python3_{8..11} ) inherit distutils-r1 libtool toolchain-funcs multilib-minimal -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/glensc/file.git"; inherit autotools git-r3 else + VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/file.asc + inherit verify-sig SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"; - 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" + SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )" + + 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" + + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )" fi -DESCRIPTION="identify a file's format by scanning binary data for patterns" +DESCRIPTION="Identify a file's format by scanning binary data for patterns" HOMEPAGE="https://www.darwinsys.com/file/"; LICENSE="BSD-2" @@ -36,7 +42,7 @@ DEPEND=" RDEPEND="${DEPEND} python? ( !dev-python/python-magic ) seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )" -BDEPEND=" +BDEPEND+=" python? ( ${PYTHON_DEPS} ${DISTUTILS_DEPS} @@ -51,13 +57,14 @@ src_prepare() { if [[ ${PV} == 9999 ]] ; then eautoreconf + else + elibtoolize fi - elibtoolize - - # don't let python README kill main README #60043 + # don't let python README kill main README, bug ##60043 mv python/README.md python/README.python.md || die - sed 's...@readme.md@README.python.md@' -i python/setup.py || die #662090 + # bug #662090 + sed 's...@readme.md@README.python.md@' -i python/setup.py || die } multilib_src_configure() { @@ -80,13 +87,14 @@ build_src_configure() { --disable-xzlib --disable-zlib ) + econf_build "${myeconfargs[@]}" } need_build_file() { # when cross-compiling, we need to build up our own file # because people often don't keep matching host/target - # file versions #362941 + # file versions, bug #362941 tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}" } @@ -106,18 +114,20 @@ multilib_src_compile() { if multilib_is_native_abi ; then emake else - cd src || die - emake magic.h #586444 - emake libmagic.la + # bug #586444 + emake -C src magic.h + emake -C src libmagic.la fi } src_compile() { if need_build_file ; then - emake -C "${WORKDIR}"/build/src magic.h #586444 + # bug #586444 + emake -C "${WORKDIR}"/build/src magic.h emake -C "${WORKDIR}"/build/src file local -x PATH="${WORKDIR}/build/src:${PATH}" fi + multilib-minimal_src_compile if use python ; then @@ -145,5 +155,6 @@ multilib_src_install_all() { cd python || die distutils-r1_src_install fi + find "${ED}" -type f -name "*.la" -delete || die }