xen: 4.19.1 -> 4.20.0 (#373294)

Author: emilazy

nixos/modules/virtualisation/xen-boot-builder.sh

@@ -1,6 +1,8 @@
 # This script is called by ./xen-dom0.nix to create the Xen boot entries.
 # shellcheck shell=bash
 
+export LC_ALL=C
+
 # Handle input argument and exit if the flag is invalid. See virtualisation.xen.efi.bootBuilderVerbosity below.
 [[ $# -ne 1 ]] && echo -e "\e[1;31merror:\e[0m xenBootBuilder must be called with exactly one verbosity argument. See the \e[1;34mvirtualisation.xen.efi.bootBuilderVerbosity\e[0m option." && exit 1
 case "$1" in
@@ -89,7 +91,8 @@ EOF
         # https://xenbits.xenproject.org/docs/unstable/misc/efi.html.
         [ "$1" = "debug" ] && echo -e "\e[1;34mxenBootBuilder:\e[0m making Xen UKI..."
         xenEfi=$(jq -re '."org.xenproject.bootspec.v1".xen' "$bootspecFile")
-        padding=$(objdump --header --section=".pad" "$xenEfi" | awk '/\.pad/ { printf("0x%016x\n", strtonum("0x"$3) + strtonum("0x"$4))};')
+        finalSection=$(objdump --header --wide "$xenEfi" | tail -n +6 | sort --key="4,4" | tail -n 1 | grep -Eo '\.[a-z]*')
+        padding=$(objdump --header --section="$finalSection" "$xenEfi" | awk -v section="$finalSection" '$0 ~ section { printf("0x%016x\n", and(strtonum("0x"$3) + strtonum("0x"$4) + 0xfff, compl(0xfff)))};')
         [ "$1" = "debug" ] && echo "               - padding: $padding"
         objcopy \
             --add-section .config="$tmpCfg" \

pkgs/by-name/xe/xen/README.md

@@ -6,45 +6,37 @@
 
 buildXenPackage.override { inherit python3Packages; } {
   pname = "xen";
-  version = "4.19.1";
+  version = "4.20.0";
   patches = [
     (fetchpatch {
-      url = "https://lore.kernel.org/xen-devel/e2caa6648a0b6c429349a9826d8fbc4338222482.1733766758.git.andrii.sultanov@cloud.com/raw";
-      hash = "sha256-JC1ueXuC1Jdi2gtUsjOHmTeEx56zjotMMLde5vBonxc=";
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.20-01.patch";
+      hash = "sha256-go743oBhYDuxsK0Xc6nK/WxutQQwc2ERtLKhCU9Dnng=";
     })
     (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa467.patch";
-      hash = "sha256-O2IwfRo6BnXAO04xjKmOyrV6J6Q1mAVLHWNCxqIEQGU=";
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.20-02.patch";
+      hash = "sha256-FTtEGAPFYxsun38hLhVMKJ1TFJOsTMK3WWPkO0R/OHg=sha256-FTtEGAPFYxsun38hLhVMKJ1TFJOsTMK3WWPkO0R/OHg=";
     })
     (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-01.patch";
-      hash = "sha256-YUcp9QI49RM/7WCxYzpzppv+vKtyl/NvLy6rIX5hVMw=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-02.patch";
-      hash = "sha256-FTtEGAPFYxsun38hLhVMKJ1TFJOsTMK3WWPkO0R/OHg=";
-    })
-    (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-03.patch";
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.20-03.patch";
       hash = "sha256-UkYMSpUgFvr4GJPXLgQsCyppGkNbeiFMyCZORK5tfmA=";
     })
     (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-04.patch";
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.20-04.patch";
       hash = "sha256-lpiDPSHi+v2VfaWE9kp4+hveZKTzojD1F+RHsOtKE3A=";
     })
     (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-05.patch";
-      hash = "sha256-EKo9a5STX0mTRopoThe3+6gCWat+3XbguLr9QgMheZs=";
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.20-05.patch";
+      hash = "sha256-N+WR8S5w9dLISlOhMI71TOH8jvCgVAR8xm310k3ZA/M=";
     })
     (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-06.patch";
-      hash = "sha256-HU+4apyTZNIFZ9cySOEtNh0JBJDG3LjDLwMvQYq0src=";
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.20-06.patch";
+      hash = "sha256-ePuyB3VP9NfQbW36BP3jjMMHKJWFJGeTYUYZqy+IlHQ=";
     })
     (fetchpatch {
-      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.19-07.patch";
-      hash = "sha256-9S85nkQ9Nn0cMzyRe4KGrFUaLggVxXBeKhoFF4R0y78=";
+      url = "https://xenbits.xenproject.org/xsa/xsa469/xsa469-4.20-07.patch";
+      hash = "sha256-+BsCJa01R2lrbu7tEluGrYSAqu2jJcrpFNUoLMY466c=";
     })
   ];
-  rev = "ccf400846780289ae779c62ef0c94757ff43bb60";
-  hash = "sha256-s0eCBCd6ybl+kLtXCC6E1sk++w7txXn/B/Cg5acQFfY=";
+  rev = "3ad5d648cda5add395f49fc3704b2552aae734f7";
+  hash = "sha256-v2DRJv+1bym8zAgU74lo1HQ/9rUcyK3qc4Eec4RpcEY=";
 }