diff options
Diffstat (limited to 'www/squid27/patches')
-rw-r--r-- | www/squid27/patches/patch-aa | 13 | ||||
-rw-r--r-- | www/squid27/patches/patch-ab | 55 | ||||
-rw-r--r-- | www/squid27/patches/patch-ac | 108 | ||||
-rw-r--r-- | www/squid27/patches/patch-ad | 16 | ||||
-rw-r--r-- | www/squid27/patches/patch-ae | 20 | ||||
-rw-r--r-- | www/squid27/patches/patch-af | 24 | ||||
-rw-r--r-- | www/squid27/patches/patch-ag | 22 | ||||
-rw-r--r-- | www/squid27/patches/patch-ah | 13 | ||||
-rw-r--r-- | www/squid27/patches/patch-ai | 26 | ||||
-rw-r--r-- | www/squid27/patches/patch-aj | 19 | ||||
-rw-r--r-- | www/squid27/patches/patch-ak | 17 | ||||
-rw-r--r-- | www/squid27/patches/patch-al | 13 |
12 files changed, 346 insertions, 0 deletions
diff --git a/www/squid27/patches/patch-aa b/www/squid27/patches/patch-aa new file mode 100644 index 00000000000..8def0ed92b5 --- /dev/null +++ b/www/squid27/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $ + +--- Makefile.in.orig 2008-01-26 08:24:17.000000000 +0900 ++++ Makefile.in +@@ -726,7 +726,7 @@ dist-hook: + + install-pinger: + chown root $(DEFAULT_PINGER) +- chmod 4711 $(DEFAULT_PINGER) ++ chmod 4511 $(DEFAULT_PINGER) + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: diff --git a/www/squid27/patches/patch-ab b/www/squid27/patches/patch-ab new file mode 100644 index 00000000000..a36912cf9b0 --- /dev/null +++ b/www/squid27/patches/patch-ab @@ -0,0 +1,55 @@ +$NetBSD: patch-ab,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $ + +--- configure.in.orig 2008-06-26 07:18:55.000000000 +0900 ++++ configure.in +@@ -1629,10 +1629,12 @@ AC_CHECK_HEADERS( + linux/netfilter_ipv4.h \ + linux/netfilter_ipv4/ip_tproxy.h \ + malloc.h \ ++ machine/byte_swap.h \ + math.h \ + memory.h \ + mount.h \ + net/if.h \ ++ net/pf/pfvar.h \ + net/pfvar.h \ + netdb.h \ + netinet/if_ether.h \ +@@ -1997,7 +1999,16 @@ AC_CHECK_SYSTYPE(size_t, unsigned int) + AC_CHECK_SYSTYPE(ssize_t, int) + AC_CHECK_SYSTYPE(off_t, int) + AC_CHECK_SYSTYPE(mode_t, unsigned short) +-AC_CHECK_SYSTYPE(fd_mask, int) ++ ++dnl Check for type fd_mask ++AC_CACHE_CHECK(for fd_set,ac_cv_have_fd_mask, [ ++ AC_TRY_COMPILE([#include <sys/types.h> ++#include <sys/time.h> ++#include <sys/unistd.h>], ++ [fd_mask fds;], ++ ac_cv_have_fd_mask="yes", ++ ac_cv_have_fd_mask="no") ++]) + + AC_CHECK_SIZEOF_SYSTYPE(off_t, 4) + AC_CHECK_SIZEOF_SYSTYPE(size_t, 4) +@@ -2292,8 +2303,8 @@ if test "$GCC" = "yes"; then + GCCVER=`$CC -v 2>&1 | awk '$2 == "version" {print $3}'` + case "$GCCVER" in + [2.95.[123]]) +- echo "Removing -O for gcc on $host with GCC $GCCVER" +- CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*//'`" ++ echo "Making -O\[[2-9\]] to -O for gcc on $host with GCC $GCCVER" ++ CFLAGS="`echo $CFLAGS | sed -e 's/-O[[0-9]]*/-O/'`" + ;; + esac + fi +@@ -2689,7 +2700,7 @@ dnl PF support requires a header file. + if test "$PF_TRANSPARENT" ; then + AC_MSG_CHECKING(if PF header file is installed) + # hold on to your hats... +- if test "$ac_cv_header_net_pfvar_h" = "yes"; then ++ if test "$ac_cv_header_net_pfvar_h" = "yes" || test "$ac_cv_header_net_pf_pfvar_h" = "yes"; then + PF_TRANSPARENT="yes" + AC_DEFINE(PF_TRANSPARENT, 1, [Enable support for Transparent Proxy on systems using PF address + redirection. This provides "masquerading" support for OpenBSD.]) diff --git a/www/squid27/patches/patch-ac b/www/squid27/patches/patch-ac new file mode 100644 index 00000000000..4fc7094f56b --- /dev/null +++ b/www/squid27/patches/patch-ac @@ -0,0 +1,108 @@ +$NetBSD: patch-ac,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $ + +--- configure.orig 2008-06-26 07:18:55.000000000 +0900 ++++ configure +@@ -8046,10 +8046,12 @@ for ac_header in sys/types.h \ + linux/netfilter_ipv4.h \ + linux/netfilter_ipv4/ip_tproxy.h \ + malloc.h \ ++ machine/byte_swap.h \ + math.h \ + memory.h \ + mount.h \ + net/if.h \ ++ net/pf/pfvar.h \ + net/pfvar.h \ + netdb.h \ + netinet/if_ether.h \ +@@ -21456,11 +21458,13 @@ _ACEOF + fi + + +-{ echo "$as_me:$LINENO: checking for fd_mask" >&5 +-echo $ECHO_N "checking for fd_mask... $ECHO_C" >&6; } +-if test "${ac_cv_type_fd_mask+set}" = set; then ++ ++{ echo "$as_me:$LINENO: checking for fd_set" >&5 ++echo $ECHO_N "checking for fd_set... $ECHO_C" >&6; } ++if test "${ac_cv_have_fd_mask+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else ++ + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -21468,35 +21472,14 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + +-/* What a mess.. many systems have added the (now standard) bit types +- * in their own ways, so we need to scan a wide variety of headers to +- * find them.. +- */ +-#include <sys/types.h> +-#if STDC_HEADERS +-#include <stdlib.h> +-#include <stddef.h> +-#endif +-#if HAVE_INTTYPES_H +-#include <inttypes.h> +-#endif +-#if HAVE_SYS_TYPES_H + #include <sys/types.h> +-#endif +-#if HAVE_SYS_BITYPES_H +-#include <sys/bitypes.h> +-#endif +- +- ++#include <sys/time.h> ++#include <sys/unistd.h> + typedef fd_mask ac__type_new_; + int + main () + { +-if ((ac__type_new_ *) 0) +- return 0; +-if (sizeof (ac__type_new_)) +- return 0; +- ; ++ac__type_new_ fds; + return 0; + } + _ACEOF +@@ -21517,30 +21500,20 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then +- ac_cv_type_fd_mask=yes ++ ac_cv_have_fd_mask=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_type_fd_mask=no ++ ac_cv_have_fd_mask=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +-fi +-{ echo "$as_me:$LINENO: result: $ac_cv_type_fd_mask" >&5 +-echo "${ECHO_T}$ac_cv_type_fd_mask" >&6; } +-if test $ac_cv_type_fd_mask = yes; then +- : +-else +- +-cat >>confdefs.h <<_ACEOF +-#define fd_mask int +-_ACEOF + + fi + +- +- ++{ echo "$as_me:$LINENO: result: $ac_cv_have_fd_mask" >&5 ++echo "${ECHO_T}$ac_cv_have_fd_mask" >&6; } + + { echo "$as_me:$LINENO: checking for off_t" >&5 + echo $ECHO_N "checking for off_t... $ECHO_C" >&6; } diff --git a/www/squid27/patches/patch-ad b/www/squid27/patches/patch-ad new file mode 100644 index 00000000000..0c5a3d39f8c --- /dev/null +++ b/www/squid27/patches/patch-ad @@ -0,0 +1,16 @@ +$NetBSD: patch-ad,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $ + +--- helpers/basic_auth/MSNT/Makefile.in.orig 2007-11-12 10:13:58.000000000 +0900 ++++ helpers/basic_auth/MSNT/Makefile.in +@@ -530,9 +530,9 @@ info: info-am + + info-am: + +-install-data-am: install-data-local ++install-data-am: + +-install-exec-am: install-libexecPROGRAMS install-sysconfDATA ++install-exec-am: install-libexecPROGRAMS + + install-info: install-info-am + diff --git a/www/squid27/patches/patch-ae b/www/squid27/patches/patch-ae new file mode 100644 index 00000000000..4a74401f807 --- /dev/null +++ b/www/squid27/patches/patch-ae @@ -0,0 +1,20 @@ +$NetBSD: patch-ae,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $ + +--- helpers/ntlm_auth/SMB/smbval/smblib-util.c.orig 2005-05-18 01:56:33.000000000 +0900 ++++ helpers/ntlm_auth/SMB/smbval/smblib-util.c +@@ -60,6 +60,7 @@ static char *SMB_Prots[] = + "NT LANMAN 1.0", + NULL}; + ++#if 0 + /* Print out an SMB pkt in all its gory detail ... */ + + void +@@ -78,6 +79,7 @@ SMB_Print_Pkt(FILE fd, RFCNB_Pkt * pkt, + /* etc */ + + } ++#endif + + /* Convert a DOS Date_Time to a local host type date time for printing */ + diff --git a/www/squid27/patches/patch-af b/www/squid27/patches/patch-af new file mode 100644 index 00000000000..beeec712699 --- /dev/null +++ b/www/squid27/patches/patch-af @@ -0,0 +1,24 @@ +$NetBSD: patch-af,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $ + +--- include/autoconf.h.in.orig 2008-06-05 09:18:07.000000000 +0900 ++++ include/autoconf.h.in +@@ -243,6 +243,9 @@ + /* Define to 1 if you have the `lrand48' function. */ + #undef HAVE_LRAND48 + ++/* Define if you have the <machine/byte_swap.h> header file. */ ++#undef HAVE_MACHINE_BYTE_SWAP_H ++ + /* Define to 1 if you have the `mallinfo' function. */ + #undef HAVE_MALLINFO + +@@ -324,6 +327,9 @@ + /* Define to 1 if you have the <net/pfvar.h> header file. */ + #undef HAVE_NET_PFVAR_H + ++/* Define to 1 if you have the <net/pf/pfvar.h> header file. */ ++#undef HAVE_NET_PF_PFVAR_H ++ + /* Define to 1 if you have the <nss_common.h> header file. */ + #undef HAVE_NSS_COMMON_H + diff --git a/www/squid27/patches/patch-ag b/www/squid27/patches/patch-ag new file mode 100644 index 00000000000..d5cbded3349 --- /dev/null +++ b/www/squid27/patches/patch-ag @@ -0,0 +1,22 @@ +$NetBSD: patch-ag,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $ + +--- include/ntlmauth.h.orig 2007-03-04 03:25:31.000000000 +0900 ++++ include/ntlmauth.h +@@ -70,6 +70,9 @@ + #define bswap16(x) bswap_16(x) + #define bswap32(x) bswap_32(x) + #else /* HAVE_BISTWAP_H */ ++#ifdef HAVE_MACHINE_BYTE_SWAP_H ++#include <machine/byte_swap.h> ++#else /* HAVE_MACHINE_BYTE_SWAP_H */ + #ifndef bswap16 + #define bswap16(x) (((((u_int16_t)x) >> 8) & 0xff) | ((((u_int16_t)x) & 0xff) << 8)) + #endif +@@ -78,6 +81,7 @@ + (((((u_int32_t)x) & 0xff000000) >> 24) | ((((u_int32_t)x) & 0x00ff0000) >> 8) | \ + ((((u_int32_t)x) & 0x0000ff00) << 8) | ((((u_int32_t)x) & 0x000000ff) << 24)) + #endif ++#endif /* HAVE_MACHINE_BYTE_SWAP_H */ + #endif /* HAVE_BITSWAP_H */ + + /* Used internally. Microsoft seems to think this is right, I believe them. diff --git a/www/squid27/patches/patch-ah b/www/squid27/patches/patch-ah new file mode 100644 index 00000000000..682090d2449 --- /dev/null +++ b/www/squid27/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $ + +--- scripts/Makefile.in.orig 2007-11-12 10:14:20.000000000 +0900 ++++ scripts/Makefile.in +@@ -386,7 +386,7 @@ info-am: + + install-data-am: + +-install-exec-am: install-binSCRIPTS ++install-exec-am: + + install-info: install-info-am + diff --git a/www/squid27/patches/patch-ai b/www/squid27/patches/patch-ai new file mode 100644 index 00000000000..d5957c1196f --- /dev/null +++ b/www/squid27/patches/patch-ai @@ -0,0 +1,26 @@ +$NetBSD: patch-ai,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $ + +--- src/Makefile.in.orig 2008-01-03 10:16:40.000000000 +0900 ++++ src/Makefile.in +@@ -657,7 +657,7 @@ 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 +-DEFAULT_PID_FILE = $(DEFAULT_LOG_PREFIX)/squid.pid ++DEFAULT_PID_FILE = $(VARBASE)/run/squid.pid + DEFAULT_NETDB_FILE = $(DEFAULT_LOG_PREFIX)/netdb.state + DEFAULT_SWAP_DIR = $(localstatedir)/cache + DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'` +@@ -1190,10 +1190,9 @@ info: info-recursive + + info-am: + +-install-data-am: install-data-local install-dataDATA ++install-data-am: install-dataDATA + +-install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS \ +- install-sysconfDATA ++install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS + + install-info: install-info-recursive + diff --git a/www/squid27/patches/patch-aj b/www/squid27/patches/patch-aj new file mode 100644 index 00000000000..8e0cdd069f6 --- /dev/null +++ b/www/squid27/patches/patch-aj @@ -0,0 +1,19 @@ +$NetBSD: patch-aj,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $ + +--- src/cf.data.pre.orig 2008-06-25 07:54:18.000000000 +0900 ++++ src/cf.data.pre +@@ -3753,12 +3753,12 @@ DOC_END + + NAME: cache_effective_user + TYPE: string +-DEFAULT: nobody ++DEFAULT: @USER@ + LOC: Config.effectiveUser + DOC_START + If you start Squid as root, it will change its effective/real + UID/GID to the user specified below. The default is to change +- to UID to nobody. If you define cache_effective_user, but not ++ to UID to @USER@. If you define cache_effective_user, but not + cache_effective_group, Squid sets the GID to the effective + user's default group ID (taken from the password file) and + supplementary group list from the from groups membership of diff --git a/www/squid27/patches/patch-ak b/www/squid27/patches/patch-ak new file mode 100644 index 00000000000..244a72d8ebc --- /dev/null +++ b/www/squid27/patches/patch-ak @@ -0,0 +1,17 @@ +$NetBSD: patch-ak,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $ + +--- src/client_side.c.orig 2008-06-25 07:54:47.000000000 +0900 ++++ src/client_side.c +@@ -88,7 +88,12 @@ + #include <sys/fcntl.h> + #include <net/if.h> + #include <netinet/in.h> ++#ifdef HAVE_NET_PF_PFVAR_H ++#include <net/pf/pfvar.h> ++#endif /* HAVE_NET_PF_PFVAR_H */ ++#ifdef HAVE_NET_PFVAR_H + #include <net/pfvar.h> ++#endif /* HAVE_NET_PFVAR_H */ + #endif + + #if LINUX_NETFILTER diff --git a/www/squid27/patches/patch-al b/www/squid27/patches/patch-al new file mode 100644 index 00000000000..5f96ba67d76 --- /dev/null +++ b/www/squid27/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.1.1.1 2008/09/12 15:02:47 taca Exp $ + +--- tools/Makefile.in.orig 2007-11-12 10:14:28.000000000 +0900 ++++ tools/Makefile.in +@@ -737,7 +737,7 @@ info: info-recursive + + info-am: + +-install-data-am: install-data-local ++install-data-am: + + install-exec-am: install-binPROGRAMS install-libexecPROGRAMS + |