summaryrefslogtreecommitdiffstats
path: root/package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2018-11-09 11:08:19 +0100
committerPeter Korsgaard <peter@korsgaard.com>2018-11-09 14:05:48 +0100
commitc2f5b3a3a866859528747edc191fb9c241343e88 (patch)
tree5a9a60411934ca631af7e0615c279eb83cd3cd12 /package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch
parent3a4c111b1f359e2ba50e31ef1246e48456a391de (diff)
downloadbuildroot-c2f5b3a3a866859528747edc191fb9c241343e88.tar.gz
buildroot-c2f5b3a3a866859528747edc191fb9c241343e88.zip
nginx: security bump to 1.15.6
Fixes the following security issues: CVE-2018-16843: Excessive memory usage in HTTP/2 CVE-2018-16844: Excessive CPU usage in HTTP/2 CVE-2018-16845: Memory disclosure in the ngx_http_mp4_module Refreshed patch 0004 + 0007 as they no longer applied cleanly. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch')
-rw-r--r--package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch14
1 files changed, 8 insertions, 6 deletions
diff --git a/package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch b/package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch
index 103f90b305..09e708b73c 100644
--- a/package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch
+++ b/package/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch
@@ -1,4 +1,4 @@
-From 211b9f19a3a62826fadef55d2f89d6f66fbf4aa6 Mon Sep 17 00:00:00 2001
+From 7783d63c87f94797aa134786214b0a84c000be75 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Thu, 29 May 2014 19:22:27 +0200
Subject: [PATCH] auto/lib/libxslt/conf: use pkg-config
@@ -7,12 +7,14 @@ Change to using pkg-config to find the path to libxslt and its
dependencies.
Signed-off-by: Martin Bark <martin@barkynet.com>
+[Peter: updated for 1.15.6]
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
- auto/lib/libxslt/conf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ auto/lib/libxslt/conf | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf
-index 3a0f37b..3c2a60e 100644
+index 3063ac7c..3209e364 100644
--- a/auto/lib/libxslt/conf
+++ b/auto/lib/libxslt/conf
@@ -12,8 +12,9 @@
@@ -26,7 +28,7 @@ index 3a0f37b..3c2a60e 100644
+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs libxslt)"
ngx_feature_test="xmlParserCtxtPtr ctxt = NULL;
xsltStylesheetPtr sheet = NULL;
- xmlDocPtr doc;
+ xmlDocPtr doc = NULL;
--
-2.8.2
+2.11.0
OpenPOWER on IntegriCloud