Sun Oct 16 15:58:15 2016 UTC ()
Fix build problem with squid-ipf PKG_OPTIONS.


(taca)
diff -r1.55 -r1.56 pkgsrc/www/squid3/distinfo
diff -r0 -r1.7 pkgsrc/www/squid3/patches/patch-src_ip_Intercept.cc
cvs diff -r1.55 -r1.56 pkgsrc/www/squid3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/squid3/Attic/distinfo 2016/10/10 09:01:39 1.55
+++ pkgsrc/www/squid3/Attic/distinfo 2016/10/16 15:58:14 1.56
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: distinfo,v 1.55 2016/10/10 09:01:39 adam Exp $ 1$NetBSD: distinfo,v 1.56 2016/10/16 15:58:14 taca Exp $
2 2
3SHA1 (squid-3.5.22.tar.xz) = 73e9199dd9d2a7f107f78d03454830713a4a571d 3SHA1 (squid-3.5.22.tar.xz) = 73e9199dd9d2a7f107f78d03454830713a4a571d
4RMD160 (squid-3.5.22.tar.xz) = 0a9e5545ae8fa20c5d9f97cfc3548c0e07c86ee4 4RMD160 (squid-3.5.22.tar.xz) = 0a9e5545ae8fa20c5d9f97cfc3548c0e07c86ee4
5SHA512 (squid-3.5.22.tar.xz) = 40925c8b4d7b05a580397b1adf24457b66514eea2e05c0685251370aea3e48e0ac52b36ec9ec5ef5b1564ac46fec89bc8842e24cced413b9f3b24eb7778f6ba5 5SHA512 (squid-3.5.22.tar.xz) = 40925c8b4d7b05a580397b1adf24457b66514eea2e05c0685251370aea3e48e0ac52b36ec9ec5ef5b1564ac46fec89bc8842e24cced413b9f3b24eb7778f6ba5
6Size (squid-3.5.22.tar.xz) = 2324164 bytes 6Size (squid-3.5.22.tar.xz) = 2324164 bytes
7SHA1 (patch-compat_compat.h) = d6cd93fa7a6d0faad3bf1aca8ae4fa5c984fe288 7SHA1 (patch-compat_compat.h) = d6cd93fa7a6d0faad3bf1aca8ae4fa5c984fe288
8SHA1 (patch-compat_debug.cc) = 95fc0aa6901834175b9bbf1ddb51eeb7d9ddc8c7 8SHA1 (patch-compat_debug.cc) = 95fc0aa6901834175b9bbf1ddb51eeb7d9ddc8c7
9SHA1 (patch-compat_debug.h) = a828871704b1578b520d412393c3d398099a5fdc 9SHA1 (patch-compat_debug.h) = a828871704b1578b520d412393c3d398099a5fdc
10SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289 10SHA1 (patch-errors_Makefile.in) = afbac822ac84d5e1734d55fc625e949ae0b85289
11SHA1 (patch-src_Makefile.in) = 7233a92a4f6ecc06d88e125f08f7413e0741f3b6 11SHA1 (patch-src_Makefile.in) = 7233a92a4f6ecc06d88e125f08f7413e0741f3b6
12SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9 12SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9
13SHA1 (patch-src_adaptation_ecap_ServiceRep.cc) = 246bc60bf2b06ddd99cacf59ae99dcbeee7365c2 13SHA1 (patch-src_adaptation_ecap_ServiceRep.cc) = 246bc60bf2b06ddd99cacf59ae99dcbeee7365c2
14SHA1 (patch-src_base_TidyPointer.h) = d05017d7db904286afb02600ed3cc2f0f253b939 14SHA1 (patch-src_base_TidyPointer.h) = d05017d7db904286afb02600ed3cc2f0f253b939
 15SHA1 (patch-src_ip_Intercept.cc) = c5fecf0adbc7b8a7c254ab70eb8ee8ee6cf058c8
15SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4 16SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4
16SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f 17SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f
File Added: pkgsrc/www/squid3/patches/Attic/patch-src_ip_Intercept.cc
$NetBSD: patch-src_ip_Intercept.cc,v 1.7 2016/10/16 15:58:15 taca Exp $

Fix build problem when PKG_OPTIONS contains squid-ipf.

--- src/ip/Intercept.cc.orig	2016-10-09 19:58:01.000000000 +0000
+++ src/ip/Intercept.cc
@@ -25,6 +25,9 @@
 #define IPFILTER_VERSION        5000004
 #endif
 
+#if HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
 #if HAVE_SYS_IOCCOM_H
 #include <sys/ioccom.h>
 #endif