-m htdig-3.2.0_beta6-r3 fixes sec bug #200285.

Package-Manager: portage-2.1.3.14

5 files changed, 123 insertions, 5 deletions

diff --git a/www-misc/htdig/ChangeLog b/www-misc/htdig/ChangeLog
index f69a8c57e0fc..2336e7d72043 100644
--- a/www-misc/htdig/ChangeLog
+++ b/www-misc/htdig/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-misc/htdig
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/ChangeLog,v 1.34 2007/06/25 14:21:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/ChangeLog,v 1.35 2007/12/03 08:13:25 wrobel Exp $
+
+*htdig-3.2.0_beta6-r3 (03 Dec 2007)
+
+  03 Dec 2007; <wrobel@gentoo.org> +files/htdig-3.2.0_beta6-quoting.patch,
+  +htdig-3.2.0_beta6-r3.ebuild:
+  -m htdig-3.2.0_beta6-r3 fixes sec bug #200285.
 
   25 Jun 2007; Raúl Porcel <armin76@gentoo.org>
   htdig-3.2.0_beta6-r2.ebuild:
diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest
index 3a8fde95cc50..21e21be716e0 100644
--- a/www-misc/htdig/Manifest
+++ b/www-misc/htdig/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.1.6-ssl.patch 19082 RMD160 32c8d70ae5aad26901e70fd1068fc58201fb8ea2 SHA1 672aa5f408ef250a888877e73901eae2f9270697 SHA256 d1b07cf0a684547578b1f015f8e73568706cd213ece1259012de60e0d3730064
 MD5 43fc0bbc4d967b1a9584542e960c89f0 files/3.1.6-ssl.patch 19082
 RMD160 32c8d70ae5aad26901e70fd1068fc58201fb8ea2 files/3.1.6-ssl.patch 19082
@@ -14,6 +17,10 @@ AUX htdig-3.2.0_beta6-gcc4.patch 541 RMD160 3b684305cee717d6cf4a628fbea6af1b7891
 MD5 2aeda683f95b58efc0978d7fe951de59 files/htdig-3.2.0_beta6-gcc4.patch 541
 RMD160 3b684305cee717d6cf4a628fbea6af1b7891164b files/htdig-3.2.0_beta6-gcc4.patch 541
 SHA256 729ea1d0fd415b5b144b2b95bba0575c4eef942f77adfbf54bb69e7da7dd58c3 files/htdig-3.2.0_beta6-gcc4.patch 541
+AUX htdig-3.2.0_beta6-quoting.patch 1130 RMD160 df995515a46234cce7ad8ded7dcd2c508c680a18 SHA1 de725d4c0666992e359279385fe706241fa93c45 SHA256 d84222aa6895305c2ee87f9975bfc348a7872f63ee02a33e862b325f125b8109
+MD5 0d9099d3b5a32d322a8e0240f85a3578 files/htdig-3.2.0_beta6-quoting.patch 1130
+RMD160 df995515a46234cce7ad8ded7dcd2c508c680a18 files/htdig-3.2.0_beta6-quoting.patch 1130
+SHA256 d84222aa6895305c2ee87f9975bfc348a7872f63ee02a33e862b325f125b8109 files/htdig-3.2.0_beta6-quoting.patch 1130
 DIST htdig-3.1.6.tar.gz 2068675 RMD160 1414943255f16cd278a31b8014a5bfe6c4400ead SHA1 603fc244ba59ee1efcbe8f2ba087567cb14468d0 SHA256 c50aae9beeeb4525901f19319350631bc16a501855f1e6f918209ba44c19638b
 DIST htdig-3.2.0b6.tar.gz 3104936 RMD160 621e85920f3452bc1a28a61cf7f8b3e08808bc55 SHA1 106db8c137a3e8f0f5fcf24ac96e01f3515e9cae SHA256 6da9e0ee8627d5302f5685a1b3e5de5f1e6e8df4c0a92c0ca00796bca9e546c8
 EBUILD htdig-3.1.6-r7.ebuild 1927 RMD160 1565e2f715779072133d539de3e8696cb8f333f1 SHA1 ba602677bb2d91f211528f7baeea404fabac032d SHA256 2f3cfa956b2c2740b705f2ac6f87b8469b1954e2d6cb61e4ff50a69afd398450
