From: twittner <twittner@pld-linux.org>
Date: Wed, 25 Aug 2004 18:17:13 +0000 (+0000)
Subject: - make things cleaner.
X-Git-Tag: auto/ac/squid-2_5_STABLE6-6~3
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=bec4c407aa73b4d705579de7d1de56fe43684804;p=packages%2Fsquid.git

- 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 403c7d4..2d65b38 100644
--- 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 66fe816..8ed32ac 100644
--- 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: