Fixed misc security vulnerabilities, bug #222121, thank Robert Buchholz for report and Klaus Singvogel for investigation/fixes.

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

3 files changed, 89 insertions, 2 deletions

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index ea96f05c44fe..f7a9c6a77ff4 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/sarg
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.44 2009/03/16 16:30:01 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.45 2009/03/23 09:05:26 pva Exp $
+
+*sarg-2.2.5-r1 (23 Mar 2009)
+
+  23 Mar 2009; Peter Volkov <pva@gentoo.org> +sarg-2.2.5-r1.ebuild:
+  Fixed misc security vulnerabilities, bug #222121, thank Robert Buchholz
+  for report and Klaus Singvogel for investigation/fixes.
 
   16 Mar 2009; Peter Volkov <pva@gentoo.org> -sarg-2.2.4.ebuild,
   sarg-2.2.5.ebuild:
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 808675d677b4..aee7f449a2ee 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,6 +1,8 @@
 AUX sarg-2.2.3.1-rewind.patch 450 RMD160 02eb366d4dfef00bdeb1683de09f48d79c6206bc SHA1 4ab1874a13ad580a1074387ea78593672381c855 SHA256 5652fa70ac5f074f43fbabd4f4cbd1875a39924da6550f4a821b826e0efa0cc6
 DIST sarg-2.2.3.1-lots-of-compiler-warnings.patch.gz 6237 RMD160 67353fb39434bb5af8ac4c620643da1baf9336d1 SHA1 25630404296156565489d506ddd09b3c0991a8a0 SHA256 d68a9cfddf4886714fe53c4264cbbd992c8f0780c488515af2a9e1fbad016f89
+DIST sarg-2.2.5-patchset-1.tar.bz2 17368 RMD160 10f90c3417c37e21f3bbb543fccd1b92941738cc SHA1 e2ec5de58ce6a8eb40fad21f1c716f82fc360a30 SHA256 4d2478bd07042c788b8b3fc4edc2c1d1ac200863eb361e97e695538681e3a9b1
 DIST sarg-2.2.5.tar.gz 639563 RMD160 df88b592b4425a4d2d4a79a13ed8a47a5dc1bc20 SHA1 ac885a617d8701c548267db0d12e7e56bb14ed90 SHA256 4798d8219c3d8e06fe122f0ae49754d18abfb901463e5edd71f4b7a529c1e81d
+EBUILD sarg-2.2.5-r1.ebuild 2440 RMD160 3cd377fd1eda566b13c4fb358c7ea00c754f4d1e SHA1 02b3619278ce3482a41d48e27e580f3912461cf9 SHA256 1c532febaf62d15fc1f3b124d83899d0423d4b59cfa35c3047ff8467550a0de8
 EBUILD sarg-2.2.5.ebuild 2021 RMD160 bae6c2141111afa6c615ad91e0e0eef5b8a61e77 SHA1 8bee25106df1bd6afcffb8db677c6afec98f7bff SHA256 96b8b14276c93872fed571ebd7a09fa6ff7fdc25f8870006133275424ef9e0fd
-MISC ChangeLog 5799 RMD160 6aeebe14f24a94b9369edb54d072b74491b07ff7 SHA1 341aa7347b33bb2f998e699f2604256911c4e28b SHA256 75eab0bbb70a95108029b6a1a002238148c2d6b39a4081a549c6f50de992be98
+MISC ChangeLog 6030 RMD160 e7bad4b6520ded7276fb6bc28d3b8e7848a61eaf SHA1 ae05281aee028a1910181df0f751537af0f4a797 SHA256 c4b54f253eba75237b3bcd3eb5ba89127212bab666dd0015e9de9628a04fcd1b
 MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0
diff --git a/net-analyzer/sarg/sarg-2.2.5-r1.ebuild b/net-analyzer/sarg/sarg-2.2.5-r1.ebuild
new file mode 100644
index 000000000000..88c8dc44530b
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.2.5-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.2.5-r1.ebuild,v 1.1 2009/03/23 09:05:26 pva Exp $
+
+EAPI="2"
+
+inherit eutils autotools
+
+DESCRIPTION="Squid Analysis Report Generator"
+HOMEPAGE="http://sarg.sourceforge.net/sarg.php"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+		mirror://gentoo/${P}-patchset-1.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="media-libs/gd[png,truetype]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	EPATCH_SOURCE="${WORKDIR}/patches/" EPATCH_SUFFIX="patch" epatch
+
+	einfo "Running sed to substitute paths..."
+	sed \
+		-e 's:/usr/local/squid/var/logs/access.log:/var/log/squid/access.log:' \
+		-e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
+		-e 's:/var/www/html/squid-reports:/var/www/localhost/htdocs/squid-reports:' \
+		-i sarg.conf || die
+
+	sed \
+		-e 's:"/usr/local/squid/var/logs/access.log":"/var/log/squid/access.log":' \
+		-e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \
+		-e 's:"/usr/local/sarg/passwd":"/etc/sarg/passwd":' \
+			-i log.c || die #43132
+
+	sed	-e 's:/usr/local/sarg/passwd:/etc/sarg/passwd:' \
+		-i htaccess || die
+
+	sed -e 's:/usr/local/squid/logs/access.log:/var/log/squid/access.log:' \
+		-i splitlog.c convlog.c || die
+
+	sed -e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
+		-e 's:/usr/local/squid/etc/passwd:/etc/squid/passwd:' \
+		-i user_limit_block || die
+
+	sed -e 's:/usr/local/squid/etc/block.txt:/etc/squid/etc/block.txt:' \
+		-i sarg-php/sarg-block-it.php || die
+
+	sed -e 's:/usr/local/\(sarg/sarg.conf\):/etc/\1:' \
+		-e 's:/usr/local/\(squidGuard/squidGuard.conf\):/etc/\1:' \
+		-e 's:/usr/local/squid/logs/access.log:/var/log/squid/access.log:' \
+			-i sarg.1 sarg-php/sarg-squidguard-block.php || die
+
+	sed -i -e 's:sarg_tmp:sarg:' email.c || die #64743
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-bindir=/usr/bin \
+		--enable-mandir=/usr/share/man/man1 \
+		--enable-sysconfdir=/etc/sarg/
+}
+
+src_install() {
+	# This is workaround for sarg installation script, which does not create dirs
+	dodir /etc/sarg /usr/sbin
+
+	make \
+		BINDIR="${D}"/usr/sbin \
+		MANDIR="${D}"/usr/share/man/man1 \
+		SYSCONFDIR="${D}"/etc/sarg \
+		HTMLDIR="${D}"/var/www/html \
+		install || die "sarg installation failed"
+
+	dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess
+}