@@ -28,10 +35,14 @@ EBUILD htdig-3.2.0_beta6-r2.ebuild 1561 RMD160 c1c34ac938c8b449614af2c1cb4e8dc6f
 MD5 8de57caacd58cca60408409d18bab9d0 htdig-3.2.0_beta6-r2.ebuild 1561
 RMD160 c1c34ac938c8b449614af2c1cb4e8dc6f0ce1748 htdig-3.2.0_beta6-r2.ebuild 1561
 SHA256 948641779107a2237f666bc43d36f2e235d5a1f3583edfa287c4ab606a7349b2 htdig-3.2.0_beta6-r2.ebuild 1561
-MISC ChangeLog 8581 RMD160 4923e7e21cec1b6f1fb5538b6643bf2f5c167e46 SHA1 894f7e13579eb0a0eb6f8aab0fc898435d30c850 SHA256 4c6de876c8e845dce2effc5f6de338fa1ecb673934867467b5e93b543afbbd07
-MD5 e5d112547acfd3624db922c204cc0581 ChangeLog 8581
-RMD160 4923e7e21cec1b6f1fb5538b6643bf2f5c167e46 ChangeLog 8581
-SHA256 4c6de876c8e845dce2effc5f6de338fa1ecb673934867467b5e93b543afbbd07 ChangeLog 8581
+EBUILD htdig-3.2.0_beta6-r3.ebuild 1618 RMD160 a6ba702e9d24c235f61a92c568256ff8a592ce59 SHA1 2f1f4f6cc81321c777a045cd0d98e748af5446c2 SHA256 73d8a3a502bd941e55a3860b78bf7385caaaac6593562f9e636d8c45d659c7ca
+MD5 04913c9f6cca9382e066243876d8fd3f htdig-3.2.0_beta6-r3.ebuild 1618
+RMD160 a6ba702e9d24c235f61a92c568256ff8a592ce59 htdig-3.2.0_beta6-r3.ebuild 1618
+SHA256 73d8a3a502bd941e55a3860b78bf7385caaaac6593562f9e636d8c45d659c7ca htdig-3.2.0_beta6-r3.ebuild 1618
+MISC ChangeLog 8774 RMD160 2d966bd05737ca122f6a7abb0a56550ee95d6f5a SHA1 6f0f4623369494d882a9881563521d3de14d784e SHA256 1366b21584d5f989a8e5d06a1dc81815af32bd669d68c86909e4e82cde172bea
+MD5 4698d843a38982d724661bbe171c0b4d ChangeLog 8774
+RMD160 2d966bd05737ca122f6a7abb0a56550ee95d6f5a ChangeLog 8774
+SHA256 1366b21584d5f989a8e5d06a1dc81815af32bd669d68c86909e4e82cde172bea ChangeLog 8774
 MISC metadata.xml 161 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b SHA1 5b91a6d8d06d3dca2d774425befba30caca51507 SHA256 9cd891fcf0af580e98b62d2f4ded9e53671599f5a7aafd5dce692b996d2a83f4
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
 RMD160 d47e924599b33a35a50f4c9f5564d325c271f83b metadata.xml 161
@@ -45,3 +56,13 @@ SHA256 fedcac612496d8042d455a31212600ea023ea918050a11b74486c9b3ff11f5ab files/di
 MD5 e6548e96cacfbef1c6a3dd84e57a24ee files/digest-htdig-3.2.0_beta6-r2 244
 RMD160 12f3e71f1833de29ecd8f34dc69eceefb0b11338 files/digest-htdig-3.2.0_beta6-r2 244
 SHA256 c986f1e3f4c8b17b8797c4fe46661af8399cb4c7dae45bf90a21549e925dc445 files/digest-htdig-3.2.0_beta6-r2 244
