From 122541517d51f030cfbb9d91cd8d7d65def0d768 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 4 Dec 2012 15:44:17 +0200 Subject: [PATCH] - up to 1.3.58, no xinetd patch needs updating --- chkconfig-add.patch | 15 +++++++-------- chkconfig.spec | 13 ++++++------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/chkconfig-add.patch b/chkconfig-add.patch index ce633ce..6105620 100644 --- a/chkconfig-add.patch +++ b/chkconfig-add.patch @@ -1,6 +1,5 @@ -diff -urN chkconfig-1.3.37.org/chkconfig.c chkconfig-1.3.37/chkconfig.c ---- chkconfig-1.3.37.org/chkconfig.c 2007-11-08 22:28:34.000000000 +0100 -+++ chkconfig-1.3.37/chkconfig.c 2008-04-24 09:27:21.427392171 +0200 +--- chkconfig-1.3.58/chkconfig.c~ 2012-12-04 15:41:14.000000000 +0200 ++++ chkconfig-1.3.58/chkconfig.c 2012-12-04 15:42:06.080488828 +0200 @@ -27,6 +27,7 @@ #include @@ -22,14 +21,14 @@ diff -urN chkconfig-1.3.37.org/chkconfig.c chkconfig-1.3.37/chkconfig.c } return 0; -@@ -558,7 +557,7 @@ +@@ -626,7 +626,7 @@ } - int main(int argc, char ** argv) { -- int listItem = 0, addItem = 0, delItem = 0, overrideItem = 0; -+ int listItem = 0, delItem = 0, overrideItem = 0; + int main(int argc, const char ** argv) { +- int listItem = 0, addItem = 0, delItem = 0, overrideItem = 0, noRedirectItem = 0; ++ int listItem = 0, delItem = 0, overrideItem = 0, noRedirectItem = 0; + int type = TYPE_ANY; int rc, i, x; - int LSB = 0; char * levels = NULL; diff -urN chkconfig-1.3.37.org/leveldb.c chkconfig-1.3.37/leveldb.c --- chkconfig-1.3.37.org/leveldb.c 2007-08-03 19:57:56.000000000 +0200 diff --git a/chkconfig.spec b/chkconfig.spec index 7ddbbe7..9ecc0df 100644 --- a/chkconfig.spec +++ b/chkconfig.spec @@ -1,4 +1,3 @@ -# # TODO: # - add patch needs fix to stop "chkconfig service off && chkconfig --add service" reactivating service # @@ -13,13 +12,13 @@ Summary(ru.UTF-8): Системная утилита для управления Summary(tr.UTF-8): Sistem servis bilgilerini sorgular ve yeniler Summary(uk.UTF-8): Системна утиліта для керування ієрархією /etc/rc.d Name: chkconfig -Version: 1.3.37 -Release: 0.2 +Version: 1.3.58 +Release: 0.1 Epoch: 2 License: GPL v2 Group: Applications/System -Source0: %{name}-%{version}.tar.gz -# Source0-md5: cca7223101b46df7982ea18b9518dc9a +Source0: http://fedorahosted.org/releases/c/h/chkconfig/%{name}-%{version}.tar.bz2 +# Source0-md5: c2039ca67f2749fe0c06ef7c6f8ee246 Patch0: %{name}-add.patch Patch1: %{name}-noxinet.patch Patch2: %{name}-rc.d.patch @@ -159,10 +158,10 @@ perla; ma być zamiennikiem skryptu update-alternatives z Debiana. %prep %setup -q %patch0 -p1 -%patch1 -p1 +#%patch1 -p1 NEEDS UPDATE %patch2 -p1 %patch3 -p1 -%patch4 -p1 +#%patch4 -p1 NEEDS UPDATE %build %{__make} \ -- 2.44.0