From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 982A4138334 for ; Tue, 27 Nov 2018 14:38:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 722D9E0BAA; Tue, 27 Nov 2018 14:38:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E4E1E0BAA for ; Tue, 27 Nov 2018 14:38:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3565C335C78 for ; Tue, 27 Nov 2018 14:38:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A259D44B for ; Tue, 27 Nov 2018 14:38:23 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1543329496.84feef34d820a60fdfdb1636b3233c1331399d97.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/file/files/, sys-apps/file/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/file/Manifest sys-apps/file/file-5.33-r4.ebuild sys-apps/file/files/file-5.33-CVE-2018-10360.patch sys-apps/file/files/file-5.33-berkdb_bogus_magic.patch sys-apps/file/files/file-5.33-gl_VISIBILITY-macro.patch X-VCS-Directories: sys-apps/file/files/ sys-apps/file/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 84feef34d820a60fdfdb1636b3233c1331399d97 X-VCS-Branch: master Date: Tue, 27 Nov 2018 14:38:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8137cf5f-5ec6-49d0-bc80-c9d2c4a43c2f X-Archives-Hash: aa4111aafe8c987e23350ccda2c7a360 commit: 84feef34d820a60fdfdb1636b3233c1331399d97 Author: Lars Wendler gentoo org> AuthorDate: Tue Nov 27 14:38:16 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue Nov 27 14:38:16 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84feef34 sys-apps/file: Removed old. Package-Manager: Portage-2.3.52, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> sys-apps/file/Manifest | 1 - sys-apps/file/file-5.33-r4.ebuild | 134 --------------------- sys-apps/file/files/file-5.33-CVE-2018-10360.patch | 18 --- .../file/files/file-5.33-berkdb_bogus_magic.patch | 33 ----- .../file/files/file-5.33-gl_VISIBILITY-macro.patch | 116 ------------------ 5 files changed, 302 deletions(-) diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest index 4999f4b174c..9eb27558139 100644 --- a/sys-apps/file/Manifest +++ b/sys-apps/file/Manifest @@ -1,3 +1,2 @@ -DIST file-5.33.tar.gz 817060 BLAKE2B 735f176f09085243dacaddda1b734ef2191ff1684f08022ed1874e84fd0c84679b5a765383c5c5ad27a7216abc23b9c2211fb7110846122563e18285de0f0e51 SHA512 36c9f2e2aa814b5557eef114fdd3de159688c7a3c9632a9f5c6355c4d2a5694cee81279bda80897616fca07289a7fedb1f797439a2903c76dc84870694773c9e DIST file-5.34.tar.gz 840219 BLAKE2B 20f34684e583d1cb42967f1106d979a42f55fd78097e26929ab4e6cd470b0d3a12c9f1fad89c982ed42869455ba0f3381c812ed00c31112e5ad17edcd50783e0 SHA512 57849f8496fd356a66e5559804fdd907059dc2e2f75ede470a25c65b1c499481aad3d7978454b15a15e94c07c9d6795864e8705304a2281dacf1c4e31501bed8 DIST file-5.35.tar.gz 865425 BLAKE2B 325b95bc45b8e21b568ad816f8c1817dc170f56b78e460ac9bb18c70f22df2491c37f7f9c38c3d85010a7a609e75c26b19b6adef208137cb04c4c40fbe8c1d05 SHA512 cbecc52e9209be8bc090752d0672efa181625d4e1e688e63edd1f5657b29bad69364a477fb4ed85d1fa413b8002c8578c86153d2acaaecce78446c0ca6ea9e38 diff --git a/sys-apps/file/file-5.33-r4.ebuild b/sys-apps/file/file-5.33-r4.ebuild deleted file mode 100644 index 1221edeea29..00000000000 --- a/sys-apps/file/file-5.33-r4.ebuild +++ /dev/null @@ -1,134 +0,0 @@ -# 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,7} pypy ) -DISTUTILS_OPTIONAL=1 - -inherit distutils-r1 libtool toolchain-funcs multilib-minimal - -if [[ ${PV} == "9999" ]] ; 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 - "${FILESDIR}"/${P}-gl_VISIBILITY-macro.patch - "${FILESDIR}"/${P}-berkdb_bogus_magic.patch #661922 -) - -src_prepare() { - default - - # We are patching configure script so fix timestamp to avoid autoreconf - touch -r compile configure - - [[ ${PV} == "9999" ]] && 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 - find "${ED}" -name "*.la" -delete || die -} 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 deleted file mode 100644 index a489846b10f..00000000000 --- a/sys-apps/file/files/file-5.33-CVE-2018-10360.patch +++ /dev/null @@ -1,18 +0,0 @@ -Avoid reading past the end of buffer - -CVE-2018-10360 - -https://github.com/file/file/commit/a642587a9c9e2dd7feacdf513c3643ce26ad3c22 - ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -842,7 +842,8 @@ do_core_note(struct magic_set *ms, unsigned char *nbuf, uint32_t type, - - cname = (unsigned char *) - &nbuf[doff + prpsoffsets(i)]; -- for (cp = cname; *cp && isprint(*cp); cp++) -+ for (cp = cname; cp < nbuf + size && *cp -+ && isprint(*cp); cp++) - continue; - /* - * Linux apparently appends a space at the end 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 deleted file mode 100644 index 7627bafc6ef..00000000000 --- a/sys-apps/file/files/file-5.33-berkdb_bogus_magic.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4fb6a59df80d4974f8230bfce36e38e6de7d574f Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Thu, 24 May 2018 18:54:40 +0000 -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 @@ - >4 ulelong 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 - !:mime application/x-maxis-dbpf --4 ulelong 1 -->8 ulelong !1 -->>24 ledate !0 \b, created: %s -->>>28 ledate !0 \b, modified: %s diff --git a/sys-apps/file/files/file-5.33-gl_VISIBILITY-macro.patch b/sys-apps/file/files/file-5.33-gl_VISIBILITY-macro.patch deleted file mode 100644 index cef3cb5518b..00000000000 --- a/sys-apps/file/files/file-5.33-gl_VISIBILITY-macro.patch +++ /dev/null @@ -1,116 +0,0 @@ -https://bugs.gentoo.org/661508 - ---- a/configure -+++ b/configure -@@ -638,6 +638,8 @@ - IS_CROSS_COMPILE_FALSE - IS_CROSS_COMPILE_TRUE - LIBOBJS -+HAVE_VISIBILITY -+CFLAG_VISIBILITY - OTOOL64 - OTOOL - LIPO -@@ -12512,7 +12519,92 @@ - # Only expand once: - - --gl_VISIBILITY -+ -+ -+ CFLAG_VISIBILITY= -+ HAVE_VISIBILITY=0 -+ if test -n "$GCC"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5 -+$as_echo_n "checking whether the -Werror option is usable... " >&6; } -+ if ${gl_cv_cc_vis_werror+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ -+ gl_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -Werror" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ gl_cv_cc_vis_werror=yes -+else -+ gl_cv_cc_vis_werror=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CFLAGS="$gl_save_CFLAGS" -+fi -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 -+$as_echo "$gl_cv_cc_vis_werror" >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5 -+$as_echo_n "checking for simple visibility declarations... " >&6; } -+ if ${gl_cv_cc_visibility+:} false; then : -+ $as_echo_n "(cached) " >&6 -+else -+ -+ gl_save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -fvisibility=hidden" -+ if test $gl_cv_cc_vis_werror = yes; then -+ CFLAGS="$CFLAGS -Werror" -+ fi -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+extern __attribute__((__visibility__("hidden"))) int hiddenvar; -+ extern __attribute__((__visibility__("default"))) int exportedvar; -+ extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); -+ extern __attribute__((__visibility__("default"))) int exportedfunc (void); -+ void dummyfunc (void) {} -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ gl_cv_cc_visibility=yes -+else -+ gl_cv_cc_visibility=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ CFLAGS="$gl_save_CFLAGS" -+fi -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_visibility" >&5 -+$as_echo "$gl_cv_cc_visibility" >&6; } -+ if test $gl_cv_cc_visibility = yes; then -+ CFLAG_VISIBILITY="-fvisibility=hidden" -+ HAVE_VISIBILITY=1 -+ fi -+ fi -+ -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define HAVE_VISIBILITY $HAVE_VISIBILITY -+_ACEOF -+ -+ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 - $as_echo_n "checking for ANSI C header files... " >&6; } - if ${ac_cv_header_stdc+:} false; then : -@@ -16194,7 +16286,7 @@ - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` -- test -z "am__include" && continue -+ test -z "$am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the