Do not set features = DEFER by default - a commented-out line in

the config file cannot override it!  D'oh!

Debian:		#587593

diff --git a/changelog b/changelog
index b3e5c1bb31cfde7f063870f1117997d50ff38cd5..059b8b35e33346972c28f700e26559122cfb0d61 100644 (file)
--- a/changelog
+++ b/changelog
@@ -2,6 +2,9 @@ dma (0.0.2010.06.17-2) UNRELEASED; urgency=low
 
   * Update the debconf translations:
     - Japanese by Hideki Yamane; Closes: #587543
+  * In the 03-debian-locations patch, revert part of the 0.0.2010.06.17-1
+    change: do not set a un-overrideable default for the deferred delivery!
+    Closes: #587593
 
  -- Peter Pentchev <roam@ringlet.net>  Tue, 29 Jun 2010 22:45:40 +0300
 

diff --git a/patches/03-debian-locations.patch b/patches/03-debian-locations.patch
index ea67c7560ed314b9cc655e19563fa450ae3999dc..d7c67e6119db6f5b5f93b20325520525a6aa6b86 100644 (file)
--- a/patches/03-debian-locations.patch
+++ b/patches/03-debian-locations.patch
@@ -1,11 +1,10 @@
 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.
- Use deferred delivery - the package includes a cron job running the queue.
 Origin: other: http://svn.ringlet.net/svn/ringlet/mail/dma/
 Forwarded: not-needed
 Author: Peter Pentchev <roam@ringlet.net>
-Last-Update: 2010-06-23
+Last-Update: 2010-06-30
 
 --- a/dma.8
 +++ b/dma.8
@@ -27,15 +26,6 @@ Last-Update: 2010-06-23
  .Xc
  Path to the local aliases file.
  Just stick with the default.
-@@ -231,7 +231,7 @@
- You have to rename this variable manually to prevent that you send your
- password accidentally over an insecure connection.
- .It Ic DEFER Xo
--(boolean, default=commented)
-+(boolean, default=set)
- .Xc
- Comment if you want that
- .Nm
 --- a/dma.conf
 +++ b/dma.conf
 @@ -2,13 +2,15 @@
@@ -67,7 +57,7 @@ Last-Update: 2010-06-23
  # message, not just the headers.
 --- a/dma.c
 +++ b/dma.c
-@@ -70,12 +70,12 @@
+@@ -70,7 +70,7 @@
  struct config config = {
        .smarthost      = NULL,
        .port           = 25,
@@ -76,9 +66,3 @@ Last-Update: 2010-06-23
        .spooldir       = "/var/spool/dma",
        .virtualpath    = NULL,
        .authpath       = NULL,
-       .certfile       = NULL,
--      .features       = 0,
-+      .features       = DEFER,
-       .mailname       = NULL,
-       .mailnamefile   = NULL,
- };

diff --git a/patches/32-comment-uncomment.patch b/patches/32-comment-uncomment.patch
index 768b72a755a786ba678a18b1ebb8d648de3a699c..7835ae86b1633a740adb3ce487960917ed5eda1e 100644 (file)
--- a/patches/32-comment-uncomment.patch
+++ b/patches/32-comment-uncomment.patch
@@ -36,7 +36,7 @@ Last-Update: 2010-06-23
  You have to rename this variable manually to prevent that you send your
 @@ -233,7 +233,7 @@
  .It Ic DEFER Xo
- (boolean, default=set)
+ (boolean, default=commented)
  .Xc
 -Comment if you want that
 +Uncomment if you want that