[shorewall/f15] Update to 4.4.23.3 Use upstreamed SysV init files Add cosmetic patches for init files
Jonathan G. Underwood
jgu at fedoraproject.org
Wed Sep 28 19:59:55 UTC 2011
commit e7753d346e8dc1db5f55d65ae639528808bd86ab
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date: Wed Sep 28 20:57:44 2011 +0100
Update to 4.4.23.3
Use upstreamed SysV init files
Add cosmetic patches for init files
.gitignore | 5 ++
shorewall-foo-init.sh | 112 ----------------------------------------
shorewall-init.patch | 30 +++++++++++
shorewall-init.sh | 121 --------------------------------------------
shorewall-lite-init.patch | 38 ++++++++++++++
shorewall.spec | 45 +++++++----------
shorewall6-init.patch | 38 ++++++++++++++
shorewall6-lite-init.patch | 38 ++++++++++++++
sources | 10 ++--
9 files changed, 172 insertions(+), 265 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 78ad53c..fe62bbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,8 @@ shorewall-lite-4.4.11.1.tar.bz2
/shorewall6-lite-4.4.22.3.tar.bz2
/shorewall-init-4.4.22.3.tar.bz2
/shorewall-lite-4.4.22.3.tar.bz2
+/shorewall-4.4.23.3.tar.bz2
+/shorewall6-4.4.23.3.tar.bz2
+/shorewall6-lite-4.4.23.3.tar.bz2
+/shorewall-init-4.4.23.3.tar.bz2
+/shorewall-lite-4.4.23.3.tar.bz2
diff --git a/shorewall-init.patch b/shorewall-init.patch
new file mode 100644
index 0000000..a95e6e4
--- /dev/null
+++ b/shorewall-init.patch
@@ -0,0 +1,30 @@
+diff -up shorewall-4.4.23.3/init.fedora.sh.orig shorewall-4.4.23.3/init.fedora.sh
+--- shorewall-4.4.23.3/init.fedora.sh.orig 2011-09-28 20:39:16.276884494 +0100
++++ shorewall-4.4.23.3/init.fedora.sh 2011-09-28 20:42:38.247551968 +0100
+@@ -33,7 +33,7 @@ if [ -f /etc/sysconfig/$prog ]; then
+ fi
+
+ start() {
+- echo -n $"Starting Shorewall: "
++ echo -n $"Starting $prog: "
+ $shorewall $OPTIONS start 2>&1 | $logger
+ retval=${PIPESTATUS[0]}
+ if [[ $retval == 0 ]]; then
+@@ -47,7 +47,7 @@ start() {
+ }
+
+ stop() {
+- echo -n $"Stopping Shorewall: "
++ echo -n $"Stopping $prog: "
+ $shorewall $OPTIONS stop 2>&1 | $logger
+ retval=${PIPESTATUS[0]}
+ if [[ $retval == 0 ]]; then
+@@ -63,7 +63,7 @@ stop() {
+ restart() {
+ # Note that we don't simply stop and start since shorewall has a built in
+ # restart which stops the firewall if running and then starts it.
+- echo -n $"Restarting Shorewall: "
++ echo -n $"Restarting $prog: "
+ $shorewall $OPTIONS restart 2>&1 | $logger
+ retval=${PIPESTATUS[0]}
+ if [[ $retval == 0 ]]; then
diff --git a/shorewall-lite-init.patch b/shorewall-lite-init.patch
new file mode 100644
index 0000000..446d1d6
--- /dev/null
+++ b/shorewall-lite-init.patch
@@ -0,0 +1,38 @@
+diff -up shorewall-lite-4.4.23.3/init.fedora.sh.orig shorewall-lite-4.4.23.3/init.fedora.sh
+--- shorewall-lite-4.4.23.3/init.fedora.sh.orig 2011-09-28 20:06:36.182969392 +0100
++++ shorewall-lite-4.4.23.3/init.fedora.sh 2011-09-28 20:34:12.303874709 +0100
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ #
+-# Shorewall init script
++# Shorewall-lite init script
+ #
+ # chkconfig: - 28 90
+ # description: Packet filtering firewall
+@@ -33,7 +33,7 @@ if [ -f /etc/sysconfig/$prog ]; then
+ fi
+
+ start() {
+- echo -n $"Starting Shorewall: "
++ echo -n $"Starting $prog: "
+ $shorewall $OPTIONS start 2>&1 | $logger
+ retval=${PIPESTATUS[0]}
+ if [[ $retval == 0 ]]; then
+@@ -47,7 +47,7 @@ start() {
+ }
+
+ stop() {
+- echo -n $"Stopping Shorewall: "
++ echo -n $"Stopping $prog: "
+ $shorewall $OPTIONS stop 2>&1 | $logger
+ retval=${PIPESTATUS[0]}
+ if [[ $retval == 0 ]]; then
+@@ -63,7 +63,7 @@ stop() {
+ restart() {
+ # Note that we don't simply stop and start since shorewall has a built in
+ # restart which stops the firewall if running and then starts it.
+- echo -n $"Restarting Shorewall: "
++ echo -n $"Restarting $prog: "
+ $shorewall $OPTIONS restart 2>&1 | $logger
+ retval=${PIPESTATUS[0]}
+ if [[ $retval == 0 ]]; then
diff --git a/shorewall.spec b/shorewall.spec
index 1686d8a..4dffb6c 100644
--- a/shorewall.spec
+++ b/shorewall.spec
@@ -1,4 +1,4 @@
-%global mainver 4.4.22
+%global mainver 4.4.23
%global baseurl http://www.shorewall.net/pub/shorewall/4.4/shorewall-%{mainver}/
# A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0"
@@ -6,7 +6,7 @@
Name: shorewall
Version: %{mainver}.3
-Release: 2%{?dist}.1
+Release: 1%{?dist}
Summary: An iptables front end for firewall configuration
Group: Applications/System
License: GPLv2+
@@ -19,11 +19,10 @@ Source2: %{baseurl}/%{name}6-%{version}.tar.bz2
Source3: %{baseurl}/%{name}6-lite-%{version}.tar.bz2
Source4: %{baseurl}/%{name}-init-%{version}.tar.bz2
-# Init file for all sub-packages except shorewall-init
-Source10: shorewall-foo-init.sh
-
-# Init file for shorewall-init
-Source11: shorewall-init.sh
+Patch0: shorewall-init.patch
+Patch1: shorewall-lite-init.patch
+Patch2: shorewall6-init.patch
+Patch3: shorewall6-lite-init.patch
BuildRequires: perl
BuildArch: noarch
@@ -110,22 +109,10 @@ for 'event-driven' startup and shutdown.
%prep
%setup -q -c -n %{name}-%{version} -T -a0 -a1 -a2 -a3 -a4
-# Overwrite default init files with Fedora specific ones
-cp %{SOURCE10} shorewall-%{version}/init.sh
-
-cp %{SOURCE10} shorewall-lite-%{version}/init.sh
-sed -i -e 's|prog="shorewall"|prog="shorewall-lite"|' shorewall-lite-%{version}/init.sh
-sed -i -e 's|Provides: shorewall|Provides: shorewall-lite|' shorewall-lite-%{version}/init.sh
-
-cp %{SOURCE10} shorewall6-%{version}/init.sh
-sed -i -e 's|prog="shorewall"|prog="shorewall6"|' shorewall6-%{version}/init.sh
-sed -i -e 's|Provides: shorewall|Provides: shorewall6|' shorewall6-%{version}/init.sh
-
-cp %{SOURCE10} shorewall6-lite-%{version}/init.sh
-sed -i -e 's|prog="shorewall"|prog="shorewall6-lite"|' shorewall6-lite-%{version}/init.sh
-sed -i -e 's|Provides: shorewall|Provides: shorewall6-lite|' shorewall6-lite-%{version}/init.sh
-
-cp %{SOURCE11} shorewall-init-%{version}/init.sh
+%patch0 -p0
+%patch1 -p0
+%patch2 -p0
+%patch3 -p0
# Remove hash-bang from files which are not directly executed as shell
# scripts. This silences some rpmlint errors.
@@ -139,12 +126,11 @@ export DEST=%{_initrddir}
export LIBEXEC=%{_libexecdir}
export PERLLIB=%{perl_privlib}
-targets="shorewall-%{version} shorewall-lite-%{version} \
-shorewall6-%{version} shorewall6-lite-%{version} \
-shorewall-init-%{version}"
+targets="shorewall shorewall-lite shorewall6 shorewall6-lite shorewall-init"
for i in $targets; do
- pushd $i
+ pushd $i-%{version}
+ mv init.fedora.sh init.sh
./install.sh
popd
done
@@ -297,6 +283,11 @@ fi
%{_libexecdir}/shorewall-init
%changelog
+* Mon Aug 22 2011 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.23.3-1
+- Update to 4.4.23.3
+- Use upstreamed SysV init files
+- Add cosmetic patches for init files
+
* Mon Aug 22 2011 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.4.22.3-2.1
- Fix up error in files list
diff --git a/shorewall6-init.patch b/shorewall6-init.patch
new file mode 100644
index 0000000..917a4cd
--- /dev/null
+++ b/shorewall6-init.patch
@@ -0,0 +1,38 @@
+diff -up shorewall6-4.4.23.3/init.fedora.sh.orig shorewall6-4.4.23.3/init.fedora.sh
+--- shorewall6-4.4.23.3/init.fedora.sh.orig 2011-09-28 19:58:23.449479261 +0100
++++ shorewall6-4.4.23.3/init.fedora.sh 2011-09-28 20:35:03.610854233 +0100
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ #
+-# Shorewall init script
++# Shorewall6 init script
+ #
+ # chkconfig: - 28 90
+ # description: Packet filtering firewall
+@@ -33,7 +33,7 @@ if [ -f /etc/sysconfig/$prog ]; then
+ fi
+
+ start() {
+- echo -n $"Starting Shorewall: "
++ echo -n $"Starting $prog: "
+ $shorewall $OPTIONS start 2>&1 | $logger
+ retval=${PIPESTATUS[0]}
+ if [[ $retval == 0 ]]; then
+@@ -47,7 +47,7 @@ start() {
+ }
+
+ stop() {
+- echo -n $"Stopping Shorewall: "
++ echo -n $"Stopping $prog: "
+ $shorewall $OPTIONS stop 2>&1 | $logger
+ retval=${PIPESTATUS[0]}
+ if [[ $retval == 0 ]]; then
+@@ -63,7 +63,7 @@ stop() {
+ restart() {
+ # Note that we don't simply stop and start since shorewall has a built in
+ # restart which stops the firewall if running and then starts it.
+- echo -n $"Restarting Shorewall: "
++ echo -n $"Restarting $prog: "
+ $shorewall $OPTIONS restart 2>&1 | $logger
+ retval=${PIPESTATUS[0]}
+ if [[ $retval == 0 ]]; then
diff --git a/shorewall6-lite-init.patch b/shorewall6-lite-init.patch
new file mode 100644
index 0000000..d6bbde8
--- /dev/null
+++ b/shorewall6-lite-init.patch
@@ -0,0 +1,38 @@
+diff -up shorewall6-lite-4.4.23.3/init.fedora.sh.orig shorewall6-lite-4.4.23.3/init.fedora.sh
+--- shorewall6-lite-4.4.23.3/init.fedora.sh.orig 2011-09-28 20:05:17.861898425 +0100
++++ shorewall6-lite-4.4.23.3/init.fedora.sh 2011-09-28 20:37:32.792180362 +0100
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ #
+-# Shorewall init script
++# Shorewall6-lite init script
+ #
+ # chkconfig: - 28 90
+ # description: Packet filtering firewall
+@@ -33,7 +33,7 @@ if [ -f /etc/sysconfig/$prog ]; then
+ fi
+
+ start() {
+- echo -n $"Starting Shorewall: "
++ echo -n $"Starting $prog: "
+ $shorewall $OPTIONS start 2>&1 | $logger
+ retval=${PIPESTATUS[0]}
+ if [[ $retval == 0 ]]; then
+@@ -47,7 +47,7 @@ start() {
+ }
+
+ stop() {
+- echo -n $"Stopping Shorewall: "
++ echo -n $"Stopping $prog: "
+ $shorewall $OPTIONS stop 2>&1 | $logger
+ retval=${PIPESTATUS[0]}
+ if [[ $retval == 0 ]]; then
+@@ -63,7 +63,7 @@ stop() {
+ restart() {
+ # Note that we don't simply stop and start since shorewall has a built in
+ # restart which stops the firewall if running and then starts it.
+- echo -n $"Restarting Shorewall: "
++ echo -n $"Restarting $prog: "
+ $shorewall $OPTIONS restart 2>&1 | $logger
+ retval=${PIPESTATUS[0]}
+ if [[ $retval == 0 ]]; then
diff --git a/sources b/sources
index 27ff012..017c6b0 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-2cd64947280d4d8cc3892bb0c1c02bc6 shorewall-4.4.22.3.tar.bz2
-03d912cdcdc0a0b7f86688af73fb271b shorewall6-4.4.22.3.tar.bz2
-ad9039a5b47f7b6ca54a247352b057a5 shorewall6-lite-4.4.22.3.tar.bz2
-a74ce8276067218f68a4c4b87842360e shorewall-init-4.4.22.3.tar.bz2
-8cdd6cdef0f2822d3ee9e649f9e69d77 shorewall-lite-4.4.22.3.tar.bz2
+3d39174c71308739db234dcceead8b71 shorewall-4.4.23.3.tar.bz2
+4803c2e9b56f1e662dbfba4ecb4665b1 shorewall6-4.4.23.3.tar.bz2
+fb01610a959508b3cf8cadf595b05a19 shorewall6-lite-4.4.23.3.tar.bz2
+5ab6eb0a034da55d487040c51062b918 shorewall-init-4.4.23.3.tar.bz2
+49f468e1cbdba69d8f6a8d93eee4a9d4 shorewall-lite-4.4.23.3.tar.bz2
More information about the scm-commits
mailing list