From ec6da604012b54769db3371a8ed9ac0be4c9d0e6 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Fri, 30 Mar 2018 02:46:29 -0400 Subject: bash: 4.4.12 -> 4.4.18 - Drop bash-memleak-bug-fix-for-builtin-command-read.patch which has been accepted since 4.4.17 Signed-off-by: Hongxu Jia Signed-off-by: Richard Purdie --- ...-memleak-bug-fix-for-builtin-command-read.patch | 35 ---------------------- meta/recipes-extended/bash/bash_4.4.12.bb | 24 --------------- meta/recipes-extended/bash/bash_4.4.18.bb | 22 ++++++++++++++ 3 files changed, 22 insertions(+), 59 deletions(-) delete mode 100644 meta/recipes-extended/bash/bash/bash-memleak-bug-fix-for-builtin-command-read.patch delete mode 100644 meta/recipes-extended/bash/bash_4.4.12.bb create mode 100644 meta/recipes-extended/bash/bash_4.4.18.bb (limited to 'meta/recipes-extended/bash') diff --git a/meta/recipes-extended/bash/bash/bash-memleak-bug-fix-for-builtin-command-read.patch b/meta/recipes-extended/bash/bash/bash-memleak-bug-fix-for-builtin-command-read.patch deleted file mode 100644 index 9fb6ba972b..0000000000 --- a/meta/recipes-extended/bash/bash/bash-memleak-bug-fix-for-builtin-command-read.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d3b6303a6853f612a56848ee4e59eaa0b0ab9489 Mon Sep 17 00:00:00 2001 -From: Zhang Xiao -Date: Tue, 21 Feb 2017 11:30:14 +0800 -Subject: [PATCH] bash: memleak bug fix for builtin command read - -Built in command "read" with "-e" use Readline to obtain the line -in an interactive shell. In this process, a string "rlbuf" is -just allocated without free operation thus cause memory leak. Fix it. - -Upstream-Status: Submitted [http://lists.gnu.org/archive/html/bug-bash/2017-02/msg00061.html] - -Signed-off-by: Zhang Xiao ---- - builtins/read.def | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/builtins/read.def b/builtins/read.def -index 4397154..ee0c5a6 100644 ---- a/builtins/read.def -+++ b/builtins/read.def -@@ -674,6 +674,11 @@ add_char: - input_string[i] = '\0'; - CHECK_ALRM; - -+#if defined (READLINE) -+ if (edit) -+ xfree (rlbuf); -+#endif -+ - if (retval < 0) - { - t_errno = errno; --- -1.9.1 - diff --git a/meta/recipes-extended/bash/bash_4.4.12.bb b/meta/recipes-extended/bash/bash_4.4.12.bb deleted file mode 100644 index 9382a77af6..0000000000 --- a/meta/recipes-extended/bash/bash_4.4.12.bb +++ /dev/null @@ -1,24 +0,0 @@ -require bash.inc - -# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ - file://execute_cmd.patch;striplevel=0 \ - file://mkbuiltins_have_stringize.patch \ - file://build-tests.patch \ - file://test-output.patch \ - file://fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch \ - file://run-ptest \ - file://fix-run-builtins.patch \ - file://0001-help-fix-printf-format-security-warning.patch \ - file://bash-memleak-bug-fix-for-builtin-command-read.patch \ - file://pathexp-dep.patch \ - " - -SRC_URI[tarball.md5sum] = "7c112970cbdcadfc331e10eeb5f6aa41" -SRC_URI[tarball.sha256sum] = "57d8432be54541531a496fd4904fdc08c12542f43605a9202594fa5d5f9f2331" - - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-extended/bash/bash_4.4.18.bb b/meta/recipes-extended/bash/bash_4.4.18.bb new file mode 100644 index 0000000000..0b22ca7a69 --- /dev/null +++ b/meta/recipes-extended/bash/bash_4.4.18.bb @@ -0,0 +1,22 @@ +require bash.inc + +# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +SRC_URI = "${GNU_MIRROR}/bash/${BP}.tar.gz;name=tarball \ + file://execute_cmd.patch;striplevel=0 \ + file://mkbuiltins_have_stringize.patch \ + file://build-tests.patch \ + file://test-output.patch \ + file://fix-run-coproc-run-heredoc-run-execscript-run-test-f.patch \ + file://run-ptest \ + file://fix-run-builtins.patch \ + file://0001-help-fix-printf-format-security-warning.patch \ + file://pathexp-dep.patch \ + " + +SRC_URI[tarball.md5sum] = "518e2c187cc11a17040f0915dddce54e" +SRC_URI[tarball.sha256sum] = "604d9eec5e4ed5fd2180ee44dd756ddca92e0b6aa4217bbab2b6227380317f23" + +BBCLASSEXTEND = "nativesdk" -- cgit 1.2.3-korg