Mon Feb 6 15:37:41 2017 UTC ()
version 6.16

This release fixes a major bug with debugs macro that can have
bad side effects like printing an error after configuration reload
an possibly some other wrong behaviors.

  - Change log level of configuration reloading message.
  - Show line in configuration file that can not be parsed
    by add_pattern().
  - Enclose debugs macro to avoid misusage. Thanks to Denis Volpato
    Martins for the patch.
  - Fix Apache complain "AH01215: CGI::param called in list context
    from package main line 14, this can lead to vulnerabilities."
    Thanks to thctlo for the report.

Please upgrade asap.


(adam)
diff -r1.11 -r1.12 pkgsrc/www/squidclamav/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/www/squidclamav/PLIST
diff -r1.5 -r1.6 pkgsrc/www/squidclamav/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/www/squidclamav/patches/patch-etc_Makefile.in
diff -r0 -r1.1 pkgsrc/www/squidclamav/patches/patch-src_squidclamav.h
cvs diff -r1.11 -r1.12 pkgsrc/www/squidclamav/Makefile (expand / switch to unified diff)

--- pkgsrc/www/squidclamav/Makefile 2016/07/09 06:39:14 1.11
+++ pkgsrc/www/squidclamav/Makefile 2017/02/06 15:37:41 1.12
@@ -1,37 +1,36 @@ @@ -1,37 +1,36 @@
1# $NetBSD: Makefile,v 1.11 2016/07/09 06:39:14 wiz Exp $ 1# $NetBSD: Makefile,v 1.12 2017/02/06 15:37:41 adam Exp $
2 2
3DISTNAME= squidclamav-6.10 3DISTNAME= squidclamav-6.16
4PKGREVISION= 3 
5CATEGORIES= www 4CATEGORIES= www
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squidclamav/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squidclamav/}
7 6
8MAINTAINER= adam@NetBSD.org 7MAINTAINER= adam@NetBSD.org
9HOMEPAGE= http://squidclamav.darold.net/ 8HOMEPAGE= http://squidclamav.darold.net/
10COMMENT= Clamav ICAP service and redirector for Squid 9COMMENT= Clamav ICAP service and redirector for Squid
11LICENSE= gnu-lgpl-v2.1 10LICENSE= gnu-lgpl-v2.1
12 11
13DEPENDS+= clamav>=0.97:../../security/clamav 12DEPENDS+= clamav>=0.97:../../security/clamav
14DEPENDS+= squid>=3.1.12:../../www/squid3 13DEPENDS+= squid>=3.1.12:../../www/squid3
15 14
16USE_LANGUAGES= c 15USE_LANGUAGES= c
17USE_LIBTOOL= yes 16USE_LIBTOOL= yes
18USE_TOOLS+= perl 17USE_TOOLS+= perl
19GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
20CONFIGURE_ARGS= --sysconfdir=${PKG_SYSCONFDIR} 19CONFIGURE_ARGS= --sysconfdir=${PKG_SYSCONFDIR}
21CONFIGURE_ARGS= --with-c-icap=${BUILDLINK_PREFIX.c-icap} 20CONFIGURE_ARGS= --with-c-icap=${BUILDLINK_PREFIX.c-icap}
22 21
23REPLACE_PERL= cgi-bin/* 22REPLACE_PERL= cgi-bin/*
24 23
25EGDIR= ${PREFIX}/share/squidclamav 24EGDIR= ${PREFIX}/share/squidclamav
26CONF_FILES= ${EGDIR}/squidclamav.conf ${PKG_SYSCONFDIR}/squidclamav.conf 25CONF_FILES= ${EGDIR}/squidclamav.conf.default ${PKG_SYSCONFDIR}/squidclamav.conf
27 26
28SUBST_CLASSES+= fix-cfg 27SUBST_CLASSES+= fix-cfg
29SUBST_STAGE.fix-cfg= pre-configure 28SUBST_STAGE.fix-cfg= pre-configure
30SUBST_MESSAGE.fix-cfg= Fixing config path. 29SUBST_MESSAGE.fix-cfg= Fixing config path.
31SUBST_FILES.fix-cfg= configure 30SUBST_FILES.fix-cfg= configure
32SUBST_FILES.fix-cfg+= src/squidclamav.h 31SUBST_FILES.fix-cfg+= src/squidclamav.h
33SUBST_SED.fix-cfg= -e 's,CFGDIR=/etc,CFGDIR=${PKG_SYSCONFDIR},' 32SUBST_SED.fix-cfg= -e 's,CFGDIR=/etc,CFGDIR=${PKG_SYSCONFDIR},'
34SUBST_SED.fix-cfg+= -e '/CONFIG_FILE/s,/etc,${PKG_SYSCONFDIR},' 33SUBST_SED.fix-cfg+= -e '/CONFIG_FILE/s,/etc,${PKG_SYSCONFDIR},'
35 34
36.include "../../www/c-icap/buildlink3.mk" 35.include "../../www/c-icap/buildlink3.mk"
37.include "../../mk/bsd.pkg.mk" 36.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/squidclamav/PLIST (expand / switch to unified diff)

--- pkgsrc/www/squidclamav/PLIST 2011/05/11 04:31:15 1.1.1.1
+++ pkgsrc/www/squidclamav/PLIST 2017/02/06 15:37:41 1.2
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2011/05/11 04:31:15 adam Exp $ 1@comment $NetBSD: PLIST,v 1.2 2017/02/06 15:37:41 adam Exp $
2lib/c_icap/squidclamav.la 2lib/c_icap/squidclamav.la
3libexec/squidclamav/clwarn.cgi 3libexec/squidclamav/clwarn.cgi
4libexec/squidclamav/clwarn.cgi.de_DE 4libexec/squidclamav/clwarn.cgi.de_DE
5libexec/squidclamav/clwarn.cgi.en_EN 5libexec/squidclamav/clwarn.cgi.en_EN
6libexec/squidclamav/clwarn.cgi.fr_FR 6libexec/squidclamav/clwarn.cgi.fr_FR
7libexec/squidclamav/clwarn.cgi.pt_BR 7libexec/squidclamav/clwarn.cgi.pt_BR
8libexec/squidclamav/clwarn.cgi.ru_RU 8libexec/squidclamav/clwarn.cgi.ru_RU
9man/man1/squidclamav.1 9man/man1/squidclamav.1
 10share/c_icap/templates/squidclamav/en/MALWARE_FOUND
10share/squidclamav/README 11share/squidclamav/README
11share/squidclamav/squidclamav.conf 12share/squidclamav/squidclamav.conf.default
cvs diff -r1.5 -r1.6 pkgsrc/www/squidclamav/distinfo (expand / switch to unified diff)

--- pkgsrc/www/squidclamav/distinfo 2015/11/04 02:47:39 1.5
+++ pkgsrc/www/squidclamav/distinfo 2017/02/06 15:37:41 1.6
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.5 2015/11/04 02:47:39 agc Exp $ 1$NetBSD: distinfo,v 1.6 2017/02/06 15:37:41 adam Exp $
2 2
3SHA1 (squidclamav-6.10.tar.gz) = b049d9f64cfc19d257db4e866c7cc0f1cb4b40c3 3SHA1 (squidclamav-6.16.tar.gz) = c54a2b4770815c5048f7313e9fb435c48738c9e3
4RMD160 (squidclamav-6.10.tar.gz) = 3ed39f62bbf16ece8e07ba4a95e983dcdf4c69f5 4RMD160 (squidclamav-6.16.tar.gz) = 55da34d1e375cf30822329c36662987c332e126b
5SHA512 (squidclamav-6.10.tar.gz) = 36a49720ea8984d3075364cc6150bd5063983aaeaaad538f6e4fde013b92243b0aeb39ef151e0a6752259739e1258d8170fa27eedf3a91384a5814fd81ae9382 5SHA512 (squidclamav-6.16.tar.gz) = 8beecf1eccbad7b2f7a1a5fa53d9695cd09cd7debbca13318e14e280211c68d341b6b562778d052c1f345ef32f82cd0c37d711ad7834c2fce95e102bc85dab6a
6Size (squidclamav-6.10.tar.gz) = 436639 bytes 6Size (squidclamav-6.16.tar.gz) = 444046 bytes
7SHA1 (patch-etc_Makefile.in) = 23a87a5ee484ab7ef7c50a5716f436b83f7e7449 7SHA1 (patch-etc_Makefile.in) = f443ab6019bec365a7e9aca53e9ac1a4275b9129
 8SHA1 (patch-src_squidclamav.h) = 737d78065fe1d357dd873a5d1b1bd63f3b7724b4
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/squidclamav/patches/patch-etc_Makefile.in (expand / switch to unified diff)

--- pkgsrc/www/squidclamav/patches/patch-etc_Makefile.in 2011/05/11 04:31:15 1.1.1.1
+++ pkgsrc/www/squidclamav/patches/patch-etc_Makefile.in 2017/02/06 15:37:41 1.2
@@ -1,15 +1,28 @@ @@ -1,15 +1,28 @@
1$NetBSD: patch-etc_Makefile.in,v 1.1.1.1 2011/05/11 04:31:15 adam Exp $ 1$NetBSD: patch-etc_Makefile.in,v 1.2 2017/02/06 15:37:41 adam Exp $
2 2
3Handle configuration files. 3Handle configuration files.
4 4
5--- etc/Makefile.in.orig 2011-05-10 09:05:26.000000000 +0000 5--- etc/Makefile.in.orig 2016-08-30 21:02:59.000000000 +0000
6+++ etc/Makefile.in 6+++ etc/Makefile.in
7@@ -167,7 +167,7 @@ top_build_prefix = @top_build_prefix@ 7@@ -175,7 +175,7 @@ top_srcdir = @top_srcdir@
8 top_builddir = @top_builddir@ 8 CONFS = squidclamav.conf
9 top_srcdir = @top_srcdir@ 9 cicapdatadir = @DATADIR@
10 EXTRA_DIST = squidclamav.conf 10 CONFIGDIR = @CONFDIR@
11-CFGINST = @CFGDIR@ 11-CFGINST = @CFGDIR@
12+CFGINST = $(datadir)/squidclamav 12+CFGINST = $(datadir)/squidclamav
 13 TMPLS = templates/en/MALWARE_FOUND
 14 EXTRA_DIST = squidclamav.conf $(TMPLS)
13 all: all-am 15 all: all-am
 16@@ -370,10 +370,9 @@ uninstall-am:
14  17
15 .SUFFIXES: 18
 19 install-data-local:
 20- $(mkinstalldirs) $(DESTDIR)$(CONFIGDIR)
 21+ $(mkinstalldirs) $(DESTDIR)$(CFGINST)
 22 for f in $(CONFS); do \
 23- $(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f.default; \
 24- if test ! -f $(DESTDIR)$(CONFIGDIR)/$$f; then $(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f; fi \
 25+ $(INSTALL) $$f $(DESTDIR)$(CFGINST)/$$f.default; \
 26 done
 27 $(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/squidclamav/en/
 28 for f in $(TMPLS); do $(INSTALL) $$f $(DESTDIR)$(cicapdatadir)/templates/squidclamav/en/; done
File Added: pkgsrc/www/squidclamav/patches/patch-src_squidclamav.h
$NetBSD: patch-src_squidclamav.h,v 1.1 2017/02/06 15:37:41 adam Exp $

Remove unused but conflicting strlcat() definition.

--- src/squidclamav.h.orig	2017-02-06 15:28:58.000000000 +0000
+++ src/squidclamav.h
@@ -30,7 +30,6 @@ void chomp(char *);
 int isPathExists(const char *);
 int isFileExists(const char *);
 int isPathSecure(const char *);
-size_t strlcat(char *dst, const char *src, size_t siz);
 size_t xstrnlen(const char *s, size_t n);
 char** split( char* str, const char* delim);