6 changed files with 104 additions and 164 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/kdump-anaconda-addon-9603258.tar.gz
+SOURCES/kdump-anaconda-addon-ffd365e.tar.gz
--- a/.kdump-anaconda-addon.metadata
+++ b/.kdump-anaconda-addon.metadata
@ -1 +1 @@
-d0e113dcab835701658bd08d5702d463e51f0256 SOURCES/kdump-anaconda-addon-9603258.tar.gz
+683f2874ba7eecb5208b86fa2253caadf3215a6e SOURCES/kdump-anaconda-addon-ffd365e.tar.gz
--- a/SOURCES/0001-Updated-Russian-translation.patch
+++ b/SOURCES/0001-Updated-Russian-translation.patch
@ -0,0 +1,72 @@
+From da5245e29819d3c5bf9b995d6c16eb49749b1004 Mon Sep 17 00:00:00 2001
+From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
+Date: Mon, 8 Jul 2024 10:52:10 +0300
+Subject: [PATCH] Updated Russian translation
+
+---
+ po/ru.po | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/po/ru.po b/po/ru.po
+index c3a7721..bd4e203 100644
+--- a/po/ru.po
+++ b/po/ru.po
+@@ -28,6 +28,11 @@ msgid ""
+ "installation finished. For more details see the \"Notes on encrypted dump "
+ "target\" section in /usr/share/doc/kexec-tools/kexec-kdump-howto.txt."
+ msgstr ""
+"Используется зашифрованное хранилище, использование зашифрованного устройства "
+"в качестве цели дампа для kdump может не работать. Пожалуйста, проверьте, "
+"правильно ли работает kdump после завершения установки. Более подробную информацию "
+"смотрите в разделе \"Примечания о зашифрованном целевом дампе\" "
+"в /usr/share/doc/kexec-tools/kexec-kdump-howto.txt ."
+ 
+ #: ../com_redhat_kdump/ks/kdump.py:143
+ #, python-format
+@@ -46,12 +51,12 @@ msgstr "Kdump отключен"
+ #: ../com_redhat_kdump/gui/spokes/kdump.py:182
+ #: ../com_redhat_kdump/tui/spokes/kdump.py:92
+ msgid "Checking storage..."
+-msgstr ""
+msgstr "Проверка хранилища..."
+ 
+ #: ../com_redhat_kdump/gui/spokes/kdump.py:184
+ #: ../com_redhat_kdump/tui/spokes/kdump.py:94
+ msgid "Kdump may require extra setup for encrypted devices."
+-msgstr ""
+msgstr "Для зашифрованных устройств может потребоваться дополнительная настройка Kdump."
+ 
+ #: ../com_redhat_kdump/gui/spokes/kdump.py:185
+ #: ../com_redhat_kdump/tui/spokes/kdump.py:95
+@@ -65,7 +70,7 @@ msgstr "Kdump"
+ #: ../com_redhat_kdump/tui/spokes/kdump.py:117
+ #, fuzzy
+ msgid "Enable kdump"
+-msgstr "_Включить kdump"
+msgstr "Включить kdump"
+ 
+ #: ../com_redhat_kdump/tui/spokes/kdump.py:125
+ #, fuzzy
+@@ -75,7 +80,7 @@ msgstr "_Включить режим fadump"
+ #: ../com_redhat_kdump/tui/spokes/kdump.py:130
+ #, python-format
+ msgid "Reserve amount (%d - %d MB)"
+-msgstr ""
+msgstr "Резервная сумма (%d - %d MB)"
+ 
+ #: tmp/kdump.glade.h:1
+ msgid "KDUMP"
+@@ -119,8 +124,8 @@ msgstr "Будет зарезервировано (МБ):"
+ 
+ #: tmp/kdump.glade.h:9
+ msgid "Total System Memory (MB):"
+-msgstr "_Всего памяти (МБ):"
+msgstr "Всего памяти (МБ):"
+ 
+ #: tmp/kdump.glade.h:10
+ msgid "Usable System Memory (MB):"
+-msgstr "_Доступно памяти (МБ):"
+msgstr "Доступно памяти (МБ):"
+-- 
+2.39.3
+
--- a/SOURCES/0001.patch
+++ b/SOURCES/0001.patch
@ -1,29 +0,0 @@
-From aa335261b2c4771442d82ee1622f189603d4a43d Mon Sep 17 00:00:00 2001
-From: Kairui Song <kasong@redhat.com>
-Date: Wed, 2 Jun 2021 16:44:08 +0800
-Subject: [PATCH 1/2] Make kdump options visible by default
-
-Currently this addon is completely hidden unless kdump_addon=on
-is set, make it visible by default. Kdump is still disabled by default,
-just show the kdump tab.
-
-Signed-off-by: Kairui Song <kasong@redhat.com>
---
- com_redhat_kdump/service/initialization.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/com_redhat_kdump/service/initialization.py b/com_redhat_kdump/service/initialization.py
-index 2bdbe6e..0e247df 100644
--- a/com_redhat_kdump/service/initialization.py
-+++ b/com_redhat_kdump/service/initialization.py
-@@ -27,6 +27,6 @@ __all__ = ["check_initial_conditions"]
- 
- def check_initial_conditions():
-     """Can the Kdump service run?"""
-    if not kernel_arguments.is_enabled("kdump_addon"):
-+    if kernel_arguments.get("kdump_addon", 1) in ["0", "off", False]:
-         log.debug("The kdump add-on is disabled. Quit.")
-         sys.exit(1)
-- 
-2.31.1
-
--- a/SOURCES/0002.patch
+++ b/SOURCES/0002.patch
@ -1,60 +0,0 @@
-From fd7b5edbb777d216ba9f94e5023f793fb01583cd Mon Sep 17 00:00:00 2001
-From: Kairui Song <kasong@redhat.com>
-Date: Wed, 21 Jul 2021 02:06:36 +0800
-Subject: [PATCH 2/2] Enable kdump by default
-
-Signed-off-by: Kairui Song <kasong@redhat.com>
---
- com_redhat_kdump/service/kdump.py     | 2 +-
- com_redhat_kdump/service/kickstart.py | 2 +-
- test/unit_tests/test_kickstart.py      | 4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/com_redhat_kdump/service/kdump.py b/com_redhat_kdump/service/kdump.py
-index 46e7242..4f4cdd1 100755
--- a/com_redhat_kdump/service/kdump.py
-+++ b/com_redhat_kdump/service/kdump.py
-@@ -41,7 +41,7 @@ class KdumpService(KickstartService):
-     def __init__(self):
-         """Create a service."""
-         super().__init__()
-        self._kdump_enabled = False
-+        self._kdump_enabled = True
-         self.kdump_enabled_changed = Signal()
- 
-         self._fadump_enabled = False
-diff --git a/com_redhat_kdump/service/kickstart.py b/com_redhat_kdump/service/kickstart.py
-index c2455a4..32c532f 100644
--- a/com_redhat_kdump/service/kickstart.py
-+++ b/com_redhat_kdump/service/kickstart.py
-@@ -36,7 +36,7 @@ class KdumpKickstartData(AddonData):
- 
-     def __init__(self):
-         super().__init__()
-        self.enabled = False
-+        self.enabled = True
-         self.reserve_mb = "auto"
-         self.enablefadump = False
- 
-diff --git a/test/unit_tests/test_kickstart.py b/test/unit_tests/test_kickstart.py
-index 49d73d2..f833504 100644
--- a/test/unit_tests/test_kickstart.py
-+++ b/test/unit_tests/test_kickstart.py
-@@ -26,12 +26,12 @@ class KdumpKickstartTestCase(TestCase):
-         self.assertEqual(output.strip(), dedent(ks_out).strip())
- 
-     def test_ks_default(self):
-        self.assertEqual(self._service.kdump_enabled, False)
-+        self.assertEqual(self._service.kdump_enabled, True)
-         self.assertEqual(self._service.fadump_enabled, False)
-         self.assertEqual(self._service.reserved_memory, "auto")
- 
-         self._check_ks_output("""
-        %addon com_redhat_kdump --disable
-+        %addon com_redhat_kdump --enable --reserve-mb='auto'
- 
-         %end
-         """)
-- 
-2.31.1
-
--- a/SPECS/kdump-anaconda-addon.spec
+++ b/SPECS/kdump-anaconda-addon.spec
@ -1,26 +1,24 @@
-%global gitcommit 960325885aa3b2b2b0af8343951ea86dcacec27a
+%global gitcommit ffd365e8b1885b6f7dd285685f3b94ac0bc83e52
 %global gitshortcommit %(c=%{gitcommit}; echo ${c:0:7})
