bash: fix postinst to not touch host system

diff --git a/packages/bash/bash.inc b/packages/bash/bash.inc
index 80aedfa..b67e8bb 100644 (file)
--- a/packages/bash/bash.inc
+++ b/packages/bash/bash.inc
@@ -20,7 +20,7 @@ do_configure () {
 }
 
 pkg_postinst () {
-       touch ${sysconfdir}/shells
-       grep -q "bin/bash" ${sysconfdir}/shells || echo /bin/bash >> ${sysconfdir}/shells
-       grep -q "bin/sh" ${sysconfdir}/shells || echo /bin/sh >> ${sysconfdir}/shells
+       touch $D${sysconfdir}/shells
+       grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells
+       grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells
 }

diff --git a/packages/bash/bash_3.0.bb b/packages/bash/bash_3.0.bb
index b4fb26a..babb704 100644 (file)
--- a/packages/bash/bash_3.0.bb
+++ b/packages/bash/bash_3.0.bb
@@ -1,5 +1,5 @@
 require bash.inc
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
         file://bash-3.0-fixes.patch;patch=1 \

diff --git a/packages/bash/bash_3.2.bb b/packages/bash/bash_3.2.bb
index f4eeff7..95c1a73 100644 (file)
--- a/packages/bash/bash_3.2.bb
+++ b/packages/bash/bash_3.2.bb
@@ -1,5 +1,5 @@
 require bash.inc
-PR = "r2"
+PR = "r3"
 
 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 \
@@ -27,4 +27,12 @@ SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
            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 \
            "