adopt 03-debian-locations.patch; do not set a default bogus smarthost

diff --git a/debian/patches/03-debian-locations.patch b/debian/patches/03-debian-locations.patch
deleted file mode 100644 (file)
index 60f68d7..0000000
--- a/debian/patches/03-debian-locations.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Customize the /etc/dma configuration files for Debian.
- On Debian, the aliases file lives in /etc, not /etc/mail.
- Define a smarthost by default, albeit an invalid one.
-Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
-Forwarded: not-needed
-Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2010-07-27
-
---- a/dma.8
-+++ b/dma.8
-@@ -166,7 +166,7 @@
- .Pa dma.conf .
- .Bl -tag -width 4n
- .It Ic SMARTHOST Xo
--(string, default=empty)
-+(string, default=mail.example.com)
- .Xc
- If you want to send outgoing mails via a smarthost, set this variable to
- your smarthosts address.
-@@ -181,7 +181,7 @@
- will deliver all mails to this port, regardless of whether a smarthost is set
- or not.
- .It Ic ALIASES Xo
--(string, default=/etc/mail/aliases)
-+(string, default=/etc/aliases)
- .Xc
- Path to the local aliases file.
- Just stick with the default.
---- a/dma.conf
-+++ b/dma.conf
-@@ -2,13 +2,15 @@
- #
- # Your smarthost (also called relayhost).  Leave blank if you don't want
- # smarthost support.
--#SMARTHOST
-+# NOTE: on Debian systems this is handled via debconf!
-+# Please use dpkg-reconfigure dma to change this value.
-+#SMARTHOST mail.example.com
- 
- # 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/mail/aliases
-+#ALIASES /etc/aliases
- 
- # Path to your spooldir.  Just stay with the default.
- #SPOOLDIR /var/spool/dma
---- a/dma.c
-+++ b/dma.c
-@@ -70,7 +70,7 @@
- struct config config = {
-       .smarthost      = NULL,
-       .port           = 25,
--      .aliases        = "/var/mail/aliases",
-+      .aliases        = "/etc/aliases",
-       .spooldir       = "/var/spool/dma",
-       .virtualpath    = NULL,
-       .authpath       = NULL,

diff --git a/dma.8 b/dma.8
index 74e4dcd940d0e1065db1d14d97810210792f7c76..9db2a3c5c3e575ed2865e978ae8c91599a7be505 100644 (file)
--- a/dma.8
+++ b/dma.8
@@ -181,7 +181,7 @@ option, because
 will deliver all mails to this port, regardless of whether a smarthost is set
 or not.
 .It Ic ALIASES Xo
-(string, default=/etc/mail/aliases)
+(string, default=/etc/aliases)
 .Xc
 Path to the local aliases file.
 Just stick with the default.

diff --git a/dma.c b/dma.c
index 49b1634499427e3d78f78082c13b265b3ab219bc..f8d893fbe99e465af1aafe839054e94709dbc577 100644 (file)
--- a/dma.c
+++ b/dma.c
@@ -72,7 +72,7 @@ static int daemonize = 1;
 struct config config = {
        .smarthost      = NULL,
        .port           = 25,
-       .aliases        = "/var/mail/aliases",
+       .aliases        = "/etc/aliases",
        .spooldir       = "/var/spool/dma",
        .authpath       = NULL,
        .certfile       = NULL,

diff --git a/dma.conf b/dma.conf
index eae6c57be127abad0e440c2bae84c63d1118e56f..a9cb57248291ea5a7d32d2f6f6dc5ec01068ee74 100644 (file)
--- a/dma.conf
+++ b/dma.conf
@@ -2,13 +2,15 @@
 #
 # Your smarthost (also called relayhost).  Leave blank if you don't want
 # smarthost support.
+# NOTE: on Debian systems this is handled via debconf!
+# Please use dpkg-reconfigure dma to change this value.
 #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/mail/aliases
+#ALIASES /etc/aliases
 
 # Path to your spooldir.  Just stay with the default.
 #SPOOLDIR /var/spool/dma