From 85fb8e75855f4a1cc5c074e33d8ea4a91ed4e4b1 Mon Sep 17 00:00:00 2001
From: Michael Fleming <mfleming@fedoraproject.org>
Date: Dec 29 2008 12:39:54 +0000
Subject: - Update to upstream 2.5.7

- Reinstate mlogc

---

diff --git a/.cvsignore b/.cvsignore
index 39a0769..3464416 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-modsecurity-apache_2.5.6.tar.gz
+modsecurity-apache_2.5.7.tar.gz
diff --git a/mod_security.spec b/mod_security.spec
index 2f084f1..96fdc31 100644
--- a/mod_security.spec
+++ b/mod_security.spec
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.5.6
+Version: 2.5.7
 Release: 1%{?dist}
 License: GPLv2
 URL: http://www.modsecurity.org/
@@ -25,6 +25,7 @@ as a powerful umbrella - shielding web applications from attacks.
 cd apache2
 %configure
 make %{_smp_mflags}
+make %{_smp_mflags} mlogc
 
 %install
 rm -rf %{buildroot}
@@ -34,14 +35,18 @@ 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
@@ -49,6 +54,10 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/optional_rules/*.conf
 
 %changelog
+* 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.
diff --git a/sources b/sources
index be9e3ee..735eeb8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb9e80a232269378752aa5b81f3e99f8  modsecurity-apache_2.5.6.tar.gz
+049509c4d76048ce02cfb558d6598761  modsecurity-apache_2.5.7.tar.gz