4 files changed, 12 insertions, 61 deletions
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 d309703aead4..000000000000
--- 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 42d676651d66..000000000000
--- 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 78a2d68330a2..000000000000
--- 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-rewind.patch b/net-analyzer/sarg/files/sarg-2.2.3.1-rewind.patch
new file mode 100644
index 000000000000..14e5f3e6bbe9
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.2.3.1-rewind.patch
@@ -0,0 +1,12 @@
+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) {