Add escape range patch, security bug 210754

Package-Manager: portage-2.1.4.4

diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog
index 8e92fafbe67718fdfe8728cb103861e97d247fb6..7ba83981ce40ef87b7967a3face4228985d7097e 100644 (file)
--- a/app-text/sword/ChangeLog
+++ b/app-text/sword/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-text/sword
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.36 2008/01/07 03:19:54 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.37 2008/02/20 04:04:09 beandog Exp $
+
+*sword-1.5.10-r2 (20 Feb 2008)
+*sword-1.5.9-r2 (20 Feb 2008)
+*sword-1.5.8-r2 (20 Feb 2008)
+
+  20 Feb 2008; Steve Dibb <beandog@gentoo.org> +files/escape_range.patch,
+  +sword-1.5.8-r2.ebuild, +sword-1.5.9-r2.ebuild, +sword-1.5.10-r2.ebuild:
+  Add escape range patch, security bug 210754
 
 *sword-1.5.10-r1 (07 Jan 2008)
 *sword-1.5.9-r1 (07 Jan 2008)

diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest
index 154793534dbd50d4755a2e7b6717fc788fb1a27c..7dd307c952de2defef39206bbe48f79dff1746d5 100644 (file)
--- a/app-text/sword/Manifest
+++ b/app-text/sword/Manifest
@@ -1,10 +1,14 @@
+AUX escape_range.patch 459 RMD160 ba8b7edc6cccea592fb653175ed6eee5c578aa8d SHA1 a77ebef76f4bdf6593507f88da3498a49659b89f SHA256 f1772e8cdc36cf2405234f1e992a0d5d29b200ce5adc82092c65df65fe034ff1
 AUX sword.conf 37 RMD160 faba7da387461ae680fdc514eb382ff0c2bf3b9c SHA1 1c25331915d8c6a420d3c8bd3e276fe1d07279b3 SHA256 5656c02ccb594d922f0fb6cc1b8babec3b6047385ade02d003182917c5b3e933
 DIST sword-1.5.10.tar.gz 1856793 RMD160 0585155c2a21bb062ea3a7885d4e881fbcb4d59b SHA1 993c40a8db4d33e82d219254ab13f45c395f3f5a SHA256 5fb3f030e9395e23a48c02bde6bc81ad42b1c4056a011d9ee15c4c85110eb847
 DIST sword-1.5.8.tar.gz 1714799 RMD160 ce896322d6c4389d4db17cb3d780b8d2a305498c SHA1 e8996f0a0ccb4b91b4e3b7b0390a9ea10ae234c9 SHA256 aeb57fe89716807f331eb17fcf23ef1ba3ad3e7018cd2d32560677ffe6937ce9
 DIST sword-1.5.9.tar.gz 1816315 RMD160 7fb20370801c493afcce76f2bad1651d77722973 SHA1 9ba3680c0acef5fc305487ecfb8583985047ea89 SHA256 dd170431235cc419cbe6c40362640927a78dc93e082623709abe1310fe804481
 EBUILD sword-1.5.10-r1.ebuild 1487 RMD160 a5ff3690cbc3682d635cdca19a9bc8baefc03249 SHA1 5e3adf1bdad658f2108433748ffbfd10bbd8cb55 SHA256 051c66d6190828d7cba40be759e21ce327a4e902dfb874088395ec5d9e4a3132
+EBUILD sword-1.5.10-r2.ebuild 1570 RMD160 91912729005a07c4606667e5d24a509e1475953c SHA1 78d75c3ca1ec08467cb76dfb17bda3234b187379 SHA256 4a107ef2f24a0c9d0e56f62a0032aa5f24a44875c540d7d36b4da27f209b80c4
 EBUILD sword-1.5.8-r1.ebuild 1243 RMD160 aab1c66d051a21aa22a34a49d99a5938d9275dce SHA1 dcb1b199ebe9658ed1dba5c6c9e0c86a74ba2bd3 SHA256 439a7cee402b9db12e267e7c968835e076f6799aebba6e1f1ddf6b3ca2da24d3
