mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-19 15:11:30 +00:00
bash: 5.2.p37 -> 5.3p0
Changes: https://lists.gnu.org/archive/html/bug-bash/2025-06/msg00004.html
This commit is contained in:
@@ -16,10 +16,10 @@
|
||||
}:
|
||||
|
||||
let
|
||||
upstreamPatches = import ./bash-5.2-patches.nix (
|
||||
upstreamPatches = import ./bash-5.3-patches.nix (
|
||||
nr: sha256:
|
||||
fetchurl {
|
||||
url = "mirror://gnu/bash/bash-5.2-patches/bash52-${nr}";
|
||||
url = "mirror://gnu/bash/bash-5.3-patches/bash53-${nr}";
|
||||
inherit sha256;
|
||||
}
|
||||
);
|
||||
@@ -31,12 +31,12 @@ lib.warnIf (withDocs != null)
|
||||
stdenv.mkDerivation
|
||||
rec {
|
||||
pname = "bash${lib.optionalString interactive "-interactive"}";
|
||||
version = "5.2${patch_suffix}";
|
||||
version = "5.3${patch_suffix}";
|
||||
patch_suffix = "p${toString (builtins.length upstreamPatches)}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnu/bash/bash-${lib.removeSuffix patch_suffix version}.tar.gz";
|
||||
sha256 = "sha256-oTnBZt9/9EccXgczBRZC7lVWwcyKSnjxRVg8XIGrMvs=";
|
||||
hash = "sha256-Yt1JxEw5ntGz9/cx6Hp4IzTYNPCOCYo18sh1R9Xbsmk=";
|
||||
};
|
||||
|
||||
hardeningDisable =
|
||||
@@ -75,12 +75,6 @@ lib.warnIf (withDocs != null)
|
||||
|
||||
patches = upstreamPatches ++ [
|
||||
./pgrp-pipe-5.patch
|
||||
# Apply parallel build fix pending upstream inclusion:
|
||||
# https://savannah.gnu.org/patch/index.php?10373
|
||||
# Had to fetch manually to workaround -p0 default.
|
||||
./parallel.patch
|
||||
# Fix `pop_var_context: head of shell_variables not a function context`.
|
||||
./fix-pop-var-context-error.patch
|
||||
];
|
||||
|
||||
configureFlags =
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
# Automatically generated by `update-patch-set.sh'; do not edit.
|
||||
|
||||
patch: [
|
||||
(patch "001" "02iibpd3jq8p1bhdzgik8ps6gi1145vr463a82gj1hivjbp2ybzl")
|
||||
(patch "002" "1f6p1z85qh1lavdp3xikgp0bfv0vqhvgpgwmdzlywl35hwdmxk25")
|
||||
(patch "003" "1zxsi869jd90hksx3nyypgyqwrxhw2ws3r6hmk76yc1lsgdhq2ba")
|
||||
(patch "004" "04i5liw5cg6dqkdxfgazqc2jrw40bmclx3dx45bwy259pcj7g0iq")
|
||||
(patch "005" "0mykflv9qnbx3jz71l4f7isadiw9knm4qimqkwsv9cv88dafpq7c")
|
||||
(patch "006" "13265akl8w6zyrg0l7f0x6arjgqjhllcwl6lk46rl53x4mm5dq6i")
|
||||
(patch "007" "146lrwkn5wgxzs6vx34wl47g69zsxdy032k40qzi626b47ya6015")
|
||||
(patch "008" "1s5i8hcayrv25lc8fxcr431v634yx5sii53b8fmip789s0pxjjvb")
|
||||
(patch "009" "1kfk25151ka9wkmk1myf12irgcmvhsd8b0nfifvhrszah9w82npr")
|
||||
(patch "010" "1kf1jrwm30js0v3d1r2rk4x09s1pyjp70wnd1qqhf9bmkw15ww67")
|
||||
(patch "011" "1x5nkvbj6hci7gx42q7qa72hg2a9wwxh85dk79gn521ypwjmy6w3")
|
||||
(patch "012" "0b6lcwzm7v5bzjiwaz2c8n5aj77w8ckhp2vwk4v3zsdq3z70gc9g")
|
||||
(patch "013" "1rkwpibd6j2ghppfhqsva2jm4kdni6b7jpdsxdps52643gc4yjq9")
|
||||
(patch "014" "09766vqqw4ffnmysm725v35qkhp1g9j4qgqag941xvq655pj9y9y")
|
||||
(patch "015" "12im449abnq5gaqjmdxr5i38kmp02fa8l8wffad3jryvd58r0wzg")
|
||||
(patch "016" "05arb0hzmng03cr357lf6p8af0x2a1pznsd3psll03nibfy56n0m")
|
||||
(patch "017" "129cvx4gfz8n23iw1lhbknbw86fyw6vh60jqj1wj3d5pr75wwj0w")
|
||||
(patch "018" "105am94qxjc27gga4a8asvsi01090xwjfim3s16lafwjvm4xsha6")
|
||||
(patch "019" "10njgv5mrc5rhsp5lvxcbm0pnzn59a8spi2nhdasifyl1a32cp1j")
|
||||
(patch "020" "07f0wlmqjdfarp44w3gj9gdqbqm5x20rvlhpn34ngklmxcm2bz5n")
|
||||
(patch "021" "1kahfqqalcwi4m73pg3ssz6lh0kcqsqax09myac7a15d2y0vhd43")
|
||||
(patch "022" "0w74aym0g1fh48864a3qxh89f26iaq7wsbg7244c6kjr94527dbq")
|
||||
(patch "023" "1lywjqbc36j5pdzfcvnz1zy30j76aqmsm190p888av0hw815b45g")
|
||||
(patch "024" "1hq23djqbr7s9y2324jq9mxr5bwdkmgizn3zgpchbsqp054k85cp")
|
||||
(patch "025" "0x9hc4silzl4d3zw4p43i5dm7w86k50j47f87lracwfgwy3z8f2i")
|
||||
(patch "026" "1b1fhm1dsi67r8ip17s0xvx2qq31fsxc1g9n3r931dd0k9a1zvln")
|
||||
(patch "027" "0fdbhvs9dkf4knncifh98a76q4gylhyvfrffq5p9q3ag5q58jap1")
|
||||
(patch "028" "1hdacd6sssjshmry1sscdnxxfb2r51bvdyghlfjaqgc9l85phhk0")
|
||||
(patch "029" "11wrlb20w6v89b96krg0gwxipwhvrda6rq1y9f972m32gsrsqp0j")
|
||||
(patch "030" "13v9fqgim082dmvkslsr0hs793yzhsij2s91mjswsfhj1qip7zy3")
|
||||
(patch "031" "15d7rddj6spwc1fy997lxx6zvzq0zbxgf2h20mhi4wgp5nzbglf2")
|
||||
(patch "032" "05ia6yf32hjprmyyxqawhgckxs3684ikfx8xg08zfgx9xkd7g73v")
|
||||
(patch "033" "1qm2aad9mf2xah6xwchga7s5pk3v308mrv9lgh50d65d236ccgh1")
|
||||
(patch "034" "0bi38dhkkwpm2qrzp8zpykglq6gibvv2n9f8m59gwj406cxvp7w9")
|
||||
(patch "035" "1r8k34y82v02yfkgws17j7i53ybb74dqnwl2jjiv0av9z93hl6l2")
|
||||
(patch "036" "0mwhr9hfbh2czf8klbxg6nbd2g9xl9kygvgk061vird56r4kzj8m")
|
||||
(patch "037" "156sbi3srzkyxajkmhb7iigq0j4nvwnpsbw88xdsxn95a4xiqb4a")
|
||||
]
|
||||
4
pkgs/shells/bash/bash-5.3-patches.nix
Normal file
4
pkgs/shells/bash/bash-5.3-patches.nix
Normal file
@@ -0,0 +1,4 @@
|
||||
# Automatically generated by `update-patch-set.sh'; do not edit.
|
||||
|
||||
patch: [
|
||||
]
|
||||
@@ -1,17 +0,0 @@
|
||||
Excerpted from <https://git.savannah.gnu.org/cgit/bash.git/commit/?h=devel&id=055a4552c901e43e6a6007f5bc664a33698dbf85>.
|
||||
|
||||
Original author: Chet Ramey <chet.ramey@case.edu>
|
||||
|
||||
--- variables.c
|
||||
+++ variables.c
|
||||
@@ -5413,7 +5413,9 @@ pop_var_context ()
|
||||
vcxt = shell_variables;
|
||||
if (vc_isfuncenv (vcxt) == 0)
|
||||
{
|
||||
- internal_error (_("pop_var_context: head of shell_variables not a function context"));
|
||||
+ /* If we haven't flushed all of the local contexts already, flag an error */
|
||||
+ if (shell_variables != global_variables || variable_context > 0)
|
||||
+ internal_error (_("pop_var_context: head of shell_variables not a function context"));
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
From https://savannah.gnu.org/patch/index.php?10373
|
||||
https://savannah.gnu.org/patch/download.php?file_id=54964
|
||||
--- Makefile.in
|
||||
+++ Makefile.in
|
||||
@@ -1432,6 +1432,7 @@ siglist.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
|
||||
subst.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
|
||||
test.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
|
||||
trap.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
|
||||
+unwind_prot.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
|
||||
variables.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
|
||||
version.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
|
||||
xmalloc.o: bashintl.h ${LIBINTL_H} $(BASHINCDIR)/gettext.h
|
||||
Reference in New Issue
Block a user