dist-git conversion

.cvsignore

@@ -1 +0,0 @@
-initscripts-9.05.tar.bz2

.gitignore

@@ -0,0 +1 @@
+initscripts-9.12.1.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: initscripts
-# $Id$
-NAME := initscripts
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

initscripts-9.05-link.patch

@@ -1,13 +0,0 @@
-diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
-index 02a024a..89baeb4 100644
---- a/sysconfig/network-scripts/network-functions
-+++ b/sysconfig/network-scripts/network-functions
-@@ -253,7 +253,7 @@ check_link_down ()
- 	delay=10
- 	[ -n "$LINKDELAY" ] && delay=$(($LINKDELAY * 2))
- 	while [ $timeout -le $delay ]; do
--	    [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" = "1" ] && return 1
-+	    [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" != "0" ] && return 1
- 	    usleep 500000
- 	    timeout=$((timeout+1))
- 	done

initscripts.spec

@@ -2,21 +2,20 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 9.05
+Version: 9.12.1
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
-Release: 1%{?dist}.1
+Release: 1%{?dist}
 URL: http://fedorahosted.org/releases/i/n/initscripts/
 Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
-Patch: initscripts-9.05-link.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: mingetty, /bin/awk, /bin/sed, mktemp, e2fsprogs >= 1.15
-Requires: /sbin/sysctl, syslog
+Requires: mingetty, /bin/awk, /bin/sed, mktemp
+Requires: /sbin/sysctl
 Requires: /sbin/fuser, /bin/grep
 Requires: /sbin/pidof, /sbin/blkid
 Requires: module-init-tools
-Requires: util-linux-ng >= 2.16, mount >= 2.11l
+Requires: util-linux-ng >= 2.16
 Requires: bash >= 3.0
 Requires: sysvinit-tools >= 2.87
 %if with_upstart
@@ -25,21 +24,24 @@ Requires: upstart >= 0.6.0
 Requires: SysVinit >= 2.85-38
 %endif
 Requires: /sbin/ip, /sbin/arping, net-tools, /bin/find
-Requires: /etc/redhat-release, dev
-Requires: ethtool >= 1.8-2, /sbin/runuser
+Requires: /etc/redhat-release
+Requires: /sbin/runuser
 Requires: udev >= 125-1
-Requires: popt >= 1.12-2
 Requires: cpio
-Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 2.6.4-3
+Conflicts: mkinitrd < 4.0, kernel < 2.6.18, mdadm < 3.1.2-9
 Conflicts: ypbind < 1.6-12, psacct < 6.3.2-12, kbd < 1.06-19, lokkit < 0.50-14
 Conflicts: dhclient < 12:4.1.0-6
 Conflicts: tcsh < 6.13-5
 Conflicts: xorg-x11, glib2 < 2.11.1-2
 Conflicts: alsa-utils < 1.0.18
 Conflicts: plymouth < 0.7.0-0.2009.02.26
+Conflicts: s390utils < 2:1.8.2-11
+Conflicts: dmraid < 1.0.0.rc16-7
+Conflicts: e2fsprogs < 1.15
 # http://bugzilla.redhat.com/show_bug.cgi?id=252973
 Conflicts: nut < 2.2.0
-Obsoletes: hotplug
+Conflicts: NetworkManager < 1:0.8.0-12.git20100504
+Obsoletes: hotplug <= 3:2004_09_23-10.1
 Requires(pre): /usr/sbin/groupadd
 Requires(post): /sbin/chkconfig, coreutils
 Requires(preun): /sbin/chkconfig
@@ -64,7 +66,6 @@ Currently, this consists of various memory checking code.
 
 %prep
 %setup -q
-%patch -p1
 
 %build
 make
@@ -86,8 +87,6 @@ rm -f $RPM_BUILD_ROOT/etc/inittab.*
 %ifnarch s390 s390x
 rm -f \
  $RPM_BUILD_ROOT/etc/sysconfig/network-scripts/ifup-ctc \
- $RPM_BUILD_ROOT/lib/udev/rules.d/55-ccw.rules \
- $RPM_BUILD_ROOT/lib/udev/ccw_init
 %else
 rm -f \
  $RPM_BUILD_ROOT/etc/rc.d/rc.sysinit.s390init \
@@ -214,9 +213,6 @@ rm -rf $RPM_BUILD_ROOT
 /lib/udev/rename_device
 /lib/udev/console_init
 /lib/udev/console_check
-%ifarch s390 s390x
-/lib/udev/ccw_init
-%endif
 /sbin/service
 /sbin/ppp-watch
 %{_mandir}/man*/*
@@ -245,6 +241,58 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Thu Jun 24 2010 Bill Nottingham <notting@redhat.com> - 9.12.1-1
+- ifup-eth: check for dhclient configuration in /etc/dhcp as well (#607764, #607766)
+- init.d/functions: handle permission denied on reading PID file. (#595597)
+- network-functions: check NM_CONTROLLED before deciding to use NM for a connection. (#599707, probably others.)
+- rc.sysinit: always reboot on autorelabel. (#595823)
+- network-functions: behave sanely if we're not passed a device at all. (#589521, #592108)
+- sysconfig/debug: export debug variables. (#589378)
+- netfs: check for NetworkManager to be connected, not just running. (#589710, #592095)
+- rcS*.conf - check if /etc/inittab exists (#590703, <plautrba@redhat.com>)
+- rc.sysinit - ignore monitoring on startup. (#589037)
+- translation updates: or
+
+* Wed May  5 2010 Bill Nottingham <notting@redhat.com> - 9.12-1
+- update for final nmcli syntax
+
+* Mon May  3 2010 Bill Nottingham <notting@redhat.com> - 9.11-1
+- init/plymouth-shutdown.conf: add 'task' here as well
+
+* Wed Apr 28 2010 Bill Nottingham <notting@redhat.com> - 9.10-1
+- fstab-decode.8: fix formatting (#586476)
+- prefdm: add --retain-splash for KDM as well (#585250)
+- init.d/functions: handle being unable to read a specified pid file. (#584575)
+- init/quit-plymouth.conf: use 'task' for stopping plymouth. (<rstrode@redhat.com>)
+- ifup-eth: run dhclient -6 similar to dhclient -4. (#585047)
+- net.hotplug: don't run on odd interfaces. (#584530)
+
+* Fri Apr  9 2010 Bill Nottingham <notting@redhat.com> - 9.09-1
+- rc.sysinit: change RAID handling (<dledford@redhat.com>)
+- fix german mistranslation (#575954, <pb@bierenger.de>)
+- init.d/functions: correct fix for environment with runuser. (#203010, #564093)
+- halt: fix mdmom pid handling for newer mdadm (#549726, <dledford@redhat.com>)
+- init.d/network: only blacklist the original loopback interface. (#579816, <evgsyr@gmail.com>
+- translation updates: de, ja, nb, pt, sv, uk
+
+* Mon Mar  8 2010 Bill Nottingham <notting@redhat.com> - 9.08-1
+- network-functions: redirect error messages when nmcli isn't installed (#570828, <zing@fastmail.fm>)
+- ifdown: use nmcli to get the device, if not specified
+- ifdown: fix typo
+- translation updates: fr
+
+* Wed Mar  3 2010 Bill Nottingham <notting@redhat.com> - 9.07-1
+- clean out some extraneous package requirements
+- fix dmraid error checking now that dmraid has return codes (#568790, others)
+- integrate with NetworkManager for ifup/ifdown (#523064)
+- translation updates: cs, da, de, en_GB, es, fi, nl, pl, pt_BR, ru, sr
+
+* Fri Feb 19 2010 Bill Nottingham <notting@redhat.com> - 9.06-1
+- move ccw_init and ccw udev rules to s390utils (#539491)
+- rc.sysinit: suppress LVM2 warnings.  (#561938, <prajnoha@redhat.com>)
+- fix translated checks for user input (#566579)
+- refresh translations
+
 * Mon Feb 15 2010 Bill Nottingham <notting@redhat.com> - 9.05-1
 - network-functions: don't use ethtool for link state, assorted other cleanups
 - inittab: fix job paths in comments (<plautrba@redhat.com>)
@@ -415,7 +463,7 @@ rm -rf $RPM_BUILD_ROOT
 - event.d/serial: add some docs
 - init.d/functions: __pids_var_run: Handle multi-line pid files correctly (#473287)
 - remove support for no longer existing 'brctl setgcint' command. (#360471)
-- add %config back for ifcfg-lo (#472761)
+- add %%config back for ifcfg-lo (#472761)
 - rcS/rcS-sulogin: don't match commented lines when finding runlevel (#472717)
 - updated translations: de, sk
 

sources

@@ -1 +1 @@
-58ff8a7a09537155cbaf09b3a8e7b25f  initscripts-9.05.tar.bz2
+4c3fa121ab5cb54a74197edeaa72afda  initscripts-9.12.1.tar.bz2