- make things cleaner.

Changed files:
    squid-fhs.patch -> 1.8
    squid.conf.patch -> 1.6

diff --git a/squid-fhs.patch b/squid-fhs.patch
index 403c7d4c4c977401527d89c33dd822d0d7e395b2..2d65b382a5a15b231d2446c36f00205bd63609f2 100644 (file)
--- a/squid-fhs.patch
+++ b/squid-fhs.patch
@@ -1,6 +1,6 @@
-diff -urN squid-2.5.STABLE2.org/src/Makefile.am squid-2.5.STABLE2/src/Makefile.am
---- squid-2.5.STABLE2.org/src/Makefile.am      Sat Apr 12 12:06:45 2003
-+++ squid-2.5.STABLE2/src/Makefile.am  Sat Apr 12 12:16:25 2003
+diff -Nur squid-2.5.STABLE6.bef/src/Makefile.am squid-2.5.STABLE6/src/Makefile.am
+--- squid-2.5.STABLE6.bef/src/Makefile.am      2002-11-10 16:30:03.000000000 +0100
++++ squid-2.5.STABLE6/src/Makefile.am  2004-08-25 20:10:12.000000000 +0200
 @@ -274,12 +274,12 @@
  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
  DEFAULT_MIME_TABLE    = $(sysconfdir)/mime.conf
@@ -10,20 +10,10 @@ diff -urN squid-2.5.STABLE2.org/src/Makefile.am squid-2.5.STABLE2/src/Makefile.a
  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        = $(DEFAULT_LOG_PREFIX)/squid.pid
 -DEFAULT_SWAP_DIR        = $(localstatedir)/cache
++DEFAULT_PID_FILE        = /var/run/squid.pid
 +DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
  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 66fe8169d274e4e7ffcbbea9f3fa4caa2e6b3bdf..8ed32acbdcd49f6f471861bcfc7753ae3c57fea3 100644 (file)
--- a/squid.conf.patch
+++ b/squid.conf.patch
@@ -13,14 +13,6 @@
  
  #  TAG: cache_access_log
  #     Logs the client request activity.  Contains an entry for
-@@ -804,6 +808,7 @@
- #
- #Default:
- # pid_filename /var/run/squid.pid
-+pid_filename /var/run/squid.pid
- 
- #  TAG: debug_options
- #     Logging options are set as section,level where each source file
 @@ -2025,6 +2030,8 @@
  #
  #Default: