with these patches Squid now compiles with our ipf headers when using the
IPF Transparent proxying support
This commit is contained in:
parent
039ffc50fd
commit
4c66c6fb0a
@ -1,5 +1,5 @@
|
||||
--- configure.orig Fri Apr 28 16:17:12 2000
|
||||
+++ configure Wed Jun 28 00:52:33 2000
|
||||
+++ configure Sun Jul 9 19:32:00 2000
|
||||
@@ -673,12 +673,6 @@
|
||||
REGEXLIB='' # -lregex
|
||||
LIBREGEX='' # libregex.a
|
||||
@ -13,11 +13,18 @@
|
||||
case "$host_os" in
|
||||
cygwin32|os2)
|
||||
exec_suffix=".exe"
|
||||
@@ -4063,18 +4057,6 @@
|
||||
|
||||
@@ -2301,6 +2295,7 @@
|
||||
netinet/tcp.h \
|
||||
netinet/ip_compat.h \
|
||||
netinet/ip_fil.h \
|
||||
+ netinet/ip_fil_compat.h \
|
||||
netinet/ip_nat.h \
|
||||
poll.h \
|
||||
pwd.h \
|
||||
@@ -4064,18 +4059,6 @@
|
||||
;;
|
||||
esac
|
||||
-
|
||||
|
||||
-# Remove optimization for GCC 2.95.[12]
|
||||
-# gcc -O[2] on *BSD and Linux (x86) causes pointers to magically become NULL
|
||||
-if test "$GCC" = "yes"; then
|
||||
@ -29,6 +36,22 @@
|
||||
- ;;
|
||||
- esac
|
||||
-fi
|
||||
|
||||
-
|
||||
# Recommended by Balint Nagy Endre <bne@CareNet.hu>
|
||||
case "$host" in
|
||||
*-univel-sysv4.2MP)
|
||||
@@ -4338,6 +4321,14 @@
|
||||
EOF
|
||||
|
||||
elif test "$ac_cv_header_netinet_ip_compat_h" = "yes" &&
|
||||
+ test "$ac_cv_header_netinet_ip_fil_h" = "yes" &&
|
||||
+ test "$ac_cv_header_netinet_ip_nat_h" = "yes" ; then
|
||||
+ IPF_TRANSPARENT="yes"
|
||||
+ cat >> confdefs.h <<\EOF
|
||||
+#define IPF_TRANSPARENT 1
|
||||
+EOF
|
||||
+
|
||||
+ elif test "$ac_cv_header_netinet_ip_fil_compat_h" = "yes" &&
|
||||
test "$ac_cv_header_netinet_ip_fil_h" = "yes" &&
|
||||
test "$ac_cv_header_netinet_ip_nat_h" = "yes" ; then
|
||||
IPF_TRANSPARENT="yes"
|
||||
|
12
www/squid/patches/patch-ak
Normal file
12
www/squid/patches/patch-ak
Normal file
@ -0,0 +1,12 @@
|
||||
--- include/autoconf.h.in.orig Wed Feb 23 01:19:06 2000
|
||||
+++ include/autoconf.h.in Sun Jul 9 19:36:00 2000
|
||||
@@ -502,6 +502,9 @@
|
||||
/* Define if you have the <netinet/in.h> header file. */
|
||||
#undef HAVE_NETINET_IN_H
|
||||
|
||||
+/* Define if you have the <netinet/ip_fil_compat.h> header file. */
|
||||
+#undef HAVE_NETINET_IP_FIL_COMPAT_H
|
||||
+
|
||||
/* Define if you have the <netinet/ip_compat.h> header file. */
|
||||
#undef HAVE_NETINET_IP_COMPAT_H
|
||||
|
11
www/squid/patches/patch-al
Normal file
11
www/squid/patches/patch-al
Normal file
@ -0,0 +1,11 @@
|
||||
--- src/client_side.c.orig Sun Jul 9 19:29:45 2000
|
||||
+++ src/client_side.c Sun Jul 9 19:30:25 2000
|
||||
@@ -43,6 +43,8 @@
|
||||
#include <net/if.h>
|
||||
#if HAVE_IP_COMPAT_H
|
||||
#include <ip_compat.h>
|
||||
+#elif HAVE_NETINET_IP_FIL_COMPAT_H
|
||||
+#include <netinet/ip_fil_compat.h>
|
||||
#elif HAVE_NETINET_IP_COMPAT_H
|
||||
#include <netinet/ip_compat.h>
|
||||
#endif
|
Loading…
Reference in New Issue
Block a user