- Update to upstream 2.5.7

- Reinstate mlogc
This commit is contained in:
Michael Fleming 2009-03-08 10:32:21 +00:00
parent b10da42fb9
commit 0419751394
4 changed files with 46 additions and 16 deletions

View File

@ -1 +1 @@
modsecurity-apache_2.1.7.tar.gz
modsecurity-apache_2.5.7.tar.gz

View File

@ -1,7 +1,5 @@
# Example configuration file for the mod_security Apache module
LoadFile LIBDIR/libxml2.so.2
LoadModule security2_module modules/mod_security2.so
LoadModule unique_id_module modules/mod_unique_id.so

View File

@ -1,6 +1,6 @@
Summary: Security module for the Apache HTTP Server
Name: mod_security
Version: 2.1.7
Version: 2.5.7
Release: 1%{?dist}
License: GPLv2
URL: http://www.modsecurity.org/
@ -9,8 +9,8 @@ Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
Source1: mod_security.conf
Source2: modsecurity_localrules.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: libxml2 pcre httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
BuildRequires: httpd-devel libxml2-devel pcre-devel
Requires: httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
BuildRequires: httpd-devel libxml2-devel pcre-devel curl-devel lua-devel
%description
ModSecurity is an open source intrusion detection and prevention engine
@ -22,8 +22,10 @@ as a powerful umbrella - shielding web applications from attacks.
%setup -n modsecurity-apache_%{version}
%build
make -C apache2 CFLAGS="%{optflags}" top_dir="%{_libdir}/httpd"
perl -pi.orig -e 's|LIBDIR|%{_libdir}|;' %{SOURCE1}
cd apache2
%configure
make %{_smp_mflags}
make %{_smp_mflags} mlogc
%install
rm -rf %{buildroot}
@ -33,28 +35,58 @@ install -d %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/optional_rules/
cp -r rules/*.conf %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/
cp -r rules/optional_rules/*.conf %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/optional_rules/
install -D -m644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/modsecurity.d/modsecurity_localrules.conf
install -Dp tools/mlogc %{buildroot}/%{_bindir}/mlogc
install -D -m644 apache2/mlogc-src/mlogc-default.conf %{buildroot}/%{_sysconfdir}/mlogc.conf
%clean
rm -rf %{buildroot}
%files
%defattr (-,root,root)
%doc CHANGES LICENSE README.* modsecurity* doc
%doc CHANGES LICENSE README.* modsecurity* doc MODSECURITY_LICENSING_EXCEPTION
%{_libdir}/httpd/modules/mod_security2.so
%{_bindir}/mlogc
%config(noreplace) %{_sysconfdir}/mlogc.conf
%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf
%dir %{_sysconfdir}/httpd/modsecurity.d
%dir %{_sysconfdir}/httpd/modsecurity.d/optional_rules
%config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/*.conf
%config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/optional_rules/*.conf
%changelog
* Thu May 1 2008 Michael Fleming <mfleming+rpm@enlartenment.com> 2.1.7-1
- New upstream release (bz #444794)
* Mon Dec 29 2008 Michael Fleming <mfleming+rpm@enlartenment.com> 2.5.7-1
- Update to upstream 2.5.7
- Reinstate mlogc
* Thu Sep 13 2007 Michael Fleming <mfleming+rpm@enlartenment.com> 2.1.3-1
- New upstream release
- Update License tag per guidelines
* Sat Aug 2 2008 Michael Fleming <mfleming+rpm@enlartenment.com> 2.5.6-1
- Update to upstream 2.5.6
- Remove references to mlogc, it no longer ships in the main tarball.
- Link correctly vs. libxml2 and lua (bz# 445839)
- Remove bogus LoadFile directives as they're no longer needed.
* Sun Apr 13 2008 Michael Fleming <mfleming+rpm@enlartenment.com> 2.1.7-1
- Update to upstream 2.1.7
* Sat Feb 23 2008 Michael Fleming <mfleming+rpm@enlartenment.com> 2.1.6-1
- Update to upstream 2.1.6 (Extra features including SecUploadFileMode)
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.1.5-3
- Autorebuild for GCC 4.3
* Sat Jan 27 2008 Michael Fleming <mfleming+rpm@enlartenment.com> 2.1.5-2
- Update to 2.1.5 (bz#425986)
- "blocking" -> "optional_rules" per tarball ;-)
* Thu Sep 13 2007 Michael Fleming <mfleming+rpm@enlartenment.com> 2.1.3-1
- Update to 2.1.3
- Update License tag per guidelines.
* Mon Sep 3 2007 Joe Orton <jorton@redhat.com> 2.1.1-3
- rebuild for fixed 32-bit APR (#254241)
* Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 2.1.1-2
- Rebuild for selinux ppc32 issue.
* Tue Jun 19 2007 Michael Fleming <mfleming+rpm@enlartenment.com> 2.1.1-1
- New upstream release

View File

@ -1 +1 @@
19c34dd5611e0c516c0717de793f4640 modsecurity-apache_2.1.7.tar.gz
049509c4d76048ce02cfb558d6598761 modsecurity-apache_2.5.7.tar.gz