SOURCES: sarg-font.patch, sarg-config.patch - updated for 2.1

[darekr]

Author: darekr                       Date: Mon Jan  9 21:07:34 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 2.1

---- Files affected:
SOURCES:
   sarg-font.patch (1.2 -> 1.3) , sarg-config.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/sarg-font.patch
diff -u SOURCES/sarg-font.patch:1.2 SOURCES/sarg-font.patch:1.3
--- SOURCES/sarg-font.patch:1.2	Thu Feb 24 20:47:28 2005
+++ SOURCES/sarg-font.patch	Mon Jan  9 22:07:29 2006
@@ -1,11 +1,11 @@
---- sarg-2.0.4-orig/grepday.c	2005-02-24 13:35:33.000000000 +0100
-+++ sarg-2.0.4/grepday.c	2005-02-24 20:27:35.000000000 +0100
-@@ -33,7 +33,7 @@
+--- sarg-2.1.orig/grepday.c	2006-01-04 22:47:25.000000000 +0100
++++ sarg-2.1/grepday.c	2006-01-09 21:59:28.000000000 +0100
+@@ -36,7 +36,7 @@
  int silver;
  int black;
  int x1;
--char *font1 = SYSCONFDIR"/fonts/Verdana.TTF";
+-char *font1 = SYSCONFDIR"/fonts/FreeSans.ttf";
 +char *font1 = "/usr/share/fonts/TTF/luxisr.ttf";
  char s[15];
  
- void *bar(long long int *n)
+ #ifdef HAVE_ICONV_H

================================================================
Index: SOURCES/sarg-config.patch
diff -u SOURCES/sarg-config.patch:1.2 SOURCES/sarg-config.patch:1.3
--- SOURCES/sarg-config.patch:1.2	Thu Nov  4 10:36:05 2004
+++ SOURCES/sarg-config.patch	Mon Jan  9 22:07:29 2006
@@ -1,6 +1,5 @@
-diff -dur sarg-2.0.1.orig/sarg.1 sarg-2.0.1/sarg.1
---- sarg-2.0.1.orig/sarg.1	2004-10-03 23:37:03.000000000 +0200
-+++ sarg-2.0.1/sarg.1	2004-11-04 10:07:46.453506303 +0100
+--- sarg-2.1.orig/sarg.1	2006-01-04 22:47:25.000000000 +0100
++++ sarg-2.1/sarg.1	2006-01-04 23:00:14.000000000 +0100
 @@ -131,11 +131,11 @@
  .B \-split
  Split the log file by date in \fB-d\fP parameter.
@@ -16,20 +15,20 @@
  .SH SEE ALSO
  squid(8)
  .SH AUTHOR
-diff -dur sarg-2.0.1.orig/sarg.conf sarg-2.0.1/sarg.conf
---- sarg-2.0.1.orig/sarg.conf	2004-10-03 23:37:03.000000000 +0200
-+++ sarg-2.0.1/sarg.conf	2004-11-04 10:09:24.966485822 +0100
-@@ -29,7 +29,8 @@
+--- sarg-2.1.orig/sarg.conf	2006-01-04 22:47:25.000000000 +0100
++++ sarg-2.1/sarg.conf	2006-01-04 23:04:50.000000000 +0100
+@@ -32,8 +32,8 @@
  #       Where is the access.log file
  #       sarg -l file
  #
 -#access_log /usr/local/squid/var/logs/access.log
+-
 +# Default PLD configuration: make report from the recently rotated log
-+access_log /var/log/archiv/squid/access.log.1.gz
- 
++access_log /var/log/squid/access.log
  # TAG: graphs yes|no
  #	Use graphics where is possible.
-@@ -130,13 +131,13 @@
+ #           graph_days_bytes_bar_color blue|green|yellow|orange|brown|red
+@@ -133,13 +133,13 @@
  #       Temporary directory name for work files
  #       sarg -w dir
  #
@@ -45,7 +44,7 @@
  
  # TAG:  output_email
  #       Email address to send the reports. If you use this tag, no html reports will be generated.
-@@ -260,7 +261,7 @@
+@@ -269,7 +269,7 @@
  # TAG: exclude_codes file
  #      Ignore records with these codes. Eg.: NONE/400
  #
@@ -54,25 +53,25 @@
  
  # TAG: replace_index string
  #      Replace "index.html" in the main index file with this string
-@@ -427,7 +428,7 @@
- #      path to squidGuard.conf file
+@@ -456,7 +456,7 @@
  #      Generate reports from SquidGuard logs.
  #      Use 'none' to disable.
+ #      You can use sarg -L filename to use an alternate squidGuard log.
 -#      squidguard_conf /usr/local/squidGuard/squidGuard.conf
 +#      squidguard_conf /var/log/squidGuard/squidGuard.conf
  #
  #squidguard_conf none
  
-@@ -481,7 +482,7 @@
+@@ -526,7 +526,7 @@
  #     Sarg will create sarg-php directory with some PHP modules:
  #     - sarg-squidguard-block.php - add urls from user reports to squidGuard DB
  #
 -#www_document_root /var/www/html
 +www_document_root /var/lib/sarg
  
- # TAG block_it module_url
+ # TAG: block_it module_url
  #     This tag allow you to pass urls from user reports to a cgi or php module,
-@@ -524,7 +525,7 @@
+@@ -569,7 +569,7 @@
  #                                          %u - user report
  #
  # user_authentication no
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/sarg-font.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/sarg-config.patch?r1=1.2&r2=1.3&f=u