Logoj0ke.net Open Build Service > Projects > internetx > mod_security > Changes
Sign Up | Log In

Difference Between Revision 38 and internetx:managed:testing / mod_security

[-] Changed mod_security-ix.changes
​x
 
1
@@ -1,66 +1,4 @@
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
​
[-] Changed mod_security-ix.spec ^
108
 
1
@@ -1,36 +1,16 @@
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.4
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
 License:   GPLv2
33
 URL:       http://www.modsecurity.org/
34
 Group:     System Environment/Daemons
35
-Source:        http://www.modsecurity.org/download/%{pkgname}%{version}.tar.bz2
36
+Source:        http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.bz2
37
 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?sl_version} || 0%{?redhat_version}
38
 Source1:   00_mod_security.conf
39
 Source2:   modsecurity_crs_10_config-default.conf
40
@@ -44,18 +24,13 @@
41
 Source5:   modsec-clamscan.pl
42
 Source6:   modsec-clean_var-asl-data-audit
43
 Patch1:        waf-label.patch
44
-Patch2:        modsecurity-2.9.1_curl-lower_7.34.patch
45
-Patch50:   CVE-2013-2765.patch
46
+Patch2:        mlogc-disable-force-sslv3.patch
47
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
48
 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?sl_version} || 0%{?redhat_version}
49
 Requires:  httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
50
 BuildRequires: httpd-devel pkgconfig lua-devel
51
 Requires:  lua
52
-%if 0%{?rhel} >= 7
53
-%define        apxs            %{_bindir}/apxs
54
-%else
55
 %define        apxs            %{_sbindir}/apxs
56
-%endif
57
 %define        apache_libexecdir   %(%{apxs} -q LIBEXECDIR)
58
 ##%define      apache_sysconfdir   %(%{apxs} -q SYSCONFDIR)
59
 %define        apache_sysconfdir   /etc/httpd
60
@@ -79,10 +54,9 @@
61
 Provides:  apache2-mod_security2 = %{version}
62
 %endif
63
64
-BuildRequires: pcre-devel libtool curl-devel
65
+BuildRequires: libxml2-devel pcre-devel libtool curl-devel
66
 BuildRequires: curl
67
68
-BuildRequires:  autoconf automake
69
 Requires:  libxml2 pcre
70
 Provides:  ix-mod_security = %{version}
71
72
@@ -92,28 +66,20 @@
73
 as a powerful umbrella - shielding web applications from attacks.
74
75
 %prep
76
-%setup -n %{pkgname}%{version}
77
+%setup -n modsecurity-apache_%{version}
78
 %patch1 -p1
79
-%patch2 -p0
80
-%if 0%{?oldver} == 1
81
-%patch50 -p1
82
-%endif
83
+%patch2
84
85
 %build
86
 CFLAGS="%{optflags}"
87
 export CFLAGS
88
-export PERL=/usr/bin/perl
89
-
90
-[ ! -f configure ] && ./autogen.sh
91
92
 %configure \
93
-%if 0%{_aslxml} == 1
94
-   --with-libxml=/var/asl/usr/ \
95
-%endif
96
-        --enable-pcre-match-limit=no \
97
-        --enable-pcre-match-limit-recursion=no \
98
-   --enable-pcre-study \
99
-   --enable-htaccess-config
100
+   --disable-pcre-match-limit \
101
+   --disable-pcre-match-limit-recursion
102
+
103
+# Legacy from LoadFile
104
+#perl -pi.orig -e 's|LIBDIR|%{_libdir}|;' %{SOURCE1}
105
106
 make  %{_smp_mflags}
107
108
​
[+] Deleted CVE-2013-2765.patch ^
[+] Deleted modsecurity-2.9.1_curl-lower_7.34.patch ^
[+] Changed modsec-clamscan.pl ^
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 ^
Deleted modsecurity-apache_2.7.5.tar.bz2 ^
Deleted modsecurity-apache_2.7.7.tar.bz2 ^

Cancel