- up to 3.0.STABLE9

Changed files:
    squid-libnsl_fixes.patch -> 1.6

diff --git a/squid-libnsl_fixes.patch b/squid-libnsl_fixes.patch
index 99c912631d4f23203affff66357c4fb1782b202a..a7e5586798a5c2dfdd1fa6a3fa56cb589fdc4395 100644 (file)
--- a/squid-libnsl_fixes.patch
+++ b/squid-libnsl_fixes.patch
@@ -1,6 +1,7 @@
---- ./configure.in.org 2006-12-03 22:02:15.000000000 +0000
-+++ ./configure.in     2006-12-03 22:04:56.000000000 +0000
-@@ -29,6 +29,7 @@
+diff -urN squid-3.0.STABLE9.orig/configure.in squid-3.0.STABLE9/configure.in
+--- squid-3.0.STABLE9.orig/configure.in        2008-09-09 18:06:45.000000000 +0200
++++ squid-3.0.STABLE9/configure.in     2008-09-19 07:43:53.042671496 +0200
+@@ -36,6 +36,7 @@
  
  
  CRYPTLIB=''
@@ -8,8 +9,8 @@
  REGEXLIB=''   # -lregex
  LIBREGEX=''   # libregex.a
  
-@@ -2011,8 +2012,10 @@
-  fi
+@@ -2205,8 +2206,10 @@
+ #include <sys/msg.h>])
  
  dnl Check for needed libraries
 -AC_CHECK_LIB(nsl, main)
@@ -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-3.0.STABLE9.orig/helpers/basic_auth/YP/Makefile.am squid-3.0.STABLE9/helpers/basic_auth/YP/Makefile.am
+--- squid-3.0.STABLE9.orig/helpers/basic_auth/YP/Makefile.am   2008-09-09 18:06:40.000000000 +0200
++++ squid-3.0.STABLE9/helpers/basic_auth/YP/Makefile.am        2008-09-19 07:44:22.396001181 +0200
 @@ -7,5 +7,5 @@
  
  libexec_PROGRAMS = yp_auth