From 89a105fb625447409f3c5d99881c7f93ac441228 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Wed, 17 Jan 2024 14:53:45 +0100 Subject: [PATCH 01/19] ci: enable upstream beakerlib tests --- .fmf/version | 1 + plans/public.fmf | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 .fmf/version create mode 100644 plans/public.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans/public.fmf b/plans/public.fmf new file mode 100644 index 0000000..d8892fe --- /dev/null +++ b/plans/public.fmf @@ -0,0 +1,9 @@ +summary: Public (upstream) beakerlib tests + +discover: + - name: fedora + how: fmf + url: https://github.com/fedora-sysv/chkconfig.git + +execute: + how: tmt From 8a4a5b5f3f54756e5ea9187df7a01874cb76c4a6 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Wed, 17 Jan 2024 15:31:27 +0100 Subject: [PATCH 02/19] 1.26 --- .gitignore | 1 + chkconfig.spec | 30 ++++++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b033d08..a820e27 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /chkconfig-1.23.tar.gz /chkconfig-1.24.tar.gz /chkconfig-1.25.tar.gz +/chkconfig-1.26.tar.gz diff --git a/chkconfig.spec b/chkconfig.spec index 952d007..d28466f 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,11 +1,17 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig -Version: 1.25 +Version: 1.26 Release: 1%{?dist} License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: newt-devel gettext popt-devel libselinux-devel beakerlib gcc systemd-devel make + +BuildRequires: gcc gettext libselinux-devel make newt-devel popt-devel systemd-devel +# beakerlib might not be available on CentOS Stream any more +%if 0%{?fedora} +BuildRequires: beakerlib +%endif + Conflicts: initscripts <= 5.30-1 Provides: /sbin/chkconfig @@ -42,8 +48,11 @@ system at the same time. %build %make_build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" +# tests are executed using tmt and tf on CentOS Stream and RHEL +%if 0%{?fedora} %check make check +%endif %install rm -rf $RPM_BUILD_ROOT @@ -88,6 +97,23 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %dir /var/lib/alternatives %changelog +* Wed Jan 17 2024 Jan Macku - 1.26-1 +- fix(test): dot't call `basename` with empty string +- spec: sort BuildRequires alphabetically +- fix(test): remove dangling `rlPhase` fn call +- ci: run tests using Packit and Testing Farm +- build: update `.pot` file +- ci: fix typo in test workflow +- test: add support for running using tmt +- Translated using Weblate (Czech) +- Translated using Weblate (Punjabi) +- build(deps): bump actions/upload-artifact from 3 to 4 +- build(deps): bump github/codeql-action from 2 to 3 +- leveldb: fix systemdActive() +- build(deps): bump redhat-plumbers-in-action/differential-shellcheck +- Translated using Weblate (Hungarian) +- build(deps): bump actions/checkout from 3 to 4 + * Wed Aug 02 2023 Jan Macku - 1.25-1 - alternatives: fix possible buffer overrun - Translated using Weblate (Korean) diff --git a/sources b/sources index eb3f8e2..4cd5cd8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chkconfig-1.25.tar.gz) = 56ab80760da9690e837dc2955daf5031a3d629ce3e00cafba1bf6f888500946078f907b6262860b244cc0de65f8b075bc90bab68d061c2e48273ddf8e20075c6 +SHA512 (chkconfig-1.26.tar.gz) = e4e4ca07c93f571b93290bf010d86ab2f5bc74a2a76e6b18843b24c1212653a6e204eb4657aa0f9b7c738ba23653b456be8cd4393a04a5651ef1669ee95cbe80 From c0cbf24c06162757f8b4cdea9223460ae043625a Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 19 Jan 2024 03:37:19 -0500 Subject: [PATCH 03/19] Fix systemd dependency systemd is used during the build only to get systemunitdir from systemd.pc. That pkgconfig file is now part of systemd, and systemd-devel does not provide that, even indirectly. While beakerlib ends up pulling in systemd, that should not be relied upon, and does not help for RHEL/ELN where beakerlib is now disabled. --- chkconfig.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chkconfig.spec b/chkconfig.spec index d28466f..9e1ad8c 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -6,7 +6,7 @@ License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: gcc gettext libselinux-devel make newt-devel popt-devel systemd-devel +BuildRequires: gcc gettext libselinux-devel make newt-devel popt-devel pkgconfig(systemd) # beakerlib might not be available on CentOS Stream any more %if 0%{?fedora} BuildRequires: beakerlib From edf022b2759b14eff69fcf4bb4c1a57adbb4139e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 15:23:32 +0000 Subject: [PATCH 04/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- chkconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chkconfig.spec b/chkconfig.spec index 9e1ad8c..3a77953 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,7 +1,7 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig Version: 1.26 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -97,6 +97,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %dir /var/lib/alternatives %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jan 17 2024 Jan Macku - 1.26-1 - fix(test): dot't call `basename` with empty string - spec: sort BuildRequires alphabetically From 3897cd3b7c840ccf6473929cbb216e0712bc4646 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 01:33:39 +0000 Subject: [PATCH 05/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- chkconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chkconfig.spec b/chkconfig.spec index 3a77953..1c3238d 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,7 +1,7 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig Version: 1.26 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -97,6 +97,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %dir /var/lib/alternatives %changelog +* Tue Jan 23 2024 Fedora Release Engineering - 1.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.26-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f72cdb0433e0445836950f850b361419aed20090 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Tue, 14 May 2024 12:55:19 +0200 Subject: [PATCH 06/19] 1.27 --- .gitignore | 1 + chkconfig.spec | 35 ++++++++++++++++++++++++++++------- sources | 2 +- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index a820e27..59cd93a 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /chkconfig-1.24.tar.gz /chkconfig-1.25.tar.gz /chkconfig-1.26.tar.gz +/chkconfig-1.27.tar.gz diff --git a/chkconfig.spec b/chkconfig.spec index 1c3238d..053867b 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,7 +1,7 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig -Version: 1.26 -Release: 3%{?dist} +Version: 1.27 +Release: 1%{?dist} License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -97,11 +97,32 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %dir /var/lib/alternatives %changelog -* Tue Jan 23 2024 Fedora Release Engineering - 1.26-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.26-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild +* Tue May 14 2024 Jan Macku - 1.27-1 +- alternatives: properly handle chars with const in normalize_path +- alternatives: use exit in main instead of return for critical failures +- alternatives: fix leak +- alternatives: fix leak +- alternatives: fix possible overrun +- alternatives: fix all the leaks of groups in readConfig +- alternatives: fix all the leaks of read line in readConfig +- alternatives: fix leak +- alternatives: fix memory leak +- alternatives: fix memory leak +- alternatives: initialize parameters in main to NULL +- alternatives: fix memory leak +- Translated using Weblate (Korean) +- Translated using Weblate (English (United Kingdom)) +- Translated using Weblate (Finnish) +- Translated using Weblate (Finnish) +- Translated using Weblate (Japanese) +- Translated using Weblate (Swedish) +- Translated using Weblate (Japanese) +- Translated using Weblate (Polish) +- Translated using Weblate (Korean) +- Translated using Weblate (Georgian) +- Update translation files +- Translated using Weblate (Japanese) +- Fix systemd dependency * Wed Jan 17 2024 Jan Macku - 1.26-1 - fix(test): dot't call `basename` with empty string diff --git a/sources b/sources index 4cd5cd8..738c719 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chkconfig-1.26.tar.gz) = e4e4ca07c93f571b93290bf010d86ab2f5bc74a2a76e6b18843b24c1212653a6e204eb4657aa0f9b7c738ba23653b456be8cd4393a04a5651ef1669ee95cbe80 +SHA512 (chkconfig-1.27.tar.gz) = e88a2bc58c06bba3abab1ed97959b1a3c13f55d6741506828035aa2ed99a21fc55a369ebb88d11dfe0038b0410a8c033902f8acbf7ce3215e6c13379d88e0ca1 From 372a2922f55eb92af7f28a71c4d9fda481a2bb03 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Fri, 21 Jun 2024 14:35:24 +0200 Subject: [PATCH 07/19] 1.28 --- .gitignore | 1 + chkconfig.spec | 11 ++++++++++- sources | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 59cd93a..f46ddb3 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /chkconfig-1.25.tar.gz /chkconfig-1.26.tar.gz /chkconfig-1.27.tar.gz +/chkconfig-1.28.tar.gz diff --git a/chkconfig.spec b/chkconfig.spec index 053867b..1474566 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,6 +1,6 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig -Version: 1.27 +Version: 1.28 Release: 1%{?dist} License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig @@ -35,6 +35,11 @@ page), ntsysv configures the current runlevel (5 if you're using X). %package -n alternatives Summary: A tool to maintain symbolic links determining default commands +%if "%{_sbindir}" == "%{_bindir}" +Provides: /usr/sbin/alternatives +Provides: /usr/sbin/update-alternatives +Requires: filesystem(unmerged-sbin-symlinks) +%endif %description -n alternatives alternatives creates, removes, maintains and displays information about the @@ -97,6 +102,10 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %dir /var/lib/alternatives %changelog +* Fri Jun 21 2024 Jan Macku - 1.28-1 +- Prepare for bin-sbin merge +- tests: fix integration with github actions + * Tue May 14 2024 Jan Macku - 1.27-1 - alternatives: properly handle chars with const in normalize_path - alternatives: use exit in main instead of return for critical failures diff --git a/sources b/sources index 738c719..0efab64 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chkconfig-1.27.tar.gz) = e88a2bc58c06bba3abab1ed97959b1a3c13f55d6741506828035aa2ed99a21fc55a369ebb88d11dfe0038b0410a8c033902f8acbf7ce3215e6c13379d88e0ca1 +SHA512 (chkconfig-1.28.tar.gz) = 73f23ae6831fd4e4d8628930ddf3acebc9c4b023c303a963c008aa528a392c00bab50a7d542aa8cf34214bfa4c5622ad1e3af8d1d60a0ae4c56d859cc7bcfddf From ab912e8b3a50805b8625f5ff0e7f4e3c6db76ce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 9 Jul 2024 12:37:14 +0200 Subject: [PATCH 08/19] Rebuilt for the bin-sbin merge https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin --- chkconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chkconfig.spec b/chkconfig.spec index 1474566..c404673 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,7 +1,7 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig Version: 1.28 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -102,6 +102,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %dir /var/lib/alternatives %changelog +* Tue Jul 09 2024 Zbigniew Jędrzejewski-Szmek - 1.28-2 +- Rebuilt for the bin-sbin merge + * Fri Jun 21 2024 Jan Macku - 1.28-1 - Prepare for bin-sbin merge - tests: fix integration with github actions From 50f43d31f257df021b2a2d8c245c3d8075ae8c11 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 19:15:47 +0000 Subject: [PATCH 09/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- chkconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chkconfig.spec b/chkconfig.spec index c404673..7ebdce7 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,7 +1,7 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig Version: 1.28 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -102,6 +102,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %dir /var/lib/alternatives %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.28-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jul 09 2024 Zbigniew Jędrzejewski-Szmek - 1.28-2 - Rebuilt for the bin-sbin merge From c8949ebd085f799922a03865f257a8cdd6eac3a9 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Tue, 30 Jul 2024 15:59:05 +0200 Subject: [PATCH 10/19] 1.29 --- .gitignore | 1 + chkconfig.spec | 27 +++++++++++++++++++++++++-- sources | 2 +- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f46ddb3..188c11b 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /chkconfig-1.26.tar.gz /chkconfig-1.27.tar.gz /chkconfig-1.28.tar.gz +/chkconfig-1.29.tar.gz diff --git a/chkconfig.spec b/chkconfig.spec index 7ebdce7..a15ba8c 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,7 +1,7 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig -Version: 1.28 -Release: 3%{?dist} +Version: 1.29 +Release: 1%{?dist} License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -102,6 +102,29 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %dir /var/lib/alternatives %changelog +* Tue Jul 30 2024 Jan Macku - 1.29-1 +- add basic mkosi config +- remove not used directory from makefile +- ntsysv: fix leaks +- leveldb: security_context_t is deprecated +- leveldb: fix leak +- leveldb: fix leak +- leveldb: fix leak +- leveldb: fix leak +- leveldb: fix leak +- chkconfig: fix leak +- chkconfig: fix leak +- chkconfig: fix memory leak when deleting a service +- leveldb: add destructors for service +- leveldb: fix memory leak +- leveldb.c: fix memory leak +- chkconfig: fix leak +- leveldb: fix memory leak +- alternatives: ensure the current alt. is freed if parsing fails +- alternatives: ensure the current group is freed +- Translated using Weblate (English (United Kingdom)) +- Translated using Weblate (Turkish) + * Wed Jul 17 2024 Fedora Release Engineering - 1.28-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 0efab64..358eb3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chkconfig-1.28.tar.gz) = 73f23ae6831fd4e4d8628930ddf3acebc9c4b023c303a963c008aa528a392c00bab50a7d542aa8cf34214bfa4c5622ad1e3af8d1d60a0ae4c56d859cc7bcfddf +SHA512 (chkconfig-1.29.tar.gz) = 614524554fd5a65dde86673806d79c711307c7915f9cd4e1946828c79cc53449bd2995a9b8a874a1b670a8cfe00e1df62166647d882225a06ec86dbb0b663065 From 33664db71db00451ec432b329ba7445f9c0dd573 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Wed, 7 Aug 2024 14:07:43 +0200 Subject: [PATCH 11/19] 1.30 --- .gitignore | 1 + chkconfig.spec | 17 ++++++++--------- sources | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 188c11b..2e9c5f3 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /chkconfig-1.27.tar.gz /chkconfig-1.28.tar.gz /chkconfig-1.29.tar.gz +/chkconfig-1.30.tar.gz diff --git a/chkconfig.spec b/chkconfig.spec index a15ba8c..e61b62c 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,6 +1,6 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig -Version: 1.29 +Version: 1.30 Release: 1%{?dist} License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig @@ -19,7 +19,7 @@ Provides: /sbin/chkconfig %description Chkconfig is a basic system utility. It updates and queries runlevel information for system services. Chkconfig manipulates the numerous -symbolic links in /etc/rc.d, to relieve system administrators of some +symbolic links in /etc/rc.d, to relieve system administrators of some of the drudgery of manually editing the symbolic links. %package -n ntsysv @@ -95,13 +95,18 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %files -n alternatives %license COPYING %dir /etc/alternatives +%ghost %dir %attr(755, root, root) /etc/alternatives.admindir +%ghost %dir %attr(755, root, root) /var/lib/alternatives %{_sbindir}/update-alternatives %{_sbindir}/alternatives %{_mandir}/*/update-alternatives* %{_mandir}/*/alternatives* -%dir /var/lib/alternatives %changelog +* Wed Aug 07 2024 Jan Macku - 1.30-1 +- ostree: move admindir to /etc/alternatives.admindir +- update po/chkconfig.pot + * Tue Jul 30 2024 Jan Macku - 1.29-1 - add basic mkosi config - remove not used directory from makefile @@ -125,12 +130,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d - Translated using Weblate (English (United Kingdom)) - Translated using Weblate (Turkish) -* Wed Jul 17 2024 Fedora Release Engineering - 1.28-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Jul 09 2024 Zbigniew Jędrzejewski-Szmek - 1.28-2 -- Rebuilt for the bin-sbin merge - * Fri Jun 21 2024 Jan Macku - 1.28-1 - Prepare for bin-sbin merge - tests: fix integration with github actions diff --git a/sources b/sources index 358eb3f..03b02fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chkconfig-1.29.tar.gz) = 614524554fd5a65dde86673806d79c711307c7915f9cd4e1946828c79cc53449bd2995a9b8a874a1b670a8cfe00e1df62166647d882225a06ec86dbb0b663065 +SHA512 (chkconfig-1.30.tar.gz) = cebe17dc8efaf9821935d6d97b68115c06ec91184ad9fc0fe865f9c29884e99234265379291746c87a6036f6b847f9704f5ef6d80828a30ad7b04760d4cb45f2 From 7923a0ce5abfdba4f1e2fb22882a241ee6a94124 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Fri, 13 Sep 2024 15:45:05 +0200 Subject: [PATCH 12/19] tests: remove old STI tests --- .../Makefile | 62 -------------- .../PURPOSE | 5 -- .../runtest.sh | 50 ----------- .../Makefile | 63 -------------- .../PURPOSE | 5 -- .../runtest.sh | 58 ------------- .../Makefile | 61 -------------- .../PURPOSE | 5 -- .../runtest.sh | 82 ------------------- .../service-a-fake | 17 ---- .../service-b-fake | 16 ---- .../service-c-fake | 16 ---- tests/tests.retry | 1 - tests/tests.yml | 15 ---- 14 files changed, 456 deletions(-) delete mode 100644 tests/alternatives-doesn-t-update-slave-links-with/Makefile delete mode 100644 tests/alternatives-doesn-t-update-slave-links-with/PURPOSE delete mode 100755 tests/alternatives-doesn-t-update-slave-links-with/runtest.sh delete mode 100644 tests/backport-family-option-from-upstream/Makefile delete mode 100644 tests/backport-family-option-from-upstream/PURPOSE delete mode 100755 tests/backport-family-option-from-upstream/runtest.sh delete mode 100644 tests/chkconfig-prioritory-set-inconsistently/Makefile delete mode 100644 tests/chkconfig-prioritory-set-inconsistently/PURPOSE delete mode 100755 tests/chkconfig-prioritory-set-inconsistently/runtest.sh delete mode 100755 tests/chkconfig-prioritory-set-inconsistently/service-a-fake delete mode 100755 tests/chkconfig-prioritory-set-inconsistently/service-b-fake delete mode 100755 tests/chkconfig-prioritory-set-inconsistently/service-c-fake delete mode 100644 tests/tests.retry delete mode 100644 tests/tests.yml diff --git a/tests/alternatives-doesn-t-update-slave-links-with/Makefile b/tests/alternatives-doesn-t-update-slave-links-with/Makefile deleted file mode 100644 index b8f453d..0000000 --- a/tests/alternatives-doesn-t-update-slave-links-with/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/chkconfig/Regression/alternatives-doesn-t-update-slave-links-with -# Description: Test for BZ#1347541 (alternatives doesn't update slave links with) -# Author: Jan Scotka -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2016 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/chkconfig/Regression/alternatives-doesn-t-update-slave-links-with -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - -$(METADATA): Makefile - @echo "Owner: Jan Scotka " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test for BZ#1347541 (alternatives doesn't update slave links with)" >> $(METADATA) - @echo "Type: Regression" >> $(METADATA) - @echo "TestTime: 10m" >> $(METADATA) - @echo "RunFor: chkconfig" >> $(METADATA) - @echo "Requires: chkconfig" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Bug: 1347541" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/alternatives-doesn-t-update-slave-links-with/PURPOSE b/tests/alternatives-doesn-t-update-slave-links-with/PURPOSE deleted file mode 100644 index 3c06b15..0000000 --- a/tests/alternatives-doesn-t-update-slave-links-with/PURPOSE +++ /dev/null @@ -1,5 +0,0 @@ -PURPOSE of /CoreOS/chkconfig/Regression/alternatives-doesn-t-update-slave-links-with -Description: Test for BZ#1347541 (alternatives doesn't update slave links with) -Author: Jan Scotka -Bug summary: alternatives doesn't update slave links with --install in manual mode -Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1347541 diff --git a/tests/alternatives-doesn-t-update-slave-links-with/runtest.sh b/tests/alternatives-doesn-t-update-slave-links-with/runtest.sh deleted file mode 100755 index 2c04dcc..0000000 --- a/tests/alternatives-doesn-t-update-slave-links-with/runtest.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/chkconfig/Regression/alternatives-doesn-t-update-slave-links-with -# Description: Test for BZ#1347541 (alternatives doesn't update slave links with) -# Author: Jan Scotka -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2016 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="chkconfig" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlPhaseEnd - rlPhaseStartTest - - rlRun "alternatives --install /usr/bin/xxx xxx /usr/bin/true 1 --slave /usr/bin/yyy yyy /usr/bin/true" - rlRun "alternatives --set xxx /usr/bin/true" - rlRun "alternatives --install /usr/bin/xxx xxx /usr/bin/true 1 --slave /usr/bin/yyy yyy /usr/bin/false" - rlRun "readlink /etc/alternatives/yyy | grep /usr/bin/false" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "update-alternatives --remove xxx /usr/bin/true" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/backport-family-option-from-upstream/Makefile b/tests/backport-family-option-from-upstream/Makefile deleted file mode 100644 index 7eca1e2..0000000 --- a/tests/backport-family-option-from-upstream/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/chkconfig/Sanity/backport-family-option-from-upstream -# Description: Test for BZ#1291340 (Backport --family option from upstream) -# Author: Jan Scotka -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2016 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/chkconfig/Sanity/backport-family-option-from-upstream -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -$(METADATA): Makefile - @echo "Owner: Jan Scotka " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Test for BZ#1291340 (Backport --family option from upstream)" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 10m" >> $(METADATA) - @echo "RunFor: chkconfig" >> $(METADATA) - @echo "Requires: chkconfig" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Bug: 1291340" >> $(METADATA) - @echo "Releases: -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/backport-family-option-from-upstream/PURPOSE b/tests/backport-family-option-from-upstream/PURPOSE deleted file mode 100644 index 2b0fc3b..0000000 --- a/tests/backport-family-option-from-upstream/PURPOSE +++ /dev/null @@ -1,5 +0,0 @@ -PURPOSE of /CoreOS/chkconfig/Sanity/backport-family-option-from-upstream -Description: Test for BZ#1291340 (Backport --family option from upstream) -Author: Jan Scotka -Bug summary: Backport --family option from upstream -Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1291340 diff --git a/tests/backport-family-option-from-upstream/runtest.sh b/tests/backport-family-option-from-upstream/runtest.sh deleted file mode 100755 index d70cd8a..0000000 --- a/tests/backport-family-option-from-upstream/runtest.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/chkconfig/Sanity/backport-family-option-from-upstream -# Description: Test for BZ#1291340 (Backport --family option from upstream) -# Author: Jan Scotka -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2016 Red Hat, Inc. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="chkconfig" - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" - rlRun "touch $TmpDir/a" - rlRun "touch $TmpDir/b" - rlRun "ln -s $TmpDir/a $TmpDir/link" - rlPhaseEnd - - rlPhaseStartTest - rlRun "alternatives --install $TmpDir/link testname $TmpDir/a 1 --family testfamily" - rlRun "alternatives --install $TmpDir/link testname $TmpDir/b 2 --family testfamily" - rlRun "alternatives --display testname |grep 'link.*$TmpDir/b'" - rlRun "alternatives --display testname |grep 'link.*$TmpDir/a'" 1 - rlRun "alternatives --display testname |grep '$TmpDir/a.*testfamily priority 1'" - rlRun "alternatives --list | grep 'testname.*$TmpDir/b'" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun " alternatives --remove testname $TmpDir/a" - rlRun " alternatives --remove testname $TmpDir/b" - rlRun "rm -rf $TmpDir" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/chkconfig-prioritory-set-inconsistently/Makefile b/tests/chkconfig-prioritory-set-inconsistently/Makefile deleted file mode 100644 index 846e4c4..0000000 --- a/tests/chkconfig-prioritory-set-inconsistently/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/chkconfig/Regression/chkconfig-prioritory-set-inconsistently -# Description: chkconfig-prioritory-set-inconsistently -# Author: Martin Cermak -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2012 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/chkconfig/Regression/chkconfig-prioritory-set-inconsistently -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE service-a-fake service-b-fake service-c-fake - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - test -x runtest.sh || chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - -$(METADATA): Makefile - @echo "Owner: Martin Cermak " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: chkconfig-prioritory-set-inconsistently" >> $(METADATA) - @echo "Type: Regression" >> $(METADATA) - @echo "TestTime: 5m" >> $(METADATA) - @echo "RunFor: chkconfig" >> $(METADATA) - @echo "Requires: chkconfig" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Bug: 771455" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/chkconfig-prioritory-set-inconsistently/PURPOSE b/tests/chkconfig-prioritory-set-inconsistently/PURPOSE deleted file mode 100644 index 35babfd..0000000 --- a/tests/chkconfig-prioritory-set-inconsistently/PURPOSE +++ /dev/null @@ -1,5 +0,0 @@ -PURPOSE of /CoreOS/chkconfig/Regression/chkconfig-prioritory-set-inconsistently -Description: chkconfig-prioritory-set-inconsistently -Author: Martin Cermak -Bug summary: chkconfig S## prioritory set inconsistently for initscript with Requires-Start: $network -Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=771455 diff --git a/tests/chkconfig-prioritory-set-inconsistently/runtest.sh b/tests/chkconfig-prioritory-set-inconsistently/runtest.sh deleted file mode 100755 index f8ff7c0..0000000 --- a/tests/chkconfig-prioritory-set-inconsistently/runtest.sh +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/chkconfig/Regression/chkconfig-prioritory-set-inconsistently -# Description: chkconfig-prioritory-set-inconsistently -# Author: Martin Cermak -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2012 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include Beaker environment -. /usr/lib/beakerlib/beakerlib.sh - -PACKAGE="chkconfig" - -myGetPriority() { - SERVICE=$1 - basename $( ls /etc/rc.d/rc3.d/S[0-9][0-9]$SERVICE ) | tr -d "[a-zA-Z\-]" -} - -# Test scenario: -# https://bugzilla.redhat.com/show_bug.cgi?id=771455#c0 - -rlJournalStart - rlPhaseStartSetup - rlAssertRpm $PACKAGE - rlRun "cp service-{a,b,c}-fake /etc/rc.d/init.d/" - - # A has Required-Start on B or C, thus the reversed order: - rlRun "/usr/lib/lsb/install_initd service-c-fake" - rlRun "/usr/lib/lsb/install_initd service-b-fake" - rlRun "/usr/lib/lsb/install_initd service-a-fake" - - rlRun "chkconfig service-a-fake off" - rlRun "chkconfig service-b-fake off" - rlRun "chkconfig service-c-fake off" - rlPhaseEnd - - rlPhaseStartTest - rlRun "chkconfig service-b-fake on" - rlRun "chkconfig service-a-fake on" - rlRun "PRIO=$( myGetPriority service-a-fake )" - # now, the priority of A should be >= 40 (should be = 40 in ideal world) - # and hopefully it is < 80 - rlRun "[ $PRIO -ge 40 ]" - rlRun "[ $PRIO -lt 80 ]" - - rlRun "chkconfig service-c-fake on" - rlRun "PRIO=$( myGetPriority service-a-fake )" - # MAIN TEST: - # right after enabling C, A should raise its priority above 80 - # this should fail with unpatched package (e.g. chkconfig-1.3.47-1.el6) - # ... and pass with patched one (e.g. chkconfig-1.3.49.3-2.el6) - rlRun "[ $PRIO -gt 80 ]" - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "/usr/lib/lsb/remove_initd service-a-fake" - rlRun "/usr/lib/lsb/remove_initd service-b-fake" - rlRun "/usr/lib/lsb/remove_initd service-c-fake" - rlRun "rm -rf /etc/rc.d/init.d/service-{a,b,c}-fake" - rlPhaseEnd -#rlJournalPrintText -rlJournalEnd diff --git a/tests/chkconfig-prioritory-set-inconsistently/service-a-fake b/tests/chkconfig-prioritory-set-inconsistently/service-a-fake deleted file mode 100755 index a58fc46..0000000 --- a/tests/chkconfig-prioritory-set-inconsistently/service-a-fake +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh -# -# service-a-fake - -# chkconfig: 2345 40 89 -# description: Fake service a -# -### BEGIN INIT INFO -# Provides: service-a-fake -# Default-Start: 2 3 4 5 -# Default-Stop: 0 6 -# Required-Start: bz771455fakeservice -# Short-Description: Fake service a -# Description: Fake service a -### END INIT INFO - - diff --git a/tests/chkconfig-prioritory-set-inconsistently/service-b-fake b/tests/chkconfig-prioritory-set-inconsistently/service-b-fake deleted file mode 100755 index c89d665..0000000 --- a/tests/chkconfig-prioritory-set-inconsistently/service-b-fake +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# -# service-b-fake - -# chkconfig: 2345 14 89 -# description: Fake service b -# -### BEGIN INIT INFO -# Provides: bz771455fakeservice -# Default-Start: 2 3 4 5 -# Default-Stop: 0 6 -# Short-Description: Fake service b -# Description: Fake service b -### END INIT INFO - - diff --git a/tests/chkconfig-prioritory-set-inconsistently/service-c-fake b/tests/chkconfig-prioritory-set-inconsistently/service-c-fake deleted file mode 100755 index 7ee6216..0000000 --- a/tests/chkconfig-prioritory-set-inconsistently/service-c-fake +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# -# service-c-fake - -# chkconfig: 2345 80 89 -# description: Fake service c -# -### BEGIN INIT INFO -# Provides: bz771455fakeservice -# Default-Start: 2 3 4 5 -# Default-Stop: 0 6 -# Short-Description: Fake service c -# Description: Fake service c -### END INIT INFO - - diff --git a/tests/tests.retry b/tests/tests.retry deleted file mode 100644 index 2fbb50c..0000000 --- a/tests/tests.retry +++ /dev/null @@ -1 +0,0 @@ -localhost diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 61bf9b4..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# This first play always runs on the local staging system -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - classic - - container - tests: - - alternatives-doesn-t-update-slave-links-with - - backport-family-option-from-upstream - - chkconfig-prioritory-set-inconsistently - required_packages: - - chkconfig - - lsb From e3ed99a50de80e7b9591f3f27ac3fbb1912d0b84 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Wed, 18 Dec 2024 16:13:11 +0100 Subject: [PATCH 13/19] 1.31 --- .gitignore | 1 + chkconfig.spec | 9 ++++++++- sources | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2e9c5f3..f027195 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /chkconfig-1.28.tar.gz /chkconfig-1.29.tar.gz /chkconfig-1.30.tar.gz +/chkconfig-1.31.tar.gz diff --git a/chkconfig.spec b/chkconfig.spec index e61b62c..07c1570 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,6 +1,6 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig -Version: 1.30 +Version: 1.31 Release: 1%{?dist} License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig @@ -103,6 +103,13 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %{_mandir}/*/alternatives* %changelog +* Wed Dec 18 2024 Jan Macku - 1.31-1 +- Translated using Weblate (Ukrainian) +- Translated using Weblate (Ukrainian) +- Translated using Weblate (French) +- Update translation files +- Translated using Weblate (Turkish) + * Wed Aug 07 2024 Jan Macku - 1.30-1 - ostree: move admindir to /etc/alternatives.admindir - update po/chkconfig.pot diff --git a/sources b/sources index 03b02fd..892b656 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chkconfig-1.30.tar.gz) = cebe17dc8efaf9821935d6d97b68115c06ec91184ad9fc0fe865f9c29884e99234265379291746c87a6036f6b847f9704f5ef6d80828a30ad7b04760d4cb45f2 +SHA512 (chkconfig-1.31.tar.gz) = 00b13114948d93e438063f862c0e5e5990768272db202045cf2f6e3fa2ef15cfae48724f9ca07bc3e44bd5dfc710eab664f5d82f86ff89b72d3fb2ccf6ae6535 From 8a0753dab8e94dca02663e8b6c865972e80e3bea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 12 Jan 2025 14:20:05 +0100 Subject: [PATCH 14/19] Rebuilt for the bin-sbin merge (2nd attempt) https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin --- chkconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chkconfig.spec b/chkconfig.spec index 07c1570..c53d68a 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,7 +1,7 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig Version: 1.31 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -103,6 +103,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %{_mandir}/*/alternatives* %changelog +* Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek - 1.31-2 +- Rebuilt for the bin-sbin merge (2nd attempt) + * Wed Dec 18 2024 Jan Macku - 1.31-1 - Translated using Weblate (Ukrainian) - Translated using Weblate (Ukrainian) From 04d6edc7a46e7db675d239ffd4bd17fb764510ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 13:40:54 +0000 Subject: [PATCH 15/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- chkconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chkconfig.spec b/chkconfig.spec index c53d68a..2062b91 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,7 +1,7 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig Version: 1.31 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -103,6 +103,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %{_mandir}/*/alternatives* %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.31-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek - 1.31-2 - Rebuilt for the bin-sbin merge (2nd attempt) From 9b0f83924ec079de12a3bb9f07290a8e1062d173 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Thu, 13 Mar 2025 17:14:26 +0100 Subject: [PATCH 16/19] 1.32 --- .gitignore | 1 + chkconfig.spec | 15 +++++++++++---- sources | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f027195..8f25702 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /chkconfig-1.29.tar.gz /chkconfig-1.30.tar.gz /chkconfig-1.31.tar.gz +/chkconfig-1.32.tar.gz diff --git a/chkconfig.spec b/chkconfig.spec index 2062b91..11a6b54 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,7 +1,7 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig -Version: 1.31 -Release: 3%{?dist} +Version: 1.32 +Release: 1%{?dist} License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -12,6 +12,8 @@ BuildRequires: gcc gettext libselinux-devel make newt-devel popt-devel pkgconfig BuildRequires: beakerlib %endif +%global merged_sbin %["%{_sbindir}" == "%{_bindir}"] + Conflicts: initscripts <= 5.30-1 Provides: /sbin/chkconfig @@ -35,7 +37,7 @@ page), ntsysv configures the current runlevel (5 if you're using X). %package -n alternatives Summary: A tool to maintain symbolic links determining default commands -%if "%{_sbindir}" == "%{_bindir}" +%if %{merged_sbin} Provides: /usr/sbin/alternatives Provides: /usr/sbin/update-alternatives Requires: filesystem(unmerged-sbin-symlinks) @@ -51,7 +53,7 @@ system at the same time. %setup -q %build -%make_build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" +%make_build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" MERGED_SBIN=%{merged_sbin} # tests are executed using tmt and tf on CentOS Stream and RHEL %if 0%{?fedora} @@ -103,6 +105,11 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %{_mandir}/*/alternatives* %changelog +* Thu Mar 13 2025 Jan Macku - 1.32-1 +- Allow paths with /usr/sbin and /usr/bin as equivalent +- mkosi: update conf to match latest mkosi version +- Translated using Weblate (Italian) + * Thu Jan 16 2025 Fedora Release Engineering - 1.31-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index 892b656..e9e419d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chkconfig-1.31.tar.gz) = 00b13114948d93e438063f862c0e5e5990768272db202045cf2f6e3fa2ef15cfae48724f9ca07bc3e44bd5dfc710eab664f5d82f86ff89b72d3fb2ccf6ae6535 +SHA512 (chkconfig-1.32.tar.gz) = 3d4b4344b40e9c72ac495e45e75f664c8a5cdc96187095fb320691dc37c746e9a8095c0b1ce1a64f0182056501dbffbab0ee8cab178c14008f31e04ed13398e2 From 5199d7e7609dfc832bfdd191d3e57e136d1db3d8 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Fri, 9 May 2025 17:51:26 +0200 Subject: [PATCH 17/19] 1.33 --- .gitignore | 1 + chkconfig.spec | 8 ++++---- sources | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8f25702..47386f8 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /chkconfig-1.30.tar.gz /chkconfig-1.31.tar.gz /chkconfig-1.32.tar.gz +/chkconfig-1.33.tar.gz diff --git a/chkconfig.spec b/chkconfig.spec index 11a6b54..68a9475 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,6 +1,6 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig -Version: 1.32 +Version: 1.33 Release: 1%{?dist} License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig @@ -105,14 +105,14 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %{_mandir}/*/alternatives* %changelog +* Fri May 09 2025 Lukas Nykryn - 1.33-1 +- alternatives: ignore all bin/sbin differences on systems with merged bin/sbin + * Thu Mar 13 2025 Jan Macku - 1.32-1 - Allow paths with /usr/sbin and /usr/bin as equivalent - mkosi: update conf to match latest mkosi version - Translated using Weblate (Italian) -* Thu Jan 16 2025 Fedora Release Engineering - 1.31-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - * Sun Jan 12 2025 Zbigniew Jędrzejewski-Szmek - 1.31-2 - Rebuilt for the bin-sbin merge (2nd attempt) diff --git a/sources b/sources index e9e419d..5ae2b15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (chkconfig-1.32.tar.gz) = 3d4b4344b40e9c72ac495e45e75f664c8a5cdc96187095fb320691dc37c746e9a8095c0b1ce1a64f0182056501dbffbab0ee8cab178c14008f31e04ed13398e2 +SHA512 (chkconfig-1.33.tar.gz) = 82a7a5e7d62537843cd81fa0c29a0f481ff8fe2798e0143fc409c028f02f01585b6c5d60faf5ce4a4c6dea11c4bba766dbd28e29978447f56708def65421739d From 7a61cc3a358b01cc18d8e07ffba07bd77927b3f2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 18:16:40 +0000 Subject: [PATCH 18/19] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- chkconfig.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/chkconfig.spec b/chkconfig.spec index 68a9475..23c6a20 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,7 +1,7 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig Version: 1.33 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -105,6 +105,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %{_mandir}/*/alternatives* %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri May 09 2025 Lukas Nykryn - 1.33-1 - alternatives: ignore all bin/sbin differences on systems with merged bin/sbin From 8358faf6403af6ad5abb7287309f0224e757395d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 27 Oct 2025 12:46:42 -0700 Subject: [PATCH 19/19] Backport PR #157 to fix MTA service disablement on package update (#2363937) --- ...ves-that-are-binary-identical-to-exi.patch | 49 +++++++++++++++++++ chkconfig.spec | 13 ++++- 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 0001-Ignore-alternatives-that-are-binary-identical-to-exi.patch diff --git a/0001-Ignore-alternatives-that-are-binary-identical-to-exi.patch b/0001-Ignore-alternatives-that-are-binary-identical-to-exi.patch new file mode 100644 index 0000000..4cfbccc --- /dev/null +++ b/0001-Ignore-alternatives-that-are-binary-identical-to-exi.patch @@ -0,0 +1,49 @@ +From 1cdf46d6c5d0fa094f46ecef7e4294144d956988 Mon Sep 17 00:00:00 2001 +From: Adam Williamson +Date: Fri, 24 Oct 2025 12:05:00 -0700 +Subject: [PATCH] Ignore alternatives that are binary-identical to existing + ones + +In https://bugzilla.redhat.com/show_bug.cgi?id=2363937 we found +a problem that is ultimately triggered by alternatives configs +having multiple entries that point to the same binary, or the +same *effective* binary after /usr and /sbin merges (which is +what streq_bin handles). I can't see a reason why we'd ever want +to support this as a real thing, so when reading the config, +let's just skip ingesting any alternative whose leader target is +the same effective binary as an alternative we've already read. + +Signed-off-by: Adam Williamson +--- + alternatives.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/alternatives.c b/alternatives.c +index 61a95ad..75d3a54 100644 +--- a/alternatives.c ++++ b/alternatives.c +@@ -520,6 +520,12 @@ static int readConfig(struct alternativeSet *set, const char *title, + newAlt.followers[i - 1].target = (line && strlen(line)) ? strsteal(&line) : NULL; + } + ++ for (i = 0; i < set->numAlts; i++) { ++ if (streq_bin(newAlt.leader.target, set->alts[i].leader.target)) { ++ goto nextalt; ++ } ++ } ++ + set->alts = realloc(set->alts, (set->numAlts + 1) * sizeof(*set->alts)); + set->alts[set->numAlts] = newAlt; + +@@ -527,7 +533,7 @@ static int readConfig(struct alternativeSet *set, const char *title, + set->best = set->numAlts; + + set->numAlts++; +- ++nextalt: + memset(&newAlt, 0, sizeof(struct alternative)); + + nextLine(&buf, &line); +-- +2.51.0 + diff --git a/chkconfig.spec b/chkconfig.spec index 23c6a20..97d30f8 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,11 +1,17 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig Version: 1.33 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-only URL: https://github.com/fedora-sysv/chkconfig Source: https://github.com/fedora-sysv/chkconfig/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# https://github.com/fedora-sysv/chkconfig/pull/157 +# https://bugzilla.redhat.com/show_bug.cgi?id=2363937 +# ignore 'duplicate' entries in config file (same effective binary) +# avoids issue where package install/update disables service +Patch: 0001-Ignore-alternatives-that-are-binary-identical-to-exi.patch + BuildRequires: gcc gettext libselinux-devel make newt-devel popt-devel pkgconfig(systemd) # beakerlib might not be available on CentOS Stream any more %if 0%{?fedora} @@ -50,7 +56,7 @@ programs fulfilling the same or similar functions to be installed on a single system at the same time. %prep -%setup -q +%autosetup -p1 %build %make_build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" MERGED_SBIN=%{merged_sbin} @@ -105,6 +111,9 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d %{_mandir}/*/alternatives* %changelog +* Fri Oct 24 2025 Adam Williamson - 1.33-3 +- Backport PR #157 to fix MTA service disablement on package update (#2363937) + * Wed Jul 23 2025 Fedora Release Engineering - 1.33-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild