Add a fix for bug #177512.

Package-Manager: portage-2.1.2.7

6 files changed, 70 insertions, 23 deletions

diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index 6ccb83a0f0ab..651664840377 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/elinks
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.78 2007/05/13 10:03:50 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.79 2007/05/21 17:22:47 spock Exp $
+
+  21 May 2007; Michał Januszewski <spock@gentoo.org>
+  +files/elinks-po-path.patch, elinks-0.11.1.ebuild, elinks-0.11.2.ebuild,
+  elinks-0.11.3.ebuild:
+  Add a fix for bug #177512.
 
 *elinks-0.11.3 (13 May 2007)
 
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index 1795cc6b8e58..a66b0838f94d 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -37,26 +37,30 @@ AUX elinks-0.11.3-lua-5.patch 46208 RMD160 669b17051f4110fadec480c48bd8944faa8f1
 MD5 10b1cc3e9b0e1a817477d54aa475d377 files/elinks-0.11.3-lua-5.patch 46208
 RMD160 669b17051f4110fadec480c48bd8944faa8f1be4 files/elinks-0.11.3-lua-5.patch 46208
 SHA256 b4682cd96f34e0f66085f511f2855fcec05bf05b2aa8fcdc37d49f0f9d0b81b2 files/elinks-0.11.3-lua-5.patch 46208
+AUX elinks-po-path.patch 1387 RMD160 47b0d596a607c476b94e88d8fe4e65ca0bbf6174 SHA1 a92aac2fee4f11c895dbf7bf2f2e15b494df5315 SHA256 18a5299dcea9fee1ef22c3257e09bd0dbc0567cb1aee6750aba9d185bca374cf
+MD5 783a5a99acb6c13f2fbec504a96458f7 files/elinks-po-path.patch 1387
+RMD160 47b0d596a607c476b94e88d8fe4e65ca0bbf6174 files/elinks-po-path.patch 1387
+SHA256 18a5299dcea9fee1ef22c3257e09bd0dbc0567cb1aee6750aba9d185bca374cf files/elinks-po-path.patch 1387
 DIST elinks-0.10.4.conf.bz2 5370 RMD160 5a0935ed8b035cd2f7636516b0e226a8065d1c70 SHA1 7f7b009b1b6cb746e90835d2b612f1aa6b5d3a1e SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613b17b629c0f0e05965baa6209
 DIST elinks-0.11.1.tar.bz2 2612791 RMD160 2c5039a2e3d7ee3fc283d3041cac40f3c7853520 SHA1 dfa18f2745976e34ce3ee27227ce9bce81495a77 SHA256 d18c723840a91989e79273215363391567b9a48b901efa458fb3974e8487327d
 DIST elinks-0.11.2.tar.bz2 2497270 RMD160 a9d938cfdfa71be282b7596e1fed5797f2efd6a5 SHA1 47669c38e1e5ebb35015a9a9a8f9c898821bd408 SHA256 91ac894715efcde78548dfe4703ae702f08fb4a94187288eb9ba2b30258d5585
 DIST elinks-0.11.3.tar.bz2 2516793 RMD160 936f0cd4dbc69f70c329cf0ef5d7acd722652b6e SHA1 e4d8b0edd5fa4ec4310662242f0b5cf32864ed11 SHA256 c10e657fbd884eae4f01b91b32407bbfcbcae0ad5017fb24ea365aebc71d2af1
