fix buffer overflow wrt #287332

Package-Manager: portage-2.2_rc61/cvs/Linux i686

4 files changed, 94 insertions, 13 deletions

diff --git a/app-admin/apachetop/ChangeLog b/app-admin/apachetop/ChangeLog
index d8f1af5b9091..1309b989e02d 100644
--- a/app-admin/apachetop/ChangeLog
+++ b/app-admin/apachetop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/apachetop
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/ChangeLog,v 1.43 2008/02/23 20:26:07 hollow Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/ChangeLog,v 1.44 2010/01/11 08:15:27 hollow Exp $
+
+*apachetop-0.12.6-r1 (11 Jan 2010)
+
+  11 Jan 2010; Benedikt Böhm <hollow@gentoo.org>
+  +apachetop-0.12.6-r1.ebuild, +files/apachetop-0.12.6-maxpathlen.patch:
+  fix buffer overflow wrt #287332
 
   23 Feb 2008; Benedikt Böhm <hollow@gentoo.org>
   +files/apachetop-0.12.6-configure.patch, -files/CAN-2005-2660.patch,
diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest
index 1e091e7dd9b5..f382dfb817f5 100644
--- a/app-admin/apachetop/Manifest
+++ b/app-admin/apachetop/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX apachetop-0.12.6-configure.patch 2884 RMD160 bb72d58d30e5370f070a7e1963b52c0900501f66 SHA1 cd1215688c97a62562bf99931eba32161d5b1a05 SHA256 56c926a2bf56ebfbf38da95176f229ce89285b1fc86aea7c8924c50ddbb49c7a
 AUX apachetop-0.12.6-gcc41.patch 243 RMD160 866303a6de71002e4da924fb2089371b234b442c SHA1 410f8778c3412893a3f7e3653fdc18c01a3b0b8e SHA256 dcdb6b52b45079c06141bf6f28f5b925db78f5574e97a8bcdc41938643058669
+AUX apachetop-0.12.6-maxpathlen.patch 1577 RMD160 4747f123cf781370caed0a583bf6ab12876d6830 SHA1 3ac615115cb2fa4f1669f9d91285f1439db724e5 SHA256 9c85eb8461946aa40afb5eab05075276688f829856919469408c64bb44329d25
 DIST apachetop-0.12.6.tar.gz 126930 RMD160 bceb52e339100f244c0246423fb9b6972cde3d88 SHA1 005c9479800a418ee7febe5027478ca8cbf3c51b SHA256 850062414517055eab2440b788b503d45ebe9b290d4b2e027a5f887ad70f3f29
+EBUILD apachetop-0.12.6-r1.ebuild 1074 RMD160 579f4aa9cab5c4400eaf942dfa4db6d59ecc086e SHA1 c069dde3ebf1bf5994e02be4a034a9e5ee4644df SHA256 ccebc4e8364d48d0e5aea7f9d3d9f839b837dbd9e6a9dcd323235a209b8a0251
 EBUILD apachetop-0.12.6.ebuild 1020 RMD160 7ad5cbc276444142353a37138adc1f6f8ddef36d SHA1 46ebadda33d8d6f0da8d74e347a1969b86949e84 SHA256 93a1e21afda8ab1c7d1e767e41644504944070a51bdd5c2f0258634fd140c31c
