[shorewall] Remove ExecReload from all service files Add After=network.target to shorewall.service
Jonathan G. Underwood
jgu at fedoraproject.org
Mon Oct 10 22:18:27 UTC 2011
commit 6c136b4cb3abb79f5fe8a482aec21c57d6d873d8
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date: Mon Oct 10 23:18:06 2011 +0100
Remove ExecReload from all service files
Add After=network.target to shorewall.service
shorewall-4.4.23.3-service.patch | 19 +++++++++++++++++++
shorewall-init-4.4.23.3-service.patch | 11 +++++++++++
shorewall-lite-4.4.23.3-service.patch | 11 +++++++++++
shorewall.spec | 18 +++++++++++++++++-
shorewall6-4.4.23.3-service.patch | 11 +++++++++++
shorewall6-lite-4.4.23.3-service.patch | 11 +++++++++++
6 files changed, 80 insertions(+), 1 deletions(-)
---
diff --git a/shorewall-4.4.23.3-service.patch b/shorewall-4.4.23.3-service.patch
new file mode 100644
index 0000000..483858e
--- /dev/null
+++ b/shorewall-4.4.23.3-service.patch
@@ -0,0 +1,19 @@
+diff -up shorewall-4.4.23.3/shorewall.service.orig shorewall-4.4.23.3/shorewall.service
+--- shorewall-4.4.23.3/shorewall.service.orig 2011-10-10 22:45:27.887663791 +0100
++++ shorewall-4.4.23.3/shorewall.service 2011-10-10 22:49:44.790920511 +0100
+@@ -6,6 +6,7 @@
+ [Unit]
+ Description=Shorewall IPv4 firewall
+ After=syslog.target
++After=network.target
+
+ [Service]
+ Type=oneshot
+@@ -13,7 +14,6 @@ RemainAfterExit=yes
+ EnvironmentFile=-/etc/sysconfig/shorewall
+ StandardOutput=syslog
+ ExecStart=/sbin/shorewall $OPTIONS start
+-ExecReload=/sbin/shorewall $OPTIONS restart
+ ExecStop=/sbin/shorewall $OPTIONS stop
+
+ [Install]
diff --git a/shorewall-init-4.4.23.3-service.patch b/shorewall-init-4.4.23.3-service.patch
new file mode 100644
index 0000000..94a57cc
--- /dev/null
+++ b/shorewall-init-4.4.23.3-service.patch
@@ -0,0 +1,11 @@
+diff -up shorewall-init-4.4.23.3/shorewall-init.service.orig shorewall-init-4.4.23.3/shorewall-init.service
+--- shorewall-init-4.4.23.3/shorewall-init.service.orig 2011-10-10 23:07:21.242469577 +0100
++++ shorewall-init-4.4.23.3/shorewall-init.service 2011-10-10 23:07:35.019031981 +0100
+@@ -14,7 +14,6 @@ RemainAfterExit=yes
+ EnvironmentFile=-/etc/sysconfig/shorewall-init
+ StandardOutput=syslog
+ ExecStart=/sbin/shorewall-init $OPTIONS start
+-ExecReload=/sbin/shorewall-init $OPTIONS restart
+ ExecStop=/sbin/shorewall-init $OPTIONS stop
+
+ [Install]
diff --git a/shorewall-lite-4.4.23.3-service.patch b/shorewall-lite-4.4.23.3-service.patch
new file mode 100644
index 0000000..f38a9c2
--- /dev/null
+++ b/shorewall-lite-4.4.23.3-service.patch
@@ -0,0 +1,11 @@
+diff -up shorewall-lite-4.4.23.3/shorewall-lite.service.orig shorewall-lite-4.4.23.3/shorewall-lite.service
+--- shorewall-lite-4.4.23.3/shorewall-lite.service.orig 2011-10-10 22:50:26.385507446 +0100
++++ shorewall-lite-4.4.23.3/shorewall-lite.service 2011-10-10 22:50:42.615956249 +0100
+@@ -14,7 +14,6 @@ RemainAfterExit=yes
+ EnvironmentFile=-/etc/sysconfig/shorewall-lite
+ StandardOutput=syslog
+ ExecStart=/sbin/shorewall-lite $OPTIONS start
+-ExecReload=/sbin/shorewall-lite $OPTIONS restart
+ ExecStop=/sbin/shorewall-lite $OPTIONS stop
+
+ [Install]
diff --git a/shorewall.spec b/shorewall.spec
index f2db52d..f5b6a83 100644
--- a/shorewall.spec
+++ b/shorewall.spec
@@ -6,7 +6,7 @@
Name: shorewall
Version: %{mainver}.3
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: An iptables front end for firewall configuration
Group: Applications/System
License: GPLv2+
@@ -19,6 +19,12 @@ Source2: %{baseurl}/%{name}6-%{version}.tar.bz2
Source3: %{baseurl}/%{name}6-lite-%{version}.tar.bz2
Source4: %{baseurl}/%{name}-init-%{version}.tar.bz2
+Patch0: shorewall-4.4.23.3-service.patch
+Patch1: shorewall-lite-4.4.23.3-service.patch
+Patch2: shorewall6-4.4.23.3-service.patch
+Patch3: shorewall6-lite-4.4.23.3-service.patch
+Patch4: shorewall-init-4.4.23.3-service.patch
+
BuildRequires: perl
BuildRequires: systemd-units
@@ -122,6 +128,12 @@ for 'event-driven' startup and shutdown.
# scripts. This silences some rpmlint errors.
find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \;
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
+
%build
%install
@@ -370,6 +382,10 @@ fi
%attr(0755,root,root) %{_libexecdir}/shorewall-init
%changelog
+* Mon Oct 10 2011 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.23.3-6
+- Remove ExecReload from all service files
+- Add After=network.target to shorewall.service
+
* Wed Sep 21 2011 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.23.3-5
- Remove erroneous spec file comment
diff --git a/shorewall6-4.4.23.3-service.patch b/shorewall6-4.4.23.3-service.patch
new file mode 100644
index 0000000..c2de2c1
--- /dev/null
+++ b/shorewall6-4.4.23.3-service.patch
@@ -0,0 +1,11 @@
+diff -up shorewall6-4.4.23.3/shorewall6.service.orig shorewall6-4.4.23.3/shorewall6.service
+--- shorewall6-4.4.23.3/shorewall6.service.orig 2011-10-10 22:51:02.871268507 +0100
++++ shorewall6-4.4.23.3/shorewall6.service 2011-10-10 22:51:21.918621930 +0100
+@@ -14,7 +14,6 @@ RemainAfterExit=yes
+ EnvironmentFile=-/etc/sysconfig/shorewall6
+ StandardOutput=syslog
+ ExecStart=/sbin/shorewall6 $OPTIONS start
+-ExecReload=/sbin/shorewall6 $OPTIONS restart
+ ExecStop=/sbin/shorewall6 $OPTIONS stop
+
+ [Install]
diff --git a/shorewall6-lite-4.4.23.3-service.patch b/shorewall6-lite-4.4.23.3-service.patch
new file mode 100644
index 0000000..b920b81
--- /dev/null
+++ b/shorewall6-lite-4.4.23.3-service.patch
@@ -0,0 +1,11 @@
+diff -up shorewall6-lite-4.4.23.3/shorewall6-lite.service.orig shorewall6-lite-4.4.23.3/shorewall6-lite.service
+--- shorewall6-lite-4.4.23.3/shorewall6-lite.service.orig 2011-10-10 23:06:43.923654871 +0100
++++ shorewall6-lite-4.4.23.3/shorewall6-lite.service 2011-10-10 23:06:56.736247939 +0100
+@@ -14,7 +14,6 @@ RemainAfterExit=yes
+ EnvironmentFile=-/etc/sysconfig/shorewall6-lite
+ StandardOutput=syslog
+ ExecStart=/sbin/shorewall6-lite $OPTIONS start
+-ExecReload=/sbin/shorewall6-lite $OPTIONS restart
+ ExecStop=/sbin/shorewall6-lite $OPTIONS stop
+
+ [Install]
More information about the scm-commits
mailing list