Author: draenog Date: Fri Mar 9 17:53:17 2012 GMT Module: packages Tag: HEAD ---- Log message: - non-interactive mksh can inherit COLUMNS and LINES from parent process; fixes git-core-1.7.10-rc0 test suite
---- Files affected: packages/mksh: mksh.spec (1.37 -> 1.38) , mksh-columns.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/mksh/mksh.spec diff -u packages/mksh/mksh.spec:1.37 packages/mksh/mksh.spec:1.38 --- packages/mksh/mksh.spec:1.37 Sun Jan 15 17:09:18 2012 +++ packages/mksh/mksh.spec Fri Mar 9 18:53:12 2012 @@ -6,7 +6,7 @@ Summary(pl.UTF-8): Powłoka Korna z MirBSD Name: mksh Version: 40d -Release: 2 +Release: 3 License: BSD Group: Applications/Shells Source0: http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.cpio.gz @@ -17,6 +17,7 @@ Patch2: %{name}-no_stop_alias.patch Patch3: %{name}-distro.patch Patch4: %{name}-cmdline-length.patch +Patch5: %{name}-columns.patch URL: https://www.mirbsd.org/mksh.htm %if %{with tests} BuildRequires: ed @@ -87,6 +88,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p0 sed -i -e 's#@DISTRO@#PLD/Linux 3.0#g' check.t sh.h @@ -167,6 +169,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +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 + Revision 1.37 2012/01/15 16:09:18 arekm - revert; with reduced echo -ne doesn't work ================================================================ Index: packages/mksh/mksh-columns.patch diff -u /dev/null packages/mksh/mksh-columns.patch:1.1 --- /dev/null Fri Mar 9 18:53:17 2012 +++ packages/mksh/mksh-columns.patch Fri Mar 9 18:53:12 2012 @@ -0,0 +1,31 @@ +diff -u -p -u -p -r1.522 sh.h +--- sh.h 3 Mar 2012 21:31:21 -0000 1.522 ++++ sh.h 9 Mar 2012 15:14:49 -0000 +@@ -855,7 +855,7 @@ EXTERN char *current_wd; + */ + #define MIN_COLS (2 + MIN_EDIT_SPACE + 3) + #define MIN_LINS 3 +-EXTERN mksh_ari_t x_cols E_INIT(80); /* tty columns */ ++EXTERN mksh_ari_t x_cols E_INIT(-1); /* tty columns */ + EXTERN mksh_ari_t x_lins E_INIT(-1); /* tty lines */ + + /* These to avoid bracket matching problems */ +diff -u -p -u -p -r1.141 var.c +--- var.c 3 Mar 2012 21:31:23 -0000 1.141 ++++ var.c 9 Mar 2012 15:14:49 -0000 +@@ -1458,14 +1458,13 @@ set_array(const char *var, bool reset, c + void + change_winsz(void) + { +- if (x_lins < 0) { ++ if (x_cols < 0 && x_lins < 0) { + /* first time initialisation */ + #ifdef TIOCGWINSZ + if (tty_fd < 0) + /* non-FTALKING, try to get an fd anyway */ + tty_init(true, false); + #endif +- x_cols = -1; + } + + #ifdef TIOCGWINSZ ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mksh/mksh.spec?r1=1.37&r2=1.38&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