+EBUILD sword-1.5.8-r2.ebuild 1324 RMD160 bdcc5da18cccd29c13c559148f938ee9a06ac9bd SHA1 e35eaf2a39694a1cd86bc0ff5b9abca2211228dc SHA256 8817c70970e4452fc42b3cc28701fa7058b30aff555eef1ac77cb7ced0988906
 EBUILD sword-1.5.8.ebuild 1219 RMD160 13fe9a8fe65f83193d0d0645a83f1823a29ba5b3 SHA1 e044425f685ee91818405282e17112bc86534e1b SHA256 9eed3e6ee7c02ffe6d922e620a79ac883ba67793e6d0a9344dfff61fc857acfa
 EBUILD sword-1.5.9-r1.ebuild 1486 RMD160 1b62d694c3a0f1ef8e17c0153028f15eead02272 SHA1 b929b1c1c5fc297571c7570051c821815d49a149 SHA256 f812f6570dad7c5540e1e783fa4080b8ffcb39e84d95409605f04b11d8614293
-MISC ChangeLog 4794 RMD160 f447eefb9f3ba6192dec474551ec2f1a79be5b2e SHA1 f92bdc183d67bd279d7211a9e4129f766f82df52 SHA256 b7a5668d555b21cddbcbddfd9d827591785db15c9ac26560aef635ec9ece4508
+EBUILD sword-1.5.9-r2.ebuild 1569 RMD160 3c52ef9be0864bc7e9e541def0409adb3742a612 SHA1 3a0be7e3b3eb23b51726f77df5da56a9190e7f92 SHA256 ed042289558bd4ff45cf26c8ea4b6c744a17cffdaf175c8508b893e740cd7bbf
+MISC ChangeLog 5082 RMD160 741fda7e00b893a5e628f1a15dc1c9efff728855 SHA1 27514a98524564b988e00708be94bc81527ea1d7 SHA256 e3c281e61b2d0ffa2a4595ea60cfbfaabdbb66c4a7df520b6f67627c99839b60
 MISC metadata.xml 469 RMD160 84ca27f8b1c3dd4142a637c9dd89ef7405aec04d SHA1 56e97e8067ac18ff2ed9aa8f42e46dc3be8488c4 SHA256 78fd163e5975551082327b925b0df4f7d26a90a60e3f01911a2a1a74cd990789

diff --git a/app-text/sword/files/escape_range.patch b/app-text/sword/files/escape_range.patch
new file mode 100644 (file)
index 0000000..e967c4c
--- /dev/null
+++ b/app-text/sword/files/escape_range.patch
@@ -0,0 +1,12 @@
+--- utilities/diatheke/cgi/diatheke.pl.orig    2008-02-19 20:53:33.000000000 -0700
++++ utilities/diatheke/cgi/diatheke.pl 2008-02-19 20:54:05.000000000 -0700
+@@ -110,8 +110,7 @@
+           $range = $mydata;
+           $range =~ tr/+/ /;
+           $range =~ s/%([a-fA-F0-9][a-fA-F0-9])/pack("C", hex($1))/eg;
+-          $range = "-r \"$range\"";
+-            $range = shell_escape($range);
++          $range = "-r '" . shell_escape($range) . "'";
+       }
+ 
+       elsif ($varname eq "strongs") {

diff --git a/app-text/sword/sword-1.5.10-r2.ebuild b/app-text/sword/sword-1.5.10-r2.ebuild
new file mode 100644 (file)
index 0000000..4b5ec55
--- /dev/null
+++ b/app-text/sword/sword-1.5.10-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.10-r2.ebuild,v 1.1 2008/02/20 04:04:10 beandog Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Library for Bible reading software."
+HOMEPAGE="http://www.crosswire.org/sword/"
+SRC_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="curl debug doc icu lucene"
+
+DEPEND="sys-libs/zlib
+       curl? ( net-misc/curl )
+       icu? ( dev-libs/icu )
+       lucene? ( dev-cpp/clucene )
+       dev-util/pkgconfig"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}/escape_range.patch"
+}
+
+src_compile() {
+       strip-flags
+       econf --with-zlib \
+               --with-conf \
+               $(use_enable curl) \
+               $(use_enable debug) \
+               $(use_with icu) \
+               $(use_enable lucene) || die "configure failed"
+       emake || die "make failed"
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die "install failed"
+       dodoc AUTHORS CODINGSTYLE ChangeLog INSTALL README
+       if use doc ;then
+               rm -rf examples/.cvsignore
+               rm -rf examples/cmdline/.cvsignore
+               rm -rf examples/cmdline/.deps
+               cp -R samples examples "${D}/usr/share/doc/${PF}/"
+       fi
+       # global configuration file
+       insinto /etc
+       doins "${FILESDIR}/sword.conf"
+}
+
+pkg_postinst() {
+       echo
+       elog "Check out http://www.crosswire.org/sword/modules/"
+       elog "to download modules that you would like to use with SWORD."
+       elog "Follow module installation instructions found on"
+       elog "the web or in /usr/share/doc/${PF}/INSTALL.gz."
+       echo
+}

