[initscripts] 9.31-1

[Bill Nottingham]

commit 4c3a9506dd6cd332eb895362a29392db78c7a667
Author: Bill Nottingham <notting at redhat.com>
Date:   Tue Jun 21 15:45:28 2011 -0400

    9.31-1

 .gitignore       |    1 +
 initscripts.spec |   18 +++++++++++++++---
 sources          |    1 +
 3 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bed8bc2..37a3359 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /initscripts-9.30.tar.bz2
+/initscripts-9.31.tar.bz2
diff --git a/initscripts.spec b/initscripts.spec
index 858afd1..e35161d 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -4,7 +4,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 9.30
+Version: 9.31
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -54,6 +54,7 @@ Conflicts: e2fsprogs < 1.15
 # http://bugzilla.redhat.com/show_bug.cgi?id=252973
 Conflicts: nut < 2.2.0
 Conflicts: NetworkManager < 1:0.8.0-12.git20100504
+Conflicts: ipsec-tools < 0.8.0-2
 Obsoletes: hotplug <= 3:2004_09_23-10.1
 Requires(pre): /usr/sbin/groupadd
 Requires(post): /sbin/chkconfig, coreutils
@@ -204,8 +205,6 @@ rm -rf $RPM_BUILD_ROOT
 /etc/sysconfig/network-scripts/ifdown-eth
 /etc/sysconfig/network-scripts/ifup-ipv6
 /etc/sysconfig/network-scripts/ifdown-ipv6
-/etc/sysconfig/network-scripts/ifup-ipsec
-/etc/sysconfig/network-scripts/ifdown-ipsec
 /etc/sysconfig/network-scripts/ifup-sit
 /etc/sysconfig/network-scripts/ifdown-sit
 /etc/sysconfig/network-scripts/ifup-tunnel
@@ -245,6 +244,7 @@ rm -rf $RPM_BUILD_ROOT
 /etc/rc.d/init.d/*
 %exclude /etc/rc.d/init.d/halt
 %exclude /etc/rc.d/init.d/reboot
+%exclude /etc/rc.d/rc[0-9].d/*single
 %exclude /etc/rc.d/init.d/single
 %config(noreplace) /etc/rc.d/rc.local
 %config(noreplace) /etc/sysctl.conf
@@ -314,6 +314,18 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Tue Jun 21 2011 Bill Nottingham <notting at redhat.com> - 9.31-1
+- remove ifup/ifdown-ipsec; they're now in ipsec-tools
+- rc.sysinit: start udev by hand, start_udev is no more (#714531)
+- ifup-aliases: if IPv6 is configured on the alias, configure it. (#583409)
+- ifup-eth: ensure DHCP_HOSTNAME is a short hostname, seed it from HOSTNAME if needed. (#697877)
+- network-functions: override NETMASK from PREFIX where specified (#705367, <mpoole at redhat.com>)
+- exclude single symlink from main package (#705457)
+- network: VLAN, etc. interfaces can be slaves; check for being a slave first. (#703475)
+- network: use LC_ALL=C when calling sed. (https://bugs.mageia.org/show_bug.cgi?id=1216, via <sander.lepik at eesti.ee>)
+- functions: (umount_loop) fuser -k defaults to -9; set the initial pass to kill -15. (#703457)
+- init.d/halt: don't match filesystem types in hostnames (#703203, <jmueller at data-tronics.com>)
+
 * Wed Apr 27 2011 Bill Nottingham <notting at redhat.com> - 9.30-1
 - ifup-eth: handle IPADDRx correctly for static addresses (#697838)
 - systemd: fix storage setup service after cryptsetup.target (#699918)
diff --git a/sources b/sources
index a6e7960..5743bb2 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 504d559c387e9d81101a7422fa933820  initscripts-9.30.tar.bz2
+885929d864bebdd59c37734ea36f1698  initscripts-9.31.tar.bz2