Security bump. Removed old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

3 files changed, 51 insertions, 49 deletions

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index aac08381ce49..6e447ce5fe3c 100644
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/file
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.258 2014/01/18 03:06:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.259 2014/02/13 05:45:55 polynomial-c Exp $
+
+*file-5.17 (13 Feb 2014)
+
+  13 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> -file-5.12-r1.ebuild,
+  +file-5.17.ebuild:
+  Security bump (CVE-2014-1943). Removed old.
 
   18 Jan 2014; Mike Frysinger <vapier@gentoo.org> file-5.15.ebuild,
   file-5.16.ebuild, file-9999.ebuild:
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 2fa3bd21271f..52b24884f141 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,30 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST file-5.12-magic-updates-4d53f0549fb40b179eaee53c63c42e1685e4ebab.patch.bz2 13636 SHA256 1694161e8a34d68fa481f362e5df81a06dee44678503f8a6113e42700c0b0ddb SHA512 641294ffb6f156dbcccf53afca4afa72fe7f2fcf7ff8c4b1815b62af3db805f761f0863948fbc435652053f7adca5a746197602c27fee1b1cca9523ab28bd152 WHIRLPOOL 2ed9ef157bddd35b7c93d4147b6dba180304676a6dfff1311ee06b9da8c3d042203c9b51c1c1f7d27502bdbe17e851b290ff313574440a034483fe9655bb2168
-DIST file-5.12.tar.gz 632808 SHA256 199d0dab2e32814cbced8dc30d3d2d5b7e45587598160a2c401358b573273d22 SHA512 eea292ea39256c0aede271676321e6076125b02bc8656d867f8d99caea4e54849e79840236c6f38f0024273d81c12cb87a966d1670da3fda77f7d739da3dd2f8 WHIRLPOOL 0d2b7733581afd65c71afdffb39f2d9693c5b29734d99c2f61d835756d522659dec2e35c50716a368c758cc7473835d646bd5638d2bb839edbb9393c97a19642
 DIST file-5.15.tar.gz 655932 SHA256 4bd52cc614d6488127c0bddc208a2855481744d76ff0878d9c173d2a6ed564e4 SHA512 390530832953c23099422c21b7159903fc6850999c6561b9d641318212d4c8e2bc768932cf8af0f545fac861a49f7389ce763b6e3b7d3832beba5281f0290e2b WHIRLPOOL 0a501f30a92b5f4dbaa66cb49caa5b8423d14b3bc4eda907124e5f530db164a3fcba829c6b9436680481af09e048a7930b20482ec227f465ef83938a2a0a9c1b
 DIST file-5.16.tar.gz 658789 SHA256 48bcac7726c37a8a0bc7ffa16b58993575657dd7b382039380fb3b74ab389261 SHA512 21c5747bc6973697b7ca2ec5613b3b2f321ad1b6b7c6258a7c302509b7ff73436ebed8e5508fd68fbd49448feefe6a5431a646ae807056aea52cbb22836e3a9b WHIRLPOOL 18acc9b00ed3750cc40a657ef3118459ec57fcbf93f6916c9aa79fd9b159d03273c6e50d4b324135050ce15f584119e80b338de3fdd8746b694dfb00dccd1c52
