summaryrefslogtreecommitdiff
path: root/www/squid/patches
diff options
context:
space:
mode:
Diffstat (limited to 'www/squid/patches')
-rw-r--r--www/squid/patches/patch-aa20
-rw-r--r--www/squid/patches/patch-ag16
-rw-r--r--www/squid/patches/patch-an16
-rw-r--r--www/squid/patches/patch-ap13
-rw-r--r--www/squid/patches/patch-bb16
-rw-r--r--www/squid/patches/patch-cd32
6 files changed, 70 insertions, 43 deletions
diff --git a/www/squid/patches/patch-aa b/www/squid/patches/patch-aa
index 3d86f8815c6..9a2b02ba340 100644
--- a/www/squid/patches/patch-aa
+++ b/www/squid/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $
+$NetBSD: patch-aa,v 1.16.2.1 2005/09/10 11:16:41 salo Exp $
---- src/Makefile.in.orig 2005-04-25 23:25:05.000000000 +0900
+--- src/Makefile.in.orig 2005-04-24 09:12:08.000000000 +0900
+++ src/Makefile.in
-@@ -383,14 +383,15 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
+@@ -384,14 +384,14 @@ DEFAULT_LOG_PREFIX = $(localstatedir)/lo
DEFAULT_CACHE_LOG = $(DEFAULT_LOG_PREFIX)/cache.log
DEFAULT_ACCESS_LOG = $(DEFAULT_LOG_PREFIX)/access.log
DEFAULT_STORE_LOG = $(DEFAULT_LOG_PREFIX)/store.log
@@ -18,11 +18,10 @@ $NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $
+DEFAULT_ICON_DIR = $(datadir)/squid/icons
+DEFAULT_ERROR_DIR = $(datadir)/squid/errors/@ERR_DEFAULT_LANGUAGE@
+DEFAULT_MIB_PATH = $(datadir)/squid/mib.txt
-+EXAMPLES_DIR = $(datadir)/examples/squid
DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
-@@ -855,20 +856,20 @@ CCDEPMODE = @CCDEPMODE@
+@@ -856,20 +856,20 @@ CCDEPMODE = @CCDEPMODE@
uninstall-info-am:
install-dataDATA: $(data_DATA)
@$(NORMAL_INSTALL)
@@ -48,7 +47,7 @@ $NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $
done
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
-@@ -1067,7 +1068,7 @@ info-am:
+@@ -1068,7 +1068,7 @@ info-am:
install-data-am: install-data-local install-dataDATA
install-exec-am: install-binPROGRAMS install-libexecPROGRAMS \
@@ -57,7 +56,7 @@ $NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $
install-info: install-info-recursive
-@@ -1085,7 +1086,7 @@ mostlyclean-am: mostlyclean-compile most
+@@ -1086,7 +1086,7 @@ mostlyclean-am: mostlyclean-compile most
uninstall-am: uninstall-binPROGRAMS uninstall-dataDATA uninstall-info-am \
uninstall-libexecPROGRAMS uninstall-local \
@@ -66,7 +65,7 @@ $NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $
uninstall-info: uninstall-info-recursive
-@@ -1168,26 +1169,12 @@ repl_modules.c: repl_modules.sh Makefile
+@@ -1169,26 +1169,7 @@ repl_modules.c: repl_modules.sh Makefile
auth_modules.c: auth_modules.sh Makefile
@$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
@@ -91,11 +90,6 @@ $NetBSD: patch-aa,v 1.16 2005/04/25 15:39:14 taca Exp $
- fi
- $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
+install-data-local: install-dataDATA
-+ @mkdir -p $(DESTDIR)$(EXAMPLES_DIR)
-+ @echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf" ;\
-+ $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(EXAMPLES_DIR)/mime.conf
-+ @echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/suqid.conf"; \
-+ $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(EXAMPLES_DIR)/squid.conf
uninstall-local:
@if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag
index ae06407cb81..bc39d039516 100644
--- a/www/squid/patches/patch-ag
+++ b/www/squid/patches/patch-ag
@@ -1,6 +1,6 @@
-$NetBSD: patch-ag,v 1.19 2005/06/07 14:19:10 taca Exp $
+$NetBSD: patch-ag,v 1.19.2.1 2005/09/10 11:16:41 salo Exp $
---- configure.orig 2005-05-17 07:41:14.000000000 +0900
+--- configure.orig 2005-09-02 10:23:02.000000000 +0900
+++ configure
@@ -2241,7 +2241,7 @@ if test "${enable_snmp+set}" = set; then
#define SQUID_SNMP 1
@@ -11,7 +11,11 @@ $NetBSD: patch-ag,v 1.19 2005/06/07 14:19:10 taca Exp $
if true; then
-@@ -4046,6 +4046,7 @@ for ac_hdr in \
+@@ -4046,9 +4046,11 @@ for ac_hdr in \
+ ip_fil_compat.h \
+ ip_fil.h \
+ ip_nat.h \
++ ipl.h \
libc.h \
limits.h \
linux/netfilter_ipv4.h \
@@ -19,7 +23,7 @@ $NetBSD: patch-ag,v 1.19 2005/06/07 14:19:10 taca Exp $
malloc.h \
math.h \
memory.h \
-@@ -4060,6 +4061,7 @@ for ac_hdr in \
+@@ -4063,6 +4065,7 @@ for ac_hdr in \
netinet/ip_fil_compat.h \
netinet/ip_fil.h \
netinet/ip_nat.h \
@@ -27,7 +31,7 @@ $NetBSD: patch-ag,v 1.19 2005/06/07 14:19:10 taca Exp $
openssl/err.h \
openssl/md5.h \
openssl/ssl.h \
-@@ -6291,43 +6293,38 @@ fi
+@@ -6294,43 +6297,38 @@ fi
echo "$ac_t""$ac_cv_type_mode_t" 1>&6
if test $ac_cv_type_mode_t = no; then
cat >> confdefs.h <<\EOF
@@ -85,7 +89,7 @@ $NetBSD: patch-ag,v 1.19 2005/06/07 14:19:10 taca Exp $
echo $ac_n "checking size of off_t""... $ac_c" 1>&6
-@@ -7643,8 +7640,8 @@ if test "$GCC" = "yes"; then
+@@ -7646,8 +7644,8 @@ if test "$GCC" = "yes"; then
GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'`
case "$GCCVER" in
2.95.[123])
diff --git a/www/squid/patches/patch-an b/www/squid/patches/patch-an
index 556dfccd30f..13bc38ee2db 100644
--- a/www/squid/patches/patch-an
+++ b/www/squid/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.7 2005/06/07 14:19:10 taca Exp $
+$NetBSD: patch-an,v 1.7.2.1 2005/09/10 11:16:41 salo Exp $
---- configure.in.orig 2005-05-17 07:41:14.000000000 +0900
+--- configure.in.orig 2005-09-02 10:23:02.000000000 +0900
+++ configure.in
@@ -493,7 +493,7 @@ AC_ARG_ENABLE(snmp,
[ if test "$enableval" = "yes" ; then
@@ -11,7 +11,11 @@ $NetBSD: patch-an,v 1.7 2005/06/07 14:19:10 taca Exp $
AM_CONDITIONAL(USE_SNMP, true)
SNMP_MAKEFILE=./snmplib/Makefile
makesnmplib=snmplib
-@@ -1282,6 +1282,7 @@ AC_CHECK_HEADERS( \
+@@ -1282,9 +1282,11 @@ AC_CHECK_HEADERS( \
+ ip_fil_compat.h \
+ ip_fil.h \
+ ip_nat.h \
++ ipl.h \
libc.h \
limits.h \
linux/netfilter_ipv4.h \
@@ -19,7 +23,7 @@ $NetBSD: patch-an,v 1.7 2005/06/07 14:19:10 taca Exp $
malloc.h \
math.h \
memory.h \
-@@ -1296,6 +1297,7 @@ AC_CHECK_HEADERS( \
+@@ -1299,6 +1301,7 @@ AC_CHECK_HEADERS( \
netinet/ip_fil_compat.h \
netinet/ip_fil.h \
netinet/ip_nat.h \
@@ -27,7 +31,7 @@ $NetBSD: patch-an,v 1.7 2005/06/07 14:19:10 taca Exp $
openssl/err.h \
openssl/md5.h \
openssl/ssl.h \
-@@ -1507,8 +1509,17 @@ AC_CHECK_TYPE(pid_t, int)
+@@ -1510,8 +1513,17 @@ AC_CHECK_TYPE(pid_t, int)
AC_CHECK_TYPE(size_t, unsigned int)
AC_CHECK_TYPE(ssize_t, int)
AC_CHECK_TYPE(off_t, int)
@@ -47,7 +51,7 @@ $NetBSD: patch-an,v 1.7 2005/06/07 14:19:10 taca Exp $
AC_CHECK_SIZEOF_SYSTYPE(off_t, 4)
AC_CHECK_SIZEOF_SYSTYPE(size_t, 4)
-@@ -1716,8 +1727,8 @@ if test "$GCC" = "yes"; then
+@@ -1719,8 +1731,8 @@ if test "$GCC" = "yes"; then
GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'`
case "$GCCVER" in
[2.95.[123]])
diff --git a/www/squid/patches/patch-ap b/www/squid/patches/patch-ap
new file mode 100644
index 00000000000..9f57f8b3218
--- /dev/null
+++ b/www/squid/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1.2.2 2005/09/10 11:16:41 salo Exp $
+
+--- helpers/basic_auth/MSNT/Makefile.in.orig 2005-03-19 09:55:41.000000000 +0900
++++ helpers/basic_auth/MSNT/Makefile.in
+@@ -383,7 +383,7 @@ info: info-am
+
+ info-am:
+
+-install-data-am: install-data-local
++install-data-am:
+
+ install-exec-am: install-libexecPROGRAMS install-sysconfDATA
+
diff --git a/www/squid/patches/patch-bb b/www/squid/patches/patch-bb
index 89665bde000..e1c3590f47e 100644
--- a/www/squid/patches/patch-bb
+++ b/www/squid/patches/patch-bb
@@ -1,8 +1,18 @@
-$NetBSD: patch-bb,v 1.6 2005/06/07 14:19:10 taca Exp $
+$NetBSD: patch-bb,v 1.6.2.1 2005/09/10 11:16:41 salo Exp $
--- include/autoconf.h.in.orig 2005-04-23 10:32:27.000000000 +0900
+++ include/autoconf.h.in
-@@ -665,6 +665,9 @@
+@@ -656,6 +656,9 @@
+ /* Define if you have the <ip_nat.h> header file. */
+ #undef HAVE_IP_NAT_H
+
++/* Define if you have the <ipl.h> header file. */
++#undef HAVE_IPL_H
++
+ /* Define if you have the <libc.h> header file. */
+ #undef HAVE_LIBC_H
+
+@@ -665,6 +668,9 @@
/* Define if you have the <linux/netfilter_ipv4.h> header file. */
#undef HAVE_LINUX_NETFILTER_IPV4_H
@@ -12,7 +22,7 @@ $NetBSD: patch-bb,v 1.6 2005/06/07 14:19:10 taca Exp $
/* Define if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
-@@ -707,6 +710,9 @@
+@@ -707,6 +713,9 @@
/* Define if you have the <netinet/ip_nat.h> header file. */
#undef HAVE_NETINET_IP_NAT_H
diff --git a/www/squid/patches/patch-cd b/www/squid/patches/patch-cd
index d42ebaf945a..5846cf55b03 100644
--- a/www/squid/patches/patch-cd
+++ b/www/squid/patches/patch-cd
@@ -1,18 +1,20 @@
-$NetBSD: patch-cd,v 1.9 2005/06/07 14:19:10 taca Exp $
+$NetBSD: patch-cd,v 1.9.2.1 2005/09/10 11:16:41 salo Exp $
---- src/client_side.c.orig 2005-04-21 06:46:06.000000000 +0900
+--- src/client_side.c.orig 2005-09-02 10:23:02.000000000 +0900
+++ src/client_side.c
-@@ -41,6 +41,9 @@
+@@ -55,6 +55,11 @@
+ #ifdef _SQUID_SOLARIS_
+ #undef free
#endif
- #include <netinet/tcp.h>
- #include <net/if.h>
-+#if HAVE_NETINET_IPL_H
++#ifdef HAVE_IPL_H
++#include <ipl.h>
++#elif HAVE_NETINET_IPL_H
+#include <netinet/ipl.h>
+#endif
#if HAVE_IP_FIL_COMPAT_H
#include <ip_fil_compat.h>
#elif HAVE_NETINET_IP_FIL_COMPAT_H
-@@ -2589,6 +2592,9 @@ parseHttpRequest(ConnStateData * conn, m
+@@ -2606,6 +2611,9 @@ parseHttpRequest(ConnStateData * conn, m
static int natfd = -1;
static int siocgnatl_cmd = SIOCGNATL & 0xff;
int x;
@@ -22,10 +24,10 @@ $NetBSD: patch-cd,v 1.9 2005/06/07 14:19:10 taca Exp $
#endif
#if PF_TRANSPARENT
struct pfioc_natlook nl;
-@@ -2731,6 +2737,13 @@ parseHttpRequest(ConnStateData * conn, m
- int vport;
+@@ -2748,6 +2756,13 @@ parseHttpRequest(ConnStateData * conn, m
if (vhost_mode) {
#if IPF_TRANSPARENT
+ static time_t last_reported = 0;
+#if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027)
+ obj.ipfo_rev = IPFILTER_VERSION;
+ obj.ipfo_size = sizeof(natLookup);
@@ -36,7 +38,7 @@ $NetBSD: patch-cd,v 1.9 2005/06/07 14:19:10 taca Exp $
natLookup.nl_inport = http->conn->me.sin_port;
natLookup.nl_outport = http->conn->peer.sin_port;
natLookup.nl_inip = http->conn->me.sin_addr;
-@@ -2739,8 +2752,8 @@ parseHttpRequest(ConnStateData * conn, m
+@@ -2756,8 +2771,8 @@ parseHttpRequest(ConnStateData * conn, m
if (natfd < 0) {
int save_errno;
enter_suid();
@@ -47,9 +49,9 @@ $NetBSD: patch-cd,v 1.9 2005/06/07 14:19:10 taca Exp $
#else
natfd = open(IPL_NAT, O_RDONLY, 0);
#endif
-@@ -2756,6 +2769,9 @@ parseHttpRequest(ConnStateData * conn, m
- cbdataFree(http);
- xfree(inbuf);
+@@ -2771,6 +2786,9 @@ parseHttpRequest(ConnStateData * conn, m
+ last_reported = squid_curtime;
+ }
} else {
+#if defined(IPFILTER_VERSION) && (IPFILTER_VERSION >= 4000027)
+ x = ioctl(natfd, SIOCGNATL, &obj);
@@ -57,11 +59,11 @@ $NetBSD: patch-cd,v 1.9 2005/06/07 14:19:10 taca Exp $
/*
* IP-Filter changed the type for SIOCGNATL between
* 3.3 and 3.4. It also changed the cmd value for
-@@ -2769,6 +2785,7 @@ parseHttpRequest(ConnStateData * conn, m
+@@ -2784,6 +2802,7 @@ parseHttpRequest(ConnStateData * conn, m
} else {
x = ioctl(natfd, SIOCGNATL, &natLookup);
}
+#endif
if (x < 0) {
if (errno != ESRCH) {
- debug(50, 1) ("parseHttpRequest: NAT lookup failed: ioctl(SIOCGNATL)\n");
+ if (squid_curtime - last_reported > 60) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 17:36:11 +0000