Bugfix patches

0001-Fix-calling-of-firewall-cmd-in-ifup-post-ifdown-post.patch

@@ -0,0 +1,40 @@
+From a1f80c69c76070e33bd2c0228738115f2c9c1473 Mon Sep 17 00:00:00 2001
+From: Jiri Popelka <jpopelka@redhat.com>
+Date: Fri, 5 Oct 2012 16:57:32 +0200
+Subject: [PATCH] Fix calling of firewall-cmd in ifup-post/ifdown-post.
+
+firewall-cmd has been using combined longopts since 0.2.6
+---
+ sysconfig/network-scripts/ifdown-post | 2 +-
+ sysconfig/network-scripts/ifup-post   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sysconfig/network-scripts/ifdown-post b/sysconfig/network-scripts/ifdown-post
+index 68354de..bcf4765 100755
+--- a/sysconfig/network-scripts/ifdown-post
++++ b/sysconfig/network-scripts/ifdown-post
+@@ -48,7 +48,7 @@ fi
+ 
+ # Inform firewall
+ if [ -x /usr/bin/firewall-cmd -a "${REALDEVICE}" != "lo" ]; then
+-    /usr/bin/firewall-cmd --remove --interface="${DEVICE}" > /dev/null 2>&1
++    /usr/bin/firewall-cmd --remove-interface="${DEVICE}" > /dev/null 2>&1
+ fi
+ 
+ # Notify programs that have requested notification
+diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post
+index 1ebb9c2..ca14acf 100755
+--- a/sysconfig/network-scripts/ifup-post
++++ b/sysconfig/network-scripts/ifup-post
+@@ -95,7 +95,7 @@ fi
+ 
+ # Inform firewall which network zone (empty means default) this interface belongs to
+ if [ -x /usr/bin/firewall-cmd -a "${REALDEVICE}" != "lo" ]; then
+-    /usr/bin/firewall-cmd --zone="${ZONE}" --change --interface="${DEVICE}" > /dev/null 2>&1
++    /usr/bin/firewall-cmd --zone="${ZONE}" --change-interface="${DEVICE}" > /dev/null 2>&1
+ fi
+ 
+ # Notify programs that have requested notification
+-- 
+1.7.11.4
+

d7cc6f6.patch

@@ -0,0 +1,19 @@
+commit d7cc6f6b94ee125ec3642368493766d38992af10 (HEAD, origin/master, origin/HEAD, master)
+Author: Bill Nottingham <notting@redhat.com>
+Date:   Mon Oct 8 16:20:56 2012 -0400
+
+    Don't pass -F to fixfiles (#863662, <dwalsh@redhat.com>)
+
+diff --git a/systemd/fedora-autorelabel b/systemd/fedora-autorelabel
+index 61dc551..689908a 100755
+--- a/systemd/fedora-autorelabel
++++ b/systemd/fedora-autorelabel
+@@ -27,7 +27,7 @@ relabel_selinux() {
+ 	echo $"*** Relabeling could take a very long time, depending on file"
+ 	echo $"*** system size and speed of hard drives."
+ 
+-	/sbin/fixfiles -F restore > /dev/null 2>&1
++	/sbin/fixfiles restore > /dev/null 2>&1
+     fi
+     rm -f  /.autorelabel
+     systemctl --force reboot

initscripts.spec

@@ -4,7 +4,7 @@ Version: 9.41
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
-Release: 1%{?dist}
+Release: 2%{?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
@@ -30,6 +30,8 @@ Requires(pre): /usr/sbin/groupadd
 Requires(post): /sbin/chkconfig, coreutils
 Requires(preun): /sbin/chkconfig
 BuildRequires: glib2-devel popt-devel gettext pkgconfig
+Patch0: d7cc6f6.patch
+Patch1: 0001-Fix-calling-of-firewall-cmd-in-ifup-post-ifdown-post.patch
 
 %description
 The initscripts package contains the basic system scripts used to boot
@@ -50,6 +52,8 @@ Currently, this consists of various memory checking code.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 make
@@ -213,6 +217,10 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Mon Oct  8 2012 Bill Nottingham <notting@redhat.com> - 9.41-2
+- fix invocation of firewall-cmd for current firewalld (#864060, <jpopelka@redhat.com>)
+- fix invocation of fixfiles in autorelabel (#863662, <dwalsh@redhat.com>)
+
 * Fri Oct  5 2012 Bill Nottingham <notting@redhat.com> - 9.41-1
 - debugmode: MALLOC_CHECK_ is not thread safe. Don't enable it by default (#853175)
 - Add support for 256 color terminals (<pbrady@redhat.com>)