-%global snapshotdate 20220128
+%global snapshotdate 20220519

 Name: kdump-anaconda-addon
-Version: 006
-Release: 13.%{snapshotdate}git%{gitshortcommit}%{?dist}
+Version: 003
+Release: 8.%{snapshotdate}git%{gitshortcommit}%{?dist}.inferit.1
 Url: https://github.com/daveyoung/kdump-anaconda-addon
 License: GPLv2
 Summary: Kdump configuration anaconda addon

 BuildArch: noarch
-Requires: anaconda >= 34.25
+Requires: anaconda >= 32.18
 Requires: hicolor-icon-theme
 BuildRequires: intltool gettext
-BuildRequires: make
-Obsoletes: kexec-tools-anaconda-addon < 2.0.17-9
+Obsoletes: kexec-tools-anaconda-addon < 2.0.17-12
 Provides: kexec-tools-anaconda-addon = %{version}-%{release}

 Source0: https://github.com/daveyoung/kdump-anaconda-addon/archive/%{gitcommit}/kdump-anaconda-addon-%{gitshortcommit}.tar.gz
-
-Patch1: 0001.patch
-Patch2: 0002.patch
+# MSVSphere
+Patch100: 0001-Updated-Russian-translation.patch

 %description
 Kdump anaconda addon
@ -39,80 +37,39 @@ Kdump anaconda addon
 %doc README
 %license LICENSE
 %{_datadir}/anaconda/addons/com_redhat_kdump
-%{_datadir}/anaconda/dbus/confs/org.fedoraproject.Anaconda.Addons.Kdump.conf
-%{_datadir}/anaconda/dbus/services/org.fedoraproject.Anaconda.Addons.Kdump.service
 %{_datadir}/icons/hicolor/scalable/apps/kdump.svg

 %changelog
-* Thu Jan 20 2022 Coiby <coxu@redhat.com> - 006-1.20220128git9603258
- Update to latest git snapshot (20220128). Resolves: bz2046612
-
-* Thu Jan 20 2022 Coiby <coxu@redhat.com> - 006-1.20220120git44fe737
- Update to latest git snapshot (20220120). Resolves: bz2003131
-
-* Thu Jan 13 2022 Coiby <coxu@redhat.com> - 006-1.20220113git4c5a91d
- Update to latest git snapshot (20220113). Resolves: bz2034491
-
-* Thu Oct 14 2021 Kairui Song <kasong@redhat.com> - 006-10.20211014git641a7b7
- Update to latest git snapshot, update encryption warning message. Resolves: bz1999662
-
-* Thu Aug 19 2021 Kairui Song <kasong@redhat.com> - 006-9.20210819git2026d20
- Update to latest git snapshot, fix encryption warning still present after disabling encryption. Resolves: bz1937035
-
-* Wed Aug 18 2021 Kairui Song <kasong@redhat.com> - 006-8.20210818git400359b
- Update to latest git snapshot, fix installation failure when reuse old partition. Resolves: bz1937035
-
-* Thu Aug 12 2021 Kairui Song <kasong@redhat.com> - 006-7.20210812git5b74c1d
- Update to latest git snapshot, fix kdump spoke is incomplete after luks device is deleted. Resolves: bz1937035
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 006-6.20210805gitce26db0
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Thu Aug 05 2021 Kairui Song <kasong@redhat.com> - 006-5.20210805gitce26db0
- Update to latest git snapshot, automated installation won't be blocked. Resolves: bz1986969
- Update RHEL only patch, fix inst.kdump_addon=0 not working issue. Resolves: bz1986942
-
-* Wed Jul 21 2021 Kairui Song <kasong@redhat.com> - 006-4.20210721gitd046d22
- Update to latest git snapshot (20210721). Resolves: bz1937035, bz1959203
- Apply RHEL only patch to enable kdump by default
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 006-3.20201128git4ba507e
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 006-2.20201128git4ba507e
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Sat Nov 28 2020 Kairui Song <kasong@redhat.com> - 006-1.20201128git4ba507e
- Update to latest git snapshot (20201128)
+* Mon Jul 08 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 003-8.20220519gitffd365e.inferit.1
+- Updated Russian translation

