Logoj0ke.net Open Build Service > Projects > internetx:projects:http > nginx > Changes
Sign Up | Log In

Changes of Revision 67

[-] Changed nginx.spec
x
 
1
@@ -85,7 +85,7 @@
2
 Patch0:     nginx-auto-cc-gcc.patch
3
 Patch1:     nginx-conf-0.7.x.patch
4
 Patch2:        check_1.7.5+.patch
5
-Patch5:        openssl-rc4tilt.patch
6
+Patch3:        openssl-rc4tilt.patch
7
 
8
 %description
9
 Nginx [engine x] is an HTTP(S) server, HTTP(S) reverse proxy and IMAP/POP3
10
@@ -99,6 +99,7 @@
11
 %patch0 -p0
12
 %patch1 -p0
13
 %patch2 -p1
14
+%patch3 -p0
15
 %{__tar} zxvf %{SOURCE5}
16
 %{__tar} zxvf %{SOURCE9}
17
 %{__tar} zxvf %{SOURCE10}
18
@@ -106,7 +107,6 @@
19
 %{__tar} zxvf %{SOURCE12}
20
 %{__tar} zxvf %{SOURCE13}
21
 
22
-#%patch5 -p0
23
 
24
 %if 0%{?rhel_version} == 700 || 0%{?centos_version} == 700
25
 
26
@@ -127,22 +127,6 @@
27
 
28
 
29
 %build
30
-
31
-#pushd modsecurity-%{waf_version} build mod_security library first
32
-#
33
-#%configure \
34
-#%if 0%{?rhel} < 6
35
-#  --with-libxml=%{libxml2_build_path}  \
36
-#%endif
37
-#  --enable-standalone-module --enable-pcre-match-limit=no --enable-pcre-match-limit-recursion=no 
38
-#
39
-#make || :
40
-#cd standalone
41
-#make install-exec-hook || :
42
-#popd
43
-
44
-
45
-
46
 export DESTDIR=%{buildroot}
47
 ./configure \
48
     --user=%{nginx_user} \
49
@@ -178,19 +162,8 @@
50
     --with-debug \
51
     --with-ipv6 \
52
     --with-cc-opt="%{optflags} $(pcre-config --cflags)" \
53
-#    --with-openssl=%{_builddir}/nginx-%{version}/openssl-%{openssl_version} \
54
-#    --add-module=%{_builddir}/nginx-%{version}/nginx-upstream-fair \
55
-#    --add-module=%{_builddir}/nginx-%{version}/nginx_upstream_check_module \
56
-#%if 0%{with_rtmp_ext}
57
-#    --add-module=%{_builddir}/nginx-%{version}/%{rtmp} \
58
-#%endif
59
-#    --add-module=%{_builddir}/nginx-%{version}/Nginx-limit-traffic-rate-module \
60
-#%if 0%{?rhel_version} == 700 || 0%{?centos_version} == 700
61
-#    --add-module=%{_builddir}/nginx-%{version}/ngx_pagespeed-release-%{nps_version}-beta \
62
-#%endif
63
-#    --add-module=%{_builddir}/nginx-%{version}/modsecurity-%{waf_version}/nginx/modsecurity \
64
-#    --with-file-aio \
65
-#    --with-poll_module \
66
+    --with-openssl=%{_builddir}/nginx-%{version}/openssl-%{openssl_version} \
67
+    --with-file-aio \
68
     --without-mail_pop3_module \
69
     --without-mail_imap_module \
70
     --without-mail_smtp_module 
71