[shorewall] Update to 4.6.0.1
Orion Poplawski
orion at fedoraproject.org
Fri May 23 14:02:35 UTC 2014
commit d257991d936b3bd21c4083cf069da9a0fd94ee9d
Author: Orion Poplawski <orion at cora.nwra.com>
Date: Fri May 23 08:02:29 2014 -0600
Update to 4.6.0.1
.gitignore | 6 ++++++
shorewall-epel7.patch | 38 +++++++++++++++++++-------------------
shorewall.spec | 12 ++++++------
sources | 12 ++++++------
4 files changed, 37 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6d70586..1b1f78f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -192,3 +192,9 @@ shorewall-lite-4.4.11.1.tar.bz2
/shorewall-core-4.6.0.tar.bz2
/shorewall-init-4.6.0.tar.bz2
/shorewall-lite-4.6.0.tar.bz2
+/shorewall-4.6.0.1.tar.bz2
+/shorewall6-4.6.0.1.tar.bz2
+/shorewall6-lite-4.6.0.1.tar.bz2
+/shorewall-core-4.6.0.1.tar.bz2
+/shorewall-init-4.6.0.1.tar.bz2
+/shorewall-lite-4.6.0.1.tar.bz2
diff --git a/shorewall-epel7.patch b/shorewall-epel7.patch
index 6869cad..062924e 100644
--- a/shorewall-epel7.patch
+++ b/shorewall-epel7.patch
@@ -1,6 +1,6 @@
-diff -up shorewall-4.6.0/shorewall-init-4.6.0/install.sh.rhel7 shorewall-4.6.0/shorewall-init-4.6.0/install.sh
---- shorewall-4.6.0/shorewall-init-4.6.0/install.sh.rhel7 2014-05-15 09:22:18.000000000 -0600
-+++ shorewall-4.6.0/shorewall-init-4.6.0/install.sh 2014-05-19 14:26:31.925410706 -0600
+diff -up shorewall-4.6.0.1/shorewall-init-4.6.0.1/install.sh.rhel7 shorewall-4.6.0.1/shorewall-init-4.6.0.1/install.sh
+--- shorewall-4.6.0.1/shorewall-init-4.6.0.1/install.sh.rhel7 2014-05-15 09:22:18.000000000 -06.0.1
++++ shorewall-4.6.0.1/shorewall-init-4.6.0.1/install.sh 2014-05-19 14:26:31.925410706 -06.0.1
@@ -191,7 +191,7 @@ if [ -z "$BUILD" ]; then
eval $(cat /etc/os-release | grep ^ID=)
@@ -10,10 +10,10 @@ diff -up shorewall-4.6.0/shorewall-init-4.6.0/install.sh.rhel7 shorewall-4.6.0/s
BUILD=redhat
;;
debian|ubuntu)
-diff --git a/shorewall-core-4.6.0/configure b/shorewall-core-4.6.0/configure
+diff --git a/shorewall-core-4.6.0.1/configure b/shorewall-core-4.6.0.1/configure
index c722022..0467904 100755
---- a/shorewall-core-4.6.0/configure
-+++ b/shorewall-core-4.6.0/configure
+--- a/shorewall-core-4.6.0.1/configure
++++ b/shorewall-core-4.6.0.1/configure
@@ -98,7 +98,7 @@ if [ -z "$vendor" ]; then
eval $(cat /etc/os-release | grep ^ID=)
@@ -23,10 +23,10 @@ index c722022..0467904 100755
vendor=redhat
;;
debian|ubuntu)
-diff --git a/shorewall-core-4.6.0/configure.pl b/shorewall-core-4.6.0/configure.pl
+diff --git a/shorewall-core-4.6.0.1/configure.pl b/shorewall-core-4.6.0.1/configure.pl
index f7f466a..c8dbd42 100755
---- a/shorewall-core-4.6.0/configure.pl
-+++ b/shorewall-core-4.6.0/configure.pl
+--- a/shorewall-core-4.6.0.1/configure.pl
++++ b/shorewall-core-4.6.0.1/configure.pl
@@ -64,7 +64,7 @@ unless ( defined $vendor ) {
$id =~ s/ID=//;
@@ -36,10 +36,10 @@ index f7f466a..c8dbd42 100755
$vendor = 'redhat';
} elsif ( $id eq 'opensuse' ) {
$vendor = 'suse';
-diff --git a/shorewall-core-4.6.0/install.sh b/shorewall-core-4.6.0/install.sh
+diff --git a/shorewall-core-4.6.0.1/install.sh b/shorewall-core-4.6.0.1/install.sh
index 471f30c..3b7f673 100755
---- a/shorewall-core-4.6.0/install.sh
-+++ b/shorewall-core-4.6.0/install.sh
+--- a/shorewall-core-4.6.0.1/install.sh
++++ b/shorewall-core-4.6.0.1/install.sh
@@ -198,7 +198,7 @@ if [ -z "$BUILD" ]; then
eval $(cat /etc/os-release | grep ^ID)
@@ -49,10 +49,10 @@ index 471f30c..3b7f673 100755
BUILD=redhat
;;
debian)
-diff --git a/shorewall-lite-4.6.0/install.sh b/shorewall-lite-4.6.0/install.sh
-index 6ef2308..ebb6106 100755
---- a/shorewall-lite-4.6.0/install.sh
-+++ b/shorewall-lite-4.6.0/install.sh
+diff --git a/shorewall-lite-4.6.0.1/install.sh b/shorewall-lite-4.6.0.1/install.sh
+index 6ef2308..ebb6.0.16 100755
+--- a/shorewall-lite-4.6.0.1/install.sh
++++ b/shorewall-lite-4.6.0.1/install.sh
@@ -206,7 +206,7 @@ if [ -z "$BUILD" ]; then
eval $(cat /etc/os-release | grep ^ID)
@@ -62,10 +62,10 @@ index 6ef2308..ebb6106 100755
BUILD=redhat
;;
debian)
-diff --git a/shorewall-4.6.0/install.sh b/shorewall-4.6.0/install.sh
+diff --git a/shorewall-4.6.0.1/install.sh b/shorewall-4.6.0.1/install.sh
index dca4667..205fcef 100755
---- a/shorewall-4.6.0/install.sh
-+++ b/shorewall-4.6.0/install.sh
+--- a/shorewall-4.6.0.1/install.sh
++++ b/shorewall-4.6.0.1/install.sh
@@ -216,7 +216,7 @@ if [ -z "$BUILD" ]; then
eval $(cat /etc/os-release | grep ^ID)
diff --git a/shorewall.spec b/shorewall.spec
index 418c17f..df3a430 100644
--- a/shorewall.spec
+++ b/shorewall.spec
@@ -6,8 +6,8 @@
# which is found at http://www.shorewall.net/Anatomy.html
Name: shorewall
-Version: %{mainver}
-Release: 2%{?dist}
+Version: %{mainver}.1
+Release: 1%{?dist}
Summary: An iptables front end for firewall configuration
Group: Applications/System
License: GPLv2+
@@ -144,15 +144,12 @@ targets="shorewall-core shorewall shorewall-lite shorewall6 shorewall6-lite shor
for i in $targets; do
pushd ${i}-%{version}
- ./configure vendor=redhat SYSTEMD=%{_unitdir} SBINDIR=%{_sbindir}
+ ./configure vendor=redhat INITFILE= SYSTEMD=%{_unitdir} SBINDIR=%{_sbindir}
DESTDIR=$RPM_BUILD_ROOT ./install.sh
[ $i != shorewall-core ] && install -m 644 ${i}.service $RPM_BUILD_ROOT%{_unitdir}
popd
done
-# Remove sysv init files
-rm -rf $RPM_BUILD_ROOT%{_initrddir}
-
# Fix up file permissions
chmod 644 $RPM_BUILD_ROOT%{_datadir}/shorewall-lite/{helpers,modules}
chmod 644 $RPM_BUILD_ROOT%{_datadir}/shorewall6-lite/{helpers,modules}
@@ -312,6 +309,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri May 23 2014 Orion Poplawski <orion at cora.nwra.com> - 4.6.0.1-1
+- Update to 4.6.0.1
+
* Wed May 21 2014 Orion Poplawski <orion at cora.nwra.com> - 4.6.0-2
- Update epel7 patch from upstream
diff --git a/sources b/sources
index 9b519f2..9c70b42 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-d9729e9a7718e4da3eb5b8a1689e6c37 shorewall-4.6.0.tar.bz2
-e22a36a413a294376ce5f818c5a08f5a shorewall6-4.6.0.tar.bz2
-abbe30b7ee3fe58bc3d0f739e002cb44 shorewall6-lite-4.6.0.tar.bz2
-be3f6e5e2ae8fee3cfc0a0b35da3c475 shorewall-core-4.6.0.tar.bz2
-40dc9c140bed36461b79dc3562e49aed shorewall-init-4.6.0.tar.bz2
-78efcb36d98209e747a50f7446a4be90 shorewall-lite-4.6.0.tar.bz2
+27233bb49716726852cb4806193b80e6 shorewall-4.6.0.1.tar.bz2
+e7e43d81e4add167ea68665706b96d7c shorewall6-4.6.0.1.tar.bz2
+de165dff73be9b32d18f7468d242f83e shorewall6-lite-4.6.0.1.tar.bz2
+b97485aa5cb77c6975399bb6ab3c078f shorewall-core-4.6.0.1.tar.bz2
+b6c6104eea2fb416069916f839854bab shorewall-init-4.6.0.1.tar.bz2
+f962abbec83c5f6c94b00b4f57651ae2 shorewall-lite-4.6.0.1.tar.bz2
More information about the scm-commits
mailing list