Updating link to change in openSUSE:Factory/sysvinit revision 60.0

OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=52a628b951b97aecf385d230fc3c476b
This commit is contained in:
OBS User buildservice-autocommit 2010-01-29 15:52:43 +00:00 committed by Git OBS Bridge
parent 032e6604de
commit 82f9de736d
4 changed files with 10 additions and 13 deletions

View File

@ -1,5 +1,5 @@
--- src/killall5.c --- src/killall5.c
+++ src/killall5.c 2009-01-27 16:32:40.000000000 +0100 +++ src/killall5.c 2009-01-27 15:32:40.000000000 +0000
@@ -59,6 +59,8 @@ typedef struct proc { @@ -59,6 +59,8 @@ typedef struct proc {
pid_t pid; /* Process ID. */ pid_t pid; /* Process ID. */
int sid; /* Session ID. */ int sid; /* Session ID. */

View File

@ -2,9 +2,7 @@
src/killall5.c | 10 ++++++++-- src/killall5.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-) 1 file changed, 8 insertions(+), 2 deletions(-)
Index: src/killall5.c --- src/killall5.c
===================================================================
--- src/killall5.c.orig
+++ src/killall5.c +++ src/killall5.c
@@ -62,6 +62,7 @@ typedef struct proc { @@ -62,6 +62,7 @@ typedef struct proc {
char isfuse; /* Provides FUSE filesystems */ char isfuse; /* Provides FUSE filesystems */
@ -19,7 +17,7 @@ Index: src/killall5.c
p->isudev = (strncmp(buf, "/sbin/udevd", 11) == 0); p->isudev = (strncmp(buf, "/sbin/udevd", 11) == 0);
+ /* Check for mdmon */ + /* Check for mdmon */
+ p->ismdmon = (strcmp(buf, "/sbin/mdmon") == 0); + p->ismdmon = (strncmp(buf, "/sbin/mdmon", 11) == 0);
+ +
/* Check for provider of FUSE filesystems */ /* Check for provider of FUSE filesystems */
p->isfuse = is_fuse(d->d_name); p->isfuse = is_fuse(d->d_name);

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jan 29 14:30:44 CET 2010 - werner@suse.de
- Remove start-stop-daemon binary (bnc#568950)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 21 16:16:13 CET 2009 - werner@suse.de Mon Dec 21 16:16:13 CET 2009 - werner@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package sysvinit (Version 2.86) # spec file for package sysvinit (Version 2.86)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -30,7 +30,7 @@ Group: System/Base
PreReq: coreutils PreReq: coreutils
AutoReqProv: on AutoReqProv: on
Version: 2.86 Version: 2.86
Release: 218 Release: 219
Summary: SysV-Style init Summary: SysV-Style init
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libselinux-devel libsepol-devel BuildRequires: libselinux-devel libsepol-devel
@ -123,9 +123,6 @@ popd
CFLAGS="-Wall ${RPM_OPT_FLAGS} -D_GNU_SOURCE -D__NO_STRING_INLINES -pipe" CFLAGS="-Wall ${RPM_OPT_FLAGS} -D_GNU_SOURCE -D__NO_STRING_INLINES -pipe"
CC=gcc CC=gcc
make %{?jobs:-j%jobs} -C src CFLAGS="$CFLAGS" CC="$CC" make %{?jobs:-j%jobs} -C src CFLAGS="$CFLAGS" CC="$CC"
pushd contrib/
$CC $CFLAGS -o start-stop-daemon start-stop-daemon.c
popd
pushd ../showconsole-%{SCVER} pushd ../showconsole-%{SCVER}
make %{?jobs:-j%jobs}; make %{?jobs:-j%jobs};
popd popd
@ -157,7 +154,6 @@ popd
mkdir -m 755 -p ${RPM_BUILD_ROOT}%{_mandir}/man5 mkdir -m 755 -p ${RPM_BUILD_ROOT}%{_mandir}/man5
mkdir -m 755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 mkdir -m 755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8
make install -C src MANPATH=%{_mandir} ROOT=${RPM_BUILD_ROOT} make install -C src MANPATH=%{_mandir} ROOT=${RPM_BUILD_ROOT}
install contrib/start-stop-daemon ${RPM_BUILD_ROOT}/sbin/
test -p ${RPM_BUILD_ROOT}/dev/initctl || { test -p ${RPM_BUILD_ROOT}/dev/initctl || {
rm -f ${RPM_BUILD_ROOT}/dev/initctl rm -f ${RPM_BUILD_ROOT}/dev/initctl
mknod ${RPM_BUILD_ROOT}/dev/initctl p mknod ${RPM_BUILD_ROOT}/dev/initctl p
@ -241,7 +237,6 @@ rm -rf ${RPM_BUILD_ROOT}
%doc ../powerd-%{PDVER}/powerd.conf.monitor %doc ../powerd-%{PDVER}/powerd.conf.monitor
%doc ../powerd-%{PDVER}/powerd.conf.peer %doc ../powerd-%{PDVER}/powerd.conf.peer
%endif %endif
%doc contrib/start-stop-daemon.README
# %doc contrib/bootlogd.README # %doc contrib/bootlogd.README
%dir /lib/mkinitrd %dir /lib/mkinitrd
%dir /lib/mkinitrd/scripts %dir /lib/mkinitrd/scripts
@ -276,7 +271,6 @@ rm -rf ${RPM_BUILD_ROOT}
/sbin/startproc /sbin/startproc
/sbin/start_daemon /sbin/start_daemon
/sbin/shutdown /sbin/shutdown
/sbin/start-stop-daemon
/sbin/sulogin /sbin/sulogin
/sbin/telinit /sbin/telinit
/sbin/startpar /sbin/startpar