commit b960ac9aa86df882d28bf90f19a21e3f0cfff9da
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Mon Jul 13 09:34:27 2015 +0200
- up to 51
mksh-no_stop_alias.patch | 78 +++++++++++++++++++++++++-----------------------
mksh.spec | 4 +--
2 files changed, 42 insertions(+), 40 deletions(-)
---
diff --git a/mksh.spec b/mksh.spec
index ce10048..fbeb670 100644
--- a/mksh.spec
+++ b/mksh.spec
@@ -6,12 +6,12 @@
Summary: MirBSD Korn Shell
Summary(pl.UTF-8): Powłoka Korna z MirBSD
Name: mksh
-Version: 50f
+Version: 51
Release: 1
License: BSD
Group: Applications/Shells
Source0:
https://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.tgz
-# Source0-md5: c3bdd668992e7369165910f0902fa854
+# Source0-md5: 8e522475da795c60f35a6f8035481baf
Source1: %{name}-mkshrc
Source2: get-source.sh
Patch0: %{name}-mkshrc_support.patch
diff --git a/mksh-no_stop_alias.patch b/mksh-no_stop_alias.patch
index 5805c05..b026076 100644
--- a/mksh-no_stop_alias.patch
+++ b/mksh-no_stop_alias.patch
@@ -1,47 +1,49 @@
---- mksh-49/main.c~ 2014-01-20 14:20:05.000000000 +0200
-+++ mksh-49/main.c 2014-01-20 14:20:37.166725505 +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",
-
---- mksh-50f/mksh.1~ 2015-04-13 01:32:55.000000000 +0300
-+++ mksh-50f/mksh.1 2015-04-22 12:28:32.070141365 +0300
-@@ -1131,7 +1131,6 @@
- nohup=\*(aqnohup \*(aq
- r=\*(aqfc \-e \-\*(aq
- source=\*(aqPATH=$PATH:. command .\*(aq
--stop=\*(aqkill \-STOP\*(aq
- type=\*(aqwhence \-v\*(aq
- .Ed
- .Pp
--- mksh-49/check.t~ 2014-01-11 20:10:02.000000000 +0200
-+++ mksh-49/check.t 2014-01-20 14:21:32.202611748 +0200
-@@ -6766,7 +6766,6 @@
+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='fc -e -'
- source='PATH=$PATH:. command .'
-- stop='kill -STOP'
- type='whence -v'
+ r='\builtin fc -e -'
+ source='PATH=$PATH:. \command .'
+- stop='\kill -STOP'
+ type='\builtin whence -v'
---
name: aliases-1-hartz4
-@@ -6834,7 +6833,6 @@
+@@ -7532,7 +7531,6 @@
nohup='nohup '
- r='fc -e -'
- source='PATH=$PATH:. command .'
-- stop='kill -STOP'
- type='whence -v'
+ r='\builtin fc -e -'
+ source='PATH=$PATH:. \command .'
+- stop='\kill -STOP'
+ type='\builtin whence -v'
---
name: aliases-3b
-@@ -6857,7 +6855,6 @@
+@@ -7555,7 +7553,6 @@
nohup='nohup '
- r='fc -e -'
- source='PATH=$PATH:. command .'
-- stop='kill -STOP'
- type='whence -v'
+ 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/b960ac9aa86df882d28bf90f19a21e3f0cfff9da
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
