Sun Jan 14 23:21:16 2024 UTC (129d)
Upgrade bash from 5.2.21nb1 to 5.2.26

Patch 22: It's possible for readline to try to zero out a line that's
	not null-terminated, leading to a memory fault.

Patch 23: Running `local -' multiple times in a shell function would
	overwrite the original saved set of options.

Patsh 24: Fix bug where associative array compound assignment would
	not expand tildes in values.

Patch 25: Make sure a subshell checks for and handles any terminating
	signals before exiting (which might have arrived after the
	command completed) so the parent and any EXIT trap will see
	the correct value for $?.

Patch 26: The custom color prefix that readline uses to color possible
	completions must have a leading `.'.


(kre)
diff -r1.111 -r1.112 pkgsrc/shells/bash/Makefile
diff -r1.80 -r1.81 pkgsrc/shells/bash/distinfo

cvs diff -r1.111 -r1.112 pkgsrc/shells/bash/Makefile (expand / switch to unified diff)

--- pkgsrc/shells/bash/Makefile 2023/11/24 12:21:28 1.111
+++ pkgsrc/shells/bash/Makefile 2024/01/14 23:21:15 1.112
@@ -1,30 +1,30 @@ @@ -1,30 +1,30 @@
1# $NetBSD: Makefile,v 1.111 2023/11/24 12:21:28 kre Exp $ 1# $NetBSD: Makefile,v 1.112 2024/01/14 23:21:15 kre Exp $
2 2
3BASH_VERSION= 5.2 3BASH_VERSION= 5.2
4BASH_PATCHLEVEL= 21 4BASH_PATCHLEVEL= 26
5PKGREVISION= 1 
6 5
7DISTNAME= bash-${BASH_VERSION} 6DISTNAME= bash-${BASH_VERSION}
8PKGNAME= bash-${BASH_VERSION}.${BASH_PATCHLEVEL} 7PKGNAME= bash-${BASH_VERSION}.${BASH_PATCHLEVEL}
9CATEGORIES= shells 8CATEGORIES= shells
10MASTER_SITES= ${MASTER_SITE_GNU:=bash/} 9MASTER_SITES= ${MASTER_SITE_GNU:=bash/}
11 10
12PATCH_SITES= ${MASTER_SITES:=bash-5.2-patches/} 11PATCH_SITES= ${MASTER_SITES:=bash-5.2-patches/}
13PATCHFILES+= bash52-001 bash52-002 bash52-003 bash52-004 bash52-005 12PATCHFILES+= bash52-001 bash52-002 bash52-003 bash52-004 bash52-005
14PATCHFILES+= bash52-006 bash52-007 bash52-008 bash52-009 bash52-010 13PATCHFILES+= bash52-006 bash52-007 bash52-008 bash52-009 bash52-010
15PATCHFILES+= bash52-011 bash52-012 bash52-013 bash52-014 bash52-015 14PATCHFILES+= bash52-011 bash52-012 bash52-013 bash52-014 bash52-015
16PATCHFILES+= bash52-016 bash52-017 bash52-018 bash52-019 bash52-020 15PATCHFILES+= bash52-016 bash52-017 bash52-018 bash52-019 bash52-020
17PATCHFILES+= bash52-021 16PATCHFILES+= bash52-021 bash52-022 bash52-023 bash52-024 bash52-025
 17PATCHFILES+= bash52-026
18 18
19MAINTAINER= pkgsrc-users@NetBSD.org 19MAINTAINER= pkgsrc-users@NetBSD.org
20HOMEPAGE= https://www.gnu.org/software/bash/bash.html 20HOMEPAGE= https://www.gnu.org/software/bash/bash.html
21COMMENT= The GNU Bourne Again Shell 21COMMENT= The GNU Bourne Again Shell
22LICENSE= gnu-gpl-v3 22LICENSE= gnu-gpl-v3
23 23
24USE_TOOLS+= makeinfo bison 24USE_TOOLS+= makeinfo bison
25TEXINFO_REQD= 4.1 25TEXINFO_REQD= 4.1
26GNU_CONFIGURE= yes 26GNU_CONFIGURE= yes
27MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} 27MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
28CONFIGURE_ARGS= LOCAL_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:M*:Q} 28CONFIGURE_ARGS= LOCAL_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:M*:Q}
29CPPFLAGS+= -DDEFAULT_PATH_VALUE="\"/sbin:/usr/sbin:/usr/bin:/bin:${PREFIX}/sbin:${PREFIX}/bin:/usr/local/sbin:/usr/local/bin\"" 29CPPFLAGS+= -DDEFAULT_PATH_VALUE="\"/sbin:/usr/sbin:/usr/bin:/bin:${PREFIX}/sbin:${PREFIX}/bin:/usr/local/sbin:/usr/local/bin\""
30TEST_TARGET= test 30TEST_TARGET= test

