[packages/chkconfig] up to 1.3.63
glen
glen at pld-linux.org
Sun Nov 30 14:06:26 CET 2014
commit bcda1112d64628be337656b583ef973e5abf8961
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Sun Nov 30 15:03:56 2014 +0200
up to 1.3.63
chkconfig-noxinet.patch | 79 ++++++++++++++++++++++++------------------------
chkconfig-optflags.patch | 14 ++++-----
chkconfig-pl.patch | 12 ++++----
chkconfig.spec | 6 ++--
4 files changed, 56 insertions(+), 55 deletions(-)
---
diff --git a/chkconfig.spec b/chkconfig.spec
index fcbadc6..ef3c5f8 100644
--- a/chkconfig.spec
+++ b/chkconfig.spec
@@ -9,13 +9,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.58
+Version: 1.3.63
Release: 1
Epoch: 2
License: GPL v2
Group: Applications/System
-Source0: http://fedorahosted.org/releases/c/h/chkconfig/%{name}-%{version}.tar.bz2
-# Source0-md5: c2039ca67f2749fe0c06ef7c6f8ee246
+Source0: https://fedorahosted.org/releases/c/h/chkconfig/%{name}-%{version}.tar.bz2
+# Source0-md5: 7a9d030aa0915b8e9341a930e95d68e6
Patch0: %{name}-add.patch
Patch1: %{name}-noxinet.patch
Patch2: %{name}-rc.d.patch
diff --git a/chkconfig-noxinet.patch b/chkconfig-noxinet.patch
index 8dc05e8..07110de 100644
--- a/chkconfig-noxinet.patch
+++ b/chkconfig-noxinet.patch
@@ -1,6 +1,5 @@
-diff -ur chkconfig-1.3.58/chkconfig.8 chkconfig-1.3.58-noxinet/chkconfig.8
---- chkconfig-1.3.58/chkconfig.8 2012-02-10 20:37:38.000000000 +0100
-+++ chkconfig-1.3.58-noxinet/chkconfig.8 2012-12-17 15:22:31.472800234 +0100
+--- chkconfig-1.3.63/chkconfig.8 2014-11-05 18:39:09.000000000 +0200
++++ chkconfig-1.3.63.no-xinetd/chkconfig.8 2014-11-30 14:54:29.771983174 +0200
@@ -63,16 +63,6 @@
an already-started service, and will not re-stop a service that is
not running.
@@ -18,10 +17,9 @@ diff -ur chkconfig-1.3.58/chkconfig.8 chkconfig-1.3.58-noxinet/chkconfig.8
.SH OPTIONS
.TP
\fB-\-level \fIlevels\fR
-diff -ur chkconfig-1.3.58/chkconfig.c chkconfig-1.3.58-noxinet/chkconfig.c
---- chkconfig-1.3.58/chkconfig.c 2012-12-17 15:22:52.589660844 +0100
-+++ chkconfig-1.3.58-noxinet/chkconfig.c 2012-12-17 15:17:47.586865799 +0100
-@@ -95,7 +95,6 @@
+--- chkconfig-1.3.63/chkconfig.c 2014-11-30 14:57:06.299908151 +0200
++++ chkconfig-1.3.63.no-xinetd/chkconfig.c 2014-11-30 14:55:40.542232924 +0200
+@@ -102,7 +102,6 @@
readServiceError(rc, name);
return 1;
}
@@ -29,7 +27,7 @@ diff -ur chkconfig-1.3.58/chkconfig.c chkconfig-1.3.58-noxinet/chkconfig.c
checkRoot();
-@@ -285,7 +284,6 @@
+@@ -298,7 +297,6 @@
return 1;
}
@@ -37,7 +35,7 @@ diff -ur chkconfig-1.3.58/chkconfig.c chkconfig-1.3.58-noxinet/chkconfig.c
checkRoot();
if (s.isLSB) {
-@@ -324,8 +322,6 @@
+@@ -337,8 +335,6 @@
return 0;
}
@@ -46,7 +44,7 @@ diff -ur chkconfig-1.3.58/chkconfig.c chkconfig-1.3.58-noxinet/chkconfig.c
checkRoot();
if ((s.levels == o.levels) &&
-@@ -403,10 +399,6 @@
+@@ -416,10 +412,6 @@
}
printf("%-15s", s.name);
@@ -57,13 +55,17 @@ diff -ur chkconfig-1.3.58/chkconfig.c chkconfig-1.3.58-noxinet/chkconfig.c
for (i = 0; i < 7; i++) {
printf("\t%d:%s", i, isOn(s.name, i) ? _("on") : _("off"));
-@@ -436,29 +428,10 @@
+@@ -448,33 +440,10 @@
+ return showServiceInfo(s, forgiving);
}
-
+-
-static int isXinetdEnabled() {
- struct service s;
-
+- if (isOverriddenBySystemd("xinetd") && isEnabledInSystemd("xinetd"))
+- return 1;
+-
- if (readServiceInfo("xinetd", TYPE_INIT_D, &s, 0)) {
- return 0;
- }
@@ -87,7 +89,7 @@ diff -ur chkconfig-1.3.58/chkconfig.c chkconfig-1.3.58-noxinet/chkconfig.c
static int listService(char * item, int type) {
DIR * dir;
struct dirent * ent;
-@@ -484,54 +457,6 @@
+@@ -502,54 +471,6 @@
}
}
}
@@ -142,7 +144,7 @@ diff -ur chkconfig-1.3.58/chkconfig.c chkconfig-1.3.58-noxinet/chkconfig.c
return 0;
}
-@@ -592,11 +517,6 @@
+@@ -610,11 +531,6 @@
reloadSystemd();
return rc;
@@ -150,22 +152,21 @@ diff -ur chkconfig-1.3.58/chkconfig.c chkconfig-1.3.58-noxinet/chkconfig.c
- if (setXinetdService(s, state)) {
- return 1;
- }
-- system("/etc/init.d/xinetd reload >/dev/null 2>&1");
+- system("/sbin/service xinetd reload >/dev/null 2>&1");
}
return 0;
-@@ -604,9 +524,6 @@
+@@ -622,8 +538,6 @@
void forwardSystemd(const char *name, int type, const char *verb) {
-
+ int socket = 0;
- if (type == TYPE_XINETD)
- return;
--
+
if (!systemdIsInit())
return;
-
-@@ -683,12 +600,10 @@
- if (help) usage();
+@@ -704,12 +618,10 @@
+ if (help) usage(progname);
if (typeString) {
- if (!strcmp(typeString, "xinetd"))
@@ -179,7 +180,7 @@ diff -ur chkconfig-1.3.58/chkconfig.c chkconfig-1.3.58-noxinet/chkconfig.c
exit(1);
}
}
-@@ -789,16 +704,9 @@
+@@ -809,16 +721,9 @@
rc = readServiceInfo(name, type, &s, 0);
if (rc)
return 1;
@@ -196,9 +197,8 @@ diff -ur chkconfig-1.3.58/chkconfig.c chkconfig-1.3.58-noxinet/chkconfig.c
} else if (!strcmp(state, "on")) {
if (!noRedirectItem) {
forwardSystemd(name, type, "enable");
-diff -ur chkconfig-1.3.58/leveldb.c chkconfig-1.3.58-noxinet/leveldb.c
---- chkconfig-1.3.58/leveldb.c 2012-12-17 15:22:52.589660844 +0100
-+++ chkconfig-1.3.58-noxinet/leveldb.c 2012-12-17 15:20:13.621535628 +0100
+--- chkconfig-1.3.63/leveldb.c 2014-11-30 14:57:06.299908151 +0200
++++ chkconfig-1.3.63.no-xinetd/leveldb.c 2014-11-30 14:56:00.846594263 +0200
@@ -154,107 +154,6 @@
return 0;
}
@@ -367,7 +367,7 @@ diff -ur chkconfig-1.3.58/leveldb.c chkconfig-1.3.58-noxinet/leveldb.c
}
static struct dep *parseDeps(char *pos, char *end) {
-@@ -760,60 +650,6 @@
+@@ -760,62 +650,6 @@
return ret;
}
@@ -377,6 +377,7 @@ diff -ur chkconfig-1.3.58/leveldb.c chkconfig-1.3.58-noxinet/leveldb.c
- char tmpstr[50];
- char *buf, *ptr, *tmp;
- struct stat sb;
+- mode_t mode;
-
- if (on == -1) {
- on = s.enabled ? 1 : 0;
@@ -395,7 +396,9 @@ diff -ur chkconfig-1.3.58/leveldb.c chkconfig-1.3.58-noxinet/leveldb.c
- close(oldfd);
- buf[sb.st_size] = '\0';
- snprintf(newfname,100,"%s/%s.XXXXXX",XINETDDIR,s.name);
+- mode = umask(S_IRWXG | S_IRWXO);
- newfd = mkstemp(newfname);
+- umask(mode);
- if (newfd == -1) {
- free(buf);
- return -1;
@@ -420,7 +423,6 @@ diff -ur chkconfig-1.3.58/leveldb.c chkconfig-1.3.58-noxinet/leveldb.c
- buf = ptr;
- }
- close(newfd);
-- chmod(newfname,0644);
- unlink(oldfname);
- return(rename(newfname,oldfname));
-}
@@ -428,9 +430,8 @@ diff -ur chkconfig-1.3.58/leveldb.c chkconfig-1.3.58-noxinet/leveldb.c
int doSetService(struct service s, int level, int on) {
int priority = on ? s.sPriority : s.kPriority;
char linkname[200];
-diff -ur chkconfig-1.3.58/leveldb.h chkconfig-1.3.58-noxinet/leveldb.h
---- chkconfig-1.3.58/leveldb.h 2012-12-17 15:22:52.592994208 +0100
-+++ chkconfig-1.3.58-noxinet/leveldb.h 2012-12-17 15:20:38.435096400 +0100
+--- chkconfig-1.3.63/leveldb.h 2014-11-05 18:39:09.000000000 +0200
++++ chkconfig-1.3.63.no-xinetd/leveldb.h 2014-11-30 14:54:29.775316676 +0200
@@ -17,13 +17,11 @@
#define H_LEVELDB
@@ -446,7 +447,7 @@ diff -ur chkconfig-1.3.58/leveldb.h chkconfig-1.3.58-noxinet/leveldb.h
#ifndef SYSTEMD_SERVICE_PATH
#define SYSTEMD_SERVICE_PATH "/lib/systemd/system"
-@@ -63,8 +61,6 @@
+@@ -67,8 +65,6 @@
int whatLevels(char * name);
int doSetService(struct service s, int level, int on);
int findServiceEntries(char * name, int level, glob_t * globresptr);
@@ -455,9 +456,8 @@ diff -ur chkconfig-1.3.58/leveldb.h chkconfig-1.3.58-noxinet/leveldb.h
int systemdIsInit();
int systemdActive();
int isOverriddenBySystemd(const char *service);
-diff -ur chkconfig-1.3.58/ntsysv.c chkconfig-1.3.58-noxinet/ntsysv.c
---- chkconfig-1.3.58/ntsysv.c 2012-02-10 20:37:38.000000000 +0100
-+++ chkconfig-1.3.58-noxinet/ntsysv.c 2012-12-17 15:21:53.479118101 +0100
+--- chkconfig-1.3.63/ntsysv.c 2014-11-05 18:39:09.000000000 +0200
++++ chkconfig-1.3.63.no-xinetd/ntsysv.c 2014-11-30 14:54:29.775316676 +0200
@@ -61,15 +61,9 @@
states = alloca(sizeof(*states) * numServices);
@@ -474,7 +474,7 @@ diff -ur chkconfig-1.3.58/ntsysv.c chkconfig-1.3.58-noxinet/ntsysv.c
newtFormAddComponent(subform, checkboxes[i]);
}
-@@ -126,15 +120,9 @@
+@@ -126,16 +120,10 @@
if (!update) return 1;
for (i = 0; i < numServices; i++) {
@@ -490,11 +490,11 @@ diff -ur chkconfig-1.3.58/ntsysv.c chkconfig-1.3.58-noxinet/ntsysv.c
- }
}
-@@ -213,49 +201,6 @@
- }
+ return 0;
+@@ -214,49 +202,6 @@
closedir(dir);
--
+
- if (!stat("/usr/sbin/xinetd",&sb)) {
- if (!(dir = opendir(XINETDDIR))) {
- fprintf(stderr, "failed to open " XINETDDIR ": %s\n",
@@ -537,6 +537,7 @@ diff -ur chkconfig-1.3.58/ntsysv.c chkconfig-1.3.58-noxinet/ntsysv.c
- return 1;
- }
- }
-
+-
qsort(services, numServices, sizeof(*services), serviceNameCmp);
+ *servicesPtr = services;
diff --git a/chkconfig-optflags.patch b/chkconfig-optflags.patch
index 09c1f3a..95807ed 100644
--- a/chkconfig-optflags.patch
+++ b/chkconfig-optflags.patch
@@ -1,13 +1,13 @@
---- chkconfig-1.3.20/Makefile.orig 2006-06-19 22:17:51.000000000 +0200
-+++ chkconfig-1.3.20/Makefile 2006-06-19 22:20:58.334683500 +0200
-@@ -3,8 +3,8 @@
- CVSTAG = r$(subst .,-,$(VERSION)-$(RELEASE))
- CVSROOT = $(shell cat CVS/Root 2>/dev/null || :)
+--- chkconfig-1.3.63/Makefile~ 2014-11-05 18:39:09.000000000 +0200
++++ chkconfig-1.3.63/Makefile 2014-11-30 15:00:11.219270582 +0200
+@@ -1,8 +1,8 @@
+ VERSION=$(shell awk '/Version:/ { print $$2 }' chkconfig.spec)
+ TAG = chkconfig-$(VERSION)
-CFLAGS=-g -Wall $(RPM_OPT_FLAGS) -D_GNU_SOURCE
--LDFLAGS=-g
+-LDFLAGS+=-g
+CFLAGS=$(OPTFLAGS) -Wall -D_GNU_SOURCE
-+LDFLAGS=
++LDFLAGS+=
MAN=chkconfig.8 ntsysv.8 alternatives.8
PROG=chkconfig
BINDIR = /sbin
diff --git a/chkconfig-pl.patch b/chkconfig-pl.patch
index 25e7096..8232103 100644
--- a/chkconfig-pl.patch
+++ b/chkconfig-pl.patch
@@ -1,16 +1,16 @@
---- chkconfig-1.3.20/po/pl.po~ 2005-05-05 20:22:32.000000000 +0200
-+++ chkconfig-1.3.20/po/pl.po 2007-01-15 15:43:08.000000000 +0100
-@@ -80,11 +80,11 @@
+--- chkconfig-1.3.63/po/pl.po~ 2014-11-05 18:39:09.000000000 +0200
++++ chkconfig-1.3.63/po/pl.po 2014-11-30 15:01:59.484752041 +0200
+@@ -106,11 +106,11 @@
- #: ../chkconfig.c:391 ../chkconfig.c:396 ../chkconfig.c:517
+ #: ../chkconfig.c:419 ../chkconfig.c:424 ../chkconfig.c:547
msgid "on"
-msgstr "włączone"
+msgstr "wł"
- #: ../chkconfig.c:391 ../chkconfig.c:396 ../chkconfig.c:517
+ #: ../chkconfig.c:419 ../chkconfig.c:424 ../chkconfig.c:547
msgid "off"
-msgstr "wyłączone"
+msgstr "wył"
- #: ../chkconfig.c:479
+ #: ../chkconfig.c:509
#, c-format
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/chkconfig.git/commitdiff/bcda1112d64628be337656b583ef973e5abf8961
More information about the pld-cvs-commit
mailing list