fix(tdnf): include epoch in Evr field of JSON transaction output

SPECS/tdnf/tdnf-json-evr-epoch.patch

@@ -0,0 +1,33 @@
+From 45a5dd8fdb5c83cd7bb32c7e0f1b038be23d84d7 Mon Sep 17 00:00:00 2001
+From: Oliver Kurth <oliver.kurth@broadcom.com>
+Date: Fri, 4 Sep 2026 23:24:32 +0000
+Subject: [PATCH] fix: include epoch in Evr field of JSON transaction output
+
+JDPkgList() built the "Evr" field from pszVersion-pszRelease only,
+dropping the epoch for packages that have one non-zero. Other JSON
+output call sites already use the pre-populated pszEVR field, which
+includes epoch, so switch to that for consistency.
+
+Fixes vmware/tdnf#602
+
+Signed-off-by: Oliver Kurth <oliver.kurth@broadcom.com>
+---
+ tools/cli/lib/installcmd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/cli/lib/installcmd.c b/tools/cli/lib/installcmd.c
+index c2f30e4..45d875d 100644
+--- a/tools/cli/lib/installcmd.c
++++ b/tools/cli/lib/installcmd.c
+@@ -391,7 +391,7 @@ JDPkgList(
+
+         CHECK_JD_RC(jd_map_add_string(jd_pkg, "Name", pPkgInfo->pszName));
+         CHECK_JD_RC(jd_map_add_string(jd_pkg, "Arch", pPkgInfo->pszArch));
+-        CHECK_JD_RC(jd_map_add_fmt(jd_pkg, "Evr", "%s-%s", pPkgInfo->pszVersion, pPkgInfo->pszRelease));
++        CHECK_JD_RC(jd_map_add_string(jd_pkg, "Evr", pPkgInfo->pszEVR));
+         CHECK_JD_RC(jd_map_add_int(jd_pkg, "InstallSize", pPkgInfo->dwInstallSizeBytes));
+         CHECK_JD_RC(jd_map_add_string(jd_pkg, "Repo", pPkgInfo->pszRepoName));
+
+-- 
+2.45.4
+

SPECS/tdnf/tdnf.spec

@@ -4,7 +4,7 @@
 Summary:        dnf equivalent using C libs
 Name:           tdnf
 Version:        3.5.8
-Release:        8%{?dist}
+Release:        9%{?dist}
 License:        LGPLv2.1 AND GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -34,6 +34,10 @@ Patch7:         tdnf-add-installonlypkgs-config.patch
 Patch8:         tdnf-installonlypkgs.patch
 Patch10:        tdnf-installonly-install-status.patch
 
+# Backport of upstream commit: fix: include epoch in Evr field of JSON transaction output:
+# https://github.com/vmware/tdnf/commit/45a5dd8fdb5c83cd7bb32c7e0f1b038be23d84d7
+Patch11:        tdnf-json-evr-epoch.patch
+
 #Cmake requires binutils
 BuildRequires:  binutils
 BuildRequires:  cmake
@@ -242,6 +246,9 @@ fi
 /%{_lib}/systemd/system/tdnf*
 
 %changelog
+* Wed Sep 09 2026 Vince Perri <viperri@microsoft.com> - 3.5.8-9
+- Include the epoch in the Evr field of JSON transaction output
+
 * Fri Aug 22 2025 Siddharth Chintamaneni <sidchintamaneni@gmail.com> - 3.5.8-8
 - Add kernel-hwe installonlypkgs entry
 

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -215,10 +215,10 @@ lua-5.4.6-1.azl3.aarch64.rpm
 lua-libs-5.4.6-1.azl3.aarch64.rpm
 azurelinux-rpm-macros-3.0-7.azl3.noarch.rpm
 azurelinux-check-macros-3.0-7.azl3.noarch.rpm
-tdnf-3.5.8-8.azl3.aarch64.rpm
-tdnf-cli-libs-3.5.8-8.azl3.aarch64.rpm
-tdnf-devel-3.5.8-8.azl3.aarch64.rpm
-tdnf-plugin-repogpgcheck-3.5.8-8.azl3.aarch64.rpm
+tdnf-3.5.8-9.azl3.aarch64.rpm
+tdnf-cli-libs-3.5.8-9.azl3.aarch64.rpm
+tdnf-devel-3.5.8-9.azl3.aarch64.rpm
+tdnf-plugin-repogpgcheck-3.5.8-9.azl3.aarch64.rpm
 libassuan-2.5.6-1.azl3.aarch64.rpm
 libassuan-devel-2.5.6-1.azl3.aarch64.rpm
 libgpg-error-1.49-1.azl3.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -215,10 +215,10 @@ lua-5.4.6-1.azl3.x86_64.rpm
 lua-libs-5.4.6-1.azl3.x86_64.rpm
 azurelinux-rpm-macros-3.0-7.azl3.noarch.rpm
 azurelinux-check-macros-3.0-7.azl3.noarch.rpm
-tdnf-3.5.8-8.azl3.x86_64.rpm
-tdnf-cli-libs-3.5.8-8.azl3.x86_64.rpm
-tdnf-devel-3.5.8-8.azl3.x86_64.rpm
-tdnf-plugin-repogpgcheck-3.5.8-8.azl3.x86_64.rpm
+tdnf-3.5.8-9.azl3.x86_64.rpm
+tdnf-cli-libs-3.5.8-9.azl3.x86_64.rpm
+tdnf-devel-3.5.8-9.azl3.x86_64.rpm
+tdnf-plugin-repogpgcheck-3.5.8-9.azl3.x86_64.rpm
 libassuan-2.5.6-1.azl3.x86_64.rpm
 libassuan-devel-2.5.6-1.azl3.x86_64.rpm
 libgpg-error-1.49-1.azl3.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -587,14 +587,14 @@ systemd-bootstrap-libs-250.3-20.azl3.aarch64.rpm
 systemd-bootstrap-rpm-macros-250.3-20.azl3.noarch.rpm
 tar-1.35-2.azl3.aarch64.rpm
 tar-debuginfo-1.35-2.azl3.aarch64.rpm
-tdnf-3.5.8-8.azl3.aarch64.rpm
-tdnf-autoupdate-3.5.8-8.azl3.aarch64.rpm
-tdnf-cli-libs-3.5.8-8.azl3.aarch64.rpm
-tdnf-debuginfo-3.5.8-8.azl3.aarch64.rpm
-tdnf-devel-3.5.8-8.azl3.aarch64.rpm
-tdnf-plugin-metalink-3.5.8-8.azl3.aarch64.rpm
-tdnf-plugin-repogpgcheck-3.5.8-8.azl3.aarch64.rpm
-tdnf-python-3.5.8-8.azl3.aarch64.rpm
+tdnf-3.5.8-9.azl3.aarch64.rpm
+tdnf-autoupdate-3.5.8-9.azl3.aarch64.rpm
+tdnf-cli-libs-3.5.8-9.azl3.aarch64.rpm
+tdnf-debuginfo-3.5.8-9.azl3.aarch64.rpm
+tdnf-devel-3.5.8-9.azl3.aarch64.rpm
+tdnf-plugin-metalink-3.5.8-9.azl3.aarch64.rpm
+tdnf-plugin-repogpgcheck-3.5.8-9.azl3.aarch64.rpm
+tdnf-python-3.5.8-9.azl3.aarch64.rpm
 texinfo-7.0.3-1.azl3.aarch64.rpm
 texinfo-debuginfo-7.0.3-1.azl3.aarch64.rpm
 unzip-6.0-22.azl3.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -595,14 +595,14 @@ systemd-bootstrap-libs-250.3-20.azl3.x86_64.rpm
 systemd-bootstrap-rpm-macros-250.3-20.azl3.noarch.rpm
 tar-1.35-2.azl3.x86_64.rpm
 tar-debuginfo-1.35-2.azl3.x86_64.rpm
-tdnf-3.5.8-8.azl3.x86_64.rpm
-tdnf-autoupdate-3.5.8-8.azl3.x86_64.rpm
-tdnf-cli-libs-3.5.8-8.azl3.x86_64.rpm
-tdnf-debuginfo-3.5.8-8.azl3.x86_64.rpm
-tdnf-devel-3.5.8-8.azl3.x86_64.rpm
-tdnf-plugin-metalink-3.5.8-8.azl3.x86_64.rpm
-tdnf-plugin-repogpgcheck-3.5.8-8.azl3.x86_64.rpm
-tdnf-python-3.5.8-8.azl3.x86_64.rpm
+tdnf-3.5.8-9.azl3.x86_64.rpm
+tdnf-autoupdate-3.5.8-9.azl3.x86_64.rpm
+tdnf-cli-libs-3.5.8-9.azl3.x86_64.rpm
+tdnf-debuginfo-3.5.8-9.azl3.x86_64.rpm
+tdnf-devel-3.5.8-9.azl3.x86_64.rpm
+tdnf-plugin-metalink-3.5.8-9.azl3.x86_64.rpm
+tdnf-plugin-repogpgcheck-3.5.8-9.azl3.x86_64.rpm
+tdnf-python-3.5.8-9.azl3.x86_64.rpm
 texinfo-7.0.3-1.azl3.x86_64.rpm
 texinfo-debuginfo-7.0.3-1.azl3.x86_64.rpm
 unzip-6.0-22.azl3.x86_64.rpm