[BACK]Return to patch-etc_Makefile.in CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / www / squidclamav / patches

File: [cvs.NetBSD.org] / pkgsrc / www / squidclamav / patches / patch-etc_Makefile.in (download)

Revision 1.2, Mon Feb 6 15:37:41 2017 UTC (3 years ago) by adam
Branch: MAIN
CVS Tags: pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, pkgsrc-2017Q2-base, pkgsrc-2017Q2, pkgsrc-2017Q1-base, pkgsrc-2017Q1, HEAD
Changes since 1.1: +20 -7 lines

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.

$NetBSD: patch-etc_Makefile.in,v 1.2 2017/02/06 15:37:41 adam Exp $

Handle configuration files.

--- etc/Makefile.in.orig	2016-08-30 21:02:59.000000000 +0000
+++ etc/Makefile.in
@@ -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:
 
 
 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