- updated to 3.2.3

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

diff --git a/squid-fhs.patch b/squid-fhs.patch
index 0c9b79bbcfe5b9363ae366cb346ae34a5039b3cb..923946ab61cb563ecdfa0b1f29ebe867a26ac870 100644 (file)
--- a/squid-fhs.patch
+++ b/squid-fhs.patch
@@ -1,14 +1,12 @@
 diff -ur squid-3.1.14-orig/src/Makefile.am squid-3.1.14/src/Makefile.am
 --- squid-3.1.14-orig/src/Makefile.am  2011-07-04 06:38:34.000000000 +0200
 +++ squid-3.1.14/src/Makefile.am       2011-07-12 13:15:33.936929633 +0200
-@@ -728,8 +728,8 @@
- DEFAULT_ACCESS_LOG      = $(DEFAULT_LOG_PREFIX)/access.log
- DEFAULT_STORE_LOG       = $(DEFAULT_LOG_PREFIX)/store.log
- DEFAULT_PID_FILE        = $(DEFAULT_PIDFILE)
--DEFAULT_NETDB_FILE      = $(DEFAULT_LOG_PREFIX)/netdb.state
--DEFAULT_SWAP_DIR        = $(localstatedir)/cache
-+DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
-+DEFAULT_NETDB_FILE      = $(DEFAULT_SWAP_DIR)/netdb.state
+@@ -867,7 +867,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_NETDB_FILE    = $(DEFAULT_LOG_PREFIX)/netdb.state
++DEFAULT_NETDB_FILE    = $(DEFAULT_SWAP_PREFIX)/netdb.state
  DEFAULT_SSL_DB_DIR    = $(localstatedir)/lib/ssl_db
  DEFAULT_PINGER                = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`
  DEFAULT_UNLINKD               = $(libexecdir)/`echo unlinkd | sed '$(transform);s/$$/$(EXEEXT)/'`