[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 971f93ab126ffa64f54e7d684fd777c0adebaa97

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 971f93ab126ffa64f54e7d684fd777c0adebaa97

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1856 bytes --]

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  971f93ab126ffa64f54e7d684fd777c0adebaa97 (commit)
       via  642557e23ba6c1bcab7e654569a35a5f4e6e8acc (commit)
       via  e706f87eedf75f786530815fe149b2b8dca070c2 (commit)
       via  a836a2787c2f6ad50c3a3058b21fc961ef497406 (commit)
       via  decb7e61f19047ea6eb2dc1402efa46e581a8a0c (commit)
      from  6522ab474f26751cd1cde863d68a1858a1d1141d (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 971f93ab126ffa64f54e7d684fd777c0adebaa97
Merge: 6522ab474 642557e23
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Mon Oct 12 20:21:09 2020 +0000

    Merge remote-tracking branch 'origin/master' into next

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

Summary of changes:
 config/rootfiles/oldcore/151/update.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/oldcore/151/update.sh b/config/rootfiles/oldcore/151/update.sh
index 699528274..5fb05488b 100644
--- a/config/rootfiles/oldcore/151/update.sh
+++ b/config/rootfiles/oldcore/151/update.sh
@@ -33,7 +33,9 @@ done
 
 # Remove files
 rm -rfv \
-	/usr/lib/perl5/site_perl/5.30.0/Locale
+	/usr/lib/perl5/site_perl/5.30.0/Locale \
+	/usr/lib/perl5/site_perl/5.30.0/*/Net/DNS \
+	/usr/lib/perl5/site_perl/5.30.0/*/Net/DNS.pm
 
 # Stop services
 /etc/init.d/ipsec stop


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