packages: mksh/mksh.spec, mksh/mksh-circumflex.patch (NEW) - circumflex.pat...

[arekm]

Author: arekm                        Date: Thu Jul  7 16:38:07 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- circumflex.patch is back

---- Files affected:
packages/mksh:
   mksh.spec (1.17 -> 1.18) , mksh-circumflex.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mksh/mksh.spec
diff -u packages/mksh/mksh.spec:1.17 packages/mksh/mksh.spec:1.18
--- packages/mksh/mksh.spec:1.17	Thu Jul  7 18:14:32 2011
+++ packages/mksh/mksh.spec	Thu Jul  7 18:38:01 2011
@@ -13,6 +13,7 @@
 # Source0-md5:	395a6c5f39c7e2afd8f6504d90ca90bd
 Source1:	%{name}-mkshrc
 Patch0:		%{name}-mkshrc_support.patch
+Patch1:		%{name}-circumflex.patch
 URL:		https://www.mirbsd.org/mksh.htm
 %if %{with tests}
 BuildRequires:	ed
@@ -79,6 +80,7 @@
 mv mksh/* .; rmdir mksh
 
 %patch0 -p0
+%patch1 -p1
 
 %build
 install -d out
@@ -145,6 +147,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2011/07/07 16:38:01  arekm
+- circumflex.patch is back
+
 Revision 1.17  2011/07/07 16:14:32  arekm
 - additional add_etc_shells for /bin/sh at posttrans (so removing pdksh won't remove /bin/sh from there)
 

================================================================
Index: packages/mksh/mksh-circumflex.patch
diff -u /dev/null packages/mksh/mksh-circumflex.patch:1.1
--- /dev/null	Thu Jul  7 18:38:07 2011
+++ packages/mksh/mksh-circumflex.patch	Thu Jul  7 18:38:01 2011
@@ -0,0 +1,55 @@
+diff -ur mksh-40.org//eval.c mksh-40/eval.c
+--- mksh-40.org//eval.c	2011-06-12 16:45:57.000000000 +0200
++++ mksh-40/eval.c	2011-07-07 18:27:58.891492090 +0200
+@@ -887,6 +887,7 @@
+ 				switch (c) {
+ 				case '[':
+ 				case NOT:
++				case NOT2:
+ 				case '-':
+ 				case ']':
+ 					/*
+diff -ur mksh-40.org//misc.c mksh-40/misc.c
+--- mksh-40.org//misc.c	2011-06-12 16:45:58.000000000 +0200
++++ mksh-40/misc.c	2011-07-07 18:28:39.015826686 +0200
+@@ -652,7 +652,7 @@
+ 			if (!in_bracket) {
+ 				saw_glob = true;
+ 				in_bracket = true;
+-				if (ISMAGIC(p[1]) && p[2] == NOT)
++				if (ISMAGIC(p[1]) && (p[2] == NOT || p[2] == NOT2))
+ 					p += 2;
+ 				if (ISMAGIC(p[1]) && p[2] == ']')
+ 					p += 2;
+@@ -831,7 +831,7 @@
+ 	int c, d, notp, found = 0;
+ 	const unsigned char *orig_p = p;
+ 
+-	if ((notp = (ISMAGIC(*p) && *++p == NOT)))
++	if ((notp = (ISMAGIC(*p) && (*++p == NOT || *p == NOT2))))
+ 		p++;
+ 	do {
+ 		c = *p++;
+diff -ur mksh-40.org//sh.h mksh-40/sh.h
+--- mksh-40.org//sh.h	2011-06-12 16:59:09.000000000 +0200
++++ mksh-40/sh.h	2011-07-07 18:29:16.346761511 +0200
+@@ -380,6 +380,7 @@
+ #define MAGIC		(7)	/* prefix for *?[!{,} during expand */
+ #define ISMAGIC(c)	((unsigned char)(c) == MAGIC)
+ #define NOT		'!'	/* might use ^ (ie, [!...] vs [^..]) */
++#define NOT2		'^'
+ 
+ #define LINE		4096	/* input line size */
+ 
+diff -ur mksh-40.org//tree.c mksh-40/tree.c
+--- mksh-40.org//tree.c	2011-05-29 04:19:21.000000000 +0200
++++ mksh-40/tree.c	2011-07-07 18:30:12.088149284 +0200
+@@ -289,7 +289,7 @@
+ 		case CHAR:
+ 			c = *wp++;
+ 			if ((opmode & WDS_MAGIC) &&
+-			    (ISMAGIC(c) || c == '[' || c == NOT ||
++			    (ISMAGIC(c) || c == '[' || c == NOT || c == NOT2 ||
+ 			    c == '-' || c == ']' || c == '*' || c == '?'))
+ 				shf_putc(MAGIC, shf);
+ 			shf_putc(c, shf);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mksh/mksh.spec?r1=1.17&r2=1.18&f=u