From patchwork Tue Mar 26 17:15:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ummeegge X-Patchwork-Id: 2162 Return-Path: Received: from mail01.ipfire.org (mail01.i.ipfire.org [172.28.1.200]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail01.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web07.i.ipfire.org (Postfix) with ESMTPS id 12C0785A0DF for ; Tue, 26 Mar 2019 06:15:37 +0000 (GMT) Received: from mail01.i.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 44T18S17W5z53WcR; Tue, 26 Mar 2019 06:15:36 +0000 (GMT) Received: from ipfire-server.local (i59F4FA56.versanet.de [89.244.250.86]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 44T18Q15lqz5CZSW; Tue, 26 Mar 2019 06:15:34 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201801; t=1553580934; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:references; bh=jCAJ526S2bDEDMOubDVDroWkzRvZYTl4fY7bojvn+qE=; b=joqwl+0n8/m7/7RyDKix3T91+o1bUoQjgAoGMhcdKNC8xH4mdIJwvi1SG5h0gUFMAWO8+O COfj5CXA/xnQ7pM26s4a3qU2NWZPBxynUM2RCns+ZQI7pO/QuG1hot825KagHtejFfx3PE T9giOJwqfCps3NPVuUVCPfqGqGSs2IRvqYR0mJHKuCbn71l1i+KKRlhu3hDdLYnJLib9QD 1PBpIW5qR9PF9gVYNXCefLFI/jMaZv61IJG/Z4v912qOQaPtOzyNbGf05qzvSegvYCsi03 Zk6nbdmmNXzlx/vI4ICEqLYont+FBxYAIiem4GE5YfCxrvcK6h8q+h5c6YqSQA== From: Erik Kapfer To: development@lists.ipfire.org Subject: [PATCH] nginx: Update to 1.15.9 Date: Tue, 26 Mar 2019 07:15:16 +0100 Message-Id: <20190326061516.1981-1-ummeegge@ipfire.org> X-Mailer: git-send-email 2.12.2 X-Spamd-Result: default: False [-2.10 / 11.00]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; DKIM_SIGNED(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; MID_CONTAINS_FROM(1.00)[]; RCVD_COUNT_ZERO(0.00)[0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:8881, ipnet:89.244.240.0/20, country:DE]; BAYES_HAM(-3.00)[100.00%] Authentication-Results: mail01.ipfire.org; auth=pass smtp.auth=ummeegge smtp.mailfrom=ummeegge@ipfire.org X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Fixes #12023 . Added support for http2. Signed-off-by: Erik Kapfer --- config/rootfiles/packages/nginx | 6 +++--- lfs/nginx | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/config/rootfiles/packages/nginx b/config/rootfiles/packages/nginx index 3560e45b9..2ea271bd9 100644 --- a/config/rootfiles/packages/nginx +++ b/config/rootfiles/packages/nginx @@ -1,4 +1,4 @@ -etc/nginx +#etc/nginx etc/nginx/fastcgi.conf etc/nginx/fastcgi.conf.default etc/nginx/fastcgi_params @@ -16,8 +16,8 @@ etc/nginx/uwsgi_params.default etc/nginx/win-utf etc/rc.d/init.d/nginx usr/sbin/nginx -usr/share/nginx -usr/share/nginx/html +#usr/share/nginx +#usr/share/nginx/html usr/share/nginx/html/50x.html usr/share/nginx/html/index.html var/ipfire/backup/addons/includes/nginx diff --git a/lfs/nginx b/lfs/nginx index f6496196c..5a24678c8 100644 --- a/lfs/nginx +++ b/lfs/nginx @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2019 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -24,7 +24,7 @@ include Config -VER = 1.15.1 +VER = 1.15.9 THISAPP = nginx-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = nginx -PAK_VER = 8 +PAK_VER = 9 ############################################################################### # Top-level Rules @@ -42,7 +42,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 2dd5a265c54a76b699443931d80a61b9 +$(DL_FILE)_MD5 = 00dde20d4d2cc65bdaf8950a5bd3e14b install : $(TARGET) @@ -99,7 +99,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-http_stub_status_module \ --with-http_dav_module \ --with-http_sub_module \ + --with-http_v2_module \ --with-pcre + cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install mkdir -p /var/log/nginx /var/spool/nginx