Accepting request 834509 from Base:System
OBS-URL: https://build.opensuse.org/request/show/834509 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sysvinit?expand=0&rev=172
This commit is contained in:
commit
0ae251f188
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package powerd
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -24,7 +24,7 @@ License: GPL-2.0-or-later
|
||||
Group: System/Base
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: systemd-rpm-macros
|
||||
Url: https://power.sourceforge.net/
|
||||
URL: https://power.sourceforge.net/
|
||||
Source0: powerd-%{version}.tar.bz2
|
||||
Source2: powerd.service
|
||||
Patch0: powerd-%{version}.dif
|
||||
|
@ -1,28 +1,12 @@
|
||||
---
|
||||
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
|
||||
|
||||
SRCS = startpar.c makeboot.c proc.c
|
||||
diff -ur -p0 startpar-0.65/Makefile startpar/Makefile
|
||||
--- Makefile 2020-07-07 02:04:06.000000000 +0200
|
||||
+++ Makefile 2020-08-25 17:03:05.687028264 +0200
|
||||
@@ -15 +14,0 @@ SRCS = startpar.c makeboot.c proc.c
|
||||
-CXXSRCS = compiletest.cc
|
||||
HDRS = makeboot.h proc.h
|
||||
REST = COPYING Makefile startpar.1
|
||||
@@ -18 +17 @@ 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
|
||||
|
||||
@@ -50,2 +49 @@ endif
|
||||
-SOURCEFILES= compiletest.cc \
|
||||
- CHANGELOG \
|
||||
+SOURCEFILES= CHANGELOG \
|
||||
COPYING \
|
||||
makeboot.c \
|
||||
makeboot.h \
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:796032608983663aea114ec5927f1fd8cad8281b349b7716967d0e307b770609
|
||||
size 23684
|
BIN
startpar-0.65.tar.xz
(Stored with Git LFS)
Normal file
BIN
startpar-0.65.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,12 +0,0 @@
|
||||
Index: startpar-0.58/proc.c
|
||||
===================================================================
|
||||
--- startpar-0.58.orig/proc.c
|
||||
+++ startpar-0.58/proc.c
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/types.h>
|
||||
+#include <sys/sysmacros.h>
|
||||
#include <sys/stat.h>
|
||||
#include <termios.h>
|
||||
#include <fcntl.h>
|
@ -2,8 +2,10 @@
|
||||
src/Makefile | 27 +++++++++------------------
|
||||
1 file changed, 9 insertions(+), 18 deletions(-)
|
||||
|
||||
--- src/Makefile
|
||||
+++ src/Makefile 2019-06-17 13:24:27.189649266 +0000
|
||||
Index: src/Makefile
|
||||
===================================================================
|
||||
--- src/Makefile.orig
|
||||
+++ src/Makefile
|
||||
@@ -9,7 +9,7 @@
|
||||
#
|
||||
|
||||
@ -44,9 +46,9 @@
|
||||
MANDB :=
|
||||
endif
|
||||
|
||||
@@ -202,13 +198,8 @@ install: all
|
||||
done
|
||||
@@ -205,13 +201,8 @@ install: all
|
||||
# $(INSTALL_DIR) $(ROOT)/etc/
|
||||
$(INSTALL_DIR) $(ROOT)/etc/inittab.d
|
||||
# $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/
|
||||
- ln -sf halt $(ROOT)/sbin/reboot
|
||||
- ln -sf halt $(ROOT)/sbin/poweroff
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2a2e26b72aa235a23ab1c8471005f890309ce1196c83fbc9413c57b9ab62b587
|
||||
size 122164
|
3
sysvinit-2.97.tar.xz
Normal file
3
sysvinit-2.97.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2d5996857519bfd8634d2e1debabb3238fb38440f65fbfdc46420ee8bdf25110
|
||||
size 126848
|
@ -1,3 +1,33 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Aug 26 12:42:23 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Drop /bin/pidof and /sbin/pidof, including corresponding man
|
||||
page: let's switch to pidof as provided by procps-ng.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 25 14:45:33 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Update to sysvinit 2.97:
|
||||
* Check $(ROOT) filesystem for libcrypt instead of a hardcoded
|
||||
path to /usr.
|
||||
* Code clean-up and making sure we avoid freeing unused memory.
|
||||
* Added shell script which converts systemd unit files into
|
||||
init.d style scripts.
|
||||
* Allow init to load configuration data from files stored in
|
||||
/etc/inittab.d/
|
||||
* Allow shutdown time to be specified in the format +hh:mm. This
|
||||
is in addition to the existing formats such as hh:mm, +m, and
|
||||
"now".
|
||||
* Fixed typos in manual pages.
|
||||
- Update startpar to 0.65:
|
||||
+ Make sure startpar testsuite can find insserv executable in
|
||||
/usr/sbin or /sbin.
|
||||
+ Added PREFIX variable to Makefile and testsuite to make
|
||||
location of startpar and insserv more flexible.
|
||||
- Rebase sysvinit-2.90.dif.
|
||||
- Drop SCVER defines: not used in any place.
|
||||
- Drop startpar-sysmacros.patch: fixed upstream.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 18 07:45:38 UTC 2019 - Dr. Werner Fink <werner@suse.de>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package sysvinit
|
||||
#
|
||||
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -18,9 +18,8 @@
|
||||
|
||||
Name: sysvinit
|
||||
%define KPVER 2.23
|
||||
%define SCVER 1.20
|
||||
%define SIVER 2.96
|
||||
%define START 0.63
|
||||
%define SIVER 2.97
|
||||
%define START 0.65
|
||||
Version: %{SIVER}
|
||||
Release: 0
|
||||
Summary: SysV-Style init
|
||||
@ -29,15 +28,14 @@ Group: System/Base
|
||||
BuildRequires: blog-devel
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
#!BuildIgnore: sysvinit-tools
|
||||
Url: https://savannah.nongnu.org/projects/sysvinit/
|
||||
Source: sysvinit-%{SIVER}.tar.xz
|
||||
URL: https://savannah.nongnu.org/projects/sysvinit/
|
||||
Source: http://download.savannah.nongnu.org/releases/sysvinit/sysvinit-%{SIVER}.tar.xz
|
||||
Source1: https://github.com/bitstreamout/killproc/archive/v%{KPVER}.tar.gz#/killproc-%{KPVER}.tar.gz
|
||||
Source2: startpar-%{START}.tar.xz
|
||||
Source2: http://download.savannah.nongnu.org/releases/sysvinit/startpar-%{START}.tar.xz
|
||||
Patch: %{name}-2.90.dif
|
||||
Patch2: %{name}-2.88dsf-suse.patch
|
||||
Patch9: %{name}-2.90-no-kill.patch
|
||||
Patch50: startpar-0.58.dif
|
||||
Patch51: startpar-sysmacros.patch
|
||||
|
||||
%description
|
||||
System V style init programs by Miquel van Smoorenburg that control the
|
||||
@ -56,7 +54,7 @@ Requires: blog
|
||||
|
||||
%description tools
|
||||
Helper tools from sysvinit that support booting, including but not exclusive
|
||||
to startpar, killproc and pidof. System V init specific programs are in the
|
||||
to startpar and killproc. System V init specific programs are in the
|
||||
sysvinit package.
|
||||
|
||||
%prep
|
||||
@ -76,7 +74,6 @@ ln -t../%{name}-%{SIVER}/doc/killproc README.md
|
||||
popd
|
||||
pushd ../startpar-%{START}
|
||||
%patch50
|
||||
%patch51 -p1
|
||||
popd
|
||||
%_fixowner .
|
||||
%_fixgroup .
|
||||
@ -106,26 +103,26 @@ popd
|
||||
# Remove files not packed:
|
||||
#
|
||||
rm -vf %{buildroot}/usr/include/initreq.h
|
||||
# pidof is part of procps-ng; let's remove the symlinks to killproc5 here
|
||||
rm -f %{buildroot}{/sbin,/bin,%{_mandir}/man8}/pidof{,.8}
|
||||
|
||||
%files tools
|
||||
%defattr (-,root,root,755)
|
||||
%license COPYING COPYRIGHT
|
||||
%doc doc/Propaganda doc/Changelog doc/killproc
|
||||
/bin/pidof
|
||||
/bin/usleep
|
||||
/bin/fsync
|
||||
/bin/startpar
|
||||
/sbin/fstab-decode
|
||||
/sbin/checkproc
|
||||
/sbin/pidofproc
|
||||
/sbin/killproc
|
||||
/sbin/killall5
|
||||
/sbin/pidof
|
||||
/sbin/startproc
|
||||
/sbin/rvmtab
|
||||
/sbin/vhangup
|
||||
/sbin/mkill
|
||||
/sbin/start_daemon
|
||||
%{_bindir}/startpar
|
||||
%doc %{_mandir}/man1/usleep.1.gz
|
||||
%doc %{_mandir}/man1/fsync.1.gz
|
||||
%doc %{_mandir}/man1/startpar.1.gz
|
||||
@ -134,7 +131,6 @@ popd
|
||||
%doc %{_mandir}/man8/pidofproc.8.gz
|
||||
%doc %{_mandir}/man8/killall5.8.gz
|
||||
%doc %{_mandir}/man8/killproc.8.gz
|
||||
%doc %{_mandir}/man8/pidof.8.gz
|
||||
%doc %{_mandir}/man8/startproc.8.gz
|
||||
%doc %{_mandir}/man8/start_daemon.8.gz
|
||||
%doc %{_mandir}/man8/rvmtab.8.gz
|
||||
|
Loading…
x
Reference in New Issue
Block a user