:xMerge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next-switch-to-libloc

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>

config/backup/includes/bacula

@@ -1 +1,2 @@
-/etc/bacula/
+/etc/bacula/bacula-fd.conf
+/var/bacula/working/bacula-fd.9102.state

config/cfgroot/general-functions.pl

@@ -1286,4 +1286,26 @@ sub formatBytes {
 	return sprintf("%.2f %s", $bytes, $unit);
 }
 
+# Cloud Stuff
+
+sub running_in_cloud() {
+	return &running_on_ec2() || &running_on_gcp();
+}
+
+sub running_on_ec2() {
+	if (-e "/var/run/aws-instance-id") {
+		return 1;
+	}
+
+	return 0;
+}
+
+sub running_on_gcp() {
+	if (-e "/var/run/gcp-instance-id") {
+		return 1;
+	}
+
+	return 0;
+}
+
 1;

config/cfgroot/header.pl

@@ -19,8 +19,6 @@ use Time::Local;
 
 $|=1; # line buffering
 
-require "/var/ipfire/aws-functions.pl";
-
 $Header::revision = 'final';
 $Header::swroot = '/var/ipfire';
 $Header::graphdir='/srv/web/ipfire/html/graphs';
@@ -172,8 +170,8 @@ sub genmenu {
         $menu->{'02.status'}{'subMenu'}->{'74.modem-status'}{'enabled'} = 1;
     }
 
