From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. c8ee8f37d401a16db0a3a784301f94b71964860c Date: Fri, 21 Jun 2019 13:37:51 +0100 Message-ID: <20190621123751.C4D3F84FDC0@people01.i.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============7664874379937184837==" List-Id: --===============7664874379937184837== 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 c8ee8f37d401a16db0a3a784301f94b71964860c (commit) via 92f6c5ed861c9e7597cf8e882d96277a8b40e494 (commit) via 7866fa2513693d7bde786c2924b1118f0488c30c (commit) via f3959d13e858f4768f45244a3792851acda740d8 (commit) via 1722701a9aab07e1a96ae25d2cedcbac403ddb76 (commit) from 744f16e45a9d7923f99ee8ce6e2cbebda131824c (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 c8ee8f37d401a16db0a3a784301f94b71964860c Author: Michael Tremer Date: Fri Jun 21 01:39:42 2019 +0100 Update contributors =20 Signed-off-by: Michael Tremer commit 92f6c5ed861c9e7597cf8e882d96277a8b40e494 Author: Michael Tremer Date: Fri Jun 21 01:38:59 2019 +0100 core134: Ship updated firewall initscript =20 Signed-off-by: Michael Tremer commit 7866fa2513693d7bde786c2924b1118f0488c30c Author: Michael Tremer Date: Fri Jun 21 01:38:22 2019 +0100 core134: Ship updated bind =20 Signed-off-by: Michael Tremer commit f3959d13e858f4768f45244a3792851acda740d8 Author: Matthias Fischer Date: Fri Jun 21 14:31:26 2019 +0200 bind: Update to 9.11.8 =20 For Details see: https://downloads.isc.org/isc/bind9/9.11.8/RELEASE-NOTES-bind-9.11.8.html =20 "Security Fixes A race condition could trigger an assertion failure when a large numb= er of incoming packets were being rejected. This flaw is disclosed in CVE-2019-6471. [GL #942]" =20 Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer commit 1722701a9aab07e1a96ae25d2cedcbac403ddb76 Author: Alexander Marx Date: Thu Jun 20 07:04:30 2019 +0200 BUG12015: Redirecting to Captive portal does not work after IPFire restart =20 When the Captive portal is enabled, the needed firewall rules are applied= . But when restarting IPFire, the rules are not applied because there is no call to do so. Added call to captivectrl in the initscrip 'firewall'. =20 Fixes: #12015 =20 Signed-off-by: Michael Tremer ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/bind | 2 +- config/rootfiles/{oldcore/100 =3D> core/134}/filelists/bind | 0 config/rootfiles/core/134/filelists/files | 1 + html/cgi-bin/credits.cgi | 2 +- lfs/bind | 4 ++-- src/initscripts/system/firewall | 3 +++ 6 files changed, 8 insertions(+), 4 deletions(-) copy config/rootfiles/{oldcore/100 =3D> core/134}/filelists/bind (100%) Difference in files: diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind index af57b88ca..e1870e4af 100644 --- a/config/rootfiles/common/bind +++ b/config/rootfiles/common/bind @@ -270,7 +270,7 @@ usr/lib/libbind9.so.161.0.2 #usr/lib/libdns.la #usr/lib/libdns.so usr/lib/libdns.so.1106 -usr/lib/libdns.so.1106.0.0 +usr/lib/libdns.so.1106.0.1 #usr/lib/libisc.la #usr/lib/libisc.so usr/lib/libisc.so.1100 diff --git a/config/rootfiles/core/134/filelists/bind b/config/rootfiles/core= /134/filelists/bind new file mode 120000 index 000000000..48a0ebaef --- /dev/null +++ b/config/rootfiles/core/134/filelists/bind @@ -0,0 +1 @@ +../../../common/bind \ No newline at end of file diff --git a/config/rootfiles/core/134/filelists/files b/config/rootfiles/cor= e/134/filelists/files index f6fc9588f..31f9cbcc4 100644 --- a/config/rootfiles/core/134/filelists/files +++ b/config/rootfiles/core/134/filelists/files @@ -1,5 +1,6 @@ etc/system-release etc/issue +etc/rc.d/init.d/firewall etc/rc.d/init.d/unbound srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 6ce9542b2..5031e4088 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -89,9 +89,9 @@ Alfred Haas, Lars Schuhmacher, Rene Zingel, Sascha Kilian, +St=C3=A9phane Pautrel, Ronald Wiesinger, Stephan Feddersen, -St=C3=A9phane Pautrel, Florian B=C3=BChrle, Bernhard Bitsch, Justin Luth, diff --git a/lfs/bind b/lfs/bind index c26487dc9..2f7e83ac1 100644 --- a/lfs/bind +++ b/lfs/bind @@ -25,7 +25,7 @@ =20 include Config =20 -VER =3D 9.11.7 +VER =3D 9.11.8 =20 THISAPP =3D bind-$(VER) DL_FILE =3D $(THISAPP).tar.gz @@ -43,7 +43,7 @@ objects =3D $(DL_FILE) =20 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE) =20 -$(DL_FILE)_MD5 =3D 5c16cdab2ee066ed43a623febfd29244 +$(DL_FILE)_MD5 =3D 67b856b6e5cbe4ff4b4456259ec37336 =20 install : $(TARGET) =20 diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall index da89857d8..b3483a744 100644 --- a/src/initscripts/system/firewall +++ b/src/initscripts/system/firewall @@ -379,6 +379,9 @@ iptables_init() { # run wirelessctrl /usr/local/bin/wirelessctrl =20 + # run captivectrl + /usr/local/bin/captivectrl + # POLICY CHAIN iptables -N POLICYIN iptables -A INPUT -j POLICYIN hooks/post-receive -- IPFire 2.x development tree --===============7664874379937184837==--