5e7c911ee3
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.
28 lines
993 B
Text
28 lines
993 B
Text
$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
|