commit:     6a99aaca71e0abc25aab4ae9d3a956eeff3e3968
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 04:53:44 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 04:53:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a99aaca

sys-apps/file: security cleanup (bug #698610)

Bug: https://bugs.gentoo.org/698610
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-apps/file/Manifest         |   1 -
 sys-apps/file/file-5.36.ebuild | 126 -----------------------------------------
 2 files changed, 127 deletions(-)

diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 13eed132df4..998712fc785 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,3 +1,2 @@
-DIST file-5.36.tar.gz 875792 BLAKE2B 
ce1d98148e26c243982bb85357d440ab774fc42c526bca4dbff15c05247d2c15b54b030671a5590020fa5383c436204116f7817ec4dd33aa4387b059e4d7fe21
 SHA512 
3ec5e51ffb7a82defa74845a90fbc983f6e169fc116606049bc01ff6e720d340c8abf6eb7a08b9ac1099162a5c02deac3633b07b039d486344c8abd9052ca751
 DIST file-5.37.tar.gz 887682 BLAKE2B 
c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7
 SHA512 
bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
 DIST file-5.38.tar.gz 932528 BLAKE2B 
08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345
 SHA512 
9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40

diff --git a/sys-apps/file/file-5.36.ebuild b/sys-apps/file/file-5.36.ebuild
deleted file mode 100644
index bab24deaf9c..00000000000
--- a/sys-apps/file/file-5.36.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-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 ~riscv 
s390 sh 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="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 )"
-
-src_prepare() {
-       default
-
-       [[ ${PV} == "9999" ]] && 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 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
-}

Reply via email to