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, master has been updated via f2d2c69787acc8ad3383d7482a15f0f8857f57ff (commit) via c75fd8c8c5638581b180abbd68ce8fc168b3bd1e (commit) via ccf83df93c8d7fedaaf8283880164ce12dd96bc3 (commit) via 83165259b1db395e2bfecef0b584055583b7d99a (commit) from e8adbea97beb1107a48b3f804143e11ebf6228bb (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 f2d2c69787acc8ad3383d7482a15f0f8857f57ff Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jan 30 12:24:24 2020 +0000

dns.cgi: increase timeout to 5s

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit c75fd8c8c5638581b180abbd68ce8fc168b3bd1e Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jan 30 12:22:37 2020 +0000

convert-dns-settings: add ppp/settings to list of converted files

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit ccf83df93c8d7fedaaf8283880164ce12dd96bc3 Merge: e8adbea97 83165259b Author: Arne Fitzenreiter arne_f@ipfire.org Date: Thu Jan 30 12:20:46 2020 +0000

Merge branch 'core141'

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

Summary of changes: config/rootfiles/core/141/update.sh | 4 ++++ html/cgi-bin/dns.cgi | 2 +- src/scripts/convert-dns-settings | 1 + 3 files changed, 6 insertions(+), 1 deletion(-)

Difference in files: diff --git a/config/rootfiles/core/141/update.sh b/config/rootfiles/core/141/update.sh index d990b44b7..51fe6ad9c 100644 --- a/config/rootfiles/core/141/update.sh +++ b/config/rootfiles/core/141/update.sh @@ -92,6 +92,10 @@ rm -fv /opt/pakfire/db/*/meta-elinks rm -fv /opt/pakfire/db/rootfiles/python3 rm -fv /opt/pakfire/db/*/meta-python3

+# run pakfire update twice (first sometimes fail) +/usr/local/bin/pakfire update +/usr/local/bin/pakfire update + # Finish /etc/init.d/fireinfo start sendprofile diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi index 3b47f5ed4..4f3418a70 100755 --- a/html/cgi-bin/dns.cgi +++ b/html/cgi-bin/dns.cgi @@ -434,7 +434,7 @@ sub show_nameservers () { # # Simple send a request to unbound and check if it can resolve the # DNS test server. - my $dns_status_ret = &check_nameserver("127.0.0.1", "$dns_test_server", "UDP", undef, "+timeout=1", "+retry=0"); + my $dns_status_ret = &check_nameserver("127.0.0.1", "$dns_test_server", "UDP", undef, "+timeout=5", "+retry=0");

if ($dns_status_ret eq "2") { $dns_status_string = "$Lang::tr{'working'}"; diff --git a/src/scripts/convert-dns-settings b/src/scripts/convert-dns-settings index 11efc7cba..945a15ef0 100755 --- a/src/scripts/convert-dns-settings +++ b/src/scripts/convert-dns-settings @@ -22,6 +22,7 @@ FILES=( /var/ipfire/ethernet/settings /var/ipfire/dns/settings + /var/ipfire/ppp/settings /var/ipfire/ppp/settings-* )

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