From 6169108d0bbd658e099c8256dd9e34d8d9c8bec1 Mon Sep 17 00:00:00 2001 From: Fernando Rodrigues Date: Sat, 1 Aug 2026 22:20:32 +1000 Subject: [PATCH] xen: 4.20.3 -> 4.20.4 Minor bugfixes. It's mostly a convenience release that rebased all of the XSA patches we were accumulating. Signed-off-by: Fernando Rodrigues (cherry picked from commit 81cb6015ff88949a2059607fe27a6756a0585e9e) --- pkgs/by-name/xe/xen/package.nix | 245 +------------------------------- 1 file changed, 6 insertions(+), 239 deletions(-) diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix index 8fe896762437..6e47fa7230d9 100644 --- a/pkgs/by-name/xe/xen/package.nix +++ b/pkgs/by-name/xe/xen/package.nix @@ -173,7 +173,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "xen"; - version = "4.20.3"; + version = "4.20.4"; # This attribute can be overriden to correct the file paths in # `passthru` when building an unstable Xen. @@ -185,242 +185,9 @@ stdenv.mkDerivation (finalAttrs: { ./0001-makefile-efi-output-directory.patch (replaceVars ./0002-scripts-external-executable-calls.patch scriptDeps) - - # XSA #483 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa483.patch"; - hash = "sha256-pZkSQKAjEIa/EHlCa2hD+3kofzpVHtFxcdp/TiWu9i8="; - }) - - # XSA #484 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa484.patch"; - hash = "sha256-6zkTBHKfpAK2poSycEFSb3pE9pDpZwBxAe5Jf862j+U="; - }) - - # XSA #486 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa486.patch"; - hash = "sha256-8EC1lv2JAYqchX5sHbO3NbP7haEyu1V0/72KwALG+BA="; - }) - - # XSA #488 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa488-4.20.patch"; - hash = "sha256-QttKWdmWC6Zn5k2hd6RIMCpLWv71HB/A9mCbDP+i8to="; - }) - - # XSA #490 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa490-4.21.patch"; - hash = "sha256-PF4zNeaS8aXHBNKLcgjVBUqmREg+nvdyHyLlhX2YBiw="; - }) - - # XSA #491 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa491-4.21.patch"; - hash = "sha256-I21YIcaK1v7BfBJi/aiVACgR3QyN+/gXnB4YMprT4zA="; - }) - - # XSA #492 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-01.patch"; - hash = "sha256-U3nE7jgTKh2HmS9tMVQG+TIGvgU5B1aikC3NSER0CaY="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-02.patch"; - hash = "sha256-Y3k9ICThfnIcu59F2pFDbFWD5DL6siPJmINmC7nT2uY="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-03.patch"; - hash = "sha256-k4nPft59/MQwYKcdrzj5d80+LDhp05e86iJWzabjkQc="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-04.patch"; - hash = "sha256-Mn+8q9zsstXbmrS/rkDdtwWEiD3EGNlmpa+eB1wESA4="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-05.patch"; - hash = "sha256-csf9nf6cz3skhq1ph8HIs2AEVgBkw29hP39zwqy2vwM="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-06.patch"; - hash = "sha256-urY9bjqqzKSGqGqEhDnagLUrzDsKkARMERT7vmukeUU="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-07.patch"; - hash = "sha256-OyUC9bJevxiMuJuyJO9Z3ScXebe7lZM95HkK5YxGino="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-08.patch"; - hash = "sha256-g3zV+r9LKjuMbkl4gprhWqClOgDU/Kbesr39LQiM+Aw="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-09.patch"; - hash = "sha256-Wuc5dqwm+zwlYOzDXpRgyQH584sKwETi+xcE7HASHyI="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-10.patch"; - hash = "sha256-ggln1O+epVOErBSUhIxX7xhwBy808vnQtcae3KYoQdo="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-11.patch"; - hash = "sha256-/Yb1i/ms8MaVsEa/nK84CTFclOKcJoWMjjQJQab7l40="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-12.patch"; - hash = "sha256-IpUeM+t7AZ8IVlzake+PiFAe0FCeFzChy+eaN9MAiSM="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-13.patch"; - hash = "sha256-3vZj9VrDcFtlKrlMy1OD//F+6O252m23jJ0BRShQ6wA="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-14.patch"; - hash = "sha256-LiBavW+FTfXdELs8Fm79KeOvskRqDXytv/e7eYRgSvY="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-15.patch"; - hash = "sha256-0eK2hIFPNDIfv2W0ivkGL8Z3F+NpN4p2X0JVKjeBYWE="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-16.patch"; - hash = "sha256-iEEkPC9mIuSF6Swt3/myUizsc8DubSPEkLkf1zm0/NE="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-17.patch"; - hash = "sha256-YNo1wr+fRKk8+78Jf/zqJ7q9ugbzg7gyiyJ3zU+nB60="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa492/xsa492-4.20-18.patch"; - hash = "sha256-qNWe3iw+bYDtvBZ2KVfcy4VKu/waOyhoKZ0L8bqLdNc="; - }) - - # XSA #493 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa493/xsa493-4.20-01.patch"; - hash = "sha256-SvAj+9CIyedpFENCB/lQTJUB4kpVkGh+z+NNk82lQqM="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa493/xsa493-4.20-02.patch"; - hash = "sha256-4fajBBBKMnMTy7mvFSUghwkRbYo833s3jATeGfiOrjc="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa493/xsa493-4.20-03.patch"; - hash = "sha256-/AI9gtd60UWf89NNd7+Zx1g+KyAIM2wCih/07LN5zt4="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa493/xsa493-4.20-04.patch"; - hash = "sha256-qvXQG9VZkgca/za3bx1zTDkmRz5lFT3JPkbdI1mlBGY="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa493/xsa493-4.20-05.patch"; - hash = "sha256-6pGjjPjalw6TY0n9TInE3nCXNmt6BUxwy1r1xf55U7k="; - }) - - # XSA #494 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa494-4.20.patch"; - hash = "sha256-ns0s++J2adUD/HWuMiYad/g3MITs+twlMnkpFnP7T0w="; - }) - - # XSA #495 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa495-4.20.patch"; - hash = "sha256-SAMu8r0yyPvD3zLCaQL53oNs+ZhV3puKUq4cCofkut8="; - }) - - # XSA #497 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa497.patch"; - hash = "sha256-xftChrVcwMJYgkH22HUlUQXSTPee0ghPRnPVymWJr3o="; - }) - - # XSA #499 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-1.patch"; - hash = "sha256-Xk8+g/mEAtf3HIWqHL2+0iYSihtWy/tohaP6DcLo1+s="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-2.patch"; - hash = "sha256-YiDERwBeOvXtgsKjLbpCoLrfYQ1aw/QnXv9i4lKMrDs="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-3.patch"; - hash = "sha256-wyEc7GW83Vf++J10s/pqJTghXgqQhwUymPjpryuq8Wg="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-4.patch"; - hash = "sha256-bK6VYiMorwGHi25q9tPu5r/YQCMPc6NWBirLAx6oCPg="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-5.patch"; - hash = "sha256-Vj5vcpVvuuExK2NvDBP6vrIRjTPsgx8Yv4zVt0ftUnk="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-6.patch"; - hash = "sha256-uTBGP6WMfE5FipQ7rzOKY7FxCztQUV6jqbROtHZozoY="; - }) - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa499/xsa499-4.20-7.patch"; - hash = "sha256-UsAx2ouUB/BNpCQCObvcjj+DLPuRBqyxlI6QQsPXtWM="; - }) - - # XSA #500 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa500.patch"; - hash = "sha256-cQc/wkaP1wK7dzbdFHmvghK6BcokWrTAtxk0gtIDQ1E="; - }) - - # XSA #501 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa501.patch"; - hash = "sha256-RvdzD/ZCpC7VT0/zzksse/dN5FBl8W/Gul04XQ5EyRg="; - }) - - # XSA #502 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa502-4.21.patch"; - hash = "sha256-hSmNtFwYValGoTwYgoz0uXhQiQV/pZ4rsYRNLAY5Ak8="; - }) - - # XSA #503 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa503.patch"; - hash = "sha256-l64K1LetmngV1V8Vy9fH4dEvUdlAH6ukXwuEMetg83A="; - }) - - # XSA #504 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa504.patch"; - hash = "sha256-uMygMaI824GW0L4obYXfaRIiohiBZpwAvoEO6slOZCE="; - }) - - # XSA #505 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa505.patch"; - hash = "sha256-eZ8CdfzU5Ylyi6BpB4fOJh0VHfHeWa2JsRyhH+sh400="; - }) - - # XSA #506 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa506.patch"; - hash = "sha256-8unTCZE3Kh2JfqDSG5KrgRx9zL9J9pcVzeXnO5vUM0Y="; - }) - - # XSA #507 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa507.patch"; - hash = "sha256-3d5h0evLsFzTAyEDYstvPFcqYLirIZxMWPSY5L868ng="; - }) - - # XSA #508 - (fetchpatch { - url = "https://xenbits.xenproject.org/xsa/xsa508.patch"; - hash = "sha256-KhNGfEsVxlxFbnlO+yeeIj8Eo75NE9QOPmg0xlt8U6U="; - }) - - # patch `libxl` to search for `qemu-system-i386` properly. (Before 4.21) + ] + ++ optionals (versionOlder finalAttrs.version "4.21") [ + # Patch `libxl` to search for `qemu-system-i386` properly. (fetchpatch { url = "https://github.com/xen-project/xen/commit/f6281291704aa356489f4bd927cc7348a920bd01.diff?full_index=1"; hash = "sha256-LH+68kxH/gxdyh45kYCPxKwk+9cztLrScpC2pCNQV2M="; @@ -438,8 +205,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "xen-project"; repo = "xen"; - tag = "RELEASE-4.20.3"; - hash = "sha256-+qTHIsDD2A5lVwmpJ7artnzdviT1XN05CYeu7JFxfqc="; + tag = "RELEASE-${finalAttrs.version}"; + hash = "sha256-dO9Y7W6NIVbXwWdlnQawpmV6MtemczwgbZdi9gGu190="; }; strictDeps = true;