Moved to portage tree.

svn path=/; revision=123

11 files changed, 0 insertions, 1296 deletions

diff --git a/net-analyzer/sarg/ChangeLog b/net-analyzer/sarg/ChangeLog
deleted file mode 100644
index db35063..0000000
--- a/net-analyzer/sarg/ChangeLog
+++ /dev/null
@@ -1,129 +0,0 @@
-# ChangeLog for net-analyzer/sarg
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/sarg/ChangeLog,v 1.34 2007/02/20 00:28:25 jokey Exp $
-
-  20 Feb 2007; Markus Ullmann <jokey@gentoo.org> ChangeLog:
-  Redigest for Manifest2
-
-  03 Nov 2006; <blubb@gentoo.org> sarg-2.2.2.ebuild:
-  stable on amd64
-
-  21 Oct 2006; Tobias Scherbaum <dertobi123@gentoo.org> sarg-2.2.2.ebuild:
-  ppc stable
-
-  17 Oct 2006; Joshua Jackson <tsunam@gentoo.org> sarg-2.2.2.ebuild:
-  Stable x86; bug #135492
-
-*sarg-2.2.2 (29 Aug 2006)
-
-  29 Aug 2006; Peter Volkov <pva@gentoo.org> +sarg-2.2.2.ebuild:
-  Version bump. See ChangeLog at http://sarg.sourceforge.net/sarg.ChangeLog.txt
-
-  30 Jul 2006; Tobias Scherbaum <dertobi123@gentoo.org> sarg-2.2.1.ebuild:
-  ppc stable
-
-  25 Jul 2006; Peter Volkov <pva@gentoo.org>
-  -files/sarg-1.4.1-2.6.fix.patch, -sarg-1.4.1-r2.ebuild,
-  -sarg-2.0.8.ebuild, -sarg-2.1.ebuild:
-  Cleaning out old versions.
-
-  25 Jul 2006; Joshua Jackson <tsunam@gentoo.org> sarg-2.2.1.ebuild:
-  Stable x86; bug #135492
-
-*sarg-2.2.1 (05 Jun 2006)
-
-  05 Jun 2006; Peter Volkov <pva@gentoo.org> +sarg-2.2.1.ebuild:
-  Version bump.
-
-  05 Jun 2006; Simon Stelling <blubb@gentoo.org> sarg-2.1-r1.ebuild:
-  stable on amd64
-
-  04 Jun 2006; <nixnut@gentoo.org> sarg-2.1-r1.ebuild:
-  Stable on ppc; bug #135492
-
-*sarg-2.1-r1 (14 Apr 2006)
-
-  14 Apr 2006; Volkov Peter <pva@gentoo.org>
-  +files/sarg-2.1-sort-options.patch, +sarg-2.1-r1.ebuild:
-  Obsolete origin-zero syntax in sort changed with POSIX compatible one.
-  Bug 129719. Thank Jeremy Heslop for fix and report.
-
-*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:
-  Changed DESCRIPTION field to better reflect tools purpose.
-
-  25 Dec 2005; Peter Volkov <pva@gentoo.org> sarg-2.0.8.ebuild:
-  Fix for bug #99951.
-
-  06 Nov 2005; <soulse@gentoo.org> metadata.xml:
-  Added to netmon herd.
-
-  06 Nov 2005; <soulse@gentoo.org> sarg-2.0.8.ebuild:
-  Stable on x86 wrt bug#111157.
-
-  08 Aug 2005; Simon Stelling <blubb@gentoo.org> sarg-2.0.8.ebuild:
-  stable on amd64
-
-  23 Jun 2005; David Holm <dholm@gentoo.org> sarg-2.0.8.ebuild:
-  Added to ~ppc.
-
-  22 Jun 2005; Jonathan Smith <smithj@gentoo.org> sarg-2.0.8.ebuild:
-  fixed whitespace in 2.0.8 ebuild
-
-*sarg-2.0.8 (22 Jun 2005)
-
-  22 Jun 2005; Jonathan Smith <smithj@gentoo.org> +sarg-2.0.8.ebuild:
-  version bump for #71656, which also fixes #43132, #64743, and probably
-  #77285; thanks to Volkov Peter <torre_cremata@mail.ru> (a dev-in-training
-  :-) for the ebuild; fixed homepage and description while i was at it
-
-  02 May 2005; Eldad Zack <eldad@gentoo.org> sarg-1.4.1-r2.ebuild:
-  Homepage, SRC_URI updates. Closes #57527. Thanks to Daniel Webert
-  <rockoo@gmail.com>.
-
-  18 Dec 2004; Jared Hudson <jhhudso@gentoo.org> sarg-1.4.1-r2.ebuild :
-  Added amd64 keyword.
-	
-  16 Aug 2004; Andrew Bevitt <cyfred@gentoo.org>; sarg-1.2.2.ebuild,
-  sarg-1.4.1-r2.ebuild, sarg-1.4.1.ebuild:
-  Changing net-www/squid to www-proxy/squid in depends
-
-  10 Jul 2004; Eldad Zack <eldad@gentoo.org> sarg-1.2.2.ebuild,
-  -sarg-1.4.1-r1.ebuild, sarg-1.4.1-r2.ebuild, sarg-1.4.1.ebuild:
-  Tidy, x86 stable
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> sarg-1.4.1-r1.ebuild,
-  sarg-1.4.1-r2.ebuild:
-  Add inherit eutils
-
-*sarg-1.4.1-r2 (24 Feb 2004)
-
-  24 Feb 2004; Jared Hudson <jhhudso@gentoo.org> : Added patch to fix segfault
-  under 2.6.x kernels. Credit goes to Ghislain Bourgeois
-  <ghislain48@hotmail.com> under bug #41834 for this fix.
-	
-*sarg-1.4.1-r1 (04 Jan 2004)
-
-  04 Jan 2004; Jared Hudson <jhhudso@gentoo.org> : Added patch as requested
-  by Markus Lidel <Markus.Lidel@shadowconnect.com> under bug #36410.
-	
-  12 Jun 2003; <msterret@gentoo.org> sarg-1.4.1.ebuild:
-  add Header
-
-*sarg-1.4.1 (24 May 2003)
-
-  24 May 2003; Jared Hudson <jhhudso@gentoo.org> : Updated to latest version
-  and added man page to ebuild. Credit goes to Marcel Meyer <meyerm@fs.tum.de>
-  In response to bug #21161
-	
-*sarg-1.2.2 (14 Nov 2002)
-
-  14 Nov 2002; Jared Hudson <jhhudso@gentoo.org> : Initial Import. Ebuild
-  submitted by Henti Smith <bain@reaper.org>. Bug #6923
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
deleted file mode 100644
index 698339b..0000000
--- a/net-analyzer/sarg/Manifest
+++ /dev/null
@@ -1,40 +0,0 @@
-AUX sarg-2.1-datafile.patch 1300 RMD160 a158013cbb19620f1942201cec0d7896d5a6ebfc SHA1 15e5c4f6d7dd7bb0d978a67fd8163eda5cadc7d5 SHA256 328bdd49a7bc6e0649af6c91620a7f6ddf7cd95f56425a2228e6c1f97fd4e9ed
-MD5 be7c27dc81fd42e595adbcdcb14130e1 files/sarg-2.1-datafile.patch 1300
-RMD160 a158013cbb19620f1942201cec0d7896d5a6ebfc files/sarg-2.1-datafile.patch 1300
-SHA256 328bdd49a7bc6e0649af6c91620a7f6ddf7cd95f56425a2228e6c1f97fd4e9ed files/sarg-2.1-datafile.patch 1300
-AUX sarg-2.1-laslog.patch 406 RMD160 e72fec0af3ce48df9a3aa43656d8be5cf3c1044b SHA1 c4af4ff498baa5d2a124b52ca84b984169c9eea8 SHA256 9fc56675e99a3d427c22cab90e1e79e3b11382578b1f4c5047c10dcdd910b224
-MD5 d2c22dddfa0d8214692f382a69eb82f3 files/sarg-2.1-laslog.patch 406
-RMD160 e72fec0af3ce48df9a3aa43656d8be5cf3c1044b files/sarg-2.1-laslog.patch 406
-SHA256 9fc56675e99a3d427c22cab90e1e79e3b11382578b1f4c5047c10dcdd910b224 files/sarg-2.1-laslog.patch 406
-AUX sarg-2.1-sort-options.patch 757 RMD160 37d4b96a5af7132ff16548cc85837792b048c1c9 SHA1 a5ff1551fdd8053172ec3e143f634ebd1d6a6b40 SHA256 f71d573c2031308f34cc6f4cf3967949b214a9199a95965f523786ce4b7fbb61
-MD5 01346d8162696cee5cf24b0b34b3ad73 files/sarg-2.1-sort-options.patch 757
-RMD160 37d4b96a5af7132ff16548cc85837792b048c1c9 files/sarg-2.1-sort-options.patch 757
-SHA256 f71d573c2031308f34cc6f4cf3967949b214a9199a95965f523786ce4b7fbb61 files/sarg-2.1-sort-options.patch 757
-AUX sarg-2.2.3.1-automatic-vars-segfault.patch 1162 RMD160 e4b20aaf965fe01d97bd4000824904be2358eba1 SHA1 ff61be8eda8af2b6ffb8ef55e0b3e16072c33c84 SHA256 fa54fba843e03ad0f6b0cba4a564f5cd53963ca7f00682be41137146efb7578a
-MD5 d1101f8ae17c3fb84c76f5ae9aadeb20 files/sarg-2.2.3.1-automatic-vars-segfault.patch 1162
-RMD160 e4b20aaf965fe01d97bd4000824904be2358eba1 files/sarg-2.2.3.1-automatic-vars-segfault.patch 1162
-SHA256 fa54fba843e03ad0f6b0cba4a564f5cd53963ca7f00682be41137146efb7578a files/sarg-2.2.3.1-automatic-vars-segfault.patch 1162
-AUX sarg-2.2.3.1-lots-of-compiler-warnings.patch 31281 RMD160 85961328ffac302709a4d85daf362ffa858c2d69 SHA1 06de8c206a681681d72c532ce893ac9ebab70104 SHA256 967cafe71ddaf92dc7485bd6ebea656fc40b27d5e341358d6ee36aaea04b6214
-MD5 e7ff87efc3cc51910c3ce01faf22d9de files/sarg-2.2.3.1-lots-of-compiler-warnings.patch 31281
-RMD160 85961328ffac302709a4d85daf362ffa858c2d69 files/sarg-2.2.3.1-lots-of-compiler-warnings.patch 31281
-SHA256 967cafe71ddaf92dc7485bd6ebea656fc40b27d5e341358d6ee36aaea04b6214 files/sarg-2.2.3.1-lots-of-compiler-warnings.patch 31281
-AUX sarg-2.2.3.1-rewind.patch 450 RMD160 02eb366d4dfef00bdeb1683de09f48d79c6206bc SHA1 4ab1874a13ad580a1074387ea78593672381c855 SHA256 5652fa70ac5f074f43fbabd4f4cbd1875a39924da6550f4a821b826e0efa0cc6
-MD5 4df3cd43d0ca84de02de1e8f876bee0d files/sarg-2.2.3.1-rewind.patch 450
-RMD160 02eb366d4dfef00bdeb1683de09f48d79c6206bc files/sarg-2.2.3.1-rewind.patch 450
-SHA256 5652fa70ac5f074f43fbabd4f4cbd1875a39924da6550f4a821b826e0efa0cc6 files/sarg-2.2.3.1-rewind.patch 450
-DIST sarg-2.2.3.1.tar.gz 641277 RMD160 3a2ce81e3cf6e8559f3efb53c0e5b0b9526f08b6 SHA1 6433ef901641245e1283bbb9ae7f7be7959841eb SHA256 fc6d7e92c156b488941820a2d44eac6231d4237435e9fffd9f3ebda51296842e
-EBUILD sarg-2.2.3.1.ebuild 2095 RMD160 cd994f74ad486a8c8671585be6e9fdf6ea2fa41b SHA1 0c8cb42f691773945c6b5fce11b8cb72913405c7 SHA256 7ca5967cdb321031ce8d73aaebf0cc2ea23d3986151f8c9a9bd1ef0742536705
-MD5 f404f619fa0f37d69554f634c9ed2ced sarg-2.2.3.1.ebuild 2095
-RMD160 cd994f74ad486a8c8671585be6e9fdf6ea2fa41b sarg-2.2.3.1.ebuild 2095
-SHA256 7ca5967cdb321031ce8d73aaebf0cc2ea23d3986151f8c9a9bd1ef0742536705 sarg-2.2.3.1.ebuild 2095
-MISC ChangeLog 4428 RMD160 7e87f0a0c5b20aec5f49b682fee1e80456224f73 SHA1 8b44cabfeeea3b55333850bf6b2f2c66fb387910 SHA256 0228c59e062deb7e78277be9ba16e4e2a3ebe72c8afd4c858516f2a2164d6b83
-MD5 0d67489fdf1a83e38d2e19bda6cfef51 ChangeLog 4428
-RMD160 7e87f0a0c5b20aec5f49b682fee1e80456224f73 ChangeLog 4428
-SHA256 0228c59e062deb7e78277be9ba16e4e2a3ebe72c8afd4c858516f2a2164d6b83 ChangeLog 4428
-MISC metadata.xml 499 RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f SHA1 cbbf1d8a5bf9bcbeffc62ea41e8145a04b863a55 SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0
-MD5 5d82bf1020f73776b224927b62cf6b43 metadata.xml 499
-RMD160 e1d8c2429d6e6bd52372c29d5921a33d3751be8f metadata.xml 499
-SHA256 73e57d3a1296fbef657981debed6854802edc051c1a4be60bfb37bdcbbb748a0 metadata.xml 499
-MD5 30ed6829e655cdb37be571a03f68ecd6 files/digest-sarg-2.2.3.1 238
-RMD160 890cb41c141eeb96efe98ad9edf10c730fe7fdbc files/digest-sarg-2.2.3.1 238
-SHA256 d8bfadedfceb70f7a5044b95d186707ef08c873e7b9be5685728c1b229891d36 files/digest-sarg-2.2.3.1 238
diff --git a/net-analyzer/sarg/files/digest-sarg-2.2.3.1 b/net-analyzer/sarg/files/digest-sarg-2.2.3.1
deleted file mode 100644
index 9761b6a..0000000
--- a/net-analyzer/sarg/files/digest-sarg-2.2.3.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6e2e2c386a89aaff31f048eb2a6c5b1a sarg-2.2.3.1.tar.gz 641277
-RMD160 3a2ce81e3cf6e8559f3efb53c0e5b0b9526f08b6 sarg-2.2.3.1.tar.gz 641277
-SHA256 fc6d7e92c156b488941820a2d44eac6231d4237435e9fffd9f3ebda51296842e sarg-2.2.3.1.tar.gz 641277
diff --git a/net-analyzer/sarg/files/sarg-2.1-datafile.patch b/net-analyzer/sarg/files/sarg-2.1-datafile.patch
deleted file mode 100644
index d309703..0000000
--- a/net-analyzer/sarg/files/sarg-2.1-datafile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- 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
deleted file mode 100644
index 42d6766..0000000
--- a/net-analyzer/sarg/files/sarg-2.1-laslog.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/files/sarg-2.1-sort-options.patch b/net-analyzer/sarg/files/sarg-2.1-sort-options.patch
deleted file mode 100644
index 78a2d68..0000000
--- a/net-analyzer/sarg/files/sarg-2.1-sort-options.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur sarg-2.1/index.c sarg-2.1-patched/index.c
---- sarg-2.1/index.c	2005-11-29 11:39:45.000000000 -0500
-+++ sarg-2.1-patched/index.c	2006-04-12 13:49:25.000000000 -0400
-@@ -369,9 +369,9 @@
-       unlink(wdir_tmp2);
-    } else {
-       if(strcmp(IndexSortOrder,"A") == 0)
--         sprintf(warea,"sort -t';' +6.5n +6.2M +6.0n '%s' -o '%s'", wdir_tmp, wdir_tmp2);
-+         sprintf(warea,"sort -t';' -k 7,5n -k 7,2M -k 7n '%s' -o '%s'", wdir_tmp, wdir_tmp2);
-       else
--         sprintf(warea,"sort -t';' +6.5nr +6.2Mr +6.0nr '%s' -o '%s'", wdir_tmp, wdir_tmp2);
-+         sprintf(warea,"sort -t';' -k 7,5nr -k 7,2Mr -k 7nr '%s' -o '%s'", wdir_tmp, wdir_tmp2);
-       system(warea);
-       unlink(wdir_tmp);
-       if((fp_ou=fopen(wdir,"w"))==NULL) {
diff --git a/net-analyzer/sarg/files/sarg-2.2.3.1-automatic-vars-segfault.patch b/net-analyzer/sarg/files/sarg-2.2.3.1-automatic-vars-segfault.patch
deleted file mode 100644
index 03200b6..0000000
--- a/net-analyzer/sarg/files/sarg-2.2.3.1-automatic-vars-segfault.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-http://sourceforge.net/tracker/index.php?func=detail&aid=1746289&group_id=68910&atid=522793
-
-ret[] should not be automatic so this should fix crash with the following bt:
-(gdb) backtrace
-#0 0x00002aaaaac32600 in strlen () from /lib64/tls/libc.so.6
-#1 0x00002aaaaac04a90 in vfprintf () from /lib64/tls/libc.so.6
-#2 0x00002aaaaac1fcd9 in vsprintf () from /lib64/tls/libc.so.6
-#3 0x00002aaaaac0aec8 in sprintf () from /lib64/tls/libc.so.6
-#4 0x000000000040dbd4 in topuser () at topuser.c:400
-#5 0x000000000040b90e in gerarel () at report.c:334
-#6 0x0000000000408b2e in main (argc=<value optimized out>, 
-argv=0x7fffffd20868) at log.c:1402
-
---- util.c.orig	2007-08-10 14:10:05.000000000 +0400
-+++ util.c	2007-08-10 14:10:27.000000000 +0400
-@@ -414,7 +414,7 @@
-    char num[MAXIMO];
-    char buf[MAXIMO * 2];
-    char *pbuf;
--   char ret[MAXIMO * 2];
-+   static char ret[MAXIMO * 2];
-    char *pret;
-    register int i, j, k;
-    static char abbrev[30];
-@@ -507,7 +507,7 @@
-    char num[MAXIMO];
-    char buf[MAXIMO * 2];
-    char *pbuf;
--   char ret[MAXIMO * 2];
-+   static char ret[MAXIMO * 2];
-    char *pret;
-    register int i, j, k;
-    static char abbrev[30];
diff --git a/net-analyzer/sarg/files/sarg-2.2.3.1-lots-of-compiler-warnings.patch b/net-analyzer/sarg/files/sarg-2.2.3.1-lots-of-compiler-warnings.patch
deleted file mode 100644
index 92813e9..0000000
--- a/net-analyzer/sarg/files/sarg-2.2.3.1-lots-of-compiler-warnings.patch
+++ /dev/null
@@ -1,933 +0,0 @@
-diff -Naur sarg-2.2.3.1.orig/auth.c sarg-2.2.3.1/auth.c
---- sarg-2.2.3.1.orig/auth.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/auth.c	2007-08-31 12:08:47.000000000 +0400
-@@ -24,6 +24,7 @@
-  */
- 
- #include "include/conf.h"
-+void getword(char *word, char *line, int stop);
- 
- void htaccess(char *name)
- {
-diff -Naur sarg-2.2.3.1.orig/authfail.c sarg-2.2.3.1/authfail.c
---- sarg-2.2.3.1.orig/authfail.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/authfail.c	2007-08-31 12:08:47.000000000 +0400
-@@ -24,6 +24,13 @@
-  */
- 
- #include "include/conf.h"
-+void css(FILE *fp_css);
-+void show_sarg(FILE *fp_ou, char *ind);
-+void getword(char *word, char *line, int stop);
-+void fixip(char *ip);
-+void ip2name(char *ip);
-+char *subs(char *str, char *from, char *to);
-+void show_info(FILE *fp_ou);
- 
- void authfail_report()
- {
-diff -Naur sarg-2.2.3.1.orig/convlog.c sarg-2.2.3.1/convlog.c
---- sarg-2.2.3.1.orig/convlog.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/convlog.c	2007-08-31 12:08:47.000000000 +0400
-@@ -24,6 +24,7 @@
-  */
- 
- #include "include/conf.h"
-+void getword(char *word, char *line, int stop);
- 
- void convlog(char *arq, char *df, int dfrom, int duntil)
- {
-diff -Naur sarg-2.2.3.1.orig/css.c sarg-2.2.3.1/css.c
---- sarg-2.2.3.1.orig/css.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/css.c	2007-08-31 12:08:47.000000000 +0400
-@@ -59,7 +59,7 @@
-    fprintf(fp_css,".data2 a:link,a:visited {font-family:%s;color:#0000FF;font-size:%s;background-color:%s;text-decoration:none;}\n", FontFace, FontSize, TxBgColor);
-    fprintf(fp_css,".data3 {font-family:%s;color:%s;font-size:%s;text-align:center;background-color:%s;border-right:1px solid #6A5ACD;border-bottom:1px solid #6A5ACD;}\n", FontFace, TxColor, FontSize, TxBgColor);
-    fprintf(fp_css,".data3 a:link,a:visited {font-family:%s;color:#0000FF;font-size:%s;text-align:center;background-color:%s;text-decoration:none;}\n", FontFace, FontSize, TxBgColor);
--   fprintf(fp_css,".text {font-family:%s;color:%s;font-size:%s;text-align:right;}\n", FontFace, TxColor, FontSize, TxBgColor);
-+   fprintf(fp_css,".text {font-family:%s;color:%s;font-size:%s;text-align:right;background-color:%s;}\n", FontFace, TxColor, FontSize, TxBgColor);
-    fprintf(fp_css,".link {font-family:%s;font-size:%s;color:#0000FF;}\n", FontFace, FontSize);
-    fprintf(fp_css,".link a:link,a:visited {font-family:%s;font-size:%s;color:#0000FF;text-decoration:none;}\n</style>\n", FontFace, FontSize);
- }
-diff -Naur sarg-2.2.3.1.orig/dansguardian_log.c sarg-2.2.3.1/dansguardian_log.c
---- sarg-2.2.3.1.orig/dansguardian_log.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/dansguardian_log.c	2007-08-31 12:08:47.000000000 +0400
-@@ -24,8 +24,11 @@
-  */
- 
- #include "include/conf.h"
-+void conv_month(char *month);
-+void debuga(char *msg);
-+void getword(char *word, char *line, int stop);
- 
--int dansguardian_log()
-+void dansguardian_log()
- {
- 
-    FILE *fp_in = NULL, *fp_ou = NULL, *fp_guard = NULL;
-@@ -38,7 +41,6 @@
-    char ip[30];
-    char wdata[127];
-    int  idata=0;
--   int  x, y;
- 
-    bzero(day, 3);
-    bzero(mon, 4);
-@@ -160,5 +162,4 @@
-    sprintf(tmp6,"sort -k 1,1 -k 2,2 -k 4,4 '%s' -o '%s'",guard_in, guard_ou);
-    system(tmp6);
-    unlink(guard_in);
--   return;
- }
-diff -Naur sarg-2.2.3.1.orig/dansguardian_report.c sarg-2.2.3.1/dansguardian_report.c
---- sarg-2.2.3.1.orig/dansguardian_report.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/dansguardian_report.c	2007-08-31 12:08:47.000000000 +0400
-@@ -24,6 +24,13 @@
-  */
- 
- #include "include/conf.h"
-+void css(FILE *fp_css);
-+void show_sarg(FILE *fp_ou, char *ind);
-+void getword(char *word, char *line, int stop);
-+void fixip(char *ip);
-+void ip2name(char *ip);
-+char *subs(char *str, char *from, char *to);
-+void show_info(FILE *fp_ou);
- 
- void dansguardian_report()
- {
-@@ -31,10 +38,8 @@
-    FILE *fp_in = NULL, *fp_ou = NULL;
-       
-    char url[MAXLEN];
--   char html[MAXLEN];
-    char html2[MAXLEN];
-    char dansguardian_in[MAXLEN];
--   char dansguardian_ou[MAXLEN];
-    char per[MAXLEN];
-    char report[MAXLEN];
-    char period[100];
-@@ -46,7 +51,6 @@
-    char date[15];
-    char date2[15];
-    char hour[15];
--   char ftime[128];
-    char *str;
-    int  z=0;
-    int  count=0;
-diff -Naur sarg-2.2.3.1.orig/datafile.c sarg-2.2.3.1/datafile.c
---- sarg-2.2.3.1.orig/datafile.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/datafile.c	2007-08-31 12:08:47.000000000 +0400
-@@ -27,6 +27,12 @@
- 
- 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);
- void grava_SmartFilter(char *dirname, char *user, char *ip, char *data, char *hora, char *url, char *smart);
-+void getword(char *word, char *line, int stop);
-+void ip2name(char *ip);
-+void gravatmp(char *oldaccuser, char *dirname, char *oldurl, long long int nacc, long long int nbytes, char *oldmsg, long long int nelap, int indexonly, long long int incache, long long int oucache);
-+void debuga(char *msg);
-+void my_lltoa(unsigned long long int n, char s[], int len);
-+void name2ip(char *name);
- 
- void data_file(char *tmp)
- {
-@@ -70,7 +76,6 @@
-          exit(1);
-       }
-       strcpy(wdname,direntp->d_name);
--      strip_prefix:
-       getword(wname2,wdname,'.');
-       strcat(user,wname2);
- 
-diff -Naur sarg-2.2.3.1.orig/decomp.c sarg-2.2.3.1/decomp.c
---- sarg-2.2.3.1.orig/decomp.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/decomp.c	2007-08-31 12:08:47.000000000 +0400
-@@ -24,6 +24,7 @@
-  */
- 
- #include "include/conf.h"
-+void debuga(char *msg);
- 
- void decomp(char *arq, char *zip, char *tmp)
- {
-diff -Naur sarg-2.2.3.1.orig/denied.c sarg-2.2.3.1/denied.c
---- sarg-2.2.3.1.orig/denied.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/denied.c	2007-08-31 12:08:47.000000000 +0400
-@@ -24,6 +24,13 @@
-  */
- 
- #include "include/conf.h"
-+void css(FILE *fp_css);
-+void show_sarg(FILE *fp_ou, char *ind);
-+void getword(char *word, char *line, int stop);
-+void fixip(char *ip);
-+void ip2name(char *ip);
-+char *subs(char *str, char *from, char *to);
-+void show_info(FILE *fp_ou);
- 
- void gen_denied_report()
- {
-diff -Naur sarg-2.2.3.1.orig/download.c sarg-2.2.3.1/download.c
---- sarg-2.2.3.1.orig/download.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/download.c	2007-08-31 12:08:47.000000000 +0400
-@@ -24,6 +24,13 @@
-  */
- 
- #include "include/conf.h"
-+void css(FILE *fp_css);
-+void show_sarg(FILE *fp_ou, char *ind);
-+void getword(char *word, char *line, int stop);
-+void fixip(char *ip);
-+void ip2name(char *ip);
-+char *subs(char *str, char *from, char *to);
-+void show_info(FILE *fp_ou);
- 
- void download_report()
- {
-diff -Naur sarg-2.2.3.1.orig/email.c sarg-2.2.3.1/email.c
---- sarg-2.2.3.1.orig/email.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/email.c	2007-08-31 12:08:47.000000000 +0400
-@@ -25,6 +25,11 @@
- 
- #include "include/conf.h"
- 
-+char *fixnum(long long int value, int n);
-+char *buildtime(long long int elap);
-+void strip_latin(char *line);
-+void fixip(char *ip);
-+
- int geramail(const char *dirname, int debug, const char *outdir, int userip, char *email, char *TempDir)
- {
- 
-diff -Naur sarg-2.2.3.1.orig/exclude.c sarg-2.2.3.1/exclude.c
---- sarg-2.2.3.1.orig/exclude.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/exclude.c	2007-08-31 12:08:47.000000000 +0400
-@@ -24,6 +24,7 @@
-  */
- 
- #include "include/conf.h"
-+void getword(char *word, char *line, int stop);
- 
- int vhexclude(char *excludefile, char *url)
- {
-@@ -34,12 +35,12 @@
-    int len = strlen(excludefile);
- 
-    if((str=(char *) malloc(len+1))==NULL) {
--         fprintf(stderr, "SARG: %s (%ld):\n",text[59], len);
-+         fprintf(stderr, "SARG: %s (%d):\n",text[59], len);
-          exit(1);
-    }
-    len = strlen(url);
-    if((wurl=(char *) malloc(len+1))==NULL) {
--         fprintf(stderr, "SARG: %s (%ld):\n",text[59], len);
-+         fprintf(stderr, "SARG: %s (%d):\n",text[59], len);
-          exit(1);
-    }
-    whost[0]='\0';
-diff -Naur sarg-2.2.3.1.orig/getconf.c sarg-2.2.3.1/getconf.c
---- sarg-2.2.3.1.orig/getconf.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/getconf.c	2007-08-31 12:08:47.000000000 +0400
-@@ -24,6 +24,11 @@
-  */
- 
- #include "include/conf.h"
-+void getword(char *word, char *line, int stop);
-+void fixnone(char *str);
-+void ccharset();
-+void debuga(char *msg);
-+void language_load(char *language);
- 
- extern numlist hours, weekdays;
- 
-diff -Naur sarg-2.2.3.1.orig/grepday.c sarg-2.2.3.1/grepday.c
---- sarg-2.2.3.1.orig/grepday.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/grepday.c	2007-08-31 12:08:47.000000000 +0400
-@@ -24,6 +24,11 @@
-  */
- 
- #include "include/conf.h"
-+char *fixnum(long long int value, int n);
-+char *subs(char *str, char *from, char *to);
-+void fixip(char *ip);
-+void ip2name(char *ip);
-+void getword(char *word, char *line, int stop);
- 
- int blue;
- int white;
-diff -Naur sarg-2.2.3.1.orig/html.c sarg-2.2.3.1/html.c
---- sarg-2.2.3.1.orig/html.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/html.c	2007-08-31 12:08:47.000000000 +0400
-@@ -24,30 +24,45 @@
-  */
- 
- #include "include/conf.h"
-+void getword(char *word, char *line, int stop);
-+void report_day(char *user, int *iprel, int *ipuser);
-+void greport_day(char *user, int *iprel, int *ipuser);
-+void fixip(char *ip);
-+void css(FILE *fp_css);
-+void show_sarg(FILE *fp_ou, char *ind);
-+void ip2name(char *ip);
-+char *subs(char *str, char *from, char *to);
-+void debuga(char *msg);
-+char *fixnum(long long int value, int n);
-+char *fixnum2(long long int value, int n);
-+void url_module(char *url, char *w2);
-+char *buildtime(long long int elap);
-+void my_lltoa(unsigned long long int n, char s[], int len);
-+void show_info(FILE *fp_ou);
-+void htaccess(char *name);
- 
- void htmlrel()
- {
-    DIR *dirp;
--   FILE *fp_in, *fp_ou, *fp_ip, *fp_ip2, *fp_usr, *fp_tt;
-+   FILE *fp_in, *fp_ou, *fp_ip, *fp_ip2, *fp_usr;
- 
-    struct dirent *direntp;
-    long long int nnbytes=0, unbytes=0, tnbytes=0, totbytes=0, totbytes2=0;
-    long long int totelap=0, totelap2=0, nnelap=0, unelap=0, tnelap=0;
-    long long int incache=0, oucache=0, tnincache=0, tnoucache=0, twork=0, twork2=0;
-    char arqin[MAXLEN], arqou[MAXLEN], arqper[MAXLEN], arqip[MAXLEN];
--   char nacc[20], nbytes[20], url[1024], purl[1024], tmsg[50], tmsg2[50], nelap[20], csort[MAXLEN];
-+   char nacc[20], nbytes[20], url[1024], tmsg[50], nelap[20], csort[MAXLEN];
-    char period[MAXLEN], usuario[MAXLEN], wusuario[MAXLEN], u2[MAXLEN], duser[MAXLEN];
-    char userbytes[20], userelap[20], userurl[1024], userhora[9], userdia[9];
-    char user_ip[MAXLEN], olduserip[MAXLEN], tmp2[MAXLEN], tmp3[MAXLEN], incac[20], oucac[20];
-    char denied_report[255], name2[MAXLEN];
--   char ttd1[3], ttd2[3], ttd3[5], ttt1[3], ttt2[3], ttt3[3];
-    char *str;
--   char ftime[128], warea[MAXLEN];
-+   char warea[MAXLEN];
-    char wtemp[MAXLEN], totuser[8];
-    long long int tnacc=0, ttnacc=0, unacc=0;
-    float perc=0, perc2=0, ouperc=0, inperc=0;
-    char *s;
--   int  x, count;
-+   int  count;
- 
-    if(strstr(ReportType,"users_sites") == 0) return;
- 
-diff -Naur sarg-2.2.3.1.orig/include/conf.h sarg-2.2.3.1/include/conf.h
---- sarg-2.2.3.1.orig/include/conf.h	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/include/conf.h	2007-08-31 12:09:05.000000000 +0400
-@@ -118,7 +118,7 @@
- char df[20];
- char day[3], month[4], year[5];
- char nmonth[30];
--char y1[5], y2[5];
-+char Y1[5], Y2[5];
- char d1[3], d2[3];
- char m1[4], m2[4];
- char ltext110[50];
-diff -Naur sarg-2.2.3.1.orig/index.c sarg-2.2.3.1/index.c
---- sarg-2.2.3.1.orig/index.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/index.c	2007-08-31 12:09:05.000000000 +0400
-@@ -24,6 +24,21 @@
-  */
- 
- #include "include/conf.h"
-+void mklastlog();
-+void debuga(char *msg);
-+void conv_month(char *month);
-+void getword(char *word, char *line, int stop);
-+void conv_month_name(char *month);
-+char* get_size(char *path, char *file);
-+void obtdate(char *dirname, char *name, char *data);
-+void obtuser(char *dirname, char *name, char *tuser);
-+void obttotal(char *dirname, char *name, char *tbytes, char *tuser, char *media);
-+void buildymd(char *dia, char *mes, char *ano, char *wdata);
-+void write_html_header(FILE *fp_ou, char * ind);
-+void name_month(char *month);
-+void write_html_trailer(FILE *fp_ou);
-+void zdate(char *ftime, char *DateFormat);
-+void show_info(FILE *fp_ou);
- 
- void make_index()
- {
-@@ -69,31 +84,31 @@
-       if(strcmp(IndexTree,"date") == 0) {
-          if(!isdigit(direntp->d_name[0]) && !isdigit(direntp->d_name[1])) continue;
-          if(strlen(direntp->d_name) > 4) {
--            bzero(y1,5);
--            bzero(y2,5);
-+            bzero(Y1,5);
-+            bzero(Y2,5);
-             bzero(m1,4);
-             bzero(m2,4);
-             bzero(d1,3);
-             bzero(d2,3);
-             if(strcmp(df,"u") == 0) {
--               strncpy(y1,direntp->d_name,4);
-+               strncpy(Y1,direntp->d_name,4);
-                strncpy(m1,direntp->d_name+4,3);
-                strncpy(d1,direntp->d_name+7,2);
--               strncpy(y2,direntp->d_name+10,4);
-+               strncpy(Y2,direntp->d_name+10,4);
-                strncpy(m2,direntp->d_name+14,3);
-                strncpy(d2,direntp->d_name+17,2);
-            } else if(strcmp(df,"e") == 0) {
--               strncpy(y1,direntp->d_name+5,4);
-+               strncpy(Y1,direntp->d_name+5,4);
-                strncpy(m1,direntp->d_name+2,3);
-                strncpy(d1,direntp->d_name,2);
--               strncpy(y2,direntp->d_name+15,4);
-+               strncpy(Y2,direntp->d_name+15,4);
-                strncpy(m2,direntp->d_name+12,3);
-                strncpy(d2,direntp->d_name+10,2);
-             }
-             conv_month(m1);
-             conv_month(m2);
-          }
--         sprintf(val1,"%s%s",outdir,y1);
-+         sprintf(val1,"%s%s",outdir,Y1);
-          if(access(val1, R_OK) != 0) mkdir(val1,0755);
-          if(strcmp(m1,m2) != 0) sprintf(val2,"%s/%s-%s",val1,m1,m2);
-          else sprintf(val2,"%s/%s",val1,m1);
-@@ -110,7 +125,7 @@
-       } else {
-          if(!isdigit(direntp->d_name[0]) && !isdigit(direntp->d_name[1])) continue;
-          if(strlen(direntp->d_name) == 4) {
--            strcpy(y1,direntp->d_name);
-+            strcpy(Y1,direntp->d_name);
-             sprintf(val1,"%s%s",outdir,direntp->d_name);
-             dirp2 = opendir(val1);
-             while ((direntp2 = readdir( dirp2 )) != NULL) {
-@@ -139,9 +154,9 @@
-                      strcpy(d1,warea);
-                      strcpy(d2,warea);
-                   }
--                  if(strcmp(df,"u") == 0) sprintf(val4,"%s%s%s%s-%s%s%s",outdir,y1,m1,d1,y1,m2,d2);
--                  else if(strcmp(df,"e") == 0) sprintf(val4,"%s%s%s%s-%s%s%s",outdir,d1,m1,y1,d2,m2,y1);
--                  sprintf(val5,"%s%s/%s/%s",outdir,y1,direntp2->d_name,direntp3->d_name);
-+                  if(strcmp(df,"u") == 0) sprintf(val4,"%s%s%s%s-%s%s%s",outdir,Y1,m1,d1,Y1,m2,d2);
-+                  else if(strcmp(df,"e") == 0) sprintf(val4,"%s%s%s%s-%s%s%s",outdir,d1,m1,Y1,d2,m2,Y1);
-+                  sprintf(val5,"%s%s/%s/%s",outdir,Y1,direntp2->d_name,direntp3->d_name);
-                   if(rename(val5,val4)) {
-                      fprintf(stderr, "SARG: (index) rename error - %s\n",strerror(errno));
-                      exit(1);
-diff -Naur sarg-2.2.3.1.orig/ip2name.c sarg-2.2.3.1/ip2name.c
---- sarg-2.2.3.1.orig/ip2name.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/ip2name.c	2007-08-31 12:09:05.000000000 +0400
-@@ -24,6 +24,7 @@
-  */
- 
- #include "include/conf.h"
-+void getword(char *word, char *line, int stop);
- 
- void ip2name(char *ip)
- { 
-diff -Naur sarg-2.2.3.1.orig/language.c sarg-2.2.3.1/language.c
---- sarg-2.2.3.1.orig/language.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/language.c	2007-08-31 12:09:45.000000000 +0400
-@@ -25,6 +25,8 @@
- 

- #include "include/conf.h"

- 

-+void getword(char *word, char *line, int stop);

-+

- void language_load(char *language)

- {

- 

-diff -Naur sarg-2.2.3.1.orig/lastlog.c sarg-2.2.3.1/lastlog.c
---- sarg-2.2.3.1.orig/lastlog.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/lastlog.c	2007-08-31 12:09:05.000000000 +0400
-@@ -24,6 +24,8 @@
-  */
- 
- #include "include/conf.h"
-+void getword(char *word, char *line, int stop);
-+void debuga(char *msg);
- 
- void mklastlog()
- {
-diff -Naur sarg-2.2.3.1.orig/log.c sarg-2.2.3.1/log.c
---- sarg-2.2.3.1.orig/log.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/log.c	2007-08-31 12:09:05.000000000 +0400
-@@ -49,6 +49,36 @@
- 
- #define _FILE_OFFSET_BITS 64
- 
-+void language_load(char *language);
-+void getword(char *word, char *line, int stop);
-+void date_from(char *date, char *dfrom, char *duntil);
-+void usage(char *prog);
-+void version();
-+void debuga(char *msg);
-+void getconf();
-+void realtime(void);
-+char *subs(char *str, char *from, char *to);
-+void convlog(char *arq, char *df, int dfrom, int duntil);
-+void splitlog(char *arq, char *df, int dfrom, int duntil, char *convert);
-+void load_excludecodes();
-+void my_mkdir(char *name);
-+void decomp(char *arq, char *zip, char *tmp);
-+void getword3(char *word, char *line, int stop);
-+void conv_month_name(char *month);
-+int vercode(char *code);
-+int testvaliduserchar(char *user);
-+char *strlow(char *string);
-+void builddia(char *dia, char *mes, char *ano, char *df, char *wdata);
-+int vhexclude(char *excludefile, char *url);
-+int vuexclude(char *excludeuser, char *user);
-+void fixip(char *ip);
-+void fixper(char *tbuf, char *period, char *duntil);
-+void debugaz(char *head, char *msg);
-+void sort_users_log(char *tmp, int debug);
-+void data_file(char *tmp);
-+void gerarel();
-+void recomp(char *arq, char *zip);
-+
- int main(argc,argv)
-    int argc;
-    char *argv[];
-@@ -145,7 +175,7 @@
-    SquidGuardLogAlternate[0]='\0';
-    arq[0]='\0';
- 
--   strcpy(AccessLog,"/usr/local/squid/var/logs/access.log");
-+   strcpy(AccessLog,"/var/log/squid/access.log");
-    sprintf(ExcludeCodes,"%s/exclude_codes",SYSCONFDIR);
-    strcpy(GraphDaysBytesBarColor,"orange");
-    strcpy(BgColor,"#ffffff");
-@@ -160,7 +190,7 @@
-    strcpy(LogoTextColor,"#006699");
-    strcpy(FontSize,"9px");
-    strcpy(TempDir,"/tmp");
--   strcpy(OutputDir,"/var/www/html/squid-reports");
-+   strcpy(OutputDir,"/var/www/localhost/htdocs/squid-reports");
-    strcpy(Ip2Name,"no");
-    strcpy(DateFormat,"u");
-    strcpy(OverwriteReport,"no");
-@@ -645,7 +675,7 @@
-    if (strlen(Ulimit) > 0) {
- #if defined(RLIMIT_NOFILE)
-       getrlimit (RLIMIT_NOFILE, &rl);
--#else #if defined(RLIMIT_OFILE)
-+#elif defined(RLIMIT_OFILE)
-       getrlimit (RLIMIT_OFILE, &rl);
- #endif
-       l1 = rl.rlim_cur;
-@@ -656,7 +686,7 @@
-          rl.rlim_max = atol(Ulimit);
-  #if defined(RLIMIT_NOFILE)
-          if(setrlimit (RLIMIT_NOFILE, &rl) == -1) {
-- #else #if defined(RLIMIT_OFILE)
-+ #elif defined(RLIMIT_OFILE)
-          if(setrlimit (RLIMIT_OFILE, &rl) == -1) {
-  #endif
-             sprintf(msg,"setrlimit error - %s\n",strerror(errno));
-@@ -1216,7 +1246,7 @@
- 
-               if(download_flag && strstr(code,"DENIED") == 0) {
-                  ndownload = 1;
--                 sprintf(bufz, "%s %s %s %s %s %s\n",dia,hora,user,ip,download_url);
-+                 sprintf(bufz, "%s %s %s %s %s\n",dia,hora,user,ip,download_url);
- 
- #ifdef LEGACY_WRITE_DOWNLOAD
-                  sprintf(tmp3,"%s/sarg/download.unsort",tmp);
-@@ -1395,7 +1425,6 @@
-  
-    sort_users_log(tmp, debug);
- 
--   report_gen:
-    if(strlen(DataFile) > 0)
-       data_file(tmp);
-    else
-diff -Naur sarg-2.2.3.1.orig/realtime.c sarg-2.2.3.1/realtime.c
---- sarg-2.2.3.1.orig/realtime.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/realtime.c	2007-08-31 12:09:05.000000000 +0400
-@@ -29,6 +29,12 @@
- void datashow(char *);
- void getlog();
- void header();
-+void getword(char *word, char *line, int stop);
-+void debuga(char *msg);
-+void getword3(char *word, char *line, int stop);
-+void ip2name(char *ip);
-+char *subs(char *str, char *from, char *to);
-+void css(FILE *fp_css);
- 
- char dat[128];
- char tim[128];
-@@ -37,7 +43,7 @@
- char ourl[MAXLEN]="";
- 
- void
--realtime(int argc, char *argv[])
-+realtime(void)
- {
- 
-    getlog();
-diff -Naur sarg-2.2.3.1.orig/repday.c sarg-2.2.3.1/repday.c
---- sarg-2.2.3.1.orig/repday.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/repday.c	2007-08-31 12:09:05.000000000 +0400
-@@ -24,6 +24,14 @@
-  */
- 
- #include "include/conf.h"
-+void getword(char *word, char *line, int stop);
-+void css(FILE *fp_css);
-+void show_sarg(FILE *fp_ou, char *ind);
-+void fixip(char *ip);
-+void ip2name(char *ip);
-+char *subs(char *str, char *from, char *to);
-+char *fixtime(long int elap);
-+void show_info(FILE *fp_ou);
- 
- extern numlist hours;
- 
-diff -Naur sarg-2.2.3.1.orig/report.c sarg-2.2.3.1/report.c
---- sarg-2.2.3.1.orig/report.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/report.c	2007-08-31 12:09:05.000000000 +0400
-@@ -25,6 +25,37 @@
- 
- #include "include/conf.h"
- #include "include/defs.h"
-+void vrfydir(char *dir, char *per1, char *addr, char *site, char *us, char *form);
-+void debugaz(char *head, char *msg);
-+void gperiod();
-+void useragent();
-+void getword(char *word, char *line, int stop);
-+void ip2name(char *ip);
-+void my_mkdir(char *name);
-+void css(FILE *fp_css);
-+void show_sarg(FILE *fp_ou, char *ind);
-+char *subs(char *str, char *from, char *to);
-+void day_totalize(const char *tmp, char *user, int indexonly);
-+void tmpsort();
-+int totalger(const char *dirname, int debug, const char *outdir);
-+void download_report();
-+void dansguardian_log();
-+void squidguard_log();
-+void topuser();
-+void topsites();
-+void siteuser();
-+void gen_denied_report();
-+void authfail_report();
-+void smartfilter_report();
-+void dansguardian_report();
-+void squidguard_report();
-+void htmlrel();
-+void make_index();
-+int geramail(const char *dirname, int debug, const char *outdir, int userip, char *email, char *TempDir);
-+void index_only();
-+void removetmp(char *outdir);
-+void debuga(char *msg);
-+void my_lltoa(unsigned long long int n, char s[], int len);
- 
- void gerarel()
- {
-diff -Naur sarg-2.2.3.1.orig/siteuser.c sarg-2.2.3.1/siteuser.c
---- sarg-2.2.3.1.orig/siteuser.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/siteuser.c	2007-08-31 12:09:05.000000000 +0400
-@@ -24,6 +24,15 @@
-  */
- 
- #include "include/conf.h"
-+void css(FILE *fp_css);
-+void show_sarg(FILE *fp_ou, char *ind);
-+char *strlow(char *string);
-+void getword(char *word, char *line, int stop);
-+void fixip(char *ip);
-+char *subs(char *str, char *from, char *to);
-+void ip2name(char *ip);
-+char *fixnum(long long int value, int n);
-+void show_info(FILE *fp_ou);
- 
- void siteuser()
- {
-diff -Naur sarg-2.2.3.1.orig/smartfilter.c sarg-2.2.3.1/smartfilter.c
---- sarg-2.2.3.1.orig/smartfilter.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/smartfilter.c	2007-08-31 12:09:05.000000000 +0400
-@@ -24,6 +24,10 @@
-  */
- 
- #include "include/conf.h"
-+char *strup(char *string);
-+void getword(char *word, char *line, int stop);
-+void fixip(char *ip);
-+void zdate(char *ftime, char *DateFormat);
- 
- void smartfilter_report()
- {
-diff -Naur sarg-2.2.3.1.orig/sort.c sarg-2.2.3.1/sort.c
---- sarg-2.2.3.1.orig/sort.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/sort.c	2007-08-31 12:09:05.000000000 +0400
-@@ -24,6 +24,10 @@
-  */
- 
- #include "include/conf.h"
-+void getword(char *word, char *line, int stop);
-+void debuga(char *msg);
-+char *strup(char *string);
-+char *strlow(char *string);
- 
- void tmpsort()
- {
-diff -Naur sarg-2.2.3.1.orig/splitlog.c sarg-2.2.3.1/splitlog.c
---- sarg-2.2.3.1.orig/splitlog.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/splitlog.c	2007-08-31 12:09:05.000000000 +0400
-@@ -24,6 +24,7 @@
-  */
- 
- #include "include/conf.h"
-+void getword(char *word, char *line, int stop);
- 
- void splitlog(char *arq, char *df, int dfrom, int duntil, char *convert)
- {
-diff -Naur sarg-2.2.3.1.orig/squidguard_log.c sarg-2.2.3.1/squidguard_log.c
---- sarg-2.2.3.1.orig/squidguard_log.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/squidguard_log.c	2007-08-31 12:09:05.000000000 +0400
-@@ -24,6 +24,9 @@
-  */
- 
- #include "include/conf.h"
-+void getword(char *word, char *line, int stop);
-+void debuga(char *msg);
-+void conv_month(char *month);
- 
- static char **files_done = NULL;
- static int nfiles_done = 0;
-@@ -159,7 +162,7 @@
- }
- 
- 
--int squidguard_log()
-+void squidguard_log()
- {
- 
-    FILE *fp_ou = NULL, *fp_guard = NULL;
-@@ -168,7 +171,6 @@
-    char logdir[MAXLEN];
-    char year[10], day[10], mon[10];
-    char user[MAXLEN];
--   char ip[30];
-    int  x, y;
- 
-    str2 = user;
-diff -Naur sarg-2.2.3.1.orig/squidguard_report.c sarg-2.2.3.1/squidguard_report.c
---- sarg-2.2.3.1.orig/squidguard_report.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/squidguard_report.c	2007-08-31 12:09:05.000000000 +0400
-@@ -24,6 +24,13 @@
-  */
- 
- #include "include/conf.h"
-+void css(FILE *fp_css);
-+void show_sarg(FILE *fp_ou, char *ind);
-+void getword(char *word, char *line, int stop);
-+void fixip(char *ip);
-+void ip2name(char *ip);
-+char *subs(char *str, char *from, char *to);
-+void show_info(FILE *fp_ou);
- 
- void squidguard_report()
- {
-@@ -31,10 +38,8 @@
-    FILE *fp_in = NULL, *fp_ou = NULL;
-       
-    char url[MAXLEN];
--   char html[MAXLEN];
-    char html2[MAXLEN];
-    char squidguard_in[MAXLEN];
--   char squidguard_ou[MAXLEN];
-    char per[MAXLEN];
-    char report[MAXLEN];
-    char period[100];
-@@ -46,7 +51,6 @@
-    char data[15];
-    char data2[15];
-    char hora[15];
--   char ftime[128];
-    char *str;
-    int  z=0;
-    int  count=0;
-diff -Naur sarg-2.2.3.1.orig/topsites.c sarg-2.2.3.1/topsites.c
---- sarg-2.2.3.1.orig/topsites.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/topsites.c	2007-08-31 12:09:05.000000000 +0400
-@@ -24,6 +24,14 @@
-  */
- 
- #include "include/conf.h"
-+void getword(char *word, char *line, int stop);
-+void my_lltoa(unsigned long long int n, char s[], int len);
-+char *strlow(char *string);
-+void css(FILE *fp_css);
-+void show_sarg(FILE *fp_ou, char *ind);
-+char *fixnum(long long int value, int n);
-+char *fixtime(long int elap);
-+void show_info(FILE *fp_ou);
- 
- void topsites()
- {
-@@ -216,7 +224,7 @@
- 
-       sprintf(wwork1,"%s",fixnum(twork1,1));
-       sprintf(wwork2,"%s",fixnum(twork2,1));
--      sprintf(wwork3,"%s",fixtime(twork3,1));
-+      sprintf(wwork3,"%s",fixtime(twork3));
- 
-       if(strlen(BlockIt) > 0)
-          sprintf(BlockImage,"<a href=\"%s%s?url=%s\"><img src=\"../images/sarg-squidguard-block.png\" border=\"0\"></a>&nbsp;",wwwDocumentRoot,BlockIt,url);
-diff -Naur sarg-2.2.3.1.orig/topuser.c sarg-2.2.3.1/topuser.c
---- sarg-2.2.3.1.orig/topuser.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/topuser.c	2007-08-31 12:09:05.000000000 +0400
-@@ -24,8 +24,20 @@
-  */
- 
- #include "include/conf.h"
-+void my_lltoa(unsigned long long int n, char s[], int len);
-+char *strup(char *string);
-+char *strlow(char *string);
-+void css(FILE *fp_css);
-+void show_sarg(FILE *fp_ou, char *ind);
-+void fixip(char *ip);
-+void ip2name(char *ip);
-+char *fixnum(long long int value, int n);
-+char *fixnum2(long long int value, int n);
-+char *buildtime(long long int elap);
-+char *subs(char *str, char *from, char *to);
-+void show_info(FILE *fp_ou);
- 
--int topuser()
-+void topuser()
- {
- 
-    FILE *fp_in = NULL, *fp_ou = NULL, *fp_top1 = NULL, *fp_top2 = NULL, *fp_top3 = NULL;
-diff -Naur sarg-2.2.3.1.orig/totday.c sarg-2.2.3.1/totday.c
---- sarg-2.2.3.1.orig/totday.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/totday.c	2007-08-31 12:09:05.000000000 +0400
-@@ -24,6 +24,8 @@
-  */
- 
- #include "include/conf.h"
-+void getword(char *word, char *line, int stop);
-+void my_lltoa(unsigned long long int n, char s[], int len);
- 
- void day_totalize(const char *tmp, char *user, int indexonly)
- {
-diff -Naur sarg-2.2.3.1.orig/totger.c sarg-2.2.3.1/totger.c
---- sarg-2.2.3.1.orig/totger.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/totger.c	2007-08-31 12:09:05.000000000 +0400
-@@ -24,6 +24,7 @@
-  */
- 
- #include "include/conf.h"
-+void my_lltoa(unsigned long long int n, char s[], int len);
- 
- int totalger(const char *dirname, int debug, const char *outdir)
- 
-diff -Naur sarg-2.2.3.1.orig/useragent.c sarg-2.2.3.1/useragent.c
---- sarg-2.2.3.1.orig/useragent.c	2007-01-02 22:11:26.000000000 +0300
-+++ sarg-2.2.3.1/useragent.c	2007-08-31 12:09:05.000000000 +0400
-@@ -24,6 +24,11 @@
-  */
- 
- #include "include/conf.h"
-+void debuga(char *msg);
-+void getword(char *word, char *line, int stop);
-+void show_sarg(FILE *fp_ou, char *ind);
-+void ip2name(char *ip);
-+void zdate(char *ftime, char *DateFormat);
- 
- void useragent()
- {
-diff -Naur sarg-2.2.3.1.orig/util.c sarg-2.2.3.1/util.c
---- sarg-2.2.3.1.orig/util.c	2007-08-31 12:03:38.000000000 +0400
-+++ sarg-2.2.3.1/util.c	2007-08-31 12:09:05.000000000 +0400
-@@ -31,6 +31,8 @@
- static char mtab1[12][4]={"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"};
- static char mtab2[12][3]={"01","02","03","04","05","06","07","08","09","10","11","12"};
- 
-+void css(FILE *fp_css);
-+
- /*void fgetword(char *word, char *line, int stop)
- {
-     //VARIANT N1
-@@ -57,7 +59,7 @@
- {
-   int x = 0, y = 0;
-   int limit=10000;
--  char wline[MAXLEN];
-+  //char wline[MAXLEN];
- 
-   //strcpy(wline,line);
- 
-@@ -510,7 +512,6 @@
-    static char ret[MAXIMO * 2];
-    char *pret;
-    register int i, j, k;
--   static char abbrev[30];
-       
-    my_lltoa(value, num, 0);
-    bzero(buf, MAXIMO*2);
-@@ -719,15 +720,15 @@
-    struct dirent *direntp;
- 
-    if(strcmp(IndexTree,"date") == 0) {
--      bzero(y1,5);
--      bzero(y2,5);
-+      bzero(Y1,5);
-+      bzero(Y2,5);
-       bzero(d1,3);
-       bzero(d2,3);
-       bzero(m1,4);
-       bzero(m2,4);
-       if(strncmp(df,"u",1) == 0) {
--         strncpy(y1,period,4);
--         strncpy(y2,period+10,4);
-+         strncpy(Y1,period,4);
-+         strncpy(Y2,period+10,4);
-          strncpy(m1,period+4,3);
-          strncpy(m2,period+14,3);
-          strncpy(d1,period+7,2);
-@@ -737,16 +738,16 @@
-          strncpy(d2,period+10,2);
-          strncpy(m1,period+2,3);
-          strncpy(m2,period+12,3);
--         strncpy(y1,period+5,4);
--         strncpy(y2,period+15,4);
-+         strncpy(Y1,period+5,4);
-+         strncpy(Y2,period+15,4);
-       }
-       conv_month(m1);
-       conv_month(m2);
- 
--      sprintf(wdir,"%s%s",outdir,y1);
--      if(strcmp(y1,y2) != 0) {
-+      sprintf(wdir,"%s%s",outdir,Y1);
-+      if(strcmp(Y1,Y2) != 0) {
-          strncat(wdir,"-",1);
--         strncat(wdir,y2,strlen(y2));
-+         strncat(wdir,Y2,strlen(Y2));
-       }
-       if(access(wdir, R_OK) != 0)
-          my_mkdir(wdir);
-@@ -1234,7 +1235,7 @@
-    if(strcmp(ShowSargLogo,"yes") == 0) fprintf(fp_ou,"<center><table cellpadding=0 cellspacing=0>\n<tr><th class=\"logo\"><a href=\"http://sarg.sourceforge.net\"><img src=\"%s/images/sarg.png\" border=\"0\" align=\"absmiddle\" title=\"SARG, Squid Analysis Report Generator. Logo by Osamu Matsuzaki\"></a>&nbsp;<font class=\"logo\">Squid Analysis Report Generator</font></th></tr>\n<tr><th class=\"title\">&nbsp</th></tr>\n<table>\n",ind);
- }
- 
--get_size(char *path, char *file)
-+char* get_size(char *path, char *file)
- {
-    FILE *fp;
-    char response[255];
-@@ -1260,7 +1261,7 @@
- }
- 
- 
--char url_module(char *url, char *w2)
-+void url_module(char *url, char *w2)
- {
-    int x, y;
-    char w[255];
-@@ -1279,8 +1280,6 @@
-       w2[y]=w[x];
-       y++;
-    }
--
--   return;
- }
- 
- 
diff --git a/net-analyzer/sarg/files/sarg-2.2.3.1-rewind.patch b/net-analyzer/sarg/files/sarg-2.2.3.1-rewind.patch
deleted file mode 100644
index 14e5f3e..0000000
--- a/net-analyzer/sarg/files/sarg-2.2.3.1-rewind.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur sarg-2.2.2/log.c sarg-2.2.2-new/log.c
---- sarg-2.2.2/log.c	2006-08-29 15:09:32.000000000 +0400
-+++ sarg-2.2.2-new/log.c	2006-09-06 13:37:50.000000000 +0400
-@@ -733,7 +733,7 @@
-       getword(val3,arqtt,'_');
-       sprintf(period,"%s-%s",val2,val3);
-       sarglog=1;
--   } else lseek(fileno(fp_in), 0, 0);
-+   } else rewind(fp_in);
- 
-    if(strcmp(ParsedOutputLog, "no") != 0 && !sarglog) {
-       if(access(ParsedOutputLog,R_OK) != 0) {
diff --git a/net-analyzer/sarg/metadata.xml b/net-analyzer/sarg/metadata.xml
deleted file mode 100644
index cc91243..0000000
--- a/net-analyzer/sarg/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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.2.3.1.ebuild b/net-analyzer/sarg/sarg-2.2.3.1.ebuild
deleted file mode 100644
index fce75d0..0000000
--- a/net-analyzer/sarg/sarg-2.2.3.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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.2.2.ebuild,v 1.4 2006/11/03 17:25:05 blubb 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}"
-
-	epatch "${FILESDIR}"/${P}-automatic-vars-segfault.patch
-	epatch "${FILESDIR}"/${P}-lots-of-compiler-warnings.patch
-	epatch "${FILESDIR}"/${P}-rewind.patch
-
-	# Fixes bug #43132
-	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":' \
-	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/access.log:' \
-	sarg.1 || die "Failed to fix man page."
-}
-
-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
-}