~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
b290a59
..
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)
@@
-94,14
+99,19
@@
OTHERHOSTS = $(filter-out $(THISHOST), $(HOSTS))
ROOT = sudo
ROOT = sudo
+install_rune = \
+ exim4 -C/etc/exim4/exim4.conf.new -bV >/dev/null && \
+ mv /etc/exim4/exim4.conf.new /etc/exim4/exim4.conf && \
+ service exim4 reload
+
install/$(THISHOST): exim4-$(call host-mode,$(THISHOST)).conf
install/$(THISHOST): exim4-$(call host-mode,$(THISHOST)).conf
- $(ROOT)
install -m644 $< /etc/exim4/exim4.conf
- $(ROOT) s
ervice exim4 reload
+ $(ROOT)
cp $< /etc/exim4/exim4.conf.new
+ $(ROOT) s
h -c '$(install_rune)'
$(addprefix install/, $(OTHERHOSTS)): \
install/%: exim4-$$(call host-mode,$$*).conf
$(addprefix install/, $(OTHERHOSTS)): \
install/%: exim4-$$(call host-mode,$$*).conf
- $(ROOT) scp $< root@$*:/etc/exim4/exim4.conf
- $(ROOT) ssh root@$*
service exim4 reload
+ $(ROOT) scp $< root@$*:/etc/exim4/exim4.conf
.new
+ $(ROOT) ssh root@$*
'$(install_rune)'
install: $(addprefix install/, $(HOSTS))
install: $(addprefix install/, $(HOSTS))