From a3253b08529045721ee9be7f8e50b893b296c376 Mon Sep 17 00:00:00 2001
From: bapt <bapt@FreeBSD.org>
Date: Fri, 9 Oct 2015 23:19:29 +0000
Subject: Rename the dma directory into dmagent to avoid collision on unclean
oject directory where an old dma binary can remain
---
libexec/dma/Makefile | 2 +-
libexec/dma/dma/Makefile | 34 ----------------------
libexec/dma/dma/dma.conf | 64 -----------------------------------------
libexec/dma/dma/mailer.conf | 5 ----
libexec/dma/dmagent/Makefile | 34 ++++++++++++++++++++++
libexec/dma/dmagent/dma.conf | 64 +++++++++++++++++++++++++++++++++++++++++
libexec/dma/dmagent/mailer.conf | 5 ++++
7 files changed, 104 insertions(+), 104 deletions(-)
delete mode 100644 libexec/dma/dma/Makefile
delete mode 100644 libexec/dma/dma/dma.conf
delete mode 100644 libexec/dma/dma/mailer.conf
create mode 100644 libexec/dma/dmagent/Makefile
create mode 100644 libexec/dma/dmagent/dma.conf
create mode 100644 libexec/dma/dmagent/mailer.conf
(limited to 'libexec/dma')
diff --git a/libexec/dma/Makefile b/libexec/dma/Makefile
index ff69240..360a5d3 100644
--- a/libexec/dma/Makefile
+++ b/libexec/dma/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-SUBDIR= dma \
+SUBDIR= dmagent \
dma-mbox-create
.include <bsd.subdir.mk>
diff --git a/libexec/dma/dma/Makefile b/libexec/dma/dma/Makefile
deleted file mode 100644
index 6a45a8d..0000000
--- a/libexec/dma/dma/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# $FreeBSD$
-
-LIBADD= ssl crypto
-
-PROG= dma
-SRCS= aliases_parse.y \
- aliases_scan.l \
- base64.c \
- conf.c \
- crypto.c \
- dma.c \
- dns.c \
- local.c \
- mail.c \
- net.c \
- spool.c \
- util.c
-MAN8= dma.8
-CONFS= dma.conf
-CONFSDIR= ${ETCDIR}/dma
-YFLAGS+= -i
-CLEANFILES= aliases_parse.i
-FILES= mailer.conf
-FILESDIR= ${SHAREDIR}/examples/dma
-
-BINMODE= 2555
-
-.include <bsd.compiler.mk>
-
-.if ${COMPILER_TYPE} == gcc
-WARNS= 5
-.endif
-
-.include <bsd.prog.mk>
diff --git a/libexec/dma/dma/dma.conf b/libexec/dma/dma/dma.conf
deleted file mode 100644
index 2f50a4e..0000000
--- a/libexec/dma/dma/dma.conf
+++ /dev/null
@@ -1,64 +0,0 @@
-# $FreeBSD$
-#
-# Your smarthost (also called relayhost). Leave blank if you don't want
-# smarthost support.
-#SMARTHOST
-
-# Use this SMTP port. Most users will be fine with the default (25)
-#PORT 25
-
-# Path to your alias file. Just stay with the default.
-#ALIASES /etc/aliases
-
-# Path to your spooldir. Just stay with the default.
-#SPOOLDIR /var/spool/dma
-
-# SMTP authentication
-#AUTHPATH /etc/dma/auth.conf
-
-# Uncomment if yout want TLS/SSL support
-#SECURETRANSFER
-
-# Uncomment if you want STARTTLS support (only used in combination with
-# SECURETRANSFER)
-#STARTTLS
-
-# Uncomment if you have specified STARTTLS above and it should be allowed
-# to fail ("opportunistic TLS", use an encrypted connection when available
-# but allow an unencrypted one to servers that do not support it)
-#OPPORTUNISTIC_TLS
-
-# Path to your local SSL certificate
-#CERTFILE
-
-# If you want to use plain text SMTP login without using encryption, change
-# the SECURE entry below to INSECURE. Otherwise plain login will only work
-# over a secure connection. Use this option with caution.
-#SECURE
-
-# Uncomment if you want to defer your mails. This is useful if you are
-# behind a dialup line. You have to submit your mails manually with dma -q
-#DEFER
-
-# Uncomment if you want the bounce message to include the complete original
-# message, not just the headers.
-#FULLBOUNCE
-
-# The internet hostname dma uses to identify the host.
-# If not set or empty, the result of gethostname(2) is used.
-# If MAILNAME is an absolute path to a file, the first line of this file
-# will be used as the hostname.
-#MAILNAME mail.example.net
-
-# Masquerade envelope from addresses with this address/hostname.
-# Use this if mails are not accepted by destination mail servers because
-# your sender domain is invalid.
-# By default, MASQUERADE is not set.
-# Format: MASQUERADE [user@][host]
-# Examples:
-# MASQUERADE john@ on host "hamlet" will send all mails as john@hamlet
-# MASQUERADE percolator will send mails as $username@percolator, e.g. fish@percolator
-# MASQUERADE herb@ert will send all mails as herb@ert
-
-# Directly forward the mail to the SMARTHOST bypassing aliases and local delivery
-#NULLCLIENT
diff --git a/libexec/dma/dma/mailer.conf b/libexec/dma/dma/mailer.conf
deleted file mode 100644
index 53f42c2..0000000
--- a/libexec/dma/dma/mailer.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# $FreeBSD$
-
-sendmail /usr/libexec/dma
-send-mail /usr/libexec/dma
-mailq /usr/libexec/dma
diff --git a/libexec/dma/dmagent/Makefile b/libexec/dma/dmagent/Makefile
new file mode 100644
index 0000000..6a45a8d
--- /dev/null
+++ b/libexec/dma/dmagent/Makefile
@@ -0,0 +1,34 @@
+# $FreeBSD$
+
+LIBADD= ssl crypto
+
+PROG= dma
+SRCS= aliases_parse.y \
+ aliases_scan.l \
+ base64.c \
+ conf.c \
+ crypto.c \
+ dma.c \
+ dns.c \
+ local.c \
+ mail.c \
+ net.c \
+ spool.c \
+ util.c
+MAN8= dma.8
+CONFS= dma.conf
+CONFSDIR= ${ETCDIR}/dma
+YFLAGS+= -i
+CLEANFILES= aliases_parse.i
+FILES= mailer.conf
+FILESDIR= ${SHAREDIR}/examples/dma
+
+BINMODE= 2555
+
+.include <bsd.compiler.mk>
+
+.if ${COMPILER_TYPE} == gcc
+WARNS= 5
+.endif
+
+.include <bsd.prog.mk>
diff --git a/libexec/dma/dmagent/dma.conf b/libexec/dma/dmagent/dma.conf
new file mode 100644
index 0000000..2f50a4e
--- /dev/null
+++ b/libexec/dma/dmagent/dma.conf
@@ -0,0 +1,64 @@
+# $FreeBSD$
+#
+# Your smarthost (also called relayhost). Leave blank if you don't want
+# smarthost support.
+#SMARTHOST
+
+# Use this SMTP port. Most users will be fine with the default (25)
+#PORT 25
+
+# Path to your alias file. Just stay with the default.
+#ALIASES /etc/aliases
+
+# Path to your spooldir. Just stay with the default.
+#SPOOLDIR /var/spool/dma
+
+# SMTP authentication
+#AUTHPATH /etc/dma/auth.conf
+
+# Uncomment if yout want TLS/SSL support
+#SECURETRANSFER
+
+# Uncomment if you want STARTTLS support (only used in combination with
+# SECURETRANSFER)
+#STARTTLS
+
+# Uncomment if you have specified STARTTLS above and it should be allowed
+# to fail ("opportunistic TLS", use an encrypted connection when available
+# but allow an unencrypted one to servers that do not support it)
+#OPPORTUNISTIC_TLS
+
+# Path to your local SSL certificate
+#CERTFILE
+
+# If you want to use plain text SMTP login without using encryption, change
+# the SECURE entry below to INSECURE. Otherwise plain login will only work
+# over a secure connection. Use this option with caution.
+#SECURE
+
+# Uncomment if you want to defer your mails. This is useful if you are
+# behind a dialup line. You have to submit your mails manually with dma -q
+#DEFER
+
+# Uncomment if you want the bounce message to include the complete original
+# message, not just the headers.
+#FULLBOUNCE
+
+# The internet hostname dma uses to identify the host.
+# If not set or empty, the result of gethostname(2) is used.
+# If MAILNAME is an absolute path to a file, the first line of this file
+# will be used as the hostname.
+#MAILNAME mail.example.net
+
+# Masquerade envelope from addresses with this address/hostname.
+# Use this if mails are not accepted by destination mail servers because
+# your sender domain is invalid.
+# By default, MASQUERADE is not set.
+# Format: MASQUERADE [user@][host]
+# Examples:
+# MASQUERADE john@ on host "hamlet" will send all mails as john@hamlet
+# MASQUERADE percolator will send mails as $username@percolator, e.g. fish@percolator
+# MASQUERADE herb@ert will send all mails as herb@ert
+
+# Directly forward the mail to the SMARTHOST bypassing aliases and local delivery
+#NULLCLIENT
diff --git a/libexec/dma/dmagent/mailer.conf b/libexec/dma/dmagent/mailer.conf
new file mode 100644
index 0000000..53f42c2
--- /dev/null
+++ b/libexec/dma/dmagent/mailer.conf
@@ -0,0 +1,5 @@
+# $FreeBSD$
+
+sendmail /usr/libexec/dma
+send-mail /usr/libexec/dma
+mailq /usr/libexec/dma
--
cgit v1.1