From 7866649ae19c5a4a9ca3b955a0c35e0775ac52be Mon Sep 17 00:00:00 2001 From: Renat Lumpau Date: Fri, 30 Sep 2005 17:22:44 +0000 Subject: Revbump wrt security bug #104473. (Portage version: 2.0.51.22-r2) --- app-admin/apachetop/ChangeLog | 8 ++++- app-admin/apachetop/Manifest | 13 ++------ app-admin/apachetop/apachetop-0.12.5-r1.ebuild | 39 ++++++++++++++++++++++ app-admin/apachetop/files/CAN-2005-2660.patch | 20 +++++++++++ .../apachetop/files/digest-apachetop-0.12.5-r1 | 1 + 5 files changed, 70 insertions(+), 11 deletions(-) create mode 100644 app-admin/apachetop/apachetop-0.12.5-r1.ebuild create mode 100644 app-admin/apachetop/files/CAN-2005-2660.patch create mode 100644 app-admin/apachetop/files/digest-apachetop-0.12.5-r1 (limited to 'app-admin/apachetop') diff --git a/app-admin/apachetop/ChangeLog b/app-admin/apachetop/ChangeLog index 7d30a52e684c..df244ea031ed 100644 --- a/app-admin/apachetop/ChangeLog +++ b/app-admin/apachetop/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/apachetop # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/ChangeLog,v 1.28 2005/09/28 00:30:31 rl03 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/ChangeLog,v 1.29 2005/09/30 17:22:44 rl03 Exp $ + +*apachetop-0.12.5-r1 (30 Sep 2005) + + 30 Sep 2005; Renat Lumpau +files/CAN-2005-2660.patch, + +apachetop-0.12.5-r1.ebuild: + Revbump wrt security bug #104473. 28 Sep 2005; Renat Lumpau -apachetop-0.11.ebuild, -apachetop-0.12.ebuild: diff --git a/app-admin/apachetop/Manifest b/app-admin/apachetop/Manifest index 9390cab7786d..7bd896438a01 100644 --- a/app-admin/apachetop/Manifest +++ b/app-admin/apachetop/Manifest @@ -1,14 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 0a23344041ddce96ee985956edc614a7 apachetop-0.12.5-r1.ebuild 1099 MD5 ae59afc3a444b95bceb4f44742ab5209 apachetop-0.12.5.ebuild 1000 MD5 cd3f99def9543d896b7a058eed40486c ChangeLog 3421 MD5 f61bfa064e3acdfcd826e4a38b121196 metadata.xml 161 +MD5 ddba3662bcd820b6ba4b41b4e254724b files/CAN-2005-2660.patch 577 +MD5 946d0848d81bf273d4d8a0cf79667a31 files/digest-apachetop-0.12.5-r1 68 MD5 946d0848d81bf273d4d8a0cf79667a31 files/digest-apachetop-0.12.5 68 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFDOeQzEzitwsaoONoRAkgCAKCODnRjM18ildbFT8uqxNsGR49zVgCbBwVo -L5iliq6szyNPzMRTFRXCIQk= -=wMWe ------END PGP SIGNATURE----- diff --git a/app-admin/apachetop/apachetop-0.12.5-r1.ebuild b/app-admin/apachetop/apachetop-0.12.5-r1.ebuild new file mode 100644 index 000000000000..26090fa72882 --- /dev/null +++ b/app-admin/apachetop/apachetop-0.12.5-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/apachetop/apachetop-0.12.5-r1.ebuild,v 1.1 2005/09/30 17:22:44 rl03 Exp $ + +inherit eutils + +DESCRIPTION="A realtime Apache log analyzer" +HOMEPAGE="http://clueful.shagged.org/apachetop/" +SRC_URI="http://clueful.shagged.org/apachetop/files/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86" +IUSE="apache2 fam pcre adns" + +DEPEND="sys-apps/sed + sys-libs/readline + sys-libs/ncurses + fam? ( virtual/fam ) + pcre? ( dev-libs/libpcre ) + adns? ( net-libs/adns )" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/CAN-2005-2660.patch +} + +src_compile() { + useq apache2 && logfile="/var/log/apache2/access_log" + useq apache2 || logfile="/var/log/apache/access_log" + econf --with-logfile="${logfile}" `use_with fam` `use_with pcre` `use_with adns` || die "econf failed" + emake || die "emake failed" +} + +src_install() { + make DESTDIR=${D} install || die "make install failed" + dodoc README INSTALL TODO AUTHORS ChangeLog NEWS +} diff --git a/app-admin/apachetop/files/CAN-2005-2660.patch b/app-admin/apachetop/files/CAN-2005-2660.patch new file mode 100644 index 000000000000..cea26afa4c5b --- /dev/null +++ b/app-admin/apachetop/files/CAN-2005-2660.patch @@ -0,0 +1,20 @@ +--- apachetop-0.12.5.orig/src/apachetop.cc 2005-09-27 20:48:10.000000000 -0400 ++++ apachetop-0.12.5/src/apachetop.cc 2005-09-27 20:49:26.000000000 -0400 +@@ -1105,7 +1105,16 @@ + FILE *d; + va_list args; + +- if (cf.debug && (d = fopen(DEBUG_OUTPUT, "a"))) ++ static char fileName[1024] = {'\0'}; ++ ++ if ( !strlen( fileName ) ) ++ { ++ strcpy( fileName, "/tmp/atop.XXXXXX" ); ++ mkdtemp( fileName ); ++ strncat( fileName, "/debug", sizeof(fileName ) ); ++ } ++ ++ if (cf.debug && (d = fopen(fileName, "a"))) + { + va_start(args, fmt); + vfprintf(d, fmt, args); diff --git a/app-admin/apachetop/files/digest-apachetop-0.12.5-r1 b/app-admin/apachetop/files/digest-apachetop-0.12.5-r1 new file mode 100644 index 000000000000..e9a79fb4e6c3 --- /dev/null +++ b/app-admin/apachetop/files/digest-apachetop-0.12.5-r1 @@ -0,0 +1 @@ +MD5 47c40c26319d57100008a2a56dcefe06 apachetop-0.12.5.tar.gz 126967 -- cgit v1.2.3-65-gdbad