Refresh the rest of the patches for the queue fix change to dma.c.

diff --git a/changelog b/changelog
index 13a764470f4c1b3c55402f8fa8c5f6cf581af306..a561f776795011f3dcf13e95d0dd3831c31582bc 100644 (file)
--- a/changelog
+++ b/changelog
@@ -2,6 +2,7 @@ dma (0.0.2009.02.11-1~6) unstable; urgency=low
 
   * Fix my own queue display patch - if a message has multiple recipients,
     only display it once :)
+  * Refresh some other patches due to the line added at the start of dma.c.
 
  -- Peter Pentchev <roam@ringlet.net>  Tue, 24 Mar 2009 16:06:57 +0200
 

diff --git a/patches/18-guess-username.patch b/patches/18-guess-username.patch
index f20c63df5377e62eec4b4b80fcb0cf8f1eb6b9b9..4cae280534582893833f709d851e38920ae06fcb 100644 (file)
--- a/patches/18-guess-username.patch
+++ b/patches/18-guess-username.patch
@@ -10,10 +10,10 @@ to utmp/wtmp, etc.
  struct config *config;
 +static const char *username;
 +static uid_t uid;
+ static struct strlist seenmsg[16][16];
  
  static int open_locked(const char *, int);
- 
-@@ -117,6 +119,45 @@
+@@ -118,6 +120,45 @@
        return name;
  }
  
@@ -59,7 +59,7 @@ to utmp/wtmp, etc.
  static char *
  set_from(const char *osender)
  {
-@@ -125,7 +166,7 @@
+@@ -126,7 +167,7 @@
  
        if ((config->features & VIRTUAL) != 0) {
                SLIST_FOREACH(v, &virtusers, next) {
@@ -68,7 +68,7 @@ to utmp/wtmp, etc.
                                sender = strdup(v->address);
                                if (sender == NULL)
                                        return(NULL);
-@@ -139,7 +180,7 @@
+@@ -140,7 +181,7 @@
                if (sender == NULL)
                        return (NULL);
        } else {
@@ -77,7 +77,7 @@ to utmp/wtmp, etc.
                        return (NULL);
        }
  
-@@ -367,7 +408,7 @@
+@@ -368,7 +409,7 @@
  \tid %"PRIxMAX"\n\
  \tby %s (%s)\n\
  \t%s\n",
@@ -86,7 +86,7 @@ to utmp/wtmp, etc.
                sender,
                queue->id,
                hostname(), VERSION,
-@@ -1121,6 +1162,7 @@
+@@ -1182,6 +1223,7 @@
        opterr = 1;
  
        openlog(tag, LOG_PID | LOG_PERROR, LOG_MAIL);

diff --git a/patches/20-parse-recipient.patch b/patches/20-parse-recipient.patch
index 8b6cfe62c5e2c0f123bf00ba063228b62a20e660..df4b9d5c5a5d466c2a093b44e9c3693b1a4fef47 100644 (file)
--- a/patches/20-parse-recipient.patch
+++ b/patches/20-parse-recipient.patch
@@ -28,10 +28,10 @@ to obtain the recipient addresses.
  static const char *username;
  static uid_t uid;
 +static FILE *scanfile;
+ static struct strlist seenmsg[16][16];
  
  static int open_locked(const char *, int);
- 
-@@ -396,11 +397,307 @@
+@@ -397,11 +398,307 @@
  }
  
  static int
@@ -339,7 +339,7 @@ to obtain the recipient addresses.
  
        error = snprintf(line, sizeof(line), "\
  Received: from %s (uid %d)\n\
-@@ -418,8 +715,12 @@
+@@ -419,8 +716,12 @@
        if (write(queue->mailfd, line, error) != error)
                return (-1);
  
@@ -354,7 +354,7 @@ to obtain the recipient addresses.
                        break;
                linelen = strlen(line);
                if (linelen == 0 || line[linelen - 1] != '\n') {
-@@ -433,6 +734,8 @@
+@@ -434,6 +735,8 @@
        }
        if (fsync(queue->mailfd) != 0)
                return (-1);
@@ -363,7 +363,7 @@ to obtain the recipient addresses.
        return (0);
  }
  
-@@ -1104,14 +1407,14 @@
+@@ -1165,14 +1468,14 @@
        struct queue queue;
        struct queue lqueue;
        int i, ch;
@@ -380,7 +380,7 @@ to obtain the recipient addresses.
                switch (ch) {
                case 'A':
                        /* -AX is being ignored, except for -A{c,m} */
-@@ -1153,6 +1456,10 @@
+@@ -1214,6 +1517,10 @@
                        doqueue = 1;
                        break;
  
@@ -391,7 +391,7 @@ to obtain the recipient addresses.
                /* Ignored options */
                case 'B':
                case 'C':
-@@ -1225,12 +1532,19 @@
+@@ -1286,12 +1593,19 @@
                        errx(1, "invalid recipient `%s'\n", argv[i]);
        }