From mboxrd@z Thu Jan 1 00:00:00 1970
From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
effa44650ebc227d99a3781ba962e015a3430d3a
Date: Tue, 26 Mar 2019 10:40:32 +0000
Message-ID: <20190326104033.09DA184FDB0@people01.i.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5429482176718844500=="
List-Id: <ipfire-scm.lists.ipfire.org>
--===============5429482176718844500==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via effa44650ebc227d99a3781ba962e015a3430d3a (commit)
from 2547e73e6b1c2e24e631140f328eeb49deddb6f9 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit effa44650ebc227d99a3781ba962e015a3430d3a
Author: Erik Kapfer <ummeegge(a)ipfire.org>
Date: Tue Mar 26 07:15:16 2019 +0100
nginx: Update to 1.15.9
=20
Fixes #12023 .
Added support for http2.
=20
Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/packages/nginx | 6 +++---
lfs/nginx | 10 ++++++----
2 files changed, 9 insertions(+), 7 deletions(-)
Difference in files:
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 @@
=20
include Config
=20
-VER =3D 1.15.1
+VER =3D 1.15.9
=20
THISAPP =3D nginx-$(VER)
DL_FILE =3D $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM =3D $(URL_IPFIRE)
DIR_APP =3D $(DIR_SRC)/$(THISAPP)
TARGET =3D $(DIR_INFO)/$(THISAPP)
PROG =3D nginx
-PAK_VER =3D 8
+PAK_VER =3D 9
=20
############################################################################=
###
# Top-level Rules
@@ -42,7 +42,7 @@ objects =3D $(DL_FILE)
=20
$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 2dd5a265c54a76b699443931d80a61b9
+$(DL_FILE)_MD5 =3D 00dde20d4d2cc65bdaf8950a5bd3e14b
=20
install : $(TARGET)
=20
@@ -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
hooks/post-receive
--
IPFire 2.x development tree
--===============5429482176718844500==--