From 53554a181573004105e6cbbb74c8c284fb949795 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Thu, 7 Jul 2011 20:21:09 +0000 Subject: [PATCH] - provide /bin/ksh symlink; make builder script working (from ksh devs) Changed files: mksh-tty.patch -> 1.1 mksh.spec -> 1.20 --- mksh-tty.patch | 11 +++++++++++ mksh.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 mksh-tty.patch diff --git a/mksh-tty.patch b/mksh-tty.patch new file mode 100644 index 0000000..6f83824 --- /dev/null +++ b/mksh-tty.patch @@ -0,0 +1,11 @@ +--- mksh-40/var.c~ 2011-07-07 21:48:19.000000000 +0200 ++++ mksh-40/var.c 2011-07-07 22:08:36.466887894 +0200 +@@ -1442,7 +1442,7 @@ + #ifdef TIOCGWINSZ + if (tty_fd < 0) + /* non-FTALKING, try to get an fd anyway */ +- tty_init(false, false); ++ tty_init(true, false); + #endif + x_cols = -1; + } diff --git a/mksh.spec b/mksh.spec index a14ab80..7da415b 100644 --- a/mksh.spec +++ b/mksh.spec @@ -5,7 +5,7 @@ Summary: MirBSD Korn Shell Summary(pl.UTF-8): Powłoka Korna z MirBSD Name: mksh Version: 40 -Release: 1 +Release: 1.1 License: BSD Group: Applications/Shells Source0: http://www.mirbsd.org/MirOS/dist/mir/mksh/%{name}-R%{version}.cpio.gz @@ -14,6 +14,7 @@ Source1: %{name}-mkshrc Patch0: %{name}-mkshrc_support.patch Patch1: %{name}-circumflex.patch Patch2: %{name}-no_stop_alias.patch +Patch3: %{name}-tty.patch URL: https://www.mirbsd.org/mksh.htm %if %{with tests} BuildRequires: ed @@ -82,6 +83,7 @@ mv mksh/* .; rmdir mksh %patch0 -p0 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build install -d out @@ -116,6 +118,9 @@ echo ".so mksh.1" > $RPM_BUILD_ROOT%{_mandir}/man1/sh.1 install -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/mkshrc ln -sf mksh $RPM_BUILD_ROOT%{_bindir}/sh +# some pdksh scripts used that +ln -sf mksh $RPM_BUILD_ROOT%{_bindir}/ksh + %clean rm -rf $RPM_BUILD_ROOT @@ -132,6 +137,7 @@ rm -rf $RPM_BUILD_ROOT %doc dot.mkshrc %config(noreplace,missingok) %verify(not md5 mtime size) %{_sysconfdir}/mkshrc %attr(755,root,root) %{_bindir}/mksh +%attr(755,root,root) %{_bindir}/ksh %attr(755,root,root) %{_bindir}/sh %{_mandir}/man1/mksh.1* %{_mandir}/man1/sh.1* -- 2.44.0