Mercurial > hg > nginx

annotate auto/lib/openssl/make @ 3430:966f9cf9c7da stable-0.7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge r3155, r3156, r3160, r969, r3191, r3197, r3358: SSL fixes: *) $ssl_session_id *) allow "make clean" for OpenSSL, the bug was introduced in r2874 *) disable SSLv2 and use only strong ciphers by default *) decrease SSL handshake error level to info
author Igor Sysoev <igor@sysoev.ru>
date Mon, 01 Feb 2010 14:39:16 +0000
parents 87da6664fb49
children ee529182e59f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
444
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 399
diff changeset
1
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 399
diff changeset
2 # Copyright (C) Igor Sysoev
42d11f017717 nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents: 399
diff changeset
3
583
4e296b7d25bf nginx-0.3.13-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 501
diff changeset
4
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
5 case "$CC" in
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
6
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
7 cl)
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
8
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
9 cat << END >> $NGX_MAKEFILE
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
10
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
11 $OPENSSL/openssl/include/openssl/ssl.h: $NGX_MAKEFILE
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
12 \$(MAKE) -f auto/lib/openssl/makefile.msvc \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
13 OPENSSL="$OPENSSL" OPENSSL_OPT="$OPENSSL_OPT"
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
14
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
15 END
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
16
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
17 ;;
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
18
2945
87da6664fb49 merge r2897, r2898, r2899, r2901, r2902, r2904, r2905, r2906, r2907,
Igor Sysoev <igor@sysoev.ru>
parents: 2879
diff changeset
19 bcc32)
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
20
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
21 ngx_opt=`echo "-DOPENSSL=\"$OPENSSL\" -DOPENSSL_OPT=\"$OPENSSL_OPT\"" \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
22 | sed -e "s/\//$ngx_regex_dirsep/g"`
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
23
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
24 cat << END >> $NGX_MAKEFILE
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
25
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
26 `echo "$OPENSSL\\openssl\\lib\\libeay32.lib: \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
27 $OPENSSL\\openssl\\include\\openssl\\ssl.h" \
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
28 | sed -e "s/\//$ngx_regex_dirsep/g"`
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
29
2846
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
30 `echo "$OPENSSL\\openssl\\lib\\ssleay32.lib: \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
31 $OPENSSL\\openssl\\include\\openssl\\ssl.h" \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
32 | sed -e "s/\//$ngx_regex_dirsep/g"`
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
33
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
34 `echo "$OPENSSL\\openssl\\include\\openssl\\ssl.h: $NGX_MAKEFILE" \
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
35 | sed -e "s/\//$ngx_regex_dirsep/g"`
dfec0e090265 fix building OpenSSL on Win32
Igor Sysoev <igor@sysoev.ru>
parents: 2838
diff changeset
36 \$(MAKE) -f auto/lib/openssl/makefile.bcc $ngx_opt
2712
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
37
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
38 END
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
39
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
40 ;;
41f993457021 OpenSSL building by MSVC and BCC from sources
Igor Sysoev <igor@sysoev.ru>
parents: 1005
diff changeset
41
399
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
42 *)
2945
87da6664fb49 merge r2897, r2898, r2899, r2901, r2902, r2904, r2905, r2906, r2907,
Igor Sysoev <igor@sysoev.ru>
parents: 2879
diff changeset
43 case $USE_THREADS in
87da6664fb49 merge r2897, r2898, r2899, r2901, r2902, r2904, r2905, r2906, r2907,
Igor Sysoev <igor@sysoev.ru>
parents: 2879
diff changeset
44 NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;;
87da6664fb49 merge r2897, r2898, r2899, r2901, r2902, r2904, r2905, r2906, r2907,
Igor Sysoev <igor@sysoev.ru>
parents: 2879
diff changeset
45 *) OPENSSL_OPT="$OPENSSL_OPT threads" ;;
87da6664fb49 merge r2897, r2898, r2899, r2901, r2902, r2904, r2905, r2906, r2907,
Igor Sysoev <igor@sysoev.ru>
parents: 2879
diff changeset
46 esac
2879
824d885aa0b1 allow absolute path in --with-openssl=
Igor Sysoev <igor@sysoev.ru>
parents: 2873
diff changeset
47
2945
87da6664fb49 merge r2897, r2898, r2899, r2901, r2902, r2904, r2905, r2906, r2907,
Igor Sysoev <igor@sysoev.ru>
parents: 2879
diff changeset
48 case $OPENSSL in
3430
966f9cf9c7da merge r3155, r3156, r3160, r969, r3191, r3197, r3358:
Igor Sysoev <igor@sysoev.ru>
parents: 2945
diff changeset
49 /*) ngx_prefix="$OPENSSL/.openssl" ;;
966f9cf9c7da merge r3155, r3156, r3160, r969, r3191, r3197, r3358:
Igor Sysoev <igor@sysoev.ru>
parents: 2945
diff changeset
50 *) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
2879
824d885aa0b1 allow absolute path in --with-openssl=
Igor Sysoev <igor@sysoev.ru>
parents: 2873
diff changeset
51 esac
824d885aa0b1 allow absolute path in --with-openssl=
Igor Sysoev <igor@sysoev.ru>
parents: 2873
diff changeset
52
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
53 cat << END >> $NGX_MAKEFILE
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
54
3430
966f9cf9c7da merge r3155, r3156, r3160, r969, r3191, r3197, r3358:
Igor Sysoev <igor@sysoev.ru>
parents: 2945
diff changeset
55 $OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
56 cd $OPENSSL \\
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
57 && \$(MAKE) clean \\
2879
824d885aa0b1 allow absolute path in --with-openssl=
Igor Sysoev <igor@sysoev.ru>
parents: 2873
diff changeset
58 && ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\
2873
e069d0b8b198 fix building OpenSSL on Unix
Igor Sysoev <igor@sysoev.ru>
parents: 2846
diff changeset
59 && \$(MAKE) \\
e069d0b8b198 fix building OpenSSL on Unix
Igor Sysoev <igor@sysoev.ru>
parents: 2846
diff changeset
60 && \$(MAKE) install
501
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
61
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
62 END
d4ea69372b94 nginx-0.1.25-RELEASE import
Igor Sysoev <igor@sysoev.ru>
parents: 493
diff changeset
63
399
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
64 ;;
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
65
4e21d1291a14 nginx-0.0.7-2004-07-25-22:34:14 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
66 esac