diff --git a/.gitignore b/.gitignore index 69175e69b..0ddc8ded6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ *.iso *.tar.bz2 /*.md5 +/*.b2 diff --git a/config/kernel/kernel.config.aarch64-ipfire b/config/kernel/kernel.config.aarch64-ipfire index 5c14fe751..8aea57e37 100644 --- a/config/kernel/kernel.config.aarch64-ipfire +++ b/config/kernel/kernel.config.aarch64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.15.22-ipfire Kernel Configuration +# Linux/arm64 5.15.32-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=110100 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23601 +CONFIG_AS_VERSION=23700 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23601 +CONFIG_LD_VERSION=23700 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -391,7 +391,6 @@ CONFIG_HZ=1000 CONFIG_SCHED_HRTICK=y CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_HW_PERF_EVENTS=y -CONFIG_ARCH_HAS_FILTER_PGPROT=y # CONFIG_PARAVIRT is not set # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set # CONFIG_KEXEC_FILE is not set @@ -399,6 +398,7 @@ CONFIG_CRASH_DUMP=y # CONFIG_XEN is not set CONFIG_FORCE_MAX_ZONEORDER=11 CONFIG_UNMAP_KERNEL_AT_EL0=y +CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y CONFIG_RODATA_FULL_DEFAULT_ENABLED=y # CONFIG_ARM64_SW_TTBR0_PAN is not set CONFIG_ARM64_TAGGED_ADDR_ABI=y @@ -702,7 +702,7 @@ CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_MODULES_USE_ELF_RELA=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y -CONFIG_ARCH_MMAP_RND_BITS=32 +CONFIG_ARCH_MMAP_RND_BITS=18 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y @@ -2032,7 +2032,6 @@ CONFIG_OF_KOBJ=y CONFIG_OF_DYNAMIC=y CONFIG_OF_ADDRESS=y CONFIG_OF_IRQ=y -CONFIG_OF_NET=y CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y CONFIG_OF_OVERLAY=y diff --git a/config/kernel/kernel.config.armv6l-ipfire b/config/kernel/kernel.config.armv6l-ipfire index 79b12591b..178c2ab6b 100644 --- a/config/kernel/kernel.config.armv6l-ipfire +++ b/config/kernel/kernel.config.armv6l-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.15.22-ipfire Kernel Configuration +# Linux/arm 5.15.32-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=110100 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23601 +CONFIG_AS_VERSION=23700 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23601 +CONFIG_LD_VERSION=23700 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y @@ -522,6 +522,7 @@ CONFIG_SWP_EMULATE=y # CONFIG_CPU_BPREDICT_DISABLE is not set CONFIG_CPU_SPECTRE=y CONFIG_HARDEN_BRANCH_PREDICTOR=y +CONFIG_HARDEN_BRANCH_HISTORY=y CONFIG_KUSER_HELPERS=y CONFIG_VDSO=y CONFIG_DMA_CACHE_RWFO=y @@ -778,7 +779,7 @@ CONFIG_MODULES_USE_ELF_REL=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y CONFIG_HAVE_ARCH_MMAP_RND_BITS=y CONFIG_HAVE_EXIT_THREAD=y -CONFIG_ARCH_MMAP_RND_BITS=32 +CONFIG_ARCH_MMAP_RND_BITS=8 CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y @@ -1837,6 +1838,7 @@ CONFIG_DEV_COREDUMP=y # CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y CONFIG_SOC_BUS=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y @@ -2037,7 +2039,6 @@ CONFIG_OF_KOBJ=y CONFIG_OF_DYNAMIC=y CONFIG_OF_ADDRESS=y CONFIG_OF_IRQ=y -CONFIG_OF_NET=y CONFIG_OF_RESERVED_MEM=y CONFIG_OF_RESOLVE=y CONFIG_OF_OVERLAY=y diff --git a/config/kernel/kernel.config.x86_64-ipfire b/config/kernel/kernel.config.x86_64-ipfire index 8d0416c8f..773845765 100644 --- a/config/kernel/kernel.config.x86_64-ipfire +++ b/config/kernel/kernel.config.x86_64-ipfire @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.15.22-ipfire Kernel Configuration +# Linux/x86 5.15.32-ipfire Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" CONFIG_CC_IS_GCC=y CONFIG_GCC_VERSION=110100 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23601 +CONFIG_AS_VERSION=23700 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23601 +CONFIG_LD_VERSION=23700 CONFIG_LLD_VERSION=0 CONFIG_CC_CAN_LINK=y CONFIG_CC_CAN_LINK_STATIC=y diff --git a/config/rootfiles/core/167/filelists/files b/config/rootfiles/core/167/filelists/files index b9afdec37..7e85b24ac 100644 --- a/config/rootfiles/core/167/filelists/files +++ b/config/rootfiles/core/167/filelists/files @@ -2,6 +2,7 @@ etc/collectd.conf etc/inittab.d etc/rc.d/init.d/firewall etc/rc.d/init.d/pakfire +etc/sysctl.conf lib/udev/network-hotplug-bridges srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/dhcp.cgi @@ -9,6 +10,7 @@ srv/web/ipfire/cgi-bin/getrrdimage.cgi srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/location-block.cgi usr/lib/firewall/rules.pl +usr/local/bin/backupiso usr/sbin/unbound-dhcp-leases-bridge var/ipfire/backup/include var/ipfire/dhcp/advoptions-list diff --git a/config/rootfiles/core/167/filelists/gzip b/config/rootfiles/core/167/filelists/gzip new file mode 120000 index 000000000..aebcccd87 --- /dev/null +++ b/config/rootfiles/core/167/filelists/gzip @@ -0,0 +1 @@ +../../../common/gzip \ No newline at end of file diff --git a/config/rootfiles/core/167/update.sh b/config/rootfiles/core/167/update.sh index 1ca93a891..fdcb843cf 100644 --- a/config/rootfiles/core/167/update.sh +++ b/config/rootfiles/core/167/update.sh @@ -310,9 +310,6 @@ rm -rvf \ /usr/share/zoneinfo/US/Pacific-New \ /var/lib/GeoIP -# Delete old 2007 Pakfire key from GPG keyring -GNUPGHOME="/opt/pakfire/etc/.gnupg" gpg --batch --yes --delete-keys 179740DC4D8C47DC63C099C74BDE364C64D96617 - # Stop services /etc/init.d/ipsec stop @@ -322,6 +319,9 @@ extract_files # update linker config ldconfig +# Delete old 2007 Pakfire key from GPG keyring +GNUPGHOME="/opt/pakfire/etc/.gnupg" gpg --batch --yes --delete-keys 179740DC4D8C47DC63C099C74BDE364C64D96617 + # Add new 2022 Pakfire key to GPG keyring GNUPGHOME="/opt/pakfire/etc/.gnupg" gpg --import /opt/pakfire/pakfire-2022.key @@ -341,6 +341,12 @@ dracut --regenerate-all --force perl -e "require '/var/ipfire/ids-functions.pl'; &IDS::oinkmaster();" /etc/init.d/suricata reload +# Apply sysctl changes +/etc/init.d/sysctl start + +# Apply local configuration to sshd_config +/usr/local/bin/sshctrl + # Start services /etc/init.d/apache restart /etc/init.d/sshd restart diff --git a/lfs/gzip b/lfs/gzip index 70c7a3f44..809c6a91f 100644 --- a/lfs/gzip +++ b/lfs/gzip @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2021 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # 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 = 1.11 +VER = 1.12 THISAPP = gzip-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -49,7 +49,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = c251066f0bded6a6557a5cbfe5d20090c6446051c31fad610af4f9f7b2537c28fed1cfab424a459452db73b7d1df1361e5aeba163a9e980fc611faf408cac128 +$(DL_FILE)_BLAKE2 = 7e2d482c08555f5fb0ff5408c0afe48c61034e9779eed6e3dd8046c847234c0a8a6bc34d49a934a54db0d73033e12c71a228d373551384a4cd663315071637e0 install : $(TARGET) diff --git a/src/installer/downloadsource.sh b/src/installer/downloadsource.sh index c74f9e232..47086b2b7 100644 --- a/src/installer/downloadsource.sh +++ b/src/installer/downloadsource.sh @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2010 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # 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 # @@ -48,17 +48,17 @@ if ! download -O "${OUTPUT}" "${URL}"; then exit 1 fi -# Download went well. Checking for MD5 sum -if download -O "${OUTPUT}.md5" "${URL}.md5" &>/dev/null; then +# Download went well. Checking for BLAKE2 sum +if download -O "${OUTPUT}.b2" "${URL}.b2" &>/dev/null; then # Read downloaded checksum - read -r md5sum rest < "${OUTPUT}.md5" - rm -f "${OUTPUT}.md5" + read -r b2sum rest < "${OUTPUT}.b2" + rm -f "${OUTPUT}.b2" # Compute checkum of downloaded image file - read -r md5sum_image rest <<< "$(md5sum "${OUTPUT}")" + read -r b2sum_image rest <<< "$(b2sum "${OUTPUT}")" - if [ "${md5sum}" != "${md5sum_image}" ]; then - echo "MD5 sum mismatch: ${md5sum} != ${md5sum_image}" >&2 + if [ "${b2sum}" != "${b2sum_image}" ]; then + echo "BLAKE2 checksum mismatch: ${b2sum} != ${b2sum_image}" >&2 exit 2 fi fi diff --git a/src/installer/main.c b/src/installer/main.c index 06dd9caf5..51e69751a 100644 --- a/src/installer/main.c +++ b/src/installer/main.c @@ -539,7 +539,7 @@ int main(int argc, char *argv[]) { } else { char reason[STRING_SIZE] = "-"; if (rc == 2) - snprintf(reason, sizeof(STRING_SIZE), _("MD5 checksum mismatch")); + snprintf(reason, sizeof(STRING_SIZE), _("BLAKE2 checksum mismatch")); snprintf(message, sizeof(message), _("The installation image could not be downloaded.\n Reason: %s\n\n%s"), diff --git a/src/installer/po/ar.po b/src/installer/po/ar.po index 9c1bc249d..09064c578 100644 --- a/src/installer/po/ar.po +++ b/src/installer/po/ar.po @@ -107,7 +107,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/ca.po b/src/installer/po/ca.po index 923f1da6d..3e906f3f7 100644 --- a/src/installer/po/ca.po +++ b/src/installer/po/ca.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/cs_CZ.po b/src/installer/po/cs_CZ.po index f00b8fb47..099bd5f26 100644 --- a/src/installer/po/cs_CZ.po +++ b/src/installer/po/cs_CZ.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/da.po b/src/installer/po/da.po index 04e8c1e8b..29138fd7e 100644 --- a/src/installer/po/da.po +++ b/src/installer/po/da.po @@ -107,8 +107,8 @@ msgstr "Henter installationsbillede..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2 checksum mismatch" #: main.c:513 #, c-format diff --git a/src/installer/po/de.po b/src/installer/po/de.po index 279982a5f..2f2a7856a 100644 --- a/src/installer/po/de.po +++ b/src/installer/po/de.po @@ -110,8 +110,8 @@ msgstr "Lade Installationsimage herunter..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5-Prüfsummen stimmen nicht überein" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2-Prüfsummen stimmen nicht überein" #: main.c:513 #, c-format diff --git a/src/installer/po/el_GR.po b/src/installer/po/el_GR.po index 831523053..ede86b2f6 100644 --- a/src/installer/po/el_GR.po +++ b/src/installer/po/el_GR.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/es.po b/src/installer/po/es.po index a3036c671..280a00f1a 100644 --- a/src/installer/po/es.po +++ b/src/installer/po/es.po @@ -108,8 +108,8 @@ msgstr "Descargando la imagen de instalación..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "Discordancia suma de verificación MD5 " +msgid "BLAKE2 checksum mismatch" +msgstr "Discordancia suma de verificación BLAKE2" #: main.c:513 #, c-format diff --git a/src/installer/po/fa.po b/src/installer/po/fa.po index 5420f9ae7..1e96546f4 100644 --- a/src/installer/po/fa.po +++ b/src/installer/po/fa.po @@ -107,8 +107,8 @@ msgstr "در حال دانلود ایمیج برای برپا سازی..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "ناهماهنگی در کنرل جمعی MD5" +msgid "BLAKE2 checksum mismatch" +msgstr "ناهماهنگی در کنرل جمعی BLAKE2" #: main.c:513 #, c-format diff --git a/src/installer/po/fr.po b/src/installer/po/fr.po index 9c6bcd60d..aad2bc31e 100644 --- a/src/installer/po/fr.po +++ b/src/installer/po/fr.po @@ -117,8 +117,8 @@ msgstr "Téléchargement de l'image d'installation..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "Erreur de vérification contrôle MD5" +msgid "BLAKE2 checksum mismatch" +msgstr "Erreur de vérification contrôle BLAKE2" #: main.c:513 #, c-format diff --git a/src/installer/po/hr.po b/src/installer/po/hr.po index abfec72ac..ecd4c4884 100644 --- a/src/installer/po/hr.po +++ b/src/installer/po/hr.po @@ -106,8 +106,8 @@ msgstr "Preuzimanje instalacijske slike" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5 checksum se ne podudara" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2 checksum se ne podudara" #: main.c:513 #, c-format diff --git a/src/installer/po/hu.po b/src/installer/po/hu.po index c69fd4bf6..fc7e1dc66 100644 --- a/src/installer/po/hu.po +++ b/src/installer/po/hu.po @@ -107,8 +107,8 @@ msgstr "Telepítési kép letöltése..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5 ellenőrzés sikertelen" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2 ellenőrzés sikertelen" #: main.c:513 #, c-format diff --git a/src/installer/po/id.po b/src/installer/po/id.po index 96f3d4de2..d5809b826 100644 --- a/src/installer/po/id.po +++ b/src/installer/po/id.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/it.po b/src/installer/po/it.po index 730ab70df..fe5d52ee0 100644 --- a/src/installer/po/it.po +++ b/src/installer/po/it.po @@ -108,8 +108,8 @@ msgstr "Scaricamento immagine di installazione..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "Checksum MD5 non corrispondente" +msgid "BLAKE2 checksum mismatch" +msgstr "Checksum BLAKE2 non corrispondente" #: main.c:513 #, c-format diff --git a/src/installer/po/ja.po b/src/installer/po/ja.po index f45b101d8..5008672d1 100644 --- a/src/installer/po/ja.po +++ b/src/installer/po/ja.po @@ -107,8 +107,8 @@ msgstr "インストール・イメージをダウンロードしています・ #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5検査合計が不正です。" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2検査合計が不正です。" #: main.c:513 #, c-format diff --git a/src/installer/po/jv.po b/src/installer/po/jv.po index 0cee8b509..b30426ae8 100644 --- a/src/installer/po/jv.po +++ b/src/installer/po/jv.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/km_KH.po b/src/installer/po/km_KH.po index a7e10a514..772b04ad2 100644 --- a/src/installer/po/km_KH.po +++ b/src/installer/po/km_KH.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/nl.po b/src/installer/po/nl.po index eab31aa15..8ef5619cd 100644 --- a/src/installer/po/nl.po +++ b/src/installer/po/nl.po @@ -107,8 +107,8 @@ msgstr "Bezig met downloaden van het installatie bestand..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5 checksum verschil" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2 checksum verschil" #: main.c:513 #, c-format diff --git a/src/installer/po/pl.po b/src/installer/po/pl.po index 6a5fc1f99..70ab67ca7 100644 --- a/src/installer/po/pl.po +++ b/src/installer/po/pl.po @@ -109,8 +109,8 @@ msgstr "Pobieranie pliku obrazu instalacji..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "Niezgodność sumy kontrolnej MD5" +msgid "BLAKE2 checksum mismatch" +msgstr "Niezgodność sumy kontrolnej BLAKE2" #: main.c:513 #, c-format diff --git a/src/installer/po/pt.po b/src/installer/po/pt.po index 8a9373062..218137bcc 100644 --- a/src/installer/po/pt.po +++ b/src/installer/po/pt.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/pt_BR.po b/src/installer/po/pt_BR.po index f9140e561..1c9282d64 100644 --- a/src/installer/po/pt_BR.po +++ b/src/installer/po/pt_BR.po @@ -110,8 +110,8 @@ msgstr "Baixando imagem de instalação..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "Assinatura MD5 incompatível" +msgid "BLAKE2 checksum mismatch" +msgstr "Assinatura BLAKE2 incompatível" #: main.c:513 #, c-format diff --git a/src/installer/po/pt_PT.po b/src/installer/po/pt_PT.po index 625115742..34a82444a 100644 --- a/src/installer/po/pt_PT.po +++ b/src/installer/po/pt_PT.po @@ -107,7 +107,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/ro.po b/src/installer/po/ro.po index 738650f7c..14442618b 100644 --- a/src/installer/po/ro.po +++ b/src/installer/po/ro.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/ro_RO.po b/src/installer/po/ro_RO.po index 57294a300..4dc708a2a 100644 --- a/src/installer/po/ro_RO.po +++ b/src/installer/po/ro_RO.po @@ -107,8 +107,8 @@ msgstr "Se descarca imaginea de instalare" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "Nepotrivire verificare MD5" +msgid "BLAKE2 checksum mismatch" +msgstr "Nepotrivire verificare BLAKE2" #: main.c:513 #, c-format diff --git a/src/installer/po/ru.po b/src/installer/po/ru.po index b11e2e9a0..4ae486144 100644 --- a/src/installer/po/ru.po +++ b/src/installer/po/ru.po @@ -107,8 +107,8 @@ msgstr "Скачивание образа установки..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5 хеш не совпал" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2 хеш не совпал" #: main.c:513 #, c-format diff --git a/src/installer/po/rw.po b/src/installer/po/rw.po index 5eae4b55e..4fe7692b3 100644 --- a/src/installer/po/rw.po +++ b/src/installer/po/rw.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/sk.po b/src/installer/po/sk.po index b285caee3..53bdea1a3 100644 --- a/src/installer/po/sk.po +++ b/src/installer/po/sk.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/sq.po b/src/installer/po/sq.po index ef3f20d8e..d141a8347 100644 --- a/src/installer/po/sq.po +++ b/src/installer/po/sq.po @@ -107,7 +107,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/sr.po b/src/installer/po/sr.po index 86dd1ef3a..05b43b2f7 100644 --- a/src/installer/po/sr.po +++ b/src/installer/po/sr.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/su.po b/src/installer/po/su.po index fd66e4e52..fe941bfdf 100644 --- a/src/installer/po/su.po +++ b/src/installer/po/su.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/sv.po b/src/installer/po/sv.po index 9cdc32bcb..b81ddde04 100644 --- a/src/installer/po/sv.po +++ b/src/installer/po/sv.po @@ -107,8 +107,8 @@ msgstr "Laddar ned installationsavbild..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5 kontrollsumma stämmer ej" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2 kontrollsumma stämmer ej" #: main.c:513 #, c-format diff --git a/src/installer/po/th.po b/src/installer/po/th.po index 2d6b33284..026d05c03 100644 --- a/src/installer/po/th.po +++ b/src/installer/po/th.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/tk.po b/src/installer/po/tk.po index 0bc6e8082..5c58d4dbb 100644 --- a/src/installer/po/tk.po +++ b/src/installer/po/tk.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/tr.po b/src/installer/po/tr.po index d66d840a2..ea0b5a62e 100644 --- a/src/installer/po/tr.po +++ b/src/installer/po/tr.po @@ -109,8 +109,8 @@ msgstr "Yükleme dosyası indiriliyor..." #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" -msgstr "MD5 checksum uyuşmuyor" +msgid "BLAKE2 checksum mismatch" +msgstr "BLAKE2 checksum uyuşmuyor" #: main.c:513 #, c-format diff --git a/src/installer/po/uk.po b/src/installer/po/uk.po index cd8deb10b..0d8958f82 100644 --- a/src/installer/po/uk.po +++ b/src/installer/po/uk.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/uz@Latn.po b/src/installer/po/uz@Latn.po index 345fb0933..be11221d9 100644 --- a/src/installer/po/uz@Latn.po +++ b/src/installer/po/uz@Latn.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/vi.po b/src/installer/po/vi.po index 7fbce462e..7aaa0449f 100644 --- a/src/installer/po/vi.po +++ b/src/installer/po/vi.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/installer/po/zh.po b/src/installer/po/zh.po index 67ed5c801..43c2f8321 100644 --- a/src/installer/po/zh.po +++ b/src/installer/po/zh.po @@ -106,7 +106,7 @@ msgstr "" #: main.c:510 #, c-format -msgid "MD5 checksum mismatch" +msgid "BLAKE2 checksum mismatch" msgstr "" #: main.c:513 diff --git a/src/patches/Tor-Sandbox-permit-the-clone3-system-call.patch b/src/patches/Tor-Sandbox-permit-the-clone3-system-call.patch index e8c6957f2..7e819ce73 100644 --- a/src/patches/Tor-Sandbox-permit-the-clone3-system-call.patch +++ b/src/patches/Tor-Sandbox-permit-the-clone3-system-call.patch @@ -1,13 +1,14 @@ diff -Naur tor-0.4.6.10.orig/src/lib/sandbox/sandbox.c tor-0.4.6.10/src/lib/sandbox/sandbox.c ---- tor-0.4.6.10.orig/src/lib/sandbox/sandbox.c 2022-03-31 07:17:55.966217291 +0000 -+++ tor-0.4.6.10/src/lib/sandbox/sandbox.c 2022-03-31 07:19:23.730134367 +0000 -@@ -151,6 +151,9 @@ +--- tor-0.4.6.10.orig/src/lib/sandbox/sandbox.c 2022-04-09 07:58:00.281189564 +0000 ++++ tor-0.4.6.10/src/lib/sandbox/sandbox.c 2022-04-09 08:00:55.861698856 +0000 +@@ -151,6 +151,10 @@ SCMP_SYS(clock_gettime), SCMP_SYS(close), SCMP_SYS(clone), +#ifdef __NR_clone3 + SCMP_SYS(clone3), +#endif ++ SCMP_SYS(rseq), SCMP_SYS(dup), SCMP_SYS(epoll_create), SCMP_SYS(epoll_wait), diff --git a/src/scripts/backupiso b/src/scripts/backupiso index fe5376741..ef017e3be 100644 --- a/src/scripts/backupiso +++ b/src/scripts/backupiso @@ -80,30 +80,30 @@ then wget --quiet -c ${URL}${ISO} fi -echo "Fetching ${URL}${ISO}.md5" -wget --quiet -O ${ISO}.md5 ${URL}${ISO}.md5 +echo "Fetching ${URL}${ISO}.b2" +wget --quiet -O ${ISO}.b2 ${URL}${ISO}.b2 -echo "Checking md5 of ${ISO}" -md5sum --status -c ${ISO}.md5 +echo "Checking BLAKE2 checksum of ${ISO}" +b2sum --status -c ${ISO}.b2 if [ $? -eq 0 ] || [ $? -eq 24 ] then - echo "md5 is OK" + echo "BLAKE2 checksum is OK" else - echo "md5 mismatch" + echo "BLAKE2 checksum mismatch" echo "Fetching again ${URL}${ISO}" wget --quiet -O ${ISO} ${URL}${ISO} - echo "Checking again md5 of ${ISO}" - md5sum --status -c ${ISO}.md5 + echo "Checking BLAKE2 checksum of ${ISO} again" + b2sum --status -c ${ISO}.b2 if [ $? -eq 0 ] || [ $? -eq 24 ] then - echo "md5 is OK" + echo "BLAKE2 checksum is OK" else - echo "md5 mismatch" - echo "aborting backup because md5 mismatch" + echo "BLAKE2 checksum mismatch" + echo "aborting backup because BLAKE2 checksum mismatch" exit 1 fi fi -rm ${ISO}.md5 +rm ${ISO}.b2 echo "Remastering iso" mkdir -p backupiso.tmp.${TS}