Add patch to open files starting with "dir" by Ulrich Müller (bug #340697).

Package-Manager: portage-2.2.0_alpha12/cvs/Linux i686

4 files changed, 26 insertions, 7 deletions

diff --git a/app-text/pinfo/ChangeLog b/app-text/pinfo/ChangeLog
index 992bcd62c565..f67786119f71 100644
--- a/app-text/pinfo/ChangeLog
+++ b/app-text/pinfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/pinfo
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/ChangeLog,v 1.50 2010/12/28 15:32:38 ranger Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/ChangeLog,v 1.51 2011/01/04 16:48:42 jer Exp $
+
+*pinfo-0.6.10-r2 (04 Jan 2011)
+
+  04 Jan 2011; Jeroen Roovers <jer@gentoo.org> -pinfo-0.6.10-r1.ebuild,
+  +pinfo-0.6.10-r2.ebuild, +files/pinfo-0.6.10-dir-file.patch:
+  Add patch to open files starting with "dir" by Ulrich Müller (bug #340697).
 
   28 Dec 2010; Brent Baude <ranger@gentoo.org> pinfo-0.6.9-r1.ebuild:
   stable ppc64, bug 339957
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index 8b6a5b678e18..ed48974cb219 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -1,3 +1,4 @@
+AUX pinfo-0.6.10-dir-file.patch 280 RMD160 a7fbc5302052cc82bc1b9154a4c474bf47a72415 SHA1 f4dd1bb327824c93479748914551e7b7662c4270 SHA256 9d133edb6882a1eb30a74e96976105b32ece189aad4b62070264d2dd0bea48e5
 AUX pinfo-0.6.10-info-suffix.patch 968 RMD160 e03f7bbebd7a8f9cb9d42cae7b65027905b77be9 SHA1 d7f724b85bd8f03b2e40c0f69f037b30149e7068 SHA256 52f7f5d737a550947175a324980dffe489138f11a52a8614202d669bf54183e4
 AUX pinfo-0.6.10-version.patch 264 RMD160 1068c457cc060310375fc88898c0d5b121608b69 SHA1 40bf84599341de6aaa550796b90c7f10e0bdb4da SHA256 cbabed690a4116ec639918e5a15f41ac51264e56923ae931f3b47f9598ee2ac2
 AUX pinfo-0.6.9-FTPVIEWER.patch 302 RMD160 829b3f5ea876530d73d1fd55ec3c61b563c7c46e SHA1 86219c50bf4f5a96bd3256b3003b7494abe3c078 SHA256 2c8bc439725f6f64ba014a84c55f39a37e7560029b13d8bc1f0d5393a8c9731e
@@ -7,8 +8,8 @@ AUX pinfo-0.6.9-lzma-xz.patch 614 RMD160 0806fff795e87baa7177b266e8a3b7be2f16a4a
 AUX pinfo-0.6.9-version.patch 1032 RMD160 787c8ac8404301e7145aa6e172127e4fd35a435e SHA1 0204e320bdc1e10d2e7a76dcf9d1fcea7442f4bb SHA256 ab2f755c004053622e4377e55cd85e28148c0537a31d0393104dd05118aecda1
 DIST pinfo-0.6.10.tar.bz2 133059 RMD160 46d6990cda262f50ea4682d5ff94d4e15d91111a SHA1 24c8cf74b7443614c8f4a23e2557853732045dfa SHA256 122180a0c23d11bc9eb569a4de3ff97d3052af96e32466fa62f2daf46ff61c5d
 DIST pinfo-0.6.9.tar.bz2 448469 RMD160 e67582e0839d431c48b9849c477a2cd6917e568e SHA1 3ecee057169c1cffb328b861641e30fdff18b06c SHA256 03037330e7626932adb31c54d6c5e71b667bcde4854fd75357e67b7b7cf87ae5
-EBUILD pinfo-0.6.10-r1.ebuild 1110 RMD160 7e9a8312c3c00ed5a3553a0c638810ce3018ec2b SHA1 f6c09cd34eb31d16555a6a3b12ce6898d6e953b7 SHA256 d4464fa68934d510894f007794802ace759e5df48ebc3042801b4f00b6b05546
+EBUILD pinfo-0.6.10-r2.ebuild 1148 RMD160 5fdfabfbcae52b214154c4cb27ec3246563fe319 SHA1 0052a109a8adf37bb69125aabb569cc452cc76aa SHA256 3e54f61aa5f841a51f442e5a8481c65ee25424e7f5023184b0be235f4c558028
 EBUILD pinfo-0.6.10.ebuild 1066 RMD160 a7277e7edcff102708047496f109ed8b7b3a1cee SHA1 37b93b1873e639106919abaa4154f783ca0a5c3a SHA256 e044efc149792910b2638e9d2189da26495db36070dff6df9de48556601ffcfe
 EBUILD pinfo-0.6.9-r1.ebuild 1091 RMD160 3a8696af85762eccf55637a2fda85667092579c3 SHA1 1df5af3920abec80d6f43d7da91c8fe6fa8f3499 SHA256 049fc49291c0e4c3fba214254c22d32cd54d9ed4e1d18d6c6b4c6ff55e1ad38e
-MISC ChangeLog 6793 RMD160 178bd5dd072439633302180b7c1eacad8007e304 SHA1 896a7b0ba6ee7e2eb3c4b6987682d0a04878a153 SHA256 e9831ab701b5d69c0f37143123400e2609c400940509476d9ba088f35a3fa057
+MISC ChangeLog 7037 RMD160 9d659f76c04f15eba0079a1e6f9f4e9fc4353f32 SHA1 4daa4407b8d9195034bedda6ade7dcc3da7aa072 SHA256 c414eb7adf8cf10330c87c48afe6cba0c7747fdc007871842d06fd26454c7e00
 MISC metadata.xml 217 RMD160 0d94a6fc560097772d4c2e86e653554bd05c25d4 SHA1 0d2cb1ef66cc2caa1b1e6905019402cddb355105 SHA256 6dc63d55b31ccafd1b88efc0808f669d4df575f9115872c574ffc1596851a4f8
diff --git a/app-text/pinfo/files/pinfo-0.6.10-dir-file.patch b/app-text/pinfo/files/pinfo-0.6.10-dir-file.patch
new file mode 100644
index 000000000000..7a282f354baa
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.10-dir-file.patch
@@ -0,0 +1,11 @@
+--- a/src/filehandling_functions.c
++++ b/src/filehandling_functions.c
+@@ -742,7 +742,7 @@
+ 	int i, j;
+ 	char *tmpfilename;
+ 
+-	if (strncmp(filename, "dir", 3) == 0)
++	if (strncmp(filename, "dir", 3) == 0 && !isalnum(filename[3]))
+ 	{
+ 		xfree(buf);
+ 		return opendirfile(number);
diff --git a/app-text/pinfo/pinfo-0.6.10-r1.ebuild b/app-text/pinfo/pinfo-0.6.10-r2.ebuild
index f94ebe4782e3..2d998e41570a 100644
--- a/app-text/pinfo/pinfo-0.6.10-r1.ebuild
+++ b/app-text/pinfo/pinfo-0.6.10-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/pinfo-0.6.10-r1.ebuild,v 1.1 2010/11/02 20:12:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/pinfo-0.6.10-r2.ebuild,v 1.1 2011/01/04 16:48:42 jer Exp $
 
 EAPI="2"
 
@@ -28,7 +28,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch \
 		"${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch \
 		"${FILESDIR}"/${P}-version.patch \
-		"${FILESDIR}"/${P}-info-suffix.patch
+		"${FILESDIR}"/${P}-info-suffix.patch \
+		"${FILESDIR}"/${P}-dir-file.patch
 	./autogen.sh || die "autogen"
 }