1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
--- a/Makefile.in
+++ b/Makefile.in
@@ -245,21 +245,21 @@ install: all
-chmod 600 $(DESTDIR)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 ; \
fi
- if test "$(DEFANGUSER)" != "" ; then \
- if id "$(DEFANGUSER)" > /dev/null 2>&1 ; then \
- chown "$(DEFANGUSER)" $(DESTDIR)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 || true; \
- test ! -d $(DESTDIR)$(SPOOLDIR) && $(INSTALL) -m 750 -o $(DEFANGUSER) -d $(DESTDIR)$(SPOOLDIR) > /dev/null 2>&1 || true; \
- test ! -d $(DESTDIR)$(QDIR) && $(INSTALL) -m 750 -o $(DEFANGUSER) -d $(DESTDIR)$(QDIR) > /dev/null 2>&1 || true; \
- fi \
- else \
- echo ""; \
- echo "Please create the spool directory, '$(SPOOLDIR)',"; \
- echo "if it does not exist. Give it mode 700 or 750, and make"; \
- echo "it owned by the user and group you intend to run MIMEDefang as."; \
- if test "$(QDIR)" != "$(SPOOLDIR)" ; then \
- echo "Please do the same with the quarantine directory, '$(QDIR)'."; \
- fi; \
- fi
+# if test "$(DEFANGUSER)" != "" ; then \
+# if id "$(DEFANGUSER)" > /dev/null 2>&1 ; then \
+# chown "$(DEFANGUSER)" $(DESTDIR)${CONFDIR}/mimedefang-ip-key > /dev/null 2>&1 || true; \
+# test ! -d $(DESTDIR)$(SPOOLDIR) && $(INSTALL) -m 750 -o $(DEFANGUSER) -d $(DESTDIR)$(SPOOLDIR) > /dev/null 2>&1 || true; \
+# test ! -d $(DESTDIR)$(QDIR) && $(INSTALL) -m 750 -o $(DEFANGUSER) -d $(DESTDIR)$(QDIR) > /dev/null 2>&1 || true; \
+# fi \
+# else \
+# echo ""; \
+# echo "Please create the spool directory, '$(SPOOLDIR)',"; \
+# echo "if it does not exist. Give it mode 700 or 750, and make"; \
+# echo "it owned by the user and group you intend to run MIMEDefang as."; \
+# if test "$(QDIR)" != "$(SPOOLDIR)" ; then \
+# echo "Please do the same with the quarantine directory, '$(QDIR)'."; \
+# fi; \
+# fi
$(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/bin
$(INSTALL) -m 755 -d $(DESTDIR)$(MANDIR)/man1
@@ -270,10 +270,10 @@ install: all
-test ! -d $(DESTDIR)$(SPOOLDIR) && mkdir -p $(DESTDIR)$(SPOOLDIR) && chmod 750 $(DESTDIR)$(SPOOLDIR) || true
-test ! -d $(DESTDIR)$(QDIR) && mkdir -p $(DESTDIR)$(QDIR) && chmod 750 $(DESTDIR)$(QDIR) || true
- if test -f $(DESTDIR)${CONFDIR}/mimedefang-filter ; then \
- $(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${CONFDIR}/mimedefang-filter.example || exit 1; \
+ if test -f $(DESTDIR)${sysconfdir}/mail/mimedefang-filter ; then \
+ $(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${sysconfdir}/mail/mimedefang-filter.example || exit 1; \
else \
- $(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${CONFDIR}/mimedefang-filter || exit 1; \
+ $(INSTALL) -m 644 examples/suggested-minimum-filter-for-windows-clients $(DESTDIR)${sysconfdir}/mail/mimedefang-filter || exit 1; \
fi
$(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) mimedefang-multiplexor $(DESTDIR)$(prefix)/bin/mimedefang-multiplexor
@@ -315,10 +315,10 @@ install: all
$(INSTALL) -m 644 mimedefang-protocol.7 $(DESTDIR)$(MANDIR)/man7/mimedefang-protocol.7
$(INSTALL) -m 644 mimedefang-notify.7 $(DESTDIR)$(MANDIR)/man7/mimedefang-notify.7
if test "$(HAVE_SPAM_ASSASSIN)" = "yes" ; then \
- if test -f $(DESTDIR)${CONFDIR}/sa-mimedefang.cf ; then \
- $(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${CONFDIR}/sa-mimedefang.cf.example || exit 1; \
+ if test -f $(DESTDIR)${sysconfdir}/mail/sa-mimedefang.cf ; then \
+ $(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${sysconfdir}/mail/sa-mimedefang.cf.example || exit 1; \
else \
- $(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${CONFDIR}/sa-mimedefang.cf || exit 1; \
+ $(INSTALL) -m 644 SpamAssassin/spamassassin.cf $(DESTDIR)${sysconfdir}/mail/sa-mimedefang.cf || exit 1; \
fi \
fi
--- a/configure
+++ b/configure
@@ -3612,7 +3612,7 @@ test -n "$AR" || AR="no"
ac_config_headers="$ac_config_headers config.h"
-PATH=$PATH:/usr/local/bin
+#PATH=$PATH:/usr/local/bin
|
