From: Peter Pentchev <roam@ringlet.net>
Date: Mon, 3 Aug 2009 13:44:19 +0000 (+0000)
Subject: After removing the deconstifying patch, refresh the later patches by a line.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0e1df9e1c7f7669e4dd96540e09df62242c0bae;p=people%2Fms%2Fdma.git

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 dabe714..f6b2659 100644
--- 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 b1a0cff..c1aec9c 100644
--- 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");