[shorewall/el6] Update to 4.5.1. Remove unneeded patches.
Jonathan G. Underwood
jgu at fedoraproject.org
Sun Mar 18 12:52:53 UTC 2012
commit b9c51977f3f20ca9a60d8e7c6e73c16c97490617
Author: Jonathan G. Underwood <jonathan.underwood at gmail.com>
Date: Sun Mar 18 12:52:33 2012 +0000
Update to 4.5.1. Remove unneeded patches.
.gitignore | 6 ++
shorewall-init.patch | 30 ---------
shorewall-lite-init.patch | 38 ------------
shorewall.spec | 143 ++++++++++++++++++++++++-------------------
shorewall6-init.patch | 38 ------------
shorewall6-lite-init.patch | 38 ------------
sources | 11 ++--
7 files changed, 92 insertions(+), 212 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fe62bbf..35b5951 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,9 @@ shorewall-lite-4.4.11.1.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
+/shorewall-4.5.1.tar.bz2
+/shorewall6-4.5.1.tar.bz2
+/shorewall6-lite-4.5.1.tar.bz2
+/shorewall-core-4.5.1.tar.bz2
+/shorewall-init-4.5.1.tar.bz2
+/shorewall-lite-4.5.1.tar.bz2
diff --git a/shorewall.spec b/shorewall.spec
index 847d7ab..e185f84 100644
--- a/shorewall.spec
+++ b/shorewall.spec
@@ -1,40 +1,32 @@
-%global mainver 4.4.23
-%global baseurl http://www.shorewall.net/pub/shorewall/4.4/shorewall-%{mainver}/
+%global mainver 4.5.1
+#global baseurl http://www.shorewall.net/pub/shorewall/development/4.5/shorewall-4.5.0/
+%global baseurl http://www.shorewall.net/pub/shorewall/4.5/shorewall-%{mainver}/
# A very helpful document for packaging Shorewall is "Anatomy of Shorewall 4.0"
# which is found at http://www.shorewall.net/Anatomy.html
Name: shorewall
-Version: %{mainver}.3
+Version: %{mainver}
Release: 1%{?dist}
Summary: An iptables front end for firewall configuration
Group: Applications/System
License: GPLv2+
URL: http://www.shorewall.net/
-Provides: shorewall(firewall) = %{version}-%{release}
+Provides: shorewall(firewall) = %{version}-%{release}
Source0: %{baseurl}/%{name}-%{version}.tar.bz2
Source1: %{baseurl}/%{name}-lite-%{version}.tar.bz2
Source2: %{baseurl}/%{name}6-%{version}.tar.bz2
Source3: %{baseurl}/%{name}6-lite-%{version}.tar.bz2
Source4: %{baseurl}/%{name}-init-%{version}.tar.bz2
-
-Patch0: shorewall-init.patch
-Patch1: shorewall-lite-init.patch
-Patch2: shorewall6-init.patch
-Patch3: shorewall6-lite-init.patch
+Source5: %{baseurl}/%{name}-core-%{version}.tar.bz2
BuildRequires: perl
BuildArch: noarch
-Requires: iptables iproute
-Requires(post): /sbin/chkconfig
-Requires(preun):/sbin/chkconfig
-Requires(preun):/sbin/service
-
-Obsoletes: shorewall-common < 4.3.0
-Obsoletes: shorewall-perl < 4.3.0
-Obsoletes: shorewall-shell < 4.3.0
+Requires: shorewall-core = %{version}-%{release}
+Requires: iptables iproute
+Requires(post): /sbin/chkconfig
%description
The Shoreline Firewall, more commonly known as "Shorewall", is a
@@ -45,25 +37,24 @@ standalone GNU/Linux system.
%package -n shorewall6
Summary: Files for the IPV6 Shorewall Firewall
Group: Applications/System
-Provides: shorewall(firewall) = %{version}-%{release}
-Requires: shorewall = %{version}-%{release}
-Requires: iptables-ipv6 iproute
-Requires(post): /sbin/chkconfig
-Requires(preun):/sbin/chkconfig
-Requires(preun):/sbin/service
+Provides: shorewall(firewall) = %{version}-%{release}
+
+Requires: shorewall-core = %{version}-%{release}
+Requires: iptables-ipv6 iproute
+Requires(post): /sbin/chkconfig
%description -n shorewall6
This package contains the files required for IPV6 functionality of the
Shoreline Firewall (shorewall).
%package lite
-Summary: Shorewall firewall for compiled rulesets
Group: Applications/System
-Provides: shorewall(firewall) = %{version}-%{release}
-Requires: iptables iproute
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
+Summary: Shorewall firewall for compiled rulesets
+Provides: shorewall(firewall) = %{version}-%{release}
+
+Requires: shorewall-core = %{version}-%{release}
+Requires: iptables-ipv6 iproute
+Requires(post): /sbin/chkconfig
%description lite
Shorewall Lite is a companion product to Shorewall that allows network
@@ -73,13 +64,13 @@ machine with a Shorewall rule compiler. A machine running Shorewall
Lite does not need to have a Shorewall rule compiler installed.
%package -n shorewall6-lite
-Summary: Shorewall firewall for compiled IPV6 rulesets
Group: Applications/System
-Provides: shorewall(firewall) = %{version}-%{release}
-Requires: iptables iproute
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
+Summary: Shorewall firewall for compiled IPV6 rulesets
+Provides: shorewall(firewall) = %{version}-%{release}
+
+Requires: shorewall-core = %{version}-%{release}
+Requires: iptables-ipv6 iproute
+Requires(post): /sbin/chkconfig
%description -n shorewall6-lite
Shorewall6 Lite is a companion product to Shorewall6 (the IPV6
@@ -89,14 +80,22 @@ firewall script generated by a machine with a Shorewall rule
compiler. A machine running Shorewall Lite does not need to have a
Shorewall rule compiler installed.
+%package core
+Group: Applications/System
+Summary: Core libraries for Shorewall
+
+%description core
+This package contains the core libraries for Shorewall.
+
%package init
-Summary: Initialization functionality and NetworkManager integration for Shorewall
Group: Applications/System
-Requires: shorewall(firewall) = %{version}-%{release}
-Requires: NetworkManager
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
+Summary: Initialization functionality and NetworkManager integration for Shorewall
+
+Requires: shorewall(firewall) = %{version}-%{release}
+Requires: NetworkManager
+Requires: shorewall = %{version}-%{release}
+Requires: iptables-ipv6 iproute
+Requires(post): /sbin/chkconfig
%description init
This package adds additional initialization functionality to Shorewall in two
@@ -107,12 +106,7 @@ integrates with NetworkManager and distribution ifup/ifdown systems to allow
for 'event-driven' startup and shutdown.
%prep
-%setup -q -c -n %{name}-%{version} -T -a0 -a1 -a2 -a3 -a4
-
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
+%setup -q -c -n %{name}-%{version} -T -a0 -a1 -a2 -a3 -a4 -a5
# Remove hash-bang from files which are not directly executed as shell
# scripts. This silences some rpmlint errors.
@@ -126,11 +120,12 @@ export DEST=%{_initrddir}
export LIBEXEC=%{_libexecdir}
export PERLLIB=%{perl_privlib}
-targets="shorewall shorewall-lite shorewall6 shorewall6-lite shorewall-init"
+targets="shorewall shorewall-core shorewall-lite shorewall6 shorewall6-lite shorewall-init"
+
+install -d $RPM_BUILD_ROOT%{_unitdir}
for i in $targets; do
- pushd $i-%{version}
- mv init.fedora.sh init.sh
+ pushd ${i}-%{version}
./install.sh
popd
done
@@ -206,16 +201,27 @@ if [ $1 = 0 ]; then
/sbin/chkconfig --del shorewall-init
fi
+
+
%files
-%defattr(-,root,root,-)
%doc shorewall-%{version}/{COPYING,changelog.txt,releasenotes.txt,Samples}
-%{_initrddir}/shorewall
/sbin/shorewall
%dir %{_sysconfdir}/shorewall
%config(noreplace) %{_sysconfdir}/shorewall/*
%config(noreplace) %{_sysconfdir}/logrotate.d/shorewall
-%{_libexecdir}/shorewall
-%{_datadir}/shorewall
+%{_datadir}/shorewall/action.*
+%{_datadir}/shorewall/actions.std
+%{_datadir}/shorewall/configfiles/
+%{_datadir}/shorewall/configpath
+%{_datadir}/shorewall/helpers
+%{_datadir}/shorewall/lib.cli-std
+%{_datadir}/shorewall/lib.core
+%{_datadir}/shorewall/macro.*
+%{_datadir}/shorewall/modules*
+%{_datadir}/shorewall/prog.*
+%{_datadir}/shorewall/version
+%{_libexecdir}/shorewall/compiler.pl
+%{_libexecdir}/shorewall/getparams
%{perl_privlib}/Shorewall
%{_mandir}/man5/shorewall*
%exclude %{_mandir}/man5/shorewall6*
@@ -224,12 +230,11 @@ fi
%exclude %{_mandir}/man8/shorewall6*
%exclude %{_mandir}/man8/shorewall-lite*
%exclude %{_mandir}/man8/shorewall-init*
+%{_initrddir}/shorewall
%dir %{_localstatedir}/lib/shorewall
%files lite
-%defattr(-,root,root,-)
%doc shorewall-lite-%{version}/{COPYING,changelog.txt,releasenotes.txt}
-%{_initrddir}/shorewall-lite
/sbin/shorewall-lite
%dir %{_sysconfdir}/shorewall-lite
%config(noreplace) %{_sysconfdir}/shorewall-lite/shorewall-lite.conf
@@ -239,12 +244,11 @@ fi
%{_libexecdir}/shorewall-lite
%{_mandir}/man5/shorewall-lite*
%{_mandir}/man8/shorewall-lite*
+%{_initrddir}/shorewall-lite
%dir %{_localstatedir}/lib/shorewall-lite
%files -n shorewall6
-%defattr(-,root,root,-)
%doc shorewall6-%{version}/{COPYING,changelog.txt,releasenotes.txt,Samples6}
-%{_initrddir}/shorewall6
/sbin/shorewall6
%dir %{_sysconfdir}/shorewall6
%config(noreplace) %{_sysconfdir}/shorewall6/*
@@ -253,14 +257,12 @@ fi
%exclude %{_mandir}/man5/shorewall6-lite*
%{_mandir}/man8/shorewall6*
%exclude %{_mandir}/man8/shorewall6-lite*
-%{_libexecdir}/shorewall6
%{_datadir}/shorewall6
+%{_initrddir}/shorewall6
%dir %{_localstatedir}/lib/shorewall6
%files -n shorewall6-lite
-%defattr(-,root,root,-)
%doc shorewall6-lite-%{version}/{COPYING,changelog.txt,releasenotes.txt}
-%{_initrddir}/shorewall6-lite
/sbin/shorewall6-lite
%dir %{_sysconfdir}/shorewall6-lite
%config(noreplace) %{_sysconfdir}/shorewall6-lite/shorewall6-lite.conf
@@ -270,19 +272,34 @@ fi
%{_mandir}/man8/shorewall6-lite*
%{_datadir}/shorewall6-lite
%{_libexecdir}/shorewall6-lite
+%{_initrddir}/shorewall6-lite
%dir %{_localstatedir}/lib/shorewall6-lite
+%files core
+%doc shorewall-core-%{version}/{COPYING,changelog.txt,releasenotes.txt}
+%dir %{_datadir}/shorewall/
+%{_datadir}/shorewall/coreversion
+%{_datadir}/shorewall/functions
+%{_datadir}/shorewall/lib.base
+%{_datadir}/shorewall/lib.cli
+%{_datadir}/shorewall/lib.common
+%dir %{_libexecdir}/shorewall
+%{_libexecdir}/shorewall/wait4ifup
+
%files init
-%defattr(-,root,root,-)
%doc shorewall-init-%{version}/{COPYING,changelog.txt,releasenotes.txt}
-%{_initrddir}/shorewall-init
%{_sysconfdir}/NetworkManager/dispatcher.d/01-shorewall
%config(noreplace) %{_sysconfdir}/sysconfig/shorewall-init
%{_mandir}/man8/shorewall-init.8.*
%{_datadir}/shorewall-init
%{_libexecdir}/shorewall-init
+%{_initrddir}/shorewall-init
+
%changelog
+* Sun Mar 18 2012 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 4.5.1-1
+- Update to 4.5.1
+
* 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
diff --git a/sources b/sources
index 017c6b0..a939033 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,6 @@
-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
+3a3a9f34b9531cd68f21a9a7d854b7b9 shorewall-4.5.1.tar.bz2
+dc3b9adf348b9777d31ca2258d81778a shorewall6-4.5.1.tar.bz2
+4f606143674c452064203982fbb49f79 shorewall6-lite-4.5.1.tar.bz2
+d5fbfa6b1b42aa7f6a5d875b3793728a shorewall-core-4.5.1.tar.bz2
+5c79bd6537834c3f638d32b485683274 shorewall-init-4.5.1.tar.bz2
+f9d7b5731a269244acfd6e1064bd1cb2 shorewall-lite-4.5.1.tar.bz2
More information about the scm-commits
mailing list