dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-modsecurity-apache_2.1.7.tar.gz

.gitignore

@@ -0,0 +1 @@
+modsecurity-apache_2.5.9.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: mod_security
-# $Id$
-NAME := mod_security
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

mod_security.conf

@@ -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
 

mod_security.spec

@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.7
+Version: 2.5.9
 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)
+Requires: httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
-BuildRequires: httpd-devel libxml2-devel pcre-devel
+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"
+cd apache2
-perl -pi.orig -e 's|LIBDIR|%{_libdir}|;' %{SOURCE1}
+%configure
+make %{_smp_mflags}
+make %{_smp_mflags} mlogc
 
 %install
 rm -rf %{buildroot}
@@ -33,22 +35,39 @@ 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 Mar 12 2009 Michael Fleming <mfleming+rpm@thatfleminggent.com> 2.5.9-1
+- Update to upstream release 2.5.9
+- Fixes potential DoS' in multipart request and PDF XSS handling
+
+* Mon Dec 29 2008 Michael Fleming <mfleming+rpm@enlartenment.com> 2.5.7-1
+- Update to upstream 2.5.7
+- Reinstate mlogc
+
+* 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
 

sources

@@ -1 +1 @@
-19c34dd5611e0c516c0717de793f4640  modsecurity-apache_2.1.7.tar.gz
+b7bf44a7e041b49b0da5043495660375  modsecurity-apache_2.5.9.tar.gz