- -more_readable.patch is back (updated for 1.3.20)

Changed files:
    chkconfig-more_readable.patch -> 1.4
    chkconfig.spec -> 1.67

diff --git a/chkconfig-more_readable.patch b/chkconfig-more_readable.patch
index b643c8312a5c998fc17ccbef0ea276795536f3a5..b52c1407ce9ad43181b195e6b57fa99ff32e21c9 100644 (file)
--- a/chkconfig-more_readable.patch
+++ b/chkconfig-more_readable.patch
@@ -1,29 +1,30 @@
-diff -Nur b.chkconfig-1.2.24h/chkconfig.c n.chkconfig-1.2.24h/chkconfig.c
---- b.chkconfig-1.2.24h/chkconfig.c    2005-08-04 20:31:03.145936000 +0200
-+++ n.chkconfig-1.2.24h/chkconfig.c    2005-08-04 22:29:48.719684984 +0200
-@@ -106,6 +106,7 @@
+--- chkconfig-1.3.20/chkconfig.c~      2005-10-22 15:39:22.000000000 +0200
++++ chkconfig-1.3.20/chkconfig.c       2005-10-22 15:43:32.000000000 +0200
+@@ -187,6 +187,7 @@
      int rc;
      int i;
      struct service s;
 +      char *on, *off;
  
-     if ((rc = readServiceInfo(name, &s, 0))) {
-       if (!forgiving)
-@@ -115,10 +116,13 @@
+     rc = readServiceInfo(name, &s, 0);
+     
+@@ -207,13 +208,17 @@
+     }
  
      printf("%-15s", s.name);
- 
--    for (i = 0; i <= conf.maxlevel; i++) {
--      printf("\t%d:%s", i, isOn(s.name, i) ? _("on") : _("off"));
--    }
--    printf("\n");
++
 +      on = getenv("CHKCONFIG_ON");
 +      off = getenv("CHKCONFIG_OFF");
-+
-+    for (i = 0; i <= conf.maxlevel; i++)
++      
+     if (s.type == TYPE_XINETD) {
+-          printf("\t%s\n", s.levels ? _("on") : _("off"));
++          printf("\t%s\n", s.levels ? on ? on : _("on") : off ? off : _("off"));
+           return 0;
+     }
+ 
+     for (i = 0; i < 7; i++) {
+-      printf("\t%d:%s", i, isOn(s.name, i) ? _("on") : _("off"));
 +              printf("\t%d:%s", i, isOn(s.name, i) ? on ? on : _("on") : off ? off : _("off"));
-+    
-+      printf("\n");
+     }
+     printf("\n");
  
-     return 0;
- }

diff --git a/chkconfig.spec b/chkconfig.spec
index 17a956e5173a02d39342830e192b2d3a31339c48..69263f34bd04a15180f96a0c78fca2ab13305e94 100644 (file)
--- a/chkconfig.spec
+++ b/chkconfig.spec
@@ -21,7 +21,7 @@ Source0:      %{name}-%{version}.tar.gz
 #Patch2:               %{name}-pl.po-update.patch
 #Patch3:               %{name}-ponames.patch
 #Patch4:               %{name}-link.patch
-#Patch5:               %{name}-more_readable.patch
+Patch5:                %{name}-more_readable.patch
 Patch6:                %{name}-rc.d.patch
 Patch7:                %{name}-nostatic.patch
 #BuildRequires:        autoconf
@@ -154,7 +154,7 @@ update-dependencies script.
 #%patch2 -p1
 #%patch3 -p1
 #%patch4 -p1
-#%patch5 -p1
+%patch5 -p1
 %patch6 -p1
 %patch7 -p1