From 9b59298391843e314b192d09f33b03c2047b4962 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Nov 15 2014 23:37:15 +0000
Subject: Update to 4.6.5.1


---

diff --git a/.gitignore b/.gitignore
index cb6ae24..4842266 100644
--- a/.gitignore
+++ b/.gitignore
@@ -258,3 +258,15 @@ shorewall-lite-4.4.11.1.tar.bz2
 /shorewall-core-4.6.4.3.tar.bz2
 /shorewall-init-4.6.4.3.tar.bz2
 /shorewall-lite-4.6.4.3.tar.bz2
+/shorewall-4.6.5.tar.bz2
+/shorewall6-4.6.5.tar.bz2
+/shorewall6-lite-4.6.5.tar.bz2
+/shorewall-core-4.6.5.tar.bz2
+/shorewall-init-4.6.5.tar.bz2
+/shorewall-lite-4.6.5.tar.bz2
+/shorewall-4.6.5.1.tar.bz2
+/shorewall6-4.6.5.1.tar.bz2
+/shorewall6-lite-4.6.5.1.tar.bz2
+/shorewall-core-4.6.5.1.tar.bz2
+/shorewall-init-4.6.5.1.tar.bz2
+/shorewall-lite-4.6.5.1.tar.bz2
diff --git a/shorewall.spec b/shorewall.spec
index 158b041..ed34a16 100644
--- a/shorewall.spec
+++ b/shorewall.spec
@@ -1,4 +1,4 @@
-%global mainver 4.6.4
+%global mainver 4.6.5
 #global baseurl http://www.shorewall.net/pub/shorewall/development/4.6/shorewall-%{mainver}/
 %global baseurl http://www.shorewall.net/pub/shorewall/4.6/shorewall-%{mainver}/
 
@@ -6,7 +6,7 @@
 # which is found at http://www.shorewall.net/Anatomy.html
 
 Name:           shorewall
-Version:        %{mainver}.3
+Version:        %{mainver}.1
 Release:        1%{?dist}
 Summary:        An iptables front end for firewall configuration
 Group:          Applications/System
@@ -137,13 +137,10 @@ find . -name "lib.*" -exec sed -i -e '/\#\!\/bin\/sh/d' {} \;
 %build
 
 %install
-targets="shorewall-core shorewall shorewall-lite shorewall6 shorewall6-lite shorewall-init"
-
-for i in $targets; do
+for i in shorewall-core shorewall shorewall-lite shorewall6 shorewall6-lite shorewall-init; do
     pushd ${i}-%{version}
-    ./configure vendor=redhat INITFILE= SYSTEMD=%{_unitdir} SBINDIR=%{_sbindir}
+    ./configure vendor=redhat INITFILE= SERVICEDIR=%{_unitdir} SBINDIR=%{_sbindir}
     DESTDIR=$RPM_BUILD_ROOT ./install.sh
-    [ $i != shorewall-core ] && install -m 644 ${i}.service $RPM_BUILD_ROOT%{_unitdir}
     popd
 done
 
@@ -306,6 +303,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Nov 15 2014 Orion Poplawski <orion@cora.nwra.com> - 4.6.5.1-1
+- Update to 4.6.5.1
+
 * Mon Oct 20 2014 Orion Poplawski <orion@cora.nwra.com> - 4.6.4.3-1
 - Update to 4.6.4.3
 
diff --git a/sources b/sources
index e868e65..46fe2f0 100644
--- a/sources
+++ b/sources
@@ -1,6 +1,6 @@
-fe0bc1d92857778d2cd065b2290502bc  shorewall-4.6.4.3.tar.bz2
-f038e4cbce511a7ee482421beaf7c2ef  shorewall6-4.6.4.3.tar.bz2
-33cecc188c32bab3aec61f4aea0b1245  shorewall6-lite-4.6.4.3.tar.bz2
-7991a29462f394e1eb3fa4d7551ce8ff  shorewall-core-4.6.4.3.tar.bz2
-c29c5b76c1b8dc083ff4ed2e45fcd784  shorewall-init-4.6.4.3.tar.bz2
-704a72ba3b141a20c83717ac81f74112  shorewall-lite-4.6.4.3.tar.bz2
+dd90214693382138909e0e694b3d76a8  shorewall-4.6.5.1.tar.bz2
+e1f523d9b99286fd2a0a778459bc73af  shorewall6-4.6.5.1.tar.bz2
+d1214c4509583b98ab99154b5404c13d  shorewall6-lite-4.6.5.1.tar.bz2
+01642ed62d5987224002ee1dccb56186  shorewall-core-4.6.5.1.tar.bz2
+ffbde19c906a830833dd1eae5c6a12cf  shorewall-init-4.6.5.1.tar.bz2
+dfe7fa92cee55f4e1cc4a898a5315f50  shorewall-lite-4.6.5.1.tar.bz2