IPFire-SCM July 2019

ipfire-scm@lists.ipfire.org

1 participants
20 discussions

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 2e65d316a7ee76eeb8edd2492e1c3fe013d366ba
by Arne Fitzenreiter 30 Jul '19

30 Jul '19

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 2e65d316a7ee76eeb8edd2492e1c3fe013d366ba (commit) via 53ece8f1f7e4ca46a327f620c15bf1b3b54bcde2 (commit) from 1fd34bd2ecf5f253673cf5912be4687ebe8f699e (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 2e65d316a7ee76eeb8edd2492e1c3fe013d366ba Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 30 18:28:57 2019 +0000 kernel: remove old modules folder before kernel build the build fails at creating source symlinks for external modules build if it already exists. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit 53ece8f1f7e4ca46a327f620c15bf1b3b54bcde2 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 30 18:24:09 2019 +0000 kernel: update arm-multi patchset this add FriendlyElec nanopi-r1 devicetree file. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/armv5tel/linux-multi | 1 + lfs/linux | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) Difference in files: diff --git a/config/rootfiles/common/armv5tel/linux-multi b/config/rootfiles/common/armv5tel/linux-multi index ec260e8c9..08a5f601c 100644 --- a/config/rootfiles/common/armv5tel/linux-multi +++ b/config/rootfiles/common/armv5tel/linux-multi @@ -468,6 +468,7 @@ boot/dtb-KVER-ipfire-multi #boot/dtb-KVER-ipfire-multi/sun8i-h3-nanopi-m1.dtb #boot/dtb-KVER-ipfire-multi/sun8i-h3-nanopi-neo-air.dtb #boot/dtb-KVER-ipfire-multi/sun8i-h3-nanopi-neo.dtb +#boot/dtb-KVER-ipfire-multi/sun8i-h3-nanopi-r1.dtb #boot/dtb-KVER-ipfire-multi/sun8i-h3-orangepi-2.dtb #boot/dtb-KVER-ipfire-multi/sun8i-h3-orangepi-lite.dtb #boot/dtb-KVER-ipfire-multi/sun8i-h3-orangepi-one.dtb diff --git a/lfs/linux b/lfs/linux index b675e4fbe..47636ac84 100644 --- a/lfs/linux +++ b/lfs/linux @@ -25,7 +25,7 @@ include Config VER = 4.14.131 -ARM_PATCHES = 4.14.131-ipfire0 +ARM_PATCHES = 4.14.131-ipfire1 THISAPP = linux-$(VER) DL_FILE = linux-$(VER).tar.xz @@ -84,7 +84,7 @@ arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(AR $(DL_FILE)_MD5 = 895790cf47b6a565ac5e5ce71b322dac -arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 5c5f6da89606e63701cdcd84a500aca1 +arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 88dddef40b71946b8112d06b980c9dc8 install : $(TARGET) @@ -179,6 +179,9 @@ else cd $(DIR_APP) && make clean cd $(DIR_APP) && sed -i -e 's/EXTRAVERSION\ =.*/EXTRAVERSION\ =\ -$(VERSUFIX)/' Makefile + # Remove modules folder if exists + rm -rf /lib/modules/$(VER)-$(VERSUFIX) + # Build the kernel cd $(DIR_APP) && make $(MAKETUNING) $(KERNEL_TARGET) modules hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 1fd34bd2ecf5f253673cf5912be4687ebe8f699e
by Arne Fitzenreiter 24 Jul '19

24 Jul '19

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. efc5cb1d3454896923355217ce8f7495df723e97
by Michael Tremer 22 Jul '19

22 Jul '19

1 0

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 8d2329a2b2058fbd5b577f58be85475abfee5ce0
by Michael Tremer 17 Jul '19

