Merge branch 'next' into temp-c165-development

author Peter Müller <peter.mueller@ipfire.org>

Thu, 10 Feb 2022 17:14:58 +0000 (17:14 +0000)

committer Peter Müller <peter.mueller@ipfire.org>

Thu, 10 Feb 2022 17:14:58 +0000 (17:14 +0000)
author Peter Müller <peter.mueller@ipfire.org>
Thu, 10 Feb 2022 17:14:58 +0000 (17:14 +0000)
committer Peter Müller <peter.mueller@ipfire.org>
Thu, 10 Feb 2022 17:14:58 +0000 (17:14 +0000)
diff --git a/config/cfgroot/ids-functions.pl b/config/cfgroot/ids-functions.pl

index 74d55def6c986ca96b3104f24eb8c865978cd071..bf02bcbaa580d5f239b93a44f42bccefe34d0b8f 100644 (file)
--- a/config/cfgroot/ids-functions.pl
+++ b/config/cfgroot/ids-functions.pl
@@ -281,7 +281,15 @@ sub downloadruleset ($) {
         use LWP::UserAgent;
  
         # Init the download module.
-       my $downloader = LWP::UserAgent->new;
+       #
+       # Request SSL hostname verification and specify path
+       # to the CA file.
+       my $downloader = LWP::UserAgent->new(
+               ssl_opts => {
+                       SSL_ca_file     => '/etc/ssl/cert.pem',
+                       verify_hostname => 1,
+               }
+       );
  
         # Set timeout to 10 seconds.
         $downloader->timeout(10);
diff --git a/config/cfgroot/manualpages b/config/cfgroot/manualpages

index 97246e6f07402141a3c95d6e1ad2297e84e6e6b7..4bfec8ab70d85dd9a91e30c8b2ebd1500cc024b3 100644 (file)
--- a/config/cfgroot/manualpages
+++ b/config/cfgroot/manualpages
@@ -25,6 +25,7 @@ netinternal=configuration/status/network_int
  netother=configuration/status/network_int
  netovpnrw=configuration/status/network_ovpnrw
  #netovpnsrv=
+wio=addons/wio
  hardwaregraphs=configuration/status/hardware_diagrams
  entropy=configuration/status/entropy
  connections=configuration/status/connections
@@ -52,6 +53,7 @@ ovpnmain=configuration/services/openvpn
  ddns=configuration/services/dyndns
  time=configuration/services/ntp
  qos=configuration/services/qos
+guardian=addons/guardian
  extrahd=configuration/services/extrahd
  
  #      Firewall menu
@@ -66,12 +68,17 @@ iptables=configuration/firewall/iptables
  
  #      IPfire menu
  pakfire=configuration/ipfire/pakfire
+wlanap=addons/wireless
+tor=addons/tor
+mpfire=addons/mpfire
+samba=addons/samba
  
  #      Logs menu
  summary=configuration/logs/summary
  config=configuration/logs/logsettings
  proxylog=configuration/logs/proxy
  calamaris=configuration/logs/proxyreports
+accounting=addons/squid-accounting
  firewalllog=configuration/logs/firewall
  firewalllogip=configuration/logs/firewall-ip
  firewalllogport=configuration/logs/firewall-port
diff --git a/config/firewall/firewall-lib.pl b/config/firewall/firewall-lib.pl

index bc0b30ca5c7b87939721e1dd3bf31f6549541f75..e7ec30ae0b337234418e5fc013c2641128a0c010 100644 (file)
--- a/config/firewall/firewall-lib.pl
+++ b/config/firewall/firewall-lib.pl
@@ -2,7 +2,7 @@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2013 Alexander Marx <amarx@ipfire.org>                        #
+# Copyright (C) 2021 Alexander Marx <amarx@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        #
@@ -315,7 +315,7 @@ sub get_addresses
                 foreach my $grp (sort {$a <=> $b} keys %customgrp) {
                         if ($customgrp{$grp}[0] eq $value) {
                                 my @address = &get_address($customgrp{$grp}[3], $customgrp{$grp}[2], $type);
-
+                               next if ($address[0][0] eq 'none');
                                 if (@address) {
                                         push(@addresses, @address);
                                 }
diff --git a/config/lua/lua.pc b/config/lua/lua.pc

index f6d25ec33d68c444b77eda7cddda2d33ce243594..5244acc17f654a39c6e47ab917e4f9c11713409c 100644 (file)
--- a/config/lua/lua.pc
+++ b/config/lua/lua.pc
@@ -1,5 +1,5 @@
  V=5.4
-R=5.4.3
+R=5.4.4
  
  prefix=/usr
  INSTALL_BIN=${prefix}/bin
diff --git a/config/rootfiles/common/aarch64/binutils b/config/rootfiles/common/aarch64/binutils

index b6099c3f752bb532604a5d7969dba07376ed05aa..cae233bce7bcfae6915b352466275369dd02d835 100644 (file)
--- a/config/rootfiles/common/aarch64/binutils
+++ b/config/rootfiles/common/aarch64/binutils
@@ -16,7 +16,6 @@ usr/bin/strings
  #usr/bin/strip
  #usr/include/ansidecl.h
  #usr/include/bfd.h
-#usr/include/bfd_stdint.h
  #usr/include/bfdlink.h
  #usr/include/ctf-api.h
  #usr/include/ctf.h
@@ -292,7 +291,7 @@ usr/lib/bfd-plugins/libdep.so
  #usr/lib/ldscripts/armelfb_linux_eabi.xu
  #usr/lib/ldscripts/armelfb_linux_eabi.xw
  #usr/lib/ldscripts/armelfb_linux_eabi.xwe
-usr/lib/libbfd-2.36.1.so
+usr/lib/libbfd-2.37.so
  #usr/lib/libbfd.a
  #usr/lib/libbfd.la
  #usr/lib/libbfd.so
@@ -306,7 +305,7 @@ usr/lib/libctf-nobfd.so.0.0.0
  #usr/lib/libctf.so
  usr/lib/libctf.so.0
  usr/lib/libctf.so.0.0.0
-usr/lib/libopcodes-2.36.1.so
+usr/lib/libopcodes-2.37.so
  #usr/lib/libopcodes.a
  #usr/lib/libopcodes.la
  #usr/lib/libopcodes.so
diff --git a/config/rootfiles/common/aarch64/glibc b/config/rootfiles/common/aarch64/glibc

index 0849703f99ecef838049d0602138d3691deac119..f98c94aab5d90139952a457cdbbbeaef112a03c7 100644 (file)
--- a/config/rootfiles/common/aarch64/glibc
+++ b/config/rootfiles/common/aarch64/glibc
@@ -1,49 +1,32 @@
  #etc/ld.so.cache
  etc/rpc
-lib/ld-2.33.so
  lib/ld-linux-aarch64.so.1
-lib/libBrokenLocale-2.33.so
  lib/libBrokenLocale.so.1
-#lib/libSegFault.so
-lib/libanl-2.33.so
  lib/libanl.so.1
-lib/libc-2.33.so
  lib/libc.so.6
-lib/libdl-2.33.so
+#lib/libc_malloc_debug.so.0
  lib/libdl.so.2
-lib/libm-2.33.so
  lib/libm.so.6
  #lib/libmemusage.so
-lib/libnsl-2.33.so
  lib/libnsl.so.1
-lib/libnss_compat-2.33.so
  lib/libnss_compat.so.2
-lib/libnss_db-2.33.so
  lib/libnss_db.so.2
-lib/libnss_dns-2.33.so
  lib/libnss_dns.so.2
-lib/libnss_files-2.33.so
  lib/libnss_files.so.2
-lib/libnss_hesiod-2.33.so
  lib/libnss_hesiod.so.2
  #lib/libpcprofile.so
-lib/libpthread-2.33.so
  lib/libpthread.so.0
-lib/libresolv-2.33.so
  lib/libresolv.so.2
-lib/librt-2.33.so
  lib/librt.so.1
-lib/libthread_db-1.0.so
  lib/libthread_db.so.1
-lib/libutil-2.33.so
  lib/libutil.so.1
  sbin/ldconfig
  #sbin/sln
-#usr/bin/catchsegv
  #usr/bin/gencat
  usr/bin/getconf
  usr/bin/getent
  #usr/bin/iconv
+usr/bin/ld.so
  usr/bin/ldd
  usr/bin/locale
  #usr/bin/localedef
@@ -74,12 +57,14 @@ usr/bin/locale
  #usr/include/bits
  #usr/include/bits/a.out.h
  #usr/include/bits/argp-ldbl.h
+#usr/include/bits/atomic_wide_counter.h
  #usr/include/bits/byteswap.h
  #usr/include/bits/cmathcalls.h
  #usr/include/bits/confname.h
  #usr/include/bits/cpu-set.h
  #usr/include/bits/dirent.h
  #usr/include/bits/dirent_ext.h
+#usr/include/bits/dl_find_object.h
  #usr/include/bits/dlfcn.h
  #usr/include/bits/elfclass.h
  #usr/include/bits/endian.h
@@ -117,6 +102,7 @@ usr/bin/locale
  #usr/include/bits/libc-header-start.h
  #usr/include/bits/libm-simd-decl-stubs.h
  #usr/include/bits/link.h
+#usr/include/bits/link_lavcurrent.h
  #usr/include/bits/local_lim.h
  #usr/include/bits/locale.h
  #usr/include/bits/long-double.h
@@ -145,10 +131,13 @@ usr/bin/locale
  #usr/include/bits/procfs-id.h
  #usr/include/bits/procfs-prregset.h
  #usr/include/bits/procfs.h
+#usr/include/bits/pthread_stack_min-dynamic.h
+#usr/include/bits/pthread_stack_min.h
  #usr/include/bits/pthreadtypes-arch.h
  #usr/include/bits/pthreadtypes.h
  #usr/include/bits/ptrace-shared.h
  #usr/include/bits/resource.h
+#usr/include/bits/rseq.h
  #usr/include/bits/sched.h
  #usr/include/bits/select.h
  #usr/include/bits/select2.h
@@ -169,6 +158,7 @@ usr/bin/locale
  #usr/include/bits/signum-arch.h
  #usr/include/bits/signum-generic.h
  #usr/include/bits/sigstack.h
+#usr/include/bits/sigstksz.h
  #usr/include/bits/sigthread.h
  #usr/include/bits/sockaddr.h
  #usr/include/bits/socket-constants.h
@@ -197,6 +187,7 @@ usr/bin/locale
  #usr/include/bits/struct_mutex.h
  #usr/include/bits/struct_rwlock.h
  #usr/include/bits/struct_stat.h
+#usr/include/bits/struct_stat_time64_helper.h
  #usr/include/bits/syscall.h
  #usr/include/bits/syslog-ldbl.h
  #usr/include/bits/syslog-path.h
@@ -245,11 +236,17 @@ usr/bin/locale
  #usr/include/bits/types/struct___jmp_buf_tag.h
  #usr/include/bits/types/struct_iovec.h
  #usr/include/bits/types/struct_itimerspec.h
+#usr/include/bits/types/struct_msqid64_ds.h
+#usr/include/bits/types/struct_msqid64_ds_helper.h
  #usr/include/bits/types/struct_msqid_ds.h
  #usr/include/bits/types/struct_osockaddr.h
  #usr/include/bits/types/struct_rusage.h
  #usr/include/bits/types/struct_sched_param.h
+#usr/include/bits/types/struct_semid64_ds.h
+#usr/include/bits/types/struct_semid64_ds_helper.h
  #usr/include/bits/types/struct_semid_ds.h
+#usr/include/bits/types/struct_shmid64_ds.h
+#usr/include/bits/types/struct_shmid64_ds_helper.h
  #usr/include/bits/types/struct_shmid_ds.h
  #usr/include/bits/types/struct_sigstack.h
  #usr/include/bits/types/struct_statx.h
@@ -292,6 +289,7 @@ usr/bin/locale
  #usr/include/error.h
  #usr/include/execinfo.h
  #usr/include/fcntl.h
+#usr/include/features-time64.h
  #usr/include/features.h
  #usr/include/fenv.h
  #usr/include/finclude
@@ -458,6 +456,7 @@ usr/bin/locale
  #usr/include/sys/raw.h
  #usr/include/sys/reboot.h
  #usr/include/sys/resource.h
+#usr/include/sys/rseq.h
  #usr/include/sys/select.h
  #usr/include/sys/sem.h
  #usr/include/sys/sendfile.h
@@ -775,6 +774,8 @@ usr/lib/gconv
  #usr/lib/gconv/UTF-7.so
  #usr/lib/gconv/VISCII.so
  #usr/lib/gconv/gconv-modules
+#usr/lib/gconv/gconv-modules.d
+#usr/lib/gconv/gconv-modules.d/gconv-modules-extra.conf
  #usr/lib/gconv/libCNS.so
  #usr/lib/gconv/libGB.so
  #usr/lib/gconv/libISOIR165.so
@@ -787,34 +788,44 @@ usr/lib/gconv
  #usr/lib/glibc/getconf/POSIX_V6_LP64_OFF64
  #usr/lib/glibc/getconf/POSIX_V7_LP64_OFF64
  #usr/lib/glibc/getconf/XBS5_LP64_OFF64
+#usr/lib/grcrt1.o
  #usr/lib/libBrokenLocale.a
  #usr/lib/libBrokenLocale.so
  #usr/lib/libanl.a
  #usr/lib/libanl.so
  #usr/lib/libc.a
  #usr/lib/libc.so
+#usr/lib/libc_malloc_debug.so
  #usr/lib/libc_nonshared.a
  #usr/lib/libdl.a
-#usr/lib/libdl.so
  #usr/lib/libg.a
  #usr/lib/libm.a
  #usr/lib/libm.so
  #usr/lib/libmcheck.a
  #usr/lib/libnss_compat.so
  #usr/lib/libnss_db.so
-#usr/lib/libnss_dns.so
-#usr/lib/libnss_files.so
  #usr/lib/libnss_hesiod.so
  #usr/lib/libpthread.a
-#usr/lib/libpthread.so
  #usr/lib/libresolv.a
  #usr/lib/libresolv.so
  #usr/lib/librt.a
-#usr/lib/librt.so
  #usr/lib/libthread_db.so
  #usr/lib/libutil.a
-#usr/lib/libutil.so
  usr/lib/locale
+#usr/lib/locale/C.utf8
+#usr/lib/locale/C.utf8/LC_ADDRESS
+#usr/lib/locale/C.utf8/LC_COLLATE
+#usr/lib/locale/C.utf8/LC_CTYPE
+#usr/lib/locale/C.utf8/LC_IDENTIFICATION
+#usr/lib/locale/C.utf8/LC_MEASUREMENT
+#usr/lib/locale/C.utf8/LC_MESSAGES
+#usr/lib/locale/C.utf8/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/C.utf8/LC_MONETARY
+#usr/lib/locale/C.utf8/LC_NAME
+#usr/lib/locale/C.utf8/LC_NUMERIC
+#usr/lib/locale/C.utf8/LC_PAPER
+#usr/lib/locale/C.utf8/LC_TELEPHONE
+#usr/lib/locale/C.utf8/LC_TIME
  #usr/lib/locale/aa_DJ
  #usr/lib/locale/aa_DJ.utf8
  #usr/lib/locale/aa_DJ.utf8/LC_ADDRESS
@@ -7647,6 +7658,7 @@ usr/lib/locale
  #usr/lib/locale/zu_ZA/LC_PAPER
  #usr/lib/locale/zu_ZA/LC_TELEPHONE
  #usr/lib/locale/zu_ZA/LC_TIME
+#usr/lib/rcrt1.o
  #usr/sbin/iconvconfig
  #usr/sbin/nscd
  #usr/sbin/zic
@@ -7886,11 +7898,13 @@ usr/lib/locale
  #usr/share/i18n/charmaps/VISCII.gz
  #usr/share/i18n/charmaps/WINDOWS-31J.gz
  #usr/share/i18n/locales
+#usr/share/i18n/locales/C
  #usr/share/i18n/locales/POSIX
  #usr/share/i18n/locales/aa_DJ
  #usr/share/i18n/locales/aa_ER
  #usr/share/i18n/locales/aa_ER@saaho
  #usr/share/i18n/locales/aa_ET
+#usr/share/i18n/locales/ab_GE
  #usr/share/i18n/locales/af_ZA
  #usr/share/i18n/locales/agr_PE
  #usr/share/i18n/locales/ak_GH
@@ -8252,6 +8266,7 @@ usr/lib/locale
  #usr/share/info/libc.info-15
  #usr/share/info/libc.info-16
  #usr/share/info/libc.info-17
+#usr/share/info/libc.info-18
  #usr/share/info/libc.info-2
  #usr/share/info/libc.info-3
  #usr/share/info/libc.info-4
@@ -8372,7 +8387,5 @@ usr/lib/locale
  #usr/share/locale/zh_TW
  #usr/share/locale/zh_TW/LC_MESSAGES
  #usr/share/locale/zh_TW/LC_MESSAGES/libc.mo
-#var/cache/ldconfig
-#var/cache/ldconfig/aux-cache
  #var/db
  #var/db/Makefile
diff --git a/config/rootfiles/common/armv6l/binutils b/config/rootfiles/common/armv6l/binutils

index 06f33f27afdd7dbcbd46a09bd8da25e97143b30c..7733152120f2caf870018dac3237c0acc1daaebe 100644 (file)
--- a/config/rootfiles/common/armv6l/binutils
+++ b/config/rootfiles/common/armv6l/binutils
@@ -16,7 +16,6 @@ usr/bin/strings
  #usr/bin/strip
  #usr/include/ansidecl.h
  #usr/include/bfd.h
-#usr/include/bfd_stdint.h
  #usr/include/bfdlink.h
  #usr/include/ctf-api.h
  #usr/include/ctf.h
@@ -72,7 +71,7 @@ usr/lib/bfd-plugins/libdep.so
  #usr/lib/ldscripts/armelfb_linux_eabi.xu
  #usr/lib/ldscripts/armelfb_linux_eabi.xw
  #usr/lib/ldscripts/armelfb_linux_eabi.xwe
-usr/lib/libbfd-2.36.1.so
+usr/lib/libbfd-2.37.so
  #usr/lib/libbfd.a
  #usr/lib/libbfd.la
  #usr/lib/libbfd.so
@@ -86,7 +85,7 @@ usr/lib/libctf-nobfd.so.0.0.0
  #usr/lib/libctf.so
  usr/lib/libctf.so.0
  usr/lib/libctf.so.0.0.0
-usr/lib/libopcodes-2.36.1.so
+usr/lib/libopcodes-2.37.so
  #usr/lib/libopcodes.a
  #usr/lib/libopcodes.la
  #usr/lib/libopcodes.so
diff --git a/config/rootfiles/common/armv6l/glibc b/config/rootfiles/common/armv6l/glibc

index de1a6519c827a343f2568764b56535eb8cbe9151..d6be0f39a01c37a3bde73326ad392df838eaa0e6 100644 (file)
--- a/config/rootfiles/common/armv6l/glibc
+++ b/config/rootfiles/common/armv6l/glibc
@@ -1,49 +1,32 @@
  #etc/ld.so.cache
  etc/rpc
-lib/ld-2.33.so
  lib/ld-linux.so.3
-lib/libBrokenLocale-2.33.so
  lib/libBrokenLocale.so.1
-#lib/libSegFault.so
-lib/libanl-2.33.so
  lib/libanl.so.1
-lib/libc-2.33.so
  lib/libc.so.6
-lib/libdl-2.33.so
+#lib/libc_malloc_debug.so.0
  lib/libdl.so.2
-lib/libm-2.33.so
  lib/libm.so.6
  #lib/libmemusage.so
-lib/libnsl-2.33.so
  lib/libnsl.so.1
-lib/libnss_compat-2.33.so
  lib/libnss_compat.so.2
-lib/libnss_db-2.33.so
  lib/libnss_db.so.2
-lib/libnss_dns-2.33.so
  lib/libnss_dns.so.2
-lib/libnss_files-2.33.so
  lib/libnss_files.so.2
-lib/libnss_hesiod-2.33.so
  lib/libnss_hesiod.so.2
  #lib/libpcprofile.so
-lib/libpthread-2.33.so
  lib/libpthread.so.0
-lib/libresolv-2.33.so
  lib/libresolv.so.2
-lib/librt-2.33.so
  lib/librt.so.1
-lib/libthread_db-1.0.so
  lib/libthread_db.so.1
-lib/libutil-2.33.so
  lib/libutil.so.1
  sbin/ldconfig
  #sbin/sln
-#usr/bin/catchsegv
  #usr/bin/gencat
  usr/bin/getconf
  usr/bin/getent
  #usr/bin/iconv
+usr/bin/ld.so
  usr/bin/ldd
  usr/bin/locale
  #usr/bin/localedef
@@ -74,12 +57,14 @@ usr/bin/locale
  #usr/include/bits
  #usr/include/bits/a.out.h
  #usr/include/bits/argp-ldbl.h
+#usr/include/bits/atomic_wide_counter.h
  #usr/include/bits/byteswap.h
  #usr/include/bits/cmathcalls.h
  #usr/include/bits/confname.h
  #usr/include/bits/cpu-set.h
  #usr/include/bits/dirent.h
  #usr/include/bits/dirent_ext.h
+#usr/include/bits/dl_find_object.h
  #usr/include/bits/dlfcn.h
  #usr/include/bits/elfclass.h
  #usr/include/bits/endian.h
@@ -117,6 +102,7 @@ usr/bin/locale
  #usr/include/bits/libc-header-start.h
  #usr/include/bits/libm-simd-decl-stubs.h
  #usr/include/bits/link.h
+#usr/include/bits/link_lavcurrent.h
  #usr/include/bits/local_lim.h
  #usr/include/bits/locale.h
  #usr/include/bits/long-double.h
@@ -145,10 +131,13 @@ usr/bin/locale
  #usr/include/bits/procfs-id.h
  #usr/include/bits/procfs-prregset.h
  #usr/include/bits/procfs.h
+#usr/include/bits/pthread_stack_min-dynamic.h
+#usr/include/bits/pthread_stack_min.h
  #usr/include/bits/pthreadtypes-arch.h
  #usr/include/bits/pthreadtypes.h
  #usr/include/bits/ptrace-shared.h
  #usr/include/bits/resource.h
+#usr/include/bits/rseq.h
  #usr/include/bits/sched.h
  #usr/include/bits/select.h
  #usr/include/bits/select2.h
@@ -169,6 +158,7 @@ usr/bin/locale
  #usr/include/bits/signum-arch.h
  #usr/include/bits/signum-generic.h
  #usr/include/bits/sigstack.h
+#usr/include/bits/sigstksz.h
  #usr/include/bits/sigthread.h
  #usr/include/bits/sockaddr.h
  #usr/include/bits/socket-constants.h
@@ -197,6 +187,7 @@ usr/bin/locale
  #usr/include/bits/struct_mutex.h
  #usr/include/bits/struct_rwlock.h
  #usr/include/bits/struct_stat.h
+#usr/include/bits/struct_stat_time64_helper.h
  #usr/include/bits/syscall.h
  #usr/include/bits/syslog-ldbl.h
  #usr/include/bits/syslog-path.h
@@ -245,11 +236,17 @@ usr/bin/locale
  #usr/include/bits/types/struct___jmp_buf_tag.h
  #usr/include/bits/types/struct_iovec.h
  #usr/include/bits/types/struct_itimerspec.h
+#usr/include/bits/types/struct_msqid64_ds.h
+#usr/include/bits/types/struct_msqid64_ds_helper.h
  #usr/include/bits/types/struct_msqid_ds.h
  #usr/include/bits/types/struct_osockaddr.h
  #usr/include/bits/types/struct_rusage.h
  #usr/include/bits/types/struct_sched_param.h
+#usr/include/bits/types/struct_semid64_ds.h
+#usr/include/bits/types/struct_semid64_ds_helper.h
  #usr/include/bits/types/struct_semid_ds.h
+#usr/include/bits/types/struct_shmid64_ds.h
+#usr/include/bits/types/struct_shmid64_ds_helper.h
  #usr/include/bits/types/struct_shmid_ds.h
  #usr/include/bits/types/struct_sigstack.h
  #usr/include/bits/types/struct_statx.h
@@ -292,6 +289,7 @@ usr/bin/locale
  #usr/include/error.h
  #usr/include/execinfo.h
  #usr/include/fcntl.h
+#usr/include/features-time64.h
  #usr/include/features.h
  #usr/include/fenv.h
  #usr/include/finclude
@@ -457,6 +455,7 @@ usr/bin/locale
  #usr/include/sys/raw.h
  #usr/include/sys/reboot.h
  #usr/include/sys/resource.h
+#usr/include/sys/rseq.h
  #usr/include/sys/select.h
  #usr/include/sys/sem.h
  #usr/include/sys/sendfile.h
@@ -774,6 +773,8 @@ usr/lib/gconv
  #usr/lib/gconv/UTF-7.so
  #usr/lib/gconv/VISCII.so
  #usr/lib/gconv/gconv-modules
+#usr/lib/gconv/gconv-modules.d
+#usr/lib/gconv/gconv-modules.d/gconv-modules-extra.conf
  #usr/lib/gconv/libCNS.so
  #usr/lib/gconv/libGB.so
  #usr/lib/gconv/libISOIR165.so
@@ -795,28 +796,37 @@ usr/lib/gconv
  #usr/lib/libanl.so
  #usr/lib/libc.a
  #usr/lib/libc.so
+#usr/lib/libc_malloc_debug.so
  #usr/lib/libc_nonshared.a
  #usr/lib/libdl.a
-#usr/lib/libdl.so
  #usr/lib/libg.a
  #usr/lib/libm.a
  #usr/lib/libm.so
  #usr/lib/libmcheck.a
  #usr/lib/libnss_compat.so
  #usr/lib/libnss_db.so
-#usr/lib/libnss_dns.so
-#usr/lib/libnss_files.so
  #usr/lib/libnss_hesiod.so
  #usr/lib/libpthread.a
-#usr/lib/libpthread.so
  #usr/lib/libresolv.a
  #usr/lib/libresolv.so
  #usr/lib/librt.a
-#usr/lib/librt.so
  #usr/lib/libthread_db.so
  #usr/lib/libutil.a
-#usr/lib/libutil.so
  usr/lib/locale
+#usr/lib/locale/C.utf8
+#usr/lib/locale/C.utf8/LC_ADDRESS
+#usr/lib/locale/C.utf8/LC_COLLATE
+#usr/lib/locale/C.utf8/LC_CTYPE
+#usr/lib/locale/C.utf8/LC_IDENTIFICATION
+#usr/lib/locale/C.utf8/LC_MEASUREMENT
+#usr/lib/locale/C.utf8/LC_MESSAGES
+#usr/lib/locale/C.utf8/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/C.utf8/LC_MONETARY
+#usr/lib/locale/C.utf8/LC_NAME
+#usr/lib/locale/C.utf8/LC_NUMERIC
+#usr/lib/locale/C.utf8/LC_PAPER
+#usr/lib/locale/C.utf8/LC_TELEPHONE
+#usr/lib/locale/C.utf8/LC_TIME
  #usr/lib/locale/aa_DJ
  #usr/lib/locale/aa_DJ.utf8
  #usr/lib/locale/aa_DJ.utf8/LC_ADDRESS
@@ -7888,11 +7898,13 @@ usr/lib/locale
  #usr/share/i18n/charmaps/VISCII.gz
  #usr/share/i18n/charmaps/WINDOWS-31J.gz
  #usr/share/i18n/locales
+#usr/share/i18n/locales/C
  #usr/share/i18n/locales/POSIX
  #usr/share/i18n/locales/aa_DJ
  #usr/share/i18n/locales/aa_ER
  #usr/share/i18n/locales/aa_ER@saaho
  #usr/share/i18n/locales/aa_ET
+#usr/share/i18n/locales/ab_GE
  #usr/share/i18n/locales/af_ZA
  #usr/share/i18n/locales/agr_PE
  #usr/share/i18n/locales/ak_GH
@@ -8254,6 +8266,7 @@ usr/lib/locale
  #usr/share/info/libc.info-15
  #usr/share/info/libc.info-16
  #usr/share/info/libc.info-17
+#usr/share/info/libc.info-18
  #usr/share/info/libc.info-2
  #usr/share/info/libc.info-3
  #usr/share/info/libc.info-4
@@ -8374,7 +8387,5 @@ usr/lib/locale
  #usr/share/locale/zh_TW
  #usr/share/locale/zh_TW/LC_MESSAGES
  #usr/share/locale/zh_TW/LC_MESSAGES/libc.mo
-#var/cache/ldconfig
-#var/cache/ldconfig/aux-cache
  #var/db
  #var/db/Makefile
diff --git a/config/rootfiles/common/curl b/config/rootfiles/common/curl

index 75015b6fa050b5eabc107f71f17f34eb41545885..da18e3f2996d84ad82b84468c61d6df25ce95469 100644 (file)
--- a/config/rootfiles/common/curl
+++ b/config/rootfiles/common/curl
@@ -231,6 +231,7 @@ usr/lib/libcurl.so.4.7.0
  #usr/share/man/man3/CURLOPT_MAX_RECV_SPEED_LARGE.3
  #usr/share/man/man3/CURLOPT_MAX_SEND_SPEED_LARGE.3
  #usr/share/man/man3/CURLOPT_MIMEPOST.3
+#usr/share/man/man3/CURLOPT_MIME_OPTIONS.3
  #usr/share/man/man3/CURLOPT_NETRC.3
  #usr/share/man/man3/CURLOPT_NETRC_FILE.3
  #usr/share/man/man3/CURLOPT_NEW_DIRECTORY_PERMS.3
@@ -397,6 +398,11 @@ usr/lib/libcurl.so.4.7.0
  #usr/share/man/man3/CURLOPT_XFERINFODATA.3
  #usr/share/man/man3/CURLOPT_XFERINFOFUNCTION.3
  #usr/share/man/man3/CURLOPT_XOAUTH2_BEARER.3
+#usr/share/man/man3/CURLSHOPT_LOCKFUNC.3
+#usr/share/man/man3/CURLSHOPT_SHARE.3
+#usr/share/man/man3/CURLSHOPT_UNLOCKFUNC.3
+#usr/share/man/man3/CURLSHOPT_UNSHARE.3
+#usr/share/man/man3/CURLSHOPT_USERDATA.3
  #usr/share/man/man3/curl_easy_cleanup.3
  #usr/share/man/man3/curl_easy_duphandle.3
  #usr/share/man/man3/curl_easy_escape.3
diff --git a/config/rootfiles/common/expat b/config/rootfiles/common/expat

index ea0c2ded59131902f952497f67e8d22402c0871a..47ce600ad6d2fd19af64e7e1278a06743980376d 100644 (file)
--- a/config/rootfiles/common/expat
+++ b/config/rootfiles/common/expat
@@ -2,22 +2,21 @@
  #usr/include/expat.h
  #usr/include/expat_config.h
  #usr/include/expat_external.h
-#usr/lib/cmake/expat-2.4.2
-#usr/lib/cmake/expat-2.4.2/expat-config-version.cmake
-#usr/lib/cmake/expat-2.4.2/expat-config.cmake
-#usr/lib/cmake/expat-2.4.2/expat-noconfig.cmake
-#usr/lib/cmake/expat-2.4.2/expat.cmake
+#usr/lib/cmake/expat-2.4.4
+#usr/lib/cmake/expat-2.4.4/expat-config-version.cmake
+#usr/lib/cmake/expat-2.4.4/expat-config.cmake
+#usr/lib/cmake/expat-2.4.4/expat-noconfig.cmake
+#usr/lib/cmake/expat-2.4.4/expat.cmake
  #usr/lib/libexpat.a
  #usr/lib/libexpat.la
  #usr/lib/libexpat.so
  usr/lib/libexpat.so.1
-usr/lib/libexpat.so.1.8.2
+usr/lib/libexpat.so.1.8.4
  #usr/lib/pkgconfig/expat.pc
  #usr/share/doc/expat
-#usr/share/doc/expat-2.4.2
-#usr/share/doc/expat-2.4.2/ok.min.css
-#usr/share/doc/expat-2.4.2/reference.html
-#usr/share/doc/expat-2.4.2/style.css
-#usr/share/doc/expat-2.4.2/valid-xhtml10.png
+#usr/share/doc/expat-2.4.4
+#usr/share/doc/expat-2.4.4/ok.min.css
+#usr/share/doc/expat-2.4.4/reference.html
+#usr/share/doc/expat-2.4.4/style.css
  #usr/share/doc/expat/AUTHORS
  #usr/share/doc/expat/changelog
diff --git a/config/rootfiles/common/glib b/config/rootfiles/common/glib

index 7eab315549db4fb58b8b9e2158d2ad70aaf73cb0..0b2e4b2685273147b60c8044c9f9da34a26e92e9 100644 (file)
--- a/config/rootfiles/common/glib
+++ b/config/rootfiles/common/glib
@@ -17,14 +17,11 @@
  #usr/include/gio-unix-2.0/gio
  #usr/include/gio-unix-2.0/gio/gdesktopappinfo.h
  #usr/include/gio-unix-2.0/gio/gfiledescriptorbased.h
-#usr/include/gio-unix-2.0/gio/gunixconnection.h
-#usr/include/gio-unix-2.0/gio/gunixcredentialsmessage.h
  #usr/include/gio-unix-2.0/gio/gunixfdlist.h
  #usr/include/gio-unix-2.0/gio/gunixfdmessage.h
  #usr/include/gio-unix-2.0/gio/gunixinputstream.h
  #usr/include/gio-unix-2.0/gio/gunixmounts.h
  #usr/include/gio-unix-2.0/gio/gunixoutputstream.h
-#usr/include/gio-unix-2.0/gio/gunixsocketaddress.h
  #usr/include/glib-2.0
  #usr/include/glib-2.0/gio
  #usr/include/glib-2.0/gio/gaction.h
@@ -71,6 +68,8 @@
  #usr/include/glib-2.0/gio/gdbusproxy.h
  #usr/include/glib-2.0/gio/gdbusserver.h
  #usr/include/glib-2.0/gio/gdbusutils.h
+usr/include/glib-2.0/gio/gdebugcontroller.h
+#usr/include/glib-2.0/gio/gdebugcontrollerdbus.h
  #usr/include/glib-2.0/gio/gdrive.h
  #usr/include/glib-2.0/gio/gdtlsclientconnection.h
  #usr/include/glib-2.0/gio/gdtlsconnection.h
@@ -173,6 +172,9 @@
  #usr/include/glib-2.0/gio/gtlsinteraction.h
  #usr/include/glib-2.0/gio/gtlspassword.h
  #usr/include/glib-2.0/gio/gtlsserverconnection.h
+#usr/include/glib-2.0/gio/gunixconnection.h
+#usr/include/glib-2.0/gio/gunixcredentialsmessage.h
+#usr/include/glib-2.0/gio/gunixsocketaddress.h
  #usr/include/glib-2.0/gio/gvfs.h
  #usr/include/glib-2.0/gio/gvolume.h
  #usr/include/glib-2.0/gio/gvolumemonitor.h
@@ -296,19 +298,19 @@
  #usr/lib/glib-2.0/include/glibconfig.h
  #usr/lib/libgio-2.0.so
  usr/lib/libgio-2.0.so.0
-usr/lib/libgio-2.0.so.0.7000.1
+usr/lib/libgio-2.0.so.0.7101.0
  #usr/lib/libglib-2.0.so
  usr/lib/libglib-2.0.so.0
-usr/lib/libglib-2.0.so.0.7000.1
+usr/lib/libglib-2.0.so.0.7101.0
  #usr/lib/libgmodule-2.0.so
  usr/lib/libgmodule-2.0.so.0
-usr/lib/libgmodule-2.0.so.0.7000.1
+usr/lib/libgmodule-2.0.so.0.7101.0
  #usr/lib/libgobject-2.0.so
  usr/lib/libgobject-2.0.so.0
-usr/lib/libgobject-2.0.so.0.7000.1
+usr/lib/libgobject-2.0.so.0.7101.0
  #usr/lib/libgthread-2.0.so
  usr/lib/libgthread-2.0.so.0
-usr/lib/libgthread-2.0.so.0.7000.1
+usr/lib/libgthread-2.0.so.0.7101.0
  #usr/lib/pkgconfig/gio-2.0.pc
  #usr/lib/pkgconfig/gio-unix-2.0.pc
  #usr/lib/pkgconfig/glib-2.0.pc
@@ -328,8 +330,8 @@ usr/lib/libgthread-2.0.so.0.7000.1
  #usr/share/gdb/auto-load
  #usr/share/gdb/auto-load/usr
  #usr/share/gdb/auto-load/usr/lib
-#usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.7000.1-gdb.py
-#usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.7000.1-gdb.py
+#usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.7101.0-gdb.py
+#usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.7101.0-gdb.py
  #usr/share/gettext/its
  #usr/share/gettext/its/gschema.its
  #usr/share/gettext/its/gschema.loc
@@ -339,6 +341,7 @@ usr/lib/libgthread-2.0.so.0.7000.1
  #usr/share/glib-2.0/codegen/codegen.py
  #usr/share/glib-2.0/codegen/codegen_docbook.py
  #usr/share/glib-2.0/codegen/codegen_main.py
+#usr/share/glib-2.0/codegen/codegen_rst.py
  #usr/share/glib-2.0/codegen/config.py
  #usr/share/glib-2.0/codegen/dbustypes.py
  #usr/share/glib-2.0/codegen/parser.py
diff --git a/config/rootfiles/common/iproute2 b/config/rootfiles/common/iproute2

index ebef87ef73aaf98c74313411f3b8aa4461062891..0247aa9769d40c6660cd98dbd66c77f7f3ca3948 100644 (file)
--- a/config/rootfiles/common/iproute2
+++ b/config/rootfiles/common/iproute2
@@ -13,17 +13,14 @@ sbin/ctstat
  sbin/dcb
  sbin/devlink
  sbin/genl
-sbin/ifcfg
  sbin/ifstat
  sbin/ip
  sbin/lnstat
  sbin/nstat
  sbin/rdma
-sbin/routef
  sbin/routel
  sbin/rtacct
  sbin/rtmon
-sbin/rtpr
  sbin/rtstat
  sbin/ss
  sbin/tc
@@ -65,7 +62,6 @@ usr/share/bash-completion/completions/tc
  #usr/share/man/man8/devlink-trap.8
  #usr/share/man/man8/devlink.8
  #usr/share/man/man8/genl.8
-#usr/share/man/man8/ifcfg.8
  #usr/share/man/man8/ifstat.8
  #usr/share/man/man8/ip-address.8
  #usr/share/man/man8/ip-addrlabel.8
@@ -101,11 +97,9 @@ usr/share/bash-completion/completions/tc
  #usr/share/man/man8/rdma-statistic.8
  #usr/share/man/man8/rdma-system.8
  #usr/share/man/man8/rdma.8
-#usr/share/man/man8/routef.8
  #usr/share/man/man8/routel.8
  #usr/share/man/man8/rtacct.8
  #usr/share/man/man8/rtmon.8
-#usr/share/man/man8/rtpr.8
  #usr/share/man/man8/rtstat.8
  #usr/share/man/man8/ss.8
  #usr/share/man/man8/tc-actions.8
diff --git a/config/rootfiles/common/libcap b/config/rootfiles/common/libcap

index c33222c4959ca7cb034591dc409b4c9d5987dd14..0c57c9120a9e8b127228ef4671f9a910872cf406 100644 (file)
--- a/config/rootfiles/common/libcap
+++ b/config/rootfiles/common/libcap
@@ -1,10 +1,10 @@
  #lib/libcap.a
  lib/libcap.so.2
-lib/libcap.so.2.61
+lib/libcap.so.2.63
  #lib/libpsx.a
  #lib/libpsx.so
  #lib/libpsx.so.2
-#lib/libpsx.so.2.61
+#lib/libpsx.so.2.63
  #lib/pkgconfig/libcap.pc
  #lib/pkgconfig/libpsx.pc
  lib/security/pam_cap.so
@@ -57,6 +57,7 @@ usr/lib/libcap.so
  #usr/share/man/man3/cap_launcher_set_mode.3
  #usr/share/man/man3/cap_launcher_setgroups.3
  #usr/share/man/man3/cap_launcher_setuid.3
+#usr/share/man/man3/cap_max_bits.3
  #usr/share/man/man3/cap_mode.3
  #usr/share/man/man3/cap_mode_name.3
  #usr/share/man/man3/cap_new_launcher.3
@@ -75,6 +76,7 @@ usr/lib/libcap.so
  #usr/share/man/man3/capsetp.3
  #usr/share/man/man3/libcap.3
  #usr/share/man/man3/libpsx.3
+#usr/share/man/man3/psx_set_sensitivity.3
  #usr/share/man/man3/psx_syscall.3
  #usr/share/man/man3/psx_syscall3.3
  #usr/share/man/man3/psx_syscall6.3
diff --git a/config/rootfiles/common/libgpg-error b/config/rootfiles/common/libgpg-error

index 579be02fa0b53cdd1930d9b1559813be73f11254..1587242d724d5a7b8e6557061147e9d485e738ea 100644 (file)
--- a/config/rootfiles/common/libgpg-error
+++ b/config/rootfiles/common/libgpg-error
@@ -7,7 +7,7 @@ usr/bin/gpg-error
  #usr/lib/libgpg-error.la
  #usr/lib/libgpg-error.so
  usr/lib/libgpg-error.so.0
-usr/lib/libgpg-error.so.0.32.1
+usr/lib/libgpg-error.so.0.32.2
  #usr/lib/pkgconfig/gpg-error.pc
  #usr/share/aclocal/gpg-error.m4
  #usr/share/aclocal/gpgrt.m4
@@ -37,6 +37,7 @@ usr/lib/libgpg-error.so.0.32.1
  #usr/share/locale/ru/LC_MESSAGES/libgpg-error.mo
  #usr/share/locale/sr/LC_MESSAGES/libgpg-error.mo
  #usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/tr/LC_MESSAGES/libgpg-error.mo
  #usr/share/locale/uk/LC_MESSAGES/libgpg-error.mo
  #usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
  #usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo
diff --git a/config/rootfiles/common/libwww-perl b/config/rootfiles/common/libwww-perl

index a3f79e4d7b11b8df8817dc15ec03123708c39f59..38edd2f48be8d736acdfa94cc968fd6e4a0e95f3 100644 (file)
--- a/config/rootfiles/common/libwww-perl
+++ b/config/rootfiles/common/libwww-perl
@@ -1,50 +1,23 @@
-#usr/lib/perl5/site_perl/5.32.1/Bundle
-usr/lib/perl5/site_perl/5.32.1/Bundle/LWP.pm
-#usr/lib/perl5/site_perl/5.32.1/File
-usr/lib/perl5/site_perl/5.32.1/File/Listing.pm
-usr/lib/perl5/site_perl/5.32.1/HTML/Form.pm
-#usr/lib/perl5/site_perl/5.32.1/HTTP
-#usr/lib/perl5/site_perl/5.32.1/HTTP/Cookies
-usr/lib/perl5/site_perl/5.32.1/HTTP/Cookies.pm
-usr/lib/perl5/site_perl/5.32.1/HTTP/Cookies/Microsoft.pm
-usr/lib/perl5/site_perl/5.32.1/HTTP/Cookies/Netscape.pm
-usr/lib/perl5/site_perl/5.32.1/HTTP/Daemon.pm
-usr/lib/perl5/site_perl/5.32.1/HTTP/Date.pm
-#usr/lib/perl5/site_perl/5.32.1/HTTP/Headers
-usr/lib/perl5/site_perl/5.32.1/HTTP/Headers.pm
-usr/lib/perl5/site_perl/5.32.1/HTTP/Headers/Auth.pm
-usr/lib/perl5/site_perl/5.32.1/HTTP/Headers/ETag.pm
-usr/lib/perl5/site_perl/5.32.1/HTTP/Headers/Util.pm
-usr/lib/perl5/site_perl/5.32.1/HTTP/Message.pm
-usr/lib/perl5/site_perl/5.32.1/HTTP/Negotiate.pm
-#usr/lib/perl5/site_perl/5.32.1/HTTP/Request
-usr/lib/perl5/site_perl/5.32.1/HTTP/Request.pm
-usr/lib/perl5/site_perl/5.32.1/HTTP/Request/Common.pm
-usr/lib/perl5/site_perl/5.32.1/HTTP/Response.pm
-usr/lib/perl5/site_perl/5.32.1/HTTP/Status.pm
  #usr/lib/perl5/site_perl/5.32.1/LWP
  usr/lib/perl5/site_perl/5.32.1/LWP.pm
-#usr/lib/perl5/site_perl/5.32.1/LWP/Authen
+usr/lib/perl5/site_perl/5.32.1/LWP/Authen
  usr/lib/perl5/site_perl/5.32.1/LWP/Authen/Basic.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/Authen/Digest.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/Authen/Ntlm.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/ConnCache.pm
+#usr/lib/perl5/site_perl/5.32.1/LWP/Debug
  usr/lib/perl5/site_perl/5.32.1/LWP/Debug.pm
+usr/lib/perl5/site_perl/5.32.1/LWP/Debug/TraceHTTP.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/DebugFile.pm
-usr/lib/perl5/site_perl/5.32.1/LWP/MediaTypes.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/MemberMixin.pm
  #usr/lib/perl5/site_perl/5.32.1/LWP/Protocol
  usr/lib/perl5/site_perl/5.32.1/LWP/Protocol.pm
-usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/GHTTP.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/cpan.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/data.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/file.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/ftp.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/gopher.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/http.pm
-usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/http10.pm
-usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/https.pm
-usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/https10.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/loopback.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/mailto.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/nntp.pm
@@ -52,51 +25,20 @@ usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/nogo.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/RobotUA.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/Simple.pm
  usr/lib/perl5/site_perl/5.32.1/LWP/UserAgent.pm
-usr/lib/perl5/site_perl/5.32.1/LWP/media.types
-#usr/lib/perl5/site_perl/5.32.1/Net
-#usr/lib/perl5/site_perl/5.32.1/Net/HTTP
-usr/lib/perl5/site_perl/5.32.1/Net/HTTP.pm
-usr/lib/perl5/site_perl/5.32.1/Net/HTTP/Methods.pm
-usr/lib/perl5/site_perl/5.32.1/Net/HTTP/NB.pm
-usr/lib/perl5/site_perl/5.32.1/Net/HTTPS.pm
-#usr/lib/perl5/site_perl/5.32.1/WWW
-#usr/lib/perl5/site_perl/5.32.1/WWW/RobotRules
-usr/lib/perl5/site_perl/5.32.1/WWW/RobotRules.pm
-usr/lib/perl5/site_perl/5.32.1/WWW/RobotRules/AnyDBM_File.pm
-#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/libwww-perl
-#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/libwww-perl/.packlist
-#usr/lib/perl5/site_perl/5.32.1/lwpcook.pod
-#usr/lib/perl5/site_perl/5.32.1/lwptut.pod
-#usr/share/man/man3/Bundle::LWP.3
-#usr/share/man/man3/File::Listing.3
-#usr/share/man/man3/HTML::Form.3
-#usr/share/man/man3/HTTP::Cookies.3
-#usr/share/man/man3/HTTP::Cookies::Microsoft.3
-#usr/share/man/man3/HTTP::Cookies::Netscape.3
-#usr/share/man/man3/HTTP::Daemon.3
-#usr/share/man/man3/HTTP::Date.3
-#usr/share/man/man3/HTTP::Headers.3
-#usr/share/man/man3/HTTP::Headers::Util.3
-#usr/share/man/man3/HTTP::Message.3
-#usr/share/man/man3/HTTP::Negotiate.3
-#usr/share/man/man3/HTTP::Request.3
-#usr/share/man/man3/HTTP::Request::Common.3
-#usr/share/man/man3/HTTP::Response.3
-#usr/share/man/man3/HTTP::Status.3
+#usr/lib/perl5/site_perl/5.32.1/libwww
+#usr/lib/perl5/site_perl/5.32.1/libwww/lwpcook.pod
+#usr/lib/perl5/site_perl/5.32.1/libwww/lwptut.pod
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/libwww
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/libwww/perl
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/libwww/perl/.packlist
  #usr/share/man/man3/LWP.3
  #usr/share/man/man3/LWP::Authen::Ntlm.3
  #usr/share/man/man3/LWP::ConnCache.3
  #usr/share/man/man3/LWP::Debug.3
-#usr/share/man/man3/LWP::DebugFile.3
-#usr/share/man/man3/LWP::MediaTypes.3
  #usr/share/man/man3/LWP::MemberMixin.3
  #usr/share/man/man3/LWP::Protocol.3
  #usr/share/man/man3/LWP::RobotUA.3
  #usr/share/man/man3/LWP::Simple.3
  #usr/share/man/man3/LWP::UserAgent.3
-#usr/share/man/man3/Net::HTTP.3
-#usr/share/man/man3/Net::HTTP::NB.3
-#usr/share/man/man3/WWW::RobotRules.3
-#usr/share/man/man3/WWW::RobotRules::AnyDBM_File.3
-#usr/share/man/man3/lwpcook.3
-#usr/share/man/man3/lwptut.3
+#usr/share/man/man3/libwww::lwpcook.3
+#usr/share/man/man3/libwww::lwptut.3
diff --git a/config/rootfiles/common/lua b/config/rootfiles/common/lua

index 1839f7e1bc4f1ad4847dc9482b21057a59cf92e6..ac844ac033681143dfe75163796b1b150e986e1e 100644 (file)
--- a/config/rootfiles/common/lua
+++ b/config/rootfiles/common/lua
@@ -7,7 +7,7 @@ usr/bin/luac
  #usr/include/lualib.h
  #usr/lib/liblua.so
  usr/lib/liblua.so.5.4
-usr/lib/liblua.so.5.4.3
+usr/lib/liblua.so.5.4.4
  #usr/lib/lua
  #usr/lib/lua/5.4
  #usr/lib/pkgconfig/lua.pc
diff --git a/config/rootfiles/common/openssl b/config/rootfiles/common/openssl

index 345f487d7f12a770021c5784bd874cc46453c058..d690f5be0d6a4dfc3e510869c929a5f9a69301ab 100644 (file)
--- a/config/rootfiles/common/openssl
+++ b/config/rootfiles/common/openssl
@@ -3846,6 +3846,8 @@ usr/lib/libssl.so.1.1
  #usr/share/doc/openssl/html/man3/d2i_X509_REVOKED.html
  #usr/share/doc/openssl/html/man3/d2i_X509_SIG.html
  #usr/share/doc/openssl/html/man3/d2i_X509_VAL.html
+#usr/share/doc/openssl/html/man3/d2i_X509_bio.html
+#usr/share/doc/openssl/html/man3/d2i_X509_fp.html
  #usr/share/doc/openssl/html/man3/i2d_ACCESS_DESCRIPTION.html
  #usr/share/doc/openssl/html/man3/i2d_ADMISSIONS.html
  #usr/share/doc/openssl/html/man3/i2d_ADMISSION_SYNTAX.html
@@ -4040,6 +4042,8 @@ usr/lib/libssl.so.1.1
  #usr/share/doc/openssl/html/man3/i2d_X509_REVOKED.html
  #usr/share/doc/openssl/html/man3/i2d_X509_SIG.html
  #usr/share/doc/openssl/html/man3/i2d_X509_VAL.html
+#usr/share/doc/openssl/html/man3/i2d_X509_bio.html
+#usr/share/doc/openssl/html/man3/i2d_X509_fp.html
  #usr/share/doc/openssl/html/man3/i2d_re_X509_CRL_tbs.html
  #usr/share/doc/openssl/html/man3/i2d_re_X509_REQ_tbs.html
  #usr/share/doc/openssl/html/man3/i2d_re_X509_tbs.html
@@ -7819,6 +7823,8 @@ usr/lib/libssl.so.1.1
  #usr/share/man/man3/d2i_X509_REVOKED.3
  #usr/share/man/man3/d2i_X509_SIG.3
  #usr/share/man/man3/d2i_X509_VAL.3
+#usr/share/man/man3/d2i_X509_bio.3
+#usr/share/man/man3/d2i_X509_fp.3
  #usr/share/man/man3/i2d_ACCESS_DESCRIPTION.3
  #usr/share/man/man3/i2d_ADMISSIONS.3
  #usr/share/man/man3/i2d_ADMISSION_SYNTAX.3
@@ -8013,6 +8019,8 @@ usr/lib/libssl.so.1.1
  #usr/share/man/man3/i2d_X509_REVOKED.3
  #usr/share/man/man3/i2d_X509_SIG.3
  #usr/share/man/man3/i2d_X509_VAL.3
+#usr/share/man/man3/i2d_X509_bio.3
+#usr/share/man/man3/i2d_X509_fp.3
  #usr/share/man/man3/i2d_re_X509_CRL_tbs.3
  #usr/share/man/man3/i2d_re_X509_REQ_tbs.3
  #usr/share/man/man3/i2d_re_X509_tbs.3
diff --git a/config/rootfiles/common/perl-HTTP-Date b/config/rootfiles/common/perl-HTTP-Date

new file mode 100644 (file)

index 0000000..75c250b
--- /dev/null
+++ b/config/rootfiles/common/perl-HTTP-Date
@@ -0,0 +1,4 @@
+usr/lib/perl5/site_perl/5.32.1/HTTP/Date.pm
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/HTTP/Date
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/HTTP/Date/.packlist
+#usr/share/man/man3/HTTP::Date.3
diff --git a/config/rootfiles/common/perl-HTTP-Message b/config/rootfiles/common/perl-HTTP-Message

new file mode 100644 (file)

index 0000000..d52b1de
--- /dev/null
+++ b/config/rootfiles/common/perl-HTTP-Message
@@ -0,0 +1,26 @@
+#usr/lib/perl5/site_perl/5.32.1/HTTP
+usr/lib/perl5/site_perl/5.32.1/HTTP/Config.pm
+#usr/lib/perl5/site_perl/5.32.1/HTTP/Headers
+usr/lib/perl5/site_perl/5.32.1/HTTP/Headers.pm
+usr/lib/perl5/site_perl/5.32.1/HTTP/Headers/Auth.pm
+usr/lib/perl5/site_perl/5.32.1/HTTP/Headers/ETag.pm
+usr/lib/perl5/site_perl/5.32.1/HTTP/Headers/Util.pm
+usr/lib/perl5/site_perl/5.32.1/HTTP/Message.pm
+#usr/lib/perl5/site_perl/5.32.1/HTTP/Request
+usr/lib/perl5/site_perl/5.32.1/HTTP/Request.pm
+usr/lib/perl5/site_perl/5.32.1/HTTP/Request/Common.pm
+usr/lib/perl5/site_perl/5.32.1/HTTP/Response.pm
+usr/lib/perl5/site_perl/5.32.1/HTTP/Status.pm
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/HTTP
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/HTTP/Message
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/HTTP/Message/.packlist
+#usr/share/man/man3/HTTP::Config.3
+#usr/share/man/man3/HTTP::Headers.3
+#usr/share/man/man3/HTTP::Headers::Auth.3
+#usr/share/man/man3/HTTP::Headers::ETag.3
+#usr/share/man/man3/HTTP::Headers::Util.3
+#usr/share/man/man3/HTTP::Message.3
+#usr/share/man/man3/HTTP::Request.3
+#usr/share/man/man3/HTTP::Request::Common.3
+#usr/share/man/man3/HTTP::Response.3
+#usr/share/man/man3/HTTP::Status.3
diff --git a/config/rootfiles/common/perl-LWP-Protocol-https b/config/rootfiles/common/perl-LWP-Protocol-https

new file mode 100644 (file)

index 0000000..9457d27
--- /dev/null
+++ b/config/rootfiles/common/perl-LWP-Protocol-https
@@ -0,0 +1,6 @@
+usr/lib/perl5/site_perl/5.32.1/LWP/Protocol/https.pm
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/LWP
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/LWP/Protocol
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/LWP/Protocol/https
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/LWP/Protocol/https/.packlist
+#usr/share/man/man3/LWP::Protocol::https.3
diff --git a/config/rootfiles/common/perl-Net-HTTP b/config/rootfiles/common/perl-Net-HTTP

new file mode 100644 (file)

index 0000000..4c09cd6
--- /dev/null
+++ b/config/rootfiles/common/perl-Net-HTTP
@@ -0,0 +1,11 @@
+#usr/lib/perl5/site_perl/5.32.1/Net/HTTP
+usr/lib/perl5/site_perl/5.32.1/Net/HTTP.pm
+usr/lib/perl5/site_perl/5.32.1/Net/HTTP/Methods.pm
+usr/lib/perl5/site_perl/5.32.1/Net/HTTP/NB.pm
+usr/lib/perl5/site_perl/5.32.1/Net/HTTPS.pm
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Net/HTTP
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Net/HTTP/.packlist
+#usr/share/man/man3/Net::HTTP.3
+#usr/share/man/man3/Net::HTTP::Methods.3
+#usr/share/man/man3/Net::HTTP::NB.3
+#usr/share/man/man3/Net::HTTPS.3
diff --git a/config/rootfiles/common/perl-Try-Tiny b/config/rootfiles/common/perl-Try-Tiny

new file mode 100644 (file)

index 0000000..bb259b5
--- /dev/null
+++ b/config/rootfiles/common/perl-Try-Tiny
@@ -0,0 +1,6 @@
+#usr/lib/perl5/site_perl/5.32.1/Try
+usr/lib/perl5/site_perl/5.32.1/Try/Tiny.pm
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Try
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Try/Tiny
+#usr/lib/perl5/site_perl/5.32.1/xxxMACHINExxx-linux-thread-multi/auto/Try/Tiny/.packlist
+#usr/share/man/man3/Try::Tiny.3
diff --git a/config/rootfiles/common/poppler b/config/rootfiles/common/poppler

index 546e8cb77816bc5b26c3f3cb9a1c7b6b6a082af5..8bd35c272ac61c9854db3d391ec9e27a95929b11 100644 (file)
--- a/config/rootfiles/common/poppler
+++ b/config/rootfiles/common/poppler
@@ -31,6 +31,8 @@ usr/bin/pdfunite
  #usr/include/poppler/Dict.h
  #usr/include/poppler/Error.h
  #usr/include/poppler/ErrorCodes.h
+#usr/include/poppler/FDPDFDocBuilder.h
+#usr/include/poppler/FILECacheLoader.h
  #usr/include/poppler/FileSpec.h
  #usr/include/poppler/FontEncodingTables.h
  #usr/include/poppler/FontInfo.h
@@ -74,8 +76,6 @@ usr/bin/pdfunite
  #usr/include/poppler/SecurityHandler.h
  #usr/include/poppler/Sound.h
  #usr/include/poppler/SplashOutputDev.h
-#usr/include/poppler/StdinCachedFile.h
-#usr/include/poppler/StdinPDFDocBuilder.h
  #usr/include/poppler/Stream-CCITT.h
  #usr/include/poppler/Stream.h
  #usr/include/poppler/StructElement.h
@@ -171,10 +171,10 @@ usr/lib/libpoppler-cpp.so.0
  usr/lib/libpoppler-cpp.so.0.9.0
  #usr/lib/libpoppler-glib.so
  usr/lib/libpoppler-glib.so.8
-usr/lib/libpoppler-glib.so.8.21.0
+usr/lib/libpoppler-glib.so.8.23.0
  #usr/lib/libpoppler.so
-usr/lib/libpoppler.so.115
-usr/lib/libpoppler.so.115.0.0
+usr/lib/libpoppler.so.118
+usr/lib/libpoppler.so.118.0.0
  #usr/lib/pkgconfig/poppler-cpp.pc
  #usr/lib/pkgconfig/poppler-glib.pc
  #usr/lib/pkgconfig/poppler.pc
diff --git a/config/rootfiles/common/sudo b/config/rootfiles/common/sudo

index 80e83efa472f5f76d0195fd9dfa0c3d18f95b09a..1cb0d2bf74a9a8b631784c0adf13eb126ebe5743 100644 (file)
--- a/config/rootfiles/common/sudo
+++ b/config/rootfiles/common/sudo
@@ -30,15 +30,18 @@ usr/lib/sudo/system_group.so
  #usr/sbin/sudo_sendlog
  usr/sbin/visudo
  #usr/share/doc/sudo
-#usr/share/doc/sudo/CONTRIBUTORS
+#usr/share/doc/sudo/CONTRIBUTING.md
+#usr/share/doc/sudo/CONTRIBUTORS.md
  #usr/share/doc/sudo/ChangeLog
-#usr/share/doc/sudo/HISTORY
-#usr/share/doc/sudo/LICENSE
+#usr/share/doc/sudo/HISTORY.md
+#usr/share/doc/sudo/LICENSE.md
  #usr/share/doc/sudo/NEWS
-#usr/share/doc/sudo/README
-#usr/share/doc/sudo/TROUBLESHOOTING
-#usr/share/doc/sudo/UPGRADE
+#usr/share/doc/sudo/README.md
+#usr/share/doc/sudo/SECURITY.md
+#usr/share/doc/sudo/TROUBLESHOOTING.md
+#usr/share/doc/sudo/UPGRADE.md
  #usr/share/doc/sudo/examples
+#usr/share/doc/sudo/examples/cvtsudoers.conf
  #usr/share/doc/sudo/examples/pam.conf
  #usr/share/doc/sudo/examples/sudo.conf
  #usr/share/doc/sudo/examples/sudo_logsrvd.conf
@@ -58,8 +61,10 @@ usr/sbin/visudo
  #usr/share/locale/eo/LC_MESSAGES/sudo.mo
  #usr/share/locale/eo/LC_MESSAGES/sudoers.mo
  #usr/share/locale/es/LC_MESSAGES/sudo.mo
+#usr/share/locale/es/LC_MESSAGES/sudoers.mo
  #usr/share/locale/eu/LC_MESSAGES/sudo.mo
  #usr/share/locale/eu/LC_MESSAGES/sudoers.mo
+#usr/share/locale/fa/LC_MESSAGES/sudo.mo
  #usr/share/locale/fi/LC_MESSAGES/sudo.mo
  #usr/share/locale/fi/LC_MESSAGES/sudoers.mo
  #usr/share/locale/fr/LC_MESSAGES/sudo.mo
diff --git a/config/rootfiles/common/x86_64/binutils b/config/rootfiles/common/x86_64/binutils

index 227841c6440928ff416bfe6644669e47b9a90629..1b342742501c1729543137c3b165d39d1a3a8adc 100644 (file)
--- a/config/rootfiles/common/x86_64/binutils
+++ b/config/rootfiles/common/x86_64/binutils
@@ -16,7 +16,6 @@ usr/bin/strings
  #usr/bin/strip
  #usr/include/ansidecl.h
  #usr/include/bfd.h
-#usr/include/bfd_stdint.h
  #usr/include/bfdlink.h
  #usr/include/ctf-api.h
  #usr/include/ctf.h
@@ -160,7 +159,7 @@ usr/bin/strings
  #usr/lib/ldscripts/elf_x86_64.xu
  #usr/lib/ldscripts/elf_x86_64.xw
  #usr/lib/ldscripts/elf_x86_64.xwe
-usr/lib/libbfd-2.36.1.so
+usr/lib/libbfd-2.37.so
  #usr/lib/libbfd.a
  #usr/lib/libbfd.la
  #usr/lib/libbfd.so
@@ -174,7 +173,7 @@ usr/lib/libctf-nobfd.so.0.0.0
  #usr/lib/libctf.so
  usr/lib/libctf.so.0
  usr/lib/libctf.so.0.0.0
-usr/lib/libopcodes-2.36.1.so
+usr/lib/libopcodes-2.37.so
  #usr/lib/libopcodes.a
  #usr/lib/libopcodes.la
  #usr/lib/libopcodes.so
diff --git a/config/rootfiles/common/x86_64/glibc b/config/rootfiles/common/x86_64/glibc

index 74f7e38fd360d073fac09c4368bffdd06793cbf4..5014f8a88f9d6d0e6836df6000258abe193d7066 100644 (file)
--- a/config/rootfiles/common/x86_64/glibc
+++ b/config/rootfiles/common/x86_64/glibc
@@ -1,51 +1,33 @@
  #etc/ld.so.cache
  etc/rpc
-lib/ld-2.33.so
  lib/ld-linux-x86-64.so.2
-lib/libBrokenLocale-2.33.so
  lib/libBrokenLocale.so.1
-#lib/libSegFault.so
-lib/libanl-2.33.so
  lib/libanl.so.1
-lib/libc-2.33.so
  lib/libc.so.6
-lib/libdl-2.33.so
+#lib/libc_malloc_debug.so.0
  lib/libdl.so.2
-lib/libm-2.33.so
  lib/libm.so.6
  #lib/libmemusage.so
-lib/libmvec-2.33.so
  lib/libmvec.so.1
-lib/libnsl-2.33.so
  lib/libnsl.so.1
-lib/libnss_compat-2.33.so
  lib/libnss_compat.so.2
-lib/libnss_db-2.33.so
  lib/libnss_db.so.2
-lib/libnss_dns-2.33.so
  lib/libnss_dns.so.2
-lib/libnss_files-2.33.so
  lib/libnss_files.so.2
-lib/libnss_hesiod-2.33.so
  lib/libnss_hesiod.so.2
  #lib/libpcprofile.so
-lib/libpthread-2.33.so
  lib/libpthread.so.0
-lib/libresolv-2.33.so
  lib/libresolv.so.2
-lib/librt-2.33.so
  lib/librt.so.1
-lib/libthread_db-1.0.so
  lib/libthread_db.so.1
-lib/libutil-2.33.so
  lib/libutil.so.1
  sbin/ldconfig
  #sbin/sln
-#usr/bin/catchsegv
  #usr/bin/gencat
  usr/bin/getconf
  usr/bin/getent
  #usr/bin/iconv
+usr/bin/ld.so
  usr/bin/ldd
  usr/bin/locale
  #usr/bin/localedef
@@ -76,12 +58,14 @@ usr/bin/locale
  #usr/include/bits
  #usr/include/bits/a.out.h
  #usr/include/bits/argp-ldbl.h
+#usr/include/bits/atomic_wide_counter.h
  #usr/include/bits/byteswap.h
  #usr/include/bits/cmathcalls.h
  #usr/include/bits/confname.h
  #usr/include/bits/cpu-set.h
  #usr/include/bits/dirent.h
  #usr/include/bits/dirent_ext.h
+#usr/include/bits/dl_find_object.h
  #usr/include/bits/dlfcn.h
  #usr/include/bits/elfclass.h
  #usr/include/bits/endian.h
@@ -119,6 +103,7 @@ usr/bin/locale
  #usr/include/bits/libc-header-start.h
  #usr/include/bits/libm-simd-decl-stubs.h
  #usr/include/bits/link.h
+#usr/include/bits/link_lavcurrent.h
  #usr/include/bits/local_lim.h
  #usr/include/bits/locale.h
  #usr/include/bits/long-double.h
@@ -137,6 +122,8 @@ usr/bin/locale
  #usr/include/bits/msq.h
  #usr/include/bits/netdb.h
  #usr/include/bits/param.h
+#usr/include/bits/platform
+#usr/include/bits/platform/x86.h
  #usr/include/bits/poll.h
  #usr/include/bits/poll2.h
  #usr/include/bits/posix1_lim.h
@@ -147,10 +134,13 @@ usr/bin/locale
  #usr/include/bits/procfs-id.h
  #usr/include/bits/procfs-prregset.h
  #usr/include/bits/procfs.h
+#usr/include/bits/pthread_stack_min-dynamic.h
+#usr/include/bits/pthread_stack_min.h
  #usr/include/bits/pthreadtypes-arch.h
  #usr/include/bits/pthreadtypes.h
  #usr/include/bits/ptrace-shared.h
  #usr/include/bits/resource.h
+#usr/include/bits/rseq.h
  #usr/include/bits/sched.h
  #usr/include/bits/select.h
  #usr/include/bits/select2.h
@@ -171,6 +161,7 @@ usr/bin/locale
  #usr/include/bits/signum-arch.h
  #usr/include/bits/signum-generic.h
  #usr/include/bits/sigstack.h
+#usr/include/bits/sigstksz.h
  #usr/include/bits/sigthread.h
  #usr/include/bits/sockaddr.h
  #usr/include/bits/socket-constants.h
@@ -199,6 +190,7 @@ usr/bin/locale
  #usr/include/bits/struct_mutex.h
  #usr/include/bits/struct_rwlock.h
  #usr/include/bits/struct_stat.h
+#usr/include/bits/struct_stat_time64_helper.h
  #usr/include/bits/syscall.h
  #usr/include/bits/syslog-ldbl.h
  #usr/include/bits/syslog-path.h
@@ -247,11 +239,17 @@ usr/bin/locale
  #usr/include/bits/types/struct___jmp_buf_tag.h
  #usr/include/bits/types/struct_iovec.h
  #usr/include/bits/types/struct_itimerspec.h
+#usr/include/bits/types/struct_msqid64_ds.h
+#usr/include/bits/types/struct_msqid64_ds_helper.h
  #usr/include/bits/types/struct_msqid_ds.h
  #usr/include/bits/types/struct_osockaddr.h
  #usr/include/bits/types/struct_rusage.h
  #usr/include/bits/types/struct_sched_param.h
+#usr/include/bits/types/struct_semid64_ds.h
+#usr/include/bits/types/struct_semid64_ds_helper.h
  #usr/include/bits/types/struct_semid_ds.h
+#usr/include/bits/types/struct_shmid64_ds.h
+#usr/include/bits/types/struct_shmid64_ds_helper.h
  #usr/include/bits/types/struct_shmid_ds.h
  #usr/include/bits/types/struct_sigstack.h
  #usr/include/bits/types/struct_statx.h
@@ -294,6 +292,7 @@ usr/bin/locale
  #usr/include/error.h
  #usr/include/execinfo.h
  #usr/include/fcntl.h
+#usr/include/features-time64.h
  #usr/include/features.h
  #usr/include/fenv.h
  #usr/include/finclude
@@ -465,6 +464,7 @@ usr/bin/locale
  #usr/include/sys/reboot.h
  #usr/include/sys/reg.h
  #usr/include/sys/resource.h
+#usr/include/sys/rseq.h
  #usr/include/sys/select.h
  #usr/include/sys/sem.h
  #usr/include/sys/sendfile.h
@@ -783,6 +783,8 @@ usr/lib/gconv
  #usr/lib/gconv/UTF-7.so
  #usr/lib/gconv/VISCII.so
  #usr/lib/gconv/gconv-modules
+#usr/lib/gconv/gconv-modules.d
+#usr/lib/gconv/gconv-modules.d/gconv-modules-extra.conf
  #usr/lib/gconv/libCNS.so
  #usr/lib/gconv/libGB.so
  #usr/lib/gconv/libISOIR165.so
@@ -795,17 +797,18 @@ usr/lib/gconv
  #usr/lib/glibc/getconf/POSIX_V6_LP64_OFF64
  #usr/lib/glibc/getconf/POSIX_V7_LP64_OFF64
  #usr/lib/glibc/getconf/XBS5_LP64_OFF64
+#usr/lib/grcrt1.o
  #usr/lib/libBrokenLocale.a
  #usr/lib/libBrokenLocale.so
  #usr/lib/libanl.a
  #usr/lib/libanl.so
  #usr/lib/libc.a
  #usr/lib/libc.so
+#usr/lib/libc_malloc_debug.so
  #usr/lib/libc_nonshared.a
  #usr/lib/libdl.a
-#usr/lib/libdl.so
  #usr/lib/libg.a
-#usr/lib/libm-2.33.a
+#usr/lib/libm-2.35.a
  #usr/lib/libm.a
  #usr/lib/libm.so
  #usr/lib/libmcheck.a
@@ -813,19 +816,28 @@ usr/lib/gconv
  #usr/lib/libmvec.so
  #usr/lib/libnss_compat.so
  #usr/lib/libnss_db.so
-#usr/lib/libnss_dns.so
-#usr/lib/libnss_files.so
  #usr/lib/libnss_hesiod.so
  #usr/lib/libpthread.a
-#usr/lib/libpthread.so
  #usr/lib/libresolv.a
  #usr/lib/libresolv.so
  #usr/lib/librt.a
-#usr/lib/librt.so
  #usr/lib/libthread_db.so
  #usr/lib/libutil.a
-#usr/lib/libutil.so
  usr/lib/locale
+#usr/lib/locale/C.utf8
+#usr/lib/locale/C.utf8/LC_ADDRESS
+#usr/lib/locale/C.utf8/LC_COLLATE
+#usr/lib/locale/C.utf8/LC_CTYPE
+#usr/lib/locale/C.utf8/LC_IDENTIFICATION
+#usr/lib/locale/C.utf8/LC_MEASUREMENT
+#usr/lib/locale/C.utf8/LC_MESSAGES
+#usr/lib/locale/C.utf8/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/C.utf8/LC_MONETARY
+#usr/lib/locale/C.utf8/LC_NAME
+#usr/lib/locale/C.utf8/LC_NUMERIC
+#usr/lib/locale/C.utf8/LC_PAPER
+#usr/lib/locale/C.utf8/LC_TELEPHONE
+#usr/lib/locale/C.utf8/LC_TIME
  #usr/lib/locale/aa_DJ
  #usr/lib/locale/aa_DJ.utf8
  #usr/lib/locale/aa_DJ.utf8/LC_ADDRESS
@@ -7658,6 +7670,7 @@ usr/lib/locale
  #usr/lib/locale/zu_ZA/LC_PAPER
  #usr/lib/locale/zu_ZA/LC_TELEPHONE
  #usr/lib/locale/zu_ZA/LC_TIME
+#usr/lib/rcrt1.o
  #usr/sbin/iconvconfig
  #usr/sbin/nscd
  #usr/sbin/zic
@@ -7897,11 +7910,13 @@ usr/lib/locale
  #usr/share/i18n/charmaps/VISCII.gz
  #usr/share/i18n/charmaps/WINDOWS-31J.gz
  #usr/share/i18n/locales
+#usr/share/i18n/locales/C
  #usr/share/i18n/locales/POSIX
  #usr/share/i18n/locales/aa_DJ
  #usr/share/i18n/locales/aa_ER
  #usr/share/i18n/locales/aa_ER@saaho
  #usr/share/i18n/locales/aa_ET
+#usr/share/i18n/locales/ab_GE
  #usr/share/i18n/locales/af_ZA
  #usr/share/i18n/locales/agr_PE
  #usr/share/i18n/locales/ak_GH
@@ -8263,6 +8278,7 @@ usr/lib/locale
  #usr/share/info/libc.info-15
  #usr/share/info/libc.info-16
  #usr/share/info/libc.info-17
+#usr/share/info/libc.info-18
  #usr/share/info/libc.info-2
  #usr/share/info/libc.info-3
  #usr/share/info/libc.info-4
@@ -8383,7 +8399,5 @@ usr/lib/locale
  #usr/share/locale/zh_TW
  #usr/share/locale/zh_TW/LC_MESSAGES
  #usr/share/locale/zh_TW/LC_MESSAGES/libc.mo
-#var/cache/ldconfig
-#var/cache/ldconfig/aux-cache
  #var/db
  #var/db/Makefile
diff --git a/config/rootfiles/common/zstd b/config/rootfiles/common/zstd

index c0f4eee731927255425aabde2256ab77b6048ae4..b4a2dbd9510fc1a93d0e70d897388ad56ebf2f30 100644 (file)
--- a/config/rootfiles/common/zstd
+++ b/config/rootfiles/common/zstd
@@ -10,7 +10,7 @@ usr/bin/zstdmt
  #usr/lib/libzstd.a
  #usr/lib/libzstd.so
  usr/lib/libzstd.so.1
-usr/lib/libzstd.so.1.5.1
+usr/lib/libzstd.so.1.5.2
  #usr/lib/pkgconfig/libzstd.pc
  #usr/share/man/man1/unzstd.1
  #usr/share/man/man1/zstd.1
diff --git a/config/rootfiles/core/164/core-files b/config/rootfiles/core/165/core-files

similarity index 100%

rename from config/rootfiles/core/164/core-files

rename to config/rootfiles/core/165/core-files
diff --git a/config/rootfiles/core/164/exclude b/config/rootfiles/core/165/exclude

similarity index 100%

rename from config/rootfiles/core/164/exclude

rename to config/rootfiles/core/165/exclude
diff --git a/config/rootfiles/core/165/filelists/aarch64/binutils b/config/rootfiles/core/165/filelists/aarch64/binutils

new file mode 120000 (symlink)

index 0000000..6da9d39
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/aarch64/binutils
@@ -0,0 +1 @@
+../../../../common/aarch64/binutils
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/aarch64/gcc b/config/rootfiles/core/165/filelists/aarch64/gcc

new file mode 120000 (symlink)

index 0000000..97678cc
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/aarch64/gcc
@@ -0,0 +1 @@
+../../../../common/aarch64/gcc
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/aarch64/glibc b/config/rootfiles/core/165/filelists/aarch64/glibc

new file mode 120000 (symlink)

index 0000000..d13849f
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/aarch64/glibc
@@ -0,0 +1 @@
+../../../../common/aarch64/glibc
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/armv6l/binutils b/config/rootfiles/core/165/filelists/armv6l/binutils

new file mode 120000 (symlink)

index 0000000..e4a1472
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/armv6l/binutils
@@ -0,0 +1 @@
+../../../../common/armv6l/binutils
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/armv6l/gcc b/config/rootfiles/core/165/filelists/armv6l/gcc

new file mode 120000 (symlink)

index 0000000..b8351ad
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/armv6l/gcc
@@ -0,0 +1 @@
+../../../../common/armv6l/gcc
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/armv6l/glibc b/config/rootfiles/core/165/filelists/armv6l/glibc

new file mode 120000 (symlink)

index 0000000..262a394
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/armv6l/glibc
@@ -0,0 +1 @@
+../../../../common/armv6l/glibc
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/bash b/config/rootfiles/core/165/filelists/bash

new file mode 120000 (symlink)

index 0000000..de970cb
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/bash
@@ -0,0 +1 @@
+../../../common/bash
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/curl b/config/rootfiles/core/165/filelists/curl

new file mode 120000 (symlink)

index 0000000..4b84bef
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/curl
@@ -0,0 +1 @@
+../../../common/curl
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/ethtool b/config/rootfiles/core/165/filelists/ethtool

new file mode 120000 (symlink)

index 0000000..494a53e
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/ethtool
@@ -0,0 +1 @@
+../../../common/ethtool
+\ No newline at end of file
diff --git a/config/rootfiles/core/164/filelists/expat b/config/rootfiles/core/165/filelists/expat

similarity index 100%

rename from config/rootfiles/core/164/filelists/expat

rename to config/rootfiles/core/165/filelists/expat
diff --git a/config/rootfiles/core/165/filelists/files b/config/rootfiles/core/165/filelists/files

new file mode 100644 (file)

index 0000000..bc4d995
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/files
@@ -0,0 +1,10 @@
+opt/pakfire/etc/pakfire.conf
+opt/pakfire/lib/functions.pl
+srv/web/ipfire/cgi-bin/backup.cgi
+srv/web/ipfire/cgi-bin/firewall.cgi
+srv/web/ipfire/cgi-bin/media.cgi
+srv/web/ipfire/html/themes/ipfire/include/css/style.css
+usr/lib/firewall/firewall-lib.pl
+usr/sbin/setup
+var/ipfire/ids-functions.pl
+var/ipfire/main/manualpages
diff --git a/config/rootfiles/core/165/filelists/glib b/config/rootfiles/core/165/filelists/glib

new file mode 120000 (symlink)

index 0000000..4466574
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/glib
@@ -0,0 +1 @@
+../../../common/glib
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/iproute2 b/config/rootfiles/core/165/filelists/iproute2

new file mode 120000 (symlink)

index 0000000..05f0f71
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/iproute2
@@ -0,0 +1 @@
+../../../common/iproute2
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/libcap b/config/rootfiles/core/165/filelists/libcap

new file mode 120000 (symlink)

index 0000000..ed67d95
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/libcap
@@ -0,0 +1 @@
+../../../common/libcap
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/libgpg-error b/config/rootfiles/core/165/filelists/libgpg-error

new file mode 120000 (symlink)

index 0000000..cad4313
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/libgpg-error
@@ -0,0 +1 @@
+../../../common/libgpg-error
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/libwww-perl b/config/rootfiles/core/165/filelists/libwww-perl

new file mode 120000 (symlink)

index 0000000..ad77c8c
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/libwww-perl
@@ -0,0 +1 @@
+../../../common/libwww-perl
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/lua b/config/rootfiles/core/165/filelists/lua

new file mode 120000 (symlink)

index 0000000..951f661
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/lua
@@ -0,0 +1 @@
+../../../common/lua
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/mdadm b/config/rootfiles/core/165/filelists/mdadm

new file mode 120000 (symlink)

index 0000000..465808b
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/mdadm
@@ -0,0 +1 @@
+../../../common/mdadm
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/openssl b/config/rootfiles/core/165/filelists/openssl

new file mode 120000 (symlink)

index 0000000..e011a92
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/openssl
@@ -0,0 +1 @@
+../../../common/openssl
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/p11-kit b/config/rootfiles/core/165/filelists/p11-kit

new file mode 120000 (symlink)

index 0000000..e652deb
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/p11-kit
@@ -0,0 +1 @@
+../../../common/p11-kit
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/perl-HTTP-Date b/config/rootfiles/core/165/filelists/perl-HTTP-Date

new file mode 120000 (symlink)

index 0000000..c09f49e
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/perl-HTTP-Date
@@ -0,0 +1 @@
+../../../common/perl-HTTP-Date
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/perl-HTTP-Message b/config/rootfiles/core/165/filelists/perl-HTTP-Message

new file mode 120000 (symlink)

index 0000000..13a7cf8
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/perl-HTTP-Message
@@ -0,0 +1 @@
+../../../common/perl-HTTP-Message
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/perl-LWP-Protocol-https b/config/rootfiles/core/165/filelists/perl-LWP-Protocol-https

new file mode 120000 (symlink)

index 0000000..b5b0354
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/perl-LWP-Protocol-https
@@ -0,0 +1 @@
+../../../common/perl-LWP-Protocol-https
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/perl-Net-HTTP b/config/rootfiles/core/165/filelists/perl-Net-HTTP

new file mode 120000 (symlink)

index 0000000..c6ab242
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/perl-Net-HTTP
@@ -0,0 +1 @@
+../../../common/perl-Net-HTTP
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/perl-Try-Tiny b/config/rootfiles/core/165/filelists/perl-Try-Tiny

new file mode 120000 (symlink)

index 0000000..3caec99
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/perl-Try-Tiny
@@ -0,0 +1 @@
+../../../common/perl-Try-Tiny
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/poppler b/config/rootfiles/core/165/filelists/poppler

new file mode 120000 (symlink)

index 0000000..39aa6c2
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/poppler
@@ -0,0 +1 @@
+../../../common/poppler
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/sqlite b/config/rootfiles/core/165/filelists/sqlite

new file mode 120000 (symlink)

index 0000000..4ea5697
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/sqlite
@@ -0,0 +1 @@
+../../../common/sqlite
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/sudo b/config/rootfiles/core/165/filelists/sudo

new file mode 120000 (symlink)

index 0000000..0d3c45e
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/sudo
@@ -0,0 +1 @@
+../../../common/sudo
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/x86_64/binutils b/config/rootfiles/core/165/filelists/x86_64/binutils

new file mode 120000 (symlink)

index 0000000..7d0fda5
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/x86_64/binutils
@@ -0,0 +1 @@
+../../../../common/x86_64/binutils
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/x86_64/gcc b/config/rootfiles/core/165/filelists/x86_64/gcc

new file mode 120000 (symlink)

index 0000000..d1616d3
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/x86_64/gcc
@@ -0,0 +1 @@
+../../../../common/x86_64/gcc
+\ No newline at end of file
diff --git a/config/rootfiles/core/165/filelists/x86_64/glibc b/config/rootfiles/core/165/filelists/x86_64/glibc

new file mode 120000 (symlink)

index 0000000..1119099
--- /dev/null
+++ b/config/rootfiles/core/165/filelists/x86_64/glibc
@@ -0,0 +1 @@
+../../../../common/x86_64/glibc
+\ No newline at end of file
diff --git a/config/rootfiles/core/164/filelists/zstd b/config/rootfiles/core/165/filelists/zstd

similarity index 100%

rename from config/rootfiles/core/164/filelists/zstd

rename to config/rootfiles/core/165/filelists/zstd
diff --git a/config/rootfiles/core/165/update.sh b/config/rootfiles/core/165/update.sh

new file mode 100644 (file)

index 0000000..ef7ba52
--- /dev/null
+++ b/config/rootfiles/core/165/update.sh
@@ -0,0 +1,88 @@
+#!/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) 2022 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=165
+
+exit_with_error() {
+       # Set last succesfull installed core.
+       echo $(($core-1)) > /opt/pakfire/db/core/mine
+       # force fsck at next boot, this may fix free space on xfs
+       touch /forcefsck
+       # don't start pakfire again at error
+       killall -KILL pak_update
+       /usr/bin/logger -p syslog.emerg -t ipfire \
+               "core-update-${core}: $1"
+       exit $2
+}
+
+# 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
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 100000 ]; then
+       exit_with_error "ERROR cannot update because not enough free space on root." 2
+       exit 2
+fi
+
+# Remove files
+
+# Stop services
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Filesytem cleanup
+/usr/local/bin/filesystem-cleanup
+
+# Start services
+telinit u
+
+# 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
diff --git a/config/rootfiles/oldcore/164/core-files b/config/rootfiles/oldcore/164/core-files

new file mode 100644 (file)

index 0000000..0dec37e
--- /dev/null
+++ b/config/rootfiles/oldcore/164/core-files
@@ -0,0 +1,5 @@
+etc/system-release
+etc/issue
+etc/os-release
+srv/web/ipfire/cgi-bin/credits.cgi
+var/ipfire/langs
diff --git a/config/rootfiles/oldcore/164/exclude b/config/rootfiles/oldcore/164/exclude

new file mode 100644 (file)

index 0000000..818039f
--- /dev/null
+++ b/config/rootfiles/oldcore/164/exclude
@@ -0,0 +1,34 @@
+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
+usr/share/xt_geoip
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/firewall/locationblock
+var/ipfire/fwhosts/customlocationgrp
+var/ipfire/ovpn
+var/ipfire/urlfilter/blacklist
+var/ipfire/urlfilter/settings
+var/lib/alternatives
+var/lib/location/database.db
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/164/filelists/aarch64/linux b/config/rootfiles/oldcore/164/filelists/aarch64/linux

similarity index 100%

rename from config/rootfiles/core/164/filelists/aarch64/linux

rename to config/rootfiles/oldcore/164/filelists/aarch64/linux
diff --git a/config/rootfiles/core/164/filelists/aarch64/linux-initrd b/config/rootfiles/oldcore/164/filelists/aarch64/linux-initrd

similarity index 100%

rename from config/rootfiles/core/164/filelists/aarch64/linux-initrd

rename to config/rootfiles/oldcore/164/filelists/aarch64/linux-initrd
diff --git a/config/rootfiles/core/164/filelists/aarch64/u-boot b/config/rootfiles/oldcore/164/filelists/aarch64/u-boot

similarity index 100%

rename from config/rootfiles/core/164/filelists/aarch64/u-boot

rename to config/rootfiles/oldcore/164/filelists/aarch64/u-boot
diff --git a/config/rootfiles/core/164/filelists/armv6l/linux b/config/rootfiles/oldcore/164/filelists/armv6l/linux

similarity index 100%

rename from config/rootfiles/core/164/filelists/armv6l/linux

rename to config/rootfiles/oldcore/164/filelists/armv6l/linux
diff --git a/config/rootfiles/core/164/filelists/armv6l/linux-initrd b/config/rootfiles/oldcore/164/filelists/armv6l/linux-initrd

similarity index 100%

rename from config/rootfiles/core/164/filelists/armv6l/linux-initrd

rename to config/rootfiles/oldcore/164/filelists/armv6l/linux-initrd
diff --git a/config/rootfiles/core/164/filelists/bind b/config/rootfiles/oldcore/164/filelists/bind

similarity index 100%

rename from config/rootfiles/core/164/filelists/bind

rename to config/rootfiles/oldcore/164/filelists/bind
diff --git a/config/rootfiles/core/164/filelists/core-files b/config/rootfiles/oldcore/164/filelists/core-files

similarity index 100%

rename from config/rootfiles/core/164/filelists/core-files

rename to config/rootfiles/oldcore/164/filelists/core-files
diff --git a/config/rootfiles/core/164/filelists/diffutils b/config/rootfiles/oldcore/164/filelists/diffutils

similarity index 100%

rename from config/rootfiles/core/164/filelists/diffutils

rename to config/rootfiles/oldcore/164/filelists/diffutils
diff --git a/config/rootfiles/oldcore/164/filelists/expat b/config/rootfiles/oldcore/164/filelists/expat

new file mode 120000 (symlink)

index 0000000..e1923cf
--- /dev/null
+++ b/config/rootfiles/oldcore/164/filelists/expat
@@ -0,0 +1 @@
+../../../common/expat
+\ No newline at end of file
diff --git a/config/rootfiles/core/164/filelists/files b/config/rootfiles/oldcore/164/filelists/files

similarity index 100%

rename from config/rootfiles/core/164/filelists/files

rename to config/rootfiles/oldcore/164/filelists/files
diff --git a/config/rootfiles/core/164/filelists/freetype b/config/rootfiles/oldcore/164/filelists/freetype

similarity index 100%

rename from config/rootfiles/core/164/filelists/freetype

rename to config/rootfiles/oldcore/164/filelists/freetype
diff --git a/config/rootfiles/core/164/filelists/gdbm b/config/rootfiles/oldcore/164/filelists/gdbm

similarity index 100%

rename from config/rootfiles/core/164/filelists/gdbm

rename to config/rootfiles/oldcore/164/filelists/gdbm
diff --git a/config/rootfiles/core/164/filelists/hdparm b/config/rootfiles/oldcore/164/filelists/hdparm

similarity index 100%

rename from config/rootfiles/core/164/filelists/hdparm

rename to config/rootfiles/oldcore/164/filelists/hdparm
diff --git a/config/rootfiles/core/164/filelists/ids-ruleset-sources b/config/rootfiles/oldcore/164/filelists/ids-ruleset-sources

similarity index 100%

rename from config/rootfiles/core/164/filelists/ids-ruleset-sources

rename to config/rootfiles/oldcore/164/filelists/ids-ruleset-sources
diff --git a/config/rootfiles/core/164/filelists/jq b/config/rootfiles/oldcore/164/filelists/jq

similarity index 100%

rename from config/rootfiles/core/164/filelists/jq

rename to config/rootfiles/oldcore/164/filelists/jq
diff --git a/config/rootfiles/core/164/filelists/kmod b/config/rootfiles/oldcore/164/filelists/kmod

similarity index 100%

rename from config/rootfiles/core/164/filelists/kmod

rename to config/rootfiles/oldcore/164/filelists/kmod
diff --git a/config/rootfiles/core/164/filelists/libusb b/config/rootfiles/oldcore/164/filelists/libusb

similarity index 100%

rename from config/rootfiles/core/164/filelists/libusb

rename to config/rootfiles/oldcore/164/filelists/libusb
diff --git a/config/rootfiles/core/164/filelists/libxml2 b/config/rootfiles/oldcore/164/filelists/libxml2

similarity index 100%

rename from config/rootfiles/core/164/filelists/libxml2

rename to config/rootfiles/oldcore/164/filelists/libxml2
diff --git a/config/rootfiles/core/164/filelists/libxslt b/config/rootfiles/oldcore/164/filelists/libxslt

similarity index 100%

rename from config/rootfiles/core/164/filelists/libxslt

rename to config/rootfiles/oldcore/164/filelists/libxslt
diff --git a/config/rootfiles/core/164/filelists/libyang b/config/rootfiles/oldcore/164/filelists/libyang

similarity index 100%

rename from config/rootfiles/core/164/filelists/libyang

rename to config/rootfiles/oldcore/164/filelists/libyang
diff --git a/config/rootfiles/core/164/filelists/lvm2 b/config/rootfiles/oldcore/164/filelists/lvm2

similarity index 100%

rename from config/rootfiles/core/164/filelists/lvm2

rename to config/rootfiles/oldcore/164/filelists/lvm2
diff --git a/config/rootfiles/core/164/filelists/oinkmaster b/config/rootfiles/oldcore/164/filelists/oinkmaster

similarity index 100%

rename from config/rootfiles/core/164/filelists/oinkmaster

rename to config/rootfiles/oldcore/164/filelists/oinkmaster
diff --git a/config/rootfiles/core/164/filelists/pciutils b/config/rootfiles/oldcore/164/filelists/pciutils

similarity index 100%

rename from config/rootfiles/core/164/filelists/pciutils

rename to config/rootfiles/oldcore/164/filelists/pciutils
diff --git a/config/rootfiles/core/164/filelists/pcre2 b/config/rootfiles/oldcore/164/filelists/pcre2

similarity index 100%

rename from config/rootfiles/core/164/filelists/pcre2

rename to config/rootfiles/oldcore/164/filelists/pcre2
diff --git a/config/rootfiles/core/164/filelists/poppler-data b/config/rootfiles/oldcore/164/filelists/poppler-data

similarity index 100%

rename from config/rootfiles/core/164/filelists/poppler-data

rename to config/rootfiles/oldcore/164/filelists/poppler-data
diff --git a/config/rootfiles/core/164/filelists/shadow b/config/rootfiles/oldcore/164/filelists/shadow

similarity index 100%

rename from config/rootfiles/core/164/filelists/shadow

rename to config/rootfiles/oldcore/164/filelists/shadow
diff --git a/config/rootfiles/core/164/filelists/squid b/config/rootfiles/oldcore/164/filelists/squid

similarity index 100%

rename from config/rootfiles/core/164/filelists/squid

rename to config/rootfiles/oldcore/164/filelists/squid
diff --git a/config/rootfiles/core/164/filelists/tcl b/config/rootfiles/oldcore/164/filelists/tcl

similarity index 100%

rename from config/rootfiles/core/164/filelists/tcl

rename to config/rootfiles/oldcore/164/filelists/tcl
diff --git a/config/rootfiles/core/164/filelists/usbutils b/config/rootfiles/oldcore/164/filelists/usbutils

similarity index 100%

rename from config/rootfiles/core/164/filelists/usbutils

rename to config/rootfiles/oldcore/164/filelists/usbutils
diff --git a/config/rootfiles/core/164/filelists/x86_64/intel-microcode b/config/rootfiles/oldcore/164/filelists/x86_64/intel-microcode

similarity index 100%

rename from config/rootfiles/core/164/filelists/x86_64/intel-microcode

rename to config/rootfiles/oldcore/164/filelists/x86_64/intel-microcode
diff --git a/config/rootfiles/core/164/filelists/x86_64/linux b/config/rootfiles/oldcore/164/filelists/x86_64/linux

similarity index 100%

rename from config/rootfiles/core/164/filelists/x86_64/linux

rename to config/rootfiles/oldcore/164/filelists/x86_64/linux
diff --git a/config/rootfiles/core/164/filelists/x86_64/linux-initrd b/config/rootfiles/oldcore/164/filelists/x86_64/linux-initrd

similarity index 100%

rename from config/rootfiles/core/164/filelists/x86_64/linux-initrd

rename to config/rootfiles/oldcore/164/filelists/x86_64/linux-initrd
diff --git a/config/rootfiles/oldcore/164/filelists/zstd b/config/rootfiles/oldcore/164/filelists/zstd

new file mode 120000 (symlink)

index 0000000..d6d4a3b
--- /dev/null
+++ b/config/rootfiles/oldcore/164/filelists/zstd
@@ -0,0 +1 @@
+../../../common/zstd
+\ No newline at end of file
diff --git a/config/rootfiles/core/164/update.sh b/config/rootfiles/oldcore/164/update.sh

similarity index 100%

rename from config/rootfiles/core/164/update.sh

rename to config/rootfiles/oldcore/164/update.sh
diff --git a/config/rootfiles/packages/cups b/config/rootfiles/packages/cups

index f9d15bc8bbec1370f67d981d1a30c213ac7d4bd2..3974aa2a14b0a11ceddad933b2cc7e74a7957c65 100644 (file)
--- a/config/rootfiles/packages/cups
+++ b/config/rootfiles/packages/cups
@@ -91,6 +91,7 @@ usr/lib/cups/notifier/rss
  usr/lib/libcups.so.2
  #usr/lib/libcupsimage.so
  usr/lib/libcupsimage.so.2
+#usr/lib/pkgconfig/cups.pc
  usr/sbin/cupsaccept
  usr/sbin/cupsctl
  usr/sbin/cupsd
@@ -102,6 +103,8 @@ usr/sbin/lpadmin
  usr/sbin/lpc
  usr/sbin/lpinfo
  usr/sbin/lpmove
+#usr/share/applications
+#usr/share/applications/cups.desktop
  usr/share/cups
  usr/share/cups/banners
  usr/share/cups/data
@@ -176,6 +179,7 @@ usr/share/cups/ipptool/print-job-hold.test
  usr/share/cups/ipptool/print-job-letter.test
  usr/share/cups/ipptool/print-job-manual.test
  usr/share/cups/ipptool/print-job-media-col.test
+usr/share/cups/ipptool/print-job-media-needed.test
  usr/share/cups/ipptool/print-job-password.test
  usr/share/cups/ipptool/print-job.test
  usr/share/cups/ipptool/print-uri.test
@@ -216,6 +220,72 @@ usr/share/cups/templates/class.tmpl
  usr/share/cups/templates/classes-header.tmpl
  usr/share/cups/templates/classes.tmpl
  usr/share/cups/templates/command.tmpl
+usr/share/cups/templates/da
+usr/share/cups/templates/da/add-class.tmpl
+usr/share/cups/templates/da/add-printer.tmpl
+usr/share/cups/templates/da/admin.tmpl
+usr/share/cups/templates/da/choose-device.tmpl
+usr/share/cups/templates/da/choose-make.tmpl
+usr/share/cups/templates/da/choose-model.tmpl
+usr/share/cups/templates/da/choose-serial.tmpl
+usr/share/cups/templates/da/choose-uri.tmpl
+usr/share/cups/templates/da/class-added.tmpl
+usr/share/cups/templates/da/class-confirm.tmpl
+usr/share/cups/templates/da/class-deleted.tmpl
+usr/share/cups/templates/da/class-jobs-header.tmpl
+usr/share/cups/templates/da/class-modified.tmpl
+usr/share/cups/templates/da/class.tmpl
+usr/share/cups/templates/da/classes-header.tmpl
+usr/share/cups/templates/da/classes.tmpl
+usr/share/cups/templates/da/command.tmpl
+usr/share/cups/templates/da/edit-config.tmpl
+usr/share/cups/templates/da/error-op.tmpl
+usr/share/cups/templates/da/error.tmpl
+usr/share/cups/templates/da/header.tmpl
+usr/share/cups/templates/da/help-header.tmpl
+usr/share/cups/templates/da/help-printable.tmpl
+usr/share/cups/templates/da/help-trailer.tmpl
+usr/share/cups/templates/da/job-cancel.tmpl
+usr/share/cups/templates/da/job-hold.tmpl
+usr/share/cups/templates/da/job-move.tmpl
+usr/share/cups/templates/da/job-moved.tmpl
+usr/share/cups/templates/da/job-release.tmpl
+usr/share/cups/templates/da/job-restart.tmpl
+usr/share/cups/templates/da/jobs-header.tmpl
+usr/share/cups/templates/da/jobs.tmpl
+usr/share/cups/templates/da/list-available-printers.tmpl
+usr/share/cups/templates/da/modify-class.tmpl
+usr/share/cups/templates/da/modify-printer.tmpl
+usr/share/cups/templates/da/norestart.tmpl
+usr/share/cups/templates/da/option-boolean.tmpl
+usr/share/cups/templates/da/option-conflict.tmpl
+usr/share/cups/templates/da/option-header.tmpl
+usr/share/cups/templates/da/option-pickmany.tmpl
+usr/share/cups/templates/da/option-pickone.tmpl
+usr/share/cups/templates/da/option-trailer.tmpl
+usr/share/cups/templates/da/pager.tmpl
+usr/share/cups/templates/da/printer-accept.tmpl
+usr/share/cups/templates/da/printer-added.tmpl
+usr/share/cups/templates/da/printer-cancel-jobs.tmpl
+usr/share/cups/templates/da/printer-configured.tmpl
+usr/share/cups/templates/da/printer-confirm.tmpl
+usr/share/cups/templates/da/printer-default.tmpl
+usr/share/cups/templates/da/printer-deleted.tmpl
+usr/share/cups/templates/da/printer-jobs-header.tmpl
+usr/share/cups/templates/da/printer-modified.tmpl
+usr/share/cups/templates/da/printer-reject.tmpl
+usr/share/cups/templates/da/printer-start.tmpl
+usr/share/cups/templates/da/printer-stop.tmpl
+usr/share/cups/templates/da/printer.tmpl
+usr/share/cups/templates/da/printers-header.tmpl
+usr/share/cups/templates/da/printers.tmpl
+usr/share/cups/templates/da/restart.tmpl
+usr/share/cups/templates/da/search.tmpl
+usr/share/cups/templates/da/set-printer-options-header.tmpl
+usr/share/cups/templates/da/set-printer-options-trailer.tmpl
+usr/share/cups/templates/da/test-page.tmpl
+usr/share/cups/templates/da/trailer.tmpl
+usr/share/cups/templates/da/users.tmpl
  usr/share/cups/templates/de
  usr/share/cups/templates/de/add-class.tmpl
  usr/share/cups/templates/de/add-printer.tmpl
@@ -666,17 +736,20 @@ usr/share/doc/cups
  usr/share/doc/cups/apple-touch-icon.png
  usr/share/doc/cups/cups-printable.css
  usr/share/doc/cups/cups.css
+usr/share/doc/cups/da
+usr/share/doc/cups/da/index.html
  usr/share/doc/cups/de
  usr/share/doc/cups/de/index.html
  usr/share/doc/cups/es
  usr/share/doc/cups/es/index.html
+usr/share/doc/cups/fr
+usr/share/doc/cups/fr/index.html
  usr/share/doc/cups/help
  usr/share/doc/cups/help/accounting.html
  usr/share/doc/cups/help/admin.html
  usr/share/doc/cups/help/api-admin.html
  usr/share/doc/cups/help/api-filter.html
  usr/share/doc/cups/help/api-ppd.html
-usr/share/doc/cups/help/api-raster.html
  usr/share/doc/cups/help/cgi.html
  usr/share/doc/cups/help/cupspm.html
  usr/share/doc/cups/help/encryption.html
@@ -745,22 +818,15 @@ usr/share/doc/cups/help/spec-raster.html
  usr/share/doc/cups/help/spec-stp.html
  usr/share/doc/cups/help/translation.html
  usr/share/doc/cups/images
-usr/share/doc/cups/images/color-wheel.png
  usr/share/doc/cups/images/cups-block-diagram.png
  usr/share/doc/cups/images/cups-command-chain.png
-usr/share/doc/cups/images/cups-icon.png
  usr/share/doc/cups/images/cups-postscript-chain.png
  usr/share/doc/cups/images/cups-raster-chain.png
  usr/share/doc/cups/images/cups.png
-usr/share/doc/cups/images/generic.png
-usr/share/doc/cups/images/left.gif
  usr/share/doc/cups/images/raster-organization.png
  usr/share/doc/cups/images/raster.png
-usr/share/doc/cups/images/right.gif
  usr/share/doc/cups/images/sample-image.png
-usr/share/doc/cups/images/sel.gif
  usr/share/doc/cups/images/smiley.jpg
-usr/share/doc/cups/images/unsel.gif
  usr/share/doc/cups/images/wait.gif
  usr/share/doc/cups/index.html
  usr/share/doc/cups/ja
@@ -770,8 +836,23 @@ usr/share/doc/cups/pt_BR/index.html
  usr/share/doc/cups/robots.txt
  usr/share/doc/cups/ru
  usr/share/doc/cups/ru/index.html
+usr/share/icons
+usr/share/icons/hicolor
+usr/share/icons/hicolor/128x128
+usr/share/icons/hicolor/128x128/apps
+usr/share/icons/hicolor/128x128/apps/cups.png
+usr/share/icons/hicolor/16x16
+usr/share/icons/hicolor/16x16/apps
+usr/share/icons/hicolor/16x16/apps/cups.png
+usr/share/icons/hicolor/32x32
+usr/share/icons/hicolor/32x32/apps
+usr/share/icons/hicolor/32x32/apps/cups.png
+usr/share/icons/hicolor/64x64
+usr/share/icons/hicolor/64x64/apps
+usr/share/icons/hicolor/64x64/apps/cups.png
  usr/share/locale/ca/cups_ca.po
  usr/share/locale/cs/cups_cs.po
+usr/share/locale/da/cups_da.po
  usr/share/locale/de/cups_de.po
  usr/share/locale/en
  usr/share/locale/en/cups_en.po
diff --git a/config/rootfiles/packages/libnfsidmap b/config/rootfiles/packages/libnfsidmap

deleted file mode 100644 (file)

index 0c9d3ab..0000000
--- a/config/rootfiles/packages/libnfsidmap
+++ /dev/null
@@ -1,15 +0,0 @@
-#usr/include/nfsidmap.h
-#usr/lib/libnfsidmap
-#usr/lib/libnfsidmap.la
-#usr/lib/libnfsidmap.so
-usr/lib/libnfsidmap.so.0
-usr/lib/libnfsidmap.so.0.3.0
-#usr/lib/libnfsidmap/nsswitch.la
-usr/lib/libnfsidmap/nsswitch.so
-#usr/lib/libnfsidmap/static.la
-usr/lib/libnfsidmap/static.so
-#usr/lib/libnfsidmap/umich_ldap.la
-usr/lib/libnfsidmap/umich_ldap.so
-#usr/lib/pkgconfig/libnfsidmap.pc
-#usr/share/man/man3/nfs4_uid_to_name.3
-#usr/share/man/man5/idmapd.conf.5
diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs

index dba272c8a94ca769da785d6db5ceb818d7ebb33c..e05c12d1267f017cfe753fabdf35f025c7331077 100644 (file)
--- a/config/rootfiles/packages/nfs
+++ b/config/rootfiles/packages/nfs
@@ -4,16 +4,27 @@ sbin/mount.nfs4
  sbin/nfsdcltrack
  sbin/umount.nfs
  sbin/umount.nfs4
+#usr/include/nfsidmap.h
  #usr/include/nfsidmap_plugin.h
+#usr/lib/libnfsidmap
  #usr/lib/libnfsidmap.a
+#usr/lib/libnfsidmap.la
+usr/lib/libnfsidmap.so
  usr/lib/libnfsidmap.so.1
  usr/lib/libnfsidmap.so.1.0.0
  #usr/lib/libnfsidmap/nsswitch.a
+#usr/lib/libnfsidmap/nsswitch.la
+usr/lib/libnfsidmap/nsswitch.so
  #usr/lib/libnfsidmap/regex.a
  #usr/lib/libnfsidmap/regex.la
  usr/lib/libnfsidmap/regex.so
  #usr/lib/libnfsidmap/static.a
+#usr/lib/libnfsidmap/static.la
+usr/lib/libnfsidmap/static.so
  #usr/lib/libnfsidmap/umich_ldap.a
+#usr/lib/libnfsidmap/umich_ldap.la
+usr/lib/libnfsidmap/umich_ldap.so
+#usr/lib/pkgconfig/libnfsidmap.pc
  #usr/sbin/blkmapd
  usr/sbin/exportfs
  usr/sbin/mountstats
@@ -32,7 +43,9 @@ usr/sbin/rpcdebug
  usr/sbin/showmount
  usr/sbin/sm-notify
  usr/sbin/start-statd
+#usr/share/man/man3/nfs4_uid_to_name.3
  #usr/share/man/man5/exports.5
+#usr/share/man/man5/idmapd.conf.5
  #usr/share/man/man5/nfs.5
  #usr/share/man/man5/nfs.conf.5
  #usr/share/man/man5/nfsmount.conf.5
diff --git a/config/rootfiles/packages/sdl2 b/config/rootfiles/packages/sdl2

index b843b9d9899e2d2a94c4b7972a0a3d03531e9201..ae18130fb313d9a97be494687d64af7a2cce32e8 100644 (file)
--- a/config/rootfiles/packages/sdl2
+++ b/config/rootfiles/packages/sdl2
@@ -81,7 +81,7 @@
  #usr/lib/cmake/SDL2/sdl2-config-version.cmake
  #usr/lib/cmake/SDL2/sdl2-config.cmake
  usr/lib/libSDL2-2.0.so.0
-usr/lib/libSDL2-2.0.so.0.18.0
+usr/lib/libSDL2-2.0.so.0.18.2
  #usr/lib/libSDL2.la
  usr/lib/libSDL2.so
  #usr/lib/libSDL2_test.a
diff --git a/config/rootfiles/packages/wio b/config/rootfiles/packages/wio

index 899dccf06db8610933e9e76d6a8c9fecc2bb6480..e1a0313d0913aea3ca83923ff8ed2f1c5af23c07 100644 (file)
--- a/config/rootfiles/packages/wio
+++ b/config/rootfiles/packages/wio
@@ -1,23 +1,6 @@
+etc/fcron.minutely/wio
  srv/web/ipfire/cgi-bin/wio.cgi
  srv/web/ipfire/cgi-bin/wiographs.cgi
-etc/fcron.minutely/wio
-var/ipfire/wio
-var/ipfire/wio/wio.conf
-var/ipfire/wio/wio.pl
-var/ipfire/wio/wiovpn.pl
-usr/lib/wio
-usr/lib/wio/wio-lib.pl
-usr/lib/wio/wio-graphs.pl
-usr/local/bin/wiohelper
-usr/local/bin/wioscan
-var/log/wio
-var/log/wio/wioips
-var/log/rrd/wio
-var/ipfire/addon-lang/wio.de.pl
-var/ipfire/addon-lang/wio.en.pl
-var/ipfire/addon-lang/wio.tr.pl
-var/ipfire/addon-lang/wio.fr.pl
-var/ipfire/menu.d/EX-wio.menu
  srv/web/ipfire/html/images/wio
  srv/web/ipfire/html/images/wio/add.png
  srv/web/ipfire/html/images/wio/back.png
@@ -40,8 +23,26 @@ srv/web/ipfire/html/images/wio/ovpnn2n.png
  srv/web/ipfire/html/images/wio/ovpnrw.png
  srv/web/ipfire/html/images/wio/red.png
  srv/web/ipfire/html/images/wio/refresh.png
-srv/web/ipfire/html/images/wio/vpnn2n.png
  srv/web/ipfire/html/images/wio/vpn.png
+srv/web/ipfire/html/images/wio/vpnn2n.png
  srv/web/ipfire/html/images/wio/vpnrw.png
  srv/web/ipfire/html/images/wio/white.png
+usr/lib/wio
+usr/lib/wio/wio-graphs.pl
+usr/lib/wio/wio-lib.pl
+usr/local/bin/wiohelper
+usr/local/bin/wioscan
+var/ipfire/addon-lang/wio.de.pl
+var/ipfire/addon-lang/wio.en.pl
+var/ipfire/addon-lang/wio.es.pl
+var/ipfire/addon-lang/wio.fr.pl
+var/ipfire/addon-lang/wio.tr.pl
  var/ipfire/backup/addons/includes/wio
+var/ipfire/menu.d/EX-wio.menu
+var/ipfire/wio
+var/ipfire/wio/wio.conf
+var/ipfire/wio/wio.pl
+var/ipfire/wio/wiovpn.pl
+var/log/rrd/wio
+var/log/wio
+var/log/wio/wioips
diff --git a/config/rootfiles/packages/x86_64/samba b/config/rootfiles/packages/x86_64/samba

index 61d39ebb1101f0c743df6311a1c53f557e01f247..c246b6c512f5cefd5c96f140349bad9358622331 100644 (file)
--- a/config/rootfiles/packages/x86_64/samba
+++ b/config/rootfiles/packages/x86_64/samba
@@ -2,7 +2,6 @@ etc/rc.d/init.d/samba
  usr/bin/cifsdd
  usr/bin/dbwrap_tool
  usr/bin/dumpmscat
-usr/bin/findsmb
  usr/bin/gentest
  usr/bin/ldbadd
  usr/bin/ldbdel
@@ -12,7 +11,7 @@ usr/bin/ldbrename
  usr/bin/ldbsearch
  usr/bin/locktest
  usr/bin/masktest
-usr/bin/mdfind
+usr/bin/mdsearch
  usr/bin/mvxattr
  usr/bin/ndrdump
  usr/bin/net
@@ -27,6 +26,7 @@ usr/bin/regshell
  usr/bin/regtree
  usr/bin/rpcclient
  usr/bin/samba-regedit
+usr/bin/samba-tool
  usr/bin/sharesec
  usr/bin/smbcacls
  usr/bin/smbclient
@@ -154,10 +154,11 @@ usr/lib/libndr-standard.so
  usr/lib/libndr-standard.so.0
  usr/lib/libndr-standard.so.0.0.1
  usr/lib/libndr.so
-usr/lib/libndr.so.1
-usr/lib/libndr.so.1.0.1
+usr/lib/libndr.so.2
+usr/lib/libndr.so.2.0.0
  usr/lib/libnetapi.so
-usr/lib/libnetapi.so.0
+usr/lib/libnetapi.so.1
+usr/lib/libnetapi.so.1.0.0
  usr/lib/libnss_winbind.so
  usr/lib/libnss_winbind.so.2
  usr/lib/libnss_wins.so
@@ -242,6 +243,7 @@ usr/lib/python3.8/site-packages/samba/dcerpc/epmapper.cpython-38-x86_64-linux-gn
  usr/lib/python3.8/site-packages/samba/dcerpc/idmap.cpython-38-x86_64-linux-gnu.so
  usr/lib/python3.8/site-packages/samba/dcerpc/initshutdown.cpython-38-x86_64-linux-gnu.so
  usr/lib/python3.8/site-packages/samba/dcerpc/irpc.cpython-38-x86_64-linux-gnu.so
+usr/lib/python3.8/site-packages/samba/dcerpc/krb5ccache.cpython-38-x86_64-linux-gnu.so
  usr/lib/python3.8/site-packages/samba/dcerpc/krb5pac.cpython-38-x86_64-linux-gnu.so
  usr/lib/python3.8/site-packages/samba/dcerpc/lsa.cpython-38-x86_64-linux-gnu.so
  usr/lib/python3.8/site-packages/samba/dcerpc/mdssvc.cpython-38-x86_64-linux-gnu.so
@@ -272,6 +274,8 @@ usr/lib/python3.8/site-packages/samba/dnsresolver.py
  usr/lib/python3.8/site-packages/samba/dnsserver.py
  usr/lib/python3.8/site-packages/samba/domain_update.py
  usr/lib/python3.8/site-packages/samba/drs_utils.py
+usr/lib/python3.8/site-packages/samba/dsdb.cpython-38-x86_64-linux-gnu.so
+usr/lib/python3.8/site-packages/samba/dsdb_dns.cpython-38-x86_64-linux-gnu.so
  #usr/lib/python3.8/site-packages/samba/emulate
  usr/lib/python3.8/site-packages/samba/emulate/__init__.py
  usr/lib/python3.8/site-packages/samba/emulate/traffic.py
@@ -280,6 +284,7 @@ usr/lib/python3.8/site-packages/samba/forest_update.py
  usr/lib/python3.8/site-packages/samba/gensec.cpython-38-x86_64-linux-gnu.so
  usr/lib/python3.8/site-packages/samba/getopt.py
  usr/lib/python3.8/site-packages/samba/gp_ext_loader.py
+usr/lib/python3.8/site-packages/samba/gp_gnome_settings_ext.py
  usr/lib/python3.8/site-packages/samba/gp_msgs_ext.py
  #usr/lib/python3.8/site-packages/samba/gp_parse
  usr/lib/python3.8/site-packages/samba/gp_parse/__init__.py
@@ -314,6 +319,7 @@ usr/lib/python3.8/site-packages/samba/ms_schema.py
  usr/lib/python3.8/site-packages/samba/ms_schema_markdown.py
  usr/lib/python3.8/site-packages/samba/ndr.py
  usr/lib/python3.8/site-packages/samba/net.cpython-38-x86_64-linux-gnu.so
+usr/lib/python3.8/site-packages/samba/net_s3.cpython-38-x86_64-linux-gnu.so
  usr/lib/python3.8/site-packages/samba/netbios.cpython-38-x86_64-linux-gnu.so
  #usr/lib/python3.8/site-packages/samba/netcmd
  usr/lib/python3.8/site-packages/samba/netcmd/__init__.py
@@ -396,7 +402,7 @@ usr/lib/python3.8/site-packages/samba/tdb_util.py
  #usr/lib/python3.8/site-packages/samba/tests/blackbox/bug13653.py
  #usr/lib/python3.8/site-packages/samba/tests/blackbox/check_output.py
  #usr/lib/python3.8/site-packages/samba/tests/blackbox/downgradedatabase.py
-#usr/lib/python3.8/site-packages/samba/tests/blackbox/mdfind.py
+#usr/lib/python3.8/site-packages/samba/tests/blackbox/mdsearch.py
  #usr/lib/python3.8/site-packages/samba/tests/blackbox/ndrdump.py
  #usr/lib/python3.8/site-packages/samba/tests/blackbox/netads_json.py
  #usr/lib/python3.8/site-packages/samba/tests/blackbox/samba_dnsupdate.py
@@ -422,6 +428,7 @@ usr/lib/python3.8/site-packages/samba/tdb_util.py
  #usr/lib/python3.8/site-packages/samba/tests/dcerpc/createtrustrelax.py
  #usr/lib/python3.8/site-packages/samba/tests/dcerpc/dnsserver.py
  #usr/lib/python3.8/site-packages/samba/tests/dcerpc/integer.py
+#usr/lib/python3.8/site-packages/samba/tests/dcerpc/lsa.py
  #usr/lib/python3.8/site-packages/samba/tests/dcerpc/mdssvc.py
  #usr/lib/python3.8/site-packages/samba/tests/dcerpc/misc.py
  #usr/lib/python3.8/site-packages/samba/tests/dcerpc/raw_protocol.py
@@ -437,6 +444,7 @@ usr/lib/python3.8/site-packages/samba/tdb_util.py
  #usr/lib/python3.8/site-packages/samba/tests/dcerpc/unix.py
  #usr/lib/python3.8/site-packages/samba/tests/dckeytab.py
  #usr/lib/python3.8/site-packages/samba/tests/dns.py
+#usr/lib/python3.8/site-packages/samba/tests/dns_aging.py
  #usr/lib/python3.8/site-packages/samba/tests/dns_base.py
  #usr/lib/python3.8/site-packages/samba/tests/dns_forwarder.py
  #usr/lib/python3.8/site-packages/samba/tests/dns_forwarder_helpers
@@ -449,6 +457,8 @@ usr/lib/python3.8/site-packages/samba/tdb_util.py
  #usr/lib/python3.8/site-packages/samba/tests/domain_backup.py
  #usr/lib/python3.8/site-packages/samba/tests/domain_backup_offline.py
  #usr/lib/python3.8/site-packages/samba/tests/dsdb.py
+#usr/lib/python3.8/site-packages/samba/tests/dsdb_api.py
+#usr/lib/python3.8/site-packages/samba/tests/dsdb_dns.py
  #usr/lib/python3.8/site-packages/samba/tests/dsdb_lock.py
  #usr/lib/python3.8/site-packages/samba/tests/dsdb_schema_attributes.py
  #usr/lib/python3.8/site-packages/samba/tests/emulate
@@ -461,9 +471,11 @@ usr/lib/python3.8/site-packages/samba/tdb_util.py
  #usr/lib/python3.8/site-packages/samba/tests/getdcname.py
  #usr/lib/python3.8/site-packages/samba/tests/glue.py
  #usr/lib/python3.8/site-packages/samba/tests/gpo.py
+#usr/lib/python3.8/site-packages/samba/tests/gpo_member.py
  #usr/lib/python3.8/site-packages/samba/tests/graph.py
  #usr/lib/python3.8/site-packages/samba/tests/group_audit.py
  #usr/lib/python3.8/site-packages/samba/tests/hostconfig.py
+#usr/lib/python3.8/site-packages/samba/tests/imports.py
  #usr/lib/python3.8/site-packages/samba/tests/join.py
  #usr/lib/python3.8/site-packages/samba/tests/kcc
  #usr/lib/python3.8/site-packages/samba/tests/kcc/__init__.py
@@ -472,25 +484,41 @@ usr/lib/python3.8/site-packages/samba/tdb_util.py
  #usr/lib/python3.8/site-packages/samba/tests/kcc/kcc_utils.py
  #usr/lib/python3.8/site-packages/samba/tests/kcc/ldif_import_export.py
  #usr/lib/python3.8/site-packages/samba/tests/krb5
+#usr/lib/python3.8/site-packages/samba/tests/krb5/alias_tests.py
  #usr/lib/python3.8/site-packages/samba/tests/krb5/as_canonicalization_tests.py
+#usr/lib/python3.8/site-packages/samba/tests/krb5/as_req_tests.py
  #usr/lib/python3.8/site-packages/samba/tests/krb5/compatability_tests.py
+#usr/lib/python3.8/site-packages/samba/tests/krb5/fast_tests.py
  #usr/lib/python3.8/site-packages/samba/tests/krb5/kcrypto.py
  #usr/lib/python3.8/site-packages/samba/tests/krb5/kdc_base_test.py
  #usr/lib/python3.8/site-packages/samba/tests/krb5/kdc_tests.py
  #usr/lib/python3.8/site-packages/samba/tests/krb5/kdc_tgs_tests.py
+#usr/lib/python3.8/site-packages/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
  #usr/lib/python3.8/site-packages/samba/tests/krb5/raw_testcase.py
  #usr/lib/python3.8/site-packages/samba/tests/krb5/rfc4120_constants.py
  #usr/lib/python3.8/site-packages/samba/tests/krb5/rfc4120_pyasn1.py
+#usr/lib/python3.8/site-packages/samba/tests/krb5/rodc_tests.py
  #usr/lib/python3.8/site-packages/samba/tests/krb5/s4u_tests.py
+#usr/lib/python3.8/site-packages/samba/tests/krb5/salt_tests.py
  #usr/lib/python3.8/site-packages/samba/tests/krb5/simple_tests.py
+#usr/lib/python3.8/site-packages/samba/tests/krb5/spn_tests.py
+#usr/lib/python3.8/site-packages/samba/tests/krb5/test_ccache.py
+#usr/lib/python3.8/site-packages/samba/tests/krb5/test_idmap_nss.py
+#usr/lib/python3.8/site-packages/samba/tests/krb5/test_ldap.py
+#usr/lib/python3.8/site-packages/samba/tests/krb5/test_min_domain_uid.py
+#usr/lib/python3.8/site-packages/samba/tests/krb5/test_rpc.py
+#usr/lib/python3.8/site-packages/samba/tests/krb5/test_smb.py
  #usr/lib/python3.8/site-packages/samba/tests/krb5/xrealm_tests.py
  #usr/lib/python3.8/site-packages/samba/tests/krb5_credentials.py
  #usr/lib/python3.8/site-packages/samba/tests/ldap_raw.py
  #usr/lib/python3.8/site-packages/samba/tests/ldap_referrals.py
+#usr/lib/python3.8/site-packages/samba/tests/ldap_spn.py
+#usr/lib/python3.8/site-packages/samba/tests/ldap_upn_sam_account.py
  #usr/lib/python3.8/site-packages/samba/tests/libsmb.py
  #usr/lib/python3.8/site-packages/samba/tests/loadparm.py
  #usr/lib/python3.8/site-packages/samba/tests/lsa_string.py
  #usr/lib/python3.8/site-packages/samba/tests/messaging.py
+#usr/lib/python3.8/site-packages/samba/tests/ndr.py
  #usr/lib/python3.8/site-packages/samba/tests/net_join.py
  #usr/lib/python3.8/site-packages/samba/tests/net_join_no_spnego.py
  #usr/lib/python3.8/site-packages/samba/tests/netbios.py
@@ -521,6 +549,7 @@ usr/lib/python3.8/site-packages/samba/tdb_util.py
  #usr/lib/python3.8/site-packages/samba/tests/pso.py
  #usr/lib/python3.8/site-packages/samba/tests/py_credentials.py
  #usr/lib/python3.8/site-packages/samba/tests/registry.py
+#usr/lib/python3.8/site-packages/samba/tests/s3_net_join.py
  #usr/lib/python3.8/site-packages/samba/tests/s3idmapdb.py
  #usr/lib/python3.8/site-packages/samba/tests/s3param.py
  #usr/lib/python3.8/site-packages/samba/tests/s3passdb.py
@@ -539,6 +568,7 @@ usr/lib/python3.8/site-packages/samba/tdb_util.py
  #usr/lib/python3.8/site-packages/samba/tests/samba_tool/forest.py
  #usr/lib/python3.8/site-packages/samba/tests/samba_tool/fsmo.py
  #usr/lib/python3.8/site-packages/samba/tests/samba_tool/gpo.py
+#usr/lib/python3.8/site-packages/samba/tests/samba_tool/gpo_exts.py
  #usr/lib/python3.8/site-packages/samba/tests/samba_tool/group.py
  #usr/lib/python3.8/site-packages/samba/tests/samba_tool/help.py
  #usr/lib/python3.8/site-packages/samba/tests/samba_tool/join.py
@@ -550,6 +580,7 @@ usr/lib/python3.8/site-packages/samba/tdb_util.py
  #usr/lib/python3.8/site-packages/samba/tests/samba_tool/promote_dc_lmdb_size.py
  #usr/lib/python3.8/site-packages/samba/tests/samba_tool/provision_lmdb_size.py
  #usr/lib/python3.8/site-packages/samba/tests/samba_tool/provision_password_check.py
+#usr/lib/python3.8/site-packages/samba/tests/samba_tool/provision_userPassword_crypt.py
  #usr/lib/python3.8/site-packages/samba/tests/samba_tool/rodc.py
  #usr/lib/python3.8/site-packages/samba/tests/samba_tool/schema.py
  #usr/lib/python3.8/site-packages/samba/tests/samba_tool/sites.py
@@ -566,6 +597,7 @@ usr/lib/python3.8/site-packages/samba/tdb_util.py
  #usr/lib/python3.8/site-packages/samba/tests/samba_upgradedns_lmdb.py
  #usr/lib/python3.8/site-packages/samba/tests/samdb.py
  #usr/lib/python3.8/site-packages/samba/tests/samdb_api.py
+#usr/lib/python3.8/site-packages/samba/tests/sddl.py
  #usr/lib/python3.8/site-packages/samba/tests/security.py
  #usr/lib/python3.8/site-packages/samba/tests/segfault.py
  #usr/lib/python3.8/site-packages/samba/tests/smb-notify.py
@@ -585,7 +617,14 @@ usr/lib/python3.8/site-packages/samba/trust_utils.py
  usr/lib/python3.8/site-packages/samba/upgrade.py
  usr/lib/python3.8/site-packages/samba/upgradehelpers.py
  usr/lib/python3.8/site-packages/samba/uptodateness.py
+#usr/lib/python3.8/site-packages/samba/vgp_access_ext.py
+#usr/lib/python3.8/site-packages/samba/vgp_files_ext.py
+#usr/lib/python3.8/site-packages/samba/vgp_issue_ext.py
+#usr/lib/python3.8/site-packages/samba/vgp_motd_ext.py
+#usr/lib/python3.8/site-packages/samba/vgp_openssh_ext.py
+#usr/lib/python3.8/site-packages/samba/vgp_startup_scripts_ext.py
  usr/lib/python3.8/site-packages/samba/vgp_sudoers_ext.py
+#usr/lib/python3.8/site-packages/samba/vgp_symlink_ext.py
  usr/lib/python3.8/site-packages/samba/werror.cpython-38-x86_64-linux-gnu.so
  usr/lib/python3.8/site-packages/samba/xattr.py
  usr/lib/python3.8/site-packages/samba/xattr_native.cpython-38-x86_64-linux-gnu.so
@@ -639,14 +678,16 @@ usr/lib/samba/libcliauth-samba4.so
  usr/lib/samba/libclidns-samba4.so
  usr/lib/samba/libcluster-samba4.so
  usr/lib/samba/libcmdline-contexts-samba4.so
-usr/lib/samba/libcmdline-credentials-samba4.so
+usr/lib/samba/libcmdline-samba4.so
  usr/lib/samba/libcmocka-samba4.so
  usr/lib/samba/libcom_err-samba4.so.0
  usr/lib/samba/libcom_err-samba4.so.0.25
  usr/lib/samba/libcommon-auth-samba4.so
  usr/lib/samba/libdbwrap-samba4.so
+usr/lib/samba/libdcerpc-pkt-auth-samba4.so
  usr/lib/samba/libdcerpc-samba-samba4.so
  usr/lib/samba/libdcerpc-samba4.so
+usr/lib/samba/libdnsserver-common-samba4.so
  usr/lib/samba/libdsdb-module-samba4.so
  usr/lib/samba/libevents-samba4.so
  usr/lib/samba/libflag-mapping-samba4.so
@@ -681,7 +722,7 @@ usr/lib/samba/libldb-key-value-samba4.so
  usr/lib/samba/libldb-tdb-err-map-samba4.so
  usr/lib/samba/libldb-tdb-int-samba4.so
  usr/lib/samba/libldb.so.2
-usr/lib/samba/libldb.so.2.3.0
+usr/lib/samba/libldb.so.2.4.1
  usr/lib/samba/libldbsamba-samba4.so
  usr/lib/samba/liblibcli-lsa3-samba4.so
  usr/lib/samba/liblibcli-netlogon3-samba4.so
@@ -697,15 +738,13 @@ usr/lib/samba/libnet-keytab-samba4.so
  usr/lib/samba/libnetif-samba4.so
  usr/lib/samba/libnpa-tstream-samba4.so
  usr/lib/samba/libnss-info-samba4.so
-usr/lib/samba/libpopt-samba3-cmdline-samba4.so
-usr/lib/samba/libpopt-samba3-samba4.so
  usr/lib/samba/libposix-eadb-samba4.so
  usr/lib/samba/libprinter-driver-samba4.so
  usr/lib/samba/libprinting-migrate-samba4.so
  usr/lib/samba/libpyldb-util.cpython-38-x86-64-linux-gnu.so.2
-usr/lib/samba/libpyldb-util.cpython-38-x86-64-linux-gnu.so.2.3.0
+usr/lib/samba/libpyldb-util.cpython-38-x86-64-linux-gnu.so.2.4.1
  usr/lib/samba/libpytalloc-util.cpython-38-x86-64-linux-gnu.so.2
-usr/lib/samba/libpytalloc-util.cpython-38-x86-64-linux-gnu.so.2.3.2
+usr/lib/samba/libpytalloc-util.cpython-38-x86-64-linux-gnu.so.2.3.3
  usr/lib/samba/libregistry-samba4.so
  usr/lib/samba/libreplace-samba4.so
  usr/lib/samba/libroken-samba4.so.19
@@ -734,16 +773,15 @@ usr/lib/samba/libsys-rw-samba4.so
  usr/lib/samba/libtalloc-report-printf-samba4.so
  usr/lib/samba/libtalloc-report-samba4.so
  usr/lib/samba/libtalloc.so.2
-usr/lib/samba/libtalloc.so.2.3.2
+usr/lib/samba/libtalloc.so.2.3.3
  usr/lib/samba/libtdb-wrap-samba4.so
  usr/lib/samba/libtdb.so.1
-usr/lib/samba/libtdb.so.1.4.3
+usr/lib/samba/libtdb.so.1.4.4
  usr/lib/samba/libtevent.so.0
-usr/lib/samba/libtevent.so.0.10.2
+usr/lib/samba/libtevent.so.0.11.0
  usr/lib/samba/libtime-basic-samba4.so
  usr/lib/samba/libtorture-samba4.so
  usr/lib/samba/libtrusts-util-samba4.so
-usr/lib/samba/libutil-cmdline-samba4.so
  usr/lib/samba/libutil-reg-samba4.so
  usr/lib/samba/libutil-setid-samba4.so
  usr/lib/samba/libutil-tdb-samba4.so
@@ -800,6 +838,7 @@ usr/lib/samba/vfs/xattr_tdb.so
  usr/lib/security
  usr/lib/security/pam_winbind.so
  #usr/libexec/samba
+usr/libexec/samba/samba-bgqd
  usr/libexec/samba/smbspool_krb5_wrapper
  usr/sbin/eventlogadm
  usr/sbin/nmbd
@@ -824,6 +863,3 @@ var/lib/samba/private
  var/lib/samba/winbindd_privileged
  var/log/samba
  var/spool/samba
-srv/web/ipfire/cgi-bin/samba.cgi
-var/ipfire/menu.d/EX-samba.menu
-usr/local/bin/sambactrl
diff --git a/doc/language_issues.de b/doc/language_issues.de

index 630ca9ff3dd774c59e369051afe2a490539dac2b..c66806be712f6fdb5897e8985a1a1d4782ab5752 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -153,6 +153,7 @@ WARNING: translation string unused: class in use
  WARNING: translation string unused: clear cache
  WARNING: translation string unused: client
  WARNING: translation string unused: comment
+WARNING: translation string unused: community rules
  WARNING: translation string unused: compression
  WARNING: translation string unused: connect
  WARNING: translation string unused: connect the modem
@@ -263,6 +264,8 @@ WARNING: translation string unused: email subject
  WARNING: translation string unused: email success
  WARNING: translation string unused: email text
  WARNING: translation string unused: emailreportlevel
+WARNING: translation string unused: emerging pro rules
+WARNING: translation string unused: emerging rules
  WARNING: translation string unused: enable javascript
  WARNING: translation string unused: enable wildcards
  WARNING: translation string unused: enabledtitle
@@ -379,6 +382,8 @@ WARNING: translation string unused: ibod for dual isdn only
  WARNING: translation string unused: icmp selected but no type
  WARNING: translation string unused: icmp type
  WARNING: translation string unused: id
+WARNING: translation string unused: ids oinkcode required
+WARNING: translation string unused: ids rules update
  WARNING: translation string unused: ike encryption
  WARNING: translation string unused: ike grouptype
  WARNING: translation string unused: ike integrity
@@ -401,6 +406,7 @@ WARNING: translation string unused: intrusion prevention system
  WARNING: translation string unused: invalid cache size
  WARNING: translation string unused: invalid date entered
  WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid input for oink code
  WARNING: translation string unused: invalid loaded file
  WARNING: translation string unused: invalid md5sum
  WARNING: translation string unused: invalid port list
@@ -629,7 +635,9 @@ WARNING: translation string unused: reboot question
  WARNING: translation string unused: reboot schedule
  WARNING: translation string unused: reboot sure
  WARNING: translation string unused: refresh update list
+WARNING: translation string unused: registered user rules
  WARNING: translation string unused: released
+WARNING: translation string unused: reload
  WARNING: translation string unused: removable device advice
  WARNING: translation string unused: reportfile
  WARNING: translation string unused: reportlevel
@@ -712,6 +720,7 @@ WARNING: translation string unused: subject test
  WARNING: translation string unused: subject warn
  WARNING: translation string unused: subnet
  WARNING: translation string unused: subnet is invalid
+WARNING: translation string unused: subscripted user rules
  WARNING: translation string unused: successfully refreshed updates list
  WARNING: translation string unused: system graphs
  WARNING: translation string unused: system has hwrng
@@ -776,6 +785,7 @@ WARNING: translation string unused: unix charset
  WARNING: translation string unused: unix group
  WARNING: translation string unused: unix password sync
  WARNING: translation string unused: unix shell
+WARNING: translation string unused: update ruleset
  WARNING: translation string unused: update transcript
  WARNING: translation string unused: updatedatabase
  WARNING: translation string unused: updates
@@ -907,6 +917,8 @@ WARNING: untranslated string: guardian logtarget_file = unknown string
  WARNING: untranslated string: guardian logtarget_syslog = unknown string
  WARNING: untranslated string: guardian no entries = unknown string
  WARNING: untranslated string: guardian service = unknown string
+WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
+WARNING: untranslated string: invalid input for subscription code = Invalid input for subscription code
  WARNING: untranslated string: ipsec dns server address is invalid = Invalid DNS server IP address(es)
  WARNING: untranslated string: ipsec invalid ip address or fqdn for rw endpoint = Invalid IP address or FQDN for Host-to-Net Endpoint
  WARNING: untranslated string: ipsec roadwarrior endpoint = Host-to-Net Endpoint
@@ -923,6 +935,7 @@ WARNING: untranslated string: samba server role member = Domain Member
  WARNING: untranslated string: samba server role standalone = Standalone
  WARNING: untranslated string: show tls-auth key = Show tls-auth key
  WARNING: untranslated string: smb daemon = SMB Daemon
+WARNING: untranslated string: subscription code = Subscription code
  WARNING: untranslated string: user management = User Management
  WARNING: untranslated string: winbind daemon = Winbind Daemon
  WARNING: untranslated string: wlan client encryption wpa3 = WPA3
diff --git a/doc/language_issues.en b/doc/language_issues.en

index 3d733c7d40fc7a88d5098603788b33eaedeb0285..867715953ea439c4a85e71b161b21aeb169bbdd0 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -486,7 +486,6 @@ WARNING: untranslated string: click to enable = Disabled (click to enable)
  WARNING: untranslated string: clock has not been synchronized = Clock has not been synchronized
  WARNING: untranslated string: clock last synchronized at = Clock was last synchronized at
  WARNING: untranslated string: common name = Common name
-WARNING: untranslated string: community rules = Snort/VRT GPLv2 Community Rules
  WARNING: untranslated string: comp-lzo = LZO-Compression:
  WARNING: untranslated string: computer to modem rate = Computer to modem rate:
  WARNING: untranslated string: concentrator name = Concentrator name:
@@ -676,12 +675,14 @@ WARNING: untranslated string: drop action = Default behaviour of (forward) firew
  WARNING: untranslated string: drop action1 = Default behaviour of (outgoing) firewall in mode "Blocked"
  WARNING: untranslated string: drop action2 = Default behaviour of (input) firewall
  WARNING: untranslated string: drop forward = Log dropped forward packets
+WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at Spamhaus DROP, etc.)
  WARNING: untranslated string: drop input = Log dropped input packets
  WARNING: untranslated string: drop newnotsyn = Log dropped new not SYN packets
  WARNING: untranslated string: drop outgoing = Log dropped outgoing packets
  WARNING: untranslated string: drop portscan = Log dropped portscan packets
  WARNING: untranslated string: drop proxy = Drop all packets not addressed to proxy
  WARNING: untranslated string: drop samba = Drop all Microsoft ports 135,137,138,139,445,1025
+WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians
  WARNING: untranslated string: drop wirelessforward = Log dropped wireless forward packets
  WARNING: untranslated string: drop wirelessinput = Log dropped wireless input packets
  WARNING: untranslated string: dst port = Dst Port
@@ -720,8 +721,6 @@ WARNING: untranslated string: email tls = TLS mode
  WARNING: untranslated string: email tls explicit = explicit (STARTTLS)
  WARNING: untranslated string: email tls implicit = implicit (TLS)
  WARNING: untranslated string: email usemail = Activate Mail Service
-WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules
-WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules
  WARNING: untranslated string: empty = This field may be left blank
  WARNING: untranslated string: empty profile = empty
  WARNING: untranslated string: enable = Enable
@@ -811,6 +810,7 @@ WARNING: untranslated string: from = From
  WARNING: untranslated string: fw blue = Firewall options for BLUE interface
  WARNING: untranslated string: fw default drop = Firewall policy
  WARNING: untranslated string: fw logging = Firewall logging
+WARNING: untranslated string: fw red = Firewall options for RED interface
  WARNING: untranslated string: fw settings = Firewall settings
  WARNING: untranslated string: fw settings color = Show colors in ruletable
  WARNING: untranslated string: fw settings dropdown = Show all networks on rulecreation site
@@ -1029,6 +1029,7 @@ WARNING: untranslated string: holdoff = Holdoff time (in seconds)
  WARNING: untranslated string: host certificate = Host Certificate
  WARNING: untranslated string: host ip = Host IP address
  WARNING: untranslated string: host to net vpn = Host-to-Net Virtual Private Network (RoadWarrior)
+WARNING: untranslated string: hostile networks = Hostile networks
  WARNING: untranslated string: hostname = Hostname
  WARNING: untranslated string: hostname cant be empty = Hostname cannot be empty.
  WARNING: untranslated string: hostname not set = Hostname not set.
@@ -1039,11 +1040,17 @@ WARNING: untranslated string: hours = Hours
  WARNING: untranslated string: idle = Idle
  WARNING: untranslated string: idle timeout = Idle timeout (mins; 0 to disable):
  WARNING: untranslated string: idle timeout not set = Idle timeout not set.
+WARNING: untranslated string: ids add provider = Add provider
  WARNING: untranslated string: ids apply = Apply
  WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids automatic rules update = Automatic Rule Update
+WARNING: untranslated string: ids autoupdates = Automatic updates
+WARNING: untranslated string: ids could not add provider = Could not add provider
+WARNING: untranslated string: ids customize ruleset = Customize ruleset
  WARNING: untranslated string: ids download new ruleset = Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids enable = Enable Intrusion Prevention System
+WARNING: untranslated string: ids enable automatic updates = Enable automatic updates
+WARNING: untranslated string: ids force ruleset update = Force ruleset update
  WARNING: untranslated string: ids hide = Hide
  WARNING: untranslated string: ids ignored hosts = Whitelisted Hosts
  WARNING: untranslated string: ids log hits = Total of number of activated rules for
@@ -1051,13 +1058,18 @@ WARNING: untranslated string: ids log viewer = IPS Log Viewer
  WARNING: untranslated string: ids logs = IPS Logs
  WARNING: untranslated string: ids monitor traffic only = Monitor traffic only
  WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
+WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
  WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
-WARNING: untranslated string: ids no ruleset available = No ruleset is available. Please download one first
-WARNING: untranslated string: ids oinkcode required = The selected ruleset requires a subscription or an Oinkcode
-WARNING: untranslated string: ids rules update = Ruleset
+WARNING: untranslated string: ids provider = Provider
+WARNING: untranslated string: ids provider settings = Provider settings
+WARNING: untranslated string: ids reset provider = Reset provider
  WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids ruleset settings = Ruleset Settings
  WARNING: untranslated string: ids show = Show
+WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
+WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
+WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset
+WARNING: untranslated string: ids visit provider website = Visit provider website
  WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully...
  WARNING: untranslated string: iface = Iface
  WARNING: untranslated string: ignore filter = Ignore filter
@@ -1113,10 +1125,10 @@ WARNING: untranslated string: invalid input for local ip address = Invalid input
  WARNING: untranslated string: invalid input for max clients = Invalid input for Max Clients. The maximum of 1024 clients has been exceeded
  WARNING: untranslated string: invalid input for mode = Invalid input for mode
  WARNING: untranslated string: invalid input for name = Invalid input for user's full name or system hostname
-WARNING: untranslated string: invalid input for oink code = Invalid input for Oink code
  WARNING: untranslated string: invalid input for organization = Invalid input for organization
  WARNING: untranslated string: invalid input for remote host/ip = Invalid input for remote host/ip.
  WARNING: untranslated string: invalid input for state or province = Invalid input for state or province.
+WARNING: untranslated string: invalid input for subscription code = Invalid input for subscription code
  WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
  WARNING: untranslated string: invalid ip = Invalid IP Address
  WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
@@ -1438,6 +1450,8 @@ WARNING: untranslated string: pakfire ago = ago.
  WARNING: untranslated string: pakfire available addons = Available Addons:
  WARNING: untranslated string: pakfire configuration = Pakfire Configuration
  WARNING: untranslated string: pakfire core update level = Core-Update-Level
+WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning...
+WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding.
  WARNING: untranslated string: pakfire install description = Please choose one or more items from the list below and click the plus to install.
  WARNING: untranslated string: pakfire install package = You want to install the following packages: 
  WARNING: untranslated string: pakfire installed addons = Installed Addons:
@@ -1447,6 +1461,7 @@ WARNING: untranslated string: pakfire last package update = Last packages list u
  WARNING: untranslated string: pakfire last serverlist update = Last server list update made
  WARNING: untranslated string: pakfire last update = Last update made
  WARNING: untranslated string: pakfire possible dependency =  There may be depending packages, here is a list of packages that need to be installed.
+WARNING: untranslated string: pakfire return = Return to Pakfire
  WARNING: untranslated string: pakfire system state = System Status
  WARNING: untranslated string: pakfire tree = Repository
  WARNING: untranslated string: pakfire tree stable = Stable
@@ -1533,8 +1548,6 @@ WARNING: untranslated string: red1 = RED
  WARNING: untranslated string: references = References
  WARNING: untranslated string: refresh = Refresh
  WARNING: untranslated string: refresh index page while connected = Refresh index.cgi page while connected
-WARNING: untranslated string: registered user rules = Talos VRT rules for registered users
-WARNING: untranslated string: reload = reload
  WARNING: untranslated string: remark = Remark
  WARNING: untranslated string: remark title = Remark:
  WARNING: untranslated string: remote access = Remote access
@@ -1636,6 +1649,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: spoofed or martians = Spoofed/Martians
  WARNING: untranslated string: srbds = Special register buffer data sampling
  WARNING: untranslated string: src port = Src Port
  WARNING: untranslated string: ssh = SSH
@@ -1677,7 +1691,7 @@ WARNING: untranslated string: stopped = STOPPED
  WARNING: untranslated string: strict = Strict
  WARNING: untranslated string: subject = Subject
  WARNING: untranslated string: subnet mask = Subnet Mask
-WARNING: untranslated string: subscripted user rules = Talos VRT rules with subscription
+WARNING: untranslated string: subscription code = Subscription code
  WARNING: untranslated string: summaries kept = Keep summaries for
  WARNING: untranslated string: sunday = Sunday
  WARNING: untranslated string: support donation = Support the IPFire project with your donation
@@ -1782,7 +1796,6 @@ WARNING: untranslated string: unlimited = Unlimited
  WARNING: untranslated string: unnamed = Unnamed
  WARNING: untranslated string: update = Update
  WARNING: untranslated string: update accelerator = Update Accelerator
-WARNING: untranslated string: update ruleset = Update ruleset
  WARNING: untranslated string: update time = Update the time:
  WARNING: untranslated string: updxlrtr 3 months = three months
  WARNING: untranslated string: updxlrtr 6 months = six  months
diff --git a/doc/language_issues.es b/doc/language_issues.es

index 3ebc2d9257d5f5a772b39c1936cef6733d829bd5..091f0a8cb2e460a5b7b98b65b60b5aba10090ce6 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -164,6 +164,7 @@ WARNING: translation string unused: class in use
  WARNING: translation string unused: clear cache
  WARNING: translation string unused: client
  WARNING: translation string unused: comment
+WARNING: translation string unused: community rules
  WARNING: translation string unused: compression
  WARNING: translation string unused: connect
  WARNING: translation string unused: connect the modem
@@ -352,6 +353,7 @@ WARNING: translation string unused: ids rules license
  WARNING: translation string unused: ids rules license1
  WARNING: translation string unused: ids rules license2
  WARNING: translation string unused: ids rules license3
+WARNING: translation string unused: ids rules update
  WARNING: translation string unused: ike encryption
  WARNING: translation string unused: ike grouptype
  WARNING: translation string unused: ike integrity
@@ -374,6 +376,7 @@ WARNING: translation string unused: intrusion detection system2
  WARNING: translation string unused: invalid cache size
  WARNING: translation string unused: invalid date entered
  WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid input for oink code
  WARNING: translation string unused: invalid loaded file
  WARNING: translation string unused: invalid md5sum
  WARNING: translation string unused: invalid port list
@@ -576,7 +579,9 @@ WARNING: translation string unused: reboot question
  WARNING: translation string unused: reboot schedule
  WARNING: translation string unused: reboot sure
  WARNING: translation string unused: refresh update list
+WARNING: translation string unused: registered user rules
  WARNING: translation string unused: released
+WARNING: translation string unused: reload
  WARNING: translation string unused: removable device advice
  WARNING: translation string unused: reportfile
  WARNING: translation string unused: reportlevel
@@ -663,6 +668,7 @@ WARNING: translation string unused: subject test
  WARNING: translation string unused: subject warn
  WARNING: translation string unused: subnet
  WARNING: translation string unused: subnet is invalid
+WARNING: translation string unused: subscripted user rules
  WARNING: translation string unused: successfully refreshed updates list
  WARNING: translation string unused: system graphs
  WARNING: translation string unused: system log viewer
@@ -955,7 +961,9 @@ WARNING: untranslated string: drop action = Default behaviour of (forward) firew
  WARNING: untranslated string: drop action1 = Default behaviour of (outgoing) firewall in mode "Blocked"
  WARNING: untranslated string: drop action2 = Default behaviour of (input) firewall
  WARNING: untranslated string: drop forward = Log dropped forward packets
+WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at Spamhaus DROP, etc.)
  WARNING: untranslated string: drop outgoing = Log dropped outgoing packets
+WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians
  WARNING: untranslated string: duration = Duration
  WARNING: untranslated string: eight hours = 8 Hours
  WARNING: untranslated string: email config = Configuration
@@ -976,8 +984,6 @@ WARNING: untranslated string: email tls = TLS mode
  WARNING: untranslated string: email tls explicit = explicit (STARTTLS)
  WARNING: untranslated string: email tls implicit = implicit (TLS)
  WARNING: untranslated string: email usemail = Activate Mail Service
-WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules
-WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules
  WARNING: untranslated string: enable = Enable
  WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
  WARNING: untranslated string: encryption = Encryption:
@@ -1020,6 +1026,7 @@ WARNING: untranslated string: force enable = Forced
  WARNING: untranslated string: foreshadow = Foreshadow
  WARNING: untranslated string: four hours = 4 Hours
  WARNING: untranslated string: fw default drop = Firewall policy
+WARNING: untranslated string: fw red = Firewall options for RED interface
  WARNING: untranslated string: fw settings = Firewall settings
  WARNING: untranslated string: fw settings color = Show colors in ruletable
  WARNING: untranslated string: fw settings dropdown = Show all networks on rulecreation site
@@ -1209,22 +1216,35 @@ WARNING: untranslated string: guardian no entries = unknown string
  WARNING: untranslated string: guardian service = unknown string
  WARNING: untranslated string: hardware support = Hardware Support
  WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
+WARNING: untranslated string: hostile networks = Hostile networks
+WARNING: untranslated string: ids add provider = Add provider
  WARNING: untranslated string: ids apply = Apply
  WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids automatic rules update = Automatic Rule Update
+WARNING: untranslated string: ids autoupdates = Automatic updates
+WARNING: untranslated string: ids could not add provider = Could not add provider
+WARNING: untranslated string: ids customize ruleset = Customize ruleset
  WARNING: untranslated string: ids download new ruleset = Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids enable = Enable Intrusion Prevention System
+WARNING: untranslated string: ids enable automatic updates = Enable automatic updates
+WARNING: untranslated string: ids force ruleset update = Force ruleset update
  WARNING: untranslated string: ids hide = Hide
  WARNING: untranslated string: ids ignored hosts = Whitelisted Hosts
  WARNING: untranslated string: ids log hits = Total of number of activated rules for
  WARNING: untranslated string: ids monitor traffic only = Monitor traffic only
  WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
+WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
  WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
-WARNING: untranslated string: ids no ruleset available = No ruleset is available. Please download one first
-WARNING: untranslated string: ids oinkcode required = The selected ruleset requires a subscription or an Oinkcode
+WARNING: untranslated string: ids provider = Provider
+WARNING: untranslated string: ids provider settings = Provider settings
+WARNING: untranslated string: ids reset provider = Reset provider
  WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids ruleset settings = Ruleset Settings
  WARNING: untranslated string: ids show = Show
+WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
+WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
+WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset
+WARNING: untranslated string: ids visit provider website = Visit provider website
  WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully...
  WARNING: untranslated string: imei = IMEI
  WARNING: untranslated string: imsi = IMSI
@@ -1242,6 +1262,7 @@ WARNING: untranslated string: invalid input for interface mode = Invalid input f
  WARNING: untranslated string: invalid input for interface mtu = Invalid input to interface MTU
  WARNING: untranslated string: invalid input for local ip address = Invalid input for local IP address
  WARNING: untranslated string: invalid input for mode = Invalid input for mode
+WARNING: untranslated string: invalid input for subscription code = Invalid input for subscription code
  WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
  WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
  WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
@@ -1349,7 +1370,10 @@ WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is no
  WARNING: untranslated string: p2p block = P2P networks
  WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes.
  WARNING: untranslated string: pakfire ago = ago.
+WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning...
+WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding.
  WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: pakfire return = Return to Pakfire
  WARNING: untranslated string: pakfire tree = Repository
  WARNING: untranslated string: pakfire tree stable = Stable
  WARNING: untranslated string: pakfire tree testing = Testing
@@ -1397,6 +1421,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: spoofed or martians = Spoofed/Martians
  WARNING: untranslated string: srbds = Special register buffer data sampling
  WARNING: untranslated string: ssh = SSH
  WARNING: untranslated string: ssh active sessions = Active logins
@@ -1408,6 +1433,7 @@ WARNING: untranslated string: standard = Standard
  WARNING: untranslated string: static routes = Static Routes
  WARNING: untranslated string: strict = Strict
  WARNING: untranslated string: subnet mask = Subnet Mask
+WARNING: untranslated string: subscription code = Subscription code
  WARNING: untranslated string: support donation = Support the IPFire project with your donation
  WARNING: untranslated string: system has rdrand = This system has support for Intel(R) RDRAND.
  WARNING: untranslated string: system information = System Information
@@ -1478,7 +1504,6 @@ WARNING: untranslated string: unblock = Unblock
  WARNING: untranslated string: unblock all = Unblock all
  WARNING: untranslated string: uncheck all = Uncheck all
  WARNING: untranslated string: unlimited = Unlimited
-WARNING: untranslated string: update ruleset = Update ruleset
  WARNING: untranslated string: updxlrtr passive mode = Delivery only/no download mode
  WARNING: untranslated string: uplink = Uplink
  WARNING: untranslated string: uplink bit rate = Uplink Bit Rate
diff --git a/doc/language_issues.fr b/doc/language_issues.fr

index 1c1e04c6aa8b8c5e91c9f60023d4deba8b6a407b..4a85e641d1c711c8b64df554fda33053f4b95158 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -174,6 +174,7 @@ WARNING: translation string unused: class in use
  WARNING: translation string unused: clear cache
  WARNING: translation string unused: client
  WARNING: translation string unused: comment
+WARNING: translation string unused: community rules
  WARNING: translation string unused: compression
  WARNING: translation string unused: connect
  WARNING: translation string unused: connect the modem
@@ -291,6 +292,8 @@ WARNING: translation string unused: email subject
  WARNING: translation string unused: email success
  WARNING: translation string unused: email text
  WARNING: translation string unused: emailreportlevel
+WARNING: translation string unused: emerging pro rules
+WARNING: translation string unused: emerging rules
  WARNING: translation string unused: enable javascript
  WARNING: translation string unused: enable wildcards
  WARNING: translation string unused: enabledtitle
@@ -410,6 +413,9 @@ WARNING: translation string unused: ibod for dual isdn only
  WARNING: translation string unused: icmp selected but no type
  WARNING: translation string unused: icmp type
  WARNING: translation string unused: id
+WARNING: translation string unused: ids no ruleset available
+WARNING: translation string unused: ids oinkcode required
+WARNING: translation string unused: ids rules update
  WARNING: translation string unused: ike encryption
  WARNING: translation string unused: ike grouptype
  WARNING: translation string unused: ike integrity
@@ -433,6 +439,7 @@ WARNING: translation string unused: intrusion prevention system
  WARNING: translation string unused: invalid cache size
  WARNING: translation string unused: invalid date entered
  WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid input for oink code
  WARNING: translation string unused: invalid loaded file
  WARNING: translation string unused: invalid md5sum
  WARNING: translation string unused: invalid port list
@@ -665,7 +672,9 @@ WARNING: translation string unused: reboot question
  WARNING: translation string unused: reboot schedule
  WARNING: translation string unused: reboot sure
  WARNING: translation string unused: refresh update list
+WARNING: translation string unused: registered user rules
  WARNING: translation string unused: released
+WARNING: translation string unused: reload
  WARNING: translation string unused: removable device advice
  WARNING: translation string unused: reportfile
  WARNING: translation string unused: reportlevel
@@ -751,6 +760,7 @@ WARNING: translation string unused: subject test
  WARNING: translation string unused: subject warn
  WARNING: translation string unused: subnet
  WARNING: translation string unused: subnet is invalid
+WARNING: translation string unused: subscripted user rules
  WARNING: translation string unused: successfully refreshed updates list
  WARNING: translation string unused: system graphs
  WARNING: translation string unused: system has hwrng
@@ -818,6 +828,7 @@ WARNING: translation string unused: unix charset
  WARNING: translation string unused: unix group
  WARNING: translation string unused: unix password sync
  WARNING: translation string unused: unix shell
+WARNING: translation string unused: update ruleset
  WARNING: translation string unused: update transcript
  WARNING: translation string unused: updatedatabase
  WARNING: translation string unused: updates
@@ -915,9 +926,12 @@ WARNING: untranslated string: cake profile pppoe-llcsnap 40 = PPPoE LLC SNAP (40
  WARNING: untranslated string: cake profile pppoe-ptm 27 = PPPoE PTM (27 bytes)
  WARNING: untranslated string: cake profile pppoe-vcmux 32 = PPPoE VC-MUX (32 bytes)
  WARNING: untranslated string: cake profile raw 0 = Raw (no overhead compensation)
+WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at Spamhaus DROP, etc.)
+WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians
  WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk.
  WARNING: untranslated string: false max bandwidth = Maximum bandwidth is false.
  WARNING: untranslated string: false min bandwidth = Minimum bandwidth is false.
+WARNING: untranslated string: fw red = Firewall options for RED interface
  WARNING: untranslated string: fwhost cust locationgrp = unknown string
  WARNING: untranslated string: fwhost err hostip = unknown string
  WARNING: untranslated string: guaranteed bandwidth = Guaranteed bandwidth
@@ -950,9 +964,30 @@ WARNING: untranslated string: guardian logtarget_file = unknown string
  WARNING: untranslated string: guardian logtarget_syslog = unknown string
  WARNING: untranslated string: guardian no entries = unknown string
  WARNING: untranslated string: guardian service = unknown string
+WARNING: untranslated string: hostile networks = Hostile networks
+WARNING: untranslated string: ids add provider = Add provider
+WARNING: untranslated string: ids autoupdates = Automatic updates
+WARNING: untranslated string: ids could not add provider = Could not add provider
+WARNING: untranslated string: ids customize ruleset = Customize ruleset
+WARNING: untranslated string: ids enable automatic updates = Enable automatic updates
+WARNING: untranslated string: ids force ruleset update = Force ruleset update
+WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
+WARNING: untranslated string: ids provider = Provider
+WARNING: untranslated string: ids provider settings = Provider settings
+WARNING: untranslated string: ids reset provider = Reset provider
+WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
+WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
+WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset
+WARNING: untranslated string: ids visit provider website = Visit provider website
+WARNING: untranslated string: invalid input for subscription code = Invalid input for subscription code
  WARNING: untranslated string: link-layer encapsulation = Link-Layer Encapsulation
  WARNING: untranslated string: max bandwidth = Maximum bandwidth
  WARNING: untranslated string: pakfire ago = ago.
+WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning...
+WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding.
+WARNING: untranslated string: pakfire return = Return to Pakfire
  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: spoofed or martians = Spoofed/Martians
+WARNING: untranslated string: subscription code = Subscription code
diff --git a/doc/language_issues.it b/doc/language_issues.it

index 9c5ff395aaf5bd5a01bcb56fc4e8635d13ecf8d8..6a4c2f26f17af8ea102945749098a21a71b81aa0 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -150,6 +150,7 @@ WARNING: translation string unused: class in use
  WARNING: translation string unused: clear cache
  WARNING: translation string unused: client
  WARNING: translation string unused: comment
+WARNING: translation string unused: community rules
  WARNING: translation string unused: compression
  WARNING: translation string unused: connect
  WARNING: translation string unused: connect the modem
@@ -261,6 +262,7 @@ WARNING: translation string unused: editor
  WARNING: translation string unused: eg
  WARNING: translation string unused: email server can not be empty
  WARNING: translation string unused: emailreportlevel
+WARNING: translation string unused: emerging rules
  WARNING: translation string unused: enable javascript
  WARNING: translation string unused: enable wildcards
  WARNING: translation string unused: enabledtitle
@@ -385,6 +387,7 @@ WARNING: translation string unused: ids rules license
  WARNING: translation string unused: ids rules license1
  WARNING: translation string unused: ids rules license2
  WARNING: translation string unused: ids rules license3
+WARNING: translation string unused: ids rules update
  WARNING: translation string unused: ike encryption
  WARNING: translation string unused: ike grouptype
  WARNING: translation string unused: ike integrity
@@ -407,6 +410,7 @@ WARNING: translation string unused: intrusion detection system2
  WARNING: translation string unused: invalid cache size
  WARNING: translation string unused: invalid date entered
  WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid input for oink code
  WARNING: translation string unused: invalid loaded file
  WARNING: translation string unused: invalid md5sum
  WARNING: translation string unused: invalid port list
@@ -632,7 +636,9 @@ WARNING: translation string unused: reboot question
  WARNING: translation string unused: reboot schedule
  WARNING: translation string unused: reboot sure
  WARNING: translation string unused: refresh update list
+WARNING: translation string unused: registered user rules
  WARNING: translation string unused: released
+WARNING: translation string unused: reload
  WARNING: translation string unused: removable device advice
  WARNING: translation string unused: reportfile
  WARNING: translation string unused: reportlevel
@@ -719,6 +725,7 @@ WARNING: translation string unused: subject test
  WARNING: translation string unused: subject warn
  WARNING: translation string unused: subnet
  WARNING: translation string unused: subnet is invalid
+WARNING: translation string unused: subscripted user rules
  WARNING: translation string unused: successfully refreshed updates list
  WARNING: translation string unused: system graphs
  WARNING: translation string unused: system has hwrng
@@ -971,6 +978,8 @@ WARNING: untranslated string: dns use protocol for dns queries = Protocol for DN
  WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
  WARNING: untranslated string: dnsforward forward_servers = Nameservers
  WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
+WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at Spamhaus DROP, etc.)
+WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians
  WARNING: untranslated string: duration = Duration
  WARNING: untranslated string: eight hours = 8 Hours
  WARNING: untranslated string: email config = Configuration
@@ -991,7 +1000,6 @@ WARNING: untranslated string: email tls = TLS mode
  WARNING: untranslated string: email tls explicit = explicit (STARTTLS)
  WARNING: untranslated string: email tls implicit = implicit (TLS)
  WARNING: untranslated string: email usemail = Activate Mail Service
-WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules
  WARNING: untranslated string: enable = Enable
  WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
  WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk.
@@ -1009,6 +1017,7 @@ WARNING: untranslated string: five minutes = 5 Minutes
  WARNING: untranslated string: force enable = Forced
  WARNING: untranslated string: foreshadow = Foreshadow
  WARNING: untranslated string: four hours = 4 Hours
+WARNING: untranslated string: fw red = Firewall options for RED interface
  WARNING: untranslated string: fwdfw all subnets = All subnets
  WARNING: untranslated string: fwdfw err concon = Invalid number for concurrent connections
  WARNING: untranslated string: fwdfw err ratecon = Invalid value for connections in Rate-limit
@@ -1055,22 +1064,35 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string
  WARNING: untranslated string: guardian no entries = unknown string
  WARNING: untranslated string: guardian service = unknown string
  WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
+WARNING: untranslated string: hostile networks = Hostile networks
+WARNING: untranslated string: ids add provider = Add provider
  WARNING: untranslated string: ids apply = Apply
  WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids automatic rules update = Automatic Rule Update
+WARNING: untranslated string: ids autoupdates = Automatic updates
+WARNING: untranslated string: ids could not add provider = Could not add provider
+WARNING: untranslated string: ids customize ruleset = Customize ruleset
  WARNING: untranslated string: ids download new ruleset = Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids enable = Enable Intrusion Prevention System
+WARNING: untranslated string: ids enable automatic updates = Enable automatic updates
+WARNING: untranslated string: ids force ruleset update = Force ruleset update
  WARNING: untranslated string: ids hide = Hide
  WARNING: untranslated string: ids ignored hosts = Whitelisted Hosts
  WARNING: untranslated string: ids log hits = Total of number of activated rules for
  WARNING: untranslated string: ids monitor traffic only = Monitor traffic only
  WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
+WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
  WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
-WARNING: untranslated string: ids no ruleset available = No ruleset is available. Please download one first
-WARNING: untranslated string: ids oinkcode required = The selected ruleset requires a subscription or an Oinkcode
+WARNING: untranslated string: ids provider = Provider
+WARNING: untranslated string: ids provider settings = Provider settings
+WARNING: untranslated string: ids reset provider = Reset provider
  WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids ruleset settings = Ruleset Settings
  WARNING: untranslated string: ids show = Show
+WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
+WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
+WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset
+WARNING: untranslated string: ids visit provider website = Visit provider website
  WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully...
  WARNING: untranslated string: incoming compression in bytes per second = Incoming Compression
  WARNING: untranslated string: incoming overhead in bytes per second = Incoming Overhead
@@ -1082,6 +1104,7 @@ WARNING: untranslated string: invalid input for interface mode = Invalid input f
  WARNING: untranslated string: invalid input for interface mtu = Invalid input to interface MTU
  WARNING: untranslated string: invalid input for local ip address = Invalid input for local IP address
  WARNING: untranslated string: invalid input for mode = Invalid input for mode
+WARNING: untranslated string: invalid input for subscription code = Invalid input for subscription code
  WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
  WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
  WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
@@ -1140,7 +1163,10 @@ WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for
  WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log
  WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
  WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
+WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning...
+WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding.
  WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: pakfire return = Return to Pakfire
  WARNING: untranslated string: pakfire tree = Repository
  WARNING: untranslated string: pakfire tree stable = Stable
  WARNING: untranslated string: pakfire tree testing = Testing
@@ -1174,6 +1200,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: spoofed or martians = Spoofed/Martians
  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
@@ -1183,6 +1210,7 @@ WARNING: untranslated string: ssh username = Username
  WARNING: untranslated string: standard = Standard
  WARNING: untranslated string: strict = Strict
  WARNING: untranslated string: subnet mask = Subnet Mask
+WARNING: untranslated string: subscription code = Subscription code
  WARNING: untranslated string: system is offline = The system is offline.
  WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2
  WARNING: untranslated string: tcp more reliable = TCP (more reliable)
@@ -1201,7 +1229,6 @@ WARNING: untranslated string: unblock = Unblock
  WARNING: untranslated string: unblock all = Unblock all
  WARNING: untranslated string: uncheck all = Uncheck all
  WARNING: untranslated string: unlimited = Unlimited
-WARNING: untranslated string: update ruleset = Update ruleset
  WARNING: untranslated string: updxlrtr passive mode = Delivery only/no download mode
  WARNING: untranslated string: uplink bit rate = Uplink Bit Rate
  WARNING: untranslated string: user management = User Management
diff --git a/doc/language_issues.nl b/doc/language_issues.nl

index ab5dada51c236978d5873798e8465d1c92c1eb5c..4cf42c6249859365a0203c148bb02d204e448439 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -149,6 +149,7 @@ WARNING: translation string unused: class in use
  WARNING: translation string unused: clear cache
  WARNING: translation string unused: client
  WARNING: translation string unused: comment
+WARNING: translation string unused: community rules
  WARNING: translation string unused: compression
  WARNING: translation string unused: connect
  WARNING: translation string unused: connect the modem
@@ -259,6 +260,7 @@ WARNING: translation string unused: editor
  WARNING: translation string unused: eg
  WARNING: translation string unused: email server can not be empty
  WARNING: translation string unused: emailreportlevel
+WARNING: translation string unused: emerging rules
  WARNING: translation string unused: enable javascript
  WARNING: translation string unused: enable wildcards
  WARNING: translation string unused: enabledtitle
@@ -383,6 +385,7 @@ WARNING: translation string unused: ids rules license
  WARNING: translation string unused: ids rules license1
  WARNING: translation string unused: ids rules license2
  WARNING: translation string unused: ids rules license3
+WARNING: translation string unused: ids rules update
  WARNING: translation string unused: ike encryption
  WARNING: translation string unused: ike grouptype
  WARNING: translation string unused: ike integrity
@@ -405,6 +408,7 @@ WARNING: translation string unused: intrusion detection system2
  WARNING: translation string unused: invalid cache size
  WARNING: translation string unused: invalid date entered
  WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid input for oink code
  WARNING: translation string unused: invalid loaded file
  WARNING: translation string unused: invalid md5sum
  WARNING: translation string unused: invalid port list
@@ -628,7 +632,9 @@ WARNING: translation string unused: reboot question
  WARNING: translation string unused: reboot schedule
  WARNING: translation string unused: reboot sure
  WARNING: translation string unused: refresh update list
+WARNING: translation string unused: registered user rules
  WARNING: translation string unused: released
+WARNING: translation string unused: reload
  WARNING: translation string unused: removable device advice
  WARNING: translation string unused: reportfile
  WARNING: translation string unused: reportlevel
@@ -715,6 +721,7 @@ WARNING: translation string unused: subject test
  WARNING: translation string unused: subject warn
  WARNING: translation string unused: subnet
  WARNING: translation string unused: subnet is invalid
+WARNING: translation string unused: subscripted user rules
  WARNING: translation string unused: successfully refreshed updates list
  WARNING: translation string unused: system graphs
  WARNING: translation string unused: system has hwrng
@@ -977,7 +984,9 @@ WARNING: untranslated string: dnssec not supported = DNSSEC Not supported
  WARNING: untranslated string: dnssec validating = DNSSEC Validating
  WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
  WARNING: untranslated string: download tls-auth key = Download tls-auth key
+WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at Spamhaus DROP, etc.)
  WARNING: untranslated string: drop outgoing = Log dropped outgoing packets
+WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians
  WARNING: untranslated string: duration = Duration
  WARNING: untranslated string: eight hours = 8 Hours
  WARNING: untranslated string: email config = Configuration
@@ -998,7 +1007,6 @@ WARNING: untranslated string: email tls = TLS mode
  WARNING: untranslated string: email tls explicit = explicit (STARTTLS)
  WARNING: untranslated string: email tls implicit = implicit (TLS)
  WARNING: untranslated string: email usemail = Activate Mail Service
-WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules
  WARNING: untranslated string: enable = Enable
  WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
  WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk.
@@ -1017,6 +1025,7 @@ WARNING: untranslated string: five minutes = 5 Minutes
  WARNING: untranslated string: force enable = Forced
  WARNING: untranslated string: foreshadow = Foreshadow
  WARNING: untranslated string: four hours = 4 Hours
+WARNING: untranslated string: fw red = Firewall options for RED interface
  WARNING: untranslated string: fwdfw all subnets = All subnets
  WARNING: untranslated string: fwdfw err concon = Invalid number for concurrent connections
  WARNING: untranslated string: fwdfw err ratecon = Invalid value for connections in Rate-limit
@@ -1064,22 +1073,35 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string
  WARNING: untranslated string: guardian no entries = unknown string
  WARNING: untranslated string: guardian service = unknown string
  WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
+WARNING: untranslated string: hostile networks = Hostile networks
+WARNING: untranslated string: ids add provider = Add provider
  WARNING: untranslated string: ids apply = Apply
  WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids automatic rules update = Automatic Rule Update
+WARNING: untranslated string: ids autoupdates = Automatic updates
+WARNING: untranslated string: ids could not add provider = Could not add provider
+WARNING: untranslated string: ids customize ruleset = Customize ruleset
  WARNING: untranslated string: ids download new ruleset = Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids enable = Enable Intrusion Prevention System
+WARNING: untranslated string: ids enable automatic updates = Enable automatic updates
+WARNING: untranslated string: ids force ruleset update = Force ruleset update
  WARNING: untranslated string: ids hide = Hide
  WARNING: untranslated string: ids ignored hosts = Whitelisted Hosts
  WARNING: untranslated string: ids log hits = Total of number of activated rules for
  WARNING: untranslated string: ids monitor traffic only = Monitor traffic only
  WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
+WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
  WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
-WARNING: untranslated string: ids no ruleset available = No ruleset is available. Please download one first
-WARNING: untranslated string: ids oinkcode required = The selected ruleset requires a subscription or an Oinkcode
+WARNING: untranslated string: ids provider = Provider
+WARNING: untranslated string: ids provider settings = Provider settings
+WARNING: untranslated string: ids reset provider = Reset provider
  WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids ruleset settings = Ruleset Settings
  WARNING: untranslated string: ids show = Show
+WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
+WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
+WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset
+WARNING: untranslated string: ids visit provider website = Visit provider website
  WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully...
  WARNING: untranslated string: imei = IMEI
  WARNING: untranslated string: imsi = IMSI
@@ -1093,6 +1115,7 @@ WARNING: untranslated string: invalid input for interface mode = Invalid input f
  WARNING: untranslated string: invalid input for interface mtu = Invalid input to interface MTU
  WARNING: untranslated string: invalid input for local ip address = Invalid input for local IP address
  WARNING: untranslated string: invalid input for mode = Invalid input for mode
+WARNING: untranslated string: invalid input for subscription code = Invalid input for subscription code
  WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
  WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
  WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
@@ -1174,7 +1197,10 @@ WARNING: untranslated string: ovpn ha = Hash algorithm
  WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log
  WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
  WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
+WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning...
+WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding.
  WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: pakfire return = Return to Pakfire
  WARNING: untranslated string: pakfire tree = Repository
  WARNING: untranslated string: pakfire tree stable = Stable
  WARNING: untranslated string: pakfire tree testing = Testing
@@ -1213,6 +1239,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: spoofed or martians = Spoofed/Martians
  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
@@ -1222,6 +1249,7 @@ WARNING: untranslated string: ssh username = Username
  WARNING: untranslated string: standard = Standard
  WARNING: untranslated string: strict = Strict
  WARNING: untranslated string: subnet mask = Subnet Mask
+WARNING: untranslated string: subscription code = Subscription code
  WARNING: untranslated string: system is offline = The system is offline.
  WARNING: untranslated string: ta key = TLS-Authentification-Key
  WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2
@@ -1241,7 +1269,6 @@ WARNING: untranslated string: unblock = Unblock
  WARNING: untranslated string: unblock all = Unblock all
  WARNING: untranslated string: uncheck all = Uncheck all
  WARNING: untranslated string: unlimited = Unlimited
-WARNING: untranslated string: update ruleset = Update ruleset
  WARNING: untranslated string: updxlrtr passive mode = Delivery only/no download mode
  WARNING: untranslated string: uplink bit rate = Uplink Bit Rate
  WARNING: untranslated string: upload dh key = Upload Diffie-Hellman parameters
diff --git a/doc/language_issues.pl b/doc/language_issues.pl

index f57c485a7e6bb6511c6e5868dfdffa557e25febb..6314c44564ec9100ce6e88bc4be458c6f5a26513 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -328,6 +328,7 @@ WARNING: translation string unused: ids rules license
  WARNING: translation string unused: ids rules license1
  WARNING: translation string unused: ids rules license2
  WARNING: translation string unused: ids rules license3
+WARNING: translation string unused: ids rules update
  WARNING: translation string unused: ike encryption
  WARNING: translation string unused: ike grouptype
  WARNING: translation string unused: ike integrity
@@ -350,6 +351,7 @@ WARNING: translation string unused: intrusion detection system2
  WARNING: translation string unused: invalid cache size
  WARNING: translation string unused: invalid date entered
  WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid input for oink code
  WARNING: translation string unused: invalid loaded file
  WARNING: translation string unused: invalid md5sum
  WARNING: translation string unused: invalid port list
@@ -560,7 +562,9 @@ WARNING: translation string unused: reboot question
  WARNING: translation string unused: reboot schedule
  WARNING: translation string unused: reboot sure
  WARNING: translation string unused: refresh update list
+WARNING: translation string unused: registered user rules
  WARNING: translation string unused: released
+WARNING: translation string unused: reload
  WARNING: translation string unused: removable device advice
  WARNING: translation string unused: reportfile
  WARNING: translation string unused: reportlevel
@@ -647,6 +651,7 @@ WARNING: translation string unused: subject test
  WARNING: translation string unused: subject warn
  WARNING: translation string unused: subnet
  WARNING: translation string unused: subnet is invalid
+WARNING: translation string unused: subscripted user rules
  WARNING: translation string unused: successfully refreshed updates list
  WARNING: translation string unused: system graphs
  WARNING: translation string unused: system log viewer
@@ -905,7 +910,6 @@ WARNING: untranslated string: ccd routes = Routing:
  WARNING: untranslated string: ccd subnet = Subnet
  WARNING: untranslated string: ccd used = Used addresses
  WARNING: untranslated string: check all = Check all
-WARNING: untranslated string: community rules = Snort/VRT GPLv2 Community Rules
  WARNING: untranslated string: count = Count
  WARNING: untranslated string: countries = Countries
  WARNING: untranslated string: country codes and flags = Country Codes and Flags:
@@ -970,7 +974,9 @@ WARNING: untranslated string: drop action = Default behaviour of (forward) firew
  WARNING: untranslated string: drop action1 = Default behaviour of (outgoing) firewall in mode "Blocked"
  WARNING: untranslated string: drop action2 = Default behaviour of (input) firewall
  WARNING: untranslated string: drop forward = Log dropped forward packets
+WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at Spamhaus DROP, etc.)
  WARNING: untranslated string: drop outgoing = Log dropped outgoing packets
+WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians
  WARNING: untranslated string: duration = Duration
  WARNING: untranslated string: eight hours = 8 Hours
  WARNING: untranslated string: email config = Configuration
@@ -991,8 +997,6 @@ WARNING: untranslated string: email tls = TLS mode
  WARNING: untranslated string: email tls explicit = explicit (STARTTLS)
  WARNING: untranslated string: email tls implicit = implicit (TLS)
  WARNING: untranslated string: email usemail = Activate Mail Service
-WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules
-WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules
  WARNING: untranslated string: enable = Enable
  WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
  WARNING: untranslated string: encryption = Encryption:
@@ -1025,6 +1029,7 @@ WARNING: untranslated string: force enable = Forced
  WARNING: untranslated string: foreshadow = Foreshadow
  WARNING: untranslated string: four hours = 4 Hours
  WARNING: untranslated string: fw default drop = Firewall policy
+WARNING: untranslated string: fw red = Firewall options for RED interface
  WARNING: untranslated string: fw settings = Firewall settings
  WARNING: untranslated string: fw settings color = Show colors in ruletable
  WARNING: untranslated string: fw settings dropdown = Show all networks on rulecreation site
@@ -1214,22 +1219,35 @@ WARNING: untranslated string: guardian no entries = unknown string
  WARNING: untranslated string: guardian service = unknown string
  WARNING: untranslated string: hardware support = Hardware Support
  WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
+WARNING: untranslated string: hostile networks = Hostile networks
+WARNING: untranslated string: ids add provider = Add provider
  WARNING: untranslated string: ids apply = Apply
  WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids automatic rules update = Automatic Rule Update
+WARNING: untranslated string: ids autoupdates = Automatic updates
+WARNING: untranslated string: ids could not add provider = Could not add provider
+WARNING: untranslated string: ids customize ruleset = Customize ruleset
  WARNING: untranslated string: ids download new ruleset = Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids enable = Enable Intrusion Prevention System
+WARNING: untranslated string: ids enable automatic updates = Enable automatic updates
+WARNING: untranslated string: ids force ruleset update = Force ruleset update
  WARNING: untranslated string: ids hide = Hide
  WARNING: untranslated string: ids ignored hosts = Whitelisted Hosts
  WARNING: untranslated string: ids log hits = Total of number of activated rules for
  WARNING: untranslated string: ids monitor traffic only = Monitor traffic only
  WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
+WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
  WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
-WARNING: untranslated string: ids no ruleset available = No ruleset is available. Please download one first
-WARNING: untranslated string: ids oinkcode required = The selected ruleset requires a subscription or an Oinkcode
+WARNING: untranslated string: ids provider = Provider
+WARNING: untranslated string: ids provider settings = Provider settings
+WARNING: untranslated string: ids reset provider = Reset provider
  WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids ruleset settings = Ruleset Settings
  WARNING: untranslated string: ids show = Show
+WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
+WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
+WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset
+WARNING: untranslated string: ids visit provider website = Visit provider website
  WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully...
  WARNING: untranslated string: imei = IMEI
  WARNING: untranslated string: imsi = IMSI
@@ -1247,6 +1265,7 @@ WARNING: untranslated string: invalid input for interface mode = Invalid input f
  WARNING: untranslated string: invalid input for interface mtu = Invalid input to interface MTU
  WARNING: untranslated string: invalid input for local ip address = Invalid input for local IP address
  WARNING: untranslated string: invalid input for mode = Invalid input for mode
+WARNING: untranslated string: invalid input for subscription code = Invalid input for subscription code
  WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
  WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
  WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
@@ -1358,7 +1377,10 @@ WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
  WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
  WARNING: untranslated string: p2p block = P2P networks
  WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes.
+WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning...
+WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding.
  WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: pakfire return = Return to Pakfire
  WARNING: untranslated string: pakfire tree = Repository
  WARNING: untranslated string: pakfire tree stable = Stable
  WARNING: untranslated string: pakfire tree testing = Testing
@@ -1406,6 +1428,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: spoofed or martians = Spoofed/Martians
  WARNING: untranslated string: srbds = Special register buffer data sampling
  WARNING: untranslated string: ssh = SSH
  WARNING: untranslated string: ssh active sessions = Active logins
@@ -1417,6 +1440,7 @@ WARNING: untranslated string: standard = Standard
  WARNING: untranslated string: static routes = Static Routes
  WARNING: untranslated string: strict = Strict
  WARNING: untranslated string: subnet mask = Subnet Mask
+WARNING: untranslated string: subscription code = Subscription code
  WARNING: untranslated string: support donation = Support the IPFire project with your donation
  WARNING: untranslated string: system has rdrand = This system has support for Intel(R) RDRAND.
  WARNING: untranslated string: system is offline = The system is offline.
@@ -1486,7 +1510,6 @@ WARNING: untranslated string: unblock = Unblock
  WARNING: untranslated string: unblock all = Unblock all
  WARNING: untranslated string: uncheck all = Uncheck all
  WARNING: untranslated string: unlimited = Unlimited
-WARNING: untranslated string: update ruleset = Update ruleset
  WARNING: untranslated string: updxlrtr passive mode = Delivery only/no download mode
  WARNING: untranslated string: uplink = Uplink
  WARNING: untranslated string: uplink bit rate = Uplink Bit Rate
diff --git a/doc/language_issues.ru b/doc/language_issues.ru

index 96b84751dd81b5a6ae2c6aef41670732df2cacca..6589fe087eb9658b67e156837280168d3e8747f5 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -325,6 +325,7 @@ WARNING: translation string unused: ids rules license
  WARNING: translation string unused: ids rules license1
  WARNING: translation string unused: ids rules license2
  WARNING: translation string unused: ids rules license3
+WARNING: translation string unused: ids rules update
  WARNING: translation string unused: ike encryption
  WARNING: translation string unused: ike grouptype
  WARNING: translation string unused: ike integrity
@@ -347,6 +348,7 @@ WARNING: translation string unused: intrusion detection system2
  WARNING: translation string unused: invalid cache size
  WARNING: translation string unused: invalid date entered
  WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid input for oink code
  WARNING: translation string unused: invalid loaded file
  WARNING: translation string unused: invalid md5sum
  WARNING: translation string unused: invalid port list
@@ -556,7 +558,9 @@ WARNING: translation string unused: reboot question
  WARNING: translation string unused: reboot schedule
  WARNING: translation string unused: reboot sure
  WARNING: translation string unused: refresh update list
+WARNING: translation string unused: registered user rules
  WARNING: translation string unused: released
+WARNING: translation string unused: reload
  WARNING: translation string unused: removable device advice
  WARNING: translation string unused: reportfile
  WARNING: translation string unused: reportlevel
@@ -643,6 +647,7 @@ WARNING: translation string unused: subject test
  WARNING: translation string unused: subject warn
  WARNING: translation string unused: subnet
  WARNING: translation string unused: subnet is invalid
+WARNING: translation string unused: subscripted user rules
  WARNING: translation string unused: successfully refreshed updates list
  WARNING: translation string unused: system graphs
  WARNING: translation string unused: system log viewer
@@ -901,7 +906,6 @@ WARNING: untranslated string: ccd routes = Routing:
  WARNING: untranslated string: ccd subnet = Subnet
  WARNING: untranslated string: ccd used = Used addresses
  WARNING: untranslated string: check all = Check all
-WARNING: untranslated string: community rules = Snort/VRT GPLv2 Community Rules
  WARNING: untranslated string: count = Count
  WARNING: untranslated string: countries = Countries
  WARNING: untranslated string: country codes and flags = Country Codes and Flags:
@@ -967,7 +971,9 @@ WARNING: untranslated string: drop action = Default behaviour of (forward) firew
  WARNING: untranslated string: drop action1 = Default behaviour of (outgoing) firewall in mode "Blocked"
  WARNING: untranslated string: drop action2 = Default behaviour of (input) firewall
  WARNING: untranslated string: drop forward = Log dropped forward packets
+WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at Spamhaus DROP, etc.)
  WARNING: untranslated string: drop outgoing = Log dropped outgoing packets
+WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians
  WARNING: untranslated string: duration = Duration
  WARNING: untranslated string: eight hours = 8 Hours
  WARNING: untranslated string: email config = Configuration
@@ -988,8 +994,6 @@ WARNING: untranslated string: email tls = TLS mode
  WARNING: untranslated string: email tls explicit = explicit (STARTTLS)
  WARNING: untranslated string: email tls implicit = implicit (TLS)
  WARNING: untranslated string: email usemail = Activate Mail Service
-WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules
-WARNING: untranslated string: emerging rules = Emergingthreats.net Community Rules
  WARNING: untranslated string: enable = Enable
  WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
  WARNING: untranslated string: encryption = Encryption:
@@ -1022,6 +1026,7 @@ WARNING: untranslated string: force enable = Forced
  WARNING: untranslated string: foreshadow = Foreshadow
  WARNING: untranslated string: four hours = 4 Hours
  WARNING: untranslated string: fw default drop = Firewall policy
+WARNING: untranslated string: fw red = Firewall options for RED interface
  WARNING: untranslated string: fw settings = Firewall settings
  WARNING: untranslated string: fw settings color = Show colors in ruletable
  WARNING: untranslated string: fw settings dropdown = Show all networks on rulecreation site
@@ -1211,22 +1216,35 @@ WARNING: untranslated string: guardian no entries = unknown string
  WARNING: untranslated string: guardian service = unknown string
  WARNING: untranslated string: hardware support = Hardware Support
  WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
+WARNING: untranslated string: hostile networks = Hostile networks
+WARNING: untranslated string: ids add provider = Add provider
  WARNING: untranslated string: ids apply = Apply
  WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids automatic rules update = Automatic Rule Update
+WARNING: untranslated string: ids autoupdates = Automatic updates
+WARNING: untranslated string: ids could not add provider = Could not add provider
+WARNING: untranslated string: ids customize ruleset = Customize ruleset
  WARNING: untranslated string: ids download new ruleset = Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids enable = Enable Intrusion Prevention System
+WARNING: untranslated string: ids enable automatic updates = Enable automatic updates
+WARNING: untranslated string: ids force ruleset update = Force ruleset update
  WARNING: untranslated string: ids hide = Hide
  WARNING: untranslated string: ids ignored hosts = Whitelisted Hosts
  WARNING: untranslated string: ids log hits = Total of number of activated rules for
  WARNING: untranslated string: ids monitor traffic only = Monitor traffic only
  WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
+WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
  WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
-WARNING: untranslated string: ids no ruleset available = No ruleset is available. Please download one first
-WARNING: untranslated string: ids oinkcode required = The selected ruleset requires a subscription or an Oinkcode
+WARNING: untranslated string: ids provider = Provider
+WARNING: untranslated string: ids provider settings = Provider settings
+WARNING: untranslated string: ids reset provider = Reset provider
  WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids ruleset settings = Ruleset Settings
  WARNING: untranslated string: ids show = Show
+WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
+WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
+WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset
+WARNING: untranslated string: ids visit provider website = Visit provider website
  WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully...
  WARNING: untranslated string: imei = IMEI
  WARNING: untranslated string: imsi = IMSI
@@ -1245,6 +1263,7 @@ WARNING: untranslated string: invalid input for interface mode = Invalid input f
  WARNING: untranslated string: invalid input for interface mtu = Invalid input to interface MTU
  WARNING: untranslated string: invalid input for local ip address = Invalid input for local IP address
  WARNING: untranslated string: invalid input for mode = Invalid input for mode
+WARNING: untranslated string: invalid input for subscription code = Invalid input for subscription code
  WARNING: untranslated string: invalid input for valid till days = Invalid input for Valid till (days).
  WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
  WARNING: untranslated string: invalid logserver protocol = Invalid syslogd server protocol
@@ -1353,7 +1372,10 @@ WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
  WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
  WARNING: untranslated string: p2p block = P2P networks
  WARNING: untranslated string: p2p block save notice = Please reload the firewall ruleset in order to apply your changes.
+WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning...
+WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding.
  WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: pakfire return = Return to Pakfire
  WARNING: untranslated string: pakfire tree = Repository
  WARNING: untranslated string: pakfire tree stable = Stable
  WARNING: untranslated string: pakfire tree testing = Testing
@@ -1401,6 +1423,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: spoofed or martians = Spoofed/Martians
  WARNING: untranslated string: srbds = Special register buffer data sampling
  WARNING: untranslated string: ssh = SSH
  WARNING: untranslated string: ssh active sessions = Active logins
@@ -1412,6 +1435,7 @@ WARNING: untranslated string: standard = Standard
  WARNING: untranslated string: static routes = Static Routes
  WARNING: untranslated string: strict = Strict
  WARNING: untranslated string: subnet mask = Subnet Mask
+WARNING: untranslated string: subscription code = Subscription code
  WARNING: untranslated string: support donation = Support the IPFire project with your donation
  WARNING: untranslated string: system has rdrand = This system has support for Intel(R) RDRAND.
  WARNING: untranslated string: system is offline = The system is offline.
@@ -1481,7 +1505,6 @@ WARNING: untranslated string: unblock = Unblock
  WARNING: untranslated string: unblock all = Unblock all
  WARNING: untranslated string: uncheck all = Uncheck all
  WARNING: untranslated string: unlimited = Unlimited
-WARNING: untranslated string: update ruleset = Update ruleset
  WARNING: untranslated string: updxlrtr passive mode = Delivery only/no download mode
  WARNING: untranslated string: uplink = Uplink
  WARNING: untranslated string: uplink bit rate = Uplink Bit Rate
diff --git a/doc/language_issues.tr b/doc/language_issues.tr

index 821d79f05ac54e76cd57cf929ebdf26ed16424e0..995ad711c278eb241ad39e6b26b3c66980ffaf62 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -172,6 +172,7 @@ WARNING: translation string unused: class in use
  WARNING: translation string unused: clear cache
  WARNING: translation string unused: client
  WARNING: translation string unused: comment
+WARNING: translation string unused: community rules
  WARNING: translation string unused: compression
  WARNING: translation string unused: connect
  WARNING: translation string unused: connect the modem
@@ -288,6 +289,7 @@ WARNING: translation string unused: email subject
  WARNING: translation string unused: email success
  WARNING: translation string unused: email text
  WARNING: translation string unused: emailreportlevel
+WARNING: translation string unused: emerging rules
  WARNING: translation string unused: enable javascript
  WARNING: translation string unused: enable wildcards
  WARNING: translation string unused: enabledtitle
@@ -411,6 +413,7 @@ WARNING: translation string unused: ids rules license
  WARNING: translation string unused: ids rules license1
  WARNING: translation string unused: ids rules license2
  WARNING: translation string unused: ids rules license3
+WARNING: translation string unused: ids rules update
  WARNING: translation string unused: ike encryption
  WARNING: translation string unused: ike grouptype
  WARNING: translation string unused: ike integrity
@@ -433,6 +436,7 @@ WARNING: translation string unused: intrusion detection system2
  WARNING: translation string unused: invalid cache size
  WARNING: translation string unused: invalid date entered
  WARNING: translation string unused: invalid downlink speed
+WARNING: translation string unused: invalid input for oink code
  WARNING: translation string unused: invalid loaded file
  WARNING: translation string unused: invalid md5sum
  WARNING: translation string unused: invalid port list
@@ -662,7 +666,9 @@ WARNING: translation string unused: reboot question
  WARNING: translation string unused: reboot schedule
  WARNING: translation string unused: reboot sure
  WARNING: translation string unused: refresh update list
+WARNING: translation string unused: registered user rules
  WARNING: translation string unused: released
+WARNING: translation string unused: reload
  WARNING: translation string unused: removable device advice
  WARNING: translation string unused: reportfile
  WARNING: translation string unused: reportlevel
@@ -749,6 +755,7 @@ WARNING: translation string unused: subject test
  WARNING: translation string unused: subject warn
  WARNING: translation string unused: subnet
  WARNING: translation string unused: subnet is invalid
+WARNING: translation string unused: subscripted user rules
  WARNING: translation string unused: successfully refreshed updates list
  WARNING: translation string unused: system graphs
  WARNING: translation string unused: system has hwrng
@@ -951,10 +958,11 @@ WARNING: untranslated string: dns use protocol for dns queries = Protocol for DN
  WARNING: untranslated string: dnsforward dnssec disabled = DNSSEC Validation is disabled
  WARNING: untranslated string: dnsforward forward_servers = Nameservers
  WARNING: untranslated string: download apple profile = Download Apple Configuration Profile
+WARNING: untranslated string: drop hostile = Drop packets from and to hostile networks (listed at Spamhaus DROP, etc.)
+WARNING: untranslated string: drop spoofed martians = Log dropped spoofed packets and marsians
  WARNING: untranslated string: duration = Duration
  WARNING: untranslated string: email tls explicit = explicit (STARTTLS)
  WARNING: untranslated string: email tls implicit = implicit (TLS)
-WARNING: untranslated string: emerging pro rules = Emergingthreats.net Pro Rules
  WARNING: untranslated string: enable = Enable
  WARNING: untranslated string: enable smt = Enable Simultaneous Multi-Threading (SMT)
  WARNING: untranslated string: eol architecture warning = You are running an architecture of IPFire which reached its end of life. You will not receive updates anymore. This is a security risk.
@@ -963,6 +971,7 @@ WARNING: untranslated string: error the to date has to be later than the from da
  WARNING: untranslated string: fallout zombieload ridl = Fallout/ZombieLoad/RIDL
  WARNING: untranslated string: force enable = Forced
  WARNING: untranslated string: foreshadow = Foreshadow
+WARNING: untranslated string: fw red = Firewall options for RED interface
  WARNING: untranslated string: fwdfw all subnets = All subnets
  WARNING: untranslated string: fwhost cust locationgrp = unknown string
  WARNING: untranslated string: fwhost err hostip = unknown string
@@ -997,22 +1006,35 @@ WARNING: untranslated string: guardian logtarget_syslog = unknown string
  WARNING: untranslated string: guardian no entries = unknown string
  WARNING: untranslated string: guardian service = unknown string
  WARNING: untranslated string: hardware vulnerabilities = Hardware Vulnerabilities
+WARNING: untranslated string: hostile networks = Hostile networks
+WARNING: untranslated string: ids add provider = Add provider
  WARNING: untranslated string: ids apply = Apply
  WARNING: untranslated string: ids apply ruleset changes = The ruleset changes are being applied. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids automatic rules update = Automatic Rule Update
+WARNING: untranslated string: ids autoupdates = Automatic updates
+WARNING: untranslated string: ids could not add provider = Could not add provider
+WARNING: untranslated string: ids customize ruleset = Customize ruleset
  WARNING: untranslated string: ids download new ruleset = Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids enable = Enable Intrusion Prevention System
+WARNING: untranslated string: ids enable automatic updates = Enable automatic updates
+WARNING: untranslated string: ids force ruleset update = Force ruleset update
  WARNING: untranslated string: ids hide = Hide
  WARNING: untranslated string: ids ignored hosts = Whitelisted Hosts
  WARNING: untranslated string: ids log hits = Total of number of activated rules for
  WARNING: untranslated string: ids monitor traffic only = Monitor traffic only
  WARNING: untranslated string: ids monitored interfaces = Monitored Interfaces
+WARNING: untranslated string: ids no enabled ruleset provider = No enabled ruleset is available. Please activate or add one first.
  WARNING: untranslated string: ids no network zone = Please select at least one network zone to be monitored
-WARNING: untranslated string: ids no ruleset available = No ruleset is available. Please download one first
-WARNING: untranslated string: ids oinkcode required = The selected ruleset requires a subscription or an Oinkcode
+WARNING: untranslated string: ids provider = Provider
+WARNING: untranslated string: ids provider settings = Provider settings
+WARNING: untranslated string: ids reset provider = Reset provider
  WARNING: untranslated string: ids ruleset autoupdate in progress = Ruleset update in progress. Please wait until all operations have completed successfully...
  WARNING: untranslated string: ids ruleset settings = Ruleset Settings
  WARNING: untranslated string: ids show = Show
+WARNING: untranslated string: ids subscription code required = The selected ruleset requires a subscription code
+WARNING: untranslated string: ids the choosen provider is already in use = The choosen provider is already in use.
+WARNING: untranslated string: ids unable to download the ruleset = Unable to download the ruleset
+WARNING: untranslated string: ids visit provider website = Visit provider website
  WARNING: untranslated string: ids working = Changes are being applied. Please wait until all operations have completed successfully...
  WARNING: untranslated string: info messages = unknown string
  WARNING: untranslated string: interface mode = Interface
@@ -1021,6 +1043,7 @@ WARNING: untranslated string: invalid input for interface mode = Invalid input f
  WARNING: untranslated string: invalid input for interface mtu = Invalid input to interface MTU
  WARNING: untranslated string: invalid input for local ip address = Invalid input for local IP address
  WARNING: untranslated string: invalid input for mode = Invalid input for mode
+WARNING: untranslated string: invalid input for subscription code = Invalid input for subscription code
  WARNING: untranslated string: invalid ip or hostname = Invalid IP Address or Hostname
  WARNING: untranslated string: ip basic info = Basic IP information
  WARNING: untranslated string: ip info for = IP information for
@@ -1054,7 +1077,10 @@ WARNING: untranslated string: ovpn error md5 = You host certificate uses MD5 for
  WARNING: untranslated string: ovpn rw connection log = OpenVPN Roadwarrior Connections Log
  WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
  WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
+WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning...
+WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding.
  WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
+WARNING: untranslated string: pakfire return = Return to Pakfire
  WARNING: untranslated string: pakfire tree = Repository
  WARNING: untranslated string: pakfire tree stable = Stable
  WARNING: untranslated string: pakfire tree testing = Testing
@@ -1080,6 +1106,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: spoofed or martians = Spoofed/Martians
  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
@@ -1089,6 +1116,7 @@ WARNING: untranslated string: ssh username = Username
  WARNING: untranslated string: standard = Standard
  WARNING: untranslated string: strict = Strict
  WARNING: untranslated string: subnet mask = Subnet Mask
+WARNING: untranslated string: subscription code = Subscription code
  WARNING: untranslated string: system is offline = The system is offline.
  WARNING: untranslated string: taa zombieload2 = TSX Async Abort / ZombieLoad v2
  WARNING: untranslated string: token = Token:
@@ -1097,7 +1125,6 @@ WARNING: untranslated string: tor guard country any = Any country
  WARNING: untranslated string: tor guard nodes = Guard Nodes
  WARNING: untranslated string: tor use guard nodes = Use only these guard nodes (one fingerprint per line)
  WARNING: untranslated string: transport mode does not support vti = VTI is not support in transport mode
-WARNING: untranslated string: update ruleset = Update ruleset
  WARNING: untranslated string: updxlrtr passive mode = Delivery only/no download mode
  WARNING: untranslated string: user management = User Management
  WARNING: untranslated string: vpn start action add = Wait for connection initiation
diff --git a/doc/language_missings b/doc/language_missings

index 6b5b85053ac1c25be6abd29bc4ebc640c8e35467..68ccda06214335c85f756b8c6b42fbdec7299832 100644 (file)
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -54,7 +54,9 @@
  < error the to date has to be later than the from date
  < g.dtm
  < g.lite
+< ids subscription code required
  < insert removable device
+< invalid input for subscription code
  < ipsec dns server address is invalid
  < ipsec invalid ip address or fqdn for rw endpoint
  < ipsec roadwarrior endpoint
@@ -73,6 +75,7 @@
  < show lines
  < show tls-auth key
  < smb daemon
+< subscription code
  < teovpn_fragment
  < tor bridge enabled
  < tor errmsg invalid node id
@@ -269,7 +272,9 @@
  < drop action1
  < drop action2
  < drop forward
+< drop hostile
  < drop outgoing
+< drop spoofed martians
  < duration
  < eight hours
  < email config
@@ -528,6 +533,7 @@
  < fwhost used
  < fwhost welcome
  < fwhost wo subnet
+< fw red
  < fw settings
  < fw settings color
  < fw settings dropdown
@@ -540,22 +546,35 @@
  < guardian
  < hardware support
  < hardware vulnerabilities
+< hostile networks
+< ids add provider
  < ids apply
  < ids apply ruleset changes
  < ids automatic rules update
+< ids autoupdates
+< ids could not add provider
+< ids customize ruleset
  < ids download new ruleset
  < ids enable
+< ids enable automatic updates
+< ids force ruleset update
  < ids hide
  < ids ignored hosts
  < ids log hits
  < ids monitored interfaces
  < ids monitor traffic only
+< ids no enabled ruleset provider
  < ids no network zone
-< ids no ruleset available
-< ids oinkcode required
+< ids provider
+< ids provider settings
+< ids reset provider
  < ids ruleset autoupdate in progress
  < ids ruleset settings
  < ids show
+< ids subscription code required
+< ids the choosen provider is already in use
+< ids unable to download the ruleset
+< ids visit provider website
  < ids working
  < imei
  < imsi
@@ -573,6 +592,7 @@
  < invalid input for interface mtu
  < invalid input for local ip address
  < invalid input for mode
+< invalid input for subscription code
  < invalid input for valid till days
  < invalid ip or hostname
  < invalid logserver protocol
@@ -712,7 +732,10 @@
  < ovpn warning rfc3280
  < p2p block
  < p2p block save notice
+< pakfire finished
+< pakfire finished error
  < pakfire invalid tree
+< pakfire return
  < pakfire tree
  < pakfire tree stable
  < pakfire tree testing
@@ -758,6 +781,7 @@
  < spectre variant 1
  < spectre variant 2
  < spectre variant 4
+< spoofed or martians
  < srbds
  < ssh
  < ssh active sessions
@@ -769,6 +793,7 @@
  < static routes
  < strict
  < subnet mask
+< subscription code
  < support donation
  < system has hwrng
  < system has rdrand
@@ -985,14 +1010,38 @@
  < cake profile pppoe-ptm 27
  < cake profile pppoe-vcmux 32
  < cake profile raw 0
+< drop hostile
+< drop spoofed martians
  < eol architecture warning
  < false max bandwidth
  < false min bandwidth
+< fw red
  < g.dtm
  < g.lite
  < guaranteed bandwidth
+< hostile networks
+< ids add provider
+< ids autoupdates
+< ids could not add provider
+< ids customize ruleset
+< ids enable automatic updates
+< ids force ruleset update
+< ids no enabled ruleset provider
+< ids provider
+< ids provider settings
+< ids reset provider
+< ids subscription code required
+< ids the choosen provider is already in use
+< ids unable to download the ruleset
+< ids visit provider website
+< invalid input for subscription code
  < link-layer encapsulation
  < max bandwidth
+< pakfire finished
+< pakfire finished error
+< pakfire return
+< spoofed or martians
+< subscription code
  < upload fcdsl.o
  ############################################################################
  # Checking cgi-bin translations for language: it                           #
@@ -1135,6 +1184,8 @@
  < dns use isp assigned nameservers
  < dns use protocol for dns queries
  < download apple profile
+< drop hostile
+< drop spoofed martians
  < duration
  < eight hours
  < email config
@@ -1189,26 +1240,40 @@
  < fwhost cust locationgroup
  < fwhost cust locationlocation
  < fwhost newlocationgrp
+< fw red
  < generate ptr
  < guaranteed bandwidth
  < guardian
  < hardware vulnerabilities
+< hostile networks
+< ids add provider
  < ids apply
  < ids apply ruleset changes
  < ids automatic rules update
+< ids autoupdates
+< ids could not add provider
+< ids customize ruleset
  < ids download new ruleset
  < ids enable
+< ids enable automatic updates
+< ids force ruleset update
  < ids hide
  < ids ignored hosts
  < ids log hits
  < ids monitored interfaces
  < ids monitor traffic only
+< ids no enabled ruleset provider
  < ids no network zone
-< ids no ruleset available
-< ids oinkcode required
+< ids provider
+< ids provider settings
+< ids reset provider
  < ids ruleset autoupdate in progress
  < ids ruleset settings
  < ids show
+< ids subscription code required
+< ids the choosen provider is already in use
+< ids unable to download the ruleset
+< ids visit provider website
  < ids working
  < incoming compression in bytes per second
  < incoming overhead in bytes per second
@@ -1220,6 +1285,7 @@
  < invalid input for interface mtu
  < invalid input for local ip address
  < invalid input for mode
+< invalid input for subscription code
  < invalid input for valid till days
  < invalid ip or hostname
  < invalid logserver protocol
@@ -1284,7 +1350,10 @@
  < ovpn rw connection log
  < ovpn tls auth
  < ovpn warning rfc3280
+< pakfire finished
+< pakfire finished error
  < pakfire invalid tree
+< pakfire return
  < pakfire tree
  < pakfire tree stable
  < pakfire tree testing
@@ -1315,6 +1384,7 @@
  < spectre variant 1
  < spectre variant 2
  < spectre variant 4
+< spoofed or martians
  < srbds
  < ssh active sessions
  < ssh agent forwarding
@@ -1324,6 +1394,7 @@
  < standard
  < strict
  < subnet mask
+< subscription code
  < system is offline
  < taa zombieload2
  < tcp more reliable
@@ -1571,7 +1642,9 @@
  < download apple profile
  < download dh parameter
  < download tls-auth key
+< drop hostile
  < drop outgoing
+< drop spoofed martians
  < duration
  < eight hours
  < email config
@@ -1627,27 +1700,41 @@
  < fwhost cust locationgroup
  < fwhost cust locationlocation
  < fwhost newlocationgrp
+< fw red
  < gen dh
  < generate dh key
  < generate ptr
  < guardian
  < hardware vulnerabilities
+< hostile networks
+< ids add provider
  < ids apply
  < ids apply ruleset changes
  < ids automatic rules update
+< ids autoupdates
+< ids could not add provider
+< ids customize ruleset
  < ids download new ruleset
  < ids enable
+< ids enable automatic updates
+< ids force ruleset update
  < ids hide
  < ids ignored hosts
  < ids log hits
  < ids monitored interfaces
  < ids monitor traffic only
+< ids no enabled ruleset provider
  < ids no network zone
-< ids no ruleset available
-< ids oinkcode required
+< ids provider
+< ids provider settings
+< ids reset provider
  < ids ruleset autoupdate in progress
  < ids ruleset settings
  < ids show
+< ids subscription code required
+< ids the choosen provider is already in use
+< ids unable to download the ruleset
+< ids visit provider website
  < ids working
  < imei
  < imsi
@@ -1661,6 +1748,7 @@
  < invalid input for interface mtu
  < invalid input for local ip address
  < invalid input for mode
+< invalid input for subscription code
  < invalid input for valid till days
  < invalid ip or hostname
  < invalid logserver protocol
@@ -1751,7 +1839,10 @@
  < ovpn rw connection log
  < ovpn tls auth
  < ovpn warning rfc3280
+< pakfire finished
+< pakfire finished error
  < pakfire invalid tree
+< pakfire return
  < pakfire tree
  < pakfire tree stable
  < pakfire tree testing
@@ -1787,6 +1878,7 @@
  < spectre variant 1
  < spectre variant 2
  < spectre variant 4
+< spoofed or martians
  < srbds
  < ssh active sessions
  < ssh agent forwarding
@@ -1796,6 +1888,7 @@
  < standard
  < strict
  < subnet mask
+< subscription code
  < system is offline
  < taa zombieload2
  < ta key
@@ -2127,7 +2220,9 @@
  < drop action1
  < drop action2
  < drop forward
+< drop hostile
  < drop outgoing
+< drop spoofed martians
  < duration
  < eight hours
  < email config
@@ -2378,6 +2473,7 @@
  < fwhost used
  < fwhost welcome
  < fwhost wo subnet
+< fw red
  < fw settings
  < fw settings color
  < fw settings dropdown
@@ -2390,22 +2486,35 @@
  < guardian
  < hardware support
  < hardware vulnerabilities
+< hostile networks
+< ids add provider
  < ids apply
  < ids apply ruleset changes
  < ids automatic rules update
+< ids autoupdates
+< ids could not add provider
+< ids customize ruleset
  < ids download new ruleset
  < ids enable
+< ids enable automatic updates
+< ids force ruleset update
  < ids hide
  < ids ignored hosts
  < ids log hits
  < ids monitored interfaces
  < ids monitor traffic only
+< ids no enabled ruleset provider
  < ids no network zone
-< ids no ruleset available
-< ids oinkcode required
+< ids provider
+< ids provider settings
+< ids reset provider
  < ids ruleset autoupdate in progress
  < ids ruleset settings
  < ids show
+< ids subscription code required
+< ids the choosen provider is already in use
+< ids unable to download the ruleset
+< ids visit provider website
  < ids working
  < imei
  < imsi
@@ -2423,6 +2532,7 @@
  < invalid input for interface mtu
  < invalid input for local ip address
  < invalid input for mode
+< invalid input for subscription code
  < invalid input for valid till days
  < invalid ip or hostname
  < invalid logserver protocol
@@ -2558,7 +2668,10 @@
  < ovpn warning rfc3280
  < p2p block
  < p2p block save notice
+< pakfire finished
+< pakfire finished error
  < pakfire invalid tree
+< pakfire return
  < pakfire tree
  < pakfire tree stable
  < pakfire tree testing
@@ -2603,6 +2716,7 @@
  < spectre variant 1
  < spectre variant 2
  < spectre variant 4
+< spoofed or martians
  < srbds
  < ssh
  < ssh active sessions
@@ -2614,6 +2728,7 @@
  < static routes
  < strict
  < subnet mask
+< subscription code
  < support donation
  < system has hwrng
  < system has rdrand
@@ -3047,7 +3162,9 @@
  < drop action1
  < drop action2
  < drop forward
+< drop hostile
  < drop outgoing
+< drop spoofed martians
  < duration
  < Edit an existing route
  < eight hours
@@ -3300,6 +3417,7 @@
  < fwhost used
  < fwhost welcome
  < fwhost wo subnet
+< fw red
  < fw settings
  < fw settings color
  < fw settings dropdown
@@ -3312,23 +3430,36 @@
  < guardian
  < hardware support
  < hardware vulnerabilities
+< hostile networks
  < hour-graph
+< ids add provider
  < ids apply
  < ids apply ruleset changes
  < ids automatic rules update
+< ids autoupdates
+< ids could not add provider
+< ids customize ruleset
  < ids download new ruleset
  < ids enable
+< ids enable automatic updates
+< ids force ruleset update
  < ids hide
  < ids ignored hosts
  < ids log hits
  < ids monitored interfaces
  < ids monitor traffic only
+< ids no enabled ruleset provider
  < ids no network zone
-< ids no ruleset available
-< ids oinkcode required
+< ids provider
+< ids provider settings
+< ids reset provider
  < ids ruleset autoupdate in progress
  < ids ruleset settings
  < ids show
+< ids subscription code required
+< ids the choosen provider is already in use
+< ids unable to download the ruleset
+< ids visit provider website
  < ids working
  < imei
  < imsi
@@ -3347,6 +3478,7 @@
  < invalid input for interface mtu
  < invalid input for local ip address
  < invalid input for mode
+< invalid input for subscription code
  < invalid input for valid till days
  < invalid ip or hostname
  < invalid logserver protocol
@@ -3480,7 +3612,10 @@
  < ovpn warning rfc3280
  < p2p block
  < p2p block save notice
+< pakfire finished
+< pakfire finished error
  < pakfire invalid tree
+< pakfire return
  < pakfire tree
  < pakfire tree stable
  < pakfire tree testing
@@ -3525,6 +3660,7 @@
  < spectre variant 1
  < spectre variant 2
  < spectre variant 4
+< spoofed or martians
  < srbds
  < ssh
  < ssh active sessions
@@ -3536,6 +3672,7 @@
  < static routes
  < strict
  < subnet mask
+< subscription code
  < support donation
  < system has hwrng
  < system has rdrand
@@ -3803,6 +3940,8 @@
  < dns use isp assigned nameservers
  < dns use protocol for dns queries
  < download apple profile
+< drop hostile
+< drop spoofed martians
  < duration
  < email tls explicit
  < email tls implicit
@@ -3816,24 +3955,38 @@
  < force enable
  < foreshadow
  < fwdfw all subnets
+< fw red
  < generate ptr
  < hardware vulnerabilities
+< hostile networks
+< ids add provider
  < ids apply
  < ids apply ruleset changes
  < ids automatic rules update
+< ids autoupdates
+< ids could not add provider
+< ids customize ruleset
  < ids download new ruleset
  < ids enable
+< ids enable automatic updates
+< ids force ruleset update
  < ids hide
  < ids ignored hosts
  < ids log hits
  < ids monitored interfaces
  < ids monitor traffic only
+< ids no enabled ruleset provider
  < ids no network zone
-< ids no ruleset available
-< ids oinkcode required
+< ids provider
+< ids provider settings
+< ids reset provider
  < ids ruleset autoupdate in progress
  < ids ruleset settings
  < ids show
+< ids subscription code required
+< ids the choosen provider is already in use
+< ids unable to download the ruleset
+< ids visit provider website
  < ids working
  < interface mode
  < intrusion prevention system
@@ -3842,6 +3995,7 @@
  < invalid input for interface mtu
  < invalid input for local ip address
  < invalid input for mode
+< invalid input for subscription code
  < invalid ip or hostname
  < ip basic info
  < ip info for
@@ -3876,7 +4030,10 @@
  < ovpn rw connection log
  < ovpn tls auth
  < ovpn warning rfc3280
+< pakfire finished
+< pakfire finished error
  < pakfire invalid tree
+< pakfire return
  < pakfire tree
  < pakfire tree stable
  < pakfire tree testing
@@ -3899,6 +4056,7 @@
  < spectre variant 1
  < spectre variant 2
  < spectre variant 4
+< spoofed or martians
  < srbds
  < ssh active sessions
  < ssh agent forwarding
@@ -3908,6 +4066,7 @@
  < standard
  < strict
  < subnet mask
+< subscription code
  < system is offline
  < taa zombieload2
  < token
diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi

index 1b1ccb4a8658b6694a1e0ca6f1a9a1aa2a88c1cf..1c01cb286f97e5a129e7d1c3372518b86c21c141 100644 (file)
--- a/html/cgi-bin/backup.cgi
+++ b/html/cgi-bin/backup.cgi
@@ -202,7 +202,7 @@ my $Datei = "/var/ipfire/backup/".$_;
  my @Info = stat($Datei);
  my $Size = $Info[7] / 1024 / 1024;
  $Size = sprintf("%0.2f", $Size);
-print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size MB</td><td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='download' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' /></form></td>";
+print "<tr><td align='center'>$Lang::tr{'backup from'} <b>$_</b> $Lang::tr{'size'} $Size MB</td><td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='download' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' /></form></td>";
  print "<td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='delete' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' /></form></td></tr>";
  }
  foreach (@backupisos){
@@ -212,7 +212,7 @@ my $Datei = "/var/tmp/backupiso/".$_;
  my @Info = stat($Datei);
  my $Size = $Info[7] / 1024 / 1024;
  $Size = sprintf("%0.2f", $Size);
-print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size MB</td><td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='downloadiso' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' /></form></td>";
+print "<tr><td align='center'>$Lang::tr{'backup from'} <b>$_</b> $Lang::tr{'size'} $Size MB</td><td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='downloadiso' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'download'}' title='$Lang::tr{'download'}' src='/images/package-x-generic.png' /></form></td>";
  print "<td width='5'><form method='post' action='$ENV{'SCRIPT_NAME'}'><input type='hidden' name='ACTION' value='delete' /><input type='hidden' name='FILE' value='$_' /><input type='image' alt='$Lang::tr{'delete'}' title='$Lang::tr{'delete'}' src='/images/user-trash.png' /></form></td></tr>";
  }
  print <<END
@@ -246,10 +246,10 @@ my $Size = $Info[7] / 1024;
  if ( -e $Datei ){
         if ($Size < 1) {
                         $Size = sprintf("%.2f", $Size);
-                       print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>";
+                       print "<tr><td align='center'>$Lang::tr{'backup from'} <b>$_</b> $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>";
         } else {
                         $Size = sprintf("%2d", $Size);
-                       print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>";
+                       print "<tr><td align='center'>$Lang::tr{'backup from'} <b>$_</b> $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>";
  
         }
  
@@ -272,7 +272,7 @@ END
  ;
  }
  else{
-  print "<tr><td align='center'>$Lang::tr{'backup from'} $_ </td><td width='5' align='right'></td><td width='5' align='right'></td>";
+  print "<tr><td align='center'>$Lang::tr{'backup from'} <b>$_</b> </td><td width='5' align='right'></td><td width='5' align='right'></td>";
  }
  print <<END
         <td align='right' width='5'>
@@ -291,7 +291,7 @@ my $Datei = "/var/ipfire/backup/addons/backup/".$_.".ipf";
  my @Info = stat($Datei);
  my $Size = $Info[7] / 1024;
  $Size = sprintf("%2d", $Size);
-print "<tr><td align='center'>$Lang::tr{'backup from'} $_ $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>";
+print "<tr><td align='center'>$Lang::tr{'backup from'} <b>$_</b> $Lang::tr{'size'} $Size KB $Lang::tr{'date'} ".localtime($Info[9])."</td>";
  print <<END
         <td align='right' width='5'>
                 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
diff --git a/html/cgi-bin/firewall.cgi b/html/cgi-bin/firewall.cgi

index 8e17cef57630bfd73dda3fea429d0805b167f27f..1341f52095a94a4f984caacc01f5ff8a11dee20b 100644 (file)
--- a/html/cgi-bin/firewall.cgi
+++ b/html/cgi-bin/firewall.cgi
@@ -643,7 +643,7 @@ sub checktarget
                 &General::readhasharray("$confighost", \%customhost);
                 foreach my $grpkey (sort keys %customgrp){
                         foreach my $hostkey (sort keys %customhost){
-                               if ($customgrp{$grpkey}[2] eq $customhost{$hostkey}[0] && $customgrp{$grpkey}[2] eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $customhost{$hostkey}[1] eq 'mac'){
+                               if ($customgrp{$grpkey}[2] eq $customhost{$hostkey}[0] && $customgrp{$grpkey}[0] eq $fwdfwsettings{$fwdfwsettings{'grp2'}} && $customhost{$hostkey}[1] eq 'mac'){
                                         $hint=$Lang::tr{'fwdfw hint mac'};
                                         return $hint;
                                 }
diff --git a/html/cgi-bin/media.cgi b/html/cgi-bin/media.cgi

index af75d1bf322fa155ac92ae6be90643d2c46c0108..6847641790d0f5758e08cd5091790fe1faad5412 100644 (file)
--- a/html/cgi-bin/media.cgi
+++ b/html/cgi-bin/media.cgi
@@ -137,7 +137,7 @@ close DF;
  my @iostat1 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$1}');
  my @iostat2 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$6}');
  my @iostat3 = qx(/usr/bin/iostat -dm -p | grep -v "Linux" | awk '{print \$7}');
-print "<tr><td colspan='3'>&nbsp;\n<tr><td colspan='3'><h3>transfers</h3></td></tr>";
+print "<tr><td colspan='3'>&nbsp;\n<tr><td colspan='3'><h3>$Lang::tr{'transfers'}</h3></td></tr>";
  my $i=0;
  
  for(my $i = 1; $i <= $#iostat1; $i++){
diff --git a/html/html/themes/ipfire/include/css/style.css b/html/html/themes/ipfire/include/css/style.css

index 661773675d64cd681ab2edb798705ad3c191de54..96d0519f5999eec8f7c0065b4f9eec52a536913b 100644 (file)
--- a/html/html/themes/ipfire/include/css/style.css
+++ b/html/html/themes/ipfire/include/css/style.css
@@ -258,6 +258,7 @@ input.text {
  #cssmenu .has-sub ul {
         display: none;
         position: absolute;
+       z-index: 1;
  }
  
  #cssmenu .has-sub ul li a {
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl

index cf34fd86eeede2b9232a9146a0778151dbfab764..7a4b30ad57968089b929f5935836b56a89352569 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1,4 +1,4 @@
-%tr = (
+%tr = ( 
  %tr,
  
  '24 hours' => '24 Stunden',
@@ -1111,12 +1111,12 @@
  'fw blue' => 'Firewalloptionen für das blaue Interface',
  'fw default drop' => 'Firewallrichtlinie',
  'fw logging' => 'Firewallprotokollierung',
+'fw red' => 'Firewalloptionen für das rote Interface',
  'fw settings' => 'Firewalleinstellungen',
  'fw settings color' => 'Farben in Regeltabelle anzeigen',
  'fw settings dropdown' => 'Alle Netzwerke auf Regelerstellungsseite anzeigen',
  'fw settings remark' => 'Anmerkungen in Regeltabelle anzeigen',
  'fw settings ruletable' => 'Leere Regeltabellen anzeigen',
-'fw red' => 'Firewalloptionen für das rote Interface',
  'fwdfw ACCEPT' => 'Akzeptieren (ACCEPT)',
  'fwdfw DROP' => 'Verwerfen (DROP)',
  'fwdfw MODE1' => 'Alle Pakete verwerfen',
@@ -1379,8 +1379,8 @@
  'ids add provider' => 'Provider hinzufügen',
  'ids apply' => 'Übernehmen',
  'ids apply ruleset changes' => 'Regeländerungen werden übernommen. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde...',
-'ids autoupdates' => 'Automatische Updates',
  'ids automatic rules update' => 'Automatische Regelaktualisierung',
+'ids autoupdates' => 'Automatische Updates',
  'ids could not add provider' => 'Provider konnte nicht hinzugefügt werden',
  'ids customize ruleset' => 'Regelset anpassen',
  'ids download new ruleset' => 'Das neue Regelset wird heruntergeladen und entpackt. Bitte warten Sie, bis dieser Vorgang erfolgreich beendet wurde...',
@@ -1394,8 +1394,8 @@
  'ids logs' => 'IPS-Protokolldateien',
  'ids monitor traffic only' => 'Netzwerkpakete nur überprüfen (nicht verwerfen)',
  'ids monitored interfaces' => 'Überwachte Netzwerkzonen',
-'ids no network zone' => 'Bitte wählen Sie mindestens eine zu überwachende Netzwerkzone aus',
  'ids no enabled ruleset provider' => 'Es ist kein aktivierter Provider verfügbar. Bitte aktivieren Sie einen oder fügen Sie einen Provider hinzu.',
+'ids no network zone' => 'Bitte wählen Sie mindestens eine zu überwachende Netzwerkzone aus',
  'ids oinkcode required' => 'Für den ausgewählten Regelsatz wird ein Abonnement oder ein Oinkcode benötigt',
  'ids provider' => 'Regelset-Anbieter',
  'ids provider settings' => 'Regelset-Anbieter-Einstellungen',
@@ -2485,6 +2485,7 @@
  'trafficsum' => 'Total',
  'trafficto' => 'Nach',
  'transfer limits' => 'Transferbeschränkungen',
+'transfers' => 'Datenübertragungen',
  'transparent on' => 'Transparent auf',
  'transport mode does not support vti' => 'VTI wird im Transport-Modus nicht unterstützt',
  'tripwire' => 'Tripwire',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl

index b170647139b9a8657048a12b450013e64fb1b7f9..644eb057414deef638dba2ebb0460c19ab580566 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1,4 +1,4 @@
-%tr = (
+%tr = ( 
  %tr,
  
  '24 hours' => '24 Hours',
@@ -1153,12 +1153,12 @@
  'fw blue' => 'Firewall options for BLUE interface',
  'fw default drop' => 'Firewall policy',
  'fw logging' => 'Firewall logging',
+'fw red' => 'Firewall options for RED interface',
  'fw settings' => 'Firewall settings',
  'fw settings color' => 'Show colors in ruletable',
  'fw settings dropdown' => 'Show all networks on rulecreation site',
  'fw settings remark' => 'Show remarks in ruletable',
  'fw settings ruletable' => 'Show empty ruletables',
-'fw red' => 'Firewall options for RED interface',
  'fwdfw ACCEPT' => 'ACCEPT',
  'fwdfw DROP' => 'DROP',
  'fwdfw MODE1' => 'Drop all packets',
@@ -1423,8 +1423,8 @@
  'ids add provider' => 'Add provider',
  'ids apply' => 'Apply',
  'ids apply ruleset changes' => 'The ruleset changes are being applied. Please wait until all operations have completed successfully...',
-'ids autoupdates' => 'Automatic updates',
  'ids automatic rules update' => 'Automatic Rule Update',
+'ids autoupdates' => 'Automatic updates',
  'ids could not add provider' => 'Could not add provider',
  'ids customize ruleset' => 'Customize ruleset',
  'ids download new ruleset' => 'Downloading and unpacking new ruleset. Please wait until all operations have completed successfully...',
@@ -1438,9 +1438,8 @@
  'ids logs' => 'IPS Logs',
  'ids monitor traffic only' => 'Monitor traffic only',
  'ids monitored interfaces' => 'Monitored Interfaces',
-'ids no network zone' => 'Please select at least one network zone to be monitored',
  'ids no enabled ruleset provider' => 'No enabled ruleset is available. Please activate or add one first.',
-'ids subscription code required' => 'The selected ruleset requires a subscription code',
+'ids no network zone' => 'Please select at least one network zone to be monitored',
  'ids provider' => 'Provider',
  'ids provider settings' => 'Provider settings',
  'ids reset provider' => 'Reset provider',
@@ -1448,6 +1447,7 @@
  'ids ruleset autoupdate in progress' => 'Ruleset update in progress. Please wait until all operations have completed successfully...',
  'ids ruleset settings' => 'Ruleset Settings',
  'ids show' => 'Show',
+'ids subscription code required' => 'The selected ruleset requires a subscription code',
  'ids the choosen provider is already in use' => 'The choosen provider is already in use.',
  'ids unable to download the ruleset' => 'Unable to download the ruleset',
  'ids visit provider website' => 'Visit provider website',
@@ -1528,10 +1528,10 @@
  'invalid input for max clients' => 'Invalid input for Max Clients. The maximum of 1024 clients has been exceeded',
  'invalid input for mode' => 'Invalid input for mode',
  'invalid input for name' => 'Invalid input for user\'s full name or system hostname',
-'invalid input for subscription code' => 'Invalid input for subscription code',
  'invalid input for organization' => 'Invalid input for organization',
  'invalid input for remote host/ip' => 'Invalid input for remote host/ip.',
  'invalid input for state or province' => 'Invalid input for state or province.',
+'invalid input for subscription code' => 'Invalid input for subscription code',
  'invalid input for valid till days' => 'Invalid input for Valid till (days).',
  'invalid ip' => 'Invalid IP Address',
  'invalid ip or hostname' => 'Invalid IP Address or Hostname',
@@ -2546,6 +2546,7 @@
  'trafficsum' => 'Totals',
  'trafficto' => 'To',
  'transfer limits' => 'Transfer limits',
+'transfers' => 'Transfers',
  'transparent on' => 'Transparent on',
  'transport mode does not support vti' => 'VTI is not support in transport mode',
  'tripwire' => 'Tripwire',
diff --git a/lfs/Config b/lfs/Config

index 3e4de3b3fd48eaddd07bc76be60b0aaca78ceadd..1209c1603a876084cc5005d34531c2f6918044b4 100644 (file)
--- a/lfs/Config
+++ b/lfs/Config
@@ -84,6 +84,11 @@ else
         PREFIX = /usr
  endif
  
+# Permit building with 32 bit time_t on 32 bit architectures
+ifeq "$(IS_32BIT)" "1"
+       export TIME_T_32_BIT_OK = yes
+endif
+
  TAR_OPTIONS = \
         --format=pax \
         --acls \
diff --git a/lfs/bash b/lfs/bash

index 1bf3eb2ec43aac27baea26c95b564519fee03ba7..4ec4be02a66250ef0f17a87c883ee885b93e03c9 100644 (file)
--- a/lfs/bash
+++ b/lfs/bash
@@ -87,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         sed -e "s/filename, RTLD_LAZY/filename, RTLD_NOW/" \
                 -i $(DIR_APP)/builtins/enable.def
  
-       for i in $$(seq 9 12); do \
+       for i in $$(seq 9 16); do \
                 cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash51-$$(printf "%03d" "$${i}") || exit 1; \
         done
  
diff --git a/lfs/binutils b/lfs/binutils

index d94be9a066c69504b1513efdbb7817668b9f71c9..33555fa23dbfeb0d22b428d69fa7d8bdb1c16b21 100644 (file)
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 2.36.1
+VER        = 2.37
  
  THISAPP    = binutils-$(VER)
  DL_FILE    = $(THISAPP).tar.xz
@@ -59,7 +59,8 @@ ifeq "$(PASS)" "1"
         --target=$(CROSSTARGET) \
         --prefix=$(TOOLS_DIR) \
         --with-sysroot=$(ROOT) \
-       --with-lib-path=$(TOOLS_DIR)/lib
+       --with-lib-path=$(TOOLS_DIR)/lib \
+       --disable-nls
    EXTRA_MAKE =
    EXTRA_INSTALL = 
  else
@@ -69,10 +70,12 @@ else
         AR="$(CROSSTARGET)-ar" \
         RANLIB="$(CROSSTARGET)-ranlib"
    EXTRA_CONFIG = \
-       --host=$(BUILDTARGET) \
         --build=$(BUILDTARGET) \
+       --host=$(BUILDTARGET) \
         --prefix=$(TOOLS_DIR) \
-       --with-lib-path=$(TOOLS_DIR)/lib
+       --with-lib-path=$(TOOLS_DIR)/lib \
+       --with-sysroot \
+       --disable-nls
    EXTRA_MAKE = 
    EXTRA_INSTALL = 
  endif
@@ -96,7 +99,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 628d490d976d8957279bbbff06cf29d4
+$(DL_FILE)_MD5 = e78d9ff2976b745a348f4c1f27c77cb1
  
  install : $(TARGET)
  
diff --git a/lfs/coreutils b/lfs/coreutils

index b64ac7a065730ca62cd455fbe1cb4a2fed18ea09..d272fd06ad51b78a82c56e007cb4332673ecc570 100644 (file)
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -50,11 +50,6 @@ CONFIGURE_OPTIONS += \
  
  CFLAGS += -fno-strict-aliasing
  
-# Build with 32 bit time_t on 32 bit architectures
-ifeq "$(IS_32BIT)" "1"
-       export TIME_T_32_BIT_OK=yes
-endif
-
  ###############################################################################
  # Top-level Rules
  ###############################################################################
diff --git a/lfs/cups b/lfs/cups

index 99c9c88874a31dd566bda4a72155e10b428b3162..6210cd3b0aac19a05af132b7e7d28c2bce98a9e9 100644 (file)
--- a/lfs/cups
+++ b/lfs/cups
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 2.3.3op2
+VER        = 2.4.1
  
  THISAPP    = cups-$(VER)
  DL_FILE    = $(THISAPP)-source.tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/cups-$(VER)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  PROG       = cups
-PAK_VER    = 23
+PAK_VER    = 24
  
  DEPS       = avahi cups-filters dbus ghostscript krb5 libtiff
  
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 524266752cf243c968921547b18ee594
+$(DL_FILE)_MD5 = c2e5143d06f21e19ea2b73913185656f
  
  install : $(TARGET)
  
diff --git a/lfs/curl b/lfs/curl

index abdd115ab9c139974eda5b60bbc1b9164080a485..8e3cedf46ae40164bb95cb00ac00c5c7bef99838 100644 (file)
--- a/lfs/curl
+++ b/lfs/curl
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 7.80.0
+VER        = 7.81.0
  
  THISAPP    = curl-$(VER)
  DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = cf9f8553762150ef0ebcd5ee412737f5
+$(DL_FILE)_MD5 = 41954fa09f879fccb57d88be23fe8606
  
  install : $(TARGET)
  
diff --git a/lfs/ethtool b/lfs/ethtool

index 22126f4ab472c099fdec7e47469d596919aa0fd3..47164c1b5f2f0d48b4ea39b55787e19c0c2cab21 100644 (file)
--- a/lfs/ethtool
+++ b/lfs/ethtool
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 5.15
+VER        = 5.16
  
  THISAPP    = ethtool-$(VER)
  DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 967f92926a453d3eb9bf41f73223f173
+$(DL_FILE)_MD5 = 0ead0316aa15e1bf90d1f9d2f81286a2
  
  install : $(TARGET)
  
diff --git a/lfs/expat b/lfs/expat

index b2df59ca3d1382123fd6f9a79b9140a7b48582fa..3898889ad9f67f53d58420e722320eb4bf01c24f 100644 (file)
--- a/lfs/expat
+++ b/lfs/expat
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 2.4.2
+VER        = 2.4.4
  
  THISAPP    = expat-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 58780ad6944d02f6cf6ba332838694b2
+$(DL_FILE)_MD5 = 99392ce3377777ab0dc8b0f14beda793
  
  install : $(TARGET)
  
@@ -76,6 +76,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         cd $(DIR_APP) && make $(MAKETUNING)
         cd $(DIR_APP) && make install
         cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/$(THISAPP)
-       cd $(DIR_APP) && install -v -m644 doc/*.{html,png,css} /usr/share/doc/$(THISAPP)
+       cd $(DIR_APP) && install -v -m644 doc/*.{html,css} /usr/share/doc/$(THISAPP)
         @rm -rf $(DIR_APP)
         @$(POSTBUILD)
diff --git a/lfs/expect b/lfs/expect

index ac4752be9855055430da639a697ddd7506a923a8..c5b8bee10c3d00b020881f1ef4156a3e1b324a4b 100644 (file)
--- a/lfs/expect
+++ b/lfs/expect
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         @$(PREBUILD)
         @rm -rf $(DIR_APP) $(DIR_SRC)/tcl* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       $(UPDATE_AUTOMAKE)
         cd $(DIR_APP) && ./configure \
                         --prefix=$(TOOLS_DIR) \
                         --build=$(BUILDTARGET) \
diff --git a/lfs/flash-images b/lfs/flash-images

index 0abb23b0a0af5107202ed8f39a0a57de6c6dfa8f..2cc81c37b4a0ffd58aa320518cad978a3ec33ef1 100644 (file)
--- a/lfs/flash-images
+++ b/lfs/flash-images
@@ -78,9 +78,9 @@ else
  endif
  
  # /boot:  128MB - OFFSET
-# /    : 1600 MB
+# /    : 1800 MB
  S_BOOT := $(shell echo $$(( 262144 - $(S_OFFSET) )))
-S_ROOT := 3354038
+S_ROOT := 3773292
  
  ifeq "$(EFI)" "1"
   S_EFI = 65536 # 32 MB
diff --git a/lfs/gcc b/lfs/gcc

index ade02dcda1b081fa56dd314f8bc13d1238a46859..f9502562dca0e8131d88feae8a98b5c01f10c4dd 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -83,8 +83,10 @@ ifeq "$(PASS)" "1"
         --with-sysroot=$(ROOT) \
         --with-local-prefix=$(TOOLS_DIR) \
         --with-native-system-header-dir=$(TOOLS_DIR)/include \
+       --with-glibc-version=2.11 \
         --disable-nls \
         --disable-shared \
+       --disable-multilib \
         --disable-decimal-float \
         --disable-threads \
         --disable-libatomic \
@@ -115,11 +117,13 @@ ifeq "$(PASS)" "2"
         RANLIB="$(CROSSTARGET)-ranlib"
    EXTRA_CONFIG = \
         --build=$(BUILDTARGET) \
+       --host=$(BUILDTARGET) \
         --prefix=$(TOOLS_DIR) \
         --with-local-prefix=$(TOOLS_DIR) \
         --with-native-system-header-dir=$(TOOLS_DIR)/include \
         --enable-languages=c,c++ \
         --disable-libstdcxx-pch \
+       --disable-multilib \
         --disable-libgomp
    EXTRA_MAKE = 
    EXTRA_INSTALL = 
diff --git a/lfs/git b/lfs/git

index ca9bfc1d5c21846daa8cf388e8d27f1213aec02b..d24e9d4d93724b10809119d22cbc68e6932210d8 100644 (file)
--- a/lfs/git
+++ b/lfs/git
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 2.34.1
+VER        = 2.35.1
  
  THISAPP    = git-$(VER)
  DL_FILE    = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  PROG       = git
-PAK_VER    = 21
+PAK_VER    = 22
  
  DEPS       = perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL
  
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = f442dade3c73ea39473f6700b3e04dcd
+$(DL_FILE)_MD5 = 3aae077280b6be861e3c1c637491853a
  
  install : $(TARGET)
  
diff --git a/lfs/glib b/lfs/glib

index 228a69b9ffc687fb5bf770fc437a9d801fd2a80a..77c37698d18c65102761b4e3077544891c815d3b 100644 (file)
--- a/lfs/glib
+++ b/lfs/glib
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 2.70.1
+VER        = 2.71.1
  
  THISAPP    = glib-$(VER)
  DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = fb613d21fabce3d3d8520f37d12bd473
+$(DL_FILE)_MD5 = 49c95e1b98f829f94bce36f7a8183004
  
  install : $(TARGET)
  
diff --git a/lfs/glibc b/lfs/glibc

index d2d3aff91a91405e8580e6d6c096f2597a89709b..3a61613eb947afcc4a5f1ebb8681367b6d7d5a01 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 2.33
+VER        = 2.35
  
  THISAPP    = glibc-$(VER)
  DL_FILE    = $(THISAPP).tar.xz
@@ -46,9 +46,7 @@ else
         --host=$(CROSSTARGET) \
         --build=$(BUILDTARGET) \
         --prefix=$(TOOLS_DIR) \
-       --with-headers=$(TOOLS_DIR)/include \
-       libc_cv_forced_unwind=yes \
-       libc_cv_c_cleanup=yes
+       --with-headers=$(TOOLS_DIR)/include
  endif
  
  ifeq "$(BUILD_ARCH)" "aarch64"
@@ -65,6 +63,14 @@ EXTRA_CONFIG += \
         --enable-bind-now \
         --disable-crypt
  
+ifeq "$(BUILD_ARCH)" "x86_64"
+       EXTRA_CONFIG += --enable-cet
+endif
+
+ifeq "$(BUILD_ARCH)" "aarch64"
+       EXTRA_CONFIG += --enable-memory-tagging
+endif
+
  ###############################################################################
  # Top-level Rules
  ###############################################################################
@@ -73,7 +79,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 390bbd889c7e8e8a7041564cb6b27cca
+$(DL_FILE)_MD5 = dd571c67d85d89d7f60b854a4e207423
  
  install : $(TARGET)
  
@@ -105,10 +111,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
         @mkdir $(DIR_SRC)/glibc-build
  
-       # Security Fixes
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.33-use-__pthread_attr_copy-in-mq_notify-bug-27896.patch
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-2.33-librt-fix-null-pointer-dereference-bug-28213.patch
-
         cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-localedef-no-archive.patch
  
  ifneq "$(TOOLCHAIN)" "1"
diff --git a/lfs/gzip b/lfs/gzip

index 4f8925cd29fe1e2945a43b3542cc28a50e80d30d..4f0853de07fbc441132358bd75fc603192711d1a 100644 (file)
--- a/lfs/gzip
+++ b/lfs/gzip
@@ -41,11 +41,6 @@ else
    EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
  endif
  
-# Build with 32 bit time_t on 32 bit architectures
-ifeq "$(IS_32BIT)" "1"
-       export TIME_T_32_BIT_OK=yes
-endif
-
  ###############################################################################
  # Top-level Rules
  ###############################################################################
diff --git a/lfs/hyperscan b/lfs/hyperscan

index f55e916060ab79c61a53921727c08edfe1c9d90a..ead1bc3448f6d9bb8ff8912bc749edad28fdc483 100644 (file)
--- a/lfs/hyperscan
+++ b/lfs/hyperscan
@@ -80,7 +80,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         cd $(DIR_APP) && cmake . \
                 -DCMAKE_INSTALL_PREFIX:PATH=/usr \
                 -DBUILD_SHARED_LIBS:BOOL=ON \
-               -DBUILD_STATIC_AND_SHARED:BOOL=OFF
+               -DBUILD_STATIC_AND_SHARED:BOOL=OFF \
+               -DCMAKE_BUILD_TYPE=Release \
+               -DBUILD_EXAMPLES=OFF
         cd $(DIR_APP) && make $(MAKETUNING)
         cd $(DIR_APP) && make install
         @rm -rf $(DIR_APP)
diff --git a/lfs/iproute2 b/lfs/iproute2

index acea611b15de484f2734cc728002eaaafbafab1c..21b792e0af99d5c63ff80552b9581683933acbdc 100644 (file)
--- a/lfs/iproute2
+++ b/lfs/iproute2
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 5.15.0
+VER        = 5.16.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         = 8a598a61c054a3ce538b47c40b010552
+$(DL_FILE)_MD5         = 994c1bad2a24aa9d70e89670c5b5dfcb
  
  install : $(TARGET)
  
diff --git a/lfs/libcap b/lfs/libcap

index 387d43e389f87ffd29d14272c19e94cb64b07fea..63467062fcbbdfdb2ff9bad1ef39a2e6f9fcc2bb 100644 (file)
--- a/lfs/libcap
+++ b/lfs/libcap
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 2.61
+VER        = 2.63
  
  THISAPP    = libcap-$(VER)
  DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 3bf105e47a8671035a0ce0812185c5e4
+$(DL_FILE)_MD5 = 18410cec436f827e698ee9ea16ada9b7
  
  install : $(TARGET)
  
diff --git a/lfs/libgpg-error b/lfs/libgpg-error

index 852f2e6f8554ab9952e12342b1355c2c6e7682f0..57786c7d454ac153346886be2e2056d59e5e885f 100644 (file)
--- a/lfs/libgpg-error
+++ b/lfs/libgpg-error
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 1.43
+VER        = 1.44
  
  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 = f1e09cfa536a6e6a264dbf2ccdc2e534
+$(DL_FILE)_MD5 = 3956969812cd4fbd133b79c5b5a2e7f7
  
  install : $(TARGET)
  
diff --git a/lfs/libwww-perl b/lfs/libwww-perl

index 536a49769010ca0e831346f179e08cd95689a48c..4943ecd06f11bbdb4002e63bc9768c5c923ba652 100644 (file)
--- a/lfs/libwww-perl
+++ b/lfs/libwww-perl
@@ -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        = 5.803
+VER        = 6.61
  
  THISAPP    = libwww-perl-$(VER)
  DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 3345d5f15a4f42350847254141725c8f
+$(DL_FILE)_MD5 = 57223812e46c8af53ef39b4358a05e5a
  
  install : $(TARGET)
  
diff --git a/lfs/lua b/lfs/lua

index 8fffba704a8fedaf5da880102b43915fe3cac536..806e85ddbfff4603ff0290217deca34f15a187be 100644 (file)
--- a/lfs/lua
+++ b/lfs/lua
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 5.4.3
+VER        = 5.4.4
  
  THISAPP    = lua-$(VER)
  DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = ef63ed2ecfb713646a7fcc583cf5f352
+$(DL_FILE)_MD5 = bd8ce7069ff99a400efd14cf339a727b
  
  install : $(TARGET)
  
@@ -78,7 +78,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         cd $(DIR_APP) && make INSTALL_TOP=/usr                                  \
                               INSTALL_DATA="cp -d"                              \
                               INSTALL_MAN=/usr/share/man/man1                   \
-                             TO_LIB="liblua.so liblua.so.5.4 liblua.so.5.4.3"  \
+                             TO_LIB="liblua.so liblua.so.5.4 liblua.so.5.4.4"  \
                          install
         @rm -rf $(DIR_APP)
         @$(POSTBUILD)
diff --git a/lfs/mdadm b/lfs/mdadm

index 19d678f93385552a3cd4d3ce1b3ef7d516217b18..c42ad8d59a3f1544385dab3fc25a993dc19584ee 100644 (file)
--- a/lfs/mdadm
+++ b/lfs/mdadm
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 4.1
+VER        = 4.2
  
  THISAPP    = mdadm-$(VER)
  DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 51bf3651bd73a06c413a2f964f299598
+$(DL_FILE)_MD5 = a304eb0a978ca81045620d06547050a6
  
  install : $(TARGET)
  
diff --git a/lfs/nfs b/lfs/nfs

index 55accfb28437da681665ee160d65af3108b43c9b..702f7116fb98a9d8238e1142676d09be8fa3565b 100644 (file)
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -32,9 +32,9 @@ DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  PROG       = nfs
-PAK_VER    = 15
+PAK_VER    = 16
  
-DEPS       = libnfsidmap rpcbind
+DEPS       = rpcbind
  
  ###############################################################################
  # Top-level Rules
diff --git a/lfs/ntp b/lfs/ntp

index ca46e51632e21f25c75a3cf2d5d0228e060d1212..e039d7bdd7c58827c73514fdc83ad53db4349a39 100644 (file)
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -70,6 +70,7 @@ $(subst %,%_MD5,$(objects)) :
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         @$(PREBUILD)
         @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/ntp-4.2.8p15-build-fix-for-glibc-2.34.patch
         $(UPDATE_AUTOMAKE)
         cd $(DIR_APP) && \
                 ./configure \
diff --git a/lfs/openssl b/lfs/openssl

index 6af90425296936027de9f1d890a605ff87c4533b..ababd763590b6e7f7a852e88a33958792ae12ab0 100644 (file)
--- a/lfs/openssl
+++ b/lfs/openssl
@@ -1,7 +1,7 @@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2021  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2022  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.1.1l
+VER        = 1.1.1m
  
  THISAPP    = openssl-$(VER)
  DL_FILE    = $(THISAPP).tar.gz
@@ -74,7 +74,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = ac0d4387f3ba0ad741b0580dd45f6ff3
+$(DL_FILE)_MD5 = 8ec70f665c145c3103f6e330f538a9db
  
  install : $(TARGET)
  
diff --git a/lfs/p11-kit b/lfs/p11-kit

index df3f51df101bb77f95b94031f83c6c26431f0e38..1d0e38e8beaa65d6e1251674bf10c365370f49b2 100644 (file)
--- a/lfs/p11-kit
+++ b/lfs/p11-kit
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 0.24.0
+VER        = 0.24.1
  
  THISAPP    = p11-kit-$(VER)
  DL_FILE    = $(THISAPP).tar.xz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 8ccf11c4a2e2e505b8e516d8549e64a5
+$(DL_FILE)_MD5 = 67b2539bdca6b4bedaeecc12864d2796
  
  install : $(TARGET)
  
diff --git a/lfs/pciutils b/lfs/pciutils

index 995c3c0a4201e794c05be37f6e7f61e69b91a405..2dcf9e8682fa660f72544d1bb10521a050ea0bc0 100644 (file)
--- a/lfs/pciutils
+++ b/lfs/pciutils
@@ -80,11 +80,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
  
         # Install headers.
         mkdir -pv /usr/include/pci
-       cd $(DIR_APP) && install -p lib/pci.h /usr/include/pci
-       cd $(DIR_APP) && install -p lib/header.h /usr/include/pci
-       cd $(DIR_APP) && install -p lib/config.h /usr/include/pci
-       cd $(DIR_APP) && install -p lib/types.h /usr/include/pci
-       cd $(DIR_APP) && install -p lib/libpci.pc /usr/lib/pkgconfig
+       cd $(DIR_APP) && install -m 644 lib/pci.h /usr/include/pci
+       cd $(DIR_APP) && install -m 644 lib/header.h /usr/include/pci
+       cd $(DIR_APP) && install -m 644 lib/config.h /usr/include/pci
+       cd $(DIR_APP) && install -m 644 lib/types.h /usr/include/pci
+       cd $(DIR_APP) && install -m 644 lib/libpci.pc /usr/lib/pkgconfig
         chmod -v 755 /usr/lib/libpci.so
         @rm -rf $(DIR_APP)
         @$(POSTBUILD)
diff --git a/lfs/libnfsidmap b/lfs/perl-HTTP-Date

similarity index 85%

rename from lfs/libnfsidmap

rename to lfs/perl-HTTP-Date

index 1980d930647664fa9803c9e2bd6955067b911540..7e3571b3af5d6a38dd792aba78dca2c8b01f462f 100644 (file)
--- a/lfs/libnfsidmap
+++ b/lfs/perl-HTTP-Date
@@ -1,7 +1,7 @@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2019  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        #
@@ -18,23 +18,18 @@
  #                                                                             #
  ###############################################################################
  
+
  ###############################################################################
  # Definitions
  ###############################################################################
-
  include Config
+VER        = 6.05
  
-VER        = 0.27
-
-THISAPP    = libnfsidmap-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+THISAPP    = HTTP-Date-$(VER)
+DL_FILE    = ${THISAPP}.tar.gz
  DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = libnfsidmap
-PAK_VER    = 2
-
-#CFLAGS    += -I/usr/include/tirpc
  
  ###############################################################################
  # Top-level Rules
@@ -44,7 +39,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 27cfb22f1ee85e51b863b71858a97da0
+$(DL_FILE)_MD5 = 2ecbb3aedf6aef062605191813ca3027
  
  install : $(TARGET)
  
@@ -54,7 +49,7 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
  
  md5 : $(subst %,%_MD5,$(objects))
  
-dist: 
+dist:
         @$(PAK)
  
  ###############################################################################
@@ -76,13 +71,9 @@ $(subst %,%_MD5,$(objects)) :
  
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       $(UPDATE_AUTOMAKE)
-       cd $(DIR_APP) && ./configure \
-               --prefix=/usr \
-               --sysconfdir=/etc \
-               --disable-static
-       cd $(DIR_APP) && make $(MAKETUNING)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && perl Makefile.PL
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
         cd $(DIR_APP) && make install
         @rm -rf $(DIR_APP)
         @$(POSTBUILD)
diff --git a/lfs/perl-HTTP-Message b/lfs/perl-HTTP-Message

new file mode 100644 (file)

index 0000000..8fc6cc3
--- /dev/null
+++ b/lfs/perl-HTTP-Message
@@ -0,0 +1,79 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2019  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+
+###############################################################################
+# Definitions
+###############################################################################
+include Config
+VER        = 6.36
+
+THISAPP    = HTTP-Message-$(VER)
+DL_FILE    = ${THISAPP}.tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = e847fb3e297e740080ab6fd1ac127f7f
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && perl Makefile.PL
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
diff --git a/lfs/perl-LWP-Protocol-https b/lfs/perl-LWP-Protocol-https

new file mode 100644 (file)

index 0000000..a8cb3e0
--- /dev/null
+++ b/lfs/perl-LWP-Protocol-https
@@ -0,0 +1,79 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2019  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+
+###############################################################################
+# Definitions
+###############################################################################
+include Config
+VER        = 6.10
+
+THISAPP    = LWP-Protocol-https-$(VER)
+DL_FILE    = ${THISAPP}.tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = cf64e4bc57a9266ac4343cdf0808c5c8
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && perl Makefile.PL
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
diff --git a/lfs/perl-Net-HTTP b/lfs/perl-Net-HTTP

new file mode 100644 (file)

index 0000000..a37c169
--- /dev/null
+++ b/lfs/perl-Net-HTTP
@@ -0,0 +1,79 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2019  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+
+###############################################################################
+# Definitions
+###############################################################################
+include Config
+VER        = 6.22
+
+THISAPP    = Net-HTTP-$(VER)
+DL_FILE    = ${THISAPP}.tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 1d46019fb8559070a5ec1d838b690657
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && perl Makefile.PL
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
diff --git a/lfs/perl-Try-Tiny b/lfs/perl-Try-Tiny

new file mode 100644 (file)

index 0000000..abff99a
--- /dev/null
+++ b/lfs/perl-Try-Tiny
@@ -0,0 +1,79 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2019  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        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+
+###############################################################################
+# Definitions
+###############################################################################
+include Config
+VER        = 0.31
+
+THISAPP    = Try-Tiny-$(VER)
+DL_FILE    = ${THISAPP}.tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 993a29ee8a03c9bd9c2f7c53d1082a03
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+       @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && perl Makefile.PL
+       cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)
diff --git a/lfs/poppler b/lfs/poppler

index d52c5e2ca8fb3344830efd8b20863137ad007a73..b91f16be6afbe76edc60d3a6d845944f1e0a5e3c 100644 (file)
--- a/lfs/poppler
+++ b/lfs/poppler
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 21.11.0
+VER        = 22.02.0
  
  THISAPP    = poppler-$(VER)
  DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = c1139795bc24a02b8a694f77233b8d22
+$(DL_FILE)_MD5 = 5f167d859b0ec3f416dbd929892c3c4d
  
  install : $(TARGET)
  
diff --git a/lfs/postfix b/lfs/postfix

index 6fe46d9a83f9a5ad200bbc91c4b2fdf8768a3fb6..0dcccadb63b7442c56475c211ca5b8abce55fbdf 100644 (file)
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -99,6 +99,7 @@ $(subst %,%_MD5,$(objects)) :
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         @$(PREBUILD)
         @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/postfix-3.6.2-glibc-234-build-fix.patch
         cd $(DIR_APP) && make -f Makefile.init makefiles \
                 DEBUG="" OPT="$(CFLAGS) -fno-strict-aliasing" CCARGS="$(CCARGS)" AUXLIBS="$(AUXLIBS)"
         cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/lfs/samba b/lfs/samba

index 45f4ffc44500ad2de8eb66f75d940620afadcb31..69f60152205156fd01e11b5e152e978bf00af1b0 100644 (file)
--- a/lfs/samba
+++ b/lfs/samba
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 4.14.6
+VER        = 4.15.5
  
  THISAPP    = samba-$(VER)
  DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  PROG       = samba
-PAK_VER    = 82
+PAK_VER    = 83
  
  DEPS       = avahi cups libtirpc krb5 perl-Parse-Yapp
  
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 0e6b5607ad37209a5a10235579fa9765
+$(DL_FILE)_MD5 = c5c8221de44dc04ad7f3358d3b118d61
  
  install : $(TARGET)
  
diff --git a/lfs/sdl2 b/lfs/sdl2

index 2cdf013eb00b45d742e48a2ee8dd026a5fa29613..3530d6675d29c63cd1fa6cbbc5feeae83d81bda7 100644 (file)
--- a/lfs/sdl2
+++ b/lfs/sdl2
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 2.0.18
+VER        = 2.0.20
  
  THISAPP    = SDL2-$(VER)
  DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  PROG       = sdl2
-PAK_VER    = 5
+PAK_VER    = 6
  
  DEPS       = alsa
  
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = c1dd33299db5b7091f37d989c68d5212
+$(DL_FILE)_MD5 = a53acc02e1cca98c4123229069b67c9e
  
  install : $(TARGET)
  
diff --git a/lfs/sqlite b/lfs/sqlite

index 84a04004a27ba3ceae184d0c57391a70bd010ed4..86d25f3ed6038727ec4f1b3761848e74b2e67d2d 100644 (file)
--- a/lfs/sqlite
+++ b/lfs/sqlite
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 3370000
+VER        = 3370200
  
  THISAPP    = sqlite-autoconf-$(VER)
  DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = 021c1d936c157bb68d6d0b158636ac7a
+$(DL_FILE)_MD5 = 683cc5312ee74e71079c14d24b7a6d27
  
  install : $(TARGET)
  
diff --git a/lfs/strip b/lfs/strip

index 48e698a7cfecbd4c08210da59271a67248102644..466dfd9d5696cf4791b91db4b688644c3c8a6c14 100644 (file)
--- a/lfs/strip
+++ b/lfs/strip
@@ -29,16 +29,6 @@ VER = ipfire
  THISAPP    = strip
  TARGET     = $(DIR_INFO)/$(THISAPP)
  
-ifeq "$(TOOLCHAIN)" "1"
-       SHELL = /bin/bash
-       STRIP = /usr/bin/strip
-       ROOT = $(TOOLS_DIR)
-else
-       SHELL = $(TOOLS_DIR)/bin/bash
-       STRIP = $(TOOLS_DIR)/bin/strip
-       ROOT = /
-endif
-
  ###############################################################################
  # Top-level Rules
  ###############################################################################
@@ -56,18 +46,19 @@ md5 :
  ###############################################################################
  
  $(TARGET) :
+ifeq "$(TOOLCHAIN)" "1"
+       # Strip everything in the toolchain
+       $(DIR_SRC)/src/stripper $(TOOLS_DIR)
+else
         # Don't strip VDR binaries, because they use a weird plugin system
         # which does not work when unneeded symbols get stripped from
         # /usr/sbin/vdr.
-       STRIP=$(STRIP) $(SHELL) $(DIR_SRC)/src/stripper \
-               $(ROOT) \
+       $(DIR_SRC)/src/stripper / \
                 --exclude=$(TOOLS_DIR) \
-               --exclude=/dev \
-               --exclude=/proc \
-               --exclude=/sys \
                 --exclude=/tmp \
                 --exclude=/usr/src \
                 --exclude=/usr/lib/vdr \
                 --exclude=/usr/sbin/vdr \
                 --exclude=/var/tmp \
                 --exclude=/usr/lib/go
+endif
diff --git a/lfs/sudo b/lfs/sudo

index bec0f6021faca00dfeb17bb9d8cb377b50426f4a..8fc6879de8bbed2edb4d052fbb308eb1e33b0dc2 100644 (file)
--- a/lfs/sudo
+++ b/lfs/sudo
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 1.9.8p2
+VER        = 1.9.9
  
  THISAPP    = sudo-$(VER)
  DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = f831c1d62835cde89c261465d9c781e4
+$(DL_FILE)_MD5 = f112d8ee214ef46ac6398196958ee383
  
  install : $(TARGET)
  
diff --git a/lfs/texinfo b/lfs/texinfo

index 4563243f078af7bb6c8e5b9780b5d019aefff150..27a3d06b61472f3a8f485949da9f802f5fe242d6 100644 (file)
--- a/lfs/texinfo
+++ b/lfs/texinfo
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         @$(PREBUILD)
         @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/texinfo-6.8-undo-gnulib-nonnul.patch
         cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls
         cd $(DIR_APP) && make $(MAKETUNING)
         cd $(DIR_APP) && make install
diff --git a/lfs/wio b/lfs/wio

index c54cd3f316fa63a3eca882901fbff86fc7ab24e6..3211f0d99091933da4e2638e85e8ef3a87b4037c 100644 (file)
--- a/lfs/wio
+++ b/lfs/wio
@@ -15,7 +15,7 @@ THISAPP    = wio-$(VER)
  DIR_APP    = $(DIR_SRC)/$(THISAPP)
  TARGET     = $(DIR_INFO)/$(THISAPP)
  PROG       = wio
-PAK_VER    = 13
+PAK_VER    = 14
  
  ###############################################################################
  # Top-level Rules
@@ -58,6 +58,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
         install -v -m 644 $(DIR_APP)/wio/images/* /srv/web/ipfire/html/images/wio/
         install -v -m 644 $(DIR_APP)/wio/lang/wio.de.pl /var/ipfire/addon-lang/
         install -v -m 644 $(DIR_APP)/wio/lang/wio.en.pl /var/ipfire/addon-lang/
+       install -v -m 644 $(DIR_APP)/wio/lang/wio.es.pl /var/ipfire/addon-lang/
         install -v -m 644 $(DIR_APP)/wio/lang/wio.fr.pl /var/ipfire/addon-lang/
         install -v -m 644 $(DIR_APP)/wio/lang/wio.tr.pl /var/ipfire/addon-lang/
         install -v -m 644 $(DIR_APP)/wio/EX-wio.menu /var/ipfire/menu.d/
diff --git a/lfs/zstd b/lfs/zstd

index 982c987915a9e6299e9af9d99019f151a679bb59..cebfc44f670484fc885d3d3a3e02401947b221f3 100644 (file)
--- a/lfs/zstd
+++ b/lfs/zstd
@@ -24,7 +24,7 @@
  
  include Config
  
-VER        = 1.5.1
+VER        = 1.5.2
  
  THISAPP    = zstd-$(VER)
  DL_FILE    = $(THISAPP).tar.gz
@@ -49,7 +49,7 @@ objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
  
-$(DL_FILE)_MD5 = b97d53547220355907dedec7de9a4f29
+$(DL_FILE)_MD5 = 072b10f71f5820c24761a65f31f43e73
  
  install : $(TARGET)
  
diff --git a/make.sh b/make.sh

index 79798834a55eab4d7afad15cb193ec00b66c0412..923f728e72b82f904a7a6110a031675e840cb389 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -17,7 +17,7 @@
  # along with IPFire; if not, write to the Free Software                    #
  # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
  #                                                                          #
-# Copyright (C) 2007-2021 IPFire Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2022 IPFire Team <info@ipfire.org>.                   #
  #                                                                          #
  ############################################################################
  #
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
  SNAME="ipfire"                                                 # Short name
  # If you update the version don't forget to update backupiso and add it to core update
  VERSION="2.27"                                                 # Version number
-CORE="164"                                                     # Core Level (Filename)
+CORE="165"                                                     # Core Level (Filename)
  SLOGAN="www.ipfire.org"                                                # Software slogan
  CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
  MAX_RETRIES=1                                                  # prefetch/check loop
@@ -38,7 +38,7 @@ GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"                       # Git Branch
  GIT_TAG="$(git tag | tail -1)"                                 # Git Tag
  GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)"                        # Last commit
  
-TOOLCHAINVER=20210701
+TOOLCHAINVER=20220203
  
  # use multicore and max compression
  ZSTD_OPT="-T0 --ultra -22"
@@ -145,35 +145,35 @@ configure_build() {
  
         case "${build_arch}" in
                 x86_64)
-                       BUILDTARGET="${build_arch}-unknown-linux-gnu"
+                       BUILDTARGET="${build_arch}-pc-linux-gnu"
                         CROSSTARGET="${build_arch}-cross-linux-gnu"
                         BUILD_PLATFORM="x86"
                         CFLAGS_ARCH="-m64 -mtune=generic -fstack-clash-protection -fcf-protection"
                         ;;
  
                 aarch64)
-                       BUILDTARGET="${build_arch}-unknown-linux-gnu"
+                       BUILDTARGET="${build_arch}-pc-linux-gnu"
                         CROSSTARGET="${build_arch}-cross-linux-gnu"
                         BUILD_PLATFORM="arm"
                         CFLAGS_ARCH="-fstack-clash-protection"
                         ;;
  
                 armv7hl)
-                       BUILDTARGET="${build_arch}-unknown-linux-gnueabi"
+                       BUILDTARGET="${build_arch}-pc-linux-gnueabi"
                         CROSSTARGET="${build_arch}-cross-linux-gnueabi"
                         BUILD_PLATFORM="arm"
                         CFLAGS_ARCH="-march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
                         ;;
  
                 armv6l)
-                       BUILDTARGET="${build_arch}-unknown-linux-gnueabi"
+                       BUILDTARGET="${build_arch}-pc-linux-gnueabi"
                         CROSSTARGET="${build_arch}-cross-linux-gnueabi"
                         BUILD_PLATFORM="arm"
                         CFLAGS_ARCH="-march=armv6zk+fp -mfpu=vfp -mfloat-abi=softfp -fomit-frame-pointer"
                         ;;
  
                 riscv64)
-                       BUILDTARGET="${build_arch}-unknown-linux-gnu"
+                       BUILDTARGET="${build_arch}-pc-linux-gnu"
                         CROSSTARGET="${build_arch}-cross-linux-gnu"
                         BUILD_PLATFORM="riscv"
                         CFLAGS_ARCH="-fstack-clash-protection"
@@ -554,7 +554,12 @@ enterchroot() {
         # Install QEMU helper, if needed
         qemu_install_helper
  
-       local PATH="${TOOLS_DIR}/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:${TOOLS_DIR}/bin"
+       local PATH="${TOOLS_DIR}/ccache/bin:/bin:/usr/bin:/sbin:/usr/sbin:${TOOLS_DIR}/sbin:${TOOLS_DIR}/bin"
+
+       # Prepend any custom changes to PATH
+       if [ -n "${CUSTOM_PATH}" ]; then
+               PATH="${CUSTOM_PATH}:${PATH}"
+       fi
  
         PATH="${PATH}" chroot ${LFS} env -i \
                 HOME="/root" \
@@ -658,8 +663,15 @@ lfsmake1() {
         lfsmakecommoncheck $*
         [ $? == 1 ] && return 0
  
+       # Set PATH to use the toolchain tools first and then whatever the host has set
+       local PATH="${TOOLS_DIR}/ccache/bin:${TOOLS_DIR}/sbin:${TOOLS_DIR}/bin:${PATH}"
+
+       if [ -n "${CUSTOM_PATH}" ]; then
+               PATH="${CUSTOM_PATH}:${PATH}"
+       fi
+
         cd $BASEDIR/lfs && env -i \
-               PATH="${TOOLS_DIR}/ccache/bin:${TOOLS_DIR}/bin:$PATH" \
+               PATH="${PATH}" \
                 CCACHE_DIR="${CCACHE_DIR}"/${BUILD_ARCH}/${TOOLCHAINVER} \
                 CCACHE_TEMPDIR="${CCACHE_TEMPDIR}" \
                 CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
@@ -695,7 +707,7 @@ lfsmake2() {
         local PS1='\u:\w$ '
  
         enterchroot \
-               ${EXTRA_PATH}bash -x -c "cd /usr/src/lfs && \
+               bash -x -c "cd /usr/src/lfs && \
                         make -f $* \
                         LFS_BASEDIR=/usr/src install" \
                 >> ${LOGFILE} 2>&1 &
@@ -1026,9 +1038,9 @@ buildtoolchain() {
         lfsmake1 libxcrypt
         lfsmake1 gcc                    PASS=L
         lfsmake1 zlib
-       lfsmake1 zstd
         lfsmake1 binutils                       PASS=2
         lfsmake1 gcc                    PASS=2
+       lfsmake1 zstd
         lfsmake1 ccache
         lfsmake1 tcl
         lfsmake1 expect
@@ -1057,7 +1069,7 @@ buildtoolchain() {
         lfsmake1 bison
         lfsmake1 flex
         lfsmake1 fake-environ
-       lfsmake1 strip
+       CUSTOM_PATH="${PATH}" lfsmake1 strip
         lfsmake1 cleanup-toolchain
  }
  
@@ -1364,6 +1376,9 @@ buildipfire() {
    lfsmake2 perl-Apache-Htpasswd
    lfsmake2 perl-Parse-Yapp
    lfsmake2 perl-Data-UUID
+  lfsmake2 perl-Try-Tiny
+  lfsmake2 perl-HTTP-Message
+  lfsmake2 perl-HTTP-Date
    lfsmake2 gnupg
    lfsmake2 hdparm
    lfsmake2 sdparm
@@ -1388,6 +1403,8 @@ buildipfire() {
    lfsmake2 Digest-SHA1
    lfsmake2 Digest-HMAC
    lfsmake2 libwww-perl
+  lfsmake2 perl-LWP-Protocol-https
+  lfsmake2 perl-Net-HTTP
    lfsmake2 Net-DNS
    lfsmake2 Net-IPv4Addr
    lfsmake2 Net_SSLeay
@@ -1496,7 +1513,6 @@ buildipfire() {
    lfsmake2 rsync
    lfsmake2 rpcbind
    lfsmake2 keyutils
-  lfsmake2 libnfsidmap
    lfsmake2 nfs
    lfsmake2 gnu-netcat
    lfsmake2 ncat
@@ -1694,7 +1710,7 @@ buildinstaller() {
    lfsmake2 memtest
    lfsmake2 installer
    # use toolchain bash for chroot to strip
-  EXTRA_PATH=${TOOLS_DIR}/bin/ lfsmake2 strip
+  CUSTOM_PATH="${TOOLS_DIR}/bin" lfsmake2 strip
  }
  
  buildpackages() {
diff --git a/src/pakfire/lib/functions.pl b/src/pakfire/lib/functions.pl

index cb448a766a01cd4f7692b119005ee14e65a5e478..8d0923d650fc1b5c5d6bbdf50643357ed6c61fc6 100644 (file)
--- a/src/pakfire/lib/functions.pl
+++ b/src/pakfire/lib/functions.pl
@@ -2,7 +2,7 @@
  ###############################################################################
  #                                                                             #
  # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2015   IPFire Team   <info@ipfire.org>                   #
+# Copyright (C) 2007-2021   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        #
@@ -155,7 +155,14 @@ sub fetchfile {
                 
                 logger("DOWNLOAD INFO: Host: $host ($proto) - File: $file");
  
-               my $ua = LWP::UserAgent->new;
+               # Init LWP::UserAgent, request SSL hostname verification
+               # and specify CA file.
+               my $ua = LWP::UserAgent->new(
+                       ssl_opts => {
+                               SSL_ca_file     => '/etc/ssl/cert.pem',
+                               verify_hostname => 1,
+                       }
+               );
                 $ua->agent("Pakfire/$Conf::version");
                 $ua->timeout(20);
                 
@@ -388,11 +395,10 @@ sub dbgetlist {
         }
  
         # Update the meta database if new packages was in the package list
-       my @meta;
         my $file;
         my $line;
         my $prog;
-       my ($name, $version, $release);
+       my %metadata;
         my @templine;
  
         open(FILE, "<$Conf::dbdir/lists/packages_list.db");
@@ -407,28 +413,14 @@ sub dbgetlist {
                 next if ( $file eq ".." );
                 next if ( $file eq "meta-" );
                 next if ( $file =~ /^old/ );
-               open(FILE, "<$Conf::dbdir/meta/$file");
-               @meta = <FILE>;
-               close(FILE);
-               foreach $line (@meta) {
-                       @templine = split(/\: /,$line);
-                       if ("$templine[0]" eq "Name") {
-                               $name = $templine[1];
-                               chomp($name);
-                       } elsif ("$templine[0]" eq "ProgVersion") {
-                               $version = $templine[1];
-                               chomp($version);
-                       } elsif ("$templine[0]" eq "Release") {
-                               $release = $templine[1];
-                               chomp($release);
-                       }
-               }
+               %metadata = parsemetafile("$Conf::dbdir/meta/$file");
+
                 foreach $prog (@db) {
                         @templine = split(/\;/,$prog);
-                       if (("$name" eq "$templine[0]") && ("$release" ne "$templine[2]")) {
-                               move("$Conf::dbdir/meta/meta-$name","$Conf::dbdir/meta/old_meta-$name");
-                               fetchfile("meta/meta-$name", "");
-                               move("$Conf::cachedir/meta-$name", "$Conf::dbdir/meta/meta-$name");
+                       if (("$metadata{'Name'}" eq "$templine[0]") && ("$metadata{'Release'}" ne "$templine[2]")) {
+                               move("$Conf::dbdir/meta/meta-$metadata{'Name'}","$Conf::dbdir/meta/old_meta-$metadata{'Name'}");
+                               fetchfile("meta/meta-$metadata{'Name'}", "");
+                               move("$Conf::cachedir/meta-$metadata{'Name'}", "$Conf::dbdir/meta/meta-$metadata{'Name'}");
                         }
                 }
         }
@@ -441,12 +433,11 @@ sub dblist {
         #   filter may be: all, notinstalled, installed
         my $filter = shift;
         my $forweb = shift;
-       my @meta;
         my @updatepaks;
         my $file;
         my $line;
         my $prog;
-       my ($name, $version, $release);
+       my %metadata;
         my @templine;
         
         ### Make sure that the list is not outdated. 
@@ -482,30 +473,16 @@ sub dblist {
                         next if ( $file eq "." );
                         next if ( $file eq ".." );
                         next if ( $file =~ /^old/ );
-                       open(FILE, "<$Conf::dbdir/installed/$file");
-                       @meta = <FILE>;
-                       close(FILE);
-                       foreach $line (@meta) {
-                               @templine = split(/\: /,$line);
-                               if ("$templine[0]" eq "Name") {
-                                       $name = $templine[1];
-                                       chomp($name);
-                               } elsif ("$templine[0]" eq "ProgVersion") {
-                                       $version = $templine[1];
-                                       chomp($version);
-                               } elsif ("$templine[0]" eq "Release") {
-                                       $release = $templine[1];
-                                       chomp($release);
-                               }
-                       }
+                       %metadata = parsemetafile("$Conf::dbdir/installed/$file");
+
                         foreach $prog (@db) {
                                 @templine = split(/\;/,$prog);
-                               if (("$name" eq "$templine[0]") && ("$release" < "$templine[2]" && "$forweb" ne "notice")) {
-                                       push(@updatepaks,$name);
+                               if (("$metadata{'Name'}" eq "$templine[0]") && ("$metadata{'Release'}" < "$templine[2]" && "$forweb" ne "notice")) {
+                                       push(@updatepaks,$metadata{'Name'});
                                         if ("$forweb" eq "forweb") {
-                                               print "<option value=\"$name\">Update: $name -- Version: $version -> $templine[1] -- Release: $release -> $templine[2]</option>\n";
+                                               print "<option value=\"$metadata{'Name'}\">Update: $metadata{'Name'} -- Version: $metadata{'ProgVersion'} -> $templine[1] -- Release: $metadata{'Release'} -> $templine[2]</option>\n";
                                         } else {
-                                               my $command = "Update: $name\nVersion: $version -> $templine[1]\nRelease: $release -> $templine[2]\n";
+                                               my $command = "Update: $metadata{'Name'}\nVersion: $metadata{'ProgVersion'} -> $templine[1]\nRelease: $metadata{'Release'} -> $templine[2]\n";
                                                 if ("$Pakfire::enable_colors" eq "1") {
                                                         print "$color{'lila'}$command$color{'normal'}\n";
                                                 } else {
@@ -560,18 +537,9 @@ sub resolvedeps_one {
         
         message("PAKFIRE RESV: $pak: Resolving dependencies...");
         
-       open(FILE, "<$Conf::dbdir/meta/meta-$pak");
-       my @file = <FILE>;
-       close(FILE);
-       
-       my $line;
-       my (@templine, @deps, @all);
-       foreach $line (@file) {
-               @templine = split(/\: /,$line);
-               if ("$templine[0]" eq "Dependencies") {
-                       @deps = split(/ /, $templine[1]);
-               }
-       }
+       my %metadata = parsemetafile("$Conf::dbdir/meta/meta-$pak");
+       my @all;
+       my @deps = split(/ /, $metadata{'Dependencies'});
         chomp (@deps);
         foreach (@deps) {
                 if ($_) {
@@ -691,20 +659,40 @@ sub getsize {
         
         getmetafile("$pak");
         
-       open(FILE, "<$Conf::dbdir/meta/meta-$pak");
-       my @file = <FILE>;
+       if (my %metadata = parsemetafile("$Conf::dbdir/meta/meta-$pak")) {
+               return $metadata{'Size'};
+       }
+       return 0;
+}
+
+sub parsemetafile {
+       ### This subroutine returns a hash with the contents of a meta- file
+       #   Pass path to metafile as argument: Pakfire::parsemetafile("$Conf::dbdir/meta/meta-$pak")
+       #   Usage is always with an argument.
+       my $metafile = shift;
+
+       my %metadata = ();
+
+       my @templine;
+       my @file;
+
+       if (! -e $metafile ) {
+               return 0;
+       }
+
+       open(FILE, "<$metafile");
+       @file = <FILE>;
         close(FILE);
         
-       my $line;
-       my @templine;
-       foreach $line (@file) {
-               @templine = split(/\: /,$line);
-               if ("$templine[0]" eq "Size") {
+       foreach (@file) {
+               @templine = split(/\: /,$_);
+               if ($templine[1]) {
                         chomp($templine[1]);
-                       return $templine[1];
+                       $metadata{"$templine[0]"} = $templine[1];
                 }
         }
-       return 0;
+
+       return %metadata;
  }
  
  sub decryptpak {
@@ -727,20 +715,8 @@ sub getpak {
  
         getmetafile("$pak");
         
-       open(FILE, "<$Conf::dbdir/meta/meta-$pak");
-       my @file = <FILE>;
-       close(FILE);
-       
-       my $line;
-       my $file;
-       my @templine;
-       foreach $line (@file) {
-               @templine = split(/\: /,$line);
-               if ("$templine[0]" eq "File") {
-                       chomp($templine[1]);
-                       $file = $templine[1];
-               }
-       }
+       my %metadata = parsemetafile("$Conf::dbdir/meta/meta-$pak");
+       my $file = $metadata{'File'};
         
         unless ($file) {
                 message("No filename given in meta-file.");
diff --git a/src/patches/bash/bash51-013 b/src/patches/bash/bash51-013

new file mode 100644 (file)

index 0000000..f2413a5
--- /dev/null
+++ b/src/patches/bash/bash51-013
@@ -0,0 +1,43 @@
+                            BASH PATCH REPORT
+                            =================
+
+Bash-Release:  5.1
+Patch-ID:      bash51-013
+
+Bug-Reported-by:       Anders Kaseorg <andersk@mit.edu>
+Bug-Reference-ID:      <de65540274064d7b95f17e9c46a3a6d8@oc11expo7.exchange.mit.edu>
+Bug-Reference-URL:     https://lists.gnu.org/archive/html/bug-bash/2021-11/msg00025.html
+
+Bug-Description:
+
+Bash did not always perform tilde expansion following an unquoted colon on
+the rhs of an assignment statement in posix mode.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-20211028/subst.c   2021-10-18 16:09:58.000000000 -0400
+--- subst.c    2021-11-30 11:19:47.000000000 -0500
+***************
+*** 3826,3829 ****
+--- 3826,3830 ----
+    td.flags = W_ASSIGNRHS;
+  #endif
++   td.flags |= (W_NOGLOB|W_TILDEEXP);
+    td.word = savestring (string);
+    value = call_expand_word_internal (&td, quoted, 0, (int *)NULL, (int *)NULL);
+
+*** ../bash-5.1/patchlevel.h   2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h       2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 12
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 13
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/src/patches/bash/bash51-014 b/src/patches/bash/bash51-014

new file mode 100644 (file)

index 0000000..cd8df23
--- /dev/null
+++ b/src/patches/bash/bash51-014
@@ -0,0 +1,48 @@
+                            BASH PATCH REPORT
+                            =================
+
+Bash-Release:  5.1
+Patch-ID:      bash51-014
+
+Bug-Reported-by:       platon7pronko@gmail.com
+Bug-Reference-ID:
+Bug-Reference-URL:     https://savannah.gnu.org/patch/?10035
+
+Bug-Description:
+
+Bash may produce corrupted input if a multibyte character spans a 512-byte
+boundary while reading the output of a command substitution.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-20210217/subst.c   2021-02-03 10:32:08.000000000 -0500
+--- subst.c    2021-03-01 16:47:52.000000000 -0500
+***************
+*** 6243,6247 ****
+         /* punt on the hard case for now */
+         memset (&ps, '\0', sizeof (mbstate_t));
+!        mblen = mbrtowc (&wc, bufp-1, bufn+1, &ps);
+         if (MB_INVALIDCH (mblen) || mblen == 0 || mblen == 1)
+           istring[istring_index++] = c;
+--- 6243,6247 ----
+         /* punt on the hard case for now */
+         memset (&ps, '\0', sizeof (mbstate_t));
+!        mblen = mbrtowc (&wc, bufp-1, bufn, &ps);
+         if (MB_INVALIDCH (mblen) || mblen == 0 || mblen == 1)
+           istring[istring_index++] = c;
+
+*** ../bash-5.1/patchlevel.h   2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h       2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 13
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 14
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/src/patches/bash/bash51-015 b/src/patches/bash/bash51-015

new file mode 100644 (file)

index 0000000..5ae6581
--- /dev/null
+++ b/src/patches/bash/bash51-015
@@ -0,0 +1,49 @@
+                            BASH PATCH REPORT
+                            =================
+
+Bash-Release:  5.1
+Patch-ID:      bash51-015
+
+Bug-Reported-by:       Volodymyr Prodan <vovcat@gmail.com>
+Bug-Reference-ID:
+Bug-Reference-URL:     https://savannah.gnu.org/patch/?10076
+
+Bug-Description:
+
+Patch (apply with `patch -p0'):
+
+There are some characters (e.g., cyrillic) that can't be displayed using
+certain single-byte encodings (e.g., cp1251) because the negative signed
+int is interpreted as EOF and not displayed.
+
+*** ../bash-20210524/lib/readline/display.c    2021-03-16 18:12:20.000000000 -0400
+--- lib/readline/display.c     2021-06-07 16:53:08.000000000 -0400
+***************
+*** 1599,1603 ****
+  
+    for (cur_face = FACE_NORMAL, i = 0; i < n; i++)
+!     putc_face (str[i], face[i], &cur_face);
+    putc_face (EOF, FACE_NORMAL, &cur_face);
+  }
+--- 1599,1603 ----
+  
+    for (cur_face = FACE_NORMAL, i = 0; i < n; i++)
+!     putc_face ((unsigned char) str[i], face[i], &cur_face);
+    putc_face (EOF, FACE_NORMAL, &cur_face);
+  }
+
+*** ../bash-5.1/patchlevel.h   2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h       2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 14
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 15
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/src/patches/bash/bash51-016 b/src/patches/bash/bash51-016

new file mode 100644 (file)

index 0000000..4694498
--- /dev/null
+++ b/src/patches/bash/bash51-016
@@ -0,0 +1,64 @@
+                            BASH PATCH REPORT
+                            =================
+
+Bash-Release:  5.1
+Patch-ID:      bash51-016
+
+Bug-Reported-by:       Vincent Menegaux <vincent.menegaux@gmail.com>
+Bug-Reference-ID:
+Bug-Reference-URL:     https://savannah.gnu.org/patch/?10070
+
+Bug-Description:
+
+Multiple `!' tokens should toggle negation of an expression in a [[
+conditional command, instead of simply negating the expression.
+
+Patch (apply with `patch -p0'):
+
+*** ../bash-20210515/parse.y   2021-04-21 15:32:50.000000000 -0400
+--- parse.y    2021-05-24 11:53:30.000000000 -0400
+***************
+*** 4797,4801 ****
+        term = cond_term ();
+        if (term)
+!      term->flags |= CMD_INVERT_RETURN;
+      }
+    else if (tok == WORD && yylval.word->word[0] == '-' && yylval.word->word[1] && yylval.word->word[2] == 0 && test_unop (yylval.word->word))
+--- 4797,4801 ----
+        term = cond_term ();
+        if (term)
+!      term->flags ^= CMD_INVERT_RETURN;
+      }
+    else if (tok == WORD && yylval.word->word[0] == '-' && yylval.word->word[1] && yylval.word->word[2] == 0 && test_unop (yylval.word->word))
+
+*** ../bash-20210515/y.tab.c   2021-05-14 15:50:41.000000000 -0400
+--- y.tab.c    2021-05-24 16:35:55.000000000 -0400
+***************
+*** 7091,7095 ****
+        term = cond_term ();
+        if (term)
+!      term->flags |= CMD_INVERT_RETURN;
+      }
+    else if (tok == WORD && yylval.word->word[0] == '-' && yylval.word->word[1] && yylval.word->word[2] == 0 && test_unop (yylval.word->word))
+--- 7091,7095 ----
+        term = cond_term ();
+        if (term)
+!      term->flags ^= CMD_INVERT_RETURN;
+      }
+    else if (tok == WORD && yylval.word->word[0] == '-' && yylval.word->word[1] && yylval.word->word[2] == 0 && test_unop (yylval.word->word))
+
+*** ../bash-5.1/patchlevel.h   2020-06-22 14:51:03.000000000 -0400
+--- patchlevel.h       2020-10-01 11:01:28.000000000 -0400
+***************
+*** 26,30 ****
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 15
+  
+  #endif /* _PATCHLEVEL_H_ */
+--- 26,30 ----
+     looks for to find the patch level (for the sccs version string). */
+  
+! #define PATCHLEVEL 16
+  
+  #endif /* _PATCHLEVEL_H_ */
diff --git a/src/patches/glibc-2.33-librt-fix-null-pointer-dereference-bug-28213.patch b/src/patches/glibc-2.33-librt-fix-null-pointer-dereference-bug-28213.patch

deleted file mode 100644 (file)

index d2083e6..0000000
--- a/src/patches/glibc-2.33-librt-fix-null-pointer-dereference-bug-28213.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 27a78fd712c06748737dfa9638fab96ea362fca9 Mon Sep 17 00:00:00 2001
-From: Nikita Popov <npv1310@gmail.com>
-Date: Mon, 9 Aug 2021 20:17:34 +0530
-Subject: [PATCH] librt: fix NULL pointer dereference (bug 28213)
-
-Helper thread frees copied attribute on NOTIFY_REMOVED message
-received from the OS kernel.  Unfortunately, it fails to check whether
-copied attribute actually exists (data.attr != NULL).  This worked
-earlier because free() checks passed pointer before actually
-attempting to release corresponding memory.  But
-__pthread_attr_destroy assumes pointer is not NULL.
-
-So passing NULL pointer to __pthread_attr_destroy will result in
-segmentation fault.  This scenario is possible if
-notification->sigev_notify_attributes == NULL (which means default
-thread attributes should be used).
-
-Signed-off-by: Nikita Popov <npv1310@gmail.com>
-Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
-(cherry picked from commit b805aebd42364fe696e417808a700fdb9800c9e8)
----
- sysdeps/unix/sysv/linux/mq_notify.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c
-index 6f46d29d1d..1714e1cc5f 100644
---- a/sysdeps/unix/sysv/linux/mq_notify.c
-+++ b/sysdeps/unix/sysv/linux/mq_notify.c
-@@ -132,7 +132,7 @@ helper_thread (void *arg)
-              to wait until it is done with it.  */
-           (void) __pthread_barrier_wait (&notify_barrier);
-       }
--      else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED)
-+      else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED && data.attr != NULL)
-       {
-         /* The only state we keep is the copy of the thread attributes.  */
-         pthread_attr_destroy (data.attr);
--- 
-2.20.1
-
diff --git a/src/patches/glibc-2.33-use-__pthread_attr_copy-in-mq_notify-bug-27896.patch b/src/patches/glibc-2.33-use-__pthread_attr_copy-in-mq_notify-bug-27896.patch

deleted file mode 100644 (file)

index f846b37..0000000
--- a/src/patches/glibc-2.33-use-__pthread_attr_copy-in-mq_notify-bug-27896.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 4b6be914bd3920500a67ef6ca1aa7d1c37e5e859 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@linux-m68k.org>
-Date: Thu, 27 May 2021 12:49:47 +0200
-Subject: [PATCH] Use __pthread_attr_copy in mq_notify (bug 27896)
-
-Make a deep copy of the pthread attribute object to remove a potential
-use-after-free issue.
-
-(cherry picked from commit 42d359350510506b87101cf77202fefcbfc790cb)
----
- NEWS                                |  6 ++++++
- sysdeps/unix/sysv/linux/mq_notify.c | 15 ++++++++++-----
- 2 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index 0c33a80af9..b9e570b4a4 100644
---- a/NEWS
-+++ b/NEWS
-@@ -13,6 +13,12 @@ Major new features:
-   a dump of information related to IFUNC resolver operation and
-   glibc-hwcaps subdirectory selection.
- 
-+Security related changes:
-+
-+  CVE-2021-33574: The mq_notify function has a potential use-after-free
-+  issue when using a notification type of SIGEV_THREAD and a thread
-+  attribute with a non-default affinity mask.
-+
- The following bugs are resolved with this release:
- 
-   [15271] dlfcn function failure after dlmopen terminates process
-diff --git a/sysdeps/unix/sysv/linux/mq_notify.c b/sysdeps/unix/sysv/linux/mq_notify.c
-index cc575a0cdd..f7ddfe5a6c 100644
---- a/sysdeps/unix/sysv/linux/mq_notify.c
-+++ b/sysdeps/unix/sysv/linux/mq_notify.c
-@@ -133,8 +133,11 @@ helper_thread (void *arg)
-           (void) __pthread_barrier_wait (&notify_barrier);
-       }
-       else if (data.raw[NOTIFY_COOKIE_LEN - 1] == NOTIFY_REMOVED)
--      /* The only state we keep is the copy of the thread attributes.  */
--      free (data.attr);
-+      {
-+        /* The only state we keep is the copy of the thread attributes.  */
-+        pthread_attr_destroy (data.attr);
-+        free (data.attr);
-+      }
-     }
-   return NULL;
- }
-@@ -255,8 +258,7 @@ mq_notify (mqd_t mqdes, const struct sigevent *notification)
-       if (data.attr == NULL)
-       return -1;
- 
--      memcpy (data.attr, notification->sigev_notify_attributes,
--            sizeof (pthread_attr_t));
-+      __pthread_attr_copy (data.attr, notification->sigev_notify_attributes);
-     }
- 
-   /* Construct the new request.  */
-@@ -270,7 +272,10 @@ mq_notify (mqd_t mqdes, const struct sigevent *notification)
- 
-   /* If it failed, free the allocated memory.  */
-   if (__glibc_unlikely (retval != 0))
--    free (data.attr);
-+    {
-+      pthread_attr_destroy (data.attr);
-+      free (data.attr);
-+    }
- 
-   return retval;
- }
--- 
-2.20.1
-
diff --git a/src/patches/ntp-4.2.8p15-build-fix-for-glibc-2.34.patch b/src/patches/ntp-4.2.8p15-build-fix-for-glibc-2.34.patch

new file mode 100644 (file)

index 0000000..442fe78
--- /dev/null
+++ b/src/patches/ntp-4.2.8p15-build-fix-for-glibc-2.34.patch
@@ -0,0 +1,29 @@
+From 082a504cfcc046c3d8adaae1164268bc94e5108a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 31 Jul 2021 10:51:41 -0700
+Subject: [PATCH] libntp: Do not use PTHREAD_STACK_MIN on glibc
+In glibc 2.34+ PTHREAD_STACK_MIN is not a compile-time constant which
+could mean different stack sizes at runtime on different architectures
+and it also causes compile failure. Default glibc thread stack size
+or 64Kb set by ntp should be good in glibc these days.
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ libntp/work_thread.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/libntp/work_thread.c b/libntp/work_thread.c
+index 03a5647..3ddd751 100644
+--- a/libntp/work_thread.c
++++ b/libntp/work_thread.c
+@@ -41,7 +41,7 @@
+ #ifndef THREAD_MINSTACKSIZE
+ # define THREAD_MINSTACKSIZE  (64U * 1024)
+ #endif
+-#ifndef __sun
++#if !defined(__sun) && !defined(__GLIBC__)
+ #if defined(PTHREAD_STACK_MIN) && THREAD_MINSTACKSIZE < PTHREAD_STACK_MIN
+ # undef THREAD_MINSTACKSIZE
+ # define THREAD_MINSTACKSIZE PTHREAD_STACK_MIN
+-- 
+2.32.0
+
diff --git a/src/patches/postfix-3.6.2-glibc-234-build-fix.patch b/src/patches/postfix-3.6.2-glibc-234-build-fix.patch

new file mode 100644 (file)

index 0000000..b678b78
--- /dev/null
+++ b/src/patches/postfix-3.6.2-glibc-234-build-fix.patch
@@ -0,0 +1,14 @@
+diff --git a/src/util/sys_defs.h b/src/util/sys_defs.h
+index 99bec9b..95c78ec 100644
+--- a/src/util/sys_defs.h
++++ b/src/util/sys_defs.h
+@@ -802,6 +803,9 @@ extern int initgroups(const char *, int);
+ #define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
+ #endif
+ #endif
++#if HAVE_GLIBC_API_VERSION_SUPPORT(2, 34)
++#define HAS_CLOSEFROM
++#endif
+ #include <linux/version.h>
+ #if !defined(KERNEL_VERSION)
+ #define KERNEL_VERSION(a,b,c) (LINUX_VERSION_CODE + 1)
diff --git a/src/patches/texinfo-6.8-undo-gnulib-nonnul.patch b/src/patches/texinfo-6.8-undo-gnulib-nonnul.patch

new file mode 100644 (file)

index 0000000..60f2e63
--- /dev/null
+++ b/src/patches/texinfo-6.8-undo-gnulib-nonnul.patch
@@ -0,0 +1,186 @@
+
+Patch by Vitezslav Crhonek <vcrhonek@redhat.com>
+Source: https://src.fedoraproject.org/rpms/texinfo/c/9b2cca4817fa4bd8d520fed05e9560fc7183dcdf?branch=rawhide
+
+diff -up texinfo-6.8/gnulib/lib/cdefs.h.orig texinfo-6.8/gnulib/lib/cdefs.h
+--- texinfo-6.8/gnulib/lib/cdefs.h.orig        2021-03-11 19:57:53.000000000 +0100
++++ texinfo-6.8/gnulib/lib/cdefs.h     2021-07-19 12:26:46.985176475 +0200
+@@ -321,15 +321,15 @@
+ 
+ /* The nonnull function attribute marks pointer parameters that
+    must not be NULL.  */
+-#ifndef __attribute_nonnull__
++#ifndef __nonnull
+ # if __GNUC_PREREQ (3,3) || __glibc_has_attribute (__nonnull__)
+-#  define __attribute_nonnull__(params) __attribute__ ((__nonnull__ params))
++#  define __nonnull(params) __attribute__ ((__nonnull__ params))
+ # else
+-#  define __attribute_nonnull__(params)
++#  define __nonnull(params)
+ # endif
+-#endif
+-#ifndef __nonnull
+-# define __nonnull(params) __attribute_nonnull__ (params)
++#elif !defined __GLIBC__
++# undef __nonnull
++# define __nonnull(params) _GL_ATTRIBUTE_NONNULL (params)
+ #endif
+ 
+ /* If fortification mode, we warn about unused results of certain
+diff -up texinfo-6.8/gnulib/lib/libc-config.h.orig texinfo-6.8/gnulib/lib/libc-config.h
+--- texinfo-6.8/gnulib/lib/libc-config.h.orig  2021-03-11 19:57:54.000000000 +0100
++++ texinfo-6.8/gnulib/lib/libc-config.h       2021-07-19 12:27:58.810590975 +0200
+@@ -33,9 +33,9 @@
+ #include <config.h>
+ 
+ /* On glibc this includes <features.h> and <sys/cdefs.h> and #defines
+-   _FEATURES_H, __WORDSIZE, and __set_errno.  On FreeBSD 11 and
+-   DragonFlyBSD 5.9 it includes <sys/cdefs.h> which defines __nonnull.
+-   Elsewhere it is harmless.  */
++   _FEATURES_H, __WORDSIZE, and __set_errno.  On FreeBSD 11 it
++   includes <sys/cdefs.h> which defines __nonnull.  Elsewhere it
++   is harmless.  */
+ #include <errno.h>
+ 
+ /* From glibc <errno.h>.  */
+diff -up texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c
+--- texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c.orig     2021-03-11 19:57:54.000000000 +0100
++++ texinfo-6.8/gnulib/lib/malloc/dynarray-skeleton.c  2021-07-19 12:24:46.878419397 +0200
+@@ -192,7 +192,7 @@ DYNARRAY_NAME (free__array__) (struct DY
+ 
+ /* Initialize a dynamic array object.  This must be called before any
+    use of the object.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static void
+ DYNARRAY_NAME (init) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -202,7 +202,7 @@ DYNARRAY_NAME (init) (struct DYNARRAY_ST
+ }
+ 
+ /* Deallocate the dynamic array and its elements.  */
+-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __nonnull ((1))
+ static void
+ DYNARRAY_FREE (struct DYNARRAY_STRUCT *list)
+ {
+@@ -213,7 +213,7 @@ DYNARRAY_FREE (struct DYNARRAY_STRUCT *l
+ }
+ 
+ /* Return true if the dynamic array is in an error state.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline bool
+ DYNARRAY_NAME (has_failed) (const struct DYNARRAY_STRUCT *list)
+ {
+@@ -222,7 +222,7 @@ DYNARRAY_NAME (has_failed) (const struct
+ 
+ /* Mark the dynamic array as failed.  All elements are deallocated as
+    a side effect.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static void
+ DYNARRAY_NAME (mark_failed) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -236,7 +236,7 @@ DYNARRAY_NAME (mark_failed) (struct DYNA
+ 
+ /* Return the number of elements which have been added to the dynamic
+    array.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline size_t
+ DYNARRAY_NAME (size) (const struct DYNARRAY_STRUCT *list)
+ {
+@@ -245,7 +245,7 @@ DYNARRAY_NAME (size) (const struct DYNAR
+ 
+ /* Return a pointer to the array element at INDEX.  Terminate the
+    process if INDEX is out of bounds.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline DYNARRAY_ELEMENT *
+ DYNARRAY_NAME (at) (struct DYNARRAY_STRUCT *list, size_t index)
+ {
+@@ -257,7 +257,7 @@ DYNARRAY_NAME (at) (struct DYNARRAY_STRU
+ /* Return a pointer to the first array element, if any.  For a
+    zero-length array, the pointer can be NULL even though the dynamic
+    array has not entered the failure state.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline DYNARRAY_ELEMENT *
+ DYNARRAY_NAME (begin) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -267,7 +267,7 @@ DYNARRAY_NAME (begin) (struct DYNARRAY_S
+ /* Return a pointer one element past the last array element.  For a
+    zero-length array, the pointer can be NULL even though the dynamic
+    array has not entered the failure state.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline DYNARRAY_ELEMENT *
+ DYNARRAY_NAME (end) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -294,7 +294,7 @@ DYNARRAY_NAME (add__) (struct DYNARRAY_S
+ /* Add ITEM at the end of the array, enlarging it by one element.
+    Mark *LIST as failed if the dynamic array allocation size cannot be
+    increased.  */
+-__attribute_nonnull__ ((1))
++__nonnull ((1))
+ static inline void
+ DYNARRAY_NAME (add) (struct DYNARRAY_STRUCT *list, DYNARRAY_ELEMENT item)
+ {
+@@ -348,8 +348,7 @@ DYNARRAY_NAME (emplace__) (struct DYNARR
+ /* Allocate a place for a new element in *LIST and return a pointer to
+    it.  The pointer can be NULL if the dynamic array cannot be
+    enlarged due to a memory allocation failure.  */
+-__attribute_maybe_unused__ __attribute_warn_unused_result__
+-__attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1))
+ static
+ /* Avoid inlining with the larger initialization code.  */
+ #if !(defined (DYNARRAY_ELEMENT_INIT) || defined (DYNARRAY_ELEMENT_FREE))
+@@ -373,7 +372,7 @@ DYNARRAY_NAME (emplace) (struct DYNARRAY
+    existing size, new elements are added (which can be initialized).
+    Otherwise, the list is truncated, and elements are freed.  Return
+    false on memory allocation failure (and mark *LIST as failed).  */
+-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __nonnull ((1))
+ static bool
+ DYNARRAY_NAME (resize) (struct DYNARRAY_STRUCT *list, size_t size)
+ {
+@@ -418,7 +417,7 @@ DYNARRAY_NAME (resize) (struct DYNARRAY_
+ }
+ 
+ /* Remove the last element of LIST if it is present.  */
+-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __nonnull ((1))
+ static void
+ DYNARRAY_NAME (remove_last) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -435,7 +434,7 @@ DYNARRAY_NAME (remove_last) (struct DYNA
+ 
+ /* Remove all elements from the list.  The elements are freed, but the
+    list itself is not.  */
+-__attribute_maybe_unused__ __attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __nonnull ((1))
+ static void
+ DYNARRAY_NAME (clear) (struct DYNARRAY_STRUCT *list)
+ {
+@@ -453,8 +452,7 @@ DYNARRAY_NAME (clear) (struct DYNARRAY_S
+    stored in *RESULT if LIST refers to an empty list.  On success, the
+    pointer in *RESULT is heap-allocated and must be deallocated using
+    free.  */
+-__attribute_maybe_unused__ __attribute_warn_unused_result__
+-__attribute_nonnull__ ((1, 2))
++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1, 2))
+ static bool
+ DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list,
+                           DYNARRAY_FINAL_TYPE *result)
+@@ -485,8 +483,7 @@ DYNARRAY_NAME (finalize) (struct DYNARRA
+    have a sentinel at the end).  If LENGTHP is not NULL, the array
+    length is written to *LENGTHP.  *LIST is re-initialized and can be
+    reused.  */
+-__attribute_maybe_unused__ __attribute_warn_unused_result__
+-__attribute_nonnull__ ((1))
++__attribute_maybe_unused__ __attribute_warn_unused_result__ __nonnull ((1))
+ static DYNARRAY_ELEMENT *
+ DYNARRAY_NAME (finalize) (struct DYNARRAY_STRUCT *list, size_t *lengthp)
+ {
diff --git a/src/stripper b/src/stripper

index 6f449bb3973c0627f8f27b6a4a6b55fada601cee..fa624815bb1b81267a8f8c0762cc7563a1067e24 100755 (executable)
--- a/src/stripper
+++ b/src/stripper
@@ -1,49 +1,58 @@
  #!/usr/bin/env bash
  
-dirs=""
-excludes="/dev /proc /sys /run"
+paths=()
+excludes=()
  
  while [ $# -gt 0 ]; do
         case "${1}" in
                 --exclude=*)
-                       excludes="${excludes} ${1#*=}"
+                       excludes+=( "!" "-path" "${1#*=}/*" )
                         ;;
                 *)
-                       dirs="${dirs} ${1}"
+                       paths+=( "${1}" )
                         ;;
         esac
         shift
  done
  
  function _strip() {
-       local file=${1}
-       local strip="${STRIP-strip}"
+       local file="${1}"
+       local args=()
  
-       local exclude l
-       for exclude in ${excludes}; do
-               l=${#exclude}
-               if [ "${file:0:${l}}" = "${exclude}" ]; then
-                       return 0
-               fi
-       done
+       # Fetch the filetype
+       local type="$(readelf -h "${file}" 2>/dev/null)"
  
-       # Fetch any capabilities
-       local capabilities="$(getfattr --no-dereference --name="security.capability" \
-               --absolute-names --dump "${file}" 2>/dev/null)"
+       case "${type}" in
+               # Libraries and Relocatable binaries
+               *Type:*"DYN (Shared object file)"*)
+                       args+=( "--strip-all" )
+                       ;;
  
-       local cmd=( "${strip}" )
+               # Binaries
+               *Type:*"EXEC (Executable file)"*)
+                       args+=( "--strip-all" )
+                       ;;
  
-       case "$(file -bi ${file})" in
-               application/x-archive*)
-                       cmd+=( "--strip-debug" "--remove-section=.comment" "--remove-section=.note" )
+               # Static libraries
+               *Type:*"REL (Relocatable file)"*)
+                       args+=( "--strip-debug" "--remove-section=.comment" "--remove-section=.note" )
                         ;;
+
+               # Skip any unrecognised files
                 *)
-                       cmd+=( "--strip-all" )
+                       return 0
                         ;;
         esac
  
+       # Fetch any capabilities
+       local capabilities="$(getfattr --no-dereference --name="security.capability" \
+               --absolute-names --dump "${file}" 2>/dev/null)"
+
         echo "Stripping ${file}..."
-       ${cmd[*]} ${file}
+       if ! strip "${args[@]}" "${file}"; then
+               return 1
+       fi
+
  
         # Restore capabilities
         if [ -n "${capabilities}" ]; then
@@ -51,18 +60,8 @@ function _strip() {
         fi
  }
  
-for dir in ${dirs}; do
-       # Strip shared objects.
-       find ${dir} -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) \
-               | file -N -f - | sed -n -e 's/^\(.*\):[   ]*.*ELF.*, not stripped.*/\1/p' |
-               while read file; do
-                       _strip ${file} || exit $?
-               done || exit $?
-
-       # Strip static archives.
-       find ${dir} -name \*.a -a -exec file {} \; \
-               | grep 'current ar archive' | sed -n -e 's/^\(.*\):[    ]*current ar archive/\1/p' |
-               while read file; do
-                       _strip ${file} || exit $?
-               done || exit $?
+for path in ${paths[@]}; do
+       for file in $(find -H "${path}" -xdev "${excludes[@]}" -type f \( -perm -0100 -or -perm -0010 -or -perm -0001 \) 2>/dev/null); do
+               _strip "${file}" || exit $?
+       done
  done
diff --git a/src/wio/lang/wio.es.pl b/src/wio/lang/wio.es.pl

new file mode 100644 (file)

index 0000000..30732c6
--- /dev/null
+++ b/src/wio/lang/wio.es.pl
@@ -0,0 +1,157 @@
+%tr = (%tr,
+'wio' => '¿Quién está conectado?',
+'wio stat' => 'Condición(es) actuales:',
+'wio checked' => 'Última comprobación',
+'wio name' => 'Nombre de host o FQDN',
+'wio ipadress' => 'Dirección IP',
+'wio image' => 'Condición',
+'wio up' => 'Activo',
+'wio down' => 'Inactivo',
+'wio err' => 'Error',
+'wio warn' => 'Advertencia',
+'wio_import_csv' => 'Archivo CSV:',
+'wio_import_hosts' => 'Configuración de hosts (var/ipfire/main/hosts)?',
+'wio_import_data' => 'Importar configuraciones para',
+'wio_import_data1' => ' correcto:',
+'wio_import_data2' => ' importar:',
+'wio_import' => 'Importando',
+'wio_import_info' => 'mensaje:',
+'wio_import_file' => 'Importar clientes(s) desde:',
+'wio_import_info_csv' => '¡No hay nuevas configuraciones para importar!',
+'wio settings' => 'Configuración:',
+'wio enabled' => 'Habilitado?',
+'wio min' => 'Minuto(s)',
+'wio cron' => 'Intervalo de tiempo para comprobar:',
+'wio_ovpn_cron' => 'Intervalo de tiempo para verificar el estado de OpenVPN RW e IPsec:',
+'wio_save' => 'Guardar',
+'wio_error' => 'mensaje de error:',
+'wio_info' => 'mensaje:',
+'wio_back' => 'Atrás',
+'wio_use' => 'Importar estos ajustes?',
+'wio_ip_error' => 'Dirección IP inválida.',
+'wio_host_error' => 'Nombre de host no válido.',
+'wio_host_exists' => 'El nombre de host ya está en uso.',
+'wio_host_empty' => '¡No se registró ningún nombre de host!',
+'wio_ip_exists' => 'La dirección IP ya está en uso.',
+'wio_ip_empty' => '¡No se registró ninguna dirección IP!',
+'wio_import_fixleases' => 'Configuración DHCP (var/ipfire/dhcp/fixleases)?',
+'wio_import_leases' => 'Importar ajustes:',
+'wio network' => 'Red',
+'wio_refresh' => 'Actualizar todos los clientes ahora',
+'wio_fqdn_error' => '¡Nombre de dominio completo (FQDN) no válido! No utilice caracteres especiales ni espacios en blanco en el FQDN.',
+'wio_edit' => 'Cambiar ajustes:',
+'wio_dyndns' => 'DynDNS',
+'wio_dyndns_hosts' => 'Nombre(s) DynDNS',
+'wio_dyndns_refresh' => 'Actualización de la IP del host DynDNS',
+'wio_dyndns_on' => 'Host DynDNS habilitado (haga clic para deshabilitar)',
+'wio_dyndns_off' => 'Host DynDNS deshabilitado (haga clic para habilitar)',
+'wio_dyndns_info' => 'IP no registrada, ya que aparentemente no existe conexión en Internet. Con la próxima conexión en Internet se logra una actualización de la IP de los Hosts DynDNS.',
+'wio_no_csv' => 'El archivo no tiene la extensión .csv',
+'wio_no_csv_error' => 'No utilice caracteres especiales ni espacios en blanco en el nombre del archivo.',
+'wio_no_file_selected' => '¡Ningún archivo seleccionado!',
+'wio_import_infos' => 'Importar ajustes:',
+'wio_import_infos_csv' => 'NOTA: Solo los registros de datos marcados con "¿Importar esta configuración?" se considerarán importados! Si se producen registros de datos con direcciones IP o nombres de host dobles, solo se importará el primer registro de datos y los demás registros de datos (con direcciones IP o nombres de host dobles) no se tendrán en cuenta. ',
+'enable disable dyndns' => 'habilitar o deshabilitar el host DynDNS',
+'wio_msg' => 'La condición de los clientes examinados se actualizán...',
+'wio_lanname' => 'Nombre de host de LAN',
+'wio_wanname' => 'Nombre de host WAN',
+'wio_sc_refresh' => 'Actualizar cliente ahora',
+'wio_edit_settings' => 'Añadir cliente:',
+'wio_edit_client' => 'Editar cliente:',
+'wio_graphs' => 'Mostrar gráficos',
+'wio_no_graphs' => 'Gráficos no disponibles',
+'wio_graphs_stat' => 'Diagrama para',
+'wio_vpn_con' => 'IPsec - Conexión(es):',
+'wio_wan_con' => 'WAN - Conexión:',
+'wio_clients' => 'Clientes:',
+'wio click to disable' => 'Activado',
+'wio click to enable' => 'Desactivado',
+'wio_net_scan' => 'Escanear red(es):',
+'wio_net_scan_l' => 'Escanear',
+'wio_net_scan_r' => 'red',
+'wio_net_scan_green' => 'green',
+'wio_net_scan_blue' => 'blue',
+'wio_net_scan_orange' => 'orange',
+'wio_net_scan_red' => 'red',
+'wio_net_scan_run' => 'Comenzar',
+'wio_sort_host' => 'Ordenar nombres de host (FQDN)',
+'wio_sort_ip' => 'Ordenar direcciones IP',
+'wio_logging' => 'Activar registro (/var/log/messages)?',
+'wio_no_image' => 'SIN ESTADO',
+'wio_ovpn_con' => 'OpenVPN - Conexión(es):',
+'wio_connected' => 'Conectado desde',
+'wio_wan_up' => 'CONECTADO',
+'wio_wan_down' => 'NO CONECTADO',
+'wio_n2n' => 'Conexión Net-to-Net',
+'wio_rw' => 'Conexión Host-to-Net',
+'wio_mailremark_enabled' => '¿Agregar comentario del cliente al cuerpo del correo electrónico?',
+'wio_mail_online_on' => 'Correo electrónico en línea habilitado (haga clic para deshabilitar)',
+'wio_mail_online_off' => 'Correo electrónico en línea deshabilitado (haga clic para habilitar)',
+'wio_mail_offline_on' => 'Correo electrónico sin conexión habilitado (haga clic para deshabilitar)',
+'wio_mail_offline_off' => 'Correo electrónico sin conexión deshabilitado (haga clic para habilitar)',
+'wio_mail_online' => 'Habilitar o deshabilitar el correo electrónico con conexión',
+'wio_mail_offline' => 'Habilitar o deshabilitar el correo electrónico sin conexión',
+'wio_sendemail' => 'Enviar correo electrónico',
+'wio_hwaddress' => 'Dirección HW',
+'wio_iface' => 'Interfaz',
+'wio_client_enable' => 'Habilitar Host?',
+'wio_ping_send' => 'Enviar ping a',
+'wio_link_open' => 'Abrir enlace a través de',
+'enable disable client' => 'Habilitar o deshabilitar cliente',
+'wio_client_on' => 'Cliente habilitado (haga clic para deshabilitar)',
+'wio_client_off' => 'Cliente deshabilitado (haga clic para habilitar)',
+'wio_webinterface' => 'ENLACE',
+'wio_webinterface_link' => 'Seguir enlace',
+'wio_ip' => 'Enviar ping a IP habilitado',
+'wio_fqdn' => 'Enviar ping a FQDN habilitado',
+'wio_ip_on' => 'Enviar ping a IP habilitado (haga clic para habilitar FQDN)',
+'wio_fqdn_on' => 'Enviar ping a FQDN habilitado (haga clic para habilitar IP)',
+'wio_client_add' => 'Usar configuración',
+'wio_config' => 'Configurar cliente(s):',
+'wio_settings_msg_hint' => 'Aquí debe establecer algunos valores para iniciar el complemento.',
+'wio_sub' => 'Correo de estado del cliente de WIO',
+'wio timeout' => 'Ping Timeout:',
+'wio sec' => 'Segundo(s)',
+'wio_add' => 'Añadir cliente:',
+'wio_no_add' => 'el cliente está disponible',
+'wio_id' => '#',
+'wio_online' => 'En línea',
+'wio_offline' => 'Desconectado',
+'wio_status' => 'Estado del cliente WIO',
+'wio_mail_style' => 'Enviar correos electrónicos de estado del cliente WIO como',
+'wio_mail_smail' => 'Correos agrupados',
+'wio_mail_email' => 'Correos individuales',
+'wio_mail_ovpnrw' => '¿Habilitar los Correos de Estado de OpenVPN RW e IPsec?',
+'wio_edit_set' => 'Configuración',
+'wio_service' => 'Servicio:',
+'wio_dyndns_success' => 'DynDNS IP identificada y registrada!',
+'wio_remove_all' => 'Eliminar todos los clientes',
+'wio_remove_all_hint' => '¿Estás seguro de eliminar todos los clientes?',
+'wio_remove_client' => 'Eliminar cliente',
+'wio_remove_client_hint' => '¿Estás seguro de eliminar al cliente?',
+'wio_arp_table_entries' => 'Agregar cliente desde Tabla-ARP:',
+'wio_activ' => 'Activo',
+'wio_check' => 'Check',
+'wio_common_name' => 'Subred remota/IP RW',
+'wio_msg_left' => 'Buscando en el',
+'wio_msg_green' => 'green',
+'wio_msg_blue' => 'blue',
+'wio_msg_red' => 'red',
+'wio_msg_orange' => 'orange',
+'wio_msg_center' => 'Interfaz',
+'wio_msg_right' => 'está siendo examinado.',
+'wio_msg_hint' => 'Un momento, por favor...',
+'wio_last_update' => 'Última actualización',
+'wio_disable_hint' => '¡Atención! ¡Restablecerá todas las configuraciones, incluido el cliente que se verificará!',
+'wio_clientremark' => '¿Mostrar comentario?',
+'wio_already_running' => '¡Esta comprobación ya se está ejecutando!',
+'wio_error_function' => 'Esta función no está disponible temporalmente, porque en segundo plano se actualizan los estados del cliente (activo/inactivo).',
+'wio_unknown_lan' => 'DESCONOCIDO',
+'wio_red_lan' => 'RED',
+'wio_search' => 'Búsqueda de hosts activos en la red local...',
+'wio_answer' => 'Respuesta',
+'wio_answer_time' => 'Tiempo de respuesta',
+'wio_scriptruntime' => 'Tiempo de ejecución del script',
+'wio_show_table_off' => 'Ocultar tabla',
+'wio_show_table_on' => 'Mostrar tabla',
+);
author	Peter Müller <peter.mueller@ipfire.org>
	Thu, 10 Feb 2022 17:14:58 +0000 (17:14 +0000)
committer	Peter Müller <peter.mueller@ipfire.org>
	Thu, 10 Feb 2022 17:14:58 +0000 (17:14 +0000)
config/cfgroot/ids-functions.pl		patch \| blob \| blame \| history
config/cfgroot/manualpages		patch \| blob \| blame \| history
config/firewall/firewall-lib.pl		patch \| blob \| blame \| history
config/lua/lua.pc		patch \| blob \| blame \| history
config/rootfiles/common/aarch64/binutils		patch \| blob \| blame \| history
config/rootfiles/common/aarch64/glibc		patch \| blob \| blame \| history
config/rootfiles/common/armv6l/binutils		patch \| blob \| blame \| history
config/rootfiles/common/armv6l/glibc		patch \| blob \| blame \| history
config/rootfiles/common/curl		patch \| blob \| blame \| history
config/rootfiles/common/expat		patch \| blob \| blame \| history
config/rootfiles/common/glib		patch \| blob \| blame \| history
config/rootfiles/common/iproute2		patch \| blob \| blame \| history
config/rootfiles/common/libcap		patch \| blob \| blame \| history
config/rootfiles/common/libgpg-error		patch \| blob \| blame \| history
config/rootfiles/common/libwww-perl		patch \| blob \| blame \| history
config/rootfiles/common/lua		patch \| blob \| blame \| history
config/rootfiles/common/openssl		patch \| blob \| blame \| history
config/rootfiles/common/perl-HTTP-Date	[new file with mode: 0644]	patch \| blob
config/rootfiles/common/perl-HTTP-Message	[new file with mode: 0644]	patch \| blob
config/rootfiles/common/perl-LWP-Protocol-https	[new file with mode: 0644]	patch \| blob
config/rootfiles/common/perl-Net-HTTP	[new file with mode: 0644]	patch \| blob
config/rootfiles/common/perl-Try-Tiny	[new file with mode: 0644]	patch \| blob
config/rootfiles/common/poppler		patch \| blob \| blame \| history
config/rootfiles/common/sudo		patch \| blob \| blame \| history
config/rootfiles/common/x86_64/binutils		patch \| blob \| blame \| history
config/rootfiles/common/x86_64/glibc		patch \| blob \| blame \| history
config/rootfiles/common/zstd		patch \| blob \| blame \| history
config/rootfiles/core/165/core-files	[moved from config/rootfiles/core/164/core-files with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/core/165/exclude	[moved from config/rootfiles/core/164/exclude with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/core/165/filelists/aarch64/binutils	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/aarch64/gcc	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/aarch64/glibc	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/armv6l/binutils	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/armv6l/gcc	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/armv6l/glibc	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/bash	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/curl	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/ethtool	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/expat	[moved from config/rootfiles/core/164/filelists/expat with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/core/165/filelists/files	[new file with mode: 0644]	patch \| blob
config/rootfiles/core/165/filelists/glib	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/iproute2	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/libcap	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/libgpg-error	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/libwww-perl	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/lua	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/mdadm	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/openssl	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/p11-kit	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/perl-HTTP-Date	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/perl-HTTP-Message	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/perl-LWP-Protocol-https	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/perl-Net-HTTP	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/perl-Try-Tiny	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/poppler	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/sqlite	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/sudo	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/x86_64/binutils	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/x86_64/gcc	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/x86_64/glibc	[new symlink]	patch \| blob
config/rootfiles/core/165/filelists/zstd	[moved from config/rootfiles/core/164/filelists/zstd with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/core/165/update.sh	[new file with mode: 0644]	patch \| blob
config/rootfiles/oldcore/164/core-files	[new file with mode: 0644]	patch \| blob
config/rootfiles/oldcore/164/exclude	[new file with mode: 0644]	patch \| blob
config/rootfiles/oldcore/164/filelists/aarch64/linux	[moved from config/rootfiles/core/164/filelists/aarch64/linux with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/aarch64/linux-initrd	[moved from config/rootfiles/core/164/filelists/aarch64/linux-initrd with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/aarch64/u-boot	[moved from config/rootfiles/core/164/filelists/aarch64/u-boot with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/armv6l/linux	[moved from config/rootfiles/core/164/filelists/armv6l/linux with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/armv6l/linux-initrd	[moved from config/rootfiles/core/164/filelists/armv6l/linux-initrd with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/bind	[moved from config/rootfiles/core/164/filelists/bind with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/core-files	[moved from config/rootfiles/core/164/filelists/core-files with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/diffutils	[moved from config/rootfiles/core/164/filelists/diffutils with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/expat	[new symlink]	patch \| blob
config/rootfiles/oldcore/164/filelists/files	[moved from config/rootfiles/core/164/filelists/files with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/freetype	[moved from config/rootfiles/core/164/filelists/freetype with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/gdbm	[moved from config/rootfiles/core/164/filelists/gdbm with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/hdparm	[moved from config/rootfiles/core/164/filelists/hdparm with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/ids-ruleset-sources	[moved from config/rootfiles/core/164/filelists/ids-ruleset-sources with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/jq	[moved from config/rootfiles/core/164/filelists/jq with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/kmod	[moved from config/rootfiles/core/164/filelists/kmod with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/libusb	[moved from config/rootfiles/core/164/filelists/libusb with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/libxml2	[moved from config/rootfiles/core/164/filelists/libxml2 with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/libxslt	[moved from config/rootfiles/core/164/filelists/libxslt with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/libyang	[moved from config/rootfiles/core/164/filelists/libyang with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/lvm2	[moved from config/rootfiles/core/164/filelists/lvm2 with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/oinkmaster	[moved from config/rootfiles/core/164/filelists/oinkmaster with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/pciutils	[moved from config/rootfiles/core/164/filelists/pciutils with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/pcre2	[moved from config/rootfiles/core/164/filelists/pcre2 with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/poppler-data	[moved from config/rootfiles/core/164/filelists/poppler-data with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/shadow	[moved from config/rootfiles/core/164/filelists/shadow with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/squid	[moved from config/rootfiles/core/164/filelists/squid with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/tcl	[moved from config/rootfiles/core/164/filelists/tcl with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/usbutils	[moved from config/rootfiles/core/164/filelists/usbutils with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/x86_64/intel-microcode	[moved from config/rootfiles/core/164/filelists/x86_64/intel-microcode with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/x86_64/linux	[moved from config/rootfiles/core/164/filelists/x86_64/linux with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/x86_64/linux-initrd	[moved from config/rootfiles/core/164/filelists/x86_64/linux-initrd with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/oldcore/164/filelists/zstd	[new symlink]	patch \| blob
config/rootfiles/oldcore/164/update.sh	[moved from config/rootfiles/core/164/update.sh with 100% similarity]	patch \| blob \| blame \| history
config/rootfiles/packages/cups		patch \| blob \| blame \| history
config/rootfiles/packages/libnfsidmap	[deleted file]	patch \| blob \| blame \| history
config/rootfiles/packages/nfs		patch \| blob \| blame \| history
config/rootfiles/packages/sdl2		patch \| blob \| blame \| history
config/rootfiles/packages/wio		patch \| blob \| blame \| history
config/rootfiles/packages/x86_64/samba		patch \| blob \| blame \| history
doc/language_issues.de		patch \| blob \| blame \| history
doc/language_issues.en		patch \| blob \| blame \| history
doc/language_issues.es		patch \| blob \| blame \| history
doc/language_issues.fr		patch \| blob \| blame \| history
doc/language_issues.it		patch \| blob \| blame \| history
doc/language_issues.nl		patch \| blob \| blame \| history
doc/language_issues.pl		patch \| blob \| blame \| history
doc/language_issues.ru		patch \| blob \| blame \| history
doc/language_issues.tr		patch \| blob \| blame \| history
doc/language_missings		patch \| blob \| blame \| history
html/cgi-bin/backup.cgi		patch \| blob \| blame \| history
html/cgi-bin/firewall.cgi		patch \| blob \| blame \| history
html/cgi-bin/media.cgi		patch \| blob \| blame \| history
html/html/themes/ipfire/include/css/style.css		patch \| blob \| blame \| history
langs/de/cgi-bin/de.pl		patch \| blob \| blame \| history
langs/en/cgi-bin/en.pl		patch \| blob \| blame \| history
lfs/Config		patch \| blob \| blame \| history
lfs/bash		patch \| blob \| blame \| history
lfs/binutils		patch \| blob \| blame \| history
lfs/coreutils		patch \| blob \| blame \| history
lfs/cups		patch \| blob \| blame \| history
lfs/curl		patch \| blob \| blame \| history
lfs/ethtool		patch \| blob \| blame \| history
lfs/expat		patch \| blob \| blame \| history
lfs/expect		patch \| blob \| blame \| history
lfs/flash-images		patch \| blob \| blame \| history
lfs/gcc		patch \| blob \| blame \| history
lfs/git		patch \| blob \| blame \| history
lfs/glib		patch \| blob \| blame \| history
lfs/glibc		patch \| blob \| blame \| history
lfs/gzip		patch \| blob \| blame \| history
lfs/hyperscan		patch \| blob \| blame \| history
lfs/iproute2		patch \| blob \| blame \| history
lfs/libcap		patch \| blob \| blame \| history
lfs/libgpg-error		patch \| blob \| blame \| history
lfs/libwww-perl		patch \| blob \| blame \| history
lfs/lua		patch \| blob \| blame \| history
lfs/mdadm		patch \| blob \| blame \| history
lfs/nfs		patch \| blob \| blame \| history
lfs/ntp		patch \| blob \| blame \| history
lfs/openssl		patch \| blob \| blame \| history
lfs/p11-kit		patch \| blob \| blame \| history
lfs/pciutils		patch \| blob \| blame \| history
lfs/perl-HTTP-Date	[moved from lfs/libnfsidmap with 85% similarity]	patch \| blob \| blame \| history
lfs/perl-HTTP-Message	[new file with mode: 0644]	patch \| blob
lfs/perl-LWP-Protocol-https	[new file with mode: 0644]	patch \| blob
lfs/perl-Net-HTTP	[new file with mode: 0644]	patch \| blob
lfs/perl-Try-Tiny	[new file with mode: 0644]	patch \| blob
lfs/poppler		patch \| blob \| blame \| history
lfs/postfix		patch \| blob \| blame \| history
lfs/samba		patch \| blob \| blame \| history
lfs/sdl2		patch \| blob \| blame \| history
lfs/sqlite		patch \| blob \| blame \| history
lfs/strip		patch \| blob \| blame \| history
lfs/sudo		patch \| blob \| blame \| history
lfs/texinfo		patch \| blob \| blame \| history
lfs/wio		patch \| blob \| blame \| history
lfs/zstd		patch \| blob \| blame \| history
make.sh		patch \| blob \| blame \| history
src/pakfire/lib/functions.pl		patch \| blob \| blame \| history
src/patches/bash/bash51-013	[new file with mode: 0644]	patch \| blob
src/patches/bash/bash51-014	[new file with mode: 0644]	patch \| blob
src/patches/bash/bash51-015	[new file with mode: 0644]	patch \| blob
src/patches/bash/bash51-016	[new file with mode: 0644]	patch \| blob
src/patches/glibc-2.33-librt-fix-null-pointer-dereference-bug-28213.patch	[deleted file]	patch \| blob \| blame \| history
src/patches/glibc-2.33-use-__pthread_attr_copy-in-mq_notify-bug-27896.patch	[deleted file]	patch \| blob \| blame \| history
src/patches/ntp-4.2.8p15-build-fix-for-glibc-2.34.patch	[new file with mode: 0644]	patch \| blob
src/patches/postfix-3.6.2-glibc-234-build-fix.patch	[new file with mode: 0644]	patch \| blob
src/patches/texinfo-6.8-undo-gnulib-nonnul.patch	[new file with mode: 0644]	patch \| blob
src/stripper		patch \| blob \| blame \| history
src/wio/lang/wio.es.pl	[new file with mode: 0644]	patch \| blob