packages: mksh/mksh-circumflex.patch, mksh/mksh-distro.patch, mksh/mksh.spe...
draenog
draenog at pld-linux.org
Fri Mar 30 04:01:23 CEST 2012
Author: draenog Date: Fri Mar 30 02:01:23 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 40e
- tty_close.patch from http://article.gmane.org/gmane.os.miros.mksh/19
---- Files affected:
packages/mksh:
mksh-circumflex.patch (1.1 -> 1.2) , mksh-distro.patch (1.4 -> 1.5) , mksh.spec (1.38 -> 1.39) , mksh-tty_close.patch (NONE -> 1.1) (NEW), mksh-columns.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/mksh/mksh-circumflex.patch
diff -u packages/mksh/mksh-circumflex.patch:1.1 packages/mksh/mksh-circumflex.patch:1.2
--- packages/mksh/mksh-circumflex.patch:1.1 Thu Jul 7 18:38:01 2011
+++ packages/mksh/mksh-circumflex.patch Fri Mar 30 04:01:17 2012
@@ -4,7 +4,7 @@
@@ -887,6 +887,7 @@
switch (c) {
case '[':
- case NOT:
+ case '!':
+ case NOT2:
case '-':
case ']':
@@ -16,8 +16,8 @@
if (!in_bracket) {
saw_glob = true;
in_bracket = true;
-- if (ISMAGIC(p[1]) && p[2] == NOT)
-+ if (ISMAGIC(p[1]) && (p[2] == NOT || p[2] == NOT2))
+- if (ISMAGIC(p[1]) && p[2] == '!')
++ if (ISMAGIC(p[1]) && (p[2] == '!' || p[2] == NOT2))
p += 2;
if (ISMAGIC(p[1]) && p[2] == ']')
p += 2;
@@ -25,18 +25,17 @@
int c, d, notp, found = 0;
const unsigned char *orig_p = p;
-- if ((notp = (ISMAGIC(*p) && *++p == NOT)))
-+ if ((notp = (ISMAGIC(*p) && (*++p == NOT || *p == NOT2))))
+- if ((notp = (ISMAGIC(*p) && *++p == '!')))
++ if ((notp = (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,6 +380,7 @@
+@@ -380,5 +380,6 @@
#define MAGIC (7) /* prefix for *?[!{,} during expand */
#define ISMAGIC(c) ((unsigned char)(c) == MAGIC)
- #define NOT '!' /* might use ^ (ie, [!...] vs [^..]) */
+#define NOT2 '^'
#define LINE 4096 /* input line size */
@@ -48,8 +47,8 @@
case CHAR:
c = *wp++;
if ((opmode & WDS_MAGIC) &&
-- (ISMAGIC(c) || c == '[' || c == NOT ||
-+ (ISMAGIC(c) || c == '[' || c == NOT || c == NOT2 ||
+- (ISMAGIC(c) || c == '[' || c == '!' ||
++ (ISMAGIC(c) || c == '[' || c == '!' || c == NOT2 ||
c == '-' || c == ']' || c == '*' || c == '?'))
shf_putc(MAGIC, shf);
shf_putc(c, shf);
================================================================
Index: packages/mksh/mksh-distro.patch
diff -u packages/mksh/mksh-distro.patch:1.4 packages/mksh/mksh-distro.patch:1.5
--- packages/mksh/mksh-distro.patch:1.4 Sun Dec 11 21:11:15 2011
+++ packages/mksh/mksh-distro.patch Fri Mar 30 04:01:17 2012
@@ -5,8 +5,8 @@
# http://www.research.att.com/~gsf/public/ifs.sh
expected-stdout:
-- @(#)MIRBSD KSH R40 2011/12/11
-+ @(#)MIRBSD KSH R40 2011/12/11 @DISTRO@
+- @(#)MIRBSD KSH R40 2012/03/20
++ @(#)MIRBSD KSH R40 2012/03/20 @DISTRO@
description:
Check version of shell.
stdin:
@@ -15,10 +15,10 @@
+++ mksh/sh.h 2011-07-12 08:01:04.445312267 +0200
@@ -153,7 +153,7 @@
#ifdef EXTERN
- __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.484.2.11 2011/12/11 18:18:28 tg Exp $");
+ __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.484.2.16 2012/03/24 21:22:43 tg Exp $");
#endif
--#define MKSH_VERSION "R40 2011/12/11"
-+#define MKSH_VERSION "R40 2011/12/11 @DISTRO@"
-
- #ifndef MKSH_INCLUDES_ONLY
+-#define MKSH_VERSION "R40 2012/03/20"
++#define MKSH_VERSION "R40 2012/03/20 @DISTRO@"
+ /* arithmetic types: C implementation */
+ #if !HAVE_CAN_INTTYPES
================================================================
Index: packages/mksh/mksh.spec
diff -u packages/mksh/mksh.spec:1.38 packages/mksh/mksh.spec:1.39
--- packages/mksh/mksh.spec:1.38 Fri Mar 9 18:53:12 2012
+++ packages/mksh/mksh.spec Fri Mar 30 04:01:17 2012
@@ -5,19 +5,19 @@
Summary: MirBSD Korn Shell
Summary(pl.UTF-8): Powłoka Korna z MirBSD
Name: mksh
-Version: 40d
-Release: 3
+Version: 40e
+Release: 1
License: BSD
Group: Applications/Shells
Source0: http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.cpio.gz
-# Source0-md5: c6428401103367730a95b99284bf47dc
+# Source0-md5: d9a2df50c09692fc24d52ee9cf3bb789
Source1: %{name}-mkshrc
Patch0: %{name}-mkshrc_support.patch
Patch1: %{name}-circumflex.patch
Patch2: %{name}-no_stop_alias.patch
Patch3: %{name}-distro.patch
Patch4: %{name}-cmdline-length.patch
-Patch5: %{name}-columns.patch
+Patch5: %{name}-tty_close.patch
URL: https://www.mirbsd.org/mksh.htm
%if %{with tests}
BuildRequires: ed
@@ -88,7 +88,7 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p0
+%patch5 -p1
sed -i -e 's#@DISTRO@#PLD/Linux 3.0#g' check.t sh.h
@@ -169,6 +169,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.39 2012/03/30 02:01:17 draenog
+- up to 40e
+- tty_close.patch from http://article.gmane.org/gmane.os.miros.mksh/19
+
Revision 1.38 2012/03/09 17:53:12 draenog
- non-interactive mksh can inherit COLUMNS and LINES from parent process;
fixes git-core-1.7.10-rc0 test suite
================================================================
Index: packages/mksh/mksh-tty_close.patch
diff -u /dev/null packages/mksh/mksh-tty_close.patch:1.1
--- /dev/null Fri Mar 30 04:01:23 2012
+++ packages/mksh/mksh-tty_close.patch Fri Mar 30 04:01:17 2012
@@ -0,0 +1,23 @@
+commit 04ac6ad16336a70603c4817d678f9a1eddd18c74
+Author: tg <tg>
+Date: Sun Mar 25 14:28:11 2012 +0000
+
+ fix regression w.r.t. TTY and external programmes:
+ • release the TTY after the initial change_winsz()
+ • since we release it, we can skip initialising tty_state, too
+
+diff --git a/main.c b/main.c
+index 8022782..0405b1b 100644
+--- a/main.c
++++ b/main.c
+@@ -252,8 +252,9 @@ main_init(int argc, const char *argv[], Source **sp, struct block **lp)
+
+ #ifdef TIOCGWINSZ
+ /* try to initialise tty size before importing environment */
+- tty_init(true, false);
++ tty_init(false, false);
+ change_winsz();
++ tty_close();
+ #endif
+
+ #ifdef _PATH_DEFPATH
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/mksh/mksh-circumflex.patch?r1=1.1&r2=1.2
http://cvs.pld-linux.org/packages/mksh/mksh-distro.patch?r1=1.4&r2=1.5
http://cvs.pld-linux.org/packages/mksh/mksh.spec?r1=1.38&r2=1.39
More information about the pld-cvs-commit
mailing list