17 Jul '19

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 3.x development tree". The branch, master has been updated via 8d2329a2b2058fbd5b577f58be85475abfee5ce0 (commit) via e163d75e37f4a4c6ea7569d35508918c976319af (commit) via 28ff2caf748df73bb8153f2f10bc2f227dfd6ed3 (commit) from 2b86e6fb751ec76d236f08e45f5d32b739e2c464 (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 8d2329a2b2058fbd5b577f58be85475abfee5ce0 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jul 17 15:53:25 2019 +0100 pcengines-firmware: update to 4.9.0.7 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit e163d75e37f4a4c6ea7569d35508918c976319af Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jul 17 15:38:18 2019 +0100 kernel: update to 5.2.1 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> commit 28ff2caf748df73bb8153f2f10bc2f227dfd6ed3 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jul 17 13:20:17 2019 +0100 iperf3: update to 3.7 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: iperf3/iperf3.nm | 8 ++++---- kernel/kernel.nm | 4 ++-- pcengines-apu-firmware/pcengines-apu-firmware.nm | 9 ++++++++- 3 files changed, 14 insertions(+), 7 deletions(-) Difference in files: diff --git a/iperf3/iperf3.nm b/iperf3/iperf3.nm index 2437ed9bd..654a4653f 100644 --- a/iperf3/iperf3.nm +++ b/iperf3/iperf3.nm @@ -4,12 +4,12 @@ ############################################################################### name = iperf3 -version = 3.1.3 +version = 3.7 release = 1 thisapp = iperf-%{version} groups = Applications/Internet -url = https://iperf.fr +url = https://software.es.net/iperf/ license = BSD summary = The ultimate speed test tool for TCP, UDP and SCTP @@ -21,8 +21,8 @@ description parameters. end -source_dl = https://iperf.fr/download/source/ -sources = %{thisapp}-source.tar.gz +source_dl = https://downloads.es.net/pub/iperf/ +sources = %{thisapp}.tar.gz build requires diff --git a/kernel/kernel.nm b/kernel/kernel.nm index b2f00c2a6..ea458a0f3 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -4,8 +4,8 @@ ############################################################################### name = kernel -version = 5.2 -release = 1.1 +version = 5.2.1 +release = 1 thisapp = linux-%{version} maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org> diff --git a/pcengines-apu-firmware/pcengines-apu-firmware.nm b/pcengines-apu-firmware/pcengines-apu-firmware.nm index 72543d9a1..48f586222 100644 --- a/pcengines-apu-firmware/pcengines-apu-firmware.nm +++ b/pcengines-apu-firmware/pcengines-apu-firmware.nm @@ -4,7 +4,7 @@ ############################################################################### name = pcengines-apu-firmware -version = 4.9.0.6 +version = 4.9.0.7 release = 1 arch = noarch @@ -20,6 +20,13 @@ description This package ships the mainline branch of the firmware. end +source_dl = \ + https://3mdeb.com/open-source-firmware/pcengines/apu1 \ + https://3mdeb.com/open-source-firmware/pcengines/apu2 \ + https://3mdeb.com/open-source-firmware/pcengines/apu3 \ + https://3mdeb.com/open-source-firmware/pcengines/apu4 \ + https://3mdeb.com/open-source-firmware/pcengines/apu5 + sources = \ apu1_v%{version}.rom \ apu2_v%{version}.rom \ hooks/post-receive -- IPFire 3.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c7ad4315ea9862a5d07a7d347701a933d1f997b5
by Arne Fitzenreiter 17 Jul '19

17 Jul '19

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. eb5cd9fa57f795615e0f00c2cf2b4acf67688c7e
by Arne Fitzenreiter 17 Jul '19

17 Jul '19

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. de8810fbaa42aebf2f2a9949482fca57778db92b
by Arne Fitzenreiter 17 Jul '19

