Fix sarg.conf to point on correct location of exclude_codes, bug 318097, thank ungift-ed for report.

(Portage version: 2.1.9.9/cvs/Linux x86_64)

2 files changed, 61 insertions, 1 deletions

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index 57d52cfb5ab2..62595392f002 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/sarg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.54 2010/09/19 09:20:05 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.55 2010/09/21 13:22:58 pva Exp $
+
+*sarg-2.3.1-r1 (21 Sep 2010)
+
+  21 Sep 2010; Peter Volkov <pva@gentoo.org> +sarg-2.3.1-r1.ebuild:
+  Fix sarg.conf to point on correct location of exclude_codes, bug 318097,
+  thank ungift-ed for report.
 
 *sarg-2.3.1 (19 Sep 2010)
 
diff --git a/net-analyzer/sarg/sarg-2.3.1-r1.ebuild b/net-analyzer/sarg/sarg-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..582651d57ea8
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.3.1-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.3.1-r1.ebuild,v 1.1 2010/09/21 13:22:58 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"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE=""
+
+DEPEND="media-libs/gd[png,truetype]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	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:' \
+		-e 's:/usr/local/sarg/exclude_codes:/etc/sarg/exclude_codes:' \
+		-i sarg.conf || die
+
+	sed -e 's:"/var/www/html/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \
+			-i log.c || die #43132
+
+	sed	-e 's:/usr/local/sarg/passwd:/etc/sarg/passwd:' \
+		-i htaccess || 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:' \
+			-i sarg.1 sarg-php/sarg-squidguard-block.php || die
+}
+
+src_configure() {
+	econf --sysconfdir=/etc/sarg/
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "sarg installation failed"
+	dodoc BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess || die
+}