Revision bump for sec bug 80602; stable on x86.

Package-Manager: portage-2.0.51-r15

7 files changed, 54 insertions, 79 deletions

diff --git a/www-misc/htdig/ChangeLog b/www-misc/htdig/ChangeLog
index 2272425b6078..3caa4123c045 100644
--- a/www-misc/htdig/ChangeLog
+++ b/www-misc/htdig/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-misc/htdig
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/ChangeLog,v 1.4 2004/09/05 09:13:00 swegener Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/ChangeLog,v 1.5 2005/02/10 16:36:03 ka0ttic Exp $
+
+*htdig-3.1.6-r7 (10 Feb 2005)
+
+  10 Feb 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/htdig-3.1.6-unescaped-output.diff, -htdig-3.1.6-r5.ebuild,
+  -htdig-3.1.6-r6.ebuild, +htdig-3.1.6-r7.ebuild:
+  Revision bump for sec bug 80602; stable on x86.
 
   05 Sep 2004; Sven Wegener <swegener@gentoo.org> :
   Fixed ChangeLog header.
diff --git a/www-misc/htdig/Manifest b/www-misc/htdig/Manifest
index 25560904d416..b5122c6bb171 100644
--- a/www-misc/htdig/Manifest
+++ b/www-misc/htdig/Manifest
@@ -1,19 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+MD5 6dcdd7b9044c5db23e4356717e03e478 htdig-3.1.6-r7.ebuild 1898
 MD5 2cb79d0610b2d89ca1b57290eb413e8b htdig-3.1.6-r4.ebuild 1765
-MD5 7a77d9c84fb54bffece23bf6fce115e4 htdig-3.1.6-r5.ebuild 1549
-MD5 f29bbef46da0848f280e7294b5694df6 htdig-3.1.6-r6.ebuild 1666
+MD5 ca50f285d94c71e437117af4b9506dfd ChangeLog 4796
 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161
-MD5 06169bf653350ea14175535565709b96 ChangeLog 4548
 MD5 8863dac1d260decb47f31d1a3fe422e2 files/CONFIG.in 2012
+MD5 d44854e0008c7b69a927940fe3f373d9 files/htdig-3.1.6-unescaped-output.diff 640
 MD5 10558a7c02e5ea20fdfe325e6186fc9d files/digest-htdig-3.1.6-r4 64
-MD5 10558a7c02e5ea20fdfe325e6186fc9d files/digest-htdig-3.1.6-r5 64
-MD5 10558a7c02e5ea20fdfe325e6186fc9d files/digest-htdig-3.1.6-r6 64
+MD5 10558a7c02e5ea20fdfe325e6186fc9d files/digest-htdig-3.1.6-r7 64
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
+Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBOtijI1lqEGTUzyQRAq+CAKCJitM1jT9tjWcNk6z6Z4BhBubWvQCeOwqG
-ErcmFBsOj99lpBbCQBl3WYo=
-=gZ5T
+iD8DBQFCC418EZCkKN40op4RApd0AJ42CVkNFGu62JTWfaIeusF1R8nw3QCcDYbq
+diRv4Sney0HvXgWKvOx4mNI=
+=xo2A
 -----END PGP SIGNATURE-----