-    # Disbale unusable things on EC2
+    # Disbale unusable things in cloud environments
-    if (&AWS::running_on_ec2()) {
+    if (&General::running_in_cloud()) {
         $menu->{'03.network'}{'subMenu'}->{'30.dhcp'}{'enabled'} = 0;
         $menu->{'03.network'}{'subMenu'}->{'80.macadressmenu'}{'enabled'} = 0;
         $menu->{'03.network'}{'subMenu'}->{'90.wakeonlan'}{'enabled'} = 0;

config/kernel/kernel.config.aarch64-ipfire

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.183-ipfire Kernel Configuration
+# Linux/arm64 4.14.184-ipfire Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
@@ -227,7 +227,7 @@ CONFIG_TRACEPOINTS=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 CONFIG_STATIC_KEYS_SELFTEST=y
-# CONFIG_UPROBES is not set
+CONFIG_UPROBES=y
 # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_HAVE_KPROBES=y
@@ -251,7 +251,6 @@ CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
 CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
@@ -299,6 +298,7 @@ CONFIG_REFCOUNT_FULL=y
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -525,7 +525,6 @@ CONFIG_HOLES_IN_ZONE=y
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
-CONFIG_SECCOMP=y
 CONFIG_HZ_100=y
 # CONFIG_HZ_250 is not set
 # CONFIG_HZ_300 is not set
@@ -6362,6 +6361,7 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
@@ -6459,7 +6459,6 @@ CONFIG_TRACER_SNAPSHOT=y
 # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
 CONFIG_BRANCH_PROFILE_NONE=y
 # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
 CONFIG_STACK_TRACER=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_UPROBE_EVENTS=y

config/kernel/kernel.config.armv5tel-ipfire-multi

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.183-ipfire-multi Kernel Configuration
+# Linux/arm 4.14.184-ipfire-multi Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -225,7 +225,7 @@ CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 CONFIG_STATIC_KEYS_SELFTEST=y
-# CONFIG_UPROBES is not set
+CONFIG_UPROBES=y
 # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y
@@ -247,7 +247,6 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 CONFIG_HAVE_ARCH_JUMP_LABEL=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
-CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_GCC_PLUGINS=y
 CONFIG_GCC_PLUGINS=y
 # CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
@@ -294,6 +293,7 @@ CONFIG_REFCOUNT_FULL=y
 # CONFIG_GCOV_KERNEL is not set
 CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -782,7 +782,6 @@ CONFIG_ARCH_NR_GPIO=512
 CONFIG_PREEMPT_NONE=y
 # CONFIG_PREEMPT_VOLUNTARY is not set
 # CONFIG_PREEMPT is not set
-CONFIG_SECCOMP=y
 CONFIG_HZ_FIXED=0
 CONFIG_HZ_100=y
 # CONFIG_HZ_200 is not set
@@ -840,7 +839,6 @@ CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
 # CONFIG_PARAVIRT is not set
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_RANDOMIZE_BASE=y
 
 #
 # Boot options
@@ -6848,6 +6846,7 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
@@ -7027,7 +7026,6 @@ CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_HARDENED_USERCOPY_PAGESPAN=y
-CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
 # CONFIG_SECURITY_SMACK is not set
 # CONFIG_SECURITY_TOMOYO is not set

config/kernel/kernel.config.i586-ipfire

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.183-ipfire Kernel Configuration
+# Linux/x86 4.14.184-ipfire Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -242,7 +242,7 @@ CONFIG_OPROFILE_NMI_TIMER=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 CONFIG_STATIC_KEYS_SELFTEST=y
-# CONFIG_UPROBES is not set
+CONFIG_UPROBES=y
 # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y

config/kernel/kernel.config.x86_64-ipfire

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.183-ipfire Kernel Configuration
+# Linux/x86 4.14.184-ipfire Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -251,7 +251,7 @@ CONFIG_OPROFILE_NMI_TIMER=y
 # CONFIG_KPROBES is not set
 CONFIG_JUMP_LABEL=y
 CONFIG_STATIC_KEYS_SELFTEST=y
-# CONFIG_UPROBES is not set
+CONFIG_UPROBES=y
 # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
 CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
 CONFIG_ARCH_USE_BUILTIN_BSWAP=y

config/rootfiles/common/aarch64/gmp

@@ -4,12 +4,14 @@
 #usr/lib/libgmp.la
 #usr/lib/libgmp.so
 usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.3.2
+usr/lib/libgmp.so.10.4.0
 #usr/lib/libgmpxx.a
 #usr/lib/libgmpxx.la
 #usr/lib/libgmpxx.so
 usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.5.2
+usr/lib/libgmpxx.so.4.6.0
+#usr/lib/pkgconfig/gmp.pc
+#usr/lib/pkgconfig/gmpxx.pc
 #usr/share/info/gmp.info
 #usr/share/info/gmp.info-1
 #usr/share/info/gmp.info-2

config/rootfiles/common/aarch64/initscripts

@@ -3,6 +3,7 @@ etc/init.d
 #etc/rc.d/helper
 etc/rc.d/helper/aws-setup
 etc/rc.d/helper/azure-setup
+etc/rc.d/helper/gcp-setup
 etc/rc.d/helper/getdnsfromdhcpc.pl
 #etc/rc.d/init.d
 etc/rc.d/init.d/acpid

config/rootfiles/common/aarch64/linux

@@ -7172,6 +7172,8 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/force/max
 #lib/modules/KVER-ipfire/build/include/config/force/max/zoneorder.h
 #lib/modules/KVER-ipfire/build/include/config/forcedeth.h
+#lib/modules/KVER-ipfire/build/include/config/fortify
+#lib/modules/KVER-ipfire/build/include/config/fortify/source.h
 #lib/modules/KVER-ipfire/build/include/config/frame
 #lib/modules/KVER-ipfire/build/include/config/frame/pointer.h
 #lib/modules/KVER-ipfire/build/include/config/frame/vector.h
@@ -7320,6 +7322,10 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/harden
 #lib/modules/KVER-ipfire/build/include/config/harden/branch
 #lib/modules/KVER-ipfire/build/include/config/harden/branch/predictor.h
+#lib/modules/KVER-ipfire/build/include/config/hardened
+#lib/modules/KVER-ipfire/build/include/config/hardened/usercopy
+#lib/modules/KVER-ipfire/build/include/config/hardened/usercopy.h
+#lib/modules/KVER-ipfire/build/include/config/hardened/usercopy/pagespan.h
 #lib/modules/KVER-ipfire/build/include/config/hardirqs
 #lib/modules/KVER-ipfire/build/include/config/hardirqs/sw
 #lib/modules/KVER-ipfire/build/include/config/hardirqs/sw/resend.h
@@ -9828,12 +9834,14 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/slab/freelist/random.h
 #lib/modules/KVER-ipfire/build/include/config/slab/merge
 #lib/modules/KVER-ipfire/build/include/config/slab/merge/default.h
+#lib/modules/KVER-ipfire/build/include/config/slabinfo.h
 #lib/modules/KVER-ipfire/build/include/config/slhc.h
 #lib/modules/KVER-ipfire/build/include/config/slicoss.h
 #lib/modules/KVER-ipfire/build/include/config/slub
 #lib/modules/KVER-ipfire/build/include/config/slub.h
 #lib/modules/KVER-ipfire/build/include/config/slub/cpu
 #lib/modules/KVER-ipfire/build/include/config/slub/cpu/partial.h
+#lib/modules/KVER-ipfire/build/include/config/slub/debug.h
 #lib/modules/KVER-ipfire/build/include/config/smc91x.h
 #lib/modules/KVER-ipfire/build/include/config/smp.h
 #lib/modules/KVER-ipfire/build/include/config/sms

config/rootfiles/common/armv5tel/gmp

@@ -4,12 +4,14 @@
 #usr/lib/libgmp.la
 #usr/lib/libgmp.so
 usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.3.2
+usr/lib/libgmp.so.10.4.0
 #usr/lib/libgmpxx.a
 #usr/lib/libgmpxx.la
 #usr/lib/libgmpxx.so
 usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.5.2
+usr/lib/libgmpxx.so.4.6.0
+#usr/lib/pkgconfig/gmp.pc
+#usr/lib/pkgconfig/gmpxx.pc
 #usr/share/info/gmp.info
 #usr/share/info/gmp.info-1
 #usr/share/info/gmp.info-2

config/rootfiles/common/armv5tel/initscripts

@@ -3,6 +3,7 @@ etc/init.d
 #etc/rc.d/helper
 etc/rc.d/helper/aws-setup
 etc/rc.d/helper/azure-setup
+etc/rc.d/helper/gcp-setup
 etc/rc.d/helper/getdnsfromdhcpc.pl
 #etc/rc.d/init.d
 etc/rc.d/init.d/acpid

config/rootfiles/common/armv5tel/linux-multi

@@ -8008,6 +8008,10 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire-multi/build/include/config/harden
 #lib/modules/KVER-ipfire-multi/build/include/config/harden/branch
 #lib/modules/KVER-ipfire-multi/build/include/config/harden/branch/predictor.h
+#lib/modules/KVER-ipfire-multi/build/include/config/hardened
+#lib/modules/KVER-ipfire-multi/build/include/config/hardened/usercopy
+#lib/modules/KVER-ipfire-multi/build/include/config/hardened/usercopy.h
+#lib/modules/KVER-ipfire-multi/build/include/config/hardened/usercopy/pagespan.h
 #lib/modules/KVER-ipfire-multi/build/include/config/hardirqs
 #lib/modules/KVER-ipfire-multi/build/include/config/hardirqs/sw
 #lib/modules/KVER-ipfire-multi/build/include/config/hardirqs/sw/resend.h
@@ -10754,12 +10758,14 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire-multi/build/include/config/slab/freelist/random.h
 #lib/modules/KVER-ipfire-multi/build/include/config/slab/merge
 #lib/modules/KVER-ipfire-multi/build/include/config/slab/merge/default.h
+#lib/modules/KVER-ipfire-multi/build/include/config/slabinfo.h
 #lib/modules/KVER-ipfire-multi/build/include/config/slhc.h
 #lib/modules/KVER-ipfire-multi/build/include/config/slicoss.h
 #lib/modules/KVER-ipfire-multi/build/include/config/slub
 #lib/modules/KVER-ipfire-multi/build/include/config/slub.h
 #lib/modules/KVER-ipfire-multi/build/include/config/slub/cpu
 #lib/modules/KVER-ipfire-multi/build/include/config/slub/cpu/partial.h
+#lib/modules/KVER-ipfire-multi/build/include/config/slub/debug.h
 #lib/modules/KVER-ipfire-multi/build/include/config/smc911x.h
 #lib/modules/KVER-ipfire-multi/build/include/config/smc91x.h
 #lib/modules/KVER-ipfire-multi/build/include/config/smp

config/rootfiles/common/bind

@@ -213,6 +213,7 @@ usr/bin/nsupdate
 #usr/include/isc/timer.h
 #usr/include/isc/tm.h
 #usr/include/isc/types.h
+#usr/include/isc/utf8.h
 #usr/include/isc/util.h
 #usr/include/isc/version.h
 #usr/include/isc/xml.h
@@ -271,11 +272,11 @@ usr/lib/libbind9.so.161.0.4
 #usr/lib/libdns.la
 #usr/lib/libdns.so
 usr/lib/libdns.so.1110
-usr/lib/libdns.so.1110.0.2
+usr/lib/libdns.so.1110.0.3
 #usr/lib/libisc.la
 #usr/lib/libisc.so
 usr/lib/libisc.so.1105
-usr/lib/libisc.so.1105.0.2
+usr/lib/libisc.so.1105.1.0
 #usr/lib/libisccc.la
 #usr/lib/libisccc.so
 usr/lib/libisccc.so.161
@@ -283,11 +284,11 @@ usr/lib/libisccc.so.161.0.1
 #usr/lib/libisccfg.la
 #usr/lib/libisccfg.so
 usr/lib/libisccfg.so.163
-usr/lib/libisccfg.so.163.0.7
+usr/lib/libisccfg.so.163.0.8
 #usr/lib/liblwres.la
 #usr/lib/liblwres.so
 usr/lib/liblwres.so.161
-usr/lib/liblwres.so.161.0.3
+usr/lib/liblwres.so.161.0.4
 #usr/share/man/man1/dig.1
 #usr/share/man/man1/host.1
 #usr/share/man/man1/nslookup.1

config/rootfiles/common/configroot

@@ -9,7 +9,6 @@ usr/sbin/firewall-policy
 var/ipfire/addon-lang
 var/ipfire/auth
 #var/ipfire/auth/users
-var/ipfire/aws-functions.pl
 #var/ipfire/backup
 var/ipfire/backup/exclude.user
 var/ipfire/backup/include.user

config/rootfiles/common/gnutls

@@ -33,7 +33,7 @@ usr/lib/libgnutls-dane.so.0.4.1
 #usr/lib/libgnutls.la
 #usr/lib/libgnutls.so
 usr/lib/libgnutls.so.30
-usr/lib/libgnutls.so.30.23.2
+usr/lib/libgnutls.so.30.28.0
 #usr/lib/libgnutlsxx.la
 #usr/lib/libgnutlsxx.so
 usr/lib/libgnutlsxx.so.28
@@ -113,9 +113,11 @@ usr/lib/libgnutlsxx.so.28.1.0
 #usr/share/man/man3/dane_verify_crt_raw.3
 #usr/share/man/man3/dane_verify_session_crt.3
 #usr/share/man/man3/gnutls_aead_cipher_decrypt.3
+#usr/share/man/man3/gnutls_aead_cipher_decryptv2.3
 #usr/share/man/man3/gnutls_aead_cipher_deinit.3
 #usr/share/man/man3/gnutls_aead_cipher_encrypt.3
 #usr/share/man/man3/gnutls_aead_cipher_encryptv.3
+#usr/share/man/man3/gnutls_aead_cipher_encryptv2.3
 #usr/share/man/man3/gnutls_aead_cipher_init.3
 #usr/share/man/man3/gnutls_alert_get.3
 #usr/share/man/man3/gnutls_alert_get_name.3
@@ -206,6 +208,8 @@ usr/lib/libgnutlsxx.so.28.1.0
 #usr/share/man/man3/gnutls_certificate_type_get_id.3
 #usr/share/man/man3/gnutls_certificate_type_get_name.3
 #usr/share/man/man3/gnutls_certificate_type_list.3
+#usr/share/man/man3/gnutls_certificate_verification_profile_get_id.3
+#usr/share/man/man3/gnutls_certificate_verification_profile_get_name.3
 #usr/share/man/man3/gnutls_certificate_verification_status_print.3
 #usr/share/man/man3/gnutls_certificate_verify_peers.3
 #usr/share/man/man3/gnutls_certificate_verify_peers2.3
@@ -271,6 +275,7 @@ usr/lib/libgnutlsxx.so.28.1.0
 #usr/share/man/man3/gnutls_dh_params_import_pkcs3.3
 #usr/share/man/man3/gnutls_dh_params_import_raw.3
 #usr/share/man/man3/gnutls_dh_params_import_raw2.3
+#usr/share/man/man3/gnutls_dh_params_import_raw3.3
 #usr/share/man/man3/gnutls_dh_params_init.3
 #usr/share/man/man3/gnutls_dh_set_prime_bits.3
 #usr/share/man/man3/gnutls_digest_get_id.3
@@ -302,12 +307,14 @@ usr/lib/libgnutlsxx.so.28.1.0
 #usr/share/man/man3/gnutls_ext_get_current_msg.3
 #usr/share/man/man3/gnutls_ext_get_data.3
 #usr/share/man/man3/gnutls_ext_get_name.3
+#usr/share/man/man3/gnutls_ext_get_name2.3
 #usr/share/man/man3/gnutls_ext_raw_parse.3
 #usr/share/man/man3/gnutls_ext_register.3
 #usr/share/man/man3/gnutls_ext_set_data.3
 #usr/share/man/man3/gnutls_fingerprint.3
 #usr/share/man/man3/gnutls_fips140_mode_enabled.3
 #usr/share/man/man3/gnutls_fips140_set_mode.3
+#usr/share/man/man3/gnutls_get_system_config_file.3
 #usr/share/man/man3/gnutls_global_deinit.3
 #usr/share/man/man3/gnutls_global_init.3
 #usr/share/man/man3/gnutls_global_set_audit_log_function.3
@@ -333,6 +340,7 @@ usr/lib/libgnutlsxx.so.28.1.0
 #usr/share/man/man3/gnutls_handshake_set_random.3
 #usr/share/man/man3/gnutls_handshake_set_timeout.3
 #usr/share/man/man3/gnutls_hash.3
+#usr/share/man/man3/gnutls_hash_copy.3
 #usr/share/man/man3/gnutls_hash_deinit.3
 #usr/share/man/man3/gnutls_hash_fast.3
 #usr/share/man/man3/gnutls_hash_get_len.3
@@ -349,9 +357,13 @@ usr/lib/libgnutlsxx.so.28.1.0
 #usr/share/man/man3/gnutls_hex_decode2.3
 #usr/share/man/man3/gnutls_hex_encode.3
 #usr/share/man/man3/gnutls_hex_encode2.3
+#usr/share/man/man3/gnutls_hkdf_expand.3
+#usr/share/man/man3/gnutls_hkdf_extract.3
 #usr/share/man/man3/gnutls_hmac.3
+#usr/share/man/man3/gnutls_hmac_copy.3
 #usr/share/man/man3/gnutls_hmac_deinit.3
 #usr/share/man/man3/gnutls_hmac_fast.3
+#usr/share/man/man3/gnutls_hmac_get_key_size.3
 #usr/share/man/man3/gnutls_hmac_get_len.3
 #usr/share/man/man3/gnutls_hmac_init.3
 #usr/share/man/man3/gnutls_hmac_output.3
@@ -425,6 +437,7 @@ usr/lib/libgnutlsxx.so.28.1.0
 #usr/share/man/man3/gnutls_openpgp_send_cert.3
 #usr/share/man/man3/gnutls_packet_deinit.3
 #usr/share/man/man3/gnutls_packet_get.3
+#usr/share/man/man3/gnutls_pbkdf2.3
 #usr/share/man/man3/gnutls_pcert_deinit.3
 #usr/share/man/man3/gnutls_pcert_export_openpgp.3
 #usr/share/man/man3/gnutls_pcert_export_x509.3
@@ -557,6 +570,7 @@ usr/lib/libgnutlsxx.so.28.1.0
 #usr/share/man/man3/gnutls_pkcs7_import.3
 #usr/share/man/man3/gnutls_pkcs7_init.3
 #usr/share/man/man3/gnutls_pkcs7_print.3
+#usr/share/man/man3/gnutls_pkcs7_print_signature_info.3
 #usr/share/man/man3/gnutls_pkcs7_set_crl.3
 #usr/share/man/man3/gnutls_pkcs7_set_crl_raw.3
 #usr/share/man/man3/gnutls_pkcs7_set_crt.3
@@ -569,6 +583,8 @@ usr/lib/libgnutlsxx.so.28.1.0
 #usr/share/man/man3/gnutls_pkcs_schema_get_name.3
 #usr/share/man/man3/gnutls_pkcs_schema_get_oid.3
 #usr/share/man/man3/gnutls_prf.3
+#usr/share/man/man3/gnutls_prf_early.3
+#usr/share/man/man3/gnutls_prf_hash_get.3
 #usr/share/man/man3/gnutls_prf_raw.3
 #usr/share/man/man3/gnutls_prf_rfc5705.3
 #usr/share/man/man3/gnutls_priority_certificate_type_list.3
@@ -645,11 +661,15 @@ usr/lib/libgnutlsxx.so.28.1.0
 #usr/share/man/man3/gnutls_psk_free_client_credentials.3
 #usr/share/man/man3/gnutls_psk_free_server_credentials.3
 #usr/share/man/man3/gnutls_psk_server_get_username.3
+#usr/share/man/man3/gnutls_psk_server_get_username2.3
 #usr/share/man/man3/gnutls_psk_set_client_credentials.3
+#usr/share/man/man3/gnutls_psk_set_client_credentials2.3
 #usr/share/man/man3/gnutls_psk_set_client_credentials_function.3
+#usr/share/man/man3/gnutls_psk_set_client_credentials_function2.3
 #usr/share/man/man3/gnutls_psk_set_params_function.3
 #usr/share/man/man3/gnutls_psk_set_server_credentials_file.3
 #usr/share/man/man3/gnutls_psk_set_server_credentials_function.3
+#usr/share/man/man3/gnutls_psk_set_server_credentials_function2.3
 #usr/share/man/man3/gnutls_psk_set_server_credentials_hint.3
 #usr/share/man/man3/gnutls_psk_set_server_dh_params.3
 #usr/share/man/man3/gnutls_psk_set_server_known_dh_params.3
@@ -720,6 +740,7 @@ usr/lib/libgnutlsxx.so.28.1.0
 #usr/share/man/man3/gnutls_record_send_early_data.3
 #usr/share/man/man3/gnutls_record_send_range.3
 #usr/share/man/man3/gnutls_record_set_max_early_data_size.3
+#usr/share/man/man3/gnutls_record_set_max_recv_size.3
 #usr/share/man/man3/gnutls_record_set_max_size.3
 #usr/share/man/man3/gnutls_record_set_state.3
 #usr/share/man/man3/gnutls_record_set_timeout.3
@@ -746,6 +767,7 @@ usr/lib/libgnutlsxx.so.28.1.0
 #usr/share/man/man3/gnutls_session_get_flags.3
 #usr/share/man/man3/gnutls_session_get_id.3
 #usr/share/man/man3/gnutls_session_get_id2.3
+#usr/share/man/man3/gnutls_session_get_keylog_function.3
 #usr/share/man/man3/gnutls_session_get_master_secret.3
 #usr/share/man/man3/gnutls_session_get_ptr.3
 #usr/share/man/man3/gnutls_session_get_random.3
@@ -755,6 +777,7 @@ usr/lib/libgnutlsxx.so.28.1.0
 #usr/share/man/man3/gnutls_session_resumption_requested.3
 #usr/share/man/man3/gnutls_session_set_data.3
 #usr/share/man/man3/gnutls_session_set_id.3
+#usr/share/man/man3/gnutls_session_set_keylog_function.3
 #usr/share/man/man3/gnutls_session_set_premaster.3
 #usr/share/man/man3/gnutls_session_set_ptr.3
 #usr/share/man/man3/gnutls_session_set_verify_cert.3

config/rootfiles/common/i586/gmp

@@ -4,14 +4,16 @@
 #usr/lib/libgmp.la
 #usr/lib/libgmp.so
 usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.3.2
+usr/lib/libgmp.so.10.4.0
 #usr/lib/libgmpxx.a
 #usr/lib/libgmpxx.la
 #usr/lib/libgmpxx.so
 usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.5.2
+usr/lib/libgmpxx.so.4.6.0
+#usr/lib/pkgconfig/gmp.pc
+#usr/lib/pkgconfig/gmpxx.pc
 usr/lib/sse2/libgmp.so.10
-usr/lib/sse2/libgmp.so.10.3.2
+usr/lib/sse2/libgmp.so.10.4.0
 #usr/share/info/gmp.info
 #usr/share/info/gmp.info-1
 #usr/share/info/gmp.info-2

config/rootfiles/common/i586/initscripts

@@ -3,6 +3,7 @@ etc/init.d
 #etc/rc.d/helper
 etc/rc.d/helper/aws-setup
 etc/rc.d/helper/azure-setup
+etc/rc.d/helper/gcp-setup
 etc/rc.d/helper/getdnsfromdhcpc.pl
 #etc/rc.d/init.d
 etc/rc.d/init.d/acpid

config/rootfiles/common/i586/linux

@@ -5942,8 +5942,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/acpi/cpu
 #lib/modules/KVER-ipfire/build/include/config/acpi/cpu/freq
 #lib/modules/KVER-ipfire/build/include/config/acpi/cpu/freq/pss.h
-#lib/modules/KVER-ipfire/build/include/config/acpi/custom
-#lib/modules/KVER-ipfire/build/include/config/acpi/custom/method.h
 #lib/modules/KVER-ipfire/build/include/config/acpi/dock.h
 #lib/modules/KVER-ipfire/build/include/config/acpi/ec
 #lib/modules/KVER-ipfire/build/include/config/acpi/ec/debugfs.h
@@ -9025,9 +9023,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/mmu
 #lib/modules/KVER-ipfire/build/include/config/mmu.h
 #lib/modules/KVER-ipfire/build/include/config/mmu/notifier.h
-#lib/modules/KVER-ipfire/build/include/config/modify
-#lib/modules/KVER-ipfire/build/include/config/modify/ldt
-#lib/modules/KVER-ipfire/build/include/config/modify/ldt/syscall.h
 #lib/modules/KVER-ipfire/build/include/config/module
 #lib/modules/KVER-ipfire/build/include/config/module/compress
 #lib/modules/KVER-ipfire/build/include/config/module/compress.h
@@ -18519,7 +18514,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/acpi_extlog.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/acpi_ipmi.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/acpi_pad.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/acpi/custom_method.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/dptf
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/dptf/dptf_power.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/ec_sys.ko.xz

config/rootfiles/common/iproute2

@@ -34,6 +34,7 @@ sbin/tc
 #usr/sbin/arpd
 #usr/share/bash-completion
 #usr/share/bash-completion/completions
+#usr/share/bash-completion/completions/devlink
 usr/share/bash-completion/completions/tc
 #usr/share/man/man3/libnetlink.3
 #usr/share/man/man7/tc-hfsc.7
@@ -41,6 +42,7 @@ usr/share/bash-completion/completions/tc
 #usr/share/man/man8/bridge.8
 #usr/share/man/man8/ctstat.8
 #usr/share/man/man8/devlink-dev.8
+#usr/share/man/man8/devlink-dpipe.8
 #usr/share/man/man8/devlink-health.8
 #usr/share/man/man8/devlink-monitor.8
 #usr/share/man/man8/devlink-port.8
@@ -104,6 +106,7 @@ usr/share/bash-completion/completions/tc
 #usr/share/man/man8/tc-codel.8
 #usr/share/man/man8/tc-connmark.8
 #usr/share/man/man8/tc-csum.8
+#usr/share/man/man8/tc-ct.8
 #usr/share/man/man8/tc-ctinfo.8
 #usr/share/man/man8/tc-drr.8
 #usr/share/man/man8/tc-ematch.8

config/rootfiles/common/libgcrypt

@@ -6,7 +6,8 @@
 #usr/lib/libgcrypt.la
 #usr/lib/libgcrypt.so
 usr/lib/libgcrypt.so.20
-usr/lib/libgcrypt.so.20.2.4
+usr/lib/libgcrypt.so.20.2.5
+#usr/lib/pkgconfig/libgcrypt.pc
 #usr/share/aclocal/libgcrypt.m4
 #usr/share/info/gcrypt.info
 #usr/share/info/gcrypt.info-1

config/rootfiles/common/libgpg-error

@@ -1,12 +1,16 @@
 usr/bin/gpg-error
 #usr/bin/gpg-error-config
+#usr/bin/gpgrt-config
+#usr/bin/yat2m
 #usr/include/gpg-error.h
 #usr/include/gpgrt.h
 #usr/lib/libgpg-error.la
 #usr/lib/libgpg-error.so
 usr/lib/libgpg-error.so.0
-usr/lib/libgpg-error.so.0.22.0
+usr/lib/libgpg-error.so.0.29.0
+#usr/lib/pkgconfig/gpg-error.pc
 #usr/share/aclocal/gpg-error.m4
+#usr/share/aclocal/gpgrt.m4
 #usr/share/common-lisp
 #usr/share/common-lisp/source
 #usr/share/common-lisp/source/gpg-error
@@ -21,6 +25,7 @@ usr/lib/libgpg-error.so.0.22.0
 #usr/share/locale/da/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/eo/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/es/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/hu/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/it/LC_MESSAGES/libgpg-error.mo
@@ -36,4 +41,4 @@ usr/lib/libgpg-error.so.0.22.0
 #usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/zh_TW/LC_MESSAGES/libgpg-error.mo
-#usr/share/man/man1/gpg-error-config.1
+#usr/share/man/man1/gpgrt-config.1

config/rootfiles/common/x86_64/gmp

@@ -4,12 +4,14 @@
 #usr/lib/libgmp.la
 #usr/lib/libgmp.so
 usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.3.2
+usr/lib/libgmp.so.10.4.0
 #usr/lib/libgmpxx.a
 #usr/lib/libgmpxx.la
 #usr/lib/libgmpxx.so
 usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.5.2
+usr/lib/libgmpxx.so.4.6.0
+#usr/lib/pkgconfig/gmp.pc
+#usr/lib/pkgconfig/gmpxx.pc
 #usr/share/info/gmp.info
 #usr/share/info/gmp.info-1
 #usr/share/info/gmp.info-2

config/rootfiles/common/x86_64/initscripts

@@ -3,6 +3,7 @@ etc/init.d
 #etc/rc.d/helper
 etc/rc.d/helper/aws-setup
 etc/rc.d/helper/azure-setup
+etc/rc.d/helper/gcp-setup
 etc/rc.d/helper/getdnsfromdhcpc.pl
 #etc/rc.d/init.d
 etc/rc.d/init.d/acpid

config/rootfiles/common/x86_64/linux

@@ -5945,8 +5945,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/acpi/cpu
 #lib/modules/KVER-ipfire/build/include/config/acpi/cpu/freq
 #lib/modules/KVER-ipfire/build/include/config/acpi/cpu/freq/pss.h
-#lib/modules/KVER-ipfire/build/include/config/acpi/custom
-#lib/modules/KVER-ipfire/build/include/config/acpi/custom/method.h
 #lib/modules/KVER-ipfire/build/include/config/acpi/dock.h
 #lib/modules/KVER-ipfire/build/include/config/acpi/ec
 #lib/modules/KVER-ipfire/build/include/config/acpi/ec/debugfs.h
@@ -9078,9 +9076,6 @@ etc/modprobe.d/ipv6.conf
 #lib/modules/KVER-ipfire/build/include/config/mmu
 #lib/modules/KVER-ipfire/build/include/config/mmu.h
 #lib/modules/KVER-ipfire/build/include/config/mmu/notifier.h
-#lib/modules/KVER-ipfire/build/include/config/modify
-#lib/modules/KVER-ipfire/build/include/config/modify/ldt
-#lib/modules/KVER-ipfire/build/include/config/modify/ldt/syscall.h
 #lib/modules/KVER-ipfire/build/include/config/module
 #lib/modules/KVER-ipfire/build/include/config/module/compress
 #lib/modules/KVER-ipfire/build/include/config/module/compress.h
@@ -18558,7 +18553,6 @@ lib/modules/KVER-ipfire/kernel
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/acpi_extlog.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/acpi_ipmi.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/acpi_pad.ko.xz
-#lib/modules/KVER-ipfire/kernel/drivers/acpi/custom_method.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/dptf
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/dptf/dptf_power.ko.xz
 #lib/modules/KVER-ipfire/kernel/drivers/acpi/ec_sys.ko.xz

config/rootfiles/core/147/filelists/aarch64/gmp

@@ -0,0 +1 @@
+../../../../common/aarch64/gmp

config/rootfiles/core/147/filelists/armv5tel/gmp

@@ -0,0 +1 @@
+../../../../common/armv5tel/gmp

config/rootfiles/core/147/filelists/bind

@@ -0,0 +1 @@
+../../../common/bind

config/rootfiles/core/147/filelists/ca-certificates

@@ -0,0 +1 @@
+../../../common/ca-certificates

config/rootfiles/core/147/filelists/dhcpcd

@@ -0,0 +1 @@
+../../../common/dhcpcd

config/rootfiles/core/147/filelists/files

@@ -0,0 +1,16 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
+etc/rc.d/helper/aws-setup
+etc/rc.d/helper/gcp-setup
+etc/rc.d/init.d/cloud-init
+etc/rc.d/init.d/firewall
+etc/rc.d/init.d/functions
+etc/rc.d/init.d/networking/any
+etc/rc.d/init.d/networking/red
+etc/rc.d/init.d/partresize
+etc/sysctl.conf
+srv/web/ipfire/cgi-bin/proxy.cgi
+var/ipfire/header.pl
+var/ipfire/general-functions.pl

config/rootfiles/core/147/filelists/gnutls

@@ -0,0 +1 @@
+../../../common/gnutls

config/rootfiles/core/147/filelists/i586/gmp

@@ -0,0 +1 @@
+../../../../common/i586/gmp

config/rootfiles/core/147/filelists/iproute2

@@ -0,0 +1 @@
+../../../common/iproute2

config/rootfiles/core/147/filelists/libgcrypt

@@ -0,0 +1 @@
+../../../common/libgcrypt

config/rootfiles/core/147/filelists/libgpg-error

@@ -0,0 +1 @@
+../../../common/libgpg-error

config/rootfiles/core/147/filelists/linux-firmware-updates

@@ -0,0 +1,252 @@
+lib/firmware/amdgpu/navi10_asd.bin
+lib/firmware/amdgpu/navi10_ce.bin
+lib/firmware/amdgpu/navi10_me.bin
+lib/firmware/amdgpu/navi10_mec2.bin
+lib/firmware/amdgpu/navi10_mec.bin
+lib/firmware/amdgpu/navi10_pfp.bin
+lib/firmware/amdgpu/navi10_rlc.bin
+lib/firmware/amdgpu/navi10_sdma1.bin
+lib/firmware/amdgpu/navi10_sdma.bin
+lib/firmware/amdgpu/navi10_smc.bin
+lib/firmware/amdgpu/navi10_sos.bin
+lib/firmware/amdgpu/navi10_ta.bin
+lib/firmware/amdgpu/navi10_vcn.bin
+lib/firmware/amdgpu/navi14_asd.bin
+lib/firmware/amdgpu/navi14_ce.bin
+lib/firmware/amdgpu/navi14_ce_wks.bin
+lib/firmware/amdgpu/navi14_me.bin
+lib/firmware/amdgpu/navi14_mec2.bin
+lib/firmware/amdgpu/navi14_mec2_wks.bin
+lib/firmware/amdgpu/navi14_mec.bin
+lib/firmware/amdgpu/navi14_mec_wks.bin
+lib/firmware/amdgpu/navi14_me_wks.bin
+lib/firmware/amdgpu/navi14_pfp.bin
+lib/firmware/amdgpu/navi14_pfp_wks.bin
+lib/firmware/amdgpu/navi14_rlc.bin
+lib/firmware/amdgpu/navi14_sdma1.bin
+lib/firmware/amdgpu/navi14_sdma.bin
+lib/firmware/amdgpu/navi14_smc.bin
+lib/firmware/amdgpu/navi14_sos.bin
+lib/firmware/amdgpu/navi14_ta.bin
+lib/firmware/amdgpu/navi14_vcn.bin
+lib/firmware/amdgpu/picasso_asd.bin
+lib/firmware/amdgpu/picasso_ce.bin
+lib/firmware/amdgpu/picasso_me.bin
+lib/firmware/amdgpu/picasso_mec2.bin
+lib/firmware/amdgpu/picasso_mec.bin
+lib/firmware/amdgpu/picasso_pfp.bin
+lib/firmware/amdgpu/picasso_rlc.bin
+lib/firmware/amdgpu/picasso_ta.bin
+lib/firmware/amdgpu/picasso_vcn.bin
+lib/firmware/amdgpu/raven2_asd.bin
+lib/firmware/amdgpu/raven2_ce.bin
+lib/firmware/amdgpu/raven2_me.bin
+lib/firmware/amdgpu/raven2_mec2.bin
+lib/firmware/amdgpu/raven2_mec.bin
+lib/firmware/amdgpu/raven2_pfp.bin
+lib/firmware/amdgpu/raven2_rlc.bin
+lib/firmware/amdgpu/raven2_ta.bin
+lib/firmware/amdgpu/raven2_vcn.bin
+lib/firmware/amdgpu/raven_asd.bin
+lib/firmware/amdgpu/raven_ce.bin
+lib/firmware/amdgpu/raven_dmcu.bin
+lib/firmware/amdgpu/raven_kicker_rlc.bin
+lib/firmware/amdgpu/raven_me.bin
+lib/firmware/amdgpu/raven_mec2.bin
+lib/firmware/amdgpu/raven_mec.bin
+lib/firmware/amdgpu/raven_pfp.bin
+lib/firmware/amdgpu/raven_rlc.bin
+lib/firmware/amdgpu/raven_ta.bin
+lib/firmware/amdgpu/raven_vcn.bin
+lib/firmware/amdgpu/renoir_asd.bin
+lib/firmware/amdgpu/renoir_ce.bin
+lib/firmware/amdgpu/renoir_dmcub.bin
+lib/firmware/amdgpu/renoir_gpu_info.bin
+lib/firmware/amdgpu/renoir_me.bin
+lib/firmware/amdgpu/renoir_mec2.bin
+lib/firmware/amdgpu/renoir_mec.bin
+lib/firmware/amdgpu/renoir_pfp.bin
+lib/firmware/amdgpu/renoir_rlc.bin
+lib/firmware/amdgpu/renoir_sdma.bin
+lib/firmware/amdgpu/renoir_vcn.bin
+lib/firmware/amdgpu/vega10_asd.bin
+lib/firmware/amdgpu/vega10_ce.bin
+lib/firmware/amdgpu/vega10_me.bin
+lib/firmware/amdgpu/vega10_mec2.bin
+lib/firmware/amdgpu/vega10_mec.bin
+lib/firmware/amdgpu/vega10_pfp.bin
+lib/firmware/amdgpu/vega10_rlc.bin
+lib/firmware/amdgpu/vega10_sdma1.bin
+lib/firmware/amdgpu/vega10_sdma.bin
+lib/firmware/amdgpu/vega10_smc.bin
+lib/firmware/amdgpu/vega10_sos.bin
+lib/firmware/amdgpu/vega10_uvd.bin
+lib/firmware/amdgpu/vega10_vce.bin
+lib/firmware/amdgpu/vega12_asd.bin
+lib/firmware/amdgpu/vega12_ce.bin
+lib/firmware/amdgpu/vega12_me.bin
+lib/firmware/amdgpu/vega12_mec2.bin
+lib/firmware/amdgpu/vega12_mec.bin
+lib/firmware/amdgpu/vega12_pfp.bin
+lib/firmware/amdgpu/vega12_sdma1.bin
+lib/firmware/amdgpu/vega12_sdma.bin
+lib/firmware/amdgpu/vega12_sos.bin
+lib/firmware/amdgpu/vega12_uvd.bin
+lib/firmware/amdgpu/vega12_vce.bin
+lib/firmware/amdgpu/vega20_asd.bin
+lib/firmware/amdgpu/vega20_ce.bin
+lib/firmware/amdgpu/vega20_me.bin
+lib/firmware/amdgpu/vega20_mec2.bin
+lib/firmware/amdgpu/vega20_mec.bin
+lib/firmware/amdgpu/vega20_pfp.bin
+lib/firmware/amdgpu/vega20_rlc.bin
+lib/firmware/amdgpu/vega20_smc.bin
+lib/firmware/amdgpu/vega20_sos.bin
+lib/firmware/amdgpu/vega20_uvd.bin
+lib/firmware/amdgpu/vega20_vce.bin
+lib/firmware/amd-ucode/microcode_amd_fam17h.bin
+lib/firmware/ath10k/QCA6174/hw3.0/board-2.bin
+lib/firmware/ath10k/QCA9887/hw1.0/firmware-5.bin
+lib/firmware/ath10k/QCA9888/hw2.0/firmware-5.bin
+lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
+lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin
+lib/firmware/ath10k/WCN3990
+lib/firmware/bnx2x/bnx2x-e1-7.13.15.0.fw
+lib/firmware/bnx2x/bnx2x-e1h-7.13.15.0.fw
+lib/firmware/bnx2x/bnx2x-e2-7.13.15.0.fw
+lib/firmware/brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
+lib/firmware/cxgb4/configs/t6-config-default.txt
+lib/firmware/cxgb4/t4fw-1.24.14.0.bin
+lib/firmware/cxgb4/t5fw-1.24.14.0.bin
+lib/firmware/cxgb4/t6fw-1.24.14.0.bin
+lib/firmware/dpaa2/mc/mc_10.18.0_ls1088a.itb
+lib/firmware/dpaa2/mc/mc_10.18.0_ls2088a.itb
+lib/firmware/dpaa2/mc/mc_10.18.0_lx2160a.itb
+lib/firmware/i915/ehl_guc_33.0.4.bin
+lib/firmware/i915/ehl_huc_9.0.0.bin
+lib/firmware/i915/tgl_dmc_ver2_06.bin
+lib/firmware/i915/tgl_guc_35.2.0.bin
+lib/firmware/i915/tgl_huc_7.0.12.bin
+lib/firmware/i915/tgl_huc_7.0.3.bin
+lib/firmware/inside-secure
+lib/firmware/intel/ibt-17-16-1.ddc
+lib/firmware/intel/ibt-17-16-1.sfi
+lib/firmware/intel/ibt-17-2.ddc
+lib/firmware/intel/ibt-17-2.sfi
+lib/firmware/intel/ibt-18-16-1.ddc
+lib/firmware/intel/ibt-18-16-1.sfi
+lib/firmware/intel/ibt-18-2.ddc
+lib/firmware/intel/ibt-18-2.sfi
+lib/firmware/intel/ibt-19-0-0.ddc
+lib/firmware/intel/ibt-19-0-0.sfi
+lib/firmware/intel/ibt-19-0-1.ddc
+lib/firmware/intel/ibt-19-0-1.sfi
+lib/firmware/intel/ibt-19-0-4.ddc
+lib/firmware/intel/ibt-19-0-4.sfi
+lib/firmware/intel/ibt-19-16-4.ddc
+lib/firmware/intel/ibt-19-16-4.sfi
+lib/firmware/intel/ibt-19-240-1.ddc
+lib/firmware/intel/ibt-19-240-1.sfi
+lib/firmware/intel/ibt-19-240-4.ddc
+lib/firmware/intel/ibt-19-240-4.sfi
+lib/firmware/intel/ibt-19-32-0.ddc
+lib/firmware/intel/ibt-19-32-0.sfi
+lib/firmware/intel/ibt-19-32-1.ddc
+lib/firmware/intel/ibt-19-32-1.sfi
+lib/firmware/intel/ibt-19-32-4.ddc
+lib/firmware/intel/ibt-19-32-4.sfi
+lib/firmware/intel/ibt-20-0-3.ddc
+lib/firmware/intel/ibt-20-0-3.sfi
+lib/firmware/intel/ibt-20-1-3.ddc
+lib/firmware/intel/ibt-20-1-3.sfi
+lib/firmware/intel/ibt-20-1-4.ddc
+lib/firmware/intel/ibt-20-1-4.sfi
+lib/firmware/iwlwifi-3168-29.ucode
+lib/firmware/iwlwifi-7265D-29.ucode
+lib/firmware/iwlwifi-8000C-36.ucode
+lib/firmware/iwlwifi-8265-36.ucode
+lib/firmware/iwlwifi-9000-pu-b0-jf-b0-46.ucode
+lib/firmware/iwlwifi-9260-th-b0-jf-b0-46.ucode
+lib/firmware/iwlwifi-cc-a0-50.ucode
+lib/firmware/iwlwifi-cc-a0-53.ucode
+lib/firmware/iwlwifi-cc-a0-55.ucode
+lib/firmware/iwlwifi-Qu-b0-hr-b0-50.ucode
+lib/firmware/iwlwifi-Qu-b0-hr-b0-53.ucode
+lib/firmware/iwlwifi-Qu-b0-hr-b0-55.ucode
+lib/firmware/iwlwifi-Qu-b0-jf-b0-50.ucode
+lib/firmware/iwlwifi-Qu-b0-jf-b0-53.ucode
+lib/firmware/iwlwifi-Qu-b0-jf-b0-55.ucode
+lib/firmware/iwlwifi-Qu-c0-hr-b0-50.ucode
+lib/firmware/iwlwifi-Qu-c0-hr-b0-53.ucode
+lib/firmware/iwlwifi-Qu-c0-hr-b0-55.ucode
+lib/firmware/iwlwifi-Qu-c0-jf-b0-50.ucode
+lib/firmware/iwlwifi-Qu-c0-jf-b0-53.ucode
+lib/firmware/iwlwifi-Qu-c0-jf-b0-55.ucode
+lib/firmware/iwlwifi-QuZ-a0-hr-b0-50.ucode
+lib/firmware/iwlwifi-QuZ-a0-hr-b0-53.ucode
+lib/firmware/iwlwifi-QuZ-a0-hr-b0-55.ucode
+lib/firmware/iwlwifi-QuZ-a0-jf-b0-50.ucode
+lib/firmware/iwlwifi-QuZ-a0-jf-b0-53.ucode
+lib/firmware/iwlwifi-QuZ-a0-jf-b0-55.ucode
+lib/firmware/mediatek/mt7615_n9.bin
+lib/firmware/mediatek/mt7622_n9.bin
+lib/firmware/mediatek/mt7622_rom_patch.bin
+lib/firmware/mediatek/mt7663_n9_rebb.bin
+lib/firmware/mediatek/mt7663_n9_v3.bin
+lib/firmware/mediatek/mt7663pr2h.bin
+lib/firmware/mediatek/mt7663pr2h_rebb.bin
+lib/firmware/mediatek/mt7915_rom_patch.bin
+lib/firmware/mediatek/mt7915_wa.bin
+lib/firmware/mediatek/mt7915_wm.bin
+lib/firmware/mediatek/mt8173
+lib/firmware/mediatek/mt8183
+lib/firmware/mellanox/mlxsw_spectrum-13.2000.2308.mfa2
+lib/firmware/mellanox/mlxsw_spectrum-13.2000.2714.mfa2
+lib/firmware/mellanox/mlxsw_spectrum2-29.2000.2308.mfa2
+lib/firmware/mellanox/mlxsw_spectrum2-29.2000.2714.mfa2
+lib/firmware/meson/vdec/g12a_hevc_mmu.bin
+lib/firmware/meson/vdec/g12a_vp9.bin
+lib/firmware/meson/vdec/gxl_h264.bin
+lib/firmware/meson/vdec/gxl_hevc.bin
+lib/firmware/meson/vdec/gxl_hevc_mmu.bin
+lib/firmware/meson/vdec/gxl_mjpeg.bin
+lib/firmware/meson/vdec/gxl_mpeg12.bin
+lib/firmware/meson/vdec/gxl_vp9.bin
+lib/firmware/meson/vdec/gxm_h264.bin
+lib/firmware/meson/vdec/sm1_hevc_mmu.bin
+lib/firmware/meson/vdec/sm1_vp9_mmu.bin
+lib/firmware/netronome/flower/nic_AMDA0058.nffw
+lib/firmware/netronome/flower/nic_AMDA0096.nffw
+lib/firmware/netronome/flower/nic_AMDA0097.nffw
+lib/firmware/netronome/flower/nic_AMDA0099.nffw
+lib/firmware/nvidia/tu102
+lib/firmware/nvidia/tu104
+lib/firmware/nvidia/tu106
+lib/firmware/nvidia/tu116
+lib/firmware/nvidia/tu117
+lib/firmware/qca/crbtfw32.tlv
+lib/firmware/qca/crnv32.bin
+lib/firmware/qca/htbtfw20.tlv
+lib/firmware/qca/htnv20.bin
+lib/firmware/qca/nvm_00230302.bin
+lib/firmware/qca/nvm_00440302_eu.bin
+lib/firmware/qca/nvm_00440302_i2s_eu.bin
+lib/firmware/qca/nvm_usb_00000302_eu.bin
+lib/firmware/qca/rampatch_00230302.bin
+lib/firmware/qca/rampatch_00440302.bin
+lib/firmware/qca/rampatch_usb_00000302.bin
+lib/firmware/qcom/sdm845
+lib/firmware/qcom/venus-5.4
+lib/firmware/qed/qed_init_values-8.40.33.0.bin
+lib/firmware/qed/qed_init_values_zipped-8.42.2.0.bin
+lib/firmware/rtl_bt/rtl8822cs_config.bin
+lib/firmware/rtl_bt/rtl8822cs_fw.bin
+lib/firmware/rtl_bt/rtl8822cu_config.bin
+lib/firmware/rtl_bt/rtl8822cu_fw.bin
+lib/firmware/rtl_nic/rtl8153a-2.fw
+lib/firmware/rtl_nic/rtl8153a-3.fw
+lib/firmware/rtl_nic/rtl8153a-4.fw
+lib/firmware/rtl_nic/rtl8153b-2.fw
+lib/firmware/rtl_nic/rtl8168fp-3.fw
+lib/firmware/rtw88/rtw8723d_fw.bin
+lib/firmware/rtw88/rtw8821c_fw.bin

config/rootfiles/core/147/filelists/ntp

@@ -0,0 +1 @@
+../../../common/ntp

config/rootfiles/core/147/filelists/openssh

@@ -0,0 +1 @@
+../../../common/openssh

config/rootfiles/core/147/filelists/squid

@@ -0,0 +1 @@
+../../../common/squid

config/rootfiles/core/147/filelists/squidguard

@@ -0,0 +1 @@
+../../../common/squidguard

config/rootfiles/core/147/filelists/x86_64/gmp

@@ -0,0 +1 @@
+../../../../common/x86_64/gmp

config/rootfiles/core/147/update.sh

@@ -0,0 +1,75 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2020 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=147
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ )); do
+	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Remove files
+rm -vf \
+	/var/ipfire/aws-functions.pl
+
+# Stop services
+/etc/init.d/squid stop
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Start services
+/etc/init.d/squid start
+/etc/init.d/sshd restart
+
+# This update needs a reboot...
+touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Update grub config to display new core version
+if [ -e /boot/grub/grub.cfg ]; then
+	grub-mkconfig -o /boot/grub/grub.cfg
+fi
+
+sync
+
+# Don't report the exitcode last command
+exit 0

