From 8b769b0b1b8e44194161a24d5395956048ea55db Mon Sep 17 00:00:00 2001
From: Gerd Hoffmann <kraxel@redhat.com>
Date: Tue, 20 Jun 2023 09:16:12 +0200
Subject: [PATCH] update to version 23.6

---
 .gitignore                        |  1 +
 0001-setup.cfg-drop-peutils.patch | 16 ++++++++--------
 python-virt-firmware.spec         |  4 +++-
 sources                           |  2 +-
 tests/tests.yml                   |  2 ++
 5 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index d693dac..4a995df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ virt-firmware-v1.2.tar.gz
 virt-firmware-v1.6.tar.gz
 /virt-firmware-23.4.tar.gz
 /virt-firmware-23.5.tar.gz
+/virt-firmware-23.6.tar.gz
diff --git a/0001-setup.cfg-drop-peutils.patch b/0001-setup.cfg-drop-peutils.patch
index 73bfde2..0b91cf5 100644
--- a/0001-setup.cfg-drop-peutils.patch
+++ b/0001-setup.cfg-drop-peutils.patch
@@ -1,10 +1,10 @@
-diff -up virt-firmware-23.4/setup.cfg.orig virt-firmware-23.4/setup.cfg
---- virt-firmware-23.4/setup.cfg.orig	2023-04-14 09:50:34.055045800 +0200
-+++ virt-firmware-23.4/setup.cfg	2023-04-14 14:00:36.986635224 +0200
-@@ -17,11 +17,9 @@ packages =
- 	virt/firmware
+diff -up virt-firmware-23.6/setup.cfg.orig virt-firmware-23.6/setup.cfg
+--- virt-firmware-23.6/setup.cfg.orig	2023-06-19 12:47:34.613739300 +0200
++++ virt-firmware-23.6/setup.cfg	2023-06-20 09:10:30.911414916 +0200
+@@ -18,11 +18,9 @@ packages =
  	virt/firmware/efi
  	virt/firmware/varstore
+ 	virt/firmware/bootcfg
 -	virt/peutils
  install_requires = 
  	setuptools
@@ -13,10 +13,10 @@ diff -up virt-firmware-23.4/setup.cfg.orig virt-firmware-23.4/setup.cfg
  
  [options.entry_points]
  console_scripts = 
-@@ -30,9 +28,6 @@ console_scripts =
- 	virt-fw-dump = virt.firmware.dump:main
- 	virt-fw-sigdb = virt.firmware.sigdb:main
+@@ -33,9 +31,6 @@ console_scripts =
  	migrate-vars = virt.firmware.migrate:main
+ 	kernel-bootcfg = virt.firmware.bootcfg.main:main
+ 	uefi-boot-menu = virt.firmware.bootcfg.menu:main
 -	pe-dumpinfo = virt.peutils.peutils:pe_dumpinfo
 -	pe-listsigs = virt.peutils.peutils:pe_listsigs
 -	pe-addsigs = virt.peutils.peutils:pe_addsigs
diff --git a/python-virt-firmware.spec b/python-virt-firmware.spec
index 717b1b0..6b11de4 100644
--- a/python-virt-firmware.spec
+++ b/python-virt-firmware.spec
@@ -1,4 +1,4 @@
-%global pypi_version 23.5
+%global pypi_version 23.6
 
 Name:           python-virt-firmware
 Version:        %{pypi_version}
@@ -65,6 +65,8 @@ cp -ar tests %{buildroot}%{_datadir}/%{name}
 %{_bindir}/virt-fw-dump
 %{_bindir}/virt-fw-vars
 %{_bindir}/virt-fw-sigdb
+%{_bindir}/kernel-bootcfg
+%{_bindir}/uefi-boot-menu
 %{_bindir}/migrate-vars
 %{_mandir}/man1/virt-*.1*
 %{python3_sitelib}/virt/firmware
diff --git a/sources b/sources
index 67b9ce4..4cadca4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (virt-firmware-23.5.tar.gz) = c86d1148a5c34418045b04cc728f33fcf542d2d39ee7d6f8f0932fb8021859ecb5f2fe44803a657d0ae69865c3f67823dadb9dfb52038bcf9378cde7128ee475
+SHA512 (virt-firmware-23.6.tar.gz) = 4441918b26d9ca999a3717f6636718ece26d0f46bd715be2788b65d2e08af3d49614a8fbea7920eb370e046d8f241959751be892623ecf7a16adbd5133952bce
diff --git a/tests/tests.yml b/tests/tests.yml
index 66821d9..11cf62b 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -10,5 +10,7 @@
         run: /usr/share/python-virt-firmware/tests/test-vars.sh
     - virt-fw-sigdb:
         run: /usr/share/python-virt-firmware/tests/test-sigdb.sh
+    - kernel-bootcfg:
+        run: /usr/share/python-virt-firmware/tests/test-bootcfg.sh
     - python-unittest:
         run: python3 /usr/share/python-virt-firmware/tests/tests.py