Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/, sys-apps/file/
Date: Wed, 31 Mar 2021 08:03:24
Message-Id: 1617177790.dee3f0719ff53493e78d1953108ba85b1897fcd4.polynomial-c@gentoo
1 commit: dee3f0719ff53493e78d1953108ba85b1897fcd4
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 31 08:02:52 2021 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 31 08:03:10 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dee3f071
7
8 sys-apps/file: Removed old
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 sys-apps/file/Manifest | 2 -
13 sys-apps/file/file-5.37-r1.ebuild | 128 ------------------
14 sys-apps/file/file-5.38-r1.ebuild | 142 --------------------
15 sys-apps/file/file-5.39-r3.ebuild | 146 ---------------------
16 sys-apps/file/files/file-5.37-CVE-2019-18218.patch | 36 -----
17 ...3-iaeiaeiaeiae-Do-as-the-comment-says-and.patch | 40 ------
18 ...ble-bit-is-only-set-when-DF_1_PIE-bit-is-.patch | 29 ----
19 ...le-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch | 27 ----
20 8 files changed, 550 deletions(-)
21
22 diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
23 index ec875e6062a..128c4b0fb4f 100644
24 --- a/sys-apps/file/Manifest
25 +++ b/sys-apps/file/Manifest
26 @@ -1,4 +1,2 @@
27 -DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
28 -DIST file-5.38.tar.gz 932528 BLAKE2B 08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345 SHA512 9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40
29 DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3470230d91aaf9ce5d35bcaceb32d551ca5a391fc8c40b64517fdb996833a8b1ca47ced7e92e9e545d2682 SHA512 9cf1a7b769c56eb6f5b25c66ce85fa1300128396e445b2e53dbbd8951e5da973a7a07c4ef9f7ebd1fe945d47bdaf2cd9ef09bd2be6c217a0bcb907d9449835e6
30 DIST file-5.40.tar.gz 1004214 BLAKE2B 4e15a1ca62fe7c03c90b0e509dc899b87f4474f758ad3d08172b3d838dc3f7c2954ba1074eeeeb3da8c04b8df84eff2b8cdf3177da334a926914429df67f60bf SHA512 3b70df75fa4c9050d55b1ffdc28e5f3c8b8ef7d4efd1a06bf53f113b676d81114a85aae56e0897d32b53716662d64ad18ab251ca8c92c6405c69eb758bb99afb
31
32 diff --git a/sys-apps/file/file-5.37-r1.ebuild b/sys-apps/file/file-5.37-r1.ebuild
33 deleted file mode 100644
34 index 8daeba6eac1..00000000000
35 --- a/sys-apps/file/file-5.37-r1.ebuild
36 +++ /dev/null
37 @@ -1,128 +0,0 @@
38 -# Copyright 1999-2021 Gentoo Authors
39 -# Distributed under the terms of the GNU General Public License v2
40 -
41 -EAPI=7
42 -
43 -PYTHON_COMPAT=( python3_{7,8} )
44 -DISTUTILS_OPTIONAL=1
45 -
46 -inherit distutils-r1 libtool toolchain-funcs multilib-minimal
47 -
48 -if [[ ${PV} == "9999" ]] ; then
49 - EGIT_REPO_URI="https://github.com/glensc/file.git"
50 - inherit autotools git-r3
51 -else
52 - SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
53 - 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"
54 -fi
55 -
56 -DESCRIPTION="identify a file's format by scanning binary data for patterns"
57 -HOMEPAGE="https://www.darwinsys.com/file/"
58 -
59 -LICENSE="BSD-2"
60 -SLOT="0"
61 -IUSE="python static-libs zlib"
62 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
63 -
64 -DEPEND="
65 - python? (
66 - ${PYTHON_DEPS}
67 - dev-python/setuptools[${PYTHON_USEDEP}]
68 - )
69 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
70 -RDEPEND="${DEPEND}
71 - python? ( !dev-python/python-magic )"
72 -
73 -PATCHES=( "${FILESDIR}"/${P}-CVE-2019-18218.patch )
74 -
75 -src_prepare() {
76 - default
77 -
78 - [[ ${PV} == "9999" ]] && eautoreconf
79 - elibtoolize
80 -
81 - # don't let python README kill main README #60043
82 - mv python/README.md python/README.python.md || die
83 - sed 's@××××××.md@README.python.md@' -i python/setup.py || die #662090
84 -}
85 -
86 -multilib_src_configure() {
87 - local myeconfargs=(
88 - --disable-libseccomp
89 - --enable-fsect-man5
90 - $(use_enable static-libs static)
91 - $(use_enable zlib)
92 - )
93 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
94 -}
95 -
96 -src_configure() {
97 - # when cross-compiling, we need to build up our own file
98 - # because people often don't keep matching host/target
99 - # file versions #362941
100 - if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
101 - mkdir -p "${WORKDIR}"/build || die
102 - cd "${WORKDIR}"/build || die
103 - tc-export_build_env BUILD_C{C,XX}
104 - ECONF_SOURCE="${S}" \
105 - ac_cv_header_zlib_h=no \
106 - ac_cv_lib_z_gzopen=no \
107 - CHOST=${CBUILD} \
108 - CFLAGS=${BUILD_CFLAGS} \
109 - CXXFLAGS=${BUILD_CXXFLAGS} \
110 - CPPFLAGS=${BUILD_CPPFLAGS} \
111 - LDFLAGS="${BUILD_LDFLAGS} -static" \
112 - CC=${BUILD_CC} \
113 - CXX=${BUILD_CXX} \
114 - econf --disable-shared --disable-libseccomp
115 - fi
116 -
117 - multilib-minimal_src_configure
118 -}
119 -
120 -multilib_src_compile() {
121 - if multilib_is_native_abi ; then
122 - emake
123 - else
124 - cd src || die
125 - emake magic.h #586444
126 - emake libmagic.la
127 - fi
128 -}
129 -
130 -src_compile() {
131 - if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
132 - emake -C "${WORKDIR}"/build/src magic.h #586444
133 - emake -C "${WORKDIR}"/build/src file
134 - PATH="${WORKDIR}/build/src:${PATH}"
135 - fi
136 - multilib-minimal_src_compile
137 -
138 - if use python ; then
139 - cd python || die
140 - distutils-r1_src_compile
141 - fi
142 -}
143 -
144 -multilib_src_install() {
145 - if multilib_is_native_abi ; then
146 - default
147 - else
148 - emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
149 - fi
150 -}
151 -
152 -multilib_src_install_all() {
153 - dodoc ChangeLog MAINT README
154 -
155 - # Required for `file -C`
156 - dodir /usr/share/misc/magic
157 - insinto /usr/share/misc/magic
158 - doins -r magic/Magdir/*
159 -
160 - if use python ; then
161 - cd python || die
162 - distutils-r1_src_install
163 - fi
164 - find "${ED}" -type f -name "*.la" -delete || die
165 -}
166
167 diff --git a/sys-apps/file/file-5.38-r1.ebuild b/sys-apps/file/file-5.38-r1.ebuild
168 deleted file mode 100644
169 index d318c4e309e..00000000000
170 --- a/sys-apps/file/file-5.38-r1.ebuild
171 +++ /dev/null
172 @@ -1,142 +0,0 @@
173 -# Copyright 1999-2021 Gentoo Authors
174 -# Distributed under the terms of the GNU General Public License v2
175 -
176 -EAPI=7
177 -
178 -PYTHON_COMPAT=( python3_{7..9} )
179 -DISTUTILS_OPTIONAL=1
180 -
181 -inherit distutils-r1 libtool toolchain-funcs multilib-minimal
182 -
183 -if [[ ${PV} == "9999" ]] ; then
184 - EGIT_REPO_URI="https://github.com/glensc/file.git"
185 - inherit autotools git-r3
186 -else
187 - SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
188 - 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"
189 -fi
190 -
191 -DESCRIPTION="identify a file's format by scanning binary data for patterns"
192 -HOMEPAGE="https://www.darwinsys.com/file/"
193 -
194 -LICENSE="BSD-2"
195 -SLOT="0"
196 -IUSE="bzip2 lzma python static-libs zlib"
197 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
198 -
199 -DEPEND="
200 - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
201 - lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
202 - python? (
203 - ${PYTHON_DEPS}
204 - dev-python/setuptools[${PYTHON_USEDEP}]
205 - )
206 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
207 -RDEPEND="${DEPEND}
208 - python? ( !dev-python/python-magic )"
209 -
210 -PATCHES=(
211 - "${FILESDIR}"/${P}-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch
212 - "${FILESDIR}"/${P}-td-is-for-ptrdiff_t-not-for-off_t.patch
213 - "${FILESDIR}"/${P}-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch
214 -)
215 -
216 -src_prepare() {
217 - default
218 -
219 - [[ ${PV} == "9999" ]] && eautoreconf
220 - elibtoolize
221 -
222 - # don't let python README kill main README #60043
223 - mv python/README.md python/README.python.md || die
224 - sed 's@××××××.md@README.python.md@' -i python/setup.py || die #662090
225 -}
226 -
227 -multilib_src_configure() {
228 - local myeconfargs=(
229 - --disable-libseccomp
230 - --enable-fsect-man5
231 - $(use_enable bzip2 bzlib)
232 - $(use_enable lzma xzlib)
233 - $(use_enable static-libs static)
234 - $(use_enable zlib)
235 - )
236 - econf "${myeconfargs[@]}"
237 -}
238 -
239 -build_src_configure() {
240 - local myeconfargs=(
241 - --disable-shared
242 - --disable-libseccomp
243 - --disable-bzlib
244 - --disable-xzlib
245 - --disable-zlib
246 - )
247 - tc-env_build econf "${myeconfargs[@]}"
248 -}
249 -
250 -need_build_file() {
251 - # when cross-compiling, we need to build up our own file
252 - # because people often don't keep matching host/target
253 - # file versions #362941
254 - tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
255 -}
256 -
257 -src_configure() {
258 - local ECONF_SOURCE=${S}
259 -
260 - if need_build_file; then
261 - mkdir -p "${WORKDIR}"/build || die
262 - cd "${WORKDIR}"/build || die
263 - build_src_configure
264 - fi
265 -
266 - multilib-minimal_src_configure
267 -}
268 -
269 -multilib_src_compile() {
270 - if multilib_is_native_abi ; then
271 - emake
272 - else
273 - cd src || die
274 - emake magic.h #586444
275 - emake libmagic.la
276 - fi
277 -}
278 -
279 -src_compile() {
280 - if need_build_file; then
281 - emake -C "${WORKDIR}"/build/src magic.h #586444
282 - emake -C "${WORKDIR}"/build/src file
283 - local -x PATH="${WORKDIR}/build/src:${PATH}"
284 - fi
285 - multilib-minimal_src_compile
286 -
287 - if use python ; then
288 - cd python || die
289 - distutils-r1_src_compile
290 - fi
291 -}
292 -
293 -multilib_src_install() {
294 - if multilib_is_native_abi ; then
295 - default
296 - else
297 - emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
298 - fi
299 -}
300 -
301 -multilib_src_install_all() {
302 - dodoc ChangeLog MAINT README
303 -
304 - # Required for `file -C`
305 - dodir /usr/share/misc/magic
306 - insinto /usr/share/misc/magic
307 - doins -r magic/Magdir/*
308 -
309 - if use python ; then
310 - cd python || die
311 - distutils-r1_src_install
312 - fi
313 - find "${ED}" -type f -name "*.la" -delete || die
314 -}
315
316 diff --git a/sys-apps/file/file-5.39-r3.ebuild b/sys-apps/file/file-5.39-r3.ebuild
317 deleted file mode 100644
318 index b64fe567d8e..00000000000
319 --- a/sys-apps/file/file-5.39-r3.ebuild
320 +++ /dev/null
321 @@ -1,146 +0,0 @@
322 -# Copyright 1999-2021 Gentoo Authors
323 -# Distributed under the terms of the GNU General Public License v2
324 -
325 -EAPI=7
326 -
327 -PYTHON_COMPAT=( python3_{7..9} )
328 -DISTUTILS_OPTIONAL=1
329 -
330 -inherit distutils-r1 libtool toolchain-funcs multilib-minimal
331 -
332 -if [[ ${PV} == "9999" ]] ; then
333 - EGIT_REPO_URI="https://github.com/glensc/file.git"
334 - inherit autotools git-r3
335 -else
336 - SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
337 - 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"
338 -fi
339 -
340 -DESCRIPTION="identify a file's format by scanning binary data for patterns"
341 -HOMEPAGE="https://www.darwinsys.com/file/"
342 -
343 -LICENSE="BSD-2"
344 -SLOT="0"
345 -IUSE="bzip2 lzma python seccomp static-libs zlib"
346 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
347 -
348 -DEPEND="
349 - bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
350 - lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
351 - python? (
352 - ${PYTHON_DEPS}
353 - dev-python/setuptools[${PYTHON_USEDEP}]
354 - )
355 - zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
356 -RDEPEND="${DEPEND}
357 - python? ( !dev-python/python-magic )
358 - seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
359 -
360 -PATCHES=(
361 - "${FILESDIR}/file-5.39-add-missing-termios.patch" #728416
362 - "${FILESDIR}/file-5.39-seccomp-musl.patch"
363 - "${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
364 -)
365 -
366 -src_prepare() {
367 - default
368 -
369 - if [[ ${PV} == 9999 ]]; then
370 - eautoreconf
371 - fi
372 -
373 - elibtoolize
374 -
375 - # don't let python README kill main README #60043
376 - mv python/README.md python/README.python.md || die
377 - sed 's@××××××.md@README.python.md@' -i python/setup.py || die #662090
378 -}
379 -
380 -multilib_src_configure() {
381 - local myeconfargs=(
382 - --enable-fsect-man5
383 - $(use_enable bzip2 bzlib)
384 - $(use_enable lzma xzlib)
385 - $(use_enable seccomp libseccomp)
386 - $(use_enable static-libs static)
387 - $(use_enable zlib)
388 - )
389 - econf "${myeconfargs[@]}"
390 -}
391 -
392 -build_src_configure() {
393 - local myeconfargs=(
394 - --disable-shared
395 - --disable-libseccomp
396 - --disable-bzlib
397 - --disable-xzlib
398 - --disable-zlib
399 - )
400 - tc-env_build econf "${myeconfargs[@]}"
401 -}
402 -
403 -need_build_file() {
404 - # when cross-compiling, we need to build up our own file
405 - # because people often don't keep matching host/target
406 - # file versions #362941
407 - tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
408 -}
409 -
410 -src_configure() {
411 - local ECONF_SOURCE=${S}
412 -
413 - if need_build_file; then
414 - mkdir -p "${WORKDIR}"/build || die
415 - cd "${WORKDIR}"/build || die
416 - build_src_configure
417 - fi
418 -
419 - multilib-minimal_src_configure
420 -}
421 -
422 -multilib_src_compile() {
423 - if multilib_is_native_abi ; then
424 - emake
425 - else
426 - cd src || die
427 - emake magic.h #586444
428 - emake libmagic.la
429 - fi
430 -}
431 -
432 -src_compile() {
433 - if need_build_file; then
434 - emake -C "${WORKDIR}"/build/src magic.h #586444
435 - emake -C "${WORKDIR}"/build/src file
436 - local -x PATH="${WORKDIR}/build/src:${PATH}"
437 - fi
438 - multilib-minimal_src_compile
439 -
440 - if use python ; then
441 - cd python || die
442 - distutils-r1_src_compile
443 - fi
444 -}
445 -
446 -multilib_src_install() {
447 - if multilib_is_native_abi ; then
448 - default
449 - else
450 - emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
451 - fi
452 -}
453 -
454 -multilib_src_install_all() {
455 - dodoc ChangeLog MAINT README
456 -
457 - # Required for `file -C`
458 - dodir /usr/share/misc/magic
459 - insinto /usr/share/misc/magic
460 - doins -r magic/Magdir/*
461 -
462 - if use python ; then
463 - cd python || die
464 - distutils-r1_src_install
465 - fi
466 - find "${ED}" -type f -name "*.la" -delete || die
467 -}
468
469 diff --git a/sys-apps/file/files/file-5.37-CVE-2019-18218.patch b/sys-apps/file/files/file-5.37-CVE-2019-18218.patch
470 deleted file mode 100644
471 index 1cd02b778ab..00000000000
472 --- a/sys-apps/file/files/file-5.37-CVE-2019-18218.patch
473 +++ /dev/null
474 @@ -1,36 +0,0 @@
475 -CVE-2019-18218
476 -https://github.com/file/file/commit/46a8443f76cec4b41ec736eca396984c74664f84
477 -
478 ---- a/src/cdf.c
479 -+++ b/src/cdf.c
480 -@@ -1027,8 +1027,9 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
481 - goto out;
482 - }
483 - nelements = CDF_GETUINT32(q, 1);
484 -- if (nelements == 0) {
485 -- DPRINTF(("CDF_VECTOR with nelements == 0\n"));
486 -+ if (nelements > CDF_ELEMENT_LIMIT || nelements == 0) {
487 -+ DPRINTF(("CDF_VECTOR with nelements == %"
488 -+ SIZE_T_FORMAT "u\n", nelements));
489 - goto out;
490 - }
491 - slen = 2;
492 -@@ -1070,8 +1071,6 @@ cdf_read_property_info(const cdf_stream_t *sst, const cdf_header_t *h,
493 - goto out;
494 - inp += nelem;
495 - }
496 -- DPRINTF(("nelements = %" SIZE_T_FORMAT "u\n",
497 -- nelements));
498 - for (j = 0; j < nelements && i < sh.sh_properties;
499 - j++, i++)
500 - {
501 ---- a/src/cdf.h
502 -+++ b/src/cdf.h
503 -@@ -48,6 +48,7 @@
504 - typedef int32_t cdf_secid_t;
505 -
506 - #define CDF_LOOP_LIMIT 10000
507 -+#define CDF_ELEMENT_LIMIT 100000
508 -
509 - #define CDF_SECID_NULL 0
510 - #define CDF_SECID_FREE -1
511
512 diff --git a/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch b/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch
513 deleted file mode 100644
514 index 240edc11f68..00000000000
515 --- a/sys-apps/file/files/file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch
516 +++ /dev/null
517 @@ -1,40 +0,0 @@
518 -From c9d21a58bea2ecb2dc8876e09e471094d54a25e4 Mon Sep 17 00:00:00 2001
519 -From: Thomas Deutschmann <whissi@g.o>
520 -Date: Mon, 13 Apr 2020 01:08:12 +0200
521 -Subject: [PATCH 1/3] Revert "PR/93: iaeiaeiaeiae: Do as the comment says, and
522 - count as dynamically linked"
523 -
524 -This reverts commit 24c9c086cd7c55b7b0a003a145b32466468e2608.
525 -
526 -Fixes misdetection of shared libraries as statically linked as
527 -reported in bug 717264.
528 -
529 -Bug: https://bugs.gentoo.org/717264
530 -Signed-off-by: Thomas Deutschmann <whissi@g.o>
531 ----
532 - src/readelf.c | 2 +-
533 - 1 file changed, 1 insertion(+), 1 deletion(-)
534 -
535 -diff --git a/src/readelf.c b/src/readelf.c
536 -index 40bcfab1..afec31d1 100644
537 ---- a/src/readelf.c
538 -+++ b/src/readelf.c
539 -@@ -1638,6 +1638,7 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
540 - /* Things we can determine before we seek */
541 - switch (xph_type) {
542 - case PT_DYNAMIC:
543 -+ linking_style = "dynamically";
544 - doread = 1;
545 - break;
546 - case PT_NOTE:
547 -@@ -1653,7 +1654,6 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
548 - }
549 - /*FALLTHROUGH*/
550 - case PT_INTERP:
551 -- linking_style = "dynamically";
552 - doread = 1;
553 - break;
554 - default:
555 ---
556 -2.26.0
557 -
558
559 diff --git a/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch b/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch
560 deleted file mode 100644
561 index bb211f355f7..00000000000
562 --- a/sys-apps/file/files/file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch
563 +++ /dev/null
564 @@ -1,29 +0,0 @@
565 -From ed971e5e3ae79bd28697d16c8b78b693052484e4 Mon Sep 17 00:00:00 2001
566 -From: Christos Zoulas <christos@××××××.com>
567 -Date: Wed, 12 Feb 2020 22:17:33 +0000
568 -Subject: [PATCH 3/3] The executable bit is only set when DF_1_PIE bit is set
569 - so it is fine.
570 -
571 ----
572 - magic/Magdir/elf | 7 ++++---
573 - 1 file changed, 4 insertions(+), 3 deletions(-)
574 -
575 -diff --git a/magic/Magdir/elf b/magic/Magdir/elf
576 -index b5a2e00b..f5e1af9a 100644
577 ---- a/magic/Magdir/elf
578 -+++ b/magic/Magdir/elf
579 -@@ -50,8 +50,9 @@
580 - !:mime application/x-object
581 - >16 leshort 2 executable,
582 - !:mime application/x-executable
583 -->16 leshort 3 shared object,
584 --!:mime application/x-sharedlib
585 -+>16 leshort 3 ${x?pie executable:shared object},
586 -+
587 -+!:mime application/x-${x?pie-executable:sharedlib}
588 - >16 leshort 4 core file,
589 - !:mime application/x-coredump
590 - # OS-specific
591 ---
592 -2.26.0
593 -
594
595 diff --git a/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch b/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch
596 deleted file mode 100644
597 index 09fcaef151e..00000000000
598 --- a/sys-apps/file/files/file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch
599 +++ /dev/null
600 @@ -1,27 +0,0 @@
601 -From c49dc91df427f89ebcf9cdec556b8fc88cdfc3c1 Mon Sep 17 00:00:00 2001
602 -From: Christos Zoulas <christos@××××××.com>
603 -Date: Tue, 17 Dec 2019 15:27:27 +0000
604 -Subject: [PATCH 2/3] %td is for ptrdiff_t not for off_t.
605 -
606 ----
607 - src/readelf.c | 6 +++---
608 - 1 file changed, 3 insertions(+), 3 deletions(-)
609 -
610 -diff --git a/src/readelf.c b/src/readelf.c
611 -index afec31d1..8ac3b7d6 100644
612 ---- a/src/readelf.c
613 -+++ b/src/readelf.c
614 -@@ -1349,8 +1349,8 @@ doshn(struct magic_set *ms, int clazz, int swap, int fd, off_t off, int num,
615 - name_off = xsh_offset;
616 -
617 - if (fsize != SIZE_UNKNOWN && fsize < name_off) {
618 -- if (file_printf(ms, ", too large section header offset %td",
619 -- name_off) == -1)
620 -+ if (file_printf(ms, ", too large section header offset %jd",
621 -+ (intmax_t)name_off) == -1)
622 - return -1;
623 - return 0;
624 - }
625 ---
626 -2.26.0
627 -