CVS commit: pkgsrc/www/squidclamav

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/www/squidclamav
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 6 Feb 2017 15:37:41 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Feb  6 15:37:41 UTC 2017

Modified Files:
        pkgsrc/www/squidclamav: Makefile PLIST distinfo
        pkgsrc/www/squidclamav/patches: patch-etc_Makefile.in
Added Files:
        pkgsrc/www/squidclamav/patches: patch-src_squidclamav.h

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/squidclamav/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/www/squidclamav/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/squidclamav/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 \
    pkgsrc/www/squidclamav/patches/patch-etc_Makefile.in
cvs rdiff -u -r0 -r1.1 pkgsrc/www/squidclamav/patches/patch-src_squidclamav.h

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

Modified files:

Index: pkgsrc/www/squidclamav/Makefile
diff -u pkgsrc/www/squidclamav/Makefile:1.11 pkgsrc/www/squidclamav/Makefile:1.12
--- pkgsrc/www/squidclamav/Makefile:1.11        Sat Jul  9 06:39:14 2016
+++ pkgsrc/www/squidclamav/Makefile     Mon Feb  6 15:37:41 2017
@@ -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=${BUILDLI
 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

Index: pkgsrc/www/squidclamav/PLIST
diff -u pkgsrc/www/squidclamav/PLIST:1.1.1.1 pkgsrc/www/squidclamav/PLIST:1.2
--- pkgsrc/www/squidclamav/PLIST:1.1.1.1        Wed May 11 04:31:15 2011
+++ pkgsrc/www/squidclamav/PLIST        Mon Feb  6 15:37:41 2017
@@ -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

Index: pkgsrc/www/squidclamav/distinfo
diff -u pkgsrc/www/squidclamav/distinfo:1.5 pkgsrc/www/squidclamav/distinfo:1.6
--- pkgsrc/www/squidclamav/distinfo:1.5 Wed Nov  4 02:47:39 2015
+++ pkgsrc/www/squidclamav/distinfo     Mon Feb  6 15:37:41 2017
@@ -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

Index: pkgsrc/www/squidclamav/patches/patch-etc_Makefile.in
diff -u pkgsrc/www/squidclamav/patches/patch-etc_Makefile.in:1.1.1.1 pkgsrc/www/squidclamav/patches/patch-etc_Makefile.in:1.2
--- pkgsrc/www/squidclamav/patches/patch-etc_Makefile.in:1.1.1.1        Wed May 11 04:31:15 2011
+++ pkgsrc/www/squidclamav/patches/patch-etc_Makefile.in        Mon Feb  6 15:37:41 2017
@@ -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

Added files:

Index: pkgsrc/www/squidclamav/patches/patch-src_squidclamav.h
diff -u /dev/null pkgsrc/www/squidclamav/patches/patch-src_squidclamav.h:1.1
--- /dev/null   Mon Feb  6 15:37:41 2017
+++ pkgsrc/www/squidclamav/patches/patch-src_squidclamav.h      Mon Feb  6 15:37:41 2017
@@ -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);
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index