7 files changed, 140 insertions, 3 deletions
diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
index 2a4a1ee734ef..a0b87dfe492e 100644
--- a/net-analyzer/sarg/ChangeLog
+++ b/net-analyzer/sarg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-analyzer/sarg
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.21 2006/01/08 15:09:09 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.22 2006/01/08 15:22:15 pva Exp $
+
+*sarg-2.1 (08 Jan 2006)
+
+  08 Jan 2006; Peter Volkov <pva@gentoo.org> +files/sarg-2.1-datafile.patch,
+  +files/sarg-2.1-laslog.patch, metadata.xml, +sarg-2.1.ebuild:
+  Version bump. Also added maintainer and longdescription in metadata.xml. And
+  droped unnecessary dependencies.
 
   08 Jan 2006; Peter Volkov <pva@gentoo.org> sarg-1.4.1-r2.ebuild,
   sarg-2.0.8.ebuild:
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index d038281ca885..d9dd6b3e0cf0 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,7 +1,11 @@
-MD5 d04b6e8c24073deee6e8096dbe959fac ChangeLog 2729
+MD5 52bb322d29100722a204b9f9af1a164d ChangeLog 3010
 MD5 e8d7d19cc32a200d8d526edb51e65878 files/digest-sarg-1.4.1-r2 132
 MD5 51dfe863ba88a60c8c3ae74fb81729c1 files/digest-sarg-2.0.8 62
+MD5 1d9851934b796e28b98e3e4d41df8232 files/digest-sarg-2.1 60
 MD5 4ce75e6dba68e51c94d8fb4b47a5ed9f files/sarg-1.4.1-2.6.fix.patch 1556
-MD5 f34e3c8858756da0001b12d2d3fa1af2 metadata.xml 159
+MD5 be7c27dc81fd42e595adbcdcb14130e1 files/sarg-2.1-datafile.patch 1300
+MD5 d2c22dddfa0d8214692f382a69eb82f3 files/sarg-2.1-laslog.patch 406
+MD5 5d82bf1020f73776b224927b62cf6b43 metadata.xml 499
 MD5 473b928acfa5d227ebd7c224f12f29fe sarg-1.4.1-r2.ebuild 1026
 MD5 5dfa5dfb41a438253b2d5d3cc47da146 sarg-2.0.8.ebuild 2091
