Sophie

Sophie

distrib > Mageia > 6 > armv7hl > media > core-updates-src > by-pkgid > 64cd365ddc9f944e5c7f6a9a303aac53 > files > 14

squid-3.5.26-1.2.mga6.src.rpm

diff -Naurp squid-3.5.5/scripts/check_cache.pl squid-3.5.5.dlucio/scripts/check_cache.pl
--- squid-3.5.5/scripts/check_cache.pl	2015-05-28 07:06:38.000000000 -0400
+++ squid-3.5.5.dlucio/scripts/check_cache.pl	2015-06-21 15:06:56.725005378 -0400
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
 #
 ## Copyright (C) 1996-2017 The Squid Software Foundation and contributors
 ##
@@ -35,7 +35,7 @@ if ($opt_h) {
 	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 = '';
@@ -54,7 +54,7 @@ while (<squidconf>) {
 	}
 }
 close (squidconf);
-push (@cachedir, '/usr/local/squid/cache') unless ($#cachedir > $[-1);
+push (@cachedir, '/usr/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 -Naurp squid-3.5.5/scripts/fileno-to-pathname.pl squid-3.5.5.dlucio/scripts/fileno-to-pathname.pl
--- squid-3.5.5/scripts/fileno-to-pathname.pl	2015-05-28 07:06:38.000000000 -0400
+++ squid-3.5.5.dlucio/scripts/fileno-to-pathname.pl	2015-06-21 15:06:20.836947660 -0400
@@ -27,7 +27,7 @@ my @CD = ();
 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 -Naurp squid-3.5.5/tools/purge/conffile.hh squid-3.5.5.dlucio/tools/purge/conffile.hh
--- squid-3.5.5/tools/purge/conffile.hh	2015-05-28 07:06:38.000000000 -0400
+++ squid-3.5.5.dlucio/tools/purge/conffile.hh	2015-06-21 15:06:20.836947660 -0400
@@ -57,7 +57,7 @@ typedef int bool;
 
 
 #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 <vector>
diff -Naurp squid-3.5.5/tools/purge/README squid-3.5.5.dlucio/tools/purge/README
--- squid-3.5.5/tools/purge/README	2015-05-28 07:06:38.000000000 -0400
+++ squid-3.5.5.dlucio/tools/purge/README	2015-06-21 15:06:20.836947660 -0400
@@ -74,7 +74,7 @@ Usage:  purge   [-a] [-c cf] [-d l] [-(f
                 [-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!).
@@ -112,7 +112,7 @@ Usage:  purge   [-a] [-c cf] [-d l] [-(f
 	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