From: Marcin Krol Date: Fri, 24 Jul 2015 16:32:15 +0000 (+0000) Subject: - updated to 51, partial PLD merge X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=21707d87fd33c0e747e437f7712104316628daa7;p=packages%2Fmksh.git - updated to 51, partial PLD merge --- diff --git a/mksh-no_stop_alias.patch b/mksh-no_stop_alias.patch index ae2a9ba..b026076 100644 --- a/mksh-no_stop_alias.patch +++ b/mksh-no_stop_alias.patch @@ -1,46 +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-49/mksh.1~ 2014-01-11 20:10:06.000000000 +0200 -+++ mksh-49/mksh.1 2014-01-20 14:21:04.704670524 +0200 -@@ -1131,7 +1131,6 @@ - nameref=\*(aqtypeset \-n\*(aq - nohup=\*(aqnohup \*(aq - r=\*(aqfc \-e \-\*(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 diff --git a/mksh.spec b/mksh.spec index 0648c90..28f9c5b 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: 50d +Version: 51 Release: 1 License: BSD Group: Applications/Shells Source0: http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.tgz -# Source0-md5: 1c3882c07a760b23df1ad94ad0b4ed2e +# Source0-md5: 8e522475da795c60f35a6f8035481baf Source1: %{name}-mkshrc Patch0: %{name}-mkshrc_support.patch Patch1: %{name}-circumflex.patch @@ -78,8 +78,7 @@ zbliżonej do oryginalnej powłoki Korna z AT&T. W tym pakiecie jest mksh skonsolidowany statycznie. %prep -%setup -qcT -gzip -dc %{SOURCE0} | cpio -mid +%setup -qc mv mksh/* .; rmdir mksh %patch0 -p1 @@ -92,7 +91,7 @@ sed -i -e 's|\(#define.*MKSH_VERSION.*\)"|\1 @DISTRO@"|g' sh.h sed -i -e 's|\(@(#)MIRBSD KSH.*\)|\1 @DISTRO@|g' check.t # fill distro -sed -i -e 's#@DISTRO@#TLD/Linux 3.0#g' check.t sh.h +sed -i -e 's#@DISTRO@#TLD/Linux#g' check.t sh.h # sanity checks grep TLD/Linux check.t || exit 1 grep TLD/Linux sh.h || exit 1