summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Januszewski <spock@gentoo.org>2011-01-06 21:37:25 +0000
committerMichael Januszewski <spock@gentoo.org>2011-01-06 21:37:25 +0000
commit262206f59b12dcf5508878cd494531ba7140b563 (patch)
tree167ea49fd4d662ec7cf6417d7ff0def0756365bc /www-client
parentMarking twisted-words-10.2.0 ppc for bug 350894 (diff)
downloadhistorical-262206f59b12dcf5508878cd494531ba7140b563.tar.gz
historical-262206f59b12dcf5508878cd494531ba7140b563.tar.bz2
historical-262206f59b12dcf5508878cd494531ba7140b563.zip
Remove old ebuilds.
Package-Manager: portage-2.1.9.29/cvs/Linux x86_64
Diffstat (limited to 'www-client')
-rw-r--r--www-client/elinks/ChangeLog7
-rw-r--r--www-client/elinks/Manifest14
-rw-r--r--www-client/elinks/elinks-0.11.5.ebuild148
-rw-r--r--www-client/elinks/elinks-0.11.6.ebuild141
-rw-r--r--www-client/elinks/files/elinks-0.10.1-utf_8_io-default.patch11
-rw-r--r--www-client/elinks/files/elinks-po-path.patch34
6 files changed, 10 insertions, 345 deletions
diff --git a/www-client/elinks/ChangeLog b/www-client/elinks/ChangeLog
index 5668d6c8cf12..9264231e32fc 100644
--- a/www-client/elinks/ChangeLog
+++ b/www-client/elinks/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-client/elinks
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.132 2011/01/06 21:01:04 spock Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/ChangeLog,v 1.133 2011/01/06 21:37:25 spock Exp $
+
+ 06 Jan 2011; Michał Januszewski <spock@gentoo.org>
+ -files/elinks-0.10.1-utf_8_io-default.patch, -elinks-0.11.5.ebuild,
+ -elinks-0.11.6.ebuild, -files/elinks-po-path.patch:
+ Remove old ebuilds.
06 Jan 2011; Michał Januszewski <spock@gentoo.org> elinks-0.11.5.ebuild,
elinks-0.11.6.ebuild, elinks-0.11.7.ebuild, elinks-0.12_pre5.ebuild,
diff --git a/www-client/elinks/Manifest b/www-client/elinks/Manifest
index f0e8d7a263c4..6371bdace0d6 100644
--- a/www-client/elinks/Manifest
+++ b/www-client/elinks/Manifest
@@ -1,30 +1,24 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-AUX elinks-0.10.1-utf_8_io-default.patch 456 RMD160 69bcd2fe9a85381d53ef7d2c3da32e15d8eae36b SHA1 c9141e89ba62da5277d0df42e73f4eb258e23552 SHA256 3255c36e7107323d7415995c3c5d2458acf7b739848fb9804157b708956a7010
AUX elinks-0.10.4.conf-syscharset.diff 2580 RMD160 3bb9037e75adc225915a4a6b41afff0ef09f1eba SHA1 fe28f5ae8f290f15f1165273f22e9417f5648e40 SHA256 3269413843aabff245ee3dce522a475e5b3042adf4676b644a63d323bb77818c
AUX elinks-0.11.2-lua-5.1.patch 538 RMD160 7bd83ed15ea14cc41b909c4022eee082a47fb706 SHA1 0183f106db71725ccb0f2b83746373ca9e5f0522 SHA256 d931af4db13b53be32def17417d86ee916511209ce9a54f25d017ee2d24473d4
AUX elinks-0.11.2-lua-5.patch 2125 RMD160 be94e085a7b231dad1681566c533699b2a6d2745 SHA1 d1af052c0700951c703f26ac39f09d1cbbf43081 SHA256 4e0f7b622111696e52e15745d8ac35249a95def36eb5aa782487c7901125260c
AUX elinks-0.11.3-lua-5.patch 1841 RMD160 61ef22891e59893542326df7803c63ac81117622 SHA1 17682210d407b3efb47bbab9b47463b937d6bffe SHA256 f04d11e01824fb2cf4387b87cd531d64ad280d21e9bcb57e461ace56419d1220
AUX elinks-0.11.5-makefile.patch 1109 RMD160 7d20513b6922f895b4e4050a37550706500952c7 SHA1 4edd6e791ac08f37ee933652ded7049e04e3b6c2 SHA256 5b37be9328b80b9a995de94cf0a053ad63d43a2e0550df6e0c5a4cdc94276e1f
AUX elinks-0.12_pre5-compilation-fix.patch 464 RMD160 afe5e31db6a7ed454052e8f0220e3a5c35aca0e1 SHA1 58a69b5b48f1699451e7a508540b14962888b4d8 SHA256 984c3e1127c18eb0925fbe1cca5bb2a7b214c6cd082db434e8fe37e082715e7e
-AUX elinks-po-path.patch 1387 RMD160 47b0d596a607c476b94e88d8fe4e65ca0bbf6174 SHA1 a92aac2fee4f11c895dbf7bf2f2e15b494df5315 SHA256 18a5299dcea9fee1ef22c3257e09bd0dbc0567cb1aee6750aba9d185bca374cf
DIST elinks-0.10.4.conf.bz2 5370 RMD160 5a0935ed8b035cd2f7636516b0e226a8065d1c70 SHA1 7f7b009b1b6cb746e90835d2b612f1aa6b5d3a1e SHA256 cb0fcd10cc592697de5d8d9358447a770d2b4613b17b629c0f0e05965baa6209
-DIST elinks-0.11.5.tar.bz2 2589451 RMD160 397e5e94de8cd8c5dc9a1774b7485d6edf1a7c49 SHA1 90768912dbb7a77e328a25b43c3e484ae3e4be2f SHA256 f5ddb8f8c82d96c5d159bd01abd475a678fa15b8dba8f2d477b903b28f1204c3
-DIST elinks-0.11.6.tar.bz2 2577351 RMD160 b58477965684f77c852ea5275b4101eb84b37156 SHA1 c05e639cc656c2559a56e38f38b0cb40f19bc861 SHA256 9068f7160318cbee90f3218eb68cc341fff38b50f312da33a612e6352b4affa6
DIST elinks-0.11.7.tar.bz2 2467915 RMD160 2e6e863d08f9accb71892ba6f236f795c83cba9c SHA1 d13edc1477d0ab32cafe7d3c1f3a23ae1c0a5c54 SHA256 456db6f704c591b1298b0cd80105f459ff8a1fc07a0ec1156a36c4da6f898979
DIST elinks-0.12pre5.tar.bz2 2783523 RMD160 4983083f21928da78f937b4dea09f8937c3a9cb9 SHA1 15fb38fa938a0eec9d5f22fdd538a6785e2854af SHA256 2d19547831098acff0c5f97f9fbc7912240f122961fd49fb8b76738417dd24d2
-EBUILD elinks-0.11.5.ebuild 4684 RMD160 37a6db9e4b25d025b23f03e7bc34dc68960279b7 SHA1 c6257f01cbfbc9f78914ef85a9dc597fe6214ee8 SHA256 3ce782e074217dfddccce93c9e1d0b9ab15d7226340a09ecca63d700682e4797
-EBUILD elinks-0.11.6.ebuild 4366 RMD160 9d1f7d1462f410a7914c965e70eb1e1024b81779 SHA1 7bbccfa14e3f1d6c92f6262e077affafe8ae8ea5 SHA256 9f8498aa58ddd0b80e8739be8e60349fbf6dd494605e753b63f6289a77593206
EBUILD elinks-0.11.7.ebuild 4341 RMD160 928771c53d04984796695408375403189cb31265 SHA1 f65206b3a85dd2629578e652f4ee67487414dfd7 SHA256 af44749ca5e47a9008f14e39f2814d8c471413f83ae110031aa11978cecad3a3
EBUILD elinks-0.12_pre5-r1.ebuild 4412 RMD160 b4cc47578fe507d5cd47b7baf59cf132b4882df5 SHA1 337245d0dd05f22d373cb3e1a26645a3e288f51f SHA256 a72b83eb2a0c786571b3853d26dea3b11e09cbd66f1b6177d0c95eeb39380f2d
EBUILD elinks-0.12_pre5.ebuild 4378 RMD160 e9e134fa08ce4060b1c5be22a059a8a311a74c20 SHA1 e38ab2016ab715f30b1bd247b1ad3186dad874d2 SHA256 d1e4a4f1a426dfd7e3a7de668d8299bd6237d79e447b92afa56899de13c3e320
-MISC ChangeLog 25665 RMD160 e121233de9b6ca74350ef1058bbe8604e9bb6f22 SHA1 b2faa1f7e6ab3efcf4d930f4524d2a842afbc5b7 SHA256 a52206d151a3947a00882a9e5e8e2a216e41f72ccde60f02ac46c9f735605114
+MISC ChangeLog 25866 RMD160 7be81f06c50a7966ec0c677ebea6262fa1593281 SHA1 2aee5ff1592df9d290ff718ec89649168fe78c1b SHA256 d9ff1b22d1faf08983f3ea7762524a3a1f9287bd510071dbbf949ac7bec1cb2a
MISC metadata.xml 539 RMD160 a8e2177168d6c229cb25da446572b8af3a636eaa SHA1 f49389e97de1e05ebffad13baa4f5212b44681ff SHA256 08733a76de608d4d9a4139ce6e9c1c9f23f5c1fea86abdce8e369b1bdc6bf0ad
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.16 (GNU/Linux)
-iEYEARECAAYFAk0mLasACgkQchej4aZK9/e/6QCeOKEs55e5NpFKA6TTDWOXyc/8
-0Z0An0cyn8JCXNtU+krx8Jt9Eop0/B6J
-=98jG
+iEYEARECAAYFAk0mNh8ACgkQchej4aZK9/dTBgCbB7euRQmTtD6YN6DtBFd9fJW0
+r+QAmwTZ9DyLKD2b44KmMvFxLoHS5OI/
+=lMV6
-----END PGP SIGNATURE-----
diff --git a/www-client/elinks/elinks-0.11.5.ebuild b/www-client/elinks/elinks-0.11.5.ebuild
deleted file mode 100644
index d09a2b13a40b..000000000000
--- a/www-client/elinks/elinks-0.11.5.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.5.ebuild,v 1.9 2011/01/06 21:01:04 spock Exp $
-
-inherit eutils autotools flag-o-matic
-
-MY_P="${P/_/}"
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
- http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \
- javascript lua nls nntp perl ruby ssl unicode X zlib"
-RESTRICT="test"
-
-DEPEND=">=dev-libs/expat-1.95.4
- bzip2? ( >=app-arch/bzip2-1.0.2 )
- ssl? ( >=dev-libs/openssl-0.9.6g )
- X? ( x11-libs/libX11 x11-libs/libXt )
- zlib? ( >=sys-libs/zlib-1.1.4 )
- lua? ( >=dev-lang/lua-5 )
- gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 )
- guile? ( >=dev-scheme/guile-1.6.4-r1 )
- idn? ( net-dns/libidn )
- perl? ( sys-devel/libperl )
- ruby? ( dev-lang/ruby dev-ruby/rubygems )
- javascript? ( dev-lang/spidermonkey )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- if use guile && has_version ">dev-scheme/guile-1.6.8" &&
- ! built_with_use -a dev-scheme/guile deprecated discouraged; then
- eerror "To install elinks with the 'guile' USE flag, dev-scheme/guile has to"
- eerror "be built with 'deprecated' and 'discouraged' USE flags."
- die "dev-scheme/guile not built with deprecated/discouraged"
- fi
-}
-
-src_unpack() {
- unpack ${A}
- epatch "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
- mv "${PN}-0.10.4.conf" "${PN}.conf"
- if ! use ftp ; then
- sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf
- fi
- sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-0.11.3-lua-5.patch
-
- if use lua && has_version ">=dev-lang/lua-5.1"; then
- epatch "${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch
- fi
-
- if use unicode ; then
- epatch "${FILESDIR}"/elinks-0.10.1-utf_8_io-default.patch
- fi
-
- epatch "${FILESDIR}"/elinks-0.11.5-makefile.patch
-
- sed -i -e 's/-Werror//' configure*
- eautoreconf
-}
-
-src_compile() {
- # NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
- # As GNUTLS is not yet 100% stable and its support in ELinks is not so well
- # tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
- local myconf=""
-
- if use debug ; then
- myconf="--enable-debug"
- else
- myconf="--enable-fastmem"
- fi
-
- if use ssl ; then
- myconf="${myconf} --with-openssl"
- else
- myconf="${myconf} --without-openssl --without-gnutls"
- fi
-
- econf \
- --sysconfdir=/etc/elinks \
- --enable-leds \
- --enable-88-colors \
- --enable-256-colors \
- --enable-html-highlight \
- $(use_with gpm) \
- $(use_with zlib) \
- $(use_with bzip2 bzlib) \
- $(use_with X x) \
- $(use_with lua) \
- $(use_with guile) \
- $(use_with perl) \
- $(use_with ruby) \
- $(use_with idn) \
- $(use_with javascript spidermonkey) \
- $(use_enable bittorrent) \
- $(use_enable nls) \
- $(use_enable ipv6) \
- $(use_enable ftp) \
- $(use_enable gopher) \
- $(use_enable nntp) \
- $(use_enable finger) \
- ${myconf} || die
- emake || die "compile problem"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
-
- insopts -m 644 ; insinto /etc/elinks
- doins "${WORKDIR}"/elinks.conf
- newins contrib/keybind-full.conf keybind-full.sample
- newins contrib/keybind.conf keybind.conf.sample
-
- dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
- docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
- insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
- insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
- insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
-
- # Remove some conflicting files on OSX. The files provided by OSX 10.4
- # are more or less the same. -- Fabian Groffen (2005-06-30)
- rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
-}
-
-pkg_postinst() {
- einfo "This ebuild provides a default config for ELinks."
- einfo "Please check /etc/elinks/elinks.conf"
- einfo
- einfo "You may want to convert your html.cfg and links.cfg of"
- einfo "Links or older ELinks versions to the new ELinks elinks.conf"
- einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
- einfo
- einfo "Please have a look at /etc/elinks/keybind-full.sample and"
- einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
- einfo
- einfo "You will have to set your TERM variable to 'xterm-256color'"
- einfo "to be able to use 256 colors in elinks."
- echo
-}
diff --git a/www-client/elinks/elinks-0.11.6.ebuild b/www-client/elinks/elinks-0.11.6.ebuild
deleted file mode 100644
index 99943d63e720..000000000000
--- a/www-client/elinks/elinks-0.11.6.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/elinks/elinks-0.11.6.ebuild,v 1.4 2011/01/06 21:01:04 spock Exp $
-
-EAPI="2"
-
-inherit eutils autotools flag-o-matic
-
-MY_P="${P/_/}"
-DESCRIPTION="Advanced and well-established text-mode web browser"
-HOMEPAGE="http://elinks.or.cz/"
-SRC_URI="http://elinks.or.cz/download/${MY_P}.tar.bz2
- http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bittorrent bzip2 debug finger ftp gopher gpm guile idn ipv6 \
- javascript lua nls nntp perl ruby ssl unicode X zlib"
-RESTRICT="test"
-
-DEPEND=">=dev-libs/expat-1.95.4
- bzip2? ( >=app-arch/bzip2-1.0.2 )
- ssl? ( >=dev-libs/openssl-0.9.6g )
- X? ( x11-libs/libX11 x11-libs/libXt )
- zlib? ( >=sys-libs/zlib-1.1.4 )
- lua? ( >=dev-lang/lua-5 )
- gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 )
- guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] )
- idn? ( net-dns/libidn )
- perl? ( sys-devel/libperl )
- ruby? ( dev-lang/ruby dev-ruby/rubygems )
- javascript? ( dev-lang/spidermonkey )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
- unpack ${A}
- epatch "${FILESDIR}"/${PN}-0.10.4.conf-syscharset.diff
- mv "${PN}-0.10.4.conf" "${PN}.conf"
- if ! use ftp ; then
- sed -i -e 's/\(.*protocol.ftp.*\)/# \1/' ${PN}.conf
- fi
- sed -i -e 's/\(.*set protocol.ftp.use_epsv.*\)/# \1/' ${PN}.conf
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-0.11.3-lua-5.patch
-
- if use lua && has_version ">=dev-lang/lua-5.1"; then
- epatch "${FILESDIR}"/${PN}-0.11.2-lua-5.1.patch
- fi
-
- if use unicode ; then
- epatch "${FILESDIR}"/elinks-0.10.1-utf_8_io-default.patch
- fi
-
- epatch "${FILESDIR}"/elinks-0.11.5-makefile.patch
-
- sed -i -e 's/-Werror//' configure*
- eautoreconf
-}
-
-src_compile() {
- # NOTE about GNUTSL SSL support (from the README -- 25/12/2002)
- # As GNUTLS is not yet 100% stable and its support in ELinks is not so well
- # tested yet, it's recommended for users to give a strong preference to OpenSSL whenever possible.
- local myconf=""
-
- if use debug ; then
- myconf="--enable-debug"
- else
- myconf="--enable-fastmem"
- fi
-
- if use ssl ; then
- myconf="${myconf} --with-openssl"
- else
- myconf="${myconf} --without-openssl --without-gnutls"
- fi
-
- econf \
- --sysconfdir=/etc/elinks \
- --enable-leds \
- --enable-88-colors \
- --enable-256-colors \
- --enable-html-highlight \
- $(use_with gpm) \
- $(use_with zlib) \
- $(use_with bzip2 bzlib) \
- $(use_with X x) \
- $(use_with lua) \
- $(use_with guile) \
- $(use_with perl) \
- $(use_with ruby) \
- $(use_with idn) \
- $(use_with javascript spidermonkey) \
- $(use_enable bittorrent) \
- $(use_enable nls) \
- $(use_enable ipv6) \
- $(use_enable ftp) \
- $(use_enable gopher) \
- $(use_enable nntp) \
- $(use_enable finger) \
- ${myconf} || die
- emake || die "compile problem"
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
-
- insopts -m 644 ; insinto /etc/elinks
- doins "${WORKDIR}"/elinks.conf
- newins contrib/keybind-full.conf keybind-full.sample
- newins contrib/keybind.conf keybind.conf.sample
-
- dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES THANKS TODO doc/*.*
- docinto contrib ; dodoc contrib/{README,colws.diff,elinks[-.]vim*}
- insinto /usr/share/doc/${PF}/contrib/lua ; doins contrib/lua/{*.lua,elinks-remote}
- insinto /usr/share/doc/${PF}/contrib/conv ; doins contrib/conv/*.*
- insinto /usr/share/doc/${PF}/contrib/guile ; doins contrib/guile/*.scm
-
- # Remove some conflicting files on OSX. The files provided by OSX 10.4
- # are more or less the same. -- Fabian Groffen (2005-06-30)
- rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
-}
-
-pkg_postinst() {
- einfo "This ebuild provides a default config for ELinks."
- einfo "Please check /etc/elinks/elinks.conf"
- einfo
- einfo "You may want to convert your html.cfg and links.cfg of"
- einfo "Links or older ELinks versions to the new ELinks elinks.conf"
- einfo "using /usr/share/doc/${PF}/contrib/conv/conf-links2elinks.pl"
- einfo
- einfo "Please have a look at /etc/elinks/keybind-full.sample and"
- einfo "/etc/elinks/keybind.conf.sample for some bindings examples."
- einfo
- einfo "You will have to set your TERM variable to 'xterm-256color'"
- einfo "to be able to use 256 colors in elinks."
- echo
-}
diff --git a/www-client/elinks/files/elinks-0.10.1-utf_8_io-default.patch b/www-client/elinks/files/elinks-0.10.1-utf_8_io-default.patch
deleted file mode 100644
index e0f59cda3264..000000000000
--- a/www-client/elinks/files/elinks-0.10.1-utf_8_io-default.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- elinks-0.10.1/src/config/options.inc.utf_8_io-default 2005-01-04 01:42:56.000000000 +0100
-+++ elinks-0.10.1/src/config/options.inc 2005-01-28 17:54:42.568968720 +0100
-@@ -747,7 +747,7 @@
- "terminal.")),
-
- INIT_OPT_BOOL("terminal._template_", N_("UTF-8 I/O"),
-- "utf_8_io", 0, 0,
-+ "utf_8_io", 0, 1,
- N_("Enable I/O in UTF8 for Unicode terminals. Note that currently,\n"
- "only the subset of UTF8 according to terminal codepage is used.")),
-
diff --git a/www-client/elinks/files/elinks-po-path.patch b/www-client/elinks/files/elinks-po-path.patch
deleted file mode 100644
index ce4305de6d9b..000000000000
--- a/www-client/elinks/files/elinks-po-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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,