[packages/mksh] - updated to 50 - updated mkshrc_support patch

[qboosh]

commit e42128b9c7816e7f2e2d18e95eb595bcc97eb3bf
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Aug 21 18:48:35 2014 +0200

    - updated to 50
    - updated mkshrc_support patch

 mksh-mkshrc_support.patch | 38 +++++++++++++++++++-------------------
 mksh.spec                 |  6 +++---
 2 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/mksh.spec b/mksh.spec
index f51bc10..f15fbf9 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:	49
+Version:	50
 Release:	1
 License:	BSD
 Group:		Applications/Shells
 Source0:	http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.tgz
-# Source0-md5:	e8c205cac72c3dc8540bbc3897421422
+# Source0-md5:	436a448f4124d3743adb9e4a1562b77e
 Source1:	%{name}-mkshrc
 Patch0:		%{name}-mkshrc_support.patch
 Patch1:		%{name}-circumflex.patch
@@ -82,7 +82,7 @@ W tym pakiecie jest mksh skonsolidowany statycznie.
 gzip -dc %{SOURCE0} | cpio -mid
 mv mksh/* .; rmdir mksh
 
-%patch0 -p0
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
diff --git a/mksh-mkshrc_support.patch b/mksh-mkshrc_support.patch
index a653979..15465a6 100644
--- a/mksh-mkshrc_support.patch
+++ b/mksh-mkshrc_support.patch
@@ -1,19 +1,19 @@
---- main.c~	2011-07-07 18:15:26.961632040 +0100
-+++ main.c	2011-07-07 18:15:50.664694256 +0100
-@@ -532,10 +532,14 @@
- 		char *env_file;
- 
- 		/* include $ENV */
--		env_file = substitute(substitute("${ENV:-" MKSHRC_PATH "}", 0),
--		    DOTILDE);
-+                env_file = substitute(substitute("${ENV}", 0), DOTILDE);
- 		if (*env_file != '\0')
- 			include(env_file, 0, NULL, true);
-+                else { 
-+			env_file = substitute(MKSHRC_PATH, DOTILDE);
-+			include("/etc/mkshrc", 0, NULL, true);
-+			include(env_file, 0, NULL, true);
-+                        }
- 	}
- 
- 	if (restricted) {
+--- mksh-50/main.c.orig	2014-08-21 18:13:38.072682886 +0200
++++ mksh-50/main.c	2014-08-21 18:29:13.715976954 +0200
+@@ -591,10 +591,14 @@
+ 		if (Flag(FLOGIN))
+ 			include(substitute("$HOME/.profile", 0), 0, NULL, true);
+ 		if (Flag(FTALKING)) {
+-			cp = substitute(substitute("${ENV:-" MKSHRC_PATH "}",
+-			    0), DOTILDE);
++			cp = substitute(substitute("${ENV}", 0), DOTILDE);
+ 			if (cp[0] != '\0')
+ 				include(cp, 0, NULL, true);
++			else {
++				cp = substitute(MKSHRC_PATH, DOTILDE);
++				include("/etc/mkshrc", 0, NULL, true);
++				include(cp, 0, NULL, true);
++			}
+ 		}
+ 	} else {
+ 		include(MKSH_SUID_PROFILE, 0, NULL, true);
================================================================

---- gitweb:

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