From 2478604756b999c8b6f41e4a9f1596ce911c4943 Mon Sep 17 00:00:00 2001 From: Toyam Cox Date: Mon, 27 Jun 2016 15:39:21 -0400 Subject: [PATCH] nginx: update to 1.10.1. --- srcpkgs/nginx/patches/cve-2016-4450.patch | 16 ---------------- srcpkgs/nginx/template | 8 ++++---- 2 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 srcpkgs/nginx/patches/cve-2016-4450.patch diff --git a/srcpkgs/nginx/patches/cve-2016-4450.patch b/srcpkgs/nginx/patches/cve-2016-4450.patch deleted file mode 100644 index b2ff7d04637..00000000000 --- a/srcpkgs/nginx/patches/cve-2016-4450.patch +++ /dev/null @@ -1,16 +0,0 @@ -http://mailman.nginx.org/pipermail/nginx-announce/2016/000179.html - ---- src/os/unix/ngx_files.c -+++ src/os/unix/ngx_files.c -@@ -183,6 +183,12 @@ ngx_write_chain_to_file(ngx_file_t *file - /* create the iovec and coalesce the neighbouring bufs */ - - while (cl && vec.nelts < IOV_MAX) { -+ -+ if (ngx_buf_special(cl->buf)) { -+ cl = cl->next; -+ continue; -+ } -+ - if (prev == cl->buf->pos) { - iov->iov_len += cl->buf->last - cl->buf->pos; diff --git a/srcpkgs/nginx/template b/srcpkgs/nginx/template index a6563266f49..d4c6042ebd6 100644 --- a/srcpkgs/nginx/template +++ b/srcpkgs/nginx/template @@ -1,7 +1,7 @@ # Template file for 'nginx' pkgname=nginx -version=1.8.1 -revision=5 +version=1.10.1 +revision=1 makedepends="pcre-devel libressl-devel $(vopt_if geoip geoip-devel)" if [ "$CROSS_BUILD" ]; then # fake configure run on host @@ -28,7 +28,7 @@ maintainer="Juan RP " license="Simplified BSD" homepage="http://nginx.org" distfiles="http://nginx.org/download/nginx-$version.tar.gz" -checksum=8f4b3c630966c044ec72715754334d1fdf741caa1d5795fb4646c27d09f797b7 +checksum=1fd35846566485e03c0e318989561c135c598323ff349c503a6c14826487a801 build_options="geoip" build_options_default="geoip" @@ -59,7 +59,7 @@ do_configure() { --with-ipv6 --with-pcre-jit \ --with-file-aio \ --with-http_gunzip_module \ - --with-http_spdy_module \ + --with-http_v2_module \ --with-http_dav_module \ --with-http_gzip_static_module \ --with-http_realip_module \