-MISC ChangeLog 5374 RMD160 1d4075c8cc8a4be0824f8dd7df9c188da6c362d4 SHA1 bd2d60ea9607927d82baf1bc34d24e5abb9bf190 SHA256 d3cc1024440e8b8eb4e5e766cf9b98bf74cbe53d691597c83bc05feafd3ad830
+MISC ChangeLog 5568 RMD160 2e11c0faa15ecccbf42dd4df1cb1d62a0a4e4c84 SHA1 d850669aca20a095e702e0e5948e754119da91dc SHA256 48e9f6ad55048531c7b5d8b75f99b95de02e73f7e6cac7ae58522fbac7fe64c0
 MISC metadata.xml 160 RMD160 a0f6e133e170b7477018d8584c20e8723f6914fa SHA1 a3b9b520ec43ee1f9b1c7b5c5b8745bf84454c03 SHA256 3c312146c4cb5b912d6f56292242ce3a85c629ca98ee7ef0a84ca575708b44fe
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEYEARECAAYFAkfAgWoACgkQmPFBzbX68WHTygCffz6RYgxfXxMQUVR5Amm4Bdqe
-ElMAn0T8nr5BuC12xWCOE8BSmd/jfU5j
-=LjVG
------END PGP SIGNATURE-----
diff --git a/app-admin/apachetop/apachetop-0.12.6-r1.ebuild b/app-admin/apachetop/apachetop-0.12.6-r1.ebuild
new file mode 100644
index 000000000000..3a05a87863b9
--- /dev/null
+++ b/app-admin/apachetop/apachetop-0.12.6-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/apachetop-0.12.6-r1.ebuild,v 1.1 2010/01/11 08:15:27 hollow Exp $
+
+EAPI="2"
+
+inherit eutils autotools
+
+DESCRIPTION="A realtime Apache log analyzer"
+HOMEPAGE="http://www.webta.org/projects/apachetop"
+SRC_URI="http://www.webta.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="fam pcre adns"
+
+DEPEND="fam? ( virtual/fam )
+	pcre? ( dev-libs/libpcre )
+	adns? ( net-libs/adns )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+	epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-maxpathlen.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-logfile=/var/log/apache2/access_log \
+		$(use_with fam) \
+		$(use_with pcre) \
+		$(use_with adns)
+}
+
+src_compile() {
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+}
diff --git a/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch b/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch
new file mode 100644
index 000000000000..b648b07cbfc5
--- /dev/null
+++ b/app-admin/apachetop/files/apachetop-0.12.6-maxpathlen.patch
@@ -0,0 +1,39 @@
+Patch by Robert Scheck <robert@fedoraproject.org> for apachetop <= 0.12.6, which
+adds some includes in order to have a real change to get MAXPATHLEN defined with
+a valid value. Once MAXPATHLEN really gets filled with 128, it will just cause a
+buffer overflow.
+
+See Red Hat Bugzilla #446199 (https://bugzilla.redhat.com/show_bug.cgi?id=446199)
+for more information. This patch should solve the mentioned bug report and should
+be sane enough to get included by upstream of apachetop for the next release. It
+is important to run autoheader before ./configure to get these changes activated.
+
+--- apachetop-0.12.6/configure.ac		2005-10-27 18:39:25.000000000 +0200
++++ apachetop-0.12.6/configure.ac.maxpathlen	2008-06-21 16:00:38.000000000 +0200
+@@ -34,7 +34,8 @@
+ # Checks for header files.
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([arpa/inet.h netdb.h netinet/in.h \
+-		string.h strings.h sys/socket.h time.h sys/time.h])
++		string.h strings.h sys/socket.h time.h sys/time.h \
++		limits.h sys/param.h])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ #AC_HEADER_STDBOOL # not in 2.53?
+--- apachetop-0.12.6/src/apachetop.h		2005-10-15 18:10:01.000000000 +0200
++++ apachetop-0.12.6/src/apachetop.h.maxpatlen	2008-06-21 16:02:00.000000000 +0200
+@@ -89,8 +89,12 @@
+ #define getMIN(a,b) (a < b ? a : b)
+ #define getMAX(a,b) (a > b ? a : b)
+ 
+-#ifndef MAXPATHLEN
+-# define MAXPATHLEN 128
++#ifdef HAVE_SYS_PARAM_H
++# include <sys/param.h>
++#endif
++ 
++#if HAVE_LIMITS_H
++# include <limits.h>
+ #endif
+ 
+ /* upon startup, each input file is put into an element of this array,