config/rootfiles/oldcore/146/exclude

@@ -0,0 +1,28 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache

config/rootfiles/oldcore/146/filelists/files

@@ -2,3 +2,4 @@ etc/system-release
 etc/issue
 srv/web/ipfire/cgi-bin/credits.cgi
 var/ipfire/langs
+srv/web/ipfire/cgi-bin/vulnerabilities.cgi

config/rootfiles/oldcore/146/filelists/i586/intel-microcode

@@ -0,0 +1 @@
+../../../../common/i586/intel-microcode

config/rootfiles/oldcore/146/filelists/x86_64/intel-microcode

@@ -0,0 +1 @@
+../../../../common/x86_64/intel-microcode

config/rootfiles/oldcore/146/update.sh

@@ -89,6 +89,8 @@ rm -rf /lib/modules
 # Remove files
 
 # Stop services
+/usr/local/bin/openvpnctrl -k
+/usr/local/bin/openvpnctrl -kn2n
 
 # Extract files
 extract_files
@@ -115,7 +117,19 @@ done
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Enable OpenVPN metrics collection
+sed -E -i /var/ipfire/ovpn/server.conf \
+	-e "/^client-(dis)?connect/d"
+
+cat <<EOF >> /var/ipfire/ovpn/server.conf
+# Log clients connecting/disconnecting
+client-connect "/usr/sbin/openvpn-metrics client-connect"
+client-disconnect "/usr/sbin/openvpn-metrics client-disconnect"
+EOF
+
 # Start services
