rpms/mod_security/F-9 mod_security.conf, 1.7, 1.8 mod_security.spec, 1.27, 1.28 sources, 1.14, 1.15

Michael Fleming (mfleming) fedora-extras-commits at redhat.com
Wed Aug 13 11:01:45 UTC 2008


Author: mfleming

Update of /cvs/extras/rpms/mod_security/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5026

Modified Files:
	mod_security.conf mod_security.spec sources 
Log Message:
* Sat Aug 2 2008 Michael Fleming <mfleming+rpm at 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.



Index: mod_security.conf
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-9/mod_security.conf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_security.conf	19 Jun 2007 10:25:54 -0000	1.7
+++ mod_security.conf	13 Aug 2008 11:01:15 -0000	1.8
@@ -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
 


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-9/mod_security.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mod_security.spec	13 Apr 2008 12:20:23 -0000	1.27
+++ mod_security.spec	13 Aug 2008 11:01:15 -0000	1.28
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 2.1.7
+Version: 2.5.6
 Release: 1%{?dist}
 License: GPLv2
 URL: http://www.modsecurity.org/
@@ -9,8 +9,8 @@
 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,9 @@
 %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}
 
 %install
 rm -rf %{buildroot}
@@ -39,7 +40,7 @@
 
 %files
 %defattr (-,root,root)
-%doc CHANGES LICENSE README.* modsecurity* doc
+%doc CHANGES LICENSE README.* modsecurity* doc 
 %{_libdir}/httpd/modules/mod_security2.so
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf
 %dir %{_sysconfdir}/httpd/modsecurity.d
@@ -47,8 +48,13 @@
 %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/*.conf
 %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/optional_rules/*.conf
 
-
 %changelog
+* Sat Aug 2 2008 Michael Fleming <mfleming+rpm at 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 at enlartenment.com> 2.1.7-1
 - Update to upstream 2.1.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/F-9/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	13 Apr 2008 12:20:23 -0000	1.14
+++ sources	13 Aug 2008 11:01:15 -0000	1.15
@@ -1 +1 @@
-19c34dd5611e0c516c0717de793f4640  modsecurity-apache_2.1.7.tar.gz
+eb9e80a232269378752aa5b81f3e99f8  modsecurity-apache_2.5.6.tar.gz




More information about the fedora-extras-commits mailing list