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 0aad67988b00090f9bdb59192101c4dbad9fc56b (commit) via 0957a949db0dfeba0487b48dcfdac3b2cbe5fc67 (commit) via a86c5df80d8cb74f31be9f4c578090fca40fb5d3 (commit) via 41749b748b9faa88fbbf69caf20cddff5e004d13 (commit) from 6f8a114146e76441c69c58af31b8f1ccd77718c1 (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 0aad67988b00090f9bdb59192101c4dbad9fc56b Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 7 11:15:34 2021 +0000

core158: Ship apache2

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

commit 0957a949db0dfeba0487b48dcfdac3b2cbe5fc67 Author: Matthias Fischer matthias.fischer@ipfire.org Date: Sun Jun 6 17:57:55 2021 +0200

apache: Update to 2.4.48

apache: Update to 2.4.48

For details see: https://mirror.synyx.de/apache//httpd/CHANGES_2.4.48

Signed-off-by: Matthias Fischer matthias.fischer@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

commit a86c5df80d8cb74f31be9f4c578090fca40fb5d3 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jun 7 11:14:40 2021 +0000

core158: Ship rng-tools

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

commit 41749b748b9faa88fbbf69caf20cddff5e004d13 Author: Peter Müller peter.mueller@ipfire.org Date: Fri Jun 4 23:29:42 2021 +0200

rng-tools: update to 6.12

Please refer to https://github.com/nhorman/rng-tools/releases for a full list of meaningful changes between 6.4 and 6.12. "--without-pkcs11" is necessary to avoid additional dependencies, which do not make sense on IPFire since there are no use-cases for it.

Rootfiles did not change, our patch to use RDRDAND on i586 as well is still valid.

Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org

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

Summary of changes: config/rootfiles/common/apache2 | 4 +++- config/rootfiles/{oldcore/114 => core/158}/filelists/apache2 | 0 config/rootfiles/{oldcore/121 => core/158}/filelists/rng-tools | 0 config/rootfiles/core/158/update.sh | 2 ++ lfs/apache2 | 6 +++--- lfs/rng-tools | 8 ++++---- 6 files changed, 12 insertions(+), 8 deletions(-) copy config/rootfiles/{oldcore/114 => core/158}/filelists/apache2 (100%) copy config/rootfiles/{oldcore/121 => core/158}/filelists/rng-tools (100%)

Difference in files: diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 4bd3e3794..8442446df 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -422,6 +422,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/getting-started.html #srv/web/ipfire/manual/getting-started.html.en #srv/web/ipfire/manual/getting-started.html.fr.utf8 +#srv/web/ipfire/manual/getting-started.html.ru.utf8 #srv/web/ipfire/manual/glossary.html #srv/web/ipfire/manual/glossary.html.de #srv/web/ipfire/manual/glossary.html.en @@ -545,6 +546,7 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/index.html.ja.utf8 #srv/web/ipfire/manual/index.html.ko.euc-kr #srv/web/ipfire/manual/index.html.pt-br +#srv/web/ipfire/manual/index.html.ru.utf8 #srv/web/ipfire/manual/index.html.tr.utf8 #srv/web/ipfire/manual/index.html.zh-cn.utf8 #srv/web/ipfire/manual/install.html @@ -1174,7 +1176,6 @@ srv/web/ipfire/html/captive #srv/web/ipfire/manual/new_features_2_0.html.ja.utf8 #srv/web/ipfire/manual/new_features_2_0.html.ko.euc-kr #srv/web/ipfire/manual/new_features_2_0.html.pt-br -#srv/web/ipfire/manual/new_features_2_0.html.ru.koi8-r #srv/web/ipfire/manual/new_features_2_0.html.tr.utf8 #srv/web/ipfire/manual/new_features_2_2.html #srv/web/ipfire/manual/new_features_2_2.html.en @@ -1515,6 +1516,7 @@ usr/bin/htpasswd #usr/include/apache/http_main.h #usr/include/apache/http_protocol.h #usr/include/apache/http_request.h +#usr/include/apache/http_ssl.h #usr/include/apache/http_vhost.h #usr/include/apache/httpd.h #usr/include/apache/mod_auth.h diff --git a/config/rootfiles/core/158/filelists/apache2 b/config/rootfiles/core/158/filelists/apache2 new file mode 120000 index 000000000..eef95efa7 --- /dev/null +++ b/config/rootfiles/core/158/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/158/filelists/rng-tools b/config/rootfiles/core/158/filelists/rng-tools new file mode 120000 index 000000000..a7853e41b --- /dev/null +++ b/config/rootfiles/core/158/filelists/rng-tools @@ -0,0 +1 @@ +../../../common/rng-tools \ No newline at end of file diff --git a/config/rootfiles/core/158/update.sh b/config/rootfiles/core/158/update.sh index 2568ea836..8a02cc6a8 100644 --- a/config/rootfiles/core/158/update.sh +++ b/config/rootfiles/core/158/update.sh @@ -56,7 +56,9 @@ ldconfig /usr/local/bin/filesystem-cleanup

# Start services +/etc/init.d/apache restart /etc/init.d/vnstatd restart +/etc/init.d/rngd restart

# This update needs a reboot... #touch /var/run/need_reboot diff --git a/lfs/apache2 b/lfs/apache2 index 772ac6018..ff9de7eb7 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2021 IPFire Team info@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 # @@ -25,7 +25,7 @@

include Config

-VER = 2.4.46 +VER = 2.4.48

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

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

-$(DL_FILE)_MD5 = 7d661ea5e736dac5e2761d9f49fe8361 +$(DL_FILE)_MD5 = a7088cec171b0d00bf43394ce64d3909

install : $(TARGET)

diff --git a/lfs/rng-tools b/lfs/rng-tools index dc87a3406..4b9915f40 100644 --- a/lfs/rng-tools +++ b/lfs/rng-tools @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2021 IPFire Team info@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 = 6.4 +VER = 6.12

THISAPP = rng-tools-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -40,7 +40,7 @@ objects = $(DL_FILE)

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

-$(DL_FILE)_MD5 = 52a8243858503f94eecd4ae0983a9818 +$(DL_FILE)_MD5 = 17f2815263b6ce6a353625b1fe615346

install : $(TARGET)

@@ -72,7 +72,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/rng-tools-6-Enable-RDRAND-for-i586-too.patch cd $(DIR_APP) && ./autogen.sh - cd $(DIR_APP) && ./configure --prefix=/usr + cd $(DIR_APP) && ./configure --prefix=/usr --without-pkcs11 cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make $(EXTRA_INSTALL) install @rm -rf $(DIR_APP)

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