Merge branch 'master' into kernel-4.9

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
2026-04-24 18:03:06 +02:00 · 2017-07-09 12:47:16 +02:00
parent 7c13ae02eb 82308f5387
commit b389d73110
906 changed files with 41258 additions and 116440 deletions
--- a/config/avahi/avahi
+++ b/config/avahi/avahi
@@ -1,45 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/avahi
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
-
-#$LastChangedBy: bdubbs $
-#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $
-
-. /etc/sysconfig/rc
-. $rc_functions
-
-case "$1" in
-	start)
-		boot_mesg "Starting avahi..."
-		loadproc /usr/sbin/avahi-daemon -f /etc/avahi/avahi-daemon.conf -D
-		;;
-
-	stop)
-		boot_mesg "Stopping avahi..."
-		/usr/sbin/avahi-daemon -k
-		;;
-
-	reload)
-		boot_mesg "Reloading avahi..."
-		reloadproc /usr/sbin/avahi-daemon -f /etc/avahi/avahi-daemon.conf -D
-		;;
-
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-
-	status)
-		statusproc /usr/sbin/avahi-daemon -c
-		;;
-
-	*)
-		echo "Usage: $0 {start|stop|reload|restart|status}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/avahi
--- a/config/avahi/smb.service
+++ b/config/avahi/smb.service
@@ -1,9 +0,0 @@
-<?xml version="1.0" standalone='no'?>
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-<service-group>
-   <name replace-wildcards="yes">Samba Shares on %h</name>
-   <service>
-       <type>_smb._tcp</type>
-       <port>139</port>
-   </service>
-</service-group>
--- a/config/backup/includes/avahi
+++ b/config/backup/includes/avahi
@@ -1 +0,0 @@
-/etc/avahi/avahi-daemon.conf
--- a/config/backup/includes/imspector
+++ b/config/backup/includes/imspector
@@ -1,3 +0,0 @@
-/etc/imspector/acl.txt
-/etc/imspector/badwords.txt
-/etc/imspector/imspector.conf
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -465,6 +465,7 @@ sub checksubnets
 	my $ccdname=$_[0];
 	my $ccdnet=$_[1];
 	my $ownnet=$_[2];
+	my $checktype=$_[3];
 	my $errormessage;
 	my ($ip,$cidr)=split(/\//,$ccdnet);
 	$cidr=&iporsubtocidr($cidr);
@@ -542,10 +543,15 @@ sub checksubnets
 	}
 	
 	#call check_net_internal
-	&General::check_net_internal($ccdnet);
+	if ($checktype eq "exact")
+	{
+		&General::check_net_internal_exact($ccdnet);
+	}else{
+		&General::check_net_internal_range($ccdnet);
+	}
 }

