- up to 2.7.STABLE4

Changed files:
    squid-empty-referer.patch -> 1.2
    squid-fhs.patch -> 1.10
    squid-libnsl_fixes.patch -> 1.4

diff --git a/squid-empty-referer.patch b/squid-empty-referer.patch
index a7608b441d465b1db345343147c61cf29524bd41..1af2605f5faccb9a2ab4661a847ef400054968ea 100644 (file)
--- a/squid-empty-referer.patch
+++ b/squid-empty-referer.patch
@@ -1,7 +1,7 @@
-diff -Nur squid-2.5.STABLE3.orig/src/client_side.c squid-2.5.STABLE3/src/client_side.c
---- squid-2.5.STABLE3.orig/src/client_side.c   Mon Sep  8 15:44:34 2003
-+++ squid-2.5.STABLE3/src/client_side.c        Mon Sep  8 17:00:06 2003
-@@ -988,11 +988,16 @@
+diff -urN squid-2.7.STABLE4.orig/src/client_side.c squid-2.7.STABLE4/src/client_side.c
+--- squid-2.7.STABLE4.orig/src/client_side.c   2008-07-21 22:43:27.000000000 +0200
++++ squid-2.7.STABLE4/src/client_side.c        2008-09-18 12:51:05.169468168 +0200
+@@ -1462,10 +1462,14 @@
  #if USE_USERAGENT_LOG
      if ((str = httpHeaderGetStr(req_hdr, HDR_USER_AGENT)))
        logUserAgent(fqdnFromAddr(http->conn->log_addr), str);
@@ -10,11 +10,9 @@ diff -Nur squid-2.5.STABLE3.orig/src/client_side.c squid-2.5.STABLE3/src/client_
  #endif
  #if USE_REFERER_LOG
      if ((str = httpHeaderGetStr(req_hdr, HDR_REFERER)))
-       logReferer(fqdnFromAddr(http->conn->log_addr), str,
-           http->log_uri);
+       logReferer(fqdnFromAddr(http->conn->log_addr), str, rfc1738_escape_unescaped(http->uri));
 +    else
-+      logReferer(fqdnFromAddr(http->conn->log_addr), "-",
-+      http->log_uri);
++      logReferer(fqdnFromAddr(http->conn->log_addr), "-", rfc1738_escape_unescaped(http->uri));
  #endif
  #if FORW_VIA_DB
      if (httpHeaderHas(req_hdr, HDR_X_FORWARDED_FOR)) {

diff --git a/squid-fhs.patch b/squid-fhs.patch
index 5a36f86fbf93891d25e9902fdbc68a9f3670a626..2e4a2c7c227ad414e9e1a418c08e70edd27fb3fd 100644 (file)
--- a/squid-fhs.patch
+++ b/squid-fhs.patch
@@ -1,7 +1,7 @@
-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 @@
+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)/`echo dnsserver | sed '$(transform);s/$$/$(EXEEXT)/'`
@@ -11,9 +11,11 @@ diff -ur squid-2.5.STABLE7.orig/src/Makefile.am squid-2.5.STABLE7/src/Makefile.a
  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_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 | sed '$(transform);s/$$/$(EXEEXT)/'`
+ DEFAULT_DISKD         = $(libexecdir)/`echo diskd-daemon | sed '$(transform);s/$$/$(EXEEXT)/'`

diff --git a/squid-libnsl_fixes.patch b/squid-libnsl_fixes.patch
index 99c912631d4f23203affff66357c4fb1782b202a..3a57796ef4ebc1ed9cb8421b569ed01d8e86ba25 100644 (file)
--- a/squid-libnsl_fixes.patch
+++ b/squid-libnsl_fixes.patch
@@ -1,5 +1,6 @@
---- ./configure.in.org 2006-12-03 22:02:15.000000000 +0000
-+++ ./configure.in     2006-12-03 22:04:56.000000000 +0000
+diff -urN squid-2.7.STABLE4.orig/configure.in squid-2.7.STABLE4/configure.in
+--- squid-2.7.STABLE4.orig/configure.in        2008-08-08 21:21:03.000000000 +0200
++++ squid-2.7.STABLE4/configure.in     2008-09-18 12:42:51.646184400 +0200
 @@ -29,6 +29,7 @@
  
  
@@ -8,7 +9,7 @@
  REGEXLIB=''   # -lregex
  LIBREGEX=''   # libregex.a
  
-@@ -2011,8 +2012,10 @@
+@@ -2043,8 +2044,10 @@
   fi
  
  dnl Check for needed libraries
@@ -18,11 +19,12 @@
 +AC_CHECK_LIB(nsl, yp_match, NSLLIB="-lnsl")
 +AC_SUBST(NSLLIB)
 +AC_SEARCH_LIBS(socket, socket)
- AC_MSG_CHECKING(for winsock)
- save_LIBS="$LIBS"
- for curlib in ws2_32 wsock32; do
---- ./helpers/basic_auth/YP/Makefile.am.org    2005-05-17 16:56:26.000000000 +0000
-+++ ./helpers/basic_auth/YP/Makefile.am        2006-12-03 22:06:20.000000000 +0000
+ dnl Check for Winsock only on MinGW, on Cygwin we must use emulated BSD socket API
+       case "$host_os" in
+       mingw|mingw32)
+diff -urN squid-2.7.STABLE4.orig/helpers/basic_auth/YP/Makefile.am squid-2.7.STABLE4/helpers/basic_auth/YP/Makefile.am
+--- squid-2.7.STABLE4.orig/helpers/basic_auth/YP/Makefile.am   2005-05-17 18:56:26.000000000 +0200
++++ squid-2.7.STABLE4/helpers/basic_auth/YP/Makefile.am        2008-09-18 12:44:11.039717339 +0200
 @@ -7,5 +7,5 @@
  
  libexec_PROGRAMS = yp_auth