+MD5 e6548e96cacfbef1c6a3dd84e57a24ee files/digest-htdig-3.2.0_beta6-r3 244
+RMD160 12f3e71f1833de29ecd8f34dc69eceefb0b11338 files/digest-htdig-3.2.0_beta6-r3 244
+SHA256 c986f1e3f4c8b17b8797c4fe46661af8399cb4c7dae45bf90a21549e925dc445 files/digest-htdig-3.2.0_beta6-r3 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHU7qrEEcxCpcDQ74RAgA3AJ9jpTn3vktOs13ktdvt/ES+uupMbgCdHyaz
+RTnJusxuqp4p8xmd/JL4xxo=
+=u2zt
+-----END PGP SIGNATURE-----
diff --git a/www-misc/htdig/files/digest-htdig-3.2.0_beta6-r3 b/www-misc/htdig/files/digest-htdig-3.2.0_beta6-r3
new file mode 100644
index 000000000000..71d425d06977
--- /dev/null
+++ b/www-misc/htdig/files/digest-htdig-3.2.0_beta6-r3
@@ -0,0 +1,3 @@
+MD5 8a6952f5b97e305dbb7489045bad220f htdig-3.2.0b6.tar.gz 3104936
+RMD160 621e85920f3452bc1a28a61cf7f8b3e08808bc55 htdig-3.2.0b6.tar.gz 3104936
+SHA256 6da9e0ee8627d5302f5685a1b3e5de5f1e6e8df4c0a92c0ca00796bca9e546c8 htdig-3.2.0b6.tar.gz 3104936
diff --git a/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch b/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch
new file mode 100644
index 000000000000..57b0e3b78731
--- /dev/null
+++ b/www-misc/htdig/files/htdig-3.2.0_beta6-quoting.patch
@@ -0,0 +1,26 @@
+Index: htdig-3.2.0b6/htsearch/Display.cc
+===================================================================
+--- htdig-3.2.0b6.orig/htsearch/Display.cc
++++ htdig-3.2.0b6/htsearch/Display.cc
+@@ -137,7 +137,7 @@ Display::display(int pageNumber)
+       // Must temporarily stash the message in a String, since
+       // displaySyntaxError will overwrite the static temp used in form.
+ 
+-      String s(form("No such sort method: `%s'", (const char*)config->Find("sort")));
++      String s("invalid sort method");
+ 
+       displaySyntaxError(s);
+       return;
+Index: htdig-3.2.0b6/libhtdig/ResultFetch.cc
+===================================================================
+--- htdig-3.2.0b6.orig/libhtdig/ResultFetch.cc
++++ htdig-3.2.0b6/libhtdig/ResultFetch.cc
+@@ -142,7 +142,7 @@ ResultFetch::fetch()
+         // Must temporarily stash the message in a String, since
+         // displaySyntaxError will overwrite the static temp used in form.
+ 
+-        String s(form("No such sort method: `%s'", (const char *) config->Find("sort")));
++        String s("invalid sort method");
+ 
+         displaySyntaxError(s);
+         //return;
diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild
new file mode 100644
index 000000000000..00f55f79d554
--- /dev/null
+++ b/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/htdig-3.2.0_beta6-r3.ebuild,v 1.1 2007/12/03 08:13:25 wrobel Exp $
+
+inherit eutils autotools
+
+MY_PV=${PV/_beta/b}
+S=${WORKDIR}/${PN}-${MY_PV}
+
+DESCRIPTION="HTTP/HTML indexing and searching system"
+SRC_URI="http://www.htdig.org/files/${PN}-${MY_PV}.tar.gz"
+HOMEPAGE="http://www.htdig.org"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+LICENSE="GPL-2"
+
+DEPEND=">=sys-libs/zlib-1.1.3
+	app-arch/unzip
+	ssl? ( dev-libs/openssl )"
+
+IUSE="ssl"
+SLOT="0"
+
+src_unpack() {
+	unpack "${A}"
+
+	cd "${S}"
+	epatch "${FILESDIR}/${P}"-gcc4.patch
+	epatch "${FILESDIR}/${P}"-as-needed.patch
+	epatch "${FILESDIR}/${P}"-quoting.patch
+	eautoreconf
+}
+
+src_compile() {
+	local conf="
+		--with-config-dir=/etc/${PN} \
+		--with-default-config-file=/etc/${PN}/${PN}.conf \
+		--with-database-dir=/var/lib/${PN}/db \
+		--with-cgi-bin-dir=/var/www/localhost/cgi-bin \
+		--with-search-dir=/var/www/localhost/htdocs/${PN} \
+		--with-image-dir=/var/www/localhost/htdocs/${PN}
+	"
+	use ssl && conf="${conf} --with-ssl"
+
+	econf ${conf} || die "configure failed"
+
+#		--with-image-url-prefix=file:///var/www/localhost/htdocs/${PN} \
+
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	dodoc ChangeLog COPYING README
+	dohtml -r htdoc
+
+	dosed /etc/${PN}/${PN}.conf
+	dosed /usr/bin/rundig
+
+	# symlink htsearch so it can be easily found. see bug #62087
+	dosym /var/www/localhost/cgi-bin/htsearch /usr/bin/htsearch
+}