From 7aa569e83428de12f270023386cab9b0044d774b Mon Sep 17 00:00:00 2001 From: Athmane Madjoudj Date: Tue, 2 Jul 2013 20:09:21 +0100 Subject: [PATCH] Update to 2.2.8. --- .gitignore | 1 + mod_security_crs.spec | 20 ++++++++++++-------- sources | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 9ba5cca..a6b75ff 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /modsecurity-crs_2.2.5.tar.gz /SpiderLabs-owasp-modsecurity-crs-21197fc.tar.gz /SpiderLabs-owasp-modsecurity-crs-v2.2.6-0-g3f85c76.tar.gz +/owasp-modsecurity-crs-2.2.8.tar.gz diff --git a/mod_security_crs.spec b/mod_security_crs.spec index 2485926..14c3971 100644 --- a/mod_security_crs.spec +++ b/mod_security_crs.spec @@ -1,18 +1,17 @@ -%global git_short 3f85c76 %global with_extras 0%{?fedora} || 0%{?rhel} <= 6 Summary: ModSecurity Rules Name: mod_security_crs -Version: 2.2.6 -Release: 5%{?dist} +Version: 2.2.8 +Release: 1%{?dist} License: ASL 2.0 URL: http://www.modsecurity.org/ Group: System Environment/Daemons # Use the following command to generate the tarball: -# wget https://github.com/SpiderLabs/owasp-modsecurity-crs/tarball/GIT_SHORT +# wget --content-disposition https://github.com/SpiderLabs/owasp-modsecurity-crs/archive/2.2.8.tar.gz -Source: SpiderLabs-owasp-modsecurity-crs-v%{version}-0-g%{git_short}.tar.gz +Source: owasp-modsecurity-crs-%{version}.tar.gz BuildArch: noarch Requires: mod_security >= 2.7.0 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,7 +30,7 @@ This package provides supplementary rules for mod_security. %endif %prep -%setup -q -n SpiderLabs-owasp-modsecurity-crs-%{git_short} +%setup -q -n owasp-modsecurity-crs-%{version} %build @@ -69,7 +68,7 @@ rm -rf %{buildroot} %files -%doc CHANGELOG INSTALL LICENSE README.md +%doc CHANGES 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 @@ -83,6 +82,11 @@ rm -rf %{buildroot} %endif %changelog +* Tue Jul 02 2013 Athmane Madjoudj 2.2.8-1 +- Update to 2.2.8 +- Adapt the spec file to new github tarball schema. +- Correct bugus date in the spec file. + * Thu Feb 14 2013 Fedora Release Engineering - 2.2.6-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild @@ -119,7 +123,7 @@ rm -rf %{buildroot} * Wed Jun 20 2012 Peter Vrabec 2.2.4-3 - "extras" subpackage is not provided on RHEL -* Wed May 03 2012 Peter Vrabec 2.2.4-2 +* Thu May 03 2012 Peter Vrabec 2.2.4-2 - fix fedora-review issues (#816975) * Thu Apr 19 2012 Peter Vrabec 2.2.4-1 diff --git a/sources b/sources index 21c4c02..a04c4a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99fa2a3ec391c56ac4a92b749b299f35 SpiderLabs-owasp-modsecurity-crs-v2.2.6-0-g3f85c76.tar.gz +fdee278c02d41a1377dc20a616b2f327 owasp-modsecurity-crs-2.2.8.tar.gz