+/usr/local/bin/openvpnctrl -s
+/usr/local/bin/openvpnctrl -sn2n
 
 # remove lm_sensor config after collectd was started
 # to reserch sensors at next boot with updated kernel

config/rootfiles/packages/armv5tel/borgbackup

@@ -81,11 +81,11 @@ usr/lib/python3.8/site-packages/borg/shellpattern.py
 usr/lib/python3.8/site-packages/borg/upgrader.py
 usr/lib/python3.8/site-packages/borg/version.py
 usr/lib/python3.8/site-packages/borg/xattr.py
-#usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info
+#usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/PKG-INFO
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/PKG-INFO
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/SOURCES.txt
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/SOURCES.txt
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/dependency_links.txt
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/dependency_links.txt
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/entry_points.txt
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/entry_points.txt
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/not-zip-safe
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/not-zip-safe
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/requires.txt
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/requires.txt
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/top_level.txt
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/top_level.txt

config/rootfiles/packages/bacula

@@ -13,22 +13,23 @@ etc/bacula/bacula-fd.conf
 #etc/bacula/btraceback.gdb
 #etc/bacula/btraceback.mdb
 #etc/bacula/disk-changer
+#etc/bacula/isworm
 #etc/bacula/mtx-changer
 #etc/bacula/mtx-changer.conf
 #etc/bacula/tapealert
 etc/rc.d/init.d/bacula
 #opt/bacula
 #opt/bacula/log
-usr/lib/bpipe-fd.so
+#usr/lib/bpipe-fd.so
-usr/lib/libbac-9.0.6.so
+usr/lib/libbac-9.6.5.so
 #usr/lib/libbac.la
-#usr/lib/libbac.so
+usr/lib/libbac.so
-usr/lib/libbaccfg-9.0.6.so
+usr/lib/libbaccfg-9.6.5.so
 #usr/lib/libbaccfg.la
-#usr/lib/libbaccfg.so
+usr/lib/libbaccfg.so
-usr/lib/libbacfind-9.0.6.so
+usr/lib/libbacfind-9.6.5.so
 #usr/lib/libbacfind.la
-#usr/lib/libbacfind.so
+usr/lib/libbacfind.so
 #usr/sbin/bacula
 usr/sbin/bacula-fd
 #usr/sbin/bbconsjson
@@ -61,4 +62,4 @@ usr/sbin/bacula-fd
 #usr/share/man/man8/bwild.8.gz
 #usr/share/man/man8/dbcheck.8.gz
 #var/bacula
-var/bacula/working
+#var/bacula/working

config/rootfiles/packages/borgbackup

@@ -81,11 +81,11 @@ usr/lib/python3.8/site-packages/borg/shellpattern.py
 usr/lib/python3.8/site-packages/borg/upgrader.py
 usr/lib/python3.8/site-packages/borg/version.py
 usr/lib/python3.8/site-packages/borg/xattr.py
-#usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info
+#usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/PKG-INFO
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/PKG-INFO
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/SOURCES.txt
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/SOURCES.txt
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/dependency_links.txt
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/dependency_links.txt
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/entry_points.txt
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/entry_points.txt
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/not-zip-safe
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/not-zip-safe
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/requires.txt
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/requires.txt
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/top_level.txt
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/top_level.txt

config/rootfiles/packages/i586/borgbackup

@@ -81,11 +81,11 @@ usr/lib/python3.8/site-packages/borg/shellpattern.py
 usr/lib/python3.8/site-packages/borg/upgrader.py
 usr/lib/python3.8/site-packages/borg/version.py
 usr/lib/python3.8/site-packages/borg/xattr.py
-#usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info
+#usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/PKG-INFO
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/PKG-INFO
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/SOURCES.txt
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/SOURCES.txt
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/dependency_links.txt
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/dependency_links.txt
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/entry_points.txt
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/entry_points.txt
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/not-zip-safe
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/not-zip-safe
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/requires.txt
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/requires.txt
-usr/lib/python3.8/site-packages/borgbackup-1.1.11-py3.8.egg-info/top_level.txt
+usr/lib/python3.8/site-packages/borgbackup-1.1.13-py3.8.egg-info/top_level.txt

config/rootfiles/packages/joe

@@ -3,75 +3,128 @@ usr/bin/joe
 #usr/bin/jpico
 #usr/bin/jstar
 usr/bin/rjoe
-#usr/bin/termidx
 #usr/etc/joe
 usr/etc/joe/ftyperc
 usr/etc/joe/jicerc.ru
 usr/etc/joe/jmacsrc
 usr/etc/joe/joerc
+usr/etc/joe/joerc.zh_TW
 usr/etc/joe/jpicorc
 usr/etc/joe/jstarrc
 usr/etc/joe/rjoerc
+usr/etc/joe/shell.csh
+usr/etc/joe/shell.sh
+#usr/share/applications/jmacs.desktop
+#usr/share/applications/joe.desktop
+#usr/share/applications/jpico.desktop
+#usr/share/applications/jstar.desktop
 #usr/share/doc/joe
 #usr/share/doc/joe/ChangeLog
-#usr/share/doc/joe/HACKING
+#usr/share/doc/joe/NEWS.md
-#usr/share/doc/joe/HINTS
+#usr/share/doc/joe/README.md
-#usr/share/doc/joe/LIST
+#usr/share/doc/joe/README.old
-#usr/share/doc/joe/NEWS
+#usr/share/doc/joe/hacking.md
-#usr/share/doc/joe/README
+#usr/share/doc/joe/man.md
 #usr/share/joe
 #usr/share/joe/charmaps
 usr/share/joe/charmaps/klingon
+usr/share/joe/colors
+usr/share/joe/colors/default.jcf
+usr/share/joe/colors/gruvbox.jcf
+usr/share/joe/colors/ir_black.jcf
+usr/share/joe/colors/molokai.jcf
+usr/share/joe/colors/solarized.jcf
+usr/share/joe/colors/wombat.jcf
+usr/share/joe/colors/xoria.jcf
+usr/share/joe/colors/zenburn-hc.jcf
+usr/share/joe/colors/zenburn.jcf
 #usr/share/joe/lang
 usr/share/joe/lang/de.po
 #usr/share/joe/lang/fr.po
 #usr/share/joe/lang/ru.po
 usr/share/joe/lang/uk.po
+usr/share/joe/lang/zh_TW.po
 #usr/share/joe/syntax
 usr/share/joe/syntax/4gl.jsf
 usr/share/joe/syntax/ada.jsf
+usr/share/joe/syntax/ant.jsf
 usr/share/joe/syntax/asm.jsf
+usr/share/joe/syntax/avr.jsf
 usr/share/joe/syntax/awk.jsf
+usr/share/joe/syntax/batch.jsf
 usr/share/joe/syntax/c.jsf
+usr/share/joe/syntax/clojure.jsf
 usr/share/joe/syntax/cobol.jsf
+usr/share/joe/syntax/coffee.jsf
+usr/share/joe/syntax/comment_todo.jsf
 usr/share/joe/syntax/conf.jsf
+usr/share/joe/syntax/context.jsf
 usr/share/joe/syntax/csh.jsf
+usr/share/joe/syntax/csharp.jsf
 usr/share/joe/syntax/css.jsf
+usr/share/joe/syntax/d.jsf
+usr/share/joe/syntax/debian.jsf
 usr/share/joe/syntax/diff.jsf
+usr/share/joe/syntax/dockerfile.jsf
+usr/share/joe/syntax/elixir.jsf
+usr/share/joe/syntax/erb.jsf
+usr/share/joe/syntax/erlang.jsf
+usr/share/joe/syntax/filename.jsf
 usr/share/joe/syntax/fortran.jsf
+usr/share/joe/syntax/git-commit.jsf
+usr/share/joe/syntax/go.jsf
+usr/share/joe/syntax/groovy.jsf
+usr/share/joe/syntax/haml.jsf
 usr/share/joe/syntax/haskell.jsf
 usr/share/joe/syntax/html.jsf
+usr/share/joe/syntax/htmlerb.jsf
+usr/share/joe/syntax/ini.jsf
+usr/share/joe/syntax/iptables.jsf
 usr/share/joe/syntax/java.jsf
+usr/share/joe/syntax/jcf.jsf
 usr/share/joe/syntax/joerc.jsf
+usr/share/joe/syntax/js.jsf
 usr/share/joe/syntax/jsf.jsf
 usr/share/joe/syntax/jsf_check.jsf
+usr/share/joe/syntax/json.jsf
 usr/share/joe/syntax/lisp.jsf
 usr/share/joe/syntax/lua.jsf
 usr/share/joe/syntax/m4.jsf
 usr/share/joe/syntax/mail.jsf
 usr/share/joe/syntax/mason.jsf
 usr/share/joe/syntax/matlab.jsf
+usr/share/joe/syntax/md.jsf
 usr/share/joe/syntax/ocaml.jsf
 usr/share/joe/syntax/pascal.jsf
 usr/share/joe/syntax/perl.jsf
 usr/share/joe/syntax/php.jsf
+usr/share/joe/syntax/powershell.jsf
+usr/share/joe/syntax/prolog.jsf
+usr/share/joe/syntax/properties.jsf
 usr/share/joe/syntax/ps.jsf
+usr/share/joe/syntax/puppet.jsf
 usr/share/joe/syntax/python.jsf
+usr/share/joe/syntax/r.jsf
 usr/share/joe/syntax/rexx.jsf
 usr/share/joe/syntax/ruby.jsf
+usr/share/joe/syntax/rust.jsf
+usr/share/joe/syntax/scala.jsf
 usr/share/joe/syntax/sed.jsf
 usr/share/joe/syntax/sh.jsf
+usr/share/joe/syntax/sieve.jsf
 usr/share/joe/syntax/skill.jsf
 usr/share/joe/syntax/sml.jsf
 usr/share/joe/syntax/spec.jsf
 usr/share/joe/syntax/sql.jsf
+usr/share/joe/syntax/swift.jsf
 usr/share/joe/syntax/tcl.jsf
 usr/share/joe/syntax/tex.jsf
 usr/share/joe/syntax/troff.jsf
+usr/share/joe/syntax/typescript.jsf
 usr/share/joe/syntax/verilog.jsf
 usr/share/joe/syntax/vhdl.jsf
+usr/share/joe/syntax/whitespace.jsf
 usr/share/joe/syntax/xml.jsf
+usr/share/joe/syntax/yaml.jsf
 usr/share/man/man1/joe.1
-#usr/share/man/ru
-#usr/share/man/ru/man1
 #usr/share/man/ru/man1/joe.1

config/rootfiles/packages/libassuan

@@ -3,6 +3,7 @@ usr/bin/libassuan-config
 #usr/lib/libassuan.la
 usr/lib/libassuan.so
 usr/lib/libassuan.so.0
-usr/lib/libassuan.so.0.7.3
+usr/lib/libassuan.so.0.8.3
+#usr/lib/pkgconfig/libassuan.pc
 #usr/share/aclocal/libassuan.m4
 #usr/share/info/assuan.info

doc/language_issues.de

@@ -48,7 +48,6 @@ WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: administrator user password
 WARNING: translation string unused: adsl settings
 WARNING: translation string unused: advproxy AUTH method ntlm
-WARNING: translation string unused: advproxy AUTH user IP cache TTL
 WARNING: translation string unused: advproxy LDAP auth
 WARNING: translation string unused: advproxy NTLM BDC hostname
 WARNING: translation string unused: advproxy NTLM PDC hostname
@@ -74,7 +73,6 @@ WARNING: translation string unused: advproxy chgwebpwd new password confirm
 WARNING: translation string unused: advproxy chgwebpwd old password
 WARNING: translation string unused: advproxy chgwebpwd username
 WARNING: translation string unused: advproxy content based throttling
-WARNING: translation string unused: advproxy errmsg auth ipcache ttl
 WARNING: translation string unused: advproxy errmsg change fail
 WARNING: translation string unused: advproxy errmsg change success
 WARNING: translation string unused: advproxy errmsg invalid bdc

doc/language_issues.en

@@ -128,6 +128,7 @@ WARNING: untranslated string: advproxy AUTH method radius = RADIUS
 WARNING: untranslated string: advproxy AUTH no auth = Domains without authentication (one per line)
 WARNING: untranslated string: advproxy AUTH number of auth processes = Number of authentication processes
 WARNING: untranslated string: advproxy AUTH realm = Authentication realm prompt
+WARNING: untranslated string: advproxy AUTH user IP cache TTL = User/IP cache TTL (in minutes)
 WARNING: untranslated string: advproxy IDENT authorized users = Authorized users (one per line)
 WARNING: untranslated string: advproxy IDENT aware hosts = Ident aware hosts (one per line)
 WARNING: untranslated string: advproxy IDENT identd settings = Common identd settings
@@ -206,6 +207,7 @@ WARNING: untranslated string: advproxy errmsg acl cannot be empty = Access contr
 WARNING: untranslated string: advproxy errmsg auth cache ttl = Invalid value for authentication cache TTL
 WARNING: untranslated string: advproxy errmsg auth children = Invalid number of authentication processes
 WARNING: untranslated string: advproxy errmsg auth ipcache may not be null = Authentication cache TTL may not be 0 when using IP address limits
+WARNING: untranslated string: advproxy errmsg auth ipcache ttl = Invalid value for user/IP cache TTL
 WARNING: untranslated string: advproxy errmsg cache = The RAM cache size is greater than the harddisk cache size:
 WARNING: untranslated string: advproxy errmsg hdd cache size = Invalid value for harddisk cache size (min 10 MB required)
 WARNING: untranslated string: advproxy errmsg ident timeout = Invalid ident timeout
@@ -1663,6 +1665,7 @@ WARNING: untranslated string: speaker on = Speaker on:
 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
+WARNING: untranslated string: srbds = Special register buffer data sampling
 WARNING: untranslated string: src port = Src Port
 WARNING: untranslated string: ssh = SSH
 WARNING: untranslated string: ssh access = SSH Access

doc/language_issues.es

@@ -24,7 +24,6 @@ WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: administrator user password
-WARNING: translation string unused: advproxy AUTH user IP cache TTL
 WARNING: translation string unused: advproxy LDAP auth
 WARNING: translation string unused: advproxy NTLM BDC hostname
 WARNING: translation string unused: advproxy NTLM PDC hostname
@@ -50,7 +49,6 @@ WARNING: translation string unused: advproxy chgwebpwd new password confirm
 WARNING: translation string unused: advproxy chgwebpwd old password
 WARNING: translation string unused: advproxy chgwebpwd username
 WARNING: translation string unused: advproxy content based throttling
-WARNING: translation string unused: advproxy errmsg auth ipcache ttl
 WARNING: translation string unused: advproxy errmsg change fail
 WARNING: translation string unused: advproxy errmsg change success
 WARNING: translation string unused: advproxy errmsg invalid bdc
@@ -1282,6 +1280,7 @@ WARNING: untranslated string: source ip country = Source IP Country
 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
+WARNING: untranslated string: srbds = Special register buffer data sampling
 WARNING: untranslated string: ssh = SSH
 WARNING: untranslated string: ssh active sessions = Active logins
 WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding

doc/language_issues.fr

@@ -52,7 +52,6 @@ WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: administrator user password
 WARNING: translation string unused: adsl settings
 WARNING: translation string unused: advproxy AUTH method ntlm
-WARNING: translation string unused: advproxy AUTH user IP cache TTL
 WARNING: translation string unused: advproxy LDAP auth
 WARNING: translation string unused: advproxy NTLM BDC hostname
 WARNING: translation string unused: advproxy NTLM PDC hostname
@@ -78,7 +77,6 @@ WARNING: translation string unused: advproxy chgwebpwd new password confirm
 WARNING: translation string unused: advproxy chgwebpwd old password
 WARNING: translation string unused: advproxy chgwebpwd username
 WARNING: translation string unused: advproxy content based throttling
-WARNING: translation string unused: advproxy errmsg auth ipcache ttl
 WARNING: translation string unused: advproxy errmsg change fail
 WARNING: translation string unused: advproxy errmsg change success
 WARNING: translation string unused: advproxy errmsg invalid bdc
@@ -842,3 +840,4 @@ WARNING: untranslated string: pakfire ago = ago.
 WARNING: untranslated string: route config changed = unknown string
 WARNING: untranslated string: routing config added = unknown string
 WARNING: untranslated string: routing config changed = unknown string
+WARNING: untranslated string: srbds = Special register buffer data sampling

doc/language_issues.it

@@ -26,7 +26,6 @@ WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: administrator user password
 WARNING: translation string unused: advproxy AUTH method ntlm
-WARNING: translation string unused: advproxy AUTH user IP cache TTL
 WARNING: translation string unused: advproxy LDAP auth
 WARNING: translation string unused: advproxy NTLM BDC hostname
 WARNING: translation string unused: advproxy NTLM PDC hostname
@@ -52,7 +51,6 @@ WARNING: translation string unused: advproxy chgwebpwd new password confirm
 WARNING: translation string unused: advproxy chgwebpwd old password
 WARNING: translation string unused: advproxy chgwebpwd username
 WARNING: translation string unused: advproxy content based throttling
-WARNING: translation string unused: advproxy errmsg auth ipcache ttl
 WARNING: translation string unused: advproxy errmsg change fail
 WARNING: translation string unused: advproxy errmsg change success
 WARNING: translation string unused: advproxy errmsg invalid bdc
@@ -1048,6 +1046,7 @@ WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (
 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
+WARNING: untranslated string: srbds = Special register buffer data sampling
 WARNING: untranslated string: ssh active sessions = Active logins
 WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding
 WARNING: untranslated string: ssh login time = Logged in since

doc/language_issues.nl

@@ -25,7 +25,6 @@ WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: administrator user password
-WARNING: translation string unused: advproxy AUTH user IP cache TTL
 WARNING: translation string unused: advproxy LDAP auth
 WARNING: translation string unused: advproxy NTLM BDC hostname
 WARNING: translation string unused: advproxy NTLM PDC hostname
@@ -51,7 +50,6 @@ WARNING: translation string unused: advproxy chgwebpwd new password confirm
 WARNING: translation string unused: advproxy chgwebpwd old password
 WARNING: translation string unused: advproxy chgwebpwd username
 WARNING: translation string unused: advproxy content based throttling
-WARNING: translation string unused: advproxy errmsg auth ipcache ttl
 WARNING: translation string unused: advproxy errmsg change fail
 WARNING: translation string unused: advproxy errmsg change success
 WARNING: translation string unused: advproxy errmsg invalid bdc
@@ -1085,6 +1083,7 @@ WARNING: untranslated string: source ip country = Source IP Country
 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
+WARNING: untranslated string: srbds = Special register buffer data sampling
 WARNING: untranslated string: ssh active sessions = Active logins
 WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding
 WARNING: untranslated string: ssh login time = Logged in since

doc/language_issues.pl

@@ -24,7 +24,6 @@ WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: administrator user password
-WARNING: translation string unused: advproxy AUTH user IP cache TTL
 WARNING: translation string unused: advproxy LDAP auth
 WARNING: translation string unused: advproxy NTLM BDC hostname
 WARNING: translation string unused: advproxy NTLM PDC hostname
@@ -50,7 +49,6 @@ WARNING: translation string unused: advproxy chgwebpwd new password confirm
 WARNING: translation string unused: advproxy chgwebpwd old password
 WARNING: translation string unused: advproxy chgwebpwd username
 WARNING: translation string unused: advproxy content based throttling
-WARNING: translation string unused: advproxy errmsg auth ipcache ttl
 WARNING: translation string unused: advproxy errmsg change fail
 WARNING: translation string unused: advproxy errmsg change success
 WARNING: translation string unused: advproxy errmsg invalid bdc
@@ -1282,6 +1280,7 @@ WARNING: untranslated string: source ip country = Source IP Country
 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
+WARNING: untranslated string: srbds = Special register buffer data sampling
 WARNING: untranslated string: ssh = SSH
 WARNING: untranslated string: ssh active sessions = Active logins
 WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding

doc/language_issues.ru

@@ -25,7 +25,6 @@ WARNING: translation string unused: add xtaccess
 WARNING: translation string unused: add-route
 WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: administrator user password
-WARNING: translation string unused: advproxy AUTH user IP cache TTL
 WARNING: translation string unused: advproxy LDAP auth
 WARNING: translation string unused: advproxy NTLM BDC hostname
 WARNING: translation string unused: advproxy NTLM PDC hostname
@@ -51,7 +50,6 @@ WARNING: translation string unused: advproxy chgwebpwd new password confirm
 WARNING: translation string unused: advproxy chgwebpwd old password
 WARNING: translation string unused: advproxy chgwebpwd username
 WARNING: translation string unused: advproxy content based throttling
-WARNING: translation string unused: advproxy errmsg auth ipcache ttl
 WARNING: translation string unused: advproxy errmsg change fail
 WARNING: translation string unused: advproxy errmsg change success
 WARNING: translation string unused: advproxy errmsg invalid bdc
@@ -1278,6 +1276,7 @@ WARNING: untranslated string: source ip country = Source IP Country
 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
+WARNING: untranslated string: srbds = Special register buffer data sampling
 WARNING: untranslated string: ssh = SSH
 WARNING: untranslated string: ssh active sessions = Active logins
 WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding

doc/language_issues.tr

@@ -48,7 +48,6 @@ WARNING: translation string unused: admin user password has been changed
 WARNING: translation string unused: administrator user password
 WARNING: translation string unused: adsl settings
 WARNING: translation string unused: advproxy AUTH method ntlm
-WARNING: translation string unused: advproxy AUTH user IP cache TTL
 WARNING: translation string unused: advproxy LDAP auth
 WARNING: translation string unused: advproxy NTLM BDC hostname
 WARNING: translation string unused: advproxy NTLM PDC hostname
@@ -74,7 +73,6 @@ WARNING: translation string unused: advproxy chgwebpwd new password confirm
 WARNING: translation string unused: advproxy chgwebpwd old password
 WARNING: translation string unused: advproxy chgwebpwd username
 WARNING: translation string unused: advproxy content based throttling
-WARNING: translation string unused: advproxy errmsg auth ipcache ttl
 WARNING: translation string unused: advproxy errmsg change fail
 WARNING: translation string unused: advproxy errmsg change success
 WARNING: translation string unused: advproxy errmsg invalid bdc
@@ -950,6 +948,7 @@ WARNING: untranslated string: smt not supported = Simultaneous Multi-Threading (
 WARNING: untranslated string: spectre variant 1 = Spectre Variant 1
 WARNING: untranslated string: spectre variant 2 = Spectre Variant 2
 WARNING: untranslated string: spectre variant 4 = Spectre Variant 4
+WARNING: untranslated string: srbds = Special register buffer data sampling
 WARNING: untranslated string: ssh active sessions = Active logins
 WARNING: untranslated string: ssh agent forwarding = Allow SSH Agent Forwarding
 WARNING: untranslated string: ssh login time = Logged in since

doc/language_missings

@@ -727,6 +727,7 @@
 < spectre variant 1
 < spectre variant 2
 < spectre variant 4
+< srbds
 < ssh
 < ssh active sessions
 < ssh agent forwarding
@@ -920,6 +921,7 @@
 < bewan adsl usb
 < g.dtm
 < g.lite
+< srbds
 < upload fcdsl.o
 ############################################################################
 # Checking cgi-bin translations for language: it                           #
@@ -1193,6 +1195,7 @@
 < spectre variant 1
 < spectre variant 2
 < spectre variant 4
+< srbds
 < ssh active sessions
 < ssh agent forwarding
 < ssh login time
@@ -1597,6 +1600,7 @@
 < spectre variant 1
 < spectre variant 2
 < spectre variant 4
+< srbds
 < ssh active sessions
 < ssh agent forwarding
 < ssh login time
@@ -2344,6 +2348,7 @@
 < spectre variant 1
 < spectre variant 2
 < spectre variant 4
+< srbds
 < ssh
 < ssh active sessions
 < ssh agent forwarding
@@ -3197,6 +3202,7 @@
 < spectre variant 1
 < spectre variant 2
 < spectre variant 4
+< srbds
 < ssh
 < ssh active sessions
 < ssh agent forwarding
@@ -3500,6 +3506,7 @@
 < spectre variant 1
 < spectre variant 2
 < spectre variant 4
+< srbds
 < ssh active sessions
 < ssh agent forwarding
 < ssh login time

html/cgi-bin/credits.cgi

@@ -78,8 +78,8 @@ Peter Pfeiffer,
 Daniel Glanzmann,
 Daniel Weismüller,
 Heiner Schmeling,
-Timo Eissler,
 Stephan Feddersen,
+Timo Eissler,
 Jan Lentfer,
 Marcus Scholz,
 Ersan Yildirim,
@@ -110,6 +110,7 @@ Jorrit de Jonge,
 Jörn-Ingo Weigert,
 Przemek Zdroik,
 Ramax Lo,
+Adolf Belka,
 Alexander Rudolf Gruber,
 Andrew Bellows,
 Axel Gembe,

html/cgi-bin/proxy.cgi

@@ -18,13 +18,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
-#
-# (c) 2004-2009 marco.s - http://www.advproxy.net
-#
-# This code is distributed under the terms of the GPL
-#
-# $Id: advproxy.cgi,v 3.0.2 2009/02/04 00:00:00 marco.s Exp $
-#
 
 use strict;
 use Apache::Htpasswd;
@@ -239,6 +232,7 @@ $proxysettings{'AUTH_METHOD'} = 'none';
 $proxysettings{'AUTH_REALM'} = '';
 $proxysettings{'AUTH_MAX_USERIP'} = '';
 $proxysettings{'AUTH_CACHE_TTL'} = '60';
+$proxysettings{'AUTH_IPCACHE_TTL'} = '0';
 $proxysettings{'AUTH_CHILDREN'} = '5';
 $proxysettings{'NCSA_MIN_PASS_LEN'} = '6';
 $proxysettings{'NCSA_BYPASS_REDIR'} = 'off';
@@ -444,18 +438,23 @@ if (($proxysettings{'ACTION'} eq $Lang::tr{'save'}) || ($proxysettings{'ACTION'}
 				}
 			}
 		}
-		if (!($proxysettings{'AUTH_CACHE_TTL'} =~ /^\d+/))
-		{
-			$errormessage = $Lang::tr{'advproxy errmsg auth cache ttl'};
-			goto ERROR;
-		}
 		if ((!($proxysettings{'AUTH_MAX_USERIP'} eq '')) &&
 			((!($proxysettings{'AUTH_MAX_USERIP'} =~ /^\d+/)) || ($proxysettings{'AUTH_MAX_USERIP'} < 1) || ($proxysettings{'AUTH_MAX_USERIP'} > 255)))
 		{
 			$errormessage = $Lang::tr{'advproxy errmsg max userip'};
 			goto ERROR;
 		}
-		if (!($proxysettings{'AUTH_MAX_USERIP'} eq ''))
+		if (!($proxysettings{'AUTH_CACHE_TTL'} =~ /^\d+/))
+		{
+			$errormessage = $Lang::tr{'advproxy errmsg auth cache ttl'};
+			goto ERROR;
+		}
+		if (!($proxysettings{'AUTH_IPCACHE_TTL'} =~ /^\d+/))
+		{
+			$errormessage = $Lang::tr{'advproxy errmsg auth ipcache ttl'};
+			goto ERROR;
+		}
+		if ((!($proxysettings{'AUTH_MAX_USERIP'} eq '')) && ($proxysettings{'AUTH_IPCACHE_TTL'} eq '0'))
 		{
 			$errormessage = $Lang::tr{'advproxy errmsg auth ipcache may not be null'};
 			goto ERROR;
@@ -1742,6 +1741,10 @@ print <<END
 	<td class='base'>$Lang::tr{'advproxy AUTH limit of IP addresses'}:</td>
 	<td><input type='text' name='AUTH_MAX_USERIP' value='$proxysettings{'AUTH_MAX_USERIP'}' size='5' /></td>
 </tr>
+<tr>
+	<td class='base'>$Lang::tr{'advproxy AUTH user IP cache TTL'}:</td>
+	<td><input type='text' name='AUTH_IPCACHE_TTL' value='$proxysettings{'AUTH_IPCACHE_TTL'}' size='5' /></td>
+</tr>
 <tr>
 	<td class='base'>$Lang::tr{'advproxy AUTH always required'}:</td>
 	<td><input type='checkbox' name='AUTH_ALWAYS_REQUIRED' $checked{'AUTH_ALWAYS_REQUIRED'}{'on'} /></td>
@@ -2038,6 +2041,7 @@ print <<END
 <td><input type='hidden' name='AUTH_CHILDREN'        value='$proxysettings{'AUTH_CHILDREN'}'></td>
 <td><input type='hidden' name='AUTH_CACHE_TTL'       value='$proxysettings{'AUTH_CACHE_TTL'}' size='5' /></td>
 <td><input type='hidden' name='AUTH_MAX_USERIP'      value='$proxysettings{'AUTH_MAX_USERIP'}' size='5' /></td>
+<td><input type='hidden' name='AUTH_IPCACHE_TTL'     value='$proxysettings{'AUTH_IPCACHE_TTL'}' size='5' /></td>
 <td><input type='hidden' name='AUTH_ALWAYS_REQUIRED' value='$proxysettings{'AUTH_ALWAYS_REQUIRED'}'></td>
 <td><input type='hidden' name='AUTH_REALM'           value='$proxysettings{'AUTH_REALM'}'></td>
 <td><input type='hidden' name='DST_NOAUTH'           value='$proxysettings{'DST_NOAUTH'}'></td>
@@ -2049,6 +2053,7 @@ print <<END
 <td><input type='hidden' name='AUTH_CHILDREN'        value='$proxysettings{'AUTH_CHILDREN'}'></td>
 <td><input type='hidden' name='AUTH_CACHE_TTL'       value='$proxysettings{'AUTH_CACHE_TTL'}' size='5' /></td>
 <td><input type='hidden' name='AUTH_MAX_USERIP'      value='$proxysettings{'AUTH_MAX_USERIP'}' size='5' /></td>
+<td><input type='hidden' name='AUTH_IPCACHE_TTL'     value='$proxysettings{'AUTH_IPCACHE_TTL'}' size='5' /></td>
 <td><input type='hidden' name='AUTH_REALM'           value='$proxysettings{'AUTH_REALM'}'></td>
 END
 ; }
@@ -3262,11 +3267,6 @@ END
 	}
 	print FILE "\n";
 
-	# If we use authentication, users must always authenticate
-	unless ($proxysettings{"AUTH_METHOD"} eq "") {
-		print FILE "authenticate_ip_ttl 0\n\n";
-	}
-
 	if ((!($proxysettings{'AUTH_METHOD'} eq 'none')) && (!($proxysettings{'AUTH_METHOD'} eq 'ident')))
 	{
 		if ($proxysettings{'AUTH_METHOD'} eq 'ncsa')
@@ -3275,6 +3275,7 @@ END
 			print FILE "auth_param basic children $proxysettings{'AUTH_CHILDREN'}\n";
 			print FILE "auth_param basic realm $authrealm\n";
 			print FILE "auth_param basic credentialsttl $proxysettings{'AUTH_CACHE_TTL'} minutes\n";
+			if (!($proxysettings{'AUTH_IPCACHE_TTL'} eq '0')) { print FILE "\nauthenticate_ip_ttl $proxysettings{'AUTH_IPCACHE_TTL'} minutes\n"; }
 		}
 
 		if ($proxysettings{'AUTH_METHOD'} eq 'ldap')
