From 1478a2a5ef5b62d4a3e96703eedb256c033380830bbd5bc988c1e4139b56dcc4 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 17 Jun 2019 13:59:26 +0000 Subject: [PATCH] Update to sysvinit-2.95 and startpar-0.63 OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=235 --- startpar-0.58.dif | 57 ++++++++++++++++++------------------- startpar-0.58.tar.bz2 | 3 -- startpar-0.63.tar.xz | 3 ++ sysvinit-2.88dsf-suse.patch | 13 ++++++--- sysvinit-2.90-no-kill.patch | 4 +-- sysvinit-2.90.dif | 28 +++++++++--------- sysvinit-2.90.tar.xz | 3 -- sysvinit-2.95.tar.xz | 3 ++ sysvinit.changes | 13 +++++++++ sysvinit.spec | 28 +++++++++++------- 10 files changed, 88 insertions(+), 67 deletions(-) delete mode 100644 startpar-0.58.tar.bz2 create mode 100644 startpar-0.63.tar.xz delete mode 100644 sysvinit-2.90.tar.xz create mode 100644 sysvinit-2.95.tar.xz diff --git a/startpar-0.58.dif b/startpar-0.58.dif index 76bcb67..efb38d6 100644 --- a/startpar-0.58.dif +++ b/startpar-0.58.dif @@ -1,31 +1,28 @@ ---- startpar.8 -+++ startpar.8 2012-04-09 13:25:33.000000000 +0000 -@@ -1,4 +1,4 @@ --.\" -+'\" e - .\" SuSE man page for startpar - .\" - .\" Copyright (c) 2003 SuSE Linux AG, Nuernberg, Germany. -@@ -62,13 +62,19 @@ option, the default is full parallelism. - the scripts can be provided with the - .B \-a - option. --Processes block by pending -+Processes blocked by pending - .B I/O --will weighting by the factor -+will cause new process creation to be weighted by the iorate factor - .IR 800 . - To change this factor the option - .B \-i --can be used to specify an other value. -+can be used to specify another value. The amount -+.EQ -+weight = (nblocked times iorate) / 1000 -+.EN -+will be subtracted from the total number of processes which could be -+started, where nblocked is the number of processes currently blocked -+by pending I/O. +--- + Makefile | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) + +--- Makefile ++++ Makefile 2019-06-17 13:48:36.894736888 +0000 +@@ -11,10 +11,9 @@ mandir = /usr/share/man + man1dir = $(mandir)/man1 - The output of each script is buffered and written when the script - exits, so output lines of different scripts won't mix. You can + SRCS = startpar.c makeboot.c proc.c +-CXXSRCS = compiletest.cc + HDRS = makeboot.h proc.h + REST = COPYING Makefile startpar.1 +-OBJS = $(SRCS:.c=.o) $(CXXSRCS:.cc=.o) ++OBJS = $(SRCS:.c=.o) + + STARTPAR := $(shell pwd)/startpar + TARBALL = $(PACKAGE)-$(VERSION).tar.xz +@@ -45,8 +44,7 @@ ifeq ($(MAKECMDGOALS),makeboot) + CFLAGS += -DTEST + endif + +-SOURCEFILES= compiletest.cc \ +- CHANGELOG \ ++SOURCEFILES= CHANGELOG \ + COPYING \ + makeboot.c \ + makeboot.h \ diff --git a/startpar-0.58.tar.bz2 b/startpar-0.58.tar.bz2 deleted file mode 100644 index b572c84..0000000 --- a/startpar-0.58.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff1db9a30fea2882c49a8c6aa2fa706e568f58b930cd35d643f304ff0f734a72 -size 21247 diff --git a/startpar-0.63.tar.xz b/startpar-0.63.tar.xz new file mode 100644 index 0000000..9400621 --- /dev/null +++ b/startpar-0.63.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:796032608983663aea114ec5927f1fd8cad8281b349b7716967d0e307b770609 +size 23684 diff --git a/sysvinit-2.88dsf-suse.patch b/sysvinit-2.88dsf-suse.patch index 1a52eb7..733265c 100644 --- a/sysvinit-2.88dsf-suse.patch +++ b/sysvinit-2.88dsf-suse.patch @@ -1,5 +1,10 @@ +--- + man/killall5.8 | 3 ++- + man/pidof.8 | 1 + + 2 files changed, 3 insertions(+), 1 deletion(-) + --- man/killall5.8 -+++ man/killall5.8 2010-03-19 14:43:25.000000000 +0000 ++++ man/killall5.8 2019-06-17 12:05:21.101622374 +0000 @@ -44,6 +44,7 @@ process were killed, and 1 if it was una .SH SEE ALSO .BR halt (8), @@ -10,9 +15,9 @@ .SH AUTHOR Miquel van Smoorenburg, miquels@cistron.nl --- man/pidof.8 -+++ man/pidof.8 2004-03-12 12:26:35.000000000 +0000 -@@ -83,6 +83,7 @@ that the executable name of running proc - so symbolic links to executables will also match. ++++ man/pidof.8 2019-06-17 12:06:25.816419988 +0000 +@@ -94,6 +94,7 @@ Zombie processes or processes in disk sl + are ignored, as attempts to access the stats of these will sometimes fail. .SH SEE ALSO +.BR pidofproc (8), diff --git a/sysvinit-2.90-no-kill.patch b/sysvinit-2.90-no-kill.patch index b1a792b..d894b94 100644 --- a/sysvinit-2.90-no-kill.patch +++ b/sysvinit-2.90-no-kill.patch @@ -4,7 +4,7 @@ --- src/killall5.c +++ src/killall5.c 2018-08-06 12:45:03.832836347 +0000 -@@ -468,6 +468,38 @@ int readarg(FILE *fp, char *buf, int sz) +@@ -470,6 +470,38 @@ int readarg(FILE *fp, char *buf, int sz) } /* @@ -43,7 +43,7 @@ * Read the proc filesystem. * CWD must be /proc to avoid problems if / is affected by the killing (ie depend on fuse). */ -@@ -650,6 +682,26 @@ int readproc(int do_stat) +@@ -674,6 +706,26 @@ int readproc(int do_stat) p->nfs = 0; switch (do_stat) { diff --git a/sysvinit-2.90.dif b/sysvinit-2.90.dif index c9cf247..eba171e 100644 --- a/sysvinit-2.90.dif +++ b/sysvinit-2.90.dif @@ -3,33 +3,33 @@ 1 file changed, 9 insertions(+), 18 deletions(-) --- src/Makefile -+++ src/Makefile 2018-08-06 12:55:51.256999853 +0000 ++++ src/Makefile 2019-06-17 13:24:27.189649266 +0000 @@ -9,7 +9,7 @@ # CPPFLAGS = --CFLAGS ?= -ansi -O2 -fomit-frame-pointer -fstack-protector-strong -+CFLAGS ?= $(RPM_OPT_FLAGS) - override CFLAGS += -W -Wall -Wunreachable-code -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -D_XOPEN_SOURCE -D_GNU_SOURCE +-CFLAGS ?= -O2 ++CFLAGS ?= $(RPM_OPT_FLAGS) + override CFLAGS += -ansi -fomit-frame-pointer -fstack-protector-strong -W -Wall -Wunreachable-code -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -D_XOPEN_SOURCE -D_GNU_SOURCE -DVERSION=\"$(VERSION)\" override CFLAGS += $(shell getconf LFS_CFLAGS) STATIC = @@ -23,13 +23,13 @@ MNTPOINT= # For some known distributions we do not build all programs, otherwise we do. BIN = --SBIN = init halt shutdown runlevel killall5 fstab-decode --USRBIN = last mesg -+SBIN = killall5 fstab-decode -+USRBIN = +-SBIN = init halt shutdown runlevel killall5 fstab-decode logsave +-USRBIN = last mesg readbootlog ++SBIN = killall5 fstab-decode logsave ++USRBIN = --MAN1 = last.1 lastb.1 mesg.1 +-MAN1 = last.1 lastb.1 mesg.1 readbootlog.1 -MAN5 = initscript.5 inittab.5 initctl.5 -MAN8 = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8 --MAN8 += shutdown.8 telinit.8 fstab-decode.8 -+MAN1 = -+MAN5 = +-MAN8 += shutdown.8 telinit.8 fstab-decode.8 logsave.8 ++MAN1 = ++MAN5 = +MAN8 = killall5.8 pidof.8 -+MAN8 += fstab-decode.8 ++MAN8 += fstab-decode.8 logsave.8 ifeq ($(DISTRO),) SBIN += sulogin bootlogd @@ -44,7 +44,7 @@ MANDB := endif -@@ -189,13 +185,8 @@ install: +@@ -203,13 +199,8 @@ install: all done # $(INSTALL_DIR) $(ROOT)/etc/ # $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/ diff --git a/sysvinit-2.90.tar.xz b/sysvinit-2.90.tar.xz deleted file mode 100644 index 371b28c..0000000 --- a/sysvinit-2.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:114cffc8ef514a38b9916de2050bb6d73b43dff7afd05aee6b09d2f6cea7664e -size 112840 diff --git a/sysvinit-2.95.tar.xz b/sysvinit-2.95.tar.xz new file mode 100644 index 0000000..f0130a6 --- /dev/null +++ b/sysvinit-2.95.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9029cb93f36bbbad8e1ce109f75e6f4d26056d271106e8812cda7159b6f86c8 +size 124576 diff --git a/sysvinit.changes b/sysvinit.changes index 691d317..fd3bab1 100644 --- a/sysvinit.changes +++ b/sysvinit.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Jun 17 13:54:35 UTC 2019 - Dr. Werner Fink + +- Update to sysvinit 2.95 + * new logsave helper +- Update to startpar-0.63 + * move startpar from /sbin to /bin +- Port our patches + * startpar-0.58.dif + * sysvinit-2.88dsf-suse.patch + * sysvinit-2.90-no-kill.patch + * sysvinit-2.90.dif + ------------------------------------------------------------------- Tue Apr 9 13:13:42 UTC 2019 - Dr. Werner Fink diff --git a/sysvinit.spec b/sysvinit.spec index b19a7a8..e8dcb30 100644 --- a/sysvinit.spec +++ b/sysvinit.spec @@ -18,9 +18,9 @@ Name: sysvinit %define KPVER 2.21 -%define SCVER 1.16 -%define SIVER 2.90 -%define START 0.58 +%define SCVER 1.20 +%define SIVER 2.95 +%define START 0.63 Version: %{SIVER} Release: 0 Summary: SysV-Style init @@ -29,18 +29,18 @@ Group: System/Base BuildRequires: blog-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build #!BuildIgnore: sysvinit-tools -Url: http://savannah.nongnu.org/projects/sysvinit/ +Url: https://savannah.nongnu.org/projects/sysvinit/ Source: sysvinit-%{SIVER}.tar.xz Source1: killproc-%{KPVER}.tar.bz2 -Source2: startpar-%{START}.tar.bz2 -Patch: %{name}-%{SIVER}.dif +Source2: startpar-%{START}.tar.xz +Patch: %{name}-2.90.dif Patch2: %{name}-2.88dsf-suse.patch -Patch9: %{name}-%{SIVER}-no-kill.patch +Patch9: %{name}-2.90-no-kill.patch Patch30: killproc-%{KPVER}.dif Patch31: killproc-2.18-open_flags.dif Patch32: killproc-sysmacros.patch Patch33: killproc-mntinf-optional.patch -Patch50: startpar-%{START}.dif +Patch50: startpar-0.58.dif Patch51: startpar-sysmacros.patch %description @@ -64,6 +64,10 @@ to startpar, killproc and pidof. System V init specific programs are in the sysvinit package. %prep +ls -l +rm -rf killproc-%{KPVER} +rm -rf startpar-%{START} startpar +ln -sf startpar startpar-%{START} %setup -n %{name}-%{SIVER} -q -b 1 -b 2 %patch2 -p0 -b .suse %patch9 -p0 -b .no-kill @@ -118,20 +122,22 @@ popd /bin/pidof /bin/usleep /bin/fsync +/bin/startpar /sbin/fstab-decode /sbin/checkproc /sbin/pidofproc /sbin/killproc /sbin/killall5 /sbin/pidof -/sbin/startpar +/sbin/startproc /sbin/rvmtab /sbin/vhangup /sbin/mkill -/sbin/startproc /sbin/start_daemon +/sbin/logsave %doc %{_mandir}/man1/usleep.1.gz %doc %{_mandir}/man1/fsync.1.gz +%doc %{_mandir}/man1/startpar.1.gz %doc %{_mandir}/man8/fstab-decode.8.gz %doc %{_mandir}/man8/checkproc.8.gz %doc %{_mandir}/man8/pidofproc.8.gz @@ -140,9 +146,9 @@ popd %doc %{_mandir}/man8/pidof.8.gz %doc %{_mandir}/man8/startproc.8.gz %doc %{_mandir}/man8/start_daemon.8.gz -%doc %{_mandir}/man8/startpar.8.gz %doc %{_mandir}/man8/rvmtab.8.gz %doc %{_mandir}/man8/vhangup.8.gz %doc %{_mandir}/man8/mkill.8.gz +%doc %{_mandir}/man8/logsave.8.gz %changelog