Sophie

Sophie

distrib > Mageia > 3 > x86_64 > media > core-updates-src > by-pkgid > eac815cedf6b9e9db19e672828247b7a > files > 14

squid-3.2.10-1.6.mga3.src.rpm

diff -Naur squid-3.2.7/scripts/check_cache.pl squid-3.2.7.path/scripts/check_cache.pl
--- squid-3.2.7/scripts/check_cache.pl	2013-02-01 05:55:31.000000000 -0500
+++ squid-3.2.7.path/scripts/check_cache.pl	2013-02-13 19:04:55.156918311 -0500
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 
 # check_cache.pl 
 #
@@ -30,7 +30,7 @@
 	exit;
 }
 
-$squidconf = $opt_c || "/usr/local/squid/etc/squid.conf";
+$squidconf = $opt_c || "/etc/squid/squid.conf";
 open (squidconf) || die "$squidconf: $!\n";
 $no_cachedir = 0;
 $swaplog = '';
@@ -49,7 +49,7 @@
 	}
 }
 close (squidconf);
-push (@cachedir, '/usr/local/squid/cache') unless ($#cachedir > $[-1);
+push (@cachedir, '/var/spool/squid') unless ($#cachedir > $[-1);
 $swaplog = $cachedir[0] . '/log' unless ($swaplog);
 $no_cachedir = $#cachedir + 1;
 print "$no_cachedir CACHE DIRS: ", join(' ', @cachedir), "\n" if ($opt_d);
diff -Naur squid-3.2.7/scripts/fileno-to-pathname.pl squid-3.2.7.path/scripts/fileno-to-pathname.pl
--- squid-3.2.7/scripts/fileno-to-pathname.pl	2013-02-01 05:55:31.000000000 -0500
+++ squid-3.2.7.path/scripts/fileno-to-pathname.pl	2013-02-13 19:05:05.311791358 -0500
@@ -21,7 +21,7 @@
 my $SWAP_DIR_SHIFT=24;
 my $SWAP_FILE_MASK=0x00FFFFFF;
 
-my $CF = $opt_c || '/usr/local/squid/etc/squid.conf';
+my $CF = $opt_c || '/etc/squid/squid.conf';
 &usage unless (open (CF,"<$CF"));
 
 my $ncache_dirs = 0;
diff -Naur squid-3.2.7/tools/purge/conffile.hh squid-3.2.7.path/tools/purge/conffile.hh
--- squid-3.2.7/tools/purge/conffile.hh	2013-02-01 05:55:31.000000000 -0500
+++ squid-3.2.7.path/tools/purge/conffile.hh	2013-02-13 19:05:18.487626637 -0500
@@ -56,7 +56,7 @@
 
 
 #if !defined(DEFAULT_SQUID_CONF)
-#define DEFAULT_SQUID_CONF "/usr/local/squid/etc/squid.conf"
+#define DEFAULT_SQUID_CONF "/etc/squid/squid.conf"
 #endif
 
 #include <stdio.h>      // FILE*
diff -Naur squid-3.2.7/tools/purge/README squid-3.2.7.path/tools/purge/README
--- squid-3.2.7/tools/purge/README	2013-02-01 05:55:31.000000000 -0500
+++ squid-3.2.7.path/tools/purge/README	2013-02-13 19:05:38.186380369 -0500
@@ -75,7 +75,7 @@
                 [-P #] [-s] [-v] [-C dir [-H]] [-n]
 
  -a     display a little rotating thingy to indicate that I am alive (tty only).
- -c c   squid.conf location, default "/usr/local/squid/etc/squid.conf".
+ -c c   squid.conf location, default "/etc/squid/squid.conf".
  -C dir base directory for content extraction (copy-out mode).
  -d l   debug level, an OR of different debug options.
  -e re  single regular expression per -e instance (use quotes!).
@@ -113,7 +113,7 @@
 	of Squid-2 cache_dir specifications, and will automatically try
 	to use the correct one.
 
-	default: /usr/local/squid/etc/squid.conf
+	default: /etc/squid/squid.conf
 
 -C cd	if you want to rescue files from your cache, you need to specify
 	the directory into which the files will be copied. Please note