From 96a6f63e3bb8700345ddeec1979e3c5f43faf844 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 6 Feb 2017 15:37:41 +0000 Subject: 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. --- www/squidclamav/Makefile | 7 +++---- www/squidclamav/PLIST | 5 +++-- www/squidclamav/distinfo | 13 ++++++------ www/squidclamav/patches/patch-etc_Makefile.in | 27 ++++++++++++++++++------- www/squidclamav/patches/patch-src_squidclamav.h | 14 +++++++++++++ 5 files changed, 47 insertions(+), 19 deletions(-) create mode 100644 www/squidclamav/patches/patch-src_squidclamav.h (limited to 'www/squidclamav') diff --git a/www/squidclamav/Makefile b/www/squidclamav/Makefile index 95636e05343..7a146b68cf3 100644 --- a/www/squidclamav/Makefile +++ b/www/squidclamav/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.11 2016/07/09 06:39:14 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2017/02/06 15:37:41 adam Exp $ -DISTNAME= squidclamav-6.10 -PKGREVISION= 3 +DISTNAME= squidclamav-6.16 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=squidclamav/} @@ -23,7 +22,7 @@ CONFIGURE_ARGS= --with-c-icap=${BUILDLINK_PREFIX.c-icap} REPLACE_PERL= cgi-bin/* EGDIR= ${PREFIX}/share/squidclamav -CONF_FILES= ${EGDIR}/squidclamav.conf ${PKG_SYSCONFDIR}/squidclamav.conf +CONF_FILES= ${EGDIR}/squidclamav.conf.default ${PKG_SYSCONFDIR}/squidclamav.conf SUBST_CLASSES+= fix-cfg SUBST_STAGE.fix-cfg= pre-configure diff --git a/www/squidclamav/PLIST b/www/squidclamav/PLIST index e2ce39fb3bd..10ca35a224d 100644 --- a/www/squidclamav/PLIST +++ b/www/squidclamav/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/05/11 04:31:15 adam Exp $ +@comment $NetBSD: PLIST,v 1.2 2017/02/06 15:37:41 adam Exp $ lib/c_icap/squidclamav.la libexec/squidclamav/clwarn.cgi libexec/squidclamav/clwarn.cgi.de_DE @@ -7,5 +7,6 @@ libexec/squidclamav/clwarn.cgi.fr_FR libexec/squidclamav/clwarn.cgi.pt_BR libexec/squidclamav/clwarn.cgi.ru_RU man/man1/squidclamav.1 +share/c_icap/templates/squidclamav/en/MALWARE_FOUND share/squidclamav/README -share/squidclamav/squidclamav.conf +share/squidclamav/squidclamav.conf.default diff --git a/www/squidclamav/distinfo b/www/squidclamav/distinfo index 63369452695..7c921b4510c 100644 --- a/www/squidclamav/distinfo +++ b/www/squidclamav/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.5 2015/11/04 02:47:39 agc Exp $ +$NetBSD: distinfo,v 1.6 2017/02/06 15:37:41 adam Exp $ -SHA1 (squidclamav-6.10.tar.gz) = b049d9f64cfc19d257db4e866c7cc0f1cb4b40c3 -RMD160 (squidclamav-6.10.tar.gz) = 3ed39f62bbf16ece8e07ba4a95e983dcdf4c69f5 -SHA512 (squidclamav-6.10.tar.gz) = 36a49720ea8984d3075364cc6150bd5063983aaeaaad538f6e4fde013b92243b0aeb39ef151e0a6752259739e1258d8170fa27eedf3a91384a5814fd81ae9382 -Size (squidclamav-6.10.tar.gz) = 436639 bytes -SHA1 (patch-etc_Makefile.in) = 23a87a5ee484ab7ef7c50a5716f436b83f7e7449 +SHA1 (squidclamav-6.16.tar.gz) = c54a2b4770815c5048f7313e9fb435c48738c9e3 +RMD160 (squidclamav-6.16.tar.gz) = 55da34d1e375cf30822329c36662987c332e126b +SHA512 (squidclamav-6.16.tar.gz) = 8beecf1eccbad7b2f7a1a5fa53d9695cd09cd7debbca13318e14e280211c68d341b6b562778d052c1f345ef32f82cd0c37d711ad7834c2fce95e102bc85dab6a +Size (squidclamav-6.16.tar.gz) = 444046 bytes +SHA1 (patch-etc_Makefile.in) = f443ab6019bec365a7e9aca53e9ac1a4275b9129 +SHA1 (patch-src_squidclamav.h) = 737d78065fe1d357dd873a5d1b1bd63f3b7724b4 diff --git a/www/squidclamav/patches/patch-etc_Makefile.in b/www/squidclamav/patches/patch-etc_Makefile.in index de6ee556192..b0bab226477 100644 --- a/www/squidclamav/patches/patch-etc_Makefile.in +++ b/www/squidclamav/patches/patch-etc_Makefile.in @@ -1,15 +1,28 @@ -$NetBSD: patch-etc_Makefile.in,v 1.1.1.1 2011/05/11 04:31:15 adam Exp $ +$NetBSD: patch-etc_Makefile.in,v 1.2 2017/02/06 15:37:41 adam Exp $ Handle configuration files. ---- etc/Makefile.in.orig 2011-05-10 09:05:26.000000000 +0000 +--- etc/Makefile.in.orig 2016-08-30 21:02:59.000000000 +0000 +++ etc/Makefile.in -@@ -167,7 +167,7 @@ top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - EXTRA_DIST = squidclamav.conf +@@ -175,7 +175,7 @@ top_srcdir = @top_srcdir@ + CONFS = squidclamav.conf + cicapdatadir = @DATADIR@ + CONFIGDIR = @CONFDIR@ -CFGINST = @CFGDIR@ +CFGINST = $(datadir)/squidclamav + TMPLS = templates/en/MALWARE_FOUND + EXTRA_DIST = squidclamav.conf $(TMPLS) all: all-am +@@ -370,10 +370,9 @@ uninstall-am: - .SUFFIXES: + + install-data-local: +- $(mkinstalldirs) $(DESTDIR)$(CONFIGDIR) ++ $(mkinstalldirs) $(DESTDIR)$(CFGINST) + for f in $(CONFS); do \ +- $(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f.default; \ +- if test ! -f $(DESTDIR)$(CONFIGDIR)/$$f; then $(INSTALL) $$f $(DESTDIR)$(CONFIGDIR)/$$f; fi \ ++ $(INSTALL) $$f $(DESTDIR)$(CFGINST)/$$f.default; \ + done + $(mkinstalldirs) $(DESTDIR)$(cicapdatadir)/templates/squidclamav/en/ + for f in $(TMPLS); do $(INSTALL) $$f $(DESTDIR)$(cicapdatadir)/templates/squidclamav/en/; done diff --git a/www/squidclamav/patches/patch-src_squidclamav.h b/www/squidclamav/patches/patch-src_squidclamav.h new file mode 100644 index 00000000000..0d1f2ccd345 --- /dev/null +++ b/www/squidclamav/patches/patch-src_squidclamav.h @@ -0,0 +1,14 @@ +$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); + -- cgit v1.2.3