diff options
| -rw-r--r-- | app-text/sword/ChangeLog | 10 | ||||
| -rw-r--r-- | app-text/sword/files/escape_range.patch | 12 | ||||
| -rw-r--r-- | app-text/sword/sword-1.5.10-r2.ebuild | 60 | ||||
| -rw-r--r-- | app-text/sword/sword-1.5.8-r2.ebuild | 50 | ||||
| -rw-r--r-- | app-text/sword/sword-1.5.9-r2.ebuild | 60 |
5 files changed, 191 insertions, 1 deletions
diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog index 8e92fafbe677..7ba83981ce40 100644 --- 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/files/escape_range.patch b/app-text/sword/files/escape_range.patch new file mode 100644 index 000000000000..e967c4c68256 --- /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 index 000000000000..4b5ec5500205 --- /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 index 000000000000..4801de2c9f6d --- /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 index 000000000000..969a64c18c89 --- /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 +} |