- updated for 2.5.STABLE7

Changed files:
    squid-fhs.patch -> 1.9

diff --git a/squid-fhs.patch b/squid-fhs.patch
index 2d65b382a5a15b231d2446c36f00205bd63609f2..5a36f86fbf93891d25e9902fdbc68a9f3670a626 100644 (file)
--- a/squid-fhs.patch
+++ b/squid-fhs.patch
@@ -1,10 +1,10 @@
-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
+diff -ur squid-2.5.STABLE7.orig/src/Makefile.am squid-2.5.STABLE7/src/Makefile.am
+--- squid-2.5.STABLE7.orig/src/Makefile.am     2004-09-25 23:37:35.000000000 +0200
++++ squid-2.5.STABLE7/src/Makefile.am  2004-10-12 11:34:16.900258376 +0200
 @@ -274,12 +274,12 @@
  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
@@ -14,6 +14,6 @@ diff -Nur squid-2.5.STABLE6.bef/src/Makefile.am squid-2.5.STABLE6/src/Makefile.a
 -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)
+ DEFAULT_PINGER                = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_UNLINKD               = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_DISKD         = $(libexecdir)/`echo diskd | sed '$(transform);s/$$/$(EXEEXT)/'`