From f630da0e0a1e8f7e886e9b448629516d16c86bf8 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: May 22 2014 03:40:38 +0000
Subject: Update epel7 patch from upstream


---

diff --git a/shorewall-epel7.patch b/shorewall-epel7.patch
index 98aab7e..6869cad 100644
--- a/shorewall-epel7.patch
+++ b/shorewall-epel7.patch
@@ -10,3 +10,68 @@ 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
+index c722022..0467904 100755
+--- a/shorewall-core-4.6.0/configure
++++ b/shorewall-core-4.6.0/configure
+@@ -98,7 +98,7 @@ if [ -z "$vendor" ]; then
+ 	eval $(cat /etc/os-release | grep ^ID=)
+ 
+ 	case $ID in
+-	    fedora)
++	    fedora|rhel)
+ 		vendor=redhat
+ 		;;
+ 	    debian|ubuntu)
+diff --git a/shorewall-core-4.6.0/configure.pl b/shorewall-core-4.6.0/configure.pl
+index f7f466a..c8dbd42 100755
+--- a/shorewall-core-4.6.0/configure.pl
++++ b/shorewall-core-4.6.0/configure.pl
+@@ -64,7 +64,7 @@ unless ( defined $vendor ) {
+ 
+ 	$id =~ s/ID=//;
+ 	
+-	if ( $id eq 'fedora' ) {
++	if ( $id eq 'fedora' || $id eq 'rhel' ) {
+ 	    $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
+index 471f30c..3b7f673 100755
+--- a/shorewall-core-4.6.0/install.sh
++++ b/shorewall-core-4.6.0/install.sh
+@@ -198,7 +198,7 @@ if [ -z "$BUILD" ]; then
+ 		eval $(cat /etc/os-release | grep ^ID)
+ 
+ 		case $ID in
+-		    fedora)
++		    fedora|rhel)
+ 			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
+@@ -206,7 +206,7 @@ if [ -z "$BUILD" ]; then
+ 		eval $(cat /etc/os-release | grep ^ID)
+ 
+ 		case $ID in
+-		    fedora)
++		    fedora|rhel)
+ 			BUILD=redhat
+ 			;;
+ 		    debian)
+diff --git a/shorewall-4.6.0/install.sh b/shorewall-4.6.0/install.sh
+index dca4667..205fcef 100755
+--- a/shorewall-4.6.0/install.sh
++++ b/shorewall-4.6.0/install.sh
+@@ -216,7 +216,7 @@ if [ -z "$BUILD" ]; then
+ 		eval $(cat /etc/os-release | grep ^ID)
+ 
+ 		case $ID in
+-		    fedora)
++		    fedora|rhel)
+ 			BUILD=redhat
+ 			;;
+ 		    debian)
diff --git a/shorewall.spec b/shorewall.spec
index a60af0e..418c17f 100644
--- a/shorewall.spec
+++ b/shorewall.spec
@@ -7,7 +7,7 @@
 
 Name:           shorewall
 Version:        %{mainver}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An iptables front end for firewall configuration
 Group:          Applications/System
 License:        GPLv2+
@@ -312,6 +312,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed May 21 2014 Orion Poplawski <orion@cora.nwra.com> - 4.6.0-2
+- Update epel7 patch from upstream
+
 * Mon May 19 2014 Orion Poplawski <orion@cora.nwra.com> - 4.6.0-1
 - Update to 4.6.0
 - Add patch for epel7 support