[fwsnort/f16] Updated version 1.6.2

[Guillermo Gómez]

commit 0883256093287fca2032a61953ddf206c6703759
Author: Guillermo Gómez <gomix at fedoraproject.org>
Date:   Sat May 26 13:44:49 2012 -0430

    Updated version 1.6.2

 .gitignore   |    1 +
 fwsnort.spec |   33 ++++++++++++++++++++-------------
 sources      |    2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5c2d350..e4baf0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ fwsnort-1.0.6.tar.gz
 /fwsnort-1.5.tar.gz
 /fwsnort-1.6.tar.gz
 /fwsnort-1.6.1.tar.gz
+/fwsnort-1.6.2.tar.gz
diff --git a/fwsnort.spec b/fwsnort.spec
index e1cc595..829fccd 100644
--- a/fwsnort.spec
+++ b/fwsnort.spec
@@ -2,19 +2,20 @@
 
 Summary: Translates Snort rules into equivalent iptables rules
 Name: fwsnort
-Version: 1.6.1
+Version: 1.6.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
-Url: http://www.cipherdyne.org/fwsnort/
-Source0: http://www.cipherdyne.org/fwsnort/download/fwsnort-1.6.1.tar.gz
+Url: http://www.cipherdyne.org/%{name}/
+Source0: http://www.cipherdyne.org/%{name}/download/%{name}-%{version}.tar.gz
 Source1: logrotate.fwsnort
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch 
 Requires: iptables
-Requires: perl(Net::IPv4Addr) 
+Requires: perl(NetAddr::IP)
 Requires: perl(IPTables::Parse) 
 Requires: logrotate 
+Requires: wget
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -41,21 +42,21 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{fwsnortlogdir}
 
 ### fwsnort config
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/fwsnort
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
 mkdir -p $RPM_BUILD_ROOT%{_sbindir}
 
 install -m 755 fwsnort $RPM_BUILD_ROOT%{_sbindir}/
-install -m 644 fwsnort.conf $RPM_BUILD_ROOT%{_sysconfdir}/fwsnort/
+install -m 644 fwsnort.conf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/
 install -m 644 fwsnort.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 
 ### install snort rules files
-cp -r deps/snort_rules $RPM_BUILD_ROOT%{_sysconfdir}/fwsnort
+cp -r deps/snort_rules $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
-install -p -m 644  logrotate.fwsnort $RPM_BUILD_ROOT/etc/logrotate.d/fwsnort
+install -p -m 644  logrotate.fwsnort $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,15 +77,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/*
 %{_mandir}/man8/*
 
-%dir %{_sysconfdir}/fwsnort
-%config %{_sysconfdir}/fwsnort/fwsnort.conf
+%dir %{_sysconfdir}/%{name}
+%config %{_sysconfdir}/%{name}/fwsnort.conf
 
-%config(noreplace) %{_sysconfdir}/logrotate.d/fwsnort
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 
-%dir %{_sysconfdir}/fwsnort/snort_rules
-%config(noreplace) %{_sysconfdir}/fwsnort/snort_rules/*
+%dir %{_sysconfdir}/%{name}/snort_rules
+%config(noreplace) %{_sysconfdir}/%{name}/snort_rules/*
 
 %changelog
+* Sun May 26 2012 Guillermo Gómez <gomix at fedoraproject.org> - 1.6.2-1
+- Update to version 1.6.2
+- Replaced Net::IPv4Addr with NetAddr::IP module which has support for IPv6
+  address network parsing and comparisons.
+- wget added as required to support default configuration.
+
 * Fri Sep 02 2011 Guillermo Gómez <gomix at fedoraproject.org> - 1.6.1-1
 - Update to version 1.6.1
 - Bug fix for 'Couldn't load target' error
diff --git a/sources b/sources
index cea8363..e30c905 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-571044af7686ef1d474a2f8647290dc6  fwsnort-1.6.1.tar.gz
+d5617a5af1f75256657611a79dfc4796  fwsnort-1.6.2.tar.gz