diff --git a/shells/bash/bash.conf b/shells/bash/bash.conf index c58bc3721..e839d0fa8 100644 --- a/shells/bash/bash.conf +++ b/shells/bash/bash.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../bash/bash.conf -# Copyright (C) 2010 - 2011 The OpenSDE Project +# Copyright (C) 2010 - 2020 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -65,10 +65,13 @@ if atstage cross; then fi var_append confopt " " "--without-bash-malloc" +var_append confopt " " "--with-curses" +var_append confopt " " "--disable-nls" # use the installed libreadline if possible if pkginstalled readline; then - var_append extraconfopt ' ' "--with-installed-readline" + pkgprefix -t readline + var_append extraconfopt ' ' "--with-installed-readline=$( pkgprefix -r libdir readline )" fi [ "$SDECFG_PKG_BASH_PROGCOMP" = 0 ] && diff --git a/shells/bash/bash.desc b/shells/bash/bash.desc index 052254be2..da9fc6cd4 100644 --- a/shells/bash/bash.desc +++ b/shells/bash/bash.desc @@ -3,7 +3,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../bash/bash.desc -[COPY] Copyright (C) 2006 - 2017 The OpenSDE Project +[COPY] Copyright (C) 2006 - 2020 The OpenSDE Project [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project [COPY] Copyright (C) 1998 - 2003 Clifford Wolf [COPY] @@ -41,56 +41,26 @@ [L] GPL [S] Stable -[V] 4.3.48 +[V] 5.0.18 [P] X -1-3-----9 109.500 -[D] 231304726 bash-4.3.tar.gz ftp://ftp.gnu.org/pub/gnu/bash/ -[D] 178292899 bash43-001.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-001 -[D] 3056647341 bash43-002.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-002 -[D] 3677710082 bash43-003.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-003 -[D] 2109749680 bash43-004.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-004 -[D] 3350455377 bash43-005.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-005 -[D] 915479990 bash43-006.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-006 -[D] 2429964861 bash43-007.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-007 -[D] 3098788763 bash43-008.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-008 -[D] 3458873315 bash43-009.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-009 -[D] 1204942154 bash43-010.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-010 -[D] 1127535386 bash43-011.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-011 -[D] 1577388152 bash43-012.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-012 -[D] 1670393051 bash43-013.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-013 -[D] 3374214628 bash43-014.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-014 -[D] 650633885 bash43-015.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-015 -[D] 213056428 bash43-016.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-016 -[D] 2391836829 bash43-017.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-017 -[D] 96834815 bash43-018.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-018 -[D] 938694344 bash43-019.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-019 -[D] 3407196338 bash43-020.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-020 -[D] 981511758 bash43-021.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-021 -[D] 890539978 bash43-022.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-022 -[D] 2845159023 bash43-023.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-023 -[D] 3411699460 bash43-024.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-024 -[D] 454104714 bash43-025.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-025 -[D] 4222253481 bash43-026.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-026 -[D] 2136286523 bash43-027.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-027 -[D] 2158779979 bash43-028.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-028 -[D] 827972829 bash43-029.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-029 -[D] 3272213980 bash43-030.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-030 -[D] 1091222134 bash43-031.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-031 -[D] 508905489 bash43-032.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-032 -[D] 1919294811 bash43-033.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-033 -[D] 2931219565 bash43-034.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-034 -[D] 2147528006 bash43-035.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-035 -[D] 1304761030 bash43-036.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-036 -[D] 4077598777 bash43-037.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-037 -[D] 1575724459 bash43-038.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-038 -[D] 4251208109 bash43-039.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-039 -[D] 3886409748 bash43-040.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-040 -[D] 3188566669 bash43-041.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-041 -[D] 2286646835 bash43-042.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-042 -[D] 2151046589 bash43-043.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-043 -[D] 223455284 bash43-044.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-044 -[D] 1694428410 bash43-045.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-045 -[D] 1608145500 bash43-046.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-046 -[D] 2066989648 bash43-047.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-047 -[D] 2204835491 bash43-048.patch !ftp://ftp.gnu.org/gnu/bash/bash-4.3-patches/bash43-048 +[D] 1133607601 bash-5.0.tar.gz ftp://ftp.gnu.org/pub/gnu/bash/ +[D] 1208418306 bash50-001.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-001 +[D] 2964049098 bash50-002.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-002 +[D] 3360534286 bash50-003.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-003 +[D] 927873322 bash50-004.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-004 +[D] 159938897 bash50-005.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-005 +[D] 745455362 bash50-006.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-006 +[D] 2422553965 bash50-007.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-007 +[D] 2780317547 bash50-008.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-008 +[D] 481433712 bash50-009.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-009 +[D] 1127906631 bash50-010.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-010 +[D] 2054122947 bash50-011.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-011 +[D] 1415492530 bash50-012.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-012 +[D] 3301811883 bash50-013.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-013 +[D] 2370618797 bash50-014.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-014 +[D] 3993891960 bash50-015.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-015 +[D] 633708120 bash50-016.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-016 +[D] 3811168361 bash50-017.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-017 +[D] 2459354096 bash50-018.patch !ftp://ftp.gnu.org/gnu/bash/bash-5.0-patches/bash50-018 diff --git a/shells/bash/readline.patch b/shells/bash/readline.patch.disable similarity index 93% rename from shells/bash/readline.patch rename to shells/bash/readline.patch.disable index 5dab5687c..5a57763ac 100644 --- a/shells/bash/readline.patch +++ b/shells/bash/readline.patch.disable @@ -1,7 +1,8 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../bash/readline.patch +# Filename: package/.../bash/readline.patch.disable +# Copyright (C) 2020 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2004 Clifford Wolf #