* [PR PATCH] bash: update to 5.2.021.
@ 2023-11-20 11:19 mhmdanas
2023-11-20 12:07 ` ahesford
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: mhmdanas @ 2023-11-20 11:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1220 bytes --]
There is a new pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages bash-5.2.021
https://github.com/void-linux/void-packages/pull/47321
bash: update to 5.2.021.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/47321.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bash-5.2.021-47321.patch --]
[-- Type: text/x-diff, Size: 1521 bytes --]
From 1912786e762630aab715802f616168f31ceeeb66 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Thu, 16 Nov 2023 22:33:49 +0000
Subject: [PATCH] bash: update to 5.2.021.
---
srcpkgs/bash/template | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template
index b7057db94dbee..0e02236b35772 100644
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@@ -1,6 +1,6 @@
# Template file for 'bash'
pkgname=bash
-version=5.2.015
+version=5.2.021
revision=1
_bash_distver=${version%.*}
_bash_patchlevel=${version##*.}
@@ -41,7 +41,13 @@ checksum="a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb
2fb107ce1fb8e93f36997c8b0b2743fc1ca98a454c7cc5a3fcabec533f67d42c
094b4fd81bc488a26febba5d799689b64d52a5505b63e8ee854f48d356bc7ce6
3ef9246f2906ef1e487a0a3f4c647ae1c289cbd8459caa7db5ce118ef136e624
- ef73905169db67399a728e238a9413e0d689462cb9b72ab17a05dba51221358a"
+ ef73905169db67399a728e238a9413e0d689462cb9b72ab17a05dba51221358a
+ 155853bc5bd10e40a9bea369fb6f50a203a7d0358e9e32321be0d9fa21585915
+ 1c48cecbc9b7b4217990580203b7e1de19c4979d0bd2c0e310167df748df2c89
+ 4641dd49dd923b454dd0a346277907090410f5d60a29a2de3b82c98e49aaaa80
+ 325c26860ad4bba8558356c4ab914ac57e7b415dac6f5aae86b9b05ccb7ed282
+ b6fc252aeb95ce67c9b017d29d81e8a5e285db4bf20d4ec8cdca35892be5c01d
+ 8334b88117ad047598f23581aeb0c66c0248cdd77abc3b4e259133aa307650cd"
make_dirs="/etc/bash/bashrc.d 755 root root"
conflicts="chroot-bash>=0"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: bash: update to 5.2.021.
2023-11-20 11:19 [PR PATCH] bash: update to 5.2.021 mhmdanas
@ 2023-11-20 12:07 ` ahesford
2023-11-20 12:08 ` ahesford
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2023-11-20 12:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/47321#issuecomment-1818944167
Comment:
I think we should drop this latching scheme and just fetch the properly versioned tarball.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: bash: update to 5.2.021.
2023-11-20 11:19 [PR PATCH] bash: update to 5.2.021 mhmdanas
2023-11-20 12:07 ` ahesford
@ 2023-11-20 12:08 ` ahesford
2023-11-20 12:50 ` [PR PATCH] [Updated] " mhmdanas
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ahesford @ 2023-11-20 12:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/47321#issuecomment-1818944167
Comment:
I think we should drop this patching scheme and just fetch the properly versioned tarball.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] bash: update to 5.2.021.
2023-11-20 11:19 [PR PATCH] bash: update to 5.2.021 mhmdanas
2023-11-20 12:07 ` ahesford
2023-11-20 12:08 ` ahesford
@ 2023-11-20 12:50 ` mhmdanas
2023-11-20 12:51 ` mhmdanas
2023-12-19 15:33 ` [PR PATCH] [Merged]: bash, chroot-bash: update to 5.2.21 leahneukirchen
4 siblings, 0 replies; 6+ messages in thread
From: mhmdanas @ 2023-11-20 12:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1225 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages bash-5.2.021
https://github.com/void-linux/void-packages/pull/47321
bash: update to 5.2.021.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/47321.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bash-5.2.021-47321.patch --]
[-- Type: text/x-diff, Size: 5588 bytes --]
From 66dbe51a6bc14f0cf948c8641e18aa6c3adf1982 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Mon, 20 Nov 2023 12:50:14 +0000
Subject: [PATCH 1/2] chroot-bash: update to 5.2.21.
---
srcpkgs/chroot-bash/template | 33 ++++-----------------------------
1 file changed, 4 insertions(+), 29 deletions(-)
diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index da448e2a57f81..84b68005ff204 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -1,10 +1,7 @@
# Template file for 'chroot-bash'
pkgname=chroot-bash
-version=5.1.004
+version=5.2.21
revision=1
-_bash_distver=${version%.*}
-_bash_patchlevel=${version##*.}
-_patchprefix="bash${_bash_distver/./}"
build_style=gnu-configure
# need 'bash_cv_termcap_lib=gnutermcap' in order to force bash to use the
# bundled termcap library when bootstrapping from source on a foreign system
@@ -13,37 +10,15 @@ configure_args="--without-bash-malloc --without-curses
short_desc="GNU Bourne Again Shell -- for xbps-src use"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.gnu.org/software/bash/bash.html"
-distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
+homepage="https://www.gnu.org/software/bash/bash.html"
+distfiles="${GNU_SITE}/bash/bash-${version}.tar.gz"
+checksum=c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8
repository=bootstrap
-_url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
-for _p in $(seq -w 001 ${_bash_patchlevel}); do
- distfiles+=" ${_url}/${_patchprefix}-${_p}"
- skip_extraction+=" ${_patchprefix}-${_p}"
-done
-unset _url
-unset _p
-
-checksum="cc012bc860406dcf42f64431bcd3d2fa7560c02915a601aba9cd597a39329baa
- ebb07b3dbadd98598f078125d0ae0d699295978a5cdaef6282fe19adef45b5fa
- 15ea6121a801e48e658ceee712ea9b88d4ded022046a6147550790caf04f5dbe
- 22f2cc262f056b22966281babf4b0a2f84cb7dd2223422e5dcd013c3dcbab6b1
- 9aaeb65664ef0d28c0067e47ba5652b518298b3b92d33327d84b98b28d873c86"
-
bootstrap=yes
provides="bash-${version}_${revision}"
conflicts="bash>=0 dash>=0 busybox>=0 loksh>=0 mksh>=0 oksh>=0 yash>=0"
-post_patch() {
- local _p
- cd ${wrksrc}
- for _p in $(seq -w 001 ${_bash_patchlevel}); do
- msg_normal " Applying patch ${_patchprefix}-${_p}.\n"
- patch -sNp0 -i ${XBPS_SRCDISTDIR}/chroot-bash-$version/${_patchprefix}-${_p}
- done
-}
-
post_install() {
ln -s bash ${DESTDIR}/usr/bin/sh
rm -rf ${DESTDIR}/usr/{lib,share,include} ${DESTDIR}/usr/lib/pkgconfig/bash.pc
From 50ecda1d23d4557c8a90f995466c97a1a85d2899 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Thu, 16 Nov 2023 22:33:49 +0000
Subject: [PATCH 2/2] bash: update to 5.2.21.
---
srcpkgs/bash/template | 42 +++---------------------------------------
1 file changed, 3 insertions(+), 39 deletions(-)
diff --git a/srcpkgs/bash/template b/srcpkgs/bash/template
index b7057db94dbee..a977c3a7d5c0a 100644
--- a/srcpkgs/bash/template
+++ b/srcpkgs/bash/template
@@ -1,10 +1,7 @@
# Template file for 'bash'
pkgname=bash
-version=5.2.015
+version=5.2.21
revision=1
-_bash_distver=${version%.*}
-_bash_patchlevel=${version##*.}
-_patchprefix="bash${_bash_distver/./}"
build_style=gnu-configure
configure_args="--without-bash-malloc --with-curses --without-installed-readline"
make_build_args="TERMCAP_LIB=${XBPS_CROSS_BASE}/usr/lib/libncursesw.a"
@@ -16,32 +13,8 @@ short_desc="GNU Bourne Again Shell"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/bash/bash.html"
-distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
-
-_url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
-for _p in $(seq -w 001 $_bash_patchlevel); do
- distfiles+=" ${_url}/${_patchprefix}-${_p}"
- skip_extraction+=" ${_patchprefix}-${_p}"
-done
-unset _url
-unset _p
-
-checksum="a139c166df7ff4471c5e0733051642ee5556c1cc8a4a78f145583c5c81ab32fb
- f42f2fee923bc2209f406a1892772121c467f44533bedfe00a176139da5d310a
- 45cc5e1b876550eee96f95bffb36c41b6cb7c07d33f671db5634405cd00fd7b8
- 6a090cdbd334306fceacd0e4a1b9e0b0678efdbbdedbd1f5842035990c8abaff
- 38827724bba908cf5721bd8d4e595d80f02c05c35f3dd7dbc4cd3c5678a42512
- ece0eb544368b3b4359fb8464caa9d89c7a6743c8ed070be1c7d599c3675d357
- d1e0566a257d149a0d99d450ce2885123f9995e9c01d0a5ef6df7044a72a468c
- 2500a3fc21cb08133f06648a017cebfa27f30ea19c8cbe8dfefdf16227cfd490
- 6b4bd92fd0099d1bab436b941875e99e0cb3c320997587182d6267af1844b1e8
- f95a817882eaeb0cb78bce82859a86bbb297a308ced730ebe449cd504211d3cd
- c7705e029f752507310ecd7270aef437e8043a9959e4d0c6065a82517996c1cd
- 831b5f25bf3e88625f3ab315043be7498907c551f86041fa3b914123d79eb6f4
- 2fb107ce1fb8e93f36997c8b0b2743fc1ca98a454c7cc5a3fcabec533f67d42c
- 094b4fd81bc488a26febba5d799689b64d52a5505b63e8ee854f48d356bc7ce6
- 3ef9246f2906ef1e487a0a3f4c647ae1c289cbd8459caa7db5ce118ef136e624
- ef73905169db67399a728e238a9413e0d689462cb9b72ab17a05dba51221358a"
+distfiles="${GNU_SITE}/bash/bash-${version}.tar.gz"
+checksum=c8e31bdc59b69aaffc5b36509905ba3e5cbb12747091d27b4b977f078560d5b8
make_dirs="/etc/bash/bashrc.d 755 root root"
conflicts="chroot-bash>=0"
@@ -53,15 +26,6 @@ alternatives="
CFLAGS="-DNON_INTERACTIVE_LOGIN_SHELLS -DSYS_BASHRC='\"/etc/bash/bashrc\"'"
-post_patch() {
- local _p
- cd ${wrksrc}
- for _p in $(seq -w 001 ${_bash_patchlevel}); do
- msg_normal " Applying patch ${_patchprefix}-${_p}.\n"
- patch -sNp0 -i ${XBPS_SRCDISTDIR}/bash-$version/${_patchprefix}-${_p}
- done
-}
-
post_install() {
rm -r ${DESTDIR}/usr/share/doc
ln -s bash ${DESTDIR}/usr/bin/rbash
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: bash: update to 5.2.021.
2023-11-20 11:19 [PR PATCH] bash: update to 5.2.021 mhmdanas
` (2 preceding siblings ...)
2023-11-20 12:50 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-11-20 12:51 ` mhmdanas
2023-12-19 15:33 ` [PR PATCH] [Merged]: bash, chroot-bash: update to 5.2.21 leahneukirchen
4 siblings, 0 replies; 6+ messages in thread
From: mhmdanas @ 2023-11-20 12:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
New comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/47321#issuecomment-1819008718
Comment:
Done, I also bumped chroot-bash as well.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: bash, chroot-bash: update to 5.2.21.
2023-11-20 11:19 [PR PATCH] bash: update to 5.2.021 mhmdanas
` (3 preceding siblings ...)
2023-11-20 12:51 ` mhmdanas
@ 2023-12-19 15:33 ` leahneukirchen
4 siblings, 0 replies; 6+ messages in thread
From: leahneukirchen @ 2023-12-19 15:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1074 bytes --]
There's a merged pull request on the void-packages repository
bash, chroot-bash: update to 5.2.21.
https://github.com/void-linux/void-packages/pull/47321
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-12-19 15:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-20 11:19 [PR PATCH] bash: update to 5.2.021 mhmdanas
2023-11-20 12:07 ` ahesford
2023-11-20 12:08 ` ahesford
2023-11-20 12:50 ` [PR PATCH] [Updated] " mhmdanas
2023-11-20 12:51 ` mhmdanas
2023-12-19 15:33 ` [PR PATCH] [Merged]: bash, chroot-bash: update to 5.2.21 leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).