1era versión para bugzilla.

2 files changed, 17 insertions, 59 deletions

diff --git a/fwsnort-1.0.6-1.fc12.src.rpm b/fwsnort-1.0.6-1.fc12.src.rpm
new file mode 100644
index 0000000..2f240e4
--- /dev/null
+++ b/fwsnort-1.0.6-1.fc12.src.rpm
diff --git a/fwsnort.spec b/fwsnort.spec
index 2e6c16d..df0f002 100644
--- a/fwsnort.spec
+++ b/fwsnort.spec
@@ -1,7 +1,6 @@
 %define name fwsnort
 %define version 1.0.6
 %define release 1
-%define fwsnortlibdir %_libdir/%name
 %define fwsnortlogdir /var/log/fwsnort
 
 ### get the first @INC directory that includes the string "linux".
@@ -15,13 +14,11 @@ Release: %release%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Url: http://www.cipherdyne.org/fwsnort/
-Source0: %name-%version.tar.gz
-#BuildRoot: %_tmppath/%{name}-buildroot
+Source0: http://www.cipherdyne.org/fwsnort/download/%name-%version.tar.gz
+Source1: logrotate.fwsnort
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch 
 Requires: iptables,perl-Net-IPv4Addr, perl-IPTables-Parse, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires: perl(ExtUtils::MakeMaker)
-#Prereq: rpm-helper
 
 %description
 fwsnort translates Snort rules into equivalent iptables rules and generates
@@ -51,32 +48,22 @@ to: http://www.cipherdyne.org/fwsnort/
 %prep
 
 %setup -q
-
-cd deps
-cd IPTables-Parse && perl Makefile.PL PREFIX=%fwsnortlibdir LIB=%fwsnortlibdir
-cd ..
-cd Net-IPv4Addr && perl Makefile.PL PREFIX=%fwsnortlibdir LIB=%fwsnortlibdir
-cd ../..
+cp -p %SOURCE1 .
 
 %build
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-#rm -rf $RPM_BUILD_ROOT
-### config directory
+rm -rf $RPM_BUILD_ROOT
 ### log directory
 mkdir -p $RPM_BUILD_ROOT%fwsnortlogdir
 
-### fwsnort module dirs
-mkdir -p $RPM_BUILD_ROOT%fwsnortlibdir
+### fwsnort config
+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
 
-### fwsnort config
-mkdir -p $RPM_BUILD_ROOT%_sysconfdir/%name
-
 install -m 755 fwsnort $RPM_BUILD_ROOT%_sbindir/
 install -m 644 fwsnort.conf $RPM_BUILD_ROOT%_sysconfdir/%name/
 install -m 644 fwsnort.8 $RPM_BUILD_ROOT%{_mandir}/man8/
@@ -84,6 +71,9 @@ install -m 644 fwsnort.8 $RPM_BUILD_ROOT%{_mandir}/man8/
 ### install snort rules files
 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
+
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
 
@@ -105,46 +95,14 @@ cp -r deps/snort_rules $RPM_BUILD_ROOT%_sysconfdir/%name
 %dir %_sysconfdir/%name
 %config(noreplace) %_sysconfdir/%name/fwsnort.conf
 
-#%dir %_sysconfdir/%name/snort_rules
-#%config(noreplace) %_sysconfdir/%name/snort_rules/*
+%dir %_sysconfdir/logrotate.d
+%config(noreplace) %_sysconfdir/logrotate.d/fwsnort
+
+%dir %_sysconfdir/%name/snort_rules
+%config(noreplace) %_sysconfdir/%name/snort_rules/*
 
 %changelog
-* Sat Dec 26 2009 Guillermo Gómez <ggomez@neotechgw.com> - 1.0.6-1
+* Sat Jan 2 2010 Guillermo Gómez <ggomez@neotechgw.com> - 1.0.6-1
 - First Fedora spec compliant version, several modifications
-
-* Sat May 29 2009 Michael Rash <mbr@cipherydne.org>
-- Added the "BuildRequires: perl-ExtUtils-MakeMaker" statement.
-- fwsnort-1.0.6 release
-
-* Thu Aug 21 2008 Michael Rash <mbr@cipherydne.org>
-- Updated to use the deps/ directory for all perl module sources.
-- fwsnort-1.0.5 release
-
-* Tue Jan 22 2008 Michael Rash <mbr@cipherydne.org>
-- fwsnort-1.0.4 release
-
-* Thu Nov 22 2007 Michael Rash <mbr@cipherydne.org>
-- fwsnort-1.0.3 release
-
-* Sun Aug 26 2007 Michael Rash <mbr@cipherydne.org>
-- fwsnort-1.0.2 release
-
-* Sun Aug 26 2007 Michael Rash <mbr@cipherydne.org>
-- fwsnort-1.0.1 release
-
-* Thu Apr 19 2007 Michael Rash <mbr@cipherydne.org>
-- fwsnort-1.0 release
-
-* Fri Mar 22 2007 Michael Rash <mbr@cipherydne.org>
-- fwsnort-0.9.0 release
-
-* Sat Feb 17 2007 Michael Rash <mbr@cipherydne.org>
-- fwsnort-0.8.2 release
-
-* Mon Sep 04 2006 Michael Rash <mbr@cipherydne.org>
-- Updated to install new IPTables::Parse module out of the IPTables-Parse
-  directory.
-- Removed smtpdaemon requirement since fwsnort does not deal with email.
-
-* Fri Nov 11 2005 Michael Rash <mbr@cipherydne.org>
-- Initial RPM release
+- No deps included
+- Free snort rules included