Mejorada la consistencia en el uso de macros rpm

4 files changed, 122 insertions, 19 deletions

diff --git a/fwsnort-1.0.6-5.fc12.src.rpm b/1.0.6-6/fc12/fwsnort-1.0.6-6.fc12.src.rpm
index faa0e1b..08c86aa 100644
--- a/fwsnort-1.0.6-5.fc12.src.rpm
+++ b/1.0.6-6/fc12/fwsnort-1.0.6-6.fc12.src.rpm
diff --git a/1.0.6-6/fc12/fwsnort.spec b/1.0.6-6/fc12/fwsnort.spec
new file mode 100644
index 0000000..11e654b
--- /dev/null
+++ b/1.0.6-6/fc12/fwsnort.spec
@@ -0,0 +1,104 @@
+%global fwsnortlogdir /var/log/fwsnort
+
+Summary: Translates Snort rules into equivalent iptables rules
+Name: fwsnort
+Version: 1.0.6
+Release: 6%{?dist}
+License: GPLv2+
+Group: System Environment/Daemons
+Url: http://www.cipherdyne.org/fwsnort/
+Source0: http://www.cipherdyne.org/fwsnort/download/fwsnort-1.0.6.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))
+
+%description
+fwsnort translates Snort rules into equivalent iptables rules and generates
+a Bourne shell script that implements the resulting iptables commands.
+
+In addition, fwsnort (optionally) uses the IPTables::Parse module to parse the
+iptables ruleset on the machine to determine which Snort rules are applicable
+to the specific iptables policy.
+
+fwsnort is able to translate approximately 60% of all rules from the
+Snort-2.3.3 IDS into equivalent iptables rules. 
+
+%prep
+%setup -q
+mv deps/snort_rules/VERSION SNORT-RULES-VERSION
+cp -p %SOURCE1 .
+
+%build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+### log directory
+mkdir -p $RPM_BUILD_ROOT%fwsnortlogdir
+
+### fwsnort config
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/fwsnort
+
+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.8 $RPM_BUILD_ROOT%{_mandir}/man8/
+
+### install snort rules files
+cp -r deps/snort_rules $RPM_BUILD_ROOT%{_sysconfdir}/fwsnort
+
+mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
+install -p -m 644  logrotate.fwsnort $RPM_BUILD_ROOT/etc/logrotate.d/fwsnort
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%pre
+### not used
+
+%post
+### not used
+
+%preun
+### not used
+
+%files
+%defattr(-,root,root)
+%doc LICENSE VERSION README CREDITS TODO SNORT-RULES-VERSION
+%dir %fwsnortlogdir
+%{_sbindir}/*
+%{_mandir}/man8/*
+
+%dir %{_sysconfdir}/fwsnort
+%config(noreplace) %{_sysconfdir}/fwsnort/fwsnort.conf
+
+%dir %{_sysconfdir}/logrotate.d
+%config(noreplace) %{_sysconfdir}/logrotate.d/fwsnort
+
+%dir %{_sysconfdir}/fwsnort/snort_rules
+%config(noreplace) %{_sysconfdir}/fwsnort/snort_rules/*
+
+%changelog
+* Sun Apr 25 2010 Guillermo Gómez <ggomez@neotechgw.com> - 1.0.6-6
+- Macros use improved for consistency
+
+* Thu Feb 04 2010 Guillermo Gómez <ggomez@neotechgw.com> - 1.0.6-5
+- Removed unnecesary macro definition
+
+* Thu Feb 04 2010 Guillermo Gómez <ggomez@neotechgw.com> - 1.0.6-4
+- Description shortened
+
+* Thu Feb 04 2010 Guillermo Gómez <ggomez@neotechgw.com> - 1.0.6-3
+- License adjusted to GPLv2+
+
+* Wed Feb 03 2010 Guillermo Gómez <ggomez@neotechgw.com> - 1.0.6-2
+- documentation included, LICENSE VERSION README CREDITS TODO
+  SNORT-RULES-VERSION
+
+* Sat Jan 2 2010 Guillermo Gómez <ggomez@neotechgw.com> - 1.0.6-1
+- First Fedora spec compliant version, several modifications
+- No deps included
+- Free snort rules included
diff --git a/fwsnort-1.0.6-6.fc12.src.rpm b/fwsnort-1.0.6-6.fc12.src.rpm
new file mode 100644
index 0000000..08c86aa
--- /dev/null
+++ b/fwsnort-1.0.6-6.fc12.src.rpm
diff --git a/fwsnort.spec b/fwsnort.spec
index a5fe57b..11e654b 100644
--- a/fwsnort.spec
+++ b/fwsnort.spec
@@ -1,13 +1,9 @@
 %global fwsnortlogdir /var/log/fwsnort
 
-### get the first @INC directory that includes the string "linux".
-### This may be 'i386-linux', or 'i686-linux-thread-multi', etc.
-#%define fwsnortmoddir `perl -e '$path='i386-linux'; for (@INC) { if($_ =~ m|.*/(.*linux.*)|) {$path = $1; last; }} print $path'`
-
 Summary: Translates Snort rules into equivalent iptables rules
 Name: fwsnort
 Version: 1.0.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+
 Group: System Environment/Daemons
 Url: http://www.cipherdyne.org/fwsnort/
@@ -41,18 +37,18 @@ 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}/fwsnort
 
-mkdir -p $RPM_BUILD_ROOT%_bindir
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man8
-mkdir -p $RPM_BUILD_ROOT%_sbindir
+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 755 fwsnort $RPM_BUILD_ROOT%{_sbindir}/
+install -m 644 fwsnort.conf $RPM_BUILD_ROOT%{_sysconfdir}/fwsnort/
 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}/fwsnort
 
 mkdir -p $RPM_BUILD_ROOT/etc/logrotate.d
 install -p -m 644  logrotate.fwsnort $RPM_BUILD_ROOT/etc/logrotate.d/fwsnort
@@ -60,7 +56,7 @@ install -p -m 644  logrotate.fwsnort $RPM_BUILD_ROOT/etc/logrotate.d/fwsnort
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-#%pre
+%pre
 ### not used
 
 %post
@@ -73,19 +69,22 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc LICENSE VERSION README CREDITS TODO SNORT-RULES-VERSION
 %dir %fwsnortlogdir
-%_sbindir/*
+%{_sbindir}/*
 %{_mandir}/man8/*
 
-%dir %_sysconfdir/fwsnort
-%config(noreplace) %_sysconfdir/fwsnort/fwsnort.conf
+%dir %{_sysconfdir}/fwsnort
+%config(noreplace) %{_sysconfdir}/fwsnort/fwsnort.conf
 
-%dir %_sysconfdir/logrotate.d
-%config(noreplace) %_sysconfdir/logrotate.d/fwsnort
+%dir %{_sysconfdir}/logrotate.d
+%config(noreplace) %{_sysconfdir}/logrotate.d/fwsnort
 
-%dir %_sysconfdir/fwsnort/snort_rules
-%config(noreplace) %_sysconfdir/fwsnort/snort_rules/*
+%dir %{_sysconfdir}/fwsnort/snort_rules
+%config(noreplace) %{_sysconfdir}/fwsnort/snort_rules/*
 
 %changelog
+* Sun Apr 25 2010 Guillermo Gómez <ggomez@neotechgw.com> - 1.0.6-6
+- Macros use improved for consistency
+
 * Thu Feb 04 2010 Guillermo Gómez <ggomez@neotechgw.com> - 1.0.6-5
 - Removed unnecesary macro definition