diff options
| author | 4679 | 2016-01-10 11:00:03 +0800 |
|---|---|---|
| committer | 4679 | 2016-01-10 11:00:03 +0800 |
| commit | fe8cd064a5d727adddfaaadee139d7b3743eb68d (patch) | |
| tree | 904c1efb65ef14644421009565ee94ee9949f7ee | |
| parent | e49c851a7dd125f2128fa9075875baa4b5ed320b (diff) | |
| download | aur-fe8cd064a5d727adddfaaadee139d7b3743eb68d.tar.gz | |
1.9.9
| -rw-r--r-- | .SRCINFO | 12 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | openssl.patch | 12 |
3 files changed, 22 insertions, 13 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Mon Jan 4 05:34:34 UTC 2016 +# Sun Jan 10 02:59:36 UTC 2016 pkgbase = nginx-mainline-boringssl pkgdesc = lightweight HTTP server, statically linked against BoringSSL. - pkgver = 1.9.7 + pkgver = 1.9.9 pkgrel = 2 url = http://nginx.org arch = i686 @@ -40,13 +40,15 @@ pkgbase = nginx-mainline-boringssl source = nginx.conf source = nginx.logrotate source = nginx.service - source = http://nginx.org/download/nginx-1.9.7.tar.gz + source = http://nginx.org/download/nginx-1.9.9.tar.gz source = openssl.patch + source = git+https://boringssl.googlesource.com/boringssl sha256sums = 8d8e314da10411b29157066ea313fc080a145d2075df0c99a1d500ffc7e8b7d1 sha256sums = adcf6507abb2d4edbc50bd92f498ba297927eed0460d71633df94f79637aa786 sha256sums = 225228970d779e1403ba4314e3cd8d0d7d16f8c6d48d7a22f8384db040eb0bdf - sha256sums = 794bd217affdfce1c6263d9199c3961f387a2df9d57dcb42876faaf41c1748d5 - sha256sums = 49b0e58fe5212bf058a416682fd958e586fa57987f6af3395c40b7a483a6d849 + sha256sums = de66bb2b11c82533aa5cb5ccc27cbce736ab87c9f2c761e5237cda0b00068d73 + sha256sums = SKIP + sha256sums = SKIP pkgname = nginx-mainline-boringssl @@ -13,7 +13,7 @@ _log_path="/var/log/${_pkgname}" pkgname=nginx-mainline-boringssl -pkgver=1.9.7 +pkgver=1.9.9 pkgrel=2 pkgdesc="lightweight HTTP server, statically linked against BoringSSL." arch=('i686' 'x86_64') @@ -46,19 +46,20 @@ source=( "nginx.conf" "nginx.service" "http://nginx.org/download/nginx-$pkgver.tar.gz" "openssl.patch" + "git+https://boringssl.googlesource.com/boringssl" ) sha256sums=('8d8e314da10411b29157066ea313fc080a145d2075df0c99a1d500ffc7e8b7d1' 'adcf6507abb2d4edbc50bd92f498ba297927eed0460d71633df94f79637aa786' '225228970d779e1403ba4314e3cd8d0d7d16f8c6d48d7a22f8384db040eb0bdf' - '794bd217affdfce1c6263d9199c3961f387a2df9d57dcb42876faaf41c1748d5' - '49b0e58fe5212bf058a416682fd958e586fa57987f6af3395c40b7a483a6d849') + 'de66bb2b11c82533aa5cb5ccc27cbce736ab87c9f2c761e5237cda0b00068d73' + 'SKIP' + 'SKIP') build() { local _src_dir="${srcdir}/${_pkgname}-${pkgver}" - export CFLAGS="-Wno-error" - git clone https://boringssl.googlesource.com/boringssl + export CFLAGS="-Wno-error -fPIC" cd ${srcdir}/boringssl mkdir build && cd build && cmake ../ && make && cd ${srcdir}/boringssl mkdir -p .openssl/lib && cd .openssl && ln -s ../include . && cd ../ diff --git a/openssl.patch b/openssl.patch index 32c2cc1413df..3dad00740100 100644 --- a/openssl.patch +++ b/openssl.patch @@ -1,6 +1,6 @@ ---- src/event/ngx_event_openssl.c 2015-12-05 09:33:39.819749000 +0800 -+++ src/event/ngx_event_openssl.c.mod 2015-12-05 09:34:30.399748978 +0800 -@@ -1909,7 +1909,6 @@ +--- src/event/ngx_event_openssl.c 2016-01-10 02:38:56.405000000 +0000 ++++ src/event/ngx_event_openssl.c.mod 2016-01-10 02:40:10.388000000 +0000 +@@ -1909,13 +1909,11 @@ /* handshake failures */ if (n == SSL_R_BAD_CHANGE_CIPHER_SPEC /* 103 */ @@ -8,3 +8,9 @@ || n == SSL_R_DIGEST_CHECK_FAILED /* 149 */ || n == SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST /* 151 */ || n == SSL_R_EXCESSIVE_MESSAGE_SIZE /* 152 */ + || n == SSL_R_LENGTH_MISMATCH /* 159 */ + || n == SSL_R_NO_CIPHERS_PASSED /* 182 */ +- || n == SSL_R_NO_CIPHERS_SPECIFIED /* 183 */ + || n == SSL_R_NO_COMPRESSION_SPECIFIED /* 187 */ + || n == SSL_R_NO_SHARED_CIPHER /* 193 */ + || n == SSL_R_RECORD_LENGTH_MISMATCH /* 213 */ |