c-icap-modules-0.4.4 changes

The X-Violations-Found does not send when clamav or clamd engines are used
Fix possible c-icap crashes, when big files are disinfected

7 files changed, 40 insertions, 20 deletions

diff --git a/www/c-icap-modules/Makefile b/www/c-icap-modules/Makefile
index 2479d816e28..2bb494c4711 100644
--- a/www/c-icap-modules/Makefile
+++ b/www/c-icap-modules/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2016/03/05 11:29:35 jperkin Exp $
+# $NetBSD: Makefile,v 1.10 2017/02/06 14:15:18 adam Exp $
 
-DISTNAME=	c_icap_modules-0.3.2
+DISTNAME=	c_icap_modules-0.4.4
 PKGNAME=	${DISTNAME:S/_/-/g}
-PKGREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=c-icap/}
 
@@ -26,6 +25,7 @@ post-install:
 
 .include "options.mk"
 
+.include "../../devel/libltdl/buildlink3.mk"
 .include "../../www/c-icap/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/www/c-icap-modules/PLIST b/www/c-icap-modules/PLIST
index b650b03b648..159e34fba66 100644
--- a/www/c-icap-modules/PLIST
+++ b/www/c-icap-modules/PLIST
@@ -1,14 +1,17 @@
-@comment $NetBSD: PLIST,v 1.3 2015/06/12 23:40:16 taca Exp $
+@comment $NetBSD: PLIST,v 1.4 2017/02/06 14:15:18 adam Exp $
 bin/c-icap-mods-sguardDB
 ${PLIST.clamav}lib/c_icap/clamav_mod.la
 ${PLIST.clamav}lib/c_icap/clamd_mod.la
+lib/c_icap/srv_content_filtering.la
 lib/c_icap/srv_url_check.la
 ${PLIST.clamav}lib/c_icap/virus_scan.la
 man/man8/c-icap-mods-sguardDB.8
 ${PLIST.clamav}share/c-icap/clamav_mod.conf.default
 ${PLIST.clamav}share/c-icap/clamd_mod.conf.default
+share/c-icap/srv_content_filtering.conf.default
 share/c-icap/srv_url_check.conf.default
 ${PLIST.clamav}share/c-icap/virus_scan.conf.default
+share/c_icap/templates/srv_content_filtering/en/BLOCK
 share/c_icap/templates/srv_url_check/en/DENY
 ${PLIST.clamav}share/c_icap/templates/virus_scan/en/VIRUS_FOUND
 ${PLIST.clamav}share/c_icap/templates/virus_scan/en/VIR_MODE_HEAD
diff --git a/www/c-icap-modules/distinfo b/www/c-icap-modules/distinfo
index c522cdd54bf..4f8d257e27b 100644
--- a/www/c-icap-modules/distinfo
+++ b/www/c-icap-modules/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 02:46:50 agc Exp $
+$NetBSD: distinfo,v 1.7 2017/02/06 14:15:18 adam Exp $
 
-SHA1 (c_icap_modules-0.3.2.tar.gz) = 98dd7b3bf40b8831e297ffa8c4e1eaf7cef57cd0
-RMD160 (c_icap_modules-0.3.2.tar.gz) = dfbce2a53e9b8d79ac7ad756cbad26881a1c6488
-SHA512 (c_icap_modules-0.3.2.tar.gz) = 9143ca5a2bbd6b6046eea073b6ec78e61967c4dbbdfee9d87f31add984f795eb3f053d7cc3c6c5ed75517be202a70c09b47b3c40ca771176bb77a91d9d76ceed
-Size (c_icap_modules-0.3.2.tar.gz) = 384788 bytes
-SHA1 (patch-configure) = f38098a56ae58ae89a5850dad176b539cf034836
-SHA1 (patch-services_url_check_Makefile.in) = 9cb97ef3441ab4fb0346a96aff2b8f635c66ec11
-SHA1 (patch-services_virus_scan_Makefile.in) = 367f8de33f664447d815180f7a1e805c591198e1
+SHA1 (c_icap_modules-0.4.4.tar.gz) = 87cda48500107a58ada1abcb16907f7f4862ca36
+RMD160 (c_icap_modules-0.4.4.tar.gz) = 6e68ed062a59248c6ac0d21068a33dfd277f9027
+SHA512 (c_icap_modules-0.4.4.tar.gz) = 3374dff7e3275ef7da7d727d098ca7bb17b401379e9f88ac5a6e6f7475b3a0859d1d4f5ac9037d35babf5079dd0a7893c9975a005c97cbd209699b04a4a6b76b
+Size (c_icap_modules-0.4.4.tar.gz) = 429224 bytes
+SHA1 (patch-configure) = c3db6a813132d052cb07008da5caa23e8e4a7dce
+SHA1 (patch-services_content__filtering_Makefile.in) = 665d10b59f2f26be7568a6f476db0fe7e64b58e1
+SHA1 (patch-services_url_check_Makefile.in) = e9a7caa1ab388fc49b36dcd199e124f058ca8300
+SHA1 (patch-services_virus_scan_Makefile.in) = c9ebb1986d0a36151eb949546ad6ad6fabb1108f
diff --git a/www/c-icap-modules/patches/patch-configure b/www/c-icap-modules/patches/patch-configure
index 3c7b7812bae..6c3f50a6d13 100644
--- a/www/c-icap-modules/patches/patch-configure
+++ b/www/c-icap-modules/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.3 2013/09/03 13:38:08 adam Exp $
+$NetBSD: patch-configure,v 1.4 2017/02/06 14:15:18 adam Exp $
 
 Detect Berkeley DB.
 
---- configure.orig	2012-12-30 18:10:40.000000000 +0000
+--- configure.orig	2016-09-21 12:14:29.000000000 +0000
 +++ configure
-@@ -12169,12 +12169,11 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -12692,12 +12692,11 @@ rm -f core conftest.err conftest.$ac_obj
       OLDCFLAGS=$CFLAGS
       OLDLDFLAGS=$LDFLAGS
       OLDLIBS=$LIBS
@@ -19,7 +19,7 @@ Detect Berkeley DB.
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -12188,7 +12187,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -12711,7 +12710,7 @@ rm -f core conftest.err conftest.$ac_obj
  
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
diff --git a/www/c-icap-modules/patches/patch-services_content__filtering_Makefile.in b/www/c-icap-modules/patches/patch-services_content__filtering_Makefile.in
new file mode 100644
index 00000000000..43d864271a8
--- /dev/null
+++ b/www/c-icap-modules/patches/patch-services_content__filtering_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-services_content__filtering_Makefile.in,v 1.1 2017/02/06 14:15:18 adam Exp $
+
+Handle configuration files.
+
+--- services/content_filtering/Makefile.in.orig	2017-02-06 13:15:55.000000000 +0000
++++ services/content_filtering/Makefile.in
+@@ -690,8 +690,7 @@ uninstall-am: uninstall-cicapmoduleLTLIB
+ 
+ 
+ install-data-local:
+-	$(INSTALL) -m 0644 srv_content_filtering.conf.default $(DESTDIR)$(CONFIGDIR)/srv_content_filtering.conf.default
+-	if test ! -f $(DESTDIR)$(CONFIGDIR)/srv_content_filtering.conf.default; then $(INSTALL) -m 0644 srv_content_filtering.conf.default $(DESTDIR)$(CONFIGDIR)/srv_content_filtering.conf; fi
++	$(INSTALL) -m 0644 srv_content_filtering.conf.default $(DESTDIR)$(datadir)/c-icap/srv_content_filtering.conf.default
+ 	$(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/srv_content_filtering/en
+ 	$(INSTALL) -m 0644 $(TMPLS) $(DESTDIR)$(cicapdatadir)/templates/srv_content_filtering/en/
+ 
diff --git a/www/c-icap-modules/patches/patch-services_url_check_Makefile.in b/www/c-icap-modules/patches/patch-services_url_check_Makefile.in
index 6b213344c1b..b56a03f0361 100644
--- a/www/c-icap-modules/patches/patch-services_url_check_Makefile.in
+++ b/www/c-icap-modules/patches/patch-services_url_check_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_url_check_Makefile.in,v 1.4 2015/06/12 23:40:16 taca Exp $
+$NetBSD: patch-services_url_check_Makefile.in,v 1.5 2017/02/06 14:15:18 adam Exp $
 
 Handle configuration files
 
 --- services/url_check/Makefile.in.orig	2013-12-27 15:35:48.000000000 +0000
 +++ services/url_check/Makefile.in
-@@ -730,8 +730,7 @@ uninstall-man: uninstall-man8
+@@ -842,8 +842,7 @@ uninstall-man: uninstall-man8
  	$(do_subst) < $< > $@
  
  install-data-local:
diff --git a/www/c-icap-modules/patches/patch-services_virus_scan_Makefile.in b/www/c-icap-modules/patches/patch-services_virus_scan_Makefile.in
index e3e560446f7..1fae913f42f 100644
--- a/www/c-icap-modules/patches/patch-services_virus_scan_Makefile.in
+++ b/www/c-icap-modules/patches/patch-services_virus_scan_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-services_virus_scan_Makefile.in,v 1.2 2015/06/12 23:40:16 taca Exp $
+$NetBSD: patch-services_virus_scan_Makefile.in,v 1.3 2017/02/06 14:15:18 adam Exp $
 
 Handle configuration files
 
 --- services/virus_scan/Makefile.in.orig	2013-12-27 15:35:48.000000000 +0000
 +++ services/virus_scan/Makefile.in
-@@ -646,8 +646,7 @@ uninstall-am: uninstall-cicapmoduleLTLIB
+@@ -749,8 +749,7 @@ uninstall-am: uninstall-cicapmoduleLTLIB
  
  install-data-local:
  	for f in $(CONFS); do \