From a094cecdf6b6b1f306578bdb773d562e913f80ab Mon Sep 17 00:00:00 2001
From: Peter Pentchev <roam@ringlet.net>
Date: Thu, 12 Mar 2009 13:40:49 +0000
Subject: [PATCH] Ignore a whole slew of sendmail compatibility options.

---
 changelog                       | 10 ++++++++--
 patches/19-ignore-options.patch | 35 +++++++++++++++++++++++++++++++++
 patches/series                  |  1 +
 3 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 patches/19-ignore-options.patch

diff --git a/changelog b/changelog
index c976ed3..fbff183 100644
--- a/changelog
+++ b/changelog
@@ -1,9 +1,15 @@
-dma (0.0.2009.02.11-1~3) unstable; urgency=low
+dma (0.0.2009.02.11-1~4) unstable; urgency=low
 
-  * Add a new patch to guess the username better when getlogin(3) fails.
+  * Add a new patch to ignore a whole slew of sendmail options.
   * TODO:
     - use debconf.
 
+ -- Peter Pentchev <roam@ringlet.net>  Thu, 12 Mar 2009 15:36:42 +0200
+
+dma (0.0.2009.02.11-1~3) unstable; urgency=low
+
+  * Add a new patch to guess the username better when getlogin(3) fails.
+
  -- Peter Pentchev <roam@ringlet.net>  Thu, 12 Mar 2009 14:43:14 +0200
 
 dma (0.0.2009.02.11-1~2) unstable; urgency=low
diff --git a/patches/19-ignore-options.patch b/patches/19-ignore-options.patch
new file mode 100644
index 0000000..725b130
--- /dev/null
+++ b/patches/19-ignore-options.patch
@@ -0,0 +1,35 @@
+Ignore a whole slew of sendmail options.  Probably some more left.
+
+--- a/dma.c
++++ b/dma.c
+@@ -1111,7 +1111,7 @@
+ 	snprintf(tag, 254, "dma");
+ 
+ 	opterr = 0;
+-	while ((ch = getopt(argc, argv, "A:b:Df:iL:o:O:q:r:")) != -1) {
++	while ((ch = getopt(argc, argv, "A:b:B:C:d:Df:F:h:iL:N:no:O:q:r:R:UV:vX:")) != -1) {
+ 		switch (ch) {
+ 		case 'A':
+ 			/* -AX is being ignored, except for -A{c,m} */
+@@ -1153,6 +1153,21 @@
+ 			doqueue = 1;
+ 			break;
+ 
++		/* Ignored options */
++		case 'B':
++		case 'C':
++		case 'd':
++		case 'F':
++		case 'h':
++		case 'N':
++		case 'n':
++		case 'R':
++		case 'U':
++		case 'V':
++		case 'v':
++		case 'X':
++			break;
++
+ 		default:
+ 			exit(1);
+ 		}
diff --git a/patches/series b/patches/series
index 7134a0c..634639c 100644
--- a/patches/series
+++ b/patches/series
@@ -16,3 +16,4 @@
 16-bounce-full.patch
 17-mailname.patch
 18-guess-username.patch
+19-ignore-options.patch
-- 
2.47.3