From 4d0a044ba0fe658d7670fd060994ad9554b376c8 Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Tue, 27 Jan 2015 12:36:21 +0000 Subject: [PATCH] Removed vulnerable versions Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC --- sys-apps/file/ChangeLog | 7 +- sys-apps/file/Manifest | 37 +++---- sys-apps/file/file-5.17.ebuild | 95 ---------------- sys-apps/file/file-5.19.ebuild | 105 ------------------ sys-apps/file/file-5.20-r1.ebuild | 107 ------------------- sys-apps/file/file-5.21.ebuild | 105 ------------------ sys-apps/file/files/file-5.20-elf-note.patch | 37 ------- 7 files changed, 20 insertions(+), 473 deletions(-) delete mode 100644 sys-apps/file/file-5.17.ebuild delete mode 100644 sys-apps/file/file-5.19.ebuild delete mode 100644 sys-apps/file/file-5.20-r1.ebuild delete mode 100644 sys-apps/file/file-5.21.ebuild delete mode 100644 sys-apps/file/files/file-5.20-elf-note.patch diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog index 662467ba4ba4..6f7d4a9f612e 100644 --- a/sys-apps/file/ChangeLog +++ b/sys-apps/file/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/file # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.307 2015/01/25 11:21:03 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.308 2015/01/27 12:36:12 polynomial-c Exp $ + + 27 Jan 2015; Lars Wendler -file-5.17.ebuild, + -file-5.19.ebuild, -file-5.20-r1.ebuild, -file-5.21.ebuild, + -files/file-5.20-elf-note.patch: + Removed vulnerable versions. 25 Jan 2015; Agostino Sarubbo file-5.22.ebuild: Stable for alpha, wrt bug #532768 diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest index 08021046160e..d1c431ee55bc 100644 --- a/sys-apps/file/Manifest +++ b/sys-apps/file/Manifest @@ -1,34 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX file-5.20-elf-note.patch 975 SHA256 d3aeef57c6a03125b2b2a17f78c15ff63e3b0dfed21f633b9cd9803039fbdbf6 SHA512 c2b8dffaf58feae3ef6c4301645405056395caf0e5dce56a1099f6be845d40aed375485a3799ba4dd0c8b664dfa051d831ae69657f9f666c3050c83957ea5f8f WHIRLPOOL 7786f758fe8af707f46c8417eba8809e0073c90c553470702fca0a467ac473f8f4d8785253694bea7946de77ac27865d088a0adafc131c120a28a28403bf0b1c -DIST file-5.17.tar.gz 709991 SHA256 3feb97141b387b64da30aee485852925312c0e74219380a5ed451f14a90c83ca SHA512 6c85d1719221f5dcf8620442901d17de1c32458ffedbdcd43beedf7d8b2553fe4bf85deeabda65abcbdc9e5cbfefafe26ecd982749c57e393955f51009ef2a88 WHIRLPOOL dff671934aed89308278a1158f0e70eb6dc73ab4852ecf206ca3164251a3d0a7e692b3d6acad98d9c49ae2154b8be15d3704c8eb3d255d79f951c808f97d8253 -DIST file-5.19.tar.gz 719158 SHA256 9484b3bbda1acc7b13a4f71031a85ce10c77bd0ffec7226741a219ef587e3a7c SHA512 f897454f731b013634f38c02c927d7fb5d0660d5b1a81b7bf614da244558dd64ae44ab35ffc6a5e634a7f670ee287c0e87c70e44266c3123e0d1b73fa303c6ed WHIRLPOOL 8ae346b023e44f5d573c1cf94102aa7eb5f685f1319e248b141bc6dd8668ec983c9d0a0791bd50d9bde031b336ded6ae273bb612d05f738441e29343dfe74477 -DIST file-5.20.tar.gz 725937 SHA256 5bc36bfbb83a009da25a7174848f1bc5824be03192a8fdce7f83dc897ed2d247 SHA512 ee3eff78c8776aa83cf2dfa66943359c488fb3d4b1458817fc39dcef8b16d536ad9fd5f138f37d785abe6f715d757b6729c8b9fc814f1016d164aa83f8511a5c WHIRLPOOL 5129048a6fea022415cccc0356d61da37389173d505da381125401e43640eddcdfdd3ebbec397657cf0407c123f91a1c388fa6ac9546e1f765b894c07452cb7d -DIST file-5.21.tar.gz 732138 SHA256 1a48741d3923c4cc73267109b8a396c0ce3aebe004181f3efb1b0a228d230bb6 SHA512 ec88ffd1dc911ccf3e52aeb6ddc2e416c1b46c02f7260dffe01f032e029e2c9f4e99605a4388bcad1d3700e4825b5d56aec1c5f998521c76f21c4c18eb13d34f WHIRLPOOL b76268e9c3faf88b01289967bea6e4d04bd72f78f7819db4fe946fe5bf3a1b4c3f1ad8bde7891408a68c59ffba0336012967bb47a31fd299b3ce0827abdf9f9e DIST file-5.22.tar.gz 732556 SHA256 c4e3a8e44cb888c5e4b476e738503e37fb9de3b25a38c143e214bfc12109fc0b SHA512 e9f1648c3b490bac642a2a9e01d31a8bd49c3e2a1feea1b25869aa1d5e37aa99bbf3fdc5d301618a8b97aec046f10e400a57f8a1d0dd61d3583830aaf3fcbda8 WHIRLPOOL de9ce9305fd824d85128617e196fe6b02ea470b63eb2a35d31e857f7cf91e09f85166aaa72695aaf4a7516413b3a146db85588e7da65f32b131a477b3dece176 -EBUILD file-5.17.ebuild 2389 SHA256 435aac5785c233b82a037570a5364ffee1da059761dd52a62a96a6c678391eb6 SHA512 f6b249645dfb3714acccbd73400c407af7a532f74ee1d079110b501913f07774ba7dd465b84e8f865de5428c25b936d308a3c5764228a3ad82ef4cb682a19f57 WHIRLPOOL 150dc8662a0042d38be5de68ea801ce62987d6fb13eeb1e593924340fb16c33398b1662386991a65fda6300f19e0b7c6961621bba785e8e2c8f2402d3a5ac324 -EBUILD file-5.19.ebuild 2784 SHA256 1b79f525f90541e73003a0f579b6f3b5c04403096155a55c63f27dc9b833fb50 SHA512 8f6889201573fbff6109a15a859ed088119bbb99bf56ac2a207c6e2adb8840d6e2e47ebeae828004dcece865250d14b57ccb05906464a08d564b9df5f772e83a WHIRLPOOL 5f6c1ddb8ae415065a867c0101333f658d66b708d78d9627822b07a2788ba0949fd5689256f59b4e5963cfe2d347058ce42554ac2dab2e9fa72f187063635377 -EBUILD file-5.20-r1.ebuild 2846 SHA256 dab09b067e9cb40d429b957c0a018cc3ad0e4eddbdd0486550243301c71198a1 SHA512 c4b75733642c5375190389e0de751dc72ba679fe7fd8e12b1ccaa67fcd6e7abf018a61610ac9ee93d18faaa88aa93586b09f26e004a138b4de91790f5f0044ff WHIRLPOOL be46f6c41b2a204bfc82488623a350e81d04ffeea3e35233546de49c479ca3bd45c281868a9399a7091f289aa13cbc52ec1e29b1b419a193ff981081d4d8a905 -EBUILD file-5.21.ebuild 2781 SHA256 39af91795d47f8b3e5a71c434aa41ed1e90782eb1455ee4a8122dac7ac1a8a58 SHA512 76cfce4e7ca1bb884c177db12b437a2374b5a6a5f3f313505929f015e475d293be600e38dcf04358fe909a42281b11011fb8493a9046dfd01622acc29b60d59e WHIRLPOOL f7938244fadd3ed82befa6bc8105c5c147737068eb98b8abdb40f3a44fa223fbab80488c7ba79c52f952ad18851359573eaf0213ff9a0031abb510c5b5b41c8b EBUILD file-5.22.ebuild 2781 SHA256 53be58892c252b3ea89168f183728e458453c0b2b131d2e619f466015b56dac5 SHA512 316ca550083ab6811945762cb8656a5ef2abb86df3b4065790a4cc0443301b767d6327f915605bba5addf507e191bd2c4bc470717535dad6459dde217feb8cde WHIRLPOOL 99c5627f8bb0ec0e3a74c68f6ec976d9645509b0d5facf452abcddea72e3ca9047586d6e2fe1fb5b95aebd82de7bbe2145421b0408c3aa1e3e9a9b04b9469227 EBUILD file-9999.ebuild 2634 SHA256 5f194ef3766ed7c49b7966a57ec605bfaf125858e71b430a8d1cfe776d2967e1 SHA512 fb37b82bd9f430f50c8129e71556c27e8bb2b36c591622d5ee4cf17ce714e73e4ded7af8ce3419d655d6bed2c5b517d7afef1bf4649d0a72bcd5efb884142cb4 WHIRLPOOL 3ac36ec49c8a01f74d2a20dec8572d0fa0b0bf6ab2e7d8e2457686a1600272a7d7d933fa6a6ae34bd2fa9fe19f9f2b880149c22e826dea5720eecf2d7e8b6311 -MISC ChangeLog 37055 SHA256 3c441ea712a0db7350b3ddb11528133cae48ec72a5cb6700640f5990a665f9e1 SHA512 1507e16789d913083b297154a15500ff581cb16f083ec08bb93700daf4541dcbc47b0e7fb5eb9fe6133ad467601769bff125fccd728b37336aaae55cb925ad01 WHIRLPOOL fc01707038a568029a186242e280f1281f5d43949fe9f9842839cabee5e4dc63ed6bfe7002c4a914e8c9811367f9abce425fee157afc8e7d655f03fdefeedd2d +MISC ChangeLog 37266 SHA256 314fa5c21c77e0d37dc360ecd20b8b8be401f2a536eb93c391ec6c7df7b1fa4a SHA512 b1c89ece60ad639410e5455aafa7c6fa1f010999625ee5a4ad203cb61ae840c48521b5f7bed8cca755635bad96263a379ac5cf6eb58bbcfe6c47f303f3780d8e WHIRLPOOL e9e113ebf6799906e310b4c3d0f0b4bad2d8b2a06c63048d779395838597823e30a35bf6656a3950236aa28ef0e7f2adbfaa23a563c3dbca8ebb9e3e127362fe MISC metadata.xml 227 SHA256 ecd74a3d9a250a8c5c597b45fd334ab26335074b687bc12f5a6fea32ef9f0690 SHA512 bf2e56b14ac89961c21f5eba6bf90e4f21fd001b88963bcf4c21d0ec63f7b860611bd8883b8760c2bc81dde2a9669456123033ca54337441016379f80e6029cf WHIRLPOOL 22c14f95d7a544f0c11e11136811724ebe69dc0c607073307a28446b1ebeb4ab8838180947a4f496f41648522e34b5dab71680c330a0085b774dbc9ea23ff647 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUxNGgAAoJELp701BxlEWf8RMP/1e4rUMHmVVcnK5FuxotESYv -TmuiqS8oGwwlhqQw1pmMgrE5uq/eRD7UuRRsAgDbH53RNi2zDaNYmlVVgGrQjaaJ -KHAom7L4XqwOoYij1nqPxNA4FyuQVelHcGWd1hT5L2j3c9mhcSUmFxBr5Ur9cRjy -Qy3Xt8j5IWKBcQurFBtquTzi1YzPRDOnbnMmNuagOCOIAPtrU0Mn8Iib47GHxDEp -V91hwhYhl15dzoxr8RTmwFM5Ds7E00OLvOeXkzpaNb4pfAb4vjO31/7Wc6+48929 -qFTGuVeitliDKeD7Aei55OqiETCGoTBjhOsIjogHKe7PpFx89qsGIv59qVo4uliJ -U1+nCg9sJwYo5t2zWwpRIc2OGM87b3Ja5HsUkGtIOrnZSYD/HSchJxbFI8t2uGug -iQV8g0YPNBf2hmgCXpulh0P064Xwju83VGKUL/ALen8mb80WlBN339KrnRl9BuEF -jZh1gOjVrbwFDn417zr4WvraOPAzx5jOuXlXFZGdvI+jcXr9/oQ5FVcRply4Zyzt -SZoO88qYOp0gj61m9tLRVnBEf8XwtwvVzrPDZ95BPC7V5VnL1vCl4r7CUWlUxEKL -wYIygpPIJmsK3sMK6GDcXmsJrfRx4asYgok9vnfcAoSBhvq04zCprWxfGVLUzDEw -Dfx8+0rs3FZV0mhwPNiQ -=Yz62 +iQIcBAEBCAAGBQJUx4ZCAAoJEPiazRVxLXTFQocP/Ah/3ayimClN6Vy7LOnE62D/ +kUjGvt1WoRzKMaK5KsAz7t1ZCAWrWMCli9AqdrAIzNMWnzxziLvXC51DUyPqE/BF +s6noe9GA6iEE38EAMxUGHgUpEvvRExrqvCP8at4+db+P0xUNX6aSLUOCRiUQ1Veh +wzV9Yh99KQKEpcPGxpOmKULArjh4AwZSgS8pCW/CD/5jZpIL9TsHbepiftCiAn8u +bQ63x5O3t2G3TqD2tz3lZJlKvT+j6z5I5QtLpGk1SxYjCDJ1UObInPKGHf467KS5 +3URCY+tvG+/QvmOTP8UJ3g+9jhysRTCVQHuMXOydb3kjZuxYNF6oBJxGSH48p/EJ +NDCnvbT0gWbv2JQsgodqMRFDYNVuqavqScDNBHbeKnjwj3R6KNpISFpK3+XP3SLG +Vf8fPoAd+CJlL7nBISTZ2dJMP4+0XY94U0y05gQAeNNX3eUvebGpHmI5OQAjBrpw +3d3q4x8leeJIMbVm0e+j+hVQlLcpxDF5T32oxscWReJVr0FEYzZPB3Nut5ctp16P +P8VbmMPJ8RYI3T8+OlTb0HgnHZteIO05CfgvSGcnLKbpTU8jb6A0Ip0Hg79ZqtsP +fnNabcO/5/0Z1Ilg1x9H2SVd+qtf6R9ixV5r5NM05ad8dxmXDRBynXMEJtbDjake +L2PG5y+iOQwDzWZjz+K7 +=ub6f -----END PGP SIGNATURE----- diff --git a/sys-apps/file/file-5.17.ebuild b/sys-apps/file/file-5.17.ebuild deleted file mode 100644 index 123ff92f0bf6..000000000000 --- a/sys-apps/file/file-5.17.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.17.ebuild,v 1.12 2014/07/06 23:25:06 kumba Exp $ - -EAPI="4" -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 ) -DISTUTILS_OPTIONAL=1 - -inherit eutils distutils-r1 libtool toolchain-funcs - -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} ) - zlib? ( sys-libs/zlib )" -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} -} - -wd() { echo "${WORKDIR}"/build-${CHOST}; } - -do_configure() { - ECONF_SOURCE=${S} - - mkdir "$(wd)" - pushd "$(wd)" >/dev/null - - econf "$@" - - popd >/dev/null -} - -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 - tc-export_build_env BUILD_C{C,XX} - 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} \ - do_configure --disable-shared - fi - - export ac_cv_header_zlib_h=$(usex zlib) ac_cv_lib_z_gzopen=$(usex zlib) - do_configure $(use_enable static-libs static) -} - -do_make() { - emake -C "$(wd)" "$@" -} - -src_compile() { - if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then - CHOST=${CBUILD} do_make -C src file - PATH=$(CHOST=${CBUILD} wd)/src:${PATH} - fi - do_make - - use python && cd python && distutils-r1_src_compile -} - -src_install() { - do_make DESTDIR="${D}" install - dodoc ChangeLog MAINT README - - use python && cd python && distutils-r1_src_install - prune_libtool_files -} diff --git a/sys-apps/file/file-5.19.ebuild b/sys-apps/file/file-5.19.ebuild deleted file mode 100644 index 76d3636c888d..000000000000 --- a/sys-apps/file/file-5.19.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.19.ebuild,v 1.10 2014/11/23 12:52:37 zlogene Exp $ - -EAPI="4" -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy2_0 ) -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} ) - 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(-)] )" -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 \ - $(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.20-r1.ebuild b/sys-apps/file/file-5.20-r1.ebuild deleted file mode 100644 index 71809400950f..000000000000 --- a/sys-apps/file/file-5.20-r1.ebuild +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.20-r1.ebuild,v 1.1 2014/10/24 17:24:09 vapier Exp $ - -EAPI="4" -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy2_0 ) -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} ) - 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(-)] )" -RDEPEND="${DEPEND} - python? ( !dev-python/python-magic )" - -src_prepare() { - epatch "${FILESDIR}"/${P}-elf-note.patch #526544 - - [[ ${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.21.ebuild b/sys-apps/file/file-5.21.ebuild deleted file mode 100644 index ae18c0bd1465..000000000000 --- a/sys-apps/file/file-5.21.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.21.ebuild,v 1.10 2014/12/26 09:18:18 ago Exp $ - -EAPI="4" -PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} pypy2_0 ) -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} ) - 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(-)] )" -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 \ - $(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.20-elf-note.patch b/sys-apps/file/files/file-5.20-elf-note.patch deleted file mode 100644 index 994dd73943d5..000000000000 --- a/sys-apps/file/files/file-5.20-elf-note.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://bugs.gentoo.org/526544 - -From 39c7ac1106be844a5296d3eb5971946cc09ffda0 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas -Date: Fri, 17 Oct 2014 15:49:00 +0000 -Subject: [PATCH] Fix note bounds reading, Francisco Alonso / Red Hat - ---- - ChangeLog | 4 ++++ - src/readelf.c | 9 ++++++++- - 2 files changed, 12 insertions(+), 1 deletion(-) - -2014-10-17 11:48 Christos Zoulas - - * fix bounds in note reading (Francisco Alonso / Red Hat) - -diff --git a/src/readelf.c b/src/readelf.c -index 08f81f5..9ebdebd 100644 ---- a/src/readelf.c -+++ b/src/readelf.c -@@ -477,6 +477,13 @@ donote(struct magic_set *ms, void *vbuf, size_t offset, size_t size, - uint32_t namesz, descsz; - unsigned char *nbuf = CAST(unsigned char *, vbuf); - -+ if (xnh_sizeof + offset > size) { -+ /* -+ * We're out of note headers. -+ */ -+ return xnh_sizeof + offset; -+ } -+ - (void)memcpy(xnh_addr, &nbuf[offset], xnh_sizeof); - offset += xnh_sizeof; - --- -2.1.2 - -- 2.26.2