Mon Jun 1 16:18:20 2015 UTC ()
Fix transparent proxying with IPFilter. Patch submitted to squid mailing
list.


(sborrill)
diff -r1.46 -r1.47 pkgsrc/www/squid3/Makefile
diff -r1.33 -r1.34 pkgsrc/www/squid3/distinfo
diff -r1.6 -r1.7 pkgsrc/www/squid3/patches/patch-configure
cvs diff -r1.46 -r1.47 pkgsrc/www/squid3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/squid3/Attic/Makefile 2015/05/29 07:50:59 1.46
+++ pkgsrc/www/squid3/Attic/Makefile 2015/06/01 16:18:20 1.47
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.46 2015/05/29 07:50:59 adam Exp $ 1# $NetBSD: Makefile,v 1.47 2015/06/01 16:18:20 sborrill Exp $
2 2
3DISTNAME= squid-3.5.5 3DISTNAME= squid-3.5.5
 4PKGREVISION= 1
4CATEGORIES= www 5CATEGORIES= www
5MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \ 6MASTER_SITES= http://www.squid-cache.org/Versions/v3/${PKGVERSION_NOREV:R}/ \
6 ftp://ftp.squid-cache.org/pub/squid/ \ 7 ftp://ftp.squid-cache.org/pub/squid/ \
7 http://ftp.nluug.nl/internet/squid/ 8 http://ftp.nluug.nl/internet/squid/
8EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.squid-cache.org/ 12HOMEPAGE= http://www.squid-cache.org/
12COMMENT= Post-Harvest_cached WWW proxy cache and accelerator 13COMMENT= Post-Harvest_cached WWW proxy cache and accelerator
13LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
14 15
15USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
16USE_TOOLS+= perl:run gmake 17USE_TOOLS+= perl:run gmake
cvs diff -r1.33 -r1.34 pkgsrc/www/squid3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/squid3/Attic/distinfo 2015/05/29 07:50:59 1.33
+++ pkgsrc/www/squid3/Attic/distinfo 2015/06/01 16:18:20 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.33 2015/05/29 07:50:59 adam Exp $ 1$NetBSD: distinfo,v 1.34 2015/06/01 16:18:20 sborrill Exp $
2 2
3SHA1 (squid-3.5.5.tar.xz) = 2c168e8b13251ed8050d9e780127c4de016dcb61 3SHA1 (squid-3.5.5.tar.xz) = 2c168e8b13251ed8050d9e780127c4de016dcb61
4RMD160 (squid-3.5.5.tar.xz) = b08a0f3be548873b14353a96d694e7999e0021d1 4RMD160 (squid-3.5.5.tar.xz) = b08a0f3be548873b14353a96d694e7999e0021d1
5Size (squid-3.5.5.tar.xz) = 2290016 bytes 5Size (squid-3.5.5.tar.xz) = 2290016 bytes
6SHA1 (patch-compat_compat.h) = d6cd93fa7a6d0faad3bf1aca8ae4fa5c984fe288 6SHA1 (patch-compat_compat.h) = d6cd93fa7a6d0faad3bf1aca8ae4fa5c984fe288
7SHA1 (patch-configure) = 4e658ac4722695f52412f77e168f31a2f523bb1b 7SHA1 (patch-configure) = 78ee60a2e9ddc5327c9a055bfedf95f3e8430948
8SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289 8SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
9SHA1 (patch-src_Makefile.in) = 7233a92a4f6ecc06d88e125f08f7413e0741f3b6 9SHA1 (patch-src_Makefile.in) = 7233a92a4f6ecc06d88e125f08f7413e0741f3b6
10SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9 10SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9
11SHA1 (patch-src_base_TidyPointer.h) = d05017d7db904286afb02600ed3cc2f0f253b939 11SHA1 (patch-src_base_TidyPointer.h) = d05017d7db904286afb02600ed3cc2f0f253b939
12SHA1 (patch-src_ip_Intercept.cc) = 80de6ca56d61e389641b35515e3509b264b1950f 12SHA1 (patch-src_ip_Intercept.cc) = 80de6ca56d61e389641b35515e3509b264b1950f
13SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4 13SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4
14SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f 14SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f
cvs diff -r1.6 -r1.7 pkgsrc/www/squid3/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/www/squid3/patches/Attic/patch-configure 2015/05/04 09:13:35 1.6
+++ pkgsrc/www/squid3/patches/Attic/patch-configure 2015/06/01 16:18:20 1.7
@@ -1,24 +1,59 @@ @@ -1,24 +1,59 @@
1$NetBSD: patch-configure,v 1.6 2015/05/04 09:13:35 adam Exp $ 1$NetBSD: patch-configure,v 1.7 2015/06/01 16:18:20 sborrill Exp $
2 2
3* Portability fix. 3* Portability fix.
 4* Fix broken tests for IPFilter
