backport-leveldb-fix-systemdActive.patch

@@ -1,44 +0,0 @@
-From 5b5268cc2d7fec04365996026f64992db6c45aa9 Mon Sep 17 00:00:00 2001
-From: Marcos Mello <marcosfrm@gmail.com>
-Date: Sun, 15 Oct 2023 14:35:06 -0300
-Subject: [PATCH] leveldb: fix systemdActive()
-
-/sys/fs/cgroup/systemd is long gone:
-
-https://systemd.io/CGROUP_DELEGATION/
-
-Check for /run/systemd/system/ directory existence instead:
-
-https://www.freedesktop.org/software/systemd/man/sd_booted.html
-
-Closes fedora-sysv/chkconfig#116
-
-Reference:https://github.com/fedora-sysv/chkconfig/commit/5b5268cc2d7fec04365996026f64992db6c45aa9
-Conflict:NA
-
----
- leveldb.c | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/leveldb.c b/leveldb.c
-index 7b8c1bd..564a207 100644
---- a/leveldb.c
-+++ b/leveldb.c
-@@ -946,13 +946,7 @@ int systemdIsInit() {
- }
- 
- int systemdActive() {
--    struct stat a, b;
--
--    if (lstat("/sys/fs/cgroup", &a) < 0)
--        return 0;
--    if (lstat("/sys/fs/cgroup/systemd", &b) < 0)
--        return 0;
--    if (a.st_dev == b.st_dev)
-+    if (access("/run/systemd/system/", F_OK) < 0)
-         return 0;
-     if (!systemdIsInit())
-         return 0;
--- 
-2.33.0
-

chkconfig.spec

@@ -1,19 +1,17 @@
 Summary:        A system tool for maintaining the /etc/rc*.d hierarchy
 Name:           chkconfig
-Version:        1.25
+Version:        1.20
 Release:        2
-License:        GPL-2.0-only
+License:        GPLv2
 URL:            https://github.com/fedora-sysv/chkconfig
-Source:         https://github.com/fedora-sysv/chkconfig/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source:         https://github.com/fedora-sysv/chkconfig/archive/refs/tags/%{version}.tar.gz
 BuildRequires:  newt-devel gettext popt-devel libselinux-devel beakerlib gcc systemd-devel make
 Conflicts:      initscripts <= 5.30-1
 Provides:       ntsysv = %{version}-%{release}
 Obsoletes:      ntsysv < %{version}-%{release}
 Provides:       /sbin/chkconfig
 
-Patch0:         fix-coredump-while-parseServiceInfo-return-1.patch
+Patch0:  fix-coredump-while-parseServiceInfo-return-1.patch
-
-Patch6000:      backport-leveldb-fix-systemdActive.patch
 
 %description
 Chkconfig is a basic system utility.  It updates and queries runlevel
@@ -30,7 +28,7 @@ of the drudgery of manually editing the symbolic links.
 %make_build RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS"
 
 %check
-%make_build check
+make check
 
 %install
 %make_install MANDIR=%{_mandir} SBINDIR=%{_sbindir}
@@ -59,21 +57,6 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d
 %{_mandir}/man8/*
 
 %changelog
-* Mon Aug 12 2024 fuanan <fuanan3@h-partners.com> - 1.25-2
-- fix systemdActive()
-
-* Fri Aug  4 2023 dillon chen <dillon.chen@gmail.com> - 1.25-1
-- update version to 1.25
-
-* Wed Jul 26 2023 xujing <xujing125@huawei.com> - 1.24-1
-- update version to 1.24
-
-* Fri Feb 17 2023 tanyulong <tanyulong@kylinos.cn> - 1.21-2
-- enable check
-
-* Wed Oct 12 2022 fushanqing <fushanqing@kylinos.cn> - 1.21-1
-- Update to 1.21
-
 * Sat Aug 27 2022 yixiangzhike <yixiangzhike007@163.com> - 1.20-2
 - fix coredump while parseServiceInfo return non-zero
 

fix-coredump-while-parseServiceInfo-return-1.patch

@@ -11,7 +11,7 @@ diff --git a/leveldb.c b/leveldb.c
 index 7b8c1bd..8a7a81d 100644
 --- a/leveldb.c
 +++ b/leveldb.c
-@@ -380,7 +380,7 @@ int readServiceInfo(char *name, int type, struct service *service,
+@@ -377,7 +377,7 @@ int readServiceInfo(char *name, int type, struct service *service,
      asprintf(&filename, RUNLEVELS "/chkconfig.d/%s", name);
      if ((fd = open(filename, O_RDONLY)) >= 0) {
          parseret = parseServiceInfo(fd, name, &serv_overrides, honorHide, 1);