Add patch by Ulrich Müller for bug #306445 by Hartmut Figge.

Package-Manager: portage-2.1.9.24/cvs/Linux i686

4 files changed, 82 insertions, 12 deletions

diff --git a/app-text/pinfo/ChangeLog b/app-text/pinfo/ChangeLog
index 2551c6f17269..1327a444468a 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.48 2010/10/19 20:02:38 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/pinfo/ChangeLog,v 1.49 2010/11/02 20:12:45 jer Exp $
+
+*pinfo-0.6.10-r1 (02 Nov 2010)
+
+  02 Nov 2010; Jeroen Roovers <jer@gentoo.org> +pinfo-0.6.10-r1.ebuild,
+  +files/pinfo-0.6.10-info-suffix.patch:
+  Add patch by Ulrich Müller for bug #306445 by Hartmut Figge.
 
   19 Oct 2010; Markos Chandras <hwoarang@gentoo.org> pinfo-0.6.9-r1.ebuild:
   Stable on amd64 wrt bug #339957
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index 03543dcc7e7b..343294030fdd 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+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
 AUX pinfo-0.6.9-GROFF_NO_SGR.patch 259 RMD160 d4bf73dd5c9c88999ed3d44095cfb0896b5de457 SHA1 c56869d251b897a76c362b82d7325faaf5edb73c SHA256 4ce70f8db368b69785fe28a9574dd2267a69e33ef6d98922c513080ea860211b
@@ -9,15 +7,9 @@ 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.ebuild 1066 RMD160 a7277e7edcff102708047496f109ed8b7b3a1cee SHA1 37b93b1873e639106919abaa4154f783ca0a5c3a SHA256 e044efc149792910b2638e9d2189da26495db36070dff6df9de48556601ffcfe
 EBUILD pinfo-0.6.9-r1.ebuild 1094 RMD160 69c321d5e87d647f2602408313d144697daa944b SHA1 d53efc1bbe2360b69f0c047de1f50f58efbcf722 SHA256 ceea017229e0b6935affde80cc0f625c2233b539c9a8bd1c8e910829546bd5ab
 EBUILD pinfo-0.6.9.ebuild 995 RMD160 47f1ec36540395a60594174e56d43804662fd6db SHA1 56759560a72c92c8505de0b08bbcb5d410012c4f SHA256 1dc1593335726b3eb026ca6a2f6db78769e7529f8a713c03e82a24576369be2b
-MISC ChangeLog 6487 RMD160 da212527a812780a73dc0a67b0f7877f80083b52 SHA1 c9e585371496dcb37857a6306e11f90063d043f7 SHA256 2373ef44bc1034c84236b5637e42df1f46eea11519386f8980b2cc0ddbaaf571
+MISC ChangeLog 6692 RMD160 07f8a9a2200c20db6834e11065ce9e67e0742b6a SHA1 cda77b9028bcc89b7611679a4ecb743d325438ff SHA256 2ff7d99cfad0de992d7e7dd7d9e806028ce67d143e4d25126489463da8efee7f
 MISC metadata.xml 217 RMD160 0d94a6fc560097772d4c2e86e653554bd05c25d4 SHA1 0d2cb1ef66cc2caa1b1e6905019402cddb355105 SHA256 6dc63d55b31ccafd1b88efc0808f669d4df575f9115872c574ffc1596851a4f8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAky9+VQACgkQ9/cejkQaxBAgXACdGOBvU7o6mB3nJ4O1EKsai//1
-z4AAn3FmjMj/u/qTvk9Rqoyg+1Ky1Pwc
-=4TBx
------END PGP SIGNATURE-----
diff --git a/app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch b/app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch
new file mode 100644
index 000000000000..45be53cd1bf6
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.10-info-suffix.patch
@@ -0,0 +1,28 @@
+--- a/src/filehandling_functions.c
++++ b/src/filehandling_functions.c
+@@ -96,11 +96,14 @@ matchfile(char **buf, char *name)
+ 	{
+ 		/* use strcat rather than strdup, because xmalloc handles all 
+ 		 * malloc errors */
+-		char *thisfile = xmalloc(strlen(dp->d_name)+1);
++		int len = strlen(dp->d_name)+1;
++		char *thisfile = xmalloc(len * 2);
++		char *thisfile_info = thisfile + len;
+ 		strcat(thisfile, dp->d_name);
+ 
+ 		/* strip suffixes (so "gcc.info.gz" -> "gcc") */
+ 		strip_compression_suffix(thisfile);
++		strcat(thisfile_info, thisfile);
+ 		strip_info_suffix(thisfile);
+ 
+ 		/* compare this file with the file we're looking for */
+@@ -109,8 +112,7 @@ matchfile(char **buf, char *name)
+ 			/* we found a match! */
+ 			matched++;
+ 			/* put it in the buffer */
+-			strncat(Buf, thisfile, 1023-strlen(Buf));
+-			strncat(Buf, ".info", 1023-strlen(Buf));
++			strncat(Buf, thisfile_info, 1023-strlen(Buf));
+ 
+ 			/* clean up, and exit the loop */
+ 			xfree(thisfile);
diff --git a/app-text/pinfo/pinfo-0.6.10-r1.ebuild b/app-text/pinfo/pinfo-0.6.10-r1.ebuild
new file mode 100644
index 000000000000..f94ebe4782e3
--- /dev/null
+++ b/app-text/pinfo/pinfo-0.6.10-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 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 $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="Hypertext info and man viewer based on (n)curses"
+HOMEPAGE="http://pinfo.alioth.debian.org/"
+SRC_URI="https://alioth.debian.org/frs/download.php/3351/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="nls readline"
+
+RDEPEND="sys-libs/ncurses
+	nls? ( virtual/libintl )"
+
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	nls? ( sys-devel/gettext )"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.6.9-as-needed.patch \
+		"${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
+	./autogen.sh || die "autogen"
+}
+
+src_configure() {
+	econf \
+		$(use_with readline) \
+		$(use_enable nls) \
+		|| die "econf failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" sysconfdir=/etc install || die
+}