[initscripts] 9.24-1

[Bill Nottingham]

commit 8f1827e3d32d61f76f15ff8ddbf82ebc7a960104
Author: Bill Nottingham <notting at redhat.com>
Date:   Fri Jan 21 11:46:43 2011 -0500

    9.24-1

 .gitignore                                         |    1 +
 ...a-valid-character-in-network-device-names.patch |   25 ----
 48da8e5.patch                                      |  120 --------------------
 diff                                               |   13 --
 initscripts.spec                                   |   28 +++--
 sources                                            |    2 +-
 6 files changed, 18 insertions(+), 171 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7b7b2b1..503ebad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ initscripts-9.16.tar.bz2
 /initscripts-9.21.tar.bz2
 /initscripts-9.22.tar.bz2
 /initscripts-9.23.tar.bz2
+/initscripts-9.24.tar.bz2
diff --git a/initscripts.spec b/initscripts.spec
index 8f94a4e..76c7b96 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -4,11 +4,11 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 9.23
+Version: 9.24
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
-Release: 3%{?dist}
+Release: 1%{?dist}
 URL: http://fedorahosted.org/releases/i/n/initscripts/
 Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -60,9 +60,6 @@ Requires(post): /sbin/chkconfig, coreutils
 Requires(preun): /sbin/chkconfig
 BuildRequires: glib2-devel popt-devel gettext pkgconfig
 
-Patch0: diff
-Patch1: 0001-add-as-a-valid-character-in-network-device-names.patch
-
 %description
 The initscripts package contains the basic system scripts used to boot
 your Red Hat or Fedora system, change runlevels, and shut the system down
@@ -91,8 +88,6 @@ Currently, this consists of various memory checking code.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 make
@@ -129,6 +124,8 @@ rm -f \
  $RPM_BUILD_ROOT/etc/sysconfig/init.s390
 %endif
 
+touch $RPM_BUILD_ROOT/etc/crypttab
+
 %pre
 /usr/sbin/groupadd -g 22 -r -f utmp
 
@@ -290,6 +287,7 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %attr(0600,root,utmp) /var/log/btmp
 %ghost %attr(0664,root,utmp) /var/log/wtmp
 %ghost %attr(0664,root,utmp) /var/run/utmp
+%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab
 %dir /etc/tmpfiles.d
 /etc/tmpfiles.d/initscripts.conf
 
@@ -314,11 +312,17 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
-* Fri Dec 17 2010 Bill Nottingham <notting at redhat.com> - 9.23-3
-- accept '#' in ethernet device names (#663904, <matt_domsch at dell.com>)
-
-* Mon Dec 06 2010 Bill Nottingham <notting at redhat.com> - 9.23-2
-- fix routing regression (#660363)
+* Fri Jan 21 2010 Bill Nottingham <notting at redhat.com> - 9.24-1
+- ifup-eth/ifdown-eth: handle 'MASTER' being quoted. (#651450, <gfidente at redhat.com>)
+- tmpfiles.d: remove entries that exist in systemd
+- frob device when calling sysctl, in case of vlans. (#665601, #667211, <ossman at cendio.se>)
+- netfs: rework to handle bind-mounted cifs/ncpfs (#663140, <dmudrich at nospam.mudrichsystems.com>)
+- own /etc/crypttab (#664309)
+- init.d/network: add # as a valid character in network device names (<Matt_Domsch at dell.com>)
+- ifup-eth: fix routing regression (#660363)
+- sysctl.conf.s390 - system z optimized sysctl settings per default (#633323, <plautrba at redhat.com>)
+- serial.conf, tty.conf: stop tty and serial also on runlevel 's' (#629257, <plautrba at redhat.com>)
+- translation updates: bn_IN, es, gu, hi, nds, or, pa, uk, zh_CN
 
 * Thu Dec 02 2010 Bill Nottingham <notting at redhat.com> - 9.23-1
 - don't throw errors on unreadable /dev/stderr (#650103, <plautrba at redhat.com>)
diff --git a/sources b/sources
index af4ad12..64cf3ff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb012b5945caaa5fcf3268188af94337  initscripts-9.23.tar.bz2
+435f176a962d45c320bd510d7ed9436a  initscripts-9.24.tar.bz2