Difference Between Revision 35 and internetx:managed:testing / mod_security
[-] | Changed | mod_security-ix.changes |
x 1
2 ------------------------------------------------------------------- 3 -Wed Jan 11 06:34:21 UTC 2023 - Carsten Schoene <carsten.schoene@internetx.com> 4 - 5 -- Update to release 2.9.7 6 - 7 -------------------------------------------------------------------- 8 -Thu Mar 17 10:30:16 UTC 2022 - Local OBS User <cs@linux-administrator.com> 9 - 10 -- Update to release 2.9.5 11 - 12 -------------------------------------------------------------------- 13 -Mon Aug 23 11:39:54 UTC 2021 - Local OBS User <cs@linux-administrator.com> 14 - 15 -- Update to release 2.9.4 16 - 17 -------------------------------------------------------------------- 18 -Wed Feb 5 09:52:49 UTC 2020 - Local OBS User <cs@linux-administrator.com> 19 - 20 -- Update to release 2.9.3 21 - 22 -------------------------------------------------------------------- 23 -Wed May 16 06:44:59 UTC 2018 - cs@linux-administrator.com 24 - 25 -- Update to release 2.9.2 26 - 27 -------------------------------------------------------------------- 28 -Thu Apr 9 09:26:32 UTC 2015 - cs@linux-administrator.com 29 - 30 -- Update to relesae 2.9.0 31 -- set PERL ENV var to /usr/bin/perl 32 -- drop mlogc-disable-force-sslv3.patch (TLSv1 is default now) 33 - 34 -------------------------------------------------------------------- 35 -Fri Aug 8 17:29:19 UTC 2014 - cs@linux-administrator.com 36 - 37 -- Update to release 2.8.0 38 - 39 -------------------------------------------------------------------- 40 -Sun Jan 5 16:20:52 UTC 2014 - cs@linux-administrator.com 41 - 42 -- enable --enable-htaccess-config 43 - 44 -------------------------------------------------------------------- 45 -Thu Dec 19 23:23:46 UTC 2013 - cs@linux-administrator.com 46 - 47 -- Update to release 2.7.7 48 - 49 -------------------------------------------------------------------- 50 -Tue Jul 30 17:01:30 UTC 2013 - cs@linux-administrator.com 51 - 52 -- Update to release 2.7.5 53 - 54 -------------------------------------------------------------------- 55 -Thu Jul 11 19:33:18 UTC 2013 - cs@linux-administrator.com 56 - 57 -- build against asl-libxml2 for EL5 based systems 58 - 59 -------------------------------------------------------------------- 60 -Sat Jun 29 17:00:16 UTC 2013 - cs@linux-administrator.com 61 - 62 -- added CVE-2013-2765.patch for 2.6.8 (included in 2.7.4) 63 - 64 -------------------------------------------------------------------- 65 -Wed Jun 5 10:16:47 UTC 2013 - cs@linux-administrator.com 66 - 67 -- fix permissions in cleanup cron script 68 - 69 -------------------------------------------------------------------- 70 -Mon May 27 17:02:32 UTC 2013 - cs@linux-administrator.com 71 - 72 -- Update to release 2.7.4 (only for >= SLE_11, >= EL6) 73 - 74 -------------------------------------------------------------------- 75 -Fri Mar 29 17:31:45 UTC 2013 - cs@linux-administrator.com 76 - 77 -- Update to release 2.7.3 (only for >= SLE_11, >= EL6) 78 - 79 -------------------------------------------------------------------- 80 -Fri Jan 25 20:10:39 UTC 2013 - cs@linux-administrator.com 81 - 82 -- Update to release 2.7.2 (only for >= SLE_11, >= EL6) 83 - 84 -------------------------------------------------------------------- 85 Sat Dec 29 10:33:37 UTC 2012 - cs@linux-administrator.com 86 87 - Update to release 2.7.1 (only for >= SLE_11, >= EL6) 88 |
||
[-] | Changed | mod_security-ix.spec ^ |
117 1
2 -%define aslxml 1 3 -%define pkgname modsecurity- 4 Summary: Security module for the Apache HTTP Server 5 Name: mod_security 6 %if 0%{?centos_version} >= 6 || 0%{?rhel_version} >= 600 || 0%{?sl_version} >= 600 || 0%{?suse_version} >= 1110 || 0%{?sles_version} >= 11 7 -%define pkgversion 2.9.7 8 -%define oldver 0 9 -%define _aslxml 0 10 -%define epoch 1 11 -BuildRequires: libxml2-devel 12 -%else 13 -%if %{aslxml} 14 -%define pkgversion 2.9.7 15 -%define oldver 0 16 -%define _aslxml 1 17 -%define epoch 1 18 -BuildRequires: asl-libxml2-devel 19 +%define pkgversion 2.7.1 20 %else 21 %define pkgversion 2.6.8 22 -%define pkgname modsecurity-apache_ 23 -%define oldver 1 24 -%define _aslxml 0 25 -%define epoch 0 26 -BuildRequires: libxml2-devel 27 -%endif 28 %endif 29 Version: %{pkgversion} 30 -Epoch: %{epoch} 31 -Release: 35 32 +Release: 30 33 License: GPLv2 34 URL: http://www.modsecurity.org/ 35 Group: System Environment/Daemons 36 -Source: http://www.modsecurity.org/download/%{pkgname}%{version}.tar.bz2 37 +Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.bz2 38 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?sl_version} || 0%{?redhat_version} 39 Source1: 00_mod_security.conf 40 Source2: modsecurity_crs_10_config-default.conf 41
42 Source5: modsec-clamscan.pl 43 Source6: modsec-clean_var-asl-data-audit 44 Patch1: waf-label.patch 45 -Patch2: modsecurity-2.9.1_curl-lower_7.34.patch 46 -Patch50: CVE-2013-2765.patch 47 +Patch2: mlogc-disable-force-sslv3.patch 48 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 49 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?sl_version} || 0%{?redhat_version} 50 Requires: httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) 51 BuildRequires: httpd-devel pkgconfig lua-devel 52 Requires: lua 53 -%if 0%{?rhel} >= 7 54 -%define apxs %{_bindir}/apxs 55 -%else 56 %define apxs %{_sbindir}/apxs 57 -%endif 58 %define apache_libexecdir %(%{apxs} -q LIBEXECDIR) 59 ##%define apache_sysconfdir %(%{apxs} -q SYSCONFDIR) 60 %define apache_sysconfdir /etc/httpd 61
62 Provides: apache2-mod_security2 = %{version} 63 %endif 64 65 -BuildRequires: pcre-devel libtool curl-devel 66 +BuildRequires: libxml2-devel pcre-devel libtool curl-devel 67 BuildRequires: curl 68 69 -BuildRequires: autoconf automake 70 Requires: libxml2 pcre 71 Provides: ix-mod_security = %{version} 72 73
74 as a powerful umbrella - shielding web applications from attacks. 75 76 %prep 77 -%setup -n %{pkgname}%{version} 78 +%setup -n modsecurity-apache_%{version} 79 %patch1 -p1 80 -%patch2 -p0 81 -%if 0%{?oldver} == 1 82 -%patch50 -p1 83 -%endif 84 +%patch2 85 86 %build 87 CFLAGS="%{optflags}" 88 export CFLAGS 89 -export PERL=/usr/bin/perl 90 - 91 -[ ! -f configure ] && ./autogen.sh 92 93 %configure \ 94 -%if 0%{_aslxml} == 1 95 - --with-libxml=/var/asl/usr/ \ 96 -%endif 97 - --enable-pcre-match-limit=no \ 98 - --enable-pcre-match-limit-recursion=no \ 99 - --enable-pcre-study \ 100 - --enable-htaccess-config 101 + --disable-pcre-match-limit \ 102 + --disable-pcre-match-limit-recursion 103 + 104 +# Legacy from LoadFile 105 +#perl -pi.orig -e 's|LIBDIR|%{_libdir}|;' %{SOURCE1} 106 107 make %{_smp_mflags} 108 109
110 install -D -m644 %{SOURCE4} %{buildroot}/%{apache_sysconfdir}/modsec/zzz_asl_custom_local_exclude.conf 111 install -D -m755 %{SOURCE5} %{buildroot}%{_bindir}/modsec-clamscan.pl 112 install -D -m755 %{SOURCE6} %{buildroot}%{_sysconfdir}/cron.daily/modsec-clean_var-asl-data-audit 113 -sed -i s@"%APAUSR%:%APAGRP%"@"%{apache_usr}:%{apache_grp}"@g %{buildroot}%{_sysconfdir}/cron.daily/modsec-clean_var-asl-data-audit 114 115 mkdir -p %{buildroot}/var/log/mlogc/data 116 install -D -m755 mlogc/mlogc %{buildroot}%{_bindir}/mlogc 117 |
||
[+] | Deleted | CVE-2013-2765.patch ^ |
@@ -1,10 +0,0 @@ ---- modsecurity-apache_2.6.8/apache2/msc_reqbody.c.orig 2013-06-29 18:56:31.446864803 +0200 -+++ modsecurity-apache_2.6.8/apache2/msc_reqbody.c 2013-06-29 18:56:45.354863561 +0200 -@@ -170,6 +170,7 @@ - - /* Would storing this chunk mean going over the limit? */ - if ((msr->msc_reqbody_spilltodisk) -+ && (msr->txcfg->reqbody_buffering != REQUEST_BODY_FORCEBUF_ON) - && (msr->msc_reqbody_length + length > (apr_size_t)msr->txcfg->reqbody_inmemory_limit)) - { - msc_data_chunk **chunks; | ||
[+] | Deleted | modsecurity-2.9.1_curl-lower_7.34.patch ^ |
@@ -1,60 +0,0 @@ ---- mlogc/mlogc.c.orig 2016-06-02 09:15:03.283648355 +0200 -+++ mlogc/mlogc.c 2016-06-02 10:59:44.378377602 +0200 -@@ -1270,33 +1270,36 @@ - } - - -- /* Seems like CURL_SSLVERSION_TLSv1_2 is not supported on libcurl -- * < v7.34.0 -- * -- * version_num is a 24 bit number created like this: -- * <8 bits major number> | <8 bits minor number> | <8 bits patch number>. -- */ -- switch (tlsprotocol) { -- case 0: -- curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_0); -- break; -- case 1: -- curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_1); -- break; -- case 2: -- curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2); -- break; -- default: -- curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2); -- break; -- } - cmaj = curlversion->version_num >> 16; - cmin = (curlversion->version_num & 0x00ff00) >> 8; - cpat = (curlversion->version_num & 0x0000ff); - /* If cURL version < v7.34.0, use TLS v1.x */ - if (cmaj <= 7 && cmin < 34) { - curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1); -- } -+#ifdef CURL_SSLVERSION_TLSv1_0 -+ } else { -+ /* Seems like CURL_SSLVERSION_TLSv1_2 is not supported on libcurl -+ * < v7.34.0 -+ * -+ * version_num is a 24 bit number created like this: -+ * <8 bits major number> | <8 bits minor number> | <8 bits patch number>. -+ */ -+ switch (tlsprotocol) { -+ case 0: -+ curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_0); -+ break; -+ case 1: -+ curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_1); -+ break; -+ case 2: -+ curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2); -+ break; -+ default: -+ curl_easy_setopt(curl, CURLOPT_SSLVERSION, CURL_SSLVERSION_TLSv1_2); -+ break; -+ } -+#endif -+ } - - curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, 15); - curl_easy_setopt(curl, CURLOPT_NOSIGNAL, TRUE); | ||
[+] | Changed | modsec-clamscan.pl ^ |
@@ -27,7 +27,7 @@ my ($FILE) = @ARGV; -$cmd = "$CLAMSCAN --stdout --no-summary $FILE"; +$cmd = "$CLAMSCAN --stdout --disable-summary $FILE"; $input = `$cmd`; $input =~ m/^(.+)/; $error_message = $1; | ||
[+] | Changed | modsec-clean_var-asl-data-audit ^ |
@@ -1,5 +1,4 @@ #!/bin/bash -nice -n 19 find /var/asl/data/audit -type d -mindepth 1 -cmin +30 -print0 | xargs -r -0 rm -rf +nice -n 19 find /var/asl/data/audit -type d -cmin +30 -print0 | xargs -r -0 rm -rf mkdir -p /var/asl/data/audit -chown -R %APAUSR%:%APAGRP% /var/asl/data/audit [ -x /usr/local/bin/modsec-permissions ] && /usr/local/bin/modsec-permissions || : | ||
Deleted | modsecurity-2.8.0.tar.bz2 ^ | |
Deleted | modsecurity-2.9.0.tar.bz2 ^ | |
Deleted | modsecurity-2.9.2.tar.bz2 ^ | |
Deleted | modsecurity-2.9.3.tar.bz2 ^ | |
Deleted | modsecurity-2.9.4.tar.bz2 ^ | |
Deleted | modsecurity-2.9.5.tar.bz2 ^ | |
Deleted | modsecurity-2.9.7.tar.bz2 ^ | |
Changed | modsecurity-apache_2.7.1.tar.bz2 ^ | |
Deleted | modsecurity-apache_2.7.5.tar.bz2 ^ | |
Deleted | modsecurity-apache_2.7.7.tar.bz2 ^ |