4 5
5--- configure.orig 2015-05-01 11:29:25.000000000 +0000 6--- configure.orig 2015-05-01 12:29:25.000000000 +0100
6+++ configure 7+++ configure 2015-05-29 11:47:07.000000000 +0100
7@@ -32733,7 +32733,7 @@ done 8@@ -32733,7 +32733,7 @@
8 ## Please see the COPYING and CONTRIBUTORS files for details. 9 ## Please see the COPYING and CONTRIBUTORS files for details.
9 ## 10 ##
10  11
11-if test "x$with_krb5" == "xyes"; then 12-if test "x$with_krb5" == "xyes"; then
12+if test "x$with_krb5" = "xyes"; then 13+if test "x$with_krb5" = "xyes"; then
13 BUILD_HELPER="kerberos" 14 BUILD_HELPER="kerberos"
14 fi 15 fi
15  16
16@@ -33292,7 +33292,7 @@ done 17@@ -33292,7 +33292,7 @@
17 ## Please see the COPYING and CONTRIBUTORS files for details. 18 ## Please see the COPYING and CONTRIBUTORS files for details.
18 ## 19 ##
19  20
20-if test "x$with_krb5" == "xyes"; then 21-if test "x$with_krb5" == "xyes"; then
21+if test "x$with_krb5" = "xyes"; then 22+if test "x$with_krb5" = "xyes"; then
22 BUILD_HELPER="kerberos_ldap_group" 23 BUILD_HELPER="kerberos_ldap_group"
23 if test "x$with_apple_krb5" = "xyes" ; then 24 if test "x$with_apple_krb5" = "xyes" ; then
24 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lresolv" >&5 25 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lresolv" >&5
 26@@ -38708,7 +38708,7 @@
 27
 28 { $as_echo "$as_me:${as_lineno-$LINENO}: result: unable to make IPFilter work with netinet/ headers" >&5
 29 $as_echo "unable to make IPFilter work with netinet/ headers" >&6; }
 30-
 31+ squid_cv_broken_ipfilter_minor_t=0
 32 fi
 33 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 34
 35@@ -38751,6 +38751,9 @@
 36 #if HAVE_SYS_IOCCOM_H
 37 #include <sys/ioccom.h>
 38 #endif
 39+#if HAVE_NET_IF_H
 40+#include <net/if.h>
 41+#endif
 42 #if USE_SOLARIS_IPFILTER_MINOR_T_HACK
 43 #undef minor_t
 44 #endif
 45@@ -41022,6 +41025,14 @@
 46 case $ac_option in
 47 # Handling of the options.
 48 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
 49+ : Avoid regenerating within pkgsrc
 50+ exit 0
 51+ : Avoid regenerating within pkgsrc
 52+ exit 0
 53+ : Avoid regenerating within pkgsrc
 54+ exit 0
 55+ : Avoid regenerating within pkgsrc
 56+ exit 0
 57 ac_cs_recheck=: ;;
 58 --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
 59 $as_echo "$ac_cs_version"; exit ;;