Fix zip detection wrt #367417 by Lubos Kolouch.

Package-Manager: portage-2.2.0_alpha33/cvs/Linux x86_64

4 files changed, 91 insertions, 5 deletions

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index fbd291bcfdd1..0b1f34640c26 100644
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/file
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.197 2011/05/11 03:43:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.198 2011/05/21 06:37:43 ssuominen Exp $
+
+*file-5.07-r1 (21 May 2011)
+
+  21 May 2011; Samuli Suominen <ssuominen@gentoo.org> +file-5.07-r1.ebuild,
+  +files/file-5.07-zip-detect.patch:
+  Fix zip detection wrt #367417 by Lubos Kolouch.
 
 *file-5.07 (11 May 2011)
 
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 4a149e64062c..f92b2819f53d 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX file-5.07-zip-detect.patch 547 RMD160 6faa21497953a7a74ded03ba9e3d1e76e989787a SHA1 aad401c2b4b538bcdf045680c40222dfbedba99f SHA256 a2b86483f3326b56d20473b66b216e553ab50b2c3d9781b12feb09065743269a
 DIST file-5.05.tar.gz 596636 RMD160 3107c10d25a88a3a0648b4b98da9441f810170a9 SHA1 b681e13849135c16f0445b42d95ce499910d242b SHA256 5cb47845d91848e2b8eb58935766f93d8a2ecf665b33be7317f1849d3c46e1b7
 DIST file-5.06.tar.gz 600720 RMD160 d9337ecc1fb836f0d7278edf376b9f86e2b37735 SHA1 ad7cd2334a4e386c7647c69fba3cc8ec6b76c6ca SHA256 34d3d28c8ce231b171abec9ae94be31935e34ead2fed9f6b09b99ec580762401
 DIST file-5.07.tar.gz 597347 RMD160 6d45c8550b8457a437f5acd5a39e6de86bfe1541 SHA1 056caa20857ecda26cae259b43f2a1eeb65ada6c SHA256 c968bfe97d87f9f564728a894d57be2c6bba9a2006763fffff85c5f72a9a3c2f
 EBUILD file-5.05.ebuild 1402 RMD160 7b3b5daa77fdd8e601f266072aeb21f5bb378786 SHA1 b4277c4778b9fcab8143495deebe8879d2958da9 SHA256 e8a4103ca1171305c4c3f8a1db297981e136e4b12f4431872c09ea94276d59e8
 EBUILD file-5.06.ebuild 1411 RMD160 699f5b233fdfa31254a9da9942a78836416ca14b SHA1 676c3bf1e72e418d3ed850a66de04e917e5df9bd SHA256 da1411c6d02631df60cb366aa50c319985556962f3f5111018f6e21c329f0c56
+EBUILD file-5.07-r1.ebuild 1462 RMD160 387803c1ed49cbdc725997ac2d9cfe518ef07aa6 SHA1 bb656169d1cc3dc633f85bf7ea9f4b5392a192d8 SHA256 793ee74c25ecaa0b1d1165790ed8b9859364e10b3ed54309cf98555695216e91
 EBUILD file-5.07.ebuild 1411 RMD160 b369266b189f3d26d7cf09b0739954fdb3fcfeaa SHA1 a72acce15503961939ed351490b93fb3e3ca8fb3 SHA256 c1667db62e791a44f003489b02538c5502e1f8899908b0466191c239e47b5082
-MISC ChangeLog 23451 RMD160 ef6b9ac6d494451141bd32ce22352665491305e9 SHA1 a43e09f27da0d821bae35e90ddcfcd456876222a SHA256 f9ce6a5bd2c97d75ddf85555117e5afe792730b4dda7970ae085103becb7808b
+MISC ChangeLog 23647 RMD160 04a72fd47a155315cf157e461593be830ec88318 SHA1 bb94c8756d99dfa824bf0fc809fca7dd645c157b SHA256 c81d976f3c1470bc478e5d88033ed9b8ebf4827ada7a410311e00b941bd4e404
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3KBdgACgkQaC/OocHi7JaQKAD+LP4PIyBEGX6BSfaTt894wOf8
-8IyMbGR3Dasc9q6aFiQA/jrnzpgJbI6z0ueUnGwd3WPgCFGKxI9E88e28/xWQBX0
-=Zsch
+iF4EAREIAAYFAk3XXWEACgkQXkR9YqOcLPHVxwD/a1VWb6DHx1tIIQ9HC6wbnTH/
+n21X1/FGaDoAmvjFX/sBAKcuUSSypkUBO8tzH7yzSu8OtKR+UUjpUYdH2DaABuKc
+=9ixq
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/file/file-5.07-r1.ebuild b/sys-apps/file/file-5.07-r1.ebuild
new file mode 100644
index 000000000000..7c74ff7e8d5b
--- /dev/null
+++ b/sys-apps/file/file-5.07-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-5.07-r1.ebuild,v 1.1 2011/05/21 06:37:43 ssuominen Exp $
+
+EAPI="2"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="*-jython"
+
+inherit eutils distutils libtool flag-o-matic
+
+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"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="python static-libs"
+
+PYTHON_MODNAME="magic.py"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-zip-detect.patch
+
+	elibtoolize
+	epunt_cxx
+
+	# dont let python README kill main README #60043
+	mv python/README{,.python}
+}
+
+src_configure() {
+	# file uses things like strndup() and wcwidth()
+	append-flags -D_GNU_SOURCE
+
+	econf $(use_enable static-libs static)
+}
+
+src_compile() {
+	emake || die
+
+	use python && cd python && distutils_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	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
+}
diff --git a/sys-apps/file/files/file-5.07-zip-detect.patch b/sys-apps/file/files/file-5.07-zip-detect.patch
new file mode 100644
index 000000000000..3ac09449d636
--- /dev/null
+++ b/sys-apps/file/files/file-5.07-zip-detect.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/show_bug.cgi?id=367417
+http://github.com/glensc/file/commit/e990dc53f658cb67ec7b33c32e0bc24e65801792#magic/Magdir/archive
+http://projects.archlinux.org/svntogit/packages.git/plain/file/trunk/file-5.07-zip-detect.patch
+
+--- magic/Magdir/archive
++++ magic/Magdir/archive
+@@ -654,6 +654,10 @@
+ >>>>78	string	-template		Template
+ !:mime	application/vnd.oasis.opendocument.image-template
+ 
++>26 byte x Zip archive data
++
++
++
+ # StarView Metafile
+ # From Pierre Ducroquet <pinaraf@pinaraf.info>
+ 0	string	VCLMTF	StarView MetaFile