Compare commits
No commits in common. "main" and "f25" have entirely different histories.
5
.gitignore
vendored
5
.gitignore
vendored
@ -5,8 +5,3 @@
|
|||||||
/owasp-modsecurity-crs-2.2.8.tar.gz
|
/owasp-modsecurity-crs-2.2.8.tar.gz
|
||||||
/SpiderLabs-owasp-modsecurity-crs-2.2.9-19-ga57031b.tar.gz
|
/SpiderLabs-owasp-modsecurity-crs-2.2.9-19-ga57031b.tar.gz
|
||||||
/owasp-modsecurity-crs-f16e0b1.tar.gz
|
/owasp-modsecurity-crs-f16e0b1.tar.gz
|
||||||
/owasp-modsecurity-crs-3.0.0.tar.gz
|
|
||||||
/owasp-modsecurity-crs-3.2.0.tar.gz
|
|
||||||
/v3.3.0.tar.gz
|
|
||||||
/v3.3.4.tar.gz
|
|
||||||
/v4.2.0.tar.gz
|
|
||||||
|
|||||||
1351
mod_security_crs-fix-incompatible-rules.patch
Normal file
1351
mod_security_crs-fix-incompatible-rules.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -1,166 +1,86 @@
|
|||||||
%{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}}
|
%global with_extras 0%{?fedora} || 0%{?rhel} <= 6
|
||||||
|
|
||||||
Summary: ModSecurity Core Ruleset
|
%global commit f16e0b1726c843889b9f024e27fd794147594677
|
||||||
|
%global shortcommit %(c=%{commit}; echo ${c:0:7})
|
||||||
|
|
||||||
|
|
||||||
|
Summary: ModSecurity Rules
|
||||||
Name: mod_security_crs
|
Name: mod_security_crs
|
||||||
Version: 4.2.0
|
Version: 2.2.9.20160414git
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
License: Apache-2.0
|
License: ASL 2.0
|
||||||
URL: https://coreruleset.org/
|
URL: https://www.owasp.org/index.php/Category:OWASP_ModSecurity_Core_Rule_Set_Project
|
||||||
Source: https://github.com/coreruleset/coreruleset/archive/refs/tags/v%{version}.tar.gz
|
Group: System Environment/Daemons
|
||||||
|
Source: https://github.com/SpiderLabs/owasp-modsecurity-crs/archive/%{commit}/owasp-modsecurity-crs-%{shortcommit}.tar.gz
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
Requires: mod_security >= 2.9.6
|
Requires: mod_security >= 2.7.0
|
||||||
Obsoletes: mod_security_crs-extras < 3.0.0
|
|
||||||
|
|
||||||
# Patch0: mod_security_crs-XXX.patch
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
This package provides the base rules for mod_security.
|
This package provides the base rules for mod_security.
|
||||||
|
|
||||||
|
%if %with_extras
|
||||||
|
%package extras
|
||||||
|
Summary: Supplementary mod_security rules
|
||||||
|
Group: System Environment/Daemons
|
||||||
|
Requires: %name = %version-%release
|
||||||
|
|
||||||
|
%description extras
|
||||||
|
This package provides supplementary rules for mod_security.
|
||||||
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -S gendiff -n coreruleset-%{version}
|
%setup -q -n owasp-modsecurity-crs-%{commit}
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%{__install} -d %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/
|
rm -rf %{buildroot}
|
||||||
%{__install} -d %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/activated_rules
|
|
||||||
%{__install} -d %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/plugins
|
|
||||||
%{__install} -d %{buildroot}%{_datarootdir}/mod_modsecurity_crs/rules
|
|
||||||
%{__install} -d %{buildroot}%{_datarootdir}/mod_modsecurity_crs/plugins
|
|
||||||
|
|
||||||
# To exclude rules (pre/post)
|
install -d %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/
|
||||||
%{__mv} rules/REQUEST-900-EXCLUSION-RULES-BEFORE-CRS.conf.example %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/activated_rules/REQUEST-900-EXCLUSION-RULES-BEFORE-CRS.conf
|
install -d %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/activated_rules
|
||||||
%{__mv} rules/RESPONSE-999-EXCLUSION-RULES-AFTER-CRS.conf.example %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/activated_rules/RESPONSE-999-EXCLUSION-RULES-AFTER-CRS.conf
|
|
||||||
|
|
||||||
%{__install} -m0644 rules/*.conf %{buildroot}%{_datarootdir}/mod_modsecurity_crs/rules/
|
install -d %{buildroot}%{_prefix}/lib/modsecurity.d/base_rules
|
||||||
%{__install} -m0644 rules/*.data %{buildroot}%{_datarootdir}/mod_modsecurity_crs/rules/
|
|
||||||
%{__install} -m0644 plugins/* %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/plugins/
|
|
||||||
%{__mv} crs-setup.conf.example %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/crs-setup.conf
|
|
||||||
|
|
||||||
%post
|
%if %with_extras
|
||||||
if [ $1 == 1 ]; then
|
install -d %{buildroot}%{_prefix}/lib/modsecurity.d/optional_rules
|
||||||
# activate base_rules
|
install -d %{buildroot}%{_prefix}/lib/modsecurity.d/experimental_rules
|
||||||
for f in `ls %{_datarootdir}/mod_modsecurity_crs/rules/` ; do
|
install -d %{buildroot}%{_prefix}/lib/modsecurity.d/slr_rules
|
||||||
%{__ln_s} %{_datarootdir}/mod_modsecurity_crs/rules/$f %{_sysconfdir}/httpd/modsecurity.d/activated_rules/$f;
|
%endif
|
||||||
done
|
|
||||||
%{__sed} -i '/IncludeOptional modsecurity\.d\/\*\.conf/ a\ IncludeOptional modsecurity.d\/plugins\/*-config.conf\n IncludeOptional modsecurity.d\/plugins\/*-before.conf' %{_httpd_confdir}/mod_security.conf
|
install -m0644 modsecurity_crs_10_setup.conf.example %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/modsecurity_crs_10_config.conf
|
||||||
%{__sed} -i '/Include modsecurity\.d\/\*\.conf/a\ Include modsecurity.d/plugins/*-config.conf\n Include modsecurity.d/plugins/*-before.conf' %{_httpd_confdir}/mod_security.conf
|
install -m0644 base_rules/* %{buildroot}%{_prefix}/lib/modsecurity.d/base_rules/
|
||||||
%{__sed} -i '/IncludeOptional modsecurity\.d\/local_rules\/\*\.conf/a\ IncludeOptional modsecurity.d\/plugins\/*-after.conf' %{_httpd_confdir}/mod_security.conf
|
|
||||||
%{__sed} -i '/Include modsecurity\.d\/local_rules\/\*\.conf/a\ Include modsecurity.d\/plugins\/*-after.conf' %{_httpd_confdir}/mod_security.conf
|
|
||||||
fi
|
%if %with_extras
|
||||||
exit 0
|
install -m0644 optional_rules/* %{buildroot}%{_prefix}/lib/modsecurity.d/optional_rules/
|
||||||
|
install -m0644 experimental_rules/* %{buildroot}%{_prefix}/lib/modsecurity.d/experimental_rules/
|
||||||
|
install -m0644 slr_rules/* %{buildroot}%{_prefix}/lib/modsecurity.d/slr_rules
|
||||||
|
%endif
|
||||||
|
|
||||||
|
# activate base_rules
|
||||||
|
for f in `ls %{buildroot}/%{_prefix}/lib/modsecurity.d/base_rules/` ; do
|
||||||
|
ln -s %{_prefix}/lib/modsecurity.d/base_rules/$f %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/activated_rules/$f;
|
||||||
|
done
|
||||||
|
|
||||||
|
%clean
|
||||||
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
%preun
|
|
||||||
if [ $1 == 0 ]; then
|
|
||||||
%{__sed} -i -E '/Include(Optional)? modsecurity\.d\/plugins/d' %{_httpd_confdir}/mod_security.conf
|
|
||||||
for f in `ls %{_datarootdir}/mod_modsecurity_crs/rules/` ; do
|
|
||||||
%{__rm} %{_sysconfdir}/httpd/modsecurity.d/activated_rules/$f;
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
exit 0
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license LICENSE
|
%doc CHANGES INSTALL LICENSE README.md
|
||||||
%doc CHANGES.md README.md
|
|
||||||
%{_datarootdir}/mod_modsecurity_crs
|
|
||||||
%{_sysconfdir}/httpd/modsecurity.d/plugins
|
|
||||||
%config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/activated_rules/*
|
%config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/activated_rules/*
|
||||||
%config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/crs-setup.conf
|
%config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/modsecurity_crs_10_config.conf
|
||||||
%config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/plugins/*
|
%{_prefix}/lib/modsecurity.d/base_rules
|
||||||
|
|
||||||
|
|
||||||
|
%if %with_extras
|
||||||
|
%files extras
|
||||||
|
%{_prefix}/lib/modsecurity.d/optional_rules
|
||||||
|
%{_prefix}/lib/modsecurity.d/experimental_rules
|
||||||
|
%{_prefix}/lib/modsecurity.d/slr_rules
|
||||||
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Jul 9 2024 Daniel Demus <daniel-fedoauth@demus.dk> - 4.2.0-2
|
|
||||||
- Prepare for plugins (see https://coreruleset.org/20220112/crs-plugin-mechanism/)
|
|
||||||
|
|
||||||
* Thu May 02 2024 Luboš Uhliarik <luhliari@redhat.com> - 4.2.0-1
|
|
||||||
- new version 4.2.0
|
|
||||||
- switch to autosetup
|
|
||||||
|
|
||||||
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.4-8
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.4-7
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.4-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jun 06 2023 Luboš Uhliarik <luhliari@redhat.com> - 3.3.4-5
|
|
||||||
- SPDX migration
|
|
||||||
|
|
||||||
* Mon Mar 20 2023 Mikel Olasagasti Uranga <mikel@olasagasti.info> - 3.3.4-4
|
|
||||||
- Change URL to new official homepage
|
|
||||||
|
|
||||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.4-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
||||||
|
|
||||||
* Mon Dec 05 2022 Luboš Uhliarik <luhliari@redhat.com> - 3.3.4-2
|
|
||||||
- Add Early blocking feature patch again
|
|
||||||
|
|
||||||
* Fri Sep 30 2022 Luboš Uhliarik <luhliari@redhat.com> - 3.3.4-1
|
|
||||||
- new version 3.3.4
|
|
||||||
|
|
||||||
* Wed Sep 07 2022 Luboš Uhliarik <luhliari@redhat.com> - 3.3.0-6
|
|
||||||
- Fix application of early blocking patch
|
|
||||||
|
|
||||||
* Wed Aug 31 2022 Luboš Uhliarik <luhliari@redhat.com> - 3.3.0-5
|
|
||||||
- Backport early blocking feature
|
|
||||||
|
|
||||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-4
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Mar 05 2021 Lubos Uhliarik <luhliari@redhat.com> - 3.2.0-1
|
|
||||||
- new version 3.2.0
|
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-12
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-11
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-10
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-9
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-8
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-7
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-6
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.0-5
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
||||||
|
|
||||||
* Sat Apr 22 2017 Athmane Madjoudj <athmane@fedoraproject.org> - 3.0.0-4
|
|
||||||
- Exclude rule files should not be symlink
|
|
||||||
|
|
||||||
* Sat Apr 22 2017 Athmane Madjoudj <athmane@fedoraproject.org> - 3.0.0-3
|
|
||||||
- Use versioned obsoletes
|
|
||||||
- Move away from /lib since rules are data
|
|
||||||
|
|
||||||
* Sat Apr 22 2017 Athmane Madjoudj <athmane@fedoraproject.org> - 3.0.0-2
|
|
||||||
- Fix the install part since extra and experimental rules are not longer included in 3.x
|
|
||||||
- Remove EL5 bits since EL5/EPEL5 are OEL-ed
|
|
||||||
- Bump reqs
|
|
||||||
|
|
||||||
* Sat Apr 22 2017 Athmane Madjoudj <athmane@fedoraproject.org> - 3.0.0-1
|
|
||||||
- Update to 3.0.0
|
|
||||||
- Clean up the spec
|
|
||||||
|
|
||||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.9.20160414git-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Apr 29 2016 Athmane Madjoudj <athmane@fedoraproject.org> 2.2.9.20160414git-1
|
* Fri Apr 29 2016 Athmane Madjoudj <athmane@fedoraproject.org> 2.2.9.20160414git-1
|
||||||
- Update to 2.9.20160414git
|
- Update to 2.9.20160414git
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user