public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
Date: Sat, 11 Jun 2022 01:52:44 +0000 (UTC)	[thread overview]
Message-ID: <1654912348.2562c4c75a1b4f5e1b64e7f4dcfec84dc0c7126e.sam@gentoo> (raw)

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
 }


             reply	other threads:[~2022-06-11  1:52 UTC|newest]

Thread overview: 228+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-11  1:52 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-07  7:07 [gentoo-commits] repo/gentoo:master commit in: sys-apps/file/ Sam James
2024-05-09 11:33 Sam James
2024-05-09 11:33 Sam James
2024-04-13  6:26 Arthur Zamarin
2024-03-14  8:20 Arthur Zamarin
2024-03-14  7:41 Arthur Zamarin
2024-03-14  6:53 Sam James
2024-03-14  6:41 Sam James
2024-03-14  6:41 Sam James
2024-03-14  6:19 Sam James
2024-03-14  6:07 Sam James
2024-02-05 14:12 Sam James
2023-12-01 20:30 Arthur Zamarin
2023-10-27 15:20 Michał Górny
2023-07-28  1:35 Sam James
2023-07-13  8:26 Sam James
2023-07-13  8:25 Sam James
2023-03-02 20:06 Mike Gilbert
2023-02-24 18:36 Sam James
2023-01-13  6:18 Sam James
2023-01-13  5:40 Sam James
2023-01-13  5:40 Sam James
2023-01-13  5:40 Sam James
2023-01-13  5:36 Sam James
2023-01-13  5:36 Sam James
2023-01-13  4:42 Sam James
2023-01-13  4:42 Sam James
2023-01-13  3:50 Sam James
2023-01-13  3:50 Sam James
2023-01-12  4:41 Sam James
2022-12-31 10:49 Arthur Zamarin
2022-12-29 10:14 Fabian Groffen
2022-12-27 14:23 Arthur Zamarin
2022-12-27 10:12 Sam James
2022-11-04  8:16 Agostino Sarubbo
2022-11-03 19:31 Arthur Zamarin
2022-11-03 19:19 Sam James
2022-09-23  2:09 Sam James
2022-09-15 15:32 Sam James
2022-09-15 11:36 Sam James
2022-09-13 20:29 Sam James
2022-08-22 18:05 Sam James
2022-08-16  2:37 Sam James
2022-08-16  2:34 Sam James
2022-07-30  9:51 Arthur Zamarin
2022-07-25  0:28 Sam James
2022-07-20 13:45 Agostino Sarubbo
2022-07-20 13:42 Agostino Sarubbo
2022-07-20 13:41 Agostino Sarubbo
2022-07-20  2:45 Sam James
2022-07-20  2:45 Sam James
2022-07-20  2:45 Sam James
2022-07-20  2:45 Sam James
2022-05-14  8:25 Michał Górny
2022-05-14  8:25 Michał Górny
2022-01-16 19:06 Mike Gilbert
2022-01-16 19:06 Mike Gilbert
2021-12-14 20:11 Arthur Zamarin
2021-12-13 18:51 Arthur Zamarin
2021-12-13  7:03 Agostino Sarubbo
2021-12-13  7:02 Agostino Sarubbo
2021-12-13  6:57 Agostino Sarubbo
2021-12-13  6:22 Sam James
2021-12-13  6:17 Sam James
2021-10-19 10:11 Lars Wendler
2021-10-03 11:28 David Seifert
2021-07-14  3:12 Sam James
2021-07-07 14:22 Sergei Trofimovich
2021-07-07  6:30 Agostino Sarubbo
2021-07-07  2:17 Sam James
2021-07-06 18:02 Sam James
2021-07-06 18:02 Sam James
2021-06-09  7:41 Michał Górny
2021-04-25 10:33 Sam James
2021-04-25  8:56 Sergei Trofimovich
2021-04-25  5:16 Sam James
2021-04-25  5:14 Sam James
2021-04-25  5:11 Sam James
2021-04-25  5:09 Sam James
2021-04-18 16:21 Mike Gilbert
2021-03-31  8:03 Lars Wendler
2021-03-31  8:03 Lars Wendler
2021-03-27 16:04 Sam James
2021-03-26 12:01 Agostino Sarubbo
2021-03-19  8:55 Sam James
2021-03-18 18:58 Sergei Trofimovich
2021-03-17  9:00 Sam James
2021-03-17  9:00 Sam James
2021-03-17  9:00 Sam James
2021-03-16 22:33 Sam James
2021-03-16 22:32 Sam James
2021-01-06 15:26 Fabian Groffen
2020-12-27 18:13 Fabian Groffen
2020-09-07 20:41 Mike Gilbert
2020-09-07 20:41 Mike Gilbert
2020-08-26 22:01 Sergei Trofimovich
2020-08-19 11:20 Sam James
2020-08-19  8:31 Sergei Trofimovich
2020-08-17 10:01 Agostino Sarubbo
2020-08-17  9:59 Agostino Sarubbo
2020-08-17  9:58 Agostino Sarubbo
2020-08-17  9:57 Agostino Sarubbo
2020-08-17  9:55 Agostino Sarubbo
2020-06-24  9:27 Lars Wendler
2020-06-15  8:09 Lars Wendler
2020-05-28 19:39 Michał Górny
2020-05-07 17:58 Michał Górny
2020-05-04 17:36 Thomas Deutschmann
2020-04-12 23:41 Thomas Deutschmann
2020-04-12 23:28 Thomas Deutschmann
2020-03-15  4:54 Thomas Deutschmann
2020-03-15  4:54 Thomas Deutschmann
2020-01-04 18:08 Mike Gilbert
2019-12-20  8:01 Lars Wendler
2019-12-20  8:01 Lars Wendler
2019-12-19 15:37 Lars Wendler
2019-12-02 14:24 Andreas Sturmlechner
2019-11-12 18:07 Agostino Sarubbo
2019-11-12 13:36 Agostino Sarubbo
2019-11-09 22:55 Matt Turner
2019-11-08  8:35 Mikle Kolyada
2019-11-06 21:51 Aaron Bauman
2019-11-01 10:36 Mikle Kolyada
2019-10-30 22:41 Sergei Trofimovich
2019-10-29 20:08 Sergei Trofimovich
2019-10-28  9:43 Agostino Sarubbo
2019-10-27 23:20 Thomas Deutschmann
2019-05-20  9:24 Lars Wendler
2019-05-20  9:24 Lars Wendler
2019-05-03 22:55 Mikle Kolyada
2019-02-24  8:24 Mikle Kolyada
2019-02-24  8:23 Mikle Kolyada
2019-02-24  8:20 Mikle Kolyada
2019-02-24  8:17 Mikle Kolyada
2019-02-24  8:17 Mikle Kolyada
2019-02-23 12:55 Sergei Trofimovich
2019-02-23 11:58 Sergei Trofimovich
2019-02-23 11:49 Sergei Trofimovich
2019-02-22 20:17 Sergei Trofimovich
2019-02-22 18:35 Jeroen Roovers
2019-02-22 18:23 Mart Raudsepp
2019-02-22  7:56 Agostino Sarubbo
2019-02-21 19:04 Patrick McLean
2018-11-25 23:24 Mart Raudsepp
2018-11-17 15:39 Mikle Kolyada
2018-11-09 19:06 Mikle Kolyada
2018-11-02  7:50 Matt Turner
2018-10-26 20:19 Sergei Trofimovich
2018-10-26 20:19 Sergei Trofimovich
2018-10-26 20:19 Sergei Trofimovich
2018-10-26 20:19 Sergei Trofimovich
2018-10-23 18:23 Sergei Trofimovich
2018-10-22 15:53 Mikle Kolyada
2018-10-22  8:12 Lars Wendler
2018-07-25 11:55 Lars Wendler
2018-07-25  8:24 Lars Wendler
2018-07-25  8:24 Lars Wendler
2018-07-25  8:24 Lars Wendler
2018-07-24  8:58 Lars Wendler
2018-07-18 14:37 Michał Górny
2018-06-22 17:51 Mikle Kolyada
2018-06-22 17:49 Mikle Kolyada
2018-06-19 14:30 Mart Raudsepp
2018-06-15  9:35 Sergei Trofimovich
2018-06-12 20:48 Sergei Trofimovich
2018-06-12 15:06 Mikle Kolyada
2018-06-12 11:36 Thomas Deutschmann
2018-06-06 21:00 Thomas Deutschmann
2018-06-06 21:00 Thomas Deutschmann
2018-04-16  7:48 Lars Wendler
2018-04-16  7:48 Lars Wendler
2017-09-30 15:15 Thomas Deutschmann
2017-09-30 15:15 Thomas Deutschmann
2017-09-29  4:54 Markus Meier
2017-09-26 22:28 Manuel Rüger
2017-09-26  9:33 Tobias Klausmann
2017-09-24 18:50 Sergei Trofimovich
2017-09-23 19:38 Sergei Trofimovich
2017-09-23 19:00 Sergei Trofimovich
2017-09-23 13:05 Sergei Trofimovich
2017-09-22 23:50 Thomas Deutschmann
2017-09-11  8:10 Sergei Trofimovich
2017-09-09 17:02 Sergei Trofimovich
2017-09-09 17:01 Sergei Trofimovich
2017-09-09 17:01 Sergei Trofimovich
2017-09-09 10:27 Markus Meier
2017-09-08 22:24 Sergei Trofimovich
2017-09-04 13:36 Tobias Klausmann
2017-09-02 22:10 Sergei Trofimovich
2017-09-02 20:36 Lars Wendler
2017-09-02 20:36 Lars Wendler
2017-06-10 15:10 Agostino Sarubbo
2017-06-10 13:45 Agostino Sarubbo
2017-05-30  4:56 Markus Meier
2017-05-27 13:23 Tobias Klausmann
2017-05-26 14:59 Agostino Sarubbo
2017-05-24 13:46 Agostino Sarubbo
2017-05-24 13:42 Agostino Sarubbo
2017-05-24  7:15 Lars Wendler
2017-05-24  7:15 Lars Wendler
2017-04-20 16:41 David Seifert
2017-03-17 19:20 Zac Medico
2017-02-25  7:30 Markus Meier
2017-02-10 22:15 Lars Wendler
2017-01-25 12:16 Tobias Klausmann
2017-01-23 16:27 Agostino Sarubbo
2017-01-21 20:33 Agostino Sarubbo
2017-01-21 13:17 Jeroen Roovers
2017-01-19 14:14 Mike Frysinger
2017-01-19 10:37 Agostino Sarubbo
2017-01-18  8:55 Mike Frysinger
2016-12-16 12:49 Fabian Groffen
2016-10-25 20:27 Lars Wendler
2016-09-18 12:39 Sergei Trofimovich
2016-08-10  9:49 Mike Frysinger
2016-06-25  3:09 Mike Frysinger
2016-06-14  1:46 Mike Frysinger
2016-06-04  4:53 Markus Meier
2016-05-27 12:46 Lars Wendler
2016-05-26 20:05 Lars Wendler
2016-05-25  6:29 Matt Turner
2016-05-25  5:25 Jeroen Roovers
2016-05-13 19:03 Mike Frysinger
2016-05-02 14:13 Lars Wendler
2016-04-17 17:39 Lars Wendler
2016-04-17 17:39 Lars Wendler
2015-09-16 14:49 Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1654912348.2562c4c75a1b4f5e1b64e7f4dcfec84dc0c7126e.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox