Changes 0.2.1:

* Bug fixes

14 files changed, 99 insertions, 60 deletions

diff --git a/www/c-icap-modules/Makefile b/www/c-icap-modules/Makefile
index 8666842e259..da37bdb87af 100644
--- a/www/c-icap-modules/Makefile
+++ b/www/c-icap-modules/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2011/08/31 07:47:17 adam Exp $
+# $NetBSD: Makefile,v 1.3 2012/07/29 10:11:18 adam Exp $
 
-DISTNAME=	c_icap_modules-0.1.6
+DISTNAME=	c_icap_modules-0.2.1
 PKGNAME=	${DISTNAME:S/_/-/g}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=c-icap/}
diff --git a/www/c-icap-modules/PLIST b/www/c-icap-modules/PLIST
index ec4aef46671..0defd6bffa8 100644
--- a/www/c-icap-modules/PLIST
+++ b/www/c-icap-modules/PLIST
@@ -1,5 +1,13 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/05/11 04:30:06 adam Exp $
-${PLIST.clamav}lib/c_icap/srv_clamav.la
+@comment $NetBSD: PLIST,v 1.2 2012/07/29 10:11:18 adam Exp $
+${PLIST.clamav}lib/c_icap/virus_scan.la
+bin/c-icap-mods-sguardDB
 lib/c_icap/srv_url_check.la
-${PLIST.clamav}share/c-icap/srv_clamav.conf.default
+${PLIST.clamav}share/c-icap/virus_scan.conf.default
+man/man8/c-icap-mods-sguardDB.8
 share/c-icap/srv_url_check.conf.default
+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
+${PLIST.clamav}share/c_icap/templates/virus_scan/en/VIR_MODE_PROGRESS
+${PLIST.clamav}share/c_icap/templates/virus_scan/en/VIR_MODE_TAIL
+${PLIST.clamav}share/c_icap/templates/virus_scan/en/VIR_MODE_VIRUS_FOUND
diff --git a/www/c-icap-modules/distinfo b/www/c-icap-modules/distinfo
index e76f2ed6ba6..42fea39fa46 100644
--- a/www/c-icap-modules/distinfo
+++ b/www/c-icap-modules/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2011/08/31 07:47:17 adam Exp $
+$NetBSD: distinfo,v 1.3 2012/07/29 10:11:18 adam Exp $
 
-SHA1 (c_icap_modules-0.1.6.tar.gz) = 535f203e6665320f6b2cd93697f5acdcb37c8f0d
-RMD160 (c_icap_modules-0.1.6.tar.gz) = 200d5a45f13b3e4159468445abdc113411eda1bb
-Size (c_icap_modules-0.1.6.tar.gz) = 321011 bytes
-SHA1 (patch-configure) = dd712ea5e18de59535200caef9d7298d5668dc58
-SHA1 (patch-services_clamav_Makefile.in) = cb6b6445cbc2b9811f70b1cc115ff843d65dbbdd
-SHA1 (patch-services_url_check_Makefile.in) = 2033feaec3f6d8680c98106f17d24e862a3446dc
+SHA1 (c_icap_modules-0.2.1.tar.gz) = a8a6b4efabfc11b8eff955bbdf8c67b6fadff649
+RMD160 (c_icap_modules-0.2.1.tar.gz) = c735e9a27f540f9d03d11f4d7cb4be502dcf6250
+Size (c_icap_modules-0.2.1.tar.gz) = 348245 bytes
+SHA1 (patch-configure) = a666aa9b4b6b62c48899c0b5a659ef1cfc7d0d6a
+SHA1 (patch-services_url_check_Makefile.in) = 600105b3cce752ebc3d21b66638e454d98ac2d45
+SHA1 (patch-services_virus_scan_Makefile.in) = 8a1ce7d863757f8851a06d621a1163d7a605b893
diff --git a/www/c-icap-modules/options.mk b/www/c-icap-modules/options.mk
index abc32dfbcb5..24ee7b509db 100644
--- a/www/c-icap-modules/options.mk
+++ b/www/c-icap-modules/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2011/05/11 04:30:06 adam Exp $
+# $NetBSD: options.mk,v 1.2 2012/07/29 10:11:18 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.c-icap
 PKG_SUPPORTED_OPTIONS=	bdb clamav
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=	--without-bdb
 .if !empty(PKG_OPTIONS:Mclamav)
 PLIST.clamav=		yes
 CONFIGURE_ARGS+=	--with-clamav
-CONF_FILES+=	${EGDIR}/srv_clamav.conf.default ${PKG_SYSCONFDIR}/srv_clamav.conf
+CONF_FILES+=	${EGDIR}/virus_scan.conf.default ${PKG_SYSCONFDIR}/virus_scan.conf
 .  include "../../security/clamav/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=	--without-clamav
diff --git a/www/c-icap-modules/patches/patch-configure b/www/c-icap-modules/patches/patch-configure
index 7b24c48d88d..55d52bbaf67 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.1.1.1 2011/05/11 04:30:06 adam Exp $
+$NetBSD: patch-configure,v 1.2 2012/07/29 10:11:18 adam Exp $
 
 Detect Berkeley DB.
 
 --- configure.orig	2011-05-05 13:16:38.000000000 +0000
 +++ configure
-@@ -11053,11 +11053,11 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11318,11 +11318,11 @@ rm -f core conftest.err conftest.$ac_obj
  #  Save old CFLAGS/LDFLAGS
       OLDCFLAGS=$CFLAGS
       OLDLDFLAGS=$LDFLAGS
@@ -13,12 +13,12 @@ Detect Berkeley DB.
          if test -d $libdbpath/include/db$DBVER; then
             echo -n "checking for Berleley DB under $libdbpath/include/db$DBVER and $libdbpath/lib/db$DBVER... "
             CFLAGS="-I$libdbpath/include/db$DBVER $OLDCFLAGS"
--           LDFLAGS="-L $libdbpath/lib/db$DBVER -ldb $OLDLDFLAGS"
-+           LDFLAGS="-L $libdbpath/lib -ldb$DBVER $OLDLDFLAGS"
+-           LDFLAGS="-L$libdbpath/lib/db$DBVER -ldb $OLDLDFLAGS"
++           LDFLAGS="-L$libdbpath/lib -ldb$DBVER $OLDLDFLAGS"
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -11071,7 +11071,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11336,7 +11336,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_clamav_Makefile.in b/www/c-icap-modules/patches/patch-services_clamav_Makefile.in
deleted file mode 100644
index d3d44e49b18..00000000000
--- a/www/c-icap-modules/patches/patch-services_clamav_Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-services_clamav_Makefile.in,v 1.1.1.1 2011/05/11 04:30:06 adam Exp $
-
-Handle configuration files.
-
---- services/clamav/Makefile.in.orig	2011-05-05 13:25:53.000000000 +0000
-+++ services/clamav/Makefile.in
-@@ -548,8 +548,7 @@ uninstall-am: uninstall-cicapmoduleLTLIB
- 
- 
- install-data-local:
--	$(INSTALL) srv_clamav.conf $(DESTDIR)$(CONFIGDIR)/srv_clamav.conf.default
--	if test ! -f $(DESTDIR)$(CONFIGDIR)/srv_clamav.conf; then $(INSTALL) srv_clamav.conf $(DESTDIR)$(CONFIGDIR)/srv_clamav.conf; fi
-+	$(INSTALL) srv_clamav.conf $(DESTDIR)$(datadir)/c-icap/srv_clamav.conf.default
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
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 1b8eb324378..208b3fa057a 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,11 +1,11 @@
-$NetBSD: patch-services_url_check_Makefile.in,v 1.1.1.1 2011/05/11 04:30:06 adam Exp $
+$NetBSD: patch-services_url_check_Makefile.in,v 1.2 2012/07/29 10:11:18 adam Exp $
 
-Remove unwanted linker flag.
-Handle configuration files.
+Remove unwanted linker flag
+Handle configuration files
 
 --- services/url_check/Makefile.in.orig	2011-05-05 13:19:55.000000000 +0000
 +++ services/url_check/Makefile.in
-@@ -34,7 +34,7 @@ PRE_UNINSTALL = :
+@@ -35,7 +35,7 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -13,14 +13,23 @@ Handle configuration files.
 +@USEBDB_TRUE@am__append_1 = @BDB_ADD_LDFLAG@
  @USEBDB_TRUE@am__append_2 = @BDB_ADD_FLAG@
  @USEBDB_TRUE@am__append_3 = sguardDB.c
- subdir = services/url_check
-@@ -554,8 +554,7 @@ uninstall-am: uninstall-cicapmoduleLTLIB
- 
+ @USEBDB_TRUE@bin_PROGRAMS = c-icap-mods-sguardDB$(EXEEXT)
+@@ -263,7 +263,7 @@ SUFFIXES = .8.in .8
+ man_MANS = $(manpages)
+ TMPLS = templates/en/DENY
+ @USEBDB_TRUE@c_icap_mods_sguardDB_SOURCES = sguardDB.c
+-@USEBDB_TRUE@c_icap_mods_sguardDB_LDADD = @UTILITIES_LIBADD@ @BDB_ADD_LDFLAG@ -ldb
++@USEBDB_TRUE@c_icap_mods_sguardDB_LDADD = @UTILITIES_LIBADD@ @BDB_ADD_LDFLAG@
+ @USEBDB_TRUE@c_icap_mods_sguardDB_CFLAGS = @BDB_ADD_FLAG@ -DBUILD_SGUARD_TOOL
+ EXTRA_DIST = sguardDB.h url_check_body.h makefile.w32 srv_url_check.def srv_url_check.conf $(TMPLS) $(manpages_src)
+ all: all-am
+@@ -720,8 +720,7 @@ uninstall-man: uninstall-man8
+ 	$(do_subst) < $< > $@
  
  install-data-local:
 -	$(INSTALL) srv_url_check.conf $(DESTDIR)$(CONFIGDIR)/srv_url_check.conf.default
 -	if test ! -f $(DESTDIR)$(CONFIGDIR)/srv_url_check.conf; then $(INSTALL) srv_url_check.conf $(DESTDIR)$(CONFIGDIR)/srv_url_check.conf; fi
 +	$(INSTALL) srv_url_check.conf $(DESTDIR)$(datadir)/c-icap/srv_url_check.conf.default
