From fd46fde1d1055c4826ad45009545c14979defc7c Mon Sep 17 00:00:00 2001 From: kre Date: Wed, 5 Oct 2022 18:16:42 +0000 Subject: The first two (upstream) patches for bash 5.2, producing bash 5.2.2 Patch 1: Expanding unset arrays in an arithmetic context can cause a segmentation fault. Patch 2: Starting bash with an invalid locale specification for LC_ALL/LANG/LC_CTYPE can cause the shell to crash. --- shells/bash/Makefile | 12 +++++------- shells/bash/distinfo | 8 +++++++- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'shells') diff --git a/shells/bash/Makefile b/shells/bash/Makefile index e4cfe13c52b..474368cc96b 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -1,17 +1,15 @@ -# $NetBSD: Makefile,v 1.104 2022/10/03 12:50:27 wiz Exp $ +# $NetBSD: Makefile,v 1.105 2022/10/05 18:16:42 kre Exp $ BASH_VERSION= 5.2 +BASH_PATCHLEVEL= 2 DISTNAME= bash-${BASH_VERSION} -#PKGNAME= bash-${BASH_VERSION}.${BASH_PATCHLEVEL} +PKGNAME= bash-${BASH_VERSION}.${BASH_PATCHLEVEL} CATEGORIES= shells MASTER_SITES= ${MASTER_SITE_GNU:=bash/} -#PATCH_SITES= ${MASTER_SITES:=bash-5.1-patches/} -#PATCHFILES+= bash51-001 bash51-002 bash51-003 bash51-004 -#PATCHFILES+= bash51-005 bash51-006 bash51-007 bash51-008 -#PATCHFILES+= bash51-009 bash51-010 bash51-011 bash51-012 -#PATCHFILES+= bash51-013 bash51-014 bash51-015 bash51-016 +PATCH_SITES= ${MASTER_SITES:=bash-5.2-patches/} +PATCHFILES+= bash52-001 bash52-002 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://www.gnu.org/software/bash/bash.html diff --git a/shells/bash/distinfo b/shells/bash/distinfo index ea0b918d8e9..c411ceff614 100644 --- a/shells/bash/distinfo +++ b/shells/bash/distinfo @@ -1,8 +1,14 @@ -$NetBSD: distinfo,v 1.72 2022/10/04 12:45:31 kim Exp $ +$NetBSD: distinfo,v 1.73 2022/10/05 18:16:42 kre Exp $ BLAKE2s (bash-5.2.tar.gz) = 430755ea2af4903dba2bdbeffd4d861edb9f54c248071362f0d14f15171764cd SHA512 (bash-5.2.tar.gz) = 5647636223ba336bf33e0c65e516d8ebcf6932de8b44f37bc468eedb87579c628ad44213f78534beb10f47aebb9c6fa670cb0bed3b4e7717e5faf7e9a1ef81ae Size (bash-5.2.tar.gz) = 10950833 bytes +BLAKE2s (bash52-001) = 6b618f14e67c2133268a4bfec8649032adbd91a7cb438ffac51e873001fbc930 +SHA512 (bash52-001) = d1e5d508a4a1888052434adff551732c4215372174adb19dce9514faa18c78ee690e1c0fd9858e15c76fbb910ccace7e62751c3c266f5db253dbffda8c882409 +Size (bash52-001) = 1381 bytes +BLAKE2s (bash52-002) = 63fc1b73de77a9e46a7ded54564dfdd6ea5f978d14133d425fb2f783fa3e441e +SHA512 (bash52-002) = 2484262d6cb32303c761793af2c352062421054149fcf3f591a590e409bb21985683a1e50669547e396eea46f1081ae0821076c3975357dc6c850f94cdd527c1 +Size (bash52-002) = 1328 bytes SHA1 (patch-af) = e26e3209902247263884cfebc11a2f7e43245062 SHA1 (patch-ag) = cd3b151e3bb045d2bb609c0a03d7d3df2c871f47 SHA1 (patch-aj) = 2e4c15afd9b50d44967ee8e1f85bdc908c0eeeb0 -- cgit v1.2.3