[packages/mksh] - up to 52; upsteam dropped stop alias

[arekm]

commit f9942231b3a55294ddb0338380946b78d563b2d3
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Dec 16 09:31:48 2015 +0100

    - up to 52; upsteam dropped stop alias

 mksh-circumflex.patch    | 12 ------------
 mksh-no_stop_alias.patch | 49 ------------------------------------------------
 mksh.spec                | 10 ++++------
 3 files changed, 4 insertions(+), 67 deletions(-)
---
diff --git a/mksh.spec b/mksh.spec
index 815fdb3..542738f 100644
--- a/mksh.spec
+++ b/mksh.spec
@@ -6,18 +6,17 @@
 Summary:	MirBSD Korn Shell
 Summary(pl.UTF-8):	Powłoka Korna z MirBSD
 Name:		mksh
-Version:	51
-Release:	3
+Version:	52
+Release:	1
 License:	BSD
 Group:		Applications/Shells
 Source0:	https://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.tgz
-# Source0-md5:	8e522475da795c60f35a6f8035481baf
+# Source0-md5:	cd5b92fc2e455d33cbd59f3e7518f257
 Source1:	%{name}-mkshrc
 Source2:	get-source.sh
 Patch0:		%{name}-mkshrc_support.patch
 Patch1:		%{name}-circumflex.patch
-Patch2:		%{name}-no_stop_alias.patch
-Patch3:		%{name}-cmdline-length.patch
+Patch2:		%{name}-cmdline-length.patch
 URL:		https://www.mirbsd.org/mksh.htm
 %if %{with tests}
 BuildRequires:	ed
@@ -85,7 +84,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
diff --git a/mksh-circumflex.patch b/mksh-circumflex.patch
index 8533e44..f52bbed 100644
--- a/mksh-circumflex.patch
+++ b/mksh-circumflex.patch
@@ -31,18 +31,6 @@ diff -ur mksh-40.org//sh.h mksh-40/sh.h
  
  #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
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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mksh.git/commitdiff/f9942231b3a55294ddb0338380946b78d563b2d3