- changed default pidfile location to /var/run/squid.pid (thnx to qboosh)

Changed files:
    squid-fhs.patch -> 1.7
    squid.conf.patch -> 1.5

diff --git a/squid-fhs.patch b/squid-fhs.patch
index 734d2ae48db0c0167845f1ebe3fd97cc21f55e49..403c7d4c4c977401527d89c33dd822d0d7e395b2 100644 (file)
--- a/squid-fhs.patch
+++ b/squid-fhs.patch
@@ -16,3 +16,14 @@ diff -urN squid-2.5.STABLE2.org/src/Makefile.am squid-2.5.STABLE2/src/Makefile.a
  DEFAULT_PINGER                = $(libexecdir)/pinger$(EXEEXT)
  DEFAULT_UNLINKD               = $(libexecdir)/unlinkd$(EXEEXT)
  DEFAULT_DISKD         = $(libexecdir)/diskd$(EXEEXT)
+--- squid-2.5.STABLE6/src/Makefile.am.orig     2004-08-25 19:46:13.000000000 +0200
++++ squid-2.5.STABLE6/src/Makefile.am  2004-08-25 19:44:11.000000000 +0200
+@@ -278,7 +278,7 @@
+ DEFAULT_CACHE_LOG       = $(DEFAULT_LOG_PREFIX)/cache.log
+ DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
+ DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
+-DEFAULT_PID_FILE        = $(DEFAULT_LOG_PREFIX)/squid.pid
++DEFAULT_PID_FILE        = /var/run/squid.pid
+ DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
+ DEFAULT_PINGER                = $(libexecdir)/pinger$(EXEEXT)
+ DEFAULT_UNLINKD               = $(libexecdir)/unlinkd$(EXEEXT)

diff --git a/squid.conf.patch b/squid.conf.patch
index dc0590d0fbd85a960a1aaaf9dc08aee9bc5f5604..66fe8169d274e4e7ffcbbea9f3fa4caa2e6b3bdf 100644 (file)
--- a/squid.conf.patch
+++ b/squid.conf.patch
@@ -16,7 +16,7 @@
 @@ -804,6 +808,7 @@
  #
  #Default:
- # pid_filename /var/log/squid/squid.pid
+ # pid_filename /var/run/squid.pid
 +pid_filename /var/run/squid.pid
  
  #  TAG: debug_options