[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/

2023-10-19 Thread Mike Gilbert 
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/, sys-apps/file/files/

2023-08-01 Thread Sam James 
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/, sys-apps/file/files/

2022-12-31 Thread Sam James 
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/, sys-apps/file/files/

2022-10-28 Thread Sam James 
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/, sys-apps/file/files/

2022-08-15 Thread Sam James 
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/, sys-apps/file/files/

2021-06-29 Thread Lars Wendler 
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/, sys-apps/file/files/

2021-04-25 Thread Mike Gilbert 
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/, sys-apps/file/files/

2021-04-21 Thread Lars Wendler 
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/, sys-apps/file/files/

2020-06-27 Thread Georgy Yakovlev 
commit: 3d32972fa6671b911726d7a2abd4128afd35a36b
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Sun Jun 28 02:07:30 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Sun Jun 28 02:08:13 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d32972f

sys-apps/file: revbump 5.39, add include termios.h patch

Closes: https://bugs.gentoo.org/728416
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Acked-by: Lars Wendler  gentoo.org>
Signed-off-by: Georgy Yakovlev  gentoo.org>

 sys-apps/file/file-5.39-r2.ebuild  | 141 +
 .../file/files/file-5.39-add-missing-termios.patch |  27 
 2 files changed, 168 insertions(+)

diff --git a/sys-apps/file/file-5.39-r2.ebuild 
b/sys-apps/file/file-5.39-r2.ebuild
new file mode 100644
index 000..204826c0d4d
--- /dev/null
+++ b/sys-apps/file/file-5.39-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/glensc/file.git;
+   inherit 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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}/${PN}-5.39-portage_sandbox.patch" #713710 #728978
+   "${FILESDIR}/${P}-add-missing-termios.patch" #728416
+)
+
+src_prepare() {
+   default
+   eautoreconf
+   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`
+   dodir /usr/share/misc/magic
+   insinto /usr/share/misc/magic
+   doins -r magic/Magdir/*
+
+   if use python ; then
+   cd python || die
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/

2020-06-15 Thread Lars Wendler 
commit: 6da8c8078434cfa0e3ec7334de28b27467a0a0b5
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jun 15 08:02:37 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jun 15 08:09:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da8c807

sys-apps/file: Bump to version 5.39

Closes: https://bugs.gentoo.org/713710
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/file/Manifest |   1 +
 sys-apps/file/file-5.39.ebuild | 140 +
 .../file/files/file-5.39-seccomp_sandbox.patch |  13 ++
 3 files changed, 154 insertions(+)

diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 998712fc785..42c17cea294 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,2 +1,3 @@
 DIST file-5.37.tar.gz 887682 BLAKE2B 
c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7
 SHA512 
bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
 DIST file-5.38.tar.gz 932528 BLAKE2B 
08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345
 SHA512 
9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40
+DIST file-5.39.tar.gz 954266 BLAKE2B 
4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3470230d91aaf9ce5d35bcaceb32d551ca5a391fc8c40b64517fdb996833a8b1ca47ced7e92e9e545d2682
 SHA512 
9cf1a7b769c56eb6f5b25c66ce85fa1300128396e445b2e53dbbd8951e5da973a7a07c4ef9f7ebd1fe945d47bdaf2cd9ef09bd2be6c217a0bcb907d9449835e6

diff --git a/sys-apps/file/file-5.39.ebuild b/sys-apps/file/file-5.39.ebuild
new file mode 100644
index 000..98499a3c73d
--- /dev/null
+++ b/sys-apps/file/file-5.39.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "" ]] ; then
+   EGIT_REPO_URI="https://github.com/glensc/file.git;
+   inherit 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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}/${PN}-5.39-seccomp_sandbox.patch" #713710
+)
+
+src_prepare() {
+   default
+   eautoreconf
+   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
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/

2020-04-12 Thread Thomas Deutschmann 
commit: 5460a7f2977b8ef57e56c447c5b8350bbe505f9d
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Apr 12 23:20:25 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Apr 12 23:21:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5460a7f2

sys-apps/file: rev bump

- Revert 
https://github.com/file/file/commit/24c9c086cd7c55b7b0a003a145b32466468e2608
  which fixes misdetection of shared libraries as statically linked as.

- Cherry-pick 
https://github.com/file/file/commit/d955cefc956ba537cfc0556023a65fe80bd2d82b

- Cherry-pick 
https://github.com/file/file/commit/483e7d8f1a5c3544bd42ead471813f8389fa7fc2

Bug: https://bugs.gentoo.org/717264
Package-Manager: Portage-2.3.98, Repoman-2.3.22
Signed-off-by: Thomas Deutschmann  gentoo.org>

 sys-apps/file/file-5.38-r1.ebuild  | 142 +
 ...3-iaeiaeiaeiae-Do-as-the-comment-says-and.patch |  40 ++
 ...ble-bit-is-only-set-when-DF_1_PIE-bit-is-.patch |  29 +
 ...le-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch |  27 
 4 files changed, 238 insertions(+)

diff --git a/sys-apps/file/file-5.38-r1.ebuild 
b/sys-apps/file/file-5.38-r1.ebuild
new file mode 100644
index 000..58bb745b6b5
--- /dev/null
+++ b/sys-apps/file/file-5.38-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 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 )"
+
+PATCHES=(
+   
"${FILESDIR}"/${P}-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch
+   "${FILESDIR}"/${P}-td-is-for-ptrdiff_t-not-for-off_t.patch
+   
"${FILESDIR}"/${P}-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch
+)
+
+src_prepare() {
+   default
+
+   [[ ${PV} == "" ]] && eautoreconf
+   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=(
+   --disable-libseccomp
+   --enable-fsect-man5
+   $(use_enable bzip2 bzlib)
+   $(use_enable lzma xzlib)
+   $(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
+}
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/

2018-07-24 Thread Lars Wendler 
commit: 6d0b89f14127625f091fe9edbec9ca41ac1accd2
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Jul 24 08:55:05 2018 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Jul 24 08:58:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d0b89f1

sys-apps/file: Revbump to fix berkdb file magic

Bumped straight to stable

Closes: https://bugs.gentoo.org/661922
Package-Manager: Portage-2.3.43, Repoman-2.3.10

 .../{file-5.33-r3.ebuild => file-5.33-r4.ebuild}   |  5 ++--
 .../file/files/file-5.33-berkdb_bogus_magic.patch  | 33 ++
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/sys-apps/file/file-5.33-r3.ebuild 
b/sys-apps/file/file-5.33-r4.ebuild
similarity index 95%
rename from sys-apps/file/file-5.33-r3.ebuild
rename to sys-apps/file/file-5.33-r4.ebuild
index e9203f385ff..1221edeea29 100644
--- a/sys-apps/file/file-5.33-r3.ebuild
+++ b/sys-apps/file/file-5.33-r4.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
 DISTUTILS_OPTIONAL=1
 
-inherit distutils-r1 libtool ltprune toolchain-funcs multilib-minimal
+inherit distutils-r1 libtool toolchain-funcs multilib-minimal
 
 if [[ ${PV} == "" ]] ; then
EGIT_REPO_URI="https://github.com/glensc/file.git;
@@ -36,6 +36,7 @@ RDEPEND="${DEPEND}
 PATCHES=(
"${FILESDIR}"/${P}-CVE-2018-10360.patch
"${FILESDIR}"/${P}-gl_VISIBILITY-macro.patch
+   "${FILESDIR}"/${P}-berkdb_bogus_magic.patch #661922
 )
 
 src_prepare() {
@@ -129,5 +130,5 @@ multilib_src_install_all() {
cd python || die
distutils-r1_src_install
fi
-   prune_libtool_files
+   find "${ED}" -name "*.la" -delete || die
 }

diff --git a/sys-apps/file/files/file-5.33-berkdb_bogus_magic.patch 
b/sys-apps/file/files/file-5.33-berkdb_bogus_magic.patch
new file mode 100644
index 000..7627bafc6ef
--- /dev/null
+++ b/sys-apps/file/files/file-5.33-berkdb_bogus_magic.patch
@@ -0,0 +1,33 @@
+From 4fb6a59df80d4974f8230bfce36e38e6de7d574f Mon Sep 17 00:00:00 2001
+From: Christos Zoulas 
+Date: Thu, 24 May 2018 18:54:40 +
+Subject: [PATCH] fix bogus magic
+
+---
+ magic/Magdir/dbpf | 8 +++-
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/magic/Magdir/dbpf b/magic/Magdir/dbpf
+index 65cab61e..8545720d 100644
+--- a/magic/Magdir/dbpf
 b/magic/Magdir/dbpf
+@@ -1,6 +1,6 @@
+ 
+ 
#--
+-# $File: dbpf,v 1.1 2017/10/13 20:47:14 christos Exp $
++# $File: dbpf,v 1.2 2018/05/24 18:54:40 christos Exp $
+ # dppf:   Maxis Database Packed Files, the stored data file format used 
by all
+ # Maxis games after the Sims: http://wiki.niotso.org/DBPF
+ # http://www.wiki.sc4devotion.com/index.php?title=DBPF
+@@ -9,9 +9,7 @@
+ >4ulelong x   \b, version: %u.
+ >>8   ulelong x   \b%u
+ >>>36 ulelong x   \b, files: %u
++>>24  ledate  !0  \b, created: %s
++>>28  ledate  !0  \b, modified: %s
+ !:ext dbpf/package/dat/sc4
+ !:mimeapplication/x-maxis-dbpf
+-4 ulelong 1
+->8ulelong !1
+->>24  ledate  !0  \b, created: %s
+->>>28 ledate  !0  \b, modified: %s

[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/

2018-06-12 Thread Thomas Deutschmann 
commit: 331976f64a3ac2e70aa62d6631db0e148f19d0fe
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Jun 12 08:17:44 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Jun 12 08:18:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=331976f6

sys-apps/file: Avoid reading past the end of buffer (CVE-2018-10360)

Bug: https://bugs.gentoo.org/657930
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-apps/file/file-5.33-r2.ebuild  | 127 +
 sys-apps/file/files/file-5.33-CVE-2018-10360.patch |  18 +++
 2 files changed, 145 insertions(+)

diff --git a/sys-apps/file/file-5.33-r2.ebuild 
b/sys-apps/file/file-5.33-r2.ebuild
new file mode 100644
index 000..4537ffb58aa
--- /dev/null
+++ b/sys-apps/file/file-5.33-r2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 libtool ltprune 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 
~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux 
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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="python static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+   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 )"
+
+PATCHES=( "${FILESDIR}"/${P}-CVE-2018-10360.patch )
+
+src_prepare() {
+   default
+
+   [[ ${PV} == "" ]] && eautoreconf
+   elibtoolize
+
+   # don't let python README kill main README #60043
+   mv python/README{,.python} || die
+}
+
+multilib_src_configure() {
+   local myeconfargs=(
+   --disable-libseccomp
+   --enable-fsect-man5
+   $(use_enable static-libs static)
+   $(use_enable zlib)
+   )
+   ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_configure() {
+   # when cross-compiling, we need to build up our own file
+   # because people often don't keep matching host/target
+   # file versions #362941
+   if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
+   mkdir -p "${WORKDIR}"/build || die
+   cd "${WORKDIR}"/build || die
+   tc-export_build_env BUILD_C{C,XX}
+   ECONF_SOURCE=${S} \
+   ac_cv_header_zlib_h=no \
+   ac_cv_lib_z_gzopen=no \
+   CHOST=${CBUILD} \
+   CFLAGS=${BUILD_CFLAGS} \
+   CXXFLAGS=${BUILD_CXXFLAGS} \
+   CPPFLAGS=${BUILD_CPPFLAGS} \
+   LDFLAGS="${BUILD_LDFLAGS} -static" \
+   CC=${BUILD_CC} \
+   CXX=${BUILD_CXX} \
+   econf --disable-shared --disable-libseccomp
+   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 tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; 
then
+   emake -C "${WORKDIR}"/build/src magic.h #586444
+   emake -C "${WORKDIR}"/build/src file
+   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`
+   dodir /usr/share/misc/magic
+   insinto /usr/share/misc/magic
+   doins -r magic/Magdir/*
+
+   if use python ; then
+   cd python || die
+   distutils-r1_src_install
+   fi
+   prune_libtool_files
+}

diff --git a/sys-apps/file/files/file-5.33-CVE-2018-10360.patch 
b/sys-apps/file/files/file-5.33-CVE-2018-10360.patch
new file mode 100644
index 000..a489846b10f
--- /dev/null
+++

[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/

2016-10-25 Thread Lars Wendler 
commit: 4a1936aa0776f32b284ba848ad5a21baf0ae4601
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Oct 25 20:03:20 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Oct 25 20:27:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a1936aa

sys-apps/file: Removed old.

Package-Manager: portage-2.3.2
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/file/Manifest |   2 -
 sys-apps/file/file-5.26-r1.ebuild  | 117 --
 sys-apps/file/file-5.27.ebuild | 108 -
 sys-apps/file/files/file-5.26-compress-1.patch |  53 -
 sys-apps/file/files/file-5.26-compress-2.patch |  73 
 sys-apps/file/files/file-5.26-header-define.patch  |  26 
 sys-apps/file/files/file-5.26-msoffice-magic.patch |  45 ---
 sys-apps/file/files/file-5.26-nes-magic.patch  |  27 -
 sys-apps/file/files/file-5.26-php-magic.patch  |  28 -
 sys-apps/file/files/file-5.26-stdin-rpm.patch  |  27 -
 sys-apps/file/files/file-5.26-stdin-test.patch | 132 -
 sys-apps/file/files/file-5.26-tests-fatal.patch|  27 -
 12 files changed, 665 deletions(-)

diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 4fcd0b3..58b3473 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,6 +1,4 @@
 DIST file-5.22.tar.gz 732556 SHA256 
c4e3a8e44cb888c5e4b476e738503e37fb9de3b25a38c143e214bfc12109fc0b SHA512 
e9f1648c3b490bac642a2a9e01d31a8bd49c3e2a1feea1b25869aa1d5e37aa99bbf3fdc5d301618a8b97aec046f10e400a57f8a1d0dd61d3583830aaf3fcbda8
 WHIRLPOOL 
de9ce9305fd824d85128617e196fe6b02ea470b63eb2a35d31e857f7cf91e09f85166aaa72695aaf4a7516413b3a146db85588e7da65f32b131a477b3dece176
 DIST file-5.25.tar.gz 739485 SHA256 
3735381563f69fb4239470b8c51b876a80425348b8285a7cded8b61d6b890eca SHA512 
4a5176a7e80df2bb7e45916490433d22eb98a442d49d04146afcbdcf92ff619ea3e73e95c8991e6b6a0628efb9d127bfa4aafc1cae523f8261ca693bc5e13402
 WHIRLPOOL 
70c682ff05e58487a551cd98091e27272baa41e034157bec93ac4d69b2f3e93caed40f37d64ef698527124e86ba4a5cb5975abacfd9eb30e4d3583262e5f0b0b
-DIST file-5.26.tar.gz 773061 SHA256 
2ef32b4ec936b0ff7b59a021dce56086a716663b6df1138c7ea597d396bf50cf SHA512 
e3251dde54f200b6bcade5db97fda25e73efcb2629ff5c464601c82190e12290b89eb942d820d43aa67ef37be3c0f2db00e7e5c303c083e4a8d1c49499b907dd
 WHIRLPOOL 
f8922b8cbfe153347f793e34ba7be1c3e36e55800e22fcb675f971bcc2094781a0784d887ece32760e2586fe6c459f56ce605610225f6746dacd70a922ac9e10
-DIST file-5.27.tar.gz 774063 SHA256 
c2e7d509b1167c4915901ecd257ee924d229a348bf988df6d1934ef0fa34a1a7 SHA512 
fcf607d367d85b8a971a62793efc79f7e548e029dd7bb41f95bf992c271c514d70cd4bb5c2ca577e470e0ff1df9dca31beaaf19a5fd4e3f617b36061eff46195
 WHIRLPOOL 
ea7483dce63a4b1f5fa7ee2571e918997bcffb46a7267a1fa45990dc33966e04a22f20d01105b268f6e6ca530a3a9c3f20f4f802a445847c60ee7f943cc5b570
 DIST file-5.28.tar.gz 777859 SHA256 
0ecb5e146b8655d1fa84159a847ee619fc102575205a0ff9c6cc60fc5ee2e012 SHA512 
42136505e21b14396e3af4e0d3f349687176cf0771d2dc9fed3599a30c7bab59184459f1e51033bce2d6ee0e292eba034bdfda727decca1219c1b3419e6bbfdc
 WHIRLPOOL 
f12889fc2a692084989d7029d8b9c849344e4236df8afc9e46c6441712aace5e07fee3bb05267ef76da7d41fbcb6b21db4e3bf6e22af660d43b2edeb6ff1571c
 DIST file-5.29.tar.gz 783919 SHA256 
ea661277cd39bf8f063d3a83ee875432cc3680494169f952787e002bdd3884c0 SHA512 
58db17a6bea5d71723f3f7d25300985b3aa78f27fdb1e8b9bb41e61dc325236acaca7c1475cc2725ed672151e1764892dff83d37c24313fe26f45ee3388d4462
 WHIRLPOOL 
e80f117f3db08707c197db2f30aa81407c85b6a5ff0125b41a311c1d6f7dfbf3c0a315ebd1115bef3eecf05beed1fad3570a90d047ecbc7d3a29adcb8ea5c094

diff --git a/sys-apps/file/file-5.26-r1.ebuild 
b/sys-apps/file/file-5.26-r1.ebuild
deleted file mode 100644
index fb300b3..
--- a/sys-apps/file/file-5.26-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
-DISTUTILS_OPTIONAL=1
-
-inherit eutils distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "" ]] ; then
-   EGIT_REPO_URI="git://github.com/glensc/file.git"
-   inherit autotools git-r3
-else
-   SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz
-   ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="http://www.darwinsys.com/file/;
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="python static-libs zlib"
-
-DEPEND="python? ( ${PYTHON_DEPS}
-   dev-python/setuptools )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-   python? ( !dev-python/python-magic )"
-
-PATCHES=(
-

[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/

2016-08-10 Thread Mike Frysinger 
commit: ba55f110bf9831afca12c51ea503e5f5293d28fe
Author: Mike Frysinger  gentoo  org>
AuthorDate: Wed Aug 10 09:33:42 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Wed Aug 10 09:47:47 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba55f110

sys-apps/file: add upstream fix for mingw builds

 sys-apps/file/file-5.28.ebuild   |  2 ++
 sys-apps/file/files/file-5.28-der-mmap.patch | 36 
 2 files changed, 38 insertions(+)

diff --git a/sys-apps/file/file-5.28.ebuild b/sys-apps/file/file-5.28.ebuild
index 298edaf..fefe087 100644
--- a/sys-apps/file/file-5.28.ebuild
+++ b/sys-apps/file/file-5.28.ebuild
@@ -37,6 +37,8 @@ src_prepare() {
[[ ${PV} == "" ]] && eautoreconf
elibtoolize
 
+   epatch "${FILESDIR}"/${P}-der-mmap.patch
+
# don't let python README kill main README #60043
mv python/README{,.python}
 }

diff --git a/sys-apps/file/files/file-5.28-der-mmap.patch 
b/sys-apps/file/files/file-5.28-der-mmap.patch
new file mode 100644
index 000..50542a6
--- /dev/null
+++ b/sys-apps/file/files/file-5.28-der-mmap.patch
@@ -0,0 +1,36 @@
+fix from upstream for building on systems w/out mmap (e.g. mingw)
+
+From 6f1fbff8114ec2319dd874f3552105b378931eb9 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas 
+Date: Fri, 15 Jul 2016 00:56:04 +
+Subject: [PATCH] we only need mman for testing.
+
+---
+ src/der.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/der.c b/src/der.c
+index fcdeb6c79814..fd093d29ee89 100644
+--- a/src/der.c
 b/src/der.c
+@@ -35,8 +35,6 @@
+ #endif
+ 
+ #include 
+-#include 
+-#include 
+ 
+ #include 
+ #include 
+@@ -53,6 +51,8 @@
+ #include "magic.h"
+ #include "der.h"
+ #else
++#include 
++#include 
+ #include 
+ #endif
+ 
+-- 
+2.9.0
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/

2016-04-21 Thread Mike Frysinger 
commit: c540f9ea27b6c6e14481b3364d6193862a3377b1
Author: Mike Frysinger  gentoo  org>
AuthorDate: Thu Apr 21 20:29:20 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Thu Apr 21 20:29:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c540f9ea

sys-apps/file: add a bunch of upstream fixes

 .../file/{file-5.26.ebuild => file-5.26-r1.ebuild} |  11 +-
 sys-apps/file/file-.ebuild |  10 +-
 sys-apps/file/files/file-5.26-compress-1.patch |  53 +
 sys-apps/file/files/file-5.26-compress-2.patch |  73 
 sys-apps/file/files/file-5.26-header-define.patch  |  26 
 sys-apps/file/files/file-5.26-msoffice-magic.patch |  45 +++
 sys-apps/file/files/file-5.26-nes-magic.patch  |  27 +
 sys-apps/file/files/file-5.26-php-magic.patch  |  28 +
 sys-apps/file/files/file-5.26-stdin-rpm.patch  |  27 +
 sys-apps/file/files/file-5.26-stdin-test.patch | 132 +
 sys-apps/file/files/file-5.26-tests-fatal.patch|  27 +
 11 files changed, 452 insertions(+), 7 deletions(-)

diff --git a/sys-apps/file/file-5.26.ebuild b/sys-apps/file/file-5.26-r1.ebuild
similarity index 86%
rename from sys-apps/file/file-5.26.ebuild
rename to sys-apps/file/file-5.26-r1.ebuild
index 594df4a..ff3216a 100644
--- a/sys-apps/file/file-5.26.ebuild
+++ b/sys-apps/file/file-5.26-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
+
 PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 DISTUTILS_OPTIONAL=1
 
@@ -30,6 +30,15 @@ RDEPEND="${DEPEND}
python? ( !dev-python/python-magic )"
 
 src_prepare() {
+   epatch "${FILESDIR}"/${P}-header-define.patch
+   epatch "${FILESDIR}"/${P}-nes-magic.patch
+   epatch "${FILESDIR}"/${P}-php-magic.patch
+   epatch "${FILESDIR}"/${P}-msoffice-magic.patch
+   epatch "${FILESDIR}"/${P}-stdin-rpm.patch
+   epatch "${FILESDIR}"/${P}-tests-fatal.patch
+   epatch "${FILESDIR}"/${P}-stdin-test.patch
+   epatch "${FILESDIR}"/${P}-compress-1.patch
+   epatch "${FILESDIR}"/${P}-compress-2.patch
[[ ${PV} == "" ]] && eautoreconf
elibtoolize
 

diff --git a/sys-apps/file/file-.ebuild b/sys-apps/file/file-.ebuild
index 88b9d2e..5aa9298 100644
--- a/sys-apps/file/file-.ebuild
+++ b/sys-apps/file/file-.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
+
 PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy )
 DISTUTILS_OPTIONAL=1
 
@@ -25,9 +25,7 @@ SLOT="0"
 IUSE="python static-libs zlib"
 
 DEPEND="python? ( ${PYTHON_DEPS} )
-   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-   abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r21
-   !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+   zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
 RDEPEND="${DEPEND}
python? ( !dev-python/python-magic )"
 
@@ -80,7 +78,7 @@ multilib_src_compile() {
 }
 
 src_compile() {
-   if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
+   if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; 
then
emake -C "${WORKDIR}"/build/src file
PATH="${WORKDIR}/build/src:${PATH}"
fi

diff --git a/sys-apps/file/files/file-5.26-compress-1.patch 
b/sys-apps/file/files/file-5.26-compress-1.patch
new file mode 100644
index 000..b10bfd2
--- /dev/null
+++ b/sys-apps/file/files/file-5.26-compress-1.patch
@@ -0,0 +1,53 @@
+From 52ae939467583ec499f6c62cdb406e8f982c0310 Mon Sep 17 00:00:00 2001
+From: Christos Zoulas 
+Date: Tue, 19 Apr 2016 13:39:19 +
+Subject: [PATCH] Fix compression code (Werner Fink)
+
+---
+ src/compress.c | 19 +++
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+diff --git a/src/compress.c b/src/compress.c
+index f322445..0ebc837 100644
+--- a/src/compress.c
 b/src/compress.c
+@@ -231,9 +231,9 @@ file_zmagic(struct magic_set *ms, int fd, const char *name,
+   goto error;
+   DPRINTF("rv = %d\n", rv);
+   if ((ms->flags & MAGIC_COMPRESS_TRANSP) != 0)
+-  goto out;
++  break;
+   if (mime != MAGIC_MIME && mime != 0)
+-  goto out;
++  break;
+   if ((file_printf(ms,
+   mime ? " compressed-encoding=" : " (")) == -1)
+   goto error;
+@@ -250,16 +250,19 @@ file_zmagic(struct magic_set *ms, int fd, const char 
*name,
+   }
+   if (!mime && file_printf(ms, ")") == -1)
+