Ignore a whole slew of sendmail compatibility options.

diff --git a/changelog b/changelog
index c976ed33dfb694345fa4405d849c83f88446e457..fbff183a7e175618a482929dda8fc90b74fbbc32 100644 (file)
--- 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 (file)
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 7134a0c3a1dc2ddf6dfbba83595372202acd21b2..634639c390973f4cdab507d52e003573ce053e3f 100644 (file)
--- 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