janneke pushed a commit to branch core-packages-team
in repository guix.
commit 400bbddf29d4f47d19b4ed4c83c499a5a77d55d3
Author: Zheng Junjie <z572@z572.online>
AuthorDate: Fri Feb 7 16:52:40 2025 +0800
gnu: bash: Update to 5.2.37.
* gnu/packages/bash.scm (bash): Update to 5.2.37.
(patch-url): Update it.
(%patch-series-5.1): Rename to %patch-series-5.2 and update it.
* gnu/packages/patches/bash-linux-pgrp-pipe.patch: Adjust it.
Change-Id: I26c070ea3256e77d3a7658190339dc080fc0bc63
---
gnu/packages/bash.scm | 67 ++++++++++++++++---------
gnu/packages/patches/bash-linux-pgrp-pipe.patch | 9 ++--
2 files changed, 49 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm
index dbcc631ed0..a809e47d43 100644
--- a/gnu/packages/bash.scm
+++ b/gnu/packages/bash.scm
@@ -63,7 +63,7 @@
(define (patch-url seqno)
"Return the URL of Bash patch number SEQNO."
- (format #f "mirror://gnu/bash/bash-5.1-patches/bash51-~3,'0d" seqno))
+ (format #f "mirror://gnu/bash/bash-5.2-patches/bash52-~3,'0d" seqno))
(define (bash-patch seqno sha256-bv)
"Return the origin of Bash patch SEQNO, with expected hash SHA256-BV."
@@ -76,26 +76,47 @@
(list (bash-patch seqno (base32 hash))
...))
-(define %patch-series-5.1
- ;; This is the current patches series for 5.1, generated using
+(define %patch-series-5.2
+ ;; This is the current patches series for 5.2, generated using
;; 'download-patches' below.
(patch-series
- (1 "1ymm8ppss6gyh9ifznjwiabrb4k91npd09c10y7mk66xp8yppc7b")
- (2 "1gjx9zqcm407am3n2sh44b8dxm48kgm15rzfiijqxr01m0hn3shm")
- (3 "1cdnpbfc64yhvkjj4d12s9ywp11g195vzfl1cab24sq55wkcrwi2")
- (4 "11iwhy6v562bv0kk7lwj7f5jj65ma9bblivy0v02h3ggcibbdbls")
- (5 "19bdyigdr81824nxvqr6a7k0cax60wq7376j6b91afbnwvlvbjyc")
- (6 "051x8wlwrqk0yr0zg378vh824iklfl5g9pkmcdf62qp8gn9pvqbm")
- (7 "0fir80pp1gmlpadmqcgkrv4y119pc7xllchjzg05fd7px73viz5c")
- (8 "1lfjgshk8i9vch92p5wgc9r90j3phw79aa7gbai89w183b2z6b7j")
- (9 "1vn36dzd9g4y1h3jiss6418crla0rbcd0d6wwsyv9d5l7aaxlp74")
- (10 "0amfmvbzsand7bdypylkjdpcp88fa3cplfshn7vyzv2ff2rdgj52")
- (11 "0yq24abb4fzfxqnwl20b330sxl9lr9ds0nc4yi30f81l94b1y6aq")
- (12 "165bff97ffih49vfs4mkr5w3z5gn1w6zfyrf773iajkw6v48kw8h")
- (13 "1bfmgv3lagbk3aq9a831d29xv7jz4sjq7jhn9hq89limyinvdb67")
- (14 "1l43dw4kpddn7l41i8wmj406z9abxky1wb3rk8krcys33g4f0kka")
- (15 "1w40vzadzx019v0zhs4q6yqycrk04x1k8xs6qb73vk7ny4p6jdqv")
- (16 "0krqqljz4bkp9wrdnwfx51bxkb8rkwf8ivc93as1znx5fr7i96c8")))
+ (1 "02iibpd3jq8p1bhdzgik8ps6gi1145vr463a82gj1hivjbp2ybzl")
+ (2 "1f6p1z85qh1lavdp3xikgp0bfv0vqhvgpgwmdzlywl35hwdmxk25")
+ (3 "1zxsi869jd90hksx3nyypgyqwrxhw2ws3r6hmk76yc1lsgdhq2ba")
+ (4 "04i5liw5cg6dqkdxfgazqc2jrw40bmclx3dx45bwy259pcj7g0iq")
+ (5 "0mykflv9qnbx3jz71l4f7isadiw9knm4qimqkwsv9cv88dafpq7c")
+ (6 "13265akl8w6zyrg0l7f0x6arjgqjhllcwl6lk46rl53x4mm5dq6i")
+ (7 "146lrwkn5wgxzs6vx34wl47g69zsxdy032k40qzi626b47ya6015")
+ (8 "1s5i8hcayrv25lc8fxcr431v634yx5sii53b8fmip789s0pxjjvb")
+ (9 "1kfk25151ka9wkmk1myf12irgcmvhsd8b0nfifvhrszah9w82npr")
+ (10 "1kf1jrwm30js0v3d1r2rk4x09s1pyjp70wnd1qqhf9bmkw15ww67")
+ (11 "1x5nkvbj6hci7gx42q7qa72hg2a9wwxh85dk79gn521ypwjmy6w3")
+ (12 "0b6lcwzm7v5bzjiwaz2c8n5aj77w8ckhp2vwk4v3zsdq3z70gc9g")
+ (13 "1rkwpibd6j2ghppfhqsva2jm4kdni6b7jpdsxdps52643gc4yjq9")
+ (14 "09766vqqw4ffnmysm725v35qkhp1g9j4qgqag941xvq655pj9y9y")
+ (15 "12im449abnq5gaqjmdxr5i38kmp02fa8l8wffad3jryvd58r0wzg")
+ (16 "05arb0hzmng03cr357lf6p8af0x2a1pznsd3psll03nibfy56n0m")
+ (17 "129cvx4gfz8n23iw1lhbknbw86fyw6vh60jqj1wj3d5pr75wwj0w")
+ (18 "105am94qxjc27gga4a8asvsi01090xwjfim3s16lafwjvm4xsha6")
+ (19 "10njgv5mrc5rhsp5lvxcbm0pnzn59a8spi2nhdasifyl1a32cp1j")
+ (20 "07f0wlmqjdfarp44w3gj9gdqbqm5x20rvlhpn34ngklmxcm2bz5n")
+ (21 "1kahfqqalcwi4m73pg3ssz6lh0kcqsqax09myac7a15d2y0vhd43")
+ (22 "0w74aym0g1fh48864a3qxh89f26iaq7wsbg7244c6kjr94527dbq")
+ (23 "1lywjqbc36j5pdzfcvnz1zy30j76aqmsm190p888av0hw815b45g")
+ (24 "1hq23djqbr7s9y2324jq9mxr5bwdkmgizn3zgpchbsqp054k85cp")
+ (25 "0x9hc4silzl4d3zw4p43i5dm7w86k50j47f87lracwfgwy3z8f2i")
+ (26 "1b1fhm1dsi67r8ip17s0xvx2qq31fsxc1g9n3r931dd0k9a1zvln")
+ (27 "0fdbhvs9dkf4knncifh98a76q4gylhyvfrffq5p9q3ag5q58jap1")
+ (28 "1hdacd6sssjshmry1sscdnxxfb2r51bvdyghlfjaqgc9l85phhk0")
+ (29 "11wrlb20w6v89b96krg0gwxipwhvrda6rq1y9f972m32gsrsqp0j")
+ (30 "13v9fqgim082dmvkslsr0hs793yzhsij2s91mjswsfhj1qip7zy3")
+ (31 "15d7rddj6spwc1fy997lxx6zvzq0zbxgf2h20mhi4wgp5nzbglf2")
+ (32 "05ia6yf32hjprmyyxqawhgckxs3684ikfx8xg08zfgx9xkd7g73v")
+ (33 "1qm2aad9mf2xah6xwchga7s5pk3v308mrv9lgh50d65d236ccgh1")
+ (34 "0bi38dhkkwpm2qrzp8zpykglq6gibvv2n9f8m59gwj406cxvp7w9")
+ (35 "1r8k34y82v02yfkgws17j7i53ybb74dqnwl2jjiv0av9z93hl6l2")
+ (36 "0mwhr9hfbh2czf8klbxg6nbd2g9xl9kygvgk061vird56r4kzj8m")
+ (37 "156sbi3srzkyxajkmhb7iigq0j4nvwnpsbw88xdsxn95a4xiqb4a")))
(define (download-patches store count)
"Download COUNT Bash patches into store. Return a list of
@@ -132,7 +153,7 @@ number/base32-hash tuples, directly usable in the
'patch-series' form."
" -Wl,-rpath -Wl,"
(assoc-ref %build-inputs "ncurses")
"/lib")))
- (version "5.1"))
+ (version "5.2"))
(package
(name "bash")
(source (origin
@@ -141,11 +162,11 @@ number/base32-hash tuples, directly usable in the
'patch-series' form."
"mirror://gnu/bash/bash-" version ".tar.gz"))
(sha256
(base32
- "1alv68wplnfdm6mh39hm57060xgssb9vqca4yr1cyva0c342n0fc"))
+ "1yrjmf0mqg2q8pqphjlark0mcmgf88b0acq7bqf4gx3zvxkc2fd1"))
(patch-flags '("-p0"))
(patches (cons (search-patch "bash-linux-pgrp-pipe.patch")
- %patch-series-5.1))))
- (version (string-append version "." (number->string (length
%patch-series-5.1))))
+ %patch-series-5.2))))
+ (version (string-append version "." (number->string (length
%patch-series-5.2))))
(build-system gnu-build-system)
(outputs '("out"
diff --git a/gnu/packages/patches/bash-linux-pgrp-pipe.patch
b/gnu/packages/patches/bash-linux-pgrp-pipe.patch
index 234a55e897..aeaed65be7 100644
--- a/gnu/packages/patches/bash-linux-pgrp-pipe.patch
+++ b/gnu/packages/patches/bash-linux-pgrp-pipe.patch
@@ -3,7 +3,7 @@ the kernel version in use on the build machine.
--- configure.ac.orig 2019-01-02 09:38:44.000000000 -0500
+++ configure.ac 2019-08-15 16:40:24.271758379 -0400
-@@ -1108,10 +1108,7 @@
+@@ -1171,10 +1171,7 @@
solaris2*) LOCAL_CFLAGS=-DSOLARIS ;;
lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
@@ -17,16 +17,17 @@ the kernel version in use on the build machine.
*qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s"
LOCAL_LIBS="-lunix -lncurses" ;;
--- configure.orig 2019-01-02 09:43:04.000000000 -0500
+++ configure 2019-08-15 16:41:44.440155912 -0400
-@@ -16312,11 +16312,7 @@
+@@ -21723,12 +21723,8 @@
solaris2*) LOCAL_CFLAGS=-DSOLARIS ;;
lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;;
linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading
- case "`uname -r`" in
- 1.*|2.[0123]*) : ;;
-- *) $as_echo "#define PGRP_PIPE 1" >>confdefs.h
+- *) printf "%s\n" "#define PGRP_PIPE 1" >>confdefs.h
- ;;
- esac ;;
-+ $as_echo "#define PGRP_PIPE 1" >>confdefs.h ;;
++ printf "%s\n" "#define PGRP_PIPE 1" >>confdefs.h ;;
netbsd*|openbsd*) LOCAL_CFLAGS="-DDEV_FD_STAT_BROKEN" ;;
+ freebsd*|midnightbsd*) LOCAL_CFLAGS='-DHEREDOC_PIPESIZE=4096' ;;
*qnx[67]*) LOCAL_LIBS="-lncurses" ;;
*qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s"
LOCAL_LIBS="-lunix -lncurses" ;;
