rpms/sysvinit/devel sysvinit.spec,1.74,1.75

[Bill Nottingham]

Author: notting

Update of /cvs/extras/rpms/sysvinit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12060

Modified Files:
	sysvinit.spec 
Log Message:
Update to new upstream version.

pidof patches still need work.



Index: sysvinit.spec
===================================================================
RCS file: /cvs/extras/rpms/sysvinit/devel/sysvinit.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sysvinit.spec	27 Jul 2009 05:27:49 -0000	1.74
+++ sysvinit.spec	27 Jul 2009 18:00:26 -0000	1.75
@@ -1,35 +1,19 @@
 Summary: Programs which control basic system processes
 Name: sysvinit
-Version: 2.86
-Release: 28
+Version: 2.87
+Release: 0.dsf%{?dist}
 License: GPLv2+
 Group: System Environment/Base
-Source: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-%{version}.tar.gz
-URL: ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/
+Source: https://alioth.debian.org/frs/download.php/3060/sysvinit-%{version}dsf.tar.gz
+URL: https://alioth.debian.org/projects/pkg-sysvinit/
 Patch1: sysvinit-2.78-man.patch
-Patch2: sysvinit-2.86-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
+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.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
-Patch20: sysvinit-selinux.patch
-Patch21: sysvinit-no-abort.patch
-Patch22: 81_killall_avoid_init.dpatch
-Patch23: sysvinit-2.86-pidof-man.patch
-Patch24: sysvinit-2.86-utmpdump.patch
+Patch11: sysvinit-2.86-pidof-man.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: pam >= 0.66-5
 Requires: filesystem >= 2.2.4-1
@@ -55,61 +39,28 @@ The sysvinit-tools package contains vari
 management.
 
 %prep
-%setup -q -n sysvinit-%{version}
+%setup -q -n sysvinit-%{version}dsf
 # 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
-# SELinux support for init - loading policy, etc.
-%patch20 -p1 -b .selinux
-# Don't abort if policy is already loaded
-%patch21 -p1 -b .no-abort
-# Make killall avoid init
-%patch22 -p1 -b .nopid1
 # Document some of the behavior of pidof. (#201317)
-%patch23 -p1 -b .pidof
-# Don't pass around unchecked malloc (and avoid a leak) (#473485)
-%patch24 -p1 -b .wheee
+%patch11 -p1 -b .pidof
 
 %build
-make %{?_smp_mflags} CC="%{__cc}" CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" -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
@@ -119,10 +70,13 @@ done
 make -C src ROOT=$RPM_BUILD_ROOT MANDIR=%{_mandir} \
 	BIN_OWNER=`id -nu` BIN_GROUP=`id -ng` install
 
+rm -f $RPM_BUILD_ROOT/bin/pidof
 ln -snf killall5 $RPM_BUILD_ROOT/sbin/pidof
-
+rm -f $RPM_BUILD_ROOT/sbin/bootlogd
+rm -f $RPM_BUILD_ROOT/%{_mandir}/man8/bootlogd*
 chmod 755 $RPM_BUILD_ROOT/usr/bin/utmpdump
 
+# Remove these files, as we use upstart as /sbin/init.
 rm -f $RPM_BUILD_ROOT/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit}
 rm -f $RPM_BUILD_ROOT/%{_includedir}/initreq.h
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man5/*
@@ -136,10 +90,10 @@ exit 0
 rm -rf $RPM_BUILD_ROOT
 
 %if 0
+# Disabled for upstart.
 %files
 %defattr(-,root,root)
 %doc doc/Changelog doc/Install COPYRIGHT
-%doc doc/sysvinit-%{version}.lsm
 /sbin/halt
 /sbin/init
 /sbin/poweroff
@@ -160,7 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files tools
 %defattr(-,root,root)
-%doc doc/Changelog
+%doc doc/Changelog COPYRIGHT
 /bin/mountpoint
 %{_bindir}/last
 %{_bindir}/lastb
@@ -176,6 +130,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/sulogin*
 
 %changelog
+* Mon Jul 27 2009 Bill Nottingham <notting at redhat.com> - 2.87-0.dsf
+- Update to new upstream release 2.87dsf
+-- remove many upstreamed/obsolete patches
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.86-28
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild