From bc6e8858d6536d68d01ffc36cedfce2b79e2fe75 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Wed, 31 Jul 2024 12:59:11 +0200
Subject: [PATCH] rebase to 1.29

Resolves: RHEL-35277
---
 .gitignore     |  1 +
 chkconfig.spec | 66 ++++++++++++++++++++++++++++++++++++++++++++------
 sources        |  2 +-
 3 files changed, 60 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index a820e27..340d59e 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.29.tar.gz
diff --git a/chkconfig.spec b/chkconfig.spec
index d71fad6..00e9b99 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: 4%{?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
@@ -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,14 +102,59 @@ mkdir -p $RPM_BUILD_ROOT/etc/chkconfig.d
 %dir /var/lib/alternatives
 
 %changelog
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.26-4
-- Bump release for June 2024 mass rebuild
+* Tue Jul 30 2024 Jan Macku <jamacku@redhat.com> - 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)
 
-* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+* Fri Jun 21 2024 Jan Macku <jamacku@redhat.com> - 1.28-1
+- Prepare for bin-sbin merge
+- tests: fix integration with github actions
 
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.26-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+* Tue May 14 2024 Jan Macku <jamacku@redhat.com> - 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 <jamacku@redhat.com> - 1.26-1
 - fix(test): dot't call `basename` with empty string
diff --git a/sources b/sources
index 4cd5cd8..358eb3f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (chkconfig-1.26.tar.gz) = e4e4ca07c93f571b93290bf010d86ab2f5bc74a2a76e6b18843b24c1212653a6e204eb4657aa0f9b7c738ba23653b456be8cd4393a04a5651ef1669ee95cbe80
+SHA512 (chkconfig-1.29.tar.gz) = 614524554fd5a65dde86673806d79c711307c7915f9cd4e1946828c79cc53449bd2995a9b8a874a1b670a8cfe00e1df62166647d882225a06ec86dbb0b663065