- fix memory leak in the processing of malformed DNS responses

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

diff --git a/squid-fhs.patch b/squid-fhs.patch
index 8c1c037a890ccf86a9517c14f11828dd05084346..5a36f86fbf93891d25e9902fdbc68a9f3670a626 100644 (file)
--- a/squid-fhs.patch
+++ b/squid-fhs.patch
@@ -1,35 +1,19 @@
-diff -urN squid-2.5.STABLE1.org/src/Makefile.am squid-2.5.STABLE1/src/Makefile.am
---- squid-2.5.STABLE1.org/src/Makefile.am      Fri Jan  3 13:50:17 2003
-+++ squid-2.5.STABLE1/src/Makefile.am  Fri Jan  3 14:04:06 2003
-@@ -268,20 +268,20 @@
- 
- DEFAULT_PREFIX                = $(prefix)
+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)/@OPT_DNSSERVER_EXE@
+ DEFAULT_MIME_TABLE    = $(sysconfdir)/mime.conf
+ DEFAULT_DNSSERVER       = $(libexecdir)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
 -DEFAULT_LOG_PREFIX    = $(localstatedir)/logs
-+DEFAULT_MIME_TABLE    = $(sysconfdir)/../mime.conf
-+DEFAULT_DNSSERVER       = $(bindir)/@OPT_DNSSERVER_EXE@
 +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_PINGER                = $(libexecdir)/@OPT_PINGER_EXE@
--DEFAULT_UNLINKD               = $(libexecdir)/$(UNLINKD_EXE)
--DEFAULT_DISKD         = $(libexecdir)/@OPT_DISKD_EXE@
--DEFAULT_ICON_DIR      = $(datadir)/icons
--DEFAULT_ERROR_DIR     = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
--DEFAULT_MIB_PATH      = $(datadir)/mib.txt
-+DEFAULT_PID_FILE        = $(localstatedir)/run/squid.pid
++DEFAULT_PID_FILE        = /var/run/squid.pid
 +DEFAULT_SWAP_DIR        = $(localstatedir)/cache/squid
-+DEFAULT_PINGER                = $(bindir)/@OPT_PINGER_EXE@
-+DEFAULT_UNLINKD               = $(bindir)/$(UNLINKD_EXE)
-+DEFAULT_DISKD         = $(bindir)/@OPT_DISKD_EXE@
-+DEFAULT_ICON_DIR      = $(datadir)/squid/icons
-+DEFAULT_ERROR_DIR     = $(datadir)/squid/errors/@ERR_DEFAULT_LANGUAGE@
-+DEFAULT_MIB_PATH      = $(datadir)/squid/mib.txt
- 
- DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
- 
+ 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)/'`