Punt resource hogging regex #174217.

Package-Manager: portage-2.1.3_rc7

5 files changed, 106 insertions, 9 deletions

diff --git a/sys-apps/file/ChangeLog b/sys-apps/file/ChangeLog
index 4accc35d7df0..e2a8d2be8d11 100644
--- a/sys-apps/file/ChangeLog
+++ b/sys-apps/file/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/file
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.144 2007/06/02 00:47:00 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/ChangeLog,v 1.145 2007/07/11 05:51:07 vapier Exp $
+
+*file-4.21-r1 (11 Jul 2007)
+
+  11 Jul 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/file-4.21-disable-regex.patch, +file-4.21-r1.ebuild:
+  Punt resource hogging regex #174217.
 
   02 Jun 2007; Joshua Kinard <kumba@gentoo.org> file-4.21.ebuild:
   Stable on mips, per #179583.
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index 093a8c460b76..df05406bf129 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -5,15 +5,23 @@ AUX file-4.15-libtool.patch 561 RMD160 f2b9f4c93f199ab3145d70816b3c624349af97a0
 MD5 26f26c3f7caf28f0bdb9dbb6fe83c254 files/file-4.15-libtool.patch 561
 RMD160 f2b9f4c93f199ab3145d70816b3c624349af97a0 files/file-4.15-libtool.patch 561
 SHA256 badb8261dad5df39bac1d6a6da1668eb8a2ff0b01c2c80baa8abfe07fd99681d files/file-4.15-libtool.patch 561
+AUX file-4.21-disable-regex.patch 645 RMD160 7038707815a1b8138a8bcff2249b8e2a1da2a94b SHA1 02e57e29a86adf0c36b935bc29bc386c7183c2df SHA256 cd53443c5bc81bbc38d3928a1f6cfd1f5022953a69cebd2a2c73a3759b5cbbfc
+MD5 b68212bdbc92505947a230a80409971c files/file-4.21-disable-regex.patch 645
+RMD160 7038707815a1b8138a8bcff2249b8e2a1da2a94b files/file-4.21-disable-regex.patch 645
+SHA256 cd53443c5bc81bbc38d3928a1f6cfd1f5022953a69cebd2a2c73a3759b5cbbfc files/file-4.21-disable-regex.patch 645
 DIST file-4.21.tar.gz 549938 RMD160 c8cfee27ba7a033bae355e458921eac39913b1e0 SHA1 4a919572fed1896212c2d7f41f841845efc1287a SHA256 6f5644d56cc603138533158076a6cb41cd33c33d27e5310cb76cb6576151ca67
+EBUILD file-4.21-r1.ebuild 1525 RMD160 d4afc95eb0640edf47bb136aa2b196c116205bdc SHA1 cb63a7a07a5c0f28b0885f7913e55567ece5398c SHA256 8405fa12c623cf839e90fa1d4682dc122e5620ede547c72ff528429125424c8e
+MD5 bdad5c521296590b41d6cbe42694bbc8 file-4.21-r1.ebuild 1525
+RMD160 d4afc95eb0640edf47bb136aa2b196c116205bdc file-4.21-r1.ebuild 1525
+SHA256 8405fa12c623cf839e90fa1d4682dc122e5620ede547c72ff528429125424c8e file-4.21-r1.ebuild 1525
 EBUILD file-4.21.ebuild 1458 RMD160 7e00ae537dedf78e8b0d9aa81d7860a217d94ba4 SHA1 fc22cd91ff4c44e428276128d31a13fde2b5cc52 SHA256 e54024312e231962757b3a137798491e51ef6d7d5667e085d16665049292d05f
 MD5 9778d59f4eeb7ef617abd4afad179d75 file-4.21.ebuild 1458
 RMD160 7e00ae537dedf78e8b0d9aa81d7860a217d94ba4 file-4.21.ebuild 1458
 SHA256 e54024312e231962757b3a137798491e51ef6d7d5667e085d16665049292d05f file-4.21.ebuild 1458
-MISC ChangeLog 17166 RMD160 2a7d7993ae42656f9e880e9322a3dfce6c763e7f SHA1 999f07dbd39759575bab496ef4e02d97001c1089 SHA256 d7b847dc38745c291c5fa40df16629a8dfe6bdd6094fb86b966d0aae532f7a0d
-MD5 68cb9b3541e85e2ad9c03fa4c45c9fbd ChangeLog 17166
-RMD160 2a7d7993ae42656f9e880e9322a3dfce6c763e7f ChangeLog 17166
-SHA256 d7b847dc38745c291c5fa40df16629a8dfe6bdd6094fb86b966d0aae532f7a0d ChangeLog 17166
+MISC ChangeLog 17348 RMD160 bc5182f3c2be4c2708862ae971808ca9130b0708 SHA1 3f9623024f0cbbf1ad72de117ff5e6c31fff2b86 SHA256 8f11bc8403dc7376c8c0fa93f6d1571c8af3591a55fcd5fd8b964ffaffe87c01
+MD5 6de0c9a7f47ceb4adda6d9d74ebadc82 ChangeLog 17348
+RMD160 bc5182f3c2be4c2708862ae971808ca9130b0708 ChangeLog 17348
+SHA256 8f11bc8403dc7376c8c0fa93f6d1571c8af3591a55fcd5fd8b964ffaffe87c01 ChangeLog 17348
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -21,10 +29,13 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 b21b877dfa9fa4ae3c1bbb442c8d1b1b files/digest-file-4.21 229
 RMD160 64cd9ab6dbfb0f555bafb6c4c1797c18a0dbc251 files/digest-file-4.21 229
 SHA256 c8f2e7eb37f35b5bd881ffc596036f2acd69e0929dae4ac3c71c44b0c06f8e17 files/digest-file-4.21 229
