After removing the deconstifying patch, refresh the later patches by a line.

diff --git a/patches/20-parse-recipient.patch b/patches/20-parse-recipient.patch
index dabe714da3ca5cda0ab4f30e85906c31b6a3f222..f6b26595847610e4cce424e6a986531e6b90fc2a 100644 (file)
--- a/patches/20-parse-recipient.patch
+++ b/patches/20-parse-recipient.patch
@@ -364,7 +364,7 @@ to obtain the recipient addresses.
        return (0);
  }
  
-@@ -1252,7 +1554,7 @@
+@@ -1251,7 +1553,7 @@
        struct queue queue;
        struct queue lqueue;
        int i, ch;
@@ -373,7 +373,7 @@ to obtain the recipient addresses.
  
        atexit(deltmp);
        LIST_INIT(&queue.queue);
-@@ -1267,7 +1569,7 @@
+@@ -1266,7 +1568,7 @@
        }
  
        opterr = 0;
@@ -382,7 +382,7 @@ to obtain the recipient addresses.
                switch (ch) {
                case 'A':
                        /* -AX is being ignored, except for -A{c,m} */
-@@ -1309,6 +1611,10 @@
+@@ -1308,6 +1610,10 @@
                        doqueue = 1;
                        break;
  
@@ -393,7 +393,7 @@ to obtain the recipient addresses.
                /* Ignored options */
                case 'B':
                case 'C':
-@@ -1382,12 +1688,19 @@
+@@ -1381,12 +1687,19 @@
                        errx(1, "invalid recipient `%s'", argv[i]);
        }
  

diff --git a/patches/22-openfiles.patch b/patches/22-openfiles.patch
index b1a0cffa2d1fe1e7ebcafc2c41233f778eeb9271..c1aec9c1ad0e641c2dda3ce4a92614f6ead47985 100644 (file)
--- a/patches/22-openfiles.patch
+++ b/patches/22-openfiles.patch
@@ -11,7 +11,7 @@ Handle the "too many open files" error gracefully, retrying.
  
  static int open_locked(const char *, int);
  
-@@ -1392,15 +1392,21 @@
+@@ -1391,15 +1391,21 @@
        char *queueid;
        char *queuefn;
        off_t hdrlen;
@@ -35,7 +35,7 @@ Handle the "too many open files" error gracefully, retrying.
        while ((de = readdir(spooldir)) != NULL) {
                sender = NULL;
                queuef = NULL;
-@@ -1416,12 +1422,22 @@
+@@ -1415,12 +1421,22 @@
                if (asprintf(&queuefn, "%s/%s", config->spooldir, de->d_name) < 0)
                        goto fail;
                seenit = seen(de->d_name);
@@ -59,7 +59,7 @@ Handle the "too many open files" error gracefully, retrying.
                        if (!ignorelock || seenit)
                                continue;
                        fd = open(queuefn, O_RDONLY);
-@@ -1506,12 +1522,15 @@
+@@ -1505,12 +1521,15 @@
  static void
  run_queue(struct queue *queue)
  {
@@ -76,7 +76,7 @@ Handle the "too many open files" error gracefully, retrying.
        deliver(it);
        /* NOTREACHED */
  }
-@@ -1534,6 +1553,8 @@
+@@ -1533,6 +1552,8 @@
                       it->queueid,
                       it->locked ? "*" : "",
                       it->sender, it->addr);
@@ -85,7 +85,7 @@ Handle the "too many open files" error gracefully, retrying.
        }
  }
  
-@@ -1664,16 +1685,21 @@
+@@ -1663,16 +1684,21 @@
                if (argc != 0)
                        errx(1, "sending mail and displaying queue is"
                                " mutually exclusive");