Small rework of getword-boundary-limit.patch, now we issue warning instead of exit(1) in case a limit at getword was not enough to handle word. Add fix for bug #263802, thank cpa for report and Dmitriy Bogun for usefull backtrace.

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

3 files changed, 91 insertions, 2 deletions

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index e6a97f0ccf43..c5a4d395bc08 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,14 @@
 # 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.47 2009/03/24 18:54:14 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.48 2009/04/05 20:39:17 pva Exp $
+
+*sarg-2.2.5-r2 (05 Apr 2009)
+
+  05 Apr 2009; Peter Volkov <pva@gentoo.org> +sarg-2.2.5-r2.ebuild:
+  Small rework of getword-boundary-limit.patch, now we issue warning instead
+  of exit(1) in case a limit at getword was not enough to handle word. Add
+  fix for bug #263802, thank cpa for report and Dmitriy Bogun for usefull
+  backtrace.
 
   24 Mar 2009; Brent Baude <ranger@gentoo.org> sarg-2.2.5-r1.ebuild:
   Marking sarg-2.2.5-r1 ppc for bug 222121
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 4366ec4b70a1..c79fc3107bee 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,8 +1,10 @@
 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-patchset-2.tar.bz2 18440 RMD160 4331dfeb48e659b6007d93073c630bf9a1280315 SHA1 e36bf7091485ad559a523e92ea338b02dbedb556 SHA256 c02d710e2674328f6590582cf9afb995552dda94a8dec3a1b292c8392f4bb7e2
 DIST sarg-2.2.5.tar.gz 639563 RMD160 df88b592b4425a4d2d4a79a13ed8a47a5dc1bc20 SHA1 ac885a617d8701c548267db0d12e7e56bb14ed90 SHA256 4798d8219c3d8e06fe122f0ae49754d18abfb901463e5edd71f4b7a529c1e81d
 EBUILD sarg-2.2.5-r1.ebuild 2440 RMD160 124eb61a683dc80c862a2ca8a6e379810c607b0e SHA1 ce4174c4c2d003472527e535cd411be3f7c20909 SHA256 41b4ec4b37a273be80b77772f8be0004cea8e00853986593873ad18ee9af9f02
+EBUILD sarg-2.2.5-r2.ebuild 2440 RMD160 15ec6bbd7dd08ba454b9e0e956191d50f5f8d823 SHA1 b4f14184c43efc4c68a4abc4913f18d4a73eb616 SHA256 588abd2e050f23e7a8194feaaff466c2f30241ff11e7fe5f689ce47a525f5ed8
 EBUILD sarg-2.2.5.ebuild 2021 RMD160 bae6c2141111afa6c615ad91e0e0eef5b8a61e77 SHA1 8bee25106df1bd6afcffb8db677c6afec98f7bff SHA256 96b8b14276c93872fed571ebd7a09fa6ff7fdc25f8870006133275424ef9e0fd
-MISC ChangeLog 6249 RMD160 b7331cae330c831a3d2b72b175dc469a9a87d547 SHA1 64da7a956bb197f877eeeae4b8e3ad23d3e10205 SHA256 154fc5151f7090ba39c905bae1faa015e7e46356b2bed2342617ac3f15fc98a4
+MISC ChangeLog 6584 RMD160 29adee2a1b3a3f583ed7e47f651cdad007de4a86 SHA1 05dff78db4c5d26e11497d9090aca52974716026 SHA256 56a09695310a6cd21887494644124a86758a4497b95d8af55ba65c2ed486d5ff
 MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0
diff --git a/net-analyzer/sarg/sarg-2.2.5-r2.ebuild b/net-analyzer/sarg/sarg-2.2.5-r2.ebuild
new file mode 100644
index 000000000000..15516ab96707
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.2.5-r2.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-r2.ebuild,v 1.1 2009/04/05 20:39:17 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-2.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
+}