Add fix from upstream for postscript detection #368121 by Justin Brody and Shannon.

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

4 files changed, 130 insertions, 5 deletions

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index ba25b9728bfd..031f89667749 100644
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,6 +1,13 @@
 # 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.199 2011/06/06 23:50:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.200 2011/07/08 21:08:34 vapier Exp $
+
+*file-5.07-r3 (08 Jul 2011)
+
+  08 Jul 2011; Mike Frysinger <vapier@gentoo.org> +file-5.07-r3.ebuild,
+  +files/file-5.07-postscript-detect.patch:
+  Add fix from upstream for postscript detection #368121 by Justin Brody and
+  Shannon.
 
 *file-5.07-r2 (06 Jun 2011)
 
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 700b8d7679e9..f427a3a94751 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX file-5.07-postscript-detect.patch 386 RMD160 25f6abd9a370883365d4ab7df0f208b5724d7b99 SHA1 4619728cd9cde329b2f7ca060fff8f093360d6ec SHA256 dc81bc4751e5e79259b00e82b3e12015c4ec8bd9545d9289245894f8c562418e
 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
@@ -9,13 +10,14 @@ EBUILD file-5.05.ebuild 1402 RMD160 7b3b5daa77fdd8e601f266072aeb21f5bb378786 SHA
 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-r2.ebuild 2464 RMD160 8dd17ac7456a37ac197f8bc51859b9e3d0f96a6c SHA1 70af640acb1a25e392eb89c5a1f242272cbd718f SHA256 e1d81e4f0dc6a33aebe5e7593fadc954f4a5b182ca37bb90b58c1af8f14f6b32
+EBUILD file-5.07-r3.ebuild 2523 RMD160 6ca260458c9fed36946a755248769e16d2b3d5fa SHA1 d7856558be16d2f3718ce531a0978e798d7ea6c4 SHA256 78a2b8ad27d50d98a3fd891313d90a194d05bb49726eb0fc70513058cb96f331
 EBUILD file-5.07.ebuild 1411 RMD160 b369266b189f3d26d7cf09b0739954fdb3fcfeaa SHA1 a72acce15503961939ed351490b93fb3e3ca8fb3 SHA256 c1667db62e791a44f003489b02538c5502e1f8899908b0466191c239e47b5082
-MISC ChangeLog 23805 RMD160 fa12aeff11e3ae347ddb380434dafe793ffcaa3b SHA1 27cda7970ff24bbc6396b30b8886aa724cd28a60 SHA256 96445a4b48c643f05347e3f6c8abdc79315c2afd26771e1f039e3a6fe10b37b9
+MISC ChangeLog 24039 RMD160 400b44557e73cd09fc1ad932560443e490a81086 SHA1 c96d46d6d6d41358504a241ca3030246de8d4595 SHA256 da1c2695bd13cc224b508b02e3d473d5c00d9c049e12cee5b0fe9ce35c33b27e
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3tZ8cACgkQaC/OocHi7JY7GQD+MtZXl+NVxbocDAixiZW+v8N5
-K978IH5V/NvuVdnxwLAA/ji14IeVwvAtr+S3kTsVkG1ZZowtJ+jWDjwtPwkQ8cAk
-=LVe/
+iF4EAREIAAYFAk4XcdgACgkQaC/OocHi7JapQgD/a70LMFrNJCGZBnEBzdlY9KDb
+iRzAAwXNZHn2t8+9fwoA/18Vt5moYUU6d8Vd+/8a12cH2eniXZG/RBWympr0LXTa
+=YXTu
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/file/file-5.07-r3.ebuild b/sys-apps/file/file-5.07-r3.ebuild
new file mode 100644
index 000000000000..cd0cd193b741
--- /dev/null
+++ b/sys-apps/file/file-5.07-r3.ebuild
@@ -0,0 +1,100 @@
+# 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-r3.ebuild,v 1.1 2011/07/08 21:08:34 vapier 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 zlib"
+
+RDEPEND="zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}"
+
+PYTHON_MODNAME="magic.py"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-zip-detect.patch #367417
+	epatch "${FILESDIR}"/${P}-postscript-detect.patch #368121
+
+	elibtoolize
+	epunt_cxx
+
+	# dont let python README kill main README #60043
+	mv python/README{,.python}
+}
+
+usex() { use $1 && echo ${2:-yes} || echo ${3:-no} ; }
+
+wd() { echo ${WORKDIR}/build-${CHOST}; }
+do_configure() {
+	ECONF_SOURCE=${S}
+
+	mkdir "$(wd)"
+	pushd "$(wd)" >/dev/null
+
+	econf "$@"
+
+	popd >/dev/null
+}
+src_configure() {
+	# file uses things like strndup() and wcwidth()
+	append-flags -D_GNU_SOURCE
+
+	# 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
+		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" \
+		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)" "$@" || die
+}
+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_src_compile
+}
+
+src_install() {
+	do_make 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-postscript-detect.patch b/sys-apps/file/files/file-5.07-postscript-detect.patch
new file mode 100644
index 000000000000..9945b0739038
--- /dev/null
+++ b/sys-apps/file/files/file-5.07-postscript-detect.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/368121
+http://bugs.gw.com/view.php?id=126
+
+fix from upstream
+
+--- magic/Magdir/printer
++++ magic/Magdir/printer
+@@ -5,7 +5,7 @@
+ #
+ 
+ # PostScript, updated by Daniel Quinlan (quinlan@yggdrasil.com)
+-0	string/t		%!		PostScript document text
++0	string		%!		PostScript document text
+ !:mime	application/postscript
+ !:apple	ASPSTEXT
+ >2	string		PS-Adobe-	conforming