- release 2 (by relup.sh)

[packages/squid.git] / squid-fhs.patch

diff --git a/squid-fhs.patch b/squid-fhs.patch
index 403c7d4c4c977401527d89c33dd822d0d7e395b2..2e4a2c7c227ad414e9e1a418c08e70edd27fb3fd 100644 (file)
--- a/squid-fhs.patch
+++ b/squid-fhs.patch
@@ -1,29 +1,21 @@
-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
-@@ -274,12 +274,12 @@
+diff -urN squid-2.7.STABLE4.orig/src/Makefile.am squid-2.7.STABLE4/src/Makefile.am
+--- squid-2.7.STABLE4.orig/src/Makefile.am     2008-01-02 16:50:39.000000000 +0100
++++ squid-2.7.STABLE4/src/Makefile.am  2008-09-18 12:38:18.280169505 +0200
+@@ -340,13 +340,13 @@
  DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
  DEFAULT_MIME_TABLE    = $(sysconfdir)/mime.conf
- DEFAULT_DNSSERVER       = $(libexecdir)/dnsserver$(EXEEXT)
+ DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
 -DEFAULT_LOG_PREFIX    = $(localstatedir)/logs
 +DEFAULT_LOG_PREFIX    = $(localstatedir)/log/squid
  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_SWAP_DIR        = $(localstatedir)/cache
-+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_NETDB_FILE      = $(DEFAULT_LOG_PREFIX)/netdb.state
+-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_NETDB_FILE      = $(DEFAULT_SWAP_DIR)/netdb.state
++DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
+ DEFAULT_PINGER                = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_UNLINKD               = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_DISKD         = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'`