From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] nginx: Update to 1.15.9
Date: Tue, 26 Mar 2019 10:40:53 +0000
Message-ID: <65D2A34C-B7C8-4F72-B161-6E47E1E1FF9D@ipfire.org>
In-Reply-To: <5bf6a1f6446868287f98bed3986440cb20c760b3.camel@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8381238740222426345=="
List-Id: <development.lists.ipfire.org>

--===============8381238740222426345==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

Thank you. Merged.

> On 26 Mar 2019, at 06:45, ummeegge <ummeegge(a)ipfire.org> wrote:
> 
> Fast test also with TLSv1.3 only can be found in here -->
> https://forum.ipfire.org/viewtopic.php?f=6&p=123346#p123346
> 
> Best,
> 
> Erik
> 
> 
> On Di, 2019-03-26 at 07:15 +0100, Erik Kapfer wrote:
>> Fixes #12023 .
>> Added support for http2.
>> 
>> Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
>> ---
>> 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  <info(a)ipfire.org>           
>>          #
>> +# Copyright (C) 2007-2019  IPFire Team  <info(a)ipfire.org>           
>>          #
>> #                                                                   
>>          #
>> # 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
> 


--===============8381238740222426345==--