CVS commit: pkgsrc/www/squid3

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Oct 16 15:58:15 UTC 2016

Modified Files:
        pkgsrc/www/squid3: distinfo
Added Files:
        pkgsrc/www/squid3/patches: patch-src_ip_Intercept.cc

Log Message:
Fix build problem with squid-ipf PKG_OPTIONS.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/www/squid3/distinfo
cvs rdiff -u -r0 -r1.7 pkgsrc/www/squid3/patches/patch-src_ip_Intercept.cc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/squid3/distinfo
diff -u pkgsrc/www/squid3/distinfo:1.55 pkgsrc/www/squid3/distinfo:1.56
--- pkgsrc/www/squid3/distinfo:1.55     Mon Oct 10 09:01:39 2016
+++ pkgsrc/www/squid3/distinfo  Sun Oct 16 15:58:14 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.55 2016/10/10 09:01:39 adam Exp $
+$NetBSD: distinfo,v 1.56 2016/10/16 15:58:14 taca Exp $
 
 SHA1 (squid-3.5.22.tar.xz) = 73e9199dd9d2a7f107f78d03454830713a4a571d
 RMD160 (squid-3.5.22.tar.xz) = 0a9e5545ae8fa20c5d9f97cfc3548c0e07c86ee4
@@ -12,5 +12,6 @@ SHA1 (patch-src_Makefile.in) = 7233a92a4
 SHA1 (patch-src_SquidNew.cc) = eef6e72e168cf7f40518fab13dc2f55ed0268db9
 SHA1 (patch-src_adaptation_ecap_ServiceRep.cc) = 246bc60bf2b06ddd99cacf59ae99dcbeee7365c2
 SHA1 (patch-src_base_TidyPointer.h) = d05017d7db904286afb02600ed3cc2f0f253b939
+SHA1 (patch-src_ip_Intercept.cc) = c5fecf0adbc7b8a7c254ab70eb8ee8ee6cf058c8
 SHA1 (patch-src_store.cc) = 055d98a59103b02a51876a5c8ffed9514954beb4
 SHA1 (patch-tools_Makefile.in) = 3a7678c63a11a35fabef091a3b18e63859f0796f

Added files:

Index: pkgsrc/www/squid3/patches/patch-src_ip_Intercept.cc
diff -u /dev/null pkgsrc/www/squid3/patches/patch-src_ip_Intercept.cc:1.7
--- /dev/null   Sun Oct 16 15:58:15 2016
+++ pkgsrc/www/squid3/patches/patch-src_ip_Intercept.cc Sun Oct 16 15:58:15 2016
@@ -0,0 +1,16 @@
+$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