From: Paul Bredbury <brebs@sent.com>
To: alpine-aports@lists.alpinelinux.org
Cc: Paul Bredbury <brebs@sent.com>
Subject: [alpine-aports] [PATCH] main/bash: upgrade to 4.4.23, enable checkwinsize
Date: Sat,  9 Mar 2019 17:13:20 +0000
Message-Id: <20190309171320.4257-1-brebs@sent.com>
Precedence: list
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

GUI-based terminals should not default to the broken behaviour of (seemingly randomly) garbled text, when editing long lines, and especially multi-line commands.

Fixed lack of variable quoting.

Added trailing slash, to be explicit that a directory is intentioned & used, rather than a file.
---
 main/bash/APKBUILD              | 18 ++++++++++++------
 main/bash/checkwinsize-on.patch | 12 ++++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 main/bash/checkwinsize-on.patch

diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index f8ca062d13..3ec19d8fdb 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -2,11 +2,11 @@
 # Contributor: TBK <alpine@jjtc.eu>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bash
-pkgver=4.4.19
+pkgver=4.4.23
 _patchlevel=${pkgver##*.}
 _myver=${pkgver%.*}
 _patchbase=${_myver/./}
-pkgrel=1
+pkgrel=0
 pkgdesc="The GNU Bourne Again shell"
 url="https://www.gnu.org/software/bash/bash.html"
 arch="all"
@@ -20,6 +20,7 @@ options="!checkroot"
 source="https://ftp.gnu.org/gnu/bash/bash-${_myver}.tar.gz
 	bash-noinfo.patch
 	fix-jobs.patch
+	checkwinsize-on.patch
 	"
 # generate url's to patches. note: no forks allowed!
 _i=1
@@ -91,14 +92,15 @@ package() {
 
 dev() {
 	default_dev
-	mkdir -p "$subpkgdir"/bin "$subpkgdir"/usr/lib/$pkgname
-	mv "$pkgdir"/bin/${pkgname}bug "$subpkgdir"/bin
-	mv "$pkgdir"/usr/lib/$pkgname/Makefile* "$subpkgdir"/usr/lib/$pkgname
+	mkdir -p "$subpkgdir"/bin "$subpkgdir/usr/lib/$pkgname"
+	mv "$pkgdir/bin/${pkgname}bug" "$subpkgdir"/bin/
+	mv "$pkgdir/usr/lib/$pkgname"/Makefile* "$subpkgdir/usr/lib/$pkgname/"
 }
 
 sha512sums="73de3b425faaac55e45456b0f6f6d8077b5dfa7bb76e0d1894a19361b4a2b6bd4fbbe182117ddbfe9b07b4d898fba03537c261badc9533dd3c0da891764c7f29  bash-4.4.tar.gz
 9d8845491d0fe335bdd8e9a2bd98bda54bfed2ae3c35b2196c6d5a38bdf96c4d97572ba7d6b19ab605ef4e8f001f64cf3312f87dedebb9e37a95ad2c44e33cdb  bash-noinfo.patch
 79473c41e620d78d25139b56c37d18adac5c03dc28939f218729dfcd3558d8cbac5e83db814ffd27aa833cd3e55f81aad26aaf62af3688c927d8ac2a4172eaa4  fix-jobs.patch
+deca765cdd0b5036ec2ed0e58114a4053b6085d0e444fb71e342295fb1b2fcd07286e5c03b1ebae2b36fe2fe34b4b57ce9c1bf4d3074abf2277063b5d68f623c  checkwinsize-on.patch
 fa7a1b277eb3bad6ae7d2c7a2887cbf2c0eb75b7fee8ed03ec1e9d45879a2fb4b8c7cb16d6b029987493b01a461214bd9a24454a6837e7cfe180b1bc56f61caa  bash44-001
 526f986057810f89080e283ff95b3a8fd24d37e4ad2f18c39f36d3a2d57956a6441d16220082157735e3c5ccf770d5016e761aa5f309129898e39277d576e6b5  bash44-002
 e61db89bdd1a7ae15013fe258046a343c9ea41e5a1c6d2c810947500a617fce7536b8d51194e14bb42499fe0de6d70cc9b2c81da0afdcb5a2278459f4f76d748  bash44-003
@@ -117,4 +119,8 @@ eac0a9abf59b65a59a0028d2f3c0a7dc8a0b3c04e2d2db642b69aa7c13a2dfa190f3c63f7d8a7c94
 5acc704df3fe63b5b8055ba7bc14ae70cc23d15aefee8db6991e6c11cc8b0e10fcc67d516bc2d2fde84be26ed5c88dbf266fa164756218b60eccc2bfb4eed7d9  bash44-016
 c1d50aee953427ba0b95e48c10d2324e7413f3354ff65b9c3c1dfd14eedec55e619fcd12353e7b99b6e280f510e04d1c971b309c1a4efb97d48ddb30d69f14ac  bash44-017
 008ff44dbf916414d691c29cee29e7f636bbe79170463d76ef16ca63ecdc24a84ff4476078c28fb8788d9b1fb0572612a7e8cb30fceb55ad650f293db8361ad1  bash44-018
-59984e221a7a6dbf72bf893b1b7c4a63fea34d6af1208a19f0e9e6cd59a09e4cf51890cb2d31c1502e2a2f644f584417bb59cf02c308d3250d2a98d41b63e893  bash44-019"
+59984e221a7a6dbf72bf893b1b7c4a63fea34d6af1208a19f0e9e6cd59a09e4cf51890cb2d31c1502e2a2f644f584417bb59cf02c308d3250d2a98d41b63e893  bash44-019
+e200fddd717fa33d2c56eb6713031d34891e5ebcd489a65a43ccfebf9728c1609b758ca3dffb1eed4abd3c62c6d7163ce88d8a1bb73b6d07bee99e0409365978  bash44-020
+43a82d06a17bc30c2579a0944cb68f60bd9e3cddb9fff4a760fbf1f2f5104a99bb69c400cf63231b242c03a4684701455e603d96c9b588f2c69da02570042fec  bash44-021
+385a0d1bbdff0dffec2a08021a84a5ac3695e44e1a90b0080b82737fc4a9ea924ee59b47fd5e288b69a540f4c976bf9da0db08ee2d20e170c868f802f75785fb  bash44-022
+442efa78d365a728555ade77cc2f8501aed09f37ae10e1ac647d35299829b63caefbc5c30436d622bfef9300e9d929d7f4fafe85a59df15089881bc987fa12fd  bash44-023"
diff --git a/main/bash/checkwinsize-on.patch b/main/bash/checkwinsize-on.patch
new file mode 100644
index 0000000000..6f2a1f5892
--- /dev/null
+++ b/main/bash/checkwinsize-on.patch
@@ -0,0 +1,12 @@
+diff -Naur a/config-top.h b/config-top.h
+--- a/config-top.h	2016-05-19 19:34:02.000000000 +0100
++++ b/config-top.h	2019-03-09 14:31:22.336578515 +0000
+@@ -130,7 +130,7 @@
+ 
+ /* Define to 0 if you want the checkwinsize option off by default, 1 if you
+    want it on. */
+-#define CHECKWINSIZE_DEFAULT	0
++#define CHECKWINSIZE_DEFAULT	1
+ 
+ /* Define to 1 if you want to optimize for sequential array assignment when
+    using indexed arrays, 0 if you want bash-4.2 behavior, which favors
-- 
2.21.0



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---