+MD5 3f3c26a640f7b781805bdad5bd2678e4 sarg-2.1.ebuild 2033
diff --git a/net-analyzer/sarg/files/digest-sarg-2.1 b/net-analyzer/sarg/files/digest-sarg-2.1
new file mode 100644
index 000000000000..12b8c86032e3
--- /dev/null
+++ b/net-analyzer/sarg/files/digest-sarg-2.1
@@ -0,0 +1 @@
+MD5 15b1c3fbff47ac6ea77573cae75b5e63 sarg-2.1.tar.gz 352935
diff --git a/net-analyzer/sarg/files/sarg-2.1-datafile.patch b/net-analyzer/sarg/files/sarg-2.1-datafile.patch
new file mode 100644
index 000000000000..d309703aead4
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.1-datafile.patch
@@ -0,0 +1,31 @@
+--- datafile.c	2005-12-07 07:22:36.000000000 -0200
++++ new/datafile.c	2005-12-07 07:32:00.000000000 -0200
+@@ -115,7 +115,7 @@
+             strcpy(wdirname,dirname);
+             gravatmp(oldaccuser,wdirname,oldurl,nacc,nbytes,oldmsg,nelap,indexonly,incache,oucache);
+             strcpy(wdirname,dirname);
+-            saverecs2(wdirname,oldaccuser,nacc,oldurl,nbytes,oldaccip,oldacchora,oldaccdia,nelap,incache,oucache);
++            saverecs(wdirname,oldaccuser,nacc,oldurl,nbytes,oldaccip,oldacchora,oldaccdia,nelap,incache,oucache);
+             nacc=0;
+             nbytes=0;
+             nelap=0;
+@@ -156,7 +156,7 @@
+    return;
+ }
+ 
+-void saverecs2(char *dirname, char *user, long long int nacc, char *url, long long int nbytes, char *ip, char *hora, char *dia, long long int nelap, long long int incache, long long int oucache)
++void saverecs(char *dirname, char *user, long long int nacc, char *url, long long int nbytes, char *ip, char *hora, char *dia, long long int nelap, long long int incache, long long int oucache)
+ {
+ 
+    FILE *fp_ou;
+--- realtime.c	2005-11-29 14:39:45.000000000 -0200
++++ new/realtime.c	2005-12-07 07:31:15.000000000 -0200
+@@ -27,6 +27,8 @@
+ 
+ void getdata(char *, FILE *);
+ void datashow(char *);
++void getlog();
++void header();
+ 
+ char dat[128];
+ char tim[128];
diff --git a/net-analyzer/sarg/files/sarg-2.1-laslog.patch b/net-analyzer/sarg/files/sarg-2.1-laslog.patch
new file mode 100644
index 000000000000..42d676651d66
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.1-laslog.patch
@@ -0,0 +1,15 @@
+--- lastlog.c   2005-12-08 10:33:36.000000000 -0200
++++ new/lastlog.c       2005-12-08 10:33:10.000000000 -0200
+@@ -59,11 +59,9 @@
+       local = localtime(&t);
+       strftime(ftime, 127, "%Y%m%d%H%M%S", local);
+       sprintf(buf,"%s %s\n",ftime,direntp->d_name);
+-printf("BUF=%s\n",buf);
+       fputs(buf,fp_ou);
+       ftot++;
+    }
+-exit(0);
+
+    (void)rewinddir( dirp );
+    (void)closedir( dirp );
+
diff --git a/net-analyzer/sarg/metadata.xml b/net-analyzer/sarg/metadata.xml
index 03aa50bab7e3..cc912433d83d 100644
--- a/net-analyzer/sarg/metadata.xml
+++ b/net-analyzer/sarg/metadata.xml
@@ -2,4 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>netmon</herd>
+ <maintainer>
+  <email>pva@gentoo.org</email>
+  <name>Peter Volkov</name>
+ </maintainer>
+ <longdescription>Sarg - Squid Analysis Report Generator is a tool that allow
+ you to view "where" your users are going to on the Internet. Sarg provides many
+ informations about Squid users activities: times, bytes, sites, etc...
+ </longdescription>
 </pkgmetadata>
diff --git a/net-analyzer/sarg/sarg-2.1.ebuild b/net-analyzer/sarg/sarg-2.1.ebuild
new file mode 100644
index 000000000000..0121602ff4e8
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/sarg-2.1.ebuild,v 1.1 2006/01/08 15:22:15 pva Exp $
+
+inherit eutils
+
+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"
+
+pkg_setup() {
+	built_with_use -a media-libs/gd png || die \
+	"Please recompile media-libs/gd with USE=\"png\""
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fixes bug #43132
+	sed -i \
+	-e 's:"/usr/local/squid/var/logs/access.log":"/var/log/squid/access.log":' \
+	-e 's:"/usr/local/etc/httpd/htdocs/squid-reports":"/var/www/localhost/htdocs/squid-reports":' \
+	log.c || die "setting default for gentoo directories... failed"
+
+	sed -i \
+	-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:' \
+	sarg.conf || die "setting default for gentoo directories... failed"
+
+	# Fixes bug #64743
+	sed -i -e 's:sarg_tmp:sarg:' email.c || die "fixing dir in email.c failed"
+
+	sed -i \
+	-e 's:/usr/local/sarg/sarg.conf:/etc/sarg/sarg.conf:' \
+	-e 's:/usr/local/squid/logs/access.log:/var/log/squid/logs/access.log:' \
+	sarg.1 || die "Failed to fix man page."
+
+	epatch ${FILESDIR}/sarg-2.1-datafile.patch
+	epatch ${FILESDIR}/sarg-2.1-laslog.patch
+}
+
+src_compile() {
+	econf \
+		--enable-bindir=/usr/bin \
+		--enable-mandir=/usr/share/man/man1 \
+		--enable-sysconfdir=/etc/sarg/ || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+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
+}