diff options
author | taca <taca> | 2005-06-07 14:19:10 +0000 |
---|---|---|
committer | taca <taca> | 2005-06-07 14:19:10 +0000 |
commit | 47cfa58dbf36aec9312e5df46bd733fc8121aef7 (patch) | |
tree | eb586fd980e844371fabe342392c4dbdfb4f992f /www/squid | |
parent | bf24caa7e16dd3f103e519e1bef8236e23bbf016 (diff) | |
download | pkgsrc-47cfa58dbf36aec9312e5df46bd733fc8121aef7.tar.gz |
- Fix build problem with IP Filter prior to 4.0; NetBSD 1.6.2.
- Avoid use of ":ts" modifier of make(1) since NetBSD 1.6.2's make(1)
dosen't support it. It might be fix "diskd" PKG_OPTION problem, too.
- Remove extra "--enable-async-io" configure option.
No PKGREVISION change.
Diffstat (limited to 'www/squid')
-rw-r--r-- | www/squid/Makefile | 5 | ||||
-rw-r--r-- | www/squid/distinfo | 10 | ||||
-rw-r--r-- | www/squid/options.mk | 12 | ||||
-rw-r--r-- | www/squid/patches/patch-ag | 14 | ||||
-rw-r--r-- | www/squid/patches/patch-an | 20 | ||||
-rw-r--r-- | www/squid/patches/patch-bb | 16 | ||||
-rw-r--r-- | www/squid/patches/patch-cd | 16 |
7 files changed, 60 insertions, 33 deletions
diff --git a/www/squid/Makefile b/www/squid/Makefile index e094e4b9ca0..92c6e160f9e 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.152 2005/06/05 14:20:25 taca Exp $ +# $NetBSD: Makefile,v 1.153 2005/06/07 14:19:10 taca Exp $ DISTNAME= squid-2.5.STABLE10 PKGNAME= squid-2.5.10 @@ -63,9 +63,8 @@ CONFIGURE_ARGS+= --enable-auth=basic,digest,ntlm \ --enable-delay-pools \ --enable-removal-policies=lru,heap \ --enable-poll \ - --enable-async-io=5 \ --enable-underscores \ - --enable-storeio=${SQUID_BACKEND} + --enable-storeio=${SQUID_BACKEND:Q} # # generic helpers diff --git a/www/squid/distinfo b/www/squid/distinfo index 143075f5217..0aaa40fe3a9 100644 --- a/www/squid/distinfo +++ b/www/squid/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.98 2005/06/05 14:20:26 taca Exp $ +$NetBSD: distinfo,v 1.99 2005/06/07 14:19:10 taca Exp $ SHA1 (squid-2.5.10-2005060500/squid-2.5.STABLE10.tar.bz2) = a0092570938032f66e7f636d1a6a02dd2383a643 RMD160 (squid-2.5.10-2005060500/squid-2.5.STABLE10.tar.bz2) = e1409a2fcd52e1c928d74740c98396886b5ef927 @@ -11,11 +11,11 @@ SHA1 (patch-ab) = 1224ba4cee98a26d2c9d670eb6d57c6187ff2d56 SHA1 (patch-ac) = 1b283f0a573c02c82ce26f75e67d19b1ec5ff9f0 SHA1 (patch-ad) = 88b46bc9051ea32ebd74f06ebd362ce16f8c5c4c SHA1 (patch-ae) = 860c8ad41ea09282bdb0d626260084354458f653 -SHA1 (patch-ag) = 599a87a5f3ca0be1f89b7ec971c4a6aa36821d8a +SHA1 (patch-ag) = e0874f435b1741f9fbc88170198c4f1102ab1798 SHA1 (patch-aj) = aa2271e53602fe168604aeced6ed66d28fe47707 SHA1 (patch-ak) = 108b313149271457bee702ecf9489c61715ec9e7 SHA1 (patch-al) = 51d7c84b007ab9600ae911e1e9206cf91b937120 -SHA1 (patch-an) = febe1a78dfbda5caebe5a9f16af6da1e1a9e79ca -SHA1 (patch-bb) = cc0486eaf27f5796d83041e6b7a9562a134d8063 +SHA1 (patch-an) = 8c9fc0f542859341fe1790dd70be7e624d46fe99 +SHA1 (patch-bb) = 0fbd2ce31546289edad3b1e5ea5de408d359d3a1 SHA1 (patch-bc) = 536299e59c396829f23484a14bb9a6f5c0a4de35 -SHA1 (patch-cd) = 657556f6d57f0a4ef01b2439714a4c1bceb04ef2 +SHA1 (patch-cd) = c58d741b140be632ce3857a86e304f21f7c06e96 diff --git a/www/squid/options.mk b/www/squid/options.mk index 8fe9ea5c808..944c8adf94d 100644 --- a/www/squid/options.mk +++ b/www/squid/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2005/06/06 01:51:13 taca Exp $ +# $NetBSD: options.mk,v 1.3 2005/06/07 14:19:10 taca Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.squid PKG_SUPPORTED_OPTIONS= icmp pam-helper snmp ssl aufs @@ -42,7 +42,7 @@ PKG_SUPPORTED_OPTIONS+= arp-acl .include "../../mk/bsd.options.mk" -SQUID_BACKEND?= ufs,null +SQUID_BACKEND?= ufs null SQUID_BASIC_AUTH_HELPERS?= getpwnam MSNT NCSA YP winbind SQUID_DIGEST_AUTH_HELPERS?= password SQUID_NTLM_AUTH_HELPERS?= fakeauth SMB @@ -89,17 +89,17 @@ SQUID_BACKEND+= diskd .endif .if !empty(SQUID_BASIC_AUTH_HELPERS) -CONFIGURE_ARGS+= --enable-basic-auth-helpers=${SQUID_BASIC_AUTH_HELPERS:ts,} +CONFIGURE_ARGS+= --enable-basic-auth-helpers=${SQUID_BASIC_AUTH_HELPERS:Q} .endif .if !empty(SQUID_DIGEST_AUTH_HELPERS) -CONFIGURE_ARGS+= --enable-digest-auth-helpers=${SQUID_DIGEST_AUTH_HELPERS:ts,} +CONFIGURE_ARGS+= --enable-digest-auth-helpers=${SQUID_DIGEST_AUTH_HELPERS:Q} .endif .if !empty(SQUID_NTLM_AUTH_HELPERS) -CONFIGURE_ARGS+= --enable-ntlm-auth-helpers=${SQUID_NTLM_AUTH_HELPERS:ts,} +CONFIGURE_ARGS+= --enable-ntlm-auth-helpers=${SQUID_NTLM_AUTH_HELPERS:Q} .endif .if !empty(SQUID_EXTERNAL_ACL_HELPERS) -CONFIGURE_ARGS+= --enable-external-acl-helpers=${SQUID_EXTERNAL_ACL_HELPERS:ts,} +CONFIGURE_ARGS+= --enable-external-acl-helpers=${SQUID_EXTERNAL_ACL_HELPERS:Q} .endif diff --git a/www/squid/patches/patch-ag b/www/squid/patches/patch-ag index 75345474d14..ae06407cb81 100644 --- a/www/squid/patches/patch-ag +++ b/www/squid/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.18 2005/06/05 14:20:27 taca Exp $ +$NetBSD: patch-ag,v 1.19 2005/06/07 14:19:10 taca Exp $ --- configure.orig 2005-05-17 07:41:14.000000000 +0900 +++ configure @@ -19,7 +19,15 @@ $NetBSD: patch-ag,v 1.18 2005/06/05 14:20:27 taca Exp $ malloc.h \ math.h \ memory.h \ -@@ -6291,43 +6292,38 @@ fi +@@ -4060,6 +4061,7 @@ for ac_hdr in \ + netinet/ip_fil_compat.h \ + netinet/ip_fil.h \ + netinet/ip_nat.h \ ++ netinet/ipl.h \ + openssl/err.h \ + openssl/md5.h \ + openssl/ssl.h \ +@@ -6291,43 +6293,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 @@ -77,7 +85,7 @@ $NetBSD: patch-ag,v 1.18 2005/06/05 14:20:27 taca Exp $ echo $ac_n "checking size of off_t""... $ac_c" 1>&6 -@@ -7643,8 +7639,8 @@ if test "$GCC" = "yes"; then +@@ -7643,8 +7640,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 62fc97bd5ff..556dfccd30f 100644 --- a/www/squid/patches/patch-an +++ b/www/squid/patches/patch-an @@ -1,8 +1,8 @@ -$NetBSD: patch-an,v 1.6 2004/10/13 15:35:55 taca Exp $ +$NetBSD: patch-an,v 1.7 2005/06/07 14:19:10 taca Exp $ ---- configure.in.orig 2004-10-12 05:27:03.000000000 +0900 +--- configure.in.orig 2005-05-17 07:41:14.000000000 +0900 +++ configure.in -@@ -489,7 +489,7 @@ AC_ARG_ENABLE(snmp, +@@ -493,7 +493,7 @@ AC_ARG_ENABLE(snmp, [ if test "$enableval" = "yes" ; then echo "SNMP monitoring enabled" AC_DEFINE(SQUID_SNMP) @@ -11,7 +11,7 @@ $NetBSD: patch-an,v 1.6 2004/10/13 15:35:55 taca Exp $ AM_CONDITIONAL(USE_SNMP, true) SNMP_MAKEFILE=./snmplib/Makefile makesnmplib=snmplib -@@ -1209,6 +1209,7 @@ AC_CHECK_HEADERS( \ +@@ -1282,6 +1282,7 @@ AC_CHECK_HEADERS( \ libc.h \ limits.h \ linux/netfilter_ipv4.h \ @@ -19,7 +19,15 @@ $NetBSD: patch-an,v 1.6 2004/10/13 15:35:55 taca Exp $ malloc.h \ math.h \ memory.h \ -@@ -1434,8 +1435,17 @@ AC_CHECK_TYPE(pid_t, int) +@@ -1296,6 +1297,7 @@ AC_CHECK_HEADERS( \ + netinet/ip_fil_compat.h \ + netinet/ip_fil.h \ + netinet/ip_nat.h \ ++ netinet/ipl.h \ + openssl/err.h \ + openssl/md5.h \ + openssl/ssl.h \ +@@ -1507,8 +1509,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) @@ -39,7 +47,7 @@ $NetBSD: patch-an,v 1.6 2004/10/13 15:35:55 taca Exp $ AC_CHECK_SIZEOF_SYSTYPE(off_t, 4) AC_CHECK_SIZEOF_SYSTYPE(size_t, 4) -@@ -1639,8 +1649,8 @@ if test "$GCC" = "yes"; then +@@ -1716,8 +1727,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-bb b/www/squid/patches/patch-bb index e8503d2e199..89665bde000 100644 --- a/www/squid/patches/patch-bb +++ b/www/squid/patches/patch-bb @@ -1,8 +1,8 @@ -$NetBSD: patch-bb,v 1.5 2004/10/13 15:35:55 taca Exp $ +$NetBSD: patch-bb,v 1.6 2005/06/07 14:19:10 taca Exp $ ---- include/autoconf.h.in.orig 2004-08-09 22:55:49.000000000 +0900 +--- include/autoconf.h.in.orig 2005-04-23 10:32:27.000000000 +0900 +++ include/autoconf.h.in -@@ -659,6 +659,9 @@ +@@ -665,6 +665,9 @@ /* Define if you have the <linux/netfilter_ipv4.h> header file. */ #undef HAVE_LINUX_NETFILTER_IPV4_H @@ -12,3 +12,13 @@ $NetBSD: patch-bb,v 1.5 2004/10/13 15:35:55 taca Exp $ /* Define if you have the <malloc.h> header file. */ #undef HAVE_MALLOC_H +@@ -707,6 +710,9 @@ + /* Define if you have the <netinet/ip_nat.h> header file. */ + #undef HAVE_NETINET_IP_NAT_H + ++/* Define if you have the <netinet/ipl.h> header file. */ ++#undef HAVE_NETINET_IPL_H ++ + /* Define if you have the <netinet/tcp.h> header file. */ + #undef HAVE_NETINET_TCP_H + diff --git a/www/squid/patches/patch-cd b/www/squid/patches/patch-cd index 6e15deef08c..d42ebaf945a 100644 --- a/www/squid/patches/patch-cd +++ b/www/squid/patches/patch-cd @@ -1,16 +1,18 @@ -$NetBSD: patch-cd,v 1.8 2005/06/05 14:20:27 taca Exp $ +$NetBSD: patch-cd,v 1.9 2005/06/07 14:19:10 taca Exp $ --- src/client_side.c.orig 2005-04-21 06:46:06.000000000 +0900 +++ src/client_side.c -@@ -41,6 +41,7 @@ +@@ -41,6 +41,9 @@ #endif #include <netinet/tcp.h> #include <net/if.h> ++#if 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 +2590,9 @@ parseHttpRequest(ConnStateData * conn, m +@@ -2589,6 +2592,9 @@ parseHttpRequest(ConnStateData * conn, m static int natfd = -1; static int siocgnatl_cmd = SIOCGNATL & 0xff; int x; @@ -20,7 +22,7 @@ $NetBSD: patch-cd,v 1.8 2005/06/05 14:20:27 taca Exp $ #endif #if PF_TRANSPARENT struct pfioc_natlook nl; -@@ -2731,6 +2735,13 @@ parseHttpRequest(ConnStateData * conn, m +@@ -2731,6 +2737,13 @@ parseHttpRequest(ConnStateData * conn, m int vport; if (vhost_mode) { #if IPF_TRANSPARENT @@ -34,7 +36,7 @@ $NetBSD: patch-cd,v 1.8 2005/06/05 14:20:27 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 +2750,8 @@ parseHttpRequest(ConnStateData * conn, m +@@ -2739,8 +2752,8 @@ parseHttpRequest(ConnStateData * conn, m if (natfd < 0) { int save_errno; enter_suid(); @@ -45,7 +47,7 @@ $NetBSD: patch-cd,v 1.8 2005/06/05 14:20:27 taca Exp $ #else natfd = open(IPL_NAT, O_RDONLY, 0); #endif -@@ -2756,6 +2767,9 @@ parseHttpRequest(ConnStateData * conn, m +@@ -2756,6 +2769,9 @@ parseHttpRequest(ConnStateData * conn, m cbdataFree(http); xfree(inbuf); } else { @@ -55,7 +57,7 @@ $NetBSD: patch-cd,v 1.8 2005/06/05 14:20:27 taca Exp $ /* * IP-Filter changed the type for SIOCGNATL between * 3.3 and 3.4. It also changed the cmd value for -@@ -2769,6 +2783,7 @@ parseHttpRequest(ConnStateData * conn, m +@@ -2769,6 +2785,7 @@ parseHttpRequest(ConnStateData * conn, m } else { x = ioctl(natfd, SIOCGNATL, &natLookup); } |