-EBUILD elinks-0.11.1.ebuild 4612 RMD160 58c1652b75ec9b2f27d5f53f14db6c0576429b02 SHA1 c2f19bcc9b8808dadf11225126710c6f57a5ed4d SHA256 df85b590f94d49d1e6ffd92b666a87c4c411f4dc1dbefce37ed18a9b2fc16e3b
-MD5 6af9b0e28c10f01dad8cc63a64a9cd26 elinks-0.11.1.ebuild 4612
-RMD160 58c1652b75ec9b2f27d5f53f14db6c0576429b02 elinks-0.11.1.ebuild 4612
-SHA256 df85b590f94d49d1e6ffd92b666a87c4c411f4dc1dbefce37ed18a9b2fc16e3b elinks-0.11.1.ebuild 4612
-EBUILD elinks-0.11.2.ebuild 4849 RMD160 3601b6b26cd53a17a4fef6fbfea46bb7c949107f SHA1 fd1bdea400a0716c3f70fe6caf1cd1f00b1273ae SHA256 857c5fa69af12264a736ed481e920906f7bf3d53a239b4f511668542169a3eac
-MD5 6c67587ec7449ea432a371c86873ba35 elinks-0.11.2.ebuild 4849
-RMD160 3601b6b26cd53a17a4fef6fbfea46bb7c949107f elinks-0.11.2.ebuild 4849
-SHA256 857c5fa69af12264a736ed481e920906f7bf3d53a239b4f511668542169a3eac elinks-0.11.2.ebuild 4849
-EBUILD elinks-0.11.3.ebuild 4717 RMD160 f04fb91b27b8221e1ddc1f72f45213486e7dbc75 SHA1 c01da846313a01bffb1cabd6f1fcaebdbe688197 SHA256 fea134071ab04bc550bd181e246ad4bf4d24ea03e40e2bd4780dc3cddc720acd
-MD5 59df0fd1a78abd4e70d693d5b4520af5 elinks-0.11.3.ebuild 4717
-RMD160 f04fb91b27b8221e1ddc1f72f45213486e7dbc75 elinks-0.11.3.ebuild 4717
-SHA256 fea134071ab04bc550bd181e246ad4bf4d24ea03e40e2bd4780dc3cddc720acd elinks-0.11.3.ebuild 4717
-MISC ChangeLog 18223 RMD160 f5b34838015bc4cffb17e6990fc6c323f6a7a2ce SHA1 92a0d0a72ff9451573e160ee1a941b6a4aeb7cc8 SHA256 52cad4230f0ba18510dc980d798a73fa66dc2d437677f1ac2c4b31d88310ee61
-MD5 a3226e271e9b917b251c77937e1250a7 ChangeLog 18223
-RMD160 f5b34838015bc4cffb17e6990fc6c323f6a7a2ce ChangeLog 18223
-SHA256 52cad4230f0ba18510dc980d798a73fa66dc2d437677f1ac2c4b31d88310ee61 ChangeLog 18223
+EBUILD elinks-0.11.1.ebuild 4653 RMD160 8538548747915b9e90ebc4cbfba26f30c9e9b0aa SHA1 0e3c809f19b7cf06a9adba8fd093ff024e5f7a60 SHA256 70f53d216b8f31a481073d3b73080c6f483059ecf91e35814c43153c32f5d788
+MD5 a1c8994714bbf562ee94968ea3b41cb1 elinks-0.11.1.ebuild 4653
+RMD160 8538548747915b9e90ebc4cbfba26f30c9e9b0aa elinks-0.11.1.ebuild 4653
+SHA256 70f53d216b8f31a481073d3b73080c6f483059ecf91e35814c43153c32f5d788 elinks-0.11.1.ebuild 4653
+EBUILD elinks-0.11.2.ebuild 4890 RMD160 4d982355d30199415a0474ee34e5194ad3f56f7e SHA1 406f5f1d834ef891414dd62f3e3900f224070d25 SHA256 ee8f906599d2507fa391f40ebd9b1d9f5c712b966dacc1a8b031a91edd1e4c91
+MD5 3bc5cc1492bfe58e4339d0787e6fb871 elinks-0.11.2.ebuild 4890
+RMD160 4d982355d30199415a0474ee34e5194ad3f56f7e elinks-0.11.2.ebuild 4890
+SHA256 ee8f906599d2507fa391f40ebd9b1d9f5c712b966dacc1a8b031a91edd1e4c91 elinks-0.11.2.ebuild 4890
+EBUILD elinks-0.11.3.ebuild 4759 RMD160 c0864039c63940c3e7ffe81ec783c7c99d4c3967 SHA1 e30b7b6c014309d29f4feb5be574bc53df78ddcb SHA256 de49554ae67603e6815fbd140c5d7ba237b45527b61a11a8a0d80403be7a97f2
+MD5 6bc2be57c6b9cdf41737b7c3f42b3b92 elinks-0.11.3.ebuild 4759
+RMD160 c0864039c63940c3e7ffe81ec783c7c99d4c3967 elinks-0.11.3.ebuild 4759
+SHA256 de49554ae67603e6815fbd140c5d7ba237b45527b61a11a8a0d80403be7a97f2 elinks-0.11.3.ebuild 4759
+MISC ChangeLog 18406 RMD160 0a010fefe5389eedb5353d6e5247e6d0b4bf8a85 SHA1 d2903f028c74d49c45ca5fe6b6d75a2864c5d8c1 SHA256 fc9edf52f3649fc05bf3eae9a8b308bcaabfbd5be83f10881dd7fc9c2f19dd5a
+MD5 f39e2b793afb5e68bab1d2bff3f5516d ChangeLog 18406
+RMD160 0a010fefe5389eedb5353d6e5247e6d0b4bf8a85 ChangeLog 18406
+SHA256 fc9edf52f3649fc05bf3eae9a8b308bcaabfbd5be83f10881dd7fc9c2f19dd5a ChangeLog 18406
 MISC metadata.xml 255 RMD160 399f78e98260d4f311124e71c6d294e368a76976 SHA1 61f663af9ea0cb4967a12878352e65b095dcd473 SHA256 b2dfe92cb4cae7ec4ecb4af91e94b9aa507a3c8214af32f75cf44f6011a13cc5
 MD5 d94d306da3804e41296e1bf04c7c9cae metadata.xml 255
 RMD160 399f78e98260d4f311124e71c6d294e368a76976 metadata.xml 255
