From e808d060a1605bccebff1888066d9bdc19d998c0 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Fri, 16 Nov 2018 08:14:32 +0000 Subject: [PATCH] enable mlogc everywhere, use buildcond to disable --- mod_security.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mod_security.spec b/mod_security.spec index 70e9d61..f436b18 100644 --- a/mod_security.spec +++ b/mod_security.spec @@ -5,12 +5,12 @@ %{!?_httpd_confdir: %{expand: %%global _httpd_confdir %%{_sysconfdir}/httpd/conf.d}} %{!?_httpd_moddir: %{expand: %%global _httpd_moddir %%{_libdir}/httpd/modules}} -%global with_mlogc 0%{?fedora} || 0%{?rhel} <= 6 +%bcond_without mlogc Summary: Security module for the Apache HTTP Server Name: mod_security Version: 2.9.2 -Release: 6%{?dist} +Release: 7%{?dist} License: ASL 2.0 URL: http://www.modsecurity.org/ Group: System Environment/Daemons @@ -42,7 +42,7 @@ ModSecurity is an open source intrusion detection and prevention engine for web applications. It operates embedded into the web server, acting as a powerful umbrella - shielding web applications from attacks. -%if %with_mlogc +%if %{with mlogc} %package -n mlogc Summary: ModSecurity Audit Log Collector Group: System Environment/Daemons @@ -98,7 +98,7 @@ install -m 700 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name} install -Dp -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/httpd/modsecurity.d/local_rules/ # mlogc -%if %with_mlogc +%if %{with mlogc} install -d %{buildroot}%{_localstatedir}/log/mlogc install -d %{buildroot}%{_localstatedir}/log/mlogc/data install -m0755 mlogc/mlogc %{buildroot}%{_bindir}/mlogc @@ -120,7 +120,7 @@ install -m0644 mlogc/mlogc-default.conf %{buildroot}%{_sysconfdir}/mlogc.conf %config(noreplace) %{_sysconfdir}/httpd/modsecurity.d/local_rules/*.conf %attr(770,apache,root) %dir %{_localstatedir}/lib/%{name} -%if %with_mlogc +%if %{with mlogc} %files -n mlogc %doc mlogc/INSTALL %attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/mlogc.conf @@ -131,6 +131,9 @@ install -m0644 mlogc/mlogc-default.conf %{buildroot}%{_sysconfdir}/mlogc.conf %endif %changelog +* Fri Nov 16 2018 Joe Orton - 2.9.2-7 +- enable mlogc everywhere, use buildcond to disable + * Fri Jul 13 2018 Fedora Release Engineering - 2.9.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild