- rebuild to fix broken filedigests

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

diff --git a/squid-fhs.patch b/squid-fhs.patch
index b2d1ac58e08c1c0af5788d30e3a966c213a58353..0c9b79bbcfe5b9363ae366cb346ae34a5039b3cb 100644 (file)
--- a/squid-fhs.patch
+++ b/squid-fhs.patch
@@ -1,47 +1,14 @@
-diff -Nur squid-2.2.STABLE3/src/Makefile.in squid-2.2.STABLE3.pld/src/Makefile.in
---- squid-2.2.STABLE3/src/Makefile.in  Wed Jun  9 08:27:17 1999
-+++ squid-2.2.STABLE3.pld/src/Makefile.in      Wed Jun  9 08:26:12 1999
-@@ -9,13 +9,14 @@
- prefix                = @prefix@
- exec_prefix   = @exec_prefix@
- exec_suffix   = @exec_suffix@
--cgi_suffix    = @cgi_suffix@
-+cgi_suffix    = @cgi_suffix@
- top_srcdir    = @top_srcdir@
- bindir                = @bindir@
- libexecdir      = @libexecdir@
- sysconfdir    = @sysconfdir@
- localstatedir   = @localstatedir@
- srcdir                = @srcdir@
-+datadir               = @prefix@/share
- VPATH         = @srcdir@
- 
- # Gotta love the DOS legacy
-@@ -30,17 +31,17 @@
- DEFAULT_PREFIX                = $(prefix)
- DEFAULT_CONFIG_FILE     = $(sysconfdir)/squid.conf
- DEFAULT_MIME_TABLE    = $(sysconfdir)/mime.conf
--DEFAULT_DNSSERVER       = $(libexecdir)/$(DNSSERVER_EXE)
--DEFAULT_CACHE_LOG       = $(localstatedir)/log/squid/cache.log
--DEFAULT_ACCESS_LOG      = $(localstatedir)/log/squid/access.log
--DEFAULT_STORE_LOG       = $(localstatedir)/log/squid/store.log
-+DEFAULT_DNSSERVER       = $(bindir)/$(DNSSERVER_EXE)
-+DEFAULT_CACHE_LOG       = $(localstatedir)/log/squid/cache
-+DEFAULT_ACCESS_LOG      = $(localstatedir)/log/squid/access
-+DEFAULT_STORE_LOG       = $(localstatedir)/log/squid/store
- DEFAULT_PID_FILE        = $(localstatedir)/run/squid.pid
+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_PINGER                = $(libexecdir)/$(PINGER_EXE)
--DEFAULT_UNLINKD               = $(libexecdir)/$(UNLINKD_EXE)
--DEFAULT_ICON_DIR      = $(sysconfdir)/icons
--DEFAULT_ERROR_DIR     = $(sysconfdir)/errors
--DEFAULT_MIB_PATH      = $(sysconfdir)/mib.txt
 +DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
-+DEFAULT_PINGER                = $(bindir)/$(PINGER_EXE)
-+DEFAULT_UNLINKD               = $(bindir)/$(UNLINKD_EXE)
-+DEFAULT_ICON_DIR      = $(datadir)/squid/icons
-+DEFAULT_ERROR_DIR     = $(datadir)/squid/errors
-+DEFAULT_MIB_PATH      = $(datadir)/squid/mib.txt
- 
- CC            = @CC@
- MAKEDEPEND    = @MAKEDEPEND@
++DEFAULT_NETDB_FILE      = $(DEFAULT_SWAP_DIR)/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)/'`