Fix from Robert Elz in PR 18664 to stop sortm coredumping when there's

a numerical subject.

"And yes, this really does add a preprocessor conditional that makes
either one of two original statements get compiled, and the other
omitted (ie:  the patch is correct, though just deleting a line would
work as well).  The "#if 0" could become "#if 1" and the core dump
would also be gone, though the results of the sort would then
sometimes be rather hard to explain..."

Bump PKGREVISION.

3 files changed, 40 insertions, 3 deletions

diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index e7d6b5a6124..92561bf66d2 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.47 2002/06/15 21:20:01 cjep Exp $
+# $NetBSD: Makefile,v 1.48 2002/10/15 10:47:00 agc Exp $
 # FreeBSD Id: Makefile,v 1.2 1997/08/04 06:51:28 markm Exp
 #
 
 DISTNAME=		nmh-1.0.4
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.mhost.com/pub/nmh/ \
 			ftp://ftp.gw.com/pub/unix/mail/mh/nmh/
diff --git a/mail/nmh/distinfo b/mail/nmh/distinfo
index fe0626b40a0..e5509a7fde5 100644
--- a/mail/nmh/distinfo
+++ b/mail/nmh/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2002/01/26 17:19:44 kim Exp $
+$NetBSD: distinfo,v 1.5 2002/10/15 10:47:00 agc Exp $
 
 SHA1 (nmh-1.0.4.tar.gz) = 71441a884d898db2fd9184a92e663682536425f5
 Size (nmh-1.0.4.tar.gz) = 683215 bytes
 SHA1 (patch-ca) = 43aaf15dc5d07de03ff912894d7128d03eb1889d
 SHA1 (patch-cb) = 6e498988c08e393fdd4e8e27f2ff6ce457e2c803
 SHA1 (patch-cd) = 13901025ef3a1b7fc07d0c13f8e1aef3e9bee2d6
+SHA1 (patch-ce) = b93b07c3ee82e6ab8599f362e14ad2dbe1955325
diff --git a/mail/nmh/patches/patch-ce b/mail/nmh/patches/patch-ce
new file mode 100644
index 00000000000..fd92e91af6c
--- /dev/null
+++ b/mail/nmh/patches/patch-ce
@@ -0,0 +1,36 @@
+$NetBSD: patch-ce,v 1.3 2002/10/15 10:47:00 agc Exp $
+
+Robert Elz's PR 18664 contains the rationale for this patch:
+
+        A bug report (from Scott Lipcon) was submitted elsewhere:
+http://savannah.nongnu.org/bugs/?func=detailbug&bug_id=1393&group_id=2166
+        and then today copied to the nmh-workers list.
+
+        Basically, using "sortm -textfield subject" where a message
+        in the folder contains "Subject:N" where "N" is alphanumeric
+        will cause sortm to dump core (the "korean spam" aspect of the
+        mail that caused the original bug report is irrelevant).
+
+>How-To-Repeat:
+        Use nmh.   Put a message in a folder that contains "Subject:1234"
+        and then run
+                sortm +whatever-folder -textfield subject
+        and watch for the core dump.
+
+        Or, examine the code and be amazed ...
+
+--- uip/sortm.c	2000/02/04 20:28:24	1.3
++++ uip/sortm.c	2002/10/15 10:38:32
+@@ -439,9 +439,12 @@
+ 			if(uprf(cp, "re:"))
+ 			    cp += 2;
+ 			else {
++#if 0
+ 			    if (isalnum(c))
+ 				*cp2++ = isupper(c) ? tolower(c) : c;
++#else
+ 			    break;
++#endif
+ 			}
+ 		    }
+ 		    cp++;