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 7dadc138292897979fd7b42dcaae3ea19f24dae0 (commit) via bf24eeec200ef75eaefd93be32a6e878a6c2b998 (commit) from 63420a96b6707866d2271715e6fae691f16650c4 (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 7dadc138292897979fd7b42dcaae3ea19f24dae0 Author: Michael Tremer michael.tremer@ipfire.org Date: Sat Oct 28 13:36:27 2017 +0100

core116: Ship updated apache

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit bf24eeec200ef75eaefd93be32a6e878a6c2b998 Author: Wolfgang Apolinarski wolfgang.apolinarski@googlemail.com Date: Sat Oct 28 12:52:03 2017 +0200

Update to Apache 2.4.29

Signed-off-by: Michael Tremer michael.tremer@ipfire.org

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/apache2 | 2 ++ config/rootfiles/{oldcore/114 => core/116}/filelists/apache2 | 0 config/rootfiles/core/116/update.sh | 1 + lfs/apache2 | 4 ++-- 4 files changed, 5 insertions(+), 2 deletions(-) copy config/rootfiles/{oldcore/114 => core/116}/filelists/apache2 (100%)

Difference in files: diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 040b482..64faa79 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1115,6 +1115,8 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/mod/mpmt_os2.html #srv/web/ipfire/manual/mod/mpmt_os2.html.en #srv/web/ipfire/manual/mod/mpmt_os2.html.fr +#srv/web/ipfire/manual/mod/overrides.html +#srv/web/ipfire/manual/mod/overrides.html.en #srv/web/ipfire/manual/mod/prefork.html #srv/web/ipfire/manual/mod/prefork.html.de #srv/web/ipfire/manual/mod/prefork.html.en diff --git a/config/rootfiles/core/116/filelists/apache2 b/config/rootfiles/core/116/filelists/apache2 new file mode 120000 index 0000000..eef95ef --- /dev/null +++ b/config/rootfiles/core/116/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/116/update.sh b/config/rootfiles/core/116/update.sh index 7a4d765..7a5512c 100644 --- a/config/rootfiles/core/116/update.sh +++ b/config/rootfiles/core/116/update.sh @@ -44,6 +44,7 @@ ldconfig #/usr/local/bin/update-lang-cache

# Start services +/etc/init.d/apache restart /etc/init.d/snort start

# This update need a reboot... diff --git a/lfs/apache2 b/lfs/apache2 index 4276a88..28855fd 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -25,7 +25,7 @@

include Config

-VER = 2.4.28 +VER = 2.4.29

THISAPP = httpd-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -45,7 +45,7 @@ objects = $(DL_FILE)

$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 49007ffe8e37a0834255b279810edf24 +$(DL_FILE)_MD5 = 0c599404ef6b69eee95bcd9fcd094407

install : $(TARGET)

hooks/post-receive -- IPFire 2.x development tree