SysVinit:

- update to new upstream release 2.87dsf
  - remove upstreamed patched
- split off -tools subpackage to avoid upstart conflicts


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@951 ec354946-7b23-47d6-9f5a-488ba84defc7

S/SysVinit/SysVinit-vl.spec

@@ -1,35 +1,27 @@
 Summary: Programs which control basic system processes.
 Summary(ja): 基本的なシステムプロセスを制御するプログラム
 Name: SysVinit
-Version: 2.86
+Version: 2.87dsf
 Release: 1%{_dist_release}
-License: GPL
+License: GPLv2+
 Group: System Environment/Base
-Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
+URL: https://alioth.debian.org/projects/pkg-sysvinit/
+Source: https://alioth.debian.org/frs/download.php/3060/sysvinit-%{version}.tar.gz
 Patch1: sysvinit-2.78-man.patch
-Patch2: sysvinit-2.77-md5-be.patch
-Patch3: sysvinit-2.78-halt.patch
-Patch4: sysvinit-2.86-autofsck.patch
-Patch5: sysvinit-2.86-loginshell.patch
-Patch6: sysvinit-2.86-makefile.patch
-Patch7: sysvinit-2.86-chroot.patch
-Patch8: sysvinit-2.86-inittab.patch
-Patch9: sysvinit-2.86-environ.patch
-Patch10: sysvinit-2.86-pidof.patch
-Patch11: sysvinit-2.86-haltname.patch
-Patch12: sysvinit-2.86-haltman.patch
-Patch13: sysvinit-2.86-single.patch
-Patch14: sysvinit-2.86-maxproclen.patch
-Patch15: sysvinit-2.86-ipv6.patch
-Patch16: sysvinit-2.86-quiet.patch
-Patch17: sysvinit-2.86-godot.patch
-Patch18: sysvinit-2.86-timeval.patch
-Patch19: sysvinit-2.86-console-open.patch
-Patch22: 81_killall_avoid_init.dpatch
+Patch2: sysvinit-2.86-autofsck.patch
+Patch3: sysvinit-2.86-loginshell.patch
+Patch4: sysvinit-2.86-inittab.patch
+Patch5: sysvinit-2.86-single.patch
+Patch6: sysvinit-2.86-quiet.patch
+Patch10: sysvinit-2.87-pidof.patch
+Patch11: sysvinit-2.86-pidof-man.patch
+Patch12: sysvinit-2.87-sulogin.patch
+Patch13: sysvinit-2.87-wide.patch
 Source1: change_console
 Source2: change_console.8
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Requires: pam >= 0.66-5
+Requires: %{name}-tools = %{version}-%{release}
 
 %description
 The SysVinit package contains a group of processes that control
@@ -44,54 +36,42 @@ SysVinit パッケージには，システムの非常に基本的な機能を
 よって最初に起動されるプログラムである init 等です．init はその後
 システムの起動や，他のプログラムの起動/終了を制御します．
 
+%package tools
+Summary: Tools used for process and utmp management.
+Group: System Environment/Base
+
+%description tools
+The sysvinit-tools package contains various tools used for process
+management.
 
 %prep
 %setup -q -n sysvinit-%{version}
-# We use a shell, not sulogin. Other random man fixes go here (such as #192804)
+# We use a shell, not sulogin. Other random man fixes go here (such as
+#192804)
 %patch1 -p1 -b .manpatch
-# Handle bigendian MD5
-%patch2 -p1 -b .be
-# Create /halt or /poweroff on shutdown
-%patch3 -p1 -b .halt
 # Unlink /.autofsck on shutdown -f
-%patch4 -p1 -b .autofsck
+%patch2 -p1 -b .autofsck
 # Invoke single-user shell as a login shell (#105653)
-%patch5 -p1 -b .loginshell
-# Various makefile adjustments
-%patch6 -p1 -b .makefile
-# Add -c option for only matching processes with the same root
-%patch7 -p1 -b .chroot
+%patch3 -p1 -b .loginshell
 # Adjust examples in inittab(5) to more accurately reflect RH/Fedora
 # usage (#173572)
