main/bash: upgrade to 4.3.48

2 files changed, 11 insertions, 38 deletions

diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index f027b784da..68f8eca976 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -1,11 +1,11 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bash
-pkgver=4.3.46
+pkgver=4.3.48
 _patchlevel=${pkgver##*.}
 _myver=${pkgver%.*}
 _patchbase=${_myver/./}
-pkgrel=4
+pkgrel=0
 pkgdesc="The GNU Bourne Again shell"
 url="http://www.gnu.org/software/bash/bash.html"
 arch="all"
@@ -17,7 +17,6 @@ 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
@@ -73,7 +72,6 @@ package() {
 md5sums="81348932d5da294953e15d4814c74dd1  bash-4.3.tar.gz
 80fec5f3d60a63756a4999c877e31a8e  bash-noinfo.patch
 a577d42e38249d298d6a8d4bf2823883  privmode-setuid-fail.patch
-17dc92c0e7d02b75c0e9fc0b335d2473  CVE-2016-7543.patch
 1ab682b4e36afa4cf1b426aa7ac81c0d  bash43-001
 8fc22cf50ec85da00f6af3d66f7ddc1b  bash43-002
 a41728eca78858758e26b5dea64ae506  bash43-003
@@ -119,11 +117,12 @@ a4775487abe958536751c8ce53cdf6f9  bash43-039
 855a46955cb251534e80b4732b748e37  bash43-043
 29623d3282fcbb37e1158136509b5bb8  bash43-044
 4473244ca5abfd4b018ea26dc73e7412  bash43-045
-7e5fb09991c077076b86e0e057798913  bash43-046"
+7e5fb09991c077076b86e0e057798913  bash43-046
+8483153bad1a6f52cadc3bd9a8df7835  bash43-047
+e9f5dc12a32b2e0d3961344e794f92b3  bash43-048"
 sha256sums="afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4  bash-4.3.tar.gz
 363bc919d98cadbfca27660be0d1d4bb6cfe1c5f86a7830966e456df36e46792  bash-noinfo.patch
 6bc2d4e48ad05fb3c8aac120a012baf1911f6522464ed18c8232b111a40b7901  privmode-setuid-fail.patch
-2e844ca9c7117fc34ac837c423c65e193b0d1990943b29ec843ba415092c77c6  CVE-2016-7543.patch
 ecb3dff2648667513e31554b3ad054ccd89fce38e33367c9459ac3a285153742  bash43-001
 eee7cd7062ab29a9e4f02924d9c367264dcb8b162703f74ff6eb8f175a91502b  bash43-002
 000e6eac50cd9053ce0630db01239dcdead04a2c2c351c47e2b51dac1ac1087d  bash43-003
@@ -169,11 +168,12 @@ ac219322db2791da87a496ee6e8e5544846494bdaaea2626270c2f73c1044919  bash43-042
 47a8a3c005b46e25821f4d8f5ccb04c1d653b1c829cb40568d553dc44f7a6180  bash43-043
 9338820630bf67373b44d8ea68409f65162ea7a47b9b29ace06a0aed12567f99  bash43-044
 ba6ec3978e9eaa1eb3fabdaf3cc6fdf8c4606ac1c599faaeb4e2d69864150023  bash43-045
-b3b456a6b690cd293353f17e22d92a202b3c8bce587ae5f2667c20c9ab6f688f  bash43-046"
+b3b456a6b690cd293353f17e22d92a202b3c8bce587ae5f2667c20c9ab6f688f  bash43-046
+c69248de7e78ba6b92f118fe1ef47bc86479d5040fe0b1f908ace1c9e3c67c4a  bash43-047
+5b8215451c5d096ca1e115307ffe6613553551a70369525a0778f216c3a4dfa2  bash43-048"
 sha512sums="a852b8e46ee55568dce9d23a30a9dbd1c770c2d2a4bc91e1c3177d723b31b32c5d69d19704a93f165891b409b9dd2cc65723372044e2bd0ee49ed59a11512651  bash-4.3.tar.gz
 74d51550cc03410f22ffea13f6452350d1e5564bff619fb07a5bbef14ca565fbe03770a2c0041292732cda16e8944b33ccbd0dfe29a606a068fedabe277cd6ae  bash-noinfo.patch
 c5804ace658f9d7f957d4b98bebab4d8eb0ba3dd2dd155a480c7f9b0f17b06ced344b4b4c9f52ef1d5c0cabb047bce5237c350f53b95cf6c95e156ab4ab9e8a9  privmode-setuid-fail.patch
-5d36121e202c495eb380de5f6f456626c53f4b091cea58d0f01242dc86a3a6e720db74d9f89823afc0edaef357c79dd27c41d3f9cb243666c57b83721536c0f2  CVE-2016-7543.patch
 a1011392652180a28f9837af4a341a80beb929c1458e2384e282f0007713c5fe8d0b315abf1340b3707748d3caed322135dee87b59eeb7612ee5130f87d79888  bash43-001
 e3178c85f553522d5d1c5fd39e76f015b680a8ccc84836a5e10283b2aed6e5b7cc3d23af0e67a270b7622dce0abf35dd8a95afa9bb6f89b73a9439f7435175a4  bash43-002
 dc2c5fad8d357d1301e419afd959dfaf015a63172857080c11f77ab1bb7d1d737f411eb0e70a861f98a36bed1b19edb7217a4fa9f4773e21706b62dc56ec3464  bash43-003
@@ -219,4 +219,6 @@ d75cdd6a1fb8aeb1a4e88f046cfea3ec493b994b96f60f27d5577b59408422bb7c51cc4525cadab8
 eb05e537fac08587d0755ad59218bb5a51685aefc1476d6e3feaf72acd1e08cbda512988d8c157425e7939863b313d1e36f51b32f8a8497655c6b0710a24b738  bash43-043
 2937ef80c99e93094e4aaa6a93d077efc3e433a4712c17e30590a0abeb5488293365cb8aa19e37d25b7d5c38d3ad26cdea12b904e5ffb2cdb16f18ab12f422fd  bash43-044
 7b79dacff44e5358da736334d2277a2879ca1389e22e9dac50e139f30dab623bc89a56930d89e74efc468a00d051f6747ccaffcd1a30d7c737d49780b9830e3d  bash43-045
-c036b659fa681f8129110356bec33fad00fb8e469f3b4bcefd0b7ddf5e20030977716adf5c65f58f3ff68cd7af0bdd42392ee077100bc7f45ee123749d082f7d  bash43-046"
+c036b659fa681f8129110356bec33fad00fb8e469f3b4bcefd0b7ddf5e20030977716adf5c65f58f3ff68cd7af0bdd42392ee077100bc7f45ee123749d082f7d  bash43-046
+9332d680ac226491cf8e5986a3261eb76b53ef4b0b2a43405564b088afc0e8658077812c9177bdab7900e05394e69f3047d82ddb59553fc01ef721acfa9d5553  bash43-047
+7c3963bfbc730b4592668460e86c166e727e9897c1a9235a6860a01bc90d365ef0707f0fac7ed62780dcc84e80dbe8484ec59e9e948def22f44ae03e8a169780  bash43-048"
diff --git a/main/bash/CVE-2016-7543.patch b/main/bash/CVE-2016-7543.patch
deleted file mode 100644
index 2ce0f6f363..0000000000
--- a/main/bash/CVE-2016-7543.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f43310742819253bfa6add2dce406701bb8cc2bb Mon Sep 17 00:00:00 2001
-From: Siteshwar Vashisht <svashisht@redhat.com>
-Date: Wed, 28 Sep 2016 18:33:55 +0530
-Subject: [PATCH] CVE-2016-7543: Patch imported from bash-4.4
-
----
- variables.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/variables.c b/variables.c
-index ac587f3..ffd39e8 100644
---- variables.c
-+++ variables.c
-@@ -496,7 +496,11 @@ initialize_shell_variables (env, privmode)
- #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);
--- 
-2.5.5
-