From: Michael Tremer <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. d08452c5055cccc9cb5c2a0dedf661cf50d28679
Date: Wed, 11 Nov 2020 12:09:22 +0000 [thread overview]
Message-ID: <4CWNnZ4tCjz2xl6@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 29073 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 d08452c5055cccc9cb5c2a0dedf661cf50d28679 (commit)
via 65ef52a33564f7fd41825aa01e0417c234690eab (commit)
via f60ae20cc86b5c1667432f29add09e65bc4048dd (commit)
via 5cebcd805a5eb9d4ce930a6a9878c40bdc9b76d9 (commit)
via 1c217406f2dfd7bba3e21c99df328d9b71407d1b (commit)
via 0163c62dee8e53612e661498dbe6fca7dec74b10 (commit)
via 85c2e400ff92ec8e7069284c1d0f6f52c39a40da (commit)
via e23b3b08a889dbd3e7fa6a31b4c481f30cc65dff (commit)
from 7b97337afb4576d4bacbe854e8822e97b4cd1a40 (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 d08452c5055cccc9cb5c2a0dedf661cf50d28679
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Nov 11 12:08:57 2020 +0000
core153: Ship unbound initscript
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 65ef52a33564f7fd41825aa01e0417c234690eab
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Nov 7 12:59:08 2020 +0000
DNS: Make YouTube configurable for Safe Search
When safe search is enabled, it is being enabled on YouTube, too.
This creates problems in some scenarios like schools where politics
is being tought as well as other subjects that might be censored by
YouTube (i.e. election TV spots).
Therefore it is now possible to exclude YouTube from Safe Search
but keep it enabled for the search engines.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f60ae20cc86b5c1667432f29add09e65bc4048dd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Nov 11 11:53:34 2020 +0000
core153: Update language cache
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5cebcd805a5eb9d4ce930a6a9878c40bdc9b76d9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Nov 11 11:52:13 2020 +0000
core153: Ship Intel mircocode and ask for reboot
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1c217406f2dfd7bba3e21c99df328d9b71407d1b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Nov 11 11:21:05 2020 +0100
intel-microcode: update to 20201110
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 0163c62dee8e53612e661498dbe6fca7dec74b10
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Nov 11 09:11:55 2020 +0100
kernel: aarch64: enable ahci
this is needed to boot on ESXi on arm.
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 85c2e400ff92ec8e7069284c1d0f6f52c39a40da
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Nov 10 11:17:46 2020 +0000
git: Bump package version
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e23b3b08a889dbd3e7fa6a31b4c481f30cc65dff
Author: ummeegge <erik.kapfer(a)ipfire.org>
Date: Tue Nov 10 09:28:56 2020 +0000
git: Add missing Error.pm and LoadCPAN submodules
Fixes #12511
Signed-off-by: ummeegge <erik.kapfer(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/kernel/kernel.config.aarch64-ipfire | 2 +-
config/rootfiles/common/aarch64/linux | 2 +-
config/rootfiles/common/i586/intel-microcode | 7 +++
config/rootfiles/common/x86_64/intel-microcode | 7 +++
config/rootfiles/core/153/filelists/files | 1 +
.../153}/filelists/i586/intel-microcode | 0
.../153}/filelists/x86_64/intel-microcode | 0
config/rootfiles/core/153/update.sh | 10 +++-
config/rootfiles/packages/git | 6 +-
doc/language_issues.en | 1 +
doc/language_issues.es | 1 +
doc/language_issues.fr | 1 +
doc/language_issues.it | 1 +
doc/language_issues.nl | 1 +
doc/language_issues.pl | 1 +
doc/language_issues.ru | 1 +
doc/language_issues.tr | 1 +
doc/language_missings | 7 +++
html/cgi-bin/dns.cgi | 19 ++++++
langs/de/cgi-bin/de.pl | 1 +
langs/en/cgi-bin/en.pl | 1 +
lfs/git | 2 +-
lfs/intel-microcode | 4 +-
src/initscripts/system/unbound | 69 +++++++++++-----------
24 files changed, 101 insertions(+), 45 deletions(-)
copy config/rootfiles/{oldcore/121 => core/153}/filelists/i586/intel-microcode (100%)
copy config/rootfiles/{oldcore/121 => core/153}/filelists/x86_64/intel-microcode (100%)
Difference in files:
diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire
index 2d4934a09..bc389470b 100644
--- a/config/kernel/kernel.config.aarch64-ipfire
+++ b/config/kernel/kernel.config.aarch64-ipfire
@@ -1819,7 +1819,7 @@ CONFIG_SATA_PMP=y
#
# Controllers with non-SFF native interface
#
-# CONFIG_SATA_AHCI is not set
+CONFIG_SATA_AHCI=y
CONFIG_SATA_AHCI_PLATFORM=m
CONFIG_AHCI_CEVA=m
CONFIG_AHCI_MVEBU=m
diff --git a/config/rootfiles/common/aarch64/linux b/config/rootfiles/common/aarch64/linux
index 6f76519d0..0961daffe 100644
--- a/config/rootfiles/common/aarch64/linux
+++ b/config/rootfiles/common/aarch64/linux
@@ -9617,6 +9617,7 @@ etc/modprobe.d/ipv6.conf
#lib/modules/KVER-ipfire/build/include/config/s2io.h
#lib/modules/KVER-ipfire/build/include/config/sata
#lib/modules/KVER-ipfire/build/include/config/sata/ahci
+#lib/modules/KVER-ipfire/build/include/config/sata/ahci.h
#lib/modules/KVER-ipfire/build/include/config/sata/ahci/platform.h
#lib/modules/KVER-ipfire/build/include/config/sata/dwc.h
#lib/modules/KVER-ipfire/build/include/config/sata/mv.h
@@ -17306,7 +17307,6 @@ lib/modules/KVER-ipfire/kernel
#lib/modules/KVER-ipfire/kernel/drivers/ata/ahci_platform.ko.xz
#lib/modules/KVER-ipfire/kernel/drivers/ata/ahci_qoriq.ko.xz
#lib/modules/KVER-ipfire/kernel/drivers/ata/ahci_sunxi.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/ata/libahci.ko.xz
#lib/modules/KVER-ipfire/kernel/drivers/ata/libahci_platform.ko.xz
#lib/modules/KVER-ipfire/kernel/drivers/ata/sata_dwc_460ex.ko.xz
#lib/modules/KVER-ipfire/kernel/drivers/ata/sata_mv.ko.xz
diff --git a/config/rootfiles/common/i586/intel-microcode b/config/rootfiles/common/i586/intel-microcode
index 9b3c50897..3185cd01a 100644
--- a/config/rootfiles/common/i586/intel-microcode
+++ b/config/rootfiles/common/i586/intel-microcode
@@ -69,6 +69,7 @@ lib/firmware/intel-ucode/06-55-03
lib/firmware/intel-ucode/06-55-04
lib/firmware/intel-ucode/06-55-06
lib/firmware/intel-ucode/06-55-07
+lib/firmware/intel-ucode/06-55-0b
lib/firmware/intel-ucode/06-56-02
lib/firmware/intel-ucode/06-56-03
lib/firmware/intel-ucode/06-56-04
@@ -82,6 +83,8 @@ lib/firmware/intel-ucode/06-66-03
lib/firmware/intel-ucode/06-7a-01
lib/firmware/intel-ucode/06-7a-08
lib/firmware/intel-ucode/06-7e-05
+lib/firmware/intel-ucode/06-8a-01
+lib/firmware/intel-ucode/06-8c-01
lib/firmware/intel-ucode/06-8e-09
lib/firmware/intel-ucode/06-8e-0a
lib/firmware/intel-ucode/06-8e-0b
@@ -91,7 +94,11 @@ lib/firmware/intel-ucode/06-9e-0a
lib/firmware/intel-ucode/06-9e-0b
lib/firmware/intel-ucode/06-9e-0c
lib/firmware/intel-ucode/06-9e-0d
+lib/firmware/intel-ucode/06-a5-02
+lib/firmware/intel-ucode/06-a5-03
+lib/firmware/intel-ucode/06-a5-05
lib/firmware/intel-ucode/06-a6-00
+lib/firmware/intel-ucode/06-a6-01
lib/firmware/intel-ucode/0f-00-07
lib/firmware/intel-ucode/0f-00-0a
lib/firmware/intel-ucode/0f-01-02
diff --git a/config/rootfiles/common/x86_64/intel-microcode b/config/rootfiles/common/x86_64/intel-microcode
index 9b3c50897..3185cd01a 100644
--- a/config/rootfiles/common/x86_64/intel-microcode
+++ b/config/rootfiles/common/x86_64/intel-microcode
@@ -69,6 +69,7 @@ lib/firmware/intel-ucode/06-55-03
lib/firmware/intel-ucode/06-55-04
lib/firmware/intel-ucode/06-55-06
lib/firmware/intel-ucode/06-55-07
+lib/firmware/intel-ucode/06-55-0b
lib/firmware/intel-ucode/06-56-02
lib/firmware/intel-ucode/06-56-03
lib/firmware/intel-ucode/06-56-04
@@ -82,6 +83,8 @@ lib/firmware/intel-ucode/06-66-03
lib/firmware/intel-ucode/06-7a-01
lib/firmware/intel-ucode/06-7a-08
lib/firmware/intel-ucode/06-7e-05
+lib/firmware/intel-ucode/06-8a-01
+lib/firmware/intel-ucode/06-8c-01
lib/firmware/intel-ucode/06-8e-09
lib/firmware/intel-ucode/06-8e-0a
lib/firmware/intel-ucode/06-8e-0b
@@ -91,7 +94,11 @@ lib/firmware/intel-ucode/06-9e-0a
lib/firmware/intel-ucode/06-9e-0b
lib/firmware/intel-ucode/06-9e-0c
lib/firmware/intel-ucode/06-9e-0d
+lib/firmware/intel-ucode/06-a5-02
+lib/firmware/intel-ucode/06-a5-03
+lib/firmware/intel-ucode/06-a5-05
lib/firmware/intel-ucode/06-a6-00
+lib/firmware/intel-ucode/06-a6-01
lib/firmware/intel-ucode/0f-00-07
lib/firmware/intel-ucode/0f-00-0a
lib/firmware/intel-ucode/0f-01-02
diff --git a/config/rootfiles/core/153/filelists/files b/config/rootfiles/core/153/filelists/files
index 04605c232..9fe5a0adf 100644
--- a/config/rootfiles/core/153/filelists/files
+++ b/config/rootfiles/core/153/filelists/files
@@ -1,6 +1,7 @@
etc/issue
etc/ntp.conf
etc/os-release
+etc/rc.d/init.d/unbound
etc/system-release
etc/sysctl.conf
srv/web/ipfire/cgi-bin/connections.cgi
diff --git a/config/rootfiles/core/153/filelists/i586/intel-microcode b/config/rootfiles/core/153/filelists/i586/intel-microcode
new file mode 120000
index 000000000..f03e84778
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/i586/intel-microcode
@@ -0,0 +1 @@
+../../../../common/i586/intel-microcode
\ No newline at end of file
diff --git a/config/rootfiles/core/153/filelists/x86_64/intel-microcode b/config/rootfiles/core/153/filelists/x86_64/intel-microcode
new file mode 120000
index 000000000..d5ac074e2
--- /dev/null
+++ b/config/rootfiles/core/153/filelists/x86_64/intel-microcode
@@ -0,0 +1 @@
+../../../../common/x86_64/intel-microcode
\ No newline at end of file
diff --git a/config/rootfiles/core/153/update.sh b/config/rootfiles/core/153/update.sh
index a6ddc0019..6868698c8 100644
--- a/config/rootfiles/core/153/update.sh
+++ b/config/rootfiles/core/153/update.sh
@@ -45,7 +45,7 @@ ldconfig
chown -vR root:root /etc/ntp
# Update Language cache
-#/usr/local/bin/update-lang-cache
+/usr/local/bin/update-lang-cache
# Filesytem cleanup
/usr/local/bin/filesystem-cleanup
@@ -57,7 +57,7 @@ chown -vR root:root /etc/ntp
sysctl -p
# This update needs a reboot...
-#touch /var/run/need_reboot
+touch /var/run/need_reboot
# Finish
/etc/init.d/fireinfo start
@@ -70,5 +70,11 @@ fi
sync
+# Reload microcode
+modprobe microcode
+if [ -w "/sys/devices/system/cpu/microcode/reload" ]; then
+ echo 1 > /sys/devices/system/cpu/microcode/reload
+fi
+
# Don't report the exitcode last command
exit 0
diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git
index df159acb4..c2023a326 100644
--- a/config/rootfiles/packages/git
+++ b/config/rootfiles/packages/git
@@ -333,9 +333,9 @@ usr/share/perl5/FromCPAN/Error.pm
usr/share/perl5/Git.pm
usr/share/perl5/Git/I18N.pm
usr/share/perl5/Git/IndexInfo.pm
-#usr/share/perl5/Git/LoadCPAN
-#usr/share/perl5/Git/LoadCPAN.pm
-#usr/share/perl5/Git/LoadCPAN/Error.pm
+usr/share/perl5/Git/LoadCPAN
+usr/share/perl5/Git/LoadCPAN.pm
+usr/share/perl5/Git/LoadCPAN/Error.pm
#usr/share/perl5/Git/LoadCPAN/Mail
#usr/share/perl5/Git/LoadCPAN/Mail/Address.pm
#usr/share/perl5/Git/Packet.pm
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 0592f938b..4cff0c6cb 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -600,6 +600,7 @@ WARNING: untranslated string: dns check failed = DNS check failed
WARNING: untranslated string: dns check servers = Check DNS Servers
WARNING: untranslated string: dns configuration = DNS Configuration
WARNING: untranslated string: dns enable safe-search = Enable Safe Search
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
diff --git a/doc/language_issues.es b/doc/language_issues.es
index fd9c61b32..8d6041ce5 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -896,6 +896,7 @@ WARNING: untranslated string: dnat address = Firewall Interface
WARNING: untranslated string: dns check servers = Check DNS Servers
WARNING: untranslated string: dns configuration = DNS Configuration
WARNING: untranslated string: dns enable safe-search = Enable Safe Search
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index c84aab2b1..f4ed28c7d 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -877,6 +877,7 @@ WARNING: translation string unused: zoneconf val ppp assignment error
WARNING: translation string unused: zoneconf val vlan amount assignment error
WARNING: translation string unused: zoneconf val vlan tag assignment error
WARNING: translation string unused: zoneconf val zoneslave amount error
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
WARNING: untranslated string: fwhost cust locationgrp = unknown string
WARNING: untranslated string: fwhost err hostip = unknown string
WARNING: untranslated string: guardian block a host = unknown string
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 505e73373..08b07080e 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -920,6 +920,7 @@ WARNING: untranslated string: dl client arch insecure = Download insecure Client
WARNING: untranslated string: dns check servers = Check DNS Servers
WARNING: untranslated string: dns configuration = DNS Configuration
WARNING: untranslated string: dns enable safe-search = Enable Safe Search
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 0f73afc86..bde5daf3c 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -921,6 +921,7 @@ WARNING: untranslated string: dl client arch insecure = Download insecure Client
WARNING: untranslated string: dns check servers = Check DNS Servers
WARNING: untranslated string: dns configuration = DNS Configuration
WARNING: untranslated string: dns enable safe-search = Enable Safe Search
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index fd9c61b32..8d6041ce5 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -896,6 +896,7 @@ WARNING: untranslated string: dnat address = Firewall Interface
WARNING: untranslated string: dns check servers = Check DNS Servers
WARNING: untranslated string: dns configuration = DNS Configuration
WARNING: untranslated string: dns enable safe-search = Enable Safe Search
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index bf1d976e9..6235f33fd 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -899,6 +899,7 @@ WARNING: untranslated string: dnat address = Firewall Interface
WARNING: untranslated string: dns check servers = Check DNS Servers
WARNING: untranslated string: dns configuration = DNS Configuration
WARNING: untranslated string: dns enable safe-search = Enable Safe Search
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index b2c24de57..b61f3740a 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -897,6 +897,7 @@ WARNING: untranslated string: disconnected = Disconnected
WARNING: untranslated string: dns check servers = Check DNS Servers
WARNING: untranslated string: dns configuration = DNS Configuration
WARNING: untranslated string: dns enable safe-search = Enable Safe Search
+WARNING: untranslated string: dns enable safe-search youtube = Include YouTube in Safe Search
WARNING: untranslated string: dns forward disable dnssec = Disable DNSSEC (dangerous)
WARNING: untranslated string: dns forwarding dnssec disabled notice = (DNSSEC disabled)
WARNING: untranslated string: dns isp assigned nameserver = ISP-assigned DNS server
diff --git a/doc/language_missings b/doc/language_missings
index d79afff83..638a7cc42 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -239,6 +239,7 @@
< dns configuration
< dns could not add server
< dns enable safe-search
+< dns enable safe-search youtube
< dnsforward
< dnsforward add a new entry
< dnsforward configuration
@@ -950,6 +951,7 @@
< ansi t1.483
< bewan adsl pci st
< bewan adsl usb
+< dns enable safe-search youtube
< g.dtm
< g.lite
< upload fcdsl.o
@@ -1052,6 +1054,7 @@
< dns configuration
< dns could not add server
< dns enable safe-search
+< dns enable safe-search youtube
< dns forward disable dnssec
< dnsforward dnssec disabled
< dnsforward forward_servers
@@ -1431,6 +1434,7 @@
< dns configuration
< dns could not add server
< dns enable safe-search
+< dns enable safe-search youtube
< dns forward disable dnssec
< dnsforward dnssec disabled
< dnsforward forward_servers
@@ -1922,6 +1926,7 @@
< dns configuration
< dns could not add server
< dns enable safe-search
+< dns enable safe-search youtube
< dnsforward
< dnsforward add a new entry
< dnsforward configuration
@@ -2790,6 +2795,7 @@
< dns configuration
< dns could not add server
< dns enable safe-search
+< dns enable safe-search youtube
< dnsforward
< dnsforward add a new entry
< dnsforward configuration
@@ -3513,6 +3519,7 @@
< dns configuration
< dns could not add server
< dns enable safe-search
+< dns enable safe-search youtube
< dns forward disable dnssec
< dnsforward dnssec disabled
< dnsforward forward_servers
diff --git a/html/cgi-bin/dns.cgi b/html/cgi-bin/dns.cgi
index 762e77ff1..5c3ca875d 100755
--- a/html/cgi-bin/dns.cgi
+++ b/html/cgi-bin/dns.cgi
@@ -87,6 +87,10 @@ if ($cgiparams{'GENERAL'} eq $Lang::tr{'save'}) {
$cgiparams{'ENABLE_SAFE_SEARCH'} = "off";
}
+ if ($cgiparams{'ENABLE_SAFE_SEARCH_YOUTUBE'} ne "on") {
+ $cgiparams{'ENABLE_SAFE_SEARCH_YOUTUBE'} = "off";
+ }
+
# Check if using ISP nameservers and TLS is enabled at the same time.
if (($cgiparams{'USE_ISP_NAMESERVERS'} eq "on") && ($cgiparams{'PROTO'} eq "TLS")) {
$errormessage = $Lang::tr{'dns isp nameservers and tls not allowed'}
@@ -259,6 +263,7 @@ if (($cgiparams{'SERVERS'} eq $Lang::tr{'save'}) || ($cgiparams{'SERVERS'} eq $L
# Hash to store the generic DNS settings.
my %settings = ();
+$settings{"ENABLE_SAFE_SEARCH_YOUTUBE"} = "on";
# Read-in general DNS settings.
&General::readhash("$settings_file", \%settings);
@@ -310,6 +315,10 @@ $checked{'ENABLE_SAFE_SEARCH'}{'off'} = '';
$checked{'ENABLE_SAFE_SEARCH'}{'on'} = '';
$checked{'ENABLE_SAFE_SEARCH'}{$settings{'ENABLE_SAFE_SEARCH'}} = "checked='checked'";
+$checked{'ENABLE_SAFE_SEARCH_YOUTUBE'}{'off'} = '';
+$checked{'ENABLE_SAFE_SEARCH_YOUTUBE'}{'on'} = '';
+$checked{'ENABLE_SAFE_SEARCH_YOUTUBE'}{$settings{'ENABLE_SAFE_SEARCH_YOUTUBE'}} = "checked='checked'";
+
$selected{'PROTO'}{'UDP'} = '';
$selected{'PROTO'}{'TLS'} = '';
$selected{'PROTO'}{'TCP'} = '';
@@ -381,6 +390,16 @@ sub show_general_dns_configuration () {
</td>
</tr>
+ <tr>
+ <td width="33%">
+ » $Lang::tr{'dns enable safe-search youtube'}
+ </td>
+
+ <td>
+ <input type="checkbox" name="ENABLE_SAFE_SEARCH_YOUTUBE" $checked{'ENABLE_SAFE_SEARCH_YOUTUBE'}{'on'}>
+ </td>
+ </tr>
+
<tr>
<td colspan="2">
<br>
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index d4dad7652..4a2a9e2e0 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -828,6 +828,7 @@
'dns configuration' => 'DNS-Konfiguration',
'dns desc' => 'Wenn auf Schnittstelle red0 die IP-Adressinformationen über DHCP vom Provider kommen, werden automatisch die DNS-Server-Adressen des Providers gesetzt. Hier können Sie nun diese mit den eigenen DNS-Server-IP-Adressen überschreiben.',
'dns enable safe-search' => 'Safe Search via DNS aktivieren',
+'dns enable safe-search youtube' => 'YouTube in Safe Search einbeziehen',
'dns error 0' => 'Die IP Adresse vom <strong>primären</strong> DNS Server ist nicht gültig, bitte überprüfen Sie Ihre Eingabe!<br />Die eingegebene <strong>sekundären</strong> DNS Server Adresse ist jedoch gültig.<br />',
'dns error 01' => 'Die eingegebene IP Adresse des <strong>primären</strong> wie auch des <strong>sekundären</strong> DNS-Servers sind nicht gültig, bitte überprüfen Sie Ihre Eingaben!',
'dns error 1' => 'Die IP Adresse vom <strong>sekundären</strong> DNS Server ist nicht gültig, bitte überprüfen Sie Ihre Eingabe!<br />Die eingegebene <strong>primäre</strong> DNS Server Adresse ist jedoch gültig.',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 19a5eb02f..1151da08d 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -851,6 +851,7 @@
'dns could not add server' => 'Could not add server - Reason:',
'dns desc' => 'If the red0 interface gets the IP address information via DHCP from the provider, the DNS server addresses will be set automatically. Now here you are able to change these DNS server IP addresses with your own ones.',
'dns enable safe-search' => 'Enable Safe Search',
+'dns enable safe-search youtube' => 'Include YouTube in Safe Search',
'dns error 0' => 'The IP address of the <strong>primary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>secondary</strong> DNS server address is valid.',
'dns error 01' => 'The entered IP address of the <strong>primary</strong> and <strong>secondary</strong> DNS server are not valid, please check your entries!',
'dns error 1' => 'The IP address of the <strong>secondary</strong> DNS server is not valid, please check your entries!<br />The entered <strong>primary</strong> DNS server address is valid.',
diff --git a/lfs/git b/lfs/git
index 2928d59e6..125690562 100644
--- a/lfs/git
+++ b/lfs/git
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = git
-PAK_VER = 17
+PAK_VER = 18
DEPS = perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL
diff --git a/lfs/intel-microcode b/lfs/intel-microcode
index 025a789a5..c94bd6fa7 100644
--- a/lfs/intel-microcode
+++ b/lfs/intel-microcode
@@ -24,7 +24,7 @@
include Config
-VER = 20200616
+VER = 20201110
THISAPP = Intel-Linux-Processor-Microcode-Data-Files-microcode-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b5e2f0cc9db2ed3d2760a5a859a0a387
+$(DL_FILE)_MD5 = 132d927e9fc1ba01d8464ab3560e3ea6
install : $(TARGET)
diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound
index acbf6f5b5..5c5d2e3f4 100644
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -502,45 +502,44 @@ update_safe_search() {
unbound-control local_zone_remove "${domain}"
done >/dev/null
- # Nothing to do if safe search is not enabled
- if [ "${ENABLE_SAFE_SEARCH}" != "on" ]; then
- return 0
- fi
-
- # Bing
- unbound-control bing.com transparent >/dev/null
- for address in $(resolve "strict.bing.com"); do
- unbound-control local_data "www.bing.com ${LOCAL_TTL} IN A ${address}"
- done >/dev/null
-
- # DuckDuckGo
- unbound-control local_zone duckduckgo.com typetransparent >/dev/null
- for address in $(resolve "safe.duckduckgo.com"); do
- unbound-control local_data "duckduckgo.com ${LOCAL_TTL} IN A ${address}"
- done >/dev/null
-
- # Google
- local addresses="$(resolve "forcesafesearch.google.com")"
- for domain in ${google_tlds[@]}; do
- unbound-control local_zone "${domain}" transparent >/dev/null
- for address in ${addresses}; do
- unbound-control local_data "www.${domain} ${LOCAL_TTL} IN A ${address}"
+ if [ "${ENABLE_SAFE_SEARCH}" = "on" ]; then
+ # Bing
+ unbound-control bing.com transparent >/dev/null
+ for address in $(resolve "strict.bing.com"); do
+ unbound-control local_data "www.bing.com ${LOCAL_TTL} IN A ${address}"
done >/dev/null
- done
- # Yandex
- for domain in yandex.com yandex.ru; do
- unbound-control local_zone "${domain}" typetransparent >/dev/null
- for address in $(resolve "familysearch.${domain}"); do
- unbound-control local_data "${domain} ${LOCAL_TTL} IN A ${address}"
+ # DuckDuckGo
+ unbound-control local_zone duckduckgo.com typetransparent >/dev/null
+ for address in $(resolve "safe.duckduckgo.com"); do
+ unbound-control local_data "duckduckgo.com ${LOCAL_TTL} IN A ${address}"
done >/dev/null
- done
- # YouTube
- unbound-control local_zone youtube.com transparent >/dev/null
- for address in $(resolve "restrictmoderate.youtube.com"); do
- unbound-control local_data "www.youtube.com ${LOCAL_TTL} IN A ${address}"
- done >/dev/null
+ # Google
+ local addresses="$(resolve "forcesafesearch.google.com")"
+ for domain in ${google_tlds[@]}; do
+ unbound-control local_zone "${domain}" transparent >/dev/null
+ for address in ${addresses}; do
+ unbound-control local_data "www.${domain} ${LOCAL_TTL} IN A ${address}"
+ done >/dev/null
+ done
+
+ # Yandex
+ for domain in yandex.com yandex.ru; do
+ unbound-control local_zone "${domain}" typetransparent >/dev/null
+ for address in $(resolve "familysearch.${domain}"); do
+ unbound-control local_data "${domain} ${LOCAL_TTL} IN A ${address}"
+ done >/dev/null
+ done
+
+ # YouTube
+ if [ "${ENABLE_SAFE_SEARCH_YOUTUBE}" = "on" ]; then
+ unbound-control local_zone youtube.com transparent >/dev/null
+ for address in $(resolve "restrictmoderate.youtube.com"); do
+ unbound-control local_data "www.youtube.com ${LOCAL_TTL} IN A ${address}"
+ done >/dev/null
+ fi
+ fi
return 0
}
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2020-11-11 12:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CWNnZ4tCjz2xl6@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox