diff options
| author | joerg <joerg@pkgsrc.org> | 2016-05-31 19:44:47 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-05-31 19:44:47 +0000 |
| commit | 7c1518ec480c38d172c0d721a251199693cb9ed1 (patch) | |
| tree | 688bfabc10b41d674459c5fda89c52955a9e44b4 /www | |
| parent | f85f4a4ca5c4a31055ec8f9c0cfd34c14bda5de6 (diff) | |
| download | pkgsrc-7c1518ec480c38d172c0d721a251199693cb9ed1.tar.gz | |
Avoid CVE-2016-4450 (NULL dereference while saving client body to
temporary file). Bump revision.
Diffstat (limited to 'www')
| -rw-r--r-- | www/nginx-devel/Makefile | 3 | ||||
| -rw-r--r-- | www/nginx-devel/distinfo | 3 | ||||
| -rw-r--r-- | www/nginx-devel/patches/patch-src_os_unix_ngx__files.c | 17 | ||||
| -rw-r--r-- | www/nginx/Makefile | 4 | ||||
| -rw-r--r-- | www/nginx/patches/patch-src_os_unix_ngx__files.c | 17 |
5 files changed, 40 insertions, 4 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index 290d18395d7..2c8e96f8b69 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2016/01/26 17:59:13 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2016/05/31 19:54:43 joerg Exp $ DISTNAME= nginx-1.9.10 +PKGREVISION= 1 MAINTAINER= imil@NetBSD.org NGINX_HTTP_V2= yes diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo index 203dbce58c7..5a2e34bacb6 100644 --- a/www/nginx-devel/distinfo +++ b/www/nginx-devel/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2016/01/26 17:59:13 joerg Exp $ +$NetBSD: distinfo,v 1.20 2016/05/31 19:54:43 joerg Exp $ SHA1 (array-var-nginx-module-0.04.tar.gz) = 1fd3bdd05c2d1d7667ed6f7baa612ddf7f630df3 RMD160 (array-var-nginx-module-0.04.tar.gz) = a751a2ce87dcfb88d072779097b4df9f42a415e4 @@ -46,3 +46,4 @@ SHA512 (set-misc-nginx-module-0.29.tar.gz) = 8dd2e1bf29e04e21b2aa4e7e72d07094b2c Size (set-misc-nginx-module-0.29.tar.gz) = 35495 bytes SHA1 (patch-auto_install) = 723e2ae222146775ae66aed7815bf3f911dd1cd7 SHA1 (patch-conf_nginx.conf) = ee9fbc3838cc006f6e1cddddadf6603f4941d171 +SHA1 (patch-src_os_unix_ngx__files.c) = e6159893bbdf6b991dd3b3ee6fae32d304374995 diff --git a/www/nginx-devel/patches/patch-src_os_unix_ngx__files.c b/www/nginx-devel/patches/patch-src_os_unix_ngx__files.c new file mode 100644 index 00000000000..0d7afebb63d --- /dev/null +++ b/www/nginx-devel/patches/patch-src_os_unix_ngx__files.c @@ -0,0 +1,17 @@ +$NetBSD: patch-src_os_unix_ngx__files.c,v 1.1 2016/05/31 19:54:43 joerg Exp $ + +--- src/os/unix/ngx_files.c.orig 2016-01-26 14:27:43.000000000 +0000 ++++ src/os/unix/ngx_files.c +@@ -313,6 +313,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/www/nginx/Makefile b/www/nginx/Makefile index 1e0365dc22e..68482ad6605 100644 --- a/www/nginx/Makefile +++ b/www/nginx/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.63 2016/03/05 11:29:38 jperkin Exp $ +# $NetBSD: Makefile,v 1.64 2016/05/31 19:44:47 joerg Exp $ DISTNAME= nginx-1.8.1 MAINTAINER= joerg@NetBSD.org -PKGREVISION= 1 +PKGREVISION= 2 .include "../../www/nginx/Makefile.common" diff --git a/www/nginx/patches/patch-src_os_unix_ngx__files.c b/www/nginx/patches/patch-src_os_unix_ngx__files.c new file mode 100644 index 00000000000..0585c479649 --- /dev/null +++ b/www/nginx/patches/patch-src_os_unix_ngx__files.c @@ -0,0 +1,17 @@ +$NetBSD: patch-src_os_unix_ngx__files.c,v 1.1 2016/05/31 19:44:47 joerg Exp $ + +--- src/os/unix/ngx_files.c.orig 2016-01-26 14:39:33.000000000 +0000 ++++ src/os/unix/ngx_files.c +@@ -292,6 +292,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; + |