aboutsummaryrefslogtreecommitdiffstats
path: root/main/bash
diff options
context:
space:
mode:
authorSergey Lukin <sergej.lukin@gmail.com>2016-12-09 09:17:20 +0000
committerLeonardo Arena <rnalrd@alpinelinux.org>2016-12-14 10:04:47 +0000
commit891d75f26c0329dc70c7fbefeeaf6756bcf9bcff (patch)
tree29a5b55aa2dd6bc7e9ea04d1198bae0db2bba2c1 /main/bash
parent71193af0722980dd21596f020d001f1b73a40383 (diff)
downloadaports-891d75f26c0329dc70c7fbefeeaf6756bcf9bcff.tar.bz2
aports-891d75f26c0329dc70c7fbefeeaf6756bcf9bcff.tar.xz
main/bash: security upgrade - fixes #6412
Diffstat (limited to 'main/bash')
-rw-r--r--main/bash/APKBUILD7
-rw-r--r--main/bash/CVE-2016-7543.patch19
2 files changed, 25 insertions, 1 deletions
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index 163a8c73c3..95b1b7b7da 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -1,11 +1,12 @@
# Contributor: Ɓukasz Jendrysik <scadu@yandex.com>
+# Contributer Sergey Lukin <sergej.lukin@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bash
pkgver=4.3.33
_patchlevel=${pkgver##*.}
_myver=${pkgver%.*}
_patchbase=${_myver/./}
-pkgrel=0
+pkgrel=1
pkgdesc="The GNU Bourne Again shell"
url="http://www.gnu.org/software/bash/bash.html"
arch="all"
@@ -16,6 +17,7 @@ subpackages="$pkgname-doc"
source="http://ftp.gnu.org/gnu/bash/bash-${_myver}.tar.gz
bash-noinfo.patch
privmode-setuid-fail.patch
+ CVE-2016-7543.patch
"
# generate url's to patches. note: no forks allowed!
_i=1
@@ -71,6 +73,7 @@ package() {
md5sums="81348932d5da294953e15d4814c74dd1 bash-4.3.tar.gz
80fec5f3d60a63756a4999c877e31a8e bash-noinfo.patch
a577d42e38249d298d6a8d4bf2823883 privmode-setuid-fail.patch
+7813a0639fc2958f23469ccab204a8f0 CVE-2016-7543.patch
1ab682b4e36afa4cf1b426aa7ac81c0d bash43-001
8fc22cf50ec85da00f6af3d66f7ddc1b bash43-002
a41728eca78858758e26b5dea64ae506 bash43-003
@@ -107,6 +110,7 @@ b551c4ee7b8713759e4143499d0bbd48 bash43-033"
sha256sums="afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4 bash-4.3.tar.gz
363bc919d98cadbfca27660be0d1d4bb6cfe1c5f86a7830966e456df36e46792 bash-noinfo.patch
6bc2d4e48ad05fb3c8aac120a012baf1911f6522464ed18c8232b111a40b7901 privmode-setuid-fail.patch
+690e6d0366bf2d717f59fac770a37bf26929950a6f380e1984677737e4d658da CVE-2016-7543.patch
ecb3dff2648667513e31554b3ad054ccd89fce38e33367c9459ac3a285153742 bash43-001
eee7cd7062ab29a9e4f02924d9c367264dcb8b162703f74ff6eb8f175a91502b bash43-002
000e6eac50cd9053ce0630db01239dcdead04a2c2c351c47e2b51dac1ac1087d bash43-003
@@ -143,6 +147,7 @@ fb2a7787a13fbe027a7335aca6eb3c21cdbd813e9edc221274b6a9d8692eaa16 bash43-033"
sha512sums="a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651 bash-4.3.tar.gz
74d51550cc03410f22ffea13f6452350d1e5564bff619fb07a5bbef14ca565fbe03770a2c0041292732cda16e8944b33ccbd0dfe29a606a068fedabe277cd6ae bash-noinfo.patch
c5804ace658f9d7f957d4b98bebab4d8eb0ba3dd2dd155a480c7f9b0f17b06ced344b4b4c9f52ef1d5c0cabb047bce5237c350f53b95cf6c95e156ab4ab9e8a9 privmode-setuid-fail.patch
+00fe0c0b30122f3de543a7b2a609e277db05d5e5fce58eabb052deb2788d579e90a14c362f5e889fc8e0168b82ad4555eb0d38ba3b300aac54432453a83daded CVE-2016-7543.patch
a1011392652180a28f9837af4a341a80beb929c1458e2384e282f0007713c5fe8d0b315abf1340b3707748d3caed322135dee87b59eeb7612ee5130f87d79888 bash43-001
e3178c85f553522d5d1c5fd39e76f015b680a8ccc84836a5e10283b2aed6e5b7cc3d23af0e67a270b7622dce0abf35dd8a95afa9bb6f89b73a9439f7435175a4 bash43-002
dc2c5fad8d357d1301e419afd959dfaf015a63172857080c11f77ab1bb7d1d737f411eb0e70a861f98a36bed1b19edb7217a4fa9f4773e21706b62dc56ec3464 bash43-003
diff --git a/main/bash/CVE-2016-7543.patch b/main/bash/CVE-2016-7543.patch
new file mode 100644
index 0000000000..69686a143c
--- /dev/null
+++ b/main/bash/CVE-2016-7543.patch
@@ -0,0 +1,19 @@
+CVE-2016-7543
+http://lists.gnu.org/archive/html/bug-bash/2016-10/msg00009.html
+
+diff -ru variables.c.orig variables.c
+--- variables.c.orig
++++ variables.c
+@@ -495,7 +495,11 @@
+ #endif
+ set_if_not ("PS2", secondary_prompt);
+ }
+- set_if_not ("PS4", "+ ");
++
++ if (current_user.euid == 0)
++ bind_variable ("PS4", "+ ", 0);
++ else
++ set_if_not ("PS4", "+ ");
+
+ /* Don't allow IFS to be imported from the environment. */
+ temp_var = bind_variable ("IFS", " \t\n", 0);