|
@@ -0,0 +1,35 @@
|
|
1
|
+Index: nginx-1.4.7/src/os/unix/ngx_linux_config.h
|
|
2
|
+===================================================================
|
|
3
|
+--- nginx-1.4.7.orig/src/os/unix/ngx_linux_config.h
|
|
4
|
++++ nginx-1.4.7/src/os/unix/ngx_linux_config.h
|
|
5
|
+@@ -51,7 +51,6 @@
|
|
6
|
+ #include <malloc.h> /* memalign() */
|
|
7
|
+ #include <limits.h> /* IOV_MAX */
|
|
8
|
+ #include <sys/ioctl.h>
|
|
9
|
+-#include <sys/sysctl.h>
|
|
10
|
+ #include <crypt.h>
|
|
11
|
+ #include <sys/utsname.h> /* uname() */
|
|
12
|
+
|
|
13
|
+--- nginx-1.2.7/src/os/unix/ngx_user.c
|
|
14
|
++++ nginx-1.2.7-patched/src/os/unix/ngx_user.c
|
|
15
|
+@@ -31,8 +31,6 @@
|
|
16
|
+ struct crypt_data cd;
|
|
17
|
+
|
|
18
|
+ cd.initialized = 0;
|
|
19
|
+- /* work around the glibc bug */
|
|
20
|
+- cd.current_salt[0] = ~salt[0];
|
|
21
|
+
|
|
22
|
+ value = crypt_r((char *) key, (char *) salt, &cd);
|
|
23
|
+
|
|
24
|
+diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf
|
|
25
|
+index 528ee17..73ef359 100644
|
|
26
|
+--- a/auto/lib/openssl/conf
|
|
27
|
++++ b/auto/lib/openssl/conf
|
|
28
|
+@@ -47,7 +47,7 @@ else
|
|
29
|
+ ngx_feature_run=no
|
|
30
|
+ ngx_feature_incs="#include <openssl/ssl.h>"
|
|
31
|
+ ngx_feature_path=
|
|
32
|
+- ngx_feature_libs="-lssl -lcrypto"
|
|
33
|
++ ngx_feature_libs="-lssl -lcrypto -lz"
|
|
34
|
+ ngx_feature_test="SSL_library_init()"
|
|
35
|
+ . auto/feature
|