bash: upgrade to version 4.1

from 3.2
version 3.2 is kept because it's the latest version
under GPLv2+

changes:
  - use 3.2.48 as base instead of 3.2
  - include upstream patches up to 051 for 3.2 and 007 for 4.1

Signed-off-by: Qing He <qing.he@intel.com>

4 files changed, 29 insertions, 46 deletions

diff --git a/meta/packages/bash/bash.inc b/meta/packages/bash/bash.inc
index b67e8bbe3..42e89180d 100644
--- a/meta/packages/bash/bash.inc
+++ b/meta/packages/bash/bash.inc
@@ -1,8 +1,11 @@
 DESCRIPTION = "An sh-compatible command language interpreter."
 HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
-DEPENDS = "ncurses"
 SECTION = "base/shell"
-LICENSE = "GPL"
+
+# GPLv2+ (< 4.0), GPLv3+ (>= 4.0)
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+DEPENDS = "ncurses"
 
 inherit autotools gettext
 
diff --git a/meta/packages/bash/bash_3.2.48.bb b/meta/packages/bash/bash_3.2.48.bb
new file mode 100644
index 000000000..47afe9880
--- /dev/null
+++ b/meta/packages/bash/bash_3.2.48.bb
@@ -0,0 +1,11 @@
+require bash.inc
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=fd5d9bcabd8ed5a54a01ce8d183d592a"
+PR = "r6"
+
+SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-049;apply=yes;striplevel=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-050;apply=yes;striplevel=0 \
+           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-051;apply=yes;striplevel=0 \
+           "
diff --git a/meta/packages/bash/bash_3.2.bb b/meta/packages/bash/bash_3.2.bb
deleted file mode 100644
index 6930c2bd2..000000000
--- a/meta/packages/bash/bash_3.2.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-require bash.inc
-PR = "r5"
-
-SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-001;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-002;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-003;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-004;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-005;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-006;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-007;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-008;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-009;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-010;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-011;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-012;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-013;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-014;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-015;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-016;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-017;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-018;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-019;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-020;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-021;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-022;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-023;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-024;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-025;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-026;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-027;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-028;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-029;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-030;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-031;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-032;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-033;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-034;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-035;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-036;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-037;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-038;patch=1;pnum=0 \
-           http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-039;patch=1;pnum=0 \
-           "
diff --git a/meta/packages/bash/bash_4.1.bb b/meta/packages/bash/bash_4.1.bb
new file mode 100644
index 000000000..6f0ced757
--- /dev/null
+++ b/meta/packages/bash/bash_4.1.bb
@@ -0,0 +1,13 @@
+require bash.inc
+
+PR = "r0"
+
+SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz \
+           http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-001;apply=yes;striplevel=0 \
+           http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-002;apply=yes;striplevel=0 \
+           http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-003;apply=yes;striplevel=0 \
+           http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-004;apply=yes;striplevel=0 \
+           http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-005;apply=yes;striplevel=0 \
+           http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-006;apply=yes;striplevel=0 \
+           http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-007;apply=yes;striplevel=0 \
+           "