From 8951ff5877fa30815d4a3f02835e8a164de25aa5 Mon Sep 17 00:00:00 2001
From: Marcin Krol <hawk@tld-linux.org>
Date: Thu, 21 Jan 2016 13:32:51 +0000
Subject: [PATCH] - updated to 52b
---
mksh-circumflex.patch | 57 ----------------------------------------
mksh-no_stop_alias.patch | 49 ----------------------------------
mksh.spec | 10 +++----
3 files changed, 3 insertions(+), 113 deletions(-)
delete mode 100644 mksh-circumflex.patch
delete mode 100644 mksh-no_stop_alias.patch
diff --git a/mksh-circumflex.patch b/mksh-circumflex.patch
deleted file mode 100644
index 8533e44..0000000
--- a/mksh-circumflex.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-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 '!':
-+ 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
-@@ -843,7 +843,7 @@
- bool notp, found = false;
- const unsigned char *orig_p = p;
-
-- if ((notp = tobool(ISMAGIC(*p) && *++p == '!')))
-+ if ((notp = tobool(ISMAGIC(*p) && (*++p == '!' || *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,5 +380,6 @@
- #define MAGIC (7) /* prefix for *?[!{,} during expand */
- #define ISMAGIC(c) ((unsigned char)(c) == MAGIC)
-+#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 == '!' ||
-+ (ISMAGIC(c) || c == '[' || c == '!' || c == NOT2 ||
- c == '-' || c == ']' || c == '*' || c == '?'))
- shf_putc(MAGIC, shf);
- shf_putc(c, shf);
-diff -urN mksh.org/check.t mksh/check.t
---- mksh.org/check.t 2014-01-11 19:10:02.000000000 +0100
-+++ mksh/check.t 2014-01-20 14:12:37.924222697 +0100
-@@ -2085,7 +2085,7 @@
- cbc
- -bc cbc
- abc bbc
-- ^bc abc bbc
-+ !bc -bc ^bc cbc
- !bc -bc ^bc cbc
- ---
- name: glob-range-2
diff --git a/mksh-no_stop_alias.patch b/mksh-no_stop_alias.patch
deleted file mode 100644
index b026076..0000000
--- a/mksh-no_stop_alias.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -urN mksh.org/check.t mksh/check.t
---- mksh.org/check.t 2015-07-10 21:36:57.000000000 +0200
-+++ mksh/check.t 2015-07-13 09:29:23.388948055 +0200
-@@ -7467,7 +7467,6 @@
- nohup='nohup '
- r='\builtin fc -e -'
- source='PATH=$PATH:. \command .'
-- stop='\kill -STOP'
- type='\builtin whence -v'
- ---
- name: aliases-1-hartz4
-@@ -7532,7 +7531,6 @@
- nohup='nohup '
- r='\builtin fc -e -'
- source='PATH=$PATH:. \command .'
-- stop='\kill -STOP'
- type='\builtin whence -v'
- ---
- name: aliases-3b
-@@ -7555,7 +7553,6 @@
- nohup='nohup '
- r='\builtin fc -e -'
- source='PATH=$PATH:. \command .'
-- stop='\kill -STOP'
- type='\builtin whence -v'
- ---
- name: aliases-2b-hartz4
-diff -urN mksh.org/main.c mksh/main.c
---- mksh.org/main.c 2015-07-10 21:37:01.000000000 +0200
-+++ mksh/main.c 2015-07-13 09:29:08.398575771 +0200
-@@ -74,7 +74,6 @@
- #if !defined(ANDROID) && !defined(MKSH_UNEMPLOYED)
- /* not in Android for political reasons */
- /* not in ARGE mksh due to no job control */
-- "stop=\\kill -STOP",
- #endif
- "autoload=\\typeset -fu",
- "functions=\\typeset -f",
-diff -urN mksh.org/mksh.1 mksh/mksh.1
---- mksh.org/mksh.1 2015-07-10 21:36:05.000000000 +0200
-+++ mksh/mksh.1 2015-07-13 09:29:15.412083285 +0200
-@@ -1131,7 +1131,6 @@
- nohup=\*(aqnohup \*(aq
- r=\*(aq\ebuiltin fc \-e \-\*(aq
- source=\*(aqPATH=$PATH:. \ecommand .\*(aq
--stop=\*(aq\ekill \-STOP\*(aq
- type=\*(aq\ebuiltin whence \-v\*(aq
- .Ed
- .Pp
diff --git a/mksh.spec b/mksh.spec
index 28f9c5b..3f02e72 100644
--- a/mksh.spec
+++ b/mksh.spec
@@ -6,17 +6,15 @@
Summary: MirBSD Korn Shell
Summary(pl.UTF-8): PowÅoka Korna z MirBSD
Name: mksh
-Version: 51
+Version: 52b
Release: 1
License: BSD
Group: Applications/Shells
Source0: http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.tgz
-# Source0-md5: 8e522475da795c60f35a6f8035481baf
+# Source0-md5: 123f713e71754da87a455b5fbe0b03b7
Source1: %{name}-mkshrc
Patch0: %{name}-mkshrc_support.patch
-Patch1: %{name}-circumflex.patch
-Patch2: %{name}-no_stop_alias.patch
-Patch3: %{name}-cmdline-length.patch
+Patch1: %{name}-cmdline-length.patch
URL: https://www.mirbsd.org/mksh.htm
%if %{with tests}
BuildRequires: ed
@@ -83,8 +81,6 @@ mv mksh/* .; rmdir mksh
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
# sed rules instead of patch (needed update for every release)
sed -i -e 's|\(#define.*MKSH_VERSION.*\)"|\1 @DISTRO@"|g' sh.h
--
2.49.0