From 06b15fb79f5e0cf451816a2875e230a8cff2e594 Mon Sep 17 00:00:00 2001 From: fbrosson Date: Sun, 29 Jan 2017 16:33:34 +0000 Subject: [PATCH] bash: bump to 4.4.012. Also patch tests/intl2.sub: /usr/bin/printf -> /bin/printf --- ...ash-4.4.011.recipe => bash-4.4.012.recipe} | 5 ++-- app-shells/bash/patches/bash-4.4.patchset | 24 ++++++++++++++++++- 2 files changed, 26 insertions(+), 3 deletions(-) rename app-shells/bash/{bash-4.4.011.recipe => bash-4.4.012.recipe} (95%) diff --git a/app-shells/bash/bash-4.4.011.recipe b/app-shells/bash/bash-4.4.012.recipe similarity index 95% rename from app-shells/bash/bash-4.4.011.recipe rename to app-shells/bash/bash-4.4.012.recipe index 2c78f3414..2d547786b 100644 --- a/app-shells/bash/bash-4.4.011.recipe +++ b/app-shells/bash/bash-4.4.012.recipe @@ -8,7 +8,7 @@ LICENSE="GNU GPL v3" REVISION="1" SOURCE_URI="https://ftp.gnu.org/gnu/bash/bash-4.4.tar.gz" CHECKSUM_SHA256="d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb" -for i in {001..011}; do +for i in {001..012}; do eval "SOURCE_URI_$i=\"https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-$i#noarchive\"" done CHECKSUM_SHA256_001="3e28d91531752df9a8cb167ad07cc542abaf944de9353fe8c6a535c9f1f17f0f" @@ -22,6 +22,7 @@ CHECKSUM_SHA256_008="86144700465933636d7b945e89b77df95d3620034725be161ca0ca5a42e CHECKSUM_SHA256_009="0b6bdd1a18a0d20e330cc3bc71e048864e4a13652e29dc0ebf3918bea729343c" CHECKSUM_SHA256_010="8465c6f2c56afe559402265b39d9e94368954930f9aa7f3dfa6d36dd66868e06" CHECKSUM_SHA256_011="dd56426ef7d7295e1107c0b3d06c192eb9298f4023c202ca2ba6266c613d170d" +CHECKSUM_SHA256_012="fac271d2bf6372c9903e3b353cb9eda044d7fe36b5aab52f21f3f21cd6a2063e" SOURCE_DIR="bash-4.4" PATCHES=" @@ -68,7 +69,7 @@ GLOBAL_WRITABLE_FILES="settings/bashrc keep-old" PATCH() { - for i in {001..011}; do + for i in {001..012}; do echo "Applying patch $i..." sed -e "s/\.\.\/bash-4.4\///" ../../sources-$i/bash44-$i | patch -p0 done diff --git a/app-shells/bash/patches/bash-4.4.patchset b/app-shells/bash/patches/bash-4.4.patchset index 3a767b9a2..db8fe6a92 100644 --- a/app-shells/bash/patches/bash-4.4.patchset +++ b/app-shells/bash/patches/bash-4.4.patchset @@ -1,7 +1,7 @@ From 611873d530c23af9c679d43a4b3a30e59dd5eee4 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov Date: Sat, 17 Sep 2016 17:17:42 +0300 -Subject: [PATCH 1/1] fix gcc2 build +Subject: fix gcc2 build --- shell.c | 2 +- @@ -23,3 +23,25 @@ index 45b77f9..4034599 100644 -- 2.7.0 + +From aec63b7ae85f2dcbaa088c52148d1f64ecd4d15e Mon Sep 17 00:00:00 2001 +From: fbrosson +Date: Fri, 27 Jan 2017 16:27:11 +0000 +Subject: Use /bin/printf (instead of /usr/bin/printf) + + +diff --git a/tests/intl2.sub b/tests/intl2.sub +index 64961bc..36f7182 100644 +--- a/tests/intl2.sub ++++ b/tests/intl2.sub +@@ -3,7 +3,7 @@ export LANG=de_DE.UTF-8 + printf '%.4f\n' 1 + + LANG=C printf '%.4f\n' 1 +-LANG=C /usr/bin/printf '%.4f\n' 1 ++LANG=C /bin/printf '%.4f\n' 1 + + env LANG=C printf '%.4f\n' 1 + (LANG=C; printf '%.4f\n' 1) +-- +2.11.0