diff --git a/.gitignore b/.gitignore index 225d078..3ab9bc7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /modsecurity-crs_2.2.4.tar.gz /modsecurity-crs_2.2.5.tar.gz +/SpiderLabs-owasp-modsecurity-crs-21197fc.tar.gz diff --git a/mod_security_crs.spec b/mod_security_crs.spec index 1c00ad6..f4fbd46 100644 --- a/mod_security_crs.spec +++ b/mod_security_crs.spec @@ -1,11 +1,17 @@ +%global git_short 21197fc + Summary: ModSecurity Rules Name: mod_security_crs -Version: 2.2.5 -Release: 5%{?dist} +Version: 2.2.6 +Release: 1%{?dist} License: ASL 2.0 URL: http://www.modsecurity.org/ Group: System Environment/Daemons -Source: https://sourceforge.net/projects/mod-security/files/modsecurity-crs/0-CURRENT/modsecurity-crs_%{version}.tar.gz + +# Use the following command to generate the tarball: +# wget https://github.com/SpiderLabs/owasp-modsecurity-crs/tarball/GIT_SHORT + +Source: SpiderLabs-owasp-modsecurity-crs-%{git_short}.tar.gz BuildArch: noarch Requires: mod_security >= 2.6.5 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -22,7 +28,7 @@ Requires: %name = %version-%release This package provides supplementary rules for mod_security. %prep -%setup -q -n modsecurity-crs_%{version} +%setup -q -n SpiderLabs-owasp-modsecurity-crs-%{git_short} %build @@ -54,7 +60,7 @@ rm -rf %{buildroot} %files -%doc CHANGELOG INSTALL LICENSE README +%doc CHANGELOG INSTALL LICENSE README.md %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/activated_rules/* %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/modsecurity_crs_10_config.conf %{_prefix}/lib/modsecurity.d/base_rules @@ -65,6 +71,10 @@ rm -rf %{buildroot} %{_prefix}/lib/modsecurity.d/slr_rules %changelog +* Sat Sep 15 2012 Athmane Madjoudj 2.2.6-1 +- Update to 2.2.6 +- Update spec file since upstream moved to Github. + * Thu Sep 13 2012 Athmane Madjoudj 2.2.5-5 - Enable extra rules sub-package for EPEL. diff --git a/sources b/sources index 5a59502..b76c985 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aaeaa1124e8efc39eeb064fb47cfc0aa modsecurity-crs_2.2.5.tar.gz +1e002f0892319724a4f14266b1213ae0 SpiderLabs-owasp-modsecurity-crs-21197fc.tar.gz