+MD5 b21b877dfa9fa4ae3c1bbb442c8d1b1b files/digest-file-4.21-r1 229
+RMD160 64cd9ab6dbfb0f555bafb6c4c1797c18a0dbc251 files/digest-file-4.21-r1 229
+SHA256 c8f2e7eb37f35b5bd881ffc596036f2acd69e0929dae4ac3c71c44b0c06f8e17 files/digest-file-4.21-r1 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGgQ5dp/wUKkr7RBoRAnrHAJwLMwMaG9nGSqxC9+LJgOqC2Ymv4QCeN2q2
-snQtR982qhmYSDfPSwEHLrs=
-=1boX
+iD8DBQFGlG/mp/wUKkr7RBoRAqVgAKC3J/xCoAtCeOHcoNdy738rCQDtiwCgnyYG
+rF895Yc7n7xKwuF9WkBvCbQ=
+=CYgA
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/file/file-4.21-r1.ebuild b/sys-apps/file/file-4.21-r1.ebuild
new file mode 100644
index 000000000000..4c71a28c6b89
--- /dev/null
+++ b/sys-apps/file/file-4.21-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/file/file-4.21-r1.ebuild,v 1.1 2007/07/11 05:51:07 vapier Exp $
+
+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 ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="python"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${PN}-4.15-libtool.patch #99593
+	epatch "${FILESDIR}"/${P}-disable-regex.patch #174217
+
+	elibtoolize
+	epunt_cxx
+
+	# make sure python links against the current libmagic #54401
+	sed -i "/library_dirs/s:'\.\./src':'../src/.libs':" python/setup.py
+
+	# dont let python README kill main README #60043
+	mv python/README{,.python}
+}
+
+src_compile() {
+	# file uses things like strndup() and wcwidth()
+	append-flags -D_GNU_SOURCE
+
+	econf --datadir=/usr/share/misc || die
+	emake || die "emake failed"
+
+	use python && cd python && distutils_src_compile
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc ChangeLog MAINT README
+
+	use python && cd python && distutils_src_install
+}
+
+pkg_postinst() {
+	use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+	use python && distutils_pkg_postrm
+}
diff --git a/sys-apps/file/files/digest-file-4.21-r1 b/sys-apps/file/files/digest-file-4.21-r1
new file mode 100644
index 000000000000..b206200b67af
--- /dev/null
+++ b/sys-apps/file/files/digest-file-4.21-r1
@@ -0,0 +1,3 @@
+MD5 9e3503116f4269a1be70220ee2234b0e file-4.21.tar.gz 549938
+RMD160 c8cfee27ba7a033bae355e458921eac39913b1e0 file-4.21.tar.gz 549938
+SHA256 6f5644d56cc603138533158076a6cb41cd33c33d27e5310cb76cb6576151ca67 file-4.21.tar.gz 549938
diff --git a/sys-apps/file/files/file-4.21-disable-regex.patch b/sys-apps/file/files/file-4.21-disable-regex.patch
new file mode 100644
index 000000000000..cc7af288f65d
--- /dev/null
+++ b/sys-apps/file/files/file-4.21-disable-regex.patch
@@ -0,0 +1,18 @@
+The new regex was added but the old one left in.  Make sure to punt the old
+one for resource issues on glibc.
+
+http://bugs.gentoo.org/174217
+
+--- file-4.21/magic/Magdir/msdos
++++ file-4.21/magic/Magdir/msdos
+@@ -17,10 +17,6 @@
+ 100	regex/c =^[\ \t]{0,10}call[\ \t]{1,10}rxfunc OS/2 REXX batch file text
+ 100	regex/c =^[\ \t]{0,10}say\ ['"]	     OS/2 REXX batch file text
+ 
+-
+-100 regex/c =^\\s*call\\s+rxfuncadd.*sysloadfu OS/2 REXX batch file text
+-100 regex/c =^\\s*say\ ['"] OS/2 REXX batch file text
+-
+ 0	leshort		0x14c	MS Windows COFF Intel 80386 object file
+ #>4	ledate		x	stamp %s
+ 0	leshort		0x166	MS Windows COFF MIPS R4000 object file