From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/
Date: Tue, 25 Oct 2016 20:27:21 +0000 (UTC) [thread overview]
Message-ID: <1477427230.4a1936aa0776f32b284ba848ad5a21baf0ae4601.polynomial-c@gentoo> (raw)
commit: 4a1936aa0776f32b284ba848ad5a21baf0ae4601
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 20:03:20 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 20:27:10 2016 +0000
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 <polynomial-c <AT> 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 ------------
| 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..00000000
--- 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} == "9999" ]] ; 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=(
- "${FILESDIR}"/${P}-header-define.patch
- "${FILESDIR}"/${P}-nes-magic.patch
- "${FILESDIR}"/${P}-php-magic.patch
- "${FILESDIR}"/${P}-msoffice-magic.patch
- "${FILESDIR}"/${P}-stdin-rpm.patch
- "${FILESDIR}"/${P}-tests-fatal.patch
- "${FILESDIR}"/${P}-stdin-test.patch
- "${FILESDIR}"/${P}-compress-1.patch
- "${FILESDIR}"/${P}-compress-2.patch
-)
-
-src_prepare() {
- epatch "${PATCHES[@]}"
- [[ ${PV} == "9999" ]] && eautoreconf
- elibtoolize
-
- # don't let python README kill main README #60043
- mv python/README{,.python}
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- ac_cv_header_zlib_h=$(usex zlib) \
- ac_cv_lib_z_gzopen=$(usex zlib)
- econf \
- $(use_enable static-libs static)
-}
-
-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
- cd "${WORKDIR}"/build
- 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
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi ; then
- emake
- else
- emake -C src libmagic.la
- fi
-}
-
-src_compile() {
- if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
- emake -C "${WORKDIR}"/build/src file
- PATH="${WORKDIR}/build/src:${PATH}"
- fi
- multilib-minimal_src_compile
-
- use python && cd python && distutils-r1_src_compile
-}
-
-multilib_src_install() {
- if multilib_is_native_abi ; then
- default
- else
- emake -C src install-{includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
- fi
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog MAINT README
-
- use python && cd python && distutils-r1_src_install
- prune_libtool_files
-}
diff --git a/sys-apps/file/file-5.27.ebuild b/sys-apps/file/file-5.27.ebuild
deleted file mode 100644
index 658a92f..00000000
--- a/sys-apps/file/file-5.27.ebuild
+++ /dev/null
@@ -1,108 +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} == "9999" ]] ; 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/ http://mx.gw.com/pipermail/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="python static-libs zlib"
-
-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 )"
-
-src_prepare() {
- [[ ${PV} == "9999" ]] && eautoreconf
- elibtoolize
-
- # don't let python README kill main README #60043
- mv python/README{,.python}
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- ac_cv_header_zlib_h=$(usex zlib) \
- ac_cv_lib_z_gzopen=$(usex zlib)
- econf \
- --enable-fsect-man5 \
- $(use_enable static-libs static)
-}
-
-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
- cd "${WORKDIR}"/build
- 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
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi ; then
- emake
- else
- emake -C src libmagic.la
- fi
-}
-
-src_compile() {
- if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
- emake -C "${WORKDIR}"/build/src file
- PATH="${WORKDIR}/build/src:${PATH}"
- fi
- multilib-minimal_src_compile
-
- use python && cd python && distutils-r1_src_compile
-}
-
-multilib_src_install() {
- if multilib_is_native_abi ; then
- default
- else
- emake -C src install-{includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
- fi
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog MAINT README
-
- use python && cd python && distutils-r1_src_install
- prune_libtool_files
-}
diff --git a/sys-apps/file/files/file-5.26-compress-1.patch b/sys-apps/file/files/file-5.26-compress-1.patch
deleted file mode 100644
index b10bfd2..00000000
--- a/sys-apps/file/files/file-5.26-compress-1.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 52ae939467583ec499f6c62cdb406e8f982c0310 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Tue, 19 Apr 2016 13:39:19 +0000
-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)
- goto error;
-- goto out;
-+ /*FALLTHROUGH*/
- case NODATA:
-- goto out;
-+ break;
- default:
- abort();
-+ /*NOTREACHED*/
-+ error:
-+ rv = -1;
-+ break;
- }
- }
--out:
-- rv = 1;
--error:
-+ DPRINTF("rv = %d\n", rv);
-+
- #ifdef HAVE_SIGNAL_H
- (void)signal(SIGPIPE, osigpipe);
- #endif
---
-2.7.4
-
diff --git a/sys-apps/file/files/file-5.26-compress-2.patch b/sys-apps/file/files/file-5.26-compress-2.patch
deleted file mode 100644
index d27656f..00000000
--- a/sys-apps/file/files/file-5.26-compress-2.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-http://mx.gw.com/pipermail/file/2016/001978.html
-
-From 26879a2b5ec6880cb46b416880e520c628927abd Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Tue, 19 Apr 2016 23:36:36 +0000
-Subject: [PATCH] Restore part of previous logic, that breaks out of the
- uncompress loop if there was a compression match error or not. Separate the
- return values to avoid confusion.
-
----
- src/compress.c | 23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/src/compress.c b/src/compress.c
-index 0ebc837..2a95f85 100644
---- a/src/compress.c
-+++ b/src/compress.c
-@@ -187,7 +187,7 @@ file_zmagic(struct magic_set *ms, int fd, const char *name,
- size_t i, nsz;
- char *rbuf;
- file_pushbuf_t *pb;
-- int rv = 0;
-+ int urv, prv, rv = 0;
- int mime = ms->flags & MAGIC_MIME;
- #ifdef HAVE_SIGNAL_H
- sig_t osigpipe;
-@@ -214,26 +214,26 @@ file_zmagic(struct magic_set *ms, int fd, const char *name,
- if (!zm)
- continue;
- nsz = nbytes;
-- rv = uncompressbuf(fd, ms->bytes_max, i, buf, &newbuf, &nsz);
-+ urv = uncompressbuf(fd, ms->bytes_max, i, buf, &newbuf, &nsz);
- DPRINTF("uncompressbuf = %d, %s, %zu\n", rv, (char *)newbuf,
- nsz);
-- switch (rv) {
-+ switch (urv) {
- case OKDATA:
- case ERRDATA:
-
- ms->flags &= ~MAGIC_COMPRESS;
-- if (rv == ERRDATA)
-- rv = file_printf(ms, "%s ERROR: %s",
-+ if (urv == ERRDATA)
-+ prv = file_printf(ms, "%s ERROR: %s",
- methodname(i), newbuf);
- else
-- rv = file_buffer(ms, -1, name, newbuf, nsz);
-- if (rv == -1)
-+ prv = file_buffer(ms, -1, name, newbuf, nsz);
-+ if (prv == -1)
- goto error;
-- DPRINTF("rv = %d\n", rv);
-+ rv = 1;
- if ((ms->flags & MAGIC_COMPRESS_TRANSP) != 0)
-- break;
-+ goto out;
- if (mime != MAGIC_MIME && mime != 0)
-- break;
-+ goto out;
- if ((file_printf(ms,
- mime ? " compressed-encoding=" : " (")) == -1)
- goto error;
-@@ -261,6 +261,7 @@ file_zmagic(struct magic_set *ms, int fd, const char *name,
- break;
- }
- }
-+out:
- DPRINTF("rv = %d\n", rv);
-
- #ifdef HAVE_SIGNAL_H
---
-2.7.4
-
diff --git a/sys-apps/file/files/file-5.26-header-define.patch b/sys-apps/file/files/file-5.26-header-define.patch
deleted file mode 100644
index 349614f..00000000
--- a/sys-apps/file/files/file-5.26-header-define.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-http://mx.gw.com/pipermail/file/2016/001955.html
-
-From c4b6ea9b998882d08692599e28f4245714eaf8bb Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Sun, 17 Apr 2016 13:56:03 +0000
-Subject: [PATCH] add missing define.
-
----
- src/magic.h.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/magic.h.in b/src/magic.h.in
-index 1e567cd..3d6954a 100644
---- a/src/magic.h.in
-+++ b/src/magic.h.in
-@@ -114,6 +114,7 @@ int magic_errno(magic_t);
- #define MAGIC_PARAM_ELF_SHNUM_MAX 3
- #define MAGIC_PARAM_ELF_NOTES_MAX 4
- #define MAGIC_PARAM_REGEX_MAX 5
-+#define MAGIC_PARAM_BYTES_MAX 6
-
- int magic_setparam(magic_t, int, const void *);
- int magic_getparam(magic_t, int, void *);
---
-2.7.4
-
diff --git a/sys-apps/file/files/file-5.26-msoffice-magic.patch b/sys-apps/file/files/file-5.26-msoffice-magic.patch
deleted file mode 100644
index a43d3f1..00000000
--- a/sys-apps/file/files/file-5.26-msoffice-magic.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 84609201fbbd9074f5426b991c5242a08ed78712 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Tue, 19 Apr 2016 18:14:19 +0000
-Subject: [PATCH] Strengthen the magic of relocatable microsoft objects to
- avoid spurious matches (Joerg Jenderek)
-
----
- magic/Magdir/xenix | 23 +++++++++++++++++++++--
- 1 file changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/magic/Magdir/xenix b/magic/Magdir/xenix
-index 38e1e3c..ca5eaae 100644
---- a/magic/Magdir/xenix
-+++ b/magic/Magdir/xenix
-@@ -12,7 +12,26 @@
- # XXX - "x.out" collides with PDP-11 archives
- #
- 0 string core core file (Xenix)
--0 byte 0x80 8086 relocatable (Microsoft)
-+# URL: http://www.polarhome.com/service/man/?qf=86rel&tf=2&of=Xenix
-+# Reference: http://www.azillionmonkeys.com/qed/Omfg.pdf
-+# Update: Joerg Jenderek
-+# recordtype~TranslatorHEADerRecord
-+0 byte 0x80
-+# GRR: line above is too general as it catches also Extensible storage engine DataBase
-+# skip examples like GENA.SND Switch.Snd by looking for record length maximal 1024-3
-+>1 uleshort <1022
-+# skip examples like GAME.PICTURE Strange.Pic by looking for positiv record length
-+>>1 uleshort >0
-+# skip examples like Xtable.Data FRACTAL.GEN SHR.VIEW by looking for positiv string length
-+>>>3 ubyte >0
-+# skip examples like OMBRE.6 with "UUUUUU" by looking for filename like "hello.c"
-+>>>>4 regex [a-zA-Z_/]{1,8}[.] 8086 relocatable (Microsoft)
-+#!:mime application/octet-stream
-+!:mime application/x-object
-+!:ext o/a
-+>>>>>3 pstring x \b, "%s"
-+# checksum
-+#>>>>>(3.b+4) ubyte x \b, checksum 0x%2.2x
- 0 leshort 0xff65 x.out
- >2 string __.SYMDEF randomized
- >0 byte x archive
---
-2.7.4
-
diff --git a/sys-apps/file/files/file-5.26-nes-magic.patch b/sys-apps/file/files/file-5.26-nes-magic.patch
deleted file mode 100644
index 0cc43b0..00000000
--- a/sys-apps/file/files/file-5.26-nes-magic.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-http://mx.gw.com/pipermail/file/2016/001969.html
-
-From 402b28ae533f5d013cd44e29eeaf64bcd4e5a925 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 18 Apr 2016 20:22:10 +0000
-Subject: [PATCH] Add missing continuation
-
----
- magic/Magdir/console | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/magic/Magdir/console b/magic/Magdir/console
-index ed69f43..9448223 100644
---- a/magic/Magdir/console
-+++ b/magic/Magdir/console
-@@ -53,7 +53,7 @@
- # so most of the data isn't easily parseable.
- #
- 0 string UNIF
--4 lelong <16 UNIF v%d format NES ROM image
-+>4 lelong <16 UNIF v%d format NES ROM image
-
- #------------------------------------------------------------------------------
- # gameboy: file(1) magic for the Nintendo (Color) Gameboy raw ROM format
---
-2.7.4
-
diff --git a/sys-apps/file/files/file-5.26-php-magic.patch b/sys-apps/file/files/file-5.26-php-magic.patch
deleted file mode 100644
index 310af1b..00000000
--- a/sys-apps/file/files/file-5.26-php-magic.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-http://mx.gw.com/pipermail/file/2016/001947.html
-http://mx.gw.com/pipermail/file/2016/001949.html
-
-From a5995b6e56c1a476360ccc58598a389f6cd71948 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Tue, 19 Apr 2016 13:40:02 +0000
-Subject: [PATCH] Fix wrong level
-
----
- magic/Magdir/commands | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/magic/Magdir/commands b/magic/Magdir/commands
-index 95109f3..fddb764 100644
---- a/magic/Magdir/commands
-+++ b/magic/Magdir/commands
-@@ -101,7 +101,7 @@
- 0 string =<?php
- >5 regex [\ \n]
- >>6 string /*\ Smarty\ version Smarty compiled template
-->24 regex [0-9.]+ \b, version %s
-+>>>24 regex [0-9.]+ \b, version %s
- !:mime text/x-php
-
- 0 string Zend\x00 PHP script Zend Optimizer data
---
-2.7.4
-
diff --git a/sys-apps/file/files/file-5.26-stdin-rpm.patch b/sys-apps/file/files/file-5.26-stdin-rpm.patch
deleted file mode 100644
index 7ba5072..00000000
--- a/sys-apps/file/files/file-5.26-stdin-rpm.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-http://mx.gw.com/pipermail/file/2016/001975.html
-
-From 11edb37a71851b5bcbd4e51ca6ad3dcbf57e9761 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Tue, 19 Apr 2016 20:51:54 +0000
-Subject: [PATCH] Revert: Don't close stdin...
-
----
- src/magic.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/magic.c b/src/magic.c
-index 46e4678..8cf6269 100644
---- a/src/magic.c
-+++ b/src/magic.c
-@@ -346,7 +346,7 @@ private void
- close_and_restore(const struct magic_set *ms, const char *name, int fd,
- const struct stat *sb)
- {
-- if (name == NULL)
-+ if (fd == STDIN_FILENO || name == NULL)
- return;
- (void) close(fd);
-
---
-2.7.4
-
diff --git a/sys-apps/file/files/file-5.26-stdin-test.patch b/sys-apps/file/files/file-5.26-stdin-test.patch
deleted file mode 100644
index 85e59a5..00000000
--- a/sys-apps/file/files/file-5.26-stdin-test.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-http://mx.gw.com/pipermail/file/2016/001963.html
-
-From 20c59ad54afc7427ea680f84c8ee5a576ba54b08 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 18 Apr 2016 15:10:34 +0000
-Subject: [PATCH] Downgrade DER comparison and offset lookup failures to be
- handled as match failures.
-
----
- src/softmagic.c | 60 ++++++++++++++++++++++++++++++++++++++-------------------
- 1 file changed, 40 insertions(+), 20 deletions(-)
-
-diff --git a/src/softmagic.c b/src/softmagic.c
-index 14a8bc5..5b5f0f9 100644
---- a/src/softmagic.c
-+++ b/src/softmagic.c
-@@ -186,11 +186,11 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
- ((text && (m->str_flags & FLT) == STRING_BINTEST) ||
- (!text && (m->str_flags & FLT) == STRING_TEXTTEST))) ||
- (m->flag & mode) != mode) {
-+flush:
- /* Skip sub-tests */
-- while (magindex + 1 < nmagic &&
-- magic[magindex + 1].cont_level != 0 &&
-- ++magindex)
-- continue;
-+ while (magindex < nmagic - 1 &&
-+ magic[magindex + 1].cont_level != 0)
-+ magindex++;
- continue; /* Skip to next top-level test*/
- }
-
-@@ -227,10 +227,7 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
- * main entry didn't match,
- * flush its continuations
- */
-- while (magindex < nmagic - 1 &&
-- magic[magindex + 1].cont_level != 0)
-- magindex++;
-- continue;
-+ goto flush;
- }
-
- if ((e = handle_annotation(ms, m)) != 0) {
-@@ -255,8 +252,14 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
- if (print && mprint(ms, m) == -1)
- return -1;
-
-- if (moffset(ms, m, nbytes, &ms->c.li[cont_level].off) == -1)
-+ switch (moffset(ms, m, nbytes, &ms->c.li[cont_level].off)) {
-+ case -1:
- return -1;
-+ case 0:
-+ goto flush;
-+ default:
-+ break;
-+ }
-
- /* and any continuations that match */
- if (file_check_mem(ms, ++cont_level) == -1)
-@@ -362,9 +365,16 @@ match(struct magic_set *ms, struct magic *magic, uint32_t nmagic,
- if (print && mprint(ms, m) == -1)
- return -1;
-
-- if (moffset(ms, m, nbytes,
-- &ms->c.li[cont_level].off) == -1)
-+ switch (moffset(ms, m, nbytes,
-+ &ms->c.li[cont_level].off)) {
-+ case -1:
- return -1;
-+ case 0:
-+ flush = 1;
-+ break;
-+ default:
-+ break;
-+ }
-
- if (*m->desc)
- *need_separator = 1;
-@@ -813,9 +823,13 @@ moffset(struct magic_set *ms, struct magic *m, size_t nbytes, int32_t *op)
- case FILE_DER:
- {
- o = der_offs(ms, m, nbytes);
-- if (o == -1) {
-- file_error(ms, 0, "EOF computing DER offset");
-- return -1;
-+ if (o == -1 || (size_t)o > nbytes) {
-+ if ((ms->flags & MAGIC_DEBUG) != 0) {
-+ (void)fprintf(stderr,
-+ "Bad DER offset %d nbytes=%zu",
-+ o, nbytes);
-+ }
-+ return 0;
- }
- break;
- }
-@@ -825,12 +839,13 @@ moffset(struct magic_set *ms, struct magic *m, size_t nbytes, int32_t *op)
- break;
- }
-
-- if ((size_t)o >= nbytes) {
-- file_error(ms, 0, "Offset out of range");
-+ if ((size_t)o > nbytes) {
-+ file_error(ms, 0, "Offset out of range %zu > %zu",
-+ (size_t)o, nbytes);
- return -1;
- }
- *op = o;
-- return 0;
-+ return 1;
- }
-
- private uint32_t
-@@ -2107,8 +2122,13 @@ magiccheck(struct magic_set *ms, struct magic *m)
- return 1;
- case FILE_DER:
- matched = der_cmp(ms, m);
-- if (matched == -1)
-- file_error(ms, 0, "EOF comparing DER entries");
-+ if (matched == -1) {
-+ if ((ms->flags & MAGIC_DEBUG) != 0) {
-+ (void) fprintf(stderr,
-+ "EOF comparing DER entries");
-+ }
-+ return 0;
-+ }
- return matched;
- default:
- file_magerror(ms, "invalid type %d in magiccheck()", m->type);
---
-2.7.4
-
diff --git a/sys-apps/file/files/file-5.26-tests-fatal.patch b/sys-apps/file/files/file-5.26-tests-fatal.patch
deleted file mode 100644
index 29c9338..00000000
--- a/sys-apps/file/files/file-5.26-tests-fatal.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-http://mx.gw.com/pipermail/file/2016/001961.html
-
-From fe1b14d68fe47a0641606c142222d6b0fb9e05d9 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Mon, 18 Apr 2016 18:16:45 +0000
-Subject: [PATCH] exit on error.
-
----
- tests/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index c2cb5ee..e55cdf4 100644
---- a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -13,7 +13,7 @@ issue311docx.testfile
- T = $(top_srcdir)/tests
- check-local:
- MAGIC=$(top_builddir)/magic/magic ./test
-- for i in $T/*.testfile; do echo Running test: $$i; MAGIC=$(top_builddir)/magic/magic ./test $$i $${i%%.testfile}.result; done
-+ set -e; for i in $T/*.testfile; do echo Running test: $$i; MAGIC=$(top_builddir)/magic/magic ./test $$i $${i%%.testfile}.result; done
-
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
---
-2.7.4
-
next reply other threads:[~2016-10-25 20:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-25 20:27 Lars Wendler [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-27 8:23 [gentoo-commits] repo/gentoo:master commit in: sys-apps/file/, sys-apps/file/files/ Sam James
2023-10-19 19:08 Mike Gilbert
2023-08-01 15:42 Sam James
2022-12-31 12:58 Sam James
2022-10-28 19:53 Sam James
2022-08-16 2:30 Sam James
2021-06-29 8:29 Lars Wendler
2021-04-25 18:13 Mike Gilbert
2021-04-21 9:42 Lars Wendler
2020-06-28 2:10 Georgy Yakovlev
2020-06-15 8:09 Lars Wendler
2020-04-12 23:28 Thomas Deutschmann
2018-07-24 8:58 Lars Wendler
2018-06-12 8:18 Thomas Deutschmann
2016-08-10 9:49 Mike Frysinger
2016-04-21 20:30 Mike Frysinger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1477427230.4a1936aa0776f32b284ba848ad5a21baf0ae4601.polynomial-c@gentoo \
--to=polynomial-c@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox