From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 5b87687cb1d37d81dbc701706e40f40f2cb16348
Date: Tue, 08 Oct 2019 19:28:35 +0000 [thread overview]
Message-ID: <46nnT02QRKz2yFP@people01.haj.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 254518 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 5b87687cb1d37d81dbc701706e40f40f2cb16348 (commit)
via 59fe973584a36b06944ad6a6e95bc95de4409eda (commit)
via 5848f7288b216d16f3b6b448c621be01660f64f0 (commit)
via 692d6e012bfb24ac37dc0cad5fb53f318bd7deb1 (commit)
via 2513c3bba983b7bac23564eee51752f434430a33 (commit)
via 64243e995b86eb6dd62a2a755c9d7d1441698873 (commit)
via a647499b10b989a42ecbafe56fa8a1d430b137fc (commit)
via 146c8a58ab6d0ba95b975283359ef15b6a6f60da (commit)
via 6c20eff135f7aa15021aae1a7726b54bd5d01f49 (commit)
via a92ede24870df2194158569e3b71b3ef082ce6de (commit)
via d46c0db060944210cdf73fa4e244ba351f3c3e5f (commit)
via 1da658398028af57da5167d0bc158b305d2a8242 (commit)
via 5fe5334daae548907aab65476eeb7b205902d58f (commit)
via d47b2cc28b76ca8273d89a2c821bc5450b861a18 (commit)
via 4dde3dd50f7e2416fa523258a1d25e4d7821e5bf (commit)
via 9875e9f2aec86c56ca3da8f5cb6d42aeffe65c29 (commit)
via ff599b6767f152ed1fe5b53163cae62e181e1762 (commit)
via b64b3c110e9686b4a67a58e13ad1a753d5d8063d (commit)
via f1e1e9072da24ada475c73dd225bc98031a361d1 (commit)
via 70cd5c42f003292bd1ecb9e38018782679dbd01e (commit)
via 974d86532fea2062670c09ae0960e8455c6e8f37 (commit)
via f003a07936b81a9c1da5d9f3351d2a3a37523483 (commit)
via 1ad45a5a09818bbbf5923b90da44284cb81f758c (commit)
via c132fed64d91a95d11020a3305e0a3a27e1b2431 (commit)
via dbf1ae2a10ec4184a48450c5c0cb8f52a2c3b151 (commit)
via 80d5bb76dda19a338bd4635d5e4be0737a1abe8c (commit)
via 563ac9b13ebc00d7ec4eeca117bc9e74b42216f1 (commit)
via 5725768496933fef728161a7159d3bf7adae1792 (commit)
via b9921169b13f219e30f0e3bb6050e226bf277c17 (commit)
via 65c295e923e9d78787ec65545b55485a98169955 (commit)
via a85a7a60fc451a1aec4563e110587b3de976a99c (commit)
via e60dde5f53e12a959232b99870eef55ae65c53da (commit)
via 24f9c830eb2fa3e602a7f3ef8286263a339e1369 (commit)
via 3ec5d6c0628557b2db457771e3cf273db70ef006 (commit)
via 0e081a25f7f19592eecfaf8bf3a7b16ebd6c58da (commit)
via 95180fe563ccaaa5c5d9018623ede57cf090f206 (commit)
via 1df47cc9eec46ac2deaee8a1314555bc08026368 (commit)
via dcf1a61f5b83cc6f845f4eaf3c7de5f031b6fdc6 (commit)
via 686ada315806e3d2731ca98bf9d050582b393471 (commit)
via dbcb1c99d2ac1dabc8783841b18ff0a403e126f0 (commit)
via 71adb8b98fb3c4cc6cf6a929ec358a63f030c56b (commit)
via c9ef22a019b52b89dfe2289b9a087f5290103abf (commit)
via 2fc8d419150ec9e665ac6e1e0bd5dc1bdf762b8c (commit)
via 19addaa5aa4cf66a37336e2b0ca63746dcf42053 (commit)
via 6499bd0d50c69e9230f6063afcef32283ba07554 (commit)
via 5121f35be3b4c5ade223f8509eaddb746ab143e9 (commit)
via 2a0edc08bf4bd5196bea1a4668e0429ee2eeedc9 (commit)
via b21a6319cd89534a7ba45bd327d297d4ee76a90d (commit)
via ae04d0a3110f6d9d9f9ac96312ca7ce130be0ffd (commit)
via a4ec2a4e4f324dcf6d6572b0a3a9cf081f5fa49f (commit)
via 5907bc5d5ecca6a29114a16ff2628caa8d35698b (commit)
via 57354c81878ceb9c0c5e1949aea87ca45b07e99d (commit)
via c0fe5525cea5577c24b643fda4837e7253158873 (commit)
via a4bb11243f0d43b7e95ec0195879aa0dd6a94b9e (commit)
via 6c84c53803c1fcf5710bea867e29b02da8adf5e8 (commit)
via 5551237b1a3f61ffce60aaaaa1a3ff9d42869994 (commit)
via 6bc008fc8f0e7b75602cbc8c294f96d0c462dfea (commit)
via 7a03d4b08a17631ca0fa14bbcfb6562c1187b90b (commit)
via 4e6c66b5258abcb94dae2759130796145b36d1dd (commit)
via deb594c1b63914ae9c977438aaccdea564408a0c (commit)
via 968af91f621d7354ad81976eee3d681983eccd9a (commit)
via db946ccc1c917287fa3a6398f93ece28be289a5b (commit)
from 73659e8cf9a2e1a453d7acb4b981911ba2d1cf6a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5b87687cb1d37d81dbc701706e40f40f2cb16348
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Mon Oct 7 20:44:05 2019 +0200
suricata: Enable rust support
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 59fe973584a36b06944ad6a6e95bc95de4409eda
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Mon Oct 7 20:44:04 2019 +0200
rust: New package.
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 5848f7288b216d16f3b6b448c621be01660f64f0
Author: Erik Kapfer <ummeegge(a)ipfire.org>
Date: Sun Oct 6 09:23:19 2019 +0200
ncat: Update to version 7.80
Several improvements has been added. This update is part of the nmap-7.80 update.
For the complete changelog take a look in here --> https://seclists.org/nmap-announce/2019/0 .
Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 692d6e012bfb24ac37dc0cad5fb53f318bd7deb1
Author: Erik Kapfer <ummeegge(a)ipfire.org>
Date: Sun Oct 6 09:16:57 2019 +0200
nmap: Update to version 7.80
Several improvements, NSE scripts and libraries has been added.
The complete changelog can be found in here --> https://seclists.org/nmap-announce/2019/0 .
Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2513c3bba983b7bac23564eee51752f434430a33
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 19:05:50 2019 +0000
core137: ship libpcap
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 64243e995b86eb6dd62a2a755c9d7d1441698873
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Oct 5 09:37:15 2019 +0200
libpcap: Update to 1.9.1
For details see:
https://www.tcpdump.org/libpcap-changes.txt
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a647499b10b989a42ecbafe56fa8a1d430b137fc
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 19:03:50 2019 +0000
core137: ship unbound
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 146c8a58ab6d0ba95b975283359ef15b6a6f60da
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Oct 5 09:09:29 2019 +0200
unbound: Update to 1.9.4
For details see:
https://nlnetlabs.nl/pipermail/unbound-users/2019-October/011832.html
"This release is a fix for vulnerability CVE-2019-16866 that causes a
failure when a specially crafted query is received."
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 6c20eff135f7aa15021aae1a7726b54bd5d01f49
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Oct 5 09:05:25 2019 +0200
tcpdump: Update to 4.9.3
For details see:
https://www.tcpdump.org/tcpdump-changes.txt
"Fix buffer overflow/overread vulnerabilities:
CVE-2017-16808 (AoE)
CVE-2018-14468 (FrameRelay)
CVE-2018-14469 (IKEv1)
CVE-2018-14470 (BABEL)
CVE-2018-14466 (AFS/RX)
CVE-2018-14461 (LDP)
CVE-2018-14462 (ICMP)
CVE-2018-14465 (RSVP)
CVE-2018-14881 (BGP)
CVE-2018-14464 (LMP)
CVE-2018-14463 (VRRP)
CVE-2018-14467 (BGP)
CVE-2018-10103 (SMB - partially fixed, but SMB printing disabled)
CVE-2018-10105 (SMB - too unreliably reproduced, SMB printing disabled)
CVE-2018-14880 (OSPF6)
CVE-2018-16451 (SMB)
CVE-2018-14882 (RPL)
CVE-2018-16227 (802.11)
CVE-2018-16229 (DCCP)
CVE-2018-16301 (was fixed in libpcap)
CVE-2018-16230 (BGP)
CVE-2018-16452 (SMB)
CVE-2018-16300 (BGP)
CVE-2018-16228 (HNCP)
CVE-2019-15166 (LMP)
CVE-2019-15167 (VRRP)
Fix for cmdline argument/local issues:
CVE-2018-14879 (tcpdump -V)"
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a92ede24870df2194158569e3b71b3ef082ce6de
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Oct 5 08:59:04 2019 +0200
clamav: Update to 0.102.0
For details see:
https://blog.clamav.net/2019/10/clamav-01020-has-been-released.html
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d46c0db060944210cdf73fa4e244ba351f3c3e5f
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Oct 5 08:51:15 2019 +0200
nano: Update to 4.5
For details see:
https://www.nano-editor.org/news.php
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 1da658398028af57da5167d0bc158b305d2a8242
Author: Erik Kapfer <ummeegge(a)ipfire.org>
Date: Fri Oct 4 19:26:26 2019 +0200
tshark: Update to version 3.0.5
The jump from 3.0.2 to 3.0.5 includes several bugfixes, updated protocols and new and updated capture support.
The complete release notes can be found in here --> https://www.wireshark.org/docs/relnotes/ .
Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 5fe5334daae548907aab65476eeb7b205902d58f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 18:56:47 2019 +0000
core137: ship strongwan and vpnmain.cgi
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit d47b2cc28b76ca8273d89a2c821bc5450b861a18
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 2 10:31:54 2019 +0000
IPsec: Add support for Curve448
This is supported since strongswan 5.7.2 and is a good alternative
to Curve25519 because Curve448 is almost equally secure but performs
faster.
https://en.wikipedia.org/wiki/Curve448
This is enabled by default although we do not expect many other
implementations to be able to support this.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 4dde3dd50f7e2416fa523258a1d25e4d7821e5bf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 2 10:31:53 2019 +0000
strongswan: Update 5.8.1
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 9875e9f2aec86c56ca3da8f5cb6d42aeffe65c29
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 2 08:53:50 2019 +0000
speedtest-cli: New package
This is a CLI implementation to test the speed of an internet
connection.
I find this quite useful when there is no access to a client
computer on the network and this will give you a rough idea
about the connection speed.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit ff599b6767f152ed1fe5b53163cae62e181e1762
Author: Stephan Feddersen <sfeddersen(a)ipfire.org>
Date: Tue Oct 1 22:07:39 2019 +0200
WIO:Add fr language
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b64b3c110e9686b4a67a58e13ad1a753d5d8063d
Author: Stephan Feddersen <sfeddersen(a)ipfire.org>
Date: Tue Oct 1 22:01:40 2019 +0200
WIO: Add french translation file
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f1e1e9072da24ada475c73dd225bc98031a361d1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 18:50:04 2019 +0000
core137: ship updated unbound initskript
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 70cd5c42f003292bd1ecb9e38018782679dbd01e
Author: peter.mueller(a)ipfire.org <peter.mueller(a)ipfire.org>
Date: Tue Oct 1 15:22:00 2019 +0000
firewall: always allow outgoing DNS traffic to root servers
Allowing outgoing DNS traffic (destination port 53, both TCP
and UDP) to the root servers is BCP for some reasons. First,
RFC 5011 assumes resolvers are able to fetch new trust ancors
from the root servers for a certain time period in order to
do key rollovers.
Second, Unbound shows some side effects if it cannot do trust
anchor signaling (see RFC 8145) or fetch the current trust anchor,
resulting in SERVFAILs for arbitrary requests a few minutes.
There is little security implication of allowing DNS traffic
to the root servers: An attacker might abuse this for exfiltrating
data via DNS queries, but is unable to infiltrate data unless
he gains control over at least one root server instance. If
there is no firewall ruleset in place which prohibits any other
DNS traffic than to chosen DNS servers, this patch will not
have security implications at all.
The second version of this patch does not use unnecessary xargs-
call nor changes anything else not related to this issue.
Fixes #12183
Cc: Michael Tremer <michael.tremer(a)ipfire.org>
Suggested-by: Horace Michael <horace.michael(a)gmx.com>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Acked-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 974d86532fea2062670c09ae0960e8455c6e8f37
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 1 12:36:16 2019 +0100
unbound: Add option to force using TCP for upstream servers
Some users have problems to reach DNS servers. This change adds an option
which allows to force using TCP for upstream name servers.
This is a good workaround for users behind a broken Fritz!Box in modem
mode which does not allow resolving any records of the root zone.
The name server tests in the script will also only use TCP.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit f003a07936b81a9c1da5d9f3351d2a3a37523483
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Sep 29 15:07:58 2019 +0000
shairport-sync: Update to 3.3.2
This version now requires libdaemon and brings various improvements
for sound quality and stability.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 1ad45a5a09818bbbf5923b90da44284cb81f758c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Sep 29 14:50:31 2019 +0000
sane: Update to 1.0.28
This patch updates the package and removes the sanedloop script
which was needed to launch saned, but that program can now run
in standalone mode.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit c132fed64d91a95d11020a3305e0a3a27e1b2431
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 18:38:52 2019 +0000
core137: ship suricata
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit dbf1ae2a10ec4184a48450c5c0cb8f52a2c3b151
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Sep 27 18:08:49 2019 +0200
suricata: Update to 4.1.5
Changelog:
"4.1.5 -- 2019-09-24
Feature #3068: protocol parser: vxlan (4.1.x)
Bug #2841: False positive alerts firing after upgrade suricata 3.0 -> 4.1.0 (4.1.x)
Bug #2966: filestore (v1 and v2): dropping of "unwanted" files (4.1.x)
Bug #3008: rust: updated libc crate causes depration warnings (4.1.x)
Bug #3044: tftp: missing logs because of broken tx handling (4.1.x)
Bug #3067: GeoIP keyword depends on now discontinued legacy GeoIP database (4.1.x)
Bug #3094: Fedora rawhide af-packet compilation err (4.1.x)
Bug #3123: bypass keyword: Suricata 4.1.x Segmentation Faults (4.1.x)
Bug #3129: Fixes warning about size of integers in string formats (4.1.x)
Bug #3159: SC_ERR_PCAP_DISPATCH with message "error code -2" upon rule reload completion (4.1.x)
Bug #3164: Suricata 4.1.4: NSS Shutdown triggers crashes in test mode
Bug #3168: tls: out of bounds read
Bug #3170: defrag: out of bounds read
Bug #3173: ipv4: ts field decoding oob read
Bug #3175: File_data inspection depth while inspecting base64 decoded data (4.1.x)
Bug #3184: decode/der: crafted input can lead to resource starvation
Bug #3186: Multiple Content-Length headers causes HTP_STREAM_ERROR (4.1.x)
Bug #3187: GET/POST HTTP-request with no Content-Length, http_client_body miss (4.1.x)"
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 80d5bb76dda19a338bd4635d5e4be0737a1abe8c
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Thu Sep 26 19:44:11 2019 +0200
iproute2: Update to 5.3.0
For details see:
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/log/?h=v5.3.0
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 563ac9b13ebc00d7ec4eeca117bc9e74b42216f1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 18:36:24 2019 +0000
core137: ship knot
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 5725768496933fef728161a7159d3bf7adae1792
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Thu Sep 26 19:40:31 2019 +0200
knot: Update to 2.8.4
For details see:
https://www.knot-dns.cz/2019-09-24-version-284.html
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b9921169b13f219e30f0e3bb6050e226bf277c17
Author: peter.mueller(a)ipfire.org <peter.mueller(a)ipfire.org>
Date: Wed Sep 25 19:05:00 2019 +0000
mtr: update to 0.93
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 65c295e923e9d78787ec65545b55485a98169955
Author: peter.mueller(a)ipfire.org <peter.mueller(a)ipfire.org>
Date: Wed Sep 25 15:15:00 2019 +0000
Tor: update to 0.4.1.6
Please refer to https://blog.torproject.org/new-release-tor-0416 for
release notes. This patch has to be applied after applying 9fb607ef6
(https://patchwork.ipfire.org/patch/2407/), which was not merged at
the time of writing.
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a85a7a60fc451a1aec4563e110587b3de976a99c
Author: peter.mueller(a)ipfire.org <peter.mueller(a)ipfire.org>
Date: Wed Sep 25 15:06:00 2019 +0000
firewall: raise log rate limit for user generated rules, too
Having raised the overall log rate limit to 10 packet per second
in Core Update 136, this did not affected rules generated by the
user. In order to stay consistent, this patch also raises log rate
limit for these.
In order to avoid side effects on firewalls with slow disks, it
was probably better touch these categories separately, so testing
users won't be DoSsed instantly. :-)
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit e60dde5f53e12a959232b99870eef55ae65c53da
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 18:26:22 2019 +0000
core137: ship Net_SSLeay
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 24f9c830eb2fa3e602a7f3ef8286263a339e1369
Author: Erik Kapfer <ummeegge(a)ipfire.org>
Date: Wed Sep 25 12:05:52 2019 +0200
Net-SSLeay: Update to version 1.88
Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 3ec5d6c0628557b2db457771e3cf273db70ef006
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Tue Sep 24 19:24:44 2019 +0200
nano: Update to 4.4
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 0e081a25f7f19592eecfaf8bf3a7b16ebd6c58da
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 18:21:17 2019 +0000
core137: ship libssh
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 95180fe563ccaaa5c5d9018623ede57cf090f206
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Sep 23 15:01:47 2019 +0000
bird: Update to 2.0.6
Minor update which will enable support for RPKI because libssh is
now present.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 1df47cc9eec46ac2deaee8a1314555bc08026368
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Sep 23 15:01:46 2019 +0000
libssh: New package
This is required by Bird to support RPKI.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit dcf1a61f5b83cc6f845f4eaf3c7de5f031b6fdc6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 18:17:44 2019 +0000
core137: ship updated logrotate.conf
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 686ada315806e3d2731ca98bf9d050582b393471
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Sep 22 09:02:48 2019 +0200
Added Mail log file to '/etc/logrotate.conf'
Fixes Bug #12155: logrotate wasn't set up to rotate this file.
For details see:
https://bugzilla.ipfire.org/show_bug.cgi?id=12155
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Acked-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit dbcb1c99d2ac1dabc8783841b18ff0a403e126f0
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 18:14:43 2019 +0000
core137: ship tzdata
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 71adb8b98fb3c4cc6cf6a929ec358a63f030c56b
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Sep 22 08:49:48 2019 +0200
tzcode / tzdata: Update to 2019c
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit c9ef22a019b52b89dfe2289b9a087f5290103abf
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 18:10:23 2019 +0000
core137: ship wpa_supplicant
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2fc8d419150ec9e665ac6e1e0bd5dc1bdf762b8c
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Sep 20 20:51:36 2019 +0200
hostapd: Update to 2.9
For details see:
https://w1.fi/cgit/hostap/plain/hostapd/ChangeLog
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 19addaa5aa4cf66a37336e2b0ca63746dcf42053
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Sep 20 20:51:35 2019 +0200
wpa_supplicant: Update to 2.9
For details see:
https://w1.fi/cgit/hostap/plain/wpa_supplicant/ChangeLog
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 6499bd0d50c69e9230f6063afcef32283ba07554
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 18:08:04 2019 +0000
core137: ship bind
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 5121f35be3b4c5ade223f8509eaddb746ab143e9
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Fri Sep 20 20:43:19 2019 +0200
bind: Update to 9.11.11
For details see:
https://downloads.isc.org/isc/bind9/9.11.11/RELEASE-NOTES-bind-9.11.11.html
"Security Fixes
A race condition could trigger an assertion failure when a large
number of incoming packets were being rejected. This flaw is disclosed
in CVE-2019-6471. [GL #942]
...
Bug Fixes
Glue address records were not being returned in responses to root priming
queries; this has been corrected. [GL #1092]
Interaction between DNS64 and RPZ No Data rule (CNAME *.) could cause
unexpected results; this has been fixed. [GL #1106]
named-checkconf now checks DNS64 prefixes to ensure bits 64-71 are zero.
[GL #1159]
named-checkconf could crash during configuration if configured to use "geoip
continent" ACLs with legacy GeoIP. [GL #1163]
named-checkconf now correctly reports missing dnstap-output option when dnstap
is set. [GL #1136]
Handle ETIMEDOUT error on connect() with a non-blocking socket. [GL #1133]"
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 2a0edc08bf4bd5196bea1a4668e0429ee2eeedc9
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 18:06:13 2019 +0000
core137: ship changed ovpnmain.cgi
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit b21a6319cd89534a7ba45bd327d297d4ee76a90d
Author: Erik Kapfer <ummeegge(a)ipfire.org>
Date: Wed Sep 18 07:03:34 2019 +0200
ovpn: Add ta.key check to main settings
Since Core 132 the 'TLS Channel Protection' is part of the global settings,
the ta.key generation check should also be in the main section otherwise it
won´t be created if not present.
Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit ae04d0a3110f6d9d9f9ac96312ca7ce130be0ffd
Author: Erik Kapfer <ummeegge(a)ipfire.org>
Date: Wed Sep 18 07:03:33 2019 +0200
ovpn: Generate ta.key before dh-parameter
Fixes: #11964 and #12157
If slow boards or/and boards with low entropy needs too long to generate the DH-parameter, ovpnmain.cgi can get into a
"Script timed out before returning headers" and no further OpenSSl commands will be executed after dhparam is finished.
Since the ta.key are created after the DH-parameter, it won´t be produced in that case.
To prevent this, the DH-parameter will now be generated at the end.
Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a4ec2a4e4f324dcf6d6572b0a3a9cf081f5fa49f
Author: peter.mueller(a)ipfire.org <peter.mueller(a)ipfire.org>
Date: Tue Sep 17 17:25:00 2019 +0000
Tor: update to 0.4.1.5
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 5907bc5d5ecca6a29114a16ff2628caa8d35698b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 18:02:23 2019 +0000
core137: add pcre
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 57354c81878ceb9c0c5e1949aea87ca45b07e99d
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sun Sep 15 18:23:21 2019 +0200
pcre: Update to 8.43
For details see:
http://www.pcre.org/original/changelog.txt
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit c0fe5525cea5577c24b643fda4837e7253158873
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 17:59:39 2019 +0000
core137: add dhcpcd
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit a4bb11243f0d43b7e95ec0195879aa0dd6a94b9e
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Sat Sep 14 18:02:33 2019 +0200
dhcpcd: Update to 8.0.6
For details see:
https://roy.marples.name/blog/dhcpcd-8-0-6-released
"inet6: Fix default route not being installed
DHCP: If root fs is network mounted, enable last lease extend
man: Fix lint errors.
BSD: avoid RTF_WASCLONED routes
DHCP: Give a better message when packet validation fails
DHCP: Ensure we have enough data to checksum IP and UDP
The last change fixes a potential DoS attack introduced in dhcpcd-8.0.3
when the checksuming code was changed to accomodate variable length
IP headers. The commit says since 7.2.0, but I've now decided that's not
the case."
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 6c84c53803c1fcf5710bea867e29b02da8adf5e8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 17:57:32 2019 +0000
core137: add iproute2
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 5551237b1a3f61ffce60aaaaa1a3ff9d42869994
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Wed Sep 11 18:07:47 2019 +0200
iproute2: Update to 5.2.0
For details see:
https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/log/
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 6bc008fc8f0e7b75602cbc8c294f96d0c462dfea
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 17:53:36 2019 +0000
core137: add iptables and collectd
collectd is linked to libip4tc so we need to ship this also
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 7a03d4b08a17631ca0fa14bbcfb6562c1187b90b
Author: Matthias Fischer <matthias.fischer(a)ipfire.org>
Date: Wed Sep 11 18:03:27 2019 +0200
iptables: Update to 1.8.3
For details see:
https://www.netfilter.org/projects/iptables/files/changes-iptables-1.8.3.txt
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 4e6c66b5258abcb94dae2759130796145b36d1dd
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 17:49:09 2019 +0000
core137: add libnetfilter_queue
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit deb594c1b63914ae9c977438aaccdea564408a0c
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Sun Sep 8 19:38:49 2019 +0200
libnetfilter_queue: Update to 1.0.4
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit 968af91f621d7354ad81976eee3d681983eccd9a
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 8 17:46:29 2019 +0000
core137: add libhtp
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
commit db946ccc1c917287fa3a6398f93ece28be289a5b
Author: Stefan Schantl <stefan.schantl(a)ipfire.org>
Date: Fri Sep 6 14:52:51 2019 +0200
libhtp: Update to 0.5.30
Fixes #12170
Signed-off-by: Stefan Schantl <stefan.schantl(a)ipfire.org>
Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
Reviewed-by: Peter Müller <peter.mueller(a)ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/etc/logrotate.conf | 2 +-
config/firewall/firewall-policy | 16 +-
config/firewall/rules.pl | 6 +-
config/rootfiles/common/Net_SSLeay | 1 -
config/rootfiles/common/aarch64/rust | 239 ++++++++
config/rootfiles/common/aarch64/stage2 | 1 -
config/rootfiles/common/armv5tel/rust | 239 ++++++++
config/rootfiles/common/bind | 4 +-
config/rootfiles/common/i586/rust | 239 ++++++++
config/rootfiles/common/iproute2 | 13 +-
config/rootfiles/common/iptables | 10 +-
config/rootfiles/common/libnetfilter_queue | 2 +-
config/rootfiles/common/libpcap | 11 +-
config/rootfiles/common/libssh | 15 +
config/rootfiles/common/pcre | 138 ++---
config/rootfiles/common/stage2 | 1 -
config/rootfiles/common/suricata | 2 +
config/rootfiles/common/unbound | 2 +-
config/rootfiles/common/x86_64/rust | 239 ++++++++
config/rootfiles/common/x86_64/stage2 | 1 -
.../{oldcore/120 => core/137}/filelists/Net_SSLeay | 0
.../{oldcore/100 => core/137}/filelists/bind | 0
.../{oldcore/125 => core/137}/filelists/collectd | 0
.../{oldcore/125 => core/137}/filelists/dhcpcd | 0
config/rootfiles/core/137/filelists/files | 7 +
.../{oldcore/106 => core/137}/filelists/iproute2 | 0
.../{oldcore/123 => core/137}/filelists/iptables | 0
.../{oldcore/128 => core/137}/filelists/knot | 0
.../{oldcore/131 => core/137}/filelists/libhtp | 0
.../92 => core/137}/filelists/libnetfilter_queue | 0
.../{oldcore/109 => core/137}/filelists/libpcap | 0
config/rootfiles/core/137/filelists/libssh | 1 +
.../{oldcore/101 => core/137}/filelists/pcre | 0
.../{oldcore/106 => core/137}/filelists/strongswan | 0
.../{oldcore/131 => core/137}/filelists/suricata | 0
.../{oldcore/100 => core/137}/filelists/tzdata | 0
.../{oldcore/106 => core/137}/filelists/unbound | 0
.../103 => core/137}/filelists/wpa_supplicant | 0
config/rootfiles/packages/aarch64/sane | 630 ---------------------
config/rootfiles/packages/clamav | 13 +-
config/rootfiles/packages/nmap | 20 +-
config/rootfiles/packages/sane | 387 +++++++------
config/rootfiles/packages/tshark | 6 +-
config/rootfiles/packages/wio | 1 +
html/cgi-bin/ovpnmain.cgi | 36 +-
html/cgi-bin/vpnmain.cgi | 16 +-
lfs/Net_SSLeay | 6 +-
lfs/bind | 4 +-
lfs/bird | 6 +-
lfs/clamav | 7 +-
lfs/dhcpcd | 4 +-
lfs/hostapd | 10 +-
lfs/iproute2 | 6 +-
lfs/iptables | 4 +-
lfs/knot | 4 +-
lfs/libhtp | 4 +-
lfs/libnetfilter_queue | 4 +-
lfs/libpcap | 6 +-
lfs/{glib => libssh} | 16 +-
lfs/mtr | 9 +-
lfs/nano | 8 +-
lfs/ncat | 18 +-
lfs/nmap | 8 +-
lfs/pcre | 6 +-
lfs/{tcl => rust} | 38 +-
lfs/sane | 14 +-
lfs/shairport-sync | 9 +-
lfs/{python-m2crypto => speedtest-cli} | 16 +-
lfs/strongswan | 4 +-
lfs/suricata | 10 +-
lfs/tcpdump | 8 +-
lfs/tor | 6 +-
lfs/tshark | 6 +-
lfs/tzdata | 6 +-
lfs/unbound | 4 +-
lfs/wio | 3 +-
lfs/wpa_supplicant | 4 +-
make.sh | 3 +
src/initscripts/packages/sane | 10 +-
src/initscripts/system/firewall | 12 +
src/initscripts/system/unbound | 40 +-
...h => hostapd-2.9-increase_EAPOL-timeouts.patch} | 4 +-
...d-2.8-noscan.patch => hostapd-2.9-noscan.patch} | 20 +-
src/wio/lang/wio.fr.pl | 158 ++++++
84 files changed, 1712 insertions(+), 1091 deletions(-)
create mode 100644 config/rootfiles/common/aarch64/rust
create mode 100644 config/rootfiles/common/armv5tel/rust
create mode 100644 config/rootfiles/common/i586/rust
create mode 100644 config/rootfiles/common/libssh
create mode 100644 config/rootfiles/common/x86_64/rust
copy config/rootfiles/{oldcore/120 => core/137}/filelists/Net_SSLeay (100%)
copy config/rootfiles/{oldcore/100 => core/137}/filelists/bind (100%)
copy config/rootfiles/{oldcore/125 => core/137}/filelists/collectd (100%)
copy config/rootfiles/{oldcore/125 => core/137}/filelists/dhcpcd (100%)
copy config/rootfiles/{oldcore/106 => core/137}/filelists/iproute2 (100%)
copy config/rootfiles/{oldcore/123 => core/137}/filelists/iptables (100%)
copy config/rootfiles/{oldcore/128 => core/137}/filelists/knot (100%)
copy config/rootfiles/{oldcore/131 => core/137}/filelists/libhtp (100%)
copy config/rootfiles/{oldcore/92 => core/137}/filelists/libnetfilter_queue (100%)
copy config/rootfiles/{oldcore/109 => core/137}/filelists/libpcap (100%)
create mode 120000 config/rootfiles/core/137/filelists/libssh
copy config/rootfiles/{oldcore/101 => core/137}/filelists/pcre (100%)
copy config/rootfiles/{oldcore/106 => core/137}/filelists/strongswan (100%)
copy config/rootfiles/{oldcore/131 => core/137}/filelists/suricata (100%)
copy config/rootfiles/{oldcore/100 => core/137}/filelists/tzdata (100%)
copy config/rootfiles/{oldcore/106 => core/137}/filelists/unbound (100%)
copy config/rootfiles/{oldcore/103 => core/137}/filelists/wpa_supplicant (100%)
delete mode 100644 config/rootfiles/packages/aarch64/sane
copy lfs/{glib => libssh} (91%)
copy lfs/{tcl => rust} (84%)
copy lfs/{python-m2crypto => speedtest-cli} (94%)
rename src/patches/hostapd/{hostapd-2.8-increase_EAPOL-timeouts.patch => hostapd-2.9-increase_EAPOL-timeouts.patch} (86%)
rename src/patches/hostapd/{hostapd-2.8-noscan.patch => hostapd-2.9-noscan.patch} (77%)
create mode 100644 src/wio/lang/wio.fr.pl
Difference in files:
diff --git a/config/etc/logrotate.conf b/config/etc/logrotate.conf
index f15ee92c3..0b6b48573 100644
--- a/config/etc/logrotate.conf
+++ b/config/etc/logrotate.conf
@@ -68,7 +68,7 @@ include /etc/logrotate.d
endscript
}
-/var/log/messages /var/log/bootlog /var/log/dhcpcd.log {
+/var/log/messages /var/log/bootlog /var/log/dhcpcd.log /var/log/mail {
create 664 root syslogd
sharedscripts
ifempty
diff --git a/config/firewall/firewall-policy b/config/firewall/firewall-policy
index 078c3c515..21165e933 100755
--- a/config/firewall/firewall-policy
+++ b/config/firewall/firewall-policy
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)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 #
@@ -100,13 +100,13 @@ esac
case "${FWPOLICY2}" in
REJECT)
if [ "${DROPINPUT}" = "on" ]; then
- iptables -A POLICYIN -m limit --limit 10/minute -j LOG --log-prefix "REJECT_INPUT "
+ iptables -A POLICYIN -m limit --limit 10/second -j LOG --log-prefix "REJECT_INPUT "
fi
iptables -A POLICYIN -j REJECT --reject-with icmp-host-unreachable -m comment --comment "DROP_INPUT"
;;
*) # DROP
if [ "${DROPINPUT}" = "on" ]; then
- iptables -A POLICYIN -m limit --limit 10/minute -j LOG --log-prefix "DROP_INPUT "
+ iptables -A POLICYIN -m limit --limit 10/second -j LOG --log-prefix "DROP_INPUT "
fi
iptables -A POLICYIN -j DROP -m comment --comment "DROP_INPUT"
;;
@@ -118,13 +118,13 @@ case "${POLICY}" in
case "${FWPOLICY}" in
REJECT)
if [ "${DROPFORWARD}" = "on" ]; then
- iptables -A POLICYFWD -m limit --limit 10/minute -j LOG --log-prefix "REJECT_FORWARD "
+ iptables -A POLICYFWD -m limit --limit 10/second -j LOG --log-prefix "REJECT_FORWARD "
fi
iptables -A POLICYFWD -j REJECT --reject-with icmp-host-unreachable -m comment --comment "DROP_FORWARD"
;;
*) # DROP
if [ "${DROPFORWARD}" = "on" ]; then
- iptables -A POLICYFWD -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD "
+ iptables -A POLICYFWD -m limit --limit 10/second -j LOG --log-prefix "DROP_FORWARD "
fi
iptables -A POLICYFWD -j DROP -m comment --comment "DROP_FORWARD"
;;
@@ -160,7 +160,7 @@ case "${POLICY}" in
fi
if [ "${DROPFORWARD}" = "on" ]; then
- iptables -A POLICYFWD -m limit --limit 10/minute -j LOG --log-prefix "DROP_FORWARD "
+ iptables -A POLICYFWD -m limit --limit 10/second -j LOG --log-prefix "DROP_FORWARD "
fi
iptables -A POLICYFWD -m comment --comment "DROP_FORWARD" -j DROP
;;
@@ -172,13 +172,13 @@ case "${POLICY1}" in
case "${FWPOLICY1}" in
REJECT)
if [ "${DROPOUTGOING}" = "on" ]; then
- iptables -A POLICYOUT -m limit --limit 10/minute -j LOG --log-prefix "REJECT_OUTPUT "
+ iptables -A POLICYOUT -m limit --limit 10/second -j LOG --log-prefix "REJECT_OUTPUT "
fi
iptables -A POLICYOUT -j REJECT --reject-with icmp-host-unreachable -m comment --comment "DROP_OUTPUT"
;;
*) # DROP
if [ "${DROPOUTGOING}" == "on" ]; then
- iptables -A POLICYOUT -m limit --limit 10/minute -j LOG --log-prefix "DROP_OUTPUT "
+ iptables -A POLICYOUT -m limit --limit 10/second -j LOG --log-prefix "DROP_OUTPUT "
fi
iptables -A POLICYOUT -j DROP -m comment --comment "DROP_OUTPUT"
;;
diff --git a/config/firewall/rules.pl b/config/firewall/rules.pl
index 78e3e1e91..86db47367 100644
--- a/config/firewall/rules.pl
+++ b/config/firewall/rules.pl
@@ -2,7 +2,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2013 Alexander Marx <amarx(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)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 #
@@ -804,8 +804,8 @@ sub make_log_limit_options {
# Maybe we should get this from the configuration.
my $limit = 10;
- # We limit log messages to $limit messages per minute.
- push(@options, ("--limit", "$limit/min"));
+ # We limit log messages to $limit messages per second.
+ push(@options, ("--limit", "$limit/second"));
# And we allow bursts of 2x $limit.
push(@options, ("--limit-burst", $limit * 2));
diff --git a/config/rootfiles/common/Net_SSLeay b/config/rootfiles/common/Net_SSLeay
index 4f14b74a7..bba719b03 100644
--- a/config/rootfiles/common/Net_SSLeay
+++ b/config/rootfiles/common/Net_SSLeay
@@ -4,7 +4,6 @@ usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Net/SSLeay.pm
usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/Net/SSLeay/Handle.pm
#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Net/SSLeay
#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Net/SSLeay/.packlist
-#usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Net/SSLeay/SSLeay.bs
usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Net/SSLeay/SSLeay.so
usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Net/SSLeay/autosplit.ix
usr/lib/perl5/site_perl/5.30.0/MACHINE-linux-thread-multi/auto/Net/SSLeay/debug_read.al
diff --git a/config/rootfiles/common/aarch64/rust b/config/rootfiles/common/aarch64/rust
new file mode 100644
index 000000000..176dbe98a
--- /dev/null
+++ b/config/rootfiles/common/aarch64/rust
@@ -0,0 +1,239 @@
+#usr/bin/cargo
+#usr/bin/rust-gdb
+#usr/bin/rust-gdbgui
+#usr/bin/rust-lldb
+#usr/bin/rustc
+#usr/bin/rustdoc
+#usr/etc
+#usr/etc/bash_completion.d
+#usr/etc/bash_completion.d/cargo
+#usr/lib/libLLVM-8-rust-1.37.0-stable.so
+#usr/lib/libarena-ceb2b0be1df82a34.so
+#usr/lib/libfmt_macros-b20970680435d874.so
+#usr/lib/libgraphviz-6134aa2fb7fc0ede.so
+#usr/lib/librustc-3ccb3dbb4a17b1c0.so
+#usr/lib/librustc_allocator-b2da80152b9c838b.so
+#usr/lib/librustc_borrowck-164479080cc8772d.so
+#usr/lib/librustc_codegen_ssa-36e16c2ebd557c5b.so
+#usr/lib/librustc_codegen_utils-a48bae0acacb485e.so
+#usr/lib/librustc_cratesio_shim-d6da3f9ed42f6b5f.so
+#usr/lib/librustc_data_structures-4f5460ff3467bd33.so
+#usr/lib/librustc_driver-1aa233c0fa499347.so
+#usr/lib/librustc_errors-4cd8925058f708b9.so
+#usr/lib/librustc_fs_util-cdf2d4af48a4d8b8.so
+#usr/lib/librustc_incremental-567a4fdbe33af894.so
+#usr/lib/librustc_interface-7691d2a4317831ca.so
+#usr/lib/librustc_lint-ddac0777c9ced2bb.so
+#usr/lib/librustc_macros-f2b013228a70c40f.so
+#usr/lib/librustc_metadata-f289cf194b04b3f9.so
+#usr/lib/librustc_mir-1828c73bde69e33b.so
+#usr/lib/librustc_passes-e0682f28cae48983.so
+#usr/lib/librustc_plugin-6bec8276dde0b5f4.so
+#usr/lib/librustc_privacy-5f93627d6eafe450.so
+#usr/lib/librustc_resolve-2b19d14c3867bf72.so
+#usr/lib/librustc_save_analysis-7c9416ee095cfab0.so
+#usr/lib/librustc_target-0fd4749864b3ce5a.so
+#usr/lib/librustc_traits-051352dbf7a1f21e.so
+#usr/lib/librustc_typeck-732835e10652d8da.so
+#usr/lib/libserialize-8fcbeb7fff90d36a.so
+#usr/lib/libstd-4a76ff35a356aedf.so
+#usr/lib/libsyntax-0268718cca0c4bfe.so
+#usr/lib/libsyntax_ext-d7fa76f0184472a6.so
+#usr/lib/libsyntax_pos-0380da211eff5e9a.so
+#usr/lib/libterm-2651f8b4eed9e86e.so
+#usr/lib/libtest-0127509d2e54a846.so
+#usr/lib/rustlib
+#usr/lib/rustlib/components
+#usr/lib/rustlib/etc
+#usr/lib/rustlib/etc/debugger_pretty_printers_common.py
+#usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py
+#usr/lib/rustlib/etc/gdb_rust_pretty_printing.py
+#usr/lib/rustlib/etc/lldb_rust_formatters.py
+#usr/lib/rustlib/install.log
+#usr/lib/rustlib/manifest-cargo
+#usr/lib/rustlib/manifest-rust-std-aarch64-unknown-linux-gnu
+#usr/lib/rustlib/manifest-rustc
+#usr/lib/rustlib/rust-installer-version
+#usr/lib/rustlib/uninstall.sh
+#usr/lib/rustlib/aarch64-unknown-linux-gnu
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/bin
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/bin/rust-lld
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/codegen-backends
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-emscripten.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libLLVM-8-rust-1.37.0-stable.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liballoc-580035dd98451925.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libannotate_snippets-25e8d8701c03547d.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libarena-ceb2b0be1df82a34.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libarrayvec-f106db365d780985.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libatty-740be20e4d7441ff.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libbacktrace-13217ede3d276f16.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libbacktrace-9af89337886e6db6.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libbacktrace_sys-621a9ee22da6caa1.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libbacktrace_sys-fba99e00c4e61492.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libbitflags-4a7d2efbf7a358d0.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libbyteorder-5ff68006fd3fb999.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcc-ce0590f9ba246196.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcfg_if-be7979c57a08057b.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcfg_if-cddc487ade7daaa5.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libchalk_engine-69df11cdcd6bae99.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libchalk_macros-2bf52732ae8243bc.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcompiler_builtins-9fc4b5be2ba5cc19.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcore-8a55a4098920125a.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcrc32fast-fc7bcda202f0f3f7.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcrossbeam_deque-b4b71504b68d8f8b.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcrossbeam_epoch-c664f1a3b4666115.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libcrossbeam_utils-63c4319e4aba6512.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libdatafrog-bb049e83d8396896.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libeither-d1a988cc36833269.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libena-baa918d535227ba6.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libenv_logger-ff2b1a6f19a13aac.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libflate2-1c2be25b633e6a65.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libfmt_macros-b20970680435d874.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libgetopts-c729851ce6e3efb2.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libgraphviz-6134aa2fb7fc0ede.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libhashbrown-be9569e4d599746f.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libhumantime-6e5514835e11fb0b.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libindexmap-7f10e194770d6bf3.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libitoa-438f269905bbaa51.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libjemalloc_sys-c8524fc37cd0fe80.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libjobserver-2c75db35ce15b29a.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liblazy_static-0de2b1545b6973a2.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liblazy_static-21ff09e0ead00dc9.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liblibc-2299a069d4067a08.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liblibc-d6459c4f0817c67c.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liblock_api-c79d1a6ea5dc7713.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liblog-18ad11d6dda4e80d.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/liblog_settings-ae8859ad47668e7f.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libmeasureme-327bb21dd04749e8.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libmemmap-954e0d1f2b0db71b.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libmemoffset-62475d073708b865.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libminiz_sys-d07d12e134a38412.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libnodrop-b315aca0ebc7a5b8.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libnum_cpus-f6407c37ef29b71f.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libowning_ref-a0b3d9e1cdab8c89.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libpanic_abort-a956b3d01e3c9a0e.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libpanic_unwind-e11c7b3b3225afe2.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libparking_lot-4b068d99c9e6fdb6.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libparking_lot_core-8c73184e7c1493fe.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libpolonius_engine-e22625b0bbda797a.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libproc_macro-4a29a6c5fe75a875.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libprofiler_builtins-b36e7b6c2d3e00eb.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libpunycode-8955eba3c43f8f2e.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libquick_error-acc678b011452377.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librand-ebc7d1f1ad312180.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librand_chacha-47ba3ac92cc46b2c.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librand_core-c1f44f472e6d23be.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librand_hc-b3cc93a39a881b5b.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librand_isaac-63fbbbd089438d27.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librand_pcg-f16fbddc311ab68e.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librand_xorshift-8cd3bbc8a0d1fb89.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libremove_dir_all-898894399d3dfed9.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librls_data-4a7aa063287c45da.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librls_span-dd90aac9099b76b5.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc-3ccb3dbb4a17b1c0.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_allocator-b2da80152b9c838b.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_apfloat-f178776c0914cec5.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_asan-5a773b1fffe6c751.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_borrowck-164479080cc8772d.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_codegen_ssa-36e16c2ebd557c5b.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_codegen_utils-a48bae0acacb485e.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_cratesio_shim-d6da3f9ed42f6b5f.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_data_structures-4f5460ff3467bd33.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_demangle-546c844e8071bbeb.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_demangle-c571e3698361b498.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_driver-1aa233c0fa499347.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_errors-4cd8925058f708b9.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_fs_util-cdf2d4af48a4d8b8.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_hash-dab039160d1ae7fc.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_incremental-567a4fdbe33af894.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_interface-7691d2a4317831ca.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_lint-ddac0777c9ced2bb.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_lsan-bcfe6f943bf3a3db.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_macros-f2b013228a70c40f.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_metadata-f289cf194b04b3f9.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_mir-1828c73bde69e33b.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_msan-ffd3999f1149534e.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_passes-e0682f28cae48983.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_plugin-6bec8276dde0b5f4.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_privacy-5f93627d6eafe450.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_rayon-45df15d01be9166e.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_rayon_core-bc509e7526aad29c.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_resolve-2b19d14c3867bf72.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_save_analysis-7c9416ee095cfab0.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-47d8845cef2a3bc5.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_std_workspace_core-aee5c24fff305dea.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_target-0fd4749864b3ce5a.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_traits-051352dbf7a1f21e.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_tsan-5af25b139995eaa9.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/librustc_typeck-732835e10652d8da.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libryu-919d5311c0fa1780.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libscoped_tls-583a4be451031471.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libscopeguard-b33d2d758306f178.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libserde-2882d0235471e138.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libserde_json-fb3419596e2872d5.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libserialize-8fcbeb7fff90d36a.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libserialize-8fcbeb7fff90d36a.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libsmallvec-a7473e0177aca21a.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstable_deref_trait-95edcbcd95f82564.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd-4a76ff35a356aedf.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libstd-4a76ff35a356aedf.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libsyntax-0268718cca0c4bfe.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libsyntax_ext-d7fa76f0184472a6.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libsyntax_pos-0380da211eff5e9a.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libtempfile-03867c2a718d0e3a.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libterm-2651f8b4eed9e86e.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libterm-2651f8b4eed9e86e.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libtermcolor-a7c37dbe6cc8c9b2.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libtest-0127509d2e54a846.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libtest-0127509d2e54a846.so
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libunicode_width-2c3a64b369c398a7.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libunicode_width-e8235f0d435d4737.rlib
+#usr/lib/rustlib/aarch64-unknown-linux-gnu/lib/libunwind-017511bce73a530c.rlib
+#usr/share/doc/cargo
+#usr/share/doc/cargo/LICENSE-APACHE
+#usr/share/doc/cargo/LICENSE-MIT
+#usr/share/doc/cargo/LICENSE-THIRD-PARTY
+#usr/share/doc/cargo/README.md
+#usr/share/doc/rust
+#usr/share/doc/rust/COPYRIGHT
+#usr/share/doc/rust/LICENSE-APACHE
+#usr/share/doc/rust/LICENSE-MIT
+#usr/share/doc/rust/README.md
+#usr/share/man/man1/cargo-bench.1
+#usr/share/man/man1/cargo-build.1
+#usr/share/man/man1/cargo-check.1
+#usr/share/man/man1/cargo-clean.1
+#usr/share/man/man1/cargo-doc.1
+#usr/share/man/man1/cargo-fetch.1
+#usr/share/man/man1/cargo-fix.1
+#usr/share/man/man1/cargo-generate-lockfile.1
+#usr/share/man/man1/cargo-help.1
+#usr/share/man/man1/cargo-init.1
+#usr/share/man/man1/cargo-install.1
+#usr/share/man/man1/cargo-locate-project.1
+#usr/share/man/man1/cargo-login.1
+#usr/share/man/man1/cargo-metadata.1
+#usr/share/man/man1/cargo-new.1
+#usr/share/man/man1/cargo-owner.1
+#usr/share/man/man1/cargo-package.1
+#usr/share/man/man1/cargo-pkgid.1
+#usr/share/man/man1/cargo-publish.1
+#usr/share/man/man1/cargo-run.1
+#usr/share/man/man1/cargo-rustc.1
+#usr/share/man/man1/cargo-rustdoc.1
+#usr/share/man/man1/cargo-search.1
+#usr/share/man/man1/cargo-test.1
+#usr/share/man/man1/cargo-uninstall.1
+#usr/share/man/man1/cargo-update.1
+#usr/share/man/man1/cargo-vendor.1
+#usr/share/man/man1/cargo-verify-project.1
+#usr/share/man/man1/cargo-version.1
+#usr/share/man/man1/cargo-yank.1
+#usr/share/man/man1/cargo.1
+#usr/share/man/man1/rustc.1
+#usr/share/man/man1/rustdoc.1
+#usr/share/zsh
+#usr/share/zsh/site-functions
+#usr/share/zsh/site-functions/_cargo
diff --git a/config/rootfiles/common/aarch64/stage2 b/config/rootfiles/common/aarch64/stage2
index 207448d5d..366ab2bb0 100644
--- a/config/rootfiles/common/aarch64/stage2
+++ b/config/rootfiles/common/aarch64/stage2
@@ -99,7 +99,6 @@ usr/local/bin/qosd
usr/local/bin/readhash
usr/local/bin/rebuild-initrd
usr/local/bin/run-parts
-#usr/local/bin/sanedloop
usr/local/bin/scanhd
usr/local/bin/settime
usr/local/bin/timecheck
diff --git a/config/rootfiles/common/armv5tel/rust b/config/rootfiles/common/armv5tel/rust
new file mode 100644
index 000000000..39aa14ec3
--- /dev/null
+++ b/config/rootfiles/common/armv5tel/rust
@@ -0,0 +1,239 @@
+#usr/bin/cargo
+#usr/bin/rust-gdb
+#usr/bin/rust-gdbgui
+#usr/bin/rust-lldb
+#usr/bin/rustc
+#usr/bin/rustdoc
+#usr/etc
+#usr/etc/bash_completion.d
+#usr/etc/bash_completion.d/cargo
+#usr/lib/libLLVM-8-rust-1.37.0-stable.so
+#usr/lib/libarena-ceb2b0be1df82a34.so
+#usr/lib/libfmt_macros-b20970680435d874.so
+#usr/lib/libgraphviz-6134aa2fb7fc0ede.so
+#usr/lib/librustc-3ccb3dbb4a17b1c0.so
+#usr/lib/librustc_allocator-b2da80152b9c838b.so
+#usr/lib/librustc_borrowck-164479080cc8772d.so
+#usr/lib/librustc_codegen_ssa-36e16c2ebd557c5b.so
+#usr/lib/librustc_codegen_utils-a48bae0acacb485e.so
+#usr/lib/librustc_cratesio_shim-d6da3f9ed42f6b5f.so
+#usr/lib/librustc_data_structures-4f5460ff3467bd33.so
+#usr/lib/librustc_driver-1aa233c0fa499347.so
+#usr/lib/librustc_errors-4cd8925058f708b9.so
+#usr/lib/librustc_fs_util-cdf2d4af48a4d8b8.so
+#usr/lib/librustc_incremental-567a4fdbe33af894.so
+#usr/lib/librustc_interface-7691d2a4317831ca.so
+#usr/lib/librustc_lint-ddac0777c9ced2bb.so
+#usr/lib/librustc_macros-f2b013228a70c40f.so
+#usr/lib/librustc_metadata-f289cf194b04b3f9.so
+#usr/lib/librustc_mir-1828c73bde69e33b.so
+#usr/lib/librustc_passes-e0682f28cae48983.so
+#usr/lib/librustc_plugin-6bec8276dde0b5f4.so
+#usr/lib/librustc_privacy-5f93627d6eafe450.so
+#usr/lib/librustc_resolve-2b19d14c3867bf72.so
+#usr/lib/librustc_save_analysis-7c9416ee095cfab0.so
+#usr/lib/librustc_target-0fd4749864b3ce5a.so
+#usr/lib/librustc_traits-051352dbf7a1f21e.so
+#usr/lib/librustc_typeck-732835e10652d8da.so
+#usr/lib/libserialize-8fcbeb7fff90d36a.so
+#usr/lib/libstd-4a76ff35a356aedf.so
+#usr/lib/libsyntax-0268718cca0c4bfe.so
+#usr/lib/libsyntax_ext-d7fa76f0184472a6.so
+#usr/lib/libsyntax_pos-0380da211eff5e9a.so
+#usr/lib/libterm-2651f8b4eed9e86e.so
+#usr/lib/libtest-0127509d2e54a846.so
+#usr/lib/rustlib
+#usr/lib/rustlib/components
+#usr/lib/rustlib/etc
+#usr/lib/rustlib/etc/debugger_pretty_printers_common.py
+#usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py
+#usr/lib/rustlib/etc/gdb_rust_pretty_printing.py
+#usr/lib/rustlib/etc/lldb_rust_formatters.py
+#usr/lib/rustlib/install.log
+#usr/lib/rustlib/manifest-cargo
+#usr/lib/rustlib/manifest-rust-std-arm-unknown-linux-gnueabi
+#usr/lib/rustlib/manifest-rustc
+#usr/lib/rustlib/rust-installer-version
+#usr/lib/rustlib/uninstall.sh
+#usr/lib/rustlib/arm-unknown-linux-gnueabi
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/bin
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/bin/rust-lld
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/codegen-backends
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/codegen-backends/librustc_codegen_llvm-emscripten.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/codegen-backends/librustc_codegen_llvm-llvm.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libLLVM-8-rust-1.37.0-stable.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/liballoc-580035dd98451925.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libannotate_snippets-25e8d8701c03547d.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libarena-ceb2b0be1df82a34.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libarrayvec-f106db365d780985.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libatty-740be20e4d7441ff.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libbacktrace-13217ede3d276f16.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libbacktrace-9af89337886e6db6.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libbacktrace_sys-621a9ee22da6caa1.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libbacktrace_sys-fba99e00c4e61492.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libbitflags-4a7d2efbf7a358d0.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libbyteorder-5ff68006fd3fb999.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcc-ce0590f9ba246196.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcfg_if-be7979c57a08057b.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcfg_if-cddc487ade7daaa5.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libchalk_engine-69df11cdcd6bae99.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libchalk_macros-2bf52732ae8243bc.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcompiler_builtins-9fc4b5be2ba5cc19.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcore-8a55a4098920125a.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcrc32fast-fc7bcda202f0f3f7.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcrossbeam_deque-b4b71504b68d8f8b.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcrossbeam_epoch-c664f1a3b4666115.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libcrossbeam_utils-63c4319e4aba6512.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libdatafrog-bb049e83d8396896.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libeither-d1a988cc36833269.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libena-baa918d535227ba6.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libenv_logger-ff2b1a6f19a13aac.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libflate2-1c2be25b633e6a65.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libfmt_macros-b20970680435d874.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libgetopts-c729851ce6e3efb2.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libgraphviz-6134aa2fb7fc0ede.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libhashbrown-be9569e4d599746f.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libhumantime-6e5514835e11fb0b.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libindexmap-7f10e194770d6bf3.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libitoa-438f269905bbaa51.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libjemalloc_sys-c8524fc37cd0fe80.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libjobserver-2c75db35ce15b29a.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/liblazy_static-0de2b1545b6973a2.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/liblazy_static-21ff09e0ead00dc9.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/liblibc-2299a069d4067a08.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/liblibc-d6459c4f0817c67c.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/liblock_api-c79d1a6ea5dc7713.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/liblog-18ad11d6dda4e80d.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/liblog_settings-ae8859ad47668e7f.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libmeasureme-327bb21dd04749e8.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libmemmap-954e0d1f2b0db71b.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libmemoffset-62475d073708b865.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libminiz_sys-d07d12e134a38412.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libnodrop-b315aca0ebc7a5b8.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libnum_cpus-f6407c37ef29b71f.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libowning_ref-a0b3d9e1cdab8c89.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libpanic_abort-a956b3d01e3c9a0e.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libpanic_unwind-e11c7b3b3225afe2.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libparking_lot-4b068d99c9e6fdb6.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libparking_lot_core-8c73184e7c1493fe.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libpolonius_engine-e22625b0bbda797a.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libproc_macro-4a29a6c5fe75a875.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libprofiler_builtins-b36e7b6c2d3e00eb.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libpunycode-8955eba3c43f8f2e.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libquick_error-acc678b011452377.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librand-ebc7d1f1ad312180.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librand_chacha-47ba3ac92cc46b2c.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librand_core-c1f44f472e6d23be.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librand_hc-b3cc93a39a881b5b.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librand_isaac-63fbbbd089438d27.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librand_pcg-f16fbddc311ab68e.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librand_xorshift-8cd3bbc8a0d1fb89.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libremove_dir_all-898894399d3dfed9.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librls_data-4a7aa063287c45da.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librls_span-dd90aac9099b76b5.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc-3ccb3dbb4a17b1c0.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_allocator-b2da80152b9c838b.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_apfloat-f178776c0914cec5.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_asan-5a773b1fffe6c751.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_borrowck-164479080cc8772d.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_codegen_ssa-36e16c2ebd557c5b.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_codegen_utils-a48bae0acacb485e.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_cratesio_shim-d6da3f9ed42f6b5f.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_data_structures-4f5460ff3467bd33.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_demangle-546c844e8071bbeb.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_demangle-c571e3698361b498.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_driver-1aa233c0fa499347.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_errors-4cd8925058f708b9.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_fs_util-cdf2d4af48a4d8b8.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_hash-dab039160d1ae7fc.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_incremental-567a4fdbe33af894.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_interface-7691d2a4317831ca.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_lint-ddac0777c9ced2bb.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_lsan-bcfe6f943bf3a3db.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_macros-f2b013228a70c40f.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_metadata-f289cf194b04b3f9.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_mir-1828c73bde69e33b.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_msan-ffd3999f1149534e.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_passes-e0682f28cae48983.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_plugin-6bec8276dde0b5f4.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_privacy-5f93627d6eafe450.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_rayon-45df15d01be9166e.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_rayon_core-bc509e7526aad29c.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_resolve-2b19d14c3867bf72.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_save_analysis-7c9416ee095cfab0.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_std_workspace_alloc-47d8845cef2a3bc5.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_std_workspace_core-aee5c24fff305dea.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_target-0fd4749864b3ce5a.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_traits-051352dbf7a1f21e.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_tsan-5af25b139995eaa9.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/librustc_typeck-732835e10652d8da.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libryu-919d5311c0fa1780.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libscoped_tls-583a4be451031471.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libscopeguard-b33d2d758306f178.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libserde-2882d0235471e138.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libserde_json-fb3419596e2872d5.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libserialize-8fcbeb7fff90d36a.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libserialize-8fcbeb7fff90d36a.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libsmallvec-a7473e0177aca21a.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libstable_deref_trait-95edcbcd95f82564.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libstd-4a76ff35a356aedf.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libstd-4a76ff35a356aedf.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libsyntax-0268718cca0c4bfe.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libsyntax_ext-d7fa76f0184472a6.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libsyntax_pos-0380da211eff5e9a.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libtempfile-03867c2a718d0e3a.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libterm-2651f8b4eed9e86e.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libterm-2651f8b4eed9e86e.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libtermcolor-a7c37dbe6cc8c9b2.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libtest-0127509d2e54a846.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libtest-0127509d2e54a846.so
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libunicode_width-2c3a64b369c398a7.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libunicode_width-e8235f0d435d4737.rlib
+#usr/lib/rustlib/arm-unknown-linux-gnueabi/lib/libunwind-017511bce73a530c.rlib
+#usr/share/doc/cargo
+#usr/share/doc/cargo/LICENSE-APACHE
+#usr/share/doc/cargo/LICENSE-MIT
+#usr/share/doc/cargo/LICENSE-THIRD-PARTY
+#usr/share/doc/cargo/README.md
+#usr/share/doc/rust
+#usr/share/doc/rust/COPYRIGHT
+#usr/share/doc/rust/LICENSE-APACHE
+#usr/share/doc/rust/LICENSE-MIT
+#usr/share/doc/rust/README.md
+#usr/share/man/man1/cargo-bench.1
+#usr/share/man/man1/cargo-build.1
+#usr/share/man/man1/cargo-check.1
+#usr/share/man/man1/cargo-clean.1
+#usr/share/man/man1/cargo-doc.1
+#usr/share/man/man1/cargo-fetch.1
+#usr/share/man/man1/cargo-fix.1
+#usr/share/man/man1/cargo-generate-lockfile.1
+#usr/share/man/man1/cargo-help.1
+#usr/share/man/man1/cargo-init.1
+#usr/share/man/man1/cargo-install.1
+#usr/share/man/man1/cargo-locate-project.1
+#usr/share/man/man1/cargo-login.1
+#usr/share/man/man1/cargo-metadata.1
+#usr/share/man/man1/cargo-new.1
+#usr/share/man/man1/cargo-owner.1
+#usr/share/man/man1/cargo-package.1
+#usr/share/man/man1/cargo-pkgid.1
+#usr/share/man/man1/cargo-publish.1
+#usr/share/man/man1/cargo-run.1
+#usr/share/man/man1/cargo-rustc.1
+#usr/share/man/man1/cargo-rustdoc.1
+#usr/share/man/man1/cargo-search.1
+#usr/share/man/man1/cargo-test.1
+#usr/share/man/man1/cargo-uninstall.1
+#usr/share/man/man1/cargo-update.1
+#usr/share/man/man1/cargo-vendor.1
+#usr/share/man/man1/cargo-verify-project.1
+#usr/share/man/man1/cargo-version.1
+#usr/share/man/man1/cargo-yank.1
+#usr/share/man/man1/cargo.1
+#usr/share/man/man1/rustc.1
+#usr/share/man/man1/rustdoc.1
+#usr/share/zsh
+#usr/share/zsh/site-functions
+#usr/share/zsh/site-functions/_cargo
diff --git a/config/rootfiles/common/bind b/config/rootfiles/common/bind
index 2b67a039c..6f90b879b 100644
--- a/config/rootfiles/common/bind
+++ b/config/rootfiles/common/bind
@@ -272,11 +272,11 @@ usr/lib/libbind9.so.161.0.3
#usr/lib/libdns.la
#usr/lib/libdns.so
usr/lib/libdns.so.1107
-usr/lib/libdns.so.1107.0.0
+usr/lib/libdns.so.1107.0.1
#usr/lib/libisc.la
#usr/lib/libisc.so
usr/lib/libisc.so.1100
-usr/lib/libisc.so.1100.3.0
+usr/lib/libisc.so.1100.3.1
#usr/lib/libisccc.la
#usr/lib/libisccc.so
usr/lib/libisccc.so.161
diff --git a/config/rootfiles/common/i586/rust b/config/rootfiles/common/i586/rust
new file mode 100644
index 000000000..ebbb2061a
--- /dev/null
+++ b/config/rootfiles/common/i586/rust
@@ -0,0 +1,239 @@
+#usr/bin/cargo
+#usr/bin/rust-gdb
+#usr/bin/rust-gdbgui
+#usr/bin/rust-lldb
+#usr/bin/rustc
+#usr/bin/rustdoc
+#usr/etc
+#usr/etc/bash_completion.d
+#usr/etc/bash_completion.d/cargo
+#usr/lib/libLLVM-8-rust-1.37.0-stable.so
+#usr/lib/libarena-ceb2b0be1df82a34.so
+#usr/lib/libfmt_macros-b20970680435d874.so
+#usr/lib/libgraphviz-6134aa2fb7fc0ede.so
+#usr/lib/librustc-3ccb3dbb4a17b1c0.so
+#usr/lib/librustc_allocator-b2da80152b9c838b.so
+#usr/lib/librustc_borrowck-164479080cc8772d.so
+#usr/lib/librustc_codegen_ssa-36e16c2ebd557c5b.so
+#usr/lib/librustc_codegen_utils-a48bae0acacb485e.so
+#usr/lib/librustc_cratesio_shim-d6da3f9ed42f6b5f.so
+#usr/lib/librustc_data_structures-4f5460ff3467bd33.so
+#usr/lib/librustc_driver-1aa233c0fa499347.so
+#usr/lib/librustc_errors-4cd8925058f708b9.so
+#usr/lib/librustc_fs_util-cdf2d4af48a4d8b8.so
+#usr/lib/librustc_incremental-567a4fdbe33af894.so
+#usr/lib/librustc_interface-7691d2a4317831ca.so
+#usr/lib/librustc_lint-ddac0777c9ced2bb.so
+#usr/lib/librustc_macros-f2b013228a70c40f.so
+#usr/lib/librustc_metadata-f289cf194b04b3f9.so
+#usr/lib/librustc_mir-1828c73bde69e33b.so
+#usr/lib/librustc_passes-e0682f28cae48983.so
+#usr/lib/librustc_plugin-6bec8276dde0b5f4.so
+#usr/lib/librustc_privacy-5f93627d6eafe450.so
+#usr/lib/librustc_resolve-2b19d14c3867bf72.so
+#usr/lib/librustc_save_analysis-7c9416ee095cfab0.so
+#usr/lib/librustc_target-0fd4749864b3ce5a.so
+#usr/lib/librustc_traits-051352dbf7a1f21e.so
+#usr/lib/librustc_typeck-732835e10652d8da.so
+#usr/lib/libserialize-8fcbeb7fff90d36a.so
+#usr/lib/libstd-4a76ff35a356aedf.so
+#usr/lib/libsyntax-0268718cca0c4bfe.so
+#usr/lib/libsyntax_ext-d7fa76f0184472a6.so
+#usr/lib/libsyntax_pos-0380da211eff5e9a.so
+#usr/lib/libterm-2651f8b4eed9e86e.so
+#usr/lib/libtest-0127509d2e54a846.so
+#usr/lib/rustlib
+#usr/lib/rustlib/components
+#usr/lib/rustlib/etc
+#usr/lib/rustlib/etc/debugger_pretty_printers_common.py
+#usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py
+#usr/lib/rustlib/etc/gdb_rust_pretty_printing.py
+#usr/lib/rustlib/etc/lldb_rust_formatters.py
+#usr/lib/rustlib/install.log
+#usr/lib/rustlib/manifest-cargo
+#usr/lib/rustlib/manifest-rust-std-i686-unknown-linux-gnu
+#usr/lib/rustlib/manifest-rustc
+#usr/lib/rustlib/rust-installer-version
+#usr/lib/rustlib/uninstall.sh
+#usr/lib/rustlib/i686-unknown-linux-gnu
+#usr/lib/rustlib/i686-unknown-linux-gnu/bin
+#usr/lib/rustlib/i686-unknown-linux-gnu/bin/rust-lld
+#usr/lib/rustlib/i686-unknown-linux-gnu/codegen-backends
+#usr/lib/rustlib/i686-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-emscripten.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libLLVM-8-rust-1.37.0-stable.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liballoc-580035dd98451925.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libannotate_snippets-25e8d8701c03547d.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libarena-ceb2b0be1df82a34.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libarrayvec-f106db365d780985.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libatty-740be20e4d7441ff.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libbacktrace-13217ede3d276f16.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libbacktrace-9af89337886e6db6.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libbacktrace_sys-621a9ee22da6caa1.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libbacktrace_sys-fba99e00c4e61492.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libbitflags-4a7d2efbf7a358d0.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libbyteorder-5ff68006fd3fb999.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcc-ce0590f9ba246196.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcfg_if-be7979c57a08057b.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcfg_if-cddc487ade7daaa5.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libchalk_engine-69df11cdcd6bae99.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libchalk_macros-2bf52732ae8243bc.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcompiler_builtins-9fc4b5be2ba5cc19.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcore-8a55a4098920125a.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcrc32fast-fc7bcda202f0f3f7.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcrossbeam_deque-b4b71504b68d8f8b.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcrossbeam_epoch-c664f1a3b4666115.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libcrossbeam_utils-63c4319e4aba6512.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libdatafrog-bb049e83d8396896.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libeither-d1a988cc36833269.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libena-baa918d535227ba6.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libenv_logger-ff2b1a6f19a13aac.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libflate2-1c2be25b633e6a65.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libfmt_macros-b20970680435d874.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libgetopts-c729851ce6e3efb2.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libgraphviz-6134aa2fb7fc0ede.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libhashbrown-be9569e4d599746f.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libhumantime-6e5514835e11fb0b.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libindexmap-7f10e194770d6bf3.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libitoa-438f269905bbaa51.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libjemalloc_sys-c8524fc37cd0fe80.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libjobserver-2c75db35ce15b29a.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblazy_static-0de2b1545b6973a2.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblazy_static-21ff09e0ead00dc9.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblibc-2299a069d4067a08.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblibc-d6459c4f0817c67c.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblock_api-c79d1a6ea5dc7713.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblog-18ad11d6dda4e80d.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/liblog_settings-ae8859ad47668e7f.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libmeasureme-327bb21dd04749e8.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libmemmap-954e0d1f2b0db71b.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libmemoffset-62475d073708b865.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libminiz_sys-d07d12e134a38412.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libnodrop-b315aca0ebc7a5b8.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libnum_cpus-f6407c37ef29b71f.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libowning_ref-a0b3d9e1cdab8c89.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_abort-a956b3d01e3c9a0e.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpanic_unwind-e11c7b3b3225afe2.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libparking_lot-4b068d99c9e6fdb6.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libparking_lot_core-8c73184e7c1493fe.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpolonius_engine-e22625b0bbda797a.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libproc_macro-4a29a6c5fe75a875.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libprofiler_builtins-b36e7b6c2d3e00eb.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libpunycode-8955eba3c43f8f2e.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libquick_error-acc678b011452377.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librand-ebc7d1f1ad312180.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librand_chacha-47ba3ac92cc46b2c.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librand_core-c1f44f472e6d23be.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librand_hc-b3cc93a39a881b5b.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librand_isaac-63fbbbd089438d27.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librand_pcg-f16fbddc311ab68e.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librand_xorshift-8cd3bbc8a0d1fb89.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libremove_dir_all-898894399d3dfed9.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librls_data-4a7aa063287c45da.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librls_span-dd90aac9099b76b5.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc-3ccb3dbb4a17b1c0.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_allocator-b2da80152b9c838b.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_apfloat-f178776c0914cec5.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_asan-5a773b1fffe6c751.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_borrowck-164479080cc8772d.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_codegen_ssa-36e16c2ebd557c5b.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_codegen_utils-a48bae0acacb485e.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_cratesio_shim-d6da3f9ed42f6b5f.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_data_structures-4f5460ff3467bd33.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_demangle-546c844e8071bbeb.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_demangle-c571e3698361b498.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_driver-1aa233c0fa499347.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_errors-4cd8925058f708b9.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_fs_util-cdf2d4af48a4d8b8.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_hash-dab039160d1ae7fc.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_incremental-567a4fdbe33af894.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_interface-7691d2a4317831ca.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_lint-ddac0777c9ced2bb.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_lsan-bcfe6f943bf3a3db.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_macros-f2b013228a70c40f.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_metadata-f289cf194b04b3f9.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_mir-1828c73bde69e33b.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_msan-ffd3999f1149534e.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_passes-e0682f28cae48983.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_plugin-6bec8276dde0b5f4.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_privacy-5f93627d6eafe450.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_rayon-45df15d01be9166e.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_rayon_core-bc509e7526aad29c.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_resolve-2b19d14c3867bf72.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_save_analysis-7c9416ee095cfab0.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_alloc-47d8845cef2a3bc5.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_std_workspace_core-aee5c24fff305dea.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_target-0fd4749864b3ce5a.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_traits-051352dbf7a1f21e.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_tsan-5af25b139995eaa9.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/librustc_typeck-732835e10652d8da.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libryu-919d5311c0fa1780.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libscoped_tls-583a4be451031471.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libscopeguard-b33d2d758306f178.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libserde-2882d0235471e138.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libserde_json-fb3419596e2872d5.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libserialize-8fcbeb7fff90d36a.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libserialize-8fcbeb7fff90d36a.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libsmallvec-a7473e0177aca21a.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstable_deref_trait-95edcbcd95f82564.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-4a76ff35a356aedf.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libstd-4a76ff35a356aedf.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libsyntax-0268718cca0c4bfe.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libsyntax_ext-d7fa76f0184472a6.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libsyntax_pos-0380da211eff5e9a.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libtempfile-03867c2a718d0e3a.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libterm-2651f8b4eed9e86e.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libterm-2651f8b4eed9e86e.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libtermcolor-a7c37dbe6cc8c9b2.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-0127509d2e54a846.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libtest-0127509d2e54a846.so
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunicode_width-2c3a64b369c398a7.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunicode_width-e8235f0d435d4737.rlib
+#usr/lib/rustlib/i686-unknown-linux-gnu/lib/libunwind-017511bce73a530c.rlib
+#usr/share/doc/cargo
+#usr/share/doc/cargo/LICENSE-APACHE
+#usr/share/doc/cargo/LICENSE-MIT
+#usr/share/doc/cargo/LICENSE-THIRD-PARTY
+#usr/share/doc/cargo/README.md
+#usr/share/doc/rust
+#usr/share/doc/rust/COPYRIGHT
+#usr/share/doc/rust/LICENSE-APACHE
+#usr/share/doc/rust/LICENSE-MIT
+#usr/share/doc/rust/README.md
+#usr/share/man/man1/cargo-bench.1
+#usr/share/man/man1/cargo-build.1
+#usr/share/man/man1/cargo-check.1
+#usr/share/man/man1/cargo-clean.1
+#usr/share/man/man1/cargo-doc.1
+#usr/share/man/man1/cargo-fetch.1
+#usr/share/man/man1/cargo-fix.1
+#usr/share/man/man1/cargo-generate-lockfile.1
+#usr/share/man/man1/cargo-help.1
+#usr/share/man/man1/cargo-init.1
+#usr/share/man/man1/cargo-install.1
+#usr/share/man/man1/cargo-locate-project.1
+#usr/share/man/man1/cargo-login.1
+#usr/share/man/man1/cargo-metadata.1
+#usr/share/man/man1/cargo-new.1
+#usr/share/man/man1/cargo-owner.1
+#usr/share/man/man1/cargo-package.1
+#usr/share/man/man1/cargo-pkgid.1
+#usr/share/man/man1/cargo-publish.1
+#usr/share/man/man1/cargo-run.1
+#usr/share/man/man1/cargo-rustc.1
+#usr/share/man/man1/cargo-rustdoc.1
+#usr/share/man/man1/cargo-search.1
+#usr/share/man/man1/cargo-test.1
+#usr/share/man/man1/cargo-uninstall.1
+#usr/share/man/man1/cargo-update.1
+#usr/share/man/man1/cargo-vendor.1
+#usr/share/man/man1/cargo-verify-project.1
+#usr/share/man/man1/cargo-version.1
+#usr/share/man/man1/cargo-yank.1
+#usr/share/man/man1/cargo.1
+#usr/share/man/man1/rustc.1
+#usr/share/man/man1/rustdoc.1
+#usr/share/zsh
+#usr/share/zsh/site-functions
+#usr/share/zsh/site-functions/_cargo
diff --git a/config/rootfiles/common/iproute2 b/config/rootfiles/common/iproute2
index cf9a5c456..802803bdd 100644
--- a/config/rootfiles/common/iproute2
+++ b/config/rootfiles/common/iproute2
@@ -40,9 +40,7 @@ usr/share/bash-completion/completions/tc
#usr/share/doc/iproute2/examples/README.cbq
#usr/share/doc/iproute2/examples/README.iproute2+tc
#usr/share/doc/iproute2/examples/SYN-DoS.rate.limit
-#usr/share/doc/iproute2/examples/cbq.init-v0.7.3
#usr/share/doc/iproute2/examples/cbqinit.eth1
-#usr/share/doc/iproute2/examples/dhcp-client-script
#usr/share/doc/iproute2/examples/diffserv
#usr/share/doc/iproute2/examples/diffserv/Edge1
#usr/share/doc/iproute2/examples/diffserv/Edge2
@@ -63,8 +61,10 @@ usr/share/bash-completion/completions/tc
#usr/share/man/man8/bridge.8
#usr/share/man/man8/ctstat.8
#usr/share/man/man8/devlink-dev.8
+#usr/share/man/man8/devlink-health.8
#usr/share/man/man8/devlink-monitor.8
#usr/share/man/man8/devlink-port.8
+#usr/share/man/man8/devlink-region.8
#usr/share/man/man8/devlink-resource.8
#usr/share/man/man8/devlink-sb.8
#usr/share/man/man8/devlink.8
@@ -84,6 +84,7 @@ usr/share/bash-completion/completions/tc
#usr/share/man/man8/ip-neighbour.8
#usr/share/man/man8/ip-netconf.8
#usr/share/man/man8/ip-netns.8
+#usr/share/man/man8/ip-nexthop.8
#usr/share/man/man8/ip-ntable.8
#usr/share/man/man8/ip-route.8
#usr/share/man/man8/ip-rule.8
@@ -99,6 +100,8 @@ usr/share/bash-completion/completions/tc
#usr/share/man/man8/rdma-dev.8
#usr/share/man/man8/rdma-link.8
#usr/share/man/man8/rdma-resource.8
+#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
@@ -111,6 +114,7 @@ usr/share/bash-completion/completions/tc
#usr/share/man/man8/tc-basic.8
#usr/share/man/man8/tc-bfifo.8
#usr/share/man/man8/tc-bpf.8
+#usr/share/man/man8/tc-cake.8
#usr/share/man/man8/tc-cbq-details.8
#usr/share/man/man8/tc-cbq.8
#usr/share/man/man8/tc-cbs.8
@@ -119,8 +123,10 @@ usr/share/bash-completion/completions/tc
#usr/share/man/man8/tc-codel.8
#usr/share/man/man8/tc-connmark.8
#usr/share/man/man8/tc-csum.8
+#usr/share/man/man8/tc-ctinfo.8
#usr/share/man/man8/tc-drr.8
#usr/share/man/man8/tc-ematch.8
+#usr/share/man/man8/tc-etf.8
#usr/share/man/man8/tc-flow.8
#usr/share/man/man8/tc-flower.8
#usr/share/man/man8/tc-fq.8
@@ -131,6 +137,7 @@ usr/share/bash-completion/completions/tc
#usr/share/man/man8/tc-ife.8
#usr/share/man/man8/tc-matchall.8
#usr/share/man/man8/tc-mirred.8
+#usr/share/man/man8/tc-mpls.8
#usr/share/man/man8/tc-mqprio.8
#usr/share/man/man8/tc-nat.8
#usr/share/man/man8/tc-netem.8
@@ -148,7 +155,9 @@ usr/share/bash-completion/completions/tc
#usr/share/man/man8/tc-simple.8
#usr/share/man/man8/tc-skbedit.8
#usr/share/man/man8/tc-skbmod.8
+#usr/share/man/man8/tc-skbprio.8
#usr/share/man/man8/tc-stab.8
+#usr/share/man/man8/tc-taprio.8
#usr/share/man/man8/tc-tbf.8
#usr/share/man/man8/tc-tcindex.8
#usr/share/man/man8/tc-tunnel_key.8
diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables
index f1a6af00e..389518646 100644
--- a/config/rootfiles/common/iptables
+++ b/config/rootfiles/common/iptables
@@ -1,11 +1,11 @@
#lib/libip4tc.la
lib/libip4tc.so
-lib/libip4tc.so.0
-lib/libip4tc.so.0.1.0
+lib/libip4tc.so.2
+lib/libip4tc.so.2.0.0
#lib/libip6tc.la
lib/libip6tc.so
-lib/libip6tc.so.0
-lib/libip6tc.so.0.1.0
+lib/libip6tc.so.2
+lib/libip6tc.so.2.0.0
#lib/libipq.la
lib/libipq.so
lib/libipq.so.0
@@ -173,10 +173,12 @@ sbin/xtables-legacy-multi
#usr/share/man/man3/libipq.3
#usr/share/man/man8/ip6tables-restore.8
#usr/share/man/man8/ip6tables-save.8
+#usr/share/man/man8/ip6tables-translate.8
#usr/share/man/man8/ip6tables.8
#usr/share/man/man8/iptables-extensions.8
#usr/share/man/man8/iptables-restore.8
#usr/share/man/man8/iptables-save.8
+#usr/share/man/man8/iptables-translate.8
#usr/share/man/man8/iptables.8
#usr/share/man/man8/nfnl_osf.8
#usr/share/man/man8/xtables-legacy.8
diff --git a/config/rootfiles/common/libnetfilter_queue b/config/rootfiles/common/libnetfilter_queue
index 418a5df89..087223033 100644
--- a/config/rootfiles/common/libnetfilter_queue
+++ b/config/rootfiles/common/libnetfilter_queue
@@ -10,5 +10,5 @@
#usr/lib/libnetfilter_queue.la
#usr/lib/libnetfilter_queue.so
usr/lib/libnetfilter_queue.so.1
-usr/lib/libnetfilter_queue.so.1.3.0
+usr/lib/libnetfilter_queue.so.1.4.0
#usr/lib/pkgconfig/libnetfilter_queue.pc
diff --git a/config/rootfiles/common/libpcap b/config/rootfiles/common/libpcap
index 6be2bd99c..868f870fa 100644
--- a/config/rootfiles/common/libpcap
+++ b/config/rootfiles/common/libpcap
@@ -6,19 +6,23 @@
#usr/include/pcap/bluetooth.h
#usr/include/pcap/bpf.h
#usr/include/pcap/can_socketcan.h
+#usr/include/pcap/compiler-tests.h
#usr/include/pcap/dlt.h
-#usr/include/pcap/export-defs.h
+#usr/include/pcap/funcattrs.h
#usr/include/pcap/ipnet.h
#usr/include/pcap/namedb.h
#usr/include/pcap/nflog.h
+#usr/include/pcap/pcap-inttypes.h
#usr/include/pcap/pcap.h
#usr/include/pcap/sll.h
+#usr/include/pcap/socket.h
#usr/include/pcap/usb.h
#usr/include/pcap/vlan.h
#usr/lib/libpcap.a
usr/lib/libpcap.so
usr/lib/libpcap.so.1
-usr/lib/libpcap.so.1.8.1
+usr/lib/libpcap.so.1.9.1
+#usr/lib/pkgconfig/libpcap.pc
#usr/share/man/man1/pcap-config.1
#usr/share/man/man3/pcap.3pcap
#usr/share/man/man3/pcap_activate.3pcap
@@ -30,6 +34,7 @@ usr/lib/libpcap.so.1.8.1
#usr/share/man/man3/pcap_datalink.3pcap
#usr/share/man/man3/pcap_datalink_name_to_val.3pcap
#usr/share/man/man3/pcap_datalink_val_to_description.3pcap
+#usr/share/man/man3/pcap_datalink_val_to_description_or_dlt.3pcap
#usr/share/man/man3/pcap_datalink_val_to_name.3pcap
#usr/share/man/man3/pcap_dispatch.3pcap
#usr/share/man/man3/pcap_dump.3pcap
@@ -48,6 +53,7 @@ usr/lib/libpcap.so.1.8.1
#usr/share/man/man3/pcap_free_tstamp_types.3pcap
#usr/share/man/man3/pcap_freealldevs.3pcap
#usr/share/man/man3/pcap_freecode.3pcap
+#usr/share/man/man3/pcap_get_required_select_timeout.3pcap
#usr/share/man/man3/pcap_get_selectable_fd.3pcap
#usr/share/man/man3/pcap_get_tstamp_precision.3pcap
#usr/share/man/man3/pcap_geterr.3pcap
@@ -76,6 +82,7 @@ usr/lib/libpcap.so.1.8.1
#usr/share/man/man3/pcap_set_datalink.3pcap
#usr/share/man/man3/pcap_set_immediate_mode.3pcap
#usr/share/man/man3/pcap_set_promisc.3pcap
+#usr/share/man/man3/pcap_set_protocol_linux.3pcap
#usr/share/man/man3/pcap_set_rfmon.3pcap
#usr/share/man/man3/pcap_set_snaplen.3pcap
#usr/share/man/man3/pcap_set_timeout.3pcap
diff --git a/config/rootfiles/common/libssh b/config/rootfiles/common/libssh
new file mode 100644
index 000000000..a454f07fb
--- /dev/null
+++ b/config/rootfiles/common/libssh
@@ -0,0 +1,15 @@
+#usr/include/libssh
+#usr/include/libssh/callbacks.h
+#usr/include/libssh/legacy.h
+#usr/include/libssh/libssh.h
+#usr/include/libssh/libsshpp.hpp
+#usr/include/libssh/server.h
+#usr/include/libssh/sftp.h
+#usr/include/libssh/ssh2.h
+#usr/lib/cmake/libssh
+#usr/lib/cmake/libssh/libssh-config-version.cmake
+#usr/lib/cmake/libssh/libssh-config.cmake
+#usr/lib/libssh.so
+usr/lib/libssh.so.4
+usr/lib/libssh.so.4.8.1
+#usr/lib/pkgconfig/libssh.pc
diff --git a/config/rootfiles/common/pcre b/config/rootfiles/common/pcre
index 8e9f22ac4..6db5724fa 100644
--- a/config/rootfiles/common/pcre
+++ b/config/rootfiles/common/pcre
@@ -10,15 +10,15 @@
#usr/lib/libpcre.la
usr/lib/libpcre.so
usr/lib/libpcre.so.1
-usr/lib/libpcre.so.1.2.10
+usr/lib/libpcre.so.1.2.11
#usr/lib/libpcre16.la
usr/lib/libpcre16.so
usr/lib/libpcre16.so.0
-usr/lib/libpcre16.so.0.2.10
+usr/lib/libpcre16.so.0.2.11
#usr/lib/libpcre32.la
usr/lib/libpcre32.so
usr/lib/libpcre32.so.0
-usr/lib/libpcre32.so.0.0.10
+usr/lib/libpcre32.so.0.0.11
#usr/lib/libpcrecpp.la
usr/lib/libpcrecpp.so
usr/lib/libpcrecpp.so.0
@@ -32,72 +32,72 @@ usr/lib/libpcreposix.so.0.0.6
#usr/lib/pkgconfig/libpcre32.pc
#usr/lib/pkgconfig/libpcrecpp.pc
#usr/lib/pkgconfig/libpcreposix.pc
-#usr/share/doc/pcre-pcre-8.42
-#usr/share/doc/pcre-pcre-8.42/AUTHORS
-#usr/share/doc/pcre-pcre-8.42/COPYING
-#usr/share/doc/pcre-pcre-8.42/ChangeLog
-#usr/share/doc/pcre-pcre-8.42/LICENCE
-#usr/share/doc/pcre-pcre-8.42/NEWS
-#usr/share/doc/pcre-pcre-8.42/README
-#usr/share/doc/pcre-pcre-8.42/html
-#usr/share/doc/pcre-pcre-8.42/html/NON-AUTOTOOLS-BUILD.txt
-#usr/share/doc/pcre-pcre-8.42/html/README.txt
-#usr/share/doc/pcre-pcre-8.42/html/index.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre-config.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre16.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre32.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_assign_jit_stack.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_compile.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_compile2.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_config.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_copy_named_substring.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_copy_substring.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_dfa_exec.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_exec.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_free_study.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_free_substring.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_free_substring_list.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_fullinfo.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_get_named_substring.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_get_stringnumber.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_get_stringtable_entries.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_get_substring.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_get_substring_list.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_jit_exec.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_jit_stack_alloc.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_jit_stack_free.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_maketables.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_pattern_to_host_byte_order.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_refcount.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_study.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_utf16_to_host_byte_order.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_utf32_to_host_byte_order.html
-#usr/share/doc/pcre-pcre-8.42/html/pcre_version.html
-#usr/share/doc/pcre-pcre-8.42/html/pcreapi.html
-#usr/share/doc/pcre-pcre-8.42/html/pcrebuild.html
-#usr/share/doc/pcre-pcre-8.42/html/pcrecallout.html
-#usr/share/doc/pcre-pcre-8.42/html/pcrecompat.html
-#usr/share/doc/pcre-pcre-8.42/html/pcrecpp.html
-#usr/share/doc/pcre-pcre-8.42/html/pcredemo.html
-#usr/share/doc/pcre-pcre-8.42/html/pcregrep.html
-#usr/share/doc/pcre-pcre-8.42/html/pcrejit.html
-#usr/share/doc/pcre-pcre-8.42/html/pcrelimits.html
-#usr/share/doc/pcre-pcre-8.42/html/pcrematching.html
-#usr/share/doc/pcre-pcre-8.42/html/pcrepartial.html
-#usr/share/doc/pcre-pcre-8.42/html/pcrepattern.html
-#usr/share/doc/pcre-pcre-8.42/html/pcreperform.html
-#usr/share/doc/pcre-pcre-8.42/html/pcreposix.html
-#usr/share/doc/pcre-pcre-8.42/html/pcreprecompile.html
-#usr/share/doc/pcre-pcre-8.42/html/pcresample.html
-#usr/share/doc/pcre-pcre-8.42/html/pcrestack.html
-#usr/share/doc/pcre-pcre-8.42/html/pcresyntax.html
-#usr/share/doc/pcre-pcre-8.42/html/pcretest.html
-#usr/share/doc/pcre-pcre-8.42/html/pcreunicode.html
-#usr/share/doc/pcre-pcre-8.42/pcre-config.txt
-#usr/share/doc/pcre-pcre-8.42/pcre.txt
-#usr/share/doc/pcre-pcre-8.42/pcregrep.txt
-#usr/share/doc/pcre-pcre-8.42/pcretest.txt
+#usr/share/doc/pcre-pcre-8.43
+#usr/share/doc/pcre-pcre-8.43/AUTHORS
+#usr/share/doc/pcre-pcre-8.43/COPYING
+#usr/share/doc/pcre-pcre-8.43/ChangeLog
+#usr/share/doc/pcre-pcre-8.43/LICENCE
+#usr/share/doc/pcre-pcre-8.43/NEWS
+#usr/share/doc/pcre-pcre-8.43/README
+#usr/share/doc/pcre-pcre-8.43/html
+#usr/share/doc/pcre-pcre-8.43/html/NON-AUTOTOOLS-BUILD.txt
+#usr/share/doc/pcre-pcre-8.43/html/README.txt
+#usr/share/doc/pcre-pcre-8.43/html/index.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre-config.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre16.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre32.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_assign_jit_stack.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_compile.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_compile2.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_config.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_copy_named_substring.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_copy_substring.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_dfa_exec.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_exec.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_free_study.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_free_substring.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_free_substring_list.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_fullinfo.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_get_named_substring.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_get_stringnumber.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_get_stringtable_entries.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_get_substring.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_get_substring_list.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_jit_exec.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_jit_stack_alloc.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_jit_stack_free.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_maketables.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_pattern_to_host_byte_order.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_refcount.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_study.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_utf16_to_host_byte_order.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_utf32_to_host_byte_order.html
+#usr/share/doc/pcre-pcre-8.43/html/pcre_version.html
+#usr/share/doc/pcre-pcre-8.43/html/pcreapi.html
+#usr/share/doc/pcre-pcre-8.43/html/pcrebuild.html
+#usr/share/doc/pcre-pcre-8.43/html/pcrecallout.html
+#usr/share/doc/pcre-pcre-8.43/html/pcrecompat.html
+#usr/share/doc/pcre-pcre-8.43/html/pcrecpp.html
+#usr/share/doc/pcre-pcre-8.43/html/pcredemo.html
+#usr/share/doc/pcre-pcre-8.43/html/pcregrep.html
+#usr/share/doc/pcre-pcre-8.43/html/pcrejit.html
+#usr/share/doc/pcre-pcre-8.43/html/pcrelimits.html
+#usr/share/doc/pcre-pcre-8.43/html/pcrematching.html
+#usr/share/doc/pcre-pcre-8.43/html/pcrepartial.html
+#usr/share/doc/pcre-pcre-8.43/html/pcrepattern.html
+#usr/share/doc/pcre-pcre-8.43/html/pcreperform.html
+#usr/share/doc/pcre-pcre-8.43/html/pcreposix.html
+#usr/share/doc/pcre-pcre-8.43/html/pcreprecompile.html
+#usr/share/doc/pcre-pcre-8.43/html/pcresample.html
+#usr/share/doc/pcre-pcre-8.43/html/pcrestack.html
+#usr/share/doc/pcre-pcre-8.43/html/pcresyntax.html
+#usr/share/doc/pcre-pcre-8.43/html/pcretest.html
+#usr/share/doc/pcre-pcre-8.43/html/pcreunicode.html
+#usr/share/doc/pcre-pcre-8.43/pcre-config.txt
+#usr/share/doc/pcre-pcre-8.43/pcre.txt
+#usr/share/doc/pcre-pcre-8.43/pcregrep.txt
+#usr/share/doc/pcre-pcre-8.43/pcretest.txt
#usr/share/man/man1/pcre-config.1
#usr/share/man/man1/pcregrep.1
#usr/share/man/man1/pcretest.1
diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2
index 5b213c8de..d9068415b 100644
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -98,7 +98,6 @@ usr/local/bin/qosd
usr/local/bin/readhash
usr/local/bin/rebuild-initrd
usr/local/bin/run-parts
-#usr/local/bin/sanedloop
usr/local/bin/scanhd
usr/local/bin/settime
usr/local/bin/timecheck
diff --git a/config/rootfiles/common/suricata b/config/rootfiles/common/suricata
index ac48dbce9..41b02525d 100644
--- a/config/rootfiles/common/suricata
+++ b/config/rootfiles/common/suricata
@@ -1,5 +1,7 @@
etc/suricata
etc/suricata/suricata.yaml
+#root/.cargo
+#root/.cargo/.package-cache
usr/bin/suricata
#usr/share/doc/suricata
#usr/share/doc/suricata/AUTHORS
diff --git a/config/rootfiles/common/unbound b/config/rootfiles/common/unbound
index 78a741377..58c520ab0 100644
--- a/config/rootfiles/common/unbound
+++ b/config/rootfiles/common/unbound
@@ -11,7 +11,7 @@ etc/unbound/unbound.conf
#usr/lib/libunbound.la
#usr/lib/libunbound.so
usr/lib/libunbound.so.8
-usr/lib/libunbound.so.8.1.3
+usr/lib/libunbound.so.8.1.4
#usr/lib/pkgconfig/libunbound.pc
usr/sbin/unbound
usr/sbin/unbound-anchor
diff --git a/config/rootfiles/common/x86_64/rust b/config/rootfiles/common/x86_64/rust
new file mode 100644
index 000000000..103d1e028
--- /dev/null
+++ b/config/rootfiles/common/x86_64/rust
@@ -0,0 +1,239 @@
+#usr/bin/cargo
+#usr/bin/rust-gdb
+#usr/bin/rust-gdbgui
+#usr/bin/rust-lldb
+#usr/bin/rustc
+#usr/bin/rustdoc
+#usr/etc
+#usr/etc/bash_completion.d
+#usr/etc/bash_completion.d/cargo
+#usr/lib/libLLVM-8-rust-1.37.0-stable.so
+#usr/lib/libarena-ceb2b0be1df82a34.so
+#usr/lib/libfmt_macros-b20970680435d874.so
+#usr/lib/libgraphviz-6134aa2fb7fc0ede.so
+#usr/lib/librustc-3ccb3dbb4a17b1c0.so
+#usr/lib/librustc_allocator-b2da80152b9c838b.so
+#usr/lib/librustc_borrowck-164479080cc8772d.so
+#usr/lib/librustc_codegen_ssa-36e16c2ebd557c5b.so
+#usr/lib/librustc_codegen_utils-a48bae0acacb485e.so
+#usr/lib/librustc_cratesio_shim-d6da3f9ed42f6b5f.so
+#usr/lib/librustc_data_structures-4f5460ff3467bd33.so
+#usr/lib/librustc_driver-1aa233c0fa499347.so
+#usr/lib/librustc_errors-4cd8925058f708b9.so
+#usr/lib/librustc_fs_util-cdf2d4af48a4d8b8.so
+#usr/lib/librustc_incremental-567a4fdbe33af894.so
+#usr/lib/librustc_interface-7691d2a4317831ca.so
+#usr/lib/librustc_lint-ddac0777c9ced2bb.so
+#usr/lib/librustc_macros-f2b013228a70c40f.so
+#usr/lib/librustc_metadata-f289cf194b04b3f9.so
+#usr/lib/librustc_mir-1828c73bde69e33b.so
+#usr/lib/librustc_passes-e0682f28cae48983.so
+#usr/lib/librustc_plugin-6bec8276dde0b5f4.so
+#usr/lib/librustc_privacy-5f93627d6eafe450.so
+#usr/lib/librustc_resolve-2b19d14c3867bf72.so
+#usr/lib/librustc_save_analysis-7c9416ee095cfab0.so
+#usr/lib/librustc_target-0fd4749864b3ce5a.so
+#usr/lib/librustc_traits-051352dbf7a1f21e.so
+#usr/lib/librustc_typeck-732835e10652d8da.so
+#usr/lib/libserialize-8fcbeb7fff90d36a.so
+#usr/lib/libstd-4a76ff35a356aedf.so
+#usr/lib/libsyntax-0268718cca0c4bfe.so
+#usr/lib/libsyntax_ext-d7fa76f0184472a6.so
+#usr/lib/libsyntax_pos-0380da211eff5e9a.so
+#usr/lib/libterm-2651f8b4eed9e86e.so
+#usr/lib/libtest-0127509d2e54a846.so
+#usr/lib/rustlib
+#usr/lib/rustlib/components
+#usr/lib/rustlib/etc
+#usr/lib/rustlib/etc/debugger_pretty_printers_common.py
+#usr/lib/rustlib/etc/gdb_load_rust_pretty_printers.py
+#usr/lib/rustlib/etc/gdb_rust_pretty_printing.py
+#usr/lib/rustlib/etc/lldb_rust_formatters.py
+#usr/lib/rustlib/install.log
+#usr/lib/rustlib/manifest-cargo
+#usr/lib/rustlib/manifest-rust-std-x86_64-unknown-linux-gnu
+#usr/lib/rustlib/manifest-rustc
+#usr/lib/rustlib/rust-installer-version
+#usr/lib/rustlib/uninstall.sh
+#usr/lib/rustlib/x86_64-unknown-linux-gnu
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/bin
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/bin/rust-lld
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-emscripten.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/codegen-backends/librustc_codegen_llvm-llvm.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libLLVM-8-rust-1.37.0-stable.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liballoc-580035dd98451925.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libannotate_snippets-25e8d8701c03547d.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libarena-ceb2b0be1df82a34.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libarrayvec-f106db365d780985.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libatty-740be20e4d7441ff.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libbacktrace-13217ede3d276f16.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libbacktrace-9af89337886e6db6.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libbacktrace_sys-621a9ee22da6caa1.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libbacktrace_sys-fba99e00c4e61492.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libbitflags-4a7d2efbf7a358d0.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libbyteorder-5ff68006fd3fb999.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcc-ce0590f9ba246196.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-be7979c57a08057b.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcfg_if-cddc487ade7daaa5.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libchalk_engine-69df11cdcd6bae99.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libchalk_macros-2bf52732ae8243bc.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcompiler_builtins-9fc4b5be2ba5cc19.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcore-8a55a4098920125a.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcrc32fast-fc7bcda202f0f3f7.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcrossbeam_deque-b4b71504b68d8f8b.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcrossbeam_epoch-c664f1a3b4666115.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libcrossbeam_utils-63c4319e4aba6512.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libdatafrog-bb049e83d8396896.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libeither-d1a988cc36833269.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libena-baa918d535227ba6.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libenv_logger-ff2b1a6f19a13aac.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libflate2-1c2be25b633e6a65.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libfmt_macros-b20970680435d874.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgetopts-c729851ce6e3efb2.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libgraphviz-6134aa2fb7fc0ede.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhashbrown-be9569e4d599746f.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libhumantime-6e5514835e11fb0b.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libindexmap-7f10e194770d6bf3.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libitoa-438f269905bbaa51.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libjemalloc_sys-c8524fc37cd0fe80.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libjobserver-2c75db35ce15b29a.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblazy_static-0de2b1545b6973a2.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblazy_static-21ff09e0ead00dc9.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-2299a069d4067a08.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblibc-d6459c4f0817c67c.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblock_api-c79d1a6ea5dc7713.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblog-18ad11d6dda4e80d.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/liblog_settings-ae8859ad47668e7f.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmeasureme-327bb21dd04749e8.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemmap-954e0d1f2b0db71b.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libmemoffset-62475d073708b865.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libminiz_sys-d07d12e134a38412.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libnodrop-b315aca0ebc7a5b8.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libnum_cpus-f6407c37ef29b71f.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libowning_ref-a0b3d9e1cdab8c89.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_abort-a956b3d01e3c9a0e.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpanic_unwind-e11c7b3b3225afe2.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libparking_lot-4b068d99c9e6fdb6.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libparking_lot_core-8c73184e7c1493fe.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpolonius_engine-e22625b0bbda797a.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libproc_macro-4a29a6c5fe75a875.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libprofiler_builtins-b36e7b6c2d3e00eb.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libpunycode-8955eba3c43f8f2e.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libquick_error-acc678b011452377.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librand-ebc7d1f1ad312180.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librand_chacha-47ba3ac92cc46b2c.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librand_core-c1f44f472e6d23be.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librand_hc-b3cc93a39a881b5b.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librand_isaac-63fbbbd089438d27.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librand_pcg-f16fbddc311ab68e.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librand_xorshift-8cd3bbc8a0d1fb89.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libremove_dir_all-898894399d3dfed9.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librls_data-4a7aa063287c45da.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librls_span-dd90aac9099b76b5.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc-3ccb3dbb4a17b1c0.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_allocator-b2da80152b9c838b.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_apfloat-f178776c0914cec5.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_asan-5a773b1fffe6c751.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_borrowck-164479080cc8772d.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_codegen_ssa-36e16c2ebd557c5b.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_codegen_utils-a48bae0acacb485e.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_cratesio_shim-d6da3f9ed42f6b5f.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_data_structures-4f5460ff3467bd33.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-546c844e8071bbeb.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_demangle-c571e3698361b498.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_driver-1aa233c0fa499347.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_errors-4cd8925058f708b9.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_fs_util-cdf2d4af48a4d8b8.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_hash-dab039160d1ae7fc.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_incremental-567a4fdbe33af894.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_interface-7691d2a4317831ca.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_lint-ddac0777c9ced2bb.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_lsan-bcfe6f943bf3a3db.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_macros-f2b013228a70c40f.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_metadata-f289cf194b04b3f9.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_mir-1828c73bde69e33b.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_msan-ffd3999f1149534e.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_passes-e0682f28cae48983.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_plugin-6bec8276dde0b5f4.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_privacy-5f93627d6eafe450.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_rayon-45df15d01be9166e.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_rayon_core-bc509e7526aad29c.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_resolve-2b19d14c3867bf72.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_save_analysis-7c9416ee095cfab0.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_alloc-47d8845cef2a3bc5.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_std_workspace_core-aee5c24fff305dea.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_target-0fd4749864b3ce5a.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_traits-051352dbf7a1f21e.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_tsan-5af25b139995eaa9.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/librustc_typeck-732835e10652d8da.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libryu-919d5311c0fa1780.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libscoped_tls-583a4be451031471.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libscopeguard-b33d2d758306f178.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libserde-2882d0235471e138.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libserde_json-fb3419596e2872d5.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libserialize-8fcbeb7fff90d36a.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libserialize-8fcbeb7fff90d36a.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libsmallvec-a7473e0177aca21a.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstable_deref_trait-95edcbcd95f82564.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-4a76ff35a356aedf.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-4a76ff35a356aedf.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libsyntax-0268718cca0c4bfe.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libsyntax_ext-d7fa76f0184472a6.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libsyntax_pos-0380da211eff5e9a.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtempfile-03867c2a718d0e3a.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libterm-2651f8b4eed9e86e.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libterm-2651f8b4eed9e86e.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtermcolor-a7c37dbe6cc8c9b2.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-0127509d2e54a846.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libtest-0127509d2e54a846.so
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-2c3a64b369c398a7.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunicode_width-e8235f0d435d4737.rlib
+#usr/lib/rustlib/x86_64-unknown-linux-gnu/lib/libunwind-017511bce73a530c.rlib
+#usr/share/doc/cargo
+#usr/share/doc/cargo/LICENSE-APACHE
+#usr/share/doc/cargo/LICENSE-MIT
+#usr/share/doc/cargo/LICENSE-THIRD-PARTY
+#usr/share/doc/cargo/README.md
+#usr/share/doc/rust
+#usr/share/doc/rust/COPYRIGHT
+#usr/share/doc/rust/LICENSE-APACHE
+#usr/share/doc/rust/LICENSE-MIT
+#usr/share/doc/rust/README.md
+#usr/share/man/man1/cargo-bench.1
+#usr/share/man/man1/cargo-build.1
+#usr/share/man/man1/cargo-check.1
+#usr/share/man/man1/cargo-clean.1
+#usr/share/man/man1/cargo-doc.1
+#usr/share/man/man1/cargo-fetch.1
+#usr/share/man/man1/cargo-fix.1
+#usr/share/man/man1/cargo-generate-lockfile.1
+#usr/share/man/man1/cargo-help.1
+#usr/share/man/man1/cargo-init.1
+#usr/share/man/man1/cargo-install.1
+#usr/share/man/man1/cargo-locate-project.1
+#usr/share/man/man1/cargo-login.1
+#usr/share/man/man1/cargo-metadata.1
+#usr/share/man/man1/cargo-new.1
+#usr/share/man/man1/cargo-owner.1
+#usr/share/man/man1/cargo-package.1
+#usr/share/man/man1/cargo-pkgid.1
+#usr/share/man/man1/cargo-publish.1
+#usr/share/man/man1/cargo-run.1
+#usr/share/man/man1/cargo-rustc.1
+#usr/share/man/man1/cargo-rustdoc.1
+#usr/share/man/man1/cargo-search.1
+#usr/share/man/man1/cargo-test.1
+#usr/share/man/man1/cargo-uninstall.1
+#usr/share/man/man1/cargo-update.1
+#usr/share/man/man1/cargo-vendor.1
+#usr/share/man/man1/cargo-verify-project.1
+#usr/share/man/man1/cargo-version.1
+#usr/share/man/man1/cargo-yank.1
+#usr/share/man/man1/cargo.1
+#usr/share/man/man1/rustc.1
+#usr/share/man/man1/rustdoc.1
+#usr/share/zsh
+#usr/share/zsh/site-functions
+#usr/share/zsh/site-functions/_cargo
diff --git a/config/rootfiles/common/x86_64/stage2 b/config/rootfiles/common/x86_64/stage2
index 5734b4542..d90e3d70a 100644
--- a/config/rootfiles/common/x86_64/stage2
+++ b/config/rootfiles/common/x86_64/stage2
@@ -100,7 +100,6 @@ usr/local/bin/qosd
usr/local/bin/readhash
usr/local/bin/rebuild-initrd
usr/local/bin/run-parts
-#usr/local/bin/sanedloop
usr/local/bin/scanhd
usr/local/bin/settime
usr/local/bin/timecheck
diff --git a/config/rootfiles/core/137/filelists/Net_SSLeay b/config/rootfiles/core/137/filelists/Net_SSLeay
new file mode 120000
index 000000000..13fe0560c
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/Net_SSLeay
@@ -0,0 +1 @@
+../../../common/Net_SSLeay
\ No newline at end of file
diff --git a/config/rootfiles/core/137/filelists/bind b/config/rootfiles/core/137/filelists/bind
new file mode 120000
index 000000000..48a0ebaef
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/bind
@@ -0,0 +1 @@
+../../../common/bind
\ No newline at end of file
diff --git a/config/rootfiles/core/137/filelists/collectd b/config/rootfiles/core/137/filelists/collectd
new file mode 120000
index 000000000..871b32f14
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/collectd
@@ -0,0 +1 @@
+../../../common/collectd
\ No newline at end of file
diff --git a/config/rootfiles/core/137/filelists/dhcpcd b/config/rootfiles/core/137/filelists/dhcpcd
new file mode 120000
index 000000000..1e799dabb
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/dhcpcd
@@ -0,0 +1 @@
+../../../common/dhcpcd
\ No newline at end of file
diff --git a/config/rootfiles/core/137/filelists/files b/config/rootfiles/core/137/filelists/files
index ce4e51768..72f83ef89 100644
--- a/config/rootfiles/core/137/filelists/files
+++ b/config/rootfiles/core/137/filelists/files
@@ -2,3 +2,10 @@ etc/system-release
etc/issue
srv/web/ipfire/cgi-bin/credits.cgi
var/ipfire/langs
+etc/logrotate.conf
+etc/rc.d/init.d/firewall
+etc/rc.d/init.d/unbound
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+usr/lib/firewall/rules.pl
+usr/sbin/firewall-policy
diff --git a/config/rootfiles/core/137/filelists/iproute2 b/config/rootfiles/core/137/filelists/iproute2
new file mode 120000
index 000000000..05f0f71fb
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/iproute2
@@ -0,0 +1 @@
+../../../common/iproute2
\ No newline at end of file
diff --git a/config/rootfiles/core/137/filelists/iptables b/config/rootfiles/core/137/filelists/iptables
new file mode 120000
index 000000000..8caf12bcc
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/iptables
@@ -0,0 +1 @@
+../../../common/iptables
\ No newline at end of file
diff --git a/config/rootfiles/core/137/filelists/knot b/config/rootfiles/core/137/filelists/knot
new file mode 120000
index 000000000..28e96f878
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/knot
@@ -0,0 +1 @@
+../../../common/knot
\ No newline at end of file
diff --git a/config/rootfiles/core/137/filelists/libhtp b/config/rootfiles/core/137/filelists/libhtp
new file mode 120000
index 000000000..676e2c5e8
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/libhtp
@@ -0,0 +1 @@
+../../../common/libhtp
\ No newline at end of file
diff --git a/config/rootfiles/core/137/filelists/libnetfilter_queue b/config/rootfiles/core/137/filelists/libnetfilter_queue
new file mode 120000
index 000000000..9344b04bf
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/libnetfilter_queue
@@ -0,0 +1 @@
+../../../common/libnetfilter_queue
\ No newline at end of file
diff --git a/config/rootfiles/core/137/filelists/libpcap b/config/rootfiles/core/137/filelists/libpcap
new file mode 120000
index 000000000..c7f9f52a8
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/libpcap
@@ -0,0 +1 @@
+../../../common/libpcap
\ No newline at end of file
diff --git a/config/rootfiles/core/137/filelists/libssh b/config/rootfiles/core/137/filelists/libssh
new file mode 120000
index 000000000..ecbb67053
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/libssh
@@ -0,0 +1 @@
+../../../common/libssh
\ No newline at end of file
diff --git a/config/rootfiles/core/137/filelists/pcre b/config/rootfiles/core/137/filelists/pcre
new file mode 120000
index 000000000..b390d9a36
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/pcre
@@ -0,0 +1 @@
+../../../common/pcre
\ No newline at end of file
diff --git a/config/rootfiles/core/137/filelists/strongswan b/config/rootfiles/core/137/filelists/strongswan
new file mode 120000
index 000000000..90c727e26
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/137/filelists/suricata b/config/rootfiles/core/137/filelists/suricata
new file mode 120000
index 000000000..f671f6993
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/suricata
@@ -0,0 +1 @@
+../../../common/suricata
\ No newline at end of file
diff --git a/config/rootfiles/core/137/filelists/tzdata b/config/rootfiles/core/137/filelists/tzdata
new file mode 120000
index 000000000..5a6e3252f
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/tzdata
@@ -0,0 +1 @@
+../../../common/tzdata
\ No newline at end of file
diff --git a/config/rootfiles/core/137/filelists/unbound b/config/rootfiles/core/137/filelists/unbound
new file mode 120000
index 000000000..66adf0924
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/unbound
@@ -0,0 +1 @@
+../../../common/unbound
\ No newline at end of file
diff --git a/config/rootfiles/core/137/filelists/wpa_supplicant b/config/rootfiles/core/137/filelists/wpa_supplicant
new file mode 120000
index 000000000..1d04c03c0
--- /dev/null
+++ b/config/rootfiles/core/137/filelists/wpa_supplicant
@@ -0,0 +1 @@
+../../../common/wpa_supplicant
\ No newline at end of file
diff --git a/config/rootfiles/packages/aarch64/sane b/config/rootfiles/packages/aarch64/sane
deleted file mode 100644
index d8ec6c28c..000000000
--- a/config/rootfiles/packages/aarch64/sane
+++ /dev/null
@@ -1,630 +0,0 @@
-etc/rc.d/init.d/sane
-etc/rc.d/rc0.d/K10sane
-etc/rc.d/rc3.d/S95sane
-etc/rc.d/rc6.d/K10sane
-#etc/sane.d
-etc/sane.d/abaton.conf
-etc/sane.d/agfafocus.conf
-etc/sane.d/apple.conf
-etc/sane.d/artec.conf
-etc/sane.d/artec_eplus48u.conf
-etc/sane.d/avision.conf
-etc/sane.d/bh.conf
-etc/sane.d/canon.conf
-etc/sane.d/canon630u.conf
-etc/sane.d/canon_dr.conf
-etc/sane.d/cardscan.conf
-etc/sane.d/coolscan.conf
-etc/sane.d/coolscan2.conf
-etc/sane.d/coolscan3.conf
-etc/sane.d/dc210.conf
-etc/sane.d/dc240.conf
-etc/sane.d/dc25.conf
-etc/sane.d/dell1600n_net.conf
-etc/sane.d/dll.conf
-etc/sane.d/dll.d
-etc/sane.d/dmc.conf
-etc/sane.d/epjitsu.conf
-etc/sane.d/epson.conf
-etc/sane.d/epson2.conf
-etc/sane.d/fujitsu.conf
-etc/sane.d/genesys.conf
-etc/sane.d/gt68xx.conf
-etc/sane.d/hp.conf
-etc/sane.d/hp3900.conf
-etc/sane.d/hp4200.conf
-etc/sane.d/hp5400.conf
-etc/sane.d/hs2p.conf
-etc/sane.d/ibm.conf
-etc/sane.d/kodak.conf
-etc/sane.d/kodakaio.conf
-etc/sane.d/leo.conf
-etc/sane.d/lexmark.conf
-etc/sane.d/ma1509.conf
-etc/sane.d/magicolor.conf
-etc/sane.d/matsushita.conf
-etc/sane.d/microtek.conf
-etc/sane.d/microtek2.conf
-etc/sane.d/mustek.conf
-etc/sane.d/mustek_pp.conf
-etc/sane.d/mustek_usb.conf
-etc/sane.d/nec.conf
-etc/sane.d/net.conf
-etc/sane.d/p5.conf
-etc/sane.d/pie.conf
-etc/sane.d/pixma.conf
-etc/sane.d/plustek.conf
-etc/sane.d/plustek_pp.conf
-etc/sane.d/ricoh.conf
-etc/sane.d/rts8891.conf
-etc/sane.d/s9036.conf
-etc/sane.d/saned.conf
-etc/sane.d/sceptre.conf
-etc/sane.d/sharp.conf
-etc/sane.d/sm3840.conf
-etc/sane.d/snapscan.conf
-etc/sane.d/sp15c.conf
-etc/sane.d/st400.conf
-etc/sane.d/stv680.conf
-etc/sane.d/tamarack.conf
-etc/sane.d/teco1.conf
-etc/sane.d/teco2.conf
-etc/sane.d/teco3.conf
-etc/sane.d/test.conf
-etc/sane.d/u12.conf
-etc/sane.d/umax.conf
-etc/sane.d/umax1220u.conf
-etc/sane.d/umax_pp.conf
-etc/sane.d/xerox_mfp.conf
-usr/bin/gamma4scanimage
-usr/bin/sane-config
-usr/bin/sane-find-scanner
-usr/bin/scanimage
-usr/doc/sane-1.0.24
-#usr/doc/sane-1.0.24/AUTHORS
-#usr/doc/sane-1.0.24/COPYING
-#usr/doc/sane-1.0.24/ChangeLog
-#usr/doc/sane-1.0.24/LICENSE
-#usr/doc/sane-1.0.24/NEWS
-#usr/doc/sane-1.0.24/PROBLEMS
-#usr/doc/sane-1.0.24/PROJECTS
-#usr/doc/sane-1.0.24/README
-#usr/doc/sane-1.0.24/README.aix
-#usr/doc/sane-1.0.24/README.beos
-#usr/doc/sane-1.0.24/README.darwin
-#usr/doc/sane-1.0.24/README.djpeg
-#usr/doc/sane-1.0.24/README.freebsd
-#usr/doc/sane-1.0.24/README.hp-ux
-#usr/doc/sane-1.0.24/README.linux
-#usr/doc/sane-1.0.24/README.netbsd
-#usr/doc/sane-1.0.24/README.openbsd
-#usr/doc/sane-1.0.24/README.os2
-#usr/doc/sane-1.0.24/README.solaris
-#usr/doc/sane-1.0.24/README.unixware2
-#usr/doc/sane-1.0.24/README.unixware7
-#usr/doc/sane-1.0.24/README.windows
-#usr/doc/sane-1.0.24/README.zeta
-#usr/doc/sane-1.0.24/backend-writing.txt
-#usr/doc/sane-1.0.24/canon
-#usr/doc/sane-1.0.24/canon/canon.changes
-#usr/doc/sane-1.0.24/canon/canon.install2700F.txt
-#usr/doc/sane-1.0.24/gt68xx
-#usr/doc/sane-1.0.24/gt68xx/gt68xx.CHANGES
-#usr/doc/sane-1.0.24/gt68xx/gt68xx.TODO
-#usr/doc/sane-1.0.24/leo
-#usr/doc/sane-1.0.24/leo/leo.txt
-#usr/doc/sane-1.0.24/matsushita
-#usr/doc/sane-1.0.24/matsushita/matsushita.txt
-#usr/doc/sane-1.0.24/mustek
-#usr/doc/sane-1.0.24/mustek/mustek.CHANGES
-#usr/doc/sane-1.0.24/mustek_usb
-#usr/doc/sane-1.0.24/mustek_usb/mustek_usb.CHANGES
-#usr/doc/sane-1.0.24/mustek_usb/mustek_usb.TODO
-#usr/doc/sane-1.0.24/mustek_usb2
-#usr/doc/sane-1.0.24/mustek_usb2/mustek_usb2.CHANGES
-#usr/doc/sane-1.0.24/mustek_usb2/mustek_usb2.TODO
-#usr/doc/sane-1.0.24/niash
-#usr/doc/sane-1.0.24/niash/niash.TODO
-#usr/doc/sane-1.0.24/plustek
-#usr/doc/sane-1.0.24/plustek/FAQ
-#usr/doc/sane-1.0.24/plustek/MakeModule.sh
-#usr/doc/sane-1.0.24/plustek/Makefile.kernel24
-#usr/doc/sane-1.0.24/plustek/Makefile.kernel26
-#usr/doc/sane-1.0.24/plustek/Plustek-PARPORT-TODO.txt
-#usr/doc/sane-1.0.24/plustek/Plustek-PARPORT.changes
-#usr/doc/sane-1.0.24/plustek/Plustek-PARPORT.txt
-#usr/doc/sane-1.0.24/plustek/Plustek-USB-TODO.txt
-#usr/doc/sane-1.0.24/plustek/Plustek-USB.changes
-#usr/doc/sane-1.0.24/plustek/Plustek-USB.txt
-#usr/doc/sane-1.0.24/sane-backends-external.html
-#usr/doc/sane-1.0.24/sane-backends.html
-#usr/doc/sane-1.0.24/sane-mfgs-external.html
-#usr/doc/sane-1.0.24/sane-mfgs.html
-#usr/doc/sane-1.0.24/sceptre
-#usr/doc/sane-1.0.24/sceptre/s1200.txt
-#usr/doc/sane-1.0.24/teco
-#usr/doc/sane-1.0.24/teco/teco1.txt
-#usr/doc/sane-1.0.24/teco/teco2.txt
-#usr/doc/sane-1.0.24/teco/teco3.txt
-#usr/doc/sane-1.0.24/u12
-#usr/doc/sane-1.0.24/u12/U12.changes
-#usr/doc/sane-1.0.24/u12/U12.todo
-#usr/doc/sane-1.0.24/umax
-#usr/doc/sane-1.0.24/umax/negative-types.txt
-#usr/doc/sane-1.0.24/umax/sane-logo.jpg
-#usr/doc/sane-1.0.24/umax/sane-umax-advanced-options-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-advanced.jpg
-#usr/doc/sane-1.0.24/umax/sane-umax-astra-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-config-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-histogram.jpg
-#usr/doc/sane-1.0.24/umax/sane-umax-mirage-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-not-listed-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-others-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-parport-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-powerlook-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-scanner-clones-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-speed-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-standard-options-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-standard.jpg
-#usr/doc/sane-1.0.24/umax/sane-umax-text.jpg
-#usr/doc/sane-1.0.24/umax/sane-umax-text2.jpg
-#usr/doc/sane-1.0.24/umax/sane-umax-text4.jpg
-#usr/doc/sane-1.0.24/umax/sane-umax-uc-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-vista-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax.jpg
-#usr/doc/sane-1.0.24/umax/umax.BUGS
-#usr/doc/sane-1.0.24/umax/umax.CHANGES
-#usr/doc/sane-1.0.24/umax/umax.FAQ
-#usr/doc/sane-1.0.24/umax/umax.TODO
-#usr/include/sane
-usr/include/sane/sane.h
-usr/include/sane/saneopts.h
-#usr/lib/libsane.la
-usr/lib/libsane.so
-usr/lib/libsane.so.1
-usr/lib/libsane.so.1.0.24
-#usr/lib/pkgconfig/sane-backends.pc
-#usr/lib/sane
-#usr/lib/sane/libsane-abaton.la
-usr/lib/sane/libsane-abaton.so
-usr/lib/sane/libsane-abaton.so.1
-usr/lib/sane/libsane-abaton.so.1.0.24
-#usr/lib/sane/libsane-agfafocus.la
-usr/lib/sane/libsane-agfafocus.so
-usr/lib/sane/libsane-agfafocus.so.1
-usr/lib/sane/libsane-agfafocus.so.1.0.24
-#usr/lib/sane/libsane-apple.la
-usr/lib/sane/libsane-apple.so
-usr/lib/sane/libsane-apple.so.1
-usr/lib/sane/libsane-apple.so.1.0.24
-#usr/lib/sane/libsane-artec.la
-usr/lib/sane/libsane-artec.so
-usr/lib/sane/libsane-artec.so.1
-usr/lib/sane/libsane-artec.so.1.0.24
-#usr/lib/sane/libsane-artec_eplus48u.la
-usr/lib/sane/libsane-artec_eplus48u.so
-usr/lib/sane/libsane-artec_eplus48u.so.1
-usr/lib/sane/libsane-artec_eplus48u.so.1.0.24
-#usr/lib/sane/libsane-as6e.la
-usr/lib/sane/libsane-as6e.so
-usr/lib/sane/libsane-as6e.so.1
-usr/lib/sane/libsane-as6e.so.1.0.24
-#usr/lib/sane/libsane-avision.la
-usr/lib/sane/libsane-avision.so
-usr/lib/sane/libsane-avision.so.1
-usr/lib/sane/libsane-avision.so.1.0.24
-#usr/lib/sane/libsane-bh.la
-usr/lib/sane/libsane-bh.so
-usr/lib/sane/libsane-bh.so.1
-usr/lib/sane/libsane-bh.so.1.0.24
-#usr/lib/sane/libsane-canon.la
-usr/lib/sane/libsane-canon.so
-usr/lib/sane/libsane-canon.so.1
-usr/lib/sane/libsane-canon.so.1.0.24
-#usr/lib/sane/libsane-canon630u.la
-usr/lib/sane/libsane-canon630u.so
-usr/lib/sane/libsane-canon630u.so.1
-usr/lib/sane/libsane-canon630u.so.1.0.24
-#usr/lib/sane/libsane-canon_dr.la
-usr/lib/sane/libsane-canon_dr.so
-usr/lib/sane/libsane-canon_dr.so.1
-usr/lib/sane/libsane-canon_dr.so.1.0.24
-#usr/lib/sane/libsane-cardscan.la
-usr/lib/sane/libsane-cardscan.so
-usr/lib/sane/libsane-cardscan.so.1
-usr/lib/sane/libsane-cardscan.so.1.0.24
-#usr/lib/sane/libsane-coolscan.la
-usr/lib/sane/libsane-coolscan.so
-usr/lib/sane/libsane-coolscan.so.1
-usr/lib/sane/libsane-coolscan.so.1.0.24
-#usr/lib/sane/libsane-coolscan2.la
-usr/lib/sane/libsane-coolscan2.so
-usr/lib/sane/libsane-coolscan2.so.1
-usr/lib/sane/libsane-coolscan2.so.1.0.24
-#usr/lib/sane/libsane-coolscan3.la
-usr/lib/sane/libsane-coolscan3.so
-usr/lib/sane/libsane-coolscan3.so.1
-usr/lib/sane/libsane-coolscan3.so.1.0.24
-#usr/lib/sane/libsane-dc210.la
-usr/lib/sane/libsane-dc210.so
-usr/lib/sane/libsane-dc210.so.1
-usr/lib/sane/libsane-dc210.so.1.0.24
-#usr/lib/sane/libsane-dc240.la
-usr/lib/sane/libsane-dc240.so
-usr/lib/sane/libsane-dc240.so.1
-usr/lib/sane/libsane-dc240.so.1.0.24
-#usr/lib/sane/libsane-dc25.la
-usr/lib/sane/libsane-dc25.so
-usr/lib/sane/libsane-dc25.so.1
-usr/lib/sane/libsane-dc25.so.1.0.24
-#usr/lib/sane/libsane-dell1600n_net.la
-usr/lib/sane/libsane-dell1600n_net.so
-usr/lib/sane/libsane-dell1600n_net.so.1
-usr/lib/sane/libsane-dell1600n_net.so.1.0.24
-#usr/lib/sane/libsane-dll.la
-usr/lib/sane/libsane-dll.so
-usr/lib/sane/libsane-dll.so.1
-usr/lib/sane/libsane-dll.so.1.0.24
-#usr/lib/sane/libsane-dmc.la
-usr/lib/sane/libsane-dmc.so
-usr/lib/sane/libsane-dmc.so.1
-usr/lib/sane/libsane-dmc.so.1.0.24
-#usr/lib/sane/libsane-epjitsu.la
-usr/lib/sane/libsane-epjitsu.so
-usr/lib/sane/libsane-epjitsu.so.1
-usr/lib/sane/libsane-epjitsu.so.1.0.24
-#usr/lib/sane/libsane-epson.la
-usr/lib/sane/libsane-epson.so
-usr/lib/sane/libsane-epson.so.1
-usr/lib/sane/libsane-epson.so.1.0.24
-#usr/lib/sane/libsane-epson2.la
-usr/lib/sane/libsane-epson2.so
-usr/lib/sane/libsane-epson2.so.1
-usr/lib/sane/libsane-epson2.so.1.0.24
-#usr/lib/sane/libsane-fujitsu.la
-usr/lib/sane/libsane-fujitsu.so
-usr/lib/sane/libsane-fujitsu.so.1
-usr/lib/sane/libsane-fujitsu.so.1.0.24
-#usr/lib/sane/libsane-genesys.la
-usr/lib/sane/libsane-genesys.so
-usr/lib/sane/libsane-genesys.so.1
-usr/lib/sane/libsane-genesys.so.1.0.24
-#usr/lib/sane/libsane-gt68xx.la
-usr/lib/sane/libsane-gt68xx.so
-usr/lib/sane/libsane-gt68xx.so.1
-usr/lib/sane/libsane-gt68xx.so.1.0.24
-#usr/lib/sane/libsane-hp.la
-usr/lib/sane/libsane-hp.so
-usr/lib/sane/libsane-hp.so.1
-usr/lib/sane/libsane-hp.so.1.0.24
-#usr/lib/sane/libsane-hp3500.la
-usr/lib/sane/libsane-hp3500.so
-usr/lib/sane/libsane-hp3500.so.1
-usr/lib/sane/libsane-hp3500.so.1.0.24
-#usr/lib/sane/libsane-hp3900.la
-usr/lib/sane/libsane-hp3900.so
-usr/lib/sane/libsane-hp3900.so.1
-usr/lib/sane/libsane-hp3900.so.1.0.24
-#usr/lib/sane/libsane-hp4200.la
-usr/lib/sane/libsane-hp4200.so
-usr/lib/sane/libsane-hp4200.so.1
-usr/lib/sane/libsane-hp4200.so.1.0.24
-#usr/lib/sane/libsane-hp5400.la
-usr/lib/sane/libsane-hp5400.so
-usr/lib/sane/libsane-hp5400.so.1
-usr/lib/sane/libsane-hp5400.so.1.0.24
-#usr/lib/sane/libsane-hp5590.la
-usr/lib/sane/libsane-hp5590.so
-usr/lib/sane/libsane-hp5590.so.1
-usr/lib/sane/libsane-hp5590.so.1.0.24
-#usr/lib/sane/libsane-hpljm1005.la
-usr/lib/sane/libsane-hpljm1005.so
-usr/lib/sane/libsane-hpljm1005.so.1
-usr/lib/sane/libsane-hpljm1005.so.1.0.24
-#usr/lib/sane/libsane-hs2p.la
-usr/lib/sane/libsane-hs2p.so
-usr/lib/sane/libsane-hs2p.so.1
-usr/lib/sane/libsane-hs2p.so.1.0.24
-#usr/lib/sane/libsane-ibm.la
-usr/lib/sane/libsane-ibm.so
-usr/lib/sane/libsane-ibm.so.1
-usr/lib/sane/libsane-ibm.so.1.0.24
-#usr/lib/sane/libsane-kodak.la
-usr/lib/sane/libsane-kodak.so
-usr/lib/sane/libsane-kodak.so.1
-usr/lib/sane/libsane-kodak.so.1.0.24
-#usr/lib/sane/libsane-kodakaio.la
-usr/lib/sane/libsane-kodakaio.so
-usr/lib/sane/libsane-kodakaio.so.1
-usr/lib/sane/libsane-kodakaio.so.1.0.24
-#usr/lib/sane/libsane-kvs1025.la
-usr/lib/sane/libsane-kvs1025.so
-usr/lib/sane/libsane-kvs1025.so.1
-usr/lib/sane/libsane-kvs1025.so.1.0.24
-#usr/lib/sane/libsane-kvs20xx.la
-usr/lib/sane/libsane-kvs20xx.so
-usr/lib/sane/libsane-kvs20xx.so.1
-usr/lib/sane/libsane-kvs20xx.so.1.0.24
-#usr/lib/sane/libsane-kvs40xx.la
-usr/lib/sane/libsane-kvs40xx.so
-usr/lib/sane/libsane-kvs40xx.so.1
-usr/lib/sane/libsane-kvs40xx.so.1.0.24
-#usr/lib/sane/libsane-leo.la
-usr/lib/sane/libsane-leo.so
-usr/lib/sane/libsane-leo.so.1
-usr/lib/sane/libsane-leo.so.1.0.24
-#usr/lib/sane/libsane-lexmark.la
-usr/lib/sane/libsane-lexmark.so
-usr/lib/sane/libsane-lexmark.so.1
-usr/lib/sane/libsane-lexmark.so.1.0.24
-#usr/lib/sane/libsane-ma1509.la
-usr/lib/sane/libsane-ma1509.so
-usr/lib/sane/libsane-ma1509.so.1
-usr/lib/sane/libsane-ma1509.so.1.0.24
-#usr/lib/sane/libsane-magicolor.la
-usr/lib/sane/libsane-magicolor.so
-usr/lib/sane/libsane-magicolor.so.1
-usr/lib/sane/libsane-magicolor.so.1.0.24
-#usr/lib/sane/libsane-matsushita.la
-usr/lib/sane/libsane-matsushita.so
-usr/lib/sane/libsane-matsushita.so.1
-usr/lib/sane/libsane-matsushita.so.1.0.24
-#usr/lib/sane/libsane-microtek.la
-usr/lib/sane/libsane-microtek.so
-usr/lib/sane/libsane-microtek.so.1
-usr/lib/sane/libsane-microtek.so.1.0.24
-#usr/lib/sane/libsane-microtek2.la
-usr/lib/sane/libsane-microtek2.so
-usr/lib/sane/libsane-microtek2.so.1
-usr/lib/sane/libsane-microtek2.so.1.0.24
-#usr/lib/sane/libsane-mustek.la
-usr/lib/sane/libsane-mustek.so
-usr/lib/sane/libsane-mustek.so.1
-usr/lib/sane/libsane-mustek.so.1.0.24
-#usr/lib/sane/libsane-mustek_pp.la
-usr/lib/sane/libsane-mustek_pp.so
-usr/lib/sane/libsane-mustek_pp.so.1
-usr/lib/sane/libsane-mustek_pp.so.1.0.24
-#usr/lib/sane/libsane-mustek_usb.la
-usr/lib/sane/libsane-mustek_usb.so
-usr/lib/sane/libsane-mustek_usb.so.1
-usr/lib/sane/libsane-mustek_usb.so.1.0.24
-#usr/lib/sane/libsane-mustek_usb2.la
-usr/lib/sane/libsane-mustek_usb2.so
-usr/lib/sane/libsane-mustek_usb2.so.1
-usr/lib/sane/libsane-mustek_usb2.so.1.0.24
-#usr/lib/sane/libsane-nec.la
-usr/lib/sane/libsane-nec.so
-usr/lib/sane/libsane-nec.so.1
-usr/lib/sane/libsane-nec.so.1.0.24
-#usr/lib/sane/libsane-net.la
-usr/lib/sane/libsane-net.so
-usr/lib/sane/libsane-net.so.1
-usr/lib/sane/libsane-net.so.1.0.24
-#usr/lib/sane/libsane-niash.la
-usr/lib/sane/libsane-niash.so
-usr/lib/sane/libsane-niash.so.1
-usr/lib/sane/libsane-niash.so.1.0.24
-#usr/lib/sane/libsane-p5.la
-usr/lib/sane/libsane-p5.so
-usr/lib/sane/libsane-p5.so.1
-usr/lib/sane/libsane-p5.so.1.0.24
-#usr/lib/sane/libsane-pie.la
-usr/lib/sane/libsane-pie.so
-usr/lib/sane/libsane-pie.so.1
-usr/lib/sane/libsane-pie.so.1.0.24
-#usr/lib/sane/libsane-pixma.la
-usr/lib/sane/libsane-pixma.so
-usr/lib/sane/libsane-pixma.so.1
-usr/lib/sane/libsane-pixma.so.1.0.24
-#usr/lib/sane/libsane-plustek.la
-usr/lib/sane/libsane-plustek.so
-usr/lib/sane/libsane-plustek.so.1
-usr/lib/sane/libsane-plustek.so.1.0.24
-#usr/lib/sane/libsane-plustek_pp.la
-usr/lib/sane/libsane-plustek_pp.so
-usr/lib/sane/libsane-plustek_pp.so.1
-usr/lib/sane/libsane-plustek_pp.so.1.0.24
-#usr/lib/sane/libsane-ricoh.la
-usr/lib/sane/libsane-ricoh.so
-usr/lib/sane/libsane-ricoh.so.1
-usr/lib/sane/libsane-ricoh.so.1.0.24
-#usr/lib/sane/libsane-rts8891.la
-usr/lib/sane/libsane-rts8891.so
-usr/lib/sane/libsane-rts8891.so.1
-usr/lib/sane/libsane-rts8891.so.1.0.24
-#usr/lib/sane/libsane-s9036.la
-usr/lib/sane/libsane-s9036.so
-usr/lib/sane/libsane-s9036.so.1
-usr/lib/sane/libsane-s9036.so.1.0.24
-#usr/lib/sane/libsane-sceptre.la
-usr/lib/sane/libsane-sceptre.so
-usr/lib/sane/libsane-sceptre.so.1
-usr/lib/sane/libsane-sceptre.so.1.0.24
-#usr/lib/sane/libsane-sharp.la
-usr/lib/sane/libsane-sharp.so
-usr/lib/sane/libsane-sharp.so.1
-usr/lib/sane/libsane-sharp.so.1.0.24
-#usr/lib/sane/libsane-sm3600.la
-usr/lib/sane/libsane-sm3600.so
-usr/lib/sane/libsane-sm3600.so.1
-usr/lib/sane/libsane-sm3600.so.1.0.24
-#usr/lib/sane/libsane-sm3840.la
-usr/lib/sane/libsane-sm3840.so
-usr/lib/sane/libsane-sm3840.so.1
-usr/lib/sane/libsane-sm3840.so.1.0.24
-#usr/lib/sane/libsane-snapscan.la
-usr/lib/sane/libsane-snapscan.so
-usr/lib/sane/libsane-snapscan.so.1
-usr/lib/sane/libsane-snapscan.so.1.0.24
-#usr/lib/sane/libsane-sp15c.la
-usr/lib/sane/libsane-sp15c.so
-usr/lib/sane/libsane-sp15c.so.1
-usr/lib/sane/libsane-sp15c.so.1.0.24
-#usr/lib/sane/libsane-st400.la
-usr/lib/sane/libsane-st400.so
-usr/lib/sane/libsane-st400.so.1
-usr/lib/sane/libsane-st400.so.1.0.24
-#usr/lib/sane/libsane-stv680.la
-usr/lib/sane/libsane-stv680.so
-usr/lib/sane/libsane-stv680.so.1
-usr/lib/sane/libsane-stv680.so.1.0.24
-#usr/lib/sane/libsane-tamarack.la
-usr/lib/sane/libsane-tamarack.so
-usr/lib/sane/libsane-tamarack.so.1
-usr/lib/sane/libsane-tamarack.so.1.0.24
-#usr/lib/sane/libsane-teco1.la
-usr/lib/sane/libsane-teco1.so
-usr/lib/sane/libsane-teco1.so.1
-usr/lib/sane/libsane-teco1.so.1.0.24
-#usr/lib/sane/libsane-teco2.la
-usr/lib/sane/libsane-teco2.so
-usr/lib/sane/libsane-teco2.so.1
-usr/lib/sane/libsane-teco2.so.1.0.24
-#usr/lib/sane/libsane-teco3.la
-usr/lib/sane/libsane-teco3.so
-usr/lib/sane/libsane-teco3.so.1
-usr/lib/sane/libsane-teco3.so.1.0.24
-#usr/lib/sane/libsane-test.la
-usr/lib/sane/libsane-test.so
-usr/lib/sane/libsane-test.so.1
-usr/lib/sane/libsane-test.so.1.0.24
-#usr/lib/sane/libsane-u12.la
-usr/lib/sane/libsane-u12.so
-usr/lib/sane/libsane-u12.so.1
-usr/lib/sane/libsane-u12.so.1.0.24
-#usr/lib/sane/libsane-umax.la
-usr/lib/sane/libsane-umax.so
-usr/lib/sane/libsane-umax.so.1
-usr/lib/sane/libsane-umax.so.1.0.24
-#usr/lib/sane/libsane-umax1220u.la
-usr/lib/sane/libsane-umax1220u.so
-usr/lib/sane/libsane-umax1220u.so.1
-usr/lib/sane/libsane-umax1220u.so.1.0.24
-#usr/lib/sane/libsane-umax_pp.la
-usr/lib/sane/libsane-umax_pp.so
-usr/lib/sane/libsane-umax_pp.so.1
-usr/lib/sane/libsane-umax_pp.so.1.0.24
-#usr/lib/sane/libsane-xerox_mfp.la
-usr/lib/sane/libsane-xerox_mfp.so
-usr/lib/sane/libsane-xerox_mfp.so.1
-usr/lib/sane/libsane-xerox_mfp.so.1.0.24
-usr/sbin/saned
-#usr/share/locale/bg/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/cs/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/da/LC_MESSAGES/sane-backends.mo
-usr/share/locale/de/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/en_GB/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/eo/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/es/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/fi/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/fr/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/gl/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/it/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/ja/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/nb/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/nl/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/pl/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/pt/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/ru/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/sv/LC_MESSAGES/sane-backends.mo
-#usr/share/locale/uk/LC_MESSAGES/sane-backends.mo
-#usr/share/man/man1/gamma4scanimage.1
-#usr/share/man/man1/sane-config.1
-#usr/share/man/man1/sane-find-scanner.1
-#usr/share/man/man1/scanimage.1
-#usr/share/man/man5/sane-abaton.5
-#usr/share/man/man5/sane-agfafocus.5
-#usr/share/man/man5/sane-apple.5
-#usr/share/man/man5/sane-artec.5
-#usr/share/man/man5/sane-artec_eplus48u.5
-#usr/share/man/man5/sane-as6e.5
-#usr/share/man/man5/sane-avision.5
-#usr/share/man/man5/sane-bh.5
-#usr/share/man/man5/sane-canon.5
-#usr/share/man/man5/sane-canon630u.5
-#usr/share/man/man5/sane-canon_dr.5
-#usr/share/man/man5/sane-cardscan.5
-#usr/share/man/man5/sane-coolscan.5
-#usr/share/man/man5/sane-coolscan2.5
-#usr/share/man/man5/sane-coolscan3.5
-#usr/share/man/man5/sane-dc210.5
-#usr/share/man/man5/sane-dc240.5
-#usr/share/man/man5/sane-dc25.5
-#usr/share/man/man5/sane-dll.5
-#usr/share/man/man5/sane-dmc.5
-#usr/share/man/man5/sane-epjitsu.5
-#usr/share/man/man5/sane-epson.5
-#usr/share/man/man5/sane-epson2.5
-#usr/share/man/man5/sane-fujitsu.5
-#usr/share/man/man5/sane-genesys.5
-#usr/share/man/man5/sane-gt68xx.5
-#usr/share/man/man5/sane-hp.5
-#usr/share/man/man5/sane-hp3500.5
-#usr/share/man/man5/sane-hp3900.5
-#usr/share/man/man5/sane-hp4200.5
-#usr/share/man/man5/sane-hp5400.5
-#usr/share/man/man5/sane-hp5590.5
-#usr/share/man/man5/sane-hpljm1005.5
-#usr/share/man/man5/sane-hs2p.5
-#usr/share/man/man5/sane-ibm.5
-#usr/share/man/man5/sane-kodak.5
-#usr/share/man/man5/sane-kodakaio.5
-#usr/share/man/man5/sane-kvs1025.5
-#usr/share/man/man5/sane-kvs20xx.5
-#usr/share/man/man5/sane-kvs40xx.5
-#usr/share/man/man5/sane-leo.5
-#usr/share/man/man5/sane-lexmark.5
-#usr/share/man/man5/sane-ma1509.5
-#usr/share/man/man5/sane-magicolor.5
-#usr/share/man/man5/sane-matsushita.5
-#usr/share/man/man5/sane-microtek.5
-#usr/share/man/man5/sane-microtek2.5
-#usr/share/man/man5/sane-mustek.5
-#usr/share/man/man5/sane-mustek_pp.5
-#usr/share/man/man5/sane-mustek_usb.5
-#usr/share/man/man5/sane-mustek_usb2.5
-#usr/share/man/man5/sane-nec.5
-#usr/share/man/man5/sane-net.5
-#usr/share/man/man5/sane-niash.5
-#usr/share/man/man5/sane-p5.5
-#usr/share/man/man5/sane-pie.5
-#usr/share/man/man5/sane-pixma.5
-#usr/share/man/man5/sane-plustek.5
-#usr/share/man/man5/sane-plustek_pp.5
-#usr/share/man/man5/sane-ricoh.5
-#usr/share/man/man5/sane-rts8891.5
-#usr/share/man/man5/sane-s9036.5
-#usr/share/man/man5/sane-sceptre.5
-#usr/share/man/man5/sane-scsi.5
-#usr/share/man/man5/sane-sharp.5
-#usr/share/man/man5/sane-sm3600.5
-#usr/share/man/man5/sane-sm3840.5
-#usr/share/man/man5/sane-snapscan.5
-#usr/share/man/man5/sane-sp15c.5
-#usr/share/man/man5/sane-st400.5
-#usr/share/man/man5/sane-stv680.5
-#usr/share/man/man5/sane-tamarack.5
-#usr/share/man/man5/sane-teco1.5
-#usr/share/man/man5/sane-teco2.5
-#usr/share/man/man5/sane-teco3.5
-#usr/share/man/man5/sane-test.5
-#usr/share/man/man5/sane-u12.5
-#usr/share/man/man5/sane-umax.5
-#usr/share/man/man5/sane-umax1220u.5
-#usr/share/man/man5/sane-umax_pp.5
-#usr/share/man/man5/sane-usb.5
-#usr/share/man/man5/sane-xerox_mfp.5
-#usr/share/man/man7/sane.7
-#usr/share/man/man8/saned.8
-#usr/share/sane
-usr/share/sane/artec_eplus48u
-usr/share/sane/epjitsu
-usr/share/sane/gt68xx
-usr/share/sane/snapscan
-#usr/var
-#usr/var/lock
-usr/var/lock/sane
-var/ipfire/backup/addons/includes/sane
-usr/local/bin/sanedloop
diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index 9d6d68647..b66276100 100644
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -4,16 +4,19 @@ usr/bin/clambc
usr/bin/clamconf
usr/bin/clamdscan
usr/bin/clamdtop
+#usr/bin/clamonacc
usr/bin/clamscan
usr/bin/clamsubmit
usr/bin/freshclam
usr/bin/sigtool
#usr/include/clamav-types.h
+#usr/include/clamav-version.h
#usr/include/clamav.h
+#usr/include/libfreshclam.h
#usr/lib/libclamav.la
usr/lib/libclamav.so
usr/lib/libclamav.so.9
-usr/lib/libclamav.so.9.0.2
+usr/lib/libclamav.so.9.0.4
#usr/lib/libclammspack.la
usr/lib/libclammspack.so
usr/lib/libclammspack.so.0
@@ -21,11 +24,15 @@ usr/lib/libclammspack.so.0.1.0
#usr/lib/libclamunrar.la
usr/lib/libclamunrar.so
usr/lib/libclamunrar.so.9
-usr/lib/libclamunrar.so.9.0.2
+usr/lib/libclamunrar.so.9.0.4
#usr/lib/libclamunrar_iface.la
usr/lib/libclamunrar_iface.so
usr/lib/libclamunrar_iface.so.9
-usr/lib/libclamunrar_iface.so.9.0.2
+usr/lib/libclamunrar_iface.so.9.0.4
+#usr/lib/libfreshclam.la
+usr/lib/libfreshclam.so
+usr/lib/libfreshclam.so.2
+usr/lib/libfreshclam.so.2.0.0
#usr/lib/pkgconfig/libclamav.pc
usr/sbin/clamd
#usr/share/man/man1/clambc.1
diff --git a/config/rootfiles/packages/nmap b/config/rootfiles/packages/nmap
index 211a8e758..d17a1e403 100644
--- a/config/rootfiles/packages/nmap
+++ b/config/rootfiles/packages/nmap
@@ -3,7 +3,7 @@ usr/bin/nmap
usr/bin/nping
#usr/bin/uninstall_ndiff
usr/lib/python2.7/site-packages/ndiff.py
-usr/lib/python2.7/site-packages/ndiff.pyc
+#usr/lib/python2.7/site-packages/ndiff.pyc
#usr/share/man/de/man1/nmap.1
#usr/share/man/es/man1/nmap.1
#usr/share/man/fr/man1/nmap.1
@@ -59,7 +59,6 @@ usr/share/nmap/nselib/asn1.lua
usr/share/nmap/nselib/base32.lua
usr/share/nmap/nselib/base64.lua
usr/share/nmap/nselib/bin.lua
-usr/share/nmap/nselib/bit.lua
usr/share/nmap/nselib/bitcoin.lua
usr/share/nmap/nselib/bits.lua
usr/share/nmap/nselib/bittorrent.lua
@@ -150,6 +149,7 @@ usr/share/nmap/nselib/iscsi.lua
usr/share/nmap/nselib/isns.lua
usr/share/nmap/nselib/jdwp.lua
usr/share/nmap/nselib/json.lua
+usr/share/nmap/nselib/knx.lua
usr/share/nmap/nselib/ldap.lua
usr/share/nmap/nselib/lfs.luadoc
usr/share/nmap/nselib/libssh2-utility.lua
@@ -178,6 +178,7 @@ usr/share/nmap/nselib/nmap.luadoc
usr/share/nmap/nselib/nrpc.lua
usr/share/nmap/nselib/nsedebug.lua
usr/share/nmap/nselib/omp2.lua
+usr/share/nmap/nselib/oops.lua
usr/share/nmap/nselib/openssl.luadoc
usr/share/nmap/nselib/ospf.lua
usr/share/nmap/nselib/packet.lua
@@ -187,6 +188,7 @@ usr/share/nmap/nselib/pop3.lua
usr/share/nmap/nselib/pppoe.lua
usr/share/nmap/nselib/proxy.lua
usr/share/nmap/nselib/punycode.lua
+usr/share/nmap/nselib/rand.lua
usr/share/nmap/nselib/rdp.lua
usr/share/nmap/nselib/re.lua
usr/share/nmap/nselib/redis.lua
@@ -213,8 +215,10 @@ usr/share/nmap/nselib/sslv2.lua
usr/share/nmap/nselib/stdnse.lua
usr/share/nmap/nselib/strbuf.lua
usr/share/nmap/nselib/strict.lua
+usr/share/nmap/nselib/stringaux.lua
usr/share/nmap/nselib/stun.lua
usr/share/nmap/nselib/tab.lua
+usr/share/nmap/nselib/tableaux.lua
usr/share/nmap/nselib/target.lua
usr/share/nmap/nselib/tftp.lua
usr/share/nmap/nselib/tls.lua
@@ -269,7 +273,9 @@ usr/share/nmap/scripts/broadcast-dhcp6-discover.nse
usr/share/nmap/scripts/broadcast-dns-service-discovery.nse
usr/share/nmap/scripts/broadcast-dropbox-listener.nse
usr/share/nmap/scripts/broadcast-eigrp-discovery.nse
+usr/share/nmap/scripts/broadcast-hid-discoveryd.nse
usr/share/nmap/scripts/broadcast-igmp-discovery.nse
+usr/share/nmap/scripts/broadcast-jenkins-discover.nse
usr/share/nmap/scripts/broadcast-listener.nse
usr/share/nmap/scripts/broadcast-ms-sql-discover.nse
usr/share/nmap/scripts/broadcast-netbios-master-browser.nse
@@ -383,7 +389,6 @@ usr/share/nmap/scripts/hddtemp-info.nse
usr/share/nmap/scripts/hnap-info.nse
usr/share/nmap/scripts/hostmap-bfk.nse
usr/share/nmap/scripts/hostmap-crtsh.nse
-usr/share/nmap/scripts/hostmap-ip2hosts.nse
usr/share/nmap/scripts/hostmap-robtex.nse
usr/share/nmap/scripts/http-adobe-coldfusion-apsa1301.nse
usr/share/nmap/scripts/http-affiliate-id.nse
@@ -433,6 +438,7 @@ usr/share/nmap/scripts/http-gitweb-projects-enum.nse
usr/share/nmap/scripts/http-google-malware.nse
usr/share/nmap/scripts/http-grep.nse
usr/share/nmap/scripts/http-headers.nse
+usr/share/nmap/scripts/http-hp-ilo-info.nse
usr/share/nmap/scripts/http-huawei-hg5xx-vuln.nse
usr/share/nmap/scripts/http-icloud-findmyiphone.nse
usr/share/nmap/scripts/http-icloud-sendmsg.nse
@@ -464,6 +470,7 @@ usr/share/nmap/scripts/http-rfi-spider.nse
usr/share/nmap/scripts/http-robots.txt.nse
usr/share/nmap/scripts/http-robtex-reverse-ip.nse
usr/share/nmap/scripts/http-robtex-shared-ns.nse
+usr/share/nmap/scripts/http-sap-netweaver-leak.nse
usr/share/nmap/scripts/http-security-headers.nse
usr/share/nmap/scripts/http-server-header.nse
usr/share/nmap/scripts/http-shellshock.nse
@@ -517,6 +524,7 @@ usr/share/nmap/scripts/http-wordpress-brute.nse
usr/share/nmap/scripts/http-wordpress-enum.nse
usr/share/nmap/scripts/http-wordpress-users.nse
usr/share/nmap/scripts/http-xssed.nse
+usr/share/nmap/scripts/https-redirect.nse
usr/share/nmap/scripts/iax2-brute.nse
usr/share/nmap/scripts/iax2-version.nse
usr/share/nmap/scripts/icap-info.nse
@@ -566,6 +574,7 @@ usr/share/nmap/scripts/ldap-search.nse
usr/share/nmap/scripts/lexmark-config.nse
usr/share/nmap/scripts/llmnr-resolve.nse
usr/share/nmap/scripts/lltd-discovery.nse
+usr/share/nmap/scripts/lu-enum.nse
usr/share/nmap/scripts/maxdb-info.nse
usr/share/nmap/scripts/mcafee-epo-agent.nse
usr/share/nmap/scripts/membase-brute.nse
@@ -662,6 +671,7 @@ usr/share/nmap/scripts/quake1-info.nse
usr/share/nmap/scripts/quake3-info.nse
usr/share/nmap/scripts/quake3-master-getservers.nse
usr/share/nmap/scripts/rdp-enum-encryption.nse
+usr/share/nmap/scripts/rdp-ntlm-info.nse
usr/share/nmap/scripts/rdp-vuln-ms12-020.nse
usr/share/nmap/scripts/realvnc-auth-bypass.nse
usr/share/nmap/scripts/redis-brute.nse
@@ -723,6 +733,8 @@ usr/share/nmap/scripts/smb-vuln-ms10-054.nse
usr/share/nmap/scripts/smb-vuln-ms10-061.nse
usr/share/nmap/scripts/smb-vuln-ms17-010.nse
usr/share/nmap/scripts/smb-vuln-regsvc-dos.nse
+usr/share/nmap/scripts/smb-vuln-webexec.nse
+usr/share/nmap/scripts/smb-webexec-exploit.nse
usr/share/nmap/scripts/smb2-capabilities.nse
usr/share/nmap/scripts/smb2-security-mode.nse
usr/share/nmap/scripts/smb2-time.nse
@@ -799,6 +811,7 @@ usr/share/nmap/scripts/tor-consensus-checker.nse
usr/share/nmap/scripts/traceroute-geolocation.nse
usr/share/nmap/scripts/tso-brute.nse
usr/share/nmap/scripts/tso-enum.nse
+usr/share/nmap/scripts/ubiquiti-discovery.nse
usr/share/nmap/scripts/unittest.nse
usr/share/nmap/scripts/unusual-port.nse
usr/share/nmap/scripts/upnp-info.nse
@@ -812,6 +825,7 @@ usr/share/nmap/scripts/vnc-info.nse
usr/share/nmap/scripts/vnc-title.nse
usr/share/nmap/scripts/voldemort-info.nse
usr/share/nmap/scripts/vtam-enum.nse
+usr/share/nmap/scripts/vulners.nse
usr/share/nmap/scripts/vuze-dht-info.nse
usr/share/nmap/scripts/wdb-version.nse
usr/share/nmap/scripts/weblogic-t3-info.nse
diff --git a/config/rootfiles/packages/sane b/config/rootfiles/packages/sane
index 792342773..014c29574 100644
--- a/config/rootfiles/packages/sane
+++ b/config/rootfiles/packages/sane
@@ -27,6 +27,7 @@ etc/sane.d/dmc.conf
etc/sane.d/epjitsu.conf
etc/sane.d/epson.conf
etc/sane.d/epson2.conf
+etc/sane.d/epsonds.conf
etc/sane.d/fujitsu.conf
etc/sane.d/genesys.conf
etc/sane.d/gt68xx.conf
@@ -38,6 +39,7 @@ etc/sane.d/hs2p.conf
etc/sane.d/ibm.conf
etc/sane.d/kodak.conf
etc/sane.d/kodakaio.conf
+etc/sane.d/kvs1025.conf
etc/sane.d/leo.conf
etc/sane.d/lexmark.conf
etc/sane.d/ma1509.conf
@@ -52,6 +54,7 @@ etc/sane.d/nec.conf
etc/sane.d/net.conf
etc/sane.d/p5.conf
etc/sane.d/pie.conf
+etc/sane.d/pieusb.conf
etc/sane.d/pixma.conf
etc/sane.d/plustek.conf
etc/sane.d/plustek_pp.conf
@@ -81,452 +84,470 @@ usr/bin/gamma4scanimage
usr/bin/sane-config
usr/bin/sane-find-scanner
usr/bin/scanimage
-usr/doc/sane-1.0.24
-#usr/doc/sane-1.0.24/AUTHORS
-#usr/doc/sane-1.0.24/COPYING
-#usr/doc/sane-1.0.24/ChangeLog
-#usr/doc/sane-1.0.24/LICENSE
-#usr/doc/sane-1.0.24/NEWS
-#usr/doc/sane-1.0.24/PROBLEMS
-#usr/doc/sane-1.0.24/PROJECTS
-#usr/doc/sane-1.0.24/README
-#usr/doc/sane-1.0.24/README.aix
-#usr/doc/sane-1.0.24/README.beos
-#usr/doc/sane-1.0.24/README.darwin
-#usr/doc/sane-1.0.24/README.djpeg
-#usr/doc/sane-1.0.24/README.freebsd
-#usr/doc/sane-1.0.24/README.hp-ux
-#usr/doc/sane-1.0.24/README.linux
-#usr/doc/sane-1.0.24/README.netbsd
-#usr/doc/sane-1.0.24/README.openbsd
-#usr/doc/sane-1.0.24/README.os2
-#usr/doc/sane-1.0.24/README.solaris
-#usr/doc/sane-1.0.24/README.unixware2
-#usr/doc/sane-1.0.24/README.unixware7
-#usr/doc/sane-1.0.24/README.windows
-#usr/doc/sane-1.0.24/README.zeta
-#usr/doc/sane-1.0.24/backend-writing.txt
-#usr/doc/sane-1.0.24/canon
-#usr/doc/sane-1.0.24/canon/canon.changes
-#usr/doc/sane-1.0.24/canon/canon.install2700F.txt
-#usr/doc/sane-1.0.24/gt68xx
-#usr/doc/sane-1.0.24/gt68xx/gt68xx.CHANGES
-#usr/doc/sane-1.0.24/gt68xx/gt68xx.TODO
-#usr/doc/sane-1.0.24/leo
-#usr/doc/sane-1.0.24/leo/leo.txt
-#usr/doc/sane-1.0.24/matsushita
-#usr/doc/sane-1.0.24/matsushita/matsushita.txt
-#usr/doc/sane-1.0.24/mustek
-#usr/doc/sane-1.0.24/mustek/mustek.CHANGES
-#usr/doc/sane-1.0.24/mustek_usb
-#usr/doc/sane-1.0.24/mustek_usb/mustek_usb.CHANGES
-#usr/doc/sane-1.0.24/mustek_usb/mustek_usb.TODO
-#usr/doc/sane-1.0.24/mustek_usb2
-#usr/doc/sane-1.0.24/mustek_usb2/mustek_usb2.CHANGES
-#usr/doc/sane-1.0.24/mustek_usb2/mustek_usb2.TODO
-#usr/doc/sane-1.0.24/niash
-#usr/doc/sane-1.0.24/niash/niash.TODO
-#usr/doc/sane-1.0.24/plustek
-#usr/doc/sane-1.0.24/plustek/FAQ
-#usr/doc/sane-1.0.24/plustek/MakeModule.sh
-#usr/doc/sane-1.0.24/plustek/Makefile.kernel24
-#usr/doc/sane-1.0.24/plustek/Makefile.kernel26
-#usr/doc/sane-1.0.24/plustek/Plustek-PARPORT-TODO.txt
-#usr/doc/sane-1.0.24/plustek/Plustek-PARPORT.changes
-#usr/doc/sane-1.0.24/plustek/Plustek-PARPORT.txt
-#usr/doc/sane-1.0.24/plustek/Plustek-USB-TODO.txt
-#usr/doc/sane-1.0.24/plustek/Plustek-USB.changes
-#usr/doc/sane-1.0.24/plustek/Plustek-USB.txt
-#usr/doc/sane-1.0.24/sane-backends-external.html
-#usr/doc/sane-1.0.24/sane-backends.html
-#usr/doc/sane-1.0.24/sane-mfgs-external.html
-#usr/doc/sane-1.0.24/sane-mfgs.html
-#usr/doc/sane-1.0.24/sceptre
-#usr/doc/sane-1.0.24/sceptre/s1200.txt
-#usr/doc/sane-1.0.24/teco
-#usr/doc/sane-1.0.24/teco/teco1.txt
-#usr/doc/sane-1.0.24/teco/teco2.txt
-#usr/doc/sane-1.0.24/teco/teco3.txt
-#usr/doc/sane-1.0.24/u12
-#usr/doc/sane-1.0.24/u12/U12.changes
-#usr/doc/sane-1.0.24/u12/U12.todo
-#usr/doc/sane-1.0.24/umax
-#usr/doc/sane-1.0.24/umax/negative-types.txt
-#usr/doc/sane-1.0.24/umax/sane-logo.jpg
-#usr/doc/sane-1.0.24/umax/sane-umax-advanced-options-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-advanced.jpg
-#usr/doc/sane-1.0.24/umax/sane-umax-astra-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-config-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-histogram.jpg
-#usr/doc/sane-1.0.24/umax/sane-umax-mirage-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-not-listed-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-others-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-parport-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-powerlook-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-scanner-clones-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-speed-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-standard-options-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-standard.jpg
-#usr/doc/sane-1.0.24/umax/sane-umax-text.jpg
-#usr/doc/sane-1.0.24/umax/sane-umax-text2.jpg
-#usr/doc/sane-1.0.24/umax/sane-umax-text4.jpg
-#usr/doc/sane-1.0.24/umax/sane-umax-uc-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax-vista-doc.html
-#usr/doc/sane-1.0.24/umax/sane-umax.jpg
-#usr/doc/sane-1.0.24/umax/umax.BUGS
-#usr/doc/sane-1.0.24/umax/umax.CHANGES
-#usr/doc/sane-1.0.24/umax/umax.FAQ
-#usr/doc/sane-1.0.24/umax/umax.TODO
+usr/bin/umax_pp
#usr/include/sane
usr/include/sane/sane.h
usr/include/sane/saneopts.h
#usr/lib/libsane.la
usr/lib/libsane.so
usr/lib/libsane.so.1
-usr/lib/libsane.so.1.0.24
+usr/lib/libsane.so.1.0.28
#usr/lib/pkgconfig/sane-backends.pc
#usr/lib/sane
#usr/lib/sane/libsane-abaton.la
usr/lib/sane/libsane-abaton.so
usr/lib/sane/libsane-abaton.so.1
-usr/lib/sane/libsane-abaton.so.1.0.24
+usr/lib/sane/libsane-abaton.so.1.0.28
#usr/lib/sane/libsane-agfafocus.la
usr/lib/sane/libsane-agfafocus.so
usr/lib/sane/libsane-agfafocus.so.1
-usr/lib/sane/libsane-agfafocus.so.1.0.24
+usr/lib/sane/libsane-agfafocus.so.1.0.28
#usr/lib/sane/libsane-apple.la
usr/lib/sane/libsane-apple.so
usr/lib/sane/libsane-apple.so.1
-usr/lib/sane/libsane-apple.so.1.0.24
+usr/lib/sane/libsane-apple.so.1.0.28
#usr/lib/sane/libsane-artec.la
usr/lib/sane/libsane-artec.so
usr/lib/sane/libsane-artec.so.1
-usr/lib/sane/libsane-artec.so.1.0.24
+usr/lib/sane/libsane-artec.so.1.0.28
#usr/lib/sane/libsane-artec_eplus48u.la
usr/lib/sane/libsane-artec_eplus48u.so
usr/lib/sane/libsane-artec_eplus48u.so.1
-usr/lib/sane/libsane-artec_eplus48u.so.1.0.24
+usr/lib/sane/libsane-artec_eplus48u.so.1.0.28
#usr/lib/sane/libsane-as6e.la
usr/lib/sane/libsane-as6e.so
usr/lib/sane/libsane-as6e.so.1
-usr/lib/sane/libsane-as6e.so.1.0.24
+usr/lib/sane/libsane-as6e.so.1.0.28
#usr/lib/sane/libsane-avision.la
usr/lib/sane/libsane-avision.so
usr/lib/sane/libsane-avision.so.1
-usr/lib/sane/libsane-avision.so.1.0.24
+usr/lib/sane/libsane-avision.so.1.0.28
#usr/lib/sane/libsane-bh.la
usr/lib/sane/libsane-bh.so
usr/lib/sane/libsane-bh.so.1
-usr/lib/sane/libsane-bh.so.1.0.24
+usr/lib/sane/libsane-bh.so.1.0.28
#usr/lib/sane/libsane-canon.la
usr/lib/sane/libsane-canon.so
usr/lib/sane/libsane-canon.so.1
-usr/lib/sane/libsane-canon.so.1.0.24
+usr/lib/sane/libsane-canon.so.1.0.28
#usr/lib/sane/libsane-canon630u.la
usr/lib/sane/libsane-canon630u.so
usr/lib/sane/libsane-canon630u.so.1
-usr/lib/sane/libsane-canon630u.so.1.0.24
+usr/lib/sane/libsane-canon630u.so.1.0.28
#usr/lib/sane/libsane-canon_dr.la
usr/lib/sane/libsane-canon_dr.so
usr/lib/sane/libsane-canon_dr.so.1
-usr/lib/sane/libsane-canon_dr.so.1.0.24
+usr/lib/sane/libsane-canon_dr.so.1.0.28
#usr/lib/sane/libsane-cardscan.la
usr/lib/sane/libsane-cardscan.so
usr/lib/sane/libsane-cardscan.so.1
-usr/lib/sane/libsane-cardscan.so.1.0.24
+usr/lib/sane/libsane-cardscan.so.1.0.28
#usr/lib/sane/libsane-coolscan.la
usr/lib/sane/libsane-coolscan.so
usr/lib/sane/libsane-coolscan.so.1
-usr/lib/sane/libsane-coolscan.so.1.0.24
+usr/lib/sane/libsane-coolscan.so.1.0.28
#usr/lib/sane/libsane-coolscan2.la
usr/lib/sane/libsane-coolscan2.so
usr/lib/sane/libsane-coolscan2.so.1
-usr/lib/sane/libsane-coolscan2.so.1.0.24
+usr/lib/sane/libsane-coolscan2.so.1.0.28
#usr/lib/sane/libsane-coolscan3.la
usr/lib/sane/libsane-coolscan3.so
usr/lib/sane/libsane-coolscan3.so.1
-usr/lib/sane/libsane-coolscan3.so.1.0.24
+usr/lib/sane/libsane-coolscan3.so.1.0.28
#usr/lib/sane/libsane-dc210.la
usr/lib/sane/libsane-dc210.so
usr/lib/sane/libsane-dc210.so.1
-usr/lib/sane/libsane-dc210.so.1.0.24
+usr/lib/sane/libsane-dc210.so.1.0.28
#usr/lib/sane/libsane-dc240.la
usr/lib/sane/libsane-dc240.so
usr/lib/sane/libsane-dc240.so.1
-usr/lib/sane/libsane-dc240.so.1.0.24
+usr/lib/sane/libsane-dc240.so.1.0.28
#usr/lib/sane/libsane-dc25.la
usr/lib/sane/libsane-dc25.so
usr/lib/sane/libsane-dc25.so.1
-usr/lib/sane/libsane-dc25.so.1.0.24
+usr/lib/sane/libsane-dc25.so.1.0.28
#usr/lib/sane/libsane-dell1600n_net.la
usr/lib/sane/libsane-dell1600n_net.so
usr/lib/sane/libsane-dell1600n_net.so.1
-usr/lib/sane/libsane-dell1600n_net.so.1.0.24
+usr/lib/sane/libsane-dell1600n_net.so.1.0.28
#usr/lib/sane/libsane-dll.la
usr/lib/sane/libsane-dll.so
usr/lib/sane/libsane-dll.so.1
-usr/lib/sane/libsane-dll.so.1.0.24
+usr/lib/sane/libsane-dll.so.1.0.28
#usr/lib/sane/libsane-dmc.la
usr/lib/sane/libsane-dmc.so
usr/lib/sane/libsane-dmc.so.1
-usr/lib/sane/libsane-dmc.so.1.0.24
+usr/lib/sane/libsane-dmc.so.1.0.28
#usr/lib/sane/libsane-epjitsu.la
usr/lib/sane/libsane-epjitsu.so
usr/lib/sane/libsane-epjitsu.so.1
-usr/lib/sane/libsane-epjitsu.so.1.0.24
+usr/lib/sane/libsane-epjitsu.so.1.0.28
#usr/lib/sane/libsane-epson.la
usr/lib/sane/libsane-epson.so
usr/lib/sane/libsane-epson.so.1
-usr/lib/sane/libsane-epson.so.1.0.24
+usr/lib/sane/libsane-epson.so.1.0.28
#usr/lib/sane/libsane-epson2.la
usr/lib/sane/libsane-epson2.so
usr/lib/sane/libsane-epson2.so.1
-usr/lib/sane/libsane-epson2.so.1.0.24
+usr/lib/sane/libsane-epson2.so.1.0.28
+#usr/lib/sane/libsane-epsonds.la
+usr/lib/sane/libsane-epsonds.so
+usr/lib/sane/libsane-epsonds.so.1
+usr/lib/sane/libsane-epsonds.so.1.0.28
#usr/lib/sane/libsane-fujitsu.la
usr/lib/sane/libsane-fujitsu.so
usr/lib/sane/libsane-fujitsu.so.1
-usr/lib/sane/libsane-fujitsu.so.1.0.24
+usr/lib/sane/libsane-fujitsu.so.1.0.28
#usr/lib/sane/libsane-genesys.la
usr/lib/sane/libsane-genesys.so
usr/lib/sane/libsane-genesys.so.1
-usr/lib/sane/libsane-genesys.so.1.0.24
+usr/lib/sane/libsane-genesys.so.1.0.28
#usr/lib/sane/libsane-gt68xx.la
usr/lib/sane/libsane-gt68xx.so
usr/lib/sane/libsane-gt68xx.so.1
-usr/lib/sane/libsane-gt68xx.so.1.0.24
+usr/lib/sane/libsane-gt68xx.so.1.0.28
#usr/lib/sane/libsane-hp.la
usr/lib/sane/libsane-hp.so
usr/lib/sane/libsane-hp.so.1
-usr/lib/sane/libsane-hp.so.1.0.24
+usr/lib/sane/libsane-hp.so.1.0.28
#usr/lib/sane/libsane-hp3500.la
usr/lib/sane/libsane-hp3500.so
usr/lib/sane/libsane-hp3500.so.1
-usr/lib/sane/libsane-hp3500.so.1.0.24
+usr/lib/sane/libsane-hp3500.so.1.0.28
#usr/lib/sane/libsane-hp3900.la
usr/lib/sane/libsane-hp3900.so
usr/lib/sane/libsane-hp3900.so.1
-usr/lib/sane/libsane-hp3900.so.1.0.24
+usr/lib/sane/libsane-hp3900.so.1.0.28
#usr/lib/sane/libsane-hp4200.la
usr/lib/sane/libsane-hp4200.so
usr/lib/sane/libsane-hp4200.so.1
-usr/lib/sane/libsane-hp4200.so.1.0.24
+usr/lib/sane/libsane-hp4200.so.1.0.28
#usr/lib/sane/libsane-hp5400.la
usr/lib/sane/libsane-hp5400.so
usr/lib/sane/libsane-hp5400.so.1
-usr/lib/sane/libsane-hp5400.so.1.0.24
+usr/lib/sane/libsane-hp5400.so.1.0.28
#usr/lib/sane/libsane-hp5590.la
usr/lib/sane/libsane-hp5590.so
usr/lib/sane/libsane-hp5590.so.1
-usr/lib/sane/libsane-hp5590.so.1.0.24
+usr/lib/sane/libsane-hp5590.so.1.0.28
#usr/lib/sane/libsane-hpljm1005.la
usr/lib/sane/libsane-hpljm1005.so
usr/lib/sane/libsane-hpljm1005.so.1
-usr/lib/sane/libsane-hpljm1005.so.1.0.24
+usr/lib/sane/libsane-hpljm1005.so.1.0.28
#usr/lib/sane/libsane-hs2p.la
usr/lib/sane/libsane-hs2p.so
usr/lib/sane/libsane-hs2p.so.1
-usr/lib/sane/libsane-hs2p.so.1.0.24
+usr/lib/sane/libsane-hs2p.so.1.0.28
#usr/lib/sane/libsane-ibm.la
usr/lib/sane/libsane-ibm.so
usr/lib/sane/libsane-ibm.so.1
-usr/lib/sane/libsane-ibm.so.1.0.24
+usr/lib/sane/libsane-ibm.so.1.0.28
#usr/lib/sane/libsane-kodak.la
usr/lib/sane/libsane-kodak.so
usr/lib/sane/libsane-kodak.so.1
-usr/lib/sane/libsane-kodak.so.1.0.24
+usr/lib/sane/libsane-kodak.so.1.0.28
#usr/lib/sane/libsane-kodakaio.la
usr/lib/sane/libsane-kodakaio.so
usr/lib/sane/libsane-kodakaio.so.1
-usr/lib/sane/libsane-kodakaio.so.1.0.24
+usr/lib/sane/libsane-kodakaio.so.1.0.28
#usr/lib/sane/libsane-kvs1025.la
usr/lib/sane/libsane-kvs1025.so
usr/lib/sane/libsane-kvs1025.so.1
-usr/lib/sane/libsane-kvs1025.so.1.0.24
+usr/lib/sane/libsane-kvs1025.so.1.0.28
#usr/lib/sane/libsane-kvs20xx.la
usr/lib/sane/libsane-kvs20xx.so
usr/lib/sane/libsane-kvs20xx.so.1
-usr/lib/sane/libsane-kvs20xx.so.1.0.24
+usr/lib/sane/libsane-kvs20xx.so.1.0.28
#usr/lib/sane/libsane-kvs40xx.la
usr/lib/sane/libsane-kvs40xx.so
usr/lib/sane/libsane-kvs40xx.so.1
-usr/lib/sane/libsane-kvs40xx.so.1.0.24
+usr/lib/sane/libsane-kvs40xx.so.1.0.28
#usr/lib/sane/libsane-leo.la
usr/lib/sane/libsane-leo.so
usr/lib/sane/libsane-leo.so.1
-usr/lib/sane/libsane-leo.so.1.0.24
+usr/lib/sane/libsane-leo.so.1.0.28
#usr/lib/sane/libsane-lexmark.la
usr/lib/sane/libsane-lexmark.so
usr/lib/sane/libsane-lexmark.so.1
-usr/lib/sane/libsane-lexmark.so.1.0.24
+usr/lib/sane/libsane-lexmark.so.1.0.28
#usr/lib/sane/libsane-ma1509.la
usr/lib/sane/libsane-ma1509.so
usr/lib/sane/libsane-ma1509.so.1
-usr/lib/sane/libsane-ma1509.so.1.0.24
+usr/lib/sane/libsane-ma1509.so.1.0.28
#usr/lib/sane/libsane-magicolor.la
usr/lib/sane/libsane-magicolor.so
usr/lib/sane/libsane-magicolor.so.1
-usr/lib/sane/libsane-magicolor.so.1.0.24
+usr/lib/sane/libsane-magicolor.so.1.0.28
#usr/lib/sane/libsane-matsushita.la
usr/lib/sane/libsane-matsushita.so
usr/lib/sane/libsane-matsushita.so.1
-usr/lib/sane/libsane-matsushita.so.1.0.24
+usr/lib/sane/libsane-matsushita.so.1.0.28
#usr/lib/sane/libsane-microtek.la
usr/lib/sane/libsane-microtek.so
usr/lib/sane/libsane-microtek.so.1
-usr/lib/sane/libsane-microtek.so.1.0.24
+usr/lib/sane/libsane-microtek.so.1.0.28
#usr/lib/sane/libsane-microtek2.la
usr/lib/sane/libsane-microtek2.so
usr/lib/sane/libsane-microtek2.so.1
-usr/lib/sane/libsane-microtek2.so.1.0.24
+usr/lib/sane/libsane-microtek2.so.1.0.28
#usr/lib/sane/libsane-mustek.la
usr/lib/sane/libsane-mustek.so
usr/lib/sane/libsane-mustek.so.1
-usr/lib/sane/libsane-mustek.so.1.0.24
+usr/lib/sane/libsane-mustek.so.1.0.28
#usr/lib/sane/libsane-mustek_pp.la
usr/lib/sane/libsane-mustek_pp.so
usr/lib/sane/libsane-mustek_pp.so.1
-usr/lib/sane/libsane-mustek_pp.so.1.0.24
+usr/lib/sane/libsane-mustek_pp.so.1.0.28
#usr/lib/sane/libsane-mustek_usb.la
usr/lib/sane/libsane-mustek_usb.so
usr/lib/sane/libsane-mustek_usb.so.1
-usr/lib/sane/libsane-mustek_usb.so.1.0.24
+usr/lib/sane/libsane-mustek_usb.so.1.0.28
#usr/lib/sane/libsane-mustek_usb2.la
usr/lib/sane/libsane-mustek_usb2.so
usr/lib/sane/libsane-mustek_usb2.so.1
-usr/lib/sane/libsane-mustek_usb2.so.1.0.24
+usr/lib/sane/libsane-mustek_usb2.so.1.0.28
#usr/lib/sane/libsane-nec.la
usr/lib/sane/libsane-nec.so
usr/lib/sane/libsane-nec.so.1
-usr/lib/sane/libsane-nec.so.1.0.24
+usr/lib/sane/libsane-nec.so.1.0.28
#usr/lib/sane/libsane-net.la
usr/lib/sane/libsane-net.so
usr/lib/sane/libsane-net.so.1
-usr/lib/sane/libsane-net.so.1.0.24
+usr/lib/sane/libsane-net.so.1.0.28
#usr/lib/sane/libsane-niash.la
usr/lib/sane/libsane-niash.so
usr/lib/sane/libsane-niash.so.1
-usr/lib/sane/libsane-niash.so.1.0.24
+usr/lib/sane/libsane-niash.so.1.0.28
#usr/lib/sane/libsane-p5.la
usr/lib/sane/libsane-p5.so
usr/lib/sane/libsane-p5.so.1
-usr/lib/sane/libsane-p5.so.1.0.24
+usr/lib/sane/libsane-p5.so.1.0.28
#usr/lib/sane/libsane-pie.la
usr/lib/sane/libsane-pie.so
usr/lib/sane/libsane-pie.so.1
-usr/lib/sane/libsane-pie.so.1.0.24
+usr/lib/sane/libsane-pie.so.1.0.28
+#usr/lib/sane/libsane-pieusb.la
+usr/lib/sane/libsane-pieusb.so
+usr/lib/sane/libsane-pieusb.so.1
+usr/lib/sane/libsane-pieusb.so.1.0.28
#usr/lib/sane/libsane-pixma.la
usr/lib/sane/libsane-pixma.so
usr/lib/sane/libsane-pixma.so.1
-usr/lib/sane/libsane-pixma.so.1.0.24
+usr/lib/sane/libsane-pixma.so.1.0.28
#usr/lib/sane/libsane-plustek.la
usr/lib/sane/libsane-plustek.so
usr/lib/sane/libsane-plustek.so.1
-usr/lib/sane/libsane-plustek.so.1.0.24
+usr/lib/sane/libsane-plustek.so.1.0.28
#usr/lib/sane/libsane-plustek_pp.la
usr/lib/sane/libsane-plustek_pp.so
usr/lib/sane/libsane-plustek_pp.so.1
-usr/lib/sane/libsane-plustek_pp.so.1.0.24
+usr/lib/sane/libsane-plustek_pp.so.1.0.28
#usr/lib/sane/libsane-qcam.la
usr/lib/sane/libsane-qcam.so
usr/lib/sane/libsane-qcam.so.1
-usr/lib/sane/libsane-qcam.so.1.0.24
+usr/lib/sane/libsane-qcam.so.1.0.28
#usr/lib/sane/libsane-ricoh.la
usr/lib/sane/libsane-ricoh.so
usr/lib/sane/libsane-ricoh.so.1
-usr/lib/sane/libsane-ricoh.so.1.0.24
+usr/lib/sane/libsane-ricoh.so.1.0.28
+#usr/lib/sane/libsane-ricoh2.la
+usr/lib/sane/libsane-ricoh2.so
+usr/lib/sane/libsane-ricoh2.so.1
+usr/lib/sane/libsane-ricoh2.so.1.0.28
#usr/lib/sane/libsane-rts8891.la
usr/lib/sane/libsane-rts8891.so
usr/lib/sane/libsane-rts8891.so.1
-usr/lib/sane/libsane-rts8891.so.1.0.24
+usr/lib/sane/libsane-rts8891.so.1.0.28
#usr/lib/sane/libsane-s9036.la
usr/lib/sane/libsane-s9036.so
usr/lib/sane/libsane-s9036.so.1
-usr/lib/sane/libsane-s9036.so.1.0.24
+usr/lib/sane/libsane-s9036.so.1.0.28
#usr/lib/sane/libsane-sceptre.la
usr/lib/sane/libsane-sceptre.so
usr/lib/sane/libsane-sceptre.so.1
-usr/lib/sane/libsane-sceptre.so.1.0.24
+usr/lib/sane/libsane-sceptre.so.1.0.28
#usr/lib/sane/libsane-sharp.la
usr/lib/sane/libsane-sharp.so
usr/lib/sane/libsane-sharp.so.1
-usr/lib/sane/libsane-sharp.so.1.0.24
+usr/lib/sane/libsane-sharp.so.1.0.28
#usr/lib/sane/libsane-sm3600.la
usr/lib/sane/libsane-sm3600.so
usr/lib/sane/libsane-sm3600.so.1
-usr/lib/sane/libsane-sm3600.so.1.0.24
+usr/lib/sane/libsane-sm3600.so.1.0.28
#usr/lib/sane/libsane-sm3840.la
usr/lib/sane/libsane-sm3840.so
usr/lib/sane/libsane-sm3840.so.1
-usr/lib/sane/libsane-sm3840.so.1.0.24
+usr/lib/sane/libsane-sm3840.so.1.0.28
#usr/lib/sane/libsane-snapscan.la
usr/lib/sane/libsane-snapscan.so
usr/lib/sane/libsane-snapscan.so.1
-usr/lib/sane/libsane-snapscan.so.1.0.24
+usr/lib/sane/libsane-snapscan.so.1.0.28
#usr/lib/sane/libsane-sp15c.la
usr/lib/sane/libsane-sp15c.so
usr/lib/sane/libsane-sp15c.so.1
-usr/lib/sane/libsane-sp15c.so.1.0.24
+usr/lib/sane/libsane-sp15c.so.1.0.28
#usr/lib/sane/libsane-st400.la
usr/lib/sane/libsane-st400.so
usr/lib/sane/libsane-st400.so.1
-usr/lib/sane/libsane-st400.so.1.0.24
+usr/lib/sane/libsane-st400.so.1.0.28
#usr/lib/sane/libsane-stv680.la
usr/lib/sane/libsane-stv680.so
usr/lib/sane/libsane-stv680.so.1
-usr/lib/sane/libsane-stv680.so.1.0.24
+usr/lib/sane/libsane-stv680.so.1.0.28
#usr/lib/sane/libsane-tamarack.la
usr/lib/sane/libsane-tamarack.so
usr/lib/sane/libsane-tamarack.so.1
-usr/lib/sane/libsane-tamarack.so.1.0.24
+usr/lib/sane/libsane-tamarack.so.1.0.28
#usr/lib/sane/libsane-teco1.la
usr/lib/sane/libsane-teco1.so
usr/lib/sane/libsane-teco1.so.1
-usr/lib/sane/libsane-teco1.so.1.0.24
+usr/lib/sane/libsane-teco1.so.1.0.28
#usr/lib/sane/libsane-teco2.la
usr/lib/sane/libsane-teco2.so
usr/lib/sane/libsane-teco2.so.1
-usr/lib/sane/libsane-teco2.so.1.0.24
+usr/lib/sane/libsane-teco2.so.1.0.28
#usr/lib/sane/libsane-teco3.la
usr/lib/sane/libsane-teco3.so
usr/lib/sane/libsane-teco3.so.1
-usr/lib/sane/libsane-teco3.so.1.0.24
+usr/lib/sane/libsane-teco3.so.1.0.28
#usr/lib/sane/libsane-test.la
usr/lib/sane/libsane-test.so
usr/lib/sane/libsane-test.so.1
-usr/lib/sane/libsane-test.so.1.0.24
+usr/lib/sane/libsane-test.so.1.0.28
#usr/lib/sane/libsane-u12.la
usr/lib/sane/libsane-u12.so
usr/lib/sane/libsane-u12.so.1
-usr/lib/sane/libsane-u12.so.1.0.24
+usr/lib/sane/libsane-u12.so.1.0.28
#usr/lib/sane/libsane-umax.la
usr/lib/sane/libsane-umax.so
usr/lib/sane/libsane-umax.so.1
-usr/lib/sane/libsane-umax.so.1.0.24
+usr/lib/sane/libsane-umax.so.1.0.28
#usr/lib/sane/libsane-umax1220u.la
usr/lib/sane/libsane-umax1220u.so
usr/lib/sane/libsane-umax1220u.so.1
-usr/lib/sane/libsane-umax1220u.so.1.0.24
+usr/lib/sane/libsane-umax1220u.so.1.0.28
#usr/lib/sane/libsane-umax_pp.la
usr/lib/sane/libsane-umax_pp.so
usr/lib/sane/libsane-umax_pp.so.1
-usr/lib/sane/libsane-umax_pp.so.1.0.24
+usr/lib/sane/libsane-umax_pp.so.1.0.28
#usr/lib/sane/libsane-xerox_mfp.la
usr/lib/sane/libsane-xerox_mfp.so
usr/lib/sane/libsane-xerox_mfp.so.1
-usr/lib/sane/libsane-xerox_mfp.so.1.0.24
-usr/local/bin/sanedloop
+usr/lib/sane/libsane-xerox_mfp.so.1.0.28
usr/sbin/saned
+#usr/share/doc/sane-backends
+#usr/share/doc/sane-backends/AUTHORS
+#usr/share/doc/sane-backends/COPYING
+#usr/share/doc/sane-backends/ChangeLog
+#usr/share/doc/sane-backends/LICENSE
+#usr/share/doc/sane-backends/NEWS
+#usr/share/doc/sane-backends/PROBLEMS
+#usr/share/doc/sane-backends/PROJECTS
+#usr/share/doc/sane-backends/README
+#usr/share/doc/sane-backends/README.aix
+#usr/share/doc/sane-backends/README.beos
+#usr/share/doc/sane-backends/README.darwin
+#usr/share/doc/sane-backends/README.djpeg
+#usr/share/doc/sane-backends/README.freebsd
+#usr/share/doc/sane-backends/README.hp-ux
+#usr/share/doc/sane-backends/README.linux
+#usr/share/doc/sane-backends/README.netbsd
+#usr/share/doc/sane-backends/README.openbsd
+#usr/share/doc/sane-backends/README.os2
+#usr/share/doc/sane-backends/README.solaris
+#usr/share/doc/sane-backends/README.unixware2
+#usr/share/doc/sane-backends/README.unixware7
+#usr/share/doc/sane-backends/README.windows
+#usr/share/doc/sane-backends/README.zeta
+#usr/share/doc/sane-backends/backend-writing.txt
+#usr/share/doc/sane-backends/canon
+#usr/share/doc/sane-backends/canon/canon.changes
+#usr/share/doc/sane-backends/canon/canon.install2700F.txt
+#usr/share/doc/sane-backends/gt68xx
+#usr/share/doc/sane-backends/gt68xx/gt68xx.CHANGES
+#usr/share/doc/sane-backends/gt68xx/gt68xx.TODO
+#usr/share/doc/sane-backends/leo
+#usr/share/doc/sane-backends/leo/leo.txt
+#usr/share/doc/sane-backends/matsushita
+#usr/share/doc/sane-backends/matsushita/matsushita.txt
+#usr/share/doc/sane-backends/mustek
+#usr/share/doc/sane-backends/mustek/mustek.CHANGES
+#usr/share/doc/sane-backends/mustek_usb
+#usr/share/doc/sane-backends/mustek_usb/mustek_usb.CHANGES
+#usr/share/doc/sane-backends/mustek_usb/mustek_usb.TODO
+#usr/share/doc/sane-backends/mustek_usb2
+#usr/share/doc/sane-backends/mustek_usb2/mustek_usb2.CHANGES
+#usr/share/doc/sane-backends/mustek_usb2/mustek_usb2.TODO
+#usr/share/doc/sane-backends/niash
+#usr/share/doc/sane-backends/niash/niash.TODO
+#usr/share/doc/sane-backends/plustek
+#usr/share/doc/sane-backends/plustek/FAQ
+#usr/share/doc/sane-backends/plustek/MakeModule.sh
+#usr/share/doc/sane-backends/plustek/Makefile.kernel24
+#usr/share/doc/sane-backends/plustek/Makefile.kernel26
+#usr/share/doc/sane-backends/plustek/Plustek-PARPORT-TODO.txt
+#usr/share/doc/sane-backends/plustek/Plustek-PARPORT.changes
+#usr/share/doc/sane-backends/plustek/Plustek-PARPORT.txt
+#usr/share/doc/sane-backends/plustek/Plustek-USB-TODO.txt
+#usr/share/doc/sane-backends/plustek/Plustek-USB.changes
+#usr/share/doc/sane-backends/plustek/Plustek-USB.txt
+#usr/share/doc/sane-backends/sane-backends-external.html
+#usr/share/doc/sane-backends/sane-backends.html
+#usr/share/doc/sane-backends/sane-mfgs-external.html
+#usr/share/doc/sane-backends/sane-mfgs.html
+#usr/share/doc/sane-backends/sceptre
+#usr/share/doc/sane-backends/sceptre/s1200.txt
+#usr/share/doc/sane-backends/teco
+#usr/share/doc/sane-backends/teco/teco1.txt
+#usr/share/doc/sane-backends/teco/teco2.txt
+#usr/share/doc/sane-backends/teco/teco3.txt
+#usr/share/doc/sane-backends/u12
+#usr/share/doc/sane-backends/u12/U12.changes
+#usr/share/doc/sane-backends/u12/U12.todo
+#usr/share/doc/sane-backends/umax
+#usr/share/doc/sane-backends/umax/negative-types.txt
+#usr/share/doc/sane-backends/umax/sane-logo.jpg
+#usr/share/doc/sane-backends/umax/sane-umax-advanced-options-doc.html
+#usr/share/doc/sane-backends/umax/sane-umax-advanced.jpg
+#usr/share/doc/sane-backends/umax/sane-umax-astra-doc.html
+#usr/share/doc/sane-backends/umax/sane-umax-config-doc.html
+#usr/share/doc/sane-backends/umax/sane-umax-doc.html
+#usr/share/doc/sane-backends/umax/sane-umax-histogram.jpg
+#usr/share/doc/sane-backends/umax/sane-umax-mirage-doc.html
+#usr/share/doc/sane-backends/umax/sane-umax-not-listed-doc.html
+#usr/share/doc/sane-backends/umax/sane-umax-others-doc.html
+#usr/share/doc/sane-backends/umax/sane-umax-parport-doc.html
+#usr/share/doc/sane-backends/umax/sane-umax-powerlook-doc.html
+#usr/share/doc/sane-backends/umax/sane-umax-scanner-clones-doc.html
+#usr/share/doc/sane-backends/umax/sane-umax-speed-doc.html
+#usr/share/doc/sane-backends/umax/sane-umax-standard-options-doc.html
+#usr/share/doc/sane-backends/umax/sane-umax-standard.jpg
+#usr/share/doc/sane-backends/umax/sane-umax-text.jpg
+#usr/share/doc/sane-backends/umax/sane-umax-text2.jpg
+#usr/share/doc/sane-backends/umax/sane-umax-text4.jpg
+#usr/share/doc/sane-backends/umax/sane-umax-uc-doc.html
+#usr/share/doc/sane-backends/umax/sane-umax-vista-doc.html
+#usr/share/doc/sane-backends/umax/sane-umax.jpg
+#usr/share/doc/sane-backends/umax/umax.BUGS
+#usr/share/doc/sane-backends/umax/umax.CHANGES
+#usr/share/doc/sane-backends/umax/umax.FAQ
+#usr/share/doc/sane-backends/umax/umax.TODO
#usr/share/locale/bg/LC_MESSAGES/sane-backends.mo
+#usr/share/locale/ca/LC_MESSAGES/sane-backends.mo
+#usr/share/locale/ca(a)valencia/LC_MESSAGES/sane-backends.mo
#usr/share/locale/cs/LC_MESSAGES/sane-backends.mo
#usr/share/locale/da/LC_MESSAGES/sane-backends.mo
-usr/share/locale/de/LC_MESSAGES/sane-backends.mo
+#sr/share/locale/de/LC_MESSAGES/sane-backends.mo
+#usr/share/locale/en(a)boldquot/LC_MESSAGES/sane-backends.mo
+#usr/share/locale/en(a)quot/LC_MESSAGES/sane-backends.mo
#usr/share/locale/en_GB/LC_MESSAGES/sane-backends.mo
#usr/share/locale/eo/LC_MESSAGES/sane-backends.mo
#usr/share/locale/es/LC_MESSAGES/sane-backends.mo
#usr/share/locale/fi/LC_MESSAGES/sane-backends.mo
#usr/share/locale/fr/LC_MESSAGES/sane-backends.mo
#usr/share/locale/gl/LC_MESSAGES/sane-backends.mo
+#usr/share/locale/he/LC_MESSAGES/sane-backends.mo
+#usr/share/locale/hu/LC_MESSAGES/sane-backends.mo
#usr/share/locale/it/LC_MESSAGES/sane-backends.mo
#usr/share/locale/ja/LC_MESSAGES/sane-backends.mo
#usr/share/locale/nb/LC_MESSAGES/sane-backends.mo
@@ -563,6 +584,7 @@ usr/share/locale/de/LC_MESSAGES/sane-backends.mo
#usr/share/man/man5/sane-epjitsu.5
#usr/share/man/man5/sane-epson.5
#usr/share/man/man5/sane-epson2.5
+#usr/share/man/man5/sane-epsonds.5
#usr/share/man/man5/sane-fujitsu.5
#usr/share/man/man5/sane-genesys.5
#usr/share/man/man5/sane-gt68xx.5
@@ -596,6 +618,7 @@ usr/share/locale/de/LC_MESSAGES/sane-backends.mo
#usr/share/man/man5/sane-niash.5
#usr/share/man/man5/sane-p5.5
#usr/share/man/man5/sane-pie.5
+#usr/share/man/man5/sane-pieusb.5
#usr/share/man/man5/sane-pixma.5
#usr/share/man/man5/sane-plustek.5
#usr/share/man/man5/sane-plustek_pp.5
diff --git a/config/rootfiles/packages/tshark b/config/rootfiles/packages/tshark
index 816ab920b..dffd2a507 100644
--- a/config/rootfiles/packages/tshark
+++ b/config/rootfiles/packages/tshark
@@ -608,10 +608,10 @@ usr/bin/tshark
#usr/include/wireshark/wsutil/xtea.h
#usr/lib/libwireshark.so
usr/lib/libwireshark.so.12
-usr/lib/libwireshark.so.12.0.2
+usr/lib/libwireshark.so.12.0.5
#usr/lib/libwiretap.so
usr/lib/libwiretap.so.9
-usr/lib/libwiretap.so.9.0.2
+usr/lib/libwiretap.so.9.0.5
#usr/lib/libwscodecs.so
usr/lib/libwscodecs.so.2
usr/lib/libwscodecs.so.2.0.0
@@ -755,7 +755,7 @@ usr/share/wireshark/dtds/xcap-error.dtd
#usr/share/wireshark/help/capture_filters.txt
#usr/share/wireshark/help/capturing.txt
#usr/share/wireshark/help/display_filters.txt
-#usr/share/wireshark/help/faq.py
+#usr/share/wireshark/help/faq.txt
#usr/share/wireshark/help/getting_started.txt
#usr/share/wireshark/help/overview.txt
#usr/share/wireshark/help/toc
diff --git a/config/rootfiles/packages/wio b/config/rootfiles/packages/wio
index 065d0be10..899dccf06 100644
--- a/config/rootfiles/packages/wio
+++ b/config/rootfiles/packages/wio
@@ -16,6 +16,7 @@ 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
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 439390228..5b8ca9731 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -898,17 +898,6 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) {
$errormessage = $Lang::tr{'invalid input for keepalive 1:2'};
goto ADV_ERROR;
}
- # Create ta.key for tls-auth if not presant
- if ($cgiparams{'TLSAUTH'} eq 'on') {
- if ( ! -e "${General::swroot}/ovpn/certs/ta.key") {
- system('/usr/sbin/openvpn', '--genkey', '--secret', "${General::swroot}/ovpn/certs/ta.key");
- if ($?) {
- $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
- goto ADV_ERROR;
- }
- }
- }
-
&General::writehash("${General::swroot}/ovpn/settings", \%vpnsettings);
&writeserverconf();#hier ok
}
@@ -1189,6 +1178,17 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save'} && $cgiparams{'TYPE'} eq '' && $cg
goto SETTINGS_ERROR;
}
+ # Create ta.key for tls-auth if not presant
+ if ($cgiparams{'TLSAUTH'} eq 'on') {
+ if ( ! -e "${General::swroot}/ovpn/certs/ta.key") {
+ system('/usr/sbin/openvpn', '--genkey', '--secret', "${General::swroot}/ovpn/certs/ta.key");
+ if ($?) {
+ $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
+ goto SETTINGS_ERROR;
+ }
+ }
+ }
+
$vpnsettings{'ENABLED_BLUE'} = $cgiparams{'ENABLED_BLUE'};
$vpnsettings{'ENABLED_ORANGE'} =$cgiparams{'ENABLED_ORANGE'};
$vpnsettings{'ENABLED'} = $cgiparams{'ENABLED'};
@@ -1947,6 +1947,13 @@ END
# } else {
# &cleanssldatabase();
}
+ # Create ta.key for tls-auth
+ system('/usr/sbin/openvpn', '--genkey', '--secret', "${General::swroot}/ovpn/certs/ta.key");
+ if ($?) {
+ $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
+ &cleanssldatabase();
+ goto ROOTCERT_ERROR;
+ }
# Create Diffie Hellmann Parameter
system('/usr/bin/openssl', 'dhparam', '-out', "${General::swroot}/ovpn/ca/dh1024.pem", "$cgiparams{'DHLENGHT'}");
if ($?) {
@@ -1961,13 +1968,6 @@ END
# } else {
# &cleanssldatabase();
}
- # Create ta.key for tls-auth
- system('/usr/sbin/openvpn', '--genkey', '--secret', "${General::swroot}/ovpn/certs/ta.key");
- if ($?) {
- $errormessage = "$Lang::tr{'openssl produced an error'}: $?";
- &cleanssldatabase();
- goto ROOTCERT_ERROR;
- }
goto ROOTCERT_SUCCESS;
}
ROOTCERT_ERROR:
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 750b69b1d..1cd7cb84b 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -2000,11 +2000,11 @@ END
#use default advanced value
$cgiparams{'IKE_ENCRYPTION'} = 'chacha20poly1305|aes256gcm128|aes256gcm96|aes256gcm64|aes256|aes192gcm128|aes192gcm96|aes192gcm64|aes192|aes128gcm128|aes128gcm96|aes128gcm64|aes128'; #[18];
$cgiparams{'IKE_INTEGRITY'} = 'sha2_512|sha2_256'; #[19];
- $cgiparams{'IKE_GROUPTYPE'} = 'curve25519|4096|3072|2048'; #[20];
+ $cgiparams{'IKE_GROUPTYPE'} = 'curve25519|curve448|4096|3072|2048'; #[20];
$cgiparams{'IKE_LIFETIME'} = '3'; #[16];
$cgiparams{'ESP_ENCRYPTION'} = 'chacha20poly1305|aes256gcm128|aes256gcm96|aes256gcm64|aes256|aes192gcm128|aes192gcm96|aes192gcm64|aes192|aes128gcm128|aes128gcm96|aes128gcm64|aes128'; #[21];
$cgiparams{'ESP_INTEGRITY'} = 'sha2_512|sha2_256'; #[22];
- $cgiparams{'ESP_GROUPTYPE'} = 'curve25519|4096|3072|2048'; #[23];
+ $cgiparams{'ESP_GROUPTYPE'} = 'curve25519|curve448|4096|3072|2048'; #[23];
$cgiparams{'ESP_KEYLIFE'} = '1'; #[17];
$cgiparams{'COMPRESSION'} = 'off'; #[13];
$cgiparams{'ONLY_PROPOSED'} = 'on'; #[24];
@@ -2368,7 +2368,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
goto ADVANCED_ERROR;
}
foreach my $val (@temp) {
- if ($val !~ /^(curve25519|e521|e384|e256|e224|e192|e512bp|e384bp|e256bp|e224bp|768|1024|1536|2048|3072|4096|6144|8192)$/) {
+ if ($val !~ /^(curve25519|curve448|e521|e384|e256|e224|e192|e512bp|e384bp|e256bp|e224bp|768|1024|1536|2048|3072|4096|6144|8192)$/) {
$errormessage = $Lang::tr{'invalid input'};
goto ADVANCED_ERROR;
}
@@ -2409,7 +2409,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
goto ADVANCED_ERROR;
}
foreach my $val (@temp) {
- if ($val !~ /^(curve25519|e521|e384|e256|e224|e192|e512bp|e384bp|e256bp|e224bp|768|1024|1536|2048|3072|4096|6144|8192|none)$/) {
+ if ($val !~ /^(curve25519|curve448|e521|e384|e256|e224|e192|e512bp|e384bp|e256bp|e224bp|768|1024|1536|2048|3072|4096|6144|8192|none)$/) {
$errormessage = $Lang::tr{'invalid input'};
goto ADVANCED_ERROR;
}
@@ -2549,6 +2549,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
@temp = split('\|', $cgiparams{'IKE_INTEGRITY'});
foreach my $key (@temp) {$checked{'IKE_INTEGRITY'}{$key} = "selected='selected'"; }
$checked{'IKE_GROUPTYPE'}{'curve25519'} = '';
+ $checked{'IKE_GROUPTYPE'}{'curve448'} = '';
$checked{'IKE_GROUPTYPE'}{'768'} = '';
$checked{'IKE_GROUPTYPE'}{'1024'} = '';
$checked{'IKE_GROUPTYPE'}{'1536'} = '';
@@ -2588,6 +2589,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
@temp = split('\|', $cgiparams{'ESP_INTEGRITY'});
foreach my $key (@temp) {$checked{'ESP_INTEGRITY'}{$key} = "selected='selected'"; }
$checked{'ESP_GROUPTYPE'}{'curve25519'} = '';
+ $checked{'ESP_GROUPTYPE'}{'curve448'} = '';
$checked{'ESP_GROUPTYPE'}{'768'} = '';
$checked{'ESP_GROUPTYPE'}{'1024'} = '';
$checked{'ESP_GROUPTYPE'}{'1536'} = '';
@@ -2752,6 +2754,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
<td class='boldbase'>
<select name='IKE_GROUPTYPE' multiple='multiple' size='6' style='width: 100%'>
<option value='curve25519' $checked{'IKE_GROUPTYPE'}{'curve25519'}>Curve 25519 (256 bit)</option>
+ <option value='curve448' $checked{'IKE_GROUPTYPE'}{'curve448'}>Curve 448 (224 bit)</option>
<option value='e521' $checked{'IKE_GROUPTYPE'}{'e521'}>ECP-521 (NIST)</option>
<option value='e512bp' $checked{'IKE_GROUPTYPE'}{'e512bp'}>ECP-512 (Brainpool)</option>
<option value='e384' $checked{'IKE_GROUPTYPE'}{'e384'}>ECP-384 (NIST)</option>
@@ -2774,6 +2777,7 @@ if(($cgiparams{'ACTION'} eq $Lang::tr{'advanced'}) ||
<td class='boldbase'>
<select name='ESP_GROUPTYPE' multiple='multiple' size='6' style='width: 100%'>
<option value='curve25519' $checked{'ESP_GROUPTYPE'}{'curve25519'}>Curve 25519 (256 bit)</option>
+ <option value='curve448' $checked{'ESP_GROUPTYPE'}{'curve448'}>Curve 448 (224 bit)</option>
<option value='e521' $checked{'ESP_GROUPTYPE'}{'e521'}>ECP-521 (NIST)</option>
<option value='e512bp' $checked{'ESP_GROUPTYPE'}{'e512bp'}>ECP-512 (Brainpool)</option>
<option value='e384' $checked{'ESP_GROUPTYPE'}{'e384'}>ECP-384 (NIST)</option>
@@ -3325,7 +3329,7 @@ sub make_algos($$$$$) {
if ($grp =~ m/^e(.*)$/) {
push(@algo, "ecp$1");
- } elsif ($grp =~ m/curve25519/) {
+ } elsif ($grp =~ m/curve(25519|448)/) {
push(@algo, "$grp");
} else {
push(@algo, "modp$grp");
@@ -3342,7 +3346,7 @@ sub make_algos($$$$$) {
# noop
} elsif ($grp =~ m/^e(.*)$/) {
push(@algo, "ecp$1");
- } elsif ($grp =~ m/curve25519/) {
+ } elsif ($grp =~ m/curve(25519|448)/) {
push(@algo, "$grp");
} else {
push(@algo, "modp$grp");
diff --git a/lfs/Net_SSLeay b/lfs/Net_SSLeay
index 90c0a310a..762bf1f4a 100644
--- a/lfs/Net_SSLeay
+++ b/lfs/Net_SSLeay
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)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.82
+VER = 1.88
THISAPP = Net-SSLeay-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2170469d929d5173bacffd0cb2d7fafa
+$(DL_FILE)_MD5 = fcef4985f5f7e0381e3dddd0ee7878d1
install : $(TARGET)
diff --git a/lfs/bind b/lfs/bind
index 46f935903..b90d2da4e 100644
--- a/lfs/bind
+++ b/lfs/bind
@@ -25,7 +25,7 @@
include Config
-VER = 9.11.10
+VER = 9.11.11
THISAPP = bind-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d337c24bac0bb0d83470cd0021366bd0
+$(DL_FILE)_MD5 = 5b4a301aa97387db81352f7466bac161
install : $(TARGET)
diff --git a/lfs/bird b/lfs/bird
index 0c908ec7b..7a2763b23 100644
--- a/lfs/bird
+++ b/lfs/bird
@@ -24,7 +24,7 @@
include Config
-VER = 2.0.4
+VER = 2.0.6
THISAPP = bird-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = bird
-PAK_VER = 4
+PAK_VER = 5
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f0d0db5c6325437be66a6165ea29e5f9
+$(DL_FILE)_MD5 = bc05f225f4fcb365da1dbb308a7e23cc
install : $(TARGET)
diff --git a/lfs/clamav b/lfs/clamav
index aa7715763..949117bf0 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -24,7 +24,7 @@
include Config
-VER = 0.101.4
+VER = 0.102.0
THISAPP = clamav-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = clamav
-PAK_VER = 46
+PAK_VER = 47
DEPS = ""
@@ -50,7 +50,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = b6e6891035ce3e3f35830154bd280311
+$(DL_FILE)_MD5 = 51e1dff512350284b4b11c3dc2d00da0
install : $(TARGET)
@@ -85,6 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure \
--prefix=/usr \
+ --disable-clamonacc \
--sysconfdir=/var/ipfire/clamav \
--with-dbdir=$(DATABASE_DIR) \
$(CONFIGURE_FLAGS)
diff --git a/lfs/dhcpcd b/lfs/dhcpcd
index 18d8ee4b7..d37cd67d3 100644
--- a/lfs/dhcpcd
+++ b/lfs/dhcpcd
@@ -24,7 +24,7 @@
include Config
-VER = 8.0.3
+VER = 8.0.6
THISAPP = dhcpcd-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 182d506dd88773aec017d93a22d0f025
+$(DL_FILE)_MD5 = 5d3edd06595130f2b24609aade342488
install : $(TARGET)
diff --git a/lfs/hostapd b/lfs/hostapd
index 9dabc3b5b..c02c9724c 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -24,7 +24,7 @@
include Config
-VER = 2.8
+VER = 2.9
THISAPP = hostapd-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = hostapd
-PAK_VER = 48
+PAK_VER = 49
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ed2c254e5f400838cb9d8e7b6e43b86c
+$(DL_FILE)_MD5 = f188fc53a495fe7af3b6d77d3c31dee8
install : $(TARGET)
@@ -78,8 +78,8 @@ $(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/hostapd/hostapd-2.8-increase_EAPOL-timeouts.patch
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd/hostapd-2.8-noscan.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/hostapd/hostapd-2.9-noscan.patch
cd $(DIR_APP)/hostapd && cp $(DIR_SRC)/config/hostapd/config ./.config
cd $(DIR_APP)/hostapd && sed -e "s@/usr/local@/usr(a)g" -i Makefile
diff --git a/lfs/iproute2 b/lfs/iproute2
index 4d2a6f4d7..820303f35 100644
--- a/lfs/iproute2
+++ b/lfs/iproute2
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 4.18.0
+VER = 5.3.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 = 8b8680e91390c57cab788fbf8e929479
+$(DL_FILE)_MD5 = 227404413c8d6db649d6188ead1e5a6e
install : $(TARGET)
diff --git a/lfs/iptables b/lfs/iptables
index 3716d8062..b91e41797 100644
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -24,7 +24,7 @@
include Config
-VER = 1.8.2
+VER = 1.8.3
THISAPP = iptables-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -41,7 +41,7 @@ objects = $(DL_FILE) \
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
netfilter-layer7-v2.23.tar.gz = $(URL_IPFIRE)/netfilter-layer7-v2.23.tar.gz
-$(DL_FILE)_MD5 = 944558e88ddcc3b9b0d9550070fa3599
+$(DL_FILE)_MD5 = 29de711d15c040c402cf3038c69ff513
netfilter-layer7-v2.23.tar.gz_MD5 = 10910b6173d18e426cb56ae7e1300eeb
install : $(TARGET)
diff --git a/lfs/knot b/lfs/knot
index 1e9d269d3..467f077db 100644
--- a/lfs/knot
+++ b/lfs/knot
@@ -24,7 +24,7 @@
include Config
-VER = 2.8.3
+VER = 2.8.4
THISAPP = knot-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fb7623a6c1f40cf2f330c91ad9a7898f
+$(DL_FILE)_MD5 = d2540d0a392e2f47fe48e5cf7bf491c9
install : $(TARGET)
diff --git a/lfs/libhtp b/lfs/libhtp
index 212514dfb..bec93a935 100644
--- a/lfs/libhtp
+++ b/lfs/libhtp
@@ -24,7 +24,7 @@
include Config
-VER = 0.5.29
+VER = 0.5.30
THISAPP = libhtp-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 5feb73647723db5b458d00faddb30954
+$(DL_FILE)_MD5 = ec0d8c57f9c611719e07668bbad7e685
install : $(TARGET)
diff --git a/lfs/libnetfilter_queue b/lfs/libnetfilter_queue
index 688f5702d..bb22a7f16 100644
--- a/lfs/libnetfilter_queue
+++ b/lfs/libnetfilter_queue
@@ -24,7 +24,7 @@
include Config
-VER = 1.0.2
+VER = 1.0.3
THISAPP = libnetfilter_queue-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = df09befac35cb215865b39a36c96a3fa
+$(DL_FILE)_MD5 = 700ce0ae4784257ab5abe6fd1802f366
install : $(TARGET)
diff --git a/lfs/libpcap b/lfs/libpcap
index b6cbd502d..ccf78a449 100644
--- a/lfs/libpcap
+++ b/lfs/libpcap
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 1.8.1
+VER = 1.9.1
THISAPP = libpcap-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3d48f9cd171ff12b0efd9134b52f1447
+$(DL_FILE)_MD5 = 21af603d9a591c7d96a6457021d84e6c
install : $(TARGET)
diff --git a/lfs/libssh b/lfs/libssh
new file mode 100644
index 000000000..d8edca234
--- /dev/null
+++ b/lfs/libssh
@@ -0,0 +1,79 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 IPFire Team <info(a)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.9.0
+
+THISAPP = libssh-$(VER)
+DL_FILE = $(THISAPP).tar.xz
+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 = d2334521d83fe20309ed43a62321e7c2
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# 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 axf $(DIR_DL)/$(DL_FILE)
+ -mkdir -pv $(DIR_APP)/build
+ cd $(DIR_APP)/build && cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ cd $(DIR_APP)/build && make $(MAKETUNING)
+ cd $(DIR_APP)/build && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/mtr b/lfs/mtr
index 4e951a0f4..da856f417 100644
--- a/lfs/mtr
+++ b/lfs/mtr
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)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 = 0.92
+VER = 0.93
THISAPP = mtr-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = mtr
-PAK_VER = 3
+PAK_VER = 4
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 3b3788f71641eb3eaba517ac2138e76d
+$(DL_FILE)_MD5 = f68c397310ec2275736e2e19727c22c0
install : $(TARGET)
@@ -77,6 +77,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) && ./bootstrap.sh
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/nano b/lfs/nano
index 4b636f4ea..3a68bf9cb 100644
--- a/lfs/nano
+++ b/lfs/nano
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 3.2
+VER = 4.5
THISAPP = nano-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nano
-PAK_VER = 25
+PAK_VER = 26
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2606dc0dc31a088f16c7d603b42d23d0
+$(DL_FILE)_MD5 = 686a169b6e5e1f76fe79570f07934001
install : $(TARGET)
diff --git a/lfs/ncat b/lfs/ncat
index e8d13f605..228750a19 100644
--- a/lfs/ncat
+++ b/lfs/ncat
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)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 = 7.60
+VER = 7.80
THISAPP = ncat-$(VER)
DL_FILE = nmap-$(VER).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/nmap-$(VER)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = ncat
-PAK_VER = 3
+PAK_VER = 4
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 4e454266559ddf2c4e2109866c62560c
+$(DL_FILE)_MD5 = d37b75b06d1d40f27b76d60db420a1f5
install : $(TARGET)
@@ -78,7 +78,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && mkdir -p build
- cd $(DIR_APP) && ./configure --prefix=/usr --without-nmapfe --without-zenmap --without-ndiff --without-nping -without-liblua --without-nmap-update
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --without-nmapfe \
+ --without-zenmap \
+ --without-ndiff \
+ --without-nping \
+ --without-liblua \
+ --without-nmap-update
+
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP)/ncat && make install
ln -f -s /usr/bin/ncat /usr/bin/nc
diff --git a/lfs/nmap b/lfs/nmap
index 7242cd812..7ac35dfd8 100644
--- a/lfs/nmap
+++ b/lfs/nmap
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)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 = 7.70
+VER = 7.80
THISAPP = nmap-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nmap
-PAK_VER = 10
+PAK_VER = 11
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 84eb6fbe788e0d4918c2b1e39421bf79
+$(DL_FILE)_MD5 = d37b75b06d1d40f27b76d60db420a1f5
install : $(TARGET)
diff --git a/lfs/pcre b/lfs/pcre
index dc6621f1c..85dc1bc8d 100644
--- a/lfs/pcre
+++ b/lfs/pcre
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)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 = 8.42
+VER = 8.43
THISAPP = pcre-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 085b6aa253e0f91cae70b3cdbe8c1ac2
+$(DL_FILE)_MD5 = 636222e79e392c3d95dcc545f24f98c4
install : $(TARGET)
diff --git a/lfs/rust b/lfs/rust
new file mode 100644
index 000000000..289387133
--- /dev/null
+++ b/lfs/rust
@@ -0,0 +1,92 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 IPFire Team <info(a)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 = 1.37.0
+
+THISAPP = rust-$(VER)
+DL_FILE = $(THISAPP)-$(RUST_BOOTSTRAP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)-$(RUST_BOOTSTRAP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+ifeq "$(BUILD_ARCH)" "i586"
+ RUST_ARCH = i686
+else
+ RUST_ARCH = $(BUILD_ARCH)
+endif
+
+ifeq "$(BUILD_ARCH)" "armv5tel"
+ RUST_BOOTSTRAP = arm-unknown-linux-gnueabi
+else
+ RUST_BOOTSTRAP = $(RUST_ARCH)-unknown-linux-gnu
+endif
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 3f84df04bd0cf0ea4668390be263945e
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# 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) && ./install.sh \
+ --components=cargo,rustc,rust-std-$(RUST_BOOTSTRAP) \
+ --prefix=/usr \
+ --disable-ldconfig
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/sane b/lfs/sane
index b3c2a1205..139a9af48 100644
--- a/lfs/sane
+++ b/lfs/sane
@@ -24,7 +24,7 @@
include Config
-VER = 1.0.24
+VER = 1.0.28
THISAPP = sane-$(VER)
DL_FILE = sane-backends-$(VER).tar.gz
@@ -33,9 +33,9 @@ DIR_APP = $(DIR_SRC)/sane-backends-$(VER)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = sane
-PAK_VER = 5
+PAK_VER = 6
-DEPS = "cups libtiff"
+DEPS = "avahi cups libtiff"
###############################################################################
# Top-level Rules
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 1ca68e536cd7c1852322822f5f6ac3a4
+$(DL_FILE)_MD5 = 02493493072769a1d4ad904d30f04e6b
install : $(TARGET)
@@ -80,10 +80,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
--disable-ipv6 \
- --enable-parport-directio
+ --enable-parport-directio \
+ --enable-avahi
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
- chmod 4755 /usr/bin/scanimage
+
+ # Install configuration
cp -vf $(DIR_SRC)/config/sane/saned.conf /etc/sane.d/
#install initscripts
diff --git a/lfs/shairport-sync b/lfs/shairport-sync
index 87e705db1..b70fbca73 100644
--- a/lfs/shairport-sync
+++ b/lfs/shairport-sync
@@ -24,7 +24,7 @@
include Config
-VER = 3.2.2
+VER = 3.3.2
THISAPP = shairport-sync-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,9 +32,9 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = shairport-sync
-PAK_VER = 2
+PAK_VER = 3
-DEPS = "alac alsa avahi soxr"
+DEPS = "alac alsa avahi libdaemon soxr"
###############################################################################
# Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = caf8a381b0623273de37a2c947703c50
+$(DL_FILE)_MD5 = 80278eed6bb1391bcbafe80c0e566d1b
install : $(TARGET)
@@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--with-alsa \
--with-apple-alac \
--with-avahi \
+ --with-libdaemon \
--with-ssl=openssl \
--with-soxr
cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/lfs/speedtest-cli b/lfs/speedtest-cli
new file mode 100644
index 000000000..aa2af73bb
--- /dev/null
+++ b/lfs/speedtest-cli
@@ -0,0 +1,83 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2018 IPFire Team <info(a)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 = 2.1.2
+
+THISAPP = speedtest-cli-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = speedtest-cli
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = a49ad088331810fc9442e8a5c59de713
+
+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) && python setup.py build
+ cd $(DIR_APP) && python setup.py install --root=/
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/strongswan b/lfs/strongswan
index e326886cf..c6f428e41 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
include Config
-VER = 5.8.0
+VER = 5.8.1
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e05f2d16a7479a2a9591609c256d523a
+$(DL_FILE)_MD5 = 5a6b9980cd1ac4fad3c24b55ed960ac9
install : $(TARGET)
diff --git a/lfs/suricata b/lfs/suricata
index 6f779d875..f6e4a593c 100644
--- a/lfs/suricata
+++ b/lfs/suricata
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 4.1.4
+VER = 4.1.5
THISAPP = suricata-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = cb8bf6b8330c44ae78dfb5b083a6fe82
+$(DL_FILE)_MD5 = 0dfd68f6f4314c5c2eed7128112eff3b
install : $(TARGET)
@@ -82,7 +82,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--disable-python \
--with-libjansson-libraries=/usr/lib \
--with-libjansson-includes=/usr/include \
- --disable-suricata-update
+ --disable-suricata-update \
+ --enable-rust
+
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cd $(DIR_APP) && make install-conf
diff --git a/lfs/tcpdump b/lfs/tcpdump
index a53cae06f..b22a1a043 100644
--- a/lfs/tcpdump
+++ b/lfs/tcpdump
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 4.9.2
+VER = 4.9.3
THISAPP = tcpdump-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tcpdump
-PAK_VER = 10
+PAK_VER = 11
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 9bbc1ee33dab61302411b02dd0515576
+$(DL_FILE)_MD5 = a4ead41d371f91aa0a2287f589958bae
install : $(TARGET)
diff --git a/lfs/tor b/lfs/tor
index 1e234e0ab..ea07f6ce2 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -24,7 +24,7 @@
include Config
-VER = 0.4.0.5
+VER = 0.4.1.6
THISAPP = tor-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tor
-PAK_VER = 41
+PAK_VER = 43
DEPS = "libseccomp"
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 23278fc58d0014db22b428cdae3ea966
+$(DL_FILE)_MD5 = d5e290d2a09d4225693cebc37a83097f
install : $(TARGET)
diff --git a/lfs/tshark b/lfs/tshark
index 562c70e26..7c9cd6613 100644
--- a/lfs/tshark
+++ b/lfs/tshark
@@ -24,7 +24,7 @@
include Config
-VER = 3.0.2
+VER = 3.0.5
THISAPP = wireshark-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tshark
DEPS = "krb5"
-PAK_VER = 2
+PAK_VER = 3
###############################################################################
# Top-level Rules
@@ -43,7 +43,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e344675283d6329a4bc213b621d7f46a
+$(DL_FILE)_MD5 = d01fdc4e78ef8ea70f20616c91419bd9
install : $(TARGET)
diff --git a/lfs/tzdata b/lfs/tzdata
index 04add8396..a65136b6d 100644
--- a/lfs/tzdata
+++ b/lfs/tzdata
@@ -24,7 +24,7 @@
include Config
-VER = 2019b
+VER = 2019c
TZDATA_VER = $(VER)
TZCODE_VER = $(VER)
@@ -45,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz
tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz
tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz
-tzdata$(TZDATA_VER).tar.gz_MD5 = b26b5d7d844cb96c73ed2fb6d588daaf
-tzcode$(TZCODE_VER).tar.gz_MD5 = 91e0978d947496fd6aaf46d351f9c41d
+tzdata$(TZDATA_VER).tar.gz_MD5 = f6987e6dfdb2eb83a1b5076a50b80894
+tzcode$(TZCODE_VER).tar.gz_MD5 = 195a17454c5db05cab96595380650391
install : $(TARGET)
diff --git a/lfs/unbound b/lfs/unbound
index f81a4166d..5cff54d2b 100644
--- a/lfs/unbound
+++ b/lfs/unbound
@@ -24,7 +24,7 @@
include Config
-VER = 1.9.3
+VER = 1.9.4
THISAPP = unbound-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = fe1af630616d7d88d621e300fb87e5d5
+$(DL_FILE)_MD5 = c4d6305f6187deca9e579d4cc5abeaea
install : $(TARGET)
diff --git a/lfs/wio b/lfs/wio
index 3d788efda..58ab16620 100644
--- 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 = 5
+PAK_VER = 6
###############################################################################
# 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.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/
install -v -m 644 $(DIR_APP)/wio/config/backup/includes/wio /var/ipfire/backup/addons/includes/wio
diff --git a/lfs/wpa_supplicant b/lfs/wpa_supplicant
index ad7b45fea..549cee152 100644
--- a/lfs/wpa_supplicant
+++ b/lfs/wpa_supplicant
@@ -24,7 +24,7 @@
include Config
-VER = 2.8
+VER = 2.9
THISAPP = wpa_supplicant-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -41,7 +41,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0af5998c5d924e985cab16b9a1c77904
+$(DL_FILE)_MD5 = 2d2958c782576dc9901092fbfecb4190
install : $(TARGET)
diff --git a/make.sh b/make.sh
index f8370ca0b..c25ce7b8a 100755
--- a/make.sh
+++ b/make.sh
@@ -1259,6 +1259,7 @@ buildipfire() {
lfsmake2 beep
lfsmake2 libarchive
lfsmake2 cmake
+ lfsmake2 libssh
lfsmake2 cdrkit
lfsmake2 dosfstools
lfsmake2 reiserfsprogs
@@ -1343,6 +1344,7 @@ buildipfire() {
lfsmake2 setserial
lfsmake2 setup
lfsmake2 libdnet
+ lfsmake2 rust
lfsmake2 jansson
lfsmake2 yaml
lfsmake2 libhtp
@@ -1628,6 +1630,7 @@ buildipfire() {
lfsmake2 firmware-update
lfsmake2 tshark
lfsmake2 geoip-generator
+ lfsmake2 speedtest-cli
}
buildinstaller() {
diff --git a/src/initscripts/packages/sane b/src/initscripts/packages/sane
index 98303036b..6b391e9d8 100644
--- a/src/initscripts/packages/sane
+++ b/src/initscripts/packages/sane
@@ -8,9 +8,6 @@
#
# Version : 01.00
#
-# Notes : runs sanedloop ibecause saned is intended
-# for use with (x)inet.d
-#
########################################################################
. /etc/sysconfig/rc
@@ -19,15 +16,13 @@
case "${1}" in
start)
boot_mesg "Starting saned - network scanner deamon..."
- loadproc /usr/local/bin/sanedloop
+ loadproc /usr/sbin/saned -lD
evaluate_retval
;;
stop)
boot_mesg "Stopping saned - network scanner deamon..."
- killproc sanedloop
- killall -s KILL -w saned > /dev/null 2>&1
- exit 0
+ killproc /usr/sbin/saned
;;
restart)
@@ -37,7 +32,6 @@ case "${1}" in
;;
status)
- statusproc /usr/bin/sanedloop
statusproc /usr/sbin/saned
;;
diff --git a/src/initscripts/system/firewall b/src/initscripts/system/firewall
index ec396c708..602bd6c5b 100644
--- a/src/initscripts/system/firewall
+++ b/src/initscripts/system/firewall
@@ -6,6 +6,7 @@
eval $(/usr/local/bin/readhash /var/ipfire/ppp/settings)
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
eval $(/usr/local/bin/readhash /var/ipfire/optionsfw/settings)
+ROOTHINTS="/etc/unbound/root.hints"
IFACE=`/bin/cat /var/ipfire/red/iface 2> /dev/null | /usr/bin/tr -d '\012'`
if [ -f /var/ipfire/red/device ]; then
@@ -307,6 +308,17 @@ iptables_init() {
iptables -A INPUT -j TOR_INPUT
iptables -N TOR_OUTPUT
iptables -A OUTPUT -j TOR_OUTPUT
+
+ # Allow outgoing DNS traffic (TCP and UDP) to DNS root servers
+ local rootserverips="$( awk '/\s+A\s+/ { print $4 }' ${ROOTHINTS} )"
+ ipset -N root-servers iphash
+
+ for ip in "${rootserverips[@]}"; do
+ ipset add root-servers $ip
+ done
+
+ iptables -A OUTPUT -m set --match-set root-servers dst -p tcp --dport 53 -j ACCEPT
+ iptables -A OUTPUT -m set --match-set root-servers dst -p udp --dport 53 -j ACCEPT
# Jump into the actual firewall ruleset.
iptables -N INPUTFW
diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound
index dbcfc951f..d195fd325 100644
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -15,6 +15,7 @@ TEST_DOMAIN_FAIL="dnssec-failed.org"
INSECURE_ZONES=
USE_FORWARDERS=1
ENABLE_SAFE_SEARCH=off
+FORCE_TCP=off
# Cache any local zones for 60 seconds
LOCAL_TTL=60
@@ -25,6 +26,12 @@ EDNS_DEFAULT_BUFFER_SIZE=4096
# Load optional configuration
[ -e "/etc/sysconfig/unbound" ] && . /etc/sysconfig/unbound
+DIG_ARGS=()
+
+if [ "${FORCE_TCP}" = "on" ]; then
+ DIG_ARGS+=( "+tcp" )
+fi
+
ip_address_revptr() {
local addr=${1}
@@ -199,6 +206,14 @@ write_forward_conf() {
(
config_header
+ # Force using TCP for upstream servers only
+ if [ "${FORCE_TCP}" = "on" ]; then
+ echo "# Force using TCP for upstream servers only"
+ echo "server:"
+ echo " tcp-upstream: yes"
+ echo
+ fi
+
local insecure_zones="${INSECURE_ZONES}"
local enabled zone server servers remark disable_dnssec rest
@@ -391,7 +406,7 @@ ns_is_online() {
local ns=${1}
shift
- dig @${ns} +nodnssec A ${TEST_DOMAIN} $@ >/dev/null
+ dig "${DIG_ARGS[@]}" @${ns} +nodnssec A ${TEST_DOMAIN} $@ >/dev/null
}
# Resolving ${TEST_DOMAIN_FAIL} will fail if the nameserver is validating
@@ -399,11 +414,11 @@ ns_is_validating() {
local ns=${1}
shift
- if ! dig @${ns} A ${TEST_DOMAIN_FAIL} $@ | grep -q SERVFAIL; then
+ if ! dig "${DIG_ARGS[@]}" @${ns} A ${TEST_DOMAIN_FAIL} $@ | grep -q SERVFAIL; then
return 1
else
# Determine if NS replies with "ad" data flag if DNSSEC enabled
- dig @${ns} +dnssec SOA ${TEST_DOMAIN} $@ | awk -F: '/\;\;\ flags\:/ { s=1; if (/\ ad/) s=0; exit s }'
+ dig "${DIG_ARGS[@]}" @${ns} +dnssec SOA ${TEST_DOMAIN} $@ | awk -F: '/\;\;\ flags\:/ { s=1; if (/\ ad/) s=0; exit s }'
fi
}
@@ -413,28 +428,33 @@ ns_forwards_DNSKEY() {
local ns=${1}
shift
- dig @${ns} DNSKEY ${TEST_DOMAIN} $@ | grep -qv SOA
+ dig "${DIG_ARGS[@]}" @${ns} DNSKEY ${TEST_DOMAIN} $@ | grep -qv SOA
}
ns_forwards_DS() {
local ns=${1}
shift
- dig @${ns} DS ${TEST_DOMAIN} $@ | grep -qv SOA
+ dig "${DIG_ARGS[@]}" @${ns} DS ${TEST_DOMAIN} $@ | grep -qv SOA
}
ns_forwards_RRSIG() {
local ns=${1}
shift
- dig @${ns} +dnssec A ${TEST_DOMAIN} $@ | grep -q RRSIG
+ dig "${DIG_ARGS[@]}" @${ns} +dnssec A ${TEST_DOMAIN} $@ | grep -q RRSIG
}
ns_supports_tcp() {
local ns=${1}
shift
- dig @${ns} +tcp A ${TEST_DOMAIN} $@ >/dev/null || return 1
+ # If TCP is forced we know by now if the server responds to it
+ if [ "${FORCE_TCP}" = "on" ]; then
+ return 0
+ fi
+
+ dig "${DIG_ARGS[@]}" @${ns} +tcp A ${TEST_DOMAIN} $@ >/dev/null || return 1
}
ns_determine_edns_buffer_size() {
@@ -443,7 +463,7 @@ ns_determine_edns_buffer_size() {
local b
for b in 4096 2048 1500 1480 1464 1400 1280 512; do
- if dig @${ns} +dnssec +bufsize=${b} A ${TEST_DOMAIN} $@ >/dev/null; then
+ if dig "${DIG_ARGS[@]}" @${ns} +dnssec +bufsize=${b} A ${TEST_DOMAIN} $@ >/dev/null; then
echo "${b}"
return 0
fi
@@ -464,7 +484,7 @@ get_root_nameservers() {
can_resolve_root() {
local ns
for ns in $(get_root_nameservers); do
- if dig @${ns} +dnssec SOA . $@ >/dev/null; then
+ if dig "${DIG_ARGS[@]}" @${ns} +dnssec SOA . $@ >/dev/null; then
return 0
fi
done
@@ -514,7 +534,7 @@ resolve() {
local ns
for ns in $(read_name_servers); do
local answer
- for answer in $(dig +short "@${ns}" A "${hostname}"); do
+ for answer in $(dig "${DIG_ARGS[@]}" +short "@${ns}" A "${hostname}"); do
found=1
# Filter out non-IP addresses
diff --git a/src/patches/hostapd/hostapd-2.8-increase_EAPOL-timeouts.patch b/src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch
similarity index 86%
rename from src/patches/hostapd/hostapd-2.8-increase_EAPOL-timeouts.patch
rename to src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch
index 4be4cd526..87aec005b 100644
--- a/src/patches/hostapd/hostapd-2.8-increase_EAPOL-timeouts.patch
+++ b/src/patches/hostapd/hostapd-2.9-increase_EAPOL-timeouts.patch
@@ -1,6 +1,6 @@
diff U3 src/ap/wpa_auth.c src/ap/wpa_auth.c
---- a/src/ap/wpa_auth.c Sun Apr 21 09:10:22 2019
-+++ b/src/ap/wpa_auth.c Sun Jun 9 01:05:24 2019
+--- a/src/ap/wpa_auth.c Wed Aug 7 15:25:25 2019
++++ b/src/ap/wpa_auth.c Fri Sep 20 17:35:23 2019
@@ -65,9 +65,9 @@
struct wpa_group *group);
static u8 * ieee80211w_kde_add(struct wpa_state_machine *sm, u8 *pos);
diff --git a/src/patches/hostapd/hostapd-2.8-noscan.patch b/src/patches/hostapd/hostapd-2.9-noscan.patch
similarity index 77%
rename from src/patches/hostapd/hostapd-2.8-noscan.patch
rename to src/patches/hostapd/hostapd-2.9-noscan.patch
index a323aab47..c4df23029 100644
--- a/src/patches/hostapd/hostapd-2.8-noscan.patch
+++ b/src/patches/hostapd/hostapd-2.9-noscan.patch
@@ -1,7 +1,7 @@
diff U3 hostapd/config_file.c hostapd/config_file.c
---- a/hostapd/config_file.c Sun Apr 21 09:10:22 2019
-+++ b/hostapd/config_file.c Sun Jun 9 01:08:21 2019
-@@ -3390,6 +3390,10 @@
+--- a/hostapd/config_file.c Wed Aug 7 15:25:25 2019
++++ b/hostapd/config_file.c Fri Sep 20 17:36:33 2019
+@@ -3411,6 +3411,10 @@
bss->ieee80211w = 1;
#endif /* CONFIG_OCV */
#ifdef CONFIG_IEEE80211N
@@ -13,9 +13,9 @@ diff U3 hostapd/config_file.c hostapd/config_file.c
conf->ieee80211n = atoi(pos);
} else if (os_strcmp(buf, "ht_capab") == 0) {
diff U3 src/ap/ap_config.h src/ap/ap_config.h
---- a/src/ap/ap_config.h Sun Apr 21 09:10:22 2019
-+++ b/src/ap/ap_config.h Sun Jun 9 01:06:42 2019
-@@ -801,6 +801,8 @@
+--- a/src/ap/ap_config.h Wed Aug 7 15:25:25 2019
++++ b/src/ap/ap_config.h Fri Sep 20 17:38:06 2019
+@@ -932,6 +932,8 @@
int ht_op_mode_fixed;
u16 ht_capab;
@@ -25,8 +25,8 @@ diff U3 src/ap/ap_config.h src/ap/ap_config.h
int secondary_channel;
int no_pri_sec_switch;
diff U3 src/ap/hw_features.c src/ap/hw_features.c
---- a/src/ap/hw_features.c Sun Apr 21 09:10:22 2019
-+++ b/src/ap/hw_features.c Sun Jun 9 01:09:41 2019
+--- a/src/ap/hw_features.c Wed Aug 7 15:25:25 2019
++++ b/src/ap/hw_features.c Fri Sep 20 17:39:02 2019
@@ -477,7 +477,8 @@
int ret;
@@ -38,8 +38,8 @@ diff U3 src/ap/hw_features.c src/ap/hw_features.c
hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
diff U3 src/ap/ieee802_11_ht.c src/ap/ieee802_11_ht.c
---- a/src/ap/ieee802_11_ht.c Sun Apr 21 09:10:22 2019
-+++ b/src/ap/ieee802_11_ht.c Sun Jun 9 01:13:09 2019
+--- a/src/ap/ieee802_11_ht.c Wed Aug 7 15:25:25 2019
++++ b/src/ap/ieee802_11_ht.c Fri Sep 20 17:41:24 2019
@@ -252,6 +252,9 @@
return;
}
diff --git a/src/wio/lang/wio.fr.pl b/src/wio/lang/wio.fr.pl
new file mode 100644
index 000000000..088c8105e
--- /dev/null
+++ b/src/wio/lang/wio.fr.pl
@@ -0,0 +1,158 @@
+%tr = (%tr,
+'wio' => 'Qui est en ligne ?',
+'wio stat' => 'Etat actuel :',
+'wio checked' => 'Dernière mise à jour',
+'wio name' => 'Nom d\'hôte ou FQDN ',
+'wio ipadress' => 'Adresse IP ',
+'wio image' => 'Statut',
+'wio up' => 'Actif',
+'wio down' => 'Inactif',
+'wio err' => 'Erreur',
+'wio warn' => 'Alerte',
+'wio_import_csv' => 'Fichier CSV :',
+'wio_import_hosts' => 'Configuration hôtes (var/ipfire/main/hosts) ?',
+'wio_import_data' => 'Import paramètres pour ',
+'wio_import_data1' => ' correct :',
+'wio_import_data2' => ' import :',
+'wio_import' => 'Importer',
+'wio_import_info' => 'message :',
+'wio_import_file' => 'Import de client(s) depuis :',
+'wio_import_info_csv' => 'Il n\'y a pas de nouvelle config à importer !',
+'wio settings' => 'Configuration :',
+'wio enabled' => 'Activer le service ?',
+'wio min' => 'minute(s)',
+'wio cron' => 'Interval de temps pour la mise à jour :',
+'wio_ovpn_cron' => 'Interval de temps pour vérifier l\'état d\'OpenVPN RW et IPSec :',
+'wio_save' => 'Sauvegarder',
+'wio_error' => 'message d\'erreur :',
+'wio_info' => 'message :',
+'wio_back' => 'Retour',
+'wio_use' => 'Importer cette config ?',
+'wio_ip_error' => 'Adresse IP invalide.',
+'wio_host_error' => 'Nom d\'hôte invalide.',
+'wio_host_exists' => 'Le nom d\'hôte est déjà utilisé.',
+'wio_host_empty' => 'Aucun nom d\'hôte n\'a été enregistré !',
+'wio_ip_exists' => 'Adresse IP déjà utilisée.',
+'wio_ip_empty' => 'Aucune adresse n\'a été enregistrée !',
+'wio_import_fixleases' => 'Configuration DHCP (var/ipfire/dhcp/fixleases) ?',
+'wio_import_leases' => 'Import settings :',
+'wio network' => 'Réseau',
+'wio_refresh' => 'maj de tous les clients maintenant',
+'wio_fqdn_error' => 'Nom de domaine (FQDN) invalide ! Veuillez ne pas utiliser de caractères spéciaux ni de blancs dans le nom de domaine.',
+'wio_edit' => 'Modifier les paramètres :',
+'wio_dyndns' => 'DynDNS ',
+'wio_dyndns_hosts' => 'Nom(s) DynDNS',
+'wio_dyndns_refresh' => 'Mise à jour IP de l\'hôte DynDNS',
+'wio_dyndns_on' => 'DynDNS Host activé (cliquer pour désactiver)',
+'wio_dyndns_off' => 'Hôte DynDNS désactivé (cliquer pour activer)',
+'wio_dyndns_info' => 'Aucune adresse IP enregistrée, car apparemment aucune connexion n’existe sur Internet. Avec la prochaine connexion Internet est réalisée une actualisation de l\'IP des hôtes DynDNS.',
+'wio_no_csv' => 'Le fichier n\'a pas l\'extension .csv',
+'wio_no_csv_error' => 'Veuillez ne pas utiliser de caractères spéciaux ou vides dans le nom de fichier.',
+'wio_no_file_selected' => 'Aucun fichier choisi !',
+'wio_import_infos' => 'Importer les configurations :',
+'wio_import_infos_csv' => 'NOTE : Seuls les enregistrements de données marqués "Importer ces paramètres ?" sont considérés comme importants ! Si des enregistrements de données avec une double adresse IP ou des noms d\'hôte doivent se faire, seul le premier enregistrement de données sera importé et les autres enregistrements de données (avec les adresses IP ou noms d\'hôte doubles) ne seront pas pris en compte !',
+'enable disable dyndns' => 'Activer ou désactiver l\'hôte DynDNS',
+'wio_msg' => 'L\'état du ou des clients examinés est mis à jour...',
+'wio_lanname' => 'Nom LAN',
+'wio_wanname' => 'Nom WAN',
+'wio_sc_refresh' => 'Mettre à jour le client maintenant',
+'wio_edit_settings' => 'Ajout manuel d\'un client :',
+'wio_edit_client' => 'Edition client :',
+'wio_graphs' => 'Afficher le graphique',
+'wio_no_graphs' => 'Pas de graphique disponible',
+'wio_graphs_stat' => 'Graphique pour',
+'wio_vpn_con' => 'Connexion(s) VPN :',
+'wio_wan_con' => 'Connexion WAN :',
+'wio_clients' => 'Clients :',
+'wio click to disable' => 'Activé',
+'wio click to enable' => 'Désactivé',
+'wio_net_scan' => 'Scan réseau(s) :',
+'wio_net_scan_vl' => 'Scan réseau',
+'wio_net_scan_l' => 'sur',
+'wio_net_scan_r' => '',
+'wio_net_scan_green' => 'vert',
+'wio_net_scan_blue' => 'bleu',
+'wio_net_scan_orange' => 'orange',
+'wio_net_scan_run' => 'Démarrer la recherche',
+'wio_sort_host' => 'Trier noms d\'hôtes (FQDN)',
+'wio_sort_ip' => 'Trier adresses IP',
+'wio_logging' => 'Activer la journalisation (/var/log/messages) ?',
+'wio_no_image' => 'SANS STATUT',
+'wio_ovpn_con' => 'OpenVPN - Connexion(s) :',
+'wio_connected' => 'Connecté depuis',
+'wio_wan_up' => 'CONNECTE',
+'wio_wan_down' => 'NON CONNECTE',
+'wio_n2n' => 'Connexion site-à-site',
+'wio_rw' => 'Connexion client nomade',
+'wio_mailremark_enabled' => 'Ajouter une remarque du client au corps de l\'email ?',
+'wio_mail_online_on' => 'Email en ligne activé (cliquer pour désactiver)',
+'wio_mail_online_off' => 'Email en ligne désactivé (cliquer pour activer)',
+'wio_mail_offline_on' => 'Email hors ligne activé (cliquer pour désactiver)',
+'wio_mail_offline_off' => 'Email hors ligne désactivé (cliquer pour activer)',
+'wio_mail_online' => 'Activer ou désactiver email en ligne',
+'wio_mail_offline' => 'Activer ou désactiver email hors ligne',
+'wio_sendemail' => 'Envoi mail changement d\'état ',
+'wio_hwaddress' => 'Adresse MAC',
+'wio_iface' => 'Interface',
+'wio_client_enable' => 'Hôte actif ?',
+'wio_ping_send' => 'Envoi ping vers ',
+'wio_link_open' => 'Ouvrir le lien avec ',
+'enable disable client' => 'Activer ou désactiver client',
+'wio_client_on' => 'Client activé (cliquer pour désactiver)',
+'wio_client_off' => 'Client désactivé (cliquer pour activer)',
+'wio_webinterface' => 'LIEN',
+'wio_webinterface_link' => 'Suivre le lien',
+'wio_ip' => 'Envoi ping vers IP activé',
+'wio_fqdn' => 'Envoi ping vers FQDN activé',
+'wio_ip_on' => 'Envoi ping vers IP activé (cliquer pour activer FQDN)',
+'wio_fqdn_on' => 'Envoi ping vers FQDN activé (cliquer pour activer IP)',
+'wio_client_add' => 'Valider ces paramètres',
+'wio_config' => 'Configurer client(s) :',
+'wio_settings_msg' => 'Paramètres de configuration :',
+'wio_settings_msg_hint' => 'Dans cette zone, vous pouvez personnaliser des paramètres du module.',
+'wio_sub' => 'WIO Client-Status-Mail',
+'wio timeout' => 'Temps de réponse max. du ping :',
+'wio sec' => 'seconde(s)',
+'wio_add' => 'Paramètres :',
+'wio_no_add' => 'Client est disponible',
+'wio_id' => '#',
+'wio_online' => 'En ligne',
+'wio_offline' => 'Hors ligne',
+'wio_status' => 'WIO Client-Status',
+'wio_mail_style' => 'Envoyer les messages d\'état du client WIO en tant que ',
+'wio_mail_smail' => 'Email collectif',
+'wio_mail_email' => 'Email simple',
+'wio_mail_ovpnrw' => 'Activer les messages d\'état OpenVPN RW et IPSec ?',
+'wio_edit_set' => 'Configuration',
+'wio_service' => 'Paramètres du service "Qui est en ligne ?" :',
+'wio_dyndns_success' => 'IP DynDNS identifié et enregistré !',
+'wio_remove_all' => 'Enlever tous les clients',
+'wio_remove_all_hint' => 'Etes-vous sûr de supprimer tous les clients ?',
+'wio_remove_client' => 'Enlever le client',
+'wio_remove_client_hint' => 'Etes-vous sûr de supprimer le client ?',
+'wio_arp_table_entries' => 'Ajout de client(s) depuis la table ARP :',
+'wio_activ' => 'Actif',
+'wio_check' => 'Vérif.',
+'wio_common_name' => 'Hôte/IP distant',
+'wio_msg_left' => 'La recherche du réseau ',
+'wio_msg_green' => 'vert',
+'wio_msg_blue' => 'bleu',
+'wio_msg_orange' => 'orange',
+'wio_msg_center' => 'sur l\'interface',
+'wio_msg_right' => 'est en cours.',
+'wio_msg_hint' => 'Un moment SVP...',
+'wio_last_update' => 'Dernière mise à jour',
+'wio_disable_hint' => 'Attention ! Tous les paramètres vont être réinitialisés , y compris le client à vérifier !',
+'wio_clientremark' => 'Afficher la remarque ?',
+'wio_already_running' => 'Cette vérification est déjà en cours d\'exécution !',
+'wio_error_function' => 'Cette fonction est temporairement indisponible, car en arrière-plan les états du client sont mis à jour (actif / inactif).',
+'wio_shutdown' => 'Arrêter IPFire quand tous les clients sont "hors ligne" ?',
+'wio_unknown_lan' => 'INCONNU',
+'wio_red_lan' => 'ROUGE',
+'wio_search' => 'Recherche d\'hôtes actifs sur le réseau local...',
+'wio_answer' => 'Answer',
+'wio_answer_time' => 'Temps de réponse',
+'wio_scriptruntime' => 'Temps d\'exécution du script',
+'wio_show_table_off' => 'Cacher la table',
+'wio_show_table_on' => 'Afficher la table',
+);
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2019-10-08 19:28 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=46nnT02QRKz2yFP@people01.haj.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox