[git.ipfire.org] IPFire 2.x development tree branch, next, updated. a4e5b80b91132e324e8c1caee1abb2e43a8ee706
by Arne Fitzenreiter 31 Oct '18
by Arne Fitzenreiter 31 Oct '18
31 Oct '18
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 a4e5b80b91132e324e8c1caee1abb2e43a8ee706 (commit)
via 1b24eec502f9b97dfed2ea82489b3dc2a9681274 (commit)
from c7b7a70deba70d6952898f4183c96d8ef8a91373 (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 a4e5b80b91132e324e8c1caee1abb2e43a8ee706
Merge: 1b24eec50 c7b7a70de
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Oct 31 18:44:43 2018 +0100
Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next
commit 1b24eec502f9b97dfed2ea82489b3dc2a9681274
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 30 18:15:14 2018 +0100
toolchain: bump version
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
make.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Difference in files:
diff --git a/make.sh b/make.sh
index 129bf6f7b..89ada4679 100755
--- a/make.sh
+++ b/make.sh
@@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
GIT_TAG=$(git tag | tail -1) # Git Tag
GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
-TOOLCHAINVER=20181024
+TOOLCHAINVER=20181030
###############################################################################
#
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. c7b7a70deba70d6952898f4183c96d8ef8a91373
by Michael Tremer 31 Oct '18
by Michael Tremer 31 Oct '18
31 Oct '18
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 c7b7a70deba70d6952898f4183c96d8ef8a91373 (commit)
via c81dffc942d95005f40d2db4c99139e139cd41bb (commit)
via ac1fc6ea5ea8dcfe30e5a47560ae4fb9210a2053 (commit)
via 33d20027679cc4a51a9d4f39160fa972b2b08fac (commit)
from b3cc1932e4afe74f450d3c05d630da16af5b3846 (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 c7b7a70deba70d6952898f4183c96d8ef8a91373
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 31 14:21:41 2018 +0000
backup: Rewrite backup script
The old script was quite messy and written in perl although
it was only calling shell commands.
This version is now written in shell although keeping the .pl
file suffix and is a drop-in replacement.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c81dffc942d95005f40d2db4c99139e139cd41bb
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 31 12:55:55 2018 +0000
core125: Ship updated backup include
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ac1fc6ea5ea8dcfe30e5a47560ae4fb9210a2053
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 31 12:10:18 2018 +0000
backup: Include addon backups in main backup
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 33d20027679cc4a51a9d4f39160fa972b2b08fac
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 31 12:08:57 2018 +0000
backup: Include custom include/exclude files
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/backup.pl | 321 +++++++++++++++++-------------
config/backup/include | 3 +
config/rootfiles/core/125/filelists/files | 2 +
3 files changed, 191 insertions(+), 135 deletions(-)
Difference in files:
diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index ce8911635..ddf2bf2b1 100644
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/bin/bash
###############################################################################
# #
# IPFire.org - A linux based firewall #
@@ -19,148 +19,199 @@
# #
###############################################################################
-require '/var/ipfire/general-functions.pl';
-require "${General::swroot}/lang.pl";
-require "${General::swroot}/header.pl";
-use File::Path;
-my $debug = 1;
-my @include = "";
-my ($Sekunden, $Minuten, $Stunden, $Monatstag, $Monat, $Jahr, $Wochentag, $Jahrestag, $Sommerzeit) = localtime(time);
-$Jahr = $Jahr + 1900;$Monat = $Monat + 1;
-$Monat = sprintf("%02d", $Monat);
-$Monatstag = sprintf("%02d", $Monatstag);
-$Stunden = sprintf("%02d", $Stunden);
-$Minuten = sprintf("%02d", $Minuten);
-
-if (($ARGV[0] eq 'include') || ($ARGV[0] eq 'iso')) {
- &createinclude;
- my @files = `find / -name *.log* 2>/dev/null`;
- foreach (@files){
- push(@include,$_);
- }
- my @files = `find /var/log/ -name *messages* 2>/dev/null`;
- foreach (@files){
- push(@include,$_);
- }
- open(DATEI, ">/tmp/include") || die "Could not save temp include file";
- print DATEI @include;
- print "/var/log/messages";
- close(DATEI);
- system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --exclude-from='/var/ipfire/backup/exclude' --exclude-from='/var/ipfire/backup/exclude.user' --files-from='/tmp/include' --files-from='/var/ipfire/backup/include.user'");
- system("rm /tmp/include");
- if ($ARGV[0] eq 'iso') {
- system("/usr/local/bin/backupiso $Jahr$Monat$Monatstag-$Stunden$Minuten &");
- }
-}
-elsif ($ARGV[0] eq 'exclude') {
- &createinclude;
- open(DATEI, ">/tmp/include") || die "Could not save temp include file";
- print DATEI @include;
- close(DATEI);
- system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --exclude-from='/var/ipfire/backup/exclude' --exclude-from='/var/ipfire/backup/exclude.user' --files-from='/tmp/include' --files-from='/var/ipfire/backup/include.user'");
- system("rm /tmp/include");
-}
-elsif ($ARGV[0] eq 'restore') {
- system("cd / && tar -xvz -p -f /tmp/restore.ipf");
- #Here some converter scripts to correct old Backups (before core 65)
- system("/usr/sbin/ovpn-ccd-convert");
- #OUTGOINGFW CONVERTER
- if( -d "${General::swroot}/outgoing"){
- if( -f "${General::swroot}/firewall/config" ){
- unlink("${General::swroot}/firewall/config");
- system("touch ${General::swroot}/firewall/config");
- chown 99,99,"${General::swroot}/firewall/config";
- }
- if( -f "${General::swroot}/firewall/outgoing" ){
- unlink("${General::swroot}/firewall/outgoing");
- system("touch ${General::swroot}/firewall/outgoing");
- chown 99,99,"${General::swroot}/firewall/outgoing";
- }
- unlink("${General::swroot}/fwhosts/customgroups");
- unlink("${General::swroot}/fwhosts/customhosts");
- unlink("${General::swroot}/fwhosts/customgroups");
- unlink("${General::swroot}/fwhosts/customnetworks");
- unlink("${General::swroot}/fwhosts/customservicegrp");
- unlink("${General::swroot}/fwhosts/customnetworks");
- system("touch ${General::swroot}/fwhosts/customgroups");
- system("touch ${General::swroot}/fwhosts/customhosts");
- system("touch ${General::swroot}/fwhosts/customnetworks");
- system("touch ${General::swroot}/fwhosts/customservicegrp");
- #START CONVERTER "OUTGOINGFW"
- system("/usr/sbin/convert-outgoingfw");
- chown 99,99,"${General::swroot}/fwhosts/customgroups";
- chown 99,99,"${General::swroot}/fwhosts/customhosts";
- chown 99,99,"${General::swroot}/fwhosts/customnetworks";
- chown 99,99,"${General::swroot}/fwhosts/customservicegrp";
- #START CONVERTER "OUTGOINGFW"
- rmtree("${General::swroot}/outgoing");
- }
- #XTACCESS CONVERTER
- if( -d "${General::swroot}/xtaccess"){
- if( -f "${General::swroot}/firewall/input" ){
- unlink("${General::swroot}/firewall/input");
- system("touch ${General::swroot}/firewall/input");
- }
- #START CONVERTER "XTACCESS"
- system("/usr/sbin/convert-xtaccess");
- chown 99,99,"${General::swroot}/firewall/input";
- rmtree("${General::swroot}/xtaccess");
- }
- #DMZ-HOLES CONVERTER
- if( -d "${General::swroot}/dmzholes" || -d "${General::swroot}/portfw"){
- if( -f "${General::swroot}/firewall/config" ){
- unlink("${General::swroot}/firewall/config");
- system("touch ${General::swroot}/firewall/config");
- }
- #START CONVERTER "DMZ-HOLES"
- system("/usr/sbin/convert-dmz");
- chown 99,99,"${General::swroot}/firewall/config";
- rmtree("${General::swroot}/dmzholes");
- }
- #PORTFORWARD CONVERTER
- if( -d "${General::swroot}/portfw"){
- #START CONVERTER "PORTFW"
- system("/usr/sbin/convert-portfw");
- rmtree("${General::swroot}/portfw");
- }
- system("/usr/local/bin/firewallctrl");
-
- # Convert old OpenVPN CCD files (CN change, core 75).
- system("/usr/local/bin/convert-ovpn");
+NOW="$(date "+%Y-%m-%d-%H:%M")"
+
+list_addons() {
+ local file
+ for file in /var/ipfire/backup/addons/includes/*; do
+ if [ -f "${file}" ]; then
+ basename "${file}"
+ fi
+ done
+
+ return 0
}
-elsif ($ARGV[0] eq 'restoreaddon') {
- if ( -e "/tmp/$ARGV[1]" ){system("mv /tmp/$ARGV[1] /var/ipfire/backup/addons/backup/$ARGV[1]");}
- system("cd / && tar -xvz -p -f /var/ipfire/backup/addons/backup/$ARGV[1]");
+
+process_includes() {
+ local include
+
+ for include in $@; do
+ local file
+ while read -r file; do
+ while read file; do
+ if [ -e "${file}" ]; then
+ echo "${file}"
+ fi
+ done <<< ${file}
+ done < "${include}"
+ done | sort -u
}
-elsif ($ARGV[0] eq 'cli') {
- system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten-$ARGV[1].ipf --files-from='$ARGV[2]' --exclude-from='$ARGV[3]'");
+
+make_backup() {
+ local filename="${1}"
+ shift
+
+ # Backup all addons first
+ local addon
+ for addon in $(list_addons); do
+ make_addon_backup "${addon}"
+ done
+
+ tar cvzf "${filename}" \
+ --exclude-from="/var/ipfire/backup/exclude" \
+ --exclude-from="/var/ipfire/backup/exclude.user" \
+ $(process_includes "/var/ipfire/backup/include" "/var/ipfire/backup/include.user") \
+ "$@"
+
+ return 0
}
-elsif ($ARGV[0] eq 'addonbackup') {
- system("tar -cvzf /var/ipfire/backup/addons/backup/$ARGV[1].ipf --files-from='/var/ipfire/backup/addons/includes/$ARGV[1]'");
+
+restore_backup() {
+ local filename="${1}"
+
+ tar xvzpf "${filename}" -C /
+
+ # Run converters
+
+ # Outgoing Firewall
+ if [ -d "/var/ipfire/outgoing" ]; then
+ # Reset files
+ local file
+ for file in /var/ipfire/firewall/{config,outgoing} \
+ /var/ipfire/fwhosts/custom{hosts,groups,networks}; do
+ : > "${file}"
+ chown nobody:nobody "${file}"
+ done
+
+ # Run converter
+ convert-outgoingfw
+
+ # Remove old configuration
+ rm -rf "/var/ipfire/outgoing"
+ fi
+
+ # External Access
+ if [ -d "/var/ipfire/xtaccess" ]; then
+ : > /var/ipfire/firewall/config
+ chown nobody:nobody "/var/ipfire/firewall/config"
+
+ # Run converter
+ convert-xtaccess
+
+ # Remove old configuration
+ rm -rf "/var/ipfire/xtaccess"
+ fi
+
+ # DMZ Holes
+ if [ -d "/var/ipfire/dmzholes" ] || [ -d "/var/ipfire/portfw" ]; then
+ : > /var/ipfire/firewall/config
+ chown nobody:nobody "/var/ipfire/firewall/config"
+
+ # Run converter
+ convert-dmz
+
+ # Remove old configuration
+ rm -rf "/var/ipfire/dmzholes"
+ fi
+
+ # Port Forwardings
+ if [ -d "/var/ipfire/portfw" ]; then
+ # Run converter
+ convert-portfw
+
+ # Remove old configuration
+ rm -rf "/var/ipfire/portfw"
+ fi
+
+ # Reload firewall
+ firewallctrl
+
+ # Convert old OpenVPN CCD files (CN change, Core Update 75)
+ convert-ovpn
+
+ return 0
}
-elsif ($ARGV[0] =~ /\.(iso|ipf)$/ ) {
- unlink("$ARGV[0]");
+
+find_logfiles() {
+ local filelist=( /var/log/messages* /var/log/*.log /var/log/**/*.log )
+
+ echo "${filelist[@]}"
}
-elsif ($ARGV[0] eq '') {
- printf "No argument given, please use <include><exclude><cli>\n"
+
+make_addon_backup() {
+ local name="${1}"
+ shift
+
+ if [ ! -f "/var/ipfire/backup/addons/includes/${name}" ]; then
+ echo "${name} does not have any backup includes" >&2
+ return 1
+ fi
+
+ local filename="/var/ipfire/backup/addons/backup/${name}.ipf"
+
+ tar cvzf "${filename}" \
+ $(process_includes "/var/ipfire/backup/addons/includes/${name}")
}
-elsif ($ARGV[0] eq 'makedirs') {
- system("mkdir -p /var/ipfire/backup/addons");
- system("mkdir -p /var/ipfire/backup/addons/backup");
- system("mkdir -p /var/ipfire/backup/addons/includes");
+
+restore_addon_backup() {
+ local name="${1}"
+
+ if [ -d "/tmp/${name}.ipf" ]; then
+ mv "/tmp/${name}.ipf" "/var/ipfire/backup/addons/backup/${name}.ipf"
+ fi
+
+ tar xvzpf "/var/ipfire/backup/addons/backup/${name}.ipf" -C /
}
-sub createinclude(){
+main() {
+ local command="${1}"
+ shift
+
+ # Desired backup filename
+ local filename="/var/ipfire/backup/${NOW}.ipf"
+
+ case "${command}" in
+ include)
+ make_backup "${filename}" $(find_logfiles)
+ ;;
+
+ exclude)
+ make_backup "${filename}"
+ ;;
+
+ restore)
+ restore_backup "/tmp/restore.ipf"
+ ;;
+
+ addonbackup)
+ make_addon_backup "$@"
+ ;;
- open(DATEI, "<${General::swroot}/backup/include") || die "Can not open include file";
- my @Zeilen = <DATEI>;
- close(DATEI);
+ restoreaddon)
+ restore_addon_backup "${1/.ipf/}"
+ ;;
- foreach (@Zeilen){
- chomp($_);
- my @files = `find $_ -maxdepth 0 2>/dev/null`;
- foreach (@files){
- push(@include,$_);
- }
- }
+ iso)
+ if make_backup "${filename}"; then
+ /usr/local/bin/backupiso "${NOW}" &
+ fi
+ ;;
+
+ makedirs)
+ mkdir -p /var/ipfire/backup/addons/{backup,includes}
+ ;;
+
+ /var/ipfire/backup/*.ipf|/var/ipfire/backup/addons/backup/*.ipf|/var/tmp/backupiso/*.iso)
+ unlink "${command}"
+ ;;
+
+ *)
+ echo "${0}: [include|exclude|restore|addonbackup <addon>|restoreaddon <addon>|iso]" >&2
+ return 2
+ ;;
+ esac
+
+ return $?
}
+
+main "$@" || exit $?
diff --git a/config/backup/include b/config/backup/include
index 6982b1c92..75bd85807 100644
--- a/config/backup/include
+++ b/config/backup/include
@@ -23,6 +23,9 @@
/root/.gitconfig
/root/.ssh
/var/ipfire/auth/users
+/var/ipfire/backup/addons/backup
+/var/ipfire/backup/exclude.user
+/var/ipfire/backup/include.user
/var/ipfire/captive/*
/var/ipfire/*/*.conf
/var/ipfire/*/config
diff --git a/config/rootfiles/core/125/filelists/files b/config/rootfiles/core/125/filelists/files
index f2afb62fb..59de43460 100644
--- a/config/rootfiles/core/125/filelists/files
+++ b/config/rootfiles/core/125/filelists/files
@@ -7,4 +7,6 @@ srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
srv/web/ipfire/cgi-bin/media.cgi
srv/web/ipfire/cgi-bin/pakfire.cgi
usr/local/bin/makegraphs
+var/ipfire/backup/bin/backup.pl
+var/ipfire/backup/include
var/ipfire/langs
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. b3cc1932e4afe74f450d3c05d630da16af5b3846
by Michael Tremer 31 Oct '18
by Michael Tremer 31 Oct '18
31 Oct '18
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 b3cc1932e4afe74f450d3c05d630da16af5b3846 (commit)
from 0faf9c7869cfca07dc51f297ba8f7b16623c3469 (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 b3cc1932e4afe74f450d3c05d630da16af5b3846
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 31 10:56:24 2018 +0000
Rootfile update
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/bison | 2 ++
config/rootfiles/common/kmod | 3 +++
config/rootfiles/packages/nfs | 19 +++++++++++++++++++
3 files changed, 24 insertions(+)
Difference in files:
diff --git a/config/rootfiles/common/bison b/config/rootfiles/common/bison
index 2ecfc75fb..d56db029e 100644
--- a/config/rootfiles/common/bison
+++ b/config/rootfiles/common/bison
@@ -51,6 +51,8 @@
#usr/share/locale/ast
#usr/share/locale/ast/LC_MESSAGES
#usr/share/locale/ast/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/ca/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/ca/LC_MESSAGES/bison.mo
#usr/share/locale/da/LC_MESSAGES/bison-runtime.mo
#usr/share/locale/da/LC_MESSAGES/bison.mo
#usr/share/locale/de/LC_MESSAGES/bison-runtime.mo
diff --git a/config/rootfiles/common/kmod b/config/rootfiles/common/kmod
index b3d45e25d..4c9b448f7 100644
--- a/config/rootfiles/common/kmod
+++ b/config/rootfiles/common/kmod
@@ -5,7 +5,10 @@ sbin/lsmod
sbin/modinfo
sbin/modprobe
sbin/rmmod
+#usr/include/libkmod.h
+#usr/lib/libkmod.la
#usr/lib/libkmod.so
usr/lib/libkmod.so.2
usr/lib/libkmod.so.2.3.3
+#usr/lib/pkgconfig/libkmod.pc
#usr/share/bash-completion/completions/kmod
diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs
index 048762650..f2637fec2 100644
--- a/config/rootfiles/packages/nfs
+++ b/config/rootfiles/packages/nfs
@@ -5,9 +5,26 @@ sbin/nfsdcltrack
sbin/osd_login
sbin/umount.nfs
sbin/umount.nfs4
+#usr/include/nfsidmap.h
#usr/include/nfsidmap_plugin.h
+#usr/lib/libnfsidmap
+#usr/lib/libnfsidmap.a
+#usr/lib/libnfsidmap.la
+#usr/lib/libnfsidmap.so
+usr/lib/libnfsidmap.so.0
+usr/lib/libnfsidmap.so.0.3.0
usr/lib/libnfsidmap.so.1
usr/lib/libnfsidmap.so.1.0.0
+#usr/lib/libnfsidmap/nsswitch.a
+#usr/lib/libnfsidmap/nsswitch.la
+usr/lib/libnfsidmap/nsswitch.so
+#usr/lib/libnfsidmap/static.a
+#usr/lib/libnfsidmap/static.la
+usr/lib/libnfsidmap/static.so
+#usr/lib/libnfsidmap/umich_ldap.a
+#usr/lib/libnfsidmap/umich_ldap.la
+usr/lib/libnfsidmap/umich_ldap.so
+#usr/lib/pkgconfig/libnfsidmap.pc
usr/sbin/exportfs
usr/sbin/mountstats
usr/sbin/nfsconf
@@ -22,7 +39,9 @@ usr/sbin/rpcdebug
usr/sbin/showmount
usr/sbin/sm-notify
usr/sbin/start-statd
+#usr/share/man/man3/nfs4_uid_to_name.3
#usr/share/man/man5/exports.5
+#usr/share/man/man5/idmapd.conf.5
#usr/share/man/man5/nfs.5
#usr/share/man/man5/nfs.conf.5
#usr/share/man/man5/nfsmount.conf.5
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 0faf9c7869cfca07dc51f297ba8f7b16623c3469
by Michael Tremer 31 Oct '18
by Michael Tremer 31 Oct '18
31 Oct '18
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 0faf9c7869cfca07dc51f297ba8f7b16623c3469 (commit)
via ed1349aa76704d35cbe306603dbe9716629f5cd0 (commit)
via 58e0aa18cca8e690e720376913fd71582689eb26 (commit)
via e1def10e29c8fedcf9357c2a7919ff9e3b70611a (commit)
via ebd6fe2b50a4f51a93475fc33f385b5477480a43 (commit)
via a90f7faf78e8d7a4220d4be51f6eb1b3f726e657 (commit)
via feaa3d91bdd88683a433287f8be9277691e09a4c (commit)
via 1a7db134068cc0ed6e599413090b18fa19743142 (commit)
from ea4e88cbbe9f7af6dc73609fd4012f918638f4d1 (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 0faf9c7869cfca07dc51f297ba8f7b16623c3469
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 31 09:32:01 2018 +0000
core125: Ship JSON-C
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ed1349aa76704d35cbe306603dbe9716629f5cd0
Merge: ea4e88cbb 58e0aa18c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 31 09:31:38 2018 +0000
Merge remote-tracking branch 'ms/frr' into next
commit 58e0aa18cca8e690e720376913fd71582689eb26
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 31 09:30:20 2018 +0000
frr: Add backup include file
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e1def10e29c8fedcf9357c2a7919ff9e3b70611a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 30 17:32:48 2018 +0000
frr: Set configuration file permissions correctly
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ebd6fe2b50a4f51a93475fc33f385b5477480a43
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 30 17:24:34 2018 +0000
frr: Add initscript
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit a90f7faf78e8d7a4220d4be51f6eb1b3f726e657
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 30 17:20:37 2018 +0000
frr: Install users and make backup when package is installed/uinstalled
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit feaa3d91bdd88683a433287f8be9277691e09a4c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 29 11:43:04 2018 +0000
frr: New package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1a7db134068cc0ed6e599413090b18fa19743142
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 26 11:23:55 2018 +0000
json-c: New package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/backup/includes/frr | 1 +
config/rootfiles/common/json-c | 21 +++++
config/rootfiles/core/125/filelists/json-c | 1 +
config/rootfiles/packages/frr | 129 +++++++++++++++++++++++++++++
lfs/{git => frr} | 45 +++++++---
lfs/{libpng => json-c} | 11 ++-
make.sh | 2 +
src/initscripts/packages/frr | 63 ++++++++++++++
src/paks/{freeradius => frr}/install.sh | 30 +++++--
src/paks/{nginx => frr}/uninstall.sh | 13 ++-
src/paks/{apcupsd => frr}/update.sh | 0
11 files changed, 289 insertions(+), 27 deletions(-)
create mode 100644 config/backup/includes/frr
create mode 100644 config/rootfiles/common/json-c
create mode 120000 config/rootfiles/core/125/filelists/json-c
create mode 100644 config/rootfiles/packages/frr
copy lfs/{git => frr} (79%)
copy lfs/{libpng => json-c} (94%)
create mode 100755 src/initscripts/packages/frr
copy src/paks/{freeradius => frr}/install.sh (78%)
copy src/paks/{nginx => frr}/uninstall.sh (93%)
copy src/paks/{apcupsd => frr}/update.sh (100%)
Difference in files:
diff --git a/config/backup/includes/frr b/config/backup/includes/frr
new file mode 100644
index 000000000..ca74d4891
--- /dev/null
+++ b/config/backup/includes/frr
@@ -0,0 +1 @@
+/etc/frr
diff --git a/config/rootfiles/common/json-c b/config/rootfiles/common/json-c
new file mode 100644
index 000000000..6be4bbe68
--- /dev/null
+++ b/config/rootfiles/common/json-c
@@ -0,0 +1,21 @@
+#usr/include/json-c
+#usr/include/json-c/arraylist.h
+#usr/include/json-c/bits.h
+#usr/include/json-c/debug.h
+#usr/include/json-c/json.h
+#usr/include/json-c/json_c_version.h
+#usr/include/json-c/json_config.h
+#usr/include/json-c/json_inttypes.h
+#usr/include/json-c/json_object.h
+#usr/include/json-c/json_object_iterator.h
+#usr/include/json-c/json_pointer.h
+#usr/include/json-c/json_tokener.h
+#usr/include/json-c/json_util.h
+#usr/include/json-c/json_visit.h
+#usr/include/json-c/linkhash.h
+#usr/include/json-c/printbuf.h
+#usr/lib/libjson-c.la
+#usr/lib/libjson-c.so
+usr/lib/libjson-c.so.4
+usr/lib/libjson-c.so.4.0.0
+#usr/lib/pkgconfig/json-c.pc
diff --git a/config/rootfiles/core/125/filelists/json-c b/config/rootfiles/core/125/filelists/json-c
new file mode 120000
index 000000000..2da263e3d
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/json-c
@@ -0,0 +1 @@
+../../../common/json-c
\ No newline at end of file
diff --git a/config/rootfiles/packages/frr b/config/rootfiles/packages/frr
new file mode 100644
index 000000000..8aafc7c6c
--- /dev/null
+++ b/config/rootfiles/packages/frr
@@ -0,0 +1,129 @@
+#etc/frr
+etc/frr/bgpd.conf.sample
+etc/frr/bgpd.conf.sample2
+etc/frr/bgpd.conf.vnc.sample
+etc/frr/ospfd.conf.sample
+etc/frr/ripngd.conf.sample
+etc/frr/staticd.conf.sample
+etc/frr/vtysh.conf.sample
+etc/frr/zebra.conf.sample
+etc/rc.d/init.d/frr
+usr/bin/bgp_btoa
+usr/bin/vtysh
+#usr/include/frr
+#usr/include/frr/bfd.h
+#usr/include/frr/bitfield.h
+#usr/include/frr/buffer.h
+#usr/include/frr/checksum.h
+#usr/include/frr/command.h
+#usr/include/frr/command_graph.h
+#usr/include/frr/command_match.h
+#usr/include/frr/compiler.h
+#usr/include/frr/csv.h
+#usr/include/frr/debug.h
+#usr/include/frr/distribute.h
+#usr/include/frr/eigrpd
+#usr/include/frr/eigrpd/eigrp_dump.h
+#usr/include/frr/eigrpd/eigrp_topology.h
+#usr/include/frr/eigrpd/eigrpd.h
+#usr/include/frr/event_counter.h
+#usr/include/frr/ferr.h
+#usr/include/frr/fifo.h
+#usr/include/frr/filter.h
+#usr/include/frr/freebsd-queue.h
+#usr/include/frr/frr_pthread.h
+#usr/include/frr/frratomic.h
+#usr/include/frr/frrstr.h
+#usr/include/frr/getopt.h
+#usr/include/frr/graph.h
+#usr/include/frr/hash.h
+#usr/include/frr/hook.h
+#usr/include/frr/if.h
+#usr/include/frr/if_rmap.h
+#usr/include/frr/imsg.h
+#usr/include/frr/ipaddr.h
+#usr/include/frr/jhash.h
+#usr/include/frr/json.h
+#usr/include/frr/keychain.h
+#usr/include/frr/lib_errors.h
+#usr/include/frr/libfrr.h
+#usr/include/frr/libospf.h
+#usr/include/frr/linklist.h
+#usr/include/frr/log.h
+#usr/include/frr/logicalrouter.h
+#usr/include/frr/md5.h
+#usr/include/frr/memory.h
+#usr/include/frr/memory_vty.h
+#usr/include/frr/module.h
+#usr/include/frr/monotime.h
+#usr/include/frr/mpls.h
+#usr/include/frr/network.h
+#usr/include/frr/nexthop.h
+#usr/include/frr/nexthop_group.h
+#usr/include/frr/ns.h
+#usr/include/frr/openbsd-queue.h
+#usr/include/frr/openbsd-tree.h
+#usr/include/frr/ospfd
+#usr/include/frr/ospfd/ospf_api.h
+#usr/include/frr/ospfd/ospf_asbr.h
+#usr/include/frr/ospfd/ospf_dump.h
+#usr/include/frr/ospfd/ospf_dump_api.h
+#usr/include/frr/ospfd/ospf_ism.h
+#usr/include/frr/ospfd/ospf_lsa.h
+#usr/include/frr/ospfd/ospf_lsdb.h
+#usr/include/frr/ospfd/ospf_nsm.h
+#usr/include/frr/ospfd/ospf_opaque.h
+#usr/include/frr/ospfd/ospfd.h
+#usr/include/frr/pbr.h
+#usr/include/frr/plist.h
+#usr/include/frr/pqueue.h
+#usr/include/frr/prefix.h
+#usr/include/frr/privs.h
+#usr/include/frr/ptm_lib.h
+#usr/include/frr/pw.h
+#usr/include/frr/qobj.h
+#usr/include/frr/queue.h
+#usr/include/frr/ringbuf.h
+#usr/include/frr/route_types.h
+#usr/include/frr/routemap.h
+#usr/include/frr/sbuf.h
+#usr/include/frr/sha256.h
+#usr/include/frr/sigevent.h
+#usr/include/frr/skiplist.h
+#usr/include/frr/sockopt.h
+#usr/include/frr/sockunion.h
+#usr/include/frr/spf_backoff.h
+#usr/include/frr/srcdest_table.h
+#usr/include/frr/stream.h
+#usr/include/frr/systemd.h
+#usr/include/frr/table.h
+#usr/include/frr/termtable.h
+#usr/include/frr/thread.h
+#usr/include/frr/vector.h
+#usr/include/frr/version.h
+#usr/include/frr/vlan.h
+#usr/include/frr/vrf.h
+#usr/include/frr/vrf_int.h
+#usr/include/frr/vty.h
+#usr/include/frr/vxlan.h
+#usr/include/frr/wheel.h
+#usr/include/frr/workqueue.h
+#usr/include/frr/zassert.h
+#usr/include/frr/zclient.h
+#usr/include/frr/zebra.h
+#usr/lib/libfrr.a
+#usr/lib/libfrr.la
+#usr/lib/libfrr.so
+usr/lib/libfrr.so.0
+usr/lib/libfrr.so.0.0.0
+usr/sbin/bgpd
+usr/sbin/frr
+usr/sbin/frr-reload
+usr/sbin/frr-reload.py
+usr/sbin/ospfd
+usr/sbin/rfptest
+usr/sbin/ssd
+usr/sbin/staticd
+usr/sbin/watchfrr
+usr/sbin/zebra
+var/ipfire/backup/addons/includes/frr
diff --git a/lfs/frr b/lfs/frr
new file mode 100644
index 000000000..a14dc5981
--- /dev/null
+++ b/lfs/frr
@@ -0,0 +1,114 @@
+###############################################################################
+# #
+# 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 = 6.0
+
+THISAPP = frr-$(VER)
+DL_FILE = $(THISAPP).tar.xz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = frr
+PAK_VER = 1
+
+DEPS = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = d725c08e0093f58e5fcac0969c781813
+
+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 axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc/frr \
+ --localstatedir=/var/run/frr \
+ --enable-user="frr" \
+ --enable-group="frr" \
+ --enable-vty-group="frrvty" \
+ --enable-multipath=64 \
+ --disable-doc \
+ --disable-babeld \
+ --disable-bfdd \
+ --disable-eigrpd \
+ --disable-irdp \
+ --disable-isisd \
+ --disable-ldpd \
+ --disable-nhrpd \
+ --disable-ospf6d \
+ --disable-ospfapi \
+ --disable-pbrd \
+ --disable-pimd \
+ --disable-ripd \
+ --disable-ripngd
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+
+ # Install backup include
+ install -v -m 644 $(DIR_SRC)/config/backup/includes/frr \
+ /var/ipfire/backup/addons/includes/frr
+
+ # Install initscript
+ $(call INSTALL_INITSCRIPT,frr)
+
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
+
diff --git a/lfs/json-c b/lfs/json-c
new file mode 100644
index 000000000..51a20ccbf
--- /dev/null
+++ b/lfs/json-c
@@ -0,0 +1,80 @@
+###############################################################################
+# #
+# 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.13.1
+
+THISAPP = json-c-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 04969ad59cc37bddd83741a08b98f350
+
+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 axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr --disable-static
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index c5cfab151..129bf6f7b 100755
--- a/make.sh
+++ b/make.sh
@@ -1176,6 +1176,7 @@ buildipfire() {
lfsmake2 libgcrypt
lfsmake2 libassuan
lfsmake2 nettle
+ lfsmake2 json-c
lfsmake2 libevent
lfsmake2 libevent2
lfsmake2 expat
@@ -1556,6 +1557,7 @@ buildipfire() {
lfsmake2 lua
lfsmake2 dnsdist
lfsmake2 bird
+ lfsmake2 frr
lfsmake2 dmidecode
lfsmake2 mcelog
lfsmake2 rtpproxy
diff --git a/src/initscripts/packages/frr b/src/initscripts/packages/frr
new file mode 100755
index 000000000..5fa4e9fa8
--- /dev/null
+++ b/src/initscripts/packages/frr
@@ -0,0 +1,63 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/frr
+#
+# Description : FRRouting Suite
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. ${rc_functions}
+
+DAEMONS="zebra bgpd ospfd staticd"
+
+case "${1}" in
+ start)
+ # Fix permissions of configuration directory
+ if [ -d "/etc/frr" ]; then
+ chown root.frr /etc/frr
+ chmod 775 /etc/frr
+ fi
+
+ for daemon in ${DAEMONS}; do
+ if [ -f "/etc/frr/${daemon}.conf" ]; then
+ # Set permissions
+ chown frr.frr "/etc/frr/${daemon}.conf"
+
+ boot_mesg "Starting FRRouting ${daemon}..."
+ loadproc "/usr/sbin/${daemon}" --daemon
+ fi
+ done
+ ;;
+
+ stop)
+ for daemon in ${DAEMONS}; do
+ boot_mesg "Stopping FRRouting ${daemon}..."
+ killproc "/usr/sbin/${daemon}"
+ done
+ ;;
+
+ reload)
+ boot_mesg "Reloading FRRouting..."
+ reloadproc /usr/sbin/frr-reload
+ ;;
+
+ restart)
+ ${0} stop
+ sleep 1
+ ${0} start
+ ;;
+
+ status)
+ for daemon in ${DAEMONS}; do
+ statusproc "/usr/sbin/${daemon}"
+ done
+ ;;
+
+ *)
+ echo "Usage: ${0} {start|stop|reload|restart|status}"
+ exit 1
+ ;;
+esac
+
+# End $rc_base/init.d/frr
diff --git a/src/paks/frr/install.sh b/src/paks/frr/install.sh
new file mode 100644
index 000000000..7e0222246
--- /dev/null
+++ b/src/paks/frr/install.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+
+if ! getent group frr &>/dev/null; then
+ groupadd -r frr
+fi
+
+if ! getent group frrvty &>/dev/null; then
+ groupadd -r frrvty
+fi
+
+if ! getent passwd frr &>/dev/null; then
+ useradd -r frr -g frr -s /bin/false -b /var/empty -G frrvty
+fi
+
+# Extract files
+extract_files
+
+# Restore any backups
+restore_backup "${NAME}"
+
+# Start services
+start_service "${NAME}"
+
+# Enable autostart
+ln -svf ../init.d/frr /etc/rc.d/rc0.d/K40frr
+ln -svf ../init.d/frr /etc/rc.d/rc3.d/S50frr
+ln -svf ../init.d/frr /etc/rc.d/rc6.d/K40frr
+
+exit 0
diff --git a/src/paks/frr/uninstall.sh b/src/paks/frr/uninstall.sh
new file mode 100644
index 000000000..49e3fdd7d
--- /dev/null
+++ b/src/paks/frr/uninstall.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+
+# Stop services
+stop_service "${NAME}"
+
+# Create backup
+extract_backup_includes
+make_backup "${NAME}"
+
+# Remove all files
+rm -rfv /etc/rc.d/rc*.d/*frr
+remove_files
diff --git a/src/paks/frr/update.sh b/src/paks/frr/update.sh
new file mode 100644
index 000000000..89c40d0d7
--- /dev/null
+++ b/src/paks/frr/update.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire is free software; you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation; either version 2 of the License, or #
+# (at your option) any later version. #
+# #
+# IPFire is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ea4e88cbbe9f7af6dc73609fd4012f918638f4d1
by Arne Fitzenreiter 30 Oct '18
by Arne Fitzenreiter 30 Oct '18
30 Oct '18
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 ea4e88cbbe9f7af6dc73609fd4012f918638f4d1 (commit)
from ebaecf2c968084efb9dad06403c6a74047ef74f6 (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 ea4e88cbbe9f7af6dc73609fd4012f918638f4d1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 30 18:13:45 2018 +0100
perl: fix toolchain build
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/perl | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Difference in files:
diff --git a/lfs/perl b/lfs/perl
index a151e765b..fa2256d6b 100644
--- a/lfs/perl
+++ b/lfs/perl
@@ -90,8 +90,7 @@ ifeq "$(ROOT)" ""
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
else
- cd $(DIR_APP) && ./Configure -des -Dprefix=$(TOOLS_DIR) \
- -Dlibs="-lm" -Uloclibpth -Ulocincpth
+ cd $(DIR_APP) && ./Configure -des -Dprefix=$(TOOLS_DIR)
cd $(DIR_APP) && sed -i 's/^0$$//' makefile
cd $(DIR_APP) && sed -i 's/^0$$//' x2p/makefile
cd $(DIR_APP) && make
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. ebaecf2c968084efb9dad06403c6a74047ef74f6
by Arne Fitzenreiter 30 Oct '18
by Arne Fitzenreiter 30 Oct '18
30 Oct '18
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 ebaecf2c968084efb9dad06403c6a74047ef74f6 (commit)
from 7261a4987d7f7399e773f45c0957b363d6a9e43d (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 ebaecf2c968084efb9dad06403c6a74047ef74f6
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 30 15:07:12 2018 +0100
Revert "make.sh: Log into subdirectory for each architecture"
This reverts commit 35ce207ff7f94921ddffb23501c28d7095d59a04.
-----------------------------------------------------------------------
Summary of changes:
lfs/Config | 7 +++----
make.sh | 34 ++++++++++++++++------------------
2 files changed, 19 insertions(+), 22 deletions(-)
Difference in files:
diff --git a/lfs/Config b/lfs/Config
index a1232a2c2..76f279da9 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -31,8 +31,7 @@
###############################################################################
# Cleanup environment from any variables
-unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN
-unexport TOOLS_DIR LOG_DIR
+unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN TOOLS_DIR
ifeq "$(BUILD_ARCH)" "aarch64"
IS_64BIT = 1
@@ -86,7 +85,7 @@ DIR_SRC = $(ROOT)/usr/src
DIR_DL = $(LFS_BASEDIR)/cache
DIR_CHK = $(LFS_BASEDIR)/cache/check
DIR_CONF = $(LFS_BASEDIR)/config
-DIR_INFO = $(LFS_BASEDIR)/$(LOG_DIR)
+DIR_INFO = $(LFS_BASEDIR)/log
DIR_TMP = /tmp
# Add the compiler location and version and specs to the ccache hash
@@ -110,7 +109,7 @@ endif
###############################################################################
# For each package we create a list of files that it installed under
-# $(LOG_DIR/)<TARGET> name. Modified files are not identified
+# log/<TARGET> name. Modified files are not identified
#
define FIND_FILES
cd $(ROOT)/ && find -mount \
diff --git a/make.sh b/make.sh
index a7e806858..c5cfab151 100755
--- a/make.sh
+++ b/make.sh
@@ -109,7 +109,10 @@ fi
# This is the directory where make.sh is in
export BASEDIR=$(echo $FULLPATH | sed "s/\/$BASENAME//g")
+LOGFILE=$BASEDIR/log/_build.preparation.log
+export LOGFILE
DIR_CHK=$BASEDIR/cache/check
+mkdir $BASEDIR/log/ 2>/dev/null
system_processors() {
getconf _NPROCESSORS_ONLN 2>/dev/null || echo "1"
@@ -190,7 +193,6 @@ configure_build() {
BUILD_ARCH="${build_arch}"
TOOLS_DIR="/tools_${BUILD_ARCH}"
- LOG_DIR="log_${BUILD_ARCH}"
# Enables hardening
HARDENING_CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong"
@@ -283,7 +285,7 @@ stdumount() {
umount $BASEDIR/build/usr/src/html 2>/dev/null;
umount $BASEDIR/build/usr/src/langs 2>/dev/null;
umount $BASEDIR/build/usr/src/lfs 2>/dev/null;
- umount $BASEDIR/build/usr/src/${LOG_DIR} 2>/dev/null;
+ umount $BASEDIR/build/usr/src/log 2>/dev/null;
umount $BASEDIR/build/usr/src/src 2>/dev/null;
}
@@ -419,9 +421,6 @@ exiterror() {
}
prepareenv() {
- # Create log directory if it doesn't exist, yet
- mkdir -p "${BASEDIR}/${LOG_DIR}"
-
# Are we running the right shell?
if [ -z "${BASH}" ]; then
exiterror "BASH environment variable is not set. You're probably running the wrong shell."
@@ -475,7 +474,7 @@ prepareenv() {
mkdir -p $BASEDIR/build/{etc,usr/src} 2>/dev/null
mkdir -p $BASEDIR/build/{dev/{shm,pts},proc,sys}
mkdir -p $BASEDIR/{cache,ccache} 2>/dev/null
- mkdir -p $BASEDIR/build/usr/src/{cache,config,doc,html,langs,lfs,${LOG_DIR},src,ccache}
+ mkdir -p $BASEDIR/build/usr/src/{cache,config,doc,html,langs,lfs,log,src,ccache}
mknod -m 600 $BASEDIR/build/dev/console c 5 1 2>/dev/null
mknod -m 666 $BASEDIR/build/dev/null c 1 3 2>/dev/null
@@ -493,7 +492,7 @@ prepareenv() {
mount --bind $BASEDIR/html $BASEDIR/build/usr/src/html
mount --bind $BASEDIR/langs $BASEDIR/build/usr/src/langs
mount --bind $BASEDIR/lfs $BASEDIR/build/usr/src/lfs
- mount --bind $BASEDIR/${LOG_DIR} $BASEDIR/build/usr/src/${LOG_DIR}
+ mount --bind $BASEDIR/log $BASEDIR/build/usr/src/log
mount --bind $BASEDIR/src $BASEDIR/build/usr/src/src
# Run LFS static binary creation scripts one by one
@@ -540,7 +539,6 @@ enterchroot() {
CORE="${CORE}" \
SLOGAN="${SLOGAN}" \
TOOLS_DIR="${TOOLS_DIR}" \
- LOG_DIR="${LOG_DIR}" \
CONFIG_ROOT="${CONFIG_ROOT}" \
CFLAGS="${CFLAGS} ${HARDENING_CFLAGS}" \
CXXFLAGS="${CXXFLAGS} ${HARDENING_CFLAGS}" \
@@ -965,7 +963,7 @@ buildtoolchain() {
exiterror "Could not create ${TOOLS_DIR} symbolic link"
fi
- LOGFILE="$BASEDIR/${LOG_DIR}/_build.toolchain.log"
+ LOGFILE="$BASEDIR/log/_build.toolchain.log"
export LOGFILE
lfsmake1 stage1
@@ -1010,7 +1008,7 @@ buildtoolchain() {
}
buildbase() {
- LOGFILE="$BASEDIR/${LOG_DIR}/_build.base.log"
+ LOGFILE="$BASEDIR/log/_build.base.log"
export LOGFILE
lfsmake2 stage2
lfsmake2 linux KCFG="-headers"
@@ -1079,7 +1077,7 @@ buildbase() {
}
buildipfire() {
- LOGFILE="$BASEDIR/${LOG_DIR}/_build.ipfire.log"
+ LOGFILE="$BASEDIR/log/_build.ipfire.log"
export LOGFILE
lfsmake2 configroot
lfsmake2 initscripts
@@ -1578,7 +1576,7 @@ buildipfire() {
buildinstaller() {
# Run installer scripts one by one
- LOGFILE="$BASEDIR/${LOG_DIR}/_build.installer.log"
+ LOGFILE="$BASEDIR/log/_build.installer.log"
export LOGFILE
lfsmake2 memtest
lfsmake2 installer
@@ -1587,7 +1585,7 @@ buildinstaller() {
}
buildpackages() {
- LOGFILE="$BASEDIR/${LOG_DIR}/_build.packages.log"
+ LOGFILE="$BASEDIR/log/_build.packages.log"
export LOGFILE
echo "... see detailed log in _build.*.log files" >> $LOGFILE
@@ -1595,8 +1593,8 @@ buildpackages() {
# Generating list of packages used
print_line "Generating packages list from logs"
rm -f $BASEDIR/doc/packages-list
- for i in `ls -1tr $BASEDIR/${LOG_DIR}/[^_]*`; do
- if [ "$i" != "$BASEDIR/${LOG_DIR}/FILES" -a -n $i ]; then
+ for i in `ls -1tr $BASEDIR/log/[^_]*`; do
+ if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then
echo "* `basename $i`" >>$BASEDIR/doc/packages-list
fi
done
@@ -1755,7 +1753,7 @@ clean)
rm -rf $BASEDIR/build
rm -rf $BASEDIR/cdrom
rm -rf $BASEDIR/packages
- rm -rf $BASEDIR/${LOG_DIR}
+ rm -rf $BASEDIR/log
if [ -h "${TOOLS_DIR}" ]; then
rm -f "${TOOLS_DIR}"
fi
@@ -1766,7 +1764,7 @@ downloadsrc)
if [ ! -d $BASEDIR/cache ]; then
mkdir $BASEDIR/cache
fi
- mkdir -p $BASEDIR/${LOG_DIR}
+ mkdir -p $BASEDIR/log
echo -e "${BOLD}Preload all source files${NORMAL}" | tee -a $LOGFILE
FINISHED=0
cd $BASEDIR/lfs
@@ -1825,7 +1823,7 @@ toolchain)
buildtoolchain
echo "`date -u '+%b %e %T'`: Create toolchain image for ${BUILD_ARCH}" | tee -a $LOGFILE
test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
- cd $BASEDIR && tar -cf- --exclude='${LOG_DIR}/_build.*.log' build/${TOOLS_DIR} build/bin/sh ${LOG_DIR} | xz ${XZ_OPT} \
+ cd $BASEDIR && tar -cf- --exclude='log/_build.*.log' build/${TOOLS_DIR} build/bin/sh log | xz ${XZ_OPT} \
> cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz
md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz \
> cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.md5
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 7261a4987d7f7399e773f45c0957b363d6a9e43d
by Michael Tremer 29 Oct '18
by Michael Tremer 29 Oct '18
29 Oct '18
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 7261a4987d7f7399e773f45c0957b363d6a9e43d (commit)
via fc95fb03034affc068672203cc3a86cc2c21cfb2 (commit)
via 35ce207ff7f94921ddffb23501c28d7095d59a04 (commit)
from 81e838ebde6879ee91c61ec4d8a17ef100b486bd (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 7261a4987d7f7399e773f45c0957b363d6a9e43d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 29 13:43:37 2018 +0000
Update translations
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fc95fb03034affc068672203cc3a86cc2c21cfb2
Author: Stéphane <steph78630(a)gmail.com>
Date: Fri Oct 26 18:32:14 2018 +0200
French translation improvements
- Adding missing syntaxes
- Improved syntax translation
- Minor corrections (spelling, conjugation)
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 35ce207ff7f94921ddffb23501c28d7095d59a04
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 29 13:42:51 2018 +0000
make.sh: Log into subdirectory for each architecture
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
doc/language_issues.es | 2 +
doc/language_issues.fr | 2 +
doc/language_issues.it | 2 +
doc/language_issues.nl | 2 +
doc/language_issues.pl | 2 +
doc/language_issues.ru | 2 +
doc/language_issues.tr | 2 +
doc/language_missings | 14 +
langs/fr/cgi-bin/fr.pl | 774 ++++++++++++++++++++++++-------------------------
lfs/Config | 7 +-
make.sh | 34 ++-
11 files changed, 437 insertions(+), 406 deletions(-)
Difference in files:
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 6a8acd6da..ea032f213 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -1272,3 +1272,5 @@ WARNING: untranslated string: wlan clients
WARNING: untranslated string: wlanap
WARNING: untranslated string: wlanap configuration
WARNING: untranslated string: wlanap country
+WARNING: untranslated string: wlanap neighbor scan
+WARNING: untranslated string: wlanap neighbor scan warning
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 271179cc6..512d181f4 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -1297,6 +1297,8 @@ WARNING: untranslated string: wlanap interface
WARNING: untranslated string: wlanap invalid wpa
WARNING: untranslated string: wlanap link dhcp
WARNING: untranslated string: wlanap link wireless
+WARNING: untranslated string: wlanap neighbor scan
+WARNING: untranslated string: wlanap neighbor scan warning
WARNING: untranslated string: wlanap no interface
WARNING: untranslated string: wlanap none
WARNING: untranslated string: wlanap notifications
diff --git a/doc/language_issues.it b/doc/language_issues.it
index ac51eb07c..59039a61d 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -935,3 +935,5 @@ WARNING: untranslated string: wlan client tls cipher
WARNING: untranslated string: wlan client tls version
WARNING: untranslated string: wlanap
WARNING: untranslated string: wlanap configuration
+WARNING: untranslated string: wlanap neighbor scan
+WARNING: untranslated string: wlanap neighbor scan warning
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 18307d5af..3b9facf7c 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -983,3 +983,5 @@ WARNING: untranslated string: wlan client tls cipher
WARNING: untranslated string: wlan client tls version
WARNING: untranslated string: wlanap
WARNING: untranslated string: wlanap configuration
+WARNING: untranslated string: wlanap neighbor scan
+WARNING: untranslated string: wlanap neighbor scan warning
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 6a8acd6da..ea032f213 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -1272,3 +1272,5 @@ WARNING: untranslated string: wlan clients
WARNING: untranslated string: wlanap
WARNING: untranslated string: wlanap configuration
WARNING: untranslated string: wlanap country
+WARNING: untranslated string: wlanap neighbor scan
+WARNING: untranslated string: wlanap neighbor scan warning
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 3a7b6b95f..bf87c2500 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -1267,3 +1267,5 @@ WARNING: untranslated string: wlan clients
WARNING: untranslated string: wlanap
WARNING: untranslated string: wlanap configuration
WARNING: untranslated string: wlanap country
+WARNING: untranslated string: wlanap neighbor scan
+WARNING: untranslated string: wlanap neighbor scan warning
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 7b5bc0559..e3517dc4b 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -798,3 +798,5 @@ WARNING: untranslated string: ssh username
WARNING: untranslated string: vpn start action add
WARNING: untranslated string: vpn statistics n2n
WARNING: untranslated string: vpn wait
+WARNING: untranslated string: wlanap neighbor scan
+WARNING: untranslated string: wlanap neighbor scan warning
diff --git a/doc/language_missings b/doc/language_missings
index 4e60485ce..a9058e0ee 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -731,6 +731,8 @@
< wlanap
< wlanap configuration
< wlanap country
+< wlanap neighbor scan
+< wlanap neighbor scan warning
< wlan client
< wlan client advanced settings
< wlan client and
@@ -1460,6 +1462,8 @@
< wlanap invalid wpa
< wlanap link dhcp
< wlanap link wireless
+< wlanap neighbor scan
+< wlanap neighbor scan warning
< wlanap no interface
< wlanap none
< wlanap notifications
@@ -1711,6 +1715,8 @@
< wireless network
< wlanap
< wlanap configuration
+< wlanap neighbor scan
+< wlanap neighbor scan warning
< wlan client anonymous identity
< wlan client auth auto
< wlan client authentication settings
@@ -1979,6 +1985,8 @@
< wireless network
< wlanap
< wlanap configuration
+< wlanap neighbor scan
+< wlanap neighbor scan warning
< wlan client anonymous identity
< wlan client auth auto
< wlan client authentication settings
@@ -2657,6 +2665,8 @@
< wlanap
< wlanap configuration
< wlanap country
+< wlanap neighbor scan
+< wlanap neighbor scan warning
< wlan client
< wlan client advanced settings
< wlan client and
@@ -3372,6 +3382,8 @@
< wlanap
< wlanap configuration
< wlanap country
+< wlanap neighbor scan
+< wlanap neighbor scan warning
< wlan client
< wlan client advanced settings
< wlan client and
@@ -3433,3 +3445,5 @@
< ssh username
< vpn start action add
< vpn wait
+< wlanap neighbor scan
+< wlanap neighbor scan warning
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index e896c9b2a..cc67251e1 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -2,16 +2,16 @@
%tr,
'Act as' => 'Agir en tant que :',
-'Add Level7 rule' => 'Ajouter une règle de Niveau 7',
-'Add Port Rule' => 'Ajouter une règle de Port',
+'Add Level7 rule' => 'Ajouter une règle de niveau 7',
+'Add Port Rule' => 'Ajouter une règle de port',
'Add Rule' => 'Ajouter une règle',
'Add a route' => 'Ajouter une route',
'Async logging enabled' => 'Activer l\'écriture asynchrone du fichier syslog',
'Choose Rule' => 'Choisissez <u>une</u> des règles suivantes.',
'Class' => 'Classe',
-'Class was deleted' => 'Avec potentielles sous classes effacées',
+'Class was deleted' => 'Avec potentielles sous-classes effacées',
'Client status and controlc' => 'Statut client et contrôle :',
-'ConnSched action' => 'Action:',
+'ConnSched action' => 'Action :',
'ConnSched add action' => 'Ajouter action',
'ConnSched change profile title' => 'Changer de profil :',
'ConnSched days' => 'Jours :',
@@ -28,24 +28,24 @@
'Edit an existing route' => 'Modifier une route existante',
'Enter TOS' => 'Activer ou désactiver TOS-Bits <br /> puis appuyez sur <i> Enregistrer </i>.',
'Existing Files' => 'Fichiers dans la base de données',
-'HDD temperature' => 'Température Disque Dur',
-'Level7 Protocol' => 'Protocole de Niveau 7',
-'Level7 Rule' => 'Règle de Niveau 7',
-'Level7 rule' => 'Règle de Niveau 7',
-'Local VPN IP' => 'Réseau Interne (Vert):',
+'HDD temperature' => 'Température disque dur',
+'Level7 Protocol' => 'Protocole de niveau 7',
+'Level7 Rule' => 'Règle de niveau 7',
+'Level7 rule' => 'Règle de niveau 7',
+'Local VPN IP' => 'Réseau interne (vert) :',
'MTU' => 'Taille du MTU:',
'Number of IPs for the pie chart' => 'Nombre d\'IPs pour le graphique circulaire',
-'Number of Ports for the pie chart' => 'Nombre de Ports pour le graphique circulaire',
+'Number of Ports for the pie chart' => 'Nombre de ports pour le graphique circulaire',
'OVPN' => 'OVPN',
'OpenVPN' => 'OpenVPN',
'Pages' => 'Pages',
'Ping' => 'Ping :',
-'Port Rule' => 'Règle de Port',
-'QoS not enabled' => 'La QoS n\'est pas active!',
+'Port Rule' => 'Règle de port',
+'QoS not enabled' => 'La QoS n\'est pas active !',
'Queuelenght' => 'Taille de la file d\'attente ',
-'Remote IP' => ' IP / Nom Hôte Distant (DynDNS):',
-'Remote VPN IP' => 'Sous-réseau VPN (ex. 10.0.10.0/255.255.255.0):',
-'Resolv' => 'Résoudre/Réessayer:',
+'Remote IP' => ' IP / Nom hôte distant (DynDNS) :',
+'Remote VPN IP' => 'Sous-réseau VPN (ex. 10.0.10.0/255.255.255.0) :',
+'Resolv' => 'Résoudre/Réessayer :',
'Scan for Files' => 'Recherche de fichiers',
'Scan from Directory' => 'Recherche depuis le répertoire',
'Set time on boot' => 'Forcer le réglage de l\'heure système au démarrage',
@@ -56,14 +56,14 @@
'The class number does not match the specified interface.' => 'Le numéro de classe ne correspond pas à l\'interface spécifiée.',
'The destination IP address is invalid.' => 'L\'adresse IP de destination n\'est pas valide.',
'The source IP address is invalid.' => 'L\'adresse IP source n\'est pas valide.',
-'Utilization on' => 'Utilisation actif',
-'Verbose' => 'Bavard:',
+'Utilization on' => 'Utilisation active',
+'Verbose' => 'Bavard :',
'WakeOnLan' => 'Réveil via le réseau',
'a ca certificate with this name already exists' => 'Un certificat de CA avec ce nom existe déjà.',
'a connection with this common name already exists' => 'Une connexion avec ce nom commun existe déjà.',
'a connection with this name already exists' => 'Une connexion avec ce nom existe déjà.',
'abort' => 'annuler',
-'access allowed' => 'Accès autorisé de:',
+'access allowed' => 'Accès autorisé de :',
'access refused with this oinkcode' => 'Accès refusé avec ce code Oink',
'accounting' => 'Comptage',
'accounting user nonpdc' => 'Comptage - pas en mode contrôleur principal de domaine',
@@ -73,14 +73,14 @@
'activate user' => 'Activer utilisateur',
'active' => 'Actif',
'add' => 'Ajouter',
-'add a host' => 'Ajouter un Hôte:',
-'add a new rule' => 'Ajouter une nouvelle règle:',
+'add a host' => 'Ajouter un hôte :',
+'add a new rule' => 'Ajouter une nouvelle règle :',
'add cron' => 'ajouter une tâche planifiée',
'add device' => 'Ajouter un périphérique',
'add network' => 'Ajouter un réseau',
-'add new alias' => 'Ajouter un nouvel alias:',
+'add new alias' => 'Ajouter un nouvel alias :',
'add new lease' => 'Ajouter un nouveau bail',
-'add new ovpn' => 'Ajouter un OpenVPN:',
+'add new ovpn' => 'Ajouter un OpenVPN :',
'add printer' => 'Ajouter une imprimante',
'add service' => 'Ajouter un service',
'add share' => 'Ajouter un partage',
@@ -91,14 +91,14 @@
'added from dhcp lease list' => 'Ajouter à partir de la liste de baux DHCP',
'admin user password has been changed' => 'Le mot de passe admin a été changé.',
'admin users' => 'Utilisateur avec droits super-utilisateur',
-'administrator user password' => 'Mot de passe de l\'administrateur:',
+'administrator user password' => 'Mot de passe de l\'administrateur :',
'advanced' => 'Avancé',
'advanced server' => 'Options avancées du serveur',
'advproxy AUTH always required' => 'Exige l\'authentification pour un accès sans restriction des adresses sources',
-'advproxy AUTH auth cache TTL' => 'Cache d\'Authentification TTL (en minutes)',
-'advproxy AUTH global settings' => 'Paramètres d\'authentification Global',
+'advproxy AUTH auth cache TTL' => 'Cache d\'authentification TTL (en minutes)',
+'advproxy AUTH global settings' => 'Paramètres d\'authentification global',
'advproxy AUTH limit of IP addresses' => 'Limite d\'adresses IP par utilisateur',
-'advproxy AUTH method' => 'Méthode d\'Authentification',
+'advproxy AUTH method' => 'Méthode d\'authentification',
'advproxy AUTH method ident' => 'identd',
'advproxy AUTH method ldap' => 'LDAP',
'advproxy AUTH method ncsa' => 'Local',
@@ -128,7 +128,7 @@
'advproxy LDAP binddn username' => 'Nom utilisateur Bind DN',
'advproxy LDAP common settings' => 'Paramètres communs LDAP',
'advproxy LDAP group access control' => 'Contrôle d\accès basé sur le groupe',
-'advproxy LDAP group required' => 'Groupe Requis',
+'advproxy LDAP group required' => 'Groupe requis',
'advproxy LDAP port' => 'Port',
'advproxy LDAP server' => 'Serveur LDAP',
'advproxy LDAP type' => 'Type LDAP',
@@ -142,18 +142,18 @@
'advproxy NCSA grp extended' => 'Etendu',
'advproxy NCSA grp standard' => 'Standard',
'advproxy NCSA min password length' => 'Longueur minimale du mot de passe',
-'advproxy NCSA no accounts' => 'Aucuncompte utilisateur disponible',
+'advproxy NCSA no accounts' => 'Aucun compte utilisateur disponible',
'advproxy NCSA password' => 'Mot de passe',
'advproxy NCSA password confirm' => 'Mot de passe (confirmez)',
'advproxy NCSA redirector bypass' => 'Redirection par contournement pour les membres du groupe',
-'advproxy NCSA update user' => 'Mise a jour utilisateur',
+'advproxy NCSA update user' => 'Mise à jour utilisateur',
'advproxy NCSA user accounts' => 'Comptes utilisateurs',
'advproxy NCSA user management' => 'Gestion des utilisateurs',
'advproxy NCSA username' => 'Nom utilisateur',
-'advproxy NTLM BDC hostname' => 'Nom d\'hote BDC',
-'advproxy NTLM PDC hostname' => 'Nom d\'hote PDC',
+'advproxy NTLM BDC hostname' => 'Nom d\'hôte BDC',
+'advproxy NTLM PDC hostname' => 'Nom d\'hôte PDC',
'advproxy NTLM auth' => 'Authentification Windows NT/2003',
-'advproxy NTLM auth mode' => 'Mode d\'Authentification',
+'advproxy NTLM auth mode' => 'Mode d\'authentification',
'advproxy NTLM authorized users' => 'Domaine autorisé utilisateurs (un par ligne)',
'advproxy NTLM domain' => 'Domaine',
'advproxy NTLM domain settings' => 'Paramètres du domaine commun',
@@ -174,17 +174,17 @@
'advproxy RADIUS user based access restrictions' => 'Utilisateur en fonction des restrictions d\'accès',
'advproxy UA enable filter' => 'Activer la vérification du navigateur',
'advproxy access' => 'Accès',
-'advproxy admin mail' => 'Cache e-mail administrateur',
-'advproxy advanced proxy' => 'Proxy Avancé',
-'advproxy advanced web proxy' => 'Proxy Web Avancé',
-'advproxy advanced web proxy configuration' => 'Configuration avancée du proxy Web',
-'advproxy allowed subnets' => 'Sous réseaux autorisés (un par ligne)',
-'advproxy allowed web browsers' => 'Clients autorisés pour l\'accès Web',
+'advproxy admin mail' => 'Email administrateur cache ',
+'advproxy advanced proxy' => 'Proxy avancé',
+'advproxy advanced web proxy' => 'Proxy web avancé',
+'advproxy advanced web proxy configuration' => 'Configuration avancée du proxy web',
+'advproxy allowed subnets' => 'Sous-réseaux autorisés (un par ligne) ',
+'advproxy allowed web browsers' => 'Clients autorisés pour l\'accès web',
'advproxy back to main page' => 'Retour à l\'accueil',
'advproxy banned ip clients' => 'Adresses IP interdites (une par ligne)',
'advproxy banned mac clients' => 'Adresses MAC interdites (une par ligne)',
'advproxy cache management' => 'Gestion du cache',
-'advproxy cache replacement policy' => 'Politique du Cache de remplacement',
+'advproxy cache replacement policy' => 'Politique du cache de remplacement ',
'advproxy chgwebpwd ERROR' => 'E R R E U R :',
'advproxy chgwebpwd SUCCESS' => 'S U C C E S :',
'advproxy chgwebpwd change password' => 'Modifier mot de passe',
@@ -193,15 +193,15 @@
'advproxy chgwebpwd new password confirm' => 'Nouveau mot de passe (confirmez)',
'advproxy chgwebpwd old password' => 'Mot de passe actuel',
'advproxy chgwebpwd username' => 'Nom Utilisateur',
-'advproxy classroom extensions' => 'Extensions des Classes',
-'advproxy clear cache' => 'Effacer le Cache',
+'advproxy classroom extensions' => 'Extensions des classes',
+'advproxy clear cache' => 'Effacer le cache',
'advproxy client IP forwarding' => 'Adresse ip du client \"forwardé\"',
'advproxy common settings' => 'Paramètres communs',
'advproxy content based throttling' => 'Activer le contenu en fonction de la capacité',
'advproxy cre disabled' => 'L\'interface de gestion a été désactivée par l\'administrateur',
'advproxy cre group definitions' => 'Groupe de définitions de classe',
'advproxy cre supervisors' => 'Superviseur des adresses IP (une par ligne)',
-'advproxy destination ports' => 'Ports de Destination',
+'advproxy destination ports' => 'Ports de destination',
'advproxy download throttling' => 'Contrôle téléchargements',
'advproxy enabled' => 'Actif',
'advproxy enabled on' => 'Actif sur',
@@ -211,14 +211,14 @@
'advproxy errmsg auth ipcache may not be null' => 'L\'authentification du cache TTL ne peut pas être à 0 lors de l\'utilisation de la limitation d\'adresse IP',
'advproxy errmsg auth ipcache ttl' => 'Valeur non valide pour l\'utilisateur / IP du cache TTL',
'advproxy errmsg change fail' => 'Le mot de passe ne peut pas etre modifié',
-'advproxy errmsg change success' => 'Le mot de passe d\'accès à Internet a été changé avec succès',
+'advproxy errmsg change success' => 'Le mot de passe d\'accès à internet a été changé avec succès',
'advproxy errmsg hdd cache size' => 'Valeur non valide pour la taille du cache disque dur (minimum de 10 Mo requis)',
'advproxy errmsg ident timeout' => 'Ident timeout non valide',
-'advproxy errmsg invalid bdc' => 'Nom de domaine non valide pour la sauvegarde du Domain Controller',
+'advproxy errmsg invalid bdc' => 'Nom de domaine non valide pour la sauvegarde du contrôleur de domaine',
'advproxy errmsg invalid destination port' => 'Port destination non valide',
'advproxy errmsg invalid ip or mask' => 'Adresse IP ou masque de sous-réseau non valide',
'advproxy errmsg invalid mac' => 'Adresse MAC non valide',
-'advproxy errmsg invalid pdc' => 'Nom d\'hôte non valide pour Primary Domain Controller',
+'advproxy errmsg invalid pdc' => 'Nom d\'hôte non valide pour le contrôleur de domaine principal',
'advproxy errmsg invalid proxy port' => 'Port proxy non valide',
'advproxy errmsg invalid upstream proxy username or password setting' => 'Nom d\'utilisateur du proxy upstream ou configuration du mot de passe non valide',
'advproxy errmsg invalid user' => 'L\'utilisateur n\'existe pas',
@@ -233,7 +233,7 @@
'advproxy errmsg no username' => 'le nom d\'utilisateur ne peut être vide',
'advproxy errmsg non-transparent proxy required' => 'Le proxy web doit fonctionner en mode non transparent pour l\'authentification',
'advproxy errmsg ntlm domain' => 'Nom de domaine Windows requis',
-'advproxy errmsg ntlm pdc' => 'Nom d\'hôte pour Primary Domain Controller requis',
+'advproxy errmsg ntlm pdc' => 'Nom d\'hôte requis pour le contrôleur de domaine principal',
'advproxy errmsg password incorrect' => 'Mot de passe incorrect',
'advproxy errmsg password length' => 'Longueur de mot de passe non valide',
'advproxy errmsg password length 1' => 'Le mot de passe doit avoir au moins ',
@@ -249,34 +249,34 @@
'advproxy fake useragent' => 'Faux useragent soumis aux sites externes',
'advproxy friday' => 'Ven',
'advproxy from' => 'De',
-'advproxy hdd cache size' => 'Taille du cache disque dur (MB)',
+'advproxy hdd cache size' => 'Taille du cache disque dur (Mo) ',
'advproxy invalid num of children' => 'Nombre de processus de filtre non valide',
'advproxy log enabled' => 'Rapports activés',
-'advproxy log query' => 'Termes de recherche en rapports',
+'advproxy log query' => 'Termes de recherche en rapports ',
'advproxy log settings' => 'Configuration des rapports',
-'advproxy log useragent' => 'Rapport des robots (de recherche)',
-'advproxy max download size' => 'Volume de téléchargement maximal (KB)',
-'advproxy max size' => 'Volume d\'objet maximal (KB)',
-'advproxy max upload size' => 'Volume d\'envoi maximal (KB)',
-'advproxy memory replacement policy' => 'Politique de remplacement de mémoire',
-'advproxy min size' => 'Volume d\'objet minimal (KB)',
+'advproxy log useragent' => 'Rapport des robots (de recherche) ',
+'advproxy max download size' => 'Volume de téléchargement maximal (Ko)',
+'advproxy max size' => 'Volume d\'objet maximal (Ko) ',
+'advproxy max upload size' => 'Volume d\'envoi maximal (Ko)',
+'advproxy memory replacement policy' => 'Politique de remplacement de mémoire ',
+'advproxy min size' => 'Volume d\'objet minimal (Ko) ',
'advproxy mode allow' => 'autoriser',
'advproxy mode deny' => 'interdire',
'advproxy monday' => 'Lun',
'advproxy network based access' => 'Contrôle d\'accès réseau',
-'advproxy no cache sites' => 'Ne pas mettre en cache ces domaines (un par ligne)',
+'advproxy no cache sites' => 'Ne pas mettre en cache ces domaines (un par ligne) ',
'advproxy no clients defined' => 'Aucun clients défini',
'advproxy no connection auth' => 'Aucune connexion d\'authentification axée sur la transmission',
-'advproxy no cre groups' => 'Il n\'y a aucungroupe d\'accès disponible',
-'advproxy no internal proxy on blue' => 'Désactiver l\'accès du proxy interne BLEU vers d\'autres sous-réseaux',
-'advproxy no internal proxy on green' => 'Désactiver l\'accès du proxy interne VERT vers d\'autres sous-réseaux',
-'advproxy number of L1 dirs' => 'Nombre de sous-dossier level-1',
+'advproxy no cre groups' => 'Il n\'y a aucun groupe d\'accès disponible',
+'advproxy no internal proxy on blue' => 'Désactiver l\'accès du proxy interne BLEU vers d\'autres sous-réseaux ',
+'advproxy no internal proxy on green' => 'Désactiver l\'accès du proxy interne VERT vers d\'autres sous-réseaux ',
+'advproxy number of L1 dirs' => 'Nombre de sous-dossier level-1 ',
'advproxy off' => 'Proxy éteint',
-'advproxy offline mode' => 'Autoriser mode hors connexion',
+'advproxy offline mode' => 'Autoriser le mode hors connexion ',
'advproxy on' => 'Proxy allumé',
'advproxy privacy' => 'Privé',
'advproxy proxy port' => 'Proxy port',
-'advproxy ram cache size' => 'Taille cache mémoire (MB)',
+'advproxy ram cache size' => 'Taille cache mémoire (Mo) ',
'advproxy redirector children' => 'Nombre de processus de filtre',
'advproxy reset' => 'Relancer',
'advproxy saturday' => 'Sam',
@@ -284,28 +284,28 @@
'advproxy squid version' => 'Squid Cache version',
'advproxy squidclamav' => 'SquidClamav',
'advproxy ssadvanced proxy' => 'Proxy avancé',
-'advproxy ssl ports' => 'Ports SSL autorisés (un par ligne)',
+'advproxy ssl ports' => 'Ports SSL autorisés (un par ligne) ',
'advproxy standard' => 'Standard',
-'advproxy standard ports' => 'Ports standards autorisés (un par ligne)',
+'advproxy standard ports' => 'Ports standards autorisés (un par ligne) ',
'advproxy sunday' => 'Dim',
-'advproxy supervisor password' => 'Mot de Passe Superviseur',
+'advproxy supervisor password' => 'Mot de passe superviseur',
'advproxy suppress version' => 'Informations sur la version supprimée',
-'advproxy throttle binary' => 'Fichiers Binaires',
+'advproxy throttle binary' => 'Fichiers binaires',
'advproxy throttle dskimg' => 'Images CD',
'advproxy throttle mmedia' => 'Multimédia',
'advproxy throttling per host on' => 'Limite par hôte',
'advproxy throttling total on' => 'Limite globale',
'advproxy throttling unlimited' => 'illimité',
'advproxy thursday' => 'Jeu',
-'advproxy time restrictions' => 'Restrictions horaire',
+'advproxy time restrictions' => 'Restrictions horaires',
'advproxy to' => 'A',
-'advproxy transfer limits' => 'Limites de Transfert',
+'advproxy transfer limits' => 'Limites de transfert',
'advproxy transparent on' => 'Transparent sur',
'advproxy tuesday' => 'Mar',
'advproxy unknown' => 'Inconnu',
'advproxy unrestricted ip clients' => 'Adresses IP sans restriction (une par ligne)',
'advproxy unrestricted mac clients' => 'Adresses MAC sans restriction (une par ligne)',
-'advproxy update accelerator' => 'Mise à jour accelérateur',
+'advproxy update accelerator' => 'Mise à jour accélérateur',
'advproxy update information' => 'Une mise à jour est disponible pour le téléchargement. Visitez <a href="http://www.advproxy.net" target="_blank"> http://www.advproxy.net </ a> pour plus d\'informations.',
'advproxy update notification' => 'Alerte de mise à jour!',
'advproxy upstream password' => 'Mot de passe montant',
@@ -316,22 +316,22 @@
'advproxy username forwarding' => 'Nom d\'utilisateur transféré',
'advproxy via forwarding' => 'Adresse proxy transférée',
'advproxy visible hostname' => 'Hostname visible',
-'advproxy web browser' => 'Navigateur Web',
+'advproxy web browser' => 'Navigateur web',
'advproxy wednesday' => 'Mer',
-'again' => 'De nouveau:',
+'again' => 'De nouveau :',
'aktiv' => 'Actif',
'album' => 'Album',
-'alcatelusb help' => 'Pour utiliser le Speedtouch 330 ou Speedtouch USB modem vous devez charger le firmware dans votre PC IPFire. Veuillez télécharger le <b>Firmware Embarqué</b> paquet pour SpeedTouch 330 depuis speedtouch.com; dézippez le et chargez le fichier approprié à votre modem : KQD6_3.xxx quand Rev<4 ou ZZZL_3.xxx pour Rev=4 en utilisant le formulaire ci-dessous.',
-'alcatelusb upload' => 'Charger le Firmware Speedtouch USB',
+'alcatelusb help' => 'Pour utiliser les modems Speedtouch 330 ou Speedtouch USB, vous devez charger le firmware dans votre PC IPFire. Veuillez télécharger le paquet <b>Firmware Embarqué</b> pour SpeedTouch 330 depuis speedtouch.com; dézippez-le et chargez le fichier approprié à votre modem : KQD6_3.xxx quand Rev<4 ou ZZZL_3.xxx pour Rev=4 en utilisant le formulaire ci-dessous.',
+'alcatelusb upload' => 'Charger le firmware Speedtouch USB',
'alias ip' => 'Alias IP',
'aliases' => 'Alias',
-'aliases not active' => 'Les Alias ne seront pas actifs tant que votre interface ROUGE est en mode STATIQUE',
+'aliases not active' => 'Les alias ne seront pas actifs tant que votre interface ROUGE sera en mode STATIQUE',
'all' => 'Tous',
-'all interfaces' => 'Toutes les Interfaces',
-'all services' => 'Tous les Services',
+'all interfaces' => 'Toutes les interfaces',
+'all services' => 'Tous les services',
'all updates installed' => 'Toutes les mises à jour sont installées',
'allmsg' => 'tout montrer',
-'alt dialup' => 'Dialup',
+'alt dialup' => 'Dialogue',
'alt home' => 'Accueil',
'alt information' => 'Information',
'alt logs' => 'Rapports',
@@ -346,62 +346,62 @@
'apply' => 'Appliquer maintenant',
'april' => 'Avril',
'archive not exist' => 'L\'archive de configuration n\'existe pas',
-'are you sure' => 'Etes vous sûr ?',
-'arp table entries' => 'Table d\'entrées ARP:',
+'are you sure' => 'Etes-vous sûr ?',
+'arp table entries' => 'Table d\'entrées ARP :',
'artist' => 'Artiste',
'atm settings' => 'Réglages ATM',
'attemps' => 'Tentatives',
'august' => 'Août',
'authentication' => 'Authentification :',
'automatic' => 'Automatique',
-'available updates' => 'Mises à jour Disponible :',
+'available updates' => 'Mises à jour disponibles :',
'average' => 'Moyenne',
-'avoid dod' => 'Ne pas utiliser cette option avec connexion à la demande! Principalement utilisée si votre IPFire se trouve derrière un routeur. Votre IP ROUGE doit être au coeur de l\'un des trois numéros de réseau réservés par exemple 10 / 8, 172.16/12, 192.168/16',
+'avoid dod' => 'Ne pas utiliser cette option avec connexion à la demande ! Principalement utilisée si votre IPFire se trouve derrière un routeur. Votre IP ROUGE doit être au coeur de l\'un des trois numéros de réseau réservés par exemple 10 / 8, 172.16/12, 192.168/16',
'back' => 'Retour',
'backup' => 'Sauvegarde',
-'backup archive' => 'Fichier Sauvegarde (.dat)',
+'backup archive' => 'Fichier sauvegarde (.dat)',
'backup clear archive' => 'Clear Backup File (.gz)',
-'backup config floppy' => 'Sauvegarder la Configuration - Lecteur de Disquette',
+'backup config floppy' => 'Sauvegarder la configuration - Lecteur de disquette',
'backup configuration' => 'Configuration de la sauvegarde :',
'backup erase key' => 'Effacer la clé',
'backup explain key' => 'Les sauvegardes sont chiffrées à l\'aide d\'une clé. Afin d\'éviter toute manipulation illégale, IPFire restaure uniquement les sauvegardes chiffrées avec la clé spécifiée ici. Vous avez trois options à votre disposition : ',
'backup explain key li1' => 'Laissez IPFire créer une clé pour vous.',
-'backup explain key li2' => 'Importez une clé sauvegardée (peut-être protégée par un mot de passe).',
+'backup explain key li2' => 'Importez une clé sauvegardée (peut être protégée par un mot de passe).',
'backup explain key li3' => 'Extraire une clé depuis une sauvegarde 1.4.10 non chiffrée.',
-'backup explain key no1' => 'Vous devriez sauver cette clé si vous planifier une installation de nouvelles machines ; IPFire n\'accepte qu\'une seule création/importation de clé.',
+'backup explain key no1' => 'Vous devriez sauver cette clé si vous planifiez une installation de nouvelles machines ; IPFire n\'accepte qu\'une seule création/importation de clé.',
'backup explain key no2' => 'Les sauvegardes sur disquettes ne sont pas concernées par cette clé.',
'backup export key' => 'Exporter la clé',
'backup extract key' => 'Exporter la clé',
'backup from' => 'Sauvegarder depuis',
'backup generate key' => 'Générer la clé',
-'backup import dat file' => 'Importer un fichier de Sauvegarde (.dat)',
+'backup import dat file' => 'Importer un fichier de sauvegarde (.dat)',
'backup import key' => 'Importer une clé',
'backup key' => 'Sauvegarder la clé de chiffrement',
'backup key file' => 'Sauvegarder le fichier clé',
'backup key info' => 'IPFire restreint l\'accès aux clés sauvegardées, par conséquent vous devez connaitre le mot de passe root. Vous avez la possibilité de protéger cette clé à l\'extérieur d\'IPFire à l\'aide d\'un mot de passe.',
-'backup media info' => 'Les disquettes et les supports non partitionnés peuvent afficher des tailles de partitions erronées. Dans ce cas, séléctionnez le périphérique en question. Souvenez vous qu\'il faut monter le disque dur avant d\'éjecter un périphérique. Remarque : les disquettes crées ici ne sont pas utilisables avec l\'installeur d\'IPFire!',
+'backup media info' => 'Les disquettes et les supports non partitionnés peuvent afficher des tailles de partitions erronées. Dans ce cas, sélectionnez le périphérique en question. Souvenez-vous qu\'il faut monter le disque dur avant d\'éjecter un périphérique. Remarque : Les disquettes crées ici ne sont pas utilisables avec l\'installeur d\'IPFire !',
'backup missing key' => 'La clé de sauvegarde est nécessaire pour restaurer la configuration',
'backup password' => 'Mot de passe de sauvegarde',
'backup protect key password' => 'Sauvegarde du mot de passe de la clé',
'backup sets' => 'Configuration des sauvegardes',
'backup to floppy' => 'Sauvegarder sur disquettes',
'backupaddon' => 'Sauvegarde additionnelle',
-'backupprofile' => 'Au cas ou la reconnexion échourrait, changez de profil',
+'backupprofile' => 'Au cas ou la reconnexion échouerait, changez de profil',
'backups' => 'sauvegardes',
-'backupwarning' => 'Veuillez restaurer votre sauvegarde principale et ensuite vos sauvegardes additionnelles. Veuillez conserver le nom de fichier fournit lors du téléchargement.',
+'backupwarning' => 'Veuillez restaurer votre sauvegarde principale et ensuite vos sauvegardes additionnelles. Veuillez conserver le nom de fichier fourni lors du téléchargement.',
'bad characters in' => 'Mauvais caractères dans ',
'bad characters in script field' => 'Mauvais caractères dans le champ de script',
'bad characters in the telephone number field' => 'Mauvais caractères dans le champ du numéro de téléphone',
-'bad destination range' => 'La fourchette des ports de destinations à une première valeur supérieure ou égale à la deuxième valeur.',
-'bad ignore filter' => 'Mauvais filtre ignoré:',
+'bad destination range' => 'La plage des ports de destination à une première valeur supérieure ou égale à la deuxième valeur.',
+'bad ignore filter' => 'Mauvais filtre ignoré :',
'bad return code' => 'Le programme d\'aide retourne un code d\'erreur',
-'bad source range' => 'La fourchette des ports sources à une première valeur supérieure ou égale à la deuxième valeur.',
+'bad source range' => 'La plage des ports source à une première valeur supérieure ou égale à la deuxième valeur.',
'bandwidth usage' => 'utilisation de la bande passante (externe)',
'bandwitherror' => 'Vous ne pouvez pas changer les réglages de la bande passante tant que la Qos est activée. Désactivez d\'abord la Qos.<p>',
'bandwithsettings' => 'Réglages de la bande passante',
'basic options' => 'Options de base',
'beep when ppp connects or disconnects' => 'Bipper quand IPFire se connecte ou se déconnecte',
-'behind a proxy' => 'Derrière un proxy:',
+'behind a proxy' => 'Derrière un proxy :',
'bewan adsl pci st' => 'A SUPPRIMER',
'bewan adsl usb' => 'A SUPPRIMER',
'bitrate' => 'Echantillonage',
@@ -414,18 +414,18 @@
'broken pipe' => 'Tuyau cassé',
'buffered memory' => 'Mémoire tampon',
'buffers' => 'tampons',
-'bytes per second' => 'Bits par Seconde',
-'bytes received' => 'Bits Reçus',
-'bytes sent' => 'Bits Envoyés',
+'bytes per second' => 'Octets par seconde',
+'bytes received' => 'Octets reçus',
+'bytes sent' => 'Octets envoyés',
'ca certificate' => 'Certificat CA',
'ca name' => 'Nom CA',
'cache management' => 'Gestion du tampon',
-'cache size' => 'Taille du Cache (MB):',
+'cache size' => 'Taille du cache (Mo):',
'cached' => 'en cache',
'cached memory' => 'Mémoire tampon ',
'cached swap' => 'Swap tampon',
'calamaris available reports' => 'Rapports disponibles',
-'calamaris byte unit' => 'Unitée de bits',
+'calamaris byte unit' => 'Unité de bits',
'calamaris create report' => 'Créer un rapport',
'calamaris enable content report' => 'Autoriser le contenu du rapport',
'calamaris enable distribution histogram' => 'Autoriser l\'histogramme de distribution',
@@ -437,7 +437,7 @@
'calamaris histogram resolution' => 'Résolution de l\'histogramme',
'calamaris low' => 'bas',
'calamaris medium' => 'moyen',
-'calamaris no reports available' => 'aucunrapport disponible',
+'calamaris no reports available' => 'aucun rapport disponible',
'calamaris none' => 'rien',
'calamaris number of content types' => 'Nombre de types de contenu',
'calamaris number of domains' => 'Nombre de domaines',
@@ -458,7 +458,7 @@
'calc traffic all x minutes' => 'Calculer le trafic toutes les X minutes',
'cancel' => 'Annuler',
'cancel-adv-options' => 'Annuler',
-'cannot enable both nat traversal and compression' => 'Impossible d\'activer NAT Traversal + Compression.',
+'cannot enable both nat traversal and compression' => 'Impossible d\'activer la traversée du NAT + compression.',
'cannot enable ntp without specifying primary' => 'Impossible d\'activer NTP sans spécifier le premier.',
'cannot specify secondary dns without specifying primary' => 'Impossible de spécifier le second DNS sans avoir spécifié le premier.',
'cannot specify secondary ntp without specifying primary' => 'Impossible de spécifier le second serveur NTP sans avoir spécifié le premier.',
@@ -479,7 +479,7 @@
'certificate file move failed' => 'Le déplacement du fichier certificat a échoué',
'cfg restart' => 'Un redémarrage est conseillé après restauration d\'une configuration archivée.',
'chain' => 'Chaîne',
-'change passwords' => 'Modifier Mots de Passe',
+'change passwords' => 'Modifier mots de passe',
'change share' => 'Modifier les options de partage',
'check for net traffic update' => 'Vérifier les mises à jour par internet',
'check vpn lr' => 'Test',
@@ -488,12 +488,12 @@
'cipher' => 'Chiffrer :',
'city' => 'Ville',
'class in use' => 'La classe est déjà en cours d\'utilisation.',
-'clear cache' => 'Vider le Cache',
+'clear cache' => 'Vider le cache',
'clear playlist' => 'Liste de lecture vide',
'clenabled' => 'Fournir du temps au réseau local',
'click to disable' => 'Activé (cliquer pour désactiver)',
'click to enable' => 'Désactivé (cliquer pour activer)',
-'client' => 'Nom de la Station (ordinateur)',
+'client' => 'Nom de la station (ordinateur)',
'clock has not been synchronized' => 'L\'horloge n\'est pas synchronisée',
'clock last synchronized at' => 'L\'horloge a été synchronisée à :',
'comment' => 'Description :',
@@ -504,22 +504,22 @@
'computer to modem rate' => 'Taux de l\'ordinateur au modem :',
'concentrator name' => 'Nom de concentrateur :',
'confirmation' => 'confirmation',
-'connect' => 'OVPN Démarrage / Connexion',
+'connect' => 'Démarrage / connexion OVPN',
'connect the modem' => 'Connexion au modem',
'connect timeout' => 'Temps de connexion dépassé :',
'connected' => 'Connecté',
'connecting' => 'Connexion en cours...',
-'connection' => 'Connection',
+'connection' => 'Connexion',
'connection closed' => 'Non connecté...',
'connection debugging' => 'Déboggage de la connexion',
'connection status and controlc' => 'Etat et contrôle de connexion :',
'connection tracking' => 'Surveillance des connexions iptables',
-'connection type' => 'Type de Connexion',
+'connection type' => 'Type de connexion',
'connection type is invalid' => 'Le type de connexion est non valide.',
'connections' => 'Connexions',
-'connections are associated with this ca. deleting the ca will delete these connections as well.' => 'Les connexions sont associées avec cette CA. La suppression de cette CA entraînera la suppression des connexions associées.',
+'connections are associated with this ca. deleting the ca will delete these connections as well.' => 'Les connexions sont associées avec ce CA. La suppression de ce CA entraînera la suppression des connexions associées.',
'connscheduler' => 'Planificateur de connexion',
-'core notice 1' => '<strong>Remarque:</strong> Il y a une mise à jour de',
+'core notice 1' => '<strong>Remarque :</strong> Il y a une mise à jour de',
'core notice 2' => 'pour',
'core notice 3' => 'disponible.',
'could not be opened' => 'ne peut pas être ouvert',
@@ -529,20 +529,20 @@
'could not create directory' => 'Impossible de créer le répertoire.',
'could not download latest patch list' => 'Ne peut pas télécharger la dernière liste de correctifs (non connecté).',
'could not download latest updates' => 'Impossible de télécharger les dernières mises à jour.',
-'could not download the available updates list' => 'Impossible de télécharger la liste des mises à jour disponible.',
+'could not download the available updates list' => 'Impossible de télécharger la liste des mises à jour disponibles.',
'could not open available updates file' => 'Impossible d\'ouvrir le fichier des mises à jour disponibles.',
'could not open installed updates file' => 'Impossible d\'ouvrir le fichier des mises à jour installées',
'could not open update information file' => 'Impossible d\'ouvrir le fichier d\'information de mise à jour. Le fichier est corrompu.',
'could not retrieve common name from certificate' => 'Impossible de récupérer le nom courant depuis le certificat.',
'country' => 'Pays',
-'cpu frequency per' => 'CPU fréquence par',
+'cpu frequency per' => 'fréquence CPU par',
'cpu idle usage' => 'Pourcentage d\'inactivité CPU',
'cpu interrupt usage' => 'Utilisation des interruptions CPU',
-'cpu iowait usage' => 'Le COU attend des IO',
-'cpu irq usage' => 'Utilisation CPU IRQ',
-'cpu nice usage' => 'Utilisation CPU Nice',
-'cpu steal usage' => 'Utilisation CPU Steal',
-'cpu system usage' => 'Utilisation CPU Systeme',
+'cpu iowait usage' => 'Le CPU attend des IO',
+'cpu irq usage' => 'Utilisation IRQ CPU',
+'cpu nice usage' => 'Utilisation Nice CPU',
+'cpu steal usage' => 'Utilisation Steal CPU',
+'cpu system usage' => 'Utilisation système CPU',
'cpu usage per' => 'Utilisation du CPU par',
'cpu user usage' => 'Utilisation du CPU par l\'utilisateur',
'create' => 'Créer',
@@ -560,33 +560,33 @@
'current fixed leases' => 'Etat actuel des baux fixes',
'current hosts' => 'Hôtes courants :',
'current media' => 'Média courant',
-'current ovpn' => 'Connection-OVPN active :',
+'current ovpn' => 'Connection OVPN active :',
'current playlist' => 'Liste de lecture courante',
-'current profile' => 'Profile courant :',
+'current profile' => 'Profil courant :',
'current rules' => 'Règles courantes :',
'custom networks' => 'Réseaux personnalisés',
'custom services' => 'Services personnalisés',
-'daily firewallhits' => 'prises journalières du pare-feu',
+'daily firewallhits' => 'Contacts journaliers du pare-feu',
'dat without key' => 'Une archive chiffrée ne pouvant être restaurée sans la clef.',
'date' => 'Date',
-'date not in logs' => 'Aucun (ou imcomplet) rapport n\'existe pour le jour demandé',
+'date not in logs' => 'Aucun rapport (ou imcomplet) n\'existe pour le jour demandé',
'day' => 'Jour',
'day after' => 'Jour d\'après',
'day before' => 'Jour d\'avant',
'day-graph' => 'Jour',
'days' => 'jours.',
-'dbfile' => 'Dbfile',
+'dbfile' => 'Fichier Db',
'ddns help dnsmadeeasy' => 'Entrez votre identifiant dans ce champ pour noms d\'hôtes (ou une liste d\'identifiants séparés par des ;)',
'ddns help freedns' => 'Dans le champ utilisateur entrez votre phrase de connexion',
'ddns help plus' => '<b>+</b> marque un champ obligatoire',
'ddns hostname added' => 'Nom d\'hôte dynamique DNS ajouté',
'ddns hostname modified' => 'Nom d\'hôte dynamique DNS modifié',
'ddns hostname removed' => 'Nom d\'hôte dynamique DNS supprimé',
-'ddns minimize updates' => 'Minimisé les mises à jour: avant une mise à jour, compare les IP des DNS pour le nom d\'hôte "[host.]domain" contre IP ROUGE.',
+'ddns minimize updates' => 'Minimiser les mises à jour : Avant une mise à jour, compare les IP des DNS pour le nom d\'hôte "[host.]domain" contre IP ROUGE.',
'ddns noip prefix' => 'Pour utiliser autre chose que des IP dans le mode de groupe, préfixez les noms d\'hôtes avec <b>%</b>',
'deactivate' => 'désactiver',
'deactivate user' => 'désactiver l\'utilisateur',
-'debugme' => 'Pas encore implementé',
+'debugme' => 'Pas encore implémenté',
'december' => 'Décembre',
'deep scan directories' => 'Scan récursif',
'def lease time' => 'Temps de bail par défaut',
@@ -600,7 +600,7 @@
'delete pc' => 'Effacer la station de travail',
'delete share' => 'Effacer le partage',
'delete user' => 'Effacer utilisateur',
-'demon login script' => 'Script de login du démon',
+'demon login script' => 'Script de login du service',
'description' => 'Description',
'dest ip and port' => 'IP Dest.:Port',
'destination' => 'Destination',
@@ -611,7 +611,7 @@
'destination port' => 'Port de destination',
'destination port numbers' => 'Le port de destination doit être un numéro ou une plage de port valide.',
'destination port overlaps' => 'La plage de ports de destination se superpose à une plage existante.',
-'detail level' => 'Niveau du Détail',
+'detail level' => 'Niveau du détail',
'device' => 'Périphérique',
'devices on blue' => 'Périphériques sur Bleu',
'dhcp advopt add' => 'Ajouter une option DHCP',
@@ -619,28 +619,28 @@
'dhcp advopt blank value' => 'La valeur de l\'option DHCP ne peut pas être vide.',
'dhcp advopt custom definition' => 'Vos options de définition personnalisées',
'dhcp advopt definition' => 'Définition',
-'dhcp advopt definition exists' => 'Cette option de définition existe déjà. Vous pouvez seulement la modifier ou la supprimer.',
+'dhcp advopt definition exists' => 'Cette option de définition existe déjà, vous pouvez seulement la modifier ou la supprimer.',
'dhcp advopt edit' => 'Modifier une option DHCP',
'dhcp advopt help' => 'Liste des options',
'dhcp advopt list' => 'Options DHCP supplémentaires',
'dhcp advopt modified' => 'Option DHCP modifiée',
-'dhcp advopt name' => 'Nom de l\'option',
+'dhcp advopt name' => 'Nom de l\'option ',
'dhcp advopt removed' => 'Option DHCP supprimée',
-'dhcp advopt scope' => 'Champ d\'application des options',
+'dhcp advopt scope' => 'Champ d\'application des options ',
'dhcp advopt scope global' => 'Global',
'dhcp advopt scope help' => 'Champ d\'application global ou limité pour vérifier les interfaces.',
'dhcp advopt unknown' => 'Le nom de l\'option DHCP n\'est pas reconnu',
-'dhcp advopt value' => 'Valeur de l\'option',
-'dhcp allow bootp' => 'Autoriser les clients bootp',
+'dhcp advopt value' => 'Valeur de l\'option ',
+'dhcp allow bootp' => 'Autoriser les clients bootp ',
'dhcp base ip fixed lease' => 'IP de base pour la création de baux fixes',
'dhcp bootp pxe data' => 'Entrez une donnée bootp pxe optionnelle pour ce bail fixe',
'dhcp configuration' => 'Configuration DHCP',
'dhcp create fixed leases' => 'Créer des baux fixes',
-'dhcp fixed lease err1' => 'Pour un bail fixe vous devez saisir l\'adresse MAC et/ou le nom d\'hôte.',
+'dhcp fixed lease err1' => 'Pour un bail fixe, vous devez saisir l\'adresse MAC et/ou le nom d\'hôte.',
'dhcp fixed lease help1' => 'L\'adresse IP doit être saisie comme FQDN',
'dhcp mode' => 'DHCP',
'dhcp server' => 'Serveur DHCP',
-'dhcp server disabled' => 'Serveur DHCP éteint. Arrêté.',
+'dhcp server disabled' => 'Serveur DHCP éteint. Arrêté.',
'dhcp server disabled on blue interface' => 'Serveur DHCP arrêté sur l\'interface BLEU',
'dhcp server enabled' => 'Serveur DHCP démarré. Redémarrage.',
'dhcp server enabled on blue interface' => 'Serveur DHCP démarré sur l\'interface BLEU',
@@ -655,9 +655,9 @@
'directory mask' => 'Droits des répertoires UNIX',
'directory writeable' => 'Ecriture possible dans ce répertoire',
'disabled' => 'Arrêté',
-'disconnect' => 'OVPN Stop / Déconnecté',
+'disconnect' => 'OVPN Stoppé / déconnecté',
'disconnects' => 'Déconnecté',
-'disk access per' => 'Accès disquen par',
+'disk access per' => 'Accès disque par',
'disk usage' => 'Utilisation disque',
'display' => 'Affichage',
'display charset' => 'Afficher Charset',
@@ -670,11 +670,11 @@
'dmz pinhole rule added' => 'Règle DMZ pinhole; Redémarrage DMZ pinhole',
'dmz pinhole rule removed' => 'Règle DMZ pinhole supprimée; Redémarrage DMZ pinhole',
'dmzpinholes for same net not necessary' => 'Les DMZ Pinholes ne sont pas forcément dans le même net. Selectionnez différentes sources ou différentes destination net.',
-'dns address deleted' => 'Suppression effectuée!',
+'dns address deleted' => 'Suppression effectuée !',
'dns address done' => 'Les adresses du serveur DNS vont être sauvegardées.',
-'dns address recon' => 'Tentative de reconnection!',
+'dns address recon' => 'Tentative de reconnexion !',
'dns check failed' => 'La vérification DNS a échouée',
-'dns desc' => 'Si l\'interface rouge0 obtient ses informations d\'adresse IP via le DHCP du fournisseur d\'accès, les adresses du serveur DNS seront définies automatiquement. Maintenant vous pouvez également changer ses adresses IP du serveur DNS par celles de votre choix.',
+'dns desc' => 'Si l\'interface rouge0 obtient ses informations d\'adresse IP via le DHCP du fournisseur d\'accès, les adresses du serveur DNS seront définies automatiquement. Maintenant, vous pouvez également changer ses adresses IP du serveur DNS par celles de votre choix.',
'dns error 0' => 'L\'adresse IP du <strong>premier</strong> serveur DNS n\'est pas valide, veuillez revoir votre saisie<br />La saisie de l\'adresse du <strong>second</strong> serveur DNS est valide.',
'dns error 01' => 'Les adresses IP du <strong>premier</strong> et du <strong>second</strong> serveur DNS ne sont pas valides, veuillez revoir vos saisies',
'dns error 1' => 'L\'adresse IP du <strong>second</strong> serveur DNS n\'est pas valide, veuillez revoir votre saisie<br />La saisie de l\'adresse du <strong>premier</strong> serveur DNS est valide.',
@@ -684,8 +684,8 @@
'dns new 0' => 'Nouvelle adresse IP du <strong>premier</strong> serveur DNS :',
'dns new 1' => 'Nouvelle adresse IP du <strong>second</strong> serveur DNS :',
'dns proxy server' => 'Serveur proxy DNS',
-'dns saved' => 'Sauvegarde effectuée!',
-'dns saved txt' => 'La sauvegarde des deux adresses entrées du serveur DNS a été effectée correctement.<br />Vous devez redémarrer ou vous reconnecter pour que les changements prennent effets!',
+'dns saved' => 'Sauvegarde effectuée !',
+'dns saved txt' => 'La sauvegarde des deux adresses saisies du serveur DNS a été effectée correctement.<br />Vous devez redémarrer ou vous reconnecter pour que les changements prennent effets!',
'dns server' => 'Serveur DNS',
'dns title' => 'Nom du domaine système',
'do not log this port list' => 'Ne pas inscrire cette liste de ports dans le journal (réduit la taille du journal)',
@@ -694,18 +694,18 @@
'dod not compatible with ddns' => 'La connexion à la demande n\'est pas compatible avec les services DNS dynamiques',
'dod waiting' => 'Connexion à la demande en attente',
'domain' => 'Domaine',
-'domain master' => 'Domaine Maitre',
-'domain name' => 'Nom de domaine',
+'domain master' => 'Domaine maitre',
+'domain name' => 'Nom de domaine ',
'domain name suffix' => 'Suffixe du nom de domaine :',
-'domain not set' => 'Domaine non établit.',
+'domain not set' => 'Domaine non établi.',
'donation' => 'Dons',
'donation-link' => 'https://www.paypal.com/en_US/GB/i/btn/btn_donateCC_LG.gif',
-'donation-text' => '<strong>IPFire</strong> est réalisé et maintenu par des volontaires durant leur temps libre. Afin d\'assurer les coûts du projet et si vous voulez nous supporter vous pouvez effectuer un don.',
+'donation-text' => '<strong>IPFire</strong> est réalisé et maintenu par des volontaires durant leur temps libre. Afin d\'assurer les coûts du projet et si vous souhaitez nous encourager vous pouvez effectuer un don.',
'done' => 'Faites le',
'dos charset' => 'DOS Charset',
'down and up speed' => 'Entrez votre débit descendant et montant <br /> et cliquez sur <i>Sauvegarder</i>.',
'downlink speed' => 'Débit de téléchargement (kbit/sec)',
-'downlink std class' => 'Classe standart de téléchargement',
+'downlink std class' => 'Classe standard de téléchargement',
'download' => 'téléchargement',
'download ca certificate' => 'Téléchargez le certificat CA',
'download certificate' => 'Téléchargez le certificat',
@@ -729,12 +729,12 @@
'duplicate ip' => 'Adresses IP entrées en double',
'duplicate ip bold' => 'Les adresses en double sont en <b>gras</b>',
'duplicate mac' => 'Adresse MAC entrée en double',
-'duplicate name' => 'Ce nom est déjà utilisé veuillez en choisir un autre.',
+'duplicate name' => 'Ce nom est déjà utilisé, veuillez en choisir un autre.',
'dyn dns source choice' => 'Le/les fournisseur(s) de DNS dynamiques revevront une adresse d\'IPFire depuis :',
-'dynamic dns' => 'DNS Dynamique',
-'dynamic dns client' => 'Client DNS Dynamique',
-'e-mail address too long' => 'L\'adresse E-Mail est trop longue; elle ne doit pas dépasser 40 caractères.',
-'eciadsl help' => 'Pour utiliser le modem ECI ADSL vous devez charger un fichier synch.bin sur votre machine IPFire. Veuillez télécharger le fichier depuis le site web d\'ECIADSL et chargez le fichier <b>synch.bin</b> en utilisant le formulaire ci-dessous.',
+'dynamic dns' => 'DNS dynamique',
+'dynamic dns client' => 'Client DNS dynamique',
+'e-mail address too long' => 'L\'adresse email est trop longue ; Elle ne doit pas dépasser 40 caractères.',
+'eciadsl help' => 'Pour utiliser le modem ECI ADSL, vous devez charger un fichier synch.bin sur votre machine IPFire. Veuillez télécharger le fichier depuis le site web d\'ECIADSL et chargez le fichier <b>synch.bin</b> en utilisant le formulaire ci-dessous.',
'eciadsl upload' => 'Charger le fichier ECI ADSL Synch.bin',
'edit' => 'Editer',
'edit a rule' => 'Editer une règle existante :',
@@ -750,8 +750,8 @@
'edit share' => 'Modifier les partages',
'editor' => 'Editeur',
'eg' => 'ex. :',
-'email server can not be empty' => 'Le serveur Mail ne peut pas être vide',
-'emailreportlevel' => 'Niveau de rapport des Mails',
+'email server can not be empty' => 'Le serveur mail ne peut pas être vide',
+'emailreportlevel' => 'Niveau de rapport des mails',
'empty' => 'Ce champ peut être laissé vide',
'empty profile' => 'vide',
'enable ignore filter' => 'Activer le filtre d\'ignorance',
@@ -762,7 +762,7 @@
'enabledtitle' => 'Activé',
'encapsulation' => 'Encapsulation',
'encrypted' => 'Chiffré',
-'end address' => 'Adresse de Fin :',
+'end address' => 'Adresse de fin :',
'enter ack class' => 'Entrez la classe ACK <br /> et cliquez sur <i>Sauvegarder</i>.',
'enter data' => 'Entrez vos réglages <br /> et cliquez sur <i>Sauvegarder</i>.',
'err bk 1' => 'Erreur lors de la création de l\'archive',
@@ -783,7 +783,7 @@
'esp integrity' => 'Intégrité ESP :',
'esp keylife' => 'Temps de vie de la clef ESP :',
'esp keylife should be between 1 and 24 hours' => 'Le temps de vie de la clef ESP doit être compris entre 1 et 24 heures.',
-'every' => 'Chaques',
+'every' => 'Chaque',
'exampel' => 'exemple',
'exclude logfiles' => 'Exclure les fichiers logs',
'excluding buffers and cache' => '-/+ buffers/tampon',
@@ -794,11 +794,11 @@
'exportkey' => 'Exporter PSK',
'external access' => 'Accès externe',
'external access configuration' => 'Configuration de l\'accès externe',
-'external access rule added' => 'Règle d\'accès externe ajoutée; redémarrage du controleur d\'accès',
-'external access rule changed' => 'Règle d\'accès externe modifiée; redémarrage du controleur d\'accès',
-'external access rule removed' => 'Règle d\'accès externe supprimée; redémarrage du controleur d\'accès',
+'external access rule added' => 'Règle d\'accès externe ajoutée ; Redémarrage du contrôleur d\'accès',
+'external access rule changed' => 'Règle d\'accès externe modifiée ; Redémarrage du contrôleur d\'accès',
+'external access rule removed' => 'Règle d\'accès externe supprimée ; Redémarrage du contrôleur d\'accès',
'external aliases configuration' => 'Configuration des alias externes',
-'extrahd' => 'ExtraHD',
+'extrahd' => 'Options stockage',
'extrahd because there is already a device mounted' => ' car vous avez déjà un support de monté',
'extrahd cant umount' => 'Impossible de démonter',
'extrahd detected drives' => 'Périphériques trouvés',
@@ -815,40 +815,40 @@
'february' => 'Février',
'fetch ip from' => 'Deviner la véritable IP publique à l\'aide d\'un serveur externe',
'filename' => 'Nom de fichier',
-'filesystem full' => 'Système de fichier plein',
-'firewall' => 'Pare-Feu',
+'filesystem full' => 'Système de fichier saturé',
+'firewall' => 'Pare-feu',
'firewall graphs' => 'Graphique du pare-feu',
-'firewall hits' => 'Nombre total des attaques du pare-feu pour',
-'firewall hits per' => 'attaques du pare-feu par',
+'firewall hits' => 'Nombre total des contacts avec le pare-feu pour',
+'firewall hits per' => 'contacts avec le pare-feu par',
'firewall log' => 'Journal du pare-feu',
'firewall log viewer' => 'Visionneuse des journaux du pare-feu',
'firewall logs' => 'Journaux du pare-feu',
'firewall logs ip' => 'Graphes du journal du pare-feu (IP)',
'firewall logs port' => 'Graphes du journal du pare-feu (Port)',
-'firewallhits' => 'Attaques du pare-feu',
+'firewallhits' => 'Contacts avec le pare-feu',
'firmware' => 'Firmware',
'firmware upload' => 'Charger Firmware/Pilotes',
'fixed ip lease added' => 'Bail IP fixe ajouté',
'fixed ip lease modified' => 'Bail IP fixe modifié',
'fixed ip lease removed' => 'Bail IP fixe supprimé',
'force update' => 'Forcer la mise à jour',
-'force user' => 'Obliger tous les nouveaux fichier à l\'utilisateur',
-'forwarding rule added' => 'Règle de transfert ajoutée; redémarrage du transitaire',
-'forwarding rule removed' => 'Règle de transfert supprimée; redémarrage du transitaire',
-'forwarding rule updated' => 'Règle de transfert mise à jour; redémarrage du transitaire',
+'force user' => 'Obliger tous les nouveaux fichiers à l\'utilisateur',
+'forwarding rule added' => 'Règle de transfert ajoutée ; Redémarrage du transitaire',
+'forwarding rule removed' => 'Règle de transfert supprimée ; Redémarrage du transitaire',
+'forwarding rule updated' => 'Règle de transfert mise à jour ; Redémarrage du transitaire',
'free' => 'Libre',
'free memory' => 'Mémoire libre ',
'free swap' => 'Swap libre',
'frequency' => 'Fréquence',
'friday' => 'Vendredi',
-'fritzdsl help' => 'Pour utiliser un des Fritz!DSL fcdsl / fcdslsl / fcdsl2 / fcdslusb / fcdslslusb modem, vous devez charger un paquet dans votre IPFire. Veuillez télécharger le tarball correspondant à votre version depuis le site web d\'IPFire et chargez <b>fcdsl-(votre_version).tgz</b> en utilisant le formulaire ci-dessous.',
+'fritzdsl help' => 'Pour utiliser un des modems Fritz!DSL fcdsl / fcdslsl / fcdsl2 / fcdslusb / fcdslslusb, vous devez charger un paquet dans votre IPFire. Veuillez télécharger le tarball correspondant à votre version depuis le site web d\'IPFire et chargez <b>fcdsl-(votre_version).tgz</b> en utilisant le formulaire ci-dessous.',
'fritzdsl upload' => 'Charger le pilote Fritz!DSL',
'from' => 'De',
-'from email adr' => 'De l\'adresse EMail',
-'from email pw' => 'Du password EMail',
-'from email server' => 'Du le serveur EMail',
-'from email user' => 'De l\'EMail de l\'utilisateur',
-'from warn email bad' => 'Cette adresse EMail n\'est pas valide',
+'from email adr' => 'De l\'adresse email',
+'from email pw' => 'Du mot de passe email',
+'from email server' => 'Du serveur email',
+'from email user' => 'De l\'email de l\'utilisateur',
+'from warn email bad' => 'Cette adresse email n\'est pas valide',
'fw blue' => 'Options du pare-feu pour l\'interface bleue',
'fw logging' => 'Journalisation du pare-feu',
'g.dtm' => 'A SUPPRIMER',
@@ -856,12 +856,12 @@
'gateway' => 'Passerelle',
'gateway ip' => 'Passerelle IP',
'gen static key' => 'Générer une clef statique',
-'generate' => 'Générer un certificat Root/Hôte',
+'generate' => 'Générer un certificat root/hôte',
'generate a certificate' => 'Générer un certificat :',
'generate iso' => 'Générer ISO',
-'generate root/host certificates' => 'Générer des certificats Root/Hôte',
+'generate root/host certificates' => 'Générer des certificats root/hôte',
'generate tripwire keys and init' => 'Générer des clef Tripwire et init',
-'generatekeys' => 'Générer des clef',
+'generatekeys' => 'Générer des clefs',
'generatepolicy' => 'Générer une nouvelle politique',
'generatereport' => 'Générer un nouveau rapport',
'generating the root and host certificates may take a long time. it can take up to several minutes on older hardware. please be patient' => 'Générer le certificat root et le certificat hôte peut prendre du temps. Cela peut prendre plusieurs minutes sur du matériel ancien. Veuillez patienter.',
@@ -873,7 +873,7 @@
'gpl please read carefully the general public license and accept it below' => 'Merci de lire attentivement la Licence et de l\'accepter',
'gpl unofficial translation of the general public license v3' => 'Traduction non officielle de la Licence v3',
'graph' => 'Graphique',
-'graph per' => 'pour',
+'graph per' => 'par',
'green' => 'VERT',
'green interface' => 'Interface VERTE',
'guaranteed bandwith' => 'Bande passante garantie',
@@ -882,10 +882,10 @@
'gz with key' => 'Seulement les archives chiffrées peuvent être restaurées sur cette machine.',
'hangup' => 'Déconnecté',
'hangup string' => 'Raccrocher :',
-'harddisk temperature' => 'Temperature disque dur',
-'harddisk temperature graphs' => 'Graphiques temperature disque dur',
+'harddisk temperature' => 'Température disque dur',
+'harddisk temperature graphs' => 'Graphiques température disque dur',
'hardware graphs' => 'Graphiques matériel',
-'hdd temperature in' => 'Temperature interne disque dur',
+'hdd temperature in' => 'Température interne disque dur',
'help' => 'Aide',
'high' => 'Haut',
'high memory usage' => 'Utilisation mémoire importante',
@@ -896,9 +896,9 @@
'host certificate' => 'Certificat hôte',
'host configuration' => 'Configuration de l\'hôte',
'host deny' => 'Liste des hôtes non autorisés',
-'host ip' => 'Adresse IP de l\'hôte',
-'host to net vpn' => 'Virtual Private Network (VPN) de l\'hôte au net (RoadWarrior)',
-'hostname' => 'Nom Hôte',
+'host ip' => 'Adresse IP de l\'hôte ',
+'host to net vpn' => 'Réseau privé virtuel (VPN) de l\'hôte au net (client nomade)',
+'hostname' => 'Nom hôte',
'hostname and domain already in use' => 'Le nom d\'hôte et de domaine sont déjà utilisés.',
'hostname cant be empty' => 'Le nom d\'hôte ne peut pas être vide.',
'hostname not set' => 'Le nom d\'hôte n\'est pas défini.',
@@ -909,18 +909,18 @@
'hours' => 'heures',
'hours2' => 'Heures',
'ibod for dual isdn only' => 'iBOD peut seulement être utilisé avec un double ISDN.',
-'icmp selected but no type' => 'ICMP est le protocole séléctionné, mais il n\'y a aucuntype ICMP spécifié.',
+'icmp selected but no type' => 'ICMP est le protocole sélectionné, mais il n\'y a aucun type ICMP spécifié.',
'icmp type' => 'Type ICMP',
'id' => 'ID',
'idle' => 'Inactif',
-'idle timeout' => 'Délai d\'inactivité (minutes; 0 pour désactiver) :',
+'idle timeout' => 'Délai d\'inactivité (minutes ; 0 pour désactiver) :',
'idle timeout not set' => 'Délai d\'inactivité non défini.',
'ids log viewer' => 'Visualiser rapport IDS',
'ids logs' => 'Rapports IDS',
'ids preprocessor' => 'Préprocesseur IDS',
'ids rules license' => 'Pour utiliser les règles certifiées par Sourcefire VRT, vous devez vous inscrire',
'ids rules license1' => '.',
-'ids rules license2' => 'Après avoir prit connaissance de la license, activez votre compte en utilisant l\'URL que vous avez reçue par mail. Ensuite allez a',
+'ids rules license2' => 'Après avoir pris connaissance de la licence, activez votre compte en utilisant l\'URL que vous avez reçu par mail. Ensuite allez a',
'ids rules license3' => 'Appuyez sur le bouton "Generate code" et copiez les 40 caractères Oinkcode dans le champ ci-dessous.',
'ids rules update' => 'Mise à jour des règles Snort',
'iface' => 'Iface',
@@ -937,7 +937,7 @@
'include logfiles' => 'inclure les fichiers logs',
'incoming' => 'entrant',
'incoming traffic in bytes per second' => 'Trafic entrant',
-'incorrect password' => 'Mot de passe Incorrect',
+'incorrect password' => 'Mot de passe incorrect',
'info' => 'Info',
'init string' => 'Init :',
'insert floppy' => 'Pour sauvegarder sur disquette, insérez une disquette formatée dans le lecteur d\'un PC IPFire et cliquez sur <i>Sauvegardez sur disquette</i> pour sauvegarder la configuration système. Veuillez examiner attentivement le résultat afin de vous assurez que la sauvegarde s\'est correctement effectuée. Cela peut prendre un certain temps, veuillez patienter.<p>',
@@ -970,11 +970,11 @@
'invalid input for authentication method' => 'Entrée non valide lors de l\'authentification.',
'invalid input for city' => 'Ville non valide.',
'invalid input for country' => 'Région non valide.',
-'invalid input for department' => 'Department non valide.',
+'invalid input for department' => 'Département non valide.',
'invalid input for dhcp dns' => 'DHCP DNS non valide',
'invalid input for dhcp domain' => 'Domaine DHCP non valide',
'invalid input for dhcp wins' => 'DHCP WINS non valide',
-'invalid input for e-mail address' => 'Adresse e-mail non valide.',
+'invalid input for e-mail address' => 'Adresse email non valide.',
'invalid input for esp keylife' => 'Durée de validité de la clef ESP non valide',
'invalid input for hostname' => 'Nom d\'hôte non valide.',
'invalid input for ike lifetime' => 'Durée de validité IKE non valide',
@@ -987,7 +987,7 @@
'invalid input for organization' => 'Organisation non valide',
'invalid input for remote host/ip' => 'hôte/IP distant(e) non valide.',
'invalid input for state or province' => 'Région ou département non valide.',
-'invalid ip' => 'IP Adresse non valide',
+'invalid ip' => 'Adresse IP non valide',
'invalid keep time' => 'Le temps restant doit être un nombre valide',
'invalid key' => 'Clef non valide.',
'invalid loaded file' => 'Fichier chargé non valide',
@@ -1013,7 +1013,7 @@
'invalid time period' => 'Période de temps non valide',
'invalid uplink speed' => 'Vitesse du lien montant non valide.',
'invalid upstream proxy username or password setting' => 'Configuration du nom d\'utilisateur ou du mot de passe du proxy montant non valide.',
-'invalid users' => 'Liste d\'utilisateur interdit d\'accès',
+'invalid users' => 'Liste d\'utilisateurs interdits d\'accès',
'invalid vpi vpci' => 'Réglages VPI/VPCI non valide',
'invalid wins address' => 'Adresse du serveur WINS non valide.',
'invert' => 'Inverser',
@@ -1046,12 +1046,12 @@
'kernel' => 'Noyau',
'kernel logging server' => 'Serveur de logs du noyau',
'kernel version' => 'Version du noyau :',
-'key stuff' => '2. Clefs et Certificats',
+'key stuff' => '2. Clefs et certificats',
'keyreset' => 'Rétablir les clefs',
'keys' => 'Clefs',
'lan' => 'LAN',
'lang' => 'fr',
-'languagepurpose' => 'Séléctionnez la langue utilisée par IPFire :',
+'languagepurpose' => 'Sélectionnez la langue utilisée par IPFire :',
'last activity' => 'Dernière activité',
'lateprompting' => 'Dernière action',
'lease expires' => 'Bail expiré',
@@ -1061,14 +1061,14 @@
'linkq' => 'Qualité du lien',
'load printer' => 'Charger imprimante',
'loaded modules' => 'Modules chargés :',
-'local hard disk' => 'Disque Dur',
+'local hard disk' => 'Disque dur',
'local master' => 'Maitre local',
'local ntp server specified but not enabled' => 'Serveur NTP local spécifié mais pas activé',
'local subnet' => 'Sous-réseau local :',
'local subnet is invalid' => 'Le sous-réseau local est non valide.',
'local vpn hostname/ip' => 'Nom d\'hôte/IP du VPN local',
-'localkey' => 'Clef local',
-'localkeyfile' => 'Fichier clef local',
+'localkey' => 'Clef locale',
+'localkeyfile' => 'Fichier clef locale',
'log' => 'Rapport :',
'log enabled' => 'Rapport activé',
'log level' => 'Niveau de rapport',
@@ -1101,25 +1101,25 @@
'ls_sshd' => 'Identifiants des utilisateurs distants :',
'ls_syslogd' => 'Syslogd :',
'mac address' => 'Adresses MAC',
-'mac address deleted' => 'Suppression réussie!',
-'mac address deleted txt' => 'L\'adresse MAC a été correctement supprimée, mais les changements prendront effets après <strong>un redémarrage</strong>.',
+'mac address deleted' => 'Suppression réussie !',
+'mac address deleted txt' => 'L\'adresse MAC a été correctement supprimée, mais les changements prendront effet après <strong>un redémarrage</strong>.',
'mac address done' => 'L\'adresse MAC sera sauvegardée.',
-'mac address error not 00' => 'Une adresse MAC doit commencer par 00!',
-'mac address error not valid' => 'Adresse MAC non valide!',
+'mac address error not 00' => 'Une adresse MAC doit commencer par 00 !',
+'mac address error not valid' => 'Adresse MAC non valide !',
'mac address header' => 'Adresse MAC de rouge0',
'mac address in use' => 'Adresse MAC en cours d\'utilisation',
'mac address menu' => 'Affecter une adresse MAC',
-'mac address recon' => 'Tentative de reconnexion!',
-'mac address saved' => 'Sauvegarde réussie!',
-'mac address saved txt' => 'L\'adresse MAC a été correctement sauvegardée, mais les changements prendront effets après un redémarrage ou une reconnexion.',
+'mac address recon' => 'Tentative de reconnexion !',
+'mac address saved' => 'Sauvegarde réussie !',
+'mac address saved txt' => 'L\'adresse MAC a été correctement sauvegardée, mais les changements prendront effet après un redémarrage ou une reconnexion.',
'mac address title' => 'Contrôle d\'accès des adresses',
'mac desc' => 'Ici vous pouvez changer l\'adresse MAC de red0. L\'adresse doit être saisie en hexadecimal (0-9,a-f), une adresse valide est <br />e.g. 00-01-02-0e-b8-d6 ou 00:01:02:0e:b8:d6.',
'mac new' => 'Nouvelle adresse MAC :',
-'mac1 new' => 'Nouvelle adresse MAC 1 (vdsl-inet):',
-'mac2 new' => 'Nouvelle adresse MAC 2 (vdsl-iptv):',
+'mac1 new' => 'Nouvelle adresse MAC 1 (vdsl-inet) :',
+'mac2 new' => 'Nouvelle adresse MAC 2 (vdsl-iptv) :',
'magic packet send to:' => 'Paquet magique envoyé à :',
-'mailmethod' => 'Méthode E-Mail',
-'mailprogramm' => 'Programme E-Mail',
+'mailmethod' => 'Méthode email',
+'mailprogramm' => 'Programme email',
'main page' => 'Page principale',
'manage ovpn' => '5. Gestion des tunnels :',
'manage printers' => 'Gestion des imprimantes',
@@ -1130,17 +1130,17 @@
'map to guest' => 'Carte de l\'utilisateur',
'march' => 'Mars',
'marked' => 'Marque',
-'max bandwith' => 'Bande passante maximum',
-'max incoming size' => 'Taille maximum des téléchargement (KB) :',
-'max lease time' => 'Durée maximum du bail (minutes):',
-'max outgoing size' => 'Taille maximum des envois (KB):',
-'max reliability' => 'Fiabilité maximum',
+'max bandwith' => 'Bande passante maximale',
+'max incoming size' => 'Taille maximale des téléchargements (Ko) :',
+'max lease time' => 'Durée maximale du bail (minutes) :',
+'max outgoing size' => 'Taille maximale des envois (Ko) :',
+'max reliability' => 'Fiabilité maximale',
'max renewal time' => 'Durée maximale de renouvellement',
-'max retries not set' => 'Nombre de tentatives maximum non défini.',
-'max size' => 'Taille maximal des objets (KB):',
-'max throughput' => 'Débit Maximum',
+'max retries not set' => 'Nombre de tentatives maximales non défini.',
+'max size' => 'Taille maximale des objets (Ko) :',
+'max throughput' => 'Débit maximal',
'maximal' => 'Maximal',
-'maximum retries' => 'Tentatives Maximum :',
+'maximum retries' => 'Tentatives maximales :',
'may' => 'Mai',
'mbmon display' => 'Afficher',
'mbmon fan' => 'Vitesse ventilateurs',
@@ -1151,19 +1151,19 @@
'mbmon temp' => 'Température',
'mbmon temp in' => 'Température en',
'mbmon value' => 'Valeur',
-'mbmon volt' => 'Voltage',
+'mbmon volt' => 'Tension',
'meaning' => 'sens',
-'media' => 'Média',
-'media information' => 'Information média',
+'media' => 'Stockage',
+'media information' => 'Informations stockage',
'medium' => 'Moyen',
'memory' => 'Mémoire',
-'memory information' => 'Information mémoire',
+'memory information' => 'Informations mémoire',
'memory usage per' => 'Utilisation de la mémoire par',
'messages logging' => 'Paramètres des rapports pour /var/log/messages',
'method' => 'Méthode :',
'min costs' => 'Coûts minimum',
'min delay' => 'Retard minimum',
-'min size' => 'Taille minimale des objets (KB):',
+'min size' => 'Taille minimale des objets (Ko):',
'minimal' => 'Minimale',
'minutes' => 'Minutes',
'misc-options' => 'Options supplémentaires',
@@ -1171,7 +1171,7 @@
'missing gz' => 'Archive déchiffrée introuvable',
'mode' => 'Mode',
'modem' => 'Modem',
-'modem configuration' => 'Configuration Modem',
+'modem configuration' => 'Configuration modem',
'modem on com1' => 'Modem sur COM1',
'modem on com2' => 'Modem sur COM2',
'modem on com3' => 'Modem sur COM3',
@@ -1184,10 +1184,10 @@
'monday' => 'Lundi',
'month' => 'Mois',
'month-graph' => 'Mois',
-'monthly firewallhits' => 'Attaques mensuelles du pare-feu',
+'monthly firewallhits' => 'Contacts mensuels avec le pare-feu',
'monthly start day bad' => 'Le jour de début du mois est incorrect',
'monthly traffic bad' => 'Le trafic mensuel est incorrect',
-'monthly volume' => 'Traffic mensuel',
+'monthly volume' => 'Trafic mensuel',
'monthly volume start day' => 'Premier jour d\'une période mensuelle',
'monthly volume start day short' => 'Premier jour',
'months' => 'mois',
@@ -1200,30 +1200,30 @@
'mpfire scanning' => 'Chercher de nouveaux fichiers',
'mpfire search' => 'Recherche MPFire',
'mpfire songs' => 'Liste des chansons MPFire',
-'mpfire webradio' => 'Webradio MPFire',
+'mpfire webradio' => 'Radio web MPFire',
'mtu QoS' => 'Ceci ne change pas le MTU global, cela règle uniquement le MTU pour la QoS.',
'my new share' => 'Mon nouveau partage',
'name' => 'Nom',
'name is invalid' => 'Le nom est non valide',
'name must only contain characters' => 'Le nom ne doit contenir que des caractères.',
'name too long' => 'Le nom d\'utilisateur ou du système hôte est trop long',
-'nat-traversal' => 'Nat Traversal :',
-'needreboot' => 'Une mise à jour nécessite un redémarrage',
+'nat-traversal' => 'Traversée NAT :',
+'needreboot' => 'Une mise à jour nécessite un redémarrage ',
'net' => 'Réseau',
'net address' => 'adresse net',
'net config' => 'Configuration réseau',
'net config type' => 'Type de configuration réseau',
-'net config type help' => 'VERT est le réseau local (LAN), ROUGE est internet (WAN), BLEU est le Wi-Fi (WLAN), ORANGE est la DMZ.',
-'net to net vpn' => 'Net-a-Net Réseau Privé Virtuel (VPN)',
+'net config type help' => 'VERT est le réseau local (LAN), ROUGE est internet (WAN), BLEU est le wifi (WLAN), ORANGE est la DMZ.',
+'net to net vpn' => 'Réseau privé virtuel (VPN) Net-a-Net',
'net traffic newversion' => 'Nouvelle version de Net-Traffic disponible :',
'net-traffic configuration' => 'Configuration Net-Traffic',
'netbios name' => 'Nom Netbios',
-'netmask' => 'Masque Réseau',
+'netmask' => 'Masque réseau',
'network' => 'Réseau',
'network added' => 'Réseau personnalisé ajouté',
'network configuration' => 'Configuration réseau',
'network internal' => 'Réseau (interne)',
-'network options' => 'Options Réseau',
+'network options' => 'Options réseau',
'network other' => 'Réseau (autres)',
'network red' => 'Réseau (externe)',
'network removed' => 'Réseau personnalisé supprimé',
@@ -1235,7 +1235,7 @@
'network traffic graphs internal' => 'Graphique du trafic net (interne)',
'network traffic graphs others' => 'Réseau (autres)',
'network updated' => 'Réseau personnalisé mis à jour',
-'networks settings' => 'Réglages Pare-feu - Réseau',
+'networks settings' => 'Réglages pare-feu - réseau',
'new optionsfw later' => 'Vos modifications seront actives au prochain redémarrage',
'new optionsfw must boot' => 'Vous devez redémarrer IPFire',
'newer' => 'Récents',
@@ -1244,7 +1244,7 @@
'no alcatelusb firmware' => 'aucun firmware Alcatel USB. Veuillez le charger.',
'no cfg upload' => 'Aucune donnée n\'a été envoyée',
'no dhcp lease' => 'Aucun bail DHCP n\'a été obtenu',
-'no eciadsl synch.bin file' => 'aucunfichier ECI ADSL synch.bin. Veuillez le charger.',
+'no eciadsl synch.bin file' => 'aucun fichier ECI ADSL synch.bin. Veuillez le charger.',
'no filter pass' => 'Entrez la classe standard pour les paquets non filtrés.',
'no fritzdsl driver' => 'Aucun pilote Fritz!DSL. Veuillez le charger.',
'no information available' => 'Aucune information disponible.',
@@ -1253,8 +1253,8 @@
'no set selected' => 'Aucun jeu sélectionné',
'no time limit' => 'temps illimité',
'none found' => 'aucun résultat',
-'nonetworkname' => 'Aucun nom de réseau entré',
-'noservicename' => 'Aucun nom de service entré',
+'nonetworkname' => 'Aucun nom de réseau saisi',
+'noservicename' => 'Aucun nom de service saisi',
'not a valid ca certificate' => 'Le certificat CA n\'est pas valide.',
'not enough disk space' => 'Pas assez d\'espace sur le disque',
'not present' => '<b>Absent</b>',
@@ -1289,20 +1289,20 @@
'optional at cmd' => 'Commande AT optionnelle',
'optional data' => '3. Paramètres optionnels :',
'options' => 'Options',
-'options fw' => 'Options du Pare-feu',
+'options fw' => 'Options du pare-feu',
'optionsfw portlist hint' => 'Les ports de la liste des ports doivent être séparés par des virgules (c.a.d. 137,138). Vous pouvez spécifier un maximum de 15 ports par protocole.',
-'optionsfw warning' => 'Une modification de ces options implique un redémarrage du Pare-feu',
+'optionsfw warning' => 'Une modification de ces options implique un redémarrage du pare-feu',
'or' => 'ou',
'orange' => 'ORANGE',
'organization cant be empty' => 'Le champ Organisation ne peut pas être vide.',
-'organization name' => 'Nom Organisation',
-'organization too long' => 'Le nom d\'organisation est trop long; il ne doit pas excéder 60 caractères.',
+'organization name' => 'Nom organisation',
+'organization too long' => 'Le nom d\'organisation est trop long ; Il ne doit pas excéder 60 caractères.',
'original' => 'Original',
'os level' => 'Niveau OS',
'other countries' => 'Autres pays',
'other login script' => 'Autres scripts d\'identification',
'otherip' => 'Autres IPs',
-'otherport' => 'Autres Port',
+'otherport' => 'Autre port',
'out' => 'sortie',
'outgoing' => 'sortant',
'outgoing firewall' => 'Pare-feu sortant',
@@ -1317,11 +1317,11 @@
'outgoing firewall mode0' => 'En utilisant ce mode, tous les clients peuvent avoir accès à Internet sans restrictions.',
'outgoing firewall mode1' => 'En utilisant ce mode, seules les connexions basées sur les règles prédéfinies sont autorisées.',
'outgoing firewall mode2' => 'En utilisant ce mode, toutes les connexions sont autorisées sans tenir compte de la liste de définitions.',
-'outgoing firewall outgoing firewall reserved groupname' => 'S il vous plaît utilisez un autre nom de groupe, ce nom est réservé.',
+'outgoing firewall outgoing firewall reserved groupname' => 'Veuillez utiliser un autre nom de groupe, ce nom est réservé.',
'outgoing firewall p2p allow' => 'le protocole p2p est autorisé',
'outgoing firewall p2p deny' => 'le protocole p2p est refusé',
'outgoing firewall p2p description 1' => 'Le bouton',
-'outgoing firewall p2p description 2' => ' signifie que le protocol est autorisé ou',
+'outgoing firewall p2p description 2' => ' signifie que le protocole est autorisé ou',
'outgoing firewall p2p description 3' => 'que le protocole p2p est bloqué.',
'outgoing firewall reset' => 'Tout réinitialiser',
'outgoing firewall view group' => 'Voir le groupe',
@@ -1333,13 +1333,13 @@
'ovpn config' => 'OVPN-Config',
'ovpn device' => 'Périphérique OpenVPN :',
'ovpn dl' => 'Télécharger OVPN-Config',
-'ovpn errmsg green already pushed' => 'La route pour le r?seau green est toujours activ?e',
-'ovpn errmsg invalid ip or mask' => 'Adresse ou masque de sous-r?seau invalide',
+'ovpn errmsg green already pushed' => 'La route pour le réseau VERT est toujours activée',
+'ovpn errmsg invalid ip or mask' => 'Adresse ou masque de sous-réseau invalide',
'ovpn log' => 'OVPN-Log',
'ovpn on blue' => 'OpenVPN sur BLEU',
'ovpn on orange' => 'OpenVPN sur ORANGE',
-'ovpn on red' => 'OpenVPN sur RED',
-'ovpn routes push' => 'Routes (une par ligne):',
+'ovpn on red' => 'OpenVPN sur ROUGE',
+'ovpn routes push' => 'Routes (une par ligne) :',
'ovpn routes push options' => 'Options de Route push',
'ovpn server status' => 'Statut actuel du serveur OpenVPN :',
'ovpn subnet' => 'Sous-réseau OpenVPN (c.a.d. 10.0.10.0/255.255.255.0)',
@@ -1362,27 +1362,27 @@
'ovpnstatus log' => 'Journal statut OVPN',
'ovpnsys log' => 'Journal système OVPN',
'package failed to install' => 'L\'installation du paquet a échoué.',
-'pagerefresh' => 'La page est entrain d\'être rafraichie, veuillez attendre.',
-'pakfire accept all' => 'Voulez-vous installer tout les paquets?',
+'pagerefresh' => 'La page est en train d\'être rafraichie, veuillez attendre.',
+'pakfire accept all' => 'Voulez-vous installer tous les paquets ?',
'pakfire ago' => '',
'pakfire available addons' => 'Addons disponibles :',
'pakfire configuration' => 'Configuration Pakfire',
-'pakfire core update auto' => 'Installer les mises à jours du noyau et des addons automatiquement :',
+'pakfire core update auto' => 'Installer les mises à jour du noyau et des addons automatiquement :',
'pakfire core update level' => 'Niveau de mise à jour du noyau',
-'pakfire health check' => 'Vérifier si le mirroir est accessible (ping):',
-'pakfire install description' => 'Veuillez choisir un ou plusieurs objets dans la liste ci-dessous et cliquez sur le plus pour installer.',
+'pakfire health check' => 'Vérifier si le miroir est accessible (ping) :',
+'pakfire install description' => 'Veuillez choisir un ou plusieurs objets dans la liste ci-dessous<br>et cliquer sur le PLUS pour installer.',
'pakfire install package' => 'Vous voulez installer les paquets suivants : ',
'pakfire installed addons' => 'Addons installés :',
'pakfire last core list update' => 'Dernière mise à jour de la liste du noyau effectuée',
'pakfire last package update' => 'Dernière mise à jour de la liste des paquets effectuée',
'pakfire last serverlist update' => 'Dernière mise à jour de la liste des serveurs effectuée',
'pakfire last update' => 'Dernière mise à jour faite ',
-'pakfire possible dependency' => 'Il y a peut être des dépendances, voici la liste des paquets qu\'il faut installer.',
+'pakfire possible dependency' => 'Il y a peut-être des dépendances, voici la liste des paquets qu\'il faut installer.',
'pakfire register' => 'Inscrivez-vous au serveur pakfire :',
'pakfire system state' => 'Statut système PakFire',
-'pakfire uninstall description' => 'Veuillez choisir un ou plusieurs objets dans la liste ci-dessous et cliquez sur le moins pour désinstaller.',
+'pakfire uninstall description' => 'Veuillez choisir un ou plusieurs objets dans la liste ci-dessous<br>et cliquer sur le MOINS pour désinstaller.',
'pakfire uninstall package' => 'Vous voulez désinstaller les paquets suivants : ',
-'pakfire update daily' => 'Rechercher des mises à jour quotidiennes:',
+'pakfire update daily' => 'Rechercher des mises à jour quotidiennes :',
'pakfire updates' => 'Mise à jour disponible :',
'pakfire working' => 'Pakfire travaille ... Veuillez attendre que tout soit terminé.',
'pap or chap' => 'PAP ou CHAP',
@@ -1391,7 +1391,7 @@
'password' => 'Mot de passe :',
'password contains illegal characters' => 'Le mot de passe contient des caractères interdits.',
'password crypting key' => 'Le mot de passe chiffre la clef',
-'password not set' => 'Mot de passe non définit.',
+'password not set' => 'Mot de passe non défini.',
'password too short' => 'Le mot de passe est trop court.',
'passwords do not match' => 'Les mots de passe ne correspondent pas.',
'passwords must be at least 6 characters in length' => 'Le mot de passe doit avoir une longueur de 6 caractères minimum',
@@ -1423,8 +1423,8 @@
'present' => 'Présent',
'prev' => 'précédent',
'primary dns' => 'DNS primaire :',
-'primary ntp server' => 'Serveur NTP primaire',
-'primary wins server address' => 'Serveur WINS primaire',
+'primary ntp server' => 'Serveur NTP primaire ',
+'primary wins server address' => 'Serveur WINS primaire ',
'printcap name' => 'Nom Printercap',
'printer' => 'Imprimante',
'printername' => 'Nom de l\'imprimante',
@@ -1444,26 +1444,26 @@
'protocol' => 'Protocole',
'proxy' => 'Proxy',
'proxy access graphs' => 'Graphiques des accès proxy',
-'proxy admin password' => 'Mot de passe admnistrateur du Cache',
-'proxy cachemgr' => 'Activer le gestionnaire de cache',
+'proxy admin password' => 'Mot de passe admnistrateur du cache ',
+'proxy cachemgr' => 'Activer le gestionnaire de cache ',
'proxy errmsg filedescriptors' => 'Mauvais montant de fichier descripteurs',
-'proxy filedescriptors' => 'Nombre de descripteurs de fichier',
+'proxy filedescriptors' => 'Nombre de descripteurs de fichier ',
'proxy log viewer' => 'Visualisateur des journaux de proxy',
'proxy logs' => 'Journaux du proxy',
'proxy no proxy extend' => 'Où spécifier une liste de destination sans transit par le proxy',
'proxy no proxy local' => 'Rejeter le proxy local sur les réseaux bleu/vert',
'proxy port' => 'Port du proxy',
-'proxy reconfigure' => 'Sauver et Recharger',
+'proxy reconfigure' => 'Sauver et recharger',
'psk' => 'PSK',
'pulse' => 'Impulsion',
'pulse dial' => 'Numérotation par impulsions :',
-'qos add subclass' => 'Ajouter une sous classe',
+'qos add subclass' => 'Ajouter une sous-classe',
'qos graphs' => 'Graphiques Qos',
-'qos warning' => 'Cette règle <strong>doit</strong> être sauvée, autrement elle ne sera pas retenue!',
+'qos warning' => 'Cette règle <strong>doit</strong> être sauvée, autrement elle ne sera pas retenue !',
'quick control' => 'Contrôle rapide',
'quick playlist' => 'Liste de lecture rapide',
'ram' => 'RAM',
-'read bytes' => 'Lire les octets',
+'read bytes' => 'Octets lus',
'read list' => 'liste des hôtes en lecture seule',
'real address' => 'Adresse réelle',
'reboot' => 'Redémarrage',
@@ -1471,10 +1471,10 @@
'reboot question' => 'Requête supplémentaire pour le redémarrage et l\'arrêt',
'reboot schedule' => 'Redémarrages planifiées d\'IPFire',
'reboot sure' => 'Etes-vous sûr de vouloir redémarrer ?',
-'rebooting' => 'Redémarrage en cours',
+'rebooting' => 'Redémarrage en cours...',
'rebooting ipfire' => 'Redémarrage d\'IPFire',
'reconnect' => 'Reconnecter',
-'reconnection' => 'Reconnection',
+'reconnection' => 'Reconnexion',
'red' => 'Internet',
'references' => 'Références',
'refresh' => 'Rafraîchir',
@@ -1491,10 +1491,10 @@
'remote host/ip' => 'Hôte/IP distant',
'remote logging' => 'Enregistrement distant',
'remote subnet' => 'Sous-réseau distant :',
-'remote subnet is invalid' => 'Le Sous-réseau distant est non valide.',
+'remote subnet is invalid' => 'Le sous-réseau distant est non valide.',
'removable device advice' => 'Branchez le périphérique, rafraîchissez, sélectionnez-le et montez-le avant de l\'utiliser. Démonter-le avant de l\'enlever.',
'remove' => 'Enlever',
-'remove ca certificate' => 'Enlever Certificat CA',
+'remove ca certificate' => 'Enlever certificat CA',
'remove x509' => 'enlever x509',
'repeat' => 'répéter',
'reportfile' => 'Fichier de rapport',
@@ -1520,11 +1520,11 @@
'root certificate' => 'Certificat root',
'root path' => 'Répertoire root',
'root user password' => 'Mot de passe root',
-'route subnet is invalid' => 'L\'itinéraire additionel push du sous-réseau est non valide',
+'route subnet is invalid' => 'L\'itinéraire additionnel push du sous-réseau est non valide',
'router ip' => 'Adresse IP du routeur :',
'routing table entries' => 'Entrées de la table de routage :',
-'rsvd dst port overlap' => 'La fourchette des ports de destination comprend un port réservé à IPFire :',
-'rsvd src port overlap' => 'La fourchette des ports sources comprend un port réservé à IPFire :',
+'rsvd dst port overlap' => 'La plage des ports de destination comprend un port réservé à IPFire :',
+'rsvd src port overlap' => 'La plage des ports sources comprend un port réservé à IPFire :',
'rules already up to date' => 'Les règles sont déjà à jour',
'running' => 'EN FONCTION',
'safe removal of umounted device' => 'Vous pouvez enlever le périphérique démonté en toute sécurité',
@@ -1538,8 +1538,8 @@
'save-adv-options' => 'Sauvegarder les options avancées',
'script name' => 'Nom du script :',
'secondary dns' => 'DNS secondaire :',
-'secondary ntp server' => 'Serveur NTP secondaire',
-'secondary wins server address' => 'Serveur WINS secondaire',
+'secondary ntp server' => 'Serveur NTP secondaire ',
+'secondary wins server address' => 'Serveur WINS secondaire ',
'seconds' => 'Secondes',
'section' => 'Section',
'secure shell server' => 'Secure shell server',
@@ -1547,12 +1547,12 @@
'security options' => 'Options de sécurité',
'select' => 'Sélectionner',
'select dest net' => 'Séléctionner une destination réseau.',
-'select media' => 'Séléctionner un média <br />(seul le FAT est supporté pour les médias amovibles)',
-'select source net' => 'Séléctionner une source réseau. Si vous n\'avez aucun réseau ORANGE ou BLEU configuré, vous n\'avez pas besoin de DMZ Pinholes.',
-'selecttraffic' => 'Séléctionner aperçu de l\'utilisation :',
+'select media' => 'Séléctionner un stockage<br />(seul le FAT est supporté pour les médias amovibles)',
+'select source net' => 'Sélectionner une source réseau. Si vous n\'avez aucun réseau ORANGE ou BLEU configuré, vous n\'avez pas besoin de DMZ Pinholes.',
+'selecttraffic' => 'Sélectionner un aperçu de l\'utilisation :',
'send cr' => 'Le FAI impose un retour chariot :',
'send email notification' => 'Activé, envoyer une notification email',
-'send test mail' => 'Envoyer un email de test',
+'send test mail' => 'Envoyer un mail de test',
'september' => 'Septembre',
'serial' => 'Numéro',
'server reserved' => 'Le serveur de nom de connexion est réservé et non autorisé',
@@ -1574,7 +1574,7 @@
'shared' => 'partagé',
'sharename' => 'Nom de partage',
'shares' => 'Partages',
-'show ajax speedmeter in footer' => 'Montrer le compteur de vitesse Ajax',
+'show ajax speedmeter in footer' => 'Montrer le compteur de bande passante Ajax',
'show areas' => 'montrer les domaines',
'show ca certificate' => 'Montrer le certificat CA',
'show certificate' => 'Montrer le certificat',
@@ -1632,23 +1632,23 @@
'srcprt within existing' => 'Le port source est à l\'intérieur d\'une plage de port déjà définie.',
'ssdmz pinholes' => 'DMZ Pinholes',
'ssh access' => 'Accès SSH',
-'ssh access tip' => 'IPFire n\'utilise par le port par défaut 22 pour le SSH!',
+'ssh access tip' => 'IPFire n\'utilise par le port par défaut 22 pour le SSH !',
'ssh fingerprint' => 'Empreinte digitale',
'ssh host keys' => 'Clef SSH de l\'hôte',
-'ssh is disabled' => 'SSH est désactivé. Arrêt.',
-'ssh is enabled' => 'SSH est activé. Redémarrage.',
+'ssh is disabled' => 'SSH est désactivé. Arrêt.',
+'ssh is enabled' => 'SSH est activé. Redémarrage.',
'ssh key' => 'Clef',
'ssh key size' => 'Taille (bits)',
'ssh keys' => 'Autoriser l\'authentification par clef publique',
-'ssh no auth' => 'Vous n\'avez autorisé aucune méthode d\'authentification; cela va vous empêcher toute connexion future',
+'ssh no auth' => 'Vous n\'avez autorisé aucune méthode d\'authentification ; Cela va vous empêcher toute connexion future',
'ssh passwords' => 'Autoriser l\'authentification par mot de passe',
'ssh port' => 'Le port SSH défini est 22 (par défaut 222)',
'ssh portfw' => 'Autoriser le transfert TCP',
-'ssh tempstart15' => 'Arrêter le démon SSH dans 15 minutes',
-'ssh tempstart30' => 'Arrêter le démon SSH dans 30 minutes',
+'ssh tempstart15' => 'Arrêter le service SSH dans 15 minutes',
+'ssh tempstart30' => 'Arrêter le service SSH dans 30 minutes',
'ssh1 disabled' => 'SSHv1 est désactivé, la version 2 du client est requise.',
'ssh1 enabled' => 'SSHv1 est activé, les anciens clients sont supportés.',
-'ssh1 support' => 'Support du protocole SSH version 1 (seulement requis pour les vieux clients)',
+'ssh1 support' => 'Support du protocole SSH version 1 (seulement requis pour les anciens clients)',
'ssnetwork status' => 'Statut réseau',
'sspasswords' => 'Mots de passe',
'ssport forwarding' => 'Transfert de port',
@@ -1660,15 +1660,15 @@
'start' => 'Démarrer',
'start address' => 'Adresse de début :',
'start ovpn server' => 'Démarrer serveur OpenVPN',
-'state or province' => 'Etat ou Région',
+'state or province' => 'Etat ou région',
'static ip' => 'IP statique',
'status' => 'Statut',
'status information' => 'Informations d\'état',
-'status ovpn' => '4. Statut OpenVPN / Configuration :',
+'status ovpn' => '4. Statut OpenVPN / configuration :',
'std classes' => 'Classes standards',
'stop' => 'Arrêter',
'stop ovpn server' => 'Arrêter serveur OpenVPN',
-'stopped' => 'ARRETER',
+'stopped' => 'ARRETE',
'subject' => 'Sujet',
'subject test' => 'Email de test',
'subject warn' => 'Attention - Le niveau d\'alerte a été atteint',
@@ -1683,11 +1683,11 @@
'system' => 'Système',
'system graphs' => 'Graphiques système',
'system log viewer' => 'Visualisateur de journaux système',
-'system logs' => 'Journaux Système',
+'system logs' => 'Journaux système',
'system status information' => 'Informations sur le statut du système',
'telephone not set' => 'Téléphone non défini.',
'template' => 'Préétabli',
-'template warning' => 'Vous avez deux options pour établir la Qos. La première, vous cliquez sur le bouton de sauvegarde et générez les classes et règles qui vous conviennent. La seconde, vous cliquez sur le bouton préétabli et les classes et règles seront mises en place par un modèle.',
+'template warning' => 'Vous avez deux options pour établir la Qos : La première, vous cliquez sur le bouton de sauvegarde et générez les classes et règles qui vous conviennent. La seconde, vous cliquez sur le bouton préétabli et les classes et règles seront mises en place par un modèle.',
'test' => 'test',
'test email could not be sent' => 'Ne peut pas envoyer d\'email de test',
'test email was sent' => 'L\'email de test a été envoyé',
@@ -1695,7 +1695,7 @@
'the statistics were last updated at' => 'Les statistiques ont été mis à jour à',
'theme' => 'Thème',
'there are updates' => 'Plusieurs mises à jour sont disponibles pour votre système. Veuillez regarder la section "Mises à jour" pour plus d\'informations.',
-'there are updates available' => 'Plusieurs mises à jour sont disponibles pour votre système. Il est recommandé de les installer aussi vite que possible.',
+'there are updates available' => 'Plusieurs mises à jour sont disponibles pour votre système. Il est recommandé de les installer dès que possible.',
'there was no file upload' => 'Il n\'y a pas eu de fichier envoyé.',
'this feature has been sponsored by' => 'Cette fonctionnalité a été sponsorisée par',
'this is not a valid archive' => 'Ceci n\'est pas une archive valide.',
@@ -1705,14 +1705,14 @@
'this weeks volume' => 'Le volume hebdomadaire',
'thursday' => 'Jeudi',
'time' => 'Heure',
-'time date manually reset' => 'Réinitialisation manuelle de la Date/Heure.',
+'time date manually reset' => 'Réinitialisation manuelle de la date/heure.',
'time server' => 'Heure du serveur',
'timeout must be a number' => 'Le délai d\'attente doit être un nombre.',
'title' => 'Titre',
'to' => 'A',
-'to email adr' => 'A l\'adresse Email',
-'to install an update' => 'Pour installer une mise à jour veuillez charger le fichier .tgz.gpg ci-dessous :',
-'to warn email bad' => 'L\'adresse Email de destination n\'est pas valide',
+'to email adr' => 'A l\'adresse email',
+'to install an update' => 'Pour installer une mise à jour, veuillez charger le fichier .tgz.gpg ci-dessous :',
+'to warn email bad' => 'L\'adresse email de destination n\'est pas valide',
'toggle' => 'pause/reprise',
'toggle enable disable' => 'Activer ou désactiver',
'tone' => 'Tonalité',
@@ -1737,7 +1737,7 @@
'trafficorange' => 'DMZ',
'trafficout' => 'Sortie',
'trafficred' => 'Internet',
-'traffics' => 'Vue génerale de l\'utilisation:',
+'traffics' => 'Vue génerale de l\'utilisation :',
'trafficsum' => 'Totaux',
'trafficto' => 'A',
'transfer limits' => 'Limites des taux de transfert',
@@ -1746,15 +1746,15 @@
'tripwire cronjob' => 'Tripwire cronjob',
'tripwire functions' => 'fonctions tripwire',
'tripwire reports' => 'rapports tripwire',
-'tripwireoperating' => 'Le processus a commencé. Cela peut prendre quelques minutes, veuillez attendre que la fenêtre se soit automatiquement rafraîchie pour que le processus soit fini.',
+'tripwireoperating' => 'Le processus a commencé, cela peut prendre quelques minutes. Veuillez attendre que la fenêtre se soit automatiquement rafraîchie pour que le processus soit fini.',
'tripwirewarningdatabase' => 'ATTENTION - Votre base de données sera mise à jour avec les données du dernier rapport. Veuillez vérifier qu\'aucune modification non autorisée ne soit signalée. Pour cela la clef locale est nécessaire.',
'tripwirewarningkeys' => 'ATTENTION - Ceci va effacer vos clefs actuelles, configuration, base de données et en régénérer des nouvelles.',
-'tripwirewarningpolicy' => 'ATTENTION - Votre politique devra être reconstruite, après cela votre base de données sera réinitialisée. Pour cela la clef du site ainsi que la clef locale sont nécessaire.',
+'tripwirewarningpolicy' => 'ATTENTION - Votre politique devra être reconstruite, après cela votre base de données sera réinitialisée. Pour cela, la clef du site ainsi que la clef locale sont nécessaire.',
'tuesday' => 'Mardi',
'type' => 'type',
'umount' => 'Démonter',
'umount removable media before to unplug' => 'Démonter le périphérique amovible avant de le débrancher',
-'unable to alter profiles while red is active' => 'Impossible de modifier les profils tant que rouge est activé.',
+'unable to alter profiles while red is active' => 'Impossible de modifier les profils tant que ROUGE est activé.',
'unable to contact' => 'Impossible de contacter',
'unencrypted' => 'Non chiffré',
'uninstall' => 'Désinstaller',
@@ -1765,14 +1765,14 @@
'unknown' => 'INCONNU',
'unnamed' => 'Sans nom',
'update' => 'Mettre à jour',
-'update accelerator' => 'Mettre à jour Booster',
+'update accelerator' => 'Mise à jour de l\'accélérateur',
'update time' => 'Mettre à jour l\'heure :',
'update transcript' => 'Mettre à jour transcript',
'updatedatabase' => 'Mettre à jour la base de données avec le dernier rapport',
'updates' => 'Mises à jour',
-'updates installed' => 'Mise à jour de l ensemble de règles',
-'updates is old1' => 'Votre fichier de mise à jour est vieux de ',
-'updates is old2' => 'jours. Il est recommandé de le mettre à jour depuis la page <b>Système>Mises à jour</b>.',
+'updates installed' => 'Mise à jour de l\'ensemble de règles',
+'updates is old1' => 'Votre fichier de mise à jour est ancien de ',
+'updates is old2' => 'jours. Il est recommandé de le mettre à jour depuis la page <b>Système > Mises à jour</b>.',
'updxlrtr 3 months' => 'trois mois',
'updxlrtr 6 months' => 'six mois',
'updxlrtr all files' => 'tous les fichiers ...',
@@ -1781,15 +1781,15 @@
'updxlrtr cache size' => 'Taille du cache (octets)',
'updxlrtr cache statistics' => 'Statistiques du cache',
'updxlrtr cancel download' => 'Annuler le téléchargement',
-'updxlrtr children' => 'Nombre de processus Accelerator',
+'updxlrtr children' => 'Nombre de processus Accélérateur',
'updxlrtr common settings' => 'Paramètres communs',
'updxlrtr condition download' => 'Télécharger',
-'updxlrtr condition nosource' => 'aucunesource',
+'updxlrtr condition nosource' => 'aucune source',
'updxlrtr condition ok' => 'A jour',
'updxlrtr condition outdated' => 'Périmé',
'updxlrtr condition suspended' => 'Suspendu',
'updxlrtr condition unknown' => 'Inconnu',
-'updxlrtr configuration' => 'Configuration de la mise a jour Accelerator',
+'updxlrtr configuration' => 'Configuration',
'updxlrtr current downloads' => 'Les fichiers ont été téléchargés dans le cache local',
'updxlrtr current files' => 'Les fichiers courants sont dans le cache local',
'updxlrtr daily' => 'quotidiennement',
@@ -1805,20 +1805,20 @@
'updxlrtr full autosync' => 'Remplacer les fichiers obsolètes au cours de la vérification',
'updxlrtr invalid disk usage' => 'Valeur de l\'utilisation maximale du disque non valide',
'updxlrtr invalid download rate' => 'Valeur de maximale du taux de téléchargement non valide',
-'updxlrtr invalid num of children' => 'Nombre de processus d\'accelerator non valide',
+'updxlrtr invalid num of children' => 'Nombre de processus d\'accélérateur non valide',
'updxlrtr last access' => 'Dernier accès au cache',
'updxlrtr last checkup' => 'Dernière vérification des sources',
'updxlrtr low download priority' => 'Faible priorité CPU pour les téléchargements',
'updxlrtr maintenance' => 'Maintenance',
'updxlrtr marked as' => 'marqué comme',
-'updxlrtr max disk usage' => 'Utilisation du disque Max.',
-'updxlrtr max download rate' => 'Taux de téléchargement externe Max. (kbit/s)',
+'updxlrtr max disk usage' => 'Utilisation du disque max.',
+'updxlrtr max download rate' => 'Taux de téléchargement externe max. (kbit/s)',
'updxlrtr month' => 'un mois',
'updxlrtr monthly' => 'mensuellement',
'updxlrtr not accessed' => 'la dernière utilisation date de',
-'updxlrtr not enabled' => 'Update Accelerator n\'est pas activé sur la page Web du proxy',
+'updxlrtr not enabled' => 'Mise à jour Accélérateur n\'est pas activé sur la page web du proxy',
'updxlrtr other' => 'Autre',
-'updxlrtr passive mode' => 'Activer le mode passif',
+'updxlrtr passive mode' => 'Activer le mode passif (bloque l\'ajout de nouveaux fichiers dans le cache)',
'updxlrtr pending downloads' => 'Téléchargements en attente',
'updxlrtr performance options' => 'Options de performance',
'updxlrtr progress' => 'En cours',
@@ -1835,16 +1835,16 @@
'updxlrtr total data from cache' => 'Total de données délivrées par le cache (octets)',
'updxlrtr total files' => 'Total de fichiers dans le cache',
'updxlrtr unknown' => 'Inconnu',
-'updxlrtr update accelerator' => 'Mettre a jour Accelerator',
-'updxlrtr update information' => 'Une nouvelle version est disponible en téléchargement. Visitez <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> pour plus d\'information.',
-'updxlrtr update notification' => 'Notification de mise à jour!',
-'updxlrtr web proxy service required' => 'Le proxy Web doit être activé pour utiliser Update Accelerator',
+'updxlrtr update accelerator' => 'Mettre à jour Accélérateur',
+'updxlrtr update information' => 'Une nouvelle version est disponible au téléchargement. Visitez <a href="http://update-accelerator.advproxy.net" target="_blank">http://update-accelerator.advproxy.net</a> pour plus d\'information.',
+'updxlrtr update notification' => 'Notification de mise à jour !',
+'updxlrtr web proxy service required' => 'Le proxy web doit être activé pour utiliser Mise à jour Accélérateur',
'updxlrtr week' => 'une semaine',
'updxlrtr weekly' => 'hebdomadairement',
'updxlrtr year' => 'une année',
'upgrade' => 'Améliorer',
'uplink speed' => 'Vitesse de la connexion (kbit/sec)',
-'uplink std class' => 'classe standart de la connexion',
+'uplink std class' => 'classe standard de la connexion',
'upload' => 'Envoi',
'upload a certificate' => 'Envoyer un certificat :',
'upload a certificate request' => 'Envoyer une demande de certificat :',
@@ -1858,8 +1858,8 @@
'upload update file' => 'Envoyer un fichier mis à jour :',
'upstream password' => 'Mot de passe de la liaison montante :',
'upstream proxy host:port' => 'Proxy de la liaison montante (hôte:port)',
-'upstream username' => 'Nom d\'utilisateur de la liaison montante:',
-'uptime and users' => 'Temps de service et utilisateurs:',
+'upstream username' => 'Nom d\'utilisateur de la liaison montante :',
+'uptime and users' => 'Temps de service et utilisateurs :',
'url filter' => 'Filtre de contenu',
'urlfilter access' => 'Accès',
'urlfilter activity detection' => 'Détection d\'activité',
@@ -1877,7 +1877,7 @@
'urlfilter automatic update schedule' => 'Mettre à jour le calendrier automatiquement',
'urlfilter back to main page' => 'Revenir à la page principale',
'urlfilter background image' => 'Filtre d\'URLs contenant des images de fonds',
-'urlfilter background text' => 'Pour avoir une image de fond personnalisée pour les pages bloquées envoyez le fichier .jpg',
+'urlfilter background text' => 'Afin d\'avoir une image de fond personnalisée pour les pages bloquées, envoyez le fichier .jpg',
'urlfilter backup' => 'Créer un fichier de sauvegarde',
'urlfilter backup error' => 'Impossible de créer un fichier de sauvegarde',
'urlfilter backup settings' => 'Sauvegarder les réglages du filtre d\'URL',
@@ -1892,28 +1892,28 @@
'urlfilter block' => 'Bloquer',
'urlfilter block access' => 'Bloquer l\'accès',
'urlfilter block all' => 'Bloquer toutes les url non autorisées explicitement',
-'urlfilter block archives' => 'Bloquer fichiers d\'archives compressés',
-'urlfilter block audio-video' => 'Bloquer fichiers audio/video',
+'urlfilter block archives' => 'Bloquer fichiers d\'archives compressés ',
+'urlfilter block audio-video' => 'Bloquer fichiers audio / video ',
'urlfilter block categories' => 'Bloquer catégories',
-'urlfilter block executables' => 'Bloquer fichiers éxecutables',
+'urlfilter block executables' => 'Bloquer fichiers exécutables ',
'urlfilter block ip' => 'Bloquer sites atteints par leur IP',
-'urlfilter block settings' => ' URL Filter Réglages',
+'urlfilter block settings' => 'Réglages filtre URL',
'urlfilter blocked domains' => 'Domaines bloqués (un par ligne)',
'urlfilter blocked expressions' => 'Expressions bloquées (comme expressions régulières)',
'urlfilter blocked urls' => 'URL bloquées (une par ligne)',
'urlfilter category' => 'Catégorie',
'urlfilter category all' => 'tout',
-'urlfilter category data error' => 'Blackliste vide',
+'urlfilter category data error' => 'Liste noire vide',
'urlfilter category log' => 'Classe les logs par catégorie',
-'urlfilter category name error' => 'Nom catégorie Blackliste requis',
+'urlfilter category name error' => 'Nom catégorie liste noire requis',
'urlfilter client' => 'Client',
-'urlfilter configuration' => 'Configuration URL filter',
+'urlfilter configuration' => 'Configuration filtre URL',
'urlfilter constraint definition' => 'Définition',
'urlfilter constraint outside' => 'Dehors',
'urlfilter constraint within' => 'Dedans',
'urlfilter copy rule' => 'Copie',
'urlfilter current files' => 'Fichiers courant du dépôt local',
-'urlfilter custom blacklist' => 'Blackliste perso',
+'urlfilter custom blacklist' => 'Liste noire perso',
'urlfilter custom expression list' => 'Liste de mots clés perso',
'urlfilter custom url' => 'Source URL perso',
'urlfilter custom url required' => 'Source URL perso requise',
@@ -1921,7 +1921,7 @@
'urlfilter daily' => 'quotidiennement',
'urlfilter disabled' => 'désactivé',
'urlfilter domains' => 'Domaine (un par ligne)',
-'urlfilter dont restart urlfilter' => 'Ne pas redémarrer URL filter',
+'urlfilter dont restart urlfilter' => 'Ne pas redémarrer filtre URL',
'urlfilter dst' => 'Destination',
'urlfilter dst error' => 'Il doit y avoir au moins une catégorie sélectionnée',
'urlfilter edit domains urls expressions' => 'Modifier domaines, URLs et expressions',
@@ -1929,45 +1929,45 @@
'urlfilter edit user quota rule' => 'Modifier une règle de quota utilisateur',
'urlfilter empty ads' => 'Bloquer "pubs" avec fenêtre vide',
'urlfilter empty repository' => 'Fichier du dépot local est vide',
-'urlfilter enable automatic blacklist update' => 'Activer Mise à jour automatique',
-'urlfilter enable custom blacklist' => 'Activer Blackliste perso',
-'urlfilter enable custom expression list' => 'Activer liste de expression perso',
+'urlfilter enable automatic blacklist update' => 'Activer mise à jour automatique',
+'urlfilter enable custom blacklist' => 'Activer liste noire perso ',
+'urlfilter enable custom expression list' => 'Activer la liste d\'expressions personnalisées ',
'urlfilter enable custom whitelist' => 'Activer liste blanche perso',
'urlfilter enable expression lists' => 'Activer liste de mots clés perso',
-'urlfilter enable full backup' => 'Inclure Blackliste complete',
+'urlfilter enable full backup' => 'Inclure liste noire complète',
'urlfilter enable jpeg' => 'Activer image d\'arrière plan',
'urlfilter enable log' => 'Activer log',
-'urlfilter enable rewrite rules' => 'Activer fichier local de redirection',
-'urlfilter enabled' => 'Activé:',
-'urlfilter example' => 'Exemple: www.domain.com',
-'urlfilter example ads' => 'Exemple: www.domain.com/ads/',
-'urlfilter export blacklist' => 'Exporter Blackliste',
+'urlfilter enable rewrite rules' => 'Activer fichier local de redirection ',
+'urlfilter enabled' => 'Activé :',
+'urlfilter example' => 'Exemple : www.domain.com',
+'urlfilter example ads' => 'Exemple : www.domain.com/ads/',
+'urlfilter export blacklist' => 'Exporter liste noire',
'urlfilter export error' => 'Impossible de créer fichier d\'exportation',
'urlfilter expressions' => 'Expressions (une par ligne)',
'urlfilter file ext bloquer' => 'Extension du fichier de blocage',
'urlfilter filename' => 'Nom',
'urlfilter filesize' => 'Taille',
-'urlfilter filter settings' => 'Paramètres URL filter',
+'urlfilter filter settings' => 'Paramètres filtre URL',
'urlfilter fri' => 'Ven',
'urlfilter friday' => 'Vendredi',
'urlfilter from' => 'De',
'urlfilter hourly' => 'par heure',
-'urlfilter import blacklist' => 'Importer Blackliste',
-'urlfilter import text' => 'Pour importer une Blackliste précédemment sauvée, charger le fichier .tar.gz suivant',
-'urlfilter install blacklist' => 'Installer Blackliste',
-'urlfilter install information' => 'La nouvelle Blackliste va être automatiquement compilée pour préparer les bases de données. Ceci peut durer plusieurs minutes et dépend de la taille de la blacklist.',
-'urlfilter invalid content' => 'Le fichier n\'est pas une Blackliste compatible squidGuard',
-'urlfilter invalid import file' => 'Le fichier n\'est pas un éditeur de fichier Blackliste compatible URL filter',
+'urlfilter import blacklist' => 'Importer liste noire',
+'urlfilter import text' => 'Pour importer une liste noire précédemment sauvée, charger le fichier .tar.gz suivant',
+'urlfilter install blacklist' => 'Installer liste noire',
+'urlfilter install information' => 'La nouvelle liste noire va être automatiquement compilée pour préparer les bases de données. Ceci peut durer plusieurs minutes et dépend de la taille de la liste noire.',
+'urlfilter invalid content' => 'Le fichier n\'est pas une liste noire compatible squidGuard',
+'urlfilter invalid import file' => 'Le fichier n\'est pas un éditeur de fichier liste noire compatible filtre URL',
'urlfilter invalid ip or mask error' => 'Addresse IP ou masque de réseau non valide',
'urlfilter invalid restore file' => 'Le fichier de sauvegarde n\'est pas compatible',
'urlfilter invalid user error' => 'Login non valide',
-'urlfilter load blacklist' => 'Charger Blackliste',
+'urlfilter load blacklist' => 'Charger liste noire',
'urlfilter local file redirection' => 'Fichier local de redirection',
-'urlfilter log' => 'Log URL filter',
+'urlfilter log' => 'Log filtre URL',
'urlfilter log summary' => 'Nombre total d\'url atteintes pour',
-'urlfilter log viewer' => 'Afficheur de log URL filter',
-'urlfilter logs' => 'Logs URL filter',
-'urlfilter maintenance' => 'Maintenance URL filter',
+'urlfilter log viewer' => 'Afficheur de log filtre URL',
+'urlfilter logs' => 'Logs filtre URL',
+'urlfilter maintenance' => 'Maintenance filtre URL',
'urlfilter manage local file repository' => 'Gérer fichier de dépôt local',
'urlfilter manage repository' => 'Gérer dépôt',
'urlfilter minutes' => 'minutes',
@@ -1981,8 +1981,8 @@
'urlfilter msg text 3' => 'Message ligne 3',
'urlfilter network access control' => 'Contrôle d\'accès réseau en fonction',
'urlfilter no categories' => 'Aucune catégorie disponible',
-'urlfilter not enabled' => 'URL filter n\'est pas activé sur le proxy page Web',
-'urlfilter quota restart message' => 'Note: Les compteurs seront remis à zéro pour tous les utilisateurs au redémarrage d\'URL filter',
+'urlfilter not enabled' => 'Filtre URL n\'est pas activé sur le proxy page web',
+'urlfilter quota restart message' => 'Note : Les compteurs seront remis à zéro pour tous les utilisateurs au redémarrage du filtre URL',
'urlfilter quota time error' => 'Valeur non valide pour quota de temps',
'urlfilter quota user error' => 'Au moins un nom d\'utilisateur est requis',
'urlfilter redirectpage' => 'Redirige vers cette URL',
@@ -1991,22 +1991,22 @@
'urlfilter renewal period' => 'Période de renouvellement',
'urlfilter repository information' => 'Les requêtes de téléchargement pour ces fichiers seront redirigées depuis la source originale vers le fichier local du dépôt.',
'urlfilter reset' => 'Remettre à zéro',
-'urlfilter restart' => 'Redémarrer URL filter',
-'urlfilter restart message' => 'URL filter doit être redémarré pour activer les changements de règles',
+'urlfilter restart' => 'Redémarrer filtre URL',
+'urlfilter restart message' => 'Filtre URL doit être redémarré pour activer les changements de règles',
'urlfilter restart notification' => 'Activer règles modifiées',
'urlfilter restore' => 'Importer fichier de sauvegarde',
'urlfilter restore results' => 'Restaurer resultats',
-'urlfilter restore settings' => 'Restaurer paramètres URL filter',
-'urlfilter restore success' => 'URL filter configuration restaurée. URL filter doit être redémarré pour activer les nouveaux paramètres.',
+'urlfilter restore settings' => 'Restaurer paramètres filtre URL',
+'urlfilter restore success' => 'Configuration Filtre URL restaurée. Filtre URL doit être redémarré pour activer les nouveaux paramètres.',
'urlfilter restore text' => 'Pour restaurer une configuration précédemment sauvée, charger le fichier de sauvgarde .tar.gz suivant',
'urlfilter safesearch' => 'Activer SafeSearch',
'urlfilter sat' => 'Sam',
'urlfilter saturday' => 'Samedi',
'urlfilter save and restart' => 'Valider et Redémarrer',
'urlfilter save schedule' => 'Valider paramètres de Mise à jour',
-'urlfilter select blacklist' => 'Selectionner Blackliste existante',
+'urlfilter select blacklist' => 'Sélectionner liste noire existante',
'urlfilter select multi' => 'Presser \'Ctrl\' pour sélectionner plusieurs catégories',
-'urlfilter select source' => 'Selectionner source de téléchargement',
+'urlfilter select source' => 'Sélectionner source de téléchargement',
'urlfilter set time constraints' => 'Fixer les contraintes de temps',
'urlfilter set user quota' => 'Fixer quotas utilisateur',
'urlfilter show category' => 'Montrer la catégorie de page bloquée',
@@ -2033,24 +2033,24 @@
'urlfilter update information' => 'Une mise à jour est disponible en téléchargement. Visitez <a href="http://www.urlfilter.net" target="_blank">http://www.urlfilter.net</a> pour plus d\'informations.',
'urlfilter update notification' => 'Mise à jour !',
'urlfilter update now' => 'Mettre à jour',
-'urlfilter update results' => 'Blacklist update results',
+'urlfilter update results' => 'Résultats de mise à jour de liste noire',
'urlfilter update rule' => 'Télécharger règle',
'urlfilter upload background' => 'Télécharger image',
-'urlfilter upload blacklist' => 'Télécharger blacklist',
+'urlfilter upload blacklist' => 'Télécharger liste noire',
'urlfilter upload file' => 'Télécharger fichier',
'urlfilter upload file information 1' => 'Note',
-'urlfilter upload file information 2' => 'URL filter doit être redémarré pour activer les changements du dépot.',
+'urlfilter upload file information 2' => 'Filtre URL doit être redémarré pour activer les changements du dépot.',
'urlfilter upload file text' => 'Pour ajouter une fichier au dépot local, charger le fichier suivant',
-'urlfilter upload information' => 'La nouvelle blacklist va être automatiquement compilée pour préparer les bases de données. Le temps dépend de la taille de la blacklist, ceci peut durer plusieurs minutes. Attendre la fin de cette tâche pour relancer URL filter.',
-'urlfilter upload success' => 'Chargement blacklist complété avec succès.',
+'urlfilter upload information' => 'La nouvelle liste noire va être automatiquement compilée pour préparer les bases de données. Le temps dépend de la taille de la liste noire, ceci peut durer plusieurs minutes. Attendre la fin de cette tâche pour relancer filtre URL.',
+'urlfilter upload success' => 'Chargement liste noire complété avec succès.',
'urlfilter upload text' => 'Pour installer une mise à jour, uploader le fichier .tar.gz suivant',
'urlfilter url filter' => 'Filtre d\'URL',
-'urlfilter urlfilter blacklist editor' => 'Editeur de la liste noire du filtre d\'URL',
+'urlfilter urlfilter blacklist editor' => 'Editeur liste noire du filtre d\'URL',
'urlfilter urls' => 'URLs (une par ligne)',
'urlfilter user time quota' => 'Quota de temps (en minutes)',
'urlfilter username' => 'Nom d\'utilisateur',
'urlfilter username log' => 'Log identifiant',
-'urlfilter web proxy service required' => 'Le service Web proxy doit être activé pour utiliser les filtres d\'URL',
+'urlfilter web proxy service required' => 'Le service proxy web doit être activé pour utiliser les filtres d\'URL',
'urlfilter wed' => 'Mer',
'urlfilter wednesday' => 'Mercredi',
'urlfilter weekday error' => 'Un jour au moins doit être sélectionné',
@@ -2059,72 +2059,72 @@
'urlfilter wrong filetype' => 'Le fichier n\'a pas l\'extension .tar.gz',
'use' => 'Utiliser',
'use a pre-shared key' => 'Utiliser une clé pré-partagée :',
-'use dov' => 'Utilisez DOV (Data Over Voice):',
+'use dov' => 'Utilisez DOV (Data Over Voice) :',
'use ibod' => 'Consommation de bande passante à la demande (iBOD):',
'use ipfire red ip' => 'La classique IP ROUGE utilisée par IPFire pendant la connexion',
'use only proposed settings' => 'Utiliser seulement les paramètres proposés.',
'used' => 'Utilisé',
-'used memory' => 'Mémoire Utilisée ',
-'used swap' => 'Swap Utilisée',
+'used memory' => 'Mémoire utilisée ',
+'used swap' => 'Swap utilisée',
'user' => 'Utilisateur',
'user log' => 'user log',
'user proxy logs' => 'user proxy log',
-'username' => 'Nom Utilisateur:',
+'username' => 'Nom utilisateur :',
'username not set' => 'Nom d\'utilisateur non défini.',
'users department' => 'Département de l\'utilisateur',
-'users email' => 'Adresse E-mail de l\'utilisateur',
+'users email' => 'Adresse email de l\'utilisateur',
'users fullname or system hostname' => 'Nom d\'utilisateur complet ou nom d\'hôte du système',
'valid root certificate already exists' => 'Un certificat racine valide existe déjà.',
'valid till' => 'Valide jusqu\'au',
'vci number' => 'Nombre VCI:',
'view log' => 'view log',
-'virtual address' => 'Addresse Virtuelle',
-'virtual private networking' => 'Réseau privé virtuel(VPN)',
+'virtual address' => 'Adresse virtuelle',
+'virtual private networking' => 'Réseau privé virtuel (VPN)',
'visible in browselist' => 'visible dans le gestionnaire de fichier',
-'voldown10' => 'Réduire le Volume par 10',
-'voldown5' => 'Réduire le Volume par 5',
-'volup10' => 'Augmenter le Volume par 10',
-'volup5' => 'Augmenter le Volume par 5',
+'voldown10' => 'Réduire le volume par 10',
+'voldown5' => 'Réduire le volume par 5',
+'volup10' => 'Augmenter le volume par 10',
+'volup5' => 'Augmenter le volume par 5',
'vpi number' => 'Nombre VPI:',
'vpn' => 'VPN',
'vpn aggrmode' => 'Mode agressif IKE autorisé. Eviter si possible (la clé pré-partagée est transmise en clair) !',
'vpn altname syntax' => 'SubjectAltName est une liste séparée par des virgules d\'email, DNS, URI, RID et de les objets du IP. <br />Email: une adresse d\'email. Email Syntaxe: copie prend le champ email du certificat à être utilisé. <br />DNS: un nom de domaine valide. <br />URI: tout URI valide. <br />RID: identificateur d\'objet enregistré. <br />IP: une adresse IP. <br />Remarque: jeu de caractères est limité et le cas est significatif. <br />Exemple:<br /><b>email:</b>info(a)ipfire.org<b>, email:</b>copier<b>,DNS:</b>www.ipfire.org<b>,IP:</b>127.0.0.1<b>,URI:</b>http://url/quelque/chose',
'vpn auth-dn' => 'Le pair est identifié par soit IPV4_ADDR, FQDN, USER_FQDN ou la chaine DER_ASN1_DN dans le champ Remote ID',
'vpn configuration main' => 'VPN configuration - Principal',
-'vpn delayed start' => 'Délai avant le lancement du VPN (seconds)',
+'vpn delayed start' => 'Délai avant le lancement du VPN (secondes)',
'vpn delayed start help' => 'Si requis, ce délai peut être utilisé pour autoriser les mises à jour de DNS dynamique pour une propagation appropriée. 60 est une valeur souvent utilisée lorsque l\'interface ROUGE est une IP dynamique.',
'vpn incompatible use of defaultroute' => 'hostname=%defaultroute non admis',
'vpn local id' => 'ID Local',
'vpn missing remote id' => 'Vous devez spécifier un nom unique correct (DN) pour cette authentification.',
-'vpn mtu invalid' => 'MTU Doit être une valeur numérique!',
+'vpn mtu invalid' => 'MTU Doit être une valeur numérique !',
'vpn no full pki' => 'Manque la clé privée pour générer des cert',
'vpn on blue' => 'VPN sur BLEU',
'vpn on green' => 'VPN sur VERT',
'vpn on orange' => 'VPN sur ORANGE',
'vpn payload compression' => 'Négocier la compression de charge utile',
'vpn red name' => 'IP publique ou nom de domaine complet pour l\'interface ROUGE ou <%defaultroute>',
-'vpn remote id' => 'ID Distant',
+'vpn remote id' => 'ID distant',
'vpn subjectaltname' => 'Subject Alt Name',
-'vpn watch' => 'Redémarrer net-to-net VPN si IP hôte distant change (dyndns).',
+'vpn watch' => 'Redémarrer VPN net-to-net si IP hôte distant change (dyndns).',
'waiting to synchronize clock' => 'Attendre la synchronisation de l\'horloge',
'warn when traffic reaches' => 'Avertir lorsque le trafic atteint x %',
-'warning messages' => 'Messages d\'Alerte',
+'warning messages' => 'Messages d\'alerte',
'was deleted' => 'a été effacé',
'web hits' => 'Nombre total de sites correspondant à des critères retenus pour',
'web proxy' => 'Proxy web',
-'web proxy configuration' => 'Configuration Web proxy',
-'web server' => 'Serveur Web',
-'webradio playlist' => 'Playlist WebRadio',
-'website' => 'Site Web',
+'web proxy configuration' => 'Configuration proxy web',
+'web server' => 'Serveur web',
+'webradio playlist' => 'Liste de diffusion radio web',
+'website' => 'Site web',
'wednesday' => 'Mercredi',
'week' => 'Semaine',
'week-graph' => 'Semaine',
-'weekly firewallhits' => 'Hits hebdomadaire du pare-feu',
+'weekly firewallhits' => 'Contacts hebdomadaires du pare-feu',
'weeks' => 'semaines',
'wildcards' => 'Jokers',
'wins server' => 'Serveur Wins',
'wins support' => 'Support Wins',
-'wireless' => 'Sans Fils',
+'wireless' => 'Sans fil',
'wireless config added' => 'Configuration réseau sans fil ajoutée',
'wireless config changed' => 'Configuration réseau sans fil modifiée',
'wireless configuration' => 'Configuration réseau sans fil',
@@ -2134,11 +2134,11 @@
'xtaccess all error' => 'Vous ne pouvez pas donner l\'accès externe à tout ce qui se fait dans le dossier de redirection de port.',
'xtaccess bad transfert' => 'Si vous spécifiez une plage de ports de destination, la plage source doit être identique !',
'year' => 'Année',
-'year-graph' => 'Annee',
-'yearly firewallhits' => 'Hits annuels du pare-feu',
+'year-graph' => 'Année',
+'yearly firewallhits' => 'Contacts annuels du pare-feu',
'yes' => 'Oui',
-'you can only define one roadwarrior connection when using pre-shared key authentication' => 'vous ne pouvez définir qu\'une connexion roadwarrior lors de l\'utilisation par pré-authentification par clé partagée.<br />Soit vous avez déjà une connexion RoadWarrior avec pré-authentification par clé partagée, ou vous essayez d\'en ajouter une maintenant.',
-'your department' => 'Votre Département',
+'you can only define one roadwarrior connection when using pre-shared key authentication' => 'vous ne pouvez définir qu\'une connexion client nomade lors de l\'utilisation par pré-authentification par clé partagée.<br />Soit vous avez déjà une connexion client nomade avec pré-authentification par clé partagée, ou vous essayez d\'en ajouter une maintenant.',
+'your department' => 'Votre département',
'your e-mail' => 'Votre adresse de courriel',
);
diff --git a/lfs/Config b/lfs/Config
index 76f279da9..a1232a2c2 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -31,7 +31,8 @@
###############################################################################
# Cleanup environment from any variables
-unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN TOOLS_DIR
+unexport BUILD_ARCH BUILD_PLATFORM BUILDTARGET CROSSTARGET TOOLCHAIN
+unexport TOOLS_DIR LOG_DIR
ifeq "$(BUILD_ARCH)" "aarch64"
IS_64BIT = 1
@@ -85,7 +86,7 @@ DIR_SRC = $(ROOT)/usr/src
DIR_DL = $(LFS_BASEDIR)/cache
DIR_CHK = $(LFS_BASEDIR)/cache/check
DIR_CONF = $(LFS_BASEDIR)/config
-DIR_INFO = $(LFS_BASEDIR)/log
+DIR_INFO = $(LFS_BASEDIR)/$(LOG_DIR)
DIR_TMP = /tmp
# Add the compiler location and version and specs to the ccache hash
@@ -109,7 +110,7 @@ endif
###############################################################################
# For each package we create a list of files that it installed under
-# log/<TARGET> name. Modified files are not identified
+# $(LOG_DIR/)<TARGET> name. Modified files are not identified
#
define FIND_FILES
cd $(ROOT)/ && find -mount \
diff --git a/make.sh b/make.sh
index c5cfab151..a7e806858 100755
--- a/make.sh
+++ b/make.sh
@@ -109,10 +109,7 @@ fi
# This is the directory where make.sh is in
export BASEDIR=$(echo $FULLPATH | sed "s/\/$BASENAME//g")
-LOGFILE=$BASEDIR/log/_build.preparation.log
-export LOGFILE
DIR_CHK=$BASEDIR/cache/check
-mkdir $BASEDIR/log/ 2>/dev/null
system_processors() {
getconf _NPROCESSORS_ONLN 2>/dev/null || echo "1"
@@ -193,6 +190,7 @@ configure_build() {
BUILD_ARCH="${build_arch}"
TOOLS_DIR="/tools_${BUILD_ARCH}"
+ LOG_DIR="log_${BUILD_ARCH}"
# Enables hardening
HARDENING_CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong"
@@ -285,7 +283,7 @@ stdumount() {
umount $BASEDIR/build/usr/src/html 2>/dev/null;
umount $BASEDIR/build/usr/src/langs 2>/dev/null;
umount $BASEDIR/build/usr/src/lfs 2>/dev/null;
- umount $BASEDIR/build/usr/src/log 2>/dev/null;
+ umount $BASEDIR/build/usr/src/${LOG_DIR} 2>/dev/null;
umount $BASEDIR/build/usr/src/src 2>/dev/null;
}
@@ -421,6 +419,9 @@ exiterror() {
}
prepareenv() {
+ # Create log directory if it doesn't exist, yet
+ mkdir -p "${BASEDIR}/${LOG_DIR}"
+
# Are we running the right shell?
if [ -z "${BASH}" ]; then
exiterror "BASH environment variable is not set. You're probably running the wrong shell."
@@ -474,7 +475,7 @@ prepareenv() {
mkdir -p $BASEDIR/build/{etc,usr/src} 2>/dev/null
mkdir -p $BASEDIR/build/{dev/{shm,pts},proc,sys}
mkdir -p $BASEDIR/{cache,ccache} 2>/dev/null
- mkdir -p $BASEDIR/build/usr/src/{cache,config,doc,html,langs,lfs,log,src,ccache}
+ mkdir -p $BASEDIR/build/usr/src/{cache,config,doc,html,langs,lfs,${LOG_DIR},src,ccache}
mknod -m 600 $BASEDIR/build/dev/console c 5 1 2>/dev/null
mknod -m 666 $BASEDIR/build/dev/null c 1 3 2>/dev/null
@@ -492,7 +493,7 @@ prepareenv() {
mount --bind $BASEDIR/html $BASEDIR/build/usr/src/html
mount --bind $BASEDIR/langs $BASEDIR/build/usr/src/langs
mount --bind $BASEDIR/lfs $BASEDIR/build/usr/src/lfs
- mount --bind $BASEDIR/log $BASEDIR/build/usr/src/log
+ mount --bind $BASEDIR/${LOG_DIR} $BASEDIR/build/usr/src/${LOG_DIR}
mount --bind $BASEDIR/src $BASEDIR/build/usr/src/src
# Run LFS static binary creation scripts one by one
@@ -539,6 +540,7 @@ enterchroot() {
CORE="${CORE}" \
SLOGAN="${SLOGAN}" \
TOOLS_DIR="${TOOLS_DIR}" \
+ LOG_DIR="${LOG_DIR}" \
CONFIG_ROOT="${CONFIG_ROOT}" \
CFLAGS="${CFLAGS} ${HARDENING_CFLAGS}" \
CXXFLAGS="${CXXFLAGS} ${HARDENING_CFLAGS}" \
@@ -963,7 +965,7 @@ buildtoolchain() {
exiterror "Could not create ${TOOLS_DIR} symbolic link"
fi
- LOGFILE="$BASEDIR/log/_build.toolchain.log"
+ LOGFILE="$BASEDIR/${LOG_DIR}/_build.toolchain.log"
export LOGFILE
lfsmake1 stage1
@@ -1008,7 +1010,7 @@ buildtoolchain() {
}
buildbase() {
- LOGFILE="$BASEDIR/log/_build.base.log"
+ LOGFILE="$BASEDIR/${LOG_DIR}/_build.base.log"
export LOGFILE
lfsmake2 stage2
lfsmake2 linux KCFG="-headers"
@@ -1077,7 +1079,7 @@ buildbase() {
}
buildipfire() {
- LOGFILE="$BASEDIR/log/_build.ipfire.log"
+ LOGFILE="$BASEDIR/${LOG_DIR}/_build.ipfire.log"
export LOGFILE
lfsmake2 configroot
lfsmake2 initscripts
@@ -1576,7 +1578,7 @@ buildipfire() {
buildinstaller() {
# Run installer scripts one by one
- LOGFILE="$BASEDIR/log/_build.installer.log"
+ LOGFILE="$BASEDIR/${LOG_DIR}/_build.installer.log"
export LOGFILE
lfsmake2 memtest
lfsmake2 installer
@@ -1585,7 +1587,7 @@ buildinstaller() {
}
buildpackages() {
- LOGFILE="$BASEDIR/log/_build.packages.log"
+ LOGFILE="$BASEDIR/${LOG_DIR}/_build.packages.log"
export LOGFILE
echo "... see detailed log in _build.*.log files" >> $LOGFILE
@@ -1593,8 +1595,8 @@ buildpackages() {
# Generating list of packages used
print_line "Generating packages list from logs"
rm -f $BASEDIR/doc/packages-list
- for i in `ls -1tr $BASEDIR/log/[^_]*`; do
- if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then
+ for i in `ls -1tr $BASEDIR/${LOG_DIR}/[^_]*`; do
+ if [ "$i" != "$BASEDIR/${LOG_DIR}/FILES" -a -n $i ]; then
echo "* `basename $i`" >>$BASEDIR/doc/packages-list
fi
done
@@ -1753,7 +1755,7 @@ clean)
rm -rf $BASEDIR/build
rm -rf $BASEDIR/cdrom
rm -rf $BASEDIR/packages
- rm -rf $BASEDIR/log
+ rm -rf $BASEDIR/${LOG_DIR}
if [ -h "${TOOLS_DIR}" ]; then
rm -f "${TOOLS_DIR}"
fi
@@ -1764,7 +1766,7 @@ downloadsrc)
if [ ! -d $BASEDIR/cache ]; then
mkdir $BASEDIR/cache
fi
- mkdir -p $BASEDIR/log
+ mkdir -p $BASEDIR/${LOG_DIR}
echo -e "${BOLD}Preload all source files${NORMAL}" | tee -a $LOGFILE
FINISHED=0
cd $BASEDIR/lfs
@@ -1823,7 +1825,7 @@ toolchain)
buildtoolchain
echo "`date -u '+%b %e %T'`: Create toolchain image for ${BUILD_ARCH}" | tee -a $LOGFILE
test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
- cd $BASEDIR && tar -cf- --exclude='log/_build.*.log' build/${TOOLS_DIR} build/bin/sh log | xz ${XZ_OPT} \
+ cd $BASEDIR && tar -cf- --exclude='${LOG_DIR}/_build.*.log' build/${TOOLS_DIR} build/bin/sh ${LOG_DIR} | xz ${XZ_OPT} \
> cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz
md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz \
> cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.md5
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 81e838ebde6879ee91c61ec4d8a17ef100b486bd
by Michael Tremer 29 Oct '18
by Michael Tremer 29 Oct '18
29 Oct '18
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 81e838ebde6879ee91c61ec4d8a17ef100b486bd (commit)
via 92505ef00391d1fc58e1a69f23a6ef2b3094a640 (commit)
via aeefbca7305ea302bf2e3bee419f799db9f9483c (commit)
via 2f1d27e3d847ce723c6c00d2d9757fb4dfcccf05 (commit)
via 3ece78597aca14d764fb508fc8920c7d59723c1e (commit)
via 1c053ccee29730c1cfde94e50780b48a4fbe23b6 (commit)
via 5a40f7aebb0ba46e83260fda2d198362ae72d3a6 (commit)
from 3ed2de12510dcca5dea8e96b02f785cb0f8fe10c (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 81e838ebde6879ee91c61ec4d8a17ef100b486bd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 29 11:30:12 2018 +0000
tzdata: Update to 2018g
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 92505ef00391d1fc58e1a69f23a6ef2b3094a640
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 29 11:27:34 2018 +0000
Drop paxctl
We do not have grsecurity and more and there is no point
in shipping this tool.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit aeefbca7305ea302bf2e3bee419f799db9f9483c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 29 11:25:24 2018 +0000
clamav: Move database directory to /var partition
The clamav database is quite large and occupies valuable
space on the root partition that on older systems is only
2GB large. This change moves the virus definition database
to the /var partition which is larger and supposed to hold
data like this anyway.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2f1d27e3d847ce723c6c00d2d9757fb4dfcccf05
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 29 11:14:45 2018 +0000
kmod: Build with support for XZ compressed modules
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 3ece78597aca14d764fb508fc8920c7d59723c1e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 29 11:12:43 2018 +0000
make.sh: Build xz earlier in the build process
XZ compression is becoming more popular and being used
by various other libraries and should therefore be available
to be linked.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 1c053ccee29730c1cfde94e50780b48a4fbe23b6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 29 11:10:58 2018 +0000
strongswan: Update to 5.7.1
Fixes security vulnerabilities: CVE-2018-16151, CVE-2018-16152 and
CVE-2018-17540.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5a40f7aebb0ba46e83260fda2d198362ae72d3a6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 29 11:02:08 2018 +0000
haproxy: Update to 1.8.14
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/paxctl | 2 -
.../{oldcore/106 => core/125}/filelists/strongswan | 0
.../{oldcore/100 => core/125}/filelists/tzdata | 0
config/rootfiles/packages/clamav | 2 +-
lfs/clamav | 16 ++---
lfs/grub | 4 --
lfs/haproxy | 6 +-
lfs/kmod | 1 +
lfs/paxctl | 79 ----------------------
lfs/qemu | 8 ---
lfs/strongswan | 4 +-
lfs/tzdata | 6 +-
make.sh | 3 +-
src/initscripts/packages/clamav | 10 +--
src/paks/clamav/update.sh | 4 +-
15 files changed, 25 insertions(+), 120 deletions(-)
delete mode 100644 config/rootfiles/common/paxctl
copy config/rootfiles/{oldcore/106 => core/125}/filelists/strongswan (100%)
copy config/rootfiles/{oldcore/100 => core/125}/filelists/tzdata (100%)
delete mode 100644 lfs/paxctl
Difference in files:
diff --git a/config/rootfiles/common/paxctl b/config/rootfiles/common/paxctl
deleted file mode 100644
index c9135a865..000000000
--- a/config/rootfiles/common/paxctl
+++ /dev/null
@@ -1,2 +0,0 @@
-sbin/paxctl
-#usr/share/man/man1/paxctl.1
diff --git a/config/rootfiles/core/125/filelists/strongswan b/config/rootfiles/core/125/filelists/strongswan
new file mode 120000
index 000000000..90c727e26
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/125/filelists/tzdata b/config/rootfiles/core/125/filelists/tzdata
new file mode 120000
index 000000000..5a6e3252f
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/tzdata
@@ -0,0 +1 @@
+../../../common/tzdata
\ No newline at end of file
diff --git a/config/rootfiles/packages/clamav b/config/rootfiles/packages/clamav
index ec5e09c84..40ee46fef 100644
--- a/config/rootfiles/packages/clamav
+++ b/config/rootfiles/packages/clamav
@@ -27,7 +27,6 @@ usr/lib/libclamunrar_iface.so.7.1.1
#usr/lib/pkgconfig/libclamav.pc
#usr/lib/pkgconfig/libclammspack.pc
usr/sbin/clamd
-usr/share/clamav
#usr/share/man/man1/clambc.1
#usr/share/man/man1/clamconf.1
#usr/share/man/man1/clamdscan.1
@@ -45,5 +44,6 @@ var/ipfire/clamav/clamd.conf
var/ipfire/clamav/clamd.conf.sample
var/ipfire/clamav/freshclam.conf
var/ipfire/clamav/freshclam.conf.sample
+var/lib/clamav
etc/rc.d/init.d/clamav
usr/local/bin/clamavctrl
diff --git a/lfs/clamav b/lfs/clamav
index ad89e1356..420ee82b3 100644
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = clamav
-PAK_VER = 40
+PAK_VER = 41
DEPS = ""
@@ -40,6 +40,8 @@ ifeq "$(BUILD_PLATFORM)" "arm"
CONFIGURE_FLAGS = --disable-fanotify
endif
+DATABASE_DIR = /var/lib/clamav
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -84,21 +86,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--sysconfdir=/var/ipfire/clamav \
+ --with-dbdir=$(DATABASE_DIR) \
$(CONFIGURE_FLAGS)
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
- mkdir -p /usr/share/clamav/
- chown clamav.clamav -R /usr/share/clamav/
+ mkdir -pv $(DATABASE_DIR)
+ chown clamav.clamav -R $(DATABASE_DIR)
+ rm -rfv $(DATABASE_DIR)/*.cvd
cp -rf $(DIR_SRC)/config/clamav/* /var/ipfire/clamav/
- rm -rfv /usr/share/clamav/*.cvd
mkdir -p /var/run/clamav
chown clamav:clamav /var/run/clamav
#install initscripts
$(call INSTALL_INITSCRIPT,clamav)
- # Disable PaX mprotect for clamd, clamscan and freshclam
- paxctl -Cm /usr/sbin/clamd
- paxctl -Cm /usr/bin/clamscan
- paxctl -Cm /usr/bin/freshclam
-
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/grub b/lfs/grub
index b51566df3..1a10c2aa5 100644
--- a/lfs/grub
+++ b/lfs/grub
@@ -131,9 +131,5 @@ endif
-mkdir -pv /etc/default
install -m 644 $(DIR_SRC)/config/grub2/default /etc/default/grub
- # Disable hardening.
- paxctl -Cmpes /usr/sbin/grub-bios-setup /usr/sbin/grub-probe
- paxctl -Cmpexs /usr/bin/grub-script-check
-
@rm -rf $(DIR_APP) $(DIR_APP_PC) $(DIR_APP_EFI)
@$(POSTBUILD)
diff --git a/lfs/haproxy b/lfs/haproxy
index 1103e331a..2cf23526e 100644
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -24,7 +24,7 @@
include Config
-VER = 1.8.0
+VER = 1.8.14
THISAPP = haproxy-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = haproxy
-PAK_VER = 5
+PAK_VER = 6
DEPS = ""
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 6ccea4619b7183fbcc8c98bae1f9823d
+$(DL_FILE)_MD5 = a050bcb90426d1c939b4b0ce3098a8c4
install : $(TARGET)
diff --git a/lfs/kmod b/lfs/kmod
index bb49fbb3c..4ef2088fd 100644
--- a/lfs/kmod
+++ b/lfs/kmod
@@ -75,6 +75,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--bindir=/bin \
--sysconfdir=/etc \
--disable-manpages \
+ --with-xz \
--with-zlib
cd $(DIR_APP) && make $(MAKETUNING)
diff --git a/lfs/paxctl b/lfs/paxctl
deleted file mode 100644
index 85e54a5ac..000000000
--- a/lfs/paxctl
+++ /dev/null
@@ -1,79 +0,0 @@
-###############################################################################
-# #
-# 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
-
-THISAPP = paxctl-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 9bea59b1987dc4e16c2d22d745374e64
-
-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 axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/lfs/qemu b/lfs/qemu
index be5d7193d..015837a59 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -89,14 +89,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# install wrapper for old kvm parameter handling
install -m 755 $(DIR_SRC)/config/qemu/qemu /usr/bin/qemu
- # disable PaX MPROTECT and RANDMMAP
- paxctl -cmr /usr/bin/qemu-system-arm
- paxctl -cmr /usr/bin/qemu-system-i386
- paxctl -cmr /usr/bin/qemu-system-x86_64
- paxctl -cmr /usr/bin/qemu-arm
- paxctl -cmr /usr/bin/qemu-i386
- paxctl -cmr /usr/bin/qemu-x86_64
-
# install an udev script to set the permissions of /dev/kvm
cp -avf $(DIR_SRC)/config/qemu/65-kvm.rules /lib/udev/rules.d/65-kvm.rules
diff --git a/lfs/strongswan b/lfs/strongswan
index 9dee2613b..fd0b91a25 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
include Config
-VER = 5.6.3
+VER = 5.7.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 = a6a28eeb22aa58080a7581771a5b63f9
+$(DL_FILE)_MD5 = 86b7e9321cde075cf382268fd282e0b0
install : $(TARGET)
diff --git a/lfs/tzdata b/lfs/tzdata
index 258fce8d3..5ed32d8d4 100644
--- a/lfs/tzdata
+++ b/lfs/tzdata
@@ -24,7 +24,7 @@
include Config
-VER = 2018e
+VER = 2018g
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 = 97d654f4d7253173b3eeb76a836dd65e
-tzcode$(TZCODE_VER).tar.gz_MD5 = c4d7df0fff7ba5588b32c5f27e2caf97
+tzdata$(TZDATA_VER).tar.gz_MD5 = e71cb1f9d8d53c43904d79d7aeeedc1b
+tzcode$(TZCODE_VER).tar.gz_MD5 = b48f0282b80bb7dbe16e35626f446ae9
install : $(TARGET)
diff --git a/make.sh b/make.sh
index b9558bc04..c5cfab151 100755
--- a/make.sh
+++ b/make.sh
@@ -1039,6 +1039,7 @@ buildbase() {
lfsmake2 readline
lfsmake2 readline-compat
lfsmake2 bzip2
+ lfsmake2 xz
lfsmake2 pcre
lfsmake2 pcre-compat
lfsmake2 bash
@@ -1073,8 +1074,6 @@ buildbase() {
lfsmake2 util-linux
lfsmake2 udev
lfsmake2 vim
- lfsmake2 xz
- lfsmake2 paxctl
}
buildipfire() {
diff --git a/src/initscripts/packages/clamav b/src/initscripts/packages/clamav
index fa080a67b..d2f63a910 100644
--- a/src/initscripts/packages/clamav
+++ b/src/initscripts/packages/clamav
@@ -12,12 +12,12 @@ case "$1" in
COUNTER=0
while [ "$COUNTER" -lt "61" ]; do
- [ -e "/usr/share/clamav/main.cvd" ] && \
- [ -e "/usr/share/clamav/daily.cvd" ] || \
- [ -e "/usr/share/clamav/daily.cld" ] && \
+ [ -e "/var/lib/clamav/main.cvd" ] && \
+ [ -e "/var/lib/clamav/daily.cvd" ] || \
+ [ -e "/var/lib/clamav/daily.cld" ] && \
break
if [ "$COUNTER" -lt "1" ]; then
- boot_mesg -n "Download db "
+ boot_mesg -n "Downloading database"
else
boot_mesg -n "."
fi
@@ -46,7 +46,7 @@ case "$1" in
stop)
boot_mesg "Stopping Clamav Definition Updater..."
killproc /usr/bin/freshclam
- rm -rf /usr/share/clamav/*.tmp
+ rm -rf /var/lib/clamav/*.tmp
boot_mesg "Stopping Clamav Daemon..."
killproc /usr/sbin/clamd
diff --git a/src/paks/clamav/update.sh b/src/paks/clamav/update.sh
index 303f036b0..0a4af73c2 100644
--- a/src/paks/clamav/update.sh
+++ b/src/paks/clamav/update.sh
@@ -22,7 +22,7 @@
############################################################################
#
. /opt/pakfire/lib/functions.sh
-mv /usr/share/clamav /usr/share/clamav-update
+mv /var/lib/clamav /var/lib/clamav-update
./uninstall.sh
-mv /usr/share/clamav-update /usr/share/clamav
+mv /var/lib/clamav-update /var/lib/clamav
./install.sh
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3ed2de12510dcca5dea8e96b02f785cb0f8fe10c
by Michael Tremer 29 Oct '18
by Michael Tremer 29 Oct '18
29 Oct '18
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 3ed2de12510dcca5dea8e96b02f785cb0f8fe10c (commit)
via c5494ad09830d5740632f9146ebabe9cf6149cc6 (commit)
via 699f0aa710932736d34dabf5a8c17287af29075c (commit)
from 02776a0dc27051337ecaf0212a740c642b337378 (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 3ed2de12510dcca5dea8e96b02f785cb0f8fe10c
Merge: 02776a0dc c5494ad09
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 29 11:59:18 2018 +0100
Merge branch 'haproxy' into next
commit c5494ad09830d5740632f9146ebabe9cf6149cc6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 22 21:47:05 2018 +0200
haproxy: Log to syslog and install logrotate script
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 699f0aa710932736d34dabf5a8c17287af29075c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 22 21:39:31 2018 +0200
haproxy: Make /dev/log available in chroot
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/etc/syslog.conf | 3 +++
config/haproxy/logrotate | 8 ++++++++
config/rootfiles/packages/haproxy | 1 +
lfs/haproxy | 7 ++++++-
src/initscripts/packages/haproxy | 14 ++++++++++++++
5 files changed, 32 insertions(+), 1 deletion(-)
create mode 100644 config/haproxy/logrotate
Difference in files:
diff --git a/config/etc/syslog.conf b/config/etc/syslog.conf
index cdef75682..d5f525a0e 100644
--- a/config/etc/syslog.conf
+++ b/config/etc/syslog.conf
@@ -21,3 +21,6 @@ cron.none;daemon.*;local0.*;local2.*;*.info;mail.none;authpriv.* -/var/log/messa
# Postfix logs
mail.* -/var/log/mail
+
+# HAProxy
+local1.* -/var/log/haproxy
diff --git a/config/haproxy/logrotate b/config/haproxy/logrotate
new file mode 100644
index 000000000..aa02505ee
--- /dev/null
+++ b/config/haproxy/logrotate
@@ -0,0 +1,8 @@
+/var/log/haproxy {
+ missingok
+ notifempty
+ sharedscripts
+ postrotate
+ /bin/kill -HUP `cat /var/run/syslogd.pid 2> /dev/null` 2> /dev/null || true
+ endscript
+}
diff --git a/config/rootfiles/packages/haproxy b/config/rootfiles/packages/haproxy
index 515145d58..7677ba4ad 100644
--- a/config/rootfiles/packages/haproxy
+++ b/config/rootfiles/packages/haproxy
@@ -1,5 +1,6 @@
#etc/haproxy
etc/haproxy/haproxy.cfg
+etc/logrotate.d/haproxy
etc/rc.d/init.d/haproxy
usr/sbin/haproxy
#usr/sbin/haproxy-systemd-wrapper
diff --git a/lfs/haproxy b/lfs/haproxy
index 9a54095a8..1103e331a 100644
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = haproxy
-PAK_VER = 4
+PAK_VER = 5
DEPS = ""
@@ -98,5 +98,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
#install initscripts
$(call INSTALL_INITSCRIPT,haproxy)
+ # Logrotate
+ -mkdir -pv /etc/logrotate.d
+ install -v -m 644 $(DIR_SRC)/config/haproxy/logrotate \
+ /etc/logrotate.d/haproxy
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/src/initscripts/packages/haproxy b/src/initscripts/packages/haproxy
index 78d64cee4..ded627773 100644
--- a/src/initscripts/packages/haproxy
+++ b/src/initscripts/packages/haproxy
@@ -11,6 +11,15 @@
case "${1}" in
start)
+ # Prepare chroot
+ mkdir -p /var/lib/haproxy/dev
+
+ # Create link for syslog socket
+ if ! mountpoint /var/lib/haproxy/dev/log &>/dev/null; then
+ touch /var/lib/haproxy/dev/log
+ mount --bind /dev/log /var/lib/haproxy/dev/log
+ fi
+
boot_mesg "Starting HAProxy..."
loadproc /usr/sbin/haproxy -D -f /etc/haproxy/haproxy.cfg \
-p /var/run/haproxy.pid
@@ -19,6 +28,11 @@ case "${1}" in
stop)
boot_mesg "Stopping HAProxy..."
killproc /usr/sbin/haproxy
+
+ # umount /dev/log
+ if mountpoint /var/lib/haproxy/dev/log &>/dev/null; then
+ umount /var/lib/haproxy/dev/log
+ fi
;;
reload)
hooks/post-receive
--
IPFire 2.x development tree
1
0
[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 02776a0dc27051337ecaf0212a740c642b337378
by Michael Tremer 29 Oct '18
by Michael Tremer 29 Oct '18
29 Oct '18
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 02776a0dc27051337ecaf0212a740c642b337378 (commit)
via 65ff71dc06504f7b4508865f70e327163a71d5e5 (commit)
via aba59b7c7664f83e0b07a8fa0dc1f133d3fe55d3 (commit)
via 9040a476ccbcb194178b5251ad53951ccb4becdf (commit)
via f4027e9b4189ece698e39ac50d069b96648c3124 (commit)
via b9e02ee6b38061786804ec6e694a3293e38b4e20 (commit)
via ce48278b21167684ba7d2f8924defbacd1b19305 (commit)
via adfa49e118b6315c1d37abafb75a2411649c682c (commit)
via fa9cfe5a02bb46c33268910192d2d353d35a9a2a (commit)
via b26071d3787edf24084bbf8fb810894e7de31f8e (commit)
via c809af109bf93656d7c661c2d5a85cf2f8a726ad (commit)
via bb44410b953b1003ff7f6a824e2fae958eb47b65 (commit)
via 9af7531136218b0fc0b356383d173e1d72be8d2e (commit)
via edacf85320e6b9d799be3a6ac9242f6c6994c999 (commit)
via 2678d600f98cfbef73faabc15f19ce85723ad698 (commit)
via 5814cf9931c0c8cda07e70e47b6cf3f02bbc8397 (commit)
via 8d4da55a5d09e9f71e1845b31e8b8ac3979e8f77 (commit)
via c3f74288c765d2a97a31cf6a4855ef66528c83b4 (commit)
via 14fb55a555ec567a710baf91d15caa91ecc60dcd (commit)
via 64ce3098b5b2da7e343a4d6e6d41fab1acf37d5e (commit)
via 8d3fb4309b0f66ef3119c852a3deff77b805c8f8 (commit)
via 2557cea21c6f568812b4b814ca630c956abe42d5 (commit)
via 7504d5414576332f2d8683fa6a32c4a1f295134d (commit)
via de18b4de65e1c47f03c6d40a90d820795c804134 (commit)
via e28e813eebc3242dfbf33fe98c7b11a8db59f9a4 (commit)
via c38f55fe23ef870666da0c7dc863002804203338 (commit)
via 7c8563065d0299beede081b4eda0580fd6d0178c (commit)
via 2db1a399c59c186d10e4eece15fe571094e713f0 (commit)
via 35d007f277018544cc8d9428a4104e1115f20df6 (commit)
via e6a67520f5dfde38f8a7f83efe226cffe3135aa9 (commit)
via e63cc45b483cc8337bee21a7fe4e9d09c2879129 (commit)
via d1654fd0001ae67dbd7ff52ef19cd3cf30de128f (commit)
via f21313ccb5fe5a3aa05b92637f25c3576fe5720c (commit)
via 68dba55dda776904de66c7ba5eaf1d2342a544bc (commit)
via 7b0f7a6e1d9c2607915db49d55fde4fd9f067898 (commit)
via 537401bb12f8633d58caa798b8396b0eb38a5eb5 (commit)
via 347bbe8fb49fa6aa1e322ab58217aad22f595dd7 (commit)
from ca9c45b3f28aa497e4dec0e67cfc54cb69dc05a0 (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 02776a0dc27051337ecaf0212a740c642b337378
Merge: 65ff71dc0 ca9c45b3f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 29 10:51:44 2018 +0000
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
commit 65ff71dc06504f7b4508865f70e327163a71d5e5
Merge: aba59b7c7 9040a476c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 29 10:51:00 2018 +0000
Merge branch 'toolchain' into next
commit aba59b7c7664f83e0b07a8fa0dc1f133d3fe55d3
Merge: c809af109 9af753113
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 29 10:50:56 2018 +0000
Merge branch 'glibc-2.28' into next
commit 9040a476ccbcb194178b5251ad53951ccb4becdf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 29 10:50:35 2018 +0000
core125: Ship glibc for i586
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f4027e9b4189ece698e39ac50d069b96648c3124
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 29 10:47:10 2018 +0000
Remove removed files from rootfiles
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b9e02ee6b38061786804ec6e694a3293e38b4e20
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 26 11:31:40 2018 +0100
libaio: Link against standard libraries
This patch fixes a build error when stack smashing protecion
is being enabled and __stack_chk_fail_local needs to be pulled
from libc.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit ce48278b21167684ba7d2f8924defbacd1b19305
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Oct 25 19:50:28 2018 +0100
perl: Fix build in toolchain
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit adfa49e118b6315c1d37abafb75a2411649c682c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 24 17:27:55 2018 +0100
toolchain: Bump version
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit fa9cfe5a02bb46c33268910192d2d353d35a9a2a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 24 17:27:38 2018 +0100
coreutils+gzip: Allow building with 32 bit time_t on 32 bit arches
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit b26071d3787edf24084bbf8fb810894e7de31f8e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 24 17:27:10 2018 +0100
Config: Set IS_32BIT when running on 32 bit
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c809af109bf93656d7c661c2d5a85cf2f8a726ad
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 24 11:23:00 2018 +0100
Update langs
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit bb44410b953b1003ff7f6a824e2fae958eb47b65
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 24 11:21:12 2018 +0100
pakfire: Remove option to enable/disable checks for updates
This does not change anything
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 9af7531136218b0fc0b356383d173e1d72be8d2e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 24 09:30:29 2018 +0100
glibc: Update to 2.28
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit edacf85320e6b9d799be3a6ac9242f6c6994c999
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 24 09:25:57 2018 +0100
libvirt: Update to 4.6.0
Fixes builds against glibc >= 2.28
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2678d600f98cfbef73faabc15f19ce85723ad698
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 24 09:15:28 2018 +0100
parted: Fix build with glibc >= 2.28
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 5814cf9931c0c8cda07e70e47b6cf3f02bbc8397
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Wed Oct 24 09:14:43 2018 +0100
syslinux: Fix build with glibc >= 2.28
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8d4da55a5d09e9f71e1845b31e8b8ac3979e8f77
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 23 16:45:33 2018 +0100
collectd: Fix compiling against newer xfsprogs
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c3f74288c765d2a97a31cf6a4855ef66528c83b4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 22 19:52:23 2018 +0100
nfs: Update to 2.3.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 14fb55a555ec567a710baf91d15caa91ecc60dcd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 22 19:49:14 2018 +0100
keyutils: New package
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 64ce3098b5b2da7e343a4d6e6d41fab1acf37d5e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 22 14:58:29 2018 +0100
ntfs-3g: Update to 2017.3.23
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 8d3fb4309b0f66ef3119c852a3deff77b805c8f8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 22 14:56:34 2018 +0100
xfsprogs: Update to 4.18.0
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2557cea21c6f568812b4b814ca630c956abe42d5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Oct 22 10:53:18 2018 +0100
reiserfsprogs: Update to 3.6.27
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7504d5414576332f2d8683fa6a32c4a1f295134d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 21 22:18:35 2018 +0100
LVM2: Update to 2.02.181
Update required to build against newer versions of glibc
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit de18b4de65e1c47f03c6d40a90d820795c804134
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 21 22:14:26 2018 +0100
libaio: New package
This library is required by newer version of LVM2
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e28e813eebc3242dfbf33fe98c7b11a8db59f9a4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 21 22:03:21 2018 +0100
ppp: Build against openssl
libcrypt has been removed from glibc and openssl
can be used instead for cryptographic operations.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit c38f55fe23ef870666da0c7dc863002804203338
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 21 22:01:28 2018 +0100
Build openssl earlier in the build process
This is a basic library that is used by so many other packages
and more and more are being added. To have those packages take
advantage of it, we build it very early.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7c8563065d0299beede081b4eda0580fd6d0178c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 21 12:47:36 2018 +0100
core125: Ship updated kmod
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 2db1a399c59c186d10e4eece15fe571094e713f0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 21 12:43:37 2018 +0100
udev: Migrate to eudev
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 35d007f277018544cc8d9428a4104e1115f20df6
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 21 12:43:12 2018 +0100
kmod: Update to version 25
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e6a67520f5dfde38f8a7f83efe226cffe3135aa9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Oct 20 12:56:30 2018 +0100
sysvinit: Fix build with glibc >= 2.28
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit e63cc45b483cc8337bee21a7fe4e9d09c2879129
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 19 14:20:48 2018 +0100
gzip: Fix build with glibc >= 2.28
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit d1654fd0001ae67dbd7ff52ef19cd3cf30de128f
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 19 13:39:58 2018 +0100
findutils: Fix building against glibc >= 2.28
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit f21313ccb5fe5a3aa05b92637f25c3576fe5720c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 19 09:07:56 2018 +0100
e2fsprogs: Update to 1.44.4
Fixes build with glibc >= 2.28
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 68dba55dda776904de66c7ba5eaf1d2342a544bc
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 19 09:00:04 2018 +0100
bison: Fix building with glibc >= 2.28
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 7b0f7a6e1d9c2607915db49d55fde4fd9f067898
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 19 08:59:46 2018 +0100
m4: Fix building with glibc >= 2.28
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 537401bb12f8633d58caa798b8396b0eb38a5eb5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 19 08:59:25 2018 +0100
gcc: Fix building with glibc >= 2.28
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 347bbe8fb49fa6aa1e322ab58217aad22f595dd7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Fri Oct 19 08:57:11 2018 +0100
coreutils: Update to 8.30
Builds with newer versions of glibc
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/aarch64/glibc | 93 ++++--
config/rootfiles/common/e2fsprogs | 16 +-
config/rootfiles/common/i586/glibc | 93 ++++--
config/rootfiles/common/keyutils | 50 +++
config/rootfiles/common/kmod | 8 +-
config/rootfiles/common/libaio | 5 +
config/rootfiles/common/lvm2 | 26 +-
config/rootfiles/common/ntfs-3g | 21 +-
config/rootfiles/common/udev | 161 +++++-----
config/rootfiles/common/x86_64/glibc | 97 +++---
config/rootfiles/common/xfsprogs | 46 ++-
config/rootfiles/core/125/filelists/aarch64/glibc | 1 +
.../{oldcore/38 => core/125}/filelists/collectd | 0
.../{oldcore/103 => core/125}/filelists/coreutils | 0
.../{oldcore/101 => core/125}/filelists/e2fsprogs | 0
config/rootfiles/core/125/filelists/files | 1 +
.../{oldcore/100 => core/125}/filelists/i586/glibc | 0
config/rootfiles/core/125/filelists/keyutils | 1 +
.../{oldcore/77 => core/125}/filelists/kmod | 0
config/rootfiles/core/125/filelists/libaio | 1 +
.../{oldcore/87 => core/125}/filelists/lvm2 | 0
.../{oldcore/32 => core/125}/filelists/ntfs-3g | 0
.../{oldcore/124 => core/125}/filelists/parted | 0
.../{oldcore/39 => core/125}/filelists/ppp | 0
.../112 => core/125}/filelists/reiserfsprogs | 0
.../{oldcore/28 => core/125}/filelists/udev | 0
.../100 => core/125}/filelists/x86_64/glibc | 0
.../{oldcore/87 => core/125}/filelists/xfsprogs | 0
config/rootfiles/core/125/update.sh | 3 +
config/rootfiles/packages/libvirt | 351 +++++++++++----------
config/rootfiles/packages/nfs | 32 +-
doc/language_issues.de | 5 +
doc/language_issues.en | 5 +
doc/language_issues.es | 5 +-
doc/language_issues.fr | 5 +-
doc/language_issues.it | 5 +
doc/language_issues.nl | 5 +
doc/language_issues.pl | 5 +-
doc/language_issues.ru | 5 +-
doc/language_issues.tr | 5 +
html/cgi-bin/pakfire.cgi | 14 -
lfs/Config | 12 +
lfs/bison | 5 +-
lfs/collectd | 3 +
lfs/coreutils | 9 +-
lfs/e2fsprogs | 4 +-
lfs/findutils | 7 +
lfs/gcc | 2 +
lfs/glibc | 4 +-
lfs/gzip | 6 +
lfs/{libmnl => keyutils} | 12 +-
lfs/kmod | 9 +-
lfs/{paxctl => libaio} | 9 +-
lfs/libvirt | 6 +-
lfs/lvm2 | 4 +-
lfs/m4 | 1 +
lfs/nfs | 11 +-
lfs/ntfs-3g | 7 +-
lfs/parted | 1 +
lfs/perl | 5 +-
lfs/ppp | 1 +
lfs/reiserfsprogs | 6 +-
lfs/syslinux | 3 +
lfs/sysvinit | 4 +
lfs/udev | 50 +--
lfs/xfsprogs | 15 +-
make.sh | 10 +-
src/patches/bison-3.0.5-gnulib-fseterr.patch | 19 ++
src/patches/collectd-4.10.9-xfs-compile-fix.patch | 28 ++
src/patches/findutils-4.6.0-glibc2.28.patch | 335 ++++++++++++++++++++
src/patches/gcc-7-glibc-2.28-ustat.patch | 31 ++
src/patches/gzip-1.9-gnulib.patch | 189 +++++++++++
...hange-options-in-libvirtd.conf-for-IPFire.patch | 16 +-
.../m4-1.4.18-glibc-change-work-around.patch | 115 +++++++
src/patches/nfs-1.3.3-glibc-stdint.patch | 10 -
src/patches/parted-3.2-sysmacros.patch | 28 ++
src/patches/ppp-2.4.7-openssl.patch | 110 +++++++
src/patches/reiserfsprogs-3.6.27-loff_t.patch | 16 +
src/patches/syslinux-6.03-sysmacros.patch | 34 ++
79 files changed, 1671 insertions(+), 531 deletions(-)
create mode 100644 config/rootfiles/common/keyutils
create mode 100644 config/rootfiles/common/libaio
create mode 120000 config/rootfiles/core/125/filelists/aarch64/glibc
copy config/rootfiles/{oldcore/38 => core/125}/filelists/collectd (100%)
copy config/rootfiles/{oldcore/103 => core/125}/filelists/coreutils (100%)
copy config/rootfiles/{oldcore/101 => core/125}/filelists/e2fsprogs (100%)
copy config/rootfiles/{oldcore/100 => core/125}/filelists/i586/glibc (100%)
create mode 120000 config/rootfiles/core/125/filelists/keyutils
copy config/rootfiles/{oldcore/77 => core/125}/filelists/kmod (100%)
create mode 120000 config/rootfiles/core/125/filelists/libaio
copy config/rootfiles/{oldcore/87 => core/125}/filelists/lvm2 (100%)
copy config/rootfiles/{oldcore/32 => core/125}/filelists/ntfs-3g (100%)
copy config/rootfiles/{oldcore/124 => core/125}/filelists/parted (100%)
copy config/rootfiles/{oldcore/39 => core/125}/filelists/ppp (100%)
copy config/rootfiles/{oldcore/112 => core/125}/filelists/reiserfsprogs (100%)
copy config/rootfiles/{oldcore/28 => core/125}/filelists/udev (100%)
copy config/rootfiles/{oldcore/100 => core/125}/filelists/x86_64/glibc (100%)
copy config/rootfiles/{oldcore/87 => core/125}/filelists/xfsprogs (100%)
copy lfs/{libmnl => keyutils} (94%)
copy lfs/{paxctl => libaio} (93%)
create mode 100644 src/patches/bison-3.0.5-gnulib-fseterr.patch
create mode 100644 src/patches/collectd-4.10.9-xfs-compile-fix.patch
create mode 100644 src/patches/findutils-4.6.0-glibc2.28.patch
create mode 100644 src/patches/gcc-7-glibc-2.28-ustat.patch
create mode 100644 src/patches/gzip-1.9-gnulib.patch
create mode 100644 src/patches/m4-1.4.18-glibc-change-work-around.patch
delete mode 100644 src/patches/nfs-1.3.3-glibc-stdint.patch
create mode 100644 src/patches/parted-3.2-sysmacros.patch
create mode 100644 src/patches/ppp-2.4.7-openssl.patch
create mode 100644 src/patches/reiserfsprogs-3.6.27-loff_t.patch
create mode 100644 src/patches/syslinux-6.03-sysmacros.patch
Difference in files:
diff --git a/config/rootfiles/common/aarch64/glibc b/config/rootfiles/common/aarch64/glibc
index 09bcb6b85..e100a7990 100644
--- a/config/rootfiles/common/aarch64/glibc
+++ b/config/rootfiles/common/aarch64/glibc
@@ -1,49 +1,47 @@
#etc/ld.so.cache
etc/rpc
-lib/ld-2.27.so
+lib/ld-2.28.so
lib/ld-linux-aarch64.so.1
-lib/libBrokenLocale-2.27.so
+lib/libBrokenLocale-2.28.so
lib/libBrokenLocale.so.1
#lib/libSegFault.so
-lib/libanl-2.27.so
+lib/libanl-2.28.so
lib/libanl.so.1
-lib/libc-2.27.so
+lib/libc-2.28.so
lib/libc.so.6
-lib/libcidn-2.27.so
-lib/libcidn.so.1
-lib/libcrypt-2.27.so
+lib/libcrypt-2.28.so
lib/libcrypt.so.1
-lib/libdl-2.27.so
+lib/libdl-2.28.so
lib/libdl.so.2
-lib/libm-2.27.so
+lib/libm-2.28.so
lib/libm.so.6
#lib/libmemusage.so
-lib/libnsl-2.27.so
+lib/libnsl-2.28.so
lib/libnsl.so.1
-lib/libnss_compat-2.27.so
+lib/libnss_compat-2.28.so
lib/libnss_compat.so.2
-lib/libnss_db-2.27.so
+lib/libnss_db-2.28.so
lib/libnss_db.so.2
-lib/libnss_dns-2.27.so
+lib/libnss_dns-2.28.so
lib/libnss_dns.so.2
-lib/libnss_files-2.27.so
+lib/libnss_files-2.28.so
lib/libnss_files.so.2
-lib/libnss_hesiod-2.27.so
+lib/libnss_hesiod-2.28.so
lib/libnss_hesiod.so.2
-lib/libnss_nis-2.27.so
+lib/libnss_nis-2.28.so
lib/libnss_nis.so.2
-lib/libnss_nisplus-2.27.so
+lib/libnss_nisplus-2.28.so
lib/libnss_nisplus.so.2
#lib/libpcprofile.so
-lib/libpthread-2.27.so
+lib/libpthread-2.28.so
lib/libpthread.so.0
-lib/libresolv-2.27.so
+lib/libresolv-2.28.so
lib/libresolv.so.2
-lib/librt-2.27.so
+lib/librt-2.28.so
lib/librt.so.1
lib/libthread_db-1.0.so
lib/libthread_db.so.1
-lib/libutil-2.27.so
+lib/libutil-2.28.so
lib/libutil.so.1
sbin/ldconfig
#sbin/sln
@@ -64,7 +62,6 @@ usr/bin/locale
#usr/bin/sprof
#usr/bin/tzselect
#usr/bin/xtrace
-#usr/include/_G_config.h
#usr/include/a.out.h
#usr/include/aio.h
#usr/include/aliases.h
@@ -81,9 +78,7 @@ usr/bin/locale
#usr/include/arpa/tftp.h
#usr/include/assert.h
#usr/include/bits
-#usr/include/bits/_G_config.h
#usr/include/bits/a.out.h
-#usr/include/bits/byteswap-16.h
#usr/include/bits/byteswap.h
#usr/include/bits/cmathcalls.h
#usr/include/bits/confname.h
@@ -112,6 +107,7 @@ usr/bin/locale
#usr/include/bits/getopt_posix.h
#usr/include/bits/hwcap.h
#usr/include/bits/in.h
+#usr/include/bits/indirect-return.h
#usr/include/bits/initspin.h
#usr/include/bits/inotify.h
#usr/include/bits/ioctl-types.h
@@ -120,8 +116,6 @@ usr/bin/locale
#usr/include/bits/ipctypes.h
#usr/include/bits/iscanonical.h
#usr/include/bits/libc-header-start.h
-#usr/include/bits/libio-ldbl.h
-#usr/include/bits/libio.h
#usr/include/bits/libm-simd-decl-stubs.h
#usr/include/bits/link.h
#usr/include/bits/local_lim.h
@@ -130,6 +124,7 @@ usr/bin/locale
#usr/include/bits/math-finite.h
#usr/include/bits/math-vector.h
#usr/include/bits/mathcalls-helper-functions.h
+#usr/include/bits/mathcalls-narrow.h
#usr/include/bits/mathcalls.h
#usr/include/bits/mathdef.h
#usr/include/bits/mathinline.h
@@ -180,6 +175,7 @@ usr/bin/locale
#usr/include/bits/stat.h
#usr/include/bits/statfs.h
#usr/include/bits/statvfs.h
+#usr/include/bits/statx.h
#usr/include/bits/stdint-intn.h
#usr/include/bits/stdint-uintn.h
#usr/include/bits/stdio-ldbl.h
@@ -209,12 +205,16 @@ usr/bin/locale
#usr/include/bits/types.h
#usr/include/bits/types/FILE.h
#usr/include/bits/types/__FILE.h
+#usr/include/bits/types/__fpos64_t.h
+#usr/include/bits/types/__fpos_t.h
#usr/include/bits/types/__locale_t.h
#usr/include/bits/types/__mbstate_t.h
#usr/include/bits/types/__sigset_t.h
#usr/include/bits/types/__sigval_t.h
#usr/include/bits/types/clock_t.h
#usr/include/bits/types/clockid_t.h
+#usr/include/bits/types/cookie_io_functions_t.h
+#usr/include/bits/types/error_t.h
#usr/include/bits/types/locale_t.h
#usr/include/bits/types/mbstate_t.h
#usr/include/bits/types/res_state.h
@@ -224,10 +224,12 @@ usr/bin/locale
#usr/include/bits/types/sigset_t.h
#usr/include/bits/types/sigval_t.h
#usr/include/bits/types/stack_t.h
+#usr/include/bits/types/struct_FILE.h
#usr/include/bits/types/struct_iovec.h
#usr/include/bits/types/struct_itimerspec.h
#usr/include/bits/types/struct_osockaddr.h
#usr/include/bits/types/struct_rusage.h
+#usr/include/bits/types/struct_sched_param.h
#usr/include/bits/types/struct_sigstack.h
#usr/include/bits/types/struct_timespec.h
#usr/include/bits/types/struct_timeval.h
@@ -240,7 +242,6 @@ usr/bin/locale
#usr/include/bits/uio-ext.h
#usr/include/bits/uio_lim.h
#usr/include/bits/unistd.h
-#usr/include/bits/ustat.h
#usr/include/bits/utmp.h
#usr/include/bits/utmpx.h
#usr/include/bits/utsname.h
@@ -296,7 +297,6 @@ usr/bin/locale
#usr/include/lastlog.h
#usr/include/libgen.h
#usr/include/libintl.h
-#usr/include/libio.h
#usr/include/limits.h
#usr/include/link.h
#usr/include/locale.h
@@ -377,14 +377,12 @@ usr/bin/locale
#usr/include/rpc/auth_des.h
#usr/include/rpc/auth_unix.h
#usr/include/rpc/clnt.h
-#usr/include/rpc/des_crypt.h
#usr/include/rpc/key_prot.h
#usr/include/rpc/netdb.h
#usr/include/rpc/pmap_clnt.h
#usr/include/rpc/pmap_prot.h
#usr/include/rpc/pmap_rmt.h
#usr/include/rpc/rpc.h
-#usr/include/rpc/rpc_des.h
#usr/include/rpc/rpc_msg.h
#usr/include/rpc/svc.h
#usr/include/rpc/svc_auth.h
@@ -522,7 +520,6 @@ usr/bin/locale
#usr/include/sys/un.h
#usr/include/sys/unistd.h
#usr/include/sys/user.h
-#usr/include/sys/ustat.h
#usr/include/sys/utsname.h
#usr/include/sys/vfs.h
#usr/include/sys/vlimit.h
@@ -538,13 +535,13 @@ usr/bin/locale
#usr/include/termios.h
#usr/include/tgmath.h
#usr/include/thread_db.h
+#usr/include/threads.h
#usr/include/time.h
#usr/include/ttyent.h
#usr/include/uchar.h
#usr/include/ucontext.h
#usr/include/ulimit.h
#usr/include/unistd.h
-#usr/include/ustat.h
#usr/include/utime.h
#usr/include/utmp.h
#usr/include/utmpx.h
@@ -828,7 +825,6 @@ usr/lib/gconv
#usr/lib/libc.a
#usr/lib/libc.so
#usr/lib/libc_nonshared.a
-#usr/lib/libcidn.so
#usr/lib/libcrypt.a
#usr/lib/libcrypt.so
#usr/lib/libdl.a
@@ -848,7 +844,6 @@ usr/lib/gconv
#usr/lib/libnss_nisplus.so
#usr/lib/libpthread.a
#usr/lib/libpthread.so
-#usr/lib/libpthread_nonshared.a
#usr/lib/libresolv.a
#usr/lib/libresolv.so
#usr/lib/librpcsvc.a
@@ -2510,6 +2505,20 @@ usr/lib/locale
#usr/lib/locale/doi_IN/LC_PAPER
#usr/lib/locale/doi_IN/LC_TELEPHONE
#usr/lib/locale/doi_IN/LC_TIME
+#usr/lib/locale/dsb_DE
+#usr/lib/locale/dsb_DE/LC_ADDRESS
+#usr/lib/locale/dsb_DE/LC_COLLATE
+#usr/lib/locale/dsb_DE/LC_CTYPE
+#usr/lib/locale/dsb_DE/LC_IDENTIFICATION
+#usr/lib/locale/dsb_DE/LC_MEASUREMENT
+#usr/lib/locale/dsb_DE/LC_MESSAGES
+#usr/lib/locale/dsb_DE/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/dsb_DE/LC_MONETARY
+#usr/lib/locale/dsb_DE/LC_NAME
+#usr/lib/locale/dsb_DE/LC_NUMERIC
+#usr/lib/locale/dsb_DE/LC_PAPER
+#usr/lib/locale/dsb_DE/LC_TELEPHONE
+#usr/lib/locale/dsb_DE/LC_TIME
#usr/lib/locale/dv_MV
#usr/lib/locale/dv_MV/LC_ADDRESS
#usr/lib/locale/dv_MV/LC_COLLATE
@@ -6206,6 +6215,20 @@ usr/lib/locale
#usr/lib/locale/sa_IN/LC_PAPER
#usr/lib/locale/sa_IN/LC_TELEPHONE
#usr/lib/locale/sa_IN/LC_TIME
+#usr/lib/locale/sah_RU
+#usr/lib/locale/sah_RU/LC_ADDRESS
+#usr/lib/locale/sah_RU/LC_COLLATE
+#usr/lib/locale/sah_RU/LC_CTYPE
+#usr/lib/locale/sah_RU/LC_IDENTIFICATION
+#usr/lib/locale/sah_RU/LC_MEASUREMENT
+#usr/lib/locale/sah_RU/LC_MESSAGES
+#usr/lib/locale/sah_RU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/sah_RU/LC_MONETARY
+#usr/lib/locale/sah_RU/LC_NAME
+#usr/lib/locale/sah_RU/LC_NUMERIC
+#usr/lib/locale/sah_RU/LC_PAPER
+#usr/lib/locale/sah_RU/LC_TELEPHONE
+#usr/lib/locale/sah_RU/LC_TIME
#usr/lib/locale/sat_IN
#usr/lib/locale/sat_IN/LC_ADDRESS
#usr/lib/locale/sat_IN/LC_COLLATE
@@ -7956,6 +7979,7 @@ usr/lib/locale
#usr/share/i18n/locales/de_LU
#usr/share/i18n/locales/de_LU@euro
#usr/share/i18n/locales/doi_IN
+#usr/share/i18n/locales/dsb_DE
#usr/share/i18n/locales/dv_MV
#usr/share/i18n/locales/dz_BT
#usr/share/i18n/locales/el_CY
@@ -8139,6 +8163,7 @@ usr/lib/locale
#usr/share/i18n/locales/ru_UA
#usr/share/i18n/locales/rw_RW
#usr/share/i18n/locales/sa_IN
+#usr/share/i18n/locales/sah_RU
#usr/share/i18n/locales/sat_IN
#usr/share/i18n/locales/sc_IT
#usr/share/i18n/locales/sd_IN
diff --git a/config/rootfiles/common/e2fsprogs b/config/rootfiles/common/e2fsprogs
index ba4f00a9f..79ac99f99 100644
--- a/config/rootfiles/common/e2fsprogs
+++ b/config/rootfiles/common/e2fsprogs
@@ -1,5 +1,4 @@
#etc/mke2fs.conf
-#etc/mke2fs.conf.e2fsprogs-new
lib/libblkid.so.1
lib/libblkid.so.1.0
lib/libcom_err.so.2
@@ -19,19 +18,18 @@ sbin/dumpe2fs
sbin/e2fsck
sbin/e2image
sbin/e2label
+sbin/e2mmpstatus
sbin/e2undo
sbin/findfs
sbin/fsck
sbin/fsck.ext2
sbin/fsck.ext3
sbin/fsck.ext4
-sbin/fsck.ext4dev
#sbin/logsave
sbin/mke2fs
sbin/mkfs.ext2
sbin/mkfs.ext3
sbin/mkfs.ext4
-sbin/mkfs.ext4dev
sbin/resize2fs
sbin/tune2fs
usr/bin/chattr
@@ -56,10 +54,9 @@ usr/bin/uuidgen
#usr/include/ext2fs/ext2_types.h
#usr/include/ext2fs/ext2fs.h
#usr/include/ext2fs/ext3_extents.h
+#usr/include/ext2fs/hashmap.h
#usr/include/ext2fs/qcow2.h
#usr/include/ext2fs/tdb.h
-#usr/include/quota
-#usr/include/quota/mkquota.h
#usr/include/ss
#usr/include/ss/ss.h
#usr/include/ss/ss_err.h
@@ -74,7 +71,6 @@ usr/lib/libcom_err.so
usr/lib/libe2p.so
#usr/lib/libext2fs.a
usr/lib/libext2fs.so
-#usr/lib/libquota.a
#usr/lib/libss.a
usr/lib/libss.so
#usr/lib/libuuid.a
@@ -83,10 +79,10 @@ usr/lib/libuuid.so
#usr/lib/pkgconfig/com_err.pc
#usr/lib/pkgconfig/e2p.pc
#usr/lib/pkgconfig/ext2fs.pc
-#usr/lib/pkgconfig/quota.pc
#usr/lib/pkgconfig/ss.pc
#usr/lib/pkgconfig/uuid.pc
usr/sbin/e2freefrag
+usr/sbin/e4crypt
usr/sbin/e4defrag
usr/sbin/filefrag
usr/sbin/mklost+found
@@ -114,10 +110,10 @@ usr/sbin/uuidd
#usr/share/man/man3/uuid_time.3
#usr/share/man/man3/uuid_unparse.3
#usr/share/man/man5/e2fsck.conf.5
-#usr/share/man/man5/mke2fs.conf.5
#usr/share/man/man5/ext2.5
#usr/share/man/man5/ext3.5
#usr/share/man/man5/ext4.5
+#usr/share/man/man5/mke2fs.conf.5
#usr/share/man/man8/badblocks.8
#usr/share/man/man8/blkid.8
#usr/share/man/man8/debugfs.8
@@ -126,7 +122,9 @@ usr/sbin/uuidd
#usr/share/man/man8/e2fsck.8
#usr/share/man/man8/e2image.8
#usr/share/man/man8/e2label.8
+#usr/share/man/man8/e2mmpstatus.8
#usr/share/man/man8/e2undo.8
+#usr/share/man/man8/e4crypt.8
#usr/share/man/man8/e4defrag.8
#usr/share/man/man8/filefrag.8
#usr/share/man/man8/findfs.8
@@ -134,13 +132,11 @@ usr/sbin/uuidd
#usr/share/man/man8/fsck.ext2.8
#usr/share/man/man8/fsck.ext3.8
#usr/share/man/man8/fsck.ext4.8
-#usr/share/man/man8/fsck.ext4dev.8
#usr/share/man/man8/logsave.8
#usr/share/man/man8/mke2fs.8
#usr/share/man/man8/mkfs.ext2.8
#usr/share/man/man8/mkfs.ext3.8
#usr/share/man/man8/mkfs.ext4.8
-#usr/share/man/man8/mkfs.ext4dev.8
#usr/share/man/man8/mklost+found.8
#usr/share/man/man8/resize2fs.8
#usr/share/man/man8/tune2fs.8
diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc
index 40bb8c63d..f3019884c 100644
--- a/config/rootfiles/common/i586/glibc
+++ b/config/rootfiles/common/i586/glibc
@@ -1,49 +1,47 @@
#etc/ld.so.cache
etc/rpc
-lib/ld-2.27.so
+lib/ld-2.28.so
lib/ld-linux.so.2
-lib/libBrokenLocale-2.27.so
+lib/libBrokenLocale-2.28.so
lib/libBrokenLocale.so.1
#lib/libSegFault.so
-lib/libanl-2.27.so
+lib/libanl-2.28.so
lib/libanl.so.1
-lib/libc-2.27.so
+lib/libc-2.28.so
lib/libc.so.6
-lib/libcidn-2.27.so
-lib/libcidn.so.1
-lib/libcrypt-2.27.so
+lib/libcrypt-2.28.so
lib/libcrypt.so.1
-lib/libdl-2.27.so
+lib/libdl-2.28.so
lib/libdl.so.2
-lib/libm-2.27.so
+lib/libm-2.28.so
lib/libm.so.6
#lib/libmemusage.so
-lib/libnsl-2.27.so
+lib/libnsl-2.28.so
lib/libnsl.so.1
-lib/libnss_compat-2.27.so
+lib/libnss_compat-2.28.so
lib/libnss_compat.so.2
-lib/libnss_db-2.27.so
+lib/libnss_db-2.28.so
lib/libnss_db.so.2
-lib/libnss_dns-2.27.so
+lib/libnss_dns-2.28.so
lib/libnss_dns.so.2
-lib/libnss_files-2.27.so
+lib/libnss_files-2.28.so
lib/libnss_files.so.2
-lib/libnss_hesiod-2.27.so
+lib/libnss_hesiod-2.28.so
lib/libnss_hesiod.so.2
-lib/libnss_nis-2.27.so
+lib/libnss_nis-2.28.so
lib/libnss_nis.so.2
-lib/libnss_nisplus-2.27.so
+lib/libnss_nisplus-2.28.so
lib/libnss_nisplus.so.2
#lib/libpcprofile.so
-lib/libpthread-2.27.so
+lib/libpthread-2.28.so
lib/libpthread.so.0
-lib/libresolv-2.27.so
+lib/libresolv-2.28.so
lib/libresolv.so.2
-lib/librt-2.27.so
+lib/librt-2.28.so
lib/librt.so.1
lib/libthread_db-1.0.so
lib/libthread_db.so.1
-lib/libutil-2.27.so
+lib/libutil-2.28.so
lib/libutil.so.1
sbin/ldconfig
#sbin/sln
@@ -65,7 +63,6 @@ usr/bin/locale
#usr/bin/sprof
#usr/bin/tzselect
#usr/bin/xtrace
-#usr/include/_G_config.h
#usr/include/a.out.h
#usr/include/aio.h
#usr/include/aliases.h
@@ -82,9 +79,7 @@ usr/bin/locale
#usr/include/arpa/tftp.h
#usr/include/assert.h
#usr/include/bits
-#usr/include/bits/_G_config.h
#usr/include/bits/a.out.h
-#usr/include/bits/byteswap-16.h
#usr/include/bits/byteswap.h
#usr/include/bits/cmathcalls.h
#usr/include/bits/confname.h
@@ -113,6 +108,7 @@ usr/bin/locale
#usr/include/bits/getopt_posix.h
#usr/include/bits/hwcap.h
#usr/include/bits/in.h
+#usr/include/bits/indirect-return.h
#usr/include/bits/initspin.h
#usr/include/bits/inotify.h
#usr/include/bits/ioctl-types.h
@@ -121,8 +117,6 @@ usr/bin/locale
#usr/include/bits/ipctypes.h
#usr/include/bits/iscanonical.h
#usr/include/bits/libc-header-start.h
-#usr/include/bits/libio-ldbl.h
-#usr/include/bits/libio.h
#usr/include/bits/libm-simd-decl-stubs.h
#usr/include/bits/link.h
#usr/include/bits/local_lim.h
@@ -131,6 +125,7 @@ usr/bin/locale
#usr/include/bits/math-finite.h
#usr/include/bits/math-vector.h
#usr/include/bits/mathcalls-helper-functions.h
+#usr/include/bits/mathcalls-narrow.h
#usr/include/bits/mathcalls.h
#usr/include/bits/mathdef.h
#usr/include/bits/mathinline.h
@@ -181,6 +176,7 @@ usr/bin/locale
#usr/include/bits/stat.h
#usr/include/bits/statfs.h
#usr/include/bits/statvfs.h
+#usr/include/bits/statx.h
#usr/include/bits/stdint-intn.h
#usr/include/bits/stdint-uintn.h
#usr/include/bits/stdio-ldbl.h
@@ -210,12 +206,16 @@ usr/bin/locale
#usr/include/bits/types.h
#usr/include/bits/types/FILE.h
#usr/include/bits/types/__FILE.h
+#usr/include/bits/types/__fpos64_t.h
+#usr/include/bits/types/__fpos_t.h
#usr/include/bits/types/__locale_t.h
#usr/include/bits/types/__mbstate_t.h
#usr/include/bits/types/__sigset_t.h
#usr/include/bits/types/__sigval_t.h
#usr/include/bits/types/clock_t.h
#usr/include/bits/types/clockid_t.h
+#usr/include/bits/types/cookie_io_functions_t.h
+#usr/include/bits/types/error_t.h
#usr/include/bits/types/locale_t.h
#usr/include/bits/types/mbstate_t.h
#usr/include/bits/types/res_state.h
@@ -225,10 +225,12 @@ usr/bin/locale
#usr/include/bits/types/sigset_t.h
#usr/include/bits/types/sigval_t.h
#usr/include/bits/types/stack_t.h
+#usr/include/bits/types/struct_FILE.h
#usr/include/bits/types/struct_iovec.h
#usr/include/bits/types/struct_itimerspec.h
#usr/include/bits/types/struct_osockaddr.h
#usr/include/bits/types/struct_rusage.h
+#usr/include/bits/types/struct_sched_param.h
#usr/include/bits/types/struct_sigstack.h
#usr/include/bits/types/struct_timespec.h
#usr/include/bits/types/struct_timeval.h
@@ -241,7 +243,6 @@ usr/bin/locale
#usr/include/bits/uio-ext.h
#usr/include/bits/uio_lim.h
#usr/include/bits/unistd.h
-#usr/include/bits/ustat.h
#usr/include/bits/utmp.h
#usr/include/bits/utmpx.h
#usr/include/bits/utsname.h
@@ -297,7 +298,6 @@ usr/bin/locale
#usr/include/lastlog.h
#usr/include/libgen.h
#usr/include/libintl.h
-#usr/include/libio.h
#usr/include/limits.h
#usr/include/link.h
#usr/include/locale.h
@@ -378,14 +378,12 @@ usr/bin/locale
#usr/include/rpc/auth_des.h
#usr/include/rpc/auth_unix.h
#usr/include/rpc/clnt.h
-#usr/include/rpc/des_crypt.h
#usr/include/rpc/key_prot.h
#usr/include/rpc/netdb.h
#usr/include/rpc/pmap_clnt.h
#usr/include/rpc/pmap_prot.h
#usr/include/rpc/pmap_rmt.h
#usr/include/rpc/rpc.h
-#usr/include/rpc/rpc_des.h
#usr/include/rpc/rpc_msg.h
#usr/include/rpc/svc.h
#usr/include/rpc/svc_auth.h
@@ -527,7 +525,6 @@ usr/bin/locale
#usr/include/sys/un.h
#usr/include/sys/unistd.h
#usr/include/sys/user.h
-#usr/include/sys/ustat.h
#usr/include/sys/utsname.h
#usr/include/sys/vfs.h
#usr/include/sys/vlimit.h
@@ -544,13 +541,13 @@ usr/bin/locale
#usr/include/termios.h
#usr/include/tgmath.h
#usr/include/thread_db.h
+#usr/include/threads.h
#usr/include/time.h
#usr/include/ttyent.h
#usr/include/uchar.h
#usr/include/ucontext.h
#usr/include/ulimit.h
#usr/include/unistd.h
-#usr/include/ustat.h
#usr/include/utime.h
#usr/include/utmp.h
#usr/include/utmpx.h
@@ -837,7 +834,6 @@ usr/lib/gconv
#usr/lib/libc.a
#usr/lib/libc.so
#usr/lib/libc_nonshared.a
-#usr/lib/libcidn.so
#usr/lib/libcrypt.a
#usr/lib/libcrypt.so
#usr/lib/libdl.a
@@ -857,7 +853,6 @@ usr/lib/gconv
#usr/lib/libnss_nisplus.so
#usr/lib/libpthread.a
#usr/lib/libpthread.so
-#usr/lib/libpthread_nonshared.a
#usr/lib/libresolv.a
#usr/lib/libresolv.so
#usr/lib/librpcsvc.a
@@ -2519,6 +2514,20 @@ usr/lib/locale
#usr/lib/locale/doi_IN/LC_PAPER
#usr/lib/locale/doi_IN/LC_TELEPHONE
#usr/lib/locale/doi_IN/LC_TIME
+#usr/lib/locale/dsb_DE
+#usr/lib/locale/dsb_DE/LC_ADDRESS
+#usr/lib/locale/dsb_DE/LC_COLLATE
+#usr/lib/locale/dsb_DE/LC_CTYPE
+#usr/lib/locale/dsb_DE/LC_IDENTIFICATION
+#usr/lib/locale/dsb_DE/LC_MEASUREMENT
+#usr/lib/locale/dsb_DE/LC_MESSAGES
+#usr/lib/locale/dsb_DE/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/dsb_DE/LC_MONETARY
+#usr/lib/locale/dsb_DE/LC_NAME
+#usr/lib/locale/dsb_DE/LC_NUMERIC
+#usr/lib/locale/dsb_DE/LC_PAPER
+#usr/lib/locale/dsb_DE/LC_TELEPHONE
+#usr/lib/locale/dsb_DE/LC_TIME
#usr/lib/locale/dv_MV
#usr/lib/locale/dv_MV/LC_ADDRESS
#usr/lib/locale/dv_MV/LC_COLLATE
@@ -6215,6 +6224,20 @@ usr/lib/locale
#usr/lib/locale/sa_IN/LC_PAPER
#usr/lib/locale/sa_IN/LC_TELEPHONE
#usr/lib/locale/sa_IN/LC_TIME
+#usr/lib/locale/sah_RU
+#usr/lib/locale/sah_RU/LC_ADDRESS
+#usr/lib/locale/sah_RU/LC_COLLATE
+#usr/lib/locale/sah_RU/LC_CTYPE
+#usr/lib/locale/sah_RU/LC_IDENTIFICATION
+#usr/lib/locale/sah_RU/LC_MEASUREMENT
+#usr/lib/locale/sah_RU/LC_MESSAGES
+#usr/lib/locale/sah_RU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/sah_RU/LC_MONETARY
+#usr/lib/locale/sah_RU/LC_NAME
+#usr/lib/locale/sah_RU/LC_NUMERIC
+#usr/lib/locale/sah_RU/LC_PAPER
+#usr/lib/locale/sah_RU/LC_TELEPHONE
+#usr/lib/locale/sah_RU/LC_TIME
#usr/lib/locale/sat_IN
#usr/lib/locale/sat_IN/LC_ADDRESS
#usr/lib/locale/sat_IN/LC_COLLATE
@@ -7965,6 +7988,7 @@ usr/lib/locale
#usr/share/i18n/locales/de_LU
#usr/share/i18n/locales/de_LU@euro
#usr/share/i18n/locales/doi_IN
+#usr/share/i18n/locales/dsb_DE
#usr/share/i18n/locales/dv_MV
#usr/share/i18n/locales/dz_BT
#usr/share/i18n/locales/el_CY
@@ -8148,6 +8172,7 @@ usr/lib/locale
#usr/share/i18n/locales/ru_UA
#usr/share/i18n/locales/rw_RW
#usr/share/i18n/locales/sa_IN
+#usr/share/i18n/locales/sah_RU
#usr/share/i18n/locales/sat_IN
#usr/share/i18n/locales/sc_IT
#usr/share/i18n/locales/sd_IN
diff --git a/config/rootfiles/common/keyutils b/config/rootfiles/common/keyutils
new file mode 100644
index 000000000..10058de1c
--- /dev/null
+++ b/config/rootfiles/common/keyutils
@@ -0,0 +1,50 @@
+bin/keyctl
+etc/request-key.conf
+etc/request-key.d
+#lib/libkeyutils.so
+lib/libkeyutils.so.1
+lib/libkeyutils.so.1.7
+sbin/key.dns_resolver
+sbin/request-key
+#usr/include/keyutils.h
+#usr/share/keyutils
+#usr/share/keyutils/request-key-debug.sh
+#usr/share/man/man1/keyctl.1
+#usr/share/man/man3/find_key_by_type_and_name.3
+#usr/share/man/man3/keyctl.3
+#usr/share/man/man3/keyctl_assume_authority.3
+#usr/share/man/man3/keyctl_chown.3
+#usr/share/man/man3/keyctl_clear.3
+#usr/share/man/man3/keyctl_describe.3
+#usr/share/man/man3/keyctl_describe_alloc.3
+#usr/share/man/man3/keyctl_dh_compute.3
+#usr/share/man/man3/keyctl_dh_compute_alloc.3
+#usr/share/man/man3/keyctl_dh_compute_kdf.3
+#usr/share/man/man3/keyctl_get_keyring_ID.3
+#usr/share/man/man3/keyctl_get_persistent.3
+#usr/share/man/man3/keyctl_get_security.3
+#usr/share/man/man3/keyctl_get_security_alloc.3
+#usr/share/man/man3/keyctl_instantiate.3
+#usr/share/man/man3/keyctl_instantiate_iov.3
+#usr/share/man/man3/keyctl_invalidate.3
+#usr/share/man/man3/keyctl_join_session_keyring.3
+#usr/share/man/man3/keyctl_link.3
+#usr/share/man/man3/keyctl_negate.3
+#usr/share/man/man3/keyctl_read.3
+#usr/share/man/man3/keyctl_read_alloc.3
+#usr/share/man/man3/keyctl_reject.3
+#usr/share/man/man3/keyctl_restrict_keyring.3
+#usr/share/man/man3/keyctl_revoke.3
+#usr/share/man/man3/keyctl_search.3
+#usr/share/man/man3/keyctl_session_to_parent.3
+#usr/share/man/man3/keyctl_set_reqkey_keyring.3
+#usr/share/man/man3/keyctl_set_timeout.3
+#usr/share/man/man3/keyctl_setperm.3
+#usr/share/man/man3/keyctl_unlink.3
+#usr/share/man/man3/keyctl_update.3
+#usr/share/man/man3/recursive_key_scan.3
+#usr/share/man/man3/recursive_session_key_scan.3
+#usr/share/man/man5/request-key.conf.5
+#usr/share/man/man7/keyutils.7
+#usr/share/man/man8/key.dns_resolver.8
+#usr/share/man/man8/request-key.8
diff --git a/config/rootfiles/common/kmod b/config/rootfiles/common/kmod
index 14e765477..b3d45e25d 100644
--- a/config/rootfiles/common/kmod
+++ b/config/rootfiles/common/kmod
@@ -5,9 +5,7 @@ sbin/lsmod
sbin/modinfo
sbin/modprobe
sbin/rmmod
-#usr/include/libkmod.h
-#usr/lib/libkmod.la
-usr/lib/libkmod.so
+#usr/lib/libkmod.so
usr/lib/libkmod.so.2
-usr/lib/libkmod.so.2.2.3
-#usr/lib/pkgconfig/libkmod.pc
+usr/lib/libkmod.so.2.3.3
+#usr/share/bash-completion/completions/kmod
diff --git a/config/rootfiles/common/libaio b/config/rootfiles/common/libaio
new file mode 100644
index 000000000..bc4ddf0de
--- /dev/null
+++ b/config/rootfiles/common/libaio
@@ -0,0 +1,5 @@
+#usr/include/libaio.h
+#usr/lib/libaio.a
+#usr/lib/libaio.so
+usr/lib/libaio.so.1
+usr/lib/libaio.so.1.0.1
diff --git a/config/rootfiles/common/lvm2 b/config/rootfiles/common/lvm2
index 8ccafc79e..db7f304e5 100644
--- a/config/rootfiles/common/lvm2
+++ b/config/rootfiles/common/lvm2
@@ -1,10 +1,21 @@
#etc/lvm
#etc/lvm/lvm.conf
+#etc/lvm/lvmlocal.conf
+#etc/lvm/profile
+#etc/lvm/profile/cache-mq.profile
+#etc/lvm/profile/cache-smq.profile
+#etc/lvm/profile/command_profile_template.profile
+#etc/lvm/profile/lvmdbusd.profile
+#etc/lvm/profile/metadata_profile_template.profile
+#etc/lvm/profile/thin-generic.profile
+#etc/lvm/profile/thin-performance.profile
#usr/include/libdevmapper.h
#usr/lib/libdevmapper.so
usr/lib/libdevmapper.so.1.02
#usr/lib/pkgconfig/devmapper.pc
+#usr/sbin/blkdeactivate
#usr/sbin/dmsetup
+#usr/sbin/dmstats
#usr/sbin/fsadm
#usr/sbin/lvchange
#usr/sbin/lvconvert
@@ -12,8 +23,8 @@ usr/lib/libdevmapper.so.1.02
#usr/sbin/lvdisplay
#usr/sbin/lvextend
#usr/sbin/lvm
-#usr/sbin/lvmchange
#usr/sbin/lvmconf
+#usr/sbin/lvmconfig
#usr/sbin/lvmdiskscan
#usr/sbin/lvmdump
#usr/sbin/lvmsadc
@@ -53,16 +64,27 @@ usr/lib/libdevmapper.so.1.02
#usr/sbin/vgscan
#usr/sbin/vgsplit
#usr/share/man/man5/lvm.conf.5
+#usr/share/man/man7/lvmcache.7
+#usr/share/man/man7/lvmraid.7
+#usr/share/man/man7/lvmreport.7
+#usr/share/man/man7/lvmsystemid.7
+#usr/share/man/man7/lvmthin.7
+#usr/share/man/man8/blkdeactivate.8
#usr/share/man/man8/dmsetup.8
+#usr/share/man/man8/dmstats.8
#usr/share/man/man8/fsadm.8
#usr/share/man/man8/lvchange.8
#usr/share/man/man8/lvconvert.8
#usr/share/man/man8/lvcreate.8
#usr/share/man/man8/lvdisplay.8
#usr/share/man/man8/lvextend.8
+#usr/share/man/man8/lvm-config.8
+#usr/share/man/man8/lvm-dumpconfig.8
+#usr/share/man/man8/lvm-fullreport.8
+#usr/share/man/man8/lvm-lvpoll.8
#usr/share/man/man8/lvm.8
-#usr/share/man/man8/lvmchange.8
#usr/share/man/man8/lvmconf.8
+#usr/share/man/man8/lvmconfig.8
#usr/share/man/man8/lvmdiskscan.8
#usr/share/man/man8/lvmdump.8
#usr/share/man/man8/lvmsadc.8
diff --git a/config/rootfiles/common/ntfs-3g b/config/rootfiles/common/ntfs-3g
index 44f13c389..9e46d2731 100644
--- a/config/rootfiles/common/ntfs-3g
+++ b/config/rootfiles/common/ntfs-3g
@@ -1,14 +1,12 @@
bin/lowntfs-3g
bin/ntfs-3g
#lib/libntfs-3g.so
-lib/libntfs-3g.so.85
-lib/libntfs-3g.so.85.0.0
+lib/libntfs-3g.so.88
+lib/libntfs-3g.so.88.0.0
sbin/mkfs.ntfs
sbin/mount.lowntfs-3g
sbin/mount.ntfs-3g
usr/bin/ntfs-3g.probe
-usr/bin/ntfs-3g.secaudit
-usr/bin/ntfs-3g.usermap
usr/bin/ntfscat
usr/bin/ntfscluster
usr/bin/ntfscmp
@@ -29,10 +27,12 @@ usr/bin/ntfsls
#usr/include/ntfs-3g/device.h
#usr/include/ntfs-3g/device_io.h
#usr/include/ntfs-3g/dir.h
+#usr/include/ntfs-3g/ea.h
#usr/include/ntfs-3g/efs.h
#usr/include/ntfs-3g/endians.h
#usr/include/ntfs-3g/index.h
#usr/include/ntfs-3g/inode.h
+#usr/include/ntfs-3g/ioctl.h
#usr/include/ntfs-3g/layout.h
#usr/include/ntfs-3g/lcnalloc.h
#usr/include/ntfs-3g/logfile.h
@@ -43,6 +43,7 @@ usr/bin/ntfsls
#usr/include/ntfs-3g/ntfstime.h
#usr/include/ntfs-3g/object_id.h
#usr/include/ntfs-3g/param.h
+#usr/include/ntfs-3g/plugin.h
#usr/include/ntfs-3g/realpath.h
#usr/include/ntfs-3g/reparse.h
#usr/include/ntfs-3g/runlist.h
@@ -55,7 +56,8 @@ usr/bin/ntfsls
#usr/lib/libntfs-3g.a
#usr/lib/libntfs-3g.la
#usr/lib/libntfs-3g.so
-usr/lib/pkgconfig/libntfs-3g.pc
+#usr/lib/ntfs-3g
+#usr/lib/pkgconfig/libntfs-3g.pc
usr/sbin/mkntfs
usr/sbin/ntfsclone
usr/sbin/ntfscp
@@ -70,17 +72,22 @@ usr/sbin/ntfsundelete
#usr/share/man/man8/mount.ntfs-3g.8
#usr/share/man/man8/ntfs-3g.8
#usr/share/man/man8/ntfs-3g.probe.8
-#usr/share/man/man8/ntfs-3g.secaudit.8
-#usr/share/man/man8/ntfs-3g.usermap.8
#usr/share/man/man8/ntfscat.8
#usr/share/man/man8/ntfsclone.8
#usr/share/man/man8/ntfscluster.8
#usr/share/man/man8/ntfscmp.8
#usr/share/man/man8/ntfscp.8
+#usr/share/man/man8/ntfsdecrypt.8
+#usr/share/man/man8/ntfsfallocate.8
#usr/share/man/man8/ntfsfix.8
#usr/share/man/man8/ntfsinfo.8
#usr/share/man/man8/ntfslabel.8
#usr/share/man/man8/ntfsls.8
#usr/share/man/man8/ntfsprogs.8
+#usr/share/man/man8/ntfsrecover.8
#usr/share/man/man8/ntfsresize.8
+#usr/share/man/man8/ntfssecaudit.8
+#usr/share/man/man8/ntfstruncate.8
#usr/share/man/man8/ntfsundelete.8
+#usr/share/man/man8/ntfsusermap.8
+#usr/share/man/man8/ntfswipe.8
diff --git a/config/rootfiles/common/udev b/config/rootfiles/common/udev
index 1ba82d044..877a832a3 100644
--- a/config/rootfiles/common/udev
+++ b/config/rootfiles/common/udev
@@ -1,102 +1,87 @@
bin/udevadm
etc/modprobe.d/blacklist.conf
etc/udev
+etc/udev/hwdb.bin
+etc/udev/hwdb.d
+etc/udev/hwdb.d/20-OUI.hwdb
+etc/udev/hwdb.d/20-acpi-vendor.hwdb
+etc/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
+etc/udev/hwdb.d/20-net-ifname.hwdb
+etc/udev/hwdb.d/20-pci-classes.hwdb
+etc/udev/hwdb.d/20-pci-vendor-model.hwdb
+etc/udev/hwdb.d/20-sdio-classes.hwdb
+etc/udev/hwdb.d/20-sdio-vendor-model.hwdb
+etc/udev/hwdb.d/20-usb-classes.hwdb
+etc/udev/hwdb.d/20-usb-vendor-model.hwdb
+etc/udev/hwdb.d/20-vmbus-class.hwdb
+etc/udev/hwdb.d/60-evdev.hwdb
+etc/udev/hwdb.d/60-keyboard.hwdb
+etc/udev/hwdb.d/60-sensor.hwdb
+etc/udev/hwdb.d/70-mouse.hwdb
+etc/udev/hwdb.d/70-pointingstick.hwdb
+etc/udev/hwdb.d/70-touchpad.hwdb
#etc/udev/rules.d
-#etc/udev/rules.d/55-lfs.rules
-#etc/udev/rules.d/81-cdrom.rules
-#etc/udev/rules.d/83-cdrom-symlinks.rules
-#etc/udev/udev.conf
-#lib/firmware
+etc/udev/rules.d/55-lfs.rules
+etc/udev/rules.d/81-cdrom.rules
+etc/udev/rules.d/83-cdrom-symlinks.rules
+etc/udev/udev.conf
lib/libudev.so.1
-lib/libudev.so.1.3.2
+lib/libudev.so.1.6.3
lib/udev
-#lib/udev/accelerometer
-#lib/udev/ata_id
-#lib/udev/cdrom_id
-#lib/udev/collect
-#lib/udev/devices
-#lib/udev/devices/pts
-#lib/udev/enable_codel
-#lib/udev/hwdb.d
-#lib/udev/hwdb.d/20-OUI.hwdb
-#lib/udev/hwdb.d/20-acpi-vendor.hwdb
-#lib/udev/hwdb.d/20-bluetooth-vendor-product.hwdb
-#lib/udev/hwdb.d/20-pci-classes.hwdb
-#lib/udev/hwdb.d/20-pci-vendor-model.hwdb
-#lib/udev/hwdb.d/20-usb-classes.hwdb
-#lib/udev/hwdb.d/20-usb-vendor-model.hwdb
-#lib/udev/hwdb.d/60-keyboard.hwdb
-#lib/udev/init-net-rules.sh
-#lib/udev/mtd_probe
-#lib/udev/network-hotplug-bridges
-#lib/udev/network-hotplug-rename
-#lib/udev/network-hotplug-vlan
-#lib/udev/rule_generator.functions
+lib/udev/ata_id
+lib/udev/cdrom_id
+lib/udev/collect
+lib/udev/enable_codel
+lib/udev/init-net-rules.sh
+lib/udev/mtd_probe
+lib/udev/network-hotplug-bridges
+lib/udev/network-hotplug-rename
+lib/udev/network-hotplug-vlan
+lib/udev/rule_generator.functions
#lib/udev/rules.d
-#lib/udev/rules.d/25-alsa.rules
-#lib/udev/rules.d/42-usb-hid-pm.rules
-#lib/udev/rules.d/50-firmware.rules
-#lib/udev/rules.d/50-udev-default.rules
-#lib/udev/rules.d/60-cdrom_id.rules
-#lib/udev/rules.d/60-keyboard.rules
-#lib/udev/rules.d/60-net.rules
-#lib/udev/rules.d/60-persistent-alsa.rules
-#lib/udev/rules.d/60-persistent-input.rules
-#lib/udev/rules.d/60-persistent-serial.rules
-#lib/udev/rules.d/60-persistent-storage-tape.rules
-#lib/udev/rules.d/60-persistent-storage.rules
-#lib/udev/rules.d/60-persistent-v4l.rules
-#lib/udev/rules.d/61-accelerometer.rules
-#lib/udev/rules.d/64-btrfs.rules
-#lib/udev/rules.d/75-net-description.rules
-#lib/udev/rules.d/75-probe_mtd.rules
-#lib/udev/rules.d/75-tty-description.rules
-#lib/udev/rules.d/78-sound-card.rules
-#lib/udev/rules.d/80-drivers.rules
-#lib/udev/rules.d/80-net-name-slot.rules
-#lib/udev/rules.d/90-hwrng.rules
-#lib/udev/rules.d/95-udev-late.rules
-#lib/udev/rules.d/99-codel.rules
-#lib/udev/scsi_id
-#lib/udev/udevd
-#lib/udev/v4l_id
-#lib/udev/write_cd_rules
-#lib/udev/write_net_rules
+lib/udev/rules.d/25-alsa.rules
+lib/udev/rules.d/50-udev-default.rules
+lib/udev/rules.d/60-block.rules
+lib/udev/rules.d/60-cdrom_id.rules
+lib/udev/rules.d/60-drm.rules
+lib/udev/rules.d/60-evdev.rules
+lib/udev/rules.d/60-input-id.rules
+lib/udev/rules.d/60-net.rules
+lib/udev/rules.d/60-persistent-alsa.rules
+lib/udev/rules.d/60-persistent-input.rules
+lib/udev/rules.d/60-persistent-storage-tape.rules
+lib/udev/rules.d/60-persistent-storage.rules
+lib/udev/rules.d/60-persistent-v4l.rules
+lib/udev/rules.d/60-sensor.rules
+lib/udev/rules.d/60-serial.rules
+lib/udev/rules.d/64-btrfs.rules
+lib/udev/rules.d/70-joystick.rules
+lib/udev/rules.d/70-mouse.rules
+lib/udev/rules.d/70-touchpad.rules
+lib/udev/rules.d/75-net-description.rules
+lib/udev/rules.d/75-probe_mtd.rules
+lib/udev/rules.d/78-sound-card.rules
+lib/udev/rules.d/80-drivers.rules
+lib/udev/rules.d/90-hwrng.rules
+lib/udev/rules.d/99-codel.rules
+lib/udev/scsi_id
+lib/udev/v4l_id
+lib/udev/write_cd_rules
+lib/udev/write_net_rules
sbin/udevadm
sbin/udevd
#usr/include/libudev.h
-#usr/lib/firmware
-usr/lib/libudev.so
+#usr/include/udev.h
+#usr/lib/libudev.la
+#usr/lib/libudev.so
#usr/lib/pkgconfig/libudev.pc
-#usr/lib/pkgconfig/udev.pc
-#usr/share/doc/udev-208
-#usr/share/doc/udev-208/lfs
-#usr/share/doc/udev-208/lfs/55-lfs.txt
-#usr/share/doc/udev-208/lfs/README
-#usr/share/doc/udev-208/libudev-overrides.txt
-#usr/share/doc/udev-208/libudev-sections.txt
-#usr/share/doc/udev-208/libudev.types
-#usr/share/gtk-doc
-#usr/share/gtk-doc/html
-#usr/share/gtk-doc/html/libudev
-#usr/share/gtk-doc/html/libudev/api-index-full.html
-#usr/share/gtk-doc/html/libudev/ch01.html
-#usr/share/gtk-doc/html/libudev/home.png
-#usr/share/gtk-doc/html/libudev/index.html
-#usr/share/gtk-doc/html/libudev/index.sgml
-#usr/share/gtk-doc/html/libudev/left.png
-#usr/share/gtk-doc/html/libudev/libudev-udev-device.html
-#usr/share/gtk-doc/html/libudev/libudev-udev-enumerate.html
-#usr/share/gtk-doc/html/libudev/libudev-udev-hwdb.html
-#usr/share/gtk-doc/html/libudev/libudev-udev-list.html
-#usr/share/gtk-doc/html/libudev/libudev-udev-monitor.html
-#usr/share/gtk-doc/html/libudev/libudev-udev-queue.html
-#usr/share/gtk-doc/html/libudev/libudev-udev-util.html
-#usr/share/gtk-doc/html/libudev/libudev-udev.html
-#usr/share/gtk-doc/html/libudev/libudev.devhelp2
-#usr/share/gtk-doc/html/libudev/right.png
-#usr/share/gtk-doc/html/libudev/style.css
-#usr/share/gtk-doc/html/libudev/up.png
+#usr/share/doc/udev-20171102
+#usr/share/doc/udev-20171102/lfs
+#usr/share/doc/udev-20171102/lfs/55-lfs.txt
+#usr/share/doc/udev-20171102/lfs/README
+#usr/share/man/man5/udev.conf.5
#usr/share/man/man7/udev.7
#usr/share/man/man8/udevadm.8
#usr/share/man/man8/udevd.8
+#usr/share/pkgconfig
+#usr/share/pkgconfig/udev.pc
diff --git a/config/rootfiles/common/x86_64/glibc b/config/rootfiles/common/x86_64/glibc
index 82bb3010a..cc70e5ac3 100644
--- a/config/rootfiles/common/x86_64/glibc
+++ b/config/rootfiles/common/x86_64/glibc
@@ -1,51 +1,49 @@
#etc/ld.so.cache
etc/rpc
-lib/ld-2.27.so
+lib/ld-2.28.so
lib/ld-linux-x86-64.so.2
-lib/libBrokenLocale-2.27.so
+lib/libBrokenLocale-2.28.so
lib/libBrokenLocale.so.1
#lib/libSegFault.so
-lib/libanl-2.27.so
+lib/libanl-2.28.so
lib/libanl.so.1
-lib/libc-2.27.so
+lib/libc-2.28.so
lib/libc.so.6
-lib/libcidn-2.27.so
-lib/libcidn.so.1
-lib/libcrypt-2.27.so
+lib/libcrypt-2.28.so
lib/libcrypt.so.1
-lib/libdl-2.27.so
+lib/libdl-2.28.so
lib/libdl.so.2
-lib/libm-2.27.so
+lib/libm-2.28.so
lib/libm.so.6
#lib/libmemusage.so
-lib/libmvec-2.27.so
+lib/libmvec-2.28.so
lib/libmvec.so.1
-lib/libnsl-2.27.so
+lib/libnsl-2.28.so
lib/libnsl.so.1
-lib/libnss_compat-2.27.so
+lib/libnss_compat-2.28.so
lib/libnss_compat.so.2
-lib/libnss_db-2.27.so
+lib/libnss_db-2.28.so
lib/libnss_db.so.2
-lib/libnss_dns-2.27.so
+lib/libnss_dns-2.28.so
lib/libnss_dns.so.2
-lib/libnss_files-2.27.so
+lib/libnss_files-2.28.so
lib/libnss_files.so.2
-lib/libnss_hesiod-2.27.so
+lib/libnss_hesiod-2.28.so
lib/libnss_hesiod.so.2
-lib/libnss_nis-2.27.so
+lib/libnss_nis-2.28.so
lib/libnss_nis.so.2
-lib/libnss_nisplus-2.27.so
+lib/libnss_nisplus-2.28.so
lib/libnss_nisplus.so.2
#lib/libpcprofile.so
-lib/libpthread-2.27.so
+lib/libpthread-2.28.so
lib/libpthread.so.0
-lib/libresolv-2.27.so
+lib/libresolv-2.28.so
lib/libresolv.so.2
-lib/librt-2.27.so
+lib/librt-2.28.so
lib/librt.so.1
lib/libthread_db-1.0.so
lib/libthread_db.so.1
-lib/libutil-2.27.so
+lib/libutil-2.28.so
lib/libutil.so.1
sbin/ldconfig
#sbin/sln
@@ -66,7 +64,6 @@ usr/bin/locale
#usr/bin/sprof
#usr/bin/tzselect
#usr/bin/xtrace
-#usr/include/_G_config.h
#usr/include/a.out.h
#usr/include/aio.h
#usr/include/aliases.h
@@ -83,9 +80,7 @@ usr/bin/locale
#usr/include/arpa/tftp.h
#usr/include/assert.h
#usr/include/bits
-#usr/include/bits/_G_config.h
#usr/include/bits/a.out.h
-#usr/include/bits/byteswap-16.h
#usr/include/bits/byteswap.h
#usr/include/bits/cmathcalls.h
#usr/include/bits/confname.h
@@ -114,6 +109,7 @@ usr/bin/locale
#usr/include/bits/getopt_posix.h
#usr/include/bits/hwcap.h
#usr/include/bits/in.h
+#usr/include/bits/indirect-return.h
#usr/include/bits/initspin.h
#usr/include/bits/inotify.h
#usr/include/bits/ioctl-types.h
@@ -122,8 +118,6 @@ usr/bin/locale
#usr/include/bits/ipctypes.h
#usr/include/bits/iscanonical.h
#usr/include/bits/libc-header-start.h
-#usr/include/bits/libio-ldbl.h
-#usr/include/bits/libio.h
#usr/include/bits/libm-simd-decl-stubs.h
#usr/include/bits/link.h
#usr/include/bits/local_lim.h
@@ -132,6 +126,7 @@ usr/bin/locale
#usr/include/bits/math-finite.h
#usr/include/bits/math-vector.h
#usr/include/bits/mathcalls-helper-functions.h
+#usr/include/bits/mathcalls-narrow.h
#usr/include/bits/mathcalls.h
#usr/include/bits/mathdef.h
#usr/include/bits/mathinline.h
@@ -182,6 +177,7 @@ usr/bin/locale
#usr/include/bits/stat.h
#usr/include/bits/statfs.h
#usr/include/bits/statvfs.h
+#usr/include/bits/statx.h
#usr/include/bits/stdint-intn.h
#usr/include/bits/stdint-uintn.h
#usr/include/bits/stdio-ldbl.h
@@ -211,12 +207,16 @@ usr/bin/locale
#usr/include/bits/types.h
#usr/include/bits/types/FILE.h
#usr/include/bits/types/__FILE.h
+#usr/include/bits/types/__fpos64_t.h
+#usr/include/bits/types/__fpos_t.h
#usr/include/bits/types/__locale_t.h
#usr/include/bits/types/__mbstate_t.h
#usr/include/bits/types/__sigset_t.h
#usr/include/bits/types/__sigval_t.h
#usr/include/bits/types/clock_t.h
#usr/include/bits/types/clockid_t.h
+#usr/include/bits/types/cookie_io_functions_t.h
+#usr/include/bits/types/error_t.h
#usr/include/bits/types/locale_t.h
#usr/include/bits/types/mbstate_t.h
#usr/include/bits/types/res_state.h
@@ -226,10 +226,12 @@ usr/bin/locale
#usr/include/bits/types/sigset_t.h
#usr/include/bits/types/sigval_t.h
#usr/include/bits/types/stack_t.h
+#usr/include/bits/types/struct_FILE.h
#usr/include/bits/types/struct_iovec.h
#usr/include/bits/types/struct_itimerspec.h
#usr/include/bits/types/struct_osockaddr.h
#usr/include/bits/types/struct_rusage.h
+#usr/include/bits/types/struct_sched_param.h
#usr/include/bits/types/struct_sigstack.h
#usr/include/bits/types/struct_timespec.h
#usr/include/bits/types/struct_timeval.h
@@ -242,7 +244,6 @@ usr/bin/locale
#usr/include/bits/uio-ext.h
#usr/include/bits/uio_lim.h
#usr/include/bits/unistd.h
-#usr/include/bits/ustat.h
#usr/include/bits/utmp.h
#usr/include/bits/utmpx.h
#usr/include/bits/utsname.h
@@ -298,7 +299,6 @@ usr/bin/locale
#usr/include/lastlog.h
#usr/include/libgen.h
#usr/include/libintl.h
-#usr/include/libio.h
#usr/include/limits.h
#usr/include/link.h
#usr/include/locale.h
@@ -379,14 +379,12 @@ usr/bin/locale
#usr/include/rpc/auth_des.h
#usr/include/rpc/auth_unix.h
#usr/include/rpc/clnt.h
-#usr/include/rpc/des_crypt.h
#usr/include/rpc/key_prot.h
#usr/include/rpc/netdb.h
#usr/include/rpc/pmap_clnt.h
#usr/include/rpc/pmap_prot.h
#usr/include/rpc/pmap_rmt.h
#usr/include/rpc/rpc.h
-#usr/include/rpc/rpc_des.h
#usr/include/rpc/rpc_msg.h
#usr/include/rpc/svc.h
#usr/include/rpc/svc_auth.h
@@ -528,7 +526,6 @@ usr/bin/locale
#usr/include/sys/un.h
#usr/include/sys/unistd.h
#usr/include/sys/user.h
-#usr/include/sys/ustat.h
#usr/include/sys/utsname.h
#usr/include/sys/vfs.h
#usr/include/sys/vlimit.h
@@ -545,13 +542,13 @@ usr/bin/locale
#usr/include/termios.h
#usr/include/tgmath.h
#usr/include/thread_db.h
+#usr/include/threads.h
#usr/include/time.h
#usr/include/ttyent.h
#usr/include/uchar.h
#usr/include/ucontext.h
#usr/include/ulimit.h
#usr/include/unistd.h
-#usr/include/ustat.h
#usr/include/utime.h
#usr/include/utmp.h
#usr/include/utmpx.h
@@ -835,13 +832,12 @@ usr/lib/gconv
#usr/lib/libc.a
#usr/lib/libc.so
#usr/lib/libc_nonshared.a
-#usr/lib/libcidn.so
#usr/lib/libcrypt.a
#usr/lib/libcrypt.so
#usr/lib/libdl.a
#usr/lib/libdl.so
#usr/lib/libg.a
-#usr/lib/libm-2.27.a
+#usr/lib/libm-2.28.a
#usr/lib/libm.a
#usr/lib/libm.so
#usr/lib/libmcheck.a
@@ -859,7 +855,6 @@ usr/lib/gconv
#usr/lib/libnss_nisplus.so
#usr/lib/libpthread.a
#usr/lib/libpthread.so
-#usr/lib/libpthread_nonshared.a
#usr/lib/libresolv.a
#usr/lib/libresolv.so
#usr/lib/librpcsvc.a
@@ -2521,6 +2516,20 @@ usr/lib/locale
#usr/lib/locale/doi_IN/LC_PAPER
#usr/lib/locale/doi_IN/LC_TELEPHONE
#usr/lib/locale/doi_IN/LC_TIME
+#usr/lib/locale/dsb_DE
+#usr/lib/locale/dsb_DE/LC_ADDRESS
+#usr/lib/locale/dsb_DE/LC_COLLATE
+#usr/lib/locale/dsb_DE/LC_CTYPE
+#usr/lib/locale/dsb_DE/LC_IDENTIFICATION
+#usr/lib/locale/dsb_DE/LC_MEASUREMENT
+#usr/lib/locale/dsb_DE/LC_MESSAGES
+#usr/lib/locale/dsb_DE/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/dsb_DE/LC_MONETARY
+#usr/lib/locale/dsb_DE/LC_NAME
+#usr/lib/locale/dsb_DE/LC_NUMERIC
+#usr/lib/locale/dsb_DE/LC_PAPER
+#usr/lib/locale/dsb_DE/LC_TELEPHONE
+#usr/lib/locale/dsb_DE/LC_TIME
#usr/lib/locale/dv_MV
#usr/lib/locale/dv_MV/LC_ADDRESS
#usr/lib/locale/dv_MV/LC_COLLATE
@@ -6217,6 +6226,20 @@ usr/lib/locale
#usr/lib/locale/sa_IN/LC_PAPER
#usr/lib/locale/sa_IN/LC_TELEPHONE
#usr/lib/locale/sa_IN/LC_TIME
+#usr/lib/locale/sah_RU
+#usr/lib/locale/sah_RU/LC_ADDRESS
+#usr/lib/locale/sah_RU/LC_COLLATE
+#usr/lib/locale/sah_RU/LC_CTYPE
+#usr/lib/locale/sah_RU/LC_IDENTIFICATION
+#usr/lib/locale/sah_RU/LC_MEASUREMENT
+#usr/lib/locale/sah_RU/LC_MESSAGES
+#usr/lib/locale/sah_RU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/sah_RU/LC_MONETARY
+#usr/lib/locale/sah_RU/LC_NAME
+#usr/lib/locale/sah_RU/LC_NUMERIC
+#usr/lib/locale/sah_RU/LC_PAPER
+#usr/lib/locale/sah_RU/LC_TELEPHONE
+#usr/lib/locale/sah_RU/LC_TIME
#usr/lib/locale/sat_IN
#usr/lib/locale/sat_IN/LC_ADDRESS
#usr/lib/locale/sat_IN/LC_COLLATE
@@ -7967,6 +7990,7 @@ usr/lib/locale
#usr/share/i18n/locales/de_LU
#usr/share/i18n/locales/de_LU@euro
#usr/share/i18n/locales/doi_IN
+#usr/share/i18n/locales/dsb_DE
#usr/share/i18n/locales/dv_MV
#usr/share/i18n/locales/dz_BT
#usr/share/i18n/locales/el_CY
@@ -8150,6 +8174,7 @@ usr/lib/locale
#usr/share/i18n/locales/ru_UA
#usr/share/i18n/locales/rw_RW
#usr/share/i18n/locales/sa_IN
+#usr/share/i18n/locales/sah_RU
#usr/share/i18n/locales/sat_IN
#usr/share/i18n/locales/sc_IT
#usr/share/i18n/locales/sd_IN
diff --git a/config/rootfiles/common/xfsprogs b/config/rootfiles/common/xfsprogs
index 4c445341b..584ded0fe 100644
--- a/config/rootfiles/common/xfsprogs
+++ b/config/rootfiles/common/xfsprogs
@@ -3,14 +3,32 @@ lib/libhandle.so.1.0.3
sbin/fsck.xfs
sbin/mkfs.xfs
sbin/xfs_repair
+sbin/xfs_scrub
+sbin/xfs_scrub_all
+#usr/include/xfs
+#usr/include/xfs/handle.h
+#usr/include/xfs/jdm.h
+#usr/include/xfs/linux.h
+#usr/include/xfs/xfs.h
+#usr/include/xfs/xfs_arch.h
+#usr/include/xfs/xfs_da_format.h
+#usr/include/xfs/xfs_format.h
+#usr/include/xfs/xfs_fs.h
+#usr/include/xfs/xfs_log_format.h
+#usr/include/xfs/xfs_types.h
+#usr/include/xfs/xqm.h
+#usr/lib/libhandle.a
#usr/lib/libhandle.la
#usr/lib/libhandle.so
+#usr/lib/xfsprogs
+#usr/lib/xfsprogs/xfs_scrub_all.cron
usr/sbin/xfs_admin
usr/sbin/xfs_bmap
-usr/sbin/xfs_check
usr/sbin/xfs_copy
usr/sbin/xfs_db
+usr/sbin/xfs_estimate
usr/sbin/xfs_freeze
+usr/sbin/xfs_fsr
usr/sbin/xfs_growfs
usr/sbin/xfs_info
usr/sbin/xfs_io
@@ -21,22 +39,39 @@ usr/sbin/xfs_mkfile
usr/sbin/xfs_ncheck
usr/sbin/xfs_quota
usr/sbin/xfs_rtcp
+usr/sbin/xfs_spaceman
#usr/share/doc/xfsprogs
#usr/share/doc/xfsprogs/CHANGES.gz
-#usr/share/doc/xfsprogs/COPYING
#usr/share/doc/xfsprogs/CREDITS
-#usr/share/doc/xfsprogs/PORTING
#usr/share/doc/xfsprogs/README
+#usr/share/locale/de/LC_MESSAGES/xfsprogs.mo
#usr/share/locale/pl/LC_MESSAGES/xfsprogs.mo
+#usr/share/man/man2/ioctl_xfs_scrub_metadata.2
+#usr/share/man/man3/attr_list_by_handle.3
+#usr/share/man/man3/attr_multi_by_handle.3
+#usr/share/man/man3/fd_to_handle.3
+#usr/share/man/man3/free_handle.3
+#usr/share/man/man3/fssetdm_by_handle.3
+#usr/share/man/man3/getparentpaths_by_handle.3
+#usr/share/man/man3/getparents_by_handle.3
+#usr/share/man/man3/handle_to_fshandle.3
+#usr/share/man/man3/open_by_handle.3
+#usr/share/man/man3/path_to_fshandle.3
+#usr/share/man/man3/path_to_handle.3
+#usr/share/man/man3/readlink_by_handle.3
+#usr/share/man/man3/xfsctl.3
+#usr/share/man/man5/projects.5
+#usr/share/man/man5/projid.5
#usr/share/man/man5/xfs.5
#usr/share/man/man8/fsck.xfs.8
#usr/share/man/man8/mkfs.xfs.8
#usr/share/man/man8/xfs_admin.8
#usr/share/man/man8/xfs_bmap.8
-#usr/share/man/man8/xfs_check.8
#usr/share/man/man8/xfs_copy.8
#usr/share/man/man8/xfs_db.8
+#usr/share/man/man8/xfs_estimate.8
#usr/share/man/man8/xfs_freeze.8
+#usr/share/man/man8/xfs_fsr.8
#usr/share/man/man8/xfs_growfs.8
#usr/share/man/man8/xfs_info.8
#usr/share/man/man8/xfs_io.8
@@ -48,3 +83,6 @@ usr/sbin/xfs_rtcp
#usr/share/man/man8/xfs_quota.8
#usr/share/man/man8/xfs_repair.8
#usr/share/man/man8/xfs_rtcp.8
+#usr/share/man/man8/xfs_scrub.8
+#usr/share/man/man8/xfs_scrub_all.8
+#usr/share/man/man8/xfs_spaceman.8
diff --git a/config/rootfiles/core/125/filelists/aarch64/glibc b/config/rootfiles/core/125/filelists/aarch64/glibc
new file mode 120000
index 000000000..d13849ff9
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/aarch64/glibc
@@ -0,0 +1 @@
+../../../../common/aarch64/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/125/filelists/collectd b/config/rootfiles/core/125/filelists/collectd
new file mode 120000
index 000000000..871b32f14
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/collectd
@@ -0,0 +1 @@
+../../../common/collectd
\ No newline at end of file
diff --git a/config/rootfiles/core/125/filelists/coreutils b/config/rootfiles/core/125/filelists/coreutils
new file mode 120000
index 000000000..7351ed2cf
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/coreutils
@@ -0,0 +1 @@
+../../../common/coreutils
\ No newline at end of file
diff --git a/config/rootfiles/core/125/filelists/e2fsprogs b/config/rootfiles/core/125/filelists/e2fsprogs
new file mode 120000
index 000000000..37b55de69
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/e2fsprogs
@@ -0,0 +1 @@
+../../../common/e2fsprogs
\ No newline at end of file
diff --git a/config/rootfiles/core/125/filelists/files b/config/rootfiles/core/125/filelists/files
index 47c0e77f3..f2afb62fb 100644
--- a/config/rootfiles/core/125/filelists/files
+++ b/config/rootfiles/core/125/filelists/files
@@ -5,5 +5,6 @@ etc/sysctl.conf
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
srv/web/ipfire/cgi-bin/media.cgi
+srv/web/ipfire/cgi-bin/pakfire.cgi
usr/local/bin/makegraphs
var/ipfire/langs
diff --git a/config/rootfiles/core/125/filelists/i586/glibc b/config/rootfiles/core/125/filelists/i586/glibc
new file mode 120000
index 000000000..943021f19
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/i586/glibc
@@ -0,0 +1 @@
+../../../../common/i586/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/125/filelists/keyutils b/config/rootfiles/core/125/filelists/keyutils
new file mode 120000
index 000000000..4311917e5
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/keyutils
@@ -0,0 +1 @@
+../../../common/keyutils
\ No newline at end of file
diff --git a/config/rootfiles/core/125/filelists/kmod b/config/rootfiles/core/125/filelists/kmod
new file mode 120000
index 000000000..0020e197e
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/kmod
@@ -0,0 +1 @@
+../../../common/kmod
\ No newline at end of file
diff --git a/config/rootfiles/core/125/filelists/libaio b/config/rootfiles/core/125/filelists/libaio
new file mode 120000
index 000000000..9788a2bc1
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/libaio
@@ -0,0 +1 @@
+../../../common/libaio
\ No newline at end of file
diff --git a/config/rootfiles/core/125/filelists/lvm2 b/config/rootfiles/core/125/filelists/lvm2
new file mode 120000
index 000000000..d640870b7
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/lvm2
@@ -0,0 +1 @@
+../../../common/lvm2
\ No newline at end of file
diff --git a/config/rootfiles/core/125/filelists/ntfs-3g b/config/rootfiles/core/125/filelists/ntfs-3g
new file mode 120000
index 000000000..d93adc2a1
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/ntfs-3g
@@ -0,0 +1 @@
+../../../common/ntfs-3g
\ No newline at end of file
diff --git a/config/rootfiles/core/125/filelists/parted b/config/rootfiles/core/125/filelists/parted
new file mode 120000
index 000000000..89195d8e8
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/parted
@@ -0,0 +1 @@
+../../../common/parted
\ No newline at end of file
diff --git a/config/rootfiles/core/125/filelists/ppp b/config/rootfiles/core/125/filelists/ppp
new file mode 120000
index 000000000..4844a9b58
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/ppp
@@ -0,0 +1 @@
+../../../common/ppp
\ No newline at end of file
diff --git a/config/rootfiles/core/125/filelists/reiserfsprogs b/config/rootfiles/core/125/filelists/reiserfsprogs
new file mode 120000
index 000000000..008c3e891
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/reiserfsprogs
@@ -0,0 +1 @@
+../../../common/reiserfsprogs
\ No newline at end of file
diff --git a/config/rootfiles/core/125/filelists/udev b/config/rootfiles/core/125/filelists/udev
new file mode 120000
index 000000000..e967a1c92
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/udev
@@ -0,0 +1 @@
+../../../common/udev
\ No newline at end of file
diff --git a/config/rootfiles/core/125/filelists/x86_64/glibc b/config/rootfiles/core/125/filelists/x86_64/glibc
new file mode 120000
index 000000000..111909966
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/x86_64/glibc
@@ -0,0 +1 @@
+../../../../common/x86_64/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/125/filelists/xfsprogs b/config/rootfiles/core/125/filelists/xfsprogs
new file mode 120000
index 000000000..91032964d
--- /dev/null
+++ b/config/rootfiles/core/125/filelists/xfsprogs
@@ -0,0 +1 @@
+../../../common/xfsprogs
\ No newline at end of file
diff --git a/config/rootfiles/core/125/update.sh b/config/rootfiles/core/125/update.sh
index 0aad5b9cd..9d056f921 100644
--- a/config/rootfiles/core/125/update.sh
+++ b/config/rootfiles/core/125/update.sh
@@ -50,6 +50,9 @@ ldconfig
# Reload sysctl.conf
sysctl -p
+# restart init
+telinit u
+
# This update needs a reboot...
#touch /var/run/need_reboot
diff --git a/config/rootfiles/packages/libvirt b/config/rootfiles/packages/libvirt
index afa167d12..30b9d1329 100644
--- a/config/rootfiles/packages/libvirt
+++ b/config/rootfiles/packages/libvirt
@@ -8,6 +8,7 @@ etc/libvirt/libvirtd.conf
#etc/libvirt/nwfilter/allow-dhcp.xml
#etc/libvirt/nwfilter/allow-incoming-ipv4.xml
#etc/libvirt/nwfilter/allow-ipv4.xml
+#etc/libvirt/nwfilter/clean-traffic-gateway.xml
#etc/libvirt/nwfilter/clean-traffic.xml
#etc/libvirt/nwfilter/no-arp-ip-spoofing.xml
#etc/libvirt/nwfilter/no-arp-mac-spoofing.xml
@@ -61,19 +62,19 @@ usr/bin/virt-xml-validate
#usr/lib/libvirt-admin.la
#usr/lib/libvirt-admin.so
usr/lib/libvirt-admin.so.0
-usr/lib/libvirt-admin.so.0.4000.0
+usr/lib/libvirt-admin.so.0.4006.0
#usr/lib/libvirt-lxc.la
#usr/lib/libvirt-lxc.so
usr/lib/libvirt-lxc.so.0
-usr/lib/libvirt-lxc.so.0.4000.0
+usr/lib/libvirt-lxc.so.0.4006.0
#usr/lib/libvirt-qemu.la
#usr/lib/libvirt-qemu.so
usr/lib/libvirt-qemu.so.0
-usr/lib/libvirt-qemu.so.0.4000.0
+usr/lib/libvirt-qemu.so.0.4006.0
#usr/lib/libvirt.la
#usr/lib/libvirt.so
usr/lib/libvirt.so.0
-usr/lib/libvirt.so.0.4000.0
+usr/lib/libvirt.so.0.4006.0
#usr/lib/libvirt/connection-driver
#usr/lib/libvirt/connection-driver/libvirt_driver_interface.la
usr/lib/libvirt/connection-driver/libvirt_driver_interface.so
@@ -93,6 +94,9 @@ usr/lib/libvirt/lock-driver/lockd.so
#usr/lib/libvirt/storage-backend
#usr/lib/libvirt/storage-backend/libvirt_storage_backend_fs.la
usr/lib/libvirt/storage-backend/libvirt_storage_backend_fs.so
+#usr/lib/libvirt/storage-file
+#usr/lib/libvirt/storage-file/libvirt_storage_file_fs.la
+usr/lib/libvirt/storage-file/libvirt_storage_file_fs.so
#usr/lib/pkgconfig/libvirt-admin.pc
#usr/lib/pkgconfig/libvirt-lxc.pc
#usr/lib/pkgconfig/libvirt-qemu.pc
@@ -116,169 +120,171 @@ usr/sbin/virtlogd
#usr/share/augeas/lenses/tests/test_virtlogd.aug
#usr/share/augeas/lenses/virtlockd.aug
#usr/share/augeas/lenses/virtlogd.aug
-#usr/share/doc/libvirt-4.0.0
-#usr/share/doc/libvirt-4.0.0/html
-#usr/share/doc/libvirt-4.0.0/html/32favicon.png
-#usr/share/doc/libvirt-4.0.0/html/404.html
-#usr/share/doc/libvirt-4.0.0/html/acl.html
-#usr/share/doc/libvirt-4.0.0/html/aclpolkit.html
-#usr/share/doc/libvirt-4.0.0/html/api.html
-#usr/share/doc/libvirt-4.0.0/html/api_extension.html
-#usr/share/doc/libvirt-4.0.0/html/apps.html
-#usr/share/doc/libvirt-4.0.0/html/architecture.gif
-#usr/share/doc/libvirt-4.0.0/html/architecture.html
-#usr/share/doc/libvirt-4.0.0/html/auditlog.html
-#usr/share/doc/libvirt-4.0.0/html/auth.html
-#usr/share/doc/libvirt-4.0.0/html/bindings.html
-#usr/share/doc/libvirt-4.0.0/html/bugs.html
-#usr/share/doc/libvirt-4.0.0/html/cgroups.html
-#usr/share/doc/libvirt-4.0.0/html/compiling.html
-#usr/share/doc/libvirt-4.0.0/html/contact.html
-#usr/share/doc/libvirt-4.0.0/html/contribute.html
-#usr/share/doc/libvirt-4.0.0/html/csharp.html
-#usr/share/doc/libvirt-4.0.0/html/devguide.html
-#usr/share/doc/libvirt-4.0.0/html/docs.html
-#usr/share/doc/libvirt-4.0.0/html/downloads.html
-#usr/share/doc/libvirt-4.0.0/html/drivers.html
-#usr/share/doc/libvirt-4.0.0/html/drvbhyve.html
-#usr/share/doc/libvirt-4.0.0/html/drvesx.html
-#usr/share/doc/libvirt-4.0.0/html/drvhyperv.html
-#usr/share/doc/libvirt-4.0.0/html/drvlxc.html
-#usr/share/doc/libvirt-4.0.0/html/drvnodedev.html
-#usr/share/doc/libvirt-4.0.0/html/drvopenvz.html
-#usr/share/doc/libvirt-4.0.0/html/drvphyp.html
-#usr/share/doc/libvirt-4.0.0/html/drvqemu.html
-#usr/share/doc/libvirt-4.0.0/html/drvremote.html
-#usr/share/doc/libvirt-4.0.0/html/drvtest.html
-#usr/share/doc/libvirt-4.0.0/html/drvuml.html
-#usr/share/doc/libvirt-4.0.0/html/drvvbox.html
-#usr/share/doc/libvirt-4.0.0/html/drvvirtuozzo.html
-#usr/share/doc/libvirt-4.0.0/html/drvvmware.html
-#usr/share/doc/libvirt-4.0.0/html/drvxen.html
-#usr/share/doc/libvirt-4.0.0/html/errors.html
-#usr/share/doc/libvirt-4.0.0/html/firewall.html
-#usr/share/doc/libvirt-4.0.0/html/fonts
-#usr/share/doc/libvirt-4.0.0/html/fonts/LICENSE.md
-#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-bold-italic.woff
-#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-bold.woff
-#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-italic.woff
-#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-light-italic.woff
-#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-light.woff
-#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-mono-bold.woff
-#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-mono-light.woff
-#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-mono-regular.woff
-#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-mono-semibold.woff
-#usr/share/doc/libvirt-4.0.0/html/fonts/overpass-regular.woff
-#usr/share/doc/libvirt-4.0.0/html/fonts/stylesheet.css
-#usr/share/doc/libvirt-4.0.0/html/format.html
-#usr/share/doc/libvirt-4.0.0/html/formatcaps.html
-#usr/share/doc/libvirt-4.0.0/html/formatdomain.html
-#usr/share/doc/libvirt-4.0.0/html/formatdomaincaps.html
-#usr/share/doc/libvirt-4.0.0/html/formatnetwork.html
-#usr/share/doc/libvirt-4.0.0/html/formatnode.html
-#usr/share/doc/libvirt-4.0.0/html/formatnwfilter.html
-#usr/share/doc/libvirt-4.0.0/html/formatsecret.html
-#usr/share/doc/libvirt-4.0.0/html/formatsnapshot.html
-#usr/share/doc/libvirt-4.0.0/html/formatstorage.html
-#usr/share/doc/libvirt-4.0.0/html/formatstorageencryption.html
-#usr/share/doc/libvirt-4.0.0/html/generic.css
-#usr/share/doc/libvirt-4.0.0/html/goals.html
-#usr/share/doc/libvirt-4.0.0/html/governance.html
-#usr/share/doc/libvirt-4.0.0/html/hacking.html
-#usr/share/doc/libvirt-4.0.0/html/hooks.html
-#usr/share/doc/libvirt-4.0.0/html/html
-#usr/share/doc/libvirt-4.0.0/html/html/home.png
-#usr/share/doc/libvirt-4.0.0/html/html/index.html
-#usr/share/doc/libvirt-4.0.0/html/html/left.png
-#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-common.html
-#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-domain-snapshot.html
-#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-domain.html
-#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-event.html
-#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-host.html
-#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-interface.html
-#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-network.html
-#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-nodedev.html
-#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-nwfilter.html
-#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-secret.html
-#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-storage.html
-#usr/share/doc/libvirt-4.0.0/html/html/libvirt-libvirt-stream.html
-#usr/share/doc/libvirt-4.0.0/html/html/libvirt-virterror.html
-#usr/share/doc/libvirt-4.0.0/html/html/right.png
-#usr/share/doc/libvirt-4.0.0/html/html/up.png
-#usr/share/doc/libvirt-4.0.0/html/hvsupport.html
-#usr/share/doc/libvirt-4.0.0/html/index.html
-#usr/share/doc/libvirt-4.0.0/html/internals
-#usr/share/doc/libvirt-4.0.0/html/internals.html
-#usr/share/doc/libvirt-4.0.0/html/internals/command.html
-#usr/share/doc/libvirt-4.0.0/html/internals/eventloop.html
-#usr/share/doc/libvirt-4.0.0/html/internals/locking.html
-#usr/share/doc/libvirt-4.0.0/html/internals/oomtesting.html
-#usr/share/doc/libvirt-4.0.0/html/internals/rpc.html
-#usr/share/doc/libvirt-4.0.0/html/java.html
-#usr/share/doc/libvirt-4.0.0/html/libvirt-daemon-arch.png
-#usr/share/doc/libvirt-4.0.0/html/libvirt-driver-arch.png
-#usr/share/doc/libvirt-4.0.0/html/libvirt-object-model.png
-#usr/share/doc/libvirt-4.0.0/html/libvirt.css
-#usr/share/doc/libvirt-4.0.0/html/locking-lockd.html
-#usr/share/doc/libvirt-4.0.0/html/locking-sanlock.html
-#usr/share/doc/libvirt-4.0.0/html/locking.html
-#usr/share/doc/libvirt-4.0.0/html/logging.html
-#usr/share/doc/libvirt-4.0.0/html/logos
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-banner-dark-256.png
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-banner-dark-800.png
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-banner-dark.svg
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-banner-light-256.png
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-banner-light-800.png
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-banner-light.svg
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-base.svg
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-128.png
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-192.png
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-256.png
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-96.png
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-powered-128.png
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-powered-192.png
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-powered-256.png
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-powered-96.png
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-square-powered.svg
-#usr/share/doc/libvirt-4.0.0/html/logos/logo-square.svg
-#usr/share/doc/libvirt-4.0.0/html/main.css
-#usr/share/doc/libvirt-4.0.0/html/migration-managed-direct.png
-#usr/share/doc/libvirt-4.0.0/html/migration-managed-p2p.png
-#usr/share/doc/libvirt-4.0.0/html/migration-native.png
-#usr/share/doc/libvirt-4.0.0/html/migration-tunnel.png
-#usr/share/doc/libvirt-4.0.0/html/migration-unmanaged-direct.png
-#usr/share/doc/libvirt-4.0.0/html/migration.html
-#usr/share/doc/libvirt-4.0.0/html/mobile.css
-#usr/share/doc/libvirt-4.0.0/html/news-2005.html
-#usr/share/doc/libvirt-4.0.0/html/news-2006.html
-#usr/share/doc/libvirt-4.0.0/html/news-2007.html
-#usr/share/doc/libvirt-4.0.0/html/news-2008.html
-#usr/share/doc/libvirt-4.0.0/html/news-2009.html
-#usr/share/doc/libvirt-4.0.0/html/news-2010.html
-#usr/share/doc/libvirt-4.0.0/html/news-2011.html
-#usr/share/doc/libvirt-4.0.0/html/news-2012.html
-#usr/share/doc/libvirt-4.0.0/html/news-2013.html
-#usr/share/doc/libvirt-4.0.0/html/news-2014.html
-#usr/share/doc/libvirt-4.0.0/html/news-2015.html
-#usr/share/doc/libvirt-4.0.0/html/news-2016.html
-#usr/share/doc/libvirt-4.0.0/html/news.html
-#usr/share/doc/libvirt-4.0.0/html/node.gif
-#usr/share/doc/libvirt-4.0.0/html/nss.html
-#usr/share/doc/libvirt-4.0.0/html/pci-hotplug.html
-#usr/share/doc/libvirt-4.0.0/html/php.html
-#usr/share/doc/libvirt-4.0.0/html/python.html
-#usr/share/doc/libvirt-4.0.0/html/remote.html
-#usr/share/doc/libvirt-4.0.0/html/secureusage.html
-#usr/share/doc/libvirt-4.0.0/html/securityprocess.html
-#usr/share/doc/libvirt-4.0.0/html/storage.html
-#usr/share/doc/libvirt-4.0.0/html/support.html
-#usr/share/doc/libvirt-4.0.0/html/testapi.html
-#usr/share/doc/libvirt-4.0.0/html/testsuites.html
-#usr/share/doc/libvirt-4.0.0/html/testtck.html
-#usr/share/doc/libvirt-4.0.0/html/todo.html
-#usr/share/doc/libvirt-4.0.0/html/uri.html
-#usr/share/doc/libvirt-4.0.0/html/virshcmdref.html
-#usr/share/doc/libvirt-4.0.0/html/windows.html
+#usr/share/doc/libvirt-4.6.0
+#usr/share/doc/libvirt-4.6.0/html
+#usr/share/doc/libvirt-4.6.0/html/32favicon.png
+#usr/share/doc/libvirt-4.6.0/html/404.html
+#usr/share/doc/libvirt-4.6.0/html/acl.html
+#usr/share/doc/libvirt-4.6.0/html/aclpolkit.html
+#usr/share/doc/libvirt-4.6.0/html/api.html
+#usr/share/doc/libvirt-4.6.0/html/api_extension.html
+#usr/share/doc/libvirt-4.6.0/html/apps.html
+#usr/share/doc/libvirt-4.6.0/html/architecture.gif
+#usr/share/doc/libvirt-4.6.0/html/architecture.html
+#usr/share/doc/libvirt-4.6.0/html/auditlog.html
+#usr/share/doc/libvirt-4.6.0/html/auth.html
+#usr/share/doc/libvirt-4.6.0/html/bindings.html
+#usr/share/doc/libvirt-4.6.0/html/bugs.html
+#usr/share/doc/libvirt-4.6.0/html/cgroups.html
+#usr/share/doc/libvirt-4.6.0/html/compiling.html
+#usr/share/doc/libvirt-4.6.0/html/contact.html
+#usr/share/doc/libvirt-4.6.0/html/contribute.html
+#usr/share/doc/libvirt-4.6.0/html/csharp.html
+#usr/share/doc/libvirt-4.6.0/html/dbus.html
+#usr/share/doc/libvirt-4.6.0/html/devguide.html
+#usr/share/doc/libvirt-4.6.0/html/docs.html
+#usr/share/doc/libvirt-4.6.0/html/downloads.html
+#usr/share/doc/libvirt-4.6.0/html/drivers.html
+#usr/share/doc/libvirt-4.6.0/html/drvbhyve.html
+#usr/share/doc/libvirt-4.6.0/html/drvesx.html
+#usr/share/doc/libvirt-4.6.0/html/drvhyperv.html
+#usr/share/doc/libvirt-4.6.0/html/drvlxc.html
+#usr/share/doc/libvirt-4.6.0/html/drvnodedev.html
+#usr/share/doc/libvirt-4.6.0/html/drvopenvz.html
+#usr/share/doc/libvirt-4.6.0/html/drvphyp.html
+#usr/share/doc/libvirt-4.6.0/html/drvqemu.html
+#usr/share/doc/libvirt-4.6.0/html/drvremote.html
+#usr/share/doc/libvirt-4.6.0/html/drvtest.html
+#usr/share/doc/libvirt-4.6.0/html/drvuml.html
+#usr/share/doc/libvirt-4.6.0/html/drvvbox.html
+#usr/share/doc/libvirt-4.6.0/html/drvvirtuozzo.html
+#usr/share/doc/libvirt-4.6.0/html/drvvmware.html
+#usr/share/doc/libvirt-4.6.0/html/drvxen.html
+#usr/share/doc/libvirt-4.6.0/html/errors.html
+#usr/share/doc/libvirt-4.6.0/html/firewall.html
+#usr/share/doc/libvirt-4.6.0/html/fonts
+#usr/share/doc/libvirt-4.6.0/html/fonts/LICENSE.md
+#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-bold-italic.woff
+#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-bold.woff
+#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-italic.woff
+#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-light-italic.woff
+#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-light.woff
+#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-mono-bold.woff
+#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-mono-light.woff
+#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-mono-regular.woff
+#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-mono-semibold.woff
+#usr/share/doc/libvirt-4.6.0/html/fonts/overpass-regular.woff
+#usr/share/doc/libvirt-4.6.0/html/fonts/stylesheet.css
+#usr/share/doc/libvirt-4.6.0/html/format.html
+#usr/share/doc/libvirt-4.6.0/html/formatcaps.html
+#usr/share/doc/libvirt-4.6.0/html/formatdomain.html
+#usr/share/doc/libvirt-4.6.0/html/formatdomaincaps.html
+#usr/share/doc/libvirt-4.6.0/html/formatnetwork.html
+#usr/share/doc/libvirt-4.6.0/html/formatnode.html
+#usr/share/doc/libvirt-4.6.0/html/formatnwfilter.html
+#usr/share/doc/libvirt-4.6.0/html/formatsecret.html
+#usr/share/doc/libvirt-4.6.0/html/formatsnapshot.html
+#usr/share/doc/libvirt-4.6.0/html/formatstorage.html
+#usr/share/doc/libvirt-4.6.0/html/formatstorageencryption.html
+#usr/share/doc/libvirt-4.6.0/html/generic.css
+#usr/share/doc/libvirt-4.6.0/html/goals.html
+#usr/share/doc/libvirt-4.6.0/html/governance.html
+#usr/share/doc/libvirt-4.6.0/html/hacking.html
+#usr/share/doc/libvirt-4.6.0/html/hooks.html
+#usr/share/doc/libvirt-4.6.0/html/html
+#usr/share/doc/libvirt-4.6.0/html/html/home.png
+#usr/share/doc/libvirt-4.6.0/html/html/index.html
+#usr/share/doc/libvirt-4.6.0/html/html/left.png
+#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-common.html
+#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-domain-snapshot.html
+#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-domain.html
+#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-event.html
+#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-host.html
+#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-interface.html
+#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-network.html
+#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-nodedev.html
+#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-nwfilter.html
+#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-secret.html
+#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-storage.html
+#usr/share/doc/libvirt-4.6.0/html/html/libvirt-libvirt-stream.html
+#usr/share/doc/libvirt-4.6.0/html/html/libvirt-virterror.html
+#usr/share/doc/libvirt-4.6.0/html/html/right.png
+#usr/share/doc/libvirt-4.6.0/html/html/up.png
+#usr/share/doc/libvirt-4.6.0/html/hvsupport.html
+#usr/share/doc/libvirt-4.6.0/html/index.html
+#usr/share/doc/libvirt-4.6.0/html/internals
+#usr/share/doc/libvirt-4.6.0/html/internals.html
+#usr/share/doc/libvirt-4.6.0/html/internals/command.html
+#usr/share/doc/libvirt-4.6.0/html/internals/eventloop.html
+#usr/share/doc/libvirt-4.6.0/html/internals/locking.html
+#usr/share/doc/libvirt-4.6.0/html/internals/oomtesting.html
+#usr/share/doc/libvirt-4.6.0/html/internals/rpc.html
+#usr/share/doc/libvirt-4.6.0/html/java.html
+#usr/share/doc/libvirt-4.6.0/html/libvirt-daemon-arch.png
+#usr/share/doc/libvirt-4.6.0/html/libvirt-driver-arch.png
+#usr/share/doc/libvirt-4.6.0/html/libvirt-object-model.png
+#usr/share/doc/libvirt-4.6.0/html/libvirt.css
+#usr/share/doc/libvirt-4.6.0/html/locking-lockd.html
+#usr/share/doc/libvirt-4.6.0/html/locking-sanlock.html
+#usr/share/doc/libvirt-4.6.0/html/locking.html
+#usr/share/doc/libvirt-4.6.0/html/logging.html
+#usr/share/doc/libvirt-4.6.0/html/logos
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-dark-256.png
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-dark-800.png
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-dark.svg
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-light-256.png
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-light-800.png
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-banner-light.svg
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-base.svg
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-128.png
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-192.png
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-256.png
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-96.png
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-powered-128.png
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-powered-192.png
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-powered-256.png
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-powered-96.png
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-square-powered.svg
+#usr/share/doc/libvirt-4.6.0/html/logos/logo-square.svg
+#usr/share/doc/libvirt-4.6.0/html/main.css
+#usr/share/doc/libvirt-4.6.0/html/migration-managed-direct.png
+#usr/share/doc/libvirt-4.6.0/html/migration-managed-p2p.png
+#usr/share/doc/libvirt-4.6.0/html/migration-native.png
+#usr/share/doc/libvirt-4.6.0/html/migration-tunnel.png
+#usr/share/doc/libvirt-4.6.0/html/migration-unmanaged-direct.png
+#usr/share/doc/libvirt-4.6.0/html/migration.html
+#usr/share/doc/libvirt-4.6.0/html/mobile.css
+#usr/share/doc/libvirt-4.6.0/html/news-2005.html
+#usr/share/doc/libvirt-4.6.0/html/news-2006.html
+#usr/share/doc/libvirt-4.6.0/html/news-2007.html
+#usr/share/doc/libvirt-4.6.0/html/news-2008.html
+#usr/share/doc/libvirt-4.6.0/html/news-2009.html
+#usr/share/doc/libvirt-4.6.0/html/news-2010.html
+#usr/share/doc/libvirt-4.6.0/html/news-2011.html
+#usr/share/doc/libvirt-4.6.0/html/news-2012.html
+#usr/share/doc/libvirt-4.6.0/html/news-2013.html
+#usr/share/doc/libvirt-4.6.0/html/news-2014.html
+#usr/share/doc/libvirt-4.6.0/html/news-2015.html
+#usr/share/doc/libvirt-4.6.0/html/news-2016.html
+#usr/share/doc/libvirt-4.6.0/html/news.html
+#usr/share/doc/libvirt-4.6.0/html/node.gif
+#usr/share/doc/libvirt-4.6.0/html/nss.html
+#usr/share/doc/libvirt-4.6.0/html/pci-hotplug.html
+#usr/share/doc/libvirt-4.6.0/html/php.html
+#usr/share/doc/libvirt-4.6.0/html/platforms.html
+#usr/share/doc/libvirt-4.6.0/html/python.html
+#usr/share/doc/libvirt-4.6.0/html/remote.html
+#usr/share/doc/libvirt-4.6.0/html/secureusage.html
+#usr/share/doc/libvirt-4.6.0/html/securityprocess.html
+#usr/share/doc/libvirt-4.6.0/html/storage.html
+#usr/share/doc/libvirt-4.6.0/html/support.html
+#usr/share/doc/libvirt-4.6.0/html/testapi.html
+#usr/share/doc/libvirt-4.6.0/html/testsuites.html
+#usr/share/doc/libvirt-4.6.0/html/testtck.html
+#usr/share/doc/libvirt-4.6.0/html/todo.html
+#usr/share/doc/libvirt-4.6.0/html/uri.html
+#usr/share/doc/libvirt-4.6.0/html/virshcmdref.html
+#usr/share/doc/libvirt-4.6.0/html/windows.html
#usr/share/gtk-doc/html/libvirt
#usr/share/gtk-doc/html/libvirt/general.html
#usr/share/gtk-doc/html/libvirt/home.png
@@ -309,6 +315,8 @@ usr/share/libvirt/schemas/network.rng
usr/share/libvirt/schemas/networkcommon.rng
usr/share/libvirt/schemas/nodedev.rng
usr/share/libvirt/schemas/nwfilter.rng
+usr/share/libvirt/schemas/nwfilter_params.rng
+usr/share/libvirt/schemas/nwfilterbinding.rng
usr/share/libvirt/schemas/secret.rng
usr/share/libvirt/schemas/storagecommon.rng
usr/share/libvirt/schemas/storagepool.rng
@@ -325,7 +333,7 @@ usr/share/libvirt/schemas/storagevol.rng
#usr/share/man/man7/virkeycode-atset3.7
#usr/share/man/man7/virkeycode-linux.7
#usr/share/man/man7/virkeycode-osx.7
-#usr/share/man/man7/virkeycode-rfb.7
+#usr/share/man/man7/virkeycode-qnum.7
#usr/share/man/man7/virkeycode-usb.7
#usr/share/man/man7/virkeycode-win32.7
#usr/share/man/man7/virkeycode-xtkbd.7
@@ -345,8 +353,9 @@ var/ipfire/backup/addons/includes/libvirt
#var/lib/libvirt/lockd
#var/lib/libvirt/lockd/files
#var/lib/libvirt/qemu
+#var/lib/libvirt/swtpm
#var/log/libvirt
-#var/log/libvirt/lxc
#var/log/libvirt/qemu
-#var/log/libvirt/uml
-
+var/log/swtpm
+var/log/swtpm/libvirt
+var/log/swtpm/libvirt/qemu
diff --git a/config/rootfiles/packages/nfs b/config/rootfiles/packages/nfs
index 08fcca9fc..048762650 100644
--- a/config/rootfiles/packages/nfs
+++ b/config/rootfiles/packages/nfs
@@ -1,28 +1,17 @@
+etc/rc.d/init.d/nfs-server
sbin/mount.nfs
sbin/mount.nfs4
sbin/nfsdcltrack
sbin/osd_login
sbin/umount.nfs
sbin/umount.nfs4
-#usr/include/nfsidmap.h
-#usr/lib/libnfsidmap
-#usr/lib/libnfsidmap.a
-#usr/lib/libnfsidmap.la
-usr/lib/libnfsidmap.so
-usr/lib/libnfsidmap.so.0
-usr/lib/libnfsidmap.so.0.3.0
-#usr/lib/libnfsidmap/nsswitch.a
-#usr/lib/libnfsidmap/nsswitch.la
-usr/lib/libnfsidmap/nsswitch.so
-#usr/lib/libnfsidmap/static.a
-#usr/lib/libnfsidmap/static.la
-usr/lib/libnfsidmap/static.so
-#usr/lib/libnfsidmap/umich_ldap.a
-#usr/lib/libnfsidmap/umich_ldap.la
-usr/lib/libnfsidmap/umich_ldap.so
-#usr/lib/pkgconfig/libnfsidmap.pc
+#usr/include/nfsidmap_plugin.h
+usr/lib/libnfsidmap.so.1
+usr/lib/libnfsidmap.so.1.0.0
usr/sbin/exportfs
usr/sbin/mountstats
+usr/sbin/nfsconf
+usr/sbin/nfsidmap
usr/sbin/nfsiostat
usr/sbin/nfsstat
usr/sbin/rpc.idmapd
@@ -33,19 +22,21 @@ usr/sbin/rpcdebug
usr/sbin/showmount
usr/sbin/sm-notify
usr/sbin/start-statd
-#usr/share/man/man3/nfs4_uid_to_name.3
#usr/share/man/man5/exports.5
-#usr/share/man/man5/idmapd.conf.5
#usr/share/man/man5/nfs.5
+#usr/share/man/man5/nfs.conf.5
#usr/share/man/man5/nfsmount.conf.5
+#usr/share/man/man7/nfs.systemd.7
#usr/share/man/man7/nfsd.7
#usr/share/man/man8/exportfs.8
#usr/share/man/man8/idmapd.8
#usr/share/man/man8/mount.nfs.8
#usr/share/man/man8/mountd.8
#usr/share/man/man8/mountstats.8
+#usr/share/man/man8/nfsconf.8
#usr/share/man/man8/nfsd.8
#usr/share/man/man8/nfsdcltrack.8
+#usr/share/man/man8/nfsidmap.8
#usr/share/man/man8/nfsiostat.8
#usr/share/man/man8/nfsstat.8
#usr/share/man/man8/rpc.idmapd.8
@@ -64,6 +55,3 @@ var/lib/nfs/rmtab
var/lib/nfs/sm
var/lib/nfs/sm.bak
var/lib/nfs/state
-var/lib/nfs/xtab
-etc/rc.d/init.d/nfs-server
-var/ipfire/nfs/nfs-server
diff --git a/doc/language_issues.de b/doc/language_issues.de
index d99efac74..e9ca04548 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -259,6 +259,7 @@ WARNING: translation string unused: fwdfw rules
WARNING: translation string unused: fwdfw std network
WARNING: translation string unused: fwdfw till
WARNING: translation string unused: fwdfw time
+WARNING: translation string unused: fwdfw useless rule
WARNING: translation string unused: fwdfw xt access
WARNING: translation string unused: fwhost Custom Host
WARNING: translation string unused: fwhost Custom Network
@@ -469,6 +470,7 @@ WARNING: translation string unused: ovpn device
WARNING: translation string unused: ovpn dl
WARNING: translation string unused: ovpn engines
WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn mtu-disc
WARNING: translation string unused: ovpn mtu-disc and mtu not 1500
WARNING: translation string unused: ovpn mtu-disc maybe
WARNING: translation string unused: ovpn mtu-disc no
@@ -494,6 +496,9 @@ WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 60b6cbb46..de3048a4c 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -283,6 +283,7 @@ WARNING: translation string unused: fwdfw rules
WARNING: translation string unused: fwdfw std network
WARNING: translation string unused: fwdfw till
WARNING: translation string unused: fwdfw time
+WARNING: translation string unused: fwdfw useless rule
WARNING: translation string unused: fwdfw xt access
WARNING: translation string unused: fwhost Custom Host
WARNING: translation string unused: fwhost Custom Network
@@ -497,6 +498,7 @@ WARNING: translation string unused: ovpn device
WARNING: translation string unused: ovpn dl
WARNING: translation string unused: ovpn engines
WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn mtu-disc
WARNING: translation string unused: ovpn mtu-disc and mtu not 1500
WARNING: translation string unused: ovpn mtu-disc maybe
WARNING: translation string unused: ovpn mtu-disc no
@@ -521,6 +523,9 @@ WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
diff --git a/doc/language_issues.es b/doc/language_issues.es
index a9bf73f69..6a8acd6da 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -421,6 +421,9 @@ WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
@@ -894,7 +897,6 @@ WARNING: untranslated string: fwdfw togglelog
WARNING: untranslated string: fwdfw use nat
WARNING: untranslated string: fwdfw use srcport
WARNING: untranslated string: fwdfw use srv
-WARNING: untranslated string: fwdfw useless rule
WARNING: untranslated string: fwdfw warn1
WARNING: untranslated string: fwdfw wd_fri
WARNING: untranslated string: fwdfw wd_mon
@@ -1097,7 +1099,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates
WARNING: untranslated string: ovpn ha
WARNING: untranslated string: ovpn hmac
WARNING: untranslated string: ovpn mgmt in root range
-WARNING: untranslated string: ovpn mtu-disc
WARNING: untranslated string: ovpn no connections
WARNING: untranslated string: ovpn port in root range
WARNING: untranslated string: ovpn routes push
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 4aaf5d3fb..271179cc6 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -430,6 +430,9 @@ WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
@@ -903,7 +906,6 @@ WARNING: untranslated string: fwdfw togglelog
WARNING: untranslated string: fwdfw use nat
WARNING: untranslated string: fwdfw use srcport
WARNING: untranslated string: fwdfw use srv
-WARNING: untranslated string: fwdfw useless rule
WARNING: untranslated string: fwdfw warn1
WARNING: untranslated string: fwdfw wd_fri
WARNING: untranslated string: fwdfw wd_mon
@@ -1111,7 +1113,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates
WARNING: untranslated string: ovpn ha
WARNING: untranslated string: ovpn hmac
WARNING: untranslated string: ovpn mgmt in root range
-WARNING: untranslated string: ovpn mtu-disc
WARNING: untranslated string: ovpn no connections
WARNING: untranslated string: ovpn port in root range
WARNING: untranslated string: ovpn warning rfc3280
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 448c96bb1..ac51eb07c 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -259,6 +259,7 @@ WARNING: translation string unused: fwdfw rules
WARNING: translation string unused: fwdfw std network
WARNING: translation string unused: fwdfw till
WARNING: translation string unused: fwdfw time
+WARNING: translation string unused: fwdfw useless rule
WARNING: translation string unused: fwdfw xt access
WARNING: translation string unused: fwhost Custom Host
WARNING: translation string unused: fwhost Custom Network
@@ -469,6 +470,7 @@ WARNING: translation string unused: ovpn device
WARNING: translation string unused: ovpn dl
WARNING: translation string unused: ovpn engines
WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn mtu-disc
WARNING: translation string unused: ovpn mtu-disc and mtu not 1500
WARNING: translation string unused: ovpn mtu-disc maybe
WARNING: translation string unused: ovpn mtu-disc no
@@ -493,6 +495,9 @@ WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index a0216f0f7..18307d5af 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -258,6 +258,7 @@ WARNING: translation string unused: fwdfw rules
WARNING: translation string unused: fwdfw std network
WARNING: translation string unused: fwdfw till
WARNING: translation string unused: fwdfw time
+WARNING: translation string unused: fwdfw useless rule
WARNING: translation string unused: fwdfw xt access
WARNING: translation string unused: fwhost Custom Host
WARNING: translation string unused: fwhost Custom Network
@@ -466,6 +467,7 @@ WARNING: translation string unused: ovpn config
WARNING: translation string unused: ovpn device
WARNING: translation string unused: ovpn dl
WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn mtu-disc
WARNING: translation string unused: ovpn mtu-disc and mtu not 1500
WARNING: translation string unused: ovpn mtu-disc maybe
WARNING: translation string unused: ovpn mtu-disc no
@@ -490,6 +492,9 @@ WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index a9bf73f69..6a8acd6da 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -421,6 +421,9 @@ WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
@@ -894,7 +897,6 @@ WARNING: untranslated string: fwdfw togglelog
WARNING: untranslated string: fwdfw use nat
WARNING: untranslated string: fwdfw use srcport
WARNING: untranslated string: fwdfw use srv
-WARNING: untranslated string: fwdfw useless rule
WARNING: untranslated string: fwdfw warn1
WARNING: untranslated string: fwdfw wd_fri
WARNING: untranslated string: fwdfw wd_mon
@@ -1097,7 +1099,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates
WARNING: untranslated string: ovpn ha
WARNING: untranslated string: ovpn hmac
WARNING: untranslated string: ovpn mgmt in root range
-WARNING: untranslated string: ovpn mtu-disc
WARNING: untranslated string: ovpn no connections
WARNING: untranslated string: ovpn port in root range
WARNING: untranslated string: ovpn routes push
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index cbcaca1ec..3a7b6b95f 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -424,6 +424,9 @@ WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
@@ -888,7 +891,6 @@ WARNING: untranslated string: fwdfw togglelog
WARNING: untranslated string: fwdfw use nat
WARNING: untranslated string: fwdfw use srcport
WARNING: untranslated string: fwdfw use srv
-WARNING: untranslated string: fwdfw useless rule
WARNING: untranslated string: fwdfw warn1
WARNING: untranslated string: fwdfw wd_fri
WARNING: untranslated string: fwdfw wd_mon
@@ -1096,7 +1098,6 @@ WARNING: untranslated string: ovpn generating the root and host certificates
WARNING: untranslated string: ovpn ha
WARNING: untranslated string: ovpn hmac
WARNING: untranslated string: ovpn mgmt in root range
-WARNING: untranslated string: ovpn mtu-disc
WARNING: untranslated string: ovpn no connections
WARNING: untranslated string: ovpn port in root range
WARNING: untranslated string: ovpn warning rfc3280
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 8a7ca44c1..7b5bc0559 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -283,6 +283,7 @@ WARNING: translation string unused: fwdfw rules
WARNING: translation string unused: fwdfw std network
WARNING: translation string unused: fwdfw till
WARNING: translation string unused: fwdfw time
+WARNING: translation string unused: fwdfw useless rule
WARNING: translation string unused: fwdfw xt access
WARNING: translation string unused: fwhost Custom Host
WARNING: translation string unused: fwhost Custom Network
@@ -497,6 +498,7 @@ WARNING: translation string unused: ovpn device
WARNING: translation string unused: ovpn dl
WARNING: translation string unused: ovpn engines
WARNING: translation string unused: ovpn log
+WARNING: translation string unused: ovpn mtu-disc
WARNING: translation string unused: ovpn mtu-disc and mtu not 1500
WARNING: translation string unused: ovpn mtu-disc maybe
WARNING: translation string unused: ovpn mtu-disc no
@@ -521,6 +523,9 @@ WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire update daily
WARNING: translation string unused: pakfire updates
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 79ff636c8..e6f3cda94 100644
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -278,20 +278,6 @@ print <<END;
</table>
END
-&Header::closebox();
-&Header::openbox("100%", "center", "$Lang::tr{'settings'}");
-
-print <<END;
- <form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <table width='95%'>
- <tr><td colspan='2' bgcolor='$color{'color20'}'><b>$Lang::tr{'basic options'}</b></td></tr>
- <tr><td align='left' width='45%'>$Lang::tr{'pakfire update daily'}</td><td width="55%" align="left">
- on <input type='radio' name='AUTOUPDATE' value='on' $checked{'AUTOUPDATE'}{'on'} /> |
- <input type='radio' name='AUTOUPDATE' value='off' $checked{'AUTOUPDATE'}{'off'} /> off </td></tr>
- </table>
- </form>
-END
-
&Header::closebox();
&Header::closebigbox();
&Header::closepage();
diff --git a/lfs/Config b/lfs/Config
index 516fb1cab..76f279da9 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -37,10 +37,22 @@ ifeq "$(BUILD_ARCH)" "aarch64"
IS_64BIT = 1
endif
+ifeq "$(BUILD_ARCH)" "armv7hl"
+ IS_32BIT = 1
+endif
+
+ifeq "$(BUILD_ARCH)" "armv5tel"
+ IS_32BIT = 1
+endif
+
ifeq "$(BUILD_ARCH)" "x86_64"
IS_64BIT = 1
endif
+ifeq "$(BUILD_ARCH)" "i586"
+ IS_32BIT = 1
+endif
+
ifeq "$(TOOLCHAIN)" "1"
PREFIX = $(TOOLS_DIR)
else
diff --git a/lfs/bison b/lfs/bison
index e961a4956..c1a6103cd 100644
--- a/lfs/bison
+++ b/lfs/bison
@@ -24,7 +24,7 @@
include Config
-VER = 3.0.4
+VER = 3.0.5
THISAPP = bison-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -45,7 +45,7 @@ objects =$(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = c342201de104cc9ce0a21e0ad10d4021
+$(DL_FILE)_MD5 = 3e54f20988ecd1b62044e25481e5f06b
install : $(TARGET)
@@ -75,6 +75,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bison-3.0.5-gnulib-fseterr.patch
cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/collectd b/lfs/collectd
index fd5dd946a..9592ec95a 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -104,6 +104,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0021-openvpn-Fix-copy-and-paste-error.patch
cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch
cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/silence-openvpn-errors.patch
+ cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10.9-xfs-compile-fix.patch
+ cd $(DIR_APP) && autoreconf -vfi
+ cd $(DIR_APP)/libltdl && autoreconf -vfi
cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
--disable-{apple_sensors,csv,ipvs,mbmon,memcached,mysql} \
--disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,xmms} \
diff --git a/lfs/coreutils b/lfs/coreutils
index 567298450..2c282b194 100644
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -24,7 +24,7 @@
include Config
-VER = 8.29
+VER = 8.30
THISAPP = coreutils-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -50,6 +50,11 @@ CONFIGURE_OPTIONS += \
CFLAGS += -fno-strict-aliasing
+# Build with 32 bit time_t on 32 bit architectures
+ifeq "$(IS_32BIT)" "1"
+ export TIME_T_32_BIT_OK=yes
+endif
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -58,7 +63,7 @@ objects =$(DL_FILE)
$(DL_FILE)= $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 960cfe75a42c9907c71439f8eb436303
+$(DL_FILE)_MD5 = ab06d68949758971fe744db66b572816
install : $(TARGET)
diff --git a/lfs/e2fsprogs b/lfs/e2fsprogs
index 9e7988b9b..8fda71389 100644
--- a/lfs/e2fsprogs
+++ b/lfs/e2fsprogs
@@ -24,7 +24,7 @@
include Config
-VER = 1.42.13
+VER = 1.44.4
THISAPP = e2fsprogs-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = bc759fc62666786f5436e2075beb3265
+$(DL_FILE)_MD5 = 156e94a6169ca1fa3f0c6749ae5921b9
install : $(TARGET)
diff --git a/lfs/findutils b/lfs/findutils
index 970ace3c2..1ec69c99a 100644
--- a/lfs/findutils
+++ b/lfs/findutils
@@ -80,6 +80,13 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+
+ # Newer C libraries omit this include from sys/types.h.
+ # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html
+ cd $(DIR_APP) && sed -i gl/lib/mountlist.c \
+ -e "/include.*config.h/a#ifdef MAJOR_IN_SYSMACROS\n#include <sys/sysmacros.h>\n#endif\n"
+
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/findutils-4.6.0-glibc2.28.patch
cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/gcc b/lfs/gcc
index 77d1f264f..6fdf2ea31 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -224,6 +224,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
@mkdir $(DIR_SRC)/gcc-build
+ cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc-7-glibc-2.28-ustat.patch
+
cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
cd $(DIR_APP) && sed -i gcc/Makefile.in \
-e 's@\./fixinc\.sh@-c true@' \
diff --git a/lfs/glibc b/lfs/glibc
index 1fd7b6ae1..4530f2ddd 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -24,7 +24,7 @@
include Config
-VER = 2.27
+VER = 2.28
THISAPP = glibc-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -93,7 +93,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 898cd5656519ffbc3a03fe811dd89e82
+$(DL_FILE)_MD5 = c81d2388896379997bc359d4f2084239
install : $(TARGET)
diff --git a/lfs/gzip b/lfs/gzip
index a10abdd0a..eeea99dbe 100644
--- a/lfs/gzip
+++ b/lfs/gzip
@@ -41,6 +41,11 @@ else
EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
endif
+# Build with 32 bit time_t on 32 bit architectures
+ifeq "$(IS_32BIT)" "1"
+ export TIME_T_32_BIT_OK=yes
+endif
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -79,6 +84,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gzip-1.9-gnulib.patch
cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/keyutils b/lfs/keyutils
new file mode 100644
index 000000000..67b6f44fa
--- /dev/null
+++ b/lfs/keyutils
@@ -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 = 1.5.11
+
+THISAPP = keyutils-$(VER)
+DL_FILE = $(THISAPP).tar.bz2
+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 = bcc0984181572461850a37c39f8b167a
+
+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 axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make NO_ARLIB=1 install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/kmod b/lfs/kmod
index 38d5de963..bb49fbb3c 100644
--- a/lfs/kmod
+++ b/lfs/kmod
@@ -24,7 +24,7 @@
include Config
-VER = 13
+VER = 25
THISAPP = kmod-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d5aba43b9370cd52f3cb35e82a1aa595
+$(DL_FILE)_MD5 = 34f325cab568f842fdde4f8b2182f220
install : $(TARGET)
@@ -74,9 +74,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--prefix=/usr \
--bindir=/bin \
--sysconfdir=/etc \
- --disable-manpages
-
-# --libdir=/lib \
+ --disable-manpages \
+ --with-zlib
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/libaio b/lfs/libaio
new file mode 100644
index 000000000..f71c58909
--- /dev/null
+++ b/lfs/libaio
@@ -0,0 +1,80 @@
+###############################################################################
+# #
+# 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.3.111
+
+THISAPP = libaio-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = abb8f46d64b9bd3d0c6097e3a36639be
+
+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 axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && sed -e "s@-nostdlib -nostartfiles@@g" -i src/Makefile
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make prefix=/usr install
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/lfs/libvirt b/lfs/libvirt
index fe2fcecfe..fce1d25ad 100644
--- a/lfs/libvirt
+++ b/lfs/libvirt
@@ -24,7 +24,7 @@
include Config
-VER = 4.0.0
+VER = 4.6.0
THISAPP = libvirt-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
SUP_ARCH = i586 x86_64
PROG = libvirt
-PAK_VER = 15
+PAK_VER = 16
DEPS = "libpciaccess libyajl ncat qemu"
@@ -45,7 +45,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ff0dbdd8ec4ac1277588dfe3b245d0e9
+$(DL_FILE)_MD5 = 6ea17a8f004a4bcdfc4beaed91fcdddd
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
diff --git a/lfs/lvm2 b/lfs/lvm2
index 3e613e80b..fe6974279 100644
--- a/lfs/lvm2
+++ b/lfs/lvm2
@@ -24,7 +24,7 @@
include Config
-VER = 2.02.95
+VER = 2.02.181
THISAPP = LVM2.$(VER)
DL_FILE = $(THISAPP).tgz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = bd470a802046c807603618a443732ea7
+$(DL_FILE)_MD5 = 7d6380d9a34981fd7b605eaa371295b3
install : $(TARGET)
diff --git a/lfs/m4 b/lfs/m4
index 22610e887..3aa503fc4 100644
--- a/lfs/m4
+++ b/lfs/m4
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/m4-1.4.18-glibc-change-work-around.patch
cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/nfs b/lfs/nfs
index 2b4fe601b..adfc1a232 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -24,15 +24,15 @@
include Config
-VER = 1.3.3
+VER = 2.3.3
THISAPP = nfs-utils-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = nfs
-PAK_VER = 10
+PAK_VER = 11
DEPS = "rpcbind"
@@ -48,7 +48,7 @@ objects = $(DL_FILE) \
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
libnfsidmap-$(LIBNFSIDMAP).tar.gz = $(DL_FROM)/libnfsidmap-$(LIBNFSIDMAP).tar.gz
-$(DL_FILE)_MD5 = 9b87d890669eaaec8e97a2b0a35b2665
+$(DL_FILE)_MD5 = 11490e3f85a8676c647fe1bddbf32f99
libnfsidmap-$(LIBNFSIDMAP).tar.gz_MD5 = 2ac4893c92716add1a1447ae01df77ab
install : $(TARGET)
@@ -81,7 +81,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && tar zxf $(DIR_DL)/libnfsidmap-$(LIBNFSIDMAP).tar.gz
$(UPDATE_AUTOMAKE)
@@ -89,7 +89,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP)/libnfsidmap* && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP)/libnfsidmap* && make install
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/nfs-1.3.3-glibc-stdint.patch
cd $(DIR_APP) && ./configure \
--prefix=/usr \
--sysconfdir=/etc \
diff --git a/lfs/ntfs-3g b/lfs/ntfs-3g
index 9199c2bc6..90498f7cf 100644
--- a/lfs/ntfs-3g
+++ b/lfs/ntfs-3g
@@ -24,13 +24,13 @@
include Config
-VER = 2014.2.15
+VER = 2017.3.23
THISAPP = ntfs-3g_ntfsprogs-$(VER)
DL_FILE = $(THISAPP).tgz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = f11d563816249d730a00498983485f3a
+$(DL_FILE)_MD5 = d97474ae1954f772c6d2fa386a6f462c
install : $(TARGET)
@@ -73,7 +73,6 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- $(UPDATE_AUTOMAKE)
cd $(DIR_APP) && ./configure --prefix=/usr
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/parted b/lfs/parted
index bbaeff1a3..dc68ba850 100644
--- a/lfs/parted
+++ b/lfs/parted
@@ -79,6 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/parted-3.2-device-mapper.patch
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/parted-3.2-sysmacros.patch
cd $(DIR_APP) && ./configure --prefix=/usr --disable-device-mapper
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/perl b/lfs/perl
index 4eee16b80..a151e765b 100644
--- a/lfs/perl
+++ b/lfs/perl
@@ -90,10 +90,11 @@ ifeq "$(ROOT)" ""
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
else
- cd $(DIR_APP) && ./configure.gnu --prefix=$(TOOLS_DIR) -Dstatic_ext='Data/Dumper Fcntl IO'
+ cd $(DIR_APP) && ./Configure -des -Dprefix=$(TOOLS_DIR) \
+ -Dlibs="-lm" -Uloclibpth -Ulocincpth
cd $(DIR_APP) && sed -i 's/^0$$//' makefile
cd $(DIR_APP) && sed -i 's/^0$$//' x2p/makefile
- cd $(DIR_APP) && make perl utilities
+ cd $(DIR_APP) && make
cd $(DIR_APP) && cp -v perl pod/pod2man $(TOOLS_DIR)/bin
cd $(DIR_APP) && mkdir -pv $(TOOLS_DIR)/lib/perl5/$(VER)
cd $(DIR_APP) && cp -Rv lib/* $(TOOLS_DIR)/lib/perl5/$(VER)
diff --git a/lfs/ppp b/lfs/ppp
index 45fc2caab..f02864cc0 100644
--- a/lfs/ppp
+++ b/lfs/ppp
@@ -79,6 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/0014-everywhere-use-SOCK_CLOEXEC-when-creating-socket.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.6-increase-max-padi-attempts.patch
cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp/ppp-2.4.7-headers_4.9.patch
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/ppp-2.4.7-openssl.patch
cd $(DIR_APP) && sed -i -e "s+/etc/ppp/connect-errors+/var/log/connect-errors+" pppd/pathnames.h
cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
cd $(DIR_APP) && make $(MAKETUNING) CC="gcc" RPM_OPT_FLAGS="$(CFLAGS)"
diff --git a/lfs/reiserfsprogs b/lfs/reiserfsprogs
index 218796d1a..eaa03d787 100644
--- a/lfs/reiserfsprogs
+++ b/lfs/reiserfsprogs
@@ -24,7 +24,7 @@
include Config
-VER = 3.6.25
+VER = 3.6.27
THISAPP = reiserfsprogs-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 027a598b055dccb8da3aea1378a19f3c
+$(DL_FILE)_MD5 = 90c139542725efc6da3a6b1709695395
install : $(TARGET)
@@ -70,6 +70,8 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/reiserfsprogs-3.6.27-loff_t.patch
+ cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP) && ./configure --prefix=/usr --sbindir=/sbin
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
diff --git a/lfs/syslinux b/lfs/syslinux
index eecf3aefa..1670da27e 100644
--- a/lfs/syslinux
+++ b/lfs/syslinux
@@ -75,6 +75,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ # Apply patches
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.03-sysmacros.patch
+
# Build
cd $(DIR_APP) && make bios $(MAKETUNING)
ifeq "$(BUILD_ARCH)" "x86_64"
diff --git a/lfs/sysvinit b/lfs/sysvinit
index 82c4fa936..d85a3659b 100644
--- a/lfs/sysvinit
+++ b/lfs/sysvinit
@@ -70,6 +70,10 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ # Newer C libraries omit this include from sys/types.h.
+ # https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00018.html
+ cd $(DIR_APP) && sed -i src/mountpoint.c src/bootlogd.c \
+ -e "/include.*sys\/stat.h/a#include <sys/sysmacros.h>\n"
cd $(DIR_APP) && make $(MAKETUNING) -C src
cd $(DIR_APP) && make -C src install
@rm -rf $(DIR_APP)
diff --git a/lfs/udev b/lfs/udev
index d55dec450..b578ab54c 100644
--- a/lfs/udev
+++ b/lfs/udev
@@ -24,26 +24,26 @@
include Config
-VER = 208
+VER = 3.2.6
+RULES_VER = 20171102
-THISAPP = udev-$(VER)
-DL_FILE = systemd-$(VER).tar.xz
+THISAPP = eudev-$(VER)
+DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
-DIR_APP = $(DIR_SRC)/systemd-$(VER)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE) udev-lfs-208-1.tar.bz2
-
+objects = $(DL_FILE) udev-lfs-$(RULES_VER).tar.bz2
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-udev-lfs-$(VER)-1.tar.bz2 = $(DL_FROM)/udev-lfs-$(VER)-1.tar.bz2
+udev-lfs-$(RULES_VER).tar.bz2 = $(DL_FROM)/udev-lfs-$(RULES_VER).tar.bz2
-$(DL_FILE)_MD5 = df64550d92afbffb4f67a434193ee165
-udev-lfs-$(VER)-1.tar.bz2_MD5 = 67a5339e7ef1fa08f5db8315a5ea69e7
+$(DL_FILE)_MD5 = 902c4cdc9235838067cc69978a780e72
+udev-lfs-$(RULES_VER).tar.bz2_MD5 = d92afb0c6e8e616792068ee4737b0d24
install : $(TARGET)
@@ -73,27 +73,36 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(VER)-1.tar.bz2
+ cd $(DIR_APP) && tar axf $(DIR_DL)/udev-lfs-$(RULES_VER).tar.bz2
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-208_remove_systemd_log.patch
- cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/udev-208-fix_uint8_t.patch
+ cd $(DIR_APP) && ./configure \
+ --prefix=/usr \
+ --bindir=/bin \
+ --sbindir=/sbin \
+ --sysconfdir=/etc \
+ --libdir=/usr/lib \
+ --libexecdir=/lib \
+ --with-rootprefix= \
+ --with-rootlibdir=/lib \
+ --enable-manpages \
+ --disable-static
- rm -rf /lib/udev/devices
- install -dv /lib/firmware
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
- cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs $(MAKETUNING)
- cd $(DIR_APP) && make -f udev-lfs-$(VER)-1/Makefile.lfs install
+ # Generate hardware database
+ udevadm hwdb --update
- # Make some compat symlinks
- ln -sf /lib/udev/udevd /sbin/udevd
- ln -sf /sbin/udevadm /bin/udevadm
+ # Install rules
+ cd $(DIR_APP) && make -f udev-lfs-$(RULES_VER)/Makefile.lfs install
# Disable net generator rule. This does not work with the setup.
rm -f /lib/udev/rules.d/75-persistent-net-generator.rules
rm -f /lib/udev/rules.d/80-net-name-slot.rules
# Blacklist some modules
- cp -vf $(DIR_SRC)/config/udev/blacklist.conf /etc/modprobe.d/blacklist.conf
+ cp -vf $(DIR_SRC)/config/udev/blacklist.conf \
+ /etc/modprobe.d/blacklist.conf
# Install config file
install -v -m 644 $(DIR_SRC)/config/udev/udev.conf \
@@ -122,5 +131,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
/lib/udev/rules.d
install -m 755 $(DIR_SRC)/config/udev/enable_codel \
/lib/udev/enable_codel
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/lfs/xfsprogs b/lfs/xfsprogs
index c104e8490..b68e1b138 100644
--- a/lfs/xfsprogs
+++ b/lfs/xfsprogs
@@ -24,10 +24,10 @@
include Config
-VER = 2.9.4
+VER = 4.18.0
THISAPP = xfsprogs-$(VER)
-DL_FILE = xfsprogs_$(VER)-1.tar.gz
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 174683e3b86b587ed59823fdbbb96ea4
+$(DL_FILE)_MD5 = 5f80b631b68df89a8b9283307e96d2e8
install : $(TARGET)
@@ -72,13 +72,10 @@ $(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) && sed -i "/include/a #include <sys\/stat.h>" \
- libxfs/xfs_ialloc.c quota/quot.c mdrestore/xfs_mdrestore.c \
- rtcp/xfs_rtcp.c
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && make DEBUG=-DNDEBUG INSTALL_USER=root INSTALL_GROUP=root \
- LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes"
- cd $(DIR_APP) && make install
+ LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes"
+ cd $(DIR_APP) && make install install-dev
cd $(DIR_APP) && install -v -m755 -D libhandle/libhandle.la /usr/lib/libhandle.la
chmod -v 755 /lib/libhandle.so*
rm -f /lib/libhandle.{a,la,so}
diff --git a/make.sh b/make.sh
index c811f0573..b9558bc04 100755
--- a/make.sh
+++ b/make.sh
@@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
GIT_TAG=$(git tag | tail -1) # Git Tag
GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
-TOOLCHAINVER=20180606
+TOOLCHAINVER=20181024
###############################################################################
#
@@ -1083,6 +1083,9 @@ buildipfire() {
lfsmake2 configroot
lfsmake2 initscripts
lfsmake2 backup
+ lfsmake2 openssl
+ [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
+ lfsmake2 openssl-compat
lfsmake2 popt
lfsmake2 libusb
lfsmake2 libusb-compat
@@ -1101,6 +1104,7 @@ buildipfire() {
lfsmake2 cpio
lfsmake2 mdadm
lfsmake2 dracut
+ lfsmake2 libaio
lfsmake2 lvm2
lfsmake2 multipath-tools
lfsmake2 freetype
@@ -1169,9 +1173,6 @@ buildipfire() {
esac
lfsmake2 intel-microcode
lfsmake2 xtables-addons USPACE="1"
- lfsmake2 openssl
- [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
- lfsmake2 openssl-compat
lfsmake2 libgpg-error
lfsmake2 libgcrypt
lfsmake2 libassuan
@@ -1378,6 +1379,7 @@ buildipfire() {
lfsmake2 rsync
lfsmake2 libtirpc
lfsmake2 rpcbind
+ lfsmake2 keyutils
lfsmake2 nfs
lfsmake2 gnu-netcat
lfsmake2 ncat
diff --git a/src/patches/bison-3.0.5-gnulib-fseterr.patch b/src/patches/bison-3.0.5-gnulib-fseterr.patch
new file mode 100644
index 000000000..cd2a48289
--- /dev/null
+++ b/src/patches/bison-3.0.5-gnulib-fseterr.patch
@@ -0,0 +1,19 @@
+commit 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e
+Author: Paul Eggert <address@hidden>
+Date: Mon Mar 5 10:56:29 2018 -0800
+
+ fflush: adjust to glibc 2.28 libio.h removal
+ (Only part of this commit was backported as needed.)
+
+diff -Nrup a/lib/fseterr.c b/lib/fseterr.c
+--- a/lib/fseterr.c 2018-05-08 06:02:48.000000000 -0400
++++ b/lib/fseterr.c 2018-08-14 16:06:19.636282264 -0400
+@@ -29,7 +29,7 @@ fseterr (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1
+ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags |= _IO_ERR_SEEN;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
diff --git a/src/patches/collectd-4.10.9-xfs-compile-fix.patch b/src/patches/collectd-4.10.9-xfs-compile-fix.patch
new file mode 100644
index 000000000..f622104a7
--- /dev/null
+++ b/src/patches/collectd-4.10.9-xfs-compile-fix.patch
@@ -0,0 +1,28 @@
+--- collectd-4.10.9/src/utils_mount.c~ 2018-10-23 12:16:24.979393842 +0000
++++ collectd-4.10.9/src/utils_mount.c 2018-10-23 12:18:44.473984419 +0000
+@@ -21,20 +21,22 @@
+ * Niki W. Waibel <niki.waibel(a)gmx.net>
+ **/
+
++#define _GNU_SOURCE
++
+ #if HAVE_CONFIG_H
+ # include "config.h"
+ #endif
+
+ #include "common.h"
++#include "plugin.h"
++#include "utils_mount.h"
++
+ #if HAVE_XFS_XQM_H
+ # include <xfs/xqm.h>
+ #define XFS_SUPER_MAGIC_STR "XFSB"
+ #define XFS_SUPER_MAGIC2_STR "BSFX"
+ #endif
+
+-#include "plugin.h"
+-#include "utils_mount.h"
+-
+ #if HAVE_GETVFSSTAT
+ # if HAVE_SYS_TYPES_H
+ # include <sys/types.h>
diff --git a/src/patches/findutils-4.6.0-glibc2.28.patch b/src/patches/findutils-4.6.0-glibc2.28.patch
new file mode 100644
index 000000000..651c2d265
--- /dev/null
+++ b/src/patches/findutils-4.6.0-glibc2.28.patch
@@ -0,0 +1,335 @@
+Fix build failure on glibc-2.28:
+ fseeko.c: In function 'rpl_fseeko':
+ fseeko.c:110:4: error: #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib."
+ #error "Please port gnulib fseeko.c to your platform! Look at the code in fseeko.c, then report this to bug-gnulib."
+
+Patch by milan hodoscek.
+
+https://bugs.gentoo.org/663242
+--- a/old/stdio-impl.h
++++ b/gl/lib/stdio-impl.h
+@@ -1,5 +1,5 @@
+ /* Implementation details of FILE streams.
+- Copyright (C) 2007-2008, 2010-2015 Free Software Foundation, Inc.
++ Copyright (C) 2007-2008, 2010-2018 Free Software Foundation, Inc.
+
+ 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
+@@ -12,12 +12,18 @@
+ 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/>. */
++ along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+ /* Many stdio implementations have the same logic and therefore can share
+ the same implementation of stdio extension API, except that some fields
+ have different naming conventions, or their access requires some casts. */
+
++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
++ problem by defining it ourselves. FIXME: Do not rely on glibc
++ internals. */
++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
++# define _IO_IN_BACKUP 0x100
++#endif
+
+ /* BSD stdio derived implementations. */
+
+@@ -29,10 +35,10 @@
+ #include <errno.h> /* For detecting Plan9. */
+
+ #if defined __sferror || defined __DragonFly__ || defined __ANDROID__
+- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+
+ # if defined __DragonFly__ /* DragonFly */
+- /* See <http://www.dragonflybsd.org/cvsweb/src/lib/libc/stdio/priv_stdio.h?rev=HEAD…>. */
++ /* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/lib/libc/std…>. */
+ # define fp_ ((struct { struct __FILE_public pub; \
+ struct { unsigned char *_base; int _size; } _bf; \
+ void *cookie; \
+@@ -49,30 +55,84 @@
+ fpos_t _offset; \
+ /* More fields, not relevant here. */ \
+ } *) fp)
+- /* See <http://www.dragonflybsd.org/cvsweb/src/include/stdio.h?rev=HEAD&content-typ…>. */
++ /* See <https://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/include/stdi…>. */
+ # define _p pub._p
+ # define _flags pub._flags
+ # define _r pub._r
+ # define _w pub._w
++# elif defined __ANDROID__ /* Android */
++ /* Up to this commit from 2015-10-12
++ <https://android.googlesource.com/platform/bionic.git/+/f0141dfab10a4b332769…>
++ the innards of FILE were public, and fp_ub could be defined like for OpenBSD,
++ see <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a56…>
++ and <https://android.googlesource.com/platform/bionic.git/+/e78392637d5086384a56…>.
++ After this commit, the innards of FILE are hidden. */
++# define fp_ ((struct { unsigned char *_p; \
++ int _r; \
++ int _w; \
++ int _flags; \
++ int _file; \
++ struct { unsigned char *_base; size_t _size; } _bf; \
++ int _lbfsize; \
++ void *_cookie; \
++ void *_close; \
++ void *_read; \
++ void *_seek; \
++ void *_write; \
++ struct { unsigned char *_base; size_t _size; } _ext; \
++ unsigned char *_up; \
++ int _ur; \
++ unsigned char _ubuf[3]; \
++ unsigned char _nbuf[1]; \
++ struct { unsigned char *_base; size_t _size; } _lb; \
++ int _blksize; \
++ fpos_t _offset; \
++ /* More fields, not relevant here. */ \
++ } *) fp)
+ # else
+ # define fp_ fp
+ # endif
+
+-# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __ANDROID__ /* NetBSD >= 1.5ZA, OpenBSD, Android */
++# if (defined __NetBSD__ && __NetBSD_Version__ >= 105270000) || defined __OpenBSD__ || defined __minix /* NetBSD >= 1.5ZA, OpenBSD, Minix 3 */
+ /* See <http://cvsweb.netbsd.org/bsdweb.cgi/src/lib/libc/stdio/fileext.h?rev=HEAD&c…>
+- and <http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=HEAD…> */
++ and <https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libc/stdio/fileext.h?rev=…>
++ and <https://github.com/Stichting-MINIX-Research-Foundation/minix/blob/master/li…> */
+ struct __sfileext
+ {
+ struct __sbuf _ub; /* ungetc buffer */
+ /* More fields, not relevant here. */
+ };
+ # define fp_ub ((struct __sfileext *) fp->_ext._base)->_ub
+-# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin, Android */
++# elif defined __ANDROID__ /* Android */
++ struct __sfileext
++ {
++ struct { unsigned char *_base; size_t _size; } _ub; /* ungetc buffer */
++ /* More fields, not relevant here. */
++ };
++# define fp_ub ((struct __sfileext *) fp_->_ext._base)->_ub
++# else /* FreeBSD, NetBSD <= 1.5Z, DragonFly, Mac OS X, Cygwin */
+ # define fp_ub fp_->_ub
+ # endif
+
+ # define HASUB(fp) (fp_ub._base != NULL)
+
++# if defined __ANDROID__ /* Android */
++ /* Needed after this commit from 2016-01-25
++ <https://android.googlesource.com/platform/bionic.git/+/e70e0e9267d069bf56a5…> */
++# ifndef __SEOF
++# define __SLBF 1
++# define __SNBF 2
++# define __SRD 4
++# define __SWR 8
++# define __SRW 0x10
++# define __SEOF 0x20
++# define __SERR 0x40
++# endif
++# ifndef __SOFF
++# define __SOFF 0x1000
++# endif
++# endif
++
+ #endif
+
+
+@@ -81,7 +141,7 @@
+ #ifdef __TANDEM /* NonStop Kernel */
+ # ifndef _IOERR
+ /* These values were determined by the program 'stdioext-flags' at
+- <http://lists.gnu.org/archive/html/bug-gnulib/2010-12/msg00165.html>. */
++ <https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html>. */
+ # define _IOERR 0x40
+ # define _IOREAD 0x80
+ # define _IOWRT 0x4
+@@ -99,6 +159,8 @@
+ int _file; \
+ unsigned int _flag; \
+ } *) fp)
++# elif defined __VMS /* OpenVMS */
++# define fp_ ((struct _iobuf *) fp)
+ # else
+ # define fp_ fp
+ # endif
+@@ -110,4 +172,31 @@
+ # define _flag __flag
+ # endif
+
++#elif defined _WIN32 && ! defined __CYGWIN__ /* newer Windows with MSVC */
++
++/* <stdio.h> does not define the innards of FILE any more. */
++# define WINDOWS_OPAQUE_FILE
++
++struct _gl_real_FILE
++{
++ /* Note: Compared to older Windows and to mingw, it has the fields
++ _base and _cnt swapped. */
++ unsigned char *_ptr;
++ unsigned char *_base;
++ int _cnt;
++ int _flag;
++ int _file;
++ int _charbuf;
++ int _bufsiz;
++};
++# define fp_ ((struct _gl_real_FILE *) fp)
++
++/* These values were determined by a program similar to the one at
++ <https://lists.gnu.org/r/bug-gnulib/2010-12/msg00165.html>. */
++# define _IOREAD 0x1
++# define _IOWRT 0x2
++# define _IORW 0x4
++# define _IOEOF 0x8
++# define _IOERR 0x10
++
+ #endif
+--- a/old/fseeko.c
++++ b/gl/lib/fseeko.c
+@@ -1,5 +1,5 @@
+ /* An fseeko() function that, together with fflush(), is POSIX compliant.
+- Copyright (C) 2007-2015 Free Software Foundation, Inc.
++ Copyright (C) 2007-2018 Free Software Foundation, Inc.
+
+ 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
+@@ -12,7 +12,7 @@
+ 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/>. */
++ with this program; if not, see <https://www.gnu.org/licenses/>. */
+
+ #include <config.h>
+
+@@ -33,9 +33,9 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+ #if _GL_WINDOWS_64_BIT_OFF_T
+ # undef fseeko
+-# if HAVE__FSEEKI64 /* msvc, mingw64 */
++# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, mingw64 */
+ # define fseeko _fseeki64
+-# else /* mingw */
++# else /* mingw before msvcrt8.0 */
+ # define fseeko fseeko64
+ # endif
+ #endif
+@@ -47,12 +47,13 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+
+ /* These tests are based on fpurge.c. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_read_end == fp->_IO_read_ptr
+ && fp->_IO_write_ptr == fp->_IO_write_base
+ && fp->_IO_save_base == NULL)
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+ # if defined __SL64 && defined __SCLE /* Cygwin */
+ if ((fp->_flags & __SL64) == 0)
+ {
+@@ -80,7 +81,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #elif defined __minix /* Minix */
+ if (fp_->_ptr == fp_->_buf
+ && (fp_->_ptr == NULL || fp_->_count == 0))
+-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
++#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
+ if (fp_->_ptr == fp_->_base
+ && (fp_->_ptr == NULL || fp_->_cnt == 0))
+ #elif defined __UCLIBC__ /* uClibc */
+@@ -117,18 +118,19 @@ fseeko (FILE *fp, off_t offset, int whence)
+ if (pos == -1)
+ {
+ #if defined __sferror || defined __DragonFly__ || defined __ANDROID__
+- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+ fp_->_flags &= ~__SOFF;
+ #endif
+ return -1;
+ }
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags &= ~_IO_EOF_SEEN;
+ fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+-# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000)
++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
++# if defined __CYGWIN__ || (defined __NetBSD__ && __NetBSD_Version__ >= 600000000) || defined __minix
+ /* fp_->_offset is typed as an integer. */
+ fp_->_offset = pos;
+ # else
+@@ -150,8 +152,8 @@ fseeko (FILE *fp, off_t offset, int whence)
+ fp_->_flags &= ~__SEOF;
+ #elif defined __EMX__ /* emx+gcc */
+ fp->_flags &= ~_IOEOF;
+-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
+- fp->_flag &= ~_IOEOF;
++#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
++ fp_->_flag &= ~_IOEOF;
+ #elif defined __MINT__ /* Atari FreeMiNT */
+ fp->__offset = pos;
+ fp->__eof = 0;
+--- a/old/freadahead.c
++++ b/gl/lib/freadahead.c
+@@ -1,5 +1,5 @@
+ /* Retrieve information about a FILE stream.
+- Copyright (C) 2007-2015 Free Software Foundation, Inc.
++ Copyright (C) 2007-2018 Free Software Foundation, Inc.
+
+ 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
+@@ -12,7 +12,7 @@
+ 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/>. */
++ along with this program. If not, see <https://www.gnu.org/licenses/>. */
+
+ #include <config.h>
+
+@@ -22,17 +22,26 @@
+ #include <stdlib.h>
+ #include "stdio-impl.h"
+
++#if defined __DragonFly__
++/* Defined in libc, but not declared in <stdio.h>. */
++extern size_t __sreadahead (FILE *);
++#endif
++
++/* This file is not used on systems that have the __freadahead function,
++ namely musl libc. */
++
+ size_t
+ freadahead (FILE *fp)
+ {
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_write_ptr > fp->_IO_write_base)
+ return 0;
+ return (fp->_IO_read_end - fp->_IO_read_ptr)
+ + (fp->_flags & _IO_IN_BACKUP ? fp->_IO_save_end - fp->_IO_save_base :
+ 0);
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+- /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
++ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+ if ((fp_->_flags & __SWR) != 0 || fp_->_r < 0)
+ return 0;
+ # if defined __DragonFly__
+@@ -53,7 +62,7 @@ freadahead (FILE *fp)
+ if ((fp_->_flags & _IOWRITING) != 0)
+ return 0;
+ return fp_->_count;
+-#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
++#elif defined _IOERR /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
+ if ((fp_->_flag & _IOWRT) != 0)
+ return 0;
+ return fp_->_cnt;
diff --git a/src/patches/gcc-7-glibc-2.28-ustat.patch b/src/patches/gcc-7-glibc-2.28-ustat.patch
new file mode 100644
index 000000000..7c56292d1
--- /dev/null
+++ b/src/patches/gcc-7-glibc-2.28-ustat.patch
@@ -0,0 +1,31 @@
+--- libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2018/04/25 07:39:32 259630
++++ libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2018/05/24 20:07:25 260687
+@@ -157,7 +157,6 @@
+ # include <sys/procfs.h>
+ #endif
+ #include <sys/user.h>
+-#include <sys/ustat.h>
+ #include <linux/cyclades.h>
+ #include <linux/if_eql.h>
+ #include <linux/if_plip.h>
+@@ -250,7 +249,19 @@
+ #endif // SANITIZER_LINUX || SANITIZER_FREEBSD
+
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+- unsigned struct_ustat_sz = sizeof(struct ustat);
++ // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which
++ // has been removed from glibc 2.28.
++#if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \
++ || defined(__powerpc64__) || defined(__arch64__) || defined(__sparcv9) \
++ || defined(__x86_64__)
++#define SIZEOF_STRUCT_USTAT 32
++#elif defined(__arm__) || defined(__i386__) || defined(__mips__) \
++ || defined(__powerpc__) || defined(__s390__)
++#define SIZEOF_STRUCT_USTAT 20
++#else
++#error Unknown size of struct ustat
++#endif
++ unsigned struct_ustat_sz = SIZEOF_STRUCT_USTAT;
+ unsigned struct_rlimit64_sz = sizeof(struct rlimit64);
+ unsigned struct_statvfs64_sz = sizeof(struct statvfs64);
+ #endif // SANITIZER_LINUX && !SANITIZER_ANDROID
diff --git a/src/patches/gzip-1.9-gnulib.patch b/src/patches/gzip-1.9-gnulib.patch
new file mode 100644
index 000000000..68e8d518a
--- /dev/null
+++ b/src/patches/gzip-1.9-gnulib.patch
@@ -0,0 +1,189 @@
+From 1831628c0630ae96a43586b2a25ca51cbdba3e53 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <address@hidden>
+Date: Mon, 5 Mar 2018 10:56:29 -0800
+Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Problem reported by Daniel P. Berrangé in:
+https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
+* lib/fbufmode.c (fbufmode):
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpending.c (__fpending):
+* lib/fpurge.c (fpurge):
+* lib/freadable.c (freadable):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/freadptr.c (freadptr):
+* lib/freadseek.c (freadptrinc):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+* lib/fwritable.c (fwritable):
+* lib/fwriting.c (fwriting):
+Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
+* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
+Define if not already defined.
+---
+ ChangeLog | 23 +++++++++++++++++++++++
+ lib/fbufmode.c | 2 +-
+ lib/fflush.c | 6 +++---
+ lib/fpending.c | 2 +-
+ lib/fpurge.c | 2 +-
+ lib/freadable.c | 2 +-
+ lib/freadahead.c | 2 +-
+ lib/freading.c | 2 +-
+ lib/freadptr.c | 2 +-
+ lib/freadseek.c | 2 +-
+ lib/fseeko.c | 4 ++--
+ lib/fseterr.c | 2 +-
+ lib/fwritable.c | 2 +-
+ lib/fwriting.c | 2 +-
+ lib/stdio-impl.h | 6 ++++++
+ 15 files changed, 45 insertions(+), 16 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 667f91663..beb835670 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,26 @@
++2018-03-05 Paul Eggert <address@hidden>
++
++ fflush: adjust to glibc 2.28 libio.h removal
++ Problem reported by Daniel P. Berrangé in:
++ https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
++ * lib/fbufmode.c (fbufmode):
++ * lib/fflush.c (clear_ungetc_buffer_preserving_position)
++ (disable_seek_optimization, rpl_fflush):
++ * lib/fpending.c (__fpending):
++ * lib/fpurge.c (fpurge):
++ * lib/freadable.c (freadable):
++ * lib/freadahead.c (freadahead):
++ * lib/freading.c (freading):
++ * lib/freadptr.c (freadptr):
++ * lib/freadseek.c (freadptrinc):
++ * lib/fseeko.c (fseeko):
++ * lib/fseterr.c (fseterr):
++ * lib/fwritable.c (fwritable):
++ * lib/fwriting.c (fwriting):
++ Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
++ * lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
++ Define if not already defined.
++
+ 2018-01-07 Jim Meyering <meyering(a)fb.com>
+
+ version 1.9
+ * NEWS: Record release date.
+diff --git a/lib/fflush.c b/lib/fflush.c
+index 983ade0ff..a6edfa105 100644
+--- a/lib/fflush.c
++++ b/lib/fflush.c
+@@ -33,7 +33,7 @@
+ #undef fflush
+
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
+ static void
+@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
+
+ #endif
+
+-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
+ if (stream == NULL || ! freading (stream))
+ return fflush (stream);
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ clear_ungetc_buffer_preserving_position (stream);
+
+diff --git a/lib/fpurge.c b/lib/fpurge.c
+index b1d417c7a..3aedcc373 100644
+--- a/lib/fpurge.c
++++ b/lib/fpurge.c
+@@ -62,7 +62,7 @@ fpurge (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_IO_read_end = fp->_IO_read_ptr;
+ fp->_IO_write_ptr = fp->_IO_write_base;
+ /* Avoid memory leak when there is an active ungetc buffer. */
+diff --git a/lib/freading.c b/lib/freading.c
+index 73c28acdd..c24d0c88a 100644
+--- a/lib/freading.c
++++ b/lib/freading.c
+@@ -31,7 +31,7 @@ freading (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ return ((fp->_flags & _IO_NO_WRITES) != 0
+ || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+ && fp->_IO_read_base != NULL));
+diff --git a/lib/fseeko.c b/lib/fseeko.c
+index 0101ab55f..193f4e8ce 100644
+--- a/lib/fseeko.c
++++ b/lib/fseeko.c
+@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+
+ /* These tests are based on fpurge.c. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_read_end == fp->_IO_read_ptr
+ && fp->_IO_write_ptr == fp->_IO_write_base
+ && fp->_IO_save_base == NULL)
+@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
+ return -1;
+ }
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags &= ~_IO_EOF_SEEN;
+ fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+diff --git a/lib/fseterr.c b/lib/fseterr.c
+index 82649c3ac..adb637256 100644
+--- a/lib/fseterr.c
++++ b/lib/fseterr.c
+@@ -29,7 +29,7 @@ fseterr (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags |= _IO_ERR_SEEN;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Minix 3, Android */
+diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
+index 78d896e9f..05c5752a2 100644
+--- a/lib/stdio-impl.h
++++ b/lib/stdio-impl.h
+@@ -18,6 +18,12 @@
+ the same implementation of stdio extension API, except that some fields
+ have different naming conventions, or their access requires some casts. */
+
++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
++ problem by defining it ourselves. FIXME: Do not rely on glibc
++ internals. */
++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
++# define _IO_IN_BACKUP 0x100
++#endif
+
+ /* BSD stdio derived implementations. */
+
+--
+2.14.3
+
diff --git a/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch b/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch
index ed685e830..ff6cb629a 100644
--- a/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch
+++ b/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch
@@ -4,15 +4,10 @@ Date: Mon, 6 Jun 2016 19:40:50 +0200
Subject: [PATCH 2/2] Change options in libvirtd.conf for IPFire
Signed-off-by: Jonatan Schlag <jonatan.schlag(a)ipfire.org>
----
- daemon/libvirtd.conf | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
-index ac06cdd..1a41914 100644
---- a/daemon/libvirtd.conf
-+++ b/daemon/libvirtd.conf
-@@ -87,14 +87,14 @@
+--- a/src/remote/libvirtd.conf~ 2018-10-24 09:12:31.045030419 +0100
++++ b/src/remote/libvirtd.conf 2018-10-24 09:12:33.443109098 +0100
+@@ -82,14 +82,14 @@
# without becoming root.
#
# This is restricted to 'root' by default.
@@ -29,7 +24,7 @@ index ac06cdd..1a41914 100644
# Set the UNIX socket permissions for the R/W socket. This is used
# for full management of VMs
-@@ -104,7 +104,7 @@
+@@ -99,7 +99,7 @@
#
# If not using PolicyKit and setting group ownership for access
# control, then you may want to relax this too.
@@ -38,6 +33,3 @@ index ac06cdd..1a41914 100644
# Set the UNIX socket permissions for the admin interface socket.
#
---
-2.1.4
-
diff --git a/src/patches/m4-1.4.18-glibc-change-work-around.patch b/src/patches/m4-1.4.18-glibc-change-work-around.patch
new file mode 100644
index 000000000..582ae9b53
--- /dev/null
+++ b/src/patches/m4-1.4.18-glibc-change-work-around.patch
@@ -0,0 +1,115 @@
+diff -up m4-1.4.18/lib/fflush.c.orig m4-1.4.18/lib/fflush.c
+--- m4-1.4.18/lib/fflush.c.orig 2018-05-02 12:35:59.536851666 +0200
++++ m4-1.4.18/lib/fflush.c 2018-05-02 12:37:02.768958606 +0200
+@@ -33,7 +33,7 @@
+ #undef fflush
+
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp). */
+ static void
+@@ -72,7 +72,7 @@ clear_ungetc_buffer (FILE *fp)
+
+ #endif
+
+-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
++#if ! (defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */)
+
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) && defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+@@ -148,7 +148,7 @@ rpl_fflush (FILE *stream)
+ if (stream == NULL || ! freading (stream))
+ return fflush (stream);
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ clear_ungetc_buffer_preserving_position (stream);
+
+diff -up m4-1.4.18/lib/fpending.c.orig m4-1.4.18/lib/fpending.c
+--- m4-1.4.18/lib/fpending.c.orig 2018-05-02 12:35:32.305806774 +0200
++++ m4-1.4.18/lib/fpending.c 2018-05-02 12:35:44.944827347 +0200
+@@ -32,7 +32,7 @@ __fpending (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ return fp->_IO_write_ptr - fp->_IO_write_base;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+diff -up m4-1.4.18/lib/fpurge.c.orig m4-1.4.18/lib/fpurge.c
+--- m4-1.4.18/lib/fpurge.c.orig 2018-05-02 12:38:13.586078669 +0200
++++ m4-1.4.18/lib/fpurge.c 2018-05-02 12:38:38.785121867 +0200
+@@ -62,7 +62,7 @@ fpurge (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_IO_read_end = fp->_IO_read_ptr;
+ fp->_IO_write_ptr = fp->_IO_write_base;
+ /* Avoid memory leak when there is an active ungetc buffer. */
+diff -up m4-1.4.18/lib/freadahead.c.orig m4-1.4.18/lib/freadahead.c
+--- m4-1.4.18/lib/freadahead.c.orig 2016-12-31 14:54:41.000000000 +0100
++++ m4-1.4.18/lib/freadahead.c 2018-05-02 11:43:19.570336724 +0200
+@@ -25,7 +25,7 @@
+ size_t
+ freadahead (FILE *fp)
+ {
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_write_ptr > fp->_IO_write_base)
+ return 0;
+ return (fp->_IO_read_end - fp->_IO_read_ptr)
+diff -up m4-1.4.18/lib/freading.c.orig m4-1.4.18/lib/freading.c
+--- m4-1.4.18/lib/freading.c.orig 2018-05-02 12:37:33.970011368 +0200
++++ m4-1.4.18/lib/freading.c 2018-05-02 12:37:59.393054359 +0200
+@@ -31,7 +31,7 @@ freading (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ return ((fp->_flags & _IO_NO_WRITES) != 0
+ || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+ && fp->_IO_read_base != NULL));
+diff -up m4-1.4.18/lib/fseeko.c.orig m4-1.4.18/lib/fseeko.c
+--- m4-1.4.18/lib/fseeko.c.orig 2018-05-02 11:44:17.947460233 +0200
++++ m4-1.4.18/lib/fseeko.c 2018-05-02 12:39:49.537216897 +0200
+@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int when
+ #endif
+
+ /* These tests are based on fpurge.c. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_read_end == fp->_IO_read_ptr
+ && fp->_IO_write_ptr == fp->_IO_write_base
+ && fp->_IO_save_base == NULL)
+@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int when
+ return -1;
+ }
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags &= ~_IO_EOF_SEEN;
+ fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+diff -up m4-1.4.18/lib/stdio-impl.h.orig m4-1.4.18/lib/stdio-impl.h
+--- m4-1.4.18/lib/stdio-impl.h.orig 2016-12-31 14:54:42.000000000 +0100
++++ m4-1.4.18/lib/stdio-impl.h 2018-05-02 11:43:19.570336724 +0200
+@@ -18,6 +18,12 @@
+ the same implementation of stdio extension API, except that some fields
+ have different naming conventions, or their access requires some casts. */
+
++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
++ problem by defining it ourselves. FIXME: Do not rely on glibc
++ internals. */
++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
++# define _IO_IN_BACKUP 0x100
++#endif
+
+ /* BSD stdio derived implementations. */
+
diff --git a/src/patches/nfs-1.3.3-glibc-stdint.patch b/src/patches/nfs-1.3.3-glibc-stdint.patch
deleted file mode 100644
index 9a65cd1f8..000000000
--- a/src/patches/nfs-1.3.3-glibc-stdint.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- nfs-utils-1.3.3/support/nsm/rpc.c~ 2018-02-11 17:01:31.137039166 +0000
-+++ nfs-utils-1.3.3/support/nsm/rpc.c 2018-02-11 17:01:45.683511380 +0000
-@@ -40,6 +40,7 @@
-
- #include <time.h>
- #include <stdbool.h>
-+#include <stdint.h>
- #include <string.h>
- #include <unistd.h>
- #include <fcntl.h>
diff --git a/src/patches/parted-3.2-sysmacros.patch b/src/patches/parted-3.2-sysmacros.patch
new file mode 100644
index 000000000..a29e7619b
--- /dev/null
+++ b/src/patches/parted-3.2-sysmacros.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/580022
+
+From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier(a)gentoo.org>
+Date: Tue, 21 Jun 2016 15:01:08 -0400
+Subject: [PATCH] include sysmacros.h for major/minor/makedev
+
+Linux C libs are moving away from including this header implicitly via
+sys/types.h, so include it explicitly.
+---
+ libparted/arch/linux.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
+index 326b95619d31..e5c168be3c68 100644
+--- a/libparted/arch/linux.c
++++ b/libparted/arch/linux.c
+@@ -37,6 +37,7 @@
+ #include <dirent.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/utsname.h> /* for uname() */
+ #include <scsi/scsi.h>
+--
+2.8.2
+
diff --git a/src/patches/ppp-2.4.7-openssl.patch b/src/patches/ppp-2.4.7-openssl.patch
new file mode 100644
index 000000000..cbb5857a7
--- /dev/null
+++ b/src/patches/ppp-2.4.7-openssl.patch
@@ -0,0 +1,110 @@
+From 3c7b86229f7bd2600d74db14b1fe5b3896be3875 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad(a)redhat.com>
+Date: Fri, 6 Apr 2018 14:27:18 +0200
+Subject: [PATCH] pppd: Use openssl for the DES instead of the libcrypt / glibc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It seems the latest glibc (in Fedora glibc-2.27.9000-12.fc29) dropped
+libcrypt. The libxcrypt standalone package can be used instead, but
+it dropped the old setkey/encrypt API which ppp uses for DES. There
+is support for using openssl in pppcrypt.c, but it contains typos
+preventing it from compiling and seems to be written for an ancient
+openssl version.
+
+This updates the code to use current openssl.
+
+[paulus(a)ozlabs.org - wrote the commit description, fixed comment in
+ Makefile.linux.]
+
+Signed-off-by: Jaroslav Škarvada <jskarvad(a)redhat.com>
+Signed-off-by: Paul Mackerras <paulus(a)ozlabs.org>
+---
+ pppd/Makefile.linux | 7 ++++---
+ pppd/pppcrypt.c | 18 +++++++++---------
+ 2 files changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/pppd/Makefile.linux b/pppd/Makefile.linux
+index 36d2b036..8d5ce99d 100644
+--- a/pppd/Makefile.linux
++++ b/pppd/Makefile.linux
+@@ -35,10 +35,10 @@ endif
+ COPTS = -O2 -pipe -Wall -g
+ LIBS =
+
+-# Uncomment the next 2 lines to include support for Microsoft's
++# Uncomment the next line to include support for Microsoft's
+ # MS-CHAP authentication protocol. Also, edit plugins/radius/Makefile.linux.
+ CHAPMS=y
+-USE_CRYPT=y
++#USE_CRYPT=y
+ # Don't use MSLANMAN unless you really know what you're doing.
+ #MSLANMAN=y
+ # Uncomment the next line to include support for MPPE. CHAPMS (above) must
+@@ -137,7 +137,8 @@ endif
+
+ ifdef NEEDDES
+ ifndef USE_CRYPT
+-LIBS += -ldes $(LIBS)
++CFLAGS += -I/usr/include/openssl
++LIBS += -lcrypto
+ else
+ CFLAGS += -DUSE_CRYPT=1
+ endif
+diff --git a/pppd/pppcrypt.c b/pppd/pppcrypt.c
+index 8b85b132..6b35375e 100644
+--- a/pppd/pppcrypt.c
++++ b/pppd/pppcrypt.c
+@@ -64,7 +64,7 @@ u_char *des_key; /* OUT 64 bit DES key with parity bits added */
+ des_key[7] = Get7Bits(key, 49);
+
+ #ifndef USE_CRYPT
+- des_set_odd_parity((des_cblock *)des_key);
++ DES_set_odd_parity((DES_cblock *)des_key);
+ #endif
+ }
+
+@@ -158,25 +158,25 @@ u_char *clear; /* OUT 8 octets */
+ }
+
+ #else /* USE_CRYPT */
+-static des_key_schedule key_schedule;
++static DES_key_schedule key_schedule;
+
+ bool
+ DesSetkey(key)
+ u_char *key;
+ {
+- des_cblock des_key;
++ DES_cblock des_key;
+ MakeKey(key, des_key);
+- des_set_key(&des_key, key_schedule);
++ DES_set_key(&des_key, &key_schedule);
+ return (1);
+ }
+
+ bool
+-DesEncrypt(clear, key, cipher)
++DesEncrypt(clear, cipher)
+ u_char *clear; /* IN 8 octets */
+ u_char *cipher; /* OUT 8 octets */
+ {
+- des_ecb_encrypt((des_cblock *)clear, (des_cblock *)cipher,
+- key_schedule, 1);
++ DES_ecb_encrypt((DES_cblock *)clear, (DES_cblock *)cipher,
++ &key_schedule, 1);
+ return (1);
+ }
+
+@@ -185,8 +185,8 @@ DesDecrypt(cipher, clear)
+ u_char *cipher; /* IN 8 octets */
+ u_char *clear; /* OUT 8 octets */
+ {
+- des_ecb_encrypt((des_cblock *)cipher, (des_cblock *)clear,
+- key_schedule, 0);
++ DES_ecb_encrypt((DES_cblock *)cipher, (DES_cblock *)clear,
++ &key_schedule, 0);
+ return (1);
+ }
+
diff --git a/src/patches/reiserfsprogs-3.6.27-loff_t.patch b/src/patches/reiserfsprogs-3.6.27-loff_t.patch
new file mode 100644
index 000000000..9ab8519e7
--- /dev/null
+++ b/src/patches/reiserfsprogs-3.6.27-loff_t.patch
@@ -0,0 +1,16 @@
+glibc-2.28 did hide loff_t indef system-specific macros:
+ https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=663e7d784977f6b15c0c…
+
+This caused build failure:
+ ../include/reiserfs_lib.h:300:55: error: unknown type name 'loff_t'; did you mean 'off_t'?
+
+Re-enable extensions to pull loff_t back.
+
+https://bugs.gentoo.org/663930
+--- a/configure.ac
++++ b/configure.ac
+@@ -23,2 +23,4 @@ AC_PROG_MAKE_SET
+ AC_PROG_LIBTOOL
++dnl pull in loff_t from glibc
++AC_USE_SYSTEM_EXTENSIONS
+
diff --git a/src/patches/syslinux-6.03-sysmacros.patch b/src/patches/syslinux-6.03-sysmacros.patch
new file mode 100644
index 000000000..af464fe53
--- /dev/null
+++ b/src/patches/syslinux-6.03-sysmacros.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/579928
+
+From d84db34dbe39d55b4d7e868764c056689aa0793b Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier(a)gentoo.org>
+Date: Tue, 19 Apr 2016 01:56:41 -0400
+Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev
+
+These functions are defined in sys/sysmacros.h, so add the include to
+main.c. This is already handled correctly in mountinfo.c. Otherwise
+we get build failures like:
+
+main.o: In function 'find_device_sysfs':
+extlinux/main.c:1131: undefined reference to 'minor'
+
+Signed-off-by: Mike Frysinger <vapier(a)gentoo.org>
+---
+ extlinux/main.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/extlinux/main.c b/extlinux/main.c
+index a7ebd49..ebff7ea 100644
+--- a/extlinux/main.c
++++ b/extlinux/main.c
+@@ -38,6 +38,7 @@
+ #include <sysexits.h>
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ #include <sys/mount.h>
+ #include <sys/vfs.h>
+--
+2.7.4
+
hooks/post-receive
--
IPFire 2.x development tree
1
0