-sub check_net_internal{
+sub check_net_internal_range{
 	my $network=shift;
 	my ($ip,$cidr)=split(/\//,$network);
 	my %ownnet=();
@@ -553,10 +559,24 @@ sub check_net_internal{
 	$cidr=&iporsubtocidr($cidr);
 	#check if we use one of ipfire's networks (green,orange,blue)
 	&readhash("${General::swroot}/ethernet/settings", \%ownnet);
-	if (($ownnet{'GREEN_NETADDRESS'}  	ne '' && $ownnet{'GREEN_NETADDRESS'} 	ne '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/$ownnet{'GREEN_NETMASK'}",$network)){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;}
-	if (($ownnet{'ORANGE_NETADDRESS'}	ne '' && $ownnet{'ORANGE_NETADDRESS'} 	ne '0.0.0.0') && &Network::network_equal("$ownnet{'ORANGE_NETADDRESS'}/$ownnet{'ORANGE_NETMASK'}",$network)){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;}
-	if (($ownnet{'BLUE_NETADDRESS'} 	ne '' && $ownnet{'BLUE_NETADDRESS'} 	ne '0.0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/$ownnet{'BLUE_NETMASK'}",$network)){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;}
-	if (($ownnet{'RED_NETADDRESS'} 		ne '' && $ownnet{'RED_NETADDRESS'} 	ne '0.0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/$ownnet{'RED_NETMASK'}",$network)){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}
+	if (($ownnet{'GREEN_NETADDRESS'}  	ne '' && $ownnet{'GREEN_NETADDRESS'} 	ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'GREEN_NETADDRESS'},&iporsubtodec($ownnet{'GREEN_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;}
+	if (($ownnet{'ORANGE_NETADDRESS'}	ne '' && $ownnet{'ORANGE_NETADDRESS'} 	ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'ORANGE_NETADDRESS'},&iporsubtodec($ownnet{'ORANGE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;}
+	if (($ownnet{'BLUE_NETADDRESS'} 	ne '' && $ownnet{'BLUE_NETADDRESS'} 	ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'BLUE_NETADDRESS'},&iporsubtodec($ownnet{'BLUE_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;}
+	if (($ownnet{'RED_NETADDRESS'} 		ne '' && $ownnet{'RED_NETADDRESS'} 		ne '0.0.0.0') && &IpInSubnet($ip,$ownnet{'RED_NETADDRESS'},&iporsubtodec($ownnet{'RED_NETMASK'}))){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}
+}
+
+sub check_net_internal_exact{
+	my $network=shift;
+	my ($ip,$cidr)=split(/\//,$network);
+	my %ownnet=();
+	my $errormessage;
+	$cidr=&iporsubtocidr($cidr);
+	#check if we use one of ipfire's networks (green,orange,blue)
+	&readhash("${General::swroot}/ethernet/settings", \%ownnet);
+	if (($ownnet{'GREEN_NETADDRESS'}  	ne '' && $ownnet{'GREEN_NETADDRESS'} 	ne '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/$ownnet{'GREEN_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;}
+	if (($ownnet{'ORANGE_NETADDRESS'}	ne '' && $ownnet{'ORANGE_NETADDRESS'} 	ne '0.0.0.0') && &Network::network_equal("$ownnet{'ORANGE_NETADDRESS'}/$ownnet{'ORANGE_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;}
+	if (($ownnet{'BLUE_NETADDRESS'} 	ne '' && $ownnet{'BLUE_NETADDRESS'} 	ne '0.0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/$ownnet{'BLUE_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;}
+	if (($ownnet{'RED_NETADDRESS'} 		ne '' && $ownnet{'RED_NETADDRESS'} 		ne '0.0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/$ownnet{'RED_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}
 }

 sub validport
@@ -1128,4 +1148,16 @@ sub get_red_interface() {
 	return $interface;
 }

+sub dnssec_status() {
+	my $path = "${General::swroot}/red/dnssec-status";
+
+	open(STATUS, $path) or return 0;
+	my $status = <STATUS>;
+	close(STATUS);
+
+	chomp($status);
+
+	return $status;
+}
+
 1;
--- a/config/cfgroot/graphs.pl
+++ b/config/cfgroot/graphs.pl
@@ -31,6 +31,30 @@ require "${General::swroot}/header.pl";

 my $ERROR;

+my @GRAPH_ARGS = (
+	# Output format
+	"--imgformat", "PNG",
+
+	# No border
+	"--border", "0",
+
+	# For a more 'organic' look
+	"--slope-mode",
+
+	# HxW define the size of the output image
+	"--full-size-mode",
+
+	# Watermark
+	"-W www.ipfire.org",
+
+	# Default size
+	"-w 910",
+	"-h 300",
+
+	# Use alternative grid
+	"--alt-y-grid",
+);
+
 # Read the global settings files to get the current theme and after this load
 # colors for this theme

@@ -77,11 +101,6 @@ foreach (@sensorsdir){
 # 3 if given is the height of the iframe default if nothing is given

 sub makegraphbox {
-	my $height = 285;
-	my $width = 700;
-
-	if ( $_[3] ne "" ){ $height = $_[3]; }
-
 	print "<center>";
 	print "<a href='".$_[0]."?".$_[1]."?hour' target='".$_[1]."box'><b>".$Lang::tr{'hour'}."</b></a>";
 	print " - ";
@@ -93,7 +112,7 @@ sub makegraphbox {
 	print " - ";
 	print "<a href='".$_[0]."?".$_[1]."?year' target='".$_[1]."box'><b>".$Lang::tr{'year'}."</b></a>";
 	print "<br></center>";
-	print "<iframe src='".$_[0]."?".$_[1]."?".$_[2]."' width='".$width."' height='".$height."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
+	print "<iframe class='graph' src='".$_[0]."?".$_[1]."?".$_[2]."' scrolling='no' frameborder='no' marginheight='0' name='".$_[1]."box'></iframe>";
 }

 # Generate the CPU Graph for the current period of time for values given by
@@ -103,16 +122,10 @@ sub updatecpugraph {
 	my $cpucount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/cpu-*/ 2>/dev/null | wc -l`;
 	my $period    = $_[0];
 	my @command = (
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-l 0",
 		"-u 100",
 		"-r",
@@ -237,16 +250,10 @@ sub updatecpugraph {
 sub updateloadgraph {
 	my $period    = $_[0];
 	RRDs::graph(
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-l 0",
 		"-r",
 		"-t Load Average ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
@@ -275,16 +282,10 @@ sub updateloadgraph {
 sub updatememorygraph {
 	my $period    = $_[0];
 	RRDs::graph(
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-l 0",
 		"-u 100",
 		"-r",
@@ -337,16 +338,10 @@ sub updatememorygraph {
 sub updateswapgraph {
 	my $period    = $_[0];
 	RRDs::graph(
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-l 0",
 		"-u 100",
 		"-r",
@@ -395,16 +390,10 @@ sub updateprocessescpugraph {
 	my $count="0";

 	my @command = (
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-l 0",
 		"-r",
 		"-t ".$Lang::tr{'processes'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
@@ -448,16 +437,10 @@ sub updateprocessesmemorygraph {
 	my $count="0";

 	my @command = (
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-l 0",
 		"-r",
 		"-t ".$Lang::tr{'processes'}." ".$Lang::tr{'memory'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
@@ -498,16 +481,10 @@ sub updatediskgraph {
 	my $disk    = $_[0];
 	my $period    = $_[1];
 	RRDs::graph(
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-r",
 		"-t ".$disk." ".$Lang::tr{'disk access per'}." ".$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes per second'},
@@ -548,16 +525,10 @@ sub updateifgraph {
 	my $interface = $_[0];
 	my $period    = $_[1];
 	RRDs::graph(
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-r",
 		"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes per second'},
@@ -591,16 +562,10 @@ sub updatevpngraph {
 	my $interface = $_[0];
 	my $period    = $_[1];
 	RRDs::graph(
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-r",
 		"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes per second'},
@@ -634,16 +599,10 @@ sub updatevpnn2ngraph {
 	my $interface = $_[0];
 	my $period    = $_[1];
 	RRDs::graph(
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-r",
 		"-t ".$Lang::tr{'traffic on'}." ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes per second'},
@@ -704,16 +663,10 @@ sub updatevpnn2ngraph {
 sub updatefwhitsgraph {
 	my $period    = $_[0];
 	RRDs::graph(
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-r",
 		"-t ".$Lang::tr{'firewall hits per'}." ".$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes per second'},
@@ -766,16 +719,10 @@ sub updatepinggraph {
 	my $period    = $_[1];
 	my $host    = $_[0];
 	RRDs::graph(
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-l 0",
 		"-r",
 		"-t ".$Lang::tr{'linkq'}." ".$host." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
@@ -812,16 +759,10 @@ sub updatewirelessgraph {
 	my $period    = $_[1];
 	my $interface    = $_[0];
 	RRDs::graph(
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-t Wireless ".$interface." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
 		"-v dBm",
 		"--color=SHADEA".$color{"color19"},
@@ -855,16 +796,10 @@ sub updatehddgraph {
 	my $disk = $_[0];
 	my $period = $_[1];
 	RRDs::graph(
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-r",
 		"-t ".$disk." ".$Lang::tr{'harddisk temperature'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
 		"-v Celsius",
@@ -895,16 +830,10 @@ sub updatehwtempgraph {
 	my $period = $_[0];

 	my @command = (
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-r",
 		"-t ".$Lang::tr{'mbmon temp'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
 		"--color=SHADEA".$color{"color19"},
@@ -948,16 +877,10 @@ sub updatehwfangraph {
 	my $period = $_[0];

 	my @command = (
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-r",
 		"-t ".$Lang::tr{'mbmon fan'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
 		"--color=SHADEA".$color{"color19"},
@@ -1001,16 +924,10 @@ sub updatehwvoltgraph {
 	my $period = $_[0];

 	my @command = (
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-r",
 		"-t ".$Lang::tr{'mbmon volt'}." ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
 		"--color=SHADEA".$color{"color19"},
@@ -1074,16 +991,10 @@ sub updateqosgraph {
 	my $color="#000000";

 	my @command = (
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-r",
 		"-t ".$Lang::tr{'Utilization on'}." (".$qossettings{'DEV'}.") ".$Lang::tr{'graph per'}." ".$Lang::tr{$period."-graph"},
 		"-v ".$Lang::tr{'bytes per second'},
@@ -1133,16 +1044,10 @@ sub updatecpufreqgraph {
 	my $cpucount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/cpu-*/ 2>/dev/null | wc -l`;
 	my $period    = $_[0];
 	my @command = (
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-r",
 		"-t ".$Lang::tr{'cpu frequency per'}." ".$Lang::tr{$period."-graph"},
 		"-v MHz",
@@ -1178,16 +1083,10 @@ sub updatethermaltempgraph {
 	my $thermalcount = `ls -dA $mainsettings{'RRDLOG'}/collectd/localhost/thermal-thermal_zone* 2>/dev/null | wc -l`;
 	my $period    = $_[0];
 	my @command = (
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 125",
 		"-r",
 		"-t "."ACPI Thermal-Zone Temperature"." - ".$Lang::tr{$period."-graph"},
 		"-v Grad Celsius",
@@ -1237,16 +1136,10 @@ sub getprocesses {
 sub updateentropygraph {
 	my $period    = $_[0];
 	my @command = (
+		@GRAPH_ARGS,
 		"-",
 		"--start",
 		"-1".$period,
-		"-aPNG",
-		"-i",
-		"-z",
-		"-W www.ipfire.org",
-		"--alt-y-grid",
-		"-w 600",
-		"-h 225",
 		"-r",
 		"--lower-limit","0",
 		"-t $Lang::tr{'entropy'}",
@@ -1259,6 +1152,7 @@ sub updateentropygraph {
 		"GPRINT:entrmax:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'maximum'}),
 		"GPRINT:entrmin:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'minimum'}),
 		"GPRINT:entravg:" . sprintf("%12s\\: %%5.0lf", $Lang::tr{'average'}) . "\\n",
+		"--color=BACK".$color{"color21"},
 	);

 	RRDs::graph (@command);
--- a/config/cfgroot/network-functions.pl
+++ b/config/cfgroot/network-functions.pl
@@ -315,6 +315,65 @@ sub setup_upstream_proxy() {
 	}
 }

+my %wireless_status = ();
+
+sub _get_wireless_status($) {
+	my $intf = shift;
+
+	if (!$wireless_status{$intf}) {
+		$wireless_status{$intf} = `iwconfig $intf`;
+	}
+
+	return $wireless_status{$intf};
+}
+
+sub wifi_get_essid($) {
+	my $status = &_get_wireless_status(shift);
+
+	my ($essid) = $status =~ /ESSID:\"(.*)\"/;
+
+	return $essid;
+}
+
+sub wifi_get_frequency($) {
+	my $status = &_get_wireless_status(shift);
+
+	my ($frequency) = $status =~ /Frequency:(\d+\.\d+ GHz)/;
+
+	return $frequency;
+}
+
+sub wifi_get_access_point($) {
+	my $status = &_get_wireless_status(shift);
+
+	my ($access_point) = $status =~ /Access Point: ([0-9A-F:]+)/;
+
+	return $access_point;
+}
+
+sub wifi_get_bit_rate($) {
+	my $status = &_get_wireless_status(shift);
+
+	my ($bit_rate) = $status =~ /Bit Rate=(\d+ [GM]b\/s)/;
+
+	return $bit_rate;
+}
+
+sub wifi_get_link_quality($) {
+	my $status = &_get_wireless_status(shift);
+
+	my ($cur, $max) = $status =~ /Link Quality=(\d+)\/(\d+)/;
+
+	return $cur * 100 / $max;
+}
+
+sub wifi_get_signal_level($) {
+	my $status = &_get_wireless_status(shift);
+
+	my ($signal_level) = $status =~ /Signal level=(\-\d+ dBm)/;
+
+	return $signal_level;
+}
 1;

 # Remove the next line to enable the testsuite
--- a/config/etc/sysctl.conf
+++ b/config/etc/sysctl.conf
@@ -34,3 +34,8 @@ net.ipv6.conf.default.disable_ipv6 = 1

 # Enable netfilter accounting
 net.netfilter.nf_conntrack_acct=1
+
+# Disable netfilter on bridges.
+net.bridge.bridge-nf-call-ip6tables = 0
+net.bridge.bridge-nf-call-iptables = 0
+net.bridge.bridge-nf-call-arptables = 0
--- a/config/firewall/ipsec-block
+++ b/config/firewall/ipsec-block
@@ -23,23 +23,43 @@ VPN_CONFIG="/var/ipfire/vpn/config"

 block_subnet() {
 	local subnet="${1}"
+	local action="${2}"

 	# Don't block a wildcard subnet
 	if [ "${subnet}" = "0.0.0.0/0" ] || [ "${subnet}" = "0.0.0.0/0.0.0.0" ]; then
 		return 0
 	fi

-	iptables -A IPSECBLOCK -d "${subnet}" -j REJECT --reject-with icmp-net-unreachable
+	case "${action}" in
+		reject)
+			iptables -A IPSECBLOCK -d "${subnet}" -j REJECT --reject-with icmp-net-unreachable
+			;;
+		drop)
+			iptables -A IPSECBLOCK -d "${subnet}" -j DROP
+			;;
+		*)
+			return 1
+			;;
+	esac
+
+	return 0
 }

 block_ipsec() {
 	# Flush all exists rules
 	iptables -F IPSECBLOCK

-	local id status name lefthost type ctype unknown1 unknown2 unknown3
-	local leftsubnets unknown4 righthost rightsubnets rest
-	while IFS="," read -r id status name lefthost type ctype unkown1 unknown2 unknown3 \
-			leftsubnets unknown4 righthost rightsubnets rest; do
+	local action
+
+	local vars="id status name lefthost type ctype x1 x2 x3 leftsubnets"
+	vars="${vars} x4 righthost rightsubnets x5 x6 x7 x8 x9 x10 x11 x12"
+	vars="${vars} x13 x14 x15 x16 x17 x18 x19 x20 x21 proto x22 x23 x24"
+	vars="${vars} route rest"
+
+	# Register local variables
+	local ${vars}
+
+	while IFS="," read -r ${vars}; do
 		# Check if the connection is enabled
 		[ "${status}" = "on" ] || continue

@@ -49,9 +69,18 @@ block_ipsec() {
 		# Split multiple subnets
 		rightsubnets="${rightsubnets//\|/ }"

+		case "${route}" in
+			route)
+				action="drop"
+				;;
+			*)
+				action="reject"
+				;;
+		esac
+
 		local rightsubnet
 		for rightsubnet in ${rightsubnets}; do
-			block_subnet "${rightsubnet}"
+			block_subnet "${rightsubnet}" "${action}"
 		done
 	done < "${VPN_CONFIG}"
 }
--- a/config/httpd/server-tuning.conf
+++ b/config/httpd/server-tuning.conf
@@ -19,9 +19,8 @@ KeepAliveTimeout 15

 MinSpareServers 1
 MaxSpareServers 10
-StartServers 1
-MaxClients 10
-MaxRequestsPerChild 100
+StartServers 2
+MaxClients 256

 #
 # The following directives modify normal HTTP response behavior to
--- a/config/imspector/imspector.conf
+++ b/config/imspector/imspector.conf
@@ -1,24 +0,0 @@
-# The listening port for redirected connections
-port=16667
-
-# For dropping privs - you probably want to do this.
-user=nobody
-group=nobody
-
-# Prefix and postfix to all responses using all responder plugins
-response_prefix=Message from IMSpector: -=
-response_postfix==-
-
-# Will load enabled plugins in plugin_dir
-icq_protocol=on
-irc_protocol=on
-msn_protocol=on
-yahoo_protocol=on
-gg_protocol=on
-jabber_protocol=on
-
-# Location where the file logging plugin will start from.
-file_logging_dir=/var/log/imspector/
-log_typing_events=on
-
-plugin_dir=/usr/lib/imspector
--- a/config/menu/EX-imspector.menu
+++ b/config/menu/EX-imspector.menu
@@ -1,5 +0,0 @@
-    $subipfire->{'30.imspector'} = {'caption' => 'Imspector',
-				  'uri' => '/cgi-bin/imspector.cgi',
-				  'title' => 'Imspector',
-				  'enabled' => 1,
-				  };
--- a/config/miniupnpd/miniupnpd.conf
+++ b/config/miniupnpd/miniupnpd.conf
@@ -2,6 +2,9 @@
 # LAN network interfaces IPs / networks
 # there can be multiple listening ips for SSDP traffic.
 # should be under the form nnn.nnn.nnn.nnn/nn
+listening_ip=green0
+#listening_ip=green1
+
 # HTTP is available on all interfaces
 # port for HTTP (descriptions and SOAP) traffic. set 0 for autoselect.
 port=0
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -411,7 +411,7 @@ print <<END
 		insmod ipt_IMQ
 		sleep 2
 	fi
-	modprobe imq numdevs=1
+	modprobe imq numdevs=1 numqueues=\$(grep -c "^processor" /proc/cpuinfo || echo 1)
 	ip link set $qossettings{'IMQ_DEV'} up

 	### ADD HTB QDISC FOR $qossettings{'IMQ_DEV'}
--- a/config/rootfiles/common/armv5tel/binutils
+++ b/config/rootfiles/common/armv5tel/binutils
@@ -19,6 +19,7 @@
 #usr/include/bfdlink.h
 #usr/include/dis-asm.h
 #usr/include/libiberty.h
+#usr/include/plugin-api.h
 #usr/include/symcat.h
 #usr/lib/ldscripts
 #usr/lib/ldscripts/armelf_linux_eabi.x
@@ -47,23 +48,127 @@
 #usr/lib/ldscripts/armelfb_linux_eabi.xsw
 #usr/lib/ldscripts/armelfb_linux_eabi.xu
 #usr/lib/ldscripts/armelfb_linux_eabi.xw
-usr/lib/libbfd-2.24.so
+usr/lib/libbfd-2.28.so
 #usr/lib/libbfd.a
 #usr/lib/libbfd.la
 #usr/lib/libbfd.so
-#usr/lib/libiberty.a
-usr/lib/libopcodes-2.24.so
+usr/lib/libopcodes-2.28.so
 #usr/lib/libopcodes.a
 #usr/lib/libopcodes.la
 #usr/lib/libopcodes.so
 #usr/share/info/as.info
 #usr/share/info/bfd.info
 #usr/share/info/binutils.info
-#usr/share/info/configure.info
-#usr/share/info/dir
 #usr/share/info/gprof.info
 #usr/share/info/ld.info
-#usr/share/info/standards.info
+#usr/share/locale/bg/LC_MESSAGES/binutils.mo
+#usr/share/locale/bg/LC_MESSAGES/gprof.mo
+#usr/share/locale/bg/LC_MESSAGES/ld.mo
+#usr/share/locale/ca/LC_MESSAGES/binutils.mo
+#usr/share/locale/da/LC_MESSAGES/bfd.mo
+#usr/share/locale/da/LC_MESSAGES/binutils.mo
+#usr/share/locale/da/LC_MESSAGES/gprof.mo
+#usr/share/locale/da/LC_MESSAGES/ld.mo
+#usr/share/locale/da/LC_MESSAGES/opcodes.mo
+#usr/share/locale/de/LC_MESSAGES/gprof.mo
+#usr/share/locale/de/LC_MESSAGES/opcodes.mo
+#usr/share/locale/eo/LC_MESSAGES/gprof.mo
+#usr/share/locale/es/LC_MESSAGES/bfd.mo
+#usr/share/locale/es/LC_MESSAGES/binutils.mo
+#usr/share/locale/es/LC_MESSAGES/gas.mo
+#usr/share/locale/es/LC_MESSAGES/gprof.mo
+#usr/share/locale/es/LC_MESSAGES/ld.mo
+#usr/share/locale/es/LC_MESSAGES/opcodes.mo
+#usr/share/locale/fi/LC_MESSAGES/bfd.mo
+#usr/share/locale/fi/LC_MESSAGES/binutils.mo
+#usr/share/locale/fi/LC_MESSAGES/gas.mo
+#usr/share/locale/fi/LC_MESSAGES/gprof.mo
+#usr/share/locale/fi/LC_MESSAGES/ld.mo
+#usr/share/locale/fi/LC_MESSAGES/opcodes.mo
+#usr/share/locale/fr/LC_MESSAGES/bfd.mo
+#usr/share/locale/fr/LC_MESSAGES/binutils.mo
+#usr/share/locale/fr/LC_MESSAGES/gas.mo
+#usr/share/locale/fr/LC_MESSAGES/gprof.mo
+#usr/share/locale/fr/LC_MESSAGES/ld.mo
+#usr/share/locale/fr/LC_MESSAGES/opcodes.mo
+#usr/share/locale/ga
+#usr/share/locale/ga/LC_MESSAGES
+#usr/share/locale/ga/LC_MESSAGES/gprof.mo
+#usr/share/locale/ga/LC_MESSAGES/ld.mo
+#usr/share/locale/ga/LC_MESSAGES/opcodes.mo
+#usr/share/locale/hr/LC_MESSAGES/binutils.mo
+#usr/share/locale/hu/LC_MESSAGES/gprof.mo
+#usr/share/locale/id/LC_MESSAGES/bfd.mo
+#usr/share/locale/id/LC_MESSAGES/binutils.mo
+#usr/share/locale/id/LC_MESSAGES/gas.mo
+#usr/share/locale/id/LC_MESSAGES/gprof.mo
+#usr/share/locale/id/LC_MESSAGES/ld.mo
+#usr/share/locale/id/LC_MESSAGES/opcodes.mo
+#usr/share/locale/it/LC_MESSAGES/binutils.mo
+#usr/share/locale/it/LC_MESSAGES/gprof.mo
+#usr/share/locale/it/LC_MESSAGES/ld.mo
+#usr/share/locale/it/LC_MESSAGES/opcodes.mo
+#usr/share/locale/ja/LC_MESSAGES/bfd.mo
+#usr/share/locale/ja/LC_MESSAGES/binutils.mo
+#usr/share/locale/ja/LC_MESSAGES/gas.mo
+#usr/share/locale/ja/LC_MESSAGES/gprof.mo
+#usr/share/locale/ja/LC_MESSAGES/ld.mo
+#usr/share/locale/ms
+#usr/share/locale/ms/LC_MESSAGES
+#usr/share/locale/ms/LC_MESSAGES/gprof.mo
+#usr/share/locale/nl/LC_MESSAGES/gprof.mo
+#usr/share/locale/nl/LC_MESSAGES/opcodes.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/gprof.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/opcodes.mo
+#usr/share/locale/ro
+#usr/share/locale/ro/LC_MESSAGES
+#usr/share/locale/ro/LC_MESSAGES/bfd.mo
+#usr/share/locale/ro/LC_MESSAGES/binutils.mo
+#usr/share/locale/ro/LC_MESSAGES/gprof.mo
+#usr/share/locale/ro/LC_MESSAGES/opcodes.mo
+#usr/share/locale/ru/LC_MESSAGES/bfd.mo
+#usr/share/locale/ru/LC_MESSAGES/binutils.mo
+#usr/share/locale/ru/LC_MESSAGES/gas.mo
+#usr/share/locale/ru/LC_MESSAGES/gprof.mo
+#usr/share/locale/rw/LC_MESSAGES/bfd.mo
+#usr/share/locale/rw/LC_MESSAGES/binutils.mo
+#usr/share/locale/rw/LC_MESSAGES/gas.mo
+#usr/share/locale/rw/LC_MESSAGES/gprof.mo
+#usr/share/locale/sk/LC_MESSAGES/binutils.mo
+#usr/share/locale/sr
+#usr/share/locale/sr/LC_MESSAGES
+#usr/share/locale/sr/LC_MESSAGES/bfd.mo
+#usr/share/locale/sr/LC_MESSAGES/binutils.mo
+#usr/share/locale/sr/LC_MESSAGES/gprof.mo
+#usr/share/locale/sv/LC_MESSAGES/bfd.mo
+#usr/share/locale/sv/LC_MESSAGES/binutils.mo
+#usr/share/locale/sv/LC_MESSAGES/gprof.mo
+#usr/share/locale/sv/LC_MESSAGES/ld.mo
+#usr/share/locale/sv/LC_MESSAGES/opcodes.mo
+#usr/share/locale/tr/LC_MESSAGES/bfd.mo
+#usr/share/locale/tr/LC_MESSAGES/binutils.mo
+#usr/share/locale/tr/LC_MESSAGES/gas.mo
+#usr/share/locale/tr/LC_MESSAGES/gprof.mo
+#usr/share/locale/tr/LC_MESSAGES/ld.mo
+#usr/share/locale/tr/LC_MESSAGES/opcodes.mo
+#usr/share/locale/uk/LC_MESSAGES/bfd.mo
+#usr/share/locale/uk/LC_MESSAGES/binutils.mo
+#usr/share/locale/uk/LC_MESSAGES/gas.mo
+#usr/share/locale/uk/LC_MESSAGES/gprof.mo
+#usr/share/locale/uk/LC_MESSAGES/ld.mo
+#usr/share/locale/uk/LC_MESSAGES/opcodes.mo
+#usr/share/locale/vi/LC_MESSAGES/bfd.mo
+#usr/share/locale/vi/LC_MESSAGES/binutils.mo
+#usr/share/locale/vi/LC_MESSAGES/gprof.mo
+#usr/share/locale/vi/LC_MESSAGES/ld.mo
+#usr/share/locale/vi/LC_MESSAGES/opcodes.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/bfd.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/binutils.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/gas.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/ld.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/opcodes.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/binutils.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/ld.mo
 #usr/share/man/man1/addr2line.1
 #usr/share/man/man1/ar.1
 #usr/share/man/man1/as.1
--- a/config/rootfiles/common/armv5tel/gcc
+++ b/config/rootfiles/common/armv5tel/gcc
--- a/config/rootfiles/common/armv5tel/glibc
+++ b/config/rootfiles/common/armv5tel/glibc
--- a/config/rootfiles/common/armv5tel/gmp
+++ b/config/rootfiles/common/armv5tel/gmp
@@ -4,12 +4,12 @@
 #usr/lib/libgmp.la
 #usr/lib/libgmp.so
 usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.3.0
+usr/lib/libgmp.so.10.3.2
 #usr/lib/libgmpxx.a
 #usr/lib/libgmpxx.la
 #usr/lib/libgmpxx.so
 usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.5.0
+usr/lib/libgmpxx.so.4.5.2
 #usr/share/info/gmp.info
 #usr/share/info/gmp.info-1
 #usr/share/info/gmp.info-2
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -3,65 +3,30 @@ etc/init.d
 #etc/rc.d/helper
 etc/rc.d/helper/getdnsfromdhcpc.pl
 #etc/rc.d/init.d
-#etc/rc.d/init.d/alsa
-#etc/rc.d/init.d/amavisd
 etc/rc.d/init.d/apache
-#etc/rc.d/init.d/apcupsd
-#etc/rc.d/init.d/applejuice
-#etc/rc.d/init.d/asterisk
 etc/rc.d/init.d/beep
-#etc/rc.d/init.d/bluetooth
 etc/rc.d/init.d/checkfs
-#etc/rc.d/init.d/clamav
 etc/rc.d/init.d/cleanfs
-#etc/rc.d/init.d/client175
 etc/rc.d/init.d/collectd
 etc/rc.d/init.d/connectd
 etc/rc.d/init.d/console
-#etc/rc.d/init.d/cpufreq
-#etc/rc.d/init.d/cups
-#etc/rc.d/init.d/cyrus-imapd
-#etc/rc.d/init.d/cyrus-sasl
 etc/rc.d/init.d/dhcp
 etc/rc.d/init.d/dhcrelay
-#etc/rc.d/init.d/dnsdist
 etc/rc.d/init.d/fcron
-#etc/rc.d/init.d/fetchmail
 etc/rc.d/init.d/fireinfo
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/firstsetup
-#etc/rc.d/init.d/freeradius
 etc/rc.d/init.d/fsresize
 etc/rc.d/init.d/functions
-#etc/rc.d/init.d/gnump3d
-#etc/rc.d/init.d/guardian
 etc/rc.d/init.d/halt
-#etc/rc.d/init.d/haproxy
-#etc/rc.d/init.d/hostapd
-#etc/rc.d/init.d/imspector
 etc/rc.d/init.d/ipsec
-#etc/rc.d/init.d/keepalived
-#etc/rc.d/init.d/lcd4linux
-#etc/rc.d/init.d/lcdproc
-#etc/rc.d/init.d/lcr
 etc/rc.d/init.d/leds
-#etc/rc.d/init.d/libvirtd
 etc/rc.d/init.d/localnet
 etc/rc.d/init.d/mISDN
-#etc/rc.d/init.d/mediatomb
-#etc/rc.d/init.d/messagebus
-#etc/rc.d/init.d/miau
-#etc/rc.d/init.d/minidlna
-#etc/rc.d/init.d/miniupnpd
 etc/rc.d/init.d/modules
-#etc/rc.d/init.d/monit
-#etc/rc.d/init.d/motion
 etc/rc.d/init.d/mountfs
 etc/rc.d/init.d/mountkernfs
 etc/rc.d/init.d/mounttmpfs
-#etc/rc.d/init.d/mpd
-#etc/rc.d/init.d/mysql
-#etc/rc.d/init.d/netsnmpd
 etc/rc.d/init.d/network
 etc/rc.d/init.d/network-trigger
 #etc/rc.d/init.d/networking
@@ -98,52 +63,31 @@ etc/rc.d/init.d/networking/red.up/99-fireinfo
 etc/rc.d/init.d/networking/red.up/99-geoip-database
 etc/rc.d/init.d/networking/red.up/99-pakfire-update
 etc/rc.d/init.d/networking/wpa_supplicant.exe
-#etc/rc.d/init.d/nfs-server
 etc/rc.d/init.d/ntp
-#etc/rc.d/init.d/nut
-#etc/rc.d/init.d/openvmtools
 etc/rc.d/init.d/partresize
-#etc/rc.d/init.d/postfix
-#etc/rc.d/init.d/pound
 etc/rc.d/init.d/random
 etc/rc.d/init.d/rc
 etc/rc.d/init.d/reboot
 etc/rc.d/init.d/rngd
-#etc/rc.d/init.d/rpcbind
-#etc/rc.d/init.d/rtpproxy
-#etc/rc.d/init.d/samba
-#etc/rc.d/init.d/sane
 etc/rc.d/init.d/sendsignals
 etc/rc.d/init.d/setclock
 etc/rc.d/init.d/smartenabler
 etc/rc.d/init.d/snort
-#etc/rc.d/init.d/spamassassin
 etc/rc.d/init.d/squid
 etc/rc.d/init.d/sshd
-#etc/rc.d/init.d/sslh
 etc/rc.d/init.d/static-routes
-#etc/rc.d/init.d/stunnel
 etc/rc.d/init.d/swap
 etc/rc.d/init.d/swconfig
 etc/rc.d/init.d/sysctl
 etc/rc.d/init.d/sysklogd
 etc/rc.d/init.d/template
-#etc/rc.d/init.d/tftpd
-#etc/rc.d/init.d/tor
-#etc/rc.d/init.d/transmission
 etc/rc.d/init.d/udev
 etc/rc.d/init.d/udev_retry
 etc/rc.d/init.d/unbound
 etc/rc.d/init.d/upnpd
-#etc/rc.d/init.d/vdr
-#etc/rc.d/init.d/vdradmin
-#etc/rc.d/init.d/virtlogd
 etc/rc.d/init.d/vnstat
-#etc/rc.d/init.d/vsftpd
 etc/rc.d/init.d/waitdrives
-#etc/rc.d/init.d/watchdog
 etc/rc.d/init.d/wlanclient
-#etc/rc.d/init.d/xinetd
 #etc/rc.d/rc0.d
 #etc/rc.d/rc0.d/K01imspetor
 #etc/rc.d/rc0.d/K01motion
--- a/config/rootfiles/common/armv5tel/lm_sensors
+++ b/config/rootfiles/common/armv5tel/lm_sensors
@@ -8,7 +8,7 @@ usr/bin/sensors-conf-convert
 #usr/lib/libsensors.a
 usr/lib/libsensors.so
 usr/lib/libsensors.so.4
-usr/lib/libsensors.so.4.3.2
+usr/lib/libsensors.so.4.4.0
 #usr/man/man1/sensors.1
 #usr/man/man3/libsensors.3
 #usr/man/man5/sensors.conf.5
@@ -17,6 +17,7 @@ usr/lib/libsensors.so.4.3.2
 #usr/man/man8/isadump.8
 #usr/man/man8/isaset.8
 #usr/man/man8/pwmconfig.8
+#usr/man/man8/sensors-conf-convert.8
 #usr/man/man8/sensors-detect.8
 usr/sbin/fancontrol
 usr/sbin/pwmconfig
--- a/config/rootfiles/common/armv5tel/python
+++ b/config/rootfiles/common/armv5tel/python
@@ -1463,8 +1463,8 @@ usr/lib/python2.7/encodings/zlib_codec.pyc
 #usr/lib/python2.7/ensurepip/__main__.pyc
 #usr/lib/python2.7/ensurepip/__main__.pyo
 #usr/lib/python2.7/ensurepip/_bundled
-#usr/lib/python2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl
-#usr/lib/python2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl
+#usr/lib/python2.7/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl
+#usr/lib/python2.7/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl
 #usr/lib/python2.7/ensurepip/_uninstall.py
 #usr/lib/python2.7/ensurepip/_uninstall.pyc
 #usr/lib/python2.7/ensurepip/_uninstall.pyo
@@ -1718,6 +1718,10 @@ usr/lib/python2.7/httplib.pyc
 #usr/lib/python2.7/idlelib/dynOptionMenuWidget.pyc
 #usr/lib/python2.7/idlelib/dynOptionMenuWidget.pyo
 #usr/lib/python2.7/idlelib/extend.txt
+#usr/lib/python2.7/idlelib/help.html
+#usr/lib/python2.7/idlelib/help.py
+#usr/lib/python2.7/idlelib/help.pyc
+#usr/lib/python2.7/idlelib/help.pyo
 #usr/lib/python2.7/idlelib/help.txt
 #usr/lib/python2.7/idlelib/idle.bat
 #usr/lib/python2.7/idlelib/idle.py
@@ -1756,12 +1760,18 @@ usr/lib/python2.7/httplib.pyc
 #usr/lib/python2.7/idlelib/idle_test/test_delegator.py
 #usr/lib/python2.7/idlelib/idle_test/test_delegator.pyc
 #usr/lib/python2.7/idlelib/idle_test/test_delegator.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_editmenu.py
+#usr/lib/python2.7/idlelib/idle_test/test_editmenu.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_editmenu.pyo
 #usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.py
 #usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyc
 #usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyo
 #usr/lib/python2.7/idlelib/idle_test/test_grep.py
 #usr/lib/python2.7/idlelib/idle_test/test_grep.pyc
 #usr/lib/python2.7/idlelib/idle_test/test_grep.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_helpabout.py
+#usr/lib/python2.7/idlelib/idle_test/test_helpabout.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_helpabout.pyo
 #usr/lib/python2.7/idlelib/idle_test/test_hyperparser.py
 #usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyc
 #usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyo
@@ -1916,7 +1926,7 @@ usr/lib/python2.7/json/tool.pyc
 usr/lib/python2.7/keyword.pyc
 #usr/lib/python2.7/keyword.pyo
 #usr/lib/python2.7/lib-dynload
-#usr/lib/python2.7/lib-dynload/Python-2.7.10-py2.7.egg-info
+#usr/lib/python2.7/lib-dynload/Python-2.7.13-py2.7.egg-info
 usr/lib/python2.7/lib-dynload/_bisect.so
 usr/lib/python2.7/lib-dynload/_bsddb.so
 usr/lib/python2.7/lib-dynload/_codecs_cn.so
@@ -2092,9 +2102,9 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib-tk/turtle.pyo
 #usr/lib/python2.7/lib2to3
 #usr/lib/python2.7/lib2to3/Grammar.txt
-#usr/lib/python2.7/lib2to3/Grammar2.7.10.final.0.pickle
+#usr/lib/python2.7/lib2to3/Grammar2.7.13.final.0.pickle
 #usr/lib/python2.7/lib2to3/PatternGrammar.txt
-#usr/lib/python2.7/lib2to3/PatternGrammar2.7.10.final.0.pickle
+#usr/lib/python2.7/lib2to3/PatternGrammar2.7.13.final.0.pickle
 #usr/lib/python2.7/lib2to3/__init__.py
 #usr/lib/python2.7/lib2to3/__init__.pyc
 #usr/lib/python2.7/lib2to3/__init__.pyo
@@ -2129,9 +2139,6 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib2to3/fixes/fix_buffer.py
 #usr/lib/python2.7/lib2to3/fixes/fix_buffer.pyc
 #usr/lib/python2.7/lib2to3/fixes/fix_buffer.pyo
-#usr/lib/python2.7/lib2to3/fixes/fix_callable.py
-#usr/lib/python2.7/lib2to3/fixes/fix_callable.pyc
-#usr/lib/python2.7/lib2to3/fixes/fix_callable.pyo
 #usr/lib/python2.7/lib2to3/fixes/fix_dict.py
 #usr/lib/python2.7/lib2to3/fixes/fix_dict.pyc
 #usr/lib/python2.7/lib2to3/fixes/fix_dict.pyo
@@ -2750,6 +2757,7 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/_mock_backport.py
 #usr/lib/python2.7/test/_mock_backport.pyc
 #usr/lib/python2.7/test/_mock_backport.pyo
+#usr/lib/python2.7/test/allsans.pem
 #usr/lib/python2.7/test/audiodata
 #usr/lib/python2.7/test/audiodata/pluck-pcm16.aiff
 #usr/lib/python2.7/test/audiodata/pluck-pcm16.au
@@ -2784,16 +2792,14 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/badsyntax_future8.py
 #usr/lib/python2.7/test/badsyntax_future9.py
 #usr/lib/python2.7/test/badsyntax_nocaret.py
-#usr/lib/python2.7/test/buffer_tests.py
-#usr/lib/python2.7/test/buffer_tests.pyc
-#usr/lib/python2.7/test/buffer_tests.pyo
 #usr/lib/python2.7/test/capath
+#usr/lib/python2.7/test/capath/0e4015b9.0
 #usr/lib/python2.7/test/capath/4e1295a3.0
 #usr/lib/python2.7/test/capath/5ed36f99.0
 #usr/lib/python2.7/test/capath/6e88d7b8.0
 #usr/lib/python2.7/test/capath/99d0fa06.0
+#usr/lib/python2.7/test/capath/ce7b8643.0
 #usr/lib/python2.7/test/cfgparser.1
-#usr/lib/python2.7/test/check_soundcard.vbs
 #usr/lib/python2.7/test/cjkencodings
 #usr/lib/python2.7/test/cjkencodings/big5-utf8.txt
 #usr/lib/python2.7/test/cjkencodings/big5.txt
@@ -2993,7 +2999,6 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/gdb_sample.pyc
 #usr/lib/python2.7/test/gdb_sample.pyo
 #usr/lib/python2.7/test/greyrgb.uue
-#usr/lib/python2.7/test/https_svn_python_org_root.pem
 #usr/lib/python2.7/test/ieee754.txt
 #usr/lib/python2.7/test/imghdrdata
 #usr/lib/python2.7/test/imghdrdata/python.bmp
@@ -3105,6 +3110,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/ssl_servers.py
 #usr/lib/python2.7/test/ssl_servers.pyc
 #usr/lib/python2.7/test/ssl_servers.pyo
+#usr/lib/python2.7/test/ssltests.py
+#usr/lib/python2.7/test/ssltests.pyc
+#usr/lib/python2.7/test/ssltests.pyo
 #usr/lib/python2.7/test/string_tests.py
 #usr/lib/python2.7/test/string_tests.pyc
 #usr/lib/python2.7/test/string_tests.pyo
@@ -3319,9 +3327,6 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_codeop.py
 #usr/lib/python2.7/test/test_codeop.pyc
 #usr/lib/python2.7/test/test_codeop.pyo
-#usr/lib/python2.7/test/test_coding.py
-#usr/lib/python2.7/test/test_coding.pyc
-#usr/lib/python2.7/test/test_coding.pyo
 #usr/lib/python2.7/test/test_coercion.py
 #usr/lib/python2.7/test/test_coercion.pyc
 #usr/lib/python2.7/test/test_coercion.pyo
@@ -3837,6 +3842,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_optparse.py
 #usr/lib/python2.7/test/test_optparse.pyc
 #usr/lib/python2.7/test/test_optparse.pyo
+#usr/lib/python2.7/test/test_ordered_dict.py
+#usr/lib/python2.7/test/test_ordered_dict.pyc
+#usr/lib/python2.7/test/test_ordered_dict.pyo
 #usr/lib/python2.7/test/test_os.py
 #usr/lib/python2.7/test/test_os.pyc
 #usr/lib/python2.7/test/test_os.pyo
@@ -3855,15 +3863,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_pep247.py
 #usr/lib/python2.7/test/test_pep247.pyc
 #usr/lib/python2.7/test/test_pep247.pyo
-#usr/lib/python2.7/test/test_pep263.py
-#usr/lib/python2.7/test/test_pep263.pyc
-#usr/lib/python2.7/test/test_pep263.pyo
 #usr/lib/python2.7/test/test_pep277.py
 #usr/lib/python2.7/test/test_pep277.pyc
 #usr/lib/python2.7/test/test_pep277.pyo
-#usr/lib/python2.7/test/test_pep292.py
-#usr/lib/python2.7/test/test_pep292.pyc
-#usr/lib/python2.7/test/test_pep292.pyo
 #usr/lib/python2.7/test/test_pep352.py
 #usr/lib/python2.7/test/test_pep352.pyc
 #usr/lib/python2.7/test/test_pep352.pyo
@@ -4047,6 +4049,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_sort.py
 #usr/lib/python2.7/test/test_sort.pyc
 #usr/lib/python2.7/test/test_sort.pyo
+#usr/lib/python2.7/test/test_source_encoding.py
+#usr/lib/python2.7/test/test_source_encoding.pyc
+#usr/lib/python2.7/test/test_source_encoding.pyo
 #usr/lib/python2.7/test/test_spwd.py
 #usr/lib/python2.7/test/test_spwd.pyc
 #usr/lib/python2.7/test/test_spwd.pyo
@@ -4194,6 +4199,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_tuple.py
 #usr/lib/python2.7/test/test_tuple.pyc
 #usr/lib/python2.7/test/test_tuple.pyo
+#usr/lib/python2.7/test/test_turtle.py
+#usr/lib/python2.7/test/test_turtle.pyc
+#usr/lib/python2.7/test/test_turtle.pyo
 #usr/lib/python2.7/test/test_typechecks.py
 #usr/lib/python2.7/test/test_typechecks.pyc
 #usr/lib/python2.7/test/test_typechecks.pyo
--- a/config/rootfiles/common/attr
+++ b/config/rootfiles/common/attr
@@ -8,7 +8,7 @@ usr/bin/setfattr
 #usr/include/attr/xattr.h
 #usr/lib/libattr.a
 #usr/lib/libattr.la
-usr/lib/libattr.so
+#usr/lib/libattr.so
 usr/lib/libattr.so.1
 usr/lib/libattr.so.1.1.0
 #usr/share/doc/attr
@@ -28,17 +28,12 @@ usr/lib/libattr.so.1.1.0
 #usr/share/man/man1/attr.1
 #usr/share/man/man1/getfattr.1
 #usr/share/man/man1/setfattr.1
-#usr/share/man/man2/fgetxattr.2
+#usr/share/man/man2/flistxattr.2
 #usr/share/man/man2/fremovexattr.2
-#usr/share/man/man2/fsetxattr.2
 #usr/share/man/man2/getxattr.2
-#usr/share/man/man2/llistxattr.2
-#usr/share/man/man2/lgetxattr.2
-#usr/share/man/man2/listxattr.2
-#usr/share/man/man2/lremovexattr.2
-#usr/share/man/man2/lsetxattr.2
-#usr/share/man/man2/removexattr.2
 #usr/share/man/man2/setxattr.2
+#usr/share/man/man2/llistxattr.2
+#usr/share/man/man2/lremovexattr.2
 #usr/share/man/man3/attr_get.3
 #usr/share/man/man3/attr_getf.3
 #usr/share/man/man3/attr_list.3
--- a/config/rootfiles/common/autoconf
+++ b/config/rootfiles/common/autoconf
@@ -54,6 +54,7 @@
 #usr/share/autoconf/m4sugar/m4sugar.m4f
 #usr/share/autoconf/m4sugar/version.m4
 #usr/share/info/autoconf.info
+#usr/share/info/standards.info
 #usr/share/man/man1/autoconf.1
 #usr/share/man/man1/autoheader.1
 #usr/share/man/man1/autom4te.1
--- a/config/rootfiles/common/bc
+++ b/config/rootfiles/common/bc
@@ -1,6 +1,6 @@
 usr/bin/bc
 usr/bin/dc
-#usr/info/bc.info
-#usr/info/dc.info
-#usr/man/man1/bc.1
-#usr/man/man1/dc.1
+#usr/share/info/bc.info
+#usr/share/info/dc.info
+#usr/share/man/man1/bc.1
+#usr/share/man/man1/dc.1
--- a/config/rootfiles/common/boost
+++ b/config/rootfiles/common/boost
--- a/config/rootfiles/common/cairo
+++ b/config/rootfiles/common/cairo
@@ -7,36 +7,38 @@
 #usr/include/cairo/cairo-pdf.h
 #usr/include/cairo/cairo-ps.h
 #usr/include/cairo/cairo-script-interpreter.h
+#usr/include/cairo/cairo-script.h
 #usr/include/cairo/cairo-svg.h
 #usr/include/cairo/cairo-version.h
 #usr/include/cairo/cairo.h
 #usr/lib/cairo
 #usr/lib/cairo/libcairo-trace.a
 #usr/lib/cairo/libcairo-trace.la
-usr/lib/cairo/libcairo-trace.so
+#usr/lib/cairo/libcairo-trace.so
 usr/lib/cairo/libcairo-trace.so.0
 usr/lib/cairo/libcairo-trace.so.0.0.0
 #usr/lib/libcairo-gobject.a
 #usr/lib/libcairo-gobject.la
-usr/lib/libcairo-gobject.so
+#usr/lib/libcairo-gobject.so
 usr/lib/libcairo-gobject.so.2
-usr/lib/libcairo-gobject.so.2.11000.2
+usr/lib/libcairo-gobject.so.2.11400.8
 #usr/lib/libcairo-script-interpreter.a
 #usr/lib/libcairo-script-interpreter.la
-usr/lib/libcairo-script-interpreter.so
+#usr/lib/libcairo-script-interpreter.so
 usr/lib/libcairo-script-interpreter.so.2
-usr/lib/libcairo-script-interpreter.so.2.11000.2
+usr/lib/libcairo-script-interpreter.so.2.11400.8
 #usr/lib/libcairo.a
 #usr/lib/libcairo.la
 #usr/lib/libcairo.so
 usr/lib/libcairo.so.2
-usr/lib/libcairo.so.2.11000.2
+usr/lib/libcairo.so.2.11400.8
 #usr/lib/pkgconfig/cairo-fc.pc
 #usr/lib/pkgconfig/cairo-ft.pc
 #usr/lib/pkgconfig/cairo-gobject.pc
 #usr/lib/pkgconfig/cairo-pdf.pc
 #usr/lib/pkgconfig/cairo-png.pc
 #usr/lib/pkgconfig/cairo-ps.pc
+#usr/lib/pkgconfig/cairo-script.pc
 #usr/lib/pkgconfig/cairo-svg.pc
 #usr/lib/pkgconfig/cairo.pc
 #usr/share/gtk-doc/html/cairo
@@ -58,16 +60,20 @@ usr/lib/libcairo.so.2.11000.2
 #usr/share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html
 #usr/share/gtk-doc/html/cairo/cairo-Quartz-(CGFont)-Fonts.html
 #usr/share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html
+#usr/share/gtk-doc/html/cairo/cairo-Raster-Sources.html
 #usr/share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html
 #usr/share/gtk-doc/html/cairo/cairo-Regions.html
 #usr/share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
+#usr/share/gtk-doc/html/cairo/cairo-Script-Surfaces.html
 #usr/share/gtk-doc/html/cairo/cairo-Transformations.html
 #usr/share/gtk-doc/html/cairo/cairo-Types.html
 #usr/share/gtk-doc/html/cairo/cairo-User-Fonts.html
 #usr/share/gtk-doc/html/cairo/cairo-Version-Information.html
 #usr/share/gtk-doc/html/cairo/cairo-Win32-Fonts.html
 #usr/share/gtk-doc/html/cairo/cairo-Win32-Surfaces.html
+#usr/share/gtk-doc/html/cairo/cairo-XCB-Surfaces.html
 #usr/share/gtk-doc/html/cairo/cairo-XLib-Surfaces.html
+#usr/share/gtk-doc/html/cairo/cairo-XLib-XRender-Backend.html
 #usr/share/gtk-doc/html/cairo/cairo-cairo-device-t.html
 #usr/share/gtk-doc/html/cairo/cairo-cairo-font-face-t.html
 #usr/share/gtk-doc/html/cairo/cairo-cairo-font-options-t.html
@@ -81,10 +87,11 @@ usr/lib/libcairo.so.2.11000.2
 #usr/share/gtk-doc/html/cairo/cairo-support.html
 #usr/share/gtk-doc/html/cairo/cairo-surfaces.html
 #usr/share/gtk-doc/html/cairo/cairo-text.html
-#usr/share/gtk-doc/html/cairo/cairo.devhelp
 #usr/share/gtk-doc/html/cairo/cairo.devhelp2
 #usr/share/gtk-doc/html/cairo/home.png
 #usr/share/gtk-doc/html/cairo/index-1.10.html
+#usr/share/gtk-doc/html/cairo/index-1.12.html
+#usr/share/gtk-doc/html/cairo/index-1.14.html
 #usr/share/gtk-doc/html/cairo/index-1.2.html
 #usr/share/gtk-doc/html/cairo/index-1.4.html
 #usr/share/gtk-doc/html/cairo/index-1.6.html
@@ -93,7 +100,10 @@ usr/lib/libcairo.so.2.11000.2
 #usr/share/gtk-doc/html/cairo/index.html
 #usr/share/gtk-doc/html/cairo/index.sgml
 #usr/share/gtk-doc/html/cairo/language-bindings.html
+#usr/share/gtk-doc/html/cairo/left-insensitive.png
 #usr/share/gtk-doc/html/cairo/left.png
+#usr/share/gtk-doc/html/cairo/right-insensitive.png
 #usr/share/gtk-doc/html/cairo/right.png
 #usr/share/gtk-doc/html/cairo/style.css
+#usr/share/gtk-doc/html/cairo/up-insensitive.png
 #usr/share/gtk-doc/html/cairo/up.png
--- a/config/rootfiles/common/cmake
+++ b/config/rootfiles/common/cmake
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -111,7 +111,6 @@ var/ipfire/menu.d/70-log.menu
 #var/ipfire/menu.d/EX-asterisk.menu
 #var/ipfire/menu.d/EX-bluetooth.menu
 #var/ipfire/menu.d/EX-guardian.menu
-#var/ipfire/menu.d/EX-imspector.menu
 #var/ipfire/menu.d/EX-mpfire.menu
 #var/ipfire/menu.d/EX-samba.menu
 #var/ipfire/menu.d/EX-tor.menu
--- a/config/rootfiles/common/cpio
+++ b/config/rootfiles/common/cpio
@@ -1,32 +1,28 @@
 bin/cpio
-bin/mt
 #usr/share/info/cpio.info
 #usr/share/locale/da/LC_MESSAGES/cpio.mo
 #usr/share/locale/de/LC_MESSAGES/cpio.mo
 #usr/share/locale/es/LC_MESSAGES/cpio.mo
 #usr/share/locale/fi/LC_MESSAGES/cpio.mo
 #usr/share/locale/fr/LC_MESSAGES/cpio.mo
-#usr/share/locale/ga
-#usr/share/locale/ga/LC_MESSAGES
 #usr/share/locale/ga/LC_MESSAGES/cpio.mo
 #usr/share/locale/gl/LC_MESSAGES/cpio.mo
+#usr/share/locale/hr/LC_MESSAGES/cpio.mo
 #usr/share/locale/hu/LC_MESSAGES/cpio.mo
-#usr/share/locale/id
-#usr/share/locale/id/LC_MESSAGES
 #usr/share/locale/id/LC_MESSAGES/cpio.mo
+#usr/share/locale/it/LC_MESSAGES/cpio.mo
+#usr/share/locale/ja/LC_MESSAGES/cpio.mo
 #usr/share/locale/ko/LC_MESSAGES/cpio.mo
 #usr/share/locale/nl/LC_MESSAGES/cpio.mo
 #usr/share/locale/pl/LC_MESSAGES/cpio.mo
 #usr/share/locale/pt_BR/LC_MESSAGES/cpio.mo
 #usr/share/locale/ro/LC_MESSAGES/cpio.mo
 #usr/share/locale/ru/LC_MESSAGES/cpio.mo
+#usr/share/locale/sr/LC_MESSAGES/cpio.mo
 #usr/share/locale/sv/LC_MESSAGES/cpio.mo
 #usr/share/locale/tr/LC_MESSAGES/cpio.mo
 #usr/share/locale/uk/LC_MESSAGES/cpio.mo
-#usr/share/locale/vi
-#usr/share/locale/vi/LC_MESSAGES
 #usr/share/locale/vi/LC_MESSAGES/cpio.mo
 #usr/share/locale/zh_CN/LC_MESSAGES/cpio.mo
 #usr/share/locale/zh_TW/LC_MESSAGES/cpio.mo
 #usr/share/man/man1/cpio.1
-#usr/share/man/man1/mt.1
--- a/config/rootfiles/common/diffutils
+++ b/config/rootfiles/common/diffutils
@@ -4,5 +4,6 @@ usr/bin/diff
 #usr/bin/sdiff
 #usr/share/info/diffutils.info
 #usr/share/man/man1/cmp.1
+#usr/share/man/man1/diff.1
 #usr/share/man/man1/diff3.1
 #usr/share/man/man1/sdiff.1
--- a/config/rootfiles/common/flex
+++ b/config/rootfiles/common/flex
@@ -7,18 +7,13 @@
 #usr/lib/libfl.so
 usr/lib/libfl.so.2
 usr/lib/libfl.so.2.0.0
-#usr/lib/libfl_pic.a
-#usr/lib/libfl_pic.la
-#usr/lib/libfl_pic.so
-usr/lib/libfl_pic.so.2
-usr/lib/libfl_pic.so.2.0.0
 #usr/lib/libl.a
 #usr/share/doc/flex
 #usr/share/doc/flex/AUTHORS
 #usr/share/doc/flex/COPYING
 #usr/share/doc/flex/NEWS
 #usr/share/doc/flex/ONEWS
-#usr/share/doc/flex/README
+#usr/share/doc/flex/README.md
 #usr/share/info/flex.info
 #usr/share/info/flex.info-1
 #usr/share/info/flex.info-2
--- a/config/rootfiles/common/fontconfig
+++ b/config/rootfiles/common/fontconfig
@@ -1,33 +1,7 @@
 #etc/fonts
-#etc/fonts/conf.avail
-etc/fonts/conf.avail/10-autohint.conf
-etc/fonts/conf.avail/10-no-sub-pixel.conf
-etc/fonts/conf.avail/10-sub-pixel-bgr.conf
-etc/fonts/conf.avail/10-sub-pixel-rgb.conf
-etc/fonts/conf.avail/10-sub-pixel-vbgr.conf
-etc/fonts/conf.avail/10-sub-pixel-vrgb.conf
-etc/fonts/conf.avail/10-unhinted.conf
-etc/fonts/conf.avail/20-fix-globaladvance.conf
-etc/fonts/conf.avail/20-unhint-small-vera.conf
-etc/fonts/conf.avail/25-unhint-nonlatin.conf
-etc/fonts/conf.avail/30-metric-aliases.conf
-etc/fonts/conf.avail/30-urw-aliases.conf
-etc/fonts/conf.avail/40-nonlatin.conf
-etc/fonts/conf.avail/45-latin.conf
-etc/fonts/conf.avail/49-sansserif.conf
-etc/fonts/conf.avail/50-user.conf
-etc/fonts/conf.avail/51-local.conf
-etc/fonts/conf.avail/60-latin.conf
-etc/fonts/conf.avail/65-fonts-persian.conf
-etc/fonts/conf.avail/65-khmer.conf
-etc/fonts/conf.avail/65-nonlatin.conf
-etc/fonts/conf.avail/69-unifont.conf
-etc/fonts/conf.avail/70-no-bitmaps.conf
-etc/fonts/conf.avail/70-yes-bitmaps.conf
-etc/fonts/conf.avail/80-delicious.conf
-etc/fonts/conf.avail/90-synthetic.conf
 #etc/fonts/conf.d
-etc/fonts/conf.d/20-fix-globaladvance.conf
+etc/fonts/conf.d/10-hinting-slight.conf
+etc/fonts/conf.d/10-scale-bitmap-fonts.conf
 etc/fonts/conf.d/20-unhint-small-vera.conf
 etc/fonts/conf.d/30-metric-aliases.conf
 etc/fonts/conf.d/30-urw-aliases.conf
@@ -44,208 +18,275 @@ etc/fonts/conf.d/80-delicious.conf
 etc/fonts/conf.d/90-synthetic.conf
 #etc/fonts/conf.d/README
 etc/fonts/fonts.conf
-etc/fonts/fonts.dtd
 usr/bin/fc-cache
 usr/bin/fc-cat
 usr/bin/fc-list
 usr/bin/fc-match
+usr/bin/fc-pattern
+usr/bin/fc-query
+usr/bin/fc-scan
+usr/bin/fc-validate
 #usr/include/fontconfig
 #usr/include/fontconfig/fcfreetype.h
 #usr/include/fontconfig/fcprivate.h
 #usr/include/fontconfig/fontconfig.h
-#usr/lib/libfontconfig.a
 #usr/lib/libfontconfig.la
-usr/lib/libfontconfig.so
+#usr/lib/libfontconfig.so
 usr/lib/libfontconfig.so.1
-usr/lib/libfontconfig.so.1.3.0
-usr/lib/pkgconfig/fontconfig.pc
+usr/lib/libfontconfig.so.1.9.2
+#usr/lib/pkgconfig/fontconfig.pc
 #usr/share/doc/fontconfig
 #usr/share/doc/fontconfig/fontconfig-devel
 #usr/share/doc/fontconfig/fontconfig-devel.pdf
 #usr/share/doc/fontconfig/fontconfig-devel.txt
-#usr/share/doc/fontconfig/fontconfig-devel/index.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1034.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1056.html
-#usr/share/doc/fontconfig/fontconfig-devel/r108.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1099.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1127.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1148.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1171.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1192.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1237.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1260.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1283.html
-#usr/share/doc/fontconfig/fontconfig-devel/r129.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1309.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1336.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1367.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1389.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1412.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1434.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1460.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1482.html
-#usr/share/doc/fontconfig/fontconfig-devel/r150.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1505.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1529.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1552.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1577.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1602.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1627.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1652.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1677.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1699.html
-#usr/share/doc/fontconfig/fontconfig-devel/r171.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1724.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1749.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1774.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1801.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1829.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1858.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1883.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1905.html
-#usr/share/doc/fontconfig/fontconfig-devel/r192.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1927.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1950.html
-#usr/share/doc/fontconfig/fontconfig-devel/r1976.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2002.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2032.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2057.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2081.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2110.html
-#usr/share/doc/fontconfig/fontconfig-devel/r213.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2131.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2155.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2178.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2201.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2227.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2256.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2286.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2316.html
-#usr/share/doc/fontconfig/fontconfig-devel/r234.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2349.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2370.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2391.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2413.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2434.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2456.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2478.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2501.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2522.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2544.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2566.html
-#usr/share/doc/fontconfig/fontconfig-devel/r258.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2588.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2609.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2631.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2655.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2676.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2698.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2721.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2744.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2767.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2788.html
-#usr/share/doc/fontconfig/fontconfig-devel/r279.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2817.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2842.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2873.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2911.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2942.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2969.html
-#usr/share/doc/fontconfig/fontconfig-devel/r2993.html
-#usr/share/doc/fontconfig/fontconfig-devel/r301.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3021.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3045.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3069.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3094.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3118.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3142.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3164.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3192.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3213.html
-#usr/share/doc/fontconfig/fontconfig-devel/r323.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3234.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3257.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3283.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3305.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3327.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3349.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3371.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3393.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3414.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3435.html
-#usr/share/doc/fontconfig/fontconfig-devel/r344.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3460.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3496.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3518.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3553.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3581.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3607.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3629.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3656.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3683.html
-#usr/share/doc/fontconfig/fontconfig-devel/r369.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3708.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3733.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3755.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3778.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3805.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3827.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3852.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3873.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3898.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3923.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3948.html
-#usr/share/doc/fontconfig/fontconfig-devel/r397.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3973.html
-#usr/share/doc/fontconfig/fontconfig-devel/r3999.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4021.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4043.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4065.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4090.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4119.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4144.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4176.html
-#usr/share/doc/fontconfig/fontconfig-devel/r418.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4209.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4245.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4267.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4289.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4311.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4334.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4356.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4380.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4405.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4430.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4457.html
-#usr/share/doc/fontconfig/fontconfig-devel/r446.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4484.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4509.html
-#usr/share/doc/fontconfig/fontconfig-devel/r4530.html
-#usr/share/doc/fontconfig/fontconfig-devel/r475.html
-#usr/share/doc/fontconfig/fontconfig-devel/r570.html
-#usr/share/doc/fontconfig/fontconfig-devel/r600.html
-#usr/share/doc/fontconfig/fontconfig-devel/r707.html
-#usr/share/doc/fontconfig/fontconfig-devel/r759.html
-#usr/share/doc/fontconfig/fontconfig-devel/r782.html
-#usr/share/doc/fontconfig/fontconfig-devel/r807.html
-#usr/share/doc/fontconfig/fontconfig-devel/r828.html
-#usr/share/doc/fontconfig/fontconfig-devel/r856.html
-#usr/share/doc/fontconfig/fontconfig-devel/r878.html
-#usr/share/doc/fontconfig/fontconfig-devel/r902.html
-#usr/share/doc/fontconfig/fontconfig-devel/r923.html
-#usr/share/doc/fontconfig/fontconfig-devel/r944.html
-#usr/share/doc/fontconfig/fontconfig-devel/r967.html
-#usr/share/doc/fontconfig/fontconfig-devel/r999.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcatomiccreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcatomicdeletenew.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcatomicdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcatomiclock.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcatomicnewfile.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcatomicorigfile.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcatomicreplaceorig.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcatomicunlock.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcblanksadd.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcblankscreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcblanksdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcblanksismember.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccachecopyset.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccachecreatetagfile.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccachedir.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccachenumfont.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccachenumsubdir.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccachesubdir.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetaddchar.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetcopy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetcount.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetcoverage.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetcreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetdelchar.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetequal.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetfirstpage.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsethaschar.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetintersect.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetintersectcount.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetissubset.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetmerge.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetnew.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetnextpage.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetsubtract.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetsubtractcount.html
+#usr/share/doc/fontconfig/fontconfig-devel/fccharsetunion.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigappfontadddir.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigappfontaddfile.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigappfontclear.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigbuildfonts.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigcreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigenablehome.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigfilename.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetblanks.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetcache.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetcachedirs.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigdirs.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigfiles.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetcurrent.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetfontdirs.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetfonts.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetrescaninterval.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiggetsysroot.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfighome.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigparseandload.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigreference.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetcurrent.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetrescaninterval.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsetsysroot.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsubstitute.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfigsubstitutewithpat.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcconfiguptodate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdefaultsubstitute.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheclean.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheload.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheloadfile.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheread.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdircacherescan.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheunlink.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdircacheunload.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdircachevalid.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdirsave.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcdirscan.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfileisdir.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfilescan.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfini.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontlist.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontmatch.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontrenderprepare.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetadd.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetcreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetlist.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetmatch.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetprint.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetsort.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsetsortdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfontsort.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharindex.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharset.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypecharsetandspacing.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypequery.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcfreetypequeryface.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcgetdefaultlangs.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcgetlangs.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcgetversion.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcinit.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcinitbringuptodate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcinitloadconfig.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcinitloadconfigandfonts.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcinitreinitialize.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcislower.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcisupper.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclanggetcharset.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangnormalize.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetadd.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetcompare.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetcontains.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetcopy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetcreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetdel.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetequal.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetgetlangs.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsethash.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsethaslang.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetsubtract.html
+#usr/share/doc/fontconfig/fontconfig-devel/fclangsetunion.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixcopy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixequal.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixinit.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixmultiply.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixrotate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixscale.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcmatrixshear.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnameconstant.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnamegetconstant.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnamegetobjecttype.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnameparse.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnameregisterconstants.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnameregisterobjecttypes.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnameunparse.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnameunregisterconstants.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcnameunregisterobjecttypes.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetadd.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetbuild.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetcreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcobjectsetdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternadd-type.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternadd.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternaddweak.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternbuild.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatterncreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatterndel.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatterndestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternduplicate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternequal.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternequalsubset.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternfilter.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternformat.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternget-type.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternget.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternhash.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternprint.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternreference.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcpatternremove.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcrangecopy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcrangecreatedouble.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcrangecreateinteger.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcrangedestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcrangegetdouble.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrbasename.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrcmp.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrcmpignorecase.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrcopy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrcopyfilename.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrdirname.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrdowncase.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrfree.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrlistcreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrlistdone.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrlistfirst.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrlistnext.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrplus.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetadd.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetaddfilename.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetcreate.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetdel.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetdestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetequal.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrsetmember.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrstr.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcstrstrignorecase.html
+#usr/share/doc/fontconfig/fontconfig-devel/fctolower.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcucs4toutf8.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcutf16len.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcutf16toucs4.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcutf8len.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcutf8toucs4.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcvaluedestroy.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcvalueequal.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcvalueprint.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcvaluesave.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcweightfromopentype.html
+#usr/share/doc/fontconfig/fontconfig-devel/fcweighttoopentype.html
+#usr/share/doc/fontconfig/fontconfig-devel/ln12.html
+#usr/share/doc/fontconfig/fontconfig-devel/t1.html
 #usr/share/doc/fontconfig/fontconfig-devel/x102.html
 #usr/share/doc/fontconfig/fontconfig-devel/x19.html
 #usr/share/doc/fontconfig/fontconfig-devel/x31.html
 #usr/share/doc/fontconfig/fontconfig-user.html
 #usr/share/doc/fontconfig/fontconfig-user.pdf
 #usr/share/doc/fontconfig/fontconfig-user.txt
+#usr/share/fontconfig
+#usr/share/fontconfig/conf.avail
+#usr/share/fontconfig/conf.avail/10-autohint.conf
+#usr/share/fontconfig/conf.avail/10-hinting-full.conf
+#usr/share/fontconfig/conf.avail/10-hinting-medium.conf
+#usr/share/fontconfig/conf.avail/10-hinting-none.conf
+#usr/share/fontconfig/conf.avail/10-hinting-slight.conf
+#usr/share/fontconfig/conf.avail/10-no-sub-pixel.conf
+#usr/share/fontconfig/conf.avail/10-scale-bitmap-fonts.conf
+#usr/share/fontconfig/conf.avail/10-sub-pixel-bgr.conf
+#usr/share/fontconfig/conf.avail/10-sub-pixel-rgb.conf
+#usr/share/fontconfig/conf.avail/10-sub-pixel-vbgr.conf
+#usr/share/fontconfig/conf.avail/10-sub-pixel-vrgb.conf
+#usr/share/fontconfig/conf.avail/10-unhinted.conf
+#usr/share/fontconfig/conf.avail/11-lcdfilter-default.conf
+#usr/share/fontconfig/conf.avail/11-lcdfilter-legacy.conf
+#usr/share/fontconfig/conf.avail/11-lcdfilter-light.conf
+#usr/share/fontconfig/conf.avail/20-unhint-small-vera.conf
+#usr/share/fontconfig/conf.avail/25-unhint-nonlatin.conf
+#usr/share/fontconfig/conf.avail/30-metric-aliases.conf
+#usr/share/fontconfig/conf.avail/30-urw-aliases.conf
+#usr/share/fontconfig/conf.avail/40-nonlatin.conf
+#usr/share/fontconfig/conf.avail/45-latin.conf
+#usr/share/fontconfig/conf.avail/49-sansserif.conf
+#usr/share/fontconfig/conf.avail/50-user.conf
+#usr/share/fontconfig/conf.avail/51-local.conf
+#usr/share/fontconfig/conf.avail/60-latin.conf
+#usr/share/fontconfig/conf.avail/65-fonts-persian.conf
+#usr/share/fontconfig/conf.avail/65-khmer.conf
+#usr/share/fontconfig/conf.avail/65-nonlatin.conf
+#usr/share/fontconfig/conf.avail/69-unifont.conf
+#usr/share/fontconfig/conf.avail/70-no-bitmaps.conf
+#usr/share/fontconfig/conf.avail/70-yes-bitmaps.conf
+#usr/share/fontconfig/conf.avail/80-delicious.conf
+#usr/share/fontconfig/conf.avail/90-synthetic.conf
 #usr/share/man/man1/fc-cache.1
 #usr/share/man/man1/fc-cat.1
 #usr/share/man/man1/fc-list.1
 #usr/share/man/man1/fc-match.1
+#usr/share/man/man1/fc-pattern.1
+#usr/share/man/man1/fc-query.1
+#usr/share/man/man1/fc-scan.1
+#usr/share/man/man1/fc-validate.1
 #usr/share/man/man3/FcAtomicCreate.3
 #usr/share/man/man3/FcAtomicDeleteNew.3
 #usr/share/man/man3/FcAtomicDestroy.3
@@ -259,6 +300,7 @@ usr/lib/pkgconfig/fontconfig.pc
 #usr/share/man/man3/FcBlanksDestroy.3
 #usr/share/man/man3/FcBlanksIsMember.3
 #usr/share/man/man3/FcCacheCopySet.3
+#usr/share/man/man3/FcCacheCreateTagFile.3
 #usr/share/man/man3/FcCacheDir.3
 #usr/share/man/man3/FcCacheNumFont.3
 #usr/share/man/man3/FcCacheNumSubdir.3
@@ -268,6 +310,7 @@ usr/lib/pkgconfig/fontconfig.pc
 #usr/share/man/man3/FcCharSetCount.3
 #usr/share/man/man3/FcCharSetCoverage.3
 #usr/share/man/man3/FcCharSetCreate.3
+#usr/share/man/man3/FcCharSetDelChar.3
 #usr/share/man/man3/FcCharSetDestroy.3
 #usr/share/man/man3/FcCharSetEqual.3
 #usr/share/man/man3/FcCharSetFirstPage.3
@@ -275,6 +318,7 @@ usr/lib/pkgconfig/fontconfig.pc
 #usr/share/man/man3/FcCharSetIntersect.3
 #usr/share/man/man3/FcCharSetIntersectCount.3
 #usr/share/man/man3/FcCharSetIsSubset.3
+#usr/share/man/man3/FcCharSetMerge.3
 #usr/share/man/man3/FcCharSetNew.3
 #usr/share/man/man3/FcCharSetNextPage.3
 #usr/share/man/man3/FcCharSetSubtract.3
@@ -297,17 +341,22 @@ usr/lib/pkgconfig/fontconfig.pc
 #usr/share/man/man3/FcConfigGetFontDirs.3
 #usr/share/man/man3/FcConfigGetFonts.3
 #usr/share/man/man3/FcConfigGetRescanInterval.3
+#usr/share/man/man3/FcConfigGetSysRoot.3
 #usr/share/man/man3/FcConfigHome.3
 #usr/share/man/man3/FcConfigParseAndLoad.3
+#usr/share/man/man3/FcConfigReference.3
 #usr/share/man/man3/FcConfigSetCurrent.3
 #usr/share/man/man3/FcConfigSetRescanInterval.3
+#usr/share/man/man3/FcConfigSetSysRoot.3
 #usr/share/man/man3/FcConfigSubstitute.3
 #usr/share/man/man3/FcConfigSubstituteWithPat.3
 #usr/share/man/man3/FcConfigUptoDate.3
 #usr/share/man/man3/FcDefaultSubstitute.3
+#usr/share/man/man3/FcDirCacheClean.3
 #usr/share/man/man3/FcDirCacheLoad.3
 #usr/share/man/man3/FcDirCacheLoadFile.3
 #usr/share/man/man3/FcDirCacheRead.3
+#usr/share/man/man3/FcDirCacheRescan.3
 #usr/share/man/man3/FcDirCacheUnlink.3
 #usr/share/man/man3/FcDirCacheUnload.3
 #usr/share/man/man3/FcDirCacheValid.3
@@ -333,6 +382,7 @@ usr/lib/pkgconfig/fontconfig.pc
 #usr/share/man/man3/FcFreeTypeCharSetAndSpacing.3
 #usr/share/man/man3/FcFreeTypeQuery.3
 #usr/share/man/man3/FcFreeTypeQueryFace.3
+#usr/share/man/man3/FcGetDefaultLangs.3
 #usr/share/man/man3/FcGetLangs.3
 #usr/share/man/man3/FcGetVersion.3
 #usr/share/man/man3/FcInit.3
@@ -343,15 +393,20 @@ usr/lib/pkgconfig/fontconfig.pc
 #usr/share/man/man3/FcIsLower.3
 #usr/share/man/man3/FcIsUpper.3
 #usr/share/man/man3/FcLangGetCharSet.3
+#usr/share/man/man3/FcLangNormalize.3
 #usr/share/man/man3/FcLangSetAdd.3
 #usr/share/man/man3/FcLangSetCompare.3
 #usr/share/man/man3/FcLangSetContains.3
 #usr/share/man/man3/FcLangSetCopy.3
 #usr/share/man/man3/FcLangSetCreate.3
+#usr/share/man/man3/FcLangSetDel.3
 #usr/share/man/man3/FcLangSetDestroy.3
 #usr/share/man/man3/FcLangSetEqual.3
+#usr/share/man/man3/FcLangSetGetLangs.3
 #usr/share/man/man3/FcLangSetHasLang.3
 #usr/share/man/man3/FcLangSetHash.3
+#usr/share/man/man3/FcLangSetSubtract.3
+#usr/share/man/man3/FcLangSetUnion.3
 #usr/share/man/man3/FcMatrixCopy.3
 #usr/share/man/man3/FcMatrixEqual.3
 #usr/share/man/man3/FcMatrixInit.3
@@ -382,21 +437,30 @@ usr/lib/pkgconfig/fontconfig.pc
 #usr/share/man/man3/FcPatternDuplicate.3
 #usr/share/man/man3/FcPatternEqual.3
 #usr/share/man/man3/FcPatternEqualSubset.3
+#usr/share/man/man3/FcPatternFilter.3
+#usr/share/man/man3/FcPatternFormat.3
 #usr/share/man/man3/FcPatternGet-Type.3
 #usr/share/man/man3/FcPatternGet.3
 #usr/share/man/man3/FcPatternHash.3
 #usr/share/man/man3/FcPatternPrint.3
 #usr/share/man/man3/FcPatternReference.3
 #usr/share/man/man3/FcPatternRemove.3
+#usr/share/man/man3/FcRangeCopy.3
+#usr/share/man/man3/FcRangeCreateDouble.3
+#usr/share/man/man3/FcRangeCreateInteger.3
+#usr/share/man/man3/FcRangeDestroy.3
+#usr/share/man/man3/FcRangeGetDouble.3
 #usr/share/man/man3/FcStrBasename.3
 #usr/share/man/man3/FcStrCmp.3
 #usr/share/man/man3/FcStrCmpIgnoreCase.3
 #usr/share/man/man3/FcStrCopy.3
 #usr/share/man/man3/FcStrCopyFilename.3
+#usr/share/man/man3/FcStrDirname.3
 #usr/share/man/man3/FcStrDowncase.3
 #usr/share/man/man3/FcStrFree.3
 #usr/share/man/man3/FcStrListCreate.3
 #usr/share/man/man3/FcStrListDone.3
+#usr/share/man/man3/FcStrListFirst.3
 #usr/share/man/man3/FcStrListNext.3
 #usr/share/man/man3/FcStrPlus.3
 #usr/share/man/man3/FcStrSetAdd.3
@@ -418,7 +482,11 @@ usr/lib/pkgconfig/fontconfig.pc
 #usr/share/man/man3/FcValueEqual.3
 #usr/share/man/man3/FcValuePrint.3
 #usr/share/man/man3/FcValueSave.3
+#usr/share/man/man3/FcWeightFromOpenType.3
+#usr/share/man/man3/FcWeightToOpenType.3
 #usr/share/man/man5/fonts-conf.5
-#usr/var
-#usr/var/cache
-usr/var/cache/fontconfig
+#usr/share/xml
+#usr/share/xml/fontconfig
+usr/share/xml/fontconfig/fonts.dtd
+var/cache/fontconfig
+var/cache/fontconfig/CACHEDIR.TAG
--- a/config/rootfiles/common/freetype
+++ b/config/rootfiles/common/freetype
@@ -1,14 +1,6 @@
 #usr/bin/freetype-config
 #usr/include/freetype2
 #usr/include/freetype2/freetype
-#usr/include/freetype2/freetype/cache
-#usr/include/freetype2/freetype/cache/ftccache.h
-#usr/include/freetype2/freetype/cache/ftccmap.h
-#usr/include/freetype2/freetype/cache/ftcglyph.h
-#usr/include/freetype2/freetype/cache/ftcimage.h
-#usr/include/freetype2/freetype/cache/ftcmanag.h
-#usr/include/freetype2/freetype/cache/ftcmru.h
-#usr/include/freetype2/freetype/cache/ftcsbits.h
 #usr/include/freetype2/freetype/config
 #usr/include/freetype2/freetype/config/ftconfig.h
 #usr/include/freetype2/freetype/config/ftheader.h
@@ -16,17 +8,26 @@
 #usr/include/freetype2/freetype/config/ftoption.h
 #usr/include/freetype2/freetype/config/ftstdlib.h
 #usr/include/freetype2/freetype/freetype.h
+#usr/include/freetype2/freetype/ftadvanc.h
+#usr/include/freetype2/freetype/ftautoh.h
 #usr/include/freetype2/freetype/ftbbox.h
 #usr/include/freetype2/freetype/ftbdf.h
 #usr/include/freetype2/freetype/ftbitmap.h
+#usr/include/freetype2/freetype/ftbzip2.h
 #usr/include/freetype2/freetype/ftcache.h
+#usr/include/freetype2/freetype/ftcffdrv.h
 #usr/include/freetype2/freetype/ftchapters.h
+#usr/include/freetype2/freetype/ftcid.h
 #usr/include/freetype2/freetype/fterrdef.h
 #usr/include/freetype2/freetype/fterrors.h
+#usr/include/freetype2/freetype/ftfntfmt.h
+#usr/include/freetype2/freetype/ftgasp.h
 #usr/include/freetype2/freetype/ftglyph.h
+#usr/include/freetype2/freetype/ftgxval.h
 #usr/include/freetype2/freetype/ftgzip.h
 #usr/include/freetype2/freetype/ftimage.h
 #usr/include/freetype2/freetype/ftincrem.h
+#usr/include/freetype2/freetype/ftlcdfil.h
 #usr/include/freetype2/freetype/ftlist.h
 #usr/include/freetype2/freetype/ftlzw.h
 #usr/include/freetype2/freetype/ftmac.h
@@ -41,55 +42,22 @@
 #usr/include/freetype2/freetype/ftsnames.h
 #usr/include/freetype2/freetype/ftstroke.h
 #usr/include/freetype2/freetype/ftsynth.h
-#usr/include/freetype2/freetype/ftsysio.h
-#usr/include/freetype2/freetype/ftsysmem.h
 #usr/include/freetype2/freetype/ftsystem.h
 #usr/include/freetype2/freetype/fttrigon.h
+#usr/include/freetype2/freetype/ftttdrv.h
 #usr/include/freetype2/freetype/fttypes.h
 #usr/include/freetype2/freetype/ftwinfnt.h
-#usr/include/freetype2/freetype/ftxf86.h
-#usr/include/freetype2/freetype/internal
-#usr/include/freetype2/freetype/internal/autohint.h
-#usr/include/freetype2/freetype/internal/ftcalc.h
-#usr/include/freetype2/freetype/internal/ftdebug.h
-#usr/include/freetype2/freetype/internal/ftdriver.h
-#usr/include/freetype2/freetype/internal/ftgloadr.h
-#usr/include/freetype2/freetype/internal/ftmemory.h
-#usr/include/freetype2/freetype/internal/ftobjs.h
-#usr/include/freetype2/freetype/internal/ftrfork.h
-#usr/include/freetype2/freetype/internal/ftserv.h
-#usr/include/freetype2/freetype/internal/ftstream.h
-#usr/include/freetype2/freetype/internal/fttrace.h
-#usr/include/freetype2/freetype/internal/ftvalid.h
-#usr/include/freetype2/freetype/internal/internal.h
-#usr/include/freetype2/freetype/internal/pcftypes.h
-#usr/include/freetype2/freetype/internal/psaux.h
-#usr/include/freetype2/freetype/internal/pshints.h
-#usr/include/freetype2/freetype/internal/sfnt.h
-#usr/include/freetype2/freetype/internal/svbdf.h
-#usr/include/freetype2/freetype/internal/svgldict.h
-#usr/include/freetype2/freetype/internal/svmm.h
-#usr/include/freetype2/freetype/internal/svotval.h
-#usr/include/freetype2/freetype/internal/svpfr.h
-#usr/include/freetype2/freetype/internal/svpostnm.h
-#usr/include/freetype2/freetype/internal/svpscmap.h
-#usr/include/freetype2/freetype/internal/svpsinfo.h
-#usr/include/freetype2/freetype/internal/svsfnt.h
-#usr/include/freetype2/freetype/internal/svttcmap.h
-#usr/include/freetype2/freetype/internal/svwinfnt.h
-#usr/include/freetype2/freetype/internal/svxf86nm.h
-#usr/include/freetype2/freetype/internal/t1types.h
-#usr/include/freetype2/freetype/internal/tttypes.h
 #usr/include/freetype2/freetype/t1tables.h
 #usr/include/freetype2/freetype/ttnameid.h
 #usr/include/freetype2/freetype/tttables.h
 #usr/include/freetype2/freetype/tttags.h
 #usr/include/freetype2/freetype/ttunpat.h
-#usr/include/ft2build.h
+#usr/include/freetype2/ft2build.h
 #usr/lib/libfreetype.a
 #usr/lib/libfreetype.la
-usr/lib/libfreetype.so
+#usr/lib/libfreetype.so
 usr/lib/libfreetype.so.6
-usr/lib/libfreetype.so.6.3.8
+usr/lib/libfreetype.so.6.13.0
 #usr/lib/pkgconfig/freetype2.pc
 #usr/share/aclocal/freetype2.m4
+#usr/share/man/man1/freetype-config.1
--- a/config/rootfiles/common/fuse
+++ b/config/rootfiles/common/fuse
@@ -1,5 +1,3 @@
-#etc/init.d
-#etc/init.d/fuse
 #etc/rc.d/init.d/fuse
 etc/udev/rules.d/99-fuse.rules
 sbin/mount.fuse
@@ -20,7 +18,7 @@ usr/bin/ulockmgr_server
 #usr/lib/libfuse.la
 usr/lib/libfuse.so
 usr/lib/libfuse.so.2
-usr/lib/libfuse.so.2.9.3
+usr/lib/libfuse.so.2.9.7
 #usr/lib/libulockmgr.a
 #usr/lib/libulockmgr.la
 usr/lib/libulockmgr.so
--- a/config/rootfiles/common/fwhits
+++ b/config/rootfiles/common/fwhits
@@ -1 +0,0 @@
-usr/local/bin/logtailfwhits
--- a/config/rootfiles/common/gawk
+++ b/config/rootfiles/common/gawk
@@ -1,18 +1,24 @@
 usr/bin/awk
 usr/bin/gawk
-#usr/bin/gawk-3.1.5
+#usr/bin/gawk-4.1.4
 #usr/bin/igawk
-#usr/bin/pgawk
-#usr/bin/pgawk-3.1.5
-#usr/info/dir
-#usr/info/gawk.info
-#usr/info/gawkinet.info
+#usr/include/gawkapi.h
 #usr/lib/awk
 #usr/lib/awk/grcat
 #usr/lib/awk/pwcat
-#usr/man/man1/gawk.1
-#usr/man/man1/igawk.1
-#usr/man/man1/pgawk.1
+#usr/lib/gawk
+usr/lib/gawk/filefuncs.so
+usr/lib/gawk/fnmatch.so
+usr/lib/gawk/fork.so
+usr/lib/gawk/inplace.so
+usr/lib/gawk/ordchr.so
+usr/lib/gawk/readdir.so
+usr/lib/gawk/readfile.so
+usr/lib/gawk/revoutput.so
+usr/lib/gawk/revtwoway.so
+usr/lib/gawk/rwarray.so
+usr/lib/gawk/testext.so
+usr/lib/gawk/time.so
 #usr/share/awk
 #usr/share/awk/assert.awk
 #usr/share/awk/bits2str.awk
@@ -22,14 +28,34 @@ usr/bin/gawk
 #usr/share/awk/getopt.awk
 #usr/share/awk/gettime.awk
 #usr/share/awk/group.awk
+#usr/share/awk/inplace.awk
 #usr/share/awk/join.awk
 #usr/share/awk/libintl.awk
-#usr/share/awk/nextfile.awk
 #usr/share/awk/noassign.awk
 #usr/share/awk/ord.awk
 #usr/share/awk/passwd.awk
+#usr/share/awk/processarray.awk
+#usr/share/awk/quicksort.awk
 #usr/share/awk/readable.awk
+#usr/share/awk/readfile.awk
 #usr/share/awk/rewind.awk
 #usr/share/awk/round.awk
+#usr/share/awk/shellquote.awk
 #usr/share/awk/strtonum.awk
+#usr/share/awk/walkarray.awk
 #usr/share/awk/zerofile.awk
+#usr/share/info/gawk.info
+#usr/share/info/gawkinet.info
+#usr/share/man/man1/gawk.1
+#usr/share/man/man1/igawk.1
+#usr/share/man/man3/filefuncs.3am
+#usr/share/man/man3/fnmatch.3am
+#usr/share/man/man3/fork.3am
+#usr/share/man/man3/inplace.3am
+#usr/share/man/man3/ordchr.3am
+#usr/share/man/man3/readdir.3am
+#usr/share/man/man3/readfile.3am
+#usr/share/man/man3/revoutput.3am
+#usr/share/man/man3/revtwoway.3am
+#usr/share/man/man3/rwarray.3am
+#usr/share/man/man3/time.3am
--- a/config/rootfiles/common/gnutls
+++ b/config/rootfiles/common/gnutls
--- a/config/rootfiles/common/gzip
+++ b/config/rootfiles/common/gzip
@@ -1,4 +1,3 @@
-#bin/compress
 bin/gunzip
 bin/gzip
 bin/uncompress
@@ -13,15 +12,15 @@ bin/zcat
 #usr/bin/zless
 #usr/bin/zmore
 #usr/bin/znew
-#usr/info/gzip.info
-#usr/man/man1/gunzip.1
-#usr/man/man1/gzexe.1
-#usr/man/man1/gzip.1
-#usr/man/man1/zcat.1
-#usr/man/man1/zcmp.1
-#usr/man/man1/zdiff.1
-#usr/man/man1/zforce.1
-#usr/man/man1/zgrep.1
-#usr/man/man1/zless.1
-#usr/man/man1/zmore.1
-#usr/man/man1/znew.1
+#usr/share/info/gzip.info
+#usr/share/man/man1/gunzip.1
+#usr/share/man/man1/gzexe.1
+#usr/share/man/man1/gzip.1
+#usr/share/man/man1/zcat.1
+#usr/share/man/man1/zcmp.1
+#usr/share/man/man1/zdiff.1
+#usr/share/man/man1/zforce.1
+#usr/share/man/man1/zgrep.1
+#usr/share/man/man1/zless.1
+#usr/share/man/man1/zmore.1
+#usr/share/man/man1/znew.1
--- a/config/rootfiles/common/i586/binutils
+++ b/config/rootfiles/common/i586/binutils
@@ -19,6 +19,7 @@
 #usr/include/bfdlink.h
 #usr/include/dis-asm.h
 #usr/include/libiberty.h
+#usr/include/plugin-api.h
 #usr/include/symcat.h
 #usr/lib/ldscripts
 #usr/lib/ldscripts/elf32_x86_64.x
@@ -47,6 +48,19 @@
 #usr/lib/ldscripts/elf_i386.xsw
 #usr/lib/ldscripts/elf_i386.xu
 #usr/lib/ldscripts/elf_i386.xw
+#usr/lib/ldscripts/elf_iamcu.x
+#usr/lib/ldscripts/elf_iamcu.xbn
+#usr/lib/ldscripts/elf_iamcu.xc
+#usr/lib/ldscripts/elf_iamcu.xd
+#usr/lib/ldscripts/elf_iamcu.xdc
+#usr/lib/ldscripts/elf_iamcu.xdw
+#usr/lib/ldscripts/elf_iamcu.xn
+#usr/lib/ldscripts/elf_iamcu.xr
+#usr/lib/ldscripts/elf_iamcu.xs
+#usr/lib/ldscripts/elf_iamcu.xsc
+#usr/lib/ldscripts/elf_iamcu.xsw
+#usr/lib/ldscripts/elf_iamcu.xu
+#usr/lib/ldscripts/elf_iamcu.xw
 #usr/lib/ldscripts/elf_k1om.x
 #usr/lib/ldscripts/elf_k1om.xbn
 #usr/lib/ldscripts/elf_k1om.xc
@@ -91,23 +105,127 @@
 #usr/lib/ldscripts/i386linux.xn
 #usr/lib/ldscripts/i386linux.xr
 #usr/lib/ldscripts/i386linux.xu
-usr/lib/libbfd-2.24.so
+usr/lib/libbfd-2.28.so
 #usr/lib/libbfd.a
 #usr/lib/libbfd.la
 #usr/lib/libbfd.so
-#usr/lib/libiberty.a
-usr/lib/libopcodes-2.24.so
+usr/lib/libopcodes-2.28.so
 #usr/lib/libopcodes.a
 #usr/lib/libopcodes.la
 #usr/lib/libopcodes.so
 #usr/share/info/as.info
 #usr/share/info/bfd.info
 #usr/share/info/binutils.info
-#usr/share/info/configure.info
-#usr/share/info/dir
 #usr/share/info/gprof.info
 #usr/share/info/ld.info
-#usr/share/info/standards.info
+#usr/share/locale/bg/LC_MESSAGES/binutils.mo
+#usr/share/locale/bg/LC_MESSAGES/gprof.mo
+#usr/share/locale/bg/LC_MESSAGES/ld.mo
+#usr/share/locale/ca/LC_MESSAGES/binutils.mo
+#usr/share/locale/da/LC_MESSAGES/bfd.mo
+#usr/share/locale/da/LC_MESSAGES/binutils.mo
+#usr/share/locale/da/LC_MESSAGES/gprof.mo
+#usr/share/locale/da/LC_MESSAGES/ld.mo
+#usr/share/locale/da/LC_MESSAGES/opcodes.mo
+#usr/share/locale/de/LC_MESSAGES/gprof.mo
+#usr/share/locale/de/LC_MESSAGES/opcodes.mo
+#usr/share/locale/eo/LC_MESSAGES/gprof.mo
+#usr/share/locale/es/LC_MESSAGES/bfd.mo
+#usr/share/locale/es/LC_MESSAGES/binutils.mo
+#usr/share/locale/es/LC_MESSAGES/gas.mo
+#usr/share/locale/es/LC_MESSAGES/gprof.mo
+#usr/share/locale/es/LC_MESSAGES/ld.mo
+#usr/share/locale/es/LC_MESSAGES/opcodes.mo
+#usr/share/locale/fi/LC_MESSAGES/bfd.mo
+#usr/share/locale/fi/LC_MESSAGES/binutils.mo
+#usr/share/locale/fi/LC_MESSAGES/gas.mo
+#usr/share/locale/fi/LC_MESSAGES/gprof.mo
+#usr/share/locale/fi/LC_MESSAGES/ld.mo
+#usr/share/locale/fi/LC_MESSAGES/opcodes.mo
+#usr/share/locale/fr/LC_MESSAGES/bfd.mo
+#usr/share/locale/fr/LC_MESSAGES/binutils.mo
+#usr/share/locale/fr/LC_MESSAGES/gas.mo
+#usr/share/locale/fr/LC_MESSAGES/gprof.mo
+#usr/share/locale/fr/LC_MESSAGES/ld.mo
+#usr/share/locale/fr/LC_MESSAGES/opcodes.mo
+#usr/share/locale/ga
+#usr/share/locale/ga/LC_MESSAGES
+#usr/share/locale/ga/LC_MESSAGES/gprof.mo
+#usr/share/locale/ga/LC_MESSAGES/ld.mo
+#usr/share/locale/ga/LC_MESSAGES/opcodes.mo
+#usr/share/locale/hr/LC_MESSAGES/binutils.mo
+#usr/share/locale/hu/LC_MESSAGES/gprof.mo
+#usr/share/locale/id/LC_MESSAGES/bfd.mo
+#usr/share/locale/id/LC_MESSAGES/binutils.mo
+#usr/share/locale/id/LC_MESSAGES/gas.mo
+#usr/share/locale/id/LC_MESSAGES/gprof.mo
+#usr/share/locale/id/LC_MESSAGES/ld.mo
+#usr/share/locale/id/LC_MESSAGES/opcodes.mo
+#usr/share/locale/it/LC_MESSAGES/binutils.mo
+#usr/share/locale/it/LC_MESSAGES/gprof.mo
+#usr/share/locale/it/LC_MESSAGES/ld.mo
+#usr/share/locale/it/LC_MESSAGES/opcodes.mo
+#usr/share/locale/ja/LC_MESSAGES/bfd.mo
+#usr/share/locale/ja/LC_MESSAGES/binutils.mo
+#usr/share/locale/ja/LC_MESSAGES/gas.mo
+#usr/share/locale/ja/LC_MESSAGES/gprof.mo
+#usr/share/locale/ja/LC_MESSAGES/ld.mo
+#usr/share/locale/ms
+#usr/share/locale/ms/LC_MESSAGES
+#usr/share/locale/ms/LC_MESSAGES/gprof.mo
+#usr/share/locale/nl/LC_MESSAGES/gprof.mo
+#usr/share/locale/nl/LC_MESSAGES/opcodes.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/gprof.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/opcodes.mo
+#usr/share/locale/ro
+#usr/share/locale/ro/LC_MESSAGES
+#usr/share/locale/ro/LC_MESSAGES/bfd.mo
+#usr/share/locale/ro/LC_MESSAGES/binutils.mo
+#usr/share/locale/ro/LC_MESSAGES/gprof.mo
+#usr/share/locale/ro/LC_MESSAGES/opcodes.mo
+#usr/share/locale/ru/LC_MESSAGES/bfd.mo
+#usr/share/locale/ru/LC_MESSAGES/binutils.mo
+#usr/share/locale/ru/LC_MESSAGES/gas.mo
+#usr/share/locale/ru/LC_MESSAGES/gprof.mo
+#usr/share/locale/rw/LC_MESSAGES/bfd.mo
+#usr/share/locale/rw/LC_MESSAGES/binutils.mo
+#usr/share/locale/rw/LC_MESSAGES/gas.mo
+#usr/share/locale/rw/LC_MESSAGES/gprof.mo
+#usr/share/locale/sk/LC_MESSAGES/binutils.mo
+#usr/share/locale/sr
+#usr/share/locale/sr/LC_MESSAGES
+#usr/share/locale/sr/LC_MESSAGES/bfd.mo
+#usr/share/locale/sr/LC_MESSAGES/binutils.mo
+#usr/share/locale/sr/LC_MESSAGES/gprof.mo
+#usr/share/locale/sv/LC_MESSAGES/bfd.mo
+#usr/share/locale/sv/LC_MESSAGES/binutils.mo
+#usr/share/locale/sv/LC_MESSAGES/gprof.mo
+#usr/share/locale/sv/LC_MESSAGES/ld.mo
+#usr/share/locale/sv/LC_MESSAGES/opcodes.mo
+#usr/share/locale/tr/LC_MESSAGES/bfd.mo
+#usr/share/locale/tr/LC_MESSAGES/binutils.mo
+#usr/share/locale/tr/LC_MESSAGES/gas.mo
+#usr/share/locale/tr/LC_MESSAGES/gprof.mo
+#usr/share/locale/tr/LC_MESSAGES/ld.mo
+#usr/share/locale/tr/LC_MESSAGES/opcodes.mo
+#usr/share/locale/uk/LC_MESSAGES/bfd.mo
+#usr/share/locale/uk/LC_MESSAGES/binutils.mo
+#usr/share/locale/uk/LC_MESSAGES/gas.mo
+#usr/share/locale/uk/LC_MESSAGES/gprof.mo
+#usr/share/locale/uk/LC_MESSAGES/ld.mo
+#usr/share/locale/uk/LC_MESSAGES/opcodes.mo
+#usr/share/locale/vi/LC_MESSAGES/bfd.mo
+#usr/share/locale/vi/LC_MESSAGES/binutils.mo
+#usr/share/locale/vi/LC_MESSAGES/gprof.mo
+#usr/share/locale/vi/LC_MESSAGES/ld.mo
+#usr/share/locale/vi/LC_MESSAGES/opcodes.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/bfd.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/binutils.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/gas.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/ld.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/opcodes.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/binutils.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/ld.mo
 #usr/share/man/man1/addr2line.1
 #usr/share/man/man1/ar.1
 #usr/share/man/man1/as.1
--- a/config/rootfiles/common/i586/gcc
+++ b/config/rootfiles/common/i586/gcc
--- a/config/rootfiles/common/i586/glibc
+++ b/config/rootfiles/common/i586/glibc
--- a/config/rootfiles/common/i586/gmp
+++ b/config/rootfiles/common/i586/gmp
@@ -4,14 +4,14 @@
 #usr/lib/libgmp.la
 #usr/lib/libgmp.so
 usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.3.0
+usr/lib/libgmp.so.10.3.2
 #usr/lib/libgmpxx.a
 #usr/lib/libgmpxx.la
 #usr/lib/libgmpxx.so
 usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.5.0
+usr/lib/libgmpxx.so.4.5.2
 usr/lib/sse2/libgmp.so.10
-usr/lib/sse2/libgmp.so.10.3.0
+usr/lib/sse2/libgmp.so.10.3.2
 #usr/share/info/gmp.info
 #usr/share/info/gmp.info-1
 #usr/share/info/gmp.info-2
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -4,66 +4,30 @@ etc/init.d
 etc/rc.d/helper/getdnsfromdhcpc.pl
 #etc/rc.d/init.d
 etc/rc.d/init.d/acpid
-#etc/rc.d/init.d/alsa
-#etc/rc.d/init.d/amavisd
 etc/rc.d/init.d/apache
-#etc/rc.d/init.d/apcupsd
-#etc/rc.d/init.d/applejuice
-#etc/rc.d/init.d/asterisk
 etc/rc.d/init.d/beep
-#etc/rc.d/init.d/bluetooth
 etc/rc.d/init.d/checkfs
-#etc/rc.d/init.d/clamav
 etc/rc.d/init.d/cleanfs
-#etc/rc.d/init.d/client175
 etc/rc.d/init.d/collectd
 etc/rc.d/init.d/connectd
 etc/rc.d/init.d/console
-#etc/rc.d/init.d/cpufreq
-#etc/rc.d/init.d/cups
-#etc/rc.d/init.d/cyrus-imapd
-#etc/rc.d/init.d/cyrus-sasl
 etc/rc.d/init.d/dhcp
 etc/rc.d/init.d/dhcrelay
-#etc/rc.d/init.d/dnsdist
 etc/rc.d/init.d/fcron
-#etc/rc.d/init.d/fetchmail
 etc/rc.d/init.d/fireinfo
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/firstsetup
-#etc/rc.d/init.d/freeradius
 etc/rc.d/init.d/fsresize
 etc/rc.d/init.d/functions
-#etc/rc.d/init.d/gnump3d
-#etc/rc.d/init.d/guardian
 etc/rc.d/init.d/halt
-#etc/rc.d/init.d/haproxy
-#etc/rc.d/init.d/hostapd
-#etc/rc.d/init.d/imspector
 etc/rc.d/init.d/ipsec
-#etc/rc.d/init.d/keepalived
-#etc/rc.d/init.d/lcd4linux
-#etc/rc.d/init.d/lcdproc
-#etc/rc.d/init.d/lcr
 etc/rc.d/init.d/leds
-#etc/rc.d/init.d/libvirt-guests
-#etc/rc.d/init.d/libvirtd
 etc/rc.d/init.d/localnet
 etc/rc.d/init.d/mISDN
-#etc/rc.d/init.d/mediatomb
-#etc/rc.d/init.d/messagebus
-#etc/rc.d/init.d/miau
-#etc/rc.d/init.d/minidlna
-#etc/rc.d/init.d/miniupnpd
 etc/rc.d/init.d/modules
-#etc/rc.d/init.d/monit
-#etc/rc.d/init.d/motion
 etc/rc.d/init.d/mountfs
 etc/rc.d/init.d/mountkernfs
 etc/rc.d/init.d/mounttmpfs
-#etc/rc.d/init.d/mpd
-#etc/rc.d/init.d/mysql
-#etc/rc.d/init.d/netsnmpd
 etc/rc.d/init.d/network
 etc/rc.d/init.d/network-trigger
 #etc/rc.d/init.d/networking
@@ -100,51 +64,30 @@ etc/rc.d/init.d/networking/red.up/99-fireinfo
 etc/rc.d/init.d/networking/red.up/99-geoip-database
 etc/rc.d/init.d/networking/red.up/99-pakfire-update
 etc/rc.d/init.d/networking/wpa_supplicant.exe
-#etc/rc.d/init.d/nfs-server
 etc/rc.d/init.d/ntp
-#etc/rc.d/init.d/nut
-#etc/rc.d/init.d/openvmtools
 etc/rc.d/init.d/partresize
-#etc/rc.d/init.d/postfix
-#etc/rc.d/init.d/pound
 etc/rc.d/init.d/random
 etc/rc.d/init.d/rc
 etc/rc.d/init.d/reboot
 etc/rc.d/init.d/rngd
-#etc/rc.d/init.d/rpcbind
-#etc/rc.d/init.d/rtpproxy
-#etc/rc.d/init.d/samba
-#etc/rc.d/init.d/sane
 etc/rc.d/init.d/sendsignals
 etc/rc.d/init.d/setclock
 etc/rc.d/init.d/smartenabler
 etc/rc.d/init.d/snort
-#etc/rc.d/init.d/spamassassin
 etc/rc.d/init.d/squid
 etc/rc.d/init.d/sshd
-#etc/rc.d/init.d/sslh
 etc/rc.d/init.d/static-routes
-#etc/rc.d/init.d/stunnel
 etc/rc.d/init.d/swap
 etc/rc.d/init.d/sysctl
 etc/rc.d/init.d/sysklogd
 etc/rc.d/init.d/template
-#etc/rc.d/init.d/tftpd
-#etc/rc.d/init.d/tor
-#etc/rc.d/init.d/transmission
 etc/rc.d/init.d/udev
 etc/rc.d/init.d/udev_retry
 etc/rc.d/init.d/unbound
 etc/rc.d/init.d/upnpd
-#etc/rc.d/init.d/vdr
-#etc/rc.d/init.d/vdradmin
-#etc/rc.d/init.d/virtlogd
 etc/rc.d/init.d/vnstat
-#etc/rc.d/init.d/vsftpd
 etc/rc.d/init.d/waitdrives
-#etc/rc.d/init.d/watchdog
 etc/rc.d/init.d/wlanclient
-#etc/rc.d/init.d/xinetd
 #etc/rc.d/rc0.d
 #etc/rc.d/rc0.d/K01imspetor
 #etc/rc.d/rc0.d/K01motion
--- a/config/rootfiles/common/i586/lm_sensors
+++ b/config/rootfiles/common/i586/lm_sensors
@@ -8,7 +8,7 @@ usr/bin/sensors-conf-convert
 #usr/lib/libsensors.a
 usr/lib/libsensors.so
 usr/lib/libsensors.so.4
-usr/lib/libsensors.so.4.3.2
+usr/lib/libsensors.so.4.4.0
 #usr/man/man1/sensors.1
 #usr/man/man3/libsensors.3
 #usr/man/man5/sensors.conf.5
@@ -17,6 +17,7 @@ usr/lib/libsensors.so.4.3.2
 #usr/man/man8/isadump.8
 #usr/man/man8/isaset.8
 #usr/man/man8/pwmconfig.8
+#usr/man/man8/sensors-conf-convert.8
 #usr/man/man8/sensors-detect.8
 usr/sbin/fancontrol
 usr/sbin/isadump
--- a/config/rootfiles/common/i586/python
+++ b/config/rootfiles/common/i586/python
@@ -1463,8 +1463,8 @@ usr/lib/python2.7/encodings/zlib_codec.pyc
 #usr/lib/python2.7/ensurepip/__main__.pyc
 #usr/lib/python2.7/ensurepip/__main__.pyo
 #usr/lib/python2.7/ensurepip/_bundled
-#usr/lib/python2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl
-#usr/lib/python2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl
+#usr/lib/python2.7/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl
+#usr/lib/python2.7/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl
 #usr/lib/python2.7/ensurepip/_uninstall.py
 #usr/lib/python2.7/ensurepip/_uninstall.pyc
 #usr/lib/python2.7/ensurepip/_uninstall.pyo
@@ -1718,6 +1718,10 @@ usr/lib/python2.7/httplib.pyc
 #usr/lib/python2.7/idlelib/dynOptionMenuWidget.pyc
 #usr/lib/python2.7/idlelib/dynOptionMenuWidget.pyo
 #usr/lib/python2.7/idlelib/extend.txt
+#usr/lib/python2.7/idlelib/help.html
+#usr/lib/python2.7/idlelib/help.py
+#usr/lib/python2.7/idlelib/help.pyc
+#usr/lib/python2.7/idlelib/help.pyo
 #usr/lib/python2.7/idlelib/help.txt
 #usr/lib/python2.7/idlelib/idle.bat
 #usr/lib/python2.7/idlelib/idle.py
@@ -1756,12 +1760,18 @@ usr/lib/python2.7/httplib.pyc
 #usr/lib/python2.7/idlelib/idle_test/test_delegator.py
 #usr/lib/python2.7/idlelib/idle_test/test_delegator.pyc
 #usr/lib/python2.7/idlelib/idle_test/test_delegator.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_editmenu.py
+#usr/lib/python2.7/idlelib/idle_test/test_editmenu.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_editmenu.pyo
 #usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.py
 #usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyc
 #usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyo
 #usr/lib/python2.7/idlelib/idle_test/test_grep.py
 #usr/lib/python2.7/idlelib/idle_test/test_grep.pyc
 #usr/lib/python2.7/idlelib/idle_test/test_grep.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_helpabout.py
+#usr/lib/python2.7/idlelib/idle_test/test_helpabout.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_helpabout.pyo
 #usr/lib/python2.7/idlelib/idle_test/test_hyperparser.py
 #usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyc
 #usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyo
@@ -1916,7 +1926,7 @@ usr/lib/python2.7/json/tool.pyc
 usr/lib/python2.7/keyword.pyc
 #usr/lib/python2.7/keyword.pyo
 #usr/lib/python2.7/lib-dynload
-#usr/lib/python2.7/lib-dynload/Python-2.7.10-py2.7.egg-info
+#usr/lib/python2.7/lib-dynload/Python-2.7.13-py2.7.egg-info
 usr/lib/python2.7/lib-dynload/_bisect.so
 usr/lib/python2.7/lib-dynload/_bsddb.so
 usr/lib/python2.7/lib-dynload/_codecs_cn.so
@@ -2092,9 +2102,9 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib-tk/turtle.pyo
 #usr/lib/python2.7/lib2to3
 #usr/lib/python2.7/lib2to3/Grammar.txt
-#usr/lib/python2.7/lib2to3/Grammar2.7.10.final.0.pickle
+#usr/lib/python2.7/lib2to3/Grammar2.7.13.final.0.pickle
 #usr/lib/python2.7/lib2to3/PatternGrammar.txt
-#usr/lib/python2.7/lib2to3/PatternGrammar2.7.10.final.0.pickle
+#usr/lib/python2.7/lib2to3/PatternGrammar2.7.13.final.0.pickle
 #usr/lib/python2.7/lib2to3/__init__.py
 #usr/lib/python2.7/lib2to3/__init__.pyc
 #usr/lib/python2.7/lib2to3/__init__.pyo
@@ -2129,9 +2139,6 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib2to3/fixes/fix_buffer.py
 #usr/lib/python2.7/lib2to3/fixes/fix_buffer.pyc
 #usr/lib/python2.7/lib2to3/fixes/fix_buffer.pyo
-#usr/lib/python2.7/lib2to3/fixes/fix_callable.py
-#usr/lib/python2.7/lib2to3/fixes/fix_callable.pyc
-#usr/lib/python2.7/lib2to3/fixes/fix_callable.pyo
 #usr/lib/python2.7/lib2to3/fixes/fix_dict.py
 #usr/lib/python2.7/lib2to3/fixes/fix_dict.pyc
 #usr/lib/python2.7/lib2to3/fixes/fix_dict.pyo
@@ -2750,6 +2757,7 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/_mock_backport.py
 #usr/lib/python2.7/test/_mock_backport.pyc
 #usr/lib/python2.7/test/_mock_backport.pyo
+#usr/lib/python2.7/test/allsans.pem
 #usr/lib/python2.7/test/audiodata
 #usr/lib/python2.7/test/audiodata/pluck-pcm16.aiff
 #usr/lib/python2.7/test/audiodata/pluck-pcm16.au
@@ -2784,16 +2792,14 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/badsyntax_future8.py
 #usr/lib/python2.7/test/badsyntax_future9.py
 #usr/lib/python2.7/test/badsyntax_nocaret.py
-#usr/lib/python2.7/test/buffer_tests.py
-#usr/lib/python2.7/test/buffer_tests.pyc
-#usr/lib/python2.7/test/buffer_tests.pyo
 #usr/lib/python2.7/test/capath
+#usr/lib/python2.7/test/capath/0e4015b9.0
 #usr/lib/python2.7/test/capath/4e1295a3.0
 #usr/lib/python2.7/test/capath/5ed36f99.0
 #usr/lib/python2.7/test/capath/6e88d7b8.0
 #usr/lib/python2.7/test/capath/99d0fa06.0
+#usr/lib/python2.7/test/capath/ce7b8643.0
 #usr/lib/python2.7/test/cfgparser.1
-#usr/lib/python2.7/test/check_soundcard.vbs
 #usr/lib/python2.7/test/cjkencodings
 #usr/lib/python2.7/test/cjkencodings/big5-utf8.txt
 #usr/lib/python2.7/test/cjkencodings/big5.txt
@@ -2993,7 +2999,6 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/gdb_sample.pyc
 #usr/lib/python2.7/test/gdb_sample.pyo
 #usr/lib/python2.7/test/greyrgb.uue
-#usr/lib/python2.7/test/https_svn_python_org_root.pem
 #usr/lib/python2.7/test/ieee754.txt
 #usr/lib/python2.7/test/imghdrdata
 #usr/lib/python2.7/test/imghdrdata/python.bmp
@@ -3105,6 +3110,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/ssl_servers.py
 #usr/lib/python2.7/test/ssl_servers.pyc
 #usr/lib/python2.7/test/ssl_servers.pyo
+#usr/lib/python2.7/test/ssltests.py
+#usr/lib/python2.7/test/ssltests.pyc
+#usr/lib/python2.7/test/ssltests.pyo
 #usr/lib/python2.7/test/string_tests.py
 #usr/lib/python2.7/test/string_tests.pyc
 #usr/lib/python2.7/test/string_tests.pyo
@@ -3319,9 +3327,6 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_codeop.py
 #usr/lib/python2.7/test/test_codeop.pyc
 #usr/lib/python2.7/test/test_codeop.pyo
-#usr/lib/python2.7/test/test_coding.py
-#usr/lib/python2.7/test/test_coding.pyc
-#usr/lib/python2.7/test/test_coding.pyo
 #usr/lib/python2.7/test/test_coercion.py
 #usr/lib/python2.7/test/test_coercion.pyc
 #usr/lib/python2.7/test/test_coercion.pyo
@@ -3837,6 +3842,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_optparse.py
 #usr/lib/python2.7/test/test_optparse.pyc
 #usr/lib/python2.7/test/test_optparse.pyo
+#usr/lib/python2.7/test/test_ordered_dict.py
+#usr/lib/python2.7/test/test_ordered_dict.pyc
+#usr/lib/python2.7/test/test_ordered_dict.pyo
 #usr/lib/python2.7/test/test_os.py
 #usr/lib/python2.7/test/test_os.pyc
 #usr/lib/python2.7/test/test_os.pyo
@@ -3855,15 +3863,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_pep247.py
 #usr/lib/python2.7/test/test_pep247.pyc
 #usr/lib/python2.7/test/test_pep247.pyo
-#usr/lib/python2.7/test/test_pep263.py
-#usr/lib/python2.7/test/test_pep263.pyc
-#usr/lib/python2.7/test/test_pep263.pyo
 #usr/lib/python2.7/test/test_pep277.py
 #usr/lib/python2.7/test/test_pep277.pyc
 #usr/lib/python2.7/test/test_pep277.pyo
-#usr/lib/python2.7/test/test_pep292.py
-#usr/lib/python2.7/test/test_pep292.pyc
-#usr/lib/python2.7/test/test_pep292.pyo
 #usr/lib/python2.7/test/test_pep352.py
 #usr/lib/python2.7/test/test_pep352.pyc
 #usr/lib/python2.7/test/test_pep352.pyo
@@ -4047,6 +4049,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_sort.py
 #usr/lib/python2.7/test/test_sort.pyc
 #usr/lib/python2.7/test/test_sort.pyo
+#usr/lib/python2.7/test/test_source_encoding.py
+#usr/lib/python2.7/test/test_source_encoding.pyc
+#usr/lib/python2.7/test/test_source_encoding.pyo
 #usr/lib/python2.7/test/test_spwd.py
 #usr/lib/python2.7/test/test_spwd.pyc
 #usr/lib/python2.7/test/test_spwd.pyo
@@ -4194,6 +4199,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_tuple.py
 #usr/lib/python2.7/test/test_tuple.pyc
 #usr/lib/python2.7/test/test_tuple.pyo
+#usr/lib/python2.7/test/test_turtle.py
+#usr/lib/python2.7/test/test_turtle.pyc
+#usr/lib/python2.7/test/test_turtle.pyo
 #usr/lib/python2.7/test/test_typechecks.py
 #usr/lib/python2.7/test/test_typechecks.pyc
 #usr/lib/python2.7/test/test_typechecks.pyo
--- a/config/rootfiles/common/i586/util-linux
+++ b/config/rootfiles/common/i586/util-linux
@@ -8,8 +8,12 @@ bin/wdctl
 #etc/fcron.daily
 etc/fcron.daily/trim
 lib/libblkid.so.1.1.0
+lib/libfdisk.so.1
+lib/libfdisk.so.1.1.0
 lib/libmount.so.1
 lib/libmount.so.1.1.0
+lib/libsmartcols.so.1
+lib/libsmartcols.so.1.1.0
 lib/libuuid.so.1.3.0
 sbin/agetty
 sbin/blkdiscard
@@ -29,7 +33,6 @@ sbin/mkfs
 #sbin/mkfs.cramfs
 sbin/mkfs.minix
 sbin/mkswap
-sbin/nologin
 #sbin/pivot_root
 sbin/raw
 sbin/sfdisk
@@ -38,13 +41,13 @@ sbin/swapoff
 sbin/swapon
 sbin/switch_root
 sbin/wipefs
+sbin/zramctl
 #usr/bin/cal
 #usr/bin/chrt
 #usr/bin/col
 #usr/bin/colcrt
 #usr/bin/colrm
 #usr/bin/column
-#usr/bin/cytune
 usr/bin/eject
 usr/bin/fallocate
 usr/bin/flock
@@ -61,7 +64,10 @@ usr/bin/ionice
 usr/bin/logger
 #usr/bin/look
 usr/bin/lscpu
+usr/bin/lsipc
 usr/bin/lslocks
+usr/bin/lslogins
+usr/bin/lsns
 #usr/bin/mcookie
 #usr/bin/namei
 #usr/bin/nsenter
@@ -78,16 +84,26 @@ usr/bin/setsid
 usr/bin/tailf
 #usr/bin/taskset
 #usr/bin/ul
+#usr/bin/uname26
 #usr/bin/unshare
 #usr/bin/whereis
+#usr/include/libfdisk
+#usr/include/libfdisk/libfdisk.h
 #usr/include/libmount
 #usr/include/libmount/libmount.h
+#usr/include/libsmartcols
+#usr/include/libsmartcols/libsmartcols.h
 #usr/lib/libblkid.la
-#usr/lib/libmount.a
+#usr/lib/libfdisk.la
+#usr/lib/libfdisk.so
 #usr/lib/libmount.la
 #usr/lib/libmount.so
+#usr/lib/libsmartcols.la
+#usr/lib/libsmartcols.so
 #usr/lib/libuuid.la
+#usr/lib/pkgconfig/fdisk.pc
 #usr/lib/pkgconfig/mount.pc
+#usr/lib/pkgconfig/smartcols.pc
 usr/sbin/addpart
 usr/sbin/delpart
 usr/sbin/fdformat
@@ -96,8 +112,6 @@ usr/sbin/partx
 #usr/sbin/readprofile
 usr/sbin/resizepart
 usr/sbin/rtcwake
-usr/share/bash-completion
-#usr/share/bash-completion/completions
 #usr/share/bash-completion/completions/addpart
 #usr/share/bash-completion/completions/blkdiscard
 #usr/share/bash-completion/completions/blkid
@@ -111,7 +125,6 @@ usr/share/bash-completion
 #usr/share/bash-completion/completions/colrm
 #usr/share/bash-completion/completions/column
 #usr/share/bash-completion/completions/ctrlaltdel
-#usr/share/bash-completion/completions/cytune
 #usr/share/bash-completion/completions/delpart
 #usr/share/bash-completion/completions/dmesg
 #usr/share/bash-completion/completions/eject
@@ -129,16 +142,21 @@ usr/share/bash-completion
 #usr/share/bash-completion/completions/hexdump
 #usr/share/bash-completion/completions/hwclock
 #usr/share/bash-completion/completions/ionice
+#usr/share/bash-completion/completions/ipcmk
 #usr/share/bash-completion/completions/ipcrm
 #usr/share/bash-completion/completions/ipcs
 #usr/share/bash-completion/completions/isosize
+#usr/share/bash-completion/completions/last
 #usr/share/bash-completion/completions/ldattach
 #usr/share/bash-completion/completions/logger
 #usr/share/bash-completion/completions/look
 #usr/share/bash-completion/completions/losetup
 #usr/share/bash-completion/completions/lsblk
 #usr/share/bash-completion/completions/lscpu
+#usr/share/bash-completion/completions/lsipc
 #usr/share/bash-completion/completions/lslocks
+#usr/share/bash-completion/completions/lslogins
+#usr/share/bash-completion/completions/lsns
 #usr/share/bash-completion/completions/mcookie
 #usr/share/bash-completion/completions/mesg
 #usr/share/bash-completion/completions/mkfs
@@ -147,6 +165,7 @@ usr/share/bash-completion
 #usr/share/bash-completion/completions/mkfs.minix
 #usr/share/bash-completion/completions/mkswap
 #usr/share/bash-completion/completions/more
+#usr/share/bash-completion/completions/mount
 #usr/share/bash-completion/completions/mountpoint
 #usr/share/bash-completion/completions/namei
 #usr/share/bash-completion/completions/nsenter
@@ -168,10 +187,12 @@ usr/share/bash-completion
 #usr/share/bash-completion/completions/setterm
 #usr/share/bash-completion/completions/sfdisk
 #usr/share/bash-completion/completions/swaplabel
+#usr/share/bash-completion/completions/swapoff
 #usr/share/bash-completion/completions/swapon
 #usr/share/bash-completion/completions/tailf
 #usr/share/bash-completion/completions/taskset
 #usr/share/bash-completion/completions/ul
+#usr/share/bash-completion/completions/umount
 #usr/share/bash-completion/completions/unshare
 #usr/share/bash-completion/completions/utmpdump
 #usr/share/bash-completion/completions/uuidd
@@ -180,44 +201,11 @@ usr/share/bash-completion
 #usr/share/bash-completion/completions/wdctl
 #usr/share/bash-completion/completions/whereis
 #usr/share/bash-completion/completions/wipefs
+#usr/share/bash-completion/completions/zramctl
 #usr/share/doc/util-linux
 #usr/share/doc/util-linux/getopt
 #usr/share/doc/util-linux/getopt/getopt-parse.bash
 #usr/share/doc/util-linux/getopt/getopt-parse.tcsh
-#usr/share/locale/ca/LC_MESSAGES/util-linux.mo
-#usr/share/locale/cs/LC_MESSAGES/util-linux.mo
-#usr/share/locale/da/LC_MESSAGES/util-linux.mo
-#usr/share/locale/de/LC_MESSAGES/util-linux.mo
-#usr/share/locale/es/LC_MESSAGES/util-linux.mo
-#usr/share/locale/et
-#usr/share/locale/et/LC_MESSAGES
-#usr/share/locale/et/LC_MESSAGES/util-linux.mo
-#usr/share/locale/eu
-#usr/share/locale/eu/LC_MESSAGES
-#usr/share/locale/eu/LC_MESSAGES/util-linux.mo
-#usr/share/locale/fi/LC_MESSAGES/util-linux.mo
-#usr/share/locale/fr/LC_MESSAGES/util-linux.mo
-#usr/share/locale/gl/LC_MESSAGES/util-linux.mo
-#usr/share/locale/hr/LC_MESSAGES/util-linux.mo
-#usr/share/locale/hu/LC_MESSAGES/util-linux.mo
-#usr/share/locale/id/LC_MESSAGES/util-linux.mo
-#usr/share/locale/it/LC_MESSAGES/util-linux.mo
-#usr/share/locale/ja/LC_MESSAGES/util-linux.mo
-#usr/share/locale/nl/LC_MESSAGES/util-linux.mo
-#usr/share/locale/pl/LC_MESSAGES/util-linux.mo
-#usr/share/locale/pt_BR/LC_MESSAGES/util-linux.mo
-#usr/share/locale/ru/LC_MESSAGES/util-linux.mo
-#usr/share/locale/sl
-#usr/share/locale/sl/LC_MESSAGES
-#usr/share/locale/sl/LC_MESSAGES/util-linux.mo
-#usr/share/locale/sv/LC_MESSAGES/util-linux.mo
-#usr/share/locale/tr/LC_MESSAGES/util-linux.mo
-#usr/share/locale/uk
-#usr/share/locale/uk/LC_MESSAGES
-#usr/share/locale/uk/LC_MESSAGES/util-linux.mo
-#usr/share/locale/vi/LC_MESSAGES/util-linux.mo
-#usr/share/locale/zh_CN/LC_MESSAGES/util-linux.mo
-#usr/share/locale/zh_TW/LC_MESSAGES/util-linux.mo
 #usr/share/man/man1/cal.1
 #usr/share/man/man1/chrt.1
 #usr/share/man/man1/col.1
@@ -237,6 +225,8 @@ usr/share/bash-completion
 #usr/share/man/man1/logger.1
 #usr/share/man/man1/look.1
 #usr/share/man/man1/lscpu.1
+#usr/share/man/man1/lsipc.1
+#usr/share/man/man1/lslogins.1
 #usr/share/man/man1/mcookie.1
 #usr/share/man/man1/more.1
 #usr/share/man/man1/namei.1
@@ -257,6 +247,7 @@ usr/share/bash-completion
 #usr/share/man/man1/whereis.1
 #usr/share/man/man3/uuid_generate_time_safe.3
 #usr/share/man/man5/fstab.5
+#usr/share/man/man5/terminal-colors.d.5
 #usr/share/man/man8/addpart.8
 #usr/share/man/man8/agetty.8
 #usr/share/man/man8/blkdiscard.8
@@ -264,7 +255,6 @@ usr/share/bash-completion
 #usr/share/man/man8/cfdisk.8
 #usr/share/man/man8/chcpu.8
 #usr/share/man/man8/ctrlaltdel.8
-#usr/share/man/man8/cytune.8
 #usr/share/man/man8/delpart.8
 #usr/share/man/man8/fdformat.8
 #usr/share/man/man8/fdisk.8
@@ -282,13 +272,13 @@ usr/share/bash-completion
 #usr/share/man/man8/losetup.8
 #usr/share/man/man8/lsblk.8
 #usr/share/man/man8/lslocks.8
+#usr/share/man/man8/lsns.8
 #usr/share/man/man8/mkfs.8
 #usr/share/man/man8/mkfs.bfs.8
 #usr/share/man/man8/mkfs.cramfs.8
 #usr/share/man/man8/mkfs.minix.8
 #usr/share/man/man8/mkswap.8
 #usr/share/man/man8/mount.8
-#usr/share/man/man8/nologin.8
 #usr/share/man/man8/partx.8
 #usr/share/man/man8/pivot_root.8
 #usr/share/man/man8/raw.8
@@ -302,5 +292,8 @@ usr/share/bash-completion
 #usr/share/man/man8/swapon.8
 #usr/share/man/man8/switch_root.8
 #usr/share/man/man8/umount.8
+#usr/share/man/man8/uname26.8
 #usr/share/man/man8/wdctl.8
 #usr/share/man/man8/wipefs.8
+#usr/share/man/man8/x86_64.8
+#usr/share/man/man8/zramctl.8
--- a/config/rootfiles/common/lcms2
+++ b/config/rootfiles/common/lcms2
@@ -0,0 +1,15 @@
+#usr/bin/jpgicc
+#usr/bin/linkicc
+#usr/bin/psicc
+#usr/bin/tificc
+#usr/bin/transicc
+#usr/include/lcms2.h
+#usr/include/lcms2_plugin.h
+#usr/lib/liblcms2.a
+#usr/lib/liblcms2.la
+#usr/lib/liblcms2.so
+usr/lib/liblcms2.so.2
+usr/lib/liblcms2.so.2.0.8
+#usr/lib/pkgconfig/lcms2.pc
+#usr/share/man/man1/jpgicc.1
+#usr/share/man/man1/tificc.1
--- a/config/rootfiles/common/libarchive
+++ b/config/rootfiles/common/libarchive
@@ -1,15 +1,15 @@
-#usr/bin/bsdcpio
 #usr/bin/bsdcat
+#usr/bin/bsdcpio
 #usr/bin/bsdtar
 #usr/include/archive.h
 #usr/include/archive_entry.h
 #usr/lib/libarchive.la
 #usr/lib/libarchive.so
 #usr/lib/libarchive.so.13
-#usr/lib/libarchive.so.13.2.1
+#usr/lib/libarchive.so.13.3.1
 #usr/lib/pkgconfig/libarchive.pc
-#usr/share/man/man1/bsdcpio.1
 #usr/share/man/man1/bsdcat.1
+#usr/share/man/man1/bsdcpio.1
 #usr/share/man/man1/bsdtar.1
 #usr/share/man/man3/archive_entry.3
 #usr/share/man/man3/archive_entry_acl.3
--- a/config/rootfiles/common/libevent2
+++ b/config/rootfiles/common/libevent2
@@ -24,22 +24,23 @@
 #usr/include/event2/tag_compat.h
 #usr/include/event2/thread.h
 #usr/include/event2/util.h
-usr/lib/libevent-2.0.so.5
-usr/lib/libevent-2.0.so.5.1.9
-usr/lib/libevent_core-2.0.so.5
-usr/lib/libevent_core-2.0.so.5.1.9
-usr/lib/libevent_extra-2.0.so.5
-usr/lib/libevent_extra-2.0.so.5.1.9
-usr/lib/libevent_openssl-2.0.so.5
-usr/lib/libevent_openssl-2.0.so.5.1.9
-#usr/lib/libevent_openssl.a
+#usr/include/event2/visibility.h
+usr/lib/libevent-2.1.so.6
+usr/lib/libevent-2.1.so.6.0.2
+usr/lib/libevent_core-2.1.so.6
+usr/lib/libevent_core-2.1.so.6.0.2
+usr/lib/libevent_extra-2.1.so.6
+usr/lib/libevent_extra-2.1.so.6.0.2
+usr/lib/libevent_openssl-2.1.so.6
+usr/lib/libevent_openssl-2.1.so.6.0.2
 #usr/lib/libevent_openssl.la
 usr/lib/libevent_openssl.so
-usr/lib/libevent_pthreads-2.0.so.5
-usr/lib/libevent_pthreads-2.0.so.5.1.9
-#usr/lib/libevent_pthreads.a
+usr/lib/libevent_pthreads-2.1.so.6
+usr/lib/libevent_pthreads-2.1.so.6.0.2
 #usr/lib/libevent_pthreads.la
 usr/lib/libevent_pthreads.so
 #usr/lib/pkgconfig/libevent.pc
+#usr/lib/pkgconfig/libevent_core.pc
+#usr/lib/pkgconfig/libevent_extra.pc
 #usr/lib/pkgconfig/libevent_openssl.pc
 #usr/lib/pkgconfig/libevent_pthreads.pc
--- a/config/rootfiles/common/libevent2-compat
+++ b/config/rootfiles/common/libevent2-compat
@@ -0,0 +1,10 @@
+usr/lib/libevent-2.0.so.5
+usr/lib/libevent-2.0.so.5.1.9
+usr/lib/libevent_core-2.0.so.5
+usr/lib/libevent_core-2.0.so.5.1.9
+usr/lib/libevent_extra-2.0.so.5
+usr/lib/libevent_extra-2.0.so.5.1.9
+usr/lib/libevent_openssl-2.0.so.5
+usr/lib/libevent_openssl-2.0.so.5.1.9
+usr/lib/libevent_pthreads-2.0.so.5
+usr/lib/libevent_pthreads-2.0.so.5.1.9
--- a/config/rootfiles/common/libgcrypt
+++ b/config/rootfiles/common/libgcrypt
@@ -6,7 +6,7 @@
 #usr/lib/libgcrypt.la
 #usr/lib/libgcrypt.so
 usr/lib/libgcrypt.so.20
-usr/lib/libgcrypt.so.20.1.3
+usr/lib/libgcrypt.so.20.1.7
 #usr/share/aclocal/libgcrypt.m4
 #usr/share/info/gcrypt.info
 #usr/share/man/man1/hmac256.1
--- a/config/rootfiles/common/libgpg-error
+++ b/config/rootfiles/common/libgpg-error
@@ -1,10 +1,11 @@
 usr/bin/gpg-error
 #usr/bin/gpg-error-config
 #usr/include/gpg-error.h
+#usr/include/gpgrt.h
 #usr/lib/libgpg-error.la
 #usr/lib/libgpg-error.so
 usr/lib/libgpg-error.so.0
-usr/lib/libgpg-error.so.0.19.1
+usr/lib/libgpg-error.so.0.22.0
 #usr/share/aclocal/gpg-error.m4
 #usr/share/common-lisp
 #usr/share/common-lisp/source
@@ -14,6 +15,8 @@ usr/lib/libgpg-error.so.0.19.1
 #usr/share/common-lisp/source/gpg-error/gpg-error.asd
 #usr/share/common-lisp/source/gpg-error/gpg-error.lisp
 #usr/share/info/gpgrt.info
+#usr/share/libgpg-error
+#usr/share/libgpg-error/errorref.txt
 #usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/da/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
--- a/config/rootfiles/common/libxml2
+++ b/config/rootfiles/common/libxml2
@@ -56,7 +56,7 @@
 #usr/lib/libxml2.la
 usr/lib/libxml2.so
 usr/lib/libxml2.so.2
-usr/lib/libxml2.so.2.9.3
+usr/lib/libxml2.so.2.9.4
 #usr/lib/pkgconfig/libxml-2.0.pc
 usr/lib/python2.7/site-packages/drv_libxml2.py
 usr/lib/python2.7/site-packages/libxml2.py
@@ -64,220 +64,222 @@ usr/lib/python2.7/site-packages/libxml2.py
 usr/lib/python2.7/site-packages/libxml2mod.so
 #usr/lib/xml2Conf.sh
 #usr/share/aclocal/libxml.m4
-#usr/share/doc/libxml2-2.9.3
-#usr/share/doc/libxml2-2.9.3/Copyright
-#usr/share/doc/libxml2-2.9.3/examples
-#usr/share/doc/libxml2-2.9.3/examples/testHTML.c
-#usr/share/doc/libxml2-2.9.3/examples/testSAX.c
-#usr/share/doc/libxml2-2.9.3/examples/testXPath.c
-#usr/share/doc/libxml2-2.9.3/examples/xmllint.c
-#usr/share/doc/libxml2-2.9.3/html
-#usr/share/doc/libxml2-2.9.3/html/DOM.gif
-#usr/share/doc/libxml2-2.9.3/html/FAQ.html
-#usr/share/doc/libxml2-2.9.3/html/Libxml2-Logo-180x168.gif
-#usr/share/doc/libxml2-2.9.3/html/Libxml2-Logo-90x34.gif
-#usr/share/doc/libxml2-2.9.3/html/encoding.html
-#usr/share/doc/libxml2-2.9.3/html/examples.xml
-#usr/share/doc/libxml2-2.9.3/html/examples.xsl
-#usr/share/doc/libxml2-2.9.3/html/html
-#usr/share/doc/libxml2-2.9.3/html/html/book1.html
-#usr/share/doc/libxml2-2.9.3/html/html/home.png
-#usr/share/doc/libxml2-2.9.3/html/html/index.html
-#usr/share/doc/libxml2-2.9.3/html/html/left.png
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-DOCBparser.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-HTMLparser.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-HTMLtree.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-SAX.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-SAX2.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-c14n.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-catalog.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-chvalid.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-debugXML.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-dict.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-encoding.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-entities.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-globals.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-hash.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-lib.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-list.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-nanoftp.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-nanohttp.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-parser.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-parserInternals.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-pattern.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-relaxng.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-schemasInternals.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-schematron.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-threads.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-tree.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-uri.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-valid.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xinclude.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xlink.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlIO.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlautomata.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlerror.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlexports.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlmemory.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlmodule.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlreader.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlregexp.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlsave.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlschemas.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlschemastypes.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlstring.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlunicode.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlversion.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlwriter.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xpath.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xpathInternals.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xpointer.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xzlib.html
-#usr/share/doc/libxml2-2.9.3/html/html/right.png
-#usr/share/doc/libxml2-2.9.3/html/html/up.png
-#usr/share/doc/libxml2-2.9.3/html/index.html
-#usr/share/doc/libxml2-2.9.3/html/io1.c
-#usr/share/doc/libxml2-2.9.3/html/io1.res
-#usr/share/doc/libxml2-2.9.3/html/io2.c
-#usr/share/doc/libxml2-2.9.3/html/io2.res
-#usr/share/doc/libxml2-2.9.3/html/libxml.gif
-#usr/share/doc/libxml2-2.9.3/html/parse1.c
-#usr/share/doc/libxml2-2.9.3/html/parse2.c
-#usr/share/doc/libxml2-2.9.3/html/parse3.c
-#usr/share/doc/libxml2-2.9.3/html/parse4.c
-#usr/share/doc/libxml2-2.9.3/html/reader1.c
-#usr/share/doc/libxml2-2.9.3/html/reader1.res
-#usr/share/doc/libxml2-2.9.3/html/reader2.c
-#usr/share/doc/libxml2-2.9.3/html/reader3.c
-#usr/share/doc/libxml2-2.9.3/html/reader3.res
-#usr/share/doc/libxml2-2.9.3/html/reader4.c
-#usr/share/doc/libxml2-2.9.3/html/reader4.res
-#usr/share/doc/libxml2-2.9.3/html/redhat.gif
-#usr/share/doc/libxml2-2.9.3/html/smallfootonly.gif
-#usr/share/doc/libxml2-2.9.3/html/structure.gif
-#usr/share/doc/libxml2-2.9.3/html/test1.xml
-#usr/share/doc/libxml2-2.9.3/html/test2.xml
-#usr/share/doc/libxml2-2.9.3/html/test3.xml
-#usr/share/doc/libxml2-2.9.3/html/testWriter.c
-#usr/share/doc/libxml2-2.9.3/html/tree1.c
-#usr/share/doc/libxml2-2.9.3/html/tree1.res
-#usr/share/doc/libxml2-2.9.3/html/tree2.c
-#usr/share/doc/libxml2-2.9.3/html/tree2.res
-#usr/share/doc/libxml2-2.9.3/html/tst.xml
-#usr/share/doc/libxml2-2.9.3/html/tutorial
-#usr/share/doc/libxml2-2.9.3/html/tutorial/apa.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/apb.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/apc.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/apd.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ape.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/apf.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/apg.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/aph.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/api.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s02.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s03.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s04.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s05.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s06.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s07.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s08.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s09.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/blank.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/1.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/10.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/2.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/3.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/4.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/5.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/6.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/7.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/8.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/9.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/caution.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/draft.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/home.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/important.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/next.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/note.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/prev.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/tip.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/toc-blank.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/toc-minus.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/toc-plus.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/up.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/warning.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/includeaddattribute.c
-#usr/share/doc/libxml2-2.9.3/html/tutorial/includeaddkeyword.c
-#usr/share/doc/libxml2-2.9.3/html/tutorial/includeconvert.c
-#usr/share/doc/libxml2-2.9.3/html/tutorial/includegetattribute.c
-#usr/share/doc/libxml2-2.9.3/html/tutorial/includekeyword.c
-#usr/share/doc/libxml2-2.9.3/html/tutorial/includexpath.c
-#usr/share/doc/libxml2-2.9.3/html/tutorial/index.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ix01.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/xmltutorial.pdf
-#usr/share/doc/libxml2-2.9.3/html/w3c.png
-#usr/share/doc/libxml2-2.9.3/html/writer.xml
-#usr/share/doc/libxml2-2.9.3/html/xml.html
-#usr/share/doc/libxml2-2.9.3/html/xpath1.c
-#usr/share/doc/libxml2-2.9.3/html/xpath1.res
-#usr/share/doc/libxml2-2.9.3/html/xpath2.c
-#usr/share/doc/libxml2-2.9.3/html/xpath2.res
-#usr/share/doc/libxml2-python-2.9.3
-#usr/share/doc/libxml2-python-2.9.3/TODO
-#usr/share/doc/libxml2-python-2.9.3/examples
-#usr/share/doc/libxml2-python-2.9.3/examples/attribs.py
-#usr/share/doc/libxml2-python-2.9.3/examples/build.py
-#usr/share/doc/libxml2-python-2.9.3/examples/compareNodes.py
-#usr/share/doc/libxml2-python-2.9.3/examples/ctxterror.py
-#usr/share/doc/libxml2-python-2.9.3/examples/cutnpaste.py
-#usr/share/doc/libxml2-python-2.9.3/examples/dtdvalid.py
-#usr/share/doc/libxml2-python-2.9.3/examples/error.py
-#usr/share/doc/libxml2-python-2.9.3/examples/inbuf.py
-#usr/share/doc/libxml2-python-2.9.3/examples/indexes.py
-#usr/share/doc/libxml2-python-2.9.3/examples/input_callback.py
-#usr/share/doc/libxml2-python-2.9.3/examples/invalid.xml
-#usr/share/doc/libxml2-python-2.9.3/examples/nsdel.py
-#usr/share/doc/libxml2-python-2.9.3/examples/outbuf.py
-#usr/share/doc/libxml2-python-2.9.3/examples/push.py
-#usr/share/doc/libxml2-python-2.9.3/examples/pushSAX.py
-#usr/share/doc/libxml2-python-2.9.3/examples/pushSAXhtml.py
-#usr/share/doc/libxml2-python-2.9.3/examples/reader.py
-#usr/share/doc/libxml2-python-2.9.3/examples/reader2.py
-#usr/share/doc/libxml2-python-2.9.3/examples/reader3.py
-#usr/share/doc/libxml2-python-2.9.3/examples/reader4.py
-#usr/share/doc/libxml2-python-2.9.3/examples/reader5.py
-#usr/share/doc/libxml2-python-2.9.3/examples/reader6.py
-#usr/share/doc/libxml2-python-2.9.3/examples/reader7.py
-#usr/share/doc/libxml2-python-2.9.3/examples/reader8.py
-#usr/share/doc/libxml2-python-2.9.3/examples/readererr.py
-#usr/share/doc/libxml2-python-2.9.3/examples/readernext.py
-#usr/share/doc/libxml2-python-2.9.3/examples/regexp.py
-#usr/share/doc/libxml2-python-2.9.3/examples/relaxng.py
-#usr/share/doc/libxml2-python-2.9.3/examples/resolver.py
-#usr/share/doc/libxml2-python-2.9.3/examples/schema.py
-#usr/share/doc/libxml2-python-2.9.3/examples/serialize.py
-#usr/share/doc/libxml2-python-2.9.3/examples/sync.py
-#usr/share/doc/libxml2-python-2.9.3/examples/test.dtd
-#usr/share/doc/libxml2-python-2.9.3/examples/thread2.py
-#usr/share/doc/libxml2-python-2.9.3/examples/tst.py
-#usr/share/doc/libxml2-python-2.9.3/examples/tst.xml
-#usr/share/doc/libxml2-python-2.9.3/examples/tstLastError.py
-#usr/share/doc/libxml2-python-2.9.3/examples/tstURI.py
-#usr/share/doc/libxml2-python-2.9.3/examples/tstmem.py
-#usr/share/doc/libxml2-python-2.9.3/examples/tstxpath.py
-#usr/share/doc/libxml2-python-2.9.3/examples/valid.xml
-#usr/share/doc/libxml2-python-2.9.3/examples/validDTD.py
-#usr/share/doc/libxml2-python-2.9.3/examples/validRNG.py
-#usr/share/doc/libxml2-python-2.9.3/examples/validSchemas.py
-#usr/share/doc/libxml2-python-2.9.3/examples/validate.py
-#usr/share/doc/libxml2-python-2.9.3/examples/walker.py
-#usr/share/doc/libxml2-python-2.9.3/examples/xpath.py
-#usr/share/doc/libxml2-python-2.9.3/examples/xpathext.py
-#usr/share/doc/libxml2-python-2.9.3/examples/xpathleak.py
-#usr/share/doc/libxml2-python-2.9.3/examples/xpathns.py
-#usr/share/doc/libxml2-python-2.9.3/examples/xpathret.py
+#usr/share/doc/libxml2-2.9.4
+#usr/share/doc/libxml2-2.9.4/Copyright
+#usr/share/doc/libxml2-2.9.4/examples
+#usr/share/doc/libxml2-2.9.4/examples/testHTML.c
+#usr/share/doc/libxml2-2.9.4/examples/testSAX.c
+#usr/share/doc/libxml2-2.9.4/examples/testXPath.c
+#usr/share/doc/libxml2-2.9.4/examples/xmllint.c
+#usr/share/doc/libxml2-2.9.4/html
+#usr/share/doc/libxml2-2.9.4/html/DOM.gif
+#usr/share/doc/libxml2-2.9.4/html/FAQ.html
+#usr/share/doc/libxml2-2.9.4/html/Libxml2-Logo-180x168.gif
+#usr/share/doc/libxml2-2.9.4/html/Libxml2-Logo-90x34.gif
+#usr/share/doc/libxml2-2.9.4/html/encoding.html
+#usr/share/doc/libxml2-2.9.4/html/examples.xml
+#usr/share/doc/libxml2-2.9.4/html/examples.xsl
+#usr/share/doc/libxml2-2.9.4/html/html
+#usr/share/doc/libxml2-2.9.4/html/html/book1.html
+#usr/share/doc/libxml2-2.9.4/html/html/home.png
+#usr/share/doc/libxml2-2.9.4/html/html/index.html
+#usr/share/doc/libxml2-2.9.4/html/html/left.png
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-DOCBparser.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-HTMLparser.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-HTMLtree.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-SAX.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-SAX2.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-c14n.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-catalog.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-chvalid.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-debugXML.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-dict.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-encoding.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-entities.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-globals.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-hash.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-lib.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-list.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-nanoftp.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-nanohttp.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-parser.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-parserInternals.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-pattern.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-relaxng.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-schemasInternals.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-schematron.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-threads.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-tree.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-uri.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-valid.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xinclude.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xlink.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlIO.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlautomata.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlerror.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlexports.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlmemory.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlmodule.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlreader.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlregexp.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlsave.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlschemas.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlschemastypes.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlstring.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlunicode.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlversion.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlwriter.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xpath.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xpathInternals.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xpointer.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xzlib.html
+#usr/share/doc/libxml2-2.9.4/html/html/right.png
+#usr/share/doc/libxml2-2.9.4/html/html/up.png
+#usr/share/doc/libxml2-2.9.4/html/index.html
+#usr/share/doc/libxml2-2.9.4/html/io1.c
+#usr/share/doc/libxml2-2.9.4/html/io1.res
+#usr/share/doc/libxml2-2.9.4/html/io2.c
+#usr/share/doc/libxml2-2.9.4/html/io2.res
+#usr/share/doc/libxml2-2.9.4/html/libxml.gif
+#usr/share/doc/libxml2-2.9.4/html/parse1.c
+#usr/share/doc/libxml2-2.9.4/html/parse2.c
+#usr/share/doc/libxml2-2.9.4/html/parse3.c
+#usr/share/doc/libxml2-2.9.4/html/parse4.c
+#usr/share/doc/libxml2-2.9.4/html/reader1.c
+#usr/share/doc/libxml2-2.9.4/html/reader1.res
+#usr/share/doc/libxml2-2.9.4/html/reader2.c
+#usr/share/doc/libxml2-2.9.4/html/reader3.c
+#usr/share/doc/libxml2-2.9.4/html/reader3.res
+#usr/share/doc/libxml2-2.9.4/html/reader4.c
+#usr/share/doc/libxml2-2.9.4/html/reader4.res
+#usr/share/doc/libxml2-2.9.4/html/redhat.gif
+#usr/share/doc/libxml2-2.9.4/html/smallfootonly.gif
+#usr/share/doc/libxml2-2.9.4/html/structure.gif
+#usr/share/doc/libxml2-2.9.4/html/test1.xml
+#usr/share/doc/libxml2-2.9.4/html/test2.xml
+#usr/share/doc/libxml2-2.9.4/html/test3.xml
+#usr/share/doc/libxml2-2.9.4/html/testWriter.c
+#usr/share/doc/libxml2-2.9.4/html/tree1.c
+#usr/share/doc/libxml2-2.9.4/html/tree1.res
+#usr/share/doc/libxml2-2.9.4/html/tree2.c
+#usr/share/doc/libxml2-2.9.4/html/tree2.res
+#usr/share/doc/libxml2-2.9.4/html/tst.xml
+#usr/share/doc/libxml2-2.9.4/html/tutorial
+#usr/share/doc/libxml2-2.9.4/html/tutorial/apa.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/apb.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/apc.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/apd.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ape.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/apf.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/apg.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/aph.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/api.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s02.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s03.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s04.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s05.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s06.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s07.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s08.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s09.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/blank.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/1.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/10.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/2.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/3.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/4.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/5.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/6.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/7.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/8.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts/9.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/caution.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/draft.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/home.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/important.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/next.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/note.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/prev.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/tip.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/toc-blank.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/toc-minus.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/toc-plus.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/up.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/warning.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/includeaddattribute.c
+#usr/share/doc/libxml2-2.9.4/html/tutorial/includeaddkeyword.c
+#usr/share/doc/libxml2-2.9.4/html/tutorial/includeconvert.c
+#usr/share/doc/libxml2-2.9.4/html/tutorial/includegetattribute.c
+#usr/share/doc/libxml2-2.9.4/html/tutorial/includekeyword.c
+#usr/share/doc/libxml2-2.9.4/html/tutorial/includexpath.c
+#usr/share/doc/libxml2-2.9.4/html/tutorial/index.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ix01.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/xmltutorial.pdf
+#usr/share/doc/libxml2-2.9.4/html/w3c.png
+#usr/share/doc/libxml2-2.9.4/html/writer.xml
+#usr/share/doc/libxml2-2.9.4/html/xml.html
+#usr/share/doc/libxml2-2.9.4/html/xpath1.c
+#usr/share/doc/libxml2-2.9.4/html/xpath1.res
+#usr/share/doc/libxml2-2.9.4/html/xpath2.c
+#usr/share/doc/libxml2-2.9.4/html/xpath2.res
+#usr/share/doc/libxml2-python-2.9.4
+#usr/share/doc/libxml2-python-2.9.4/TODO
+#usr/share/doc/libxml2-python-2.9.4/examples
+#usr/share/doc/libxml2-python-2.9.4/examples/attribs.py
+#usr/share/doc/libxml2-python-2.9.4/examples/build.py
+#usr/share/doc/libxml2-python-2.9.4/examples/compareNodes.py
+#usr/share/doc/libxml2-python-2.9.4/examples/ctxterror.py
+#usr/share/doc/libxml2-python-2.9.4/examples/cutnpaste.py
+#usr/share/doc/libxml2-python-2.9.4/examples/dtdvalid.py
+#usr/share/doc/libxml2-python-2.9.4/examples/error.py
+#usr/share/doc/libxml2-python-2.9.4/examples/inbuf.py
+#usr/share/doc/libxml2-python-2.9.4/examples/indexes.py
+#usr/share/doc/libxml2-python-2.9.4/examples/input_callback.py
+#usr/share/doc/libxml2-python-2.9.4/examples/invalid.xml
+#usr/share/doc/libxml2-python-2.9.4/examples/nsdel.py
+#usr/share/doc/libxml2-python-2.9.4/examples/outbuf.py
+#usr/share/doc/libxml2-python-2.9.4/examples/push.py
+#usr/share/doc/libxml2-python-2.9.4/examples/pushSAX.py
+#usr/share/doc/libxml2-python-2.9.4/examples/pushSAXhtml.py
+#usr/share/doc/libxml2-python-2.9.4/examples/reader.py
+#usr/share/doc/libxml2-python-2.9.4/examples/reader2.py
+#usr/share/doc/libxml2-python-2.9.4/examples/reader3.py
+#usr/share/doc/libxml2-python-2.9.4/examples/reader4.py
+#usr/share/doc/libxml2-python-2.9.4/examples/reader5.py
+#usr/share/doc/libxml2-python-2.9.4/examples/reader6.py
+#usr/share/doc/libxml2-python-2.9.4/examples/reader7.py
+#usr/share/doc/libxml2-python-2.9.4/examples/reader8.py
+#usr/share/doc/libxml2-python-2.9.4/examples/readererr.py
+#usr/share/doc/libxml2-python-2.9.4/examples/readernext.py
+#usr/share/doc/libxml2-python-2.9.4/examples/regexp.py
+#usr/share/doc/libxml2-python-2.9.4/examples/relaxng.py
+#usr/share/doc/libxml2-python-2.9.4/examples/resolver.py
+#usr/share/doc/libxml2-python-2.9.4/examples/schema.py
+#usr/share/doc/libxml2-python-2.9.4/examples/serialize.py
+#usr/share/doc/libxml2-python-2.9.4/examples/sync.py
+#usr/share/doc/libxml2-python-2.9.4/examples/test.dtd
+#usr/share/doc/libxml2-python-2.9.4/examples/thread2.py
+#usr/share/doc/libxml2-python-2.9.4/examples/tst.py
+#usr/share/doc/libxml2-python-2.9.4/examples/tst.xml
+#usr/share/doc/libxml2-python-2.9.4/examples/tstLastError.py
+#usr/share/doc/libxml2-python-2.9.4/examples/tstURI.py
+#usr/share/doc/libxml2-python-2.9.4/examples/tstmem.py
+#usr/share/doc/libxml2-python-2.9.4/examples/tstxpath.py
+#usr/share/doc/libxml2-python-2.9.4/examples/valid.xml
+#usr/share/doc/libxml2-python-2.9.4/examples/validDTD.py
+#usr/share/doc/libxml2-python-2.9.4/examples/validRNG.py
+#usr/share/doc/libxml2-python-2.9.4/examples/validSchemas.py
+#usr/share/doc/libxml2-python-2.9.4/examples/validate.py
+#usr/share/doc/libxml2-python-2.9.4/examples/walker.py
+#usr/share/doc/libxml2-python-2.9.4/examples/xpath.py
+#usr/share/doc/libxml2-python-2.9.4/examples/xpathext.py
+#usr/share/doc/libxml2-python-2.9.4/examples/xpathleak.py
+#usr/share/doc/libxml2-python-2.9.4/examples/xpathns.py
+#usr/share/doc/libxml2-python-2.9.4/examples/xpathret.py
+#usr/share/gtk-doc
+#usr/share/gtk-doc/html
 #usr/share/gtk-doc/html/libxml2
 #usr/share/gtk-doc/html/libxml2/general.html
 #usr/share/gtk-doc/html/libxml2/home.png
--- a/config/rootfiles/common/logrotate
+++ b/config/rootfiles/common/logrotate
@@ -1,6 +1,6 @@
 #etc/logrotate.d
 etc/logrotate.d/.empty
-#usr/man/man5/logrotate.conf.5
-#usr/man/man8/logrotate.8
 usr/sbin/logrotate
+#usr/share/man/man5/logrotate.conf.5
+#usr/share/man/man8/logrotate.8
 var/lib/logrotate.status
--- a/config/rootfiles/common/logwatch
+++ b/config/rootfiles/common/logwatch
@@ -1,11 +1,6 @@
 #etc/logwatch
 etc/logwatch/conf
 #etc/logwatch/logwatch.cron
-#etc/logwatch/conf/ignore.conf
-#etc/logwatch/conf/logfiles
-#etc/logwatch/conf/logwatch.conf
-#etc/logwatch/conf/override.conf
-#etc/logwatch/conf/services
 etc/logwatch/scripts
 etc/logwatch/scripts/services
 usr/sbin/logwatch
@@ -72,7 +67,7 @@ usr/share/logwatch/default.conf/logfiles/xferlog.conf
 #usr/share/logwatch/default.conf/logfiles/yum.conf
 #usr/share/logwatch/default.conf/logfiles/zypp.conf
 usr/share/logwatch/default.conf/logwatch.conf
-usr/share/logwatch/default.conf/services
+#usr/share/logwatch/default.conf/services
 #usr/share/logwatch/default.conf/services/afpd.conf
 usr/share/logwatch/default.conf/services/amavis.conf
 #usr/share/logwatch/default.conf/services/arpwatch.conf
@@ -99,7 +94,7 @@ usr/share/logwatch/default.conf/services/dhcpd.conf
 #usr/share/logwatch/default.conf/services/evtsecurity.conf
 #usr/share/logwatch/default.conf/services/evtsystem.conf
 #usr/share/logwatch/default.conf/services/exim.conf
-#usr/share/logwatch/default.conf/services/eximstats.conf
+usr/share/logwatch/default.conf/services/eximstats.conf
 #usr/share/logwatch/default.conf/services/extreme-networks.conf
 #usr/share/logwatch/default.conf/services/fail2ban.conf
 #usr/share/logwatch/default.conf/services/fetchmail.conf
@@ -166,10 +161,12 @@ usr/share/logwatch/default.conf/services/scsi.conf
 #usr/share/logwatch/default.conf/services/spamassassin.conf
 usr/share/logwatch/default.conf/services/sshd.conf
 usr/share/logwatch/default.conf/services/sshd2.conf
+#usr/share/logwatch/default.conf/services/sssd.conf
 #usr/share/logwatch/default.conf/services/stunnel.conf
 usr/share/logwatch/default.conf/services/sudo.conf
 #usr/share/logwatch/default.conf/services/syslog-ng.conf
 usr/share/logwatch/default.conf/services/syslogd.conf
+#usr/share/logwatch/default.conf/services/systemd.conf
 #usr/share/logwatch/default.conf/services/tac_acc.conf
 #usr/share/logwatch/default.conf/services/tivoli-smc.conf
 #usr/share/logwatch/default.conf/services/up2date.conf
@@ -182,10 +179,10 @@ usr/share/logwatch/default.conf/services/windows.conf
 #usr/share/logwatch/default.conf/services/zypp.conf
 usr/share/logwatch/default.conf/services/zz-disk_space.conf
 #usr/share/logwatch/default.conf/services/zz-fortune.conf
-#usr/share/logwatch/default.conf/services/zz-lm_sensors.conf
+usr/share/logwatch/default.conf/services/zz-lm_sensors.conf
 usr/share/logwatch/default.conf/services/zz-network.conf
 usr/share/logwatch/default.conf/services/zz-runtime.conf
-#usr/share/logwatch/default.conf/services/zz-sys.conf
+usr/share/logwatch/default.conf/services/zz-sys.conf
 #usr/share/logwatch/default.conf/services/zz-zfs.conf
 #usr/share/logwatch/dist.conf
 usr/share/logwatch/dist.conf/logfiles
@@ -213,7 +210,7 @@ usr/share/logwatch/scripts/logfiles/xferlog/removeheaders
 #usr/share/logwatch/scripts/logfiles/yum
 #usr/share/logwatch/scripts/logfiles/yum/applydate
 usr/share/logwatch/scripts/logwatch.pl
-usr/share/logwatch/scripts/services
+#usr/share/logwatch/scripts/services
 #usr/share/logwatch/scripts/services/afpd
 usr/share/logwatch/scripts/services/amavis
 #usr/share/logwatch/scripts/services/arpwatch
@@ -241,7 +238,7 @@ usr/share/logwatch/scripts/services/dialup
 #usr/share/logwatch/scripts/services/evtsecurity
 #usr/share/logwatch/scripts/services/evtsystem
 #usr/share/logwatch/scripts/services/exim
-#usr/share/logwatch/scripts/services/eximstats
+usr/share/logwatch/scripts/services/eximstats
 #usr/share/logwatch/scripts/services/extreme-networks
 #usr/share/logwatch/scripts/services/fail2ban
 #usr/share/logwatch/scripts/services/fetchmail
@@ -292,7 +289,7 @@ usr/share/logwatch/scripts/services/postfix
 #usr/share/logwatch/scripts/services/qmail-send
 #usr/share/logwatch/scripts/services/qmail-smtpd
 #usr/share/logwatch/scripts/services/raid
-#usr/share/logwatch/scripts/services/resolver
+usr/share/logwatch/scripts/services/resolver
 #usr/share/logwatch/scripts/services/rsyslogd
 #usr/share/logwatch/scripts/services/rt314
 usr/share/logwatch/scripts/services/samba
@@ -308,10 +305,12 @@ usr/share/logwatch/scripts/services/scsi
 #usr/share/logwatch/scripts/services/spamassassin
 usr/share/logwatch/scripts/services/sshd
 usr/share/logwatch/scripts/services/sshd2
+#usr/share/logwatch/scripts/services/sssd
 #usr/share/logwatch/scripts/services/stunnel
 usr/share/logwatch/scripts/services/sudo
 #usr/share/logwatch/scripts/services/syslog-ng
 usr/share/logwatch/scripts/services/syslogd
+#usr/share/logwatch/scripts/services/systemd
 #usr/share/logwatch/scripts/services/tac_acc
 #usr/share/logwatch/scripts/services/tivoli-smc
 #usr/share/logwatch/scripts/services/up2date
@@ -324,10 +323,10 @@ usr/share/logwatch/scripts/services/windows
 #usr/share/logwatch/scripts/services/zypp
 usr/share/logwatch/scripts/services/zz-disk_space
 #usr/share/logwatch/scripts/services/zz-fortune
-#usr/share/logwatch/scripts/services/zz-lm_sensors
+usr/share/logwatch/scripts/services/zz-lm_sensors
 usr/share/logwatch/scripts/services/zz-network
 usr/share/logwatch/scripts/services/zz-runtime
-#usr/share/logwatch/scripts/services/zz-sys
+usr/share/logwatch/scripts/services/zz-sys
 #usr/share/logwatch/scripts/services/zz-zfs
 #usr/share/logwatch/scripts/shared
 usr/share/logwatch/scripts/shared/applybinddate
--- a/config/rootfiles/common/mpfr
+++ b/config/rootfiles/common/mpfr
@@ -4,7 +4,7 @@
 #usr/lib/libmpfr.la
 #usr/lib/libmpfr.so
 usr/lib/libmpfr.so.4
-usr/lib/libmpfr.so.4.1.3
+usr/lib/libmpfr.so.4.1.5
 #usr/share/doc/mpfr
 #usr/share/doc/mpfr/AUTHORS
 #usr/share/doc/mpfr/BUGS
--- a/config/rootfiles/common/ncurses
+++ b/config/rootfiles/common/ncurses
@@ -49,14 +49,9 @@ usr/lib/libncursesw.so.6.0
 usr/lib/libpanelw.so.6
 usr/lib/libpanelw.so.6.0
 #usr/lib/pkgconfig/form.pc
-#usr/lib/pkgconfig/formw.pc
 #usr/lib/pkgconfig/menu.pc
-#usr/lib/pkgconfig/menuw.pc
-#usr/lib/pkgconfig/ncurses++w.pc
 #usr/lib/pkgconfig/ncurses.pc
-#usr/lib/pkgconfig/ncursesw.pc
 #usr/lib/pkgconfig/panel.pc
-#usr/lib/pkgconfig/panelw.pc
 #usr/lib/terminfo
 #usr/share/man/man1/captoinfo.1m
 #usr/share/man/man1/clear.1
--- a/config/rootfiles/common/nettle
+++ b/config/rootfiles/common/nettle
@@ -39,6 +39,7 @@
 #usr/include/nettle/md4.h
 #usr/include/nettle/md5-compat.h
 #usr/include/nettle/md5.h
+#usr/include/nettle/memops.h
 #usr/include/nettle/memxor.h
 #usr/include/nettle/nettle-meta.h
 #usr/include/nettle/nettle-stdint.h
@@ -63,11 +64,9 @@
 #usr/include/nettle/yarrow.h
 usr/lib/libhogweed.so
 usr/lib/libhogweed.so.4
-usr/lib/libhogweed.so.4.2
+usr/lib/libhogweed.so.4.3
 #usr/lib/libnettle.so
 usr/lib/libnettle.so.6
-usr/lib/libnettle.so.6.2
+usr/lib/libnettle.so.6.3
 #usr/lib/pkgconfig/hogweed.pc
 #usr/lib/pkgconfig/nettle.pc
-usr/share/doc/nettle-3.2
-#usr/share/info/nettle.info
--- a/config/rootfiles/common/pcre
+++ b/config/rootfiles/common/pcre
@@ -10,15 +10,15 @@
 #usr/lib/libpcre.la
 usr/lib/libpcre.so
 usr/lib/libpcre.so.1
-usr/lib/libpcre.so.1.2.7
+usr/lib/libpcre.so.1.2.8
 #usr/lib/libpcre16.la
 usr/lib/libpcre16.so
 usr/lib/libpcre16.so.0
-usr/lib/libpcre16.so.0.2.7
+usr/lib/libpcre16.so.0.2.8
 #usr/lib/libpcre32.la
 usr/lib/libpcre32.so
 usr/lib/libpcre32.so.0
-usr/lib/libpcre32.so.0.0.7
+usr/lib/libpcre32.so.0.0.8
 #usr/lib/libpcrecpp.la
 usr/lib/libpcrecpp.so
 usr/lib/libpcrecpp.so.0
@@ -32,72 +32,72 @@ usr/lib/libpcreposix.so.0.0.4
 #usr/lib/pkgconfig/libpcre32.pc
 #usr/lib/pkgconfig/libpcrecpp.pc
 #usr/lib/pkgconfig/libpcreposix.pc
-#usr/share/doc/pcre-pcre-8.39
-#usr/share/doc/pcre-pcre-8.39/AUTHORS
-#usr/share/doc/pcre-pcre-8.39/COPYING
-#usr/share/doc/pcre-pcre-8.39/ChangeLog
-#usr/share/doc/pcre-pcre-8.39/LICENCE
-#usr/share/doc/pcre-pcre-8.39/NEWS
-#usr/share/doc/pcre-pcre-8.39/README
-#usr/share/doc/pcre-pcre-8.39/html
-#usr/share/doc/pcre-pcre-8.39/html/NON-AUTOTOOLS-BUILD.txt
-#usr/share/doc/pcre-pcre-8.39/html/README.txt
-#usr/share/doc/pcre-pcre-8.39/html/index.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre-config.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre16.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre32.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_assign_jit_stack.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_compile.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_compile2.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_config.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_copy_named_substring.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_copy_substring.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_dfa_exec.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_exec.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_free_study.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_free_substring.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_free_substring_list.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_fullinfo.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_get_named_substring.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_get_stringnumber.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_get_stringtable_entries.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_get_substring.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_get_substring_list.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_jit_exec.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_jit_stack_alloc.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_jit_stack_free.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_maketables.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_pattern_to_host_byte_order.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_refcount.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_study.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_utf16_to_host_byte_order.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_utf32_to_host_byte_order.html
-#usr/share/doc/pcre-pcre-8.39/html/pcre_version.html
-#usr/share/doc/pcre-pcre-8.39/html/pcreapi.html
-#usr/share/doc/pcre-pcre-8.39/html/pcrebuild.html
-#usr/share/doc/pcre-pcre-8.39/html/pcrecallout.html
-#usr/share/doc/pcre-pcre-8.39/html/pcrecompat.html
-#usr/share/doc/pcre-pcre-8.39/html/pcrecpp.html
-#usr/share/doc/pcre-pcre-8.39/html/pcredemo.html
-#usr/share/doc/pcre-pcre-8.39/html/pcregrep.html
-#usr/share/doc/pcre-pcre-8.39/html/pcrejit.html
-#usr/share/doc/pcre-pcre-8.39/html/pcrelimits.html
-#usr/share/doc/pcre-pcre-8.39/html/pcrematching.html
-#usr/share/doc/pcre-pcre-8.39/html/pcrepartial.html
-#usr/share/doc/pcre-pcre-8.39/html/pcrepattern.html
-#usr/share/doc/pcre-pcre-8.39/html/pcreperform.html
-#usr/share/doc/pcre-pcre-8.39/html/pcreposix.html
-#usr/share/doc/pcre-pcre-8.39/html/pcreprecompile.html
-#usr/share/doc/pcre-pcre-8.39/html/pcresample.html
-#usr/share/doc/pcre-pcre-8.39/html/pcrestack.html
-#usr/share/doc/pcre-pcre-8.39/html/pcresyntax.html
-#usr/share/doc/pcre-pcre-8.39/html/pcretest.html
-#usr/share/doc/pcre-pcre-8.39/html/pcreunicode.html
-#usr/share/doc/pcre-pcre-8.39/pcre-config.txt
-#usr/share/doc/pcre-pcre-8.39/pcre.txt
-#usr/share/doc/pcre-pcre-8.39/pcregrep.txt
-#usr/share/doc/pcre-pcre-8.39/pcretest.txt
+#usr/share/doc/pcre-pcre-8.40
+#usr/share/doc/pcre-pcre-8.40/AUTHORS
+#usr/share/doc/pcre-pcre-8.40/COPYING
+#usr/share/doc/pcre-pcre-8.40/ChangeLog
+#usr/share/doc/pcre-pcre-8.40/LICENCE
+#usr/share/doc/pcre-pcre-8.40/NEWS
+#usr/share/doc/pcre-pcre-8.40/README
+#usr/share/doc/pcre-pcre-8.40/html
+#usr/share/doc/pcre-pcre-8.40/html/NON-AUTOTOOLS-BUILD.txt
+#usr/share/doc/pcre-pcre-8.40/html/README.txt
+#usr/share/doc/pcre-pcre-8.40/html/index.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre-config.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre16.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre32.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_assign_jit_stack.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_compile.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_compile2.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_config.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_copy_named_substring.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_copy_substring.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_dfa_exec.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_exec.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_free_study.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_free_substring.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_free_substring_list.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_fullinfo.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_get_named_substring.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_get_stringnumber.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_get_stringtable_entries.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_get_substring.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_get_substring_list.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_jit_exec.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_jit_stack_alloc.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_jit_stack_free.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_maketables.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_pattern_to_host_byte_order.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_refcount.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_study.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_utf16_to_host_byte_order.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_utf32_to_host_byte_order.html
+#usr/share/doc/pcre-pcre-8.40/html/pcre_version.html
+#usr/share/doc/pcre-pcre-8.40/html/pcreapi.html
+#usr/share/doc/pcre-pcre-8.40/html/pcrebuild.html
+#usr/share/doc/pcre-pcre-8.40/html/pcrecallout.html
+#usr/share/doc/pcre-pcre-8.40/html/pcrecompat.html
+#usr/share/doc/pcre-pcre-8.40/html/pcrecpp.html
+#usr/share/doc/pcre-pcre-8.40/html/pcredemo.html
+#usr/share/doc/pcre-pcre-8.40/html/pcregrep.html
+#usr/share/doc/pcre-pcre-8.40/html/pcrejit.html
+#usr/share/doc/pcre-pcre-8.40/html/pcrelimits.html
+#usr/share/doc/pcre-pcre-8.40/html/pcrematching.html
+#usr/share/doc/pcre-pcre-8.40/html/pcrepartial.html
+#usr/share/doc/pcre-pcre-8.40/html/pcrepattern.html
+#usr/share/doc/pcre-pcre-8.40/html/pcreperform.html
+#usr/share/doc/pcre-pcre-8.40/html/pcreposix.html
+#usr/share/doc/pcre-pcre-8.40/html/pcreprecompile.html
+#usr/share/doc/pcre-pcre-8.40/html/pcresample.html
+#usr/share/doc/pcre-pcre-8.40/html/pcrestack.html
+#usr/share/doc/pcre-pcre-8.40/html/pcresyntax.html
+#usr/share/doc/pcre-pcre-8.40/html/pcretest.html
+#usr/share/doc/pcre-pcre-8.40/html/pcreunicode.html
+#usr/share/doc/pcre-pcre-8.40/pcre-config.txt
+#usr/share/doc/pcre-pcre-8.40/pcre.txt
+#usr/share/doc/pcre-pcre-8.40/pcregrep.txt
+#usr/share/doc/pcre-pcre-8.40/pcretest.txt
 #usr/share/man/man1/pcre-config.1
 #usr/share/man/man1/pcregrep.1
 #usr/share/man/man1/pcretest.1
--- a/config/rootfiles/common/pixman
+++ b/config/rootfiles/common/pixman
@@ -5,5 +5,5 @@
 #usr/lib/libpixman-1.la
 usr/lib/libpixman-1.so
 usr/lib/libpixman-1.so.0
-usr/lib/libpixman-1.so.0.26.0
+usr/lib/libpixman-1.so.0.34.0
 #usr/lib/pkgconfig/pixman-1.pc
--- a/config/rootfiles/common/poppler
+++ b/config/rootfiles/common/poppler
@@ -0,0 +1,174 @@
+usr/bin/pdfdetach
+usr/bin/pdffonts
+usr/bin/pdfimages
+usr/bin/pdfinfo
+usr/bin/pdfseparate
+usr/bin/pdftocairo
+usr/bin/pdftohtml
+usr/bin/pdftoppm
+usr/bin/pdftops
+usr/bin/pdftotext
+usr/bin/pdfunite
+#usr/include/poppler
+#usr/include/poppler/Annot.h
+#usr/include/poppler/Array.h
+#usr/include/poppler/BuiltinFont.h
+#usr/include/poppler/BuiltinFontTables.h
+#usr/include/poppler/CMap.h
+#usr/include/poppler/CachedFile.h
+#usr/include/poppler/Catalog.h
+#usr/include/poppler/CharCodeToUnicode.h
+#usr/include/poppler/CharTypes.h
+#usr/include/poppler/CompactFontTables.h
+#usr/include/poppler/DateInfo.h
+#usr/include/poppler/Decrypt.h
+#usr/include/poppler/Dict.h
+#usr/include/poppler/Error.h
+#usr/include/poppler/ErrorCodes.h
+#usr/include/poppler/FileSpec.h
+#usr/include/poppler/FontEncodingTables.h
+#usr/include/poppler/FontInfo.h
+#usr/include/poppler/Form.h
+#usr/include/poppler/Function.h
+#usr/include/poppler/Gfx.h
+#usr/include/poppler/GfxFont.h
+#usr/include/poppler/GfxState.h
+#usr/include/poppler/GfxState_helpers.h
+#usr/include/poppler/GlobalParams.h
+#usr/include/poppler/Hints.h
+#usr/include/poppler/JArithmeticDecoder.h
+#usr/include/poppler/JBIG2Stream.h
+#usr/include/poppler/Lexer.h
+#usr/include/poppler/Linearization.h
+#usr/include/poppler/Link.h
+#usr/include/poppler/LocalPDFDocBuilder.h
+#usr/include/poppler/MarkedContentOutputDev.h
+#usr/include/poppler/Movie.h
+#usr/include/poppler/NameToCharCode.h
+#usr/include/poppler/NameToUnicodeTable.h
+#usr/include/poppler/Object.h
+#usr/include/poppler/OptionalContent.h
+#usr/include/poppler/Outline.h
+#usr/include/poppler/OutputDev.h
+#usr/include/poppler/PDFDoc.h
+#usr/include/poppler/PDFDocBuilder.h
+#usr/include/poppler/PDFDocEncoding.h
+#usr/include/poppler/PDFDocFactory.h
+#usr/include/poppler/PSOutputDev.h
+#usr/include/poppler/PSTokenizer.h
+#usr/include/poppler/Page.h
+#usr/include/poppler/PageTransition.h
+#usr/include/poppler/Parser.h
+#usr/include/poppler/PopplerCache.h
+#usr/include/poppler/PreScanOutputDev.h
+#usr/include/poppler/ProfileData.h
+#usr/include/poppler/Rendition.h
+#usr/include/poppler/SecurityHandler.h
+#usr/include/poppler/SignatureInfo.h
+#usr/include/poppler/Sound.h
+#usr/include/poppler/SplashOutputDev.h
+#usr/include/poppler/StdinCachedFile.h
+#usr/include/poppler/StdinPDFDocBuilder.h
+#usr/include/poppler/Stream-CCITT.h
+#usr/include/poppler/Stream.h
+#usr/include/poppler/StructElement.h
+#usr/include/poppler/StructTreeRoot.h
+#usr/include/poppler/TextOutputDev.h
+#usr/include/poppler/UTF.h
+#usr/include/poppler/UTF8.h
+#usr/include/poppler/UnicodeCClassTables.h
+#usr/include/poppler/UnicodeCompTables.h
+#usr/include/poppler/UnicodeDecompTables.h
+#usr/include/poppler/UnicodeMap.h
+#usr/include/poppler/UnicodeMapTables.h
+#usr/include/poppler/UnicodeTypeTable.h
+#usr/include/poppler/ViewerPreferences.h
+#usr/include/poppler/XRef.h
+#usr/include/poppler/XpdfPluginAPI.h
+#usr/include/poppler/cpp
+#usr/include/poppler/cpp/poppler-document.h
+#usr/include/poppler/cpp/poppler-embedded-file.h
+#usr/include/poppler/cpp/poppler-font.h
+#usr/include/poppler/cpp/poppler-global.h
+#usr/include/poppler/cpp/poppler-image.h
+#usr/include/poppler/cpp/poppler-page-renderer.h
+#usr/include/poppler/cpp/poppler-page-transition.h
+#usr/include/poppler/cpp/poppler-page.h
+#usr/include/poppler/cpp/poppler-rectangle.h
+#usr/include/poppler/cpp/poppler-toc.h
+#usr/include/poppler/cpp/poppler-version.h
+#usr/include/poppler/fofi
+#usr/include/poppler/fofi/FoFiBase.h
+#usr/include/poppler/fofi/FoFiEncodings.h
+#usr/include/poppler/fofi/FoFiIdentifier.h
+#usr/include/poppler/fofi/FoFiTrueType.h
+#usr/include/poppler/fofi/FoFiType1.h
+#usr/include/poppler/fofi/FoFiType1C.h
+#usr/include/poppler/goo
+#usr/include/poppler/goo/FixedPoint.h
+#usr/include/poppler/goo/GooHash.h
+#usr/include/poppler/goo/GooLikely.h
+#usr/include/poppler/goo/GooList.h
+#usr/include/poppler/goo/GooMutex.h
+#usr/include/poppler/goo/GooString.h
+#usr/include/poppler/goo/GooTimer.h
+#usr/include/poppler/goo/ImgWriter.h
+#usr/include/poppler/goo/JpegWriter.h
+#usr/include/poppler/goo/NetPBMWriter.h
+#usr/include/poppler/goo/PNGWriter.h
+#usr/include/poppler/goo/TiffWriter.h
+#usr/include/poppler/goo/gfile.h
+#usr/include/poppler/goo/gmem.h
+#usr/include/poppler/goo/grandom.h
+#usr/include/poppler/goo/gstrtod.h
+#usr/include/poppler/goo/gtypes.h
+#usr/include/poppler/poppler-config.h
+#usr/include/poppler/splash
+#usr/include/poppler/splash/Splash.h
+#usr/include/poppler/splash/SplashBitmap.h
+#usr/include/poppler/splash/SplashClip.h
+#usr/include/poppler/splash/SplashErrorCodes.h
+#usr/include/poppler/splash/SplashFTFont.h
+#usr/include/poppler/splash/SplashFTFontEngine.h
+#usr/include/poppler/splash/SplashFTFontFile.h
+#usr/include/poppler/splash/SplashFont.h
+#usr/include/poppler/splash/SplashFontEngine.h
+#usr/include/poppler/splash/SplashFontFile.h
+#usr/include/poppler/splash/SplashFontFileID.h
+#usr/include/poppler/splash/SplashGlyphBitmap.h
+#usr/include/poppler/splash/SplashMath.h
+#usr/include/poppler/splash/SplashPath.h
+#usr/include/poppler/splash/SplashPattern.h
+#usr/include/poppler/splash/SplashScreen.h
+#usr/include/poppler/splash/SplashState.h
+#usr/include/poppler/splash/SplashT1Font.h
+#usr/include/poppler/splash/SplashT1FontEngine.h
+#usr/include/poppler/splash/SplashT1FontFile.h
+#usr/include/poppler/splash/SplashTypes.h
+#usr/include/poppler/splash/SplashXPath.h
+#usr/include/poppler/splash/SplashXPathScanner.h
+#usr/lib/libpoppler-cpp.a
+#usr/lib/libpoppler-cpp.la
+#usr/lib/libpoppler-cpp.so
+usr/lib/libpoppler-cpp.so.0
+usr/lib/libpoppler-cpp.so.0.3.0
+#usr/lib/libpoppler.a
+#usr/lib/libpoppler.la
+#usr/lib/libpoppler.so
+usr/lib/libpoppler.so.66
+usr/lib/libpoppler.so.66.0.0
+#usr/lib/pkgconfig/poppler-cairo.pc
+#usr/lib/pkgconfig/poppler-cpp.pc
+#usr/lib/pkgconfig/poppler-splash.pc
+#usr/lib/pkgconfig/poppler.pc
+#usr/share/man/man1/pdfdetach.1
+#usr/share/man/man1/pdffonts.1
+#usr/share/man/man1/pdfimages.1
+#usr/share/man/man1/pdfinfo.1
+#usr/share/man/man1/pdfseparate.1
+#usr/share/man/man1/pdftocairo.1
+#usr/share/man/man1/pdftohtml.1
+#usr/share/man/man1/pdftoppm.1
+#usr/share/man/man1/pdftops.1
+#usr/share/man/man1/pdftotext.1
+#usr/share/man/man1/pdfunite.1
--- a/config/rootfiles/common/qpdf
+++ b/config/rootfiles/common/qpdf
@@ -0,0 +1,44 @@
+usr/bin/fix-qdf
+usr/bin/qpdf
+#usr/bin/zlib-flate
+#usr/include/qpdf
+#usr/include/qpdf/Buffer.hh
+#usr/include/qpdf/BufferInputSource.hh
+#usr/include/qpdf/Constants.h
+#usr/include/qpdf/DLL.h
+#usr/include/qpdf/FileInputSource.hh
+#usr/include/qpdf/InputSource.hh
+#usr/include/qpdf/Pipeline.hh
+#usr/include/qpdf/Pl_Buffer.hh
+#usr/include/qpdf/Pl_Concatenate.hh
+#usr/include/qpdf/Pl_Count.hh
+#usr/include/qpdf/Pl_Discard.hh
+#usr/include/qpdf/Pl_Flate.hh
+#usr/include/qpdf/Pl_StdioFile.hh
+#usr/include/qpdf/PointerHolder.hh
+#usr/include/qpdf/QPDF.hh
+#usr/include/qpdf/QPDFExc.hh
+#usr/include/qpdf/QPDFObjGen.hh
+#usr/include/qpdf/QPDFObject.hh
+#usr/include/qpdf/QPDFObjectHandle.hh
+#usr/include/qpdf/QPDFTokenizer.hh
+#usr/include/qpdf/QPDFWriter.hh
+#usr/include/qpdf/QPDFXRefEntry.hh
+#usr/include/qpdf/QTC.hh
+#usr/include/qpdf/QUtil.hh
+#usr/include/qpdf/RandomDataProvider.hh
+#usr/include/qpdf/Types.h
+#usr/include/qpdf/qpdf-c.h
+#usr/lib/libqpdf.a
+#usr/lib/libqpdf.la
+#usr/lib/libqpdf.so
+usr/lib/libqpdf.so.17
+usr/lib/libqpdf.so.17.0.0
+#usr/lib/pkgconfig/libqpdf.pc
+#usr/share/doc/qpdf
+#usr/share/doc/qpdf/qpdf-manual.html
+#usr/share/doc/qpdf/qpdf-manual.pdf
+#usr/share/doc/qpdf/stylesheet.css
+#usr/share/man/man1/fix-qdf.1
+#usr/share/man/man1/qpdf.1
+#usr/share/man/man1/zlib-flate.1
--- a/config/rootfiles/common/reiserfsprogs
+++ b/config/rootfiles/common/reiserfsprogs
@@ -1,3 +1,4 @@
+#sbin/debugfs.reiserfs
 #sbin/debugreiserfs
 sbin/fsck.reiserfs
 sbin/mkfs.reiserfs
@@ -5,8 +6,26 @@ sbin/mkreiserfs
 sbin/reiserfsck
 sbin/reiserfstune
 sbin/resize_reiserfs
+sbin/tunefs.reiserfs
+#usr/include/reiserfs
+#usr/include/reiserfs/io.h
+#usr/include/reiserfs/misc.h
+#usr/include/reiserfs/reiserfs_err.h
+#usr/include/reiserfs/reiserfs_fs.h
+#usr/include/reiserfs/reiserfs_lib.h
+#usr/include/reiserfs/swab.h
+#usr/lib/libreiserfscore.a
+#usr/lib/libreiserfscore.la
+#usr/lib/libreiserfscore.so
+usr/lib/libreiserfscore.so.0
+usr/lib/libreiserfscore.so.0.0.0
+#usr/lib/pkgconfig/reiserfscore.pc
+#usr/share/man/man8/debugfs.reiserfs.8
 #usr/share/man/man8/debugreiserfs.8
+#usr/share/man/man8/fsck.reiserfs.8
+#usr/share/man/man8/mkfs.reiserfs.8
 #usr/share/man/man8/mkreiserfs.8
 #usr/share/man/man8/reiserfsck.8
 #usr/share/man/man8/reiserfstune.8
 #usr/share/man/man8/resize_reiserfs.8
+#usr/share/man/man8/tunefs.reiserfs.8
--- a/config/rootfiles/common/rrdtool
+++ b/config/rootfiles/common/rrdtool
@@ -1,7 +1,7 @@
 #srv/web/ipfire/html/graphs
 usr/bin/rrdcached
-#usr/bin/rrdcreate
-#usr/bin/rrdinfo
+usr/bin/rrdcreate
+usr/bin/rrdinfo
 usr/bin/rrdtool
 usr/bin/rrdupdate
 #usr/include/rrd.h
@@ -10,13 +10,8 @@ usr/bin/rrdupdate
 #usr/lib/librrd.a
 #usr/lib/librrd.la
 #usr/lib/librrd.so
-usr/lib/librrd.so.4
-usr/lib/librrd.so.4.3.5
-#usr/lib/librrd_th.a
-#usr/lib/librrd_th.la
-#usr/lib/librrd_th.so
-usr/lib/librrd_th.so.4
-usr/lib/librrd_th.so.4.3.5
+usr/lib/librrd.so.8
+usr/lib/librrd.so.8.0.0
 usr/lib/perl5/site_perl/5.12.3/RRDp.pm
 usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/RRDs.pm
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDp
@@ -26,98 +21,101 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/RRDs.pm
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.bs
 usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.so
 #usr/lib/pkgconfig/librrd.pc
-#usr/share/doc/rrdtool-1.5.5
-#usr/share/doc/rrdtool-1.5.5/html
-#usr/share/doc/rrdtool-1.5.5/html/RRDp.html
-#usr/share/doc/rrdtool-1.5.5/html/RRDs.html
-#usr/share/doc/rrdtool-1.5.5/html/bin_dec_hex.html
-#usr/share/doc/rrdtool-1.5.5/html/cdeftutorial.html
-#usr/share/doc/rrdtool-1.5.5/html/index.html
-#usr/share/doc/rrdtool-1.5.5/html/librrd.html
-#usr/share/doc/rrdtool-1.5.5/html/rpntutorial.html
-#usr/share/doc/rrdtool-1.5.5/html/rrd-beginners.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdbuild.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdcached.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdcgi.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdcreate.html
-#usr/share/doc/rrdtool-1.5.5/html/rrddump.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdfetch.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdfirst.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdflushcached.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdgraph.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdgraph_data.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdgraph_examples.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdgraph_graph.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdgraph_rpn.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdinfo.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdlast.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdlastupdate.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdresize.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdrestore.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdthreads.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdtool.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdtune.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdtutorial.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdupdate.html
-#usr/share/doc/rrdtool-1.5.5/html/rrdxport.html
-#usr/share/doc/rrdtool-1.5.5/txt
-#usr/share/doc/rrdtool-1.5.5/txt/bin_dec_hex.pod
-#usr/share/doc/rrdtool-1.5.5/txt/bin_dec_hex.txt
-#usr/share/doc/rrdtool-1.5.5/txt/cdeftutorial.pod
-#usr/share/doc/rrdtool-1.5.5/txt/cdeftutorial.txt
-#usr/share/doc/rrdtool-1.5.5/txt/librrd.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rpntutorial.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rpntutorial.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrd-beginners.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrd-beginners.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdbuild.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdbuild.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdcached.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdcached.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdcgi.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdcgi.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdcreate.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdcreate.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrddump.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrddump.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdfetch.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdfetch.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdfirst.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdfirst.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdflushcached.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdflushcached.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_data.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_data.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_examples.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_examples.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_graph.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_graph.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_rpn.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdgraph_rpn.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdinfo.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdinfo.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdlast.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdlast.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdlastupdate.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdlastupdate.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdresize.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdresize.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdrestore.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdrestore.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdthreads.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdthreads.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdtool.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdtool.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdtune.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdtune.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdtutorial.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdtutorial.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdupdate.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdupdate.txt
-#usr/share/doc/rrdtool-1.5.5/txt/rrdxport.pod
-#usr/share/doc/rrdtool-1.5.5/txt/rrdxport.txt
+#usr/share/doc/rrdtool-1.6.0
+#usr/share/doc/rrdtool-1.6.0/html
+#usr/share/doc/rrdtool-1.6.0/html/RRDp.html
+#usr/share/doc/rrdtool-1.6.0/html/RRDs.html
+#usr/share/doc/rrdtool-1.6.0/html/bin_dec_hex.html
+#usr/share/doc/rrdtool-1.6.0/html/cdeftutorial.html
+#usr/share/doc/rrdtool-1.6.0/html/index.html
+#usr/share/doc/rrdtool-1.6.0/html/librrd.html
+#usr/share/doc/rrdtool-1.6.0/html/rpntutorial.html
+#usr/share/doc/rrdtool-1.6.0/html/rrd-beginners.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdbuild.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdcached.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdcgi.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdcreate.html
+#usr/share/doc/rrdtool-1.6.0/html/rrddump.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdfetch.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdfirst.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdflushcached.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdgraph.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdgraph_data.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdgraph_examples.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdgraph_graph.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdgraph_rpn.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdinfo.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdlast.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdlastupdate.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdlua.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdresize.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdrestore.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdthreads.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdtool.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdtune.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdtutorial.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdupdate.html
+#usr/share/doc/rrdtool-1.6.0/html/rrdxport.html
+#usr/share/doc/rrdtool-1.6.0/txt
+#usr/share/doc/rrdtool-1.6.0/txt/bin_dec_hex.pod
+#usr/share/doc/rrdtool-1.6.0/txt/bin_dec_hex.txt
+#usr/share/doc/rrdtool-1.6.0/txt/cdeftutorial.pod
+#usr/share/doc/rrdtool-1.6.0/txt/cdeftutorial.txt
+#usr/share/doc/rrdtool-1.6.0/txt/librrd.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rpntutorial.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rpntutorial.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrd-beginners.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrd-beginners.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdbuild.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdbuild.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdcached.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdcached.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdcgi.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdcgi.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdcreate.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdcreate.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrddump.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrddump.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdfetch.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdfetch.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdfirst.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdfirst.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdflushcached.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdflushcached.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_data.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_data.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_examples.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_examples.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_graph.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_graph.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_rpn.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdgraph_rpn.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdinfo.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdinfo.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdlast.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdlast.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdlastupdate.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdlastupdate.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdlua.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdlua.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdresize.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdresize.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdrestore.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdrestore.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdthreads.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdthreads.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdtool.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdtool.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdtune.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdtune.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdtutorial.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdtutorial.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdupdate.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdupdate.txt
+#usr/share/doc/rrdtool-1.6.0/txt/rrdxport.pod
+#usr/share/doc/rrdtool-1.6.0/txt/rrdxport.txt
 #usr/share/man/man1/bin_dec_hex.1
 #usr/share/man/man1/cdeftutorial.1
 #usr/share/man/man1/rpntutorial.1
@@ -138,6 +136,7 @@ usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/RRDs/RRDs.so
 #usr/share/man/man1/rrdinfo.1
 #usr/share/man/man1/rrdlast.1
 #usr/share/man/man1/rrdlastupdate.1
+#usr/share/man/man1/rrdlua.1
 #usr/share/man/man1/rrdresize.1
 #usr/share/man/man1/rrdrestore.1
 #usr/share/man/man1/rrdthreads.1
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -21,6 +21,7 @@ etc/strongswan.d/charon/cmac.conf
 etc/strongswan.d/charon/constraints.conf
 etc/strongswan.d/charon/ctr.conf
 etc/strongswan.d/charon/curl.conf
+etc/strongswan.d/charon/curve25519.conf
 etc/strongswan.d/charon/des.conf
 etc/strongswan.d/charon/dhcp.conf
 etc/strongswan.d/charon/dnskey.conf
@@ -105,6 +106,11 @@ usr/lib/ipsec/libstrongswan.so.0.0.0
 usr/lib/ipsec/libtls.so
 usr/lib/ipsec/libtls.so.0
 usr/lib/ipsec/libtls.so.0.0.0
+#usr/lib/ipsec/libtpmtss.a
+#usr/lib/ipsec/libtpmtss.la
+usr/lib/ipsec/libtpmtss.so
+usr/lib/ipsec/libtpmtss.so.0
+usr/lib/ipsec/libtpmtss.so.0.0.0
 #usr/lib/ipsec/libvici.a
 #usr/lib/ipsec/libvici.la
 usr/lib/ipsec/libvici.so
@@ -118,6 +124,7 @@ usr/lib/ipsec/plugins/libstrongswan-cmac.so
 usr/lib/ipsec/plugins/libstrongswan-constraints.so
 usr/lib/ipsec/plugins/libstrongswan-ctr.so
 usr/lib/ipsec/plugins/libstrongswan-curl.so
+usr/lib/ipsec/plugins/libstrongswan-curve25519.so
 usr/lib/ipsec/plugins/libstrongswan-des.so
 usr/lib/ipsec/plugins/libstrongswan-dhcp.so
 usr/lib/ipsec/plugins/libstrongswan-dnskey.so
@@ -201,6 +208,7 @@ usr/sbin/swanctl
 #usr/share/strongswan/templates/config/plugins/constraints.conf
 #usr/share/strongswan/templates/config/plugins/ctr.conf
 #usr/share/strongswan/templates/config/plugins/curl.conf
+#usr/share/strongswan/templates/config/plugins/curve25519.conf
 #usr/share/strongswan/templates/config/plugins/des.conf
 #usr/share/strongswan/templates/config/plugins/dhcp.conf
 #usr/share/strongswan/templates/config/plugins/dnskey.conf
--- a/config/rootfiles/common/sudo
+++ b/config/rootfiles/common/sudo
@@ -74,4 +74,4 @@ usr/sbin/visudo
 #usr/share/man/man8/sudoedit.8
 #usr/share/man/man8/sudoreplay.8
 #usr/share/man/man8/visudo.8
-var/lib/sudo
+var/db/sudo
--- a/config/rootfiles/common/tzdata
+++ b/config/rootfiles/common/tzdata
@@ -1,3 +1,4 @@
+etc/localtime
 usr/share/zoneinfo
 #usr/share/zoneinfo/Africa
 #usr/share/zoneinfo/Africa/Abidjan
--- a/config/rootfiles/common/unbound
+++ b/config/rootfiles/common/unbound
@@ -6,11 +6,12 @@ etc/unbound/icannbundle.pem
 etc/unbound/local.d
 etc/unbound/root.hints
 etc/unbound/unbound.conf
+#usr/include/unbound-event.h
 #usr/include/unbound.h
 #usr/lib/libunbound.la
 #usr/lib/libunbound.so
 usr/lib/libunbound.so.2
-usr/lib/libunbound.so.2.4.3
+usr/lib/libunbound.so.2.5.2
 usr/sbin/unbound
 usr/sbin/unbound-anchor
 usr/sbin/unbound-checkconf
--- a/config/rootfiles/common/unzip
+++ b/config/rootfiles/common/unzip
@@ -3,8 +3,8 @@ usr/bin/unzip
 #usr/bin/unzipsfx
 #usr/bin/zipgrep
 #usr/bin/zipinfo
-#usr/man/man1/funzip.1
-#usr/man/man1/unzip.1
-#usr/man/man1/unzipsfx.1
-#usr/man/man1/zipgrep.1
-#usr/man/man1/zipinfo.1
+#usr/share/man/man1/funzip.1
+#usr/share/man/man1/unzip.1
+#usr/share/man/man1/unzipsfx.1
+#usr/share/man/man1/zipgrep.1
+#usr/share/man/man1/zipinfo.1
--- a/config/rootfiles/common/web-user-interface
+++ b/config/rootfiles/common/web-user-interface
@@ -29,7 +29,6 @@ srv/web/ipfire/cgi-bin/gui.cgi
 srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
 srv/web/ipfire/cgi-bin/hosts.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
-#srv/web/ipfire/cgi-bin/imspector.cgi
 srv/web/ipfire/cgi-bin/index.cgi
 srv/web/ipfire/cgi-bin/ipinfo.cgi
 srv/web/ipfire/cgi-bin/iptables.cgi
@@ -117,6 +116,7 @@ srv/web/ipfire/html/images/audio-volume-low-red.png
 srv/web/ipfire/html/images/audio-volume-low.png
 srv/web/ipfire/html/images/audio-x-generic-red.png
 srv/web/ipfire/html/images/audio-x-generic.png
+srv/web/ipfire/html/images/back.png
 srv/web/ipfire/html/images/background.gif
 srv/web/ipfire/html/images/bookmark-new.png
 srv/web/ipfire/html/images/clock.gif
--- a/config/rootfiles/common/x86_64/binutils
+++ b/config/rootfiles/common/x86_64/binutils
@@ -19,6 +19,7 @@
 #usr/include/bfdlink.h
 #usr/include/dis-asm.h
 #usr/include/libiberty.h
+#usr/include/plugin-api.h
 #usr/include/symcat.h
 #usr/lib/ldscripts
 #usr/lib/ldscripts/elf32_x86_64.x
@@ -47,6 +48,19 @@
 #usr/lib/ldscripts/elf_i386.xsw
 #usr/lib/ldscripts/elf_i386.xu
 #usr/lib/ldscripts/elf_i386.xw
+#usr/lib/ldscripts/elf_iamcu.x
+#usr/lib/ldscripts/elf_iamcu.xbn
+#usr/lib/ldscripts/elf_iamcu.xc
+#usr/lib/ldscripts/elf_iamcu.xd
+#usr/lib/ldscripts/elf_iamcu.xdc
+#usr/lib/ldscripts/elf_iamcu.xdw
+#usr/lib/ldscripts/elf_iamcu.xn
+#usr/lib/ldscripts/elf_iamcu.xr
+#usr/lib/ldscripts/elf_iamcu.xs
+#usr/lib/ldscripts/elf_iamcu.xsc
+#usr/lib/ldscripts/elf_iamcu.xsw
+#usr/lib/ldscripts/elf_iamcu.xu
+#usr/lib/ldscripts/elf_iamcu.xw
 #usr/lib/ldscripts/elf_k1om.x
 #usr/lib/ldscripts/elf_k1om.xbn
 #usr/lib/ldscripts/elf_k1om.xc
@@ -91,23 +105,127 @@
 #usr/lib/ldscripts/i386linux.xn
 #usr/lib/ldscripts/i386linux.xr
 #usr/lib/ldscripts/i386linux.xu
-#usr/lib/libbfd-2.24.so
+#usr/lib/libbfd-2.28.so
 #usr/lib/libbfd.a
 #usr/lib/libbfd.la
 #usr/lib/libbfd.so
-#usr/lib/libiberty.a
-#usr/lib/libopcodes-2.24.so
+#usr/lib/libopcodes-2.28.so
 #usr/lib/libopcodes.a
 #usr/lib/libopcodes.la
 #usr/lib/libopcodes.so
 #usr/share/info/as.info
 #usr/share/info/bfd.info
 #usr/share/info/binutils.info
-#usr/share/info/configure.info
-#usr/share/info/dir
 #usr/share/info/gprof.info
 #usr/share/info/ld.info
-#usr/share/info/standards.info
+#usr/share/locale/bg/LC_MESSAGES/binutils.mo
+#usr/share/locale/bg/LC_MESSAGES/gprof.mo
+#usr/share/locale/bg/LC_MESSAGES/ld.mo
+#usr/share/locale/ca/LC_MESSAGES/binutils.mo
+#usr/share/locale/da/LC_MESSAGES/bfd.mo
+#usr/share/locale/da/LC_MESSAGES/binutils.mo
+#usr/share/locale/da/LC_MESSAGES/gprof.mo
+#usr/share/locale/da/LC_MESSAGES/ld.mo
+#usr/share/locale/da/LC_MESSAGES/opcodes.mo
+#usr/share/locale/de/LC_MESSAGES/gprof.mo
+#usr/share/locale/de/LC_MESSAGES/opcodes.mo
+#usr/share/locale/eo/LC_MESSAGES/gprof.mo
+#usr/share/locale/es/LC_MESSAGES/bfd.mo
+#usr/share/locale/es/LC_MESSAGES/binutils.mo
+#usr/share/locale/es/LC_MESSAGES/gas.mo
+#usr/share/locale/es/LC_MESSAGES/gprof.mo
+#usr/share/locale/es/LC_MESSAGES/ld.mo
+#usr/share/locale/es/LC_MESSAGES/opcodes.mo
+#usr/share/locale/fi/LC_MESSAGES/bfd.mo
+#usr/share/locale/fi/LC_MESSAGES/binutils.mo
+#usr/share/locale/fi/LC_MESSAGES/gas.mo
+#usr/share/locale/fi/LC_MESSAGES/gprof.mo
+#usr/share/locale/fi/LC_MESSAGES/ld.mo
+#usr/share/locale/fi/LC_MESSAGES/opcodes.mo
+#usr/share/locale/fr/LC_MESSAGES/bfd.mo
+#usr/share/locale/fr/LC_MESSAGES/binutils.mo
+#usr/share/locale/fr/LC_MESSAGES/gas.mo
+#usr/share/locale/fr/LC_MESSAGES/gprof.mo
+#usr/share/locale/fr/LC_MESSAGES/ld.mo
+#usr/share/locale/fr/LC_MESSAGES/opcodes.mo
+#usr/share/locale/ga
+#usr/share/locale/ga/LC_MESSAGES
+#usr/share/locale/ga/LC_MESSAGES/gprof.mo
+#usr/share/locale/ga/LC_MESSAGES/ld.mo
+#usr/share/locale/ga/LC_MESSAGES/opcodes.mo
+#usr/share/locale/hr/LC_MESSAGES/binutils.mo
+#usr/share/locale/hu/LC_MESSAGES/gprof.mo
+#usr/share/locale/id/LC_MESSAGES/bfd.mo
+#usr/share/locale/id/LC_MESSAGES/binutils.mo
+#usr/share/locale/id/LC_MESSAGES/gas.mo
+#usr/share/locale/id/LC_MESSAGES/gprof.mo
+#usr/share/locale/id/LC_MESSAGES/ld.mo
+#usr/share/locale/id/LC_MESSAGES/opcodes.mo
+#usr/share/locale/it/LC_MESSAGES/binutils.mo
+#usr/share/locale/it/LC_MESSAGES/gprof.mo
+#usr/share/locale/it/LC_MESSAGES/ld.mo
+#usr/share/locale/it/LC_MESSAGES/opcodes.mo
+#usr/share/locale/ja/LC_MESSAGES/bfd.mo
+#usr/share/locale/ja/LC_MESSAGES/binutils.mo
+#usr/share/locale/ja/LC_MESSAGES/gas.mo
+#usr/share/locale/ja/LC_MESSAGES/gprof.mo
+#usr/share/locale/ja/LC_MESSAGES/ld.mo
+#usr/share/locale/ms
+#usr/share/locale/ms/LC_MESSAGES
+#usr/share/locale/ms/LC_MESSAGES/gprof.mo
+#usr/share/locale/nl/LC_MESSAGES/gprof.mo
+#usr/share/locale/nl/LC_MESSAGES/opcodes.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/gprof.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/opcodes.mo
+#usr/share/locale/ro
+#usr/share/locale/ro/LC_MESSAGES
+#usr/share/locale/ro/LC_MESSAGES/bfd.mo
+#usr/share/locale/ro/LC_MESSAGES/binutils.mo
+#usr/share/locale/ro/LC_MESSAGES/gprof.mo
+#usr/share/locale/ro/LC_MESSAGES/opcodes.mo
+#usr/share/locale/ru/LC_MESSAGES/bfd.mo
+#usr/share/locale/ru/LC_MESSAGES/binutils.mo
+#usr/share/locale/ru/LC_MESSAGES/gas.mo
+#usr/share/locale/ru/LC_MESSAGES/gprof.mo
+#usr/share/locale/rw/LC_MESSAGES/bfd.mo
+#usr/share/locale/rw/LC_MESSAGES/binutils.mo
+#usr/share/locale/rw/LC_MESSAGES/gas.mo
+#usr/share/locale/rw/LC_MESSAGES/gprof.mo
+#usr/share/locale/sk/LC_MESSAGES/binutils.mo
+#usr/share/locale/sr
+#usr/share/locale/sr/LC_MESSAGES
+#usr/share/locale/sr/LC_MESSAGES/bfd.mo
+#usr/share/locale/sr/LC_MESSAGES/binutils.mo
+#usr/share/locale/sr/LC_MESSAGES/gprof.mo
+#usr/share/locale/sv/LC_MESSAGES/bfd.mo
+#usr/share/locale/sv/LC_MESSAGES/binutils.mo
+#usr/share/locale/sv/LC_MESSAGES/gprof.mo
+#usr/share/locale/sv/LC_MESSAGES/ld.mo
+#usr/share/locale/sv/LC_MESSAGES/opcodes.mo
+#usr/share/locale/tr/LC_MESSAGES/bfd.mo
+#usr/share/locale/tr/LC_MESSAGES/binutils.mo
+#usr/share/locale/tr/LC_MESSAGES/gas.mo
+#usr/share/locale/tr/LC_MESSAGES/gprof.mo
+#usr/share/locale/tr/LC_MESSAGES/ld.mo
+#usr/share/locale/tr/LC_MESSAGES/opcodes.mo
+#usr/share/locale/uk/LC_MESSAGES/bfd.mo
+#usr/share/locale/uk/LC_MESSAGES/binutils.mo
+#usr/share/locale/uk/LC_MESSAGES/gas.mo
+#usr/share/locale/uk/LC_MESSAGES/gprof.mo
+#usr/share/locale/uk/LC_MESSAGES/ld.mo
+#usr/share/locale/uk/LC_MESSAGES/opcodes.mo
+#usr/share/locale/vi/LC_MESSAGES/bfd.mo
+#usr/share/locale/vi/LC_MESSAGES/binutils.mo
+#usr/share/locale/vi/LC_MESSAGES/gprof.mo
+#usr/share/locale/vi/LC_MESSAGES/ld.mo
+#usr/share/locale/vi/LC_MESSAGES/opcodes.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/bfd.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/binutils.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/gas.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/ld.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/opcodes.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/binutils.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/ld.mo
 #usr/share/man/man1/addr2line.1
 #usr/share/man/man1/ar.1
 #usr/share/man/man1/as.1
--- a/config/rootfiles/common/x86_64/gcc
+++ b/config/rootfiles/common/x86_64/gcc
--- a/config/rootfiles/common/x86_64/glibc
+++ b/config/rootfiles/common/x86_64/glibc
--- a/config/rootfiles/common/x86_64/gmp
+++ b/config/rootfiles/common/x86_64/gmp
@@ -4,12 +4,12 @@
 #usr/lib/libgmp.la
 #usr/lib/libgmp.so
 usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.3.0
+usr/lib/libgmp.so.10.3.2
 #usr/lib/libgmpxx.a
 #usr/lib/libgmpxx.la
 #usr/lib/libgmpxx.so
 usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.5.0
+usr/lib/libgmpxx.so.4.5.2
 #usr/share/info/gmp.info
 #usr/share/info/gmp.info-1
 #usr/share/info/gmp.info-2
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -4,66 +4,30 @@ etc/init.d
 etc/rc.d/helper/getdnsfromdhcpc.pl
 #etc/rc.d/init.d
 etc/rc.d/init.d/acpid
-#etc/rc.d/init.d/alsa
-#etc/rc.d/init.d/amavisd
 etc/rc.d/init.d/apache
-#etc/rc.d/init.d/apcupsd
-#etc/rc.d/init.d/applejuice
-#etc/rc.d/init.d/asterisk
 etc/rc.d/init.d/beep
-#etc/rc.d/init.d/bluetooth
 etc/rc.d/init.d/checkfs
-#etc/rc.d/init.d/clamav
 etc/rc.d/init.d/cleanfs
-#etc/rc.d/init.d/client175
 etc/rc.d/init.d/collectd
 etc/rc.d/init.d/connectd
 etc/rc.d/init.d/console
-#etc/rc.d/init.d/cpufreq
-#etc/rc.d/init.d/cups
-#etc/rc.d/init.d/cyrus-imapd
-#etc/rc.d/init.d/cyrus-sasl
 etc/rc.d/init.d/dhcp
 etc/rc.d/init.d/dhcrelay
-#etc/rc.d/init.d/dnsdist
 etc/rc.d/init.d/fcron
-#etc/rc.d/init.d/fetchmail
 etc/rc.d/init.d/fireinfo
 etc/rc.d/init.d/firewall
 etc/rc.d/init.d/firstsetup
-#etc/rc.d/init.d/freeradius
 etc/rc.d/init.d/fsresize
 etc/rc.d/init.d/functions
-#etc/rc.d/init.d/gnump3d
-#etc/rc.d/init.d/guardian
 etc/rc.d/init.d/halt
-#etc/rc.d/init.d/haproxy
-#etc/rc.d/init.d/hostapd
-#etc/rc.d/init.d/imspector
 etc/rc.d/init.d/ipsec
-#etc/rc.d/init.d/keepalived
-#etc/rc.d/init.d/lcd4linux
-#etc/rc.d/init.d/lcdproc
-#etc/rc.d/init.d/lcr
 etc/rc.d/init.d/leds
-#etc/rc.d/init.d/libvirt-guests
-#etc/rc.d/init.d/libvirtd
 etc/rc.d/init.d/localnet
 etc/rc.d/init.d/mISDN
-#etc/rc.d/init.d/mediatomb
-#etc/rc.d/init.d/messagebus
-#etc/rc.d/init.d/miau
-#etc/rc.d/init.d/minidlna
-#etc/rc.d/init.d/miniupnpd
 etc/rc.d/init.d/modules
-#etc/rc.d/init.d/monit
-#etc/rc.d/init.d/motion
 etc/rc.d/init.d/mountfs
 etc/rc.d/init.d/mountkernfs
 etc/rc.d/init.d/mounttmpfs
-#etc/rc.d/init.d/mpd
-#etc/rc.d/init.d/mysql
-#etc/rc.d/init.d/netsnmpd
 etc/rc.d/init.d/network
 etc/rc.d/init.d/network-trigger
 #etc/rc.d/init.d/networking
@@ -100,51 +64,30 @@ etc/rc.d/init.d/networking/red.up/99-fireinfo
 etc/rc.d/init.d/networking/red.up/99-geoip-database
 etc/rc.d/init.d/networking/red.up/99-pakfire-update
 etc/rc.d/init.d/networking/wpa_supplicant.exe
-#etc/rc.d/init.d/nfs-server
 etc/rc.d/init.d/ntp
-#etc/rc.d/init.d/nut
-#etc/rc.d/init.d/openvmtools
 etc/rc.d/init.d/partresize
-#etc/rc.d/init.d/postfix
-#etc/rc.d/init.d/pound
 etc/rc.d/init.d/random
 etc/rc.d/init.d/rc
 etc/rc.d/init.d/reboot
 etc/rc.d/init.d/rngd
-#etc/rc.d/init.d/rpcbind
-#etc/rc.d/init.d/rtpproxy
-#etc/rc.d/init.d/samba
-#etc/rc.d/init.d/sane
 etc/rc.d/init.d/sendsignals
 etc/rc.d/init.d/setclock
 etc/rc.d/init.d/smartenabler
 etc/rc.d/init.d/snort
-#etc/rc.d/init.d/spamassassin
 etc/rc.d/init.d/squid
 etc/rc.d/init.d/sshd
-#etc/rc.d/init.d/sslh
 etc/rc.d/init.d/static-routes
-#etc/rc.d/init.d/stunnel
 etc/rc.d/init.d/swap
 etc/rc.d/init.d/sysctl
 etc/rc.d/init.d/sysklogd
 etc/rc.d/init.d/template
-#etc/rc.d/init.d/tftpd
-#etc/rc.d/init.d/tor
-#etc/rc.d/init.d/transmission
 etc/rc.d/init.d/udev
 etc/rc.d/init.d/udev_retry
 etc/rc.d/init.d/unbound
 etc/rc.d/init.d/upnpd
-#etc/rc.d/init.d/vdr
-#etc/rc.d/init.d/vdradmin
-#etc/rc.d/init.d/virtlogd
 etc/rc.d/init.d/vnstat
-#etc/rc.d/init.d/vsftpd
 etc/rc.d/init.d/waitdrives
-#etc/rc.d/init.d/watchdog
 etc/rc.d/init.d/wlanclient
-#etc/rc.d/init.d/xinetd
 #etc/rc.d/rc0.d
 #etc/rc.d/rc0.d/K01imspetor
 #etc/rc.d/rc0.d/K01motion
--- a/config/rootfiles/common/x86_64/lm_sensors
+++ b/config/rootfiles/common/x86_64/lm_sensors
@@ -8,7 +8,7 @@ usr/bin/sensors-conf-convert
 #usr/lib/libsensors.a
 usr/lib/libsensors.so
 usr/lib/libsensors.so.4
-usr/lib/libsensors.so.4.3.2
+usr/lib/libsensors.so.4.4.0
 #usr/man/man1/sensors.1
 #usr/man/man3/libsensors.3
 #usr/man/man5/sensors.conf.5
@@ -17,6 +17,7 @@ usr/lib/libsensors.so.4.3.2
 #usr/man/man8/isadump.8
 #usr/man/man8/isaset.8
 #usr/man/man8/pwmconfig.8
+#usr/man/man8/sensors-conf-convert.8
 #usr/man/man8/sensors-detect.8
 usr/sbin/fancontrol
 usr/sbin/isadump
--- a/config/rootfiles/common/x86_64/python
+++ b/config/rootfiles/common/x86_64/python
@@ -1463,8 +1463,8 @@ usr/lib/python2.7/encodings/zlib_codec.pyc
 #usr/lib/python2.7/ensurepip/__main__.pyc
 #usr/lib/python2.7/ensurepip/__main__.pyo
 #usr/lib/python2.7/ensurepip/_bundled
-#usr/lib/python2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl
-#usr/lib/python2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl
+#usr/lib/python2.7/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl
+#usr/lib/python2.7/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl
 #usr/lib/python2.7/ensurepip/_uninstall.py
 #usr/lib/python2.7/ensurepip/_uninstall.pyc
 #usr/lib/python2.7/ensurepip/_uninstall.pyo
@@ -1718,6 +1718,10 @@ usr/lib/python2.7/httplib.pyc
 #usr/lib/python2.7/idlelib/dynOptionMenuWidget.pyc
 #usr/lib/python2.7/idlelib/dynOptionMenuWidget.pyo
 #usr/lib/python2.7/idlelib/extend.txt
+#usr/lib/python2.7/idlelib/help.html
+#usr/lib/python2.7/idlelib/help.py
+#usr/lib/python2.7/idlelib/help.pyc
+#usr/lib/python2.7/idlelib/help.pyo
 #usr/lib/python2.7/idlelib/help.txt
 #usr/lib/python2.7/idlelib/idle.bat
 #usr/lib/python2.7/idlelib/idle.py
@@ -1756,12 +1760,18 @@ usr/lib/python2.7/httplib.pyc
 #usr/lib/python2.7/idlelib/idle_test/test_delegator.py
 #usr/lib/python2.7/idlelib/idle_test/test_delegator.pyc
 #usr/lib/python2.7/idlelib/idle_test/test_delegator.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_editmenu.py
+#usr/lib/python2.7/idlelib/idle_test/test_editmenu.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_editmenu.pyo
 #usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.py
 #usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyc
 #usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyo
 #usr/lib/python2.7/idlelib/idle_test/test_grep.py
 #usr/lib/python2.7/idlelib/idle_test/test_grep.pyc
 #usr/lib/python2.7/idlelib/idle_test/test_grep.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_helpabout.py
+#usr/lib/python2.7/idlelib/idle_test/test_helpabout.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_helpabout.pyo
 #usr/lib/python2.7/idlelib/idle_test/test_hyperparser.py
 #usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyc
 #usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyo
@@ -1916,7 +1926,7 @@ usr/lib/python2.7/json/tool.pyc
 usr/lib/python2.7/keyword.pyc
 #usr/lib/python2.7/keyword.pyo
 #usr/lib/python2.7/lib-dynload
-#usr/lib/python2.7/lib-dynload/Python-2.7.10-py2.7.egg-info
+#usr/lib/python2.7/lib-dynload/Python-2.7.13-py2.7.egg-info
 usr/lib/python2.7/lib-dynload/_bisect.so
 usr/lib/python2.7/lib-dynload/_bsddb.so
 usr/lib/python2.7/lib-dynload/_codecs_cn.so
@@ -2090,9 +2100,9 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib-tk/turtle.pyo
 #usr/lib/python2.7/lib2to3
 #usr/lib/python2.7/lib2to3/Grammar.txt
-#usr/lib/python2.7/lib2to3/Grammar2.7.10.final.0.pickle
+#usr/lib/python2.7/lib2to3/Grammar2.7.13.final.0.pickle
 #usr/lib/python2.7/lib2to3/PatternGrammar.txt
-#usr/lib/python2.7/lib2to3/PatternGrammar2.7.10.final.0.pickle
+#usr/lib/python2.7/lib2to3/PatternGrammar2.7.13.final.0.pickle
 #usr/lib/python2.7/lib2to3/__init__.py
 #usr/lib/python2.7/lib2to3/__init__.pyc
 #usr/lib/python2.7/lib2to3/__init__.pyo
@@ -2127,9 +2137,6 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib2to3/fixes/fix_buffer.py
 #usr/lib/python2.7/lib2to3/fixes/fix_buffer.pyc
 #usr/lib/python2.7/lib2to3/fixes/fix_buffer.pyo
-#usr/lib/python2.7/lib2to3/fixes/fix_callable.py
-#usr/lib/python2.7/lib2to3/fixes/fix_callable.pyc
-#usr/lib/python2.7/lib2to3/fixes/fix_callable.pyo
 #usr/lib/python2.7/lib2to3/fixes/fix_dict.py
 #usr/lib/python2.7/lib2to3/fixes/fix_dict.pyc
 #usr/lib/python2.7/lib2to3/fixes/fix_dict.pyo
@@ -2748,6 +2755,7 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/_mock_backport.py
 #usr/lib/python2.7/test/_mock_backport.pyc
 #usr/lib/python2.7/test/_mock_backport.pyo
+#usr/lib/python2.7/test/allsans.pem
 #usr/lib/python2.7/test/audiodata
 #usr/lib/python2.7/test/audiodata/pluck-pcm16.aiff
 #usr/lib/python2.7/test/audiodata/pluck-pcm16.au
@@ -2782,16 +2790,14 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/badsyntax_future8.py
 #usr/lib/python2.7/test/badsyntax_future9.py
 #usr/lib/python2.7/test/badsyntax_nocaret.py
-#usr/lib/python2.7/test/buffer_tests.py
-#usr/lib/python2.7/test/buffer_tests.pyc
-#usr/lib/python2.7/test/buffer_tests.pyo
 #usr/lib/python2.7/test/capath
+#usr/lib/python2.7/test/capath/0e4015b9.0
 #usr/lib/python2.7/test/capath/4e1295a3.0
 #usr/lib/python2.7/test/capath/5ed36f99.0
 #usr/lib/python2.7/test/capath/6e88d7b8.0
 #usr/lib/python2.7/test/capath/99d0fa06.0
+#usr/lib/python2.7/test/capath/ce7b8643.0
 #usr/lib/python2.7/test/cfgparser.1
-#usr/lib/python2.7/test/check_soundcard.vbs
 #usr/lib/python2.7/test/cjkencodings
 #usr/lib/python2.7/test/cjkencodings/big5-utf8.txt
 #usr/lib/python2.7/test/cjkencodings/big5.txt
@@ -2991,7 +2997,6 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/gdb_sample.pyc
 #usr/lib/python2.7/test/gdb_sample.pyo
 #usr/lib/python2.7/test/greyrgb.uue
-#usr/lib/python2.7/test/https_svn_python_org_root.pem
 #usr/lib/python2.7/test/ieee754.txt
 #usr/lib/python2.7/test/imghdrdata
 #usr/lib/python2.7/test/imghdrdata/python.bmp
@@ -3103,6 +3108,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/ssl_servers.py
 #usr/lib/python2.7/test/ssl_servers.pyc
 #usr/lib/python2.7/test/ssl_servers.pyo
+#usr/lib/python2.7/test/ssltests.py
+#usr/lib/python2.7/test/ssltests.pyc
+#usr/lib/python2.7/test/ssltests.pyo
 #usr/lib/python2.7/test/string_tests.py
 #usr/lib/python2.7/test/string_tests.pyc
 #usr/lib/python2.7/test/string_tests.pyo
@@ -3317,9 +3325,6 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_codeop.py
 #usr/lib/python2.7/test/test_codeop.pyc
 #usr/lib/python2.7/test/test_codeop.pyo
-#usr/lib/python2.7/test/test_coding.py
-#usr/lib/python2.7/test/test_coding.pyc
-#usr/lib/python2.7/test/test_coding.pyo
 #usr/lib/python2.7/test/test_coercion.py
 #usr/lib/python2.7/test/test_coercion.pyc
 #usr/lib/python2.7/test/test_coercion.pyo
@@ -3835,6 +3840,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_optparse.py
 #usr/lib/python2.7/test/test_optparse.pyc
 #usr/lib/python2.7/test/test_optparse.pyo
+#usr/lib/python2.7/test/test_ordered_dict.py
+#usr/lib/python2.7/test/test_ordered_dict.pyc
+#usr/lib/python2.7/test/test_ordered_dict.pyo
 #usr/lib/python2.7/test/test_os.py
 #usr/lib/python2.7/test/test_os.pyc
 #usr/lib/python2.7/test/test_os.pyo
@@ -3853,15 +3861,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_pep247.py
 #usr/lib/python2.7/test/test_pep247.pyc
 #usr/lib/python2.7/test/test_pep247.pyo
-#usr/lib/python2.7/test/test_pep263.py
-#usr/lib/python2.7/test/test_pep263.pyc
-#usr/lib/python2.7/test/test_pep263.pyo
 #usr/lib/python2.7/test/test_pep277.py
 #usr/lib/python2.7/test/test_pep277.pyc
 #usr/lib/python2.7/test/test_pep277.pyo
-#usr/lib/python2.7/test/test_pep292.py
-#usr/lib/python2.7/test/test_pep292.pyc
-#usr/lib/python2.7/test/test_pep292.pyo
 #usr/lib/python2.7/test/test_pep352.py
 #usr/lib/python2.7/test/test_pep352.pyc
 #usr/lib/python2.7/test/test_pep352.pyo
@@ -4045,6 +4047,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_sort.py
 #usr/lib/python2.7/test/test_sort.pyc
 #usr/lib/python2.7/test/test_sort.pyo
+#usr/lib/python2.7/test/test_source_encoding.py
+#usr/lib/python2.7/test/test_source_encoding.pyc
+#usr/lib/python2.7/test/test_source_encoding.pyo
 #usr/lib/python2.7/test/test_spwd.py
 #usr/lib/python2.7/test/test_spwd.pyc
 #usr/lib/python2.7/test/test_spwd.pyo
@@ -4192,6 +4197,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_tuple.py
 #usr/lib/python2.7/test/test_tuple.pyc
 #usr/lib/python2.7/test/test_tuple.pyo
+#usr/lib/python2.7/test/test_turtle.py
+#usr/lib/python2.7/test/test_turtle.pyc
+#usr/lib/python2.7/test/test_turtle.pyo
 #usr/lib/python2.7/test/test_typechecks.py
 #usr/lib/python2.7/test/test_typechecks.pyc
 #usr/lib/python2.7/test/test_typechecks.pyo
--- a/config/rootfiles/common/x86_64/util-linux
+++ b/config/rootfiles/common/x86_64/util-linux
@@ -8,8 +8,12 @@ bin/wdctl
 #etc/fcron.daily
 etc/fcron.daily/trim
 lib/libblkid.so.1.1.0
+lib/libfdisk.so.1
+lib/libfdisk.so.1.1.0
 lib/libmount.so.1
 lib/libmount.so.1.1.0
+lib/libsmartcols.so.1
+lib/libsmartcols.so.1.1.0
 lib/libuuid.so.1.3.0
 sbin/agetty
 sbin/blkdiscard
@@ -29,7 +33,6 @@ sbin/mkfs
 #sbin/mkfs.cramfs
 sbin/mkfs.minix
 sbin/mkswap
-sbin/nologin
 #sbin/pivot_root
 sbin/raw
 sbin/sfdisk
@@ -38,13 +41,13 @@ sbin/swapoff
 sbin/swapon
 sbin/switch_root
 sbin/wipefs
+sbin/zramctl
 #usr/bin/cal
 #usr/bin/chrt
 #usr/bin/col
 #usr/bin/colcrt
 #usr/bin/colrm
 #usr/bin/column
-#usr/bin/cytune
 usr/bin/eject
 usr/bin/fallocate
 usr/bin/flock
@@ -61,7 +64,10 @@ usr/bin/ionice
 usr/bin/logger
 #usr/bin/look
 usr/bin/lscpu
+usr/bin/lsipc
 usr/bin/lslocks
+usr/bin/lslogins
+usr/bin/lsns
 #usr/bin/mcookie
 #usr/bin/namei
 #usr/bin/nsenter
@@ -78,17 +84,27 @@ usr/bin/setsid
 usr/bin/tailf
 #usr/bin/taskset
 #usr/bin/ul
+#usr/bin/uname26
 #usr/bin/unshare
 #usr/bin/whereis
-#usr/bin/x86_64
+usr/bin/x86_64
+#usr/include/libfdisk
+#usr/include/libfdisk/libfdisk.h
 #usr/include/libmount
 #usr/include/libmount/libmount.h
+#usr/include/libsmartcols
+#usr/include/libsmartcols/libsmartcols.h
 #usr/lib/libblkid.la
-#usr/lib/libmount.a
+#usr/lib/libfdisk.la
+#usr/lib/libfdisk.so
 #usr/lib/libmount.la
 #usr/lib/libmount.so
+#usr/lib/libsmartcols.la
+#usr/lib/libsmartcols.so
 #usr/lib/libuuid.la
+#usr/lib/pkgconfig/fdisk.pc
 #usr/lib/pkgconfig/mount.pc
+#usr/lib/pkgconfig/smartcols.pc
 usr/sbin/addpart
 usr/sbin/delpart
 usr/sbin/fdformat
@@ -97,8 +113,6 @@ usr/sbin/partx
 #usr/sbin/readprofile
 usr/sbin/resizepart
 usr/sbin/rtcwake
-usr/share/bash-completion
-#usr/share/bash-completion/completions
 #usr/share/bash-completion/completions/addpart
 #usr/share/bash-completion/completions/blkdiscard
 #usr/share/bash-completion/completions/blkid
@@ -112,7 +126,6 @@ usr/share/bash-completion
 #usr/share/bash-completion/completions/colrm
 #usr/share/bash-completion/completions/column
 #usr/share/bash-completion/completions/ctrlaltdel
-#usr/share/bash-completion/completions/cytune
 #usr/share/bash-completion/completions/delpart
 #usr/share/bash-completion/completions/dmesg
 #usr/share/bash-completion/completions/eject
@@ -130,16 +143,21 @@ usr/share/bash-completion
 #usr/share/bash-completion/completions/hexdump
 #usr/share/bash-completion/completions/hwclock
 #usr/share/bash-completion/completions/ionice
+#usr/share/bash-completion/completions/ipcmk
 #usr/share/bash-completion/completions/ipcrm
 #usr/share/bash-completion/completions/ipcs
 #usr/share/bash-completion/completions/isosize
+#usr/share/bash-completion/completions/last
 #usr/share/bash-completion/completions/ldattach
 #usr/share/bash-completion/completions/logger
 #usr/share/bash-completion/completions/look
 #usr/share/bash-completion/completions/losetup
 #usr/share/bash-completion/completions/lsblk
 #usr/share/bash-completion/completions/lscpu
+#usr/share/bash-completion/completions/lsipc
 #usr/share/bash-completion/completions/lslocks
+#usr/share/bash-completion/completions/lslogins
+#usr/share/bash-completion/completions/lsns
 #usr/share/bash-completion/completions/mcookie
 #usr/share/bash-completion/completions/mesg
 #usr/share/bash-completion/completions/mkfs
@@ -148,6 +166,7 @@ usr/share/bash-completion
 #usr/share/bash-completion/completions/mkfs.minix
 #usr/share/bash-completion/completions/mkswap
 #usr/share/bash-completion/completions/more
+#usr/share/bash-completion/completions/mount
 #usr/share/bash-completion/completions/mountpoint
 #usr/share/bash-completion/completions/namei
 #usr/share/bash-completion/completions/nsenter
@@ -169,10 +188,12 @@ usr/share/bash-completion
 #usr/share/bash-completion/completions/setterm
 #usr/share/bash-completion/completions/sfdisk
 #usr/share/bash-completion/completions/swaplabel
+#usr/share/bash-completion/completions/swapoff
 #usr/share/bash-completion/completions/swapon
 #usr/share/bash-completion/completions/tailf
 #usr/share/bash-completion/completions/taskset
 #usr/share/bash-completion/completions/ul
+#usr/share/bash-completion/completions/umount
 #usr/share/bash-completion/completions/unshare
 #usr/share/bash-completion/completions/utmpdump
 #usr/share/bash-completion/completions/uuidd
@@ -181,36 +202,11 @@ usr/share/bash-completion
 #usr/share/bash-completion/completions/wdctl
 #usr/share/bash-completion/completions/whereis
 #usr/share/bash-completion/completions/wipefs
+#usr/share/bash-completion/completions/zramctl
 #usr/share/doc/util-linux
 #usr/share/doc/util-linux/getopt
 #usr/share/doc/util-linux/getopt/getopt-parse.bash
 #usr/share/doc/util-linux/getopt/getopt-parse.tcsh
-#usr/share/locale/ca/LC_MESSAGES/util-linux.mo
-#usr/share/locale/cs/LC_MESSAGES/util-linux.mo
-#usr/share/locale/da/LC_MESSAGES/util-linux.mo
-#usr/share/locale/de/LC_MESSAGES/util-linux.mo
-#usr/share/locale/es/LC_MESSAGES/util-linux.mo
-#usr/share/locale/et/LC_MESSAGES/util-linux.mo
-#usr/share/locale/eu/LC_MESSAGES/util-linux.mo
-#usr/share/locale/fi/LC_MESSAGES/util-linux.mo
-#usr/share/locale/fr/LC_MESSAGES/util-linux.mo
-#usr/share/locale/gl/LC_MESSAGES/util-linux.mo
-#usr/share/locale/hr/LC_MESSAGES/util-linux.mo
-#usr/share/locale/hu/LC_MESSAGES/util-linux.mo
-#usr/share/locale/id/LC_MESSAGES/util-linux.mo
-#usr/share/locale/it/LC_MESSAGES/util-linux.mo
-#usr/share/locale/ja/LC_MESSAGES/util-linux.mo
-#usr/share/locale/nl/LC_MESSAGES/util-linux.mo
-#usr/share/locale/pl/LC_MESSAGES/util-linux.mo
-#usr/share/locale/pt_BR/LC_MESSAGES/util-linux.mo
-#usr/share/locale/ru/LC_MESSAGES/util-linux.mo
-#usr/share/locale/sl/LC_MESSAGES/util-linux.mo
-#usr/share/locale/sv/LC_MESSAGES/util-linux.mo
-#usr/share/locale/tr/LC_MESSAGES/util-linux.mo
-#usr/share/locale/uk/LC_MESSAGES/util-linux.mo
-#usr/share/locale/vi/LC_MESSAGES/util-linux.mo
-#usr/share/locale/zh_CN/LC_MESSAGES/util-linux.mo
-#usr/share/locale/zh_TW/LC_MESSAGES/util-linux.mo
 #usr/share/man/man1/cal.1
 #usr/share/man/man1/chrt.1
 #usr/share/man/man1/col.1
@@ -230,6 +226,8 @@ usr/share/bash-completion
 #usr/share/man/man1/logger.1
 #usr/share/man/man1/look.1
 #usr/share/man/man1/lscpu.1
+#usr/share/man/man1/lsipc.1
+#usr/share/man/man1/lslogins.1
 #usr/share/man/man1/mcookie.1
 #usr/share/man/man1/more.1
 #usr/share/man/man1/namei.1
@@ -250,6 +248,7 @@ usr/share/bash-completion
 #usr/share/man/man1/whereis.1
 #usr/share/man/man3/uuid_generate_time_safe.3
 #usr/share/man/man5/fstab.5
+#usr/share/man/man5/terminal-colors.d.5
 #usr/share/man/man8/addpart.8
 #usr/share/man/man8/agetty.8
 #usr/share/man/man8/blkdiscard.8
@@ -257,7 +256,6 @@ usr/share/bash-completion
 #usr/share/man/man8/cfdisk.8
 #usr/share/man/man8/chcpu.8
 #usr/share/man/man8/ctrlaltdel.8
-#usr/share/man/man8/cytune.8
 #usr/share/man/man8/delpart.8
 #usr/share/man/man8/fdformat.8
 #usr/share/man/man8/fdisk.8
@@ -275,13 +273,13 @@ usr/share/bash-completion
 #usr/share/man/man8/losetup.8
 #usr/share/man/man8/lsblk.8
 #usr/share/man/man8/lslocks.8
+#usr/share/man/man8/lsns.8
 #usr/share/man/man8/mkfs.8
 #usr/share/man/man8/mkfs.bfs.8
 #usr/share/man/man8/mkfs.cramfs.8
 #usr/share/man/man8/mkfs.minix.8
 #usr/share/man/man8/mkswap.8
 #usr/share/man/man8/mount.8
-#usr/share/man/man8/nologin.8
 #usr/share/man/man8/partx.8
 #usr/share/man/man8/pivot_root.8
 #usr/share/man/man8/raw.8
@@ -295,6 +293,8 @@ usr/share/bash-completion
 #usr/share/man/man8/swapon.8
 #usr/share/man/man8/switch_root.8
 #usr/share/man/man8/umount.8
+#usr/share/man/man8/uname26.8
 #usr/share/man/man8/wdctl.8
 #usr/share/man/man8/wipefs.8
 #usr/share/man/man8/x86_64.8
+#usr/share/man/man8/zramctl.8
--- a/config/rootfiles/core/112/exclude
+++ b/config/rootfiles/core/112/exclude
--- a/config/rootfiles/core/112/filelists/armv5tel/binutils
+++ b/config/rootfiles/core/112/filelists/armv5tel/binutils
@@ -0,0 +1 @@
+../../../../common/armv5tel/binutils
--- a/config/rootfiles/core/112/filelists/armv5tel/gcc
+++ b/config/rootfiles/core/112/filelists/armv5tel/gcc
@@ -0,0 +1 @@
+../../../../common/armv5tel/gcc
--- a/config/rootfiles/core/112/filelists/armv5tel/glibc
+++ b/config/rootfiles/core/112/filelists/armv5tel/glibc
@@ -0,0 +1 @@
+../../../../common/armv5tel/glibc
--- a/config/rootfiles/core/112/filelists/armv5tel/util-linux
+++ b/config/rootfiles/core/112/filelists/armv5tel/util-linux
@@ -0,0 +1 @@
+../../../../common/armv5tel/util-linux
--- a/config/rootfiles/core/112/filelists/autoconf
+++ b/config/rootfiles/core/112/filelists/autoconf
@@ -0,0 +1 @@
+../../../common/autoconf
--- a/config/rootfiles/core/112/filelists/bc
+++ b/config/rootfiles/core/112/filelists/bc
@@ -0,0 +1 @@
+../../../common/bc
--- a/config/rootfiles/core/112/filelists/boost
+++ b/config/rootfiles/core/112/filelists/boost
@@ -0,0 +1 @@
+../../../common/boost
--- a/config/rootfiles/core/112/filelists/cmake
+++ b/config/rootfiles/core/112/filelists/cmake
@@ -0,0 +1 @@
+../../../common/cmake
--- a/config/rootfiles/core/112/filelists/files
+++ b/config/rootfiles/core/112/filelists/files
@@ -0,0 +1,7 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/fwhosts.cgi
+srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+var/ipfire/langs
+var/ipfire/general-functions.pl
--- a/config/rootfiles/core/112/filelists/flex
+++ b/config/rootfiles/core/112/filelists/flex
@@ -0,0 +1 @@
+../../../common/flex
--- a/config/rootfiles/core/112/filelists/fuse
+++ b/config/rootfiles/core/112/filelists/fuse
@@ -0,0 +1 @@
+../../../common/fuse
--- a/config/rootfiles/core/112/filelists/gawk
+++ b/config/rootfiles/core/112/filelists/gawk
@@ -0,0 +1 @@
+../../../common/gawk
--- a/config/rootfiles/core/112/filelists/gnutls
+++ b/config/rootfiles/core/112/filelists/gnutls
@@ -0,0 +1 @@
+../../../common/gnutls
--- a/config/rootfiles/core/112/filelists/i586/binutils
+++ b/config/rootfiles/core/112/filelists/i586/binutils
@@ -0,0 +1 @@
+../../../../common/i586/binutils
--- a/config/rootfiles/core/112/filelists/i586/gcc
+++ b/config/rootfiles/core/112/filelists/i586/gcc
@@ -0,0 +1 @@
+../../../../common/i586/gcc
--- a/config/rootfiles/core/112/filelists/i586/glibc
+++ b/config/rootfiles/core/112/filelists/i586/glibc
@@ -0,0 +1 @@
+../../../../common/i586/glibc
--- a/config/rootfiles/core/112/filelists/i586/python
+++ b/config/rootfiles/core/112/filelists/i586/python
@@ -0,0 +1 @@
+../../../../common/i586/python
--- a/config/rootfiles/core/112/filelists/i586/util-linux
+++ b/config/rootfiles/core/112/filelists/i586/util-linux
@@ -0,0 +1 @@
+../../../../common/i586/util-linux
--- a/config/rootfiles/core/112/filelists/kbd
+++ b/config/rootfiles/core/112/filelists/kbd
@@ -0,0 +1 @@
+../../../common/kbd
--- a/config/rootfiles/core/112/filelists/libarchive
+++ b/config/rootfiles/core/112/filelists/libarchive
@@ -0,0 +1 @@
+../../../common/libarchive
--- a/config/rootfiles/core/112/filelists/libgcrypt
+++ b/config/rootfiles/core/112/filelists/libgcrypt
@@ -0,0 +1 @@
+../../../common/libgcrypt
--- a/Show More
+++ b/Show More