~mdw
/
exim-config
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updates for CVE-2016-1531.
[exim-config]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
341208e
..
844b31a
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-57,10
+57,15
@@
MAIN = lists.m4 base.m4
MODES =
MODES += satellite
MODES =
MODES += satellite
-OPTIONS_satellite = satellite.m4
+OPTIONS_satellite = satellite.m4 sat-rewrite.m4
+
+MODES += srv
+HOOKS_srv = nosysdomain.m4
+OPTIONS_srv = exchange.m4 spam.m4 vhost.m4 sat-rewrite.m4
MODES += hub
MODES += hub
-OPTIONS_hub = auth.m4 exchange.m4 local.m4 spam.m4 vhost.m4
+OPTIONS_hub = auth.m4 exchange.m4 local.m4 spam.m4
+OPTIONS_hub += user-spam.m4 vhost.m4
MODES += usersat
OPTIONS_usersat = auth.m4 local.m4 satellite.m4
MODES += usersat
OPTIONS_usersat = auth.m4 local.m4 satellite.m4
@@
-77,7
+82,7
@@
CONFIGS = $(foreach m, $(MODES), exim4-$m.conf)
TARGETS += $(CONFIGS)
$(CONFIGS): exim4-%.conf: $(EARLY) $$(HOOKS_$$*) $(MAIN) $$(OPTIONS_$$*)
$(V_GEN)m4 -P -DMODE=$* $^ >$@.new
TARGETS += $(CONFIGS)
$(CONFIGS): exim4-%.conf: $(EARLY) $$(HOOKS_$$*) $(MAIN) $$(OPTIONS_$$*)
$(V_GEN)m4 -P -DMODE=$* $^ >$@.new
- $(V_AT)$(CHECK_$*)exim4 -C$@.new -bV >/dev/null
+ $(V_AT)$(CHECK_$*)exim4 -C$
$(pwd)/$
@.new -bV >/dev/null
$(V_AT)mv $@.new $@
all: $(TARGETS)
$(V_AT)mv $@.new $@
all: $(TARGETS)