From 034f840fcfe560ce948b68ff051b609876627c3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Thu, 15 Jul 2021 18:33:25 +0200 Subject: groups/211.native_packages_cmdline.group: bash: bump to v5.1.8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups/211.native_packages_cmdline.group | 4 ++-- patches/bash-5.1.8.local.patch | 23 +++++++++++++++++++++++ patches/bash-5.1.local.patch | 23 ----------------------- patches/bash_minipix-5.1.8.local.patch | 1 + patches/bash_minipix-5.1.local.patch | 1 - vars/bash.vars | 15 ++++++++++++++- 6 files changed, 40 insertions(+), 27 deletions(-) create mode 100644 patches/bash-5.1.8.local.patch delete mode 100644 patches/bash-5.1.local.patch create mode 120000 patches/bash_minipix-5.1.8.local.patch delete mode 120000 patches/bash_minipix-5.1.local.patch diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group index 72519368..74f7f19a 100644 --- a/groups/211.native_packages_cmdline.group +++ b/groups/211.native_packages_cmdline.group @@ -8,8 +8,8 @@ findutils gawk grep jush lzop mc mksh moon_buggy mpg123 mp3splt nano ninvaders openbsd_baseutils profanity pixz pv rc sbase screen sed sloccount tar tcsh the_silver_searcher toilet tree terminally_tetris ubase which zsh")"; : ${PKG_BASH_DEPENDS:="ncurses"}; -: ${PKG_BASH_SHA256SUM:=cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa}; -: ${PKG_BASH_VERSION:=5.1}; +: ${PKG_BASH_SHA256SUM:=0cfb5c9bb1a29f800a97bd242d19511c997a1013815b805e0fdd32214113d6be}; +: ${PKG_BASH_VERSION:=5.1.8}; : ${PKG_BASH_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}.tar.gz}; : ${PKG_BASH_CONFIGURE_ARGS_EXTRA:="--without-bash-malloc --with-curses"}; : ${PKG_BASH_MAKEFLAGS_BUILD:=-j1}; diff --git a/patches/bash-5.1.8.local.patch b/patches/bash-5.1.8.local.patch new file mode 100644 index 00000000..b2d55bef --- /dev/null +++ b/patches/bash-5.1.8.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-5.1.local.patch b/patches/bash-5.1.local.patch deleted file mode 100644 index b2d55bef..00000000 --- a/patches/bash-5.1.local.patch +++ /dev/null @@ -1,23 +0,0 @@ -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-5.1.8.local.patch b/patches/bash_minipix-5.1.8.local.patch new file mode 120000 index 00000000..f5b925f9 --- /dev/null +++ b/patches/bash_minipix-5.1.8.local.patch @@ -0,0 +1 @@ +bash-5.1.8.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 deleted file mode 120000 index 2a1dba5a..00000000 --- a/patches/bash_minipix-5.1.local.patch +++ /dev/null @@ -1 +0,0 @@ -bash-5.1.local.patch \ No newline at end of file diff --git a/vars/bash.vars b/vars/bash.vars index 94db72a8..f14a13d4 100644 --- a/vars/bash.vars +++ b/vars/bash.vars @@ -10,6 +10,19 @@ bash_cv_printf_a_format=yes bash_cv_sys_named_pipes=present bash_cv_ulimit_maxfds=yes bash_cv_under_sys_siglist=yes -bash_cv_unusable_rtsigs=no"}; +bash_cv_unusable_rtsigs=no +bash_cv_wcontinued_broken=no +bash_cv_must_reinstall_sighandlers=no +bash_cv_fnmatch_equiv_fallback=no +bash_cv_func_vsnprintf=yes +bash_cv_func_strcoll_broken=no +bash_cv_getenv_redef=yes +bash_cv_opendir_not_robust=no +bash_cv_func_sbrk=yes +bash_cv_wexitstatus_offset=8 +bash_cv_sys_siglist=no +bash_cv_pgrp_pipe=no +bash_cv_dup2_broken=no +bash_cv_func_ctype_nonascii=no"}; # vim:filetype=sh textwidth=0 -- cgit v1.2.3