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

Package-Manager: portage-2.1.9.9/cvs/Linux x86_64

3 files changed, 63 insertions, 2 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/Manifest b/net-analyzer/sarg/Manifest
index a7ef1ef1c2ca..bccccd866ff3 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -2,6 +2,7 @@ DIST sarg-2.2.5-patchset-5.tar.bz2 19830 RMD160 af81d065b8f9148052cb48c06ccc1626
 DIST sarg-2.2.5.tar.gz 639563 RMD160 df88b592b4425a4d2d4a79a13ed8a47a5dc1bc20 SHA1 ac885a617d8701c548267db0d12e7e56bb14ed90 SHA256 4798d8219c3d8e06fe122f0ae49754d18abfb901463e5edd71f4b7a529c1e81d
 DIST sarg-2.3.1.tar.gz 1073514 RMD160 b990ffd6baa170f0fd63c160555882779343c140 SHA1 823849387090bd6ff85db045a38db5a5ac7b7887 SHA256 2228d5dea0e9ce7a3996e0ec238a4e8ca0681e809eda85e9bf334e76cd621d0f
 EBUILD sarg-2.2.5-r5.ebuild 2440 RMD160 337d452068f06c18e66a78dea526d25cd00ecbb7 SHA1 d79631a5a2b4fa1c84ec47b6d5be82a37d965e63 SHA256 ab84c1fa11ec62e7f67bf09d18ac4ce1d850599d656b70a3fcb26331dcb431e2
+EBUILD sarg-2.3.1-r1.ebuild 1716 RMD160 12d40813f74b40dae15fd354c14be1c6336da6eb SHA1 5d88b039084b7535677b6e47a2e24582b23fd283 SHA256 edccd4d47deb1def27aacbf81ffc56f2bd94b75b4ad0e67797e4708ba504eead
 EBUILD sarg-2.3.1.ebuild 1651 RMD160 af7551bc016fc038c9562c7879d634c15270cb18 SHA1 6e9358b3cd2a2699c19b01bc527ca212196044cf SHA256 5e0f0b2829acbe7ae13babee13448c66875df8cdb641fc2110d4f1fa754156ac
-MISC ChangeLog 7648 RMD160 b1b7749b0d7905e82f82f3d0b5523297ce5e9655 SHA1 2551dfc4658fc426b31be7b811bcf84c064bd38e SHA256 3a20304775c63ba6eda590195c0ddb4069559e3fe26a4b658961f48920509dad
+MISC ChangeLog 7852 RMD160 7240fdd4c4e45f52f3109449f35aeefbd484a252 SHA1 916e51620943795a781d77c4197ead78cff9b9a3 SHA256 0e6fff5a26c9da3a7fcc89ddb8f23d6a1daecc9430726fb1b5e7bebbcbe01550
 MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0
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
+}