17 Jul '19

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 de8810fbaa42aebf2f2a9949482fca57778db92b (commit) via e4e1b8718e75e72e192e748fb11643ba198d3c08 (commit) via fd7c2f3a9ea343a1e123694025f166b960857921 (commit) from 3ec3329dffe9e045c37b1b3d048947bb59cd6fa6 (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 de8810fbaa42aebf2f2a9949482fca57778db92b Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jul 17 13:15:33 2019 +0200 iperf3: update to 3.7 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit e4e1b8718e75e72e192e748fb11643ba198d3c08 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jul 17 13:15:01 2019 +0200 iperf: update to 2.0.13 Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> commit fd7c2f3a9ea343a1e123694025f166b960857921 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Wed Jul 17 13:12:46 2019 +0200 initskripts: fix i586 rootfile ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/i586/initscripts | 4 +- lfs/iperf | 8 ++-- lfs/iperf3 | 10 ++--- src/patches/iperf3/0001-remove-pg-flag.patch | 46 ----------------------- src/patches/iperf3/iperf-3.7-remove-pg-flag.patch | 30 +++++++++++++++ 5 files changed, 41 insertions(+), 57 deletions(-) delete mode 100644 src/patches/iperf3/0001-remove-pg-flag.patch create mode 100644 src/patches/iperf3/iperf-3.7-remove-pg-flag.patch Difference in files: diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index 88ec789bc..d74fb743b 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -41,7 +41,7 @@ etc/rc.d/init.d/networking/green etc/rc.d/init.d/networking/orange etc/rc.d/init.d/networking/red #etc/rc.d/init.d/networking/red.down -etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders +etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders etc/rc.d/init.d/networking/red.down/10-ipsec etc/rc.d/init.d/networking/red.down/10-miniupnpd etc/rc.d/init.d/networking/red.down/10-ovpn @@ -49,7 +49,7 @@ etc/rc.d/init.d/networking/red.down/10-static-routes etc/rc.d/init.d/networking/red.down/20-firewall #etc/rc.d/init.d/networking/red.up etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup -etc/rc.d/init.d/networking/red.up/05-remove-dns-forwarders +etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders etc/rc.d/init.d/networking/red.up/10-miniupnpd etc/rc.d/init.d/networking/red.up/10-multicast etc/rc.d/init.d/networking/red.up/10-static-routes diff --git a/lfs/iperf b/lfs/iperf index 23a8b7abe..aaace823f 100644 --- a/lfs/iperf +++ b/lfs/iperf @@ -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 = 2.0.9 +VER = 2.0.13 THISAPP = iperf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = iperf -PAK_VER = 3 +PAK_VER = 4 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 351b018b71176b8cb25f20eef6a9e37c +$(DL_FILE)_MD5 = 31ea1c6d5cbf80b16ff3abe4288dad5e install : $(TARGET) diff --git a/lfs/iperf3 b/lfs/iperf3 index fc84f6468..842d48cec 100644 --- a/lfs/iperf3 +++ b/lfs/iperf3 @@ -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 = 3.1.2 +VER = 3.7 THISAPP = iperf-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = iperf3 -PAK_VER = 1 +PAK_VER = 2 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = f48a1b45c68647a9d8a8491af44470d6 +$(DL_FILE)_MD5 = 9534aae7430791b46d8cb8fc44afb6f8 install : $(TARGET) check : $(patsubst %,$(DIR_CHK)/%,$(objects)) @@ -76,7 +76,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iperf3/0001-remove-pg-flag.patch + cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/iperf3/iperf-3.7-remove-pg-flag.patch cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE) cd $(DIR_APP) && make install diff --git a/src/patches/iperf3/0001-remove-pg-flag.patch b/src/patches/iperf3/0001-remove-pg-flag.patch deleted file mode 100644 index 601712d88..000000000 --- a/src/patches/iperf3/0001-remove-pg-flag.patch +++ /dev/null @@ -1,46 +0,0 @@ -From be7dafdb802f39c3ad8bcc896216508842c42751 Mon Sep 17 00:00:00 2001 -From: Jonatan Schlag <jonatan.schlag(a)ipfire.org> -Date: Thu, 31 Mar 2016 19:33:17 +0200 -Subject: [PATCH] remove -pg flag - -Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org> ---- - src/Makefile.am | 4 ++-- - src/Makefile.in | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 23b0c72..6268145 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -49,9 +49,9 @@ iperf3_LDFLAGS = -g - iperf3_profile_SOURCES = main.c \ - $(libiperf_la_SOURCES) - --iperf3_profile_CFLAGS = -pg -g -+iperf3_profile_CFLAGS = -g - iperf3_profile_LDADD = libiperf.la --iperf3_profile_LDFLAGS = -pg -g -+iperf3_profile_LDFLAGS = -g - - # Specify the sources and various flags for the test cases - t_timer_SOURCES = t_timer.c -diff --git a/src/Makefile.in b/src/Makefile.in -index f7c46ad..016a022 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -610,9 +610,9 @@ iperf3_LDFLAGS = -g - iperf3_profile_SOURCES = main.c \ - $(libiperf_la_SOURCES) - --iperf3_profile_CFLAGS = -pg -g -+iperf3_profile_CFLAGS = -g - iperf3_profile_LDADD = libiperf.la --iperf3_profile_LDFLAGS = -pg -g -+iperf3_profile_LDFLAGS = -g - - # Specify the sources and various flags for the test cases - t_timer_SOURCES = t_timer.c --- -2.1.4 - diff --git a/src/patches/iperf3/iperf-3.7-remove-pg-flag.patch b/src/patches/iperf3/iperf-3.7-remove-pg-flag.patch new file mode 100644 index 000000000..1dae2c211 --- /dev/null +++ b/src/patches/iperf3/iperf-3.7-remove-pg-flag.patch @@ -0,0 +1,30 @@ +diff -Naur iperf-3.7.org/src/Makefile.am iperf-3.7/src/Makefile.am +--- iperf-3.7.org/src/Makefile.am 2019-06-21 03:12:47.000000000 +0200 ++++ iperf-3.7/src/Makefile.am 2019-07-17 12:19:38.133540594 +0200 +@@ -58,9 +58,9 @@ + iperf3_profile_SOURCES = main.c \ + $(libiperf_la_SOURCES) + +-iperf3_profile_CFLAGS = -pg -g ++iperf3_profile_CFLAGS = -g + iperf3_profile_LDADD = libiperf.la +-iperf3_profile_LDFLAGS = -pg -g ++iperf3_profile_LDFLAGS = -g + endif + + # Specify the sources and various flags for the test cases +diff -Naur iperf-3.7.org/src/Makefile.in iperf-3.7/src/Makefile.in +--- iperf-3.7.org/src/Makefile.in 2019-06-21 03:12:47.000000000 +0200 ++++ iperf-3.7/src/Makefile.in 2019-07-17 12:19:53.133496336 +0200 +@@ -670,9 +670,9 @@ + @ENABLE_PROFILING_TRUE@iperf3_profile_SOURCES = main.c \ + @ENABLE_PROFILING_TRUE@ $(libiperf_la_SOURCES) + +-@ENABLE_PROFILING_TRUE@iperf3_profile_CFLAGS = -pg -g ++@ENABLE_PROFILING_TRUE@iperf3_profile_CFLAGS = -g + @ENABLE_PROFILING_TRUE@iperf3_profile_LDADD = libiperf.la +-@ENABLE_PROFILING_TRUE@iperf3_profile_LDFLAGS = -pg -g ++@ENABLE_PROFILING_TRUE@iperf3_profile_LDFLAGS = -g + + # Specify the sources and various flags for the test cases + t_timer_SOURCES = t_timer.c hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3ec3329dffe9e045c37b1b3d048947bb59cd6fa6
by Arne Fitzenreiter 16 Jul '19

16 Jul '19

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 3ec3329dffe9e045c37b1b3d048947bb59cd6fa6 (commit) from 4a46575628378e447f6aec0771cc4cc0f2743a3a (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 3ec3329dffe9e045c37b1b3d048947bb59cd6fa6 Author: Arne Fitzenreiter <arne_f(a)ipfire.org> Date: Tue Jul 16 11:14:41 2019 +0200 unbound: rework dns-forwader handling add check if red interface has an IPv4 address before test the servers at red up and simply remove forwarders at down process. This also fix the hung at dhcpd shutdown. Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org> ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/aarch64/initscripts | 2 +- config/rootfiles/common/armv5tel/initscripts | 2 +- config/rootfiles/common/i586/initscripts | 2 +- config/rootfiles/common/x86_64/initscripts | 2 +- config/rootfiles/core/135/filelists/files | 1 + config/rootfiles/core/135/update.sh | 1 + .../networking/red.down/05-remove-dns-forwarders | 4 ++ .../networking/red.down/05-update-dns-forwarders | 4 -- src/initscripts/system/unbound | 44 ++++++++++++++++++++-- 9 files changed, 51 insertions(+), 11 deletions(-) create mode 100644 src/initscripts/networking/red.down/05-remove-dns-forwarders delete mode 100644 src/initscripts/networking/red.down/05-update-dns-forwarders Difference in files: diff --git a/config/rootfiles/common/aarch64/initscripts b/config/rootfiles/common/aarch64/initscripts index b731a70c1..260a961fe 100644 --- a/config/rootfiles/common/aarch64/initscripts +++ b/config/rootfiles/common/aarch64/initscripts @@ -41,7 +41,7 @@ etc/rc.d/init.d/networking/green etc/rc.d/init.d/networking/orange etc/rc.d/init.d/networking/red #etc/rc.d/init.d/networking/red.down -etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders +etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders etc/rc.d/init.d/networking/red.down/10-ipsec etc/rc.d/init.d/networking/red.down/10-miniupnpd etc/rc.d/init.d/networking/red.down/10-ovpn diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts index b731a70c1..260a961fe 100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts @@ -41,7 +41,7 @@ etc/rc.d/init.d/networking/green etc/rc.d/init.d/networking/orange etc/rc.d/init.d/networking/red #etc/rc.d/init.d/networking/red.down -etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders +etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders etc/rc.d/init.d/networking/red.down/10-ipsec etc/rc.d/init.d/networking/red.down/10-miniupnpd etc/rc.d/init.d/networking/red.down/10-ovpn diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts index df4f859f1..88ec789bc 100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts @@ -49,7 +49,7 @@ etc/rc.d/init.d/networking/red.down/10-static-routes etc/rc.d/init.d/networking/red.down/20-firewall #etc/rc.d/init.d/networking/red.up etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup -etc/rc.d/init.d/networking/red.up/05-update-dns-forwarders +etc/rc.d/init.d/networking/red.up/05-remove-dns-forwarders etc/rc.d/init.d/networking/red.up/10-miniupnpd etc/rc.d/init.d/networking/red.up/10-multicast etc/rc.d/init.d/networking/red.up/10-static-routes diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index df4f859f1..d74fb743b 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -41,7 +41,7 @@ etc/rc.d/init.d/networking/green etc/rc.d/init.d/networking/orange etc/rc.d/init.d/networking/red #etc/rc.d/init.d/networking/red.down -etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders +etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders etc/rc.d/init.d/networking/red.down/10-ipsec etc/rc.d/init.d/networking/red.down/10-miniupnpd etc/rc.d/init.d/networking/red.down/10-ovpn diff --git a/config/rootfiles/core/135/filelists/files b/config/rootfiles/core/135/filelists/files index 3d868d324..d8df9f65b 100644 --- a/config/rootfiles/core/135/filelists/files +++ b/config/rootfiles/core/135/filelists/files @@ -6,6 +6,7 @@ etc/unbound/root.hints etc/rc.d/helper/azure-setup etc/rc.d/init.d/cloud-init etc/rc.d/init.d/functions +etc/rc.d/init.d/networking/red.down/05-remove-dns-forwarders etc/rc.d/init.d/partresize etc/rc.d/init.d/unbound etc/sysctl.conf diff --git a/config/rootfiles/core/135/update.sh b/config/rootfiles/core/135/update.sh index 56854d2c9..55f72fc4e 100644 --- a/config/rootfiles/core/135/update.sh +++ b/config/rootfiles/core/135/update.sh @@ -35,6 +35,7 @@ done rm -vf \ /etc/rc.d/init.d/aws \ /etc/rc.d/rcsysinit.d/S74aws + /etc/rc.d/init.d/networking/red.down/05-update-dns-forwarders # Stop services /etc/init.d/squid stop diff --git a/src/initscripts/networking/red.down/05-remove-dns-forwarders b/src/initscripts/networking/red.down/05-remove-dns-forwarders new file mode 100644 index 000000000..671cca9df --- /dev/null +++ b/src/initscripts/networking/red.down/05-remove-dns-forwarders @@ -0,0 +1,4 @@ +#!/bin/bash + +# Remove DNS forwarders for unbound +exec /etc/init.d/unbound remove-forwarders diff --git a/src/initscripts/networking/red.down/05-update-dns-forwarders b/src/initscripts/networking/red.down/05-update-dns-forwarders deleted file mode 100644 index 7f35696f5..000000000 --- a/src/initscripts/networking/red.down/05-update-dns-forwarders +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -# Update DNS forwarders for unbound -exec /etc/init.d/unbound update-forwarders diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound index 5d3c5062f..dbcfc951f 100644 --- a/src/initscripts/system/unbound +++ b/src/initscripts/system/unbound @@ -41,6 +41,22 @@ read_name_servers() { done 2>/dev/null | xargs echo } +check_red_has_carrier_and_ip() { + # Interface configured ? + [ ! -e "/var/ipfire/red/iface" ] && return 0; + + # Interface present ? + [ ! -e "/sys/class/net/$(</var/ipfire/red/iface)" ] && return 0; + + # has carrier ? + [ ! "$(</sys/class/net/$(</var/ipfire/red/iface)/carrier)" = "1" ] && return 0; + + # has ip ? + [ "$(ip address show dev $(</var/ipfire/red/iface) | grep "inet")" = "" ] && return 0; + + return 1; +} + config_header() { echo "# This file is automatically generated and any changes" echo "# will be overwritten. DO NOT EDIT!" @@ -48,7 +64,8 @@ config_header() { } update_forwarders() { - if [ "${USE_FORWARDERS}" = "1" -a -e "/var/ipfire/red/iface" -a "$(</sys/class/net/$(</var/ipfire/red/iface)/carrier)" = "1" ]; then + check_red_has_carrier_and_ip + if [ "${USE_FORWARDERS}" = "1" -a "${?}" = "1" ]; then local forwarders local broken_forwarders @@ -131,6 +148,13 @@ update_forwarders() { unbound-control -q forward off } +remove_forwarders() { + enable_dnssec + echo "local recursor" > /var/ipfire/red/dns + unbound-control -q forward off + +} + own_hostname() { local hostname=$(hostname -f) # 1.1.1.1 is reserved for unused green, skip this @@ -473,7 +497,8 @@ disable_dnssec() { fix_time_if_dns_fail() { # If DNS still not work try to init ntp with # hardcoded ntp.ipfire.org (81.3.27.46) - if [ -e "/var/ipfire/red/iface" -a "$(</sys/class/net/$(</var/ipfire/red/iface)/carrier)" = "1" ]; then + check_red_has_carrier_and_ip + if [ -e "/var/ipfire/red/iface" -a "${?}" = "1" ]; then host 0.ipfire.pool.ntp.org > /dev/null 2>&1 if [ "${?}" != "0" ]; then boot_mesg "DNS still not functioning... Trying to sync time with ntp.ipfire.org (81.3.27.46)..." @@ -807,6 +832,19 @@ case "$1" in fix_time_if_dns_fail ;; + remove-forwarders) + # Do not try updating forwarders when unbound is not running + if ! pgrep unbound &>/dev/null; then + exit 0 + fi + + remove_forwarders + + unbound-control flush_negative > /dev/null + unbound-control flush_bogus > /dev/null + ;; + + test-name-server) ns=${2} @@ -848,7 +886,7 @@ case "$1" in ;; *) - echo "Usage: $0 {start|stop|restart|status|update-forwarders|test-name-server|resolve}" + echo "Usage: $0 {start|stop|restart|status|update-forwarders|remove-forwarders|test-name-server|resolve}" exit 1 ;; esac hooks/post-receive -- IPFire 2.x development tree

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4a46575628378e447f6aec0771cc4cc0f2743a3a
by Michael Tremer 15 Jul '19

15 Jul '19

1 0

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 65114604878aaae06354819e13d9c069e00b9411
by Arne Fitzenreiter 14 Jul '19

14 Jul '19

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

IPFire-SCM July 2019