@@ -73,7 +77,7 @@ SHA256 07212a85189d571790777d937ad45aca72a20e4fbb54d784a5feb9b2d4c8dcbd files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGRuJ2chej4aZK9/cRAmGNAJ9OCXVfyv31lb66RNdkyygkEQGe7QCfZGbu
-LEnfD3tO8cZwbAfN6W7RWTY=
-=pMai
+iD8DBQFGUdV5chej4aZK9/cRAstYAJ47miRi7DxIZ/5jU9a49DrNHZpltwCdFCd1
+rXyIwWlD91JDrig/crSI7hA=
+=QjEK
 -----END PGP SIGNATURE-----
diff --git a/www-client/elinks/elinks-0.11.1.ebuild b/www-client/elinks/elinks-0.11.1.ebuild
index 3cc939074b55..dfeffbbf3298 100644
--- a/www-client/elinks/elinks-0.11.1.ebuild
+++ b/www-client/elinks/elinks-0.11.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.1.ebuild,v 1.15 2007/03/15 12:03:13 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.1.ebuild,v 1.16 2007/05/21 17:22:47 spock Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.4"
@@ -53,6 +53,7 @@ src_unpack() {
 	if use unicode ; then
 		epatch ${FILESDIR}/elinks-0.10.1-utf_8_io-default.patch
 	fi
+	epatch ${FILESDIR}/elinks-po-path.patch
 	sed -i -e 's/-Werror//' configure*
 }
 
diff --git a/www-client/elinks/elinks-0.11.2.ebuild b/www-client/elinks/elinks-0.11.2.ebuild
index f42dd113dad7..9091e7f1a7e3 100644
--- a/www-client/elinks/elinks-0.11.2.ebuild
+++ b/www-client/elinks/elinks-0.11.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.2.ebuild,v 1.14 2007/04/25 13:44:25 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.2.ebuild,v 1.15 2007/05/21 17:22:47 spock Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.4"
@@ -68,6 +68,7 @@ src_unpack() {
 		epatch ${FILESDIR}/elinks-0.10.1-utf_8_io-default.patch
 	fi
 
+	epatch ${FILESDIR}/elinks-po-path.patch
 	sed -i -e 's/-Werror//' configure*
 }
 
diff --git a/www-client/elinks/elinks-0.11.3.ebuild b/www-client/elinks/elinks-0.11.3.ebuild
index b490bc5ef5ad..a7e38cd15f51 100644
--- a/www-client/elinks/elinks-0.11.3.ebuild
+++ b/www-client/elinks/elinks-0.11.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.3.ebuild,v 1.1 2007/05/13 10:03:50 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.3.ebuild,v 1.2 2007/05/21 17:22:47 spock Exp $
 
 WANT_AUTOCONF="latest"
 WANT_AUTOMAKE="1.4"
@@ -65,6 +65,8 @@ src_unpack() {
 		epatch ${FILESDIR}/elinks-0.10.1-utf_8_io-default.patch
 	fi
 
+	epatch ${FILESDIR}/elinks-po-path.patch
+
 	sed -i -e 's/-Werror//' configure*
 }
 
diff --git a/www-client/elinks/files/elinks-po-path.patch b/www-client/elinks/files/elinks-po-path.patch
new file mode 100644
index 000000000000..ce4305de6d9b
--- /dev/null
+++ b/www-client/elinks/files/elinks-po-path.patch
@@ -0,0 +1,34 @@
+From: Jonas Fonseca <fonseca@diku.dk>
+Date: Thu, 3 May 2007 06:46:29 +0000 (+0200)
+Subject: Check if the program path contains "src/" before using ../po files
+X-Git-Tag: elinks-0.11rc0
+X-Git-Url: http://pasky.or.cz/gitweb.cgi?p=elinks.git;a=commitdiff;h=928f364ba2803f98d71775dc03b694d6403c0754
+
+Check if the program path contains "src/" before using ../po files
+
+Don't look for gettext message catalogs in ../po/ unless ELinks is being
+run as src/elinks, ./src/elinks, or .../src/elinks.
+
+Discovered by Arnaud Giersch, this alternate fix (than what is in debian
+package 0.11.1-1.4) closes debian bug #417789 and redhat bug #235411.
+Also reported in: CVE-2007-2027.
+
+Restricting it to only work with --enable-debug was also considered,
+however, it is an important feature for translaters so this less
+paranoid fix was chosen.
+---
+
+--- a/src/intl/gettext/loadmsgcat.c
++++ b/src/intl/gettext/loadmsgcat.c
+@@ -212,6 +212,11 @@ add_filename_to_string(struct string *st
+ 	unsigned char *slash = strrchr(program.path, '/');
+ 	size_t dirnamelen = (slash ? slash - program.path + 1 : 0);
+ 
++	/* Check if elinks is being run from the source tree. */
++	if (dirnamelen < 4
++	    || strncmp(program.path + dirnamelen - 4, "src", 3))
++		return NULL;
++
+ 	if ((dirnamelen && !add_bytes_to_string(str, program.path, dirnamelen))
+ 	    || !add_to_string(str, "../po/")
+ 	    || !add_bytes_to_string(str,