diff --git a/app-text/sword/sword-1.5.8-r2.ebuild b/app-text/sword/sword-1.5.8-r2.ebuild
new file mode 100644 (file)
index 0000000..4801de2
--- /dev/null
+++ b/app-text/sword/sword-1.5.8-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.8-r2.ebuild,v 1.1 2008/02/20 04:04:10 beandog Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Library for Bible reading software."
+HOMEPAGE="http://www.crosswire.org/sword/"
+SRC_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="curl icu debug"
+
+DEPEND="sys-libs/zlib
+       curl? ( net-misc/curl )
+       icu? ( dev-libs/icu )
+       dev-util/pkgconfig"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}/escape_range.patch"
+}
+
+src_compile() {
+       strip-flags
+       local myconf="--without-lucene --with-zlib --with-conf
+                     $(use_enable debug) $(use_with curl)"
+
+       econf ${myconf} || die "configure failed"
+       emake || die "make failed"
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die "install failed"
+       dodoc AUTHORS CODINGSTYLE ChangeLog INSTALL README
+
+       cp -R samples examples "${D}/usr/share/doc/${PF}/"
+}
+
+pkg_postinst() {
+       echo
+       elog "Check out http://www.crosswire.org/sword/modules/"
+       elog "to download modules that you would like to use with SWORD."
+       elog "Follow module installation instructions found on"
+       elog "the web or in /usr/share/doc/${PF}/INSTALL.gz."
+       echo
+}

diff --git a/app-text/sword/sword-1.5.9-r2.ebuild b/app-text/sword/sword-1.5.9-r2.ebuild
new file mode 100644 (file)
index 0000000..969a64c
--- /dev/null
+++ b/app-text/sword/sword-1.5.9-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.5.9-r2.ebuild,v 1.1 2008/02/20 04:04:10 beandog Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Library for Bible reading software."
+HOMEPAGE="http://www.crosswire.org/sword/"
+SRC_URI="http://www.crosswire.org/ftpmirror/pub/sword/source/v1.5/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="curl debug doc icu lucene"
+
+DEPEND="sys-libs/zlib
+       curl? ( net-misc/curl )
+       icu? ( dev-libs/icu )
+       lucene? ( dev-cpp/clucene )
+       dev-util/pkgconfig"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}/escape_range.patch"
+}
+
+src_compile() {
+       strip-flags
+       econf --with-zlib \
+               --with-conf \
+               $(use_enable curl) \
+               $(use_enable debug) \
+               $(use_with icu) \
+               $(use_enable lucene) || die "configure failed"
+       emake || die "make failed"
+}
+
+src_install() {
+       make DESTDIR="${D}" install || die "install failed"
+       dodoc AUTHORS CODINGSTYLE ChangeLog INSTALL README
+       if use doc ;then
+               rm -rf examples/.cvsignore
+               rm -rf examples/cmdline/.cvsignore
+               rm -rf examples/cmdline/.deps
+               cp -R samples examples "${D}/usr/share/doc/${PF}/"
+       fi
+       # global configuration file
+       insinto /etc
+       doins "${FILESDIR}/sword.conf"
+}
+
+pkg_postinst() {
+       echo
+       elog "Check out http://www.crosswire.org/sword/modules/"
+       elog "to download modules that you would like to use with SWORD."
+       elog "Follow module installation instructions found on"
+       elog "the web or in /usr/share/doc/${PF}/INSTALL.gz."
+       echo
+}