-%patch8 -p1 -b .inittabdocs
-# Assumedly, if we're passing an environment as the last arg, we
-# want execle, not execl.
-%patch9 -p1 -b .environ
+%patch4 -p1 -b .inittabdocs
+# Fix single user mode (#176348)
+%patch5 -p1 -b .single
+# Be less verbose when booted with 'quiet'
+%patch6 -p1 -b .quiet
 # Fix various things in pidof - pidof /x/y matching /z/y, pidof -x
 # for scripts, etc.
 %patch10 -p1 -b .pidof
-# Fix halt when called by login
-%patch11 -p1 -b .haltname
-# Document pam_console usage
-%patch12 -p1 -b .haltman
-# Fix single user mode (#176348)
-%patch13 -p1 -b .single
-# Fix under-copy of proc title (#188160)
-%patch14 -p1 -b .maxproclen
-# ipv6 support in last
-%patch15 -p1 -b .ipv6
-# Be less verbose when booted with 'quiet'
-%patch16 -p1 -b .quiet
-# Preserve 'waiting' across re-exec (#199305, #201146, #143289)
-%patch17 -p1 -b .godot
-# Don't overwrite ut_addr_v6 on 64-bit platforms (#176494)
-%patch18 -p1 -b .timeval
-# Allow some time for failed opens to resolve themselves (#181546)
-%patch19 -p1 -b .console-open
-%patch22 -p1 -b .nopid1
+# Document some of the behavior of pidof. (#201317)
+%patch11 -p1 -b .pidof
+# get_default_context_with_level returns 0 on success (#568530)
+%patch12 -p1 -b .sulogin
+# Add wide output names with -w (#550333)
+%patch13 -p1 -b .wide
 
 %build
-make %{?_smp_mflags} CC=%{__cc} -C src
+make %{?_smp_mflags} CC=%{__cc} CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" LDFLAGS="" LCRYPT="-lcrypt" -C src
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -122,30 +102,50 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root)
-%doc doc/Changelog doc/Install
-%doc doc/sysvinit-%{version}.lsm contrib/start-stop-daemon.* 
+%doc doc/Changelog doc/Install COPYRIGHT
 /sbin/halt
 /sbin/init
-/sbin/killall5
-/sbin/pidof
 /sbin/poweroff
 /sbin/reboot
 /sbin/runlevel
 /sbin/shutdown
-/sbin/sulogin
 /sbin/telinit
-/sbin/change_console
 %{_includedir}/initreq.h
+%attr(2555,root,tty)  %{_bindir}/wall
+%{_mandir}/man5/*
+%{_mandir}/man8/halt*
+%{_mandir}/man8/init*
+%{_mandir}/man8/poweroff*
+%{_mandir}/man8/reboot*
+%{_mandir}/man8/runlevel*
+%{_mandir}/man8/shutdown*
+%{_mandir}/man8/telinit*
+
+
+%files tools
+%defattr(-,root,root)
+%doc doc/Changelog COPYRIGHT
 %{_bindir}/last
 %{_bindir}/lastb
 %{_bindir}/mesg
 %{_bindir}/utmpdump
 %{_sysbindir}/mountpoint
 %attr(2555,root,tty)  %{_bindir}/wall
-%{_mandir}/*/*
-/dev/initctl
+/sbin/pidof
+/sbin/killall5
+/sbin/sulogin
+%{_mandir}/man1/*
+%{_mandir}/man8/killall5*
+%{_mandir}/man8/pidof*
+%{_mandir}/man8/sulogin*
+
 
 %changelog
+* Fri Apr 23 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 2.87dsf-1
+- new upstream release (2.87dsf)
+- remove upstreamed or obsoleted patches
+- split off a -tools subpackage to avoid upstart conflicts
+
 * Mon Aug 04 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 2.86-1
 - new upstream release