+ 	$(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/srv_url_check/en
+ 	$(INSTALL) $(TMPLS) $(DESTDIR)$(cicapdatadir)/templates/srv_url_check/en/
  
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
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
new file mode 100644
index 00000000000..02fca805120
--- /dev/null
+++ b/www/c-icap-modules/patches/patch-services_virus_scan_Makefile.in
@@ -0,0 +1,16 @@
+$NetBSD: patch-services_virus_scan_Makefile.in,v 1.1 2012/07/29 10:12:08 adam Exp $
+
+Handle configuration files
+
+--- services/virus_scan/Makefile.in.orig	2012-07-29 09:31:53.000000000 +0000
++++ services/virus_scan/Makefile.in
+@@ -586,8 +586,7 @@ uninstall-am: uninstall-cicapmoduleLTLIB
+ 
+ 
+ install-data-local:
+-	$(INSTALL) virus_scan.conf $(DESTDIR)$(CONFIGDIR)/virus_scan.conf.default
+-	if test ! -f $(DESTDIR)$(CONFIGDIR)/virus_scan.conf; then $(INSTALL) virus_scan.conf $(DESTDIR)$(CONFIGDIR)/virus_scan.conf; fi
++	$(INSTALL) virus_scan.conf $(DESTDIR)$(datadir)/c-icap/virus_scan.conf.default
+ 	$(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/virus_scan/en/
+ 	for f in $(TMPLS); do $(INSTALL) $$f $(DESTDIR)$(cicapdatadir)/templates/virus_scan/en/; done
+ 
diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile
index 5a9c2edecd5..961fd608e9e 100644
--- a/www/c-icap/Makefile
+++ b/www/c-icap/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2011/08/31 07:42:06 adam Exp $
+# $NetBSD: Makefile,v 1.4 2012/07/29 10:11:17 adam Exp $
 
-DISTNAME=	c_icap-0.1.6
+DISTNAME=	c_icap-0.2.1
 PKGNAME=	${DISTNAME:S/_/-/}
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=c-icap/}
diff --git a/www/c-icap/PLIST b/www/c-icap/PLIST
index efe51b61c74..94e111fd030 100644
--- a/www/c-icap/PLIST
+++ b/www/c-icap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/05/11 04:29:18 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/07/29 10:11:17 adam Exp $
 bin/c-icap
 bin/c-icap-client
 bin/c-icap-config
@@ -7,6 +7,7 @@ ${PLIST.bdb}bin/c-icap-mkbdb
 bin/c-icap-stretch
 include/c_icap/access.h
 include/c_icap/acl.h
+include/c_icap/array.h
 include/c_icap/body.h
 include/c_icap/c-icap-conf.h
 include/c_icap/c-icap.h
@@ -40,6 +41,7 @@ lib/c_icap/dnsbl_tables.la
 ${PLIST.ldap}lib/c_icap/ldap_module.la
 ${PLIST.perl}lib/c_icap/perl_handler.la
 lib/c_icap/srv_echo.la
+lib/c_icap/srv_ex206.la
 lib/c_icap/sys_logger.la
 lib/libicapapi.la
 man/man8/c-icap-client.8
diff --git a/www/c-icap/distinfo b/www/c-icap/distinfo
index 7cc76b73e31..02f41ec4230 100644
--- a/www/c-icap/distinfo
+++ b/www/c-icap/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2011/08/31 07:42:07 adam Exp $
+$NetBSD: distinfo,v 1.3 2012/07/29 10:11:17 adam Exp $
 
-SHA1 (c_icap-0.1.6.tar.gz) = 31d322eacdc4fe3ee5f8d5d2c93d7f4faef1f7d7
-RMD160 (c_icap-0.1.6.tar.gz) = 3949976edb3fe3265563f280cc2929c590c44930
-Size (c_icap-0.1.6.tar.gz) = 528708 bytes
-SHA1 (patch-Makefile.in) = 50f68b9c071d9552a37360591a27d07590759b5b
-SHA1 (patch-configure) = ef069f6377c9b96c40af1301b03464e981436ba4
+SHA1 (c_icap-0.2.1.tar.gz) = aab7799da76f8caf2305e025f844e04c50ee5a6d
+RMD160 (c_icap-0.2.1.tar.gz) = ffafde55389f817827440cf5624b2b2e7ddc4ee5
+Size (c_icap-0.2.1.tar.gz) = 556687 bytes
+SHA1 (patch-Makefile.in) = 1e24956dee6d124c4f1e06d4bc6187ca0c2be52b
+SHA1 (patch-configure) = 7c03ef488f20ac9cf1af6b59bb037330c0d5a337
+SHA1 (patch-include_util.h) = 7e0a5e20dade3e7b62ddcad385cf81c1a772d6e6
diff --git a/www/c-icap/patches/patch-Makefile.in b/www/c-icap/patches/patch-Makefile.in
index 6f7bc0fa065..d8d2e8f7165 100644
--- a/www/c-icap/patches/patch-Makefile.in
+++ b/www/c-icap/patches/patch-Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-Makefile.in,v 1.1.1.1 2011/05/11 04:29:18 adam Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2012/07/29 10:11:17 adam Exp $
 
 Handle configuration files.
 
 --- Makefile.in.orig	2011-03-28 19:22:39.000000000 +0000
 +++ Makefile.in
-@@ -1560,11 +1560,9 @@ doc:
+@@ -1581,11 +1581,9 @@ doc:
  	$(DOXYGEN) c-icap.dox
  
  install-data-local:
diff --git a/www/c-icap/patches/patch-configure b/www/c-icap/patches/patch-configure
index 9753a816942..b0da59d3047 100644
--- a/www/c-icap/patches/patch-configure
+++ b/www/c-icap/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.1.1.1 2011/05/11 04:29:18 adam Exp $
+$NetBSD: patch-configure,v 1.2 2012/07/29 10:11:17 adam Exp $
 
 Detect Berkeley DB.
 
 --- configure.orig	2011-05-05 12:27:48.000000000 +0000
 +++ configure
-@@ -11647,11 +11647,11 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11658,11 +11658,11 @@ rm -f core conftest.err conftest.$ac_obj
  #  Save old CFLAGS/LDFLAGS
       OLDCFLAGS=$CFLAGS
       OLDLDFLAGS=$LDFLAGS
@@ -13,12 +13,12 @@ Detect Berkeley DB.
          if test -d $libdbpath/include/db$DBVER; then
             echo -n "checking for Berleley DB under $libdbpath/include/db$DBVER and $libdbpath/lib/db$DBVER... "
             CFLAGS="-I$libdbpath/include/db$DBVER $OLDCFLAGS"
--           LDFLAGS="-L $libdbpath/lib/db$DBVER -ldb $OLDLDFLAGS"
-+           LDFLAGS="-L $libdbpath/lib -ldb$DBVER $OLDLDFLAGS"
+-           LDFLAGS="-L$libdbpath/lib/db$DBVER -ldb $OLDLDFLAGS"
++           LDFLAGS="-L$libdbpath/lib -ldb$DBVER $OLDLDFLAGS"
             cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -11665,7 +11665,7 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -11676,7 +11676,7 @@ rm -f core conftest.err conftest.$ac_obj
  
  _ACEOF
  if ac_fn_c_try_link "$LINENO"; then :
diff --git a/www/c-icap/patches/patch-include_util.h b/www/c-icap/patches/patch-include_util.h
new file mode 100644
index 00000000000..35c84a3289e
--- /dev/null
+++ b/www/c-icap/patches/patch-include_util.h
@@ -0,0 +1,19 @@
+$NetBSD: patch-include_util.h,v 1.1 2012/07/29 10:11:17 adam Exp $
+
+On Mac OS X, strnstr declaration is different
+
+--- include/util.h.orig	2012-05-27 20:30:13.000000000 +0000
++++ include/util.h
+@@ -42,8 +42,12 @@ CI_DECLARE_FUNC(struct tm*) gmtime_r(con
+ #endif
+ 
+ #ifndef HAVE_STRNSTR
++#ifdef __APPLE__
++CI_DECLARE_FUNC(char *) strnstr(const char *s, const char *find, size_t slen);
++#else
+ CI_DECLARE_FUNC(const char *) strnstr(const char *s, const char *find, size_t slen);
+ #endif
++#endif
+ 
+ #ifndef HAVE_STRNCASESTR
+ CI_DECLARE_FUNC(const char *) strncasestr(const char *s, const char *find, size_t slen);