[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 01e983d4803df443c057c3ed3c174a77e4cb929c
Author: Sam James gentoo org>
AuthorDate: Thu May 9 11:18:11 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu May 9 11:32:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01e983d4
sys-apps/file: enable py3.12
Closes: https://bugs.gentoo.org/929810
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.45-r4.ebuild | 2 +-
sys-apps/file/file-.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/file/file-5.45-r4.ebuild
b/sys-apps/file/file-5.45-r4.ebuild
index f822d863338e..6a112ffecb4a 100644
--- a/sys-apps/file/file-5.45-r4.ebuild
+++ b/sys-apps/file/file-5.45-r4.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1 toolchain-funcs multilib-minimal
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index 19c650b61358..c909db1c6e81 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
inherit distutils-r1 libtool toolchain-funcs multilib-minimal
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 323dd2a226905b0e0f280f0c3dcf3a9d7f91704f
Author: Sam James gentoo org>
AuthorDate: Thu May 9 11:16:07 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu May 9 11:32:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=323dd2a2
sys-apps/file: drop 5.45-r3
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.45-r3.ebuild | 180 --
1 file changed, 180 deletions(-)
diff --git a/sys-apps/file/file-5.45-r3.ebuild
b/sys-apps/file/file-5.45-r3.ebuild
deleted file mode 100644
index 4bad50bf1169..
--- a/sys-apps/file/file-5.45-r3.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 toolchain-funcs multilib-minimal
-
-if [[ ${PV} == ]] ; then
- EGIT_REPO_URI="https://github.com/glensc/file.git;
- inherit autotools git-r3
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/file.asc
- inherit autotools verify-sig
- SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
-
- BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
-fi
-
-DESCRIPTION="Identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzip lzma python seccomp static-libs zlib zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
- lzip? ( app-arch/lzlib )
- lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
- seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
- ${DEPEND}
- python? ( !dev-python/python-magic )
- seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
-"
-BDEPEND+="
- python? (
- ${PYTHON_DEPS}
- ${DISTUTILS_DEPS}
- )
-"
-
-# https://bugs.gentoo.org/898676
-QA_CONFIG_IMPL_DECL_SKIP=( makedev )
-
-PATCHES=(
- "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
- "${FILESDIR}/file-5.45-seccomp-sandbox.patch"
- "${FILESDIR}/${P}-32-bit-time_t.patch"
- "${FILESDIR}/${P}-32-bit-time_t-deux.patch"
- "${FILESDIR}/${P}-weak-magic-shell.patch" #908401
-)
-
-src_prepare() {
- default
-
- #if [[ ${PV} == ]] ; then
- # eautoreconf
- #else
- # elibtoolize
- #fi
- # Just for file-5.45-32-bit-time_t-deux.patch, drop in 5.46
- eautoreconf
-
- # Don't let python README kill main README, bug #60043
- mv python/README.md python/README.python.md || die
-
- # bug #662090
- sed -i 's...@readme.md@README.python.md@' python/setup.py || die
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-fsect-man5
- $(use_enable bzip2 bzlib)
- $(multilib_native_use_enable lzip lzlib)
- $(use_enable lzma xzlib)
- $(use_enable seccomp libseccomp)
- $(use_enable static-libs static)
- $(use_enable zlib)
- $(use_enable zstd zstdlib)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
- local myeconfargs=(
- --disable-shared
- --disable-libseccomp
- --disable-bzlib
- --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, bug #362941
- tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
- local ECONF_SOURCE="${S}"
-
- if need_build_file ; then
- mkdir -p "${WORKDIR}"/build || die
- cd "${WORKDIR}"/build || die
- build_src_configure
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi ; then
- emake
- else
- # bug #586444
- emake -C src magic.h
- emake -C src libmagic.la
- fi
-}
-
-src_compile() {
- if need_build_file ; then
- # bug #586444
-
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 0dee29492f77aa5e3ebddb75a84cb7364952d5f8
Author: Matoro Mahri matoro tk>
AuthorDate: Fri Apr 12 23:26:14 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Apr 13 06:25:12 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dee2949
sys-apps/file: Stabilize 5.45-r4 hppa, #926987
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Arthur Zamarin gentoo.org>
sys-apps/file/file-5.45-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.45-r4.ebuild
b/sys-apps/file/file-5.45-r4.ebuild
index 4947c83e8990..f822d863338e 100644
--- a/sys-apps/file/file-5.45-r4.ebuild
+++ b/sys-apps/file/file-5.45-r4.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: f3ea5331169031bb2649dc139b6cdfba2b201f39
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Mar 14 08:20:07 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Mar 14 08:20:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3ea5331
sys-apps/file: Stabilize 5.45-r4 ppc64, #926987
Signed-off-by: Arthur Zamarin gentoo.org>
sys-apps/file/file-5.45-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.45-r4.ebuild
b/sys-apps/file/file-5.45-r4.ebuild
index c50f0ffaa948..4947c83e8990 100644
--- a/sys-apps/file/file-5.45-r4.ebuild
+++ b/sys-apps/file/file-5.45-r4.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 6c7efce3ccf23fe42c5d19010c13a7bf4bdae34e
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Mar 14 07:41:51 2024 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Mar 14 07:41:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c7efce3
sys-apps/file: Stabilize 5.45-r4 amd64, #926987
Signed-off-by: Arthur Zamarin gentoo.org>
sys-apps/file/file-5.45-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.45-r4.ebuild
b/sys-apps/file/file-5.45-r4.ebuild
index ea85ffc24d85..c50f0ffaa948 100644
--- a/sys-apps/file/file-5.45-r4.ebuild
+++ b/sys-apps/file/file-5.45-r4.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc
~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 47328b6f1e03bed9e591f027e3459c84626302f9
Author: Sam James gentoo org>
AuthorDate: Thu Mar 14 06:51:03 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Mar 14 06:52:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47328b6f
sys-apps/file: Stabilize 5.45-r4 sparc, #926987
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.45-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.45-r4.ebuild
b/sys-apps/file/file-5.45-r4.ebuild
index 46c51b9bbe3b..ea85ffc24d85 100644
--- a/sys-apps/file/file-5.45-r4.ebuild
+++ b/sys-apps/file/file-5.45-r4.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc
~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 1113eb229135e6c090c9eb608c51b90260d61af6
Author: Sam James gentoo org>
AuthorDate: Thu Mar 14 06:40:57 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Mar 14 06:40:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1113eb22
sys-apps/file: Stabilize 5.45-r4 x86, #926987
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.45-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.45-r4.ebuild
b/sys-apps/file/file-5.45-r4.ebuild
index 5ed767e96f2f..46c51b9bbe3b 100644
--- a/sys-apps/file/file-5.45-r4.ebuild
+++ b/sys-apps/file/file-5.45-r4.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc
~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 5b1caa1a26f74d2e1c967c26e4da85e3cb528032
Author: Sam James gentoo org>
AuthorDate: Thu Mar 14 06:40:55 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Mar 14 06:40:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b1caa1a
sys-apps/file: Stabilize 5.45-r4 ppc, #926987
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.45-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.45-r4.ebuild
b/sys-apps/file/file-5.45-r4.ebuild
index 498543e444ac..5ed767e96f2f 100644
--- a/sys-apps/file/file-5.45-r4.ebuild
+++ b/sys-apps/file/file-5.45-r4.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 92ef15bf060ea101a07cc0280839c382c489938c
Author: Sam James gentoo org>
AuthorDate: Thu Mar 14 06:18:54 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Mar 14 06:18:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ef15bf
sys-apps/file: Stabilize 5.45-r4 arm64, #926987
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.45-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.45-r4.ebuild
b/sys-apps/file/file-5.45-r4.ebuild
index baed08a00af9..498543e444ac 100644
--- a/sys-apps/file/file-5.45-r4.ebuild
+++ b/sys-apps/file/file-5.45-r4.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: c22b65ee4fff834a6aea5896be00241494be755c
Author: Sam James gentoo org>
AuthorDate: Thu Mar 14 06:06:49 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Mar 14 06:06:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c22b65ee
sys-apps/file: Stabilize 5.45-r4 arm, #926987
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.45-r4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.45-r4.ebuild
b/sys-apps/file/file-5.45-r4.ebuild
index 3876dcbbf72f..baed08a00af9 100644
--- a/sys-apps/file/file-5.45-r4.ebuild
+++ b/sys-apps/file/file-5.45-r4.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 762048810c50d1994b1af1c7d95b09353b78b38e
Author: Eli Schwartz gmail com>
AuthorDate: Sun Feb 4 05:19:21 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 5 14:12:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76204881
sys-apps/file: fix dependencies for USE=python
This uses DISTUTILS_OPTIONAL and manually adds dependencies based on
USE, but gets it wrong:
- it requires python/setuptools in DEPEND, whereas the eclass expects it
in BDEPEND for cross building
- it adds all DEPEND to RDEPEND, which then includes setuptools
- it uses hardcoded setuptools stuff instead of the eclass recommended
variable containing additional build time dependencies
It then also adds the correct BDEPEND version of the dependencies.
Solve this by ripping out the DEPEND handling altogether, and using a
minimal set of RDEPEND requirements.
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
.../file/{file-.ebuild => file-5.45-r4.ebuild} | 32 --
sys-apps/file/file-.ebuild | 11
2 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-5.45-r4.ebuild
similarity index 88%
copy from sys-apps/file/file-.ebuild
copy to sys-apps/file/file-5.45-r4.ebuild
index 1f2cf6f8d1ac..3876dcbbf72f 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-5.45-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,14 +7,14 @@ DISTUTILS_USE_PEP517=setuptools
DISTUTILS_OPTIONAL=1
PYTHON_COMPAT=( python3_{10..11} )
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+inherit distutils-r1 toolchain-funcs multilib-minimal
if [[ ${PV} == ]] ; then
EGIT_REPO_URI="https://github.com/glensc/file.git;
inherit autotools git-r3
else
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/file.asc
- inherit verify-sig
+ inherit autotools verify-sig
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc
)"
@@ -35,17 +35,16 @@ DEPEND="
bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
lzip? ( app-arch/lzlib )
lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
"
RDEPEND="
${DEPEND}
- python? ( !dev-python/python-magic )
+ python? (
+ ${PYTHON_DEPS}
+ !dev-python/python-magic
+ )
seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
"
BDEPEND+="
@@ -60,17 +59,22 @@ QA_CONFIG_IMPL_DECL_SKIP=( makedev )
PATCHES=(
"${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
- "${FILESDIR}/file-5.43-portage-sandbox.patch" #889046
+ "${FILESDIR}/file-5.45-seccomp-sandbox.patch"
+ "${FILESDIR}/${P}-32-bit-time_t.patch"
+ "${FILESDIR}/${P}-32-bit-time_t-deux.patch"
+ "${FILESDIR}/${P}-weak-magic-shell.patch" #908401
)
src_prepare() {
default
- if [[ ${PV} == ]] ; then
- eautoreconf
- else
- elibtoolize
- fi
+ #if [[ ${PV} == ]] ; then
+ # eautoreconf
+ #else
+ # elibtoolize
+ #fi
+ # Just for file-5.45-32-bit-time_t-deux.patch, drop in 5.46
+ eautoreconf
# Don't let python README kill main README, bug #60043
mv python/README.md python/README.python.md || die
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index 1f2cf6f8d1ac..19c650b61358 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -35,17 +35,16 @@ DEPEND="
bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
lzip? ( app-arch/lzlib )
lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
"
RDEPEND="
${DEPEND}
- python? ( !dev-python/python-magic )
+ python? (
+ ${PYTHON_DEPS}
+ !dev-python/python-magic
+ )
seccomp? (
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/, sys-apps/file/
commit: 0e92bbf0f0596a082f71e915fcea8f4477d7b659
Author: Sam James gentoo org>
AuthorDate: Thu Dec 28 04:03:22 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Dec 28 04:03:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e92bbf0
sys-apps/file: drop 5.44-r3, 5.45
Signed-off-by: Sam James gentoo.org>
sys-apps/file/Manifest | 2 -
sys-apps/file/file-5.44-r3.ebuild | 178 -
sys-apps/file/file-5.45.ebuild | 175
.../file/files/file-5.43-portage-sandbox.patch | 28
.../file/files/file-5.44-decompress-empty.patch| 126 ---
sys-apps/file/files/file-5.44-limits-solaris.patch | 19 ---
sys-apps/file/files/file-5.44-seccomp-utimes.patch | 18 ---
7 files changed, 546 deletions(-)
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index fa88c96b450d..c4c8697aff68 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,4 +1,2 @@
-DIST file-5.44.tar.gz 1186437 BLAKE2B
a90ccae738a95315d75a0aaee7bbff3624425cc9267daf18ba9147b7c9b9ebfb31288b54c63a73e4695eca0e876f206e40bcb81c422f1bf572b976e753b25a42
SHA512
26c3b9c7a6950649d0b2de896bfeca54289febe4cd487c0f91aa6ff1857fa49f9077f8738a17b86100125668a31dae05b586615c564f78da47ac20a1e4a74f63
-DIST file-5.44.tar.gz.asc 195 BLAKE2B
a0905d42fec0fa052d75fb5b267c6ae223176451c0f1d3346006d4b760c3d858f2dcda5f0a30c6aa4b09b5afee427b75bc4debd5033d978f39dc1da01d3e1bd1
SHA512
1a4dc39283f4859581441aa35b3ed72b323c4e05ca0960d17126d1b9ec18465c695c0545e24f09f8437a60ab52e582be67b6cbbc656bbb676de00148c3644d23
DIST file-5.45.tar.gz 1246503 BLAKE2B
30fc77c091e6624f2e9a950f4c6fe69ea6aa46d4a8ad9f20d49320a3675617c5bfbc9ff1ebba5eeb2cf4435c38d71b47b8beeb5146c9f55fe3bac11fe65e89bd
SHA512
12611a59ff766c22a55db4b4a9f80f95a0a2e916a1d8593612c6ead32c247102a8fdc23693c6bf81bda9b604d951a62c0051e91580b1b79e190a3504c0efc20a
DIST file-5.45.tar.gz.asc 163 BLAKE2B
1405080c63412e9c66bfe06086ecee28b276b77cc2ddacb20cfd370c539a0d983812fd29dcf7a33bad69d6490cd439ef8d1219bfaf3928fb835a38da85013af3
SHA512
56bf131b2f35e896788be19b4d8cd1c7ec942c794fb584d5e589375d22fbccebdd04c03e779fafc0c10840586dc41e64251b3de1767ae9ab95f5d3300f9af254
diff --git a/sys-apps/file/file-5.44-r3.ebuild
b/sys-apps/file/file-5.44-r3.ebuild
deleted file mode 100644
index b707b4b3b516..
--- a/sys-apps/file/file-5.44-r3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == ]] ; then
- EGIT_REPO_URI="https://github.com/glensc/file.git;
- inherit autotools git-r3
-else
- VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/file.asc
- inherit verify-sig
- SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
-
- BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
-fi
-
-DESCRIPTION="Identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzip lzma python seccomp static-libs zlib zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
- lzip? ( app-arch/lzlib )
- lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
- seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
- ${DEPEND}
- python? ( !dev-python/python-magic )
- seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
-"
-BDEPEND+="
- python? (
- ${PYTHON_DEPS}
- ${DISTUTILS_DEPS}
- )
-"
-
-# https://bugs.gentoo.org/898676
-QA_CONFIG_IMPL_DECL_SKIP=( makedev )
-
-PATCHES=(
- "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
- "${FILESDIR}/file-5.43-portage-sandbox.patch" #889046
- "${FILESDIR}/file-5.44-limits-solaris.patch" # applied upstream
- "${FILESDIR}/file-5.44-seccomp-utimes.patch" # upstream
- "${FILESDIR}/file-5.44-decompress-empty.patch" # upstream
-)
-
-src_prepare() {
- default
-
- if [[ ${PV} == ]] ; then
- eautoreconf
- else
- elibtoolize
- fi
-
- # Don't let python README
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: d0d129eff8d9cf67c66ee5712979f883bc1d79b6
Author: Arthur Zamarin gentoo org>
AuthorDate: Fri Dec 1 20:29:49 2023 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Dec 1 20:29:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0d129ef
sys-apps/file: Stabilize 5.45-r3 ppc, #913799
Signed-off-by: Arthur Zamarin gentoo.org>
sys-apps/file/file-5.45-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.45-r3.ebuild
b/sys-apps/file/file-5.45-r3.ebuild
index 8742403197cd..4bad50bf1169 100644
--- a/sys-apps/file/file-5.45-r3.ebuild
+++ b/sys-apps/file/file-5.45-r3.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc
ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: b6da5c66fcec4316f3711063fb6d93757a015d02 Author: Michał Górny gentoo org> AuthorDate: Sun Oct 22 12:50:33 2023 + Commit: Michał Górny gentoo org> CommitDate: Fri Oct 27 15:18:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6da5c66 sys-apps/file: Remove redundant local flag descs Signed-off-by: Michał Górny gentoo.org> sys-apps/file/metadata.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys-apps/file/metadata.xml b/sys-apps/file/metadata.xml index 01bf4264459f..9d92ca28bc24 100644 --- a/sys-apps/file/metadata.xml +++ b/sys-apps/file/metadata.xml @@ -10,7 +10,4 @@ cpe:/a:file_project:file file/file - - Enable app-arch/lzip decompression support via app-arch/lzlib -
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/
commit: 1a8e3a3717ff4d46c6c7b1d356ded751275c531d
Author: Mike Gilbert gentoo org>
AuthorDate: Thu Oct 19 19:05:58 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Thu Oct 19 19:05:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a8e3a37
sys-apps/file: seccomp: also allow geteuid and getegid
Bug: https://bugs.gentoo.org/915890
Signed-off-by: Mike Gilbert gentoo.org>
.../file/{file-5.45-r2.ebuild => file-5.45-r3.ebuild} | 0
sys-apps/file/files/file-5.45-seccomp-sandbox.patch| 18 +-
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/sys-apps/file/file-5.45-r2.ebuild
b/sys-apps/file/file-5.45-r3.ebuild
similarity index 100%
rename from sys-apps/file/file-5.45-r2.ebuild
rename to sys-apps/file/file-5.45-r3.ebuild
diff --git a/sys-apps/file/files/file-5.45-seccomp-sandbox.patch
b/sys-apps/file/files/file-5.45-seccomp-sandbox.patch
index 4ae62b5aa947..d5f499d395f5 100644
--- a/sys-apps/file/files/file-5.45-seccomp-sandbox.patch
+++ b/sys-apps/file/files/file-5.45-seccomp-sandbox.patch
@@ -1,4 +1,4 @@
-From 056d8aa6e0a743ff743c60a1fca67126f3dce0b6 Mon Sep 17 00:00:00 2001
+From b05f904dc5df267f90c6489817a379cb7f7f62ee Mon Sep 17 00:00:00 2001
From: Mike Gilbert
Date: Thu, 19 Oct 2023 13:58:20 -0400
Subject: [PATCH] seccomp: allow syscalls used by Gentoo's LD_PRELOAD sandbox
@@ -7,11 +7,11 @@ Bug: https://bugs.gentoo.org/728978
Bug: https://bugs.gentoo.org/889046
Bug: https://bugs.gentoo.org/915890
---
- src/seccomp.c | 12
- 1 file changed, 12 insertions(+)
+ src/seccomp.c | 20
+ 1 file changed, 20 insertions(+)
diff --git a/src/seccomp.c b/src/seccomp.c
-index 87d4c49e..31954ff4 100644
+index 87d4c49e..f1804660 100644
--- a/src/seccomp.c
+++ b/src/seccomp.c
@@ -174,6 +174,9 @@ enable_sandbox_full(void)
@@ -24,7 +24,7 @@ index 87d4c49e..31954ff4 100644
#endif
ALLOW_RULE(fcntl);
ALLOW_RULE(fcntl64);
-@@ -185,9 +188,18 @@ enable_sandbox_full(void)
+@@ -185,9 +188,26 @@ enable_sandbox_full(void)
ALLOW_RULE(fstatat64);
#endif
ALLOW_RULE(futex);
@@ -33,6 +33,14 @@ index 87d4c49e..31954ff4 100644
#ifdef __NR_getdents64
ALLOW_RULE(getdents64);
+#endif
++ ALLOW_RULE(getegid);
++#ifdef __NR_getegid32
++ ALLOW_RULE(getegid32);
++#endif
++ ALLOW_RULE(geteuid);
++#ifdef __NR_geteuid32
++ ALLOW_RULE(geteuid32);
++#endif
+ ALLOW_RULE(getgid);
+#ifdef __NR_getgid32
+ ALLOW_RULE(getgid32);
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/, sys-apps/file/
commit: dbbbf5f526aff28f9c8ba79c7a277bc3aa09398b
Author: Mike Gilbert gentoo org>
AuthorDate: Thu Oct 19 18:06:37 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Thu Oct 19 18:08:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbbbf5f5
sys-apps/file: add another seccomp fix for sandbox
Bug: https://bugs.gentoo.org/728978
Bug: https://bugs.gentoo.org/889046
Bug: https://bugs.gentoo.org/915890
Signed-off-by: Mike Gilbert gentoo.org>
.../{file-5.45-r1.ebuild => file-5.45-r2.ebuild} | 2 +-
.../file/files/file-5.45-seccomp-sandbox.patch | 48 ++
2 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.45-r1.ebuild
b/sys-apps/file/file-5.45-r2.ebuild
similarity index 98%
rename from sys-apps/file/file-5.45-r1.ebuild
rename to sys-apps/file/file-5.45-r2.ebuild
index 84d29bfbdf00..6626b607e4b4 100644
--- a/sys-apps/file/file-5.45-r1.ebuild
+++ b/sys-apps/file/file-5.45-r2.ebuild
@@ -60,7 +60,7 @@ QA_CONFIG_IMPL_DECL_SKIP=( makedev )
PATCHES=(
"${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
- "${FILESDIR}/file-5.43-portage-sandbox.patch" #889046
+ "${FILESDIR}/file-5.45-seccomp-sandbox.patch"
"${FILESDIR}/${P}-32-bit-time_t.patch"
"${FILESDIR}/${P}-32-bit-time_t-deux.patch"
"${FILESDIR}/${P}-weak-magic-shell.patch" #908401
diff --git a/sys-apps/file/files/file-5.45-seccomp-sandbox.patch
b/sys-apps/file/files/file-5.45-seccomp-sandbox.patch
new file mode 100644
index ..4ae62b5aa947
--- /dev/null
+++ b/sys-apps/file/files/file-5.45-seccomp-sandbox.patch
@@ -0,0 +1,48 @@
+From 056d8aa6e0a743ff743c60a1fca67126f3dce0b6 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Thu, 19 Oct 2023 13:58:20 -0400
+Subject: [PATCH] seccomp: allow syscalls used by Gentoo's LD_PRELOAD sandbox
+
+Bug: https://bugs.gentoo.org/728978
+Bug: https://bugs.gentoo.org/889046
+Bug: https://bugs.gentoo.org/915890
+---
+ src/seccomp.c | 12
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index 87d4c49e..31954ff4 100644
+--- a/src/seccomp.c
b/src/seccomp.c
+@@ -174,6 +174,9 @@ enable_sandbox_full(void)
+ ALLOW_RULE(exit_group);
+ #ifdef __NR_faccessat
+ ALLOW_RULE(faccessat);
++#endif
++#ifdef __NR_faccessat2
++ALLOW_RULE(faccessat2);
+ #endif
+ ALLOW_RULE(fcntl);
+ ALLOW_RULE(fcntl64);
+@@ -185,9 +188,18 @@ enable_sandbox_full(void)
+ ALLOW_RULE(fstatat64);
+ #endif
+ ALLOW_RULE(futex);
++ ALLOW_RULE(getcwd);
+ ALLOW_RULE(getdents);
+ #ifdef __NR_getdents64
+ ALLOW_RULE(getdents64);
++#endif
++ ALLOW_RULE(getgid);
++#ifdef __NR_getgid32
++ ALLOW_RULE(getgid32);
++#endif
++ ALLOW_RULE(getuid);
++#ifdef __NR_getuid32
++ ALLOW_RULE(getuid32);
+ #endif
+ #ifdef FIONREAD
+ // called in src/compress.c under sread
+--
+2.42.0
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/
commit: 26eb5b45518d15e61fe83c7da08afb749be9f6e6
Author: Sam James gentoo org>
AuthorDate: Tue Aug 1 15:41:21 2023 +
Commit: Sam James gentoo org>
CommitDate: Tue Aug 1 15:42:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26eb5b45
sys-apps/file: backport 32-bit time_t fix, backport weak shell magic fix
Bug: https://bugs.gentoo.org/908401
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.45-r1.ebuild | 180 +
.../file/files/file-5.45-32-bit-time_t-deux.patch | 29
sys-apps/file/files/file-5.45-32-bit-time_t.patch | 34
.../file/files/file-5.45-weak-magic-shell.patch| 43 +
4 files changed, 286 insertions(+)
diff --git a/sys-apps/file/file-5.45-r1.ebuild
b/sys-apps/file/file-5.45-r1.ebuild
new file mode 100644
index ..dfa655148963
--- /dev/null
+++ b/sys-apps/file/file-5.45-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 toolchain-funcs multilib-minimal
+
+if [[ ${PV} == ]] ; 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 autotools verify-sig
+ SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
+ 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 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+
+ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
+fi
+
+DESCRIPTION="Identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/;
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzip lzma python seccomp static-libs zlib zstd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+ bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+ lzip? ( app-arch/lzlib )
+ lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )
+ seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+ ${DEPEND}
+ python? ( !dev-python/python-magic )
+ seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
+"
+BDEPEND+="
+ python? (
+ ${PYTHON_DEPS}
+ ${DISTUTILS_DEPS}
+ )
+"
+
+# https://bugs.gentoo.org/898676
+QA_CONFIG_IMPL_DECL_SKIP=( makedev )
+
+PATCHES=(
+ "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
+ "${FILESDIR}/file-5.43-portage-sandbox.patch" #889046
+ "${FILESDIR}/${P}-32-bit-time_t.patch"
+ "${FILESDIR}/${P}-32-bit-time_t-deux.patch"
+ "${FILESDIR}/${P}-weak-magic-shell.patch" #908401
+)
+
+src_prepare() {
+ default
+
+ #if [[ ${PV} == ]] ; then
+ # eautoreconf
+ #else
+ # elibtoolize
+ #fi
+ # Just for file-5.45-32-bit-time_t-deux.patch, drop in 5.46
+ eautoreconf
+
+ # Don't let python README kill main README, bug #60043
+ mv python/README.md python/README.python.md || die
+
+ # bug #662090
+ sed -i 's...@readme.md@README.python.md@' python/setup.py || die
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --enable-fsect-man5
+ $(use_enable bzip2 bzlib)
+ $(multilib_native_use_enable lzip lzlib)
+ $(use_enable lzma xzlib)
+ $(use_enable seccomp libseccomp)
+ $(use_enable static-libs static)
+ $(use_enable zlib)
+ $(use_enable zstd zstdlib)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+ local myeconfargs=(
+ --disable-shared
+ --disable-libseccomp
+ --disable-bzlib
+ --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, bug #362941
+ tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+ local ECONF_SOURCE="${S}"
+
+ if need_build_file ; then
+ mkdir -p "${WORKDIR}"/build || die
+ cd "${WORKDIR}"/build || die
+ build_src_configure
+ fi
+
+ multilib-minimal_src_configure
+}
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: a20054eb512e733aeedf8a2b73c1d36c73aed13c
Author: Sam James gentoo org>
AuthorDate: Fri Jul 28 01:20:25 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 28 01:26:46 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a20054eb
sys-apps/file: add 5.45
Signed-off-by: Sam James gentoo.org>
sys-apps/file/Manifest | 2 ++
sys-apps/file/{file-.ebuild => file-5.45.ebuild} | 6 +++---
sys-apps/file/file-.ebuild | 6 +++---
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 4ecddd747bee..fa88c96b450d 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,2 +1,4 @@
DIST file-5.44.tar.gz 1186437 BLAKE2B
a90ccae738a95315d75a0aaee7bbff3624425cc9267daf18ba9147b7c9b9ebfb31288b54c63a73e4695eca0e876f206e40bcb81c422f1bf572b976e753b25a42
SHA512
26c3b9c7a6950649d0b2de896bfeca54289febe4cd487c0f91aa6ff1857fa49f9077f8738a17b86100125668a31dae05b586615c564f78da47ac20a1e4a74f63
DIST file-5.44.tar.gz.asc 195 BLAKE2B
a0905d42fec0fa052d75fb5b267c6ae223176451c0f1d3346006d4b760c3d858f2dcda5f0a30c6aa4b09b5afee427b75bc4debd5033d978f39dc1da01d3e1bd1
SHA512
1a4dc39283f4859581441aa35b3ed72b323c4e05ca0960d17126d1b9ec18465c695c0545e24f09f8437a60ab52e582be67b6cbbc656bbb676de00148c3644d23
+DIST file-5.45.tar.gz 1246503 BLAKE2B
30fc77c091e6624f2e9a950f4c6fe69ea6aa46d4a8ad9f20d49320a3675617c5bfbc9ff1ebba5eeb2cf4435c38d71b47b8beeb5146c9f55fe3bac11fe65e89bd
SHA512
12611a59ff766c22a55db4b4a9f80f95a0a2e916a1d8593612c6ead32c247102a8fdc23693c6bf81bda9b604d951a62c0051e91580b1b79e190a3504c0efc20a
+DIST file-5.45.tar.gz.asc 163 BLAKE2B
1405080c63412e9c66bfe06086ecee28b276b77cc2ddacb20cfd370c539a0d983812fd29dcf7a33bad69d6490cd439ef8d1219bfaf3928fb835a38da85013af3
SHA512
56bf131b2f35e896788be19b4d8cd1c7ec942c794fb584d5e589375d22fbccebdd04c03e779fafc0c10840586dc41e64251b3de1767ae9ab95f5d3300f9af254
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-5.45.ebuild
similarity index 94%
copy from sys-apps/file/file-.ebuild
copy to sys-apps/file/file-5.45.ebuild
index c50090845eaf..60dd8e0742e4 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-5.45.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
fi
@@ -72,11 +72,11 @@ src_prepare() {
elibtoolize
fi
- # Don't let python README kill main README, bug ##60043
+ # Don't let python README kill main README, bug #60043
mv python/README.md python/README.python.md || die
# bug #662090
- sed 's...@readme.md@README.python.md@' -i python/setup.py || die
+ sed -i 's...@readme.md@README.python.md@' python/setup.py || die
}
multilib_src_configure() {
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index c50090845eaf..60dd8e0742e4 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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 ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos
~x64-macos ~x64-solaris"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
fi
@@ -72,11 +72,11 @@ src_prepare() {
elibtoolize
fi
- # Don't let python README kill main README, bug ##60043
+ # Don't let python README kill main README, bug #60043
mv python/README.md python/README.python.md || die
# bug #662090
- sed 's...@readme.md@README.python.md@' -i python/setup.py || die
+ sed -i 's...@readme.md@README.python.md@' python/setup.py || die
}
multilib_src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 4e819f0752d23f3e629f0b4ce54f3d2dc5fe8f98
Author: Sam James gentoo org>
AuthorDate: Thu Jul 13 08:26:19 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Jul 13 08:26:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e819f07
sys-apps/file: disable py3.9
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.44-r3.ebuild | 2 +-
sys-apps/file/file-.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/file/file-5.44-r3.ebuild
b/sys-apps/file/file-5.44-r3.ebuild
index 80a30f3270c3..bbf929ba27f1 100644
--- a/sys-apps/file/file-5.44-r3.ebuild
+++ b/sys-apps/file/file-5.44-r3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
inherit distutils-r1 libtool toolchain-funcs multilib-minimal
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index 9ad85783b1a0..c50090845eaf 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -5,7 +5,7 @@ EAPI=8
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
inherit distutils-r1 libtool toolchain-funcs multilib-minimal
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: ba1d1b839e336051bb31d5098512a1bd4698348e
Author: Matija Skala gmx com>
AuthorDate: Fri Jun 30 18:35:23 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Jul 13 08:25:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba1d1b83
sys-apps/file: fix for sed-bsd
Signed-off-by: Matija Skala gmx.com>
Closes: https://github.com/gentoo/gentoo/pull/31679
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.44-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.44-r3.ebuild
b/sys-apps/file/file-5.44-r3.ebuild
index 0514af650941..80a30f3270c3 100644
--- a/sys-apps/file/file-5.44-r3.ebuild
+++ b/sys-apps/file/file-5.44-r3.ebuild
@@ -79,7 +79,7 @@ src_prepare() {
mv python/README.md python/README.python.md || die
# bug #662090
- sed 's...@readme.md@README.python.md@' -i python/setup.py || die
+ sed -i 's...@readme.md@README.python.md@' python/setup.py || die
}
multilib_src_configure() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: a66499f6dd7b9e1643e8d6062206c56ca31971fe
Author: Mike Gilbert gentoo org>
AuthorDate: Thu Mar 2 20:05:15 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Thu Mar 2 20:05:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a66499f6
sys-apps/file: add 'makedev' to QA_CONFIG_IMPL_DECL_SKIP
Closes: https://bugs.gentoo.org/898676
Signed-off-by: Mike Gilbert gentoo.org>
sys-apps/file/file-5.44-r3.ebuild | 3 +++
sys-apps/file/file-.ebuild| 3 +++
2 files changed, 6 insertions(+)
diff --git a/sys-apps/file/file-5.44-r3.ebuild
b/sys-apps/file/file-5.44-r3.ebuild
index d62a1b406c2a..dc9376f5c87a 100644
--- a/sys-apps/file/file-5.44-r3.ebuild
+++ b/sys-apps/file/file-5.44-r3.ebuild
@@ -55,6 +55,9 @@ BDEPEND+="
)
"
+# https://bugs.gentoo.org/898676
+QA_CONFIG_IMPL_DECL_SKIP=( makedev )
+
PATCHES=(
"${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
"${FILESDIR}/file-5.43-portage-sandbox.patch" #889046
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index 26babd17aba5..fdcca649e2a5 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -55,6 +55,9 @@ BDEPEND+="
)
"
+# https://bugs.gentoo.org/898676
+QA_CONFIG_IMPL_DECL_SKIP=( makedev )
+
PATCHES=(
"${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
"${FILESDIR}/file-5.43-portage-sandbox.patch" #889046
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 24d43d252387be846c4cae6014aa74bbf1f1d90e
Author: Sam James gentoo org>
AuthorDate: Fri Feb 24 18:34:33 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 24 18:36:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24d43d25
sys-apps/file: keyword for ~arm64-macos
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.44-r3.ebuild | 2 +-
sys-apps/file/file-.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/file/file-5.44-r3.ebuild
b/sys-apps/file/file-5.44-r3.ebuild
index a8a4f92d1f59..d62a1b406c2a 100644
--- a/sys-apps/file/file-5.44-r3.ebuild
+++ b/sys-apps/file/file-5.44-r3.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
fi
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index 82884ca365e2..26babd17aba5 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos
~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/, sys-apps/file/
commit: 60f7d9b860472c9074d0df011641fdb555437cdf
Author: Sam James gentoo org>
AuthorDate: Fri Jan 13 16:35:33 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 13 16:46:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60f7d9b8
sys-apps/file: drop 5.43-r3
Signed-off-by: Sam James gentoo.org>
sys-apps/file/Manifest | 2 -
sys-apps/file/file-5.43-r3.ebuild | 166 -
.../file/files/file-5.43-configure-clang16.patch | 20 ---
3 files changed, 188 deletions(-)
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 86eb997f0bb1..4ecddd747bee 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,4 +1,2 @@
-DIST file-5.43.tar.gz 1162786 BLAKE2B
aaaf32c5054fb83e912af6656e5e67947f45576ec3711c7cba5531ed780e142a448580e0db41a828c8a3c5d2f1bf0c8ed49bc9688499caaae4a08baa16b3610c
SHA512
9d02f4e7a69d90468d6bd35df5ec240ddee8c2408b7df3e73427d7f18736baf77db0638a1fe8283f4e6abd1d5ad653890ed3a5a0d48bb52d4023ca4070ecdf06
-DIST file-5.43.tar.gz.asc 195 BLAKE2B
d7f83b3e21d1390467989f8870e36daa48ebb8c5ac7ab8dc6d667a65d10561126d32cfc5ef3d81a130990b3e46bcba9b5e03f0a7dd169782351b02cebec2471f
SHA512
c565958840f2f5c62821cd08d4149ec97c574232913ec00400473364e160250cfaced8c715e109c4c617359e33d2470f7ca6af1891cbdf994329e890f90c8be3
DIST file-5.44.tar.gz 1186437 BLAKE2B
a90ccae738a95315d75a0aaee7bbff3624425cc9267daf18ba9147b7c9b9ebfb31288b54c63a73e4695eca0e876f206e40bcb81c422f1bf572b976e753b25a42
SHA512
26c3b9c7a6950649d0b2de896bfeca54289febe4cd487c0f91aa6ff1857fa49f9077f8738a17b86100125668a31dae05b586615c564f78da47ac20a1e4a74f63
DIST file-5.44.tar.gz.asc 195 BLAKE2B
a0905d42fec0fa052d75fb5b267c6ae223176451c0f1d3346006d4b760c3d858f2dcda5f0a30c6aa4b09b5afee427b75bc4debd5033d978f39dc1da01d3e1bd1
SHA512
1a4dc39283f4859581441aa35b3ed72b323c4e05ca0960d17126d1b9ec18465c695c0545e24f09f8437a60ab52e582be67b6cbbc656bbb676de00148c3644d23
diff --git a/sys-apps/file/file-5.43-r3.ebuild
b/sys-apps/file/file-5.43-r3.ebuild
deleted file mode 100644
index 040db6fb3eb5..
--- a/sys-apps/file/file-5.43-r3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == ]] ; 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;
- 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"
-HOMEPAGE="https://www.darwinsys.com/file/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzma python seccomp static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
- lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
- seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
- ${DEPEND}
- python? ( !dev-python/python-magic )
-"
-BDEPEND+="
- python? (
- ${PYTHON_DEPS}
- ${DISTUTILS_DEPS}
- )
-"
-
-PATCHES=(
- "${FILESDIR}/file-5.43-portage-sandbox.patch" #713710 #728978
- "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
- "${FILESDIR}/${P}-configure-clang16.patch"
-)
-
-src_prepare() {
- default
-
- if [[ ${PV} == ]] ; then
- eautoreconf
- else
- elibtoolize
- fi
-
- # don't let python README kill main README, bug ##60043
- mv python/README.md python/README.python.md || die
- # bug #662090
- sed 's...@readme.md@README.python.md@' -i python/setup.py || die
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-fsect-man5
- $(use_enable bzip2 bzlib)
- $(use_enable lzma xzlib)
- $(use_enable seccomp libseccomp)
- $(use_enable static-libs static)
- $(use_enable zlib)
- )
- econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
- local myeconfargs=(
-
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: a5d976a0ccd02aceda4b67bc6daa91fd1478d27b
Author: Sam James gentoo org>
AuthorDate: Fri Jan 13 06:18:04 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 13 06:18:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5d976a0
sys-apps/file: Stabilize 5.44-r3 hppa, #890610
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.44-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.44-r3.ebuild
b/sys-apps/file/file-5.44-r3.ebuild
index a5c4194b0e51..6bcda3e154fb 100644
--- a/sys-apps/file/file-5.44-r3.ebuild
+++ b/sys-apps/file/file-5.44-r3.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: c1dd24a9687cd5032ce6c501194fc944f9f674aa
Author: Sam James gentoo org>
AuthorDate: Fri Jan 13 05:40:16 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 13 05:40:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1dd24a9
sys-apps/file: Stabilize 5.44-r3 ppc64, #890610
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.44-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.44-r3.ebuild
b/sys-apps/file/file-5.44-r3.ebuild
index 3d5f32a35456..a5c4194b0e51 100644
--- a/sys-apps/file/file-5.44-r3.ebuild
+++ b/sys-apps/file/file-5.44-r3.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 76ba0ea99361846e0c57c9e28be18ece2737ba6a
Author: Sam James gentoo org>
AuthorDate: Fri Jan 13 05:40:15 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 13 05:40:15 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ba0ea9
sys-apps/file: Stabilize 5.44-r3 ppc, #890610
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.44-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.44-r3.ebuild
b/sys-apps/file/file-5.44-r3.ebuild
index 51e5b9ccba56..3d5f32a35456 100644
--- a/sys-apps/file/file-5.44-r3.ebuild
+++ b/sys-apps/file/file-5.44-r3.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 4a3ccac9111f1e6a6d1efaec808538e67c3397d4
Author: Sam James gentoo org>
AuthorDate: Fri Jan 13 05:40:14 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 13 05:40:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a3ccac9
sys-apps/file: Stabilize 5.44-r3 sparc, #890610
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.44-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.44-r3.ebuild
b/sys-apps/file/file-5.44-r3.ebuild
index 1052b2282ce3..51e5b9ccba56 100644
--- a/sys-apps/file/file-5.44-r3.ebuild
+++ b/sys-apps/file/file-5.44-r3.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: cd9a3c3941b4fa078317902e5fa0887c76ead4cc
Author: Sam James gentoo org>
AuthorDate: Fri Jan 13 05:36:18 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 13 05:36:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd9a3c39
sys-apps/file: Stabilize 5.44-r3 arm64, #890610
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.44-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.44-r3.ebuild
b/sys-apps/file/file-5.44-r3.ebuild
index 3ec82f6612ac..1052b2282ce3 100644
--- a/sys-apps/file/file-5.44-r3.ebuild
+++ b/sys-apps/file/file-5.44-r3.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 8fcc1941154df6e79116a3d0b1d6baf5b79cc4e3
Author: Sam James gentoo org>
AuthorDate: Fri Jan 13 05:36:17 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 13 05:36:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fcc1941
sys-apps/file: Stabilize 5.44-r3 arm, #890610
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.44-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.44-r3.ebuild
b/sys-apps/file/file-5.44-r3.ebuild
index 2ef72d8197bf..3ec82f6612ac 100644
--- a/sys-apps/file/file-5.44-r3.ebuild
+++ b/sys-apps/file/file-5.44-r3.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 2b8d461e20dfef36b17971b668aa77dba1de4dc2
Author: Sam James gentoo org>
AuthorDate: Fri Jan 13 04:42:17 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 13 04:42:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b8d461e
sys-apps/file: Stabilize 5.44-r3 amd64, #890610
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.44-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.44-r3.ebuild
b/sys-apps/file/file-5.44-r3.ebuild
index b1ac4056460e..2ef72d8197bf 100644
--- a/sys-apps/file/file-5.44-r3.ebuild
+++ b/sys-apps/file/file-5.44-r3.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 93af14fe25cb6866550e051d2f2a1ab6a3f1a443
Author: Sam James gentoo org>
AuthorDate: Fri Jan 13 04:42:16 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 13 04:42:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93af14fe
sys-apps/file: Stabilize 5.44-r3 x86, #890610
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.44-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.44-r3.ebuild
b/sys-apps/file/file-5.44-r3.ebuild
index cdeb8bd0cfe1..b1ac4056460e 100644
--- a/sys-apps/file/file-5.44-r3.ebuild
+++ b/sys-apps/file/file-5.44-r3.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 91bff8e1a6489728a3951a052ff7bd3daa1903b3
Author: Sam James gentoo org>
AuthorDate: Fri Jan 13 03:46:34 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 13 03:46:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91bff8e1
sys-apps/file: depend on newer libseccomp for faccessat2()
This ensures correct upgrade ordering and also mitigates issues
w/ partial upgrades - newer libseccomp is needed for faccessat2
to be defined properly.
Bug: https://bugs.gentoo.org/889046
Signed-off-by: Sam James gentoo.org>
sys-apps/file/{file-5.43-r2.ebuild => file-5.43-r3.ebuild} | 14 +-
sys-apps/file/{file-5.44-r2.ebuild => file-5.44-r3.ebuild} | 10 +++---
sys-apps/file/file-.ebuild | 12
3 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/sys-apps/file/file-5.43-r2.ebuild
b/sys-apps/file/file-5.43-r3.ebuild
similarity index 95%
rename from sys-apps/file/file-5.43-r2.ebuild
rename to sys-apps/file/file-5.43-r3.ebuild
index 610753073aa6..040db6fb3eb5 100644
--- a/sys-apps/file/file-5.43-r2.ebuild
+++ b/sys-apps/file/file-5.43-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -38,15 +38,19 @@ DEPEND="
${PYTHON_DEPS}
dev-python/setuptools[${PYTHON_USEDEP}]
)
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
+ seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+"
+RDEPEND="
+ ${DEPEND}
python? ( !dev-python/python-magic )
- seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+"
BDEPEND+="
python? (
${PYTHON_DEPS}
${DISTUTILS_DEPS}
- )"
+ )
+"
PATCHES=(
"${FILESDIR}/file-5.43-portage-sandbox.patch" #713710 #728978
diff --git a/sys-apps/file/file-5.44-r2.ebuild
b/sys-apps/file/file-5.44-r3.ebuild
similarity index 96%
rename from sys-apps/file/file-5.44-r2.ebuild
rename to sys-apps/file/file-5.44-r3.ebuild
index b20035b2e73c..cdeb8bd0cfe1 100644
--- a/sys-apps/file/file-5.44-r2.ebuild
+++ b/sys-apps/file/file-5.44-r3.ebuild
@@ -39,17 +39,21 @@ DEPEND="
${PYTHON_DEPS}
dev-python/setuptools[${PYTHON_USEDEP}]
)
+ seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
"
-RDEPEND="${DEPEND}
+RDEPEND="
+ ${DEPEND}
python? ( !dev-python/python-magic )
- seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+ seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
+"
BDEPEND+="
python? (
${PYTHON_DEPS}
${DISTUTILS_DEPS}
- )"
+ )
+"
PATCHES=(
"${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index c83ce4f71f81..0c13d481dc8d 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -39,17 +39,21 @@ DEPEND="
${PYTHON_DEPS}
dev-python/setuptools[${PYTHON_USEDEP}]
)
+ seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
"
-RDEPEND="${DEPEND}
+RDEPEND="
+ ${DEPEND}
python? ( !dev-python/python-magic )
- seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+ seccomp? ( >=sys-libs/libseccomp-2.5.4[${MULTILIB_USEDEP}] )
+"
BDEPEND+="
python? (
${PYTHON_DEPS}
${DISTUTILS_DEPS}
- )"
+ )
+"
PATCHES=(
"${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 72e1ad6167838adb3ad4c4cf85bc6272992db51f
Author: Sam James gentoo org>
AuthorDate: Fri Jan 13 03:45:40 2023 +
Commit: Sam James gentoo org>
CommitDate: Fri Jan 13 03:45:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e1ad61
sys-apps/file: drop 5.44-r1
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.44-r1.ebuild | 170 --
1 file changed, 170 deletions(-)
diff --git a/sys-apps/file/file-5.44-r1.ebuild
b/sys-apps/file/file-5.44-r1.ebuild
deleted file mode 100644
index c29778951f51..
--- a/sys-apps/file/file-5.44-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == ]] ; 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;
- 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 ~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"
-HOMEPAGE="https://www.darwinsys.com/file/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzip lzma python seccomp static-libs zlib zstd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
- lzip? ( app-arch/lzlib )
- lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}
- python? ( !dev-python/python-magic )
- seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
-BDEPEND+="
- python? (
- ${PYTHON_DEPS}
- ${DISTUTILS_DEPS}
- )"
-
-PATCHES=(
- "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
- "${FILESDIR}/file-5.43-portage-sandbox.patch" #889046
- "${FILESDIR}/file-5.44-limits-solaris.patch" # applied upstream
- "${FILESDIR}/file-5.44-seccomp-utimes.patch" # upstream
-)
-
-src_prepare() {
- default
-
- if [[ ${PV} == ]] ; then
- eautoreconf
- else
- elibtoolize
- fi
-
- # Don't let python README kill main README, bug ##60043
- mv python/README.md python/README.python.md || die
-
- # bug #662090
- sed 's...@readme.md@README.python.md@' -i python/setup.py || die
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-fsect-man5
- $(use_enable bzip2 bzlib)
- $(multilib_native_use_enable lzip lzlib)
- $(use_enable lzma xzlib)
- $(use_enable seccomp libseccomp)
- $(use_enable static-libs static)
- $(use_enable zlib)
- $(use_enable zstd zstdlib)
- )
-
- econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
- local myeconfargs=(
- --disable-shared
- --disable-libseccomp
- --disable-bzlib
- --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, bug #362941
- tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
- local ECONF_SOURCE="${S}"
-
- if need_build_file ; then
- mkdir -p "${WORKDIR}"/build || die
- cd "${WORKDIR}"/build || die
- build_src_configure
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi ; then
- emake
- else
- # bug #586444
- emake -C src magic.h
- emake -C src libmagic.la
- fi
-}
-
-src_compile() {
- if need_build_file ; then
- # 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 5ed192642a8db584d5a8aec301075f7d4fd7c7f1
Author: Sam James gentoo org>
AuthorDate: Thu Jan 12 04:40:52 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 12 04:40:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ed19264
sys-apps/file: Keyword 5.44-r2 sparc, #888623
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.44-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.44-r2.ebuild
b/sys-apps/file/file-5.44-r2.ebuild
index fd89f18309c4..b20035b2e73c 100644
--- a/sys-apps/file/file-5.44-r2.ebuild
+++ b/sys-apps/file/file-5.44-r2.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/, sys-apps/file/
commit: 5e07fccffc54abe0e18cf91fd5b430625da28561
Author: Sam James gentoo org>
AuthorDate: Wed Jan 11 21:38:49 2023 +
Commit: Sam James gentoo org>
CommitDate: Wed Jan 11 21:39:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e07fccf
sys-apps/file: backport decompression fix
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.44-r2.ebuild | 171 +
.../file/files/file-5.44-decompress-empty.patch| 126 +++
2 files changed, 297 insertions(+)
diff --git a/sys-apps/file/file-5.44-r2.ebuild
b/sys-apps/file/file-5.44-r2.ebuild
new file mode 100644
index ..fd89f18309c4
--- /dev/null
+++ b/sys-apps/file/file-5.44-r2.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == ]] ; 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;
+ 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 ~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"
+HOMEPAGE="https://www.darwinsys.com/file/;
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzip lzma python seccomp static-libs zlib zstd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+ bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+ lzip? ( app-arch/lzlib )
+ lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}
+ python? ( !dev-python/python-magic )
+ seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+BDEPEND+="
+ python? (
+ ${PYTHON_DEPS}
+ ${DISTUTILS_DEPS}
+ )"
+
+PATCHES=(
+ "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
+ "${FILESDIR}/file-5.43-portage-sandbox.patch" #889046
+ "${FILESDIR}/file-5.44-limits-solaris.patch" # applied upstream
+ "${FILESDIR}/file-5.44-seccomp-utimes.patch" # upstream
+ "${FILESDIR}/file-5.44-decompress-empty.patch" # upstream
+)
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
+
+ # Don't let python README kill main README, bug ##60043
+ mv python/README.md python/README.python.md || die
+
+ # bug #662090
+ sed 's...@readme.md@README.python.md@' -i python/setup.py || die
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --enable-fsect-man5
+ $(use_enable bzip2 bzlib)
+ $(multilib_native_use_enable lzip lzlib)
+ $(use_enable lzma xzlib)
+ $(use_enable seccomp libseccomp)
+ $(use_enable static-libs static)
+ $(use_enable zlib)
+ $(use_enable zstd zstdlib)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+ local myeconfargs=(
+ --disable-shared
+ --disable-libseccomp
+ --disable-bzlib
+ --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, bug #362941
+ tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+ local ECONF_SOURCE="${S}"
+
+ if need_build_file ; then
+ mkdir -p "${WORKDIR}"/build || die
+ cd "${WORKDIR}"/build || die
+ build_src_configure
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi ; then
+ emake
+ else
+ # bug #586444
+ emake -C src magic.h
+ emake -C src libmagic.la
+ fi
+}
+
+src_compile() {
+ if need_build_file ; then
+ # bug #586444
+ emake -C "${WORKDIR}"/build/src magic.h
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/
commit: 1e188b6c8248035454631203353b4bcf4e8a5f23 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Jan 1 13:39:34 2023 + Commit: Conrad Kostecki gentoo org> CommitDate: Sun Jan 1 18:16:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e188b6c sys-apps/file: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/28921 Signed-off-by: Conrad Kostecki gentoo.org> .../file/files/file-5.39-portage-sandbox.patch | 17 - .../files/file-5.40-seccomp-fstatat64-musl.patch | 22 -- 2 files changed, 39 deletions(-) diff --git a/sys-apps/file/files/file-5.39-portage-sandbox.patch b/sys-apps/file/files/file-5.39-portage-sandbox.patch deleted file mode 100644 index 1880f6223c06.. --- a/sys-apps/file/files/file-5.39-portage-sandbox.patch +++ /dev/null @@ -1,17 +0,0 @@ -From 81765a2d4fcce23f42495d5ec03bbfecb2a3c381 Mon Sep 17 00:00:00 2001 -From: tka -Date: Wed, 24 Jun 2020 11:18:45 +0200 -Subject: [PATCH] Allow getcwd for Gentoo's portage sandbox - -Bug: https://bugs.gentoo.org/728978 a/src/seccomp.c -+++ b/src/seccomp.c -@@ -229,6 +229,8 @@ enable_sandbox_full(void) - ALLOW_RULE(write); - ALLOW_RULE(writev); - -+ // needed by Gentoo's portage sandbox -+ ALLOW_RULE(getcwd); - - #if 0 - // needed by valgrind diff --git a/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch b/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch deleted file mode 100644 index 28a278e73f07.. --- a/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 8c13923a8e17a02be0989649b2edc20124816729 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Tue, 15 Jun 2021 16:08:22 -0400 -Subject: [PATCH] seccomp: undef fstatat64 to avoid build failure on musl - -sys/stat.h in musl does this: - - #define fstatat64 fstatat - -Counteract this with an #undef. - -Bug: https://bugs.gentoo.org/789336 a/src/seccomp.c -+++ b/src/seccomp.c -@@ -179,6 +179,7 @@ enable_sandbox_full(void) - ALLOW_RULE(fstat); - ALLOW_RULE(fstat64); - #ifdef __NR_fstatat64 -+#undef fstatat64 - ALLOW_RULE(fstatat64); - #endif - ALLOW_RULE(futex);
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/
commit: 0a43a1114f05d985cef96402cab1451580a6339b
Author: Sam James gentoo org>
AuthorDate: Sat Dec 31 12:51:36 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Dec 31 12:52:10 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a43a111
sys-apps/file: allow faccessat2 syscall in seccomp for sandbox-2.30
Closes: https://bugs.gentoo.org/889046
Signed-off-by: Sam James gentoo.org>
.../{file-5.43-r1.ebuild => file-5.43-r2.ebuild} | 4 ++--
.../file/{file-5.44.ebuild => file-5.44-r1.ebuild} | 5 ++--
sys-apps/file/file-.ebuild | 6 ++---
.../file/files/file-5.43-portage-sandbox.patch | 28 ++
.../files/file-5.43-seccomp-fstatat64-musl.patch | 22 +
sys-apps/file/files/file-5.44-seccomp-utimes.patch | 18 ++
6 files changed, 76 insertions(+), 7 deletions(-)
diff --git a/sys-apps/file/file-5.43-r1.ebuild
b/sys-apps/file/file-5.43-r2.ebuild
similarity index 96%
rename from sys-apps/file/file-5.43-r1.ebuild
rename to sys-apps/file/file-5.43-r2.ebuild
index 10bf50a18e4f..610753073aa6 100644
--- a/sys-apps/file/file-5.43-r1.ebuild
+++ b/sys-apps/file/file-5.43-r2.ebuild
@@ -49,8 +49,8 @@ BDEPEND+="
)"
PATCHES=(
- "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
- "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
+ "${FILESDIR}/file-5.43-portage-sandbox.patch" #713710 #728978
+ "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
"${FILESDIR}/${P}-configure-clang16.patch"
)
diff --git a/sys-apps/file/file-5.44.ebuild b/sys-apps/file/file-5.44-r1.ebuild
similarity index 95%
rename from sys-apps/file/file-5.44.ebuild
rename to sys-apps/file/file-5.44-r1.ebuild
index 99d5b362b9c5..c29778951f51 100644
--- a/sys-apps/file/file-5.44.ebuild
+++ b/sys-apps/file/file-5.44-r1.ebuild
@@ -52,9 +52,10 @@ BDEPEND+="
)"
PATCHES=(
- "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
- "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
+ "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
+ "${FILESDIR}/file-5.43-portage-sandbox.patch" #889046
"${FILESDIR}/file-5.44-limits-solaris.patch" # applied upstream
+ "${FILESDIR}/file-5.44-seccomp-utimes.patch" # upstream
)
src_prepare() {
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index 81f60050024c..c83ce4f71f81 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~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
@@ -52,8 +52,8 @@ BDEPEND+="
)"
PATCHES=(
- "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
- "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
+ "${FILESDIR}/file-5.43-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
+ "${FILESDIR}/file-5.43-portage-sandbox.patch" #889046
)
src_prepare() {
diff --git a/sys-apps/file/files/file-5.43-portage-sandbox.patch
b/sys-apps/file/files/file-5.43-portage-sandbox.patch
new file mode 100644
index ..f9e715cc366f
--- /dev/null
+++ b/sys-apps/file/files/file-5.43-portage-sandbox.patch
@@ -0,0 +1,28 @@
+Allow syscalls for Gentoo's portage sandbox
+
+- Add getcwd (bug #728978)
+- Add faccessat2 (bug #889046)
+
+Bug: https://bugs.gentoo.org/728978
+Bug: https://bugs.gentoo.org/889046
+--- a/src/seccomp.c
b/src/seccomp.c
+@@ -174,6 +174,9 @@ enable_sandbox_full(void)
+ ALLOW_RULE(exit_group);
+ #ifdef __NR_faccessat
+ ALLOW_RULE(faccessat);
++#endif
++#ifdef __NR_faccessat2
++ALLOW_RULE(faccessat2);
+ #endif
+ ALLOW_RULE(fcntl);
+ ALLOW_RULE(fcntl64);
+@@ -237,6 +240,8 @@ enable_sandbox_full(void)
+ ALLOW_RULE(write);
+ ALLOW_RULE(writev);
+
++ // needed by Gentoo's portage sandbox
++ ALLOW_RULE(getcwd);
+
+ #if 0
+ // needed by valgrind
diff --git a/sys-apps/file/files/file-5.43-seccomp-fstatat64-musl.patch
b/sys-apps/file/files/file-5.43-seccomp-fstatat64-musl.patch
new file mode 100644
index ..a039882ac8d7
--- /dev/null
+++ b/sys-apps/file/files/file-5.43-seccomp-fstatat64-musl.patch
@@ -0,0 +1,22 @@
+From
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: a3231935a671284e4214aa04c16ad78c7bc1e73d
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Dec 31 10:49:29 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Dec 31 10:49:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3231935
sys-apps/file: Keyword 5.44 ia64, #888623
Signed-off-by: Arthur Zamarin gentoo.org>
sys-apps/file/file-5.44.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.44.ebuild b/sys-apps/file/file-5.44.ebuild
index 8d91170d66e5..99d5b362b9c5 100644
--- a/sys-apps/file/file-5.44.ebuild
+++ b/sys-apps/file/file-5.44.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc
)"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos
~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: c3c3e19d4ce31bdc7b104e37d1aea4bcd2deb87f
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Dec 29 10:13:54 2022 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Dec 29 10:14:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3c3e19d
sys-apps/file-5.44: update comment to reflect patch status
Signed-off-by: Fabian Groffen gentoo.org>
sys-apps/file/file-5.44.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.44.ebuild b/sys-apps/file/file-5.44.ebuild
index e300174f860d..8d91170d66e5 100644
--- a/sys-apps/file/file-5.44.ebuild
+++ b/sys-apps/file/file-5.44.ebuild
@@ -54,7 +54,7 @@ BDEPEND+="
PATCHES=(
"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
"${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
- "${FILESDIR}/file-5.44-limits-solaris.patch" # not upstream yet
+ "${FILESDIR}/file-5.44-limits-solaris.patch" # applied upstream
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/, sys-apps/file/
commit: eedc8deda6d12b9e02f97c44dc16e95680e14c3e
Author: Fabian Groffen gentoo org>
AuthorDate: Tue Dec 27 19:30:13 2022 +
Commit: Fabian Groffen gentoo org>
CommitDate: Tue Dec 27 19:30:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eedc8ded
sys-apps/file-5.44: add build patch for Solaris
Signed-off-by: Fabian Groffen gentoo.org>
sys-apps/file/file-5.44.ebuild | 1 +
sys-apps/file/files/file-5.44-limits-solaris.patch | 19 +++
2 files changed, 20 insertions(+)
diff --git a/sys-apps/file/file-5.44.ebuild b/sys-apps/file/file-5.44.ebuild
index 41f62b904bd3..e300174f860d 100644
--- a/sys-apps/file/file-5.44.ebuild
+++ b/sys-apps/file/file-5.44.ebuild
@@ -54,6 +54,7 @@ BDEPEND+="
PATCHES=(
"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
"${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
+ "${FILESDIR}/file-5.44-limits-solaris.patch" # not upstream yet
)
src_prepare() {
diff --git a/sys-apps/file/files/file-5.44-limits-solaris.patch
b/sys-apps/file/files/file-5.44-limits-solaris.patch
new file mode 100644
index ..7a04535577b4
--- /dev/null
+++ b/sys-apps/file/files/file-5.44-limits-solaris.patch
@@ -0,0 +1,19 @@
+softmagic: include limits.h for UINT_MAX usage
+
+Platforms like Solaris need this to compile.
+
+Bug: https://bugs.astron.com/view.php?id=413
+Signed-off-by: Fabian Groffen
+
+--- a/src/softmagic.c
b/src/softmagic.c
+@@ -42,6 +42,7 @@
+ #include
+ #include
+ #include
++#include
+ #include "der.h"
+
+ file_private int match(struct magic_set *, struct magic *, file_regex_t **,
size_t,
+
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 13f656da0830806059a8955ba46fe4804f8cc904
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Dec 27 14:22:51 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Dec 27 14:22:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13f656da
sys-apps/file: Keyword 5.44 s390, #888623
Signed-off-by: Arthur Zamarin gentoo.org>
sys-apps/file/file-5.44.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.44.ebuild b/sys-apps/file/file-5.44.ebuild
index 0bcf7bae6d9e..41f62b904bd3 100644
--- a/sys-apps/file/file-5.44.ebuild
+++ b/sys-apps/file/file-5.44.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc
)"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~s390 ~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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 0c5d19e3d8f92b56a31d81daadcf6044ae46
Author: Sam James gentoo org>
AuthorDate: Tue Dec 27 10:02:55 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 27 10:03:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c5d19e3
sys-apps/file: add 5.44
Signed-off-by: Sam James gentoo.org>
sys-apps/file/Manifest | 2 +
sys-apps/file/file-5.44.ebuild | 168 +
2 files changed, 170 insertions(+)
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 79a81f398ac8..86eb997f0bb1 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,2 +1,4 @@
DIST file-5.43.tar.gz 1162786 BLAKE2B
aaaf32c5054fb83e912af6656e5e67947f45576ec3711c7cba5531ed780e142a448580e0db41a828c8a3c5d2f1bf0c8ed49bc9688499caaae4a08baa16b3610c
SHA512
9d02f4e7a69d90468d6bd35df5ec240ddee8c2408b7df3e73427d7f18736baf77db0638a1fe8283f4e6abd1d5ad653890ed3a5a0d48bb52d4023ca4070ecdf06
DIST file-5.43.tar.gz.asc 195 BLAKE2B
d7f83b3e21d1390467989f8870e36daa48ebb8c5ac7ab8dc6d667a65d10561126d32cfc5ef3d81a130990b3e46bcba9b5e03f0a7dd169782351b02cebec2471f
SHA512
c565958840f2f5c62821cd08d4149ec97c574232913ec00400473364e160250cfaced8c715e109c4c617359e33d2470f7ca6af1891cbdf994329e890f90c8be3
+DIST file-5.44.tar.gz 1186437 BLAKE2B
a90ccae738a95315d75a0aaee7bbff3624425cc9267daf18ba9147b7c9b9ebfb31288b54c63a73e4695eca0e876f206e40bcb81c422f1bf572b976e753b25a42
SHA512
26c3b9c7a6950649d0b2de896bfeca54289febe4cd487c0f91aa6ff1857fa49f9077f8738a17b86100125668a31dae05b586615c564f78da47ac20a1e4a74f63
+DIST file-5.44.tar.gz.asc 195 BLAKE2B
a0905d42fec0fa052d75fb5b267c6ae223176451c0f1d3346006d4b760c3d858f2dcda5f0a30c6aa4b09b5afee427b75bc4debd5033d978f39dc1da01d3e1bd1
SHA512
1a4dc39283f4859581441aa35b3ed72b323c4e05ca0960d17126d1b9ec18465c695c0545e24f09f8437a60ab52e582be67b6cbbc656bbb676de00148c3644d23
diff --git a/sys-apps/file/file-5.44.ebuild b/sys-apps/file/file-5.44.ebuild
new file mode 100644
index ..0bcf7bae6d9e
--- /dev/null
+++ b/sys-apps/file/file-5.44.ebuild
@@ -0,0 +1,168 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == ]] ; 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;
+ SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc
)"
+
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc
~ppc64 ~riscv ~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"
+HOMEPAGE="https://www.darwinsys.com/file/;
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzip lzma python seccomp static-libs zlib zstd"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+ bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+ lzip? ( app-arch/lzlib )
+ lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}
+ python? ( !dev-python/python-magic )
+ seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+BDEPEND+="
+ python? (
+ ${PYTHON_DEPS}
+ ${DISTUTILS_DEPS}
+ )"
+
+PATCHES=(
+ "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+ "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
+)
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
+
+ # Don't let python README kill main README, bug ##60043
+ mv python/README.md python/README.python.md || die
+
+ # bug #662090
+ sed 's...@readme.md@README.python.md@' -i python/setup.py || die
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --enable-fsect-man5
+ $(use_enable bzip2 bzlib)
+ $(multilib_native_use_enable lzip lzlib)
+ $(use_enable lzma xzlib)
+ $(use_enable seccomp libseccomp)
+ $(use_enable static-libs static)
+ $(use_enable zlib)
+ $(use_enable zstd zstdlib)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+ local
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/, sys-apps/file/
commit: faa75d431684f8efcebf1116128ae3e528d0889a
Author: Sam James gentoo org>
AuthorDate: Sat Nov 19 23:36:31 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Nov 19 23:37:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faa75d43
sys-apps/file: fix configure w/ clang 16
Signed-off-by: Sam James gentoo.org>
.../file/{file-5.43.ebuild => file-5.43-r1.ebuild} | 1 +
.../file/files/file-5.43-configure-clang16.patch | 20
2 files changed, 21 insertions(+)
diff --git a/sys-apps/file/file-5.43.ebuild b/sys-apps/file/file-5.43-r1.ebuild
similarity index 98%
rename from sys-apps/file/file-5.43.ebuild
rename to sys-apps/file/file-5.43-r1.ebuild
index 7a43ed771918..10bf50a18e4f 100644
--- a/sys-apps/file/file-5.43.ebuild
+++ b/sys-apps/file/file-5.43-r1.ebuild
@@ -51,6 +51,7 @@ BDEPEND+="
PATCHES=(
"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
"${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
+ "${FILESDIR}/${P}-configure-clang16.patch"
)
src_prepare() {
diff --git a/sys-apps/file/files/file-5.43-configure-clang16.patch
b/sys-apps/file/files/file-5.43-configure-clang16.patch
new file mode 100644
index ..15fd5b1c4a05
--- /dev/null
+++ b/sys-apps/file/files/file-5.43-configure-clang16.patch
@@ -0,0 +1,20 @@
+https://github.com/file/file/commit/4502517cc7316569d5902ab65c97b3b8e46f8a25
+https://github.com/file/file/commit/8c845b7bbad085678695d3e70467b8eec3dfa7af
+--- a/configure
b/configure
+@@ -14037,13 +14037,14 @@ else $as_nop
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include
++#include
+ int
+ main (void)
+ {
+ #if !HAVE_DECL_DAYLIGHT
+ extern int daylight;
+ #endif
+-atoi(daylight);
++daylight = atoi("1");
+ ;
+ return 0;
+ }
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: c46df3626d1b472913e3ae9d24cb485e6bf8a4cc
Author: Agostino Sarubbo gentoo org>
AuthorDate: Fri Nov 4 08:14:49 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Fri Nov 4 08:14:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c46df362
sys-apps/file: Stabilize 5.43 x86, #879275
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-apps/file/file-5.43.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.43.ebuild b/sys-apps/file/file-5.43.ebuild
index d51b52ff380a..7a43ed771918 100644
--- a/sys-apps/file/file-5.43.ebuild
+++ b/sys-apps/file/file-5.43.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 7f40e25d90198836b6ec6231ad3f86690ea49113
Author: Arthur Zamarin gentoo org>
AuthorDate: Thu Nov 3 19:31:23 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Thu Nov 3 19:31:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f40e25d
sys-apps/file: Stabilize 5.43 arm64, #879275
Signed-off-by: Arthur Zamarin gentoo.org>
sys-apps/file/file-5.43.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.43.ebuild b/sys-apps/file/file-5.43.ebuild
index b6cbee7589a7..d51b52ff380a 100644
--- a/sys-apps/file/file-5.43.ebuild
+++ b/sys-apps/file/file-5.43.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: ba905beea301c842bfb2d0aa6406f969ecc14da7
Author: Sam James gentoo org>
AuthorDate: Thu Nov 3 19:19:13 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Nov 3 19:19:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba905bee
sys-apps/file: Stabilize 5.43 amd64, #879275
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.43.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.43.ebuild b/sys-apps/file/file-5.43.ebuild
index b1dfb5912ef9..b6cbee7589a7 100644
--- a/sys-apps/file/file-5.43.ebuild
+++ b/sys-apps/file/file-5.43.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/
commit: 839a63370d7565fd40cc66956ac86f412f607eee
Author: Sam James gentoo org>
AuthorDate: Fri Oct 28 19:44:21 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Oct 28 19:50:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=839a6337
sys-apps/file: drop 5.42-r1
Signed-off-by: Sam James gentoo.org>
sys-apps/file/Manifest| 2 -
sys-apps/file/file-5.42-r1.ebuild | 162 -
sys-apps/file/files/file-5.42-unicode-fixes.patch | 390 --
3 files changed, 554 deletions(-)
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 7ee7779ca582..ffc539bd9488 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,5 +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
DIST file-5.43.tar.gz 1162786 BLAKE2B
aaaf32c5054fb83e912af6656e5e67947f45576ec3711c7cba5531ed780e142a448580e0db41a828c8a3c5d2f1bf0c8ed49bc9688499caaae4a08baa16b3610c
SHA512
9d02f4e7a69d90468d6bd35df5ec240ddee8c2408b7df3e73427d7f18736baf77db0638a1fe8283f4e6abd1d5ad653890ed3a5a0d48bb52d4023ca4070ecdf06
DIST file-5.43.tar.gz.asc 195 BLAKE2B
d7f83b3e21d1390467989f8870e36daa48ebb8c5ac7ab8dc6d667a65d10561126d32cfc5ef3d81a130990b3e46bcba9b5e03f0a7dd169782351b02cebec2471f
SHA512
c565958840f2f5c62821cd08d4149ec97c574232913ec00400473364e160250cfaced8c715e109c4c617359e33d2470f7ca6af1891cbdf994329e890f90c8be3
diff --git a/sys-apps/file/file-5.42-r1.ebuild
b/sys-apps/file/file-5.42-r1.ebuild
deleted file mode 100644
index bbde9949d397..
--- a/sys-apps/file/file-5.42-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == ]] ; 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;
- 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"
-HOMEPAGE="https://www.darwinsys.com/file/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzma python seccomp static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
- lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
- python? ( !dev-python/python-magic )
- seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
-BDEPEND+="
- python? (
- ${PYTHON_DEPS}
- ${DISTUTILS_DEPS}
- )"
-
-PATCHES=(
- "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
- "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
- "${FILESDIR}/${P}-unicode-fixes.patch" #861089
-)
-
-src_prepare() {
- default
-
- if [[ ${PV} == ]] ; then
- eautoreconf
- else
- elibtoolize
- fi
-
- # don't let python README kill main README, bug ##60043
- mv python/README.md python/README.python.md || die
- # bug #662090
- sed 's...@readme.md@README.python.md@' -i python/setup.py || die
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-fsect-man5
- $(use_enable bzip2
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 77944d6b6448f73741340c1ac6712e4d02abb9e4
Author: Sam James gentoo org>
AuthorDate: Fri Sep 23 02:03:03 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Sep 23 02:08:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77944d6b
sys-apps/file: drop 5.42
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.42.ebuild | 161 -
1 file changed, 161 deletions(-)
diff --git a/sys-apps/file/file-5.42.ebuild b/sys-apps/file/file-5.42.ebuild
deleted file mode 100644
index 0b9cc3af8dba..
--- a/sys-apps/file/file-5.42.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == ]] ; 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;
- 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"
-HOMEPAGE="https://www.darwinsys.com/file/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzma python seccomp static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
- lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
- python? ( !dev-python/python-magic )
- seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
-BDEPEND+="
- python? (
- ${PYTHON_DEPS}
- ${DISTUTILS_DEPS}
- )"
-
-PATCHES=(
- "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
- "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
-)
-
-src_prepare() {
- default
-
- if [[ ${PV} == ]] ; then
- eautoreconf
- else
- elibtoolize
- fi
-
- # don't let python README kill main README, bug ##60043
- mv python/README.md python/README.python.md || die
- # bug #662090
- sed 's...@readme.md@README.python.md@' -i python/setup.py || die
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-fsect-man5
- $(use_enable bzip2 bzlib)
- $(use_enable lzma xzlib)
- $(use_enable seccomp libseccomp)
- $(use_enable static-libs static)
- $(use_enable zlib)
- )
- econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
- local myeconfargs=(
- --disable-shared
- --disable-libseccomp
- --disable-bzlib
- --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, bug #362941
- tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
- local ECONF_SOURCE="${S}"
-
- if need_build_file ; then
- mkdir -p "${WORKDIR}"/build || die
- cd "${WORKDIR}"/build || die
- build_src_configure
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi ; then
- emake
- else
- # bug #586444
- emake -C src magic.h
- emake -C src libmagic.la
- fi
-}
-
-src_compile() {
- if need_build_file ; then
- # 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
- cd python || die
- distutils-r1_src_compile
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi ; then
- default
- else
- emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES}
DESTDIR="${D}"
- fi
-}
-
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: fff186e55f1cb9eb95ffc0d37cf4c2920bbd7d67
Author: Sam James gentoo org>
AuthorDate: Thu Sep 15 15:31:02 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Sep 15 15:32:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fff186e5
sys-apps/file: add lzip support to live
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-.ebuild | 4 +++-
sys-apps/file/metadata.xml | 3 +++
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index 4f8b267d4f06..81f60050024c 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -28,11 +28,12 @@ HOMEPAGE="https://www.darwinsys.com/file/;
LICENSE="BSD-2"
SLOT="0"
-IUSE="bzip2 lzma python seccomp static-libs zlib zstd"
+IUSE="bzip2 lzip lzma python seccomp static-libs zlib zstd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
DEPEND="
bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+ lzip? ( app-arch/lzlib )
lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
python? (
${PYTHON_DEPS}
@@ -75,6 +76,7 @@ multilib_src_configure() {
local myeconfargs=(
--enable-fsect-man5
$(use_enable bzip2 bzlib)
+ $(multilib_native_use_enable lzip lzlib)
$(use_enable lzma xzlib)
$(use_enable seccomp libseccomp)
$(use_enable static-libs static)
diff --git a/sys-apps/file/metadata.xml b/sys-apps/file/metadata.xml
index 9d92ca28bc24..01bf4264459f 100644
--- a/sys-apps/file/metadata.xml
+++ b/sys-apps/file/metadata.xml
@@ -10,4 +10,7 @@
cpe:/a:file_project:file
file/file
+
+ Enable app-arch/lzip decompression
support via app-arch/lzlib
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 59b51772d0d9df31ddde1483375c35cc6a267728
Author: Sam James gentoo org>
AuthorDate: Thu Sep 15 11:36:42 2022 +
Commit: Sam James gentoo org>
CommitDate: Thu Sep 15 11:36:42 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59b51772
sys-apps/file: add zstd support to live
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-.ebuild | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index e6b302756971..4f8b267d4f06 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -28,7 +28,7 @@ HOMEPAGE="https://www.darwinsys.com/file/;
LICENSE="BSD-2"
SLOT="0"
-IUSE="bzip2 lzma python seccomp static-libs zlib"
+IUSE="bzip2 lzma python seccomp static-libs zlib zstd"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
DEPEND="
@@ -38,7 +38,9 @@ DEPEND="
${PYTHON_DEPS}
dev-python/setuptools[${PYTHON_USEDEP}]
)
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
RDEPEND="${DEPEND}
python? ( !dev-python/python-magic )
seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
@@ -62,8 +64,9 @@ src_prepare() {
elibtoolize
fi
- # don't let python README kill main README, bug ##60043
+ # Don't let python README kill main README, bug ##60043
mv python/README.md python/README.python.md || die
+
# bug #662090
sed 's...@readme.md@README.python.md@' -i python/setup.py || die
}
@@ -76,7 +79,9 @@ multilib_src_configure() {
$(use_enable seccomp libseccomp)
$(use_enable static-libs static)
$(use_enable zlib)
+ $(use_enable zstd zstdlib)
)
+
econf "${myeconfargs[@]}"
}
@@ -93,7 +98,7 @@ build_src_configure() {
}
need_build_file() {
- # when cross-compiling, we need to build up our own file
+ # When cross-compiling, we need to build up our own file
# because people often don't keep matching host/target
# file versions, bug #362941
tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 3b7e623c2bebc73f847bf866557375ae728a1ab1
Author: Sam James gentoo org>
AuthorDate: Tue Sep 13 20:24:33 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Sep 13 20:29:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b7e623c
sys-apps/file: add 5.43
Signed-off-by: Sam James gentoo.org>
sys-apps/file/Manifest | 2 ++
sys-apps/file/{file-.ebuild => file-5.43.ebuild} | 5 +++--
sys-apps/file/file-.ebuild | 5 +++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 39e70ed0adab..7ee7779ca582 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,3 +1,5 @@
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
+DIST file-5.43.tar.gz 1162786 BLAKE2B
aaaf32c5054fb83e912af6656e5e67947f45576ec3711c7cba5531ed780e142a448580e0db41a828c8a3c5d2f1bf0c8ed49bc9688499caaae4a08baa16b3610c
SHA512
9d02f4e7a69d90468d6bd35df5ec240ddee8c2408b7df3e73427d7f18736baf77db0638a1fe8283f4e6abd1d5ad653890ed3a5a0d48bb52d4023ca4070ecdf06
+DIST file-5.43.tar.gz.asc 195 BLAKE2B
d7f83b3e21d1390467989f8870e36daa48ebb8c5ac7ab8dc6d667a65d10561126d32cfc5ef3d81a130990b3e46bcba9b5e03f0a7dd169782351b02cebec2471f
SHA512
c565958840f2f5c62821cd08d4149ec97c574232913ec00400473364e160250cfaced8c715e109c4c617359e33d2470f7ca6af1891cbdf994329e890f90c8be3
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-5.43.ebuild
similarity index 96%
copy from sys-apps/file/file-.ebuild
copy to sys-apps/file/file-5.43.ebuild
index a4e9e2299f36..e6b302756971 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-5.43.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_OPTIONAL=1
@@ -50,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() {
@@ -145,7 +146,7 @@ multilib_src_install() {
}
multilib_src_install_all() {
- dodoc ChangeLog MAINT README.md
+ dodoc ChangeLog MAINT # README
# Required for `file -C`
insinto /usr/share/misc/magic
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index a4e9e2299f36..e6b302756971 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DISTUTILS_USE_PEP517=setuptools
DISTUTILS_OPTIONAL=1
@@ -50,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() {
@@ -145,7 +146,7 @@ multilib_src_install() {
}
multilib_src_install_all() {
- dodoc ChangeLog MAINT README.md
+ dodoc ChangeLog MAINT # README
# Required for `file -C`
insinto /usr/share/misc/magic
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: da324cbb488b8a50aaa3e26af5ea0120535eefee
Author: Sam James gentoo org>
AuthorDate: Mon Aug 22 18:04:56 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Aug 22 18:05:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da324cbb
sys-apps/file: rekeyword 5.42-r1 w/ unicode fixes
Closes: https://bugs.gentoo.org/861089
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.42-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.42-r1.ebuild
b/sys-apps/file/file-5.42-r1.ebuild
index e74d71b49e84..bbde9949d397 100644
--- a/sys-apps/file/file-5.42-r1.ebuild
+++ b/sys-apps/file/file-5.42-r1.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: dad23bcead9f6d10e5c82e3aa0d4391eee11a4a2
Author: Sam James gentoo org>
AuthorDate: Tue Aug 16 02:37:02 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Aug 16 02:37:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dad23bce
sys-apps/file: fix install (README rename)
Closes: https://bugs.gentoo.org/863353
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index 7f27cf37781f..a4e9e2299f36 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -145,7 +145,7 @@ multilib_src_install() {
}
multilib_src_install_all() {
- dodoc ChangeLog MAINT README
+ dodoc ChangeLog MAINT README.md
# Required for `file -C`
insinto /usr/share/misc/magic
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 72038d02f171d9e3defd2c054f857869f84e9287
Author: Sam James gentoo org>
AuthorDate: Tue Aug 16 02:34:40 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Aug 16 02:34:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72038d02
sys-apps/file: drop 5.42 back to ~arch
Issues with handling unicode.
Bug: https://bugs.gentoo.org/861089
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.42.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.42.ebuild b/sys-apps/file/file-5.42.ebuild
index dee13cbe1e88..0b9cc3af8dba 100644
--- a/sys-apps/file/file-5.42.ebuild
+++ b/sys-apps/file/file-5.42.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/
commit: 0c0ecc2a92bf36517163678454555fc825c28ae9 Author: Sam James gentoo org> AuthorDate: Tue Aug 16 02:32:13 2022 + Commit: Sam James gentoo org> CommitDate: Tue Aug 16 02:32:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c0ecc2a sys-apps/file: scrub patches Signed-off-by: Sam James gentoo.org> .../file/files/file-5.39-portage-sandbox.patch | 9 .../files/file-5.40-seccomp-fstatat64-musl.patch | 9 sys-apps/file/files/file-5.42-unicode-fixes.patch | 24 -- 3 files changed, 42 deletions(-) diff --git a/sys-apps/file/files/file-5.39-portage-sandbox.patch b/sys-apps/file/files/file-5.39-portage-sandbox.patch index 3ea26641671f..1880f6223c06 100644 --- a/sys-apps/file/files/file-5.39-portage-sandbox.patch +++ b/sys-apps/file/files/file-5.39-portage-sandbox.patch @@ -4,12 +4,6 @@ Date: Wed, 24 Jun 2020 11:18:45 +0200 Subject: [PATCH] Allow getcwd for Gentoo's portage sandbox Bug: https://bugs.gentoo.org/728978 - src/seccomp.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/seccomp.c b/src/seccomp.c -index db9364ae..7f5d6f26 100644 --- a/src/seccomp.c +++ b/src/seccomp.c @@ -229,6 +229,8 @@ enable_sandbox_full(void) @@ -21,6 +15,3 @@ index db9364ae..7f5d6f26 100644 #if 0 // needed by valgrind --- -2.28.0 - diff --git a/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch b/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch index 4cc648017860..28a278e73f07 100644 --- a/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch +++ b/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch @@ -10,12 +10,6 @@ sys/stat.h in musl does this: Counteract this with an #undef. Bug: https://bugs.gentoo.org/789336 - src/seccomp.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/seccomp.c b/src/seccomp.c -index 3318367c..eb8b1e57 100644 --- a/src/seccomp.c +++ b/src/seccomp.c @@ -179,6 +179,7 @@ enable_sandbox_full(void) @@ -26,6 +20,3 @@ index 3318367c..eb8b1e57 100644 ALLOW_RULE(fstatat64); #endif ALLOW_RULE(futex); --- -2.32.0 - diff --git a/sys-apps/file/files/file-5.42-unicode-fixes.patch b/sys-apps/file/files/file-5.42-unicode-fixes.patch index 91c46a358120..cc6ee7196b49 100644 --- a/sys-apps/file/files/file-5.42-unicode-fixes.patch +++ b/sys-apps/file/files/file-5.42-unicode-fixes.patch @@ -11,12 +11,6 @@ From: Christos Zoulas Date: Mon, 4 Jul 2022 17:00:51 + Subject: [PATCH] PR/358: Fix width for -f - (jpalus) - src/file.c | 46 +- - 2 files changed, 31 insertions(+), 18 deletions(-) - -diff --git a/src/file.c b/src/file.c -index 5300e5af8..bb058ce1e 100644 --- a/src/file.c +++ b/src/file.c @@ -506,35 +506,47 @@ unwrap(struct magic_set *ms, const char *fn) @@ -262,12 +256,6 @@ Date: Mon, 4 Jul 2022 20:16:29 + Subject: [PATCH] Handle invalid characters as octal (idea from PR/363 by dimich) - src/file.c | 16 +++- - 1 file changed, 11 insertions(+), 5 deletions(-) - -diff --git a/src/file.c b/src/file.c -index 5e89137d7..af9be0f0c 100644 --- a/src/file.c +++ b/src/file.c @@ -580,8 +580,11 @@ fname_print(const char *inname) @@ -307,12 +295,6 @@ Date: Mon, 4 Jul 2022 22:30:51 + Subject: [PATCH] mbrlen(NULL, is not portable; revert to using memset to initialize the state. - src/file.c | 10 +- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/file.c b/src/file.c -index af9be0f0c..8b4f14c2e 100644 --- a/src/file.c +++ b/src/file.c @@ -575,14 +575,14 @@ fname_print(const char *inname) @@ -395,12 +377,6 @@ From: Christos Zoulas Date: Tue, 26 Jul 2022 15:10:05 + Subject: [PATCH] Fix bug with large flist (Florian Weimer) - src/file.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/file.c b/src/file.c -index e169c08fc..c0b8aa197 100644 --- a/src/file.c +++ b/src/file.c @@ -535,6 +535,7 @@ out: file_err(EXIT_FAILURE, "Cannot allocate memory for file list");
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/
commit: 253ca90f3f968a03ea6fff8f0011cf411764b22e
Author: Sam James gentoo org>
AuthorDate: Tue Aug 16 02:28:55 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Aug 16 02:29:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=253ca90f
sys-apps/file: backport unicode handling fixes to 5.42
Temporarily unkeyworded given I had a few issues before I threw
in a few extra patches. Want to give it a test run for a day
or so myself first before keywording.
Bug: https://bugs.gentoo.org/861089
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.42-r1.ebuild | 162 +
sys-apps/file/files/file-5.42-unicode-fixes.patch | 414 ++
2 files changed, 576 insertions(+)
diff --git a/sys-apps/file/file-5.42-r1.ebuild
b/sys-apps/file/file-5.42-r1.ebuild
new file mode 100644
index ..e74d71b49e84
--- /dev/null
+++ b/sys-apps/file/file-5.42-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == ]] ; 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;
+ 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"
+HOMEPAGE="https://www.darwinsys.com/file/;
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+ bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+ lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+ python? ( !dev-python/python-magic )
+ seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+BDEPEND+="
+ python? (
+ ${PYTHON_DEPS}
+ ${DISTUTILS_DEPS}
+ )"
+
+PATCHES=(
+ "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+ "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
+ "${FILESDIR}/${P}-unicode-fixes.patch" #861089
+)
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == ]] ; then
+ eautoreconf
+ else
+ elibtoolize
+ fi
+
+ # don't let python README kill main README, bug ##60043
+ mv python/README.md python/README.python.md || die
+ # bug #662090
+ sed 's...@readme.md@README.python.md@' -i python/setup.py || die
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --enable-fsect-man5
+ $(use_enable bzip2 bzlib)
+ $(use_enable lzma xzlib)
+ $(use_enable seccomp libseccomp)
+ $(use_enable static-libs static)
+ $(use_enable zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+ local myeconfargs=(
+ --disable-shared
+ --disable-libseccomp
+ --disable-bzlib
+ --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, bug #362941
+ tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+ local ECONF_SOURCE="${S}"
+
+ if need_build_file ; then
+ mkdir -p "${WORKDIR}"/build || die
+ cd "${WORKDIR}"/build || die
+ build_src_configure
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi ; then
+ emake
+ else
+ # bug #586444
+ emake -C src magic.h
+ emake -C src libmagic.la
+ fi
+}
+
+src_compile() {
+ if need_build_file ; then
+ # bug #586444
+ emake -C "${WORKDIR}"/build/src magic.h
+ emake -C "${WORKDIR}"/build/src file
+ local -x PATH="${WORKDIR}/build/src:${PATH}"
+ fi
+
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 3429a96cdc2114e3d6050186c221f53a2aca4abd
Author: Arthur Zamarin gentoo org>
AuthorDate: Sat Jul 30 09:50:33 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Sat Jul 30 09:50:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3429a96c
sys-apps/file: Stabilize 5.42 hppa, #859427
Signed-off-by: Arthur Zamarin gentoo.org>
sys-apps/file/file-5.42.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.42.ebuild b/sys-apps/file/file-5.42.ebuild
index b9886cbe87f1..dee13cbe1e88 100644
--- a/sys-apps/file/file-5.42.ebuild
+++ b/sys-apps/file/file-5.42.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 97a289342bf5f66e4b239f2e5b5242275a23c032 Author: Sam James gentoo org> AuthorDate: Mon Jul 25 00:09:24 2022 + Commit: Sam James gentoo org> CommitDate: Mon Jul 25 00:09:24 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a28934 sys-apps/file: add github upstream metadata Signed-off-by: Sam James gentoo.org> sys-apps/file/metadata.xml | 17 + 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/sys-apps/file/metadata.xml b/sys-apps/file/metadata.xml index 034e87228c1c..9d92ca28bc24 100644 --- a/sys-apps/file/metadata.xml +++ b/sys-apps/file/metadata.xml @@ -1,12 +1,13 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - base-sys...@gentoo.org - Gentoo Base System - - - https://bugs.astron.com/ - cpe:/a:file_project:file - + + base-sys...@gentoo.org + Gentoo Base System + + + https://bugs.astron.com/ + cpe:/a:file_project:file + file/file +
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: f9bb1c6c92c70438c02f23adada6a3c3c54197c7
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jul 20 13:45:37 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jul 20 13:45:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9bb1c6c
sys-apps/file: sparc stable wrt bug #859427
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-apps/file/file-5.42.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.42.ebuild b/sys-apps/file/file-5.42.ebuild
index faffdc355f55..b9886cbe87f1 100644
--- a/sys-apps/file/file-5.42.ebuild
+++ b/sys-apps/file/file-5.42.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 6038ea8cd0fc7eca84d180a1623c8ee921dc55a3
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jul 20 13:42:30 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jul 20 13:42:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6038ea8c
sys-apps/file: arm64 stable wrt bug #859427
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-apps/file/file-5.42.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.42.ebuild b/sys-apps/file/file-5.42.ebuild
index 3e7113493d7e..faffdc355f55 100644
--- a/sys-apps/file/file-5.42.ebuild
+++ b/sys-apps/file/file-5.42.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 7ca81616f24064a9d56252fc93f0588d6ea849d1
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jul 20 13:41:26 2022 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jul 20 13:41:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ca81616
sys-apps/file: arm stable wrt bug #859427
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-apps/file/file-5.42.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.42.ebuild b/sys-apps/file/file-5.42.ebuild
index 29cf65fd701c..3e7113493d7e 100644
--- a/sys-apps/file/file-5.42.ebuild
+++ b/sys-apps/file/file-5.42.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 6f54a2fbd03b5992dfebe4393c4d91d0d9b06d6f
Author: Sam James gentoo org>
AuthorDate: Wed Jul 20 02:45:44 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 20 02:45:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f54a2fb
sys-apps/file: Stabilize 5.42 x86, #859427
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.42.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.42.ebuild b/sys-apps/file/file-5.42.ebuild
index a2eba9c20636..29cf65fd701c 100644
--- a/sys-apps/file/file-5.42.ebuild
+++ b/sys-apps/file/file-5.42.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 9dee3e5fcb983bca6633c1058b53b3cd7c2c5cb3
Author: Sam James gentoo org>
AuthorDate: Wed Jul 20 02:44:35 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 20 02:44:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dee3e5f
sys-apps/file: Stabilize 5.42 ppc, #859427
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.42.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.42.ebuild b/sys-apps/file/file-5.42.ebuild
index 0b9cc3af8dba..2f2008466fa6 100644
--- a/sys-apps/file/file-5.42.ebuild
+++ b/sys-apps/file/file-5.42.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: d2dea557aa9034e389da2f0b10cb1ba9f2945110
Author: Sam James gentoo org>
AuthorDate: Wed Jul 20 02:45:23 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 20 02:45:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2dea557
sys-apps/file: Stabilize 5.42 amd64, #859427
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.42.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.42.ebuild b/sys-apps/file/file-5.42.ebuild
index 61f74e239033..a2eba9c20636 100644
--- a/sys-apps/file/file-5.42.ebuild
+++ b/sys-apps/file/file-5.42.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 1dc1b80c3ae70f66c22449033b9385262c3d113d
Author: Sam James gentoo org>
AuthorDate: Wed Jul 20 02:44:36 2022 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 20 02:44:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dc1b80c
sys-apps/file: Stabilize 5.42 ppc64, #859427
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.42.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.42.ebuild b/sys-apps/file/file-5.42.ebuild
index 2f2008466fa6..61f74e239033 100644
--- a/sys-apps/file/file-5.42.ebuild
+++ b/sys-apps/file/file-5.42.ebuild
@@ -18,7 +18,7 @@ else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
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"
+ 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 2562c4c75a1b4f5e1b64e7f4dcfec84dc0c7126e
Author: Sam James gentoo org>
AuthorDate: Sat Jun 11 01:09:25 2022 +
Commit: Sam James gentoo org>
CommitDate: Sat Jun 11 01:52:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2562c4c7
sys-apps/file: add 5.42
Signed-off-by: Sam James gentoo.org>
sys-apps/file/Manifest | 2 ++
.../file/{file-.ebuild => file-5.42.ebuild}| 40 ++
sys-apps/file/file-.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-.ebuild b/sys-apps/file/file-5.42.ebuild
similarity index 73%
copy from sys-apps/file/file-.ebuild
copy to sys-apps/file/file-5.42.ebuild
index dbb7e47df16d..0b9cc3af8dba 100644
--- a/sys-apps/file/file-.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} == "" ]] ; then
+if [[ ${PV} == ]] ; 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} == ]] ; 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
-
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 31a6c87f45f1763253e50dd879b75ae1549cc0e6
Author: Michał Górny gentoo org>
AuthorDate: Sat May 14 08:23:49 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Sat May 14 08:25:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31a6c87f
sys-apps/file: Use PEP517 build
Signed-off-by: Michał Górny gentoo.org>
sys-apps/file/{file-.ebuild => file-5.41-r1.ebuild} | 13 ++---
sys-apps/file/file-.ebuild | 8 +++-
2 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-5.41-r1.ebuild
similarity index 87%
copy from sys-apps/file/file-.ebuild
copy to sys-apps/file/file-5.41-r1.ebuild
index 2b15f3bbd314..cc2281d4dee8 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-5.41-r1.ebuild
@@ -3,8 +3,9 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1 libtool toolchain-funcs multilib-minimal
@@ -13,7 +14,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
@@ -35,9 +36,15 @@ DEPEND="
RDEPEND="${DEPEND}
python? ( !dev-python/python-magic )
seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+BDEPEND="
+ python? (
+ ${PYTHON_DEPS}
+ ${DISTUTILS_DEPS}
+ )"
PATCHES=(
"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+ "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
)
src_prepare() {
@@ -129,7 +136,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
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index 2b15f3bbd314..dbb7e47df16d 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -3,8 +3,9 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8..11} )
inherit distutils-r1 libtool toolchain-funcs multilib-minimal
@@ -35,6 +36,11 @@ DEPEND="
RDEPEND="${DEPEND}
python? ( !dev-python/python-magic )
seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+BDEPEND="
+ python? (
+ ${PYTHON_DEPS}
+ ${DISTUTILS_DEPS}
+ )"
PATCHES=(
"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 67cc4ce6caaa4252c15d1e76286da80f32020d8c
Author: Michał Górny gentoo org>
AuthorDate: Sat May 14 08:19:13 2022 +
Commit: Michał Górny gentoo org>
CommitDate: Sat May 14 08:25:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67cc4ce6
sys-apps/file: Enable py3.11
Signed-off-by: Michał Górny gentoo.org>
sys-apps/file/file-5.41.ebuild | 2 +-
sys-apps/file/file-.ebuild | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sys-apps/file/file-5.41.ebuild b/sys-apps/file/file-5.41.ebuild
index 8e64edcfcd6d..14fa1ec11ad8 100644
--- a/sys-apps/file/file-5.41.ebuild
+++ b/sys-apps/file/file-5.41.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
DISTUTILS_OPTIONAL=1
inherit distutils-r1 libtool toolchain-funcs multilib-minimal
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index 75f6a558ae52..2b15f3bbd314 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
DISTUTILS_OPTIONAL=1
inherit distutils-r1 libtool toolchain-funcs multilib-minimal
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/
commit: 2c1baa9850a947f37d6a8fd5f2d1b5f907fbd776
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Mon Jan 17 20:56:56 2022 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Wed Feb 9 23:02:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c1baa98
sys-apps/file: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/23847
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Conrad Kostecki gentoo.org>
.../file/files/file-5.40-revert-char-count.patch | 49 --
.../file/files/file-5.40-seccomp-faccessat.patch | 34 ---
.../file/files/file-5.40-seccomp-fstatat64.patch | 29 -
sys-apps/file/files/file-5.40-xz_magic.patch | 37
4 files changed, 149 deletions(-)
diff --git a/sys-apps/file/files/file-5.40-revert-char-count.patch
b/sys-apps/file/files/file-5.40-revert-char-count.patch
deleted file mode 100644
index 9d6f5be60fac..
--- a/sys-apps/file/files/file-5.40-revert-char-count.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From c07e242e766242a44ff720c149b1bdd4924ec247 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas
-Date: Tue, 27 Apr 2021 19:37:14 +
-Subject: [PATCH] Revert the fix for PR/180. It lead to PR/261. Using character
- count heuristics ends up with confusing behavior, the following should not be
- producing different results: echo -n xx | ./file - echo -n xy |
- ./file -
-
-[patch backported to 5.40 release -- ulm]
-
- src/encoding.c | 15 ++-
- 1 file changed, 2 insertions(+), 13 deletions(-)
-
-diff --git a/src/encoding.c b/src/encoding.c
-index 31d4d125..3647a481 100644
a/src/encoding.c
-+++ b/src/encoding.c
-@@ -265,9 +265,7 @@ private int \
- looks_ ## NAME(const unsigned char *buf, size_t nbytes, file_unichar_t *ubuf,
\
- size_t *ulen) \
- { \
-- size_t i, u; \
-- unsigned char dist[256]; \
-- memset(dist, 0, sizeof(dist)); \
-+ size_t i; \
- \
- *ulen = 0; \
- \
-@@ -278,16 +276,7 @@ looks_ ## NAME(const unsigned char *buf, size_t nbytes,
file_unichar_t *ubuf, \
- return 0; \
- \
- ubuf[(*ulen)++] = buf[i]; \
-- dist[buf[i]]++; \
- } \
-- u = 0; \
-- for (i = 0; i < __arraycount(dist); i++) { \
-- if (dist[i]) \
-- u++; \
-- } \
-- if (u < 3) \
-- return 0; \
--\
- return 1; \
- }
-
---
-2.32.0
-
diff --git a/sys-apps/file/files/file-5.40-seccomp-faccessat.patch
b/sys-apps/file/files/file-5.40-seccomp-faccessat.patch
deleted file mode 100644
index 4aeb88cfe875..
--- a/sys-apps/file/files/file-5.40-seccomp-faccessat.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From abcd583135bb0762e6bfd0f2e06c50bea1fb3cd0 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas
-Date: Tue, 6 Apr 2021 22:02:17 +
-Subject: [PATCH] On ARM64 Linux access() syscall is no longer a real syscall
- to the kernel. Instead it's emulated by glibc with a new faccessat() syscall.
- (Icenowy Zheng)
-
- src/seccomp.c | 5 -
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/seccomp.c b/src/seccomp.c
-index 0da907ff7..81842cf5c 100644
a/src/seccomp.c
-+++ b/src/seccomp.c
-@@ -27,7 +27,7 @@
- #include "file.h"
-
- #ifndef lint
--FILE_RCSID("@(#)$File: seccomp.c,v 1.18 2021/03/14 17:01:58 christos Exp $")
-+FILE_RCSID("@(#)$File: seccomp.c,v 1.19 2021/04/06 22:02:17 christos Exp $")
- #endif/* lint */
-
- #if HAVE_LIBSECCOMP
-@@ -171,6 +171,9 @@ enable_sandbox_full(void)
- ALLOW_RULE(dup2);
- ALLOW_RULE(exit);
- ALLOW_RULE(exit_group);
-+#ifdef __NR_faccessat
-+ ALLOW_RULE(faccessat);
-+#endif
- ALLOW_RULE(fcntl);
- ALLOW_RULE(fcntl64);
- ALLOW_RULE(fstat);
diff --git a/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch
b/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch
deleted file mode 100644
index 57d04e5f40cf..
--- a/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From e3d0265a147878b6c2903bcc83b9842dff68ceb4 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert
-Date: Fri, 23 Apr 2021 15:00:42 -0400
-Subject: [PATCH] seccomp: allow fstatat64
-
-This is needed for the libsandbox LD_PRELOAD wrapper on Gentoo Linux.
-
-Bug: https://bugs.gentoo.org/784857
- src/seccomp.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/seccomp.c b/src/seccomp.c
-index 81842cf5..43abc684 100644
a/src/seccomp.c
-+++ b/src/seccomp.c
-@@ -178,6 +178,9 @@ enable_sandbox_full(void)
- ALLOW_RULE(fcntl64);
- ALLOW_RULE(fstat);
- ALLOW_RULE(fstat64);
-+#ifdef __NR_fstatat64
-+ ALLOW_RULE(fstatat64);
-+#endif
- ALLOW_RULE(futex);
- ALLOW_RULE(getdents);
- #ifdef __NR_getdents64
---
-2.31.1
-
diff --git
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 285c461f5388ff97351611a7365d0e64613d8761
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Jan 16 19:01:06 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Jan 16 19:06:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=285c461f
sys-apps/file: drop 5.40-r3
Signed-off-by: Mike Gilbert gentoo.org>
sys-apps/file/Manifest| 1 -
sys-apps/file/file-5.40-r3.ebuild | 148 --
2 files changed, 149 deletions(-)
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 34a37c9cebd6..8ae92ee49bed 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,2 +1 @@
-DIST file-5.40.tar.gz 1004214 BLAKE2B
4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074b3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf
SHA512
3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb
DIST file-5.41.tar.gz 1064097 BLAKE2B
56fe8a58d9497bb1bfe3ed6b3ce5df70dd27cc308eb0cfdac8e91ba81c733a96aa622c120ac59079986c6d84901c6f2d82fa24f698d481d7f77e6cfdd432d648
SHA512
bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654
diff --git a/sys-apps/file/file-5.40-r3.ebuild
b/sys-apps/file/file-5.40-r3.ebuild
deleted file mode 100644
index bb2ef20e0af9..
--- a/sys-apps/file/file-5.40-r3.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "" ]] ; then
- EGIT_REPO_URI="https://github.com/glensc/file.git;
- inherit autotools git-r3
-else
- SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzma python seccomp static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
- lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
- python? ( !dev-python/python-magic )
- seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
- "${FILESDIR}/file-5.40-xz_magic.patch" #784773
- "${FILESDIR}/file-5.40-seccomp-faccessat.patch"
- "${FILESDIR}/file-5.40-seccomp-fstatat64.patch" #784857
- "${FILESDIR}/file-5.40-revert-char-count.patch" #799188
- "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
-)
-
-src_prepare() {
- default
-
- if [[ ${PV} == ]] ; then
- eautoreconf
- fi
-
- elibtoolize
-
- # don't let python README kill main README #60043
- mv python/README.md python/README.python.md || die
- sed 's...@readme.md@README.python.md@' -i python/setup.py || die #662090
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-fsect-man5
- $(use_enable bzip2 bzlib)
- $(use_enable lzma xzlib)
- $(use_enable seccomp libseccomp)
- $(use_enable static-libs static)
- $(use_enable zlib)
- )
- econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
- local myeconfargs=(
- --disable-shared
- --disable-libseccomp
- --disable-bzlib
- --disable-xzlib
- --disable-zlib
- )
- tc-env_build econf "${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
- tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
- local ECONF_SOURCE="${S}"
-
- if need_build_file ; then
- mkdir -p "${WORKDIR}"/build || die
- cd "${WORKDIR}"/build || die
- build_src_configure
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi ; then
- emake
- else
- cd src || die
- emake magic.h #586444
- emake libmagic.la
- fi
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: aa6e02fbc6d33d73699760d86015035f685a8228
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Jan 16 19:02:42 2022 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Jan 16 19:06:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa6e02fb
sys-apps/file: use econf_build
Signed-off-by: Mike Gilbert gentoo.org>
sys-apps/file/file-5.41.ebuild | 4 ++--
sys-apps/file/file-.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-apps/file/file-5.41.ebuild b/sys-apps/file/file-5.41.ebuild
index a60b0fb70b25..b64e9a3a0156 100644
--- a/sys-apps/file/file-5.41.ebuild
+++ b/sys-apps/file/file-5.41.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -75,7 +75,7 @@ build_src_configure() {
--disable-xzlib
--disable-zlib
)
- tc-env_build econf "${myeconfargs[@]}"
+ econf_build "${myeconfargs[@]}"
}
need_build_file() {
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index 9e1359cd588f..75f6a558ae52 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -74,7 +74,7 @@ build_src_configure() {
--disable-xzlib
--disable-zlib
)
- tc-env_build econf "${myeconfargs[@]}"
+ econf_build "${myeconfargs[@]}"
}
need_build_file() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 3b4d6c2a32aa645d43233d2963cc7b419939a144
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Dec 14 20:10:41 2021 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Dec 14 20:11:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b4d6c2a
sys-apps/file: Stabilize 5.41 hppa, #829046
Signed-off-by: Arthur Zamarin gentoo.org>
sys-apps/file/file-5.41.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.41.ebuild b/sys-apps/file/file-5.41.ebuild
index 5e5adf846a0a..a60b0fb70b25 100644
--- a/sys-apps/file/file-5.41.ebuild
+++ b/sys-apps/file/file-5.41.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 148a5e44202fad7bf18ad3229d78515c9b843e68
Author: Arthur Zamarin gentoo org>
AuthorDate: Mon Dec 13 18:50:44 2021 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Mon Dec 13 18:51:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=148a5e44
sys-apps/file: Stabilize 5.41 arm, #829046
Signed-off-by: Arthur Zamarin gentoo.org>
sys-apps/file/file-5.41.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.41.ebuild b/sys-apps/file/file-5.41.ebuild
index ae063f753b7d..5e5adf846a0a 100644
--- a/sys-apps/file/file-5.41.ebuild
+++ b/sys-apps/file/file-5.41.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: c0b046c0c97e744752f5d25e24b627146806fd2b
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Dec 13 07:03:25 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Dec 13 07:03:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b046c0
sys-apps/file: ppc stable wrt bug #829046
Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-apps/file/file-5.41.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.41.ebuild b/sys-apps/file/file-5.41.ebuild
index 78fa54113295..1caba98cad7b 100644
--- a/sys-apps/file/file-5.41.ebuild
+++ b/sys-apps/file/file-5.41.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 69c064790fdef5b54832d70a689c978783f5ce55
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Dec 13 07:01:48 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Dec 13 07:01:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69c06479
sys-apps/file: x86 stable wrt bug #829046
Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-apps/file/file-5.41.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.41.ebuild b/sys-apps/file/file-5.41.ebuild
index d52a3a10e40a..78fa54113295 100644
--- a/sys-apps/file/file-5.41.ebuild
+++ b/sys-apps/file/file-5.41.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: d0998a293f552f14d8b08554cfd11a9f6c31c90a
Author: Agostino Sarubbo gentoo org>
AuthorDate: Mon Dec 13 06:57:33 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Mon Dec 13 06:57:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0998a29
sys-apps/file: amd64 stable wrt bug #829046
Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-apps/file/file-5.41.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.41.ebuild b/sys-apps/file/file-5.41.ebuild
index dc056fc0413e..d52a3a10e40a 100644
--- a/sys-apps/file/file-5.41.ebuild
+++ b/sys-apps/file/file-5.41.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 9d8281200ffab9289fe5ff89cc9eeeac54e6
Author: Sam James gentoo org>
AuthorDate: Mon Dec 13 06:22:16 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Dec 13 06:22:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d8281ff
sys-apps/file: Stabilize 5.41 ppc64, #829046
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.41.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.41.ebuild b/sys-apps/file/file-5.41.ebuild
index 79cf816d57da..dc056fc0413e 100644
--- a/sys-apps/file/file-5.41.ebuild
+++ b/sys-apps/file/file-5.41.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: ea48cbc24e8eedf0a508ce26b9b33f33c438801d
Author: Sam James gentoo org>
AuthorDate: Mon Dec 13 06:17:07 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Dec 13 06:17:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea48cbc2
sys-apps/file: Stabilize 5.41 sparc, #829046
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.41.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.41.ebuild b/sys-apps/file/file-5.41.ebuild
index cb9244c374de..79cf816d57da 100644
--- a/sys-apps/file/file-5.41.ebuild
+++ b/sys-apps/file/file-5.41.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 18fcd439557ad7bead7db8e9113adfdc820652e9
Author: Lars Wendler gentoo org>
AuthorDate: Tue Oct 19 10:11:27 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Oct 19 10:11:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18fcd439
sys-apps/file: Bump to version 5.41
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/file/Manifest | 1 +
sys-apps/file/file-5.41.ebuild | 144 +
2 files changed, 145 insertions(+)
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 87042e9a832..34a37c9cebd 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1 +1,2 @@
DIST file-5.40.tar.gz 1004214 BLAKE2B
4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074b3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf
SHA512
3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb
+DIST file-5.41.tar.gz 1064097 BLAKE2B
56fe8a58d9497bb1bfe3ed6b3ce5df70dd27cc308eb0cfdac8e91ba81c733a96aa622c120ac59079986c6d84901c6f2d82fa24f698d481d7f77e6cfdd432d648
SHA512
bbf2d8e39450b31d0ba8d76d202790fea953775657f942f06e6dc9091798d4a395f7205e542388e4a25b6a4506d07f36c5c4da37cfce0734133e9203a3b00654
diff --git a/sys-apps/file/file-5.41.ebuild b/sys-apps/file/file-5.41.ebuild
new file mode 100644
index 000..cb9244c374d
--- /dev/null
+++ b/sys-apps/file/file-5.41.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "" ]] ; then
+ EGIT_REPO_URI="https://github.com/glensc/file.git;
+ inherit autotools git-r3
+else
+ SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
+ 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"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/;
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+ bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+ lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+ python? ( !dev-python/python-magic )
+ seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+ "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
+)
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == ]] ; then
+ eautoreconf
+ fi
+
+ elibtoolize
+
+ # don't let python README kill main README #60043
+ mv python/README.md python/README.python.md || die
+ sed 's...@readme.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --enable-fsect-man5
+ $(use_enable bzip2 bzlib)
+ $(use_enable lzma xzlib)
+ $(use_enable seccomp libseccomp)
+ $(use_enable static-libs static)
+ $(use_enable zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+ local myeconfargs=(
+ --disable-shared
+ --disable-libseccomp
+ --disable-bzlib
+ --disable-xzlib
+ --disable-zlib
+ )
+ tc-env_build econf "${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
+ tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+ local ECONF_SOURCE="${S}"
+
+ if need_build_file ; then
+ mkdir -p "${WORKDIR}"/build || die
+ cd "${WORKDIR}"/build || die
+ build_src_configure
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi ; then
+ emake
+ else
+ cd src || die
+ emake magic.h #586444
+ emake libmagic.la
+ fi
+}
+
+src_compile() {
+ if need_build_file ; then
+ emake -C "${WORKDIR}"/build/src magic.h #586444
+ emake -C "${WORKDIR}"/build/src file
+ local -x PATH="${WORKDIR}/build/src:${PATH}"
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 0ebe99a6753e527c36c9d3cb8f62418c13ec84a8
Author: David Seifert gentoo org>
AuthorDate: Sun Oct 3 11:27:50 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sun Oct 3 11:27:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebe99a6
sys-apps/file: drop 5.40-r2
Signed-off-by: David Seifert gentoo.org>
sys-apps/file/file-5.40-r2.ebuild | 146 --
1 file changed, 146 deletions(-)
diff --git a/sys-apps/file/file-5.40-r2.ebuild
b/sys-apps/file/file-5.40-r2.ebuild
deleted file mode 100644
index 74b875bde52..000
--- a/sys-apps/file/file-5.40-r2.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "" ]] ; then
- EGIT_REPO_URI="https://github.com/glensc/file.git;
- inherit autotools git-r3
-else
- SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzma python seccomp static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
- lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
- python? ( !dev-python/python-magic )
- seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
- "${FILESDIR}/file-5.40-xz_magic.patch" #784773
- "${FILESDIR}/file-5.40-seccomp-faccessat.patch"
- "${FILESDIR}/file-5.40-seccomp-fstatat64.patch" #784857
-)
-
-src_prepare() {
- default
-
- if [[ ${PV} == ]] ; then
- eautoreconf
- fi
-
- elibtoolize
-
- # don't let python README kill main README #60043
- mv python/README.md python/README.python.md || die
- sed 's...@readme.md@README.python.md@' -i python/setup.py || die #662090
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-fsect-man5
- $(use_enable bzip2 bzlib)
- $(use_enable lzma xzlib)
- $(use_enable seccomp libseccomp)
- $(use_enable static-libs static)
- $(use_enable zlib)
- )
- econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
- local myeconfargs=(
- --disable-shared
- --disable-libseccomp
- --disable-bzlib
- --disable-xzlib
- --disable-zlib
- )
- tc-env_build econf "${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
- tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
- local ECONF_SOURCE="${S}"
-
- if need_build_file ; then
- mkdir -p "${WORKDIR}"/build || die
- cd "${WORKDIR}"/build || die
- build_src_configure
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi ; then
- emake
- else
- cd src || die
- emake magic.h #586444
- emake libmagic.la
- fi
-}
-
-src_compile() {
- if need_build_file ; then
- emake -C "${WORKDIR}"/build/src magic.h #586444
- emake -C "${WORKDIR}"/build/src file
- local -x PATH="${WORKDIR}/build/src:${PATH}"
- fi
- multilib-minimal_src_compile
-
- if use python ; then
- cd python || die
- distutils-r1_src_compile
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi ; then
- default
- else
- emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES}
DESTDIR="${D}"
- fi
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog MAINT README
-
- # Required for `file -C`
- insinto /usr/share/misc/magic
- doins -r magic/Magdir/*
-
- if use python ; then
- cd python || die
- distutils-r1_src_install
- fi
- find "${ED}" -type f -name "*.la" -delete || die
-}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/, sys-apps/file/
commit: 2e20ec0fa649b0720f862615c6099b947848fd3c
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Jul 18 17:46:26 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Jul 18 17:46:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e20ec0f
sys-apps/file: fix seccomp build failure with musl
Closes: https://bugs.gentoo.org/789336
Signed-off-by: Mike Gilbert gentoo.org>
sys-apps/file/file-5.40-r3.ebuild | 1 +
.../files/file-5.40-seccomp-fstatat64-musl.patch | 31 ++
2 files changed, 32 insertions(+)
diff --git a/sys-apps/file/file-5.40-r3.ebuild
b/sys-apps/file/file-5.40-r3.ebuild
index 90b41899e80..7cb5ba7a5cd 100644
--- a/sys-apps/file/file-5.40-r3.ebuild
+++ b/sys-apps/file/file-5.40-r3.ebuild
@@ -42,6 +42,7 @@ PATCHES=(
"${FILESDIR}/file-5.40-seccomp-faccessat.patch"
"${FILESDIR}/file-5.40-seccomp-fstatat64.patch" #784857
"${FILESDIR}/file-5.40-revert-char-count.patch" #799188
+ "${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not
upstream yet
)
src_prepare() {
diff --git a/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
b/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
new file mode 100644
index 000..4cc64801786
--- /dev/null
+++ b/sys-apps/file/files/file-5.40-seccomp-fstatat64-musl.patch
@@ -0,0 +1,31 @@
+From 8c13923a8e17a02be0989649b2edc20124816729 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Tue, 15 Jun 2021 16:08:22 -0400
+Subject: [PATCH] seccomp: undef fstatat64 to avoid build failure on musl
+
+sys/stat.h in musl does this:
+
+ #define fstatat64 fstatat
+
+Counteract this with an #undef.
+
+Bug: https://bugs.gentoo.org/789336
+---
+ src/seccomp.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index 3318367c..eb8b1e57 100644
+--- a/src/seccomp.c
b/src/seccomp.c
+@@ -179,6 +179,7 @@ enable_sandbox_full(void)
+ ALLOW_RULE(fstat);
+ ALLOW_RULE(fstat64);
+ #ifdef __NR_fstatat64
++#undef fstatat64
+ ALLOW_RULE(fstatat64);
+ #endif
+ ALLOW_RULE(futex);
+--
+2.32.0
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: ec9c31915f702a62404366212874cbc786bba469
Author: Sam James gentoo org>
AuthorDate: Wed Jul 14 03:11:45 2021 +
Commit: Sam James gentoo org>
CommitDate: Wed Jul 14 03:11:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec9c3191
sys-apps/file: Stabilize 5.40-r3 arm, #800851
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.40-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.40-r3.ebuild
b/sys-apps/file/file-5.40-r3.ebuild
index a35b94c33d9..90b41899e80 100644
--- a/sys-apps/file/file-5.40-r3.ebuild
+++ b/sys-apps/file/file-5.40-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: b0ae2e9b89801980b0a150afdad4d4dd53817034
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Wed Jul 7 14:05:55 2021 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Wed Jul 7 14:22:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0ae2e9b
sys-apps/file: stable 5.40-r3 for hppa, bug #800851
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
sys-apps/file/file-5.40-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.40-r3.ebuild
b/sys-apps/file/file-5.40-r3.ebuild
index 2e39c4c558c..879174d8cc3 100644
--- a/sys-apps/file/file-5.40-r3.ebuild
+++ b/sys-apps/file/file-5.40-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: c3d0264973bea20703422e34ee1081a1e8913812
Author: Agostino Sarubbo gentoo org>
AuthorDate: Wed Jul 7 06:30:40 2021 +
Commit: Agostino Sarubbo gentoo org>
CommitDate: Wed Jul 7 06:30:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d02649
sys-apps/file: amd64 stable wrt bug #800851
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo gentoo.org>
sys-apps/file/file-5.40-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.40-r3.ebuild
b/sys-apps/file/file-5.40-r3.ebuild
index 2e7e19d9e30..2e39c4c558c 100644
--- a/sys-apps/file/file-5.40-r3.ebuild
+++ b/sys-apps/file/file-5.40-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: d233774b3e1ae97e09eb21d3eee6654b39130c1b
Author: Sam James gentoo org>
AuthorDate: Tue Jul 6 23:21:11 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Jul 6 23:21:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d233774b
sys-apps/file: Stabilize 5.40-r3 ppc64, #800851
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.40-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.40-r3.ebuild
b/sys-apps/file/file-5.40-r3.ebuild
index 50d240c0daf..2e7e19d9e30 100644
--- a/sys-apps/file/file-5.40-r3.ebuild
+++ b/sys-apps/file/file-5.40-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 3e2b03236300a10a5b0dde1a4c0873c05efc5b54
Author: Sam James gentoo org>
AuthorDate: Tue Jul 6 18:01:46 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Jul 6 18:01:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e2b0323
sys-apps/file: Stabilize 5.40-r3 ppc, #800851
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.40-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.40-r3.ebuild
b/sys-apps/file/file-5.40-r3.ebuild
index d042faf4ce4..50d240c0daf 100644
--- a/sys-apps/file/file-5.40-r3.ebuild
+++ b/sys-apps/file/file-5.40-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 44f871c078f185da5faeb1f438a5f9bbbe0fd764
Author: Sam James gentoo org>
AuthorDate: Tue Jul 6 18:01:42 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Jul 6 18:01:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44f871c0
sys-apps/file: Stabilize 5.40-r3 sparc, #800851
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.40-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.40-r3.ebuild
b/sys-apps/file/file-5.40-r3.ebuild
index 7fd5ac3b71b..d042faf4ce4 100644
--- a/sys-apps/file/file-5.40-r3.ebuild
+++ b/sys-apps/file/file-5.40-r3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/
commit: 68e24256a0449b2a27e44879f95171780f21526b
Author: Ulrich Müller gentoo org>
AuthorDate: Tue Jun 29 08:09:10 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Jun 29 08:29:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68e24256
sys-apps/file: Fix character count heuristic
This restores behaviour of file-5.39, i.e. correctly identifies small
text files as text/plain rather than application/octet-stream again.
Patch taken from upstream and (trivially) backported to 5.40.
Closes: https://bugs.gentoo.org/799188
Bug: https://bugs.astron.com/view.php?id=261
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Ulrich Müller gentoo.org>
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/file/file-5.40-r3.ebuild | 147 +
.../file/files/file-5.40-revert-char-count.patch | 49 +++
2 files changed, 196 insertions(+)
diff --git a/sys-apps/file/file-5.40-r3.ebuild
b/sys-apps/file/file-5.40-r3.ebuild
new file mode 100644
index 000..7fd5ac3b71b
--- /dev/null
+++ b/sys-apps/file/file-5.40-r3.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "" ]] ; then
+ EGIT_REPO_URI="https://github.com/glensc/file.git;
+ inherit autotools git-r3
+else
+ SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
+ 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"
+fi
+
+DESCRIPTION="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/;
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+ bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+ lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+ python? ( !dev-python/python-magic )
+ seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+ "${FILESDIR}/file-5.40-xz_magic.patch" #784773
+ "${FILESDIR}/file-5.40-seccomp-faccessat.patch"
+ "${FILESDIR}/file-5.40-seccomp-fstatat64.patch" #784857
+ "${FILESDIR}/file-5.40-revert-char-count.patch" #799188
+)
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == ]] ; then
+ eautoreconf
+ fi
+
+ elibtoolize
+
+ # don't let python README kill main README #60043
+ mv python/README.md python/README.python.md || die
+ sed 's...@readme.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --enable-fsect-man5
+ $(use_enable bzip2 bzlib)
+ $(use_enable lzma xzlib)
+ $(use_enable seccomp libseccomp)
+ $(use_enable static-libs static)
+ $(use_enable zlib)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+ local myeconfargs=(
+ --disable-shared
+ --disable-libseccomp
+ --disable-bzlib
+ --disable-xzlib
+ --disable-zlib
+ )
+ tc-env_build econf "${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
+ tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+ local ECONF_SOURCE="${S}"
+
+ if need_build_file ; then
+ mkdir -p "${WORKDIR}"/build || die
+ cd "${WORKDIR}"/build || die
+ build_src_configure
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi ; then
+ emake
+ else
+ cd src || die
+ emake magic.h #586444
+ emake libmagic.la
+ fi
+}
+
+src_compile() {
+ if need_build_file ; then
+ emake -C "${WORKDIR}"/build/src magic.h #586444
+ emake -C "${WORKDIR}"/build/src file
+ local -x PATH="${WORKDIR}/build/src:${PATH}"
+ fi
+ multilib-minimal_src_compile
+
+ if use python ; then
+ cd python || die
+ distutils-r1_src_compile
+ fi
+}
+
+multilib_src_install() {
+ if
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 052f09d4e94f2c197e936a8efb35062c5bd4cb60
Author: Michał Górny gentoo org>
AuthorDate: Wed Jun 9 07:39:41 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Wed Jun 9 07:41:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=052f09d4
sys-apps/file: Enable py3.10
Signed-off-by: Michał Górny gentoo.org>
sys-apps/file/file-5.40-r2.ebuild | 2 +-
sys-apps/file/file-.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sys-apps/file/file-5.40-r2.ebuild
b/sys-apps/file/file-5.40-r2.ebuild
index 03607930389..74b875bde52 100644
--- a/sys-apps/file/file-5.40-r2.ebuild
+++ b/sys-apps/file/file-5.40-r2.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_OPTIONAL=1
inherit distutils-r1 libtool toolchain-funcs multilib-minimal
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index 67c33d9f485..9e1359cd588 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
DISTUTILS_OPTIONAL=1
inherit distutils-r1 libtool toolchain-funcs multilib-minimal
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/
commit: 569ba84b15b51f0a0ee9bdff795a7455e67b4404
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Apr 25 18:12:40 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Apr 25 18:13:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=569ba84b
sys-apps/file: drop 5.39-r4
Signed-off-by: Mike Gilbert gentoo.org>
sys-apps/file/Manifest | 1 -
sys-apps/file/file-5.39-r4.ebuild | 146 -
.../file/files/file-5.39-add-missing-termios.patch | 30 -
.../file/files/file-5.39-allow-futex-seccomp.patch | 18 ---
sys-apps/file/files/file-5.39-seccomp-musl.patch | 37 --
5 files changed, 232 deletions(-)
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 128c4b0fb4f..87042e9a832 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,2 +1 @@
-DIST file-5.39.tar.gz 954266 BLAKE2B
4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3470230d91aaf9ce5d35bcaceb32d551ca5a391fc8c40b64517fdb996833a8b1ca47ced7e92e9e545d2682
SHA512
9cf1a7b769c56eb6f5b25c66ce85fa1300128396e445b2e53dbbd8951e5da973a7a07c4ef9f7ebd1fe945d47bdaf2cd9ef09bd2be6c217a0bcb907d9449835e6
DIST file-5.40.tar.gz 1004214 BLAKE2B
4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074b3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf
SHA512
3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb
diff --git a/sys-apps/file/file-5.39-r4.ebuild
b/sys-apps/file/file-5.39-r4.ebuild
deleted file mode 100644
index 9a001b6a073..000
--- a/sys-apps/file/file-5.39-r4.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "" ]] ; then
- EGIT_REPO_URI="https://github.com/glensc/file.git;
- inherit autotools git-r3
-else
- SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzma python seccomp static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
- bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
- lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
- python? (
- ${PYTHON_DEPS}
- dev-python/setuptools[${PYTHON_USEDEP}]
- )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
- python? ( !dev-python/python-magic )
- seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
-
-PATCHES=(
- "${FILESDIR}/file-5.39-add-missing-termios.patch" #728416
- "${FILESDIR}/file-5.39-seccomp-musl.patch"
- "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
- "${FILESDIR}/file-5.39-allow-futex-seccomp.patch" #771096
-)
-
-src_prepare() {
- default
-
- if [[ ${PV} == ]]; then
- eautoreconf
- fi
-
- elibtoolize
-
- # don't let python README kill main README #60043
- mv python/README.md python/README.python.md || die
- sed 's...@readme.md@README.python.md@' -i python/setup.py || die #662090
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-fsect-man5
- $(use_enable bzip2 bzlib)
- $(use_enable lzma xzlib)
- $(use_enable seccomp libseccomp)
- $(use_enable static-libs static)
- $(use_enable zlib)
- )
- econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
- local myeconfargs=(
- --disable-shared
- --disable-libseccomp
- --disable-bzlib
- --disable-xzlib
- --disable-zlib
- )
- tc-env_build econf "${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
- tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
- local ECONF_SOURCE=${S}
-
- if need_build_file; then
- mkdir -p "${WORKDIR}"/build || die
- cd "${WORKDIR}"/build || die
- build_src_configure
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi ; then
- emake
- else
- cd src || die
- emake magic.h
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 68901d6b9aefc6335dad43bc9eabbca0485fa29b
Author: Sam James gentoo org>
AuthorDate: Sun Apr 25 10:33:11 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 25 10:33:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68901d6b
sys-apps/file: Stabilize 5.40-r2 arm64, #785292
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.40-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.40-r2.ebuild
b/sys-apps/file/file-5.40-r2.ebuild
index fb586956b33..03607930389 100644
--- a/sys-apps/file/file-5.40-r2.ebuild
+++ b/sys-apps/file/file-5.40-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 77bd4232676dfcadd0d11ac68bf591211d8f4aaf
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Sun Apr 25 08:42:39 2021 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Apr 25 08:56:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77bd4232
sys-apps/file: stable 5.40-r2 for hppa, bug #785292
Package-Manager: Portage-3.0.17, Repoman-3.0.2
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer sf-mail.de>
Signed-off-by: Sergei Trofimovich gentoo.org>
sys-apps/file/file-5.40-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.40-r2.ebuild
b/sys-apps/file/file-5.40-r2.ebuild
index 650001c2ea3..fb586956b33 100644
--- a/sys-apps/file/file-5.40-r2.ebuild
+++ b/sys-apps/file/file-5.40-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: f88608173b899979b80a09512353c49311f9cd88
Author: Sam James gentoo org>
AuthorDate: Sun Apr 25 05:15:47 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 25 05:15:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8860817
sys-apps/file: Stabilize 5.40-r2 sparc, #785292
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.40-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.40-r2.ebuild
b/sys-apps/file/file-5.40-r2.ebuild
index 09ae37a9c7b..650001c2ea3 100644
--- a/sys-apps/file/file-5.40-r2.ebuild
+++ b/sys-apps/file/file-5.40-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 4fdf2278a8f2df8ad4afe4346fbc21786f078175
Author: Sam James gentoo org>
AuthorDate: Sun Apr 25 05:14:18 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 25 05:14:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fdf2278
sys-apps/file: Stabilize 5.40-r2 arm, #785292
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.40-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.40-r2.ebuild
b/sys-apps/file/file-5.40-r2.ebuild
index f18f1863657..09ae37a9c7b 100644
--- a/sys-apps/file/file-5.40-r2.ebuild
+++ b/sys-apps/file/file-5.40-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: d656c398ddbe1e4033bd78b90da0745789fb5ac9
Author: Sam James gentoo org>
AuthorDate: Sun Apr 25 05:10:40 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 25 05:10:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d656c398
sys-apps/file: Stabilize 5.40-r2 x86, #785292
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.40-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.40-r2.ebuild
b/sys-apps/file/file-5.40-r2.ebuild
index 4a02e27da19..a5173f83bf7 100644
--- a/sys-apps/file/file-5.40-r2.ebuild
+++ b/sys-apps/file/file-5.40-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 411851489d7aad3a5db39fe1f53502647449e393
Author: Sam James gentoo org>
AuthorDate: Sun Apr 25 05:09:23 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Apr 25 05:09:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41185148
sys-apps/file: Stabilize 5.40-r2 amd64, #785292
Signed-off-by: Sam James gentoo.org>
sys-apps/file/file-5.40-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys-apps/file/file-5.40-r2.ebuild
b/sys-apps/file/file-5.40-r2.ebuild
index f46a59bccfa..4a02e27da19 100644
--- a/sys-apps/file/file-5.40-r2.ebuild
+++ b/sys-apps/file/file-5.40-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "" ]] ; then
inherit autotools git-r3
else
SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz;
- 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"
+ 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"
fi
DESCRIPTION="identify a file's format by scanning binary data for patterns"
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/, sys-apps/file/
commit: 0813d843cb2a43c748fdf6c9d5ac6dc882104dcf
Author: Mike Gilbert gentoo org>
AuthorDate: Fri Apr 23 19:10:09 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Fri Apr 23 19:10:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0813d843
sys-apps/file: allow faccessat and fstatat64 syscalls
Closes: https://bugs.gentoo.org/784857
Signed-off-by: Mike Gilbert gentoo.org>
.../{file-5.40-r1.ebuild => file-5.40-r2.ebuild} | 2 ++
.../file/files/file-5.40-seccomp-faccessat.patch | 34 ++
.../file/files/file-5.40-seccomp-fstatat64.patch | 29 ++
3 files changed, 65 insertions(+)
diff --git a/sys-apps/file/file-5.40-r1.ebuild
b/sys-apps/file/file-5.40-r2.ebuild
similarity index 96%
rename from sys-apps/file/file-5.40-r1.ebuild
rename to sys-apps/file/file-5.40-r2.ebuild
index a901c2a4003..f46a59bccfa 100644
--- a/sys-apps/file/file-5.40-r1.ebuild
+++ b/sys-apps/file/file-5.40-r2.ebuild
@@ -39,6 +39,8 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
"${FILESDIR}/file-5.40-xz_magic.patch" #784773
+ "${FILESDIR}/file-5.40-seccomp-faccessat.patch"
+ "${FILESDIR}/file-5.40-seccomp-fstatat64.patch" #784857
)
src_prepare() {
diff --git a/sys-apps/file/files/file-5.40-seccomp-faccessat.patch
b/sys-apps/file/files/file-5.40-seccomp-faccessat.patch
new file mode 100644
index 000..4aeb88cfe87
--- /dev/null
+++ b/sys-apps/file/files/file-5.40-seccomp-faccessat.patch
@@ -0,0 +1,34 @@
+From abcd583135bb0762e6bfd0f2e06c50bea1fb3cd0 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas
+Date: Tue, 6 Apr 2021 22:02:17 +
+Subject: [PATCH] On ARM64 Linux access() syscall is no longer a real syscall
+ to the kernel. Instead it's emulated by glibc with a new faccessat() syscall.
+ (Icenowy Zheng)
+
+---
+ src/seccomp.c | 5 -
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index 0da907ff7..81842cf5c 100644
+--- a/src/seccomp.c
b/src/seccomp.c
+@@ -27,7 +27,7 @@
+ #include "file.h"
+
+ #ifndef lint
+-FILE_RCSID("@(#)$File: seccomp.c,v 1.18 2021/03/14 17:01:58 christos Exp $")
++FILE_RCSID("@(#)$File: seccomp.c,v 1.19 2021/04/06 22:02:17 christos Exp $")
+ #endif/* lint */
+
+ #if HAVE_LIBSECCOMP
+@@ -171,6 +171,9 @@ enable_sandbox_full(void)
+ ALLOW_RULE(dup2);
+ ALLOW_RULE(exit);
+ ALLOW_RULE(exit_group);
++#ifdef __NR_faccessat
++ ALLOW_RULE(faccessat);
++#endif
+ ALLOW_RULE(fcntl);
+ ALLOW_RULE(fcntl64);
+ ALLOW_RULE(fstat);
diff --git a/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch
b/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch
new file mode 100644
index 000..57d04e5f40c
--- /dev/null
+++ b/sys-apps/file/files/file-5.40-seccomp-fstatat64.patch
@@ -0,0 +1,29 @@
+From e3d0265a147878b6c2903bcc83b9842dff68ceb4 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Fri, 23 Apr 2021 15:00:42 -0400
+Subject: [PATCH] seccomp: allow fstatat64
+
+This is needed for the libsandbox LD_PRELOAD wrapper on Gentoo Linux.
+
+Bug: https://bugs.gentoo.org/784857
+---
+ src/seccomp.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index 81842cf5..43abc684 100644
+--- a/src/seccomp.c
b/src/seccomp.c
+@@ -178,6 +178,9 @@ enable_sandbox_full(void)
+ ALLOW_RULE(fcntl64);
+ ALLOW_RULE(fstat);
+ ALLOW_RULE(fstat64);
++#ifdef __NR_fstatat64
++ ALLOW_RULE(fstatat64);
++#endif
+ ALLOW_RULE(futex);
+ ALLOW_RULE(getdents);
+ #ifdef __NR_getdents64
+--
+2.31.1
+
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/
commit: bb949123596216a8af1a18b1ba4f396919a2d976
Author: Lars Wendler gentoo org>
AuthorDate: Wed Apr 21 09:41:58 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Apr 21 09:42:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb949123
sys-apps/file: Revbump to fix xz magic
Thanks-to: Mike Auty gentoo.org>
Closes: https://bugs.gentoo.org/784773
Signed-off-by: Lars Wendler gentoo.org>
.../file/{file-5.40.ebuild => file-5.40-r1.ebuild} | 1 +
sys-apps/file/files/file-5.40-xz_magic.patch | 37 ++
2 files changed, 38 insertions(+)
diff --git a/sys-apps/file/file-5.40.ebuild b/sys-apps/file/file-5.40-r1.ebuild
similarity index 98%
rename from sys-apps/file/file-5.40.ebuild
rename to sys-apps/file/file-5.40-r1.ebuild
index 67c33d9f485..a901c2a4003 100644
--- a/sys-apps/file/file-5.40.ebuild
+++ b/sys-apps/file/file-5.40-r1.ebuild
@@ -38,6 +38,7 @@ RDEPEND="${DEPEND}
PATCHES=(
"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
+ "${FILESDIR}/file-5.40-xz_magic.patch" #784773
)
src_prepare() {
diff --git a/sys-apps/file/files/file-5.40-xz_magic.patch
b/sys-apps/file/files/file-5.40-xz_magic.patch
new file mode 100644
index 000..e4fed0421f7
--- /dev/null
+++ b/sys-apps/file/files/file-5.40-xz_magic.patch
@@ -0,0 +1,37 @@
+From 9b0459afab309a82aa4e46f73a4e50dd641f3d39 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas
+Date: Mon, 19 Apr 2021 17:01:45 +
+Subject: [PATCH] PR/257: cuihao: put attributes inside the xz magic.
+
+---
+ magic/Magdir/compress | 7 +++
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/magic/Magdir/compress b/magic/Magdir/compress
+index 64d11a736..41a65738f 100644
+--- a/magic/Magdir/compress
b/magic/Magdir/compress
+@@ -1,5 +1,5 @@
+
#--
+-# $File: compress,v 1.80 2021/03/15 17:49:24 christos Exp $
++# $File: compress,v 1.81 2021/04/19 17:01:45 christos Exp $
+ # compress: file(1) magic for pure-compression formats (no archives)
+ #
+ # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.
+@@ -265,14 +265,13 @@
+
+ # http://tukaani.org/xz/xz-file-format.txt
+ 0 ustring \xFD7zXZ\x00XZ compressed data, checksum
++!:strength * 2
++!:mimeapplication/x-xz
+ >7byte&0xf0x0 NONE
+ >7byte&0xf0x1 CRC32
+ >7byte&0xf0x4 CRC64
+ >7byte&0xf0xa SHA-256
+
+-!:strength * 2
+-!:mimeapplication/x-xz
+-
+ # https://github.com/ckolivas/lrzip/blob/master/doc/magic.header.txt
+ 0 string LRZILRZIP compressed data
+ >4bytex - version %d
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: b4cb65e51776c80c7c6d51a243fa298bbcc09497
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Apr 18 16:20:52 2021 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Apr 18 16:21:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4cb65e5
sys-apps/file: drop redundant dodir
Signed-off-by: Mike Gilbert gentoo.org>
sys-apps/file/file-5.39-r4.ebuild | 1 -
sys-apps/file/file-5.40.ebuild| 1 -
sys-apps/file/file-.ebuild| 1 -
3 files changed, 3 deletions(-)
diff --git a/sys-apps/file/file-5.39-r4.ebuild
b/sys-apps/file/file-5.39-r4.ebuild
index 9f5f522c9cf..9a001b6a073 100644
--- a/sys-apps/file/file-5.39-r4.ebuild
+++ b/sys-apps/file/file-5.39-r4.ebuild
@@ -135,7 +135,6 @@ multilib_src_install_all() {
dodoc ChangeLog MAINT README
# Required for `file -C`
- dodir /usr/share/misc/magic
insinto /usr/share/misc/magic
doins -r magic/Magdir/*
diff --git a/sys-apps/file/file-5.40.ebuild b/sys-apps/file/file-5.40.ebuild
index 76a8c3e996e..67c33d9f485 100644
--- a/sys-apps/file/file-5.40.ebuild
+++ b/sys-apps/file/file-5.40.ebuild
@@ -132,7 +132,6 @@ multilib_src_install_all() {
dodoc ChangeLog MAINT README
# Required for `file -C`
- dodir /usr/share/misc/magic
insinto /usr/share/misc/magic
doins -r magic/Magdir/*
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index 76a8c3e996e..67c33d9f485 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -132,7 +132,6 @@ multilib_src_install_all() {
dodoc ChangeLog MAINT README
# Required for `file -C`
- dodir /usr/share/misc/magic
insinto /usr/share/misc/magic
doins -r magic/Magdir/*
[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/
commit: 7e8dcf9253be079020e8cf997b127a7bf020ce59
Author: Lars Wendler gentoo org>
AuthorDate: Wed Mar 31 08:01:42 2021 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Mar 31 08:03:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e8dcf92
sys-apps/file: Synced live ebuild
Signed-off-by: Lars Wendler gentoo.org>
sys-apps/file/file-.ebuild | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index 8e6aab3b29e..76a8c3e996e 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -43,7 +43,7 @@ PATCHES=(
src_prepare() {
default
- if [[ ${PV} == ]]; then
+ if [[ ${PV} == ]] ; then
eautoreconf
fi
@@ -85,9 +85,9 @@ need_build_file() {
}
src_configure() {
- local ECONF_SOURCE=${S}
+ local ECONF_SOURCE="${S}"
- if need_build_file; then
+ if need_build_file ; then
mkdir -p "${WORKDIR}"/build || die
cd "${WORKDIR}"/build || die
build_src_configure
@@ -107,7 +107,7 @@ multilib_src_compile() {
}
src_compile() {
- if need_build_file; then
+ if need_build_file ; then
emake -C "${WORKDIR}"/build/src magic.h #586444
emake -C "${WORKDIR}"/build/src file
local -x PATH="${WORKDIR}/build/src:${PATH}"