diff --git a/www-misc/htdig/files/digest-htdig-3.1.6-r6 b/www-misc/htdig/files/digest-htdig-3.1.6-r6
deleted file mode 100644
index a44fa14c97b5..000000000000
--- a/www-misc/htdig/files/digest-htdig-3.1.6-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a2f20d8d6149efd8d119bb2ebf55f23 htdig-3.1.6.tar.gz 2068675
diff --git a/www-misc/htdig/files/digest-htdig-3.1.6-r5 b/www-misc/htdig/files/digest-htdig-3.1.6-r7
index a44fa14c97b5..a44fa14c97b5 100644
--- a/www-misc/htdig/files/digest-htdig-3.1.6-r5
+++ b/www-misc/htdig/files/digest-htdig-3.1.6-r7
diff --git a/www-misc/htdig/files/htdig-3.1.6-unescaped-output.diff b/www-misc/htdig/files/htdig-3.1.6-unescaped-output.diff
new file mode 100644
index 000000000000..5a041f11f8a1
--- /dev/null
+++ b/www-misc/htdig/files/htdig-3.1.6-unescaped-output.diff
@@ -0,0 +1,17 @@
+diff -urN htdig-3.1.6.orig/htsearch/htsearch.cc htdig-3.1.6/htsearch/htsearch.cc
+--- htdig-3.1.6.orig/htsearch/htsearch.cc	2005-02-10 10:44:13.593198276 -0500
++++ htdig-3.1.6/htsearch/htsearch.cc	2005-02-10 10:46:15.391055719 -0500
+@@ -143,11 +143,8 @@
+ 	  configFile << '/' << input["config"] << ".conf";
+     }
+     if (access(configFile, R_OK) < 0)
+-    {
+-	if (filenameok) filenamemsg << " '" << configFile.get() << "'";
+-	reportError(form("Unable to read configuration file%s",
+-			 filenamemsg.get()));
+-    }
++	reportError("Unable to read configuration file.");
++    
+     config.Read(configFile);
+ 
+     if (input.exists("method"))
diff --git a/www-misc/htdig/htdig-3.1.6-r5.ebuild b/www-misc/htdig/htdig-3.1.6-r5.ebuild
deleted file mode 100644
index 0eedb72fd941..000000000000
--- a/www-misc/htdig/htdig-3.1.6-r5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/htdig-3.1.6-r5.ebuild,v 1.1 2004/08/26 12:51:06 rl03 Exp $
-
-inherit webapp
-
-DESCRIPTION="HTTP/HTML indexing and searching system"
-SRC_URI="http://www.htdig.org/files/${P}.tar.gz"
-HOMEPAGE="http://www.htdig.org"
-KEYWORDS="~x86 ~sparc ~ppc ~mips ~amd64"
-LICENSE="GPL-2"
-
-DEPEND=">=sys-libs/zlib-1.1.3
-	app-arch/unzip"
-
-export CPPFLAGS="${CPPFLAGS} -Wno-deprecated"
-
-src_compile() {
-	cd ${S}
-	./configure \
-		--prefix=/usr \
-		--with-config-dir=/${MY_HOSTROOTDIR}/${PN} \
-		--with-cgi-bin-dir=${MY_CGIBINDIR} \
-		--with-common-dir=/usr/share/${PN} \
-		--with-database-dir=${MY_HOSTROOTDIR}/${PN}/db \
-		--with-image-dir=${MY_HTDOCSDIR} \
-		--with-default-config-file=${MY_HOSTROOTDIR}/${PN}/${PN}.conf \
-		|| die
-
-	emake || die
-}
-
-src_install () {
-	webapp_src_preinst
-	dodir ${MY_HOSTROOTDIR}/${PN}
-
-	make 	\
-		DESTDIR=${D} \
-		CONFIG_DIR=${D}/${MY_HOSTROOTDIR}/${PN} \
-		SEARCH_DIR=${D}/${MY_HOSTROOTDIR} \
-		CGIBIN_DIR=${D}/${MY_CGIBINDIR} \
-		COMMON_DIR=${D}/usr/share/${PN} \
-		DATABASE_DIR=${D}/${MY_HOSTROOTDIR}/${PN}/db \
-		IMAGE_DIR=${D}/${MY_HTDOCSDIR} \
-		DEFAULT_CONFIG_FILE=${D}/${MY_HOSTROOTDIR}/${PN}/${PN}.conf \
-		exec_prefix=${D}/usr \
-		install || die
-
-	dodoc ChangeLog COPYING README
-	dohtml -r htdoc
-
-	sed -e "s/@DATABASE_DIR@/\/var\/${PN}\/db/" -i ${D}/${MY_HOSTROOT}/${PN}/htdig.conf
-
-	dosed ${MY_HOSTROOTDIR}/${PN}/${PN}.conf
-	dosed /usr/bin/rundig
-
-	webapp_src_install
-}
diff --git a/www-misc/htdig/htdig-3.1.6-r6.ebuild b/www-misc/htdig/htdig-3.1.6-r7.ebuild
index 8cb1cb9ba2ab..5278c137b71a 100644
--- a/www-misc/htdig/htdig-3.1.6-r6.ebuild
+++ b/www-misc/htdig/htdig-3.1.6-r7.ebuild
@@ -1,22 +1,33 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/htdig-3.1.6-r6.ebuild,v 1.1 2004/08/29 16:46:29 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-misc/htdig/htdig-3.1.6-r7.ebuild,v 1.1 2005/02/10 16:36:03 ka0ttic Exp $
 
-inherit webapp
+inherit webapp eutils flag-o-matic
 
 DESCRIPTION="HTTP/HTML indexing and searching system"
 SRC_URI="http://www.htdig.org/files/${P}.tar.gz"
 HOMEPAGE="http://www.htdig.org"
-KEYWORDS="~x86 ~sparc ~ppc ~mips ~amd64"
+KEYWORDS="x86 ~sparc ~ppc ~mips ~amd64"
 LICENSE="GPL-2"
 
-DEPEND=">=sys-libs/zlib-1.1.3
+RDEPEND=">=sys-libs/zlib-1.1.3
 	app-arch/unzip"
+DEPEND="${RDEPEND}"
 
 export CPPFLAGS="${CPPFLAGS} -Wno-deprecated"
 
-src_compile() {
+src_unpack() {
+	unpack ${A}
 	cd ${S}
+
+	# security bug 80602
+	epatch ${FILESDIR}/${P}-unescaped-output.diff
+
+}
+
+src_compile() {
+	append-flags -Wno-deprecated
+
 	./configure \
 		--prefix=/usr \
 		--with-config-dir=/${MY_HOSTROOTDIR}/${PN} \
@@ -25,9 +36,9 @@ src_compile() {
 		--with-database-dir=${MY_HOSTROOTDIR}/${PN}/db \
 		--with-image-dir=${MY_HTDOCSDIR} \
 		--with-default-config-file=${MY_HOSTROOTDIR}/${PN}/${PN}.conf \
-		|| die
+		|| die "configure failed"
 
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install () {
@@ -44,7 +55,7 @@ src_install () {
 		IMAGE_DIR=${D}/${MY_HTDOCSDIR} \
 		DEFAULT_CONFIG_FILE=${D}/${MY_HOSTROOTDIR}/${PN}/${PN}.conf \
 		exec_prefix=${D}/usr \
-		install || die
+		install || die "make install failed"
 
 	dodoc ChangeLog COPYING README
 	dohtml -r htdoc