cvs diff -r1.80 -r1.81 pkgsrc/shells/bash/distinfo (expand / switch to unified diff)

--- pkgsrc/shells/bash/distinfo 2023/11/24 01:41:04 1.80
+++ pkgsrc/shells/bash/distinfo 2024/01/14 23:21:15 1.81
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.80 2023/11/24 01:41:04 nia Exp $ 1$NetBSD: distinfo,v 1.81 2024/01/14 23:21:15 kre Exp $
2 2
3BLAKE2s (bash-5.2.tar.gz) = 430755ea2af4903dba2bdbeffd4d861edb9f54c248071362f0d14f15171764cd 3BLAKE2s (bash-5.2.tar.gz) = 430755ea2af4903dba2bdbeffd4d861edb9f54c248071362f0d14f15171764cd
4SHA512 (bash-5.2.tar.gz) = 5647636223ba336bf33e0c65e516d8ebcf6932de8b44f37bc468eedb87579c628ad44213f78534beb10f47aebb9c6fa670cb0bed3b4e7717e5faf7e9a1ef81ae 4SHA512 (bash-5.2.tar.gz) = 5647636223ba336bf33e0c65e516d8ebcf6932de8b44f37bc468eedb87579c628ad44213f78534beb10f47aebb9c6fa670cb0bed3b4e7717e5faf7e9a1ef81ae
5Size (bash-5.2.tar.gz) = 10950833 bytes 5Size (bash-5.2.tar.gz) = 10950833 bytes
6BLAKE2s (bash52-001) = 6b618f14e67c2133268a4bfec8649032adbd91a7cb438ffac51e873001fbc930 6BLAKE2s (bash52-001) = 6b618f14e67c2133268a4bfec8649032adbd91a7cb438ffac51e873001fbc930
7SHA512 (bash52-001) = d1e5d508a4a1888052434adff551732c4215372174adb19dce9514faa18c78ee690e1c0fd9858e15c76fbb910ccace7e62751c3c266f5db253dbffda8c882409 7SHA512 (bash52-001) = d1e5d508a4a1888052434adff551732c4215372174adb19dce9514faa18c78ee690e1c0fd9858e15c76fbb910ccace7e62751c3c266f5db253dbffda8c882409
8Size (bash52-001) = 1381 bytes 8Size (bash52-001) = 1381 bytes
9BLAKE2s (bash52-002) = 63fc1b73de77a9e46a7ded54564dfdd6ea5f978d14133d425fb2f783fa3e441e 9BLAKE2s (bash52-002) = 63fc1b73de77a9e46a7ded54564dfdd6ea5f978d14133d425fb2f783fa3e441e
10SHA512 (bash52-002) = 2484262d6cb32303c761793af2c352062421054149fcf3f591a590e409bb21985683a1e50669547e396eea46f1081ae0821076c3975357dc6c850f94cdd527c1 10SHA512 (bash52-002) = 2484262d6cb32303c761793af2c352062421054149fcf3f591a590e409bb21985683a1e50669547e396eea46f1081ae0821076c3975357dc6c850f94cdd527c1
11Size (bash52-002) = 1328 bytes 11Size (bash52-002) = 1328 bytes
12BLAKE2s (bash52-003) = b1e967bd7c6a231c2168c9140e0a6fd77a99b94861069188872fa597755c633e 12BLAKE2s (bash52-003) = b1e967bd7c6a231c2168c9140e0a6fd77a99b94861069188872fa597755c633e
13SHA512 (bash52-003) = c8dac54c8b1805dc756efd06be3092a4de1c45bc1e97b574ca49bf4152515a545d154a84c1d9a82747c79d676b8330254856380bc929d8e835b10af743d66cbb 13SHA512 (bash52-003) = c8dac54c8b1805dc756efd06be3092a4de1c45bc1e97b574ca49bf4152515a545d154a84c1d9a82747c79d676b8330254856380bc929d8e835b10af743d66cbb
14Size (bash52-003) = 2157 bytes 14Size (bash52-003) = 2157 bytes
@@ -56,23 +56,38 @@ SHA512 (bash52-017) = 1844d1f4fbce0ae1dd @@ -56,23 +56,38 @@ SHA512 (bash52-017) = 1844d1f4fbce0ae1dd
56Size (bash52-017) = 1396 bytes 56Size (bash52-017) = 1396 bytes
57BLAKE2s (bash52-018) = 963bff57ea63d6f14d99415932f9c9a577c5a23a19ae91f9ab705cad744fda61 57BLAKE2s (bash52-018) = 963bff57ea63d6f14d99415932f9c9a577c5a23a19ae91f9ab705cad744fda61
58SHA512 (bash52-018) = b454ba8a311b0943f9669425891499fe8d4b5f1a90899bf6c4d0969699e21f8f8e08d0b0e23a7cf5c97aa6b21384ae907ed710254053e7edd43328aa6003780c 58SHA512 (bash52-018) = b454ba8a311b0943f9669425891499fe8d4b5f1a90899bf6c4d0969699e21f8f8e08d0b0e23a7cf5c97aa6b21384ae907ed710254053e7edd43328aa6003780c
59Size (bash52-018) = 151467 bytes 59Size (bash52-018) = 151467 bytes
60BLAKE2s (bash52-019) = 860a8e163707481b42601921fabe41875bcbd89bf8685bb97e180c7d9cfa6b94 60BLAKE2s (bash52-019) = 860a8e163707481b42601921fabe41875bcbd89bf8685bb97e180c7d9cfa6b94
61SHA512 (bash52-019) = d009b0a571a3e23ab723c6c6fd4b28c48db1a927d690b4c42d7ed2fa51052aaf662026a2de9e4ee3676087eac844f8b57adae567556228c4fd8fb4ed3c8a1b94 61SHA512 (bash52-019) = d009b0a571a3e23ab723c6c6fd4b28c48db1a927d690b4c42d7ed2fa51052aaf662026a2de9e4ee3676087eac844f8b57adae567556228c4fd8fb4ed3c8a1b94
62Size (bash52-019) = 2548 bytes 62Size (bash52-019) = 2548 bytes
63BLAKE2s (bash52-020) = 55118bb23608eea47252d2aa3941c317acfa149ffd810a6ede7945ea6d2e41f8 63BLAKE2s (bash52-020) = 55118bb23608eea47252d2aa3941c317acfa149ffd810a6ede7945ea6d2e41f8
64SHA512 (bash52-020) = a5a927e90ac3daead54e90f8ff99dbda0fd652c3df83b7bcde0adb136fc4ba8498810e5bfa1d7f0c143422bf1f4622a4669c96e505bccad7c9a271d7e0668187 64SHA512 (bash52-020) = a5a927e90ac3daead54e90f8ff99dbda0fd652c3df83b7bcde0adb136fc4ba8498810e5bfa1d7f0c143422bf1f4622a4669c96e505bccad7c9a271d7e0668187
65Size (bash52-020) = 1459 bytes 65Size (bash52-020) = 1459 bytes
66BLAKE2s (bash52-021) = 323342e574ace61041f5d9238de72aaa37e4093eacca443ec751d859f983ae6a 66BLAKE2s (bash52-021) = 323342e574ace61041f5d9238de72aaa37e4093eacca443ec751d859f983ae6a
67SHA512 (bash52-021) = c3a61e975819919d7ba120f322fc5e9a420b21f03d7bf989a5e7b6a99bfe35372744277040e88361ee383ab53b05d607d52ff2000b401de038af67c91728b48f 67SHA512 (bash52-021) = c3a61e975819919d7ba120f322fc5e9a420b21f03d7bf989a5e7b6a99bfe35372744277040e88361ee383ab53b05d607d52ff2000b401de038af67c91728b48f
68Size (bash52-021) = 1890 bytes 68Size (bash52-021) = 1890 bytes
 69BLAKE2s (bash52-022) = b5f7daa956e81d040555c968c85972d8d00623941529b80c6358e61ab4a92b33
 70SHA512 (bash52-022) = 12a669f3b6ba936be31a85c50bfe52689f3deea02eedb31100ab113b1e74d8104934e615965b4bf7f3b1cf5ad71870211b0bd910bf0862e8ce603505b4b1db3f
 71Size (bash52-022) = 1305 bytes
 72BLAKE2s (bash52-023) = 582754e708d881f3286133c0a7b5ca4123d308a558775e9f07ffa59adbed40fc
 73SHA512 (bash52-023) = 59a2e9e4ee4938ba868552eecdbed5f5d797e143bf6f69fde5c50a4e478c19ce36d562b9f51f65d7da5fe216050276bfe1eb430c151c845cffa77d3fdc9ce771
 74Size (bash52-023) = 1817 bytes
 75BLAKE2s (bash52-024) = c9e07ff67af63a40b0581259efae0fef35b5a49d122c4ef1fde9f6e7a342320d
 76SHA512 (bash52-024) = ff77920ba4c8df7cb8841d94f483a5678a65ff2aab3f03b02b21eba7daaea15d05af26d2fc7f468509c2047f682908d78cd94254e0688496280e345d010aac24
 77Size (bash52-024) = 2298 bytes
 78BLAKE2s (bash52-025) = e0e9df6638237c359a4a788e2685af538e34f5bd14b7730828c43ed714af3729
 79SHA512 (bash52-025) = 20e708ff483ae2ba655c069fbaccdef59d81f52ba787d97fd1b997522248e9e7e1d7773a35f3a6e44c4521a7a5be273ffa25c580533e6d1d1bfb5e49040530c3
 80Size (bash52-025) = 1454 bytes
 81BLAKE2s (bash52-026) = a80b13836a08e48795b3b71b645b1032ace336efe80b4058af4bcc7d16f4d343
 82SHA512 (bash52-026) = 571993da2b8067ef5b7b705aee65dd414ee70b216ffbcb9fab7c08807b87a72465594c3f1576c795ae86bf951911cdde70ad1037e851b88ee379c4237ccff6fe
 83Size (bash52-026) = 1372 bytes