@@ -3319,6 +3320,7 @@ END
 			print FILE "auth_param basic children $proxysettings{'AUTH_CHILDREN'}\n";
 			print FILE "auth_param basic realm $authrealm\n";
 			print FILE "auth_param basic credentialsttl $proxysettings{'AUTH_CACHE_TTL'} minutes\n";
+			if (!($proxysettings{'AUTH_IPCACHE_TTL'} eq '0')) { print FILE "\nauthenticate_ip_ttl $proxysettings{'AUTH_IPCACHE_TTL'} minutes\n"; }
 		}
 
 		if ($proxysettings{'AUTH_METHOD'} eq 'ntlm-auth')
@@ -3359,6 +3361,7 @@ END
 			print FILE "auth_param basic children $proxysettings{'AUTH_CHILDREN'}\n";
 			print FILE "auth_param basic realm $authrealm\n";
 			print FILE "auth_param basic credentialsttl $proxysettings{'AUTH_CACHE_TTL'} minutes\n";
+			if (!($proxysettings{'AUTH_IPCACHE_TTL'} eq '0')) { print FILE "\nauthenticate_ip_ttl $proxysettings{'AUTH_IPCACHE_TTL'} minutes\n"; }
 		}
 
 		print FILE "\n";

html/cgi-bin/vulnerabilities.cgi

@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@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        #
@@ -37,6 +37,7 @@ my %VULNERABILITIES = (
 	"spec_store_bypass" => "$Lang::tr{'spectre variant 4'} (CVE-2018-3639)",
 	"spectre_v1" => "$Lang::tr{'spectre variant 1'} (CVE-2017-5753)",
 	"spectre_v2" => "$Lang::tr{'spectre variant 2'} (CVE-2017-5715)",
+	"srbds" => "$Lang::tr{'srbds'} (CVE-2020-0543)",
 	"tsx_async_abort" => "$Lang::tr{'taa zombieload2'} (CVE-2019-11135)",
 );
 

langs/de/cgi-bin/de.pl

@@ -2256,6 +2256,7 @@
 'squid extension methods' => 'Ihre <tt>extension_methods</tt> Liste',
 'squid extension methods invalid' => 'Ihre  \'extension_methods\' Liste darf nur Worte aus Großbuchstaben und Ziffer enthalten, die mittels eines Leerzeichens getrennt werden.',
 'squid fix cache' => 'Zwischenspeicher reparieren',
+'srbds' => 'Special Register Buffer Data Sampling',
 'src port' => 'Quellport',
 'srcprt range overlaps' => 'Quellportbereich überlappt mit einem bereits definierten Port.',
 'srcprt within existing' => 'Quellport befindet sich innnerhalb eines bereits definierten Portbereichs.',

langs/en/cgi-bin/en.pl

@@ -2284,6 +2284,7 @@
 'squid extension methods' => 'Your <tt>extension_methods</tt> list',
 'squid extension methods invalid' => 'Your \'extension_methods\' list can only contain uppercase words of letters and digits, separated with a space. ',
 'squid fix cache' => 'Repair cache',
+'srbds' => 'Special register buffer data sampling',
 'src port' => 'Src Port',
 'srcprt range overlaps' => 'Source port range overlaps an already defined port.',
 'srcprt within existing' => 'Source port is within an already defined port range.',

lfs/bacula

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 9.0.6
+VER        = 9.6.5
 
 THISAPP    = bacula-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bacula
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       =
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9168e398808c42bf290515f60892f643
+$(DL_FILE)_MD5 = e58eb531483de98d0410b33e3ec3d96a
 
 install : $(TARGET)
 
@@ -80,12 +80,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	$(UPDATE_AUTOMAKE)
 	cd $(DIR_APP) && ./configure \
 				--prefix=/usr \
+				--enable-smartalloc \
 				--sysconfdir=/etc/bacula \
 				--with-working-dir=/var/bacula/working \
 				--enable-client-only
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	ln -s /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula
+	ln -sf /etc/bacula/bacula-ctl-fd /etc/rc.d/init.d/bacula
 	rm -f /root/.rnd
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)

lfs/bind

@@ -25,7 +25,7 @@
 
 include Config
 
-VER        = 9.11.19
+VER        = 9.11.20
 
 THISAPP    = bind-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 41bc2c6509a4c324e16775b462608820
+$(DL_FILE)_MD5 = bb64b1fd66a915af98fdf2ae2287ddb4
 
 install : $(TARGET)
 

lfs/borgbackup

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.1.11
+VER        = 1.1.13
 
 THISAPP    = borgbackup-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = borgbackup
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = python3-llfuse python3-msgpack
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = ab9721f10c2500e0ca872545c64b6e2f
+$(DL_FILE)_MD5 = a82d2bdf61bfaeebb90ac8ab1347657a
 
 install : $(TARGET)
 

lfs/ca-certificates

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@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        = 20191128
+VER        = 20200620
 
 THISAPP    = ca-certificates
 DIR_APP    = $(DIR_SRC)/$(THISAPP)

lfs/configroot

@@ -79,7 +79,6 @@ $(TARGET) :
 	cp $(DIR_SRC)/config/cfgroot/general-functions.pl	$(CONFIG_ROOT)/
 	cp $(DIR_SRC)/config/cfgroot/network-functions.pl	$(CONFIG_ROOT)/
 	cp $(DIR_SRC)/config/cfgroot/location-functions.pl		$(CONFIG_ROOT)/
-	cp $(DIR_SRC)/config/cfgroot/aws-functions.pl		$(CONFIG_ROOT)/
 	cp $(DIR_SRC)/config/cfgroot/ids-functions.pl		$(CONFIG_ROOT)/
 	cp $(DIR_SRC)/config/cfgroot/lang.pl			$(CONFIG_ROOT)/
 	cp $(DIR_SRC)/config/cfgroot/countries.pl		$(CONFIG_ROOT)/

lfs/dhcpcd

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 9.0.2
+VER        = 9.1.2
 
 THISAPP    = dhcpcd-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f62118a576b01f5d0adf0c5ce617fbe7
+$(DL_FILE)_MD5 = 96fc03f0b57e85a2dca2854bf2ff762d
 
 install : $(TARGET)
 

lfs/gmp

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@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        = 6.1.2
+VER        = 6.2.0
 
 THISAPP    = gmp-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f58fa8001d60c4c77595fbbb62b63c1d
+$(DL_FILE)_MD5 = a325e3f09e6d91e62101e59f9bda3ec1
 
 install : $(TARGET)
 
@@ -100,7 +100,7 @@ ifeq "$(BUILD_ARCH)" "i586"
 	cd $(DIR_APP) && make $(MAKETUNING)
 
 	-mkdir -pv /usr/lib/sse2
-	cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.3.2 /usr/lib/sse2
+	cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.4.0 /usr/lib/sse2
 endif
 
 	@rm -rf $(DIR_APP)

lfs/gnutls

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@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,11 +24,10 @@
 
 include Config
 
-VER        = 3.6.7
+VER        = 3.6.14
-SUBVER     = .1
 
 THISAPP    = gnutls-$(VER)
-DL_FILE    = $(THISAPP)$(SUBVER).tar.xz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -41,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 92a8049e618afa60e2c852da1884c457
+$(DL_FILE)_MD5 = bf70632d420e421baff482247f01dbfe
 
 install : $(TARGET)
 

lfs/haproxy

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@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.1.4
+VER        = 2.1.7
 
 THISAPP    = haproxy-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
-PAK_VER    = 14
+PAK_VER    = 15
 
 DEPS       =
 
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 100cccf98aaf3ba80b5fd070866ad115
+$(DL_FILE)_MD5 = f0ddf67e2be18cfe1b996f9914cfa67e
 
 install : $(TARGET)
 

lfs/intel-microcode

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@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        = 20191115
+VER        = 20200609
 
 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 = 49cc3595934772b54b6218f8dbe64a94
+$(DL_FILE)_MD5 = a03e827c5c43be594f7f34d75b1706f9
 
 install : $(TARGET)
 

lfs/iproute2

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.6.0
+VER        = 5.7.0
 
 THISAPP    = iproute2-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE)             = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5         = 9da0c352707c34b8b1fec3bf42fcfd09
+$(DL_FILE)_MD5         = da22ab8562eda56ae232872fa72e4870
 
 install : $(TARGET)
 

lfs/joe

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@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.7
+VER        = 4.6
 
 THISAPP    = joe-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = joe
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       =
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 66de1b073e869ba12abbfcde3885c577
+$(DL_FILE)_MD5 = 9017484e6116830d846678b625ea5c43
 
 install : $(TARGET)
 

lfs/libassuan

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@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.4.3
+VER        = 2.5.3
 
 THISAPP    = libassuan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libassuan
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       =
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8e01a7c72d3e5d154481230668e6eb5a
+$(DL_FILE)_MD5 = 226c504ea78a232224bf3b6846b3adb9
 
 install : $(TARGET)
 

lfs/libgcrypt

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@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        = 1.8.4
+VER        = 1.8.5
 
 THISAPP    = libgcrypt-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fbfdaebbbc6d7e5fbbf6ffdb3e139573
+$(DL_FILE)_MD5 = 348cc4601ca34307fc6cd6c945467743
 
 install : $(TARGET)
 

lfs/libgpg-error

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@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        = 1.27
+VER        = 1.38
 
 THISAPP    = libgpg-error-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5217ef3e76a7275a2a3b569a12ddc989
+$(DL_FILE)_MD5 = f164ce3400c820907965fdc53e43acfc
 
 install : $(TARGET)
 

lfs/linux

@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.183
+VER         = 4.14.184
-ARM_PATCHES = 4.14.183-ipfire0
+ARM_PATCHES = 4.14.184-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -79,8 +79,8 @@ objects =$(DL_FILE) \
 $(DL_FILE)					= $(URL_IPFIRE)/$(DL_FILE)
 arm-multi-patches-$(ARM_PATCHES).patch.xz	= $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)_MD5					= bd6db02bdbe35609756842b8c4c72cad
+$(DL_FILE)_MD5					= 8d6e90aa90d2ae927f27404cb7674f28
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5	= 55f6b8d709919adb8791e507836ceedc
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5	= e7a545581a7bd2333eaf271fba1aeadd
 
 install : $(TARGET)
 

lfs/linux-firmware

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 20191022
+VER        = 20200519
 
 THISAPP    = linux-firmware-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a9fa049840931f37469a8035b9c06318
+$(DL_FILE)_MD5 = 7ea1c59732569a01ec8b0e6a412a314c
 
 install : $(TARGET)
 
@@ -71,7 +71,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	mkdir -p /lib/firmware
-	cd $(DIR_APP) && cp -vr * /lib/firmware
+	cd $(DIR_APP) && make install
 	# Remove Space from Filenames
 	mv "/lib/firmware/brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt" \
 	   "/lib/firmware/brcm/brcmfmac43430a0-sdio.ONDA-V80_PLUS.txt"

lfs/ntp

@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2019  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2020  IPFire Team  <info@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        = 4.2.8p14
+VER        = 4.2.8p15
 
 THISAPP    = ntp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 783edaf1d68ddf651bde64eda54a579d
+$(DL_FILE)_MD5 = e1e6b23d2fc75cced41801dbcd6c2561
 
 install : $(TARGET)
 

lfs/openssh

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 8.2p1
+VER        = 8.3p1
 
 THISAPP    = openssh-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 3076e6413e8dbe56d33848c1054ac091
+$(DL_FILE)_MD5 = 68d7527bf2672153ca47402f6489a1af
 
 install : $(TARGET)
 

lfs/squid

@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.11
+VER        = 4.12
 
 THISAPP    = squid-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -46,7 +46,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 10f34e852153a9996aa4614670e2bda1
+$(DL_FILE)_MD5 = ad7a4a8a0031cae3435717a759173829
 
 install : $(TARGET)