-EBUILD file-5.12-r1.ebuild 2560 SHA256 4a8dfaad82b6d172c5240460995334734154a880cbd9422d89e05a5d48491800 SHA512 fe1990834b705606a7e7b7cd5bcefa3b77b1250e391f0aa9c75374ba981eb37b14f4b8239dd99e302597032a61f4e6b34fcb1d3c1557bacb4daf88350a1bede5 WHIRLPOOL 3c01a66082d313c871e491884efc153a5b5d648d4d247e20d8a9d62fd7fbbf34223f843fb3039618d6a38b08d4e26381df4227dc1cb60ad2cae20d692590b6db
+DIST file-5.17.tar.gz 709991 SHA256 3feb97141b387b64da30aee485852925312c0e74219380a5ed451f14a90c83ca SHA512 6c85d1719221f5dcf8620442901d17de1c32458ffedbdcd43beedf7d8b2553fe4bf85deeabda65abcbdc9e5cbfefafe26ecd982749c57e393955f51009ef2a88 WHIRLPOOL dff671934aed89308278a1158f0e70eb6dc73ab4852ecf206ca3164251a3d0a7e692b3d6acad98d9c49ae2154b8be15d3704c8eb3d255d79f951c808f97d8253
 EBUILD file-5.15.ebuild 2390 SHA256 497d238cb266e5c2f8df9498857ce76e61c8cb6a76922154c495a30f45b58b26 SHA512 af771b49ac9747075ab7acf6de4e6e911219c1c75206ef04518da16ee5200f551db8144384df0767c923582ef1e1b3c1ecd33d56c0d7c3aa8399d66a3bf16389 WHIRLPOOL e65db4cdd0f4f0a3a9202495928442ac508c718bf2c2fcfd2fc84e37db41d42d2b122980fa83a28774b217e8bca57d811fb839c529f8b7b559f3b9266f7a1f9e
 EBUILD file-5.16.ebuild 2402 SHA256 ced6810d40920f4ada9a7079f9b7349275f7ab4a957ffeb3b6af1130f26bde41 SHA512 d0483f00998abfbb677b1225df91e3db8c5def4c5700441631426b228056da04ca5140b6d5e8fbb0a35311ca1c9b320b6cf044d273786329560fcb4f96fbc6ff WHIRLPOOL e7a8ddcc454686c511e0ec5f38615bf2a6019fe96c1abd7f5641f86983245e35d170dd6d4fac9773f695ac976fcb253eb7d702054c75590e406fc9316e09e2dd
+EBUILD file-5.17.ebuild 2408 SHA256 07bed0de9ab6d805fdea10cdc83e7855c0425decdbe1f707651d4730dc06ea4a SHA512 3d8305d1894210fe238b5ebc002a40569fd988f0cd71ba5042e8eeb3b37782438b4997abfb5dee65609c347e367df059156b6cf95120f720b1e0785c6243898a WHIRLPOOL d449d1010985f96914ec94cf6cad86dac47833df6a0f4435d3572970249d05ed55d247f6ce635e1ef4139d643feec6380bce380443b47b709db4c370aa088eff
 EBUILD file-9999.ebuild 2402 SHA256 9ab9132710ab8b2f77808142baff8a974dfe8fe4151e49cbb4f91ddf17d52966 SHA512 e78ea4bd7ab2b1654ba8ccce287696b0968e39a2584fb5f1d565c59830de5a9169c1311d3b2f8e7c2b81c404e3a1af170f7304295231839423be3f3ffbc055fd WHIRLPOOL 7756ad617d6d6bb2cbf09a64b4041affb41bb555a96ccc83423b46150667bc776310b257957a49637b2037063533026325594b7c060db108fb1977c24f725e30
-MISC ChangeLog 31337 SHA256 296b6e5744641d329297de65af8443d5b02fdfe4c32f620063344871d36dee36 SHA512 f504c0f960f013aad997fcedd7d36a6ed1661fba030b6300079a8a9a2fc1913da48b1cbf0b38be9e08ff563f99005e3d20b01d24ea6724408cd5eaac0f96ddc5 WHIRLPOOL 95dfeacb39aaef5c87bb22d176b36c7a341d38a291938215ff2173e197cfb83b47e9ee6082bf09c5680ab2954570b6b859cbe1efc38fabc9be6c059e097a9a52
+MISC ChangeLog 31513 SHA256 52d1cf58407f3bc41372126729a8da80dbd9115e5fc276dddcfc6f41bb373395 SHA512 013cbf293ba10ab065ee28a1a5ade6a7b8c575bdb7d25761fef5ee0c158fb16a974783b435e562ef997ba1bf89507ef3d78b9be3d9739ad2f2a6172e10fc70c7 WHIRLPOOL 747d8082206c732912f4d33901c9fc93803bd681f9a03766e8ee6065f2de3915cbb2c0b0c0b5ed55f1d114d4d100ecc78e8a8546712cef8f37335e5ba7f74241
 MISC metadata.xml 227 SHA256 ecd74a3d9a250a8c5c597b45fd334ab26335074b687bc12f5a6fea32ef9f0690 SHA512 bf2e56b14ac89961c21f5eba6bf90e4f21fd001b88963bcf4c21d0ec63f7b860611bd8883b8760c2bc81dde2a9669456123033ca54337441016379f80e6029cf WHIRLPOOL 22c14f95d7a544f0c11e11136811724ebe69dc0c607073307a28446b1ebeb4ab8838180947a4f496f41648522e34b5dab71680c330a0085b774dbc9ea23ff647
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS2e+9AAoJEPGu1DbS6WIAD9MQAIyBR1pfseP7ocWeraTKFgKk
-I5YJaH3HJbycXNv0ILBp3FJfQ49SHYCfm9hhsv+FcoAMrsTVGwpDFxSqtiR2gHX3
-q9+woQLTlHvKsC3L4Ko607WMgekleroqieKKJSLShGud8QozlAKslaagLoJJies+
-wo4I3D5jajcYm1ls+Xh3zRU3OFF/oCKgRkxVApXS6ZEzePt4DI+zZT0k+dzRmCNJ
-1tC6A56Z0mVpqJnhUu8oRua/EVJYlZUUHU6AtQSqypMSYM3rTFrzvyfDB+4/Vha1
-gsqDwZXZQF+SSCdplvj0o/UHf2YkEGs76KLkUDcxb+kW7j36u66f5N2DlJNuiLtn
-sFwi5UMysD6AFJpDNzOU8rDtS7Q+FXf7IQzZ7ywomSyfWGwjyytO8L5ddMxgXACR
-toCabNGhQQD9IEUvRIqScuBl8FwseTMs7j2KotUm852LPP+RMv2bR1fiJFzdaSul
-dP4Ced41fKuNwzbb1zGejkWYuZcvFpyAmvG0ezkAiVowZpYp2+eB30LESlmbKOlu
-So45p6xlDuT+UqSneStnR5eDd8ft763gXt4gU9DOXpck4CphyaJkuNbU9wsZ2Yz3
-e065ev4RUFeC5n/t9thdpiYt3JFEhVzO7AZtdX2ZLW0kzqmyJBgbv3ECZsaJJqsB
-qC5WxcF1Ayk8Fzn5vUjz
-=icO2
+iQIcBAEBCAAGBQJS/FwUAAoJEPiazRVxLXTFj7kQAL6uDgNRHG6NbzPlkjYX0hUX
+8ClyP3KoP2Ix9Fyq5/coBKemquQKY32TTaIZrmDdD6AjWSPWaDDGWKUZTMk57R7L
+V21w2y6KJYovDBWRG9k3L1a9Or8a/lpt0Bjk/7b15Qe1wQrafL3e2O8a2OudnYEq
+oRyziqWOvH4n79T6M7+JwfLyM9w5Gdb2IYwt6vzRxgmXLGnH22YmyR0WjVshDxWz
+eqdGH7hexQYNXKqOmC9aArKRe85oEY9zmZHSOkARSsoYirOhYfK/8hJOAGV3+JsM
+ttUiOKmnD9QYl9Jpv1Hfq7P1f2YRwlwMx74DQSusiqczqD4XvZC5byZBwJmqJtSl
+Pmlzooe5btbszbCNgDdKHHh082EfW0HWvShOiI461/Ed7eVIkygADp3YWgKUDh/c
+ScJSKPwv2ixou1r8nxF/zooeOPJZHKOP7ND70SLTrzt3Xk3dN+ocuIfKZ7xhTy5d
+ukj47R4Ap8uZfBSdxEuIrh/AnWC7Wf+K/qwH9OG/Bq9y5DiZnGse9Ma9bJkNCsSM
+VGR/DNVl5sDw+HiMTFxsrlRMl4uPCBF2uOk2R8FvgWlbw/PVPhDnReLdJ3RKEqq8
+24HIUVregpHkA0S/pD0ioKviaZG/y41b0jWmnZC0wR3gTBxHYXjkbxGQfy6GJgkC
+Jh35xpBtSW9VlSKCDJNd
+=RqVS
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/file/file-5.12-r1.ebuild b/sys-apps/file/file-5.17.ebuild
index 32184a9fc01e..67c3d910f158 100644
--- a/sys-apps/file/file-5.12-r1.ebuild
+++ b/sys-apps/file/file-5.17.ebuild
@@ -1,41 +1,44 @@
-# Copyright 1999-2013 Gentoo Foundation
+# 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.12-r1.ebuild,v 1.11 2013/11/28 19:53:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.17.ebuild,v 1.1 2014/02/13 05:45:55 polynomial-c Exp $
 
-EAPI="2"
-PYTHON_DEPEND="python? *"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython"
+EAPI="4"
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy2_0 )
+DISTUTILS_OPTIONAL=1
 
-inherit eutils distutils libtool toolchain-funcs
+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="ftp://ftp.astron.com/pub/file/"
-SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz
-	ftp://ftp.gw.com/mirrors/pub/unix/file/${P}.tar.gz
-	mirror://gentoo/${P}-magic-updates-4d53f0549fb40b179eaee53c63c42e1685e4ebab.patch.bz2"
+HOMEPAGE="http://www.darwinsys.com/file/"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="python static-libs zlib"
 
-DEPEND="zlib? ( sys-libs/zlib )"
+DEPEND="python? ( ${PYTHON_DEPS} )
+	zlib? ( sys-libs/zlib )"
 RDEPEND="${DEPEND}
 	python? ( !dev-python/python-magic )"
 
-PYTHON_MODNAME="magic.py"
-
 src_prepare() {
-	epatch "${WORKDIR}"/${P}-magic-updates-4d53f0549fb40b179eaee53c63c42e1685e4ebab.patch
-
+	[[ ${PV} == "9999" ]] && eautoreconf
 	elibtoolize
 
-	# dont let python README kill main README #60043
+	# don't let python README kill main README #60043
 	mv python/README{,.python}
 }
 
 wd() { echo "${WORKDIR}"/build-${CHOST}; }
+
 do_configure() {
 	ECONF_SOURCE=${S}
 
@@ -46,6 +49,7 @@ do_configure() {
 
 	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
@@ -69,8 +73,9 @@ src_configure() {
 }
 
 do_make() {
-	emake -C "$(wd)" "$@" || die
+	emake -C "$(wd)" "$@"
 }
+
 src_compile() {
 	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
 		CHOST=${CBUILD} do_make -C src file
@@ -78,21 +83,13 @@ src_compile() {
 	fi
 	do_make
 
-	use python && cd python && distutils_src_compile
+	use python && cd python && distutils-r1_src_compile
 }
 
 src_install() {
-	do_make DESTDIR="${D}" install || die
+	do_make DESTDIR="${D}" install
 	dodoc ChangeLog MAINT README
 
-	use python && cd python && distutils_src_install
-	use static-libs || rm -f "${D}"/usr/lib*/libmagic.la
-}
-
-pkg_postinst() {
-	use python && distutils_pkg_postinst
-}
-
-pkg_postrm() {
-	use python && distutils_pkg_postrm
+	use python && cd python && distutils-r1_src_install
+	prune_libtool_files
 }