4 files changed, 24 insertions, 131 deletions
diff --git a/patches/bash-4.4.local.patch b/patches/bash-4.4.local.patch
deleted file mode 100644
index 993594a0..00000000
--- a/patches/bash-4.4.local.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- bash-4.4/configure.orig	2016-08-05 22:29:55.000000000 +0200
-+++ bash-4.4/configure	2016-12-17 21:32:44.745849000 +0100
-@@ -2869,6 +2869,7 @@
- *-opennt*|*-interix*)	opt_bash_malloc=no ;;	# Interix, now owned by Microsoft
- *-nsk*)		opt_bash_malloc=no ;;	# HP NonStop
- *-haiku*)	opt_bash_malloc=no ;;	# Haiku OS
-+*-midipix*)	opt_bash_malloc=no ;;	# Midipix
- esac
- 
- # memory scrambling on free()
-@@ -5157,13 +5158,13 @@
- if test "x$ac_cv_lib_curses_tgetent" = xyes; then :
-   bash_cv_termcap_lib=libcurses
- else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
--$as_echo_n "checking for tgetent in -lncurses... " >&6; }
--if ${ac_cv_lib_ncurses_tgetent+:} false; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncursesw" >&5
-+$as_echo_n "checking for tgetent in -lncursesw... " >&6; }
-+if ${ac_cv_lib_ncursesw_tgetent+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lncurses  $LIBS"
-+LIBS="-lncursesw  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -5183,18 +5184,18 @@
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_ncurses_tgetent=yes
-+  ac_cv_lib_ncursesw_tgetent=yes
- else
--  ac_cv_lib_ncurses_tgetent=no
-+  ac_cv_lib_ncursesw_tgetent=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
--$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
--if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
--  bash_cv_termcap_lib=libncurses
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_tgetent" >&5
-+$as_echo "$ac_cv_lib_ncursesw_tgetent" >&6; }
-+if test "x$ac_cv_lib_ncursesw_tgetent" = xyes; then :
-+  bash_cv_termcap_lib=libncursesw
- else
-   bash_cv_termcap_lib=gnutermcap
- fi
-@@ -5225,8 +5226,8 @@
- elif test $bash_cv_termcap_lib = libtinfo; then
- TERMCAP_LIB=-ltinfo
- TERMCAP_DEP=
--elif test $bash_cv_termcap_lib = libncurses; then
--TERMCAP_LIB=-lncurses
-+elif test $bash_cv_termcap_lib = libncursesw; then
-+TERMCAP_LIB=-lncursesw
- TERMCAP_DEP=
- elif test $bash_cv_termcap_lib = libc; then
- TERMCAP_LIB=
-@@ -15850,13 +15851,13 @@
- if test "x$ac_cv_lib_curses_tgetent" = xyes; then :
-   bash_cv_termcap_lib=libcurses
- else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
--$as_echo_n "checking for tgetent in -lncurses... " >&6; }
--if ${ac_cv_lib_ncurses_tgetent+:} false; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncursesw" >&5
-+$as_echo_n "checking for tgetent in -lncursesw... " >&6; }
-+if ${ac_cv_lib_ncursesw_tgetent+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
--LIBS="-lncurses  $LIBS"
-+LIBS="-lncursesw  $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -15876,18 +15877,18 @@
- }
- _ACEOF
- if ac_fn_c_try_link "$LINENO"; then :
--  ac_cv_lib_ncurses_tgetent=yes
-+  ac_cv_lib_ncursesw_tgetent=yes
- else
--  ac_cv_lib_ncurses_tgetent=no
-+  ac_cv_lib_ncursesw_tgetent=no
- fi
- rm -f core conftest.err conftest.$ac_objext \
-     conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
--$as_echo "$ac_cv_lib_ncurses_tgetent" >&6; }
--if test "x$ac_cv_lib_ncurses_tgetent" = xyes; then :
--  bash_cv_termcap_lib=libncurses
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncursesw_tgetent" >&5
-+$as_echo "$ac_cv_lib_ncursesw_tgetent" >&6; }
-+if test "x$ac_cv_lib_ncursesw_tgetent" = xyes; then :
-+  bash_cv_termcap_lib=libncursesw
- else
-   bash_cv_termcap_lib=gnutermcap
- fi
-@@ -15918,8 +15919,8 @@
- elif test $bash_cv_termcap_lib = libtinfo; then
- TERMCAP_LIB=-ltinfo
- TERMCAP_DEP=
--elif test $bash_cv_termcap_lib = libncurses; then
--TERMCAP_LIB=-lncurses
-+elif test $bash_cv_termcap_lib = libncursesw; then
-+TERMCAP_LIB=-lncursesw
- TERMCAP_DEP=
- elif test $bash_cv_termcap_lib = libc; then
- TERMCAP_LIB=
-diff -ru bash-4.4.orig/lib/sh/oslib.c bash-4.4/lib/sh/oslib.c
---- bash-4.4.orig/lib/sh/oslib.c	2013-10-14 15:12:57.000000000 +0200
-+++ bash-4.4/lib/sh/oslib.c	2017-10-07 22:48:52.478254782 +0200
-@@ -280,7 +280,7 @@
- long
- getmaxchild ()
- {
--  static long maxchild = -1L;
-+  static long maxchild = _SC_CHILD_MAX;
- 
-   if (maxchild > 0)
-     return maxchild;
diff --git a/patches/bash-5.1.local.patch b/patches/bash-5.1.local.patch
new file mode 100644
index 00000000..b2d55bef
--- /dev/null
+++ b/patches/bash-5.1.local.patch
@@ -0,0 +1,23 @@
+diff -ru bash-5.1.orig/configure bash-5.1/configure
+--- bash-5.1.orig/configure	2020-12-04 15:05:14.000000000 +0100
++++ bash-5.1/configure	2020-12-08 14:34:05.162114735 +0100
+@@ -2917,6 +2917,7 @@
+ *-nsk*)		opt_bash_malloc=no ;;	# HP NonStop
+ *-haiku*)	opt_bash_malloc=no ;;	# Haiku OS
+ *-genode*)	opt_bash_malloc=no ;;	# Genode has no sbrk
++*-midipix*)	opt_bash_malloc=no ;;	# Midipix
+ esac
+ 
+ # memory scrambling on free()
+diff -ru bash-5.1.orig/lib/sh/oslib.c bash-5.1/lib/sh/oslib.c
+--- bash-5.1.orig/lib/sh/oslib.c	2013-10-14 15:12:57.000000000 +0200
++++ bash-5.1/lib/sh/oslib.c	2020-12-08 14:35:05.062112859 +0100
+@@ -280,7 +280,7 @@
+ long
+ getmaxchild ()
+ {
+-  static long maxchild = -1L;
++  static long maxchild = _SC_CHILD_MAX;
+ 
+   if (maxchild > 0)
+     return maxchild;
diff --git a/patches/bash_minipix-4.4.local.patch b/patches/bash_minipix-4.4.local.patch
deleted file mode 120000
index 4ba2963c..00000000
--- a/patches/bash_minipix-4.4.local.patch
+++ /dev/null
@@ -1 +0,0 @@
-bash-4.4.local.patch
-\ No newline at end of file
diff --git a/patches/bash_minipix-5.1.local.patch b/patches/bash_minipix-5.1.local.patch
new file mode 120000
index 00000000..2a1dba5a
--- /dev/null
+++ b/patches/bash_minipix-5.1.local.patch
@@ -0,0 +1 @@
+bash-5.1.local.patch
+\ No newline at end of file