From bd3b3701f23086062a878900b4cb81565f676b2e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: May 12 2016 07:35:13 +0000 Subject: import chkconfig-1.3.61-5.el7_2.1 --- diff --git a/SOURCES/0001-chkconfig-use-isXinetdEnabled-instead-of-isOn.patch b/SOURCES/0001-chkconfig-use-isXinetdEnabled-instead-of-isOn.patch new file mode 100644 index 0000000..479e892 --- /dev/null +++ b/SOURCES/0001-chkconfig-use-isXinetdEnabled-instead-of-isOn.patch @@ -0,0 +1,25 @@ +From a10b9542afeacb6c6bd8dcf2ad82cca005d28aa9 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Thu, 28 Apr 2016 15:03:19 +0200 +Subject: [PATCH] chkconfig: use isXinetdEnabled instead of isOn + +--- + chkconfig.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/chkconfig.c b/chkconfig.c +index d334bf2..30e110a 100644 +--- a/chkconfig.c ++++ b/chkconfig.c +@@ -817,7 +817,7 @@ int main(int argc, const char ** argv) { + if (rc) + return 1; + if (s.type == TYPE_XINETD) { +- if (isOn("xinetd",level)) ++ if (isXinetdEnabled()) + return !s.levels; + else + return 1; +-- +2.4.3 + diff --git a/SPECS/chkconfig.spec b/SPECS/chkconfig.spec index 053652a..c45e321 100644 --- a/SPECS/chkconfig.spec +++ b/SPECS/chkconfig.spec @@ -1,7 +1,7 @@ Summary: A system tool for maintaining the /etc/rc*.d hierarchy Name: chkconfig Version: 1.3.61 -Release: 5%{?dist} +Release: 5%{?dist}.1 License: GPLv2 Group: System Environment/Base Source: http://fedorahosted.org/releases/c/h/chkconfig/%{name}-%{version}.tar.bz2 @@ -14,6 +14,7 @@ Patch2: 0003-leveldb-remove-debug-output.patch Patch3: 0004-fix-combination-type-xinetd-list-service.patch Patch4: 0005-Makefile-fix-wrongly-behaving-LDFLAGS.patch Patch5: 0006-chkconfig-don-t-create-symlinks-if-they-already-exis.patch +Patch6: 0001-chkconfig-use-isXinetdEnabled-instead-of-isOn.patch %description Chkconfig is a basic system utility. It updates and queries runlevel @@ -42,6 +43,7 @@ page), ntsysv configures the current runlevel (5 if you're using X). %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %build @@ -88,6 +90,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/*/ntsysv.8* %changelog +* Fri Apr 29 2016 Lukáš Nykrýn - 1.3.61-5.1 +- chkconfig: use isXinetdEnabled instead of isOn + * Thu Apr 30 2015 Lukáš Nykrýn - 1.3.61-5 - chkconfig: don't create symlinks if they already exist - fix combination --type xinetd --list service