69SHA1 (patch-Makefile.in) = 2e4c15afd9b50d44967ee8e1f85bdc908c0eeeb0 84SHA1 (patch-Makefile.in) = 2e4c15afd9b50d44967ee8e1f85bdc908c0eeeb0
70SHA1 (patch-builtins_printf.def) = e26e3209902247263884cfebc11a2f7e43245062 85SHA1 (patch-builtins_printf.def) = e26e3209902247263884cfebc11a2f7e43245062
71SHA1 (patch-builtins_psize.c) = cd3b151e3bb045d2bb609c0a03d7d3df2c871f47 86SHA1 (patch-builtins_psize.c) = cd3b151e3bb045d2bb609c0a03d7d3df2c871f47
72SHA1 (patch-builtins_ulimit.def) = 1390069344607204eb3abbd6ddeb148ff590c55e 87SHA1 (patch-builtins_ulimit.def) = 1390069344607204eb3abbd6ddeb148ff590c55e
73SHA1 (patch-configure) = c4e1ab53a1ee85f3e6121047f0aca8ceb85e6e5d 88SHA1 (patch-configure) = c4e1ab53a1ee85f3e6121047f0aca8ceb85e6e5d
74SHA1 (patch-examples_loadables_Makefile.in) = 0d27f82399c4ae9fae8ac0f8c48c68a23a3dcbd8 89SHA1 (patch-examples_loadables_Makefile.in) = 0d27f82399c4ae9fae8ac0f8c48c68a23a3dcbd8
75SHA1 (patch-examples_loadables_fdflags.c) = dce409c76b7d6c838eb25c3ccc7a89ee57ca69b8 90SHA1 (patch-examples_loadables_fdflags.c) = dce409c76b7d6c838eb25c3ccc7a89ee57ca69b8
76SHA1 (patch-examples_loadables_getconf.c) = 4e5705fa1dc6c86514d16b4960320a56a3fb2366 91SHA1 (patch-examples_loadables_getconf.c) = 4e5705fa1dc6c86514d16b4960320a56a3fb2366
77SHA1 (patch-lib_malloc_malloc.c) = 6e500228972eac0cb4d4defb02e9cf573b7fa207 92SHA1 (patch-lib_malloc_malloc.c) = 6e500228972eac0cb4d4defb02e9cf573b7fa207
78SHA1 (patch-support_shobj-conf) = 010d5058262a23add420deed6c44a605bb16aa26 93SHA1 (patch-support_shobj-conf) = 010d5058262a23add420deed6c44a605bb16aa26