-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 005-9.20200220git80aab11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+* Fri Aug 04 2023 Sergey Cherevko <s.cherevko@msvsphere.ru> - 003-8.20220519gitffd365e.inferit
+- Updated Russian translation
+- Rebuilt for MSVSphere 8.8

-* Thu Feb 20 2020 Kairui Song <kasong@redhat.com> - 005-8.20200220git80aab11
- Update to latest git snapshot (20200220)
+* Wed Jul 26 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 003-8.20220519gitffd365e
+- Rebuilt for MSVSphere 8.8

-* Tue Jan 14 2020 Kairui Song <kasong@redhat.com> - 005-7.20200114git122ccd9
- Update to latest git snapshot (20200114)
+* Thu May 19 2022 Coiby Xu <coxu@redhat.com> - 003-8.20220519gitffd365e
+- return False instead of None for the mandatory property

-* Wed Aug 7 2019 Kairui Song <kasong@redhat.com> - 005-6.20190730gitc109552
- Update to latest git snapshot (20190723)
+* Thu Oct 21 2021 Kairui Song <kasong@redhat.com> - 003-7.20211021gitcb5edde
+- Warn the user when encrypted storage is in-use

-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 005-5.20190103gitb16ea2c
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+* Thu Feb 04 2021 Kairui Song <kasong@redhat.com> - 003-6.20210204git43c39c1
+- Set default crashkernel value to 'auto'

-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 005-4.20190103gitb16ea2c
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Mon Aug 10 2020 Kairui Song <kasong@redhat.com> - 003-5.20200810git0202fa1
+- Update kdump icon

-* Thu Jan 3 2019 Kairui Song <kasong@redhat.com> - 005-3.20190103gitb16ea2c
- Update to latest git snapshot (20190103)
+* Fri Jul 10 2020 Kairui Song <kasong@redhat.com> - 003-4.20200526gita0c4527
+- Fix CI gating

-* Tue Aug 7 2018 Kairui Song <kasong@redhat.com> - 005-2.20180730git966223e
- Bump obsoleted kexec-tools-anaconda-addon version
- Remove redundant source files
+* Tue May 26 2020 Kairui Song <kasong@redhat.com> - 003-3.20200526gita0c4527
+- Rebase to latest upstream

-* Tue Aug 7 2018 Kairui Song <kasong@redhat.com> - 005-1.20180730git966223e
- Update to latest git snapshot (20180730)
+* Wed Nov 07 2018 Kairui Song <kasong@redhat.com> - 003-2.20181107git443d7ed
+- Define help_id for Kdump spokes (#1637546)

-* Mon Jul 9 2018 Kairui Song <kasong@redhat.com> - 005-1.20180626git8b243e3
+* Wed Aug 29 2018 Kairui Song <kasong@redhat.com> - 003-1.20180730git06ad891
 - Initial package for kdump-anaconda-addon