Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

config/backup/include

@@ -41,3 +41,4 @@
 /root/.bash_history
 /var/ipfire/ethernet/aliases
 /var/ipfire/ethernet/wireless
+/var/ipfire/captive/*

config/ca-certificates/build.sh

@@ -4,7 +4,7 @@ set -e
 
 # Create file layout.
 mkdir -pv certs certs/legacy-default certs/legacy-disable
-cp certdata.txt ipfire-ca.crt certs
+cp certdata.txt certs
 cd certs
 
 python ../certdata2pem.py

config/ca-certificates/ipfire-ca.crt

@@ -1,42 +0,0 @@
-# alias="IPFire CA"
-# trust=CKA_TRUST_SERVER_AUTH
-# distrust=
-# openssl-trust=serverAuth
------BEGIN CERTIFICATE-----
-MIIGrDCCBJSgAwIBAgIJAJIvs+XE5h41MA0GCSqGSIb3DQEBDQUAMGgxCzAJBgNV
-BAYTAkRFMRcwFQYDVQQKDA5JUEZpcmUgUHJvamVjdDEaMBgGA1UEAwwRSVBGaXJl
-IFByb2plY3QgQ0ExJDAiBgkqhkiG9w0BCQEWFWNlcnRtYXN0ZXJAaXBmaXJlLm9y
-ZzAeFw0xNTAxMzExNzMyNDFaFw0yNTAxMjgxNzMyNDFaMGgxCzAJBgNVBAYTAkRF
-MRcwFQYDVQQKDA5JUEZpcmUgUHJvamVjdDEaMBgGA1UEAwwRSVBGaXJlIFByb2pl
-Y3QgQ0ExJDAiBgkqhkiG9w0BCQEWFWNlcnRtYXN0ZXJAaXBmaXJlLm9yZzCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANjqPsfhHX2Zg5nat3ZT0XdbWqVu
-z0G2Supepa8eWzPtxIC6NDt8gAPGQcbgqL2gIYrUISaNQ3R99/XCWdu398cliw+6
-z9W1dh/YHzjyHDqpV+C6ufNuw2n4D4E9TfgZzlMnk3iluYOXJXZUN8T0PQbP3oHV
-KfH0fIlrj7LVT9cewLjpe2XzuevyBxqK42ioR0ax+yaZPxS3eHWdPpqRitfGFIx9
-O9jgj465z6Y0S7n6Z3cV49IN5ZvSBTAZYuBNlW5bEgOpqC13CJZMbOLS8wUbh4Ql
-Mklpo0dF3yYZne4Za0pcRqQB4AfvZnrggLF/AyHQab9Kia5PBAkVNXW2ApCH14v7
-h9bQ7KMoxaZ9WFBKchFVu36CmJLPI1HsSqV/+6HnMOd5Rd8GAN2/2uLiUSFIrpAD
-3eXenr+CFEeq4P3UKSzMG3wTd3y1JWSCnvKaK0GTEOdvk4C7L8V4KO29w3NRI2a8
-NEUQ3xa15gT3dRtqBvq151Vzd+PmptyI5uzbTVqfbkiMRbeq4CvJ5HkI+l0kuest
-37CLNeqldHnsAe2ziTFE1UbnYk3r6r6KLn4xAraVntFCYpQavzwtE7UdHFeCMAlu
-zVrc3GyEigG+NqY2lp18JtUw1S1XAQGO7XGQTPfSDx2eRxrqQx/Voc4hxKsifSvQ
-kTVrQkP173khAfTtAgMBAAGjggFXMIIBUzAdBgNVHQ4EFgQUxl27sebgR5PcYCcA
-SrdiG1QiKogwgZoGA1UdIwSBkjCBj4AUxl27sebgR5PcYCcASrdiG1QiKoihbKRq
-MGgxCzAJBgNVBAYTAkRFMRcwFQYDVQQKDA5JUEZpcmUgUHJvamVjdDEaMBgGA1UE
-AwwRSVBGaXJlIFByb2plY3QgQ0ExJDAiBgkqhkiG9w0BCQEWFWNlcnRtYXN0ZXJA
-aXBmaXJlLm9yZ4IJAJIvs+XE5h41MBIGA1UdEwEB/wQIMAYBAf8CAQAwCwYDVR0P
-BAQDAgEGMCAGA1UdEQQZMBeBFWNlcnRtYXN0ZXJAaXBmaXJlLm9yZzAgBgNVHRIE
-GTAXgRVjZXJ0bWFzdGVyQGlwZmlyZS5vcmcwMAYDVR0fBCkwJzAloCOgIYYfaHR0
-cDovL2NlcnRzLmlwZmlyZS5vcmcvY3JsLnBlbTANBgkqhkiG9w0BAQ0FAAOCAgEA
-HUXBFAC0AM/AhAp0mykBTY0QChI6YaXX1ki8Nb1sschcC53rnykHELPLMLKbSCLG
-cM7lJc1GJeDvQ9O46/Z7EWpFDACCstVn/hXUmj4ZxCSZ4B+L6Xt+GMdTksY434nS
-voM4fgc9a/OG6Tr2+YN9/rhnU3WdyMjpdApVFLs0qfzDHKmCTzC0h7itRSvitHOa
-p7yRQnErKy6GFSjSgSG1mhZbghJhGzrYRjCuAa59+R74IE+3ZWtpPUHro+S4kMcQ
-5NZLEwf0w5KzZcRF50UTSBxIUcBrtWRJElxRc9MncTaAS/uP6GBTkOM+f1WZ+zH0
-iRU5Sy4k/YfIxAU89QwMVW4GXktjIIXXbzbofaezKge3qc2v8dpI/V/U6I9mARja
-ltosmfE4lVBEJtQe6rNVUO55AiMnYpuC5hWjxhKjgeYQug+/nW9IIzCc5Ny7w8fb
-5NR0UqI/0TeS4Z1mNM8d6I5q41NuVSDU+6izUxDGgDL3ZWRkG6VWG1sRGxWMJb2L
-n3E6Zp51AY/l9e2gFqGFearanLw1w3lk2rEyYVHpZIKSjHEfUusOzuLFRaW95pgj
-HSJ0+XVE3cH/ppDBlxM0psrpOylXm3EaRnIPl2cGWjZwTIqga8PRJA9FefzMDGIX
-bQMywe8LR6okWvXhTV0wl0F6ynOiKE8LmbDf5si0EBU=
------END CERTIFICATE-----

config/cfgroot/general-functions.pl

@@ -235,7 +235,13 @@ sub writehashpart
 sub age {
 	my ($dev, $ino, $mode, $nlink, $uid, $gid, $rdev, $size,
 		$atime, $mtime, $ctime, $blksize, $blocks) = stat $_[0];
-	my $totalsecs = time() - $mtime;
+	my $t = time() - $mtime;
+
+	return &format_time($t);
+}
+
+sub format_time($) {
+	my $totalsecs = shift;
 	my @s = ();
 
 	my $secs = $totalsecs % 60;

config/cfgroot/geoip-functions.pl

@@ -23,8 +23,23 @@
 
 package GeoIP;
 
+use Geo::IP::PurePerl;
 use Locale::Codes::Country;
 
+my $database;
+
+sub lookup($) {
+	my $address = shift;
+
+	# Load the database into memory if not already done
+	if (!$database) {
+		$database = Geo::IP::PurePerl->new(GEOIP_MEMORY_CACHE);
+	}
+
+	# Return the name of the country
+	return $database->country_code_by_name($address);
+}
+
 # Function to get the flag icon for a specified country code.
 sub get_flag_icon($) {
 	my ($input) = @_;
@@ -63,10 +78,10 @@ sub get_flag_icon($) {
 		# the icon for "unknown".
 		my $ccode = "unknown";
 
-		# Redoing all the stuff from abouve for the "unknown" icon.
+		# Redoing all the stuff from above for the "unknown" icon.
-		my $file = join('.', $ccode,$ext);
+		my $file = join('.', $ccode, $ext);
-		my $flag_icon = join('/', $flagdir,$file);
+		my $flag_icon = join('/', $flagdir, $file);
-		my $absolute_path = join('', $webroot,$flag_icon);
+		my $absolute_path = join('', $webroot, $flag_icon);
 
 		# Check if the icon is present.
 		if (-e "$absolute_path") {

config/cfgroot/lang.pl

@@ -179,4 +179,18 @@ sub FindWebLanguage() {
 	return undef;
 }
 
+sub DetectBrowserLanguages() {
+	my $langs = $ENV{"HTTP_ACCEPT_LANGUAGE"};
+	my @results = ();
+
+	foreach my $lang (split /[,;]/, $langs) {
+		# Drop all q= arguments
+		next if ($lang =~ m/^q=/);
+
+		push(@results, $lang);
+	}
+
+	return @results;
+}
+
 1;

config/cfgroot/network-functions.pl

@@ -108,10 +108,14 @@ sub network_equal {
 	my $network1 = shift;
 	my $network2 = shift;
 
-	my $bin1 = &network2bin($network1);
+	my @bin1 = &network2bin($network1);
-	my $bin2 = &network2bin($network2);
+	my @bin2 = &network2bin($network2);
 
-	if ($bin1 eq $bin2) {
+	if (!defined $bin1 || !defined $bin2) {
+		return undef;
+	}
+
+	if ($bin1[0] eq $bin2[0] && $bin1[1] eq $bin2[1]) {
 		return 1;
 	}
 
@@ -133,6 +137,10 @@ sub network2bin($) {
 	my $address_bin = &ip2bin($address);
 	my $netmask_bin = &ip2bin($netmask);
 
+	if (!defined $address_bin || !defined $netmask_bin) {
+		return undef;
+	}
+
 	my $network_start = $address_bin & $netmask_bin;
 
 	return ($network_start, $netmask_bin);
@@ -374,6 +382,26 @@ sub wifi_get_signal_level($) {
 
 	return $signal_level;
 }
+
+sub get_hardware_address($) {
+	my $ip_address = shift;
+	my $ret;
+
+	open(FILE, "/proc/net/arp") or die("Could not read ARP table");
+
+	while (<FILE>) {
+		my ($ip_addr, $hwtype, $flags, $hwaddr, $mask, $device) = split(/\s+/, $_);
+		if ($ip_addr eq $ip_address) {
+			$ret = $hwaddr;
+			last;
+		}
+	}
+
+	close(FILE);
+
+	return $ret;
+}
+
 1;
 
 # Remove the next line to enable the testsuite
@@ -437,7 +465,7 @@ sub testsuite() {
 	assert(!$result);
 
 	$result = &network_equal("192.168.0.1/24", "192.168.0.XXX/24");
-	assert($result);
+	assert(!$result);
 
 	$result = &ip_address_in_network("10.0.1.4", "10.0.0.0/8");
 	assert($result);

config/cron/crontab

@@ -65,6 +65,12 @@ HOME=/
 # Retry sending spooled mails regularly
 %hourly * /usr/sbin/dma -q
 
+# Cleanup captive clients
+%hourly * /usr/bin/captive-cleanup
+
+# Reload captive firewall rules
+%nightly * 23-1   /usr/local/bin/captivectrl >/dev/null
+
 # Cleanup the mail spool directory
 %weekly * * /usr/sbin/dma-cleanup-spool
 

config/etc/inittab

@@ -26,6 +26,6 @@ su:S016:once:/sbin/sulogin
 5:2345:respawn:/sbin/agetty tty5 9600
 6:2345:respawn:/sbin/agetty tty6 9600
 # *** Uncomment for serial console
-#7:2345:respawn:/sbin/agetty ttyS0 115200
+#7:2345:respawn:/sbin/agetty ttyS0
 
 # End /etc/inittab

config/extrahd/extrahd.pl

@@ -48,8 +48,6 @@ close FILE;
 ############################################################################################################################
 ############################################################################################################################
 
-print "$ARGV[0] $ARGV[1]";
-
 if ( "$ARGV[0]" eq "mount" ) {
 	system("/bin/cp -f /etc/fstab $fstab");
 
@@ -77,7 +75,7 @@ if ( "$ARGV[0]" eq "mount" ) {
 	if ( ! `/bin/mount | /bin/fgrep $ARGV[1]` ) {
 		system("/bin/cp -f /etc/fstab $fstab");
 		system("/bin/fgrep -v $ARGV[1] <$fstab >/etc/fstab");
-		print "Succesfully umounted $ARGV[1].\n";
+		print "Successfully umounted $ARGV[1].\n";
 		exit(0);
 	} else {
 		print "Can't umount $ARGV[1].\n";

config/httpd/httpd.conf

@@ -65,7 +65,6 @@ Include /etc/httpd/conf/global.conf
 
 # associate MIME types with filename extensions
 TypesConfig /etc/mime.types
-DefaultType text/plain
 
 # global (server-wide) SSL configuration, that is not specific to 
 # any virtual host
@@ -80,8 +79,7 @@ Include /etc/httpd/conf/ssl-global.conf
 AccessFileName .htaccess
 # and never show them
 <Files ~ "^\.ht">
-    Order allow,deny
+    Require all denied
-    Deny from all
 </Files>
 
 # List of resources to look for when the client requests a directory

config/httpd/loadmodule.conf

@@ -1,8 +1,11 @@
 LoadModule authn_file_module /usr/lib/apache/mod_authn_file.so
+LoadModule unixd_module /usr/lib/apache/mod_unixd.so
 #LoadModule authn_dbm_module /usr/lib/apache/mod_authn_dbm.so
 #LoadModule authn_anon_module /usr/lib/apache/mod_authn_anon.so
 #LoadModule authn_dbd_module /usr/lib/apache/mod_authn_dbd.so
 #LoadModule authn_default_module /usr/lib/apache/mod_authn_default.so
+LoadModule authn_core_module /usr/lib/apache/mod_authn_core.so
+LoadModule authz_core_module /usr/lib/apache/mod_authz_core.so
 LoadModule authz_host_module /usr/lib/apache/mod_authz_host.so
 #LoadModule authz_groupfile_module /usr/lib/apache/mod_authz_groupfile.so
 LoadModule authz_user_module /usr/lib/apache/mod_authz_user.so
@@ -10,7 +13,7 @@ LoadModule authz_user_module /usr/lib/apache/mod_authz_user.so
 #LoadModule authz_owner_module /usr/lib/apache/mod_authz_owner.so
 #LoadModule authz_default_module /usr/lib/apache/mod_authz_default.so
 LoadModule auth_basic_module /usr/lib/apache/mod_auth_basic.so
-LoadModule auth_digest_module /usr/lib/apache/mod_auth_digest.so
+#LoadModule auth_digest_module /usr/lib/apache/mod_auth_digest.so
 #LoadModule dbd_module /usr/lib/apache/mod_dbd.so
 #LoadModule dumpio_module /usr/lib/apache/mod_dumpio.so
 #LoadModule ext_filter_module /usr/lib/apache/mod_ext_filter.so
@@ -33,10 +36,10 @@ LoadModule setenvif_module /usr/lib/apache/mod_setenvif.so
 LoadModule mime_module /usr/lib/apache/mod_mime.so
 #LoadModule dav_module /usr/lib/apache/mod_dav.so
 #LoadModule status_module /usr/lib/apache/mod_status.so
-LoadModule autoindex_module /usr/lib/apache/mod_autoindex.so
+#LoadModule autoindex_module /usr/lib/apache/mod_autoindex.so
 #LoadModule asis_module /usr/lib/apache/mod_asis.so
 #LoadModule info_module /usr/lib/apache/mod_info.so
-LoadModule cgi_module /usr/lib/apache/mod_cgi.so
+LoadModule cgid_module /usr/lib/apache/mod_cgid.so
 #LoadModule dav_fs_module /usr/lib/apache/mod_dav_fs.so
 #LoadModule vhost_alias_module /usr/lib/apache/mod_vhost_alias.so
 #LoadModule negotiation_module /usr/lib/apache/mod_negotiation.so
@@ -47,5 +50,6 @@ LoadModule dir_module /usr/lib/apache/mod_dir.so
 #LoadModule userdir_module /usr/lib/apache/mod_userdir.so
 LoadModule alias_module /usr/lib/apache/mod_alias.so
 LoadModule rewrite_module /usr/lib/apache/mod_rewrite.so
+LoadModule socache_shmcb_module /usr/lib/apache/mod_socache_shmcb.so
 LoadModule ssl_module /usr/lib/apache/mod_ssl.so
 LoadModule php5_module /usr/lib/apache/libphp5.so

config/httpd/server-tuning.conf

@@ -17,10 +17,11 @@ MaxKeepAliveRequests 100
 #
 KeepAliveTimeout 15
 
-MinSpareServers 1
+MinSpareThreads 1
-MaxSpareServers 10
+MaxSpareThreads 20
 StartServers 2
-MaxClients 256
+MaxRequestWorkers 256
+ThreadsPerChild 16
 
 #
 # The following directives modify normal HTTP response behavior to

config/httpd/ssl-global.conf

@@ -39,11 +39,6 @@
 	SSLSessionCache         shmcb:/var/log/httpd/ssl_scache(512000)
 	SSLSessionCacheTimeout  900
 
-	#   Semaphore:
-	#   Configure the path to the mutual exclusion semaphore the
-	#   SSL engine uses internally for inter-process synchronization. 
-	SSLMutex  file:/var/log/httpd/ssl_mutex
-
 	#   Pseudo Random Number Generator (PRNG):
 	#   Configure one or more sources to seed the PRNG of the 
 	#   SSL library. The seed data should be of good random quality.

config/httpd/vhosts.d/captive.conf

@@ -0,0 +1,30 @@
+Listen 1013
+
+<VirtualHost *:1013>
+	DocumentRoot /srv/web/ipfire/html/captive
+
+	# Close all connections as soon as a reply has been sent.
+	# Most browsers open loads of connections which then causes
+	# the access page being loaded again after a correct coupon
+	# code was entered.
+	KeepAlive Off
+
+	ScriptAlias /cgi-bin/ /srv/web/ipfire/cgi-bin/captive/
+	Alias /assets/ /srv/web/ipfire/html/captive/assets/
+
+	Alias /favicon.ico /srv/web/ipfire/html/captive/assets/favicon.ico
+
+	# All unknown URIs will be redirected to the first
+	# redirector script.
+	ScriptAliasMatch .* /srv/web/ipfire/cgi-bin/captive/redirect.cgi
+
+	<Directory /srv/web/ipfire/cgi-bin/captive>
+		Options ExecCGI
+		Require all granted
+	</Directory>
+
+	<Directory /srv/web/ipfire/html/captive>
+		Options +FollowSymlinks
+		Require all granted
+	</Directory>
+</VirtualHost>

config/httpd/vhosts.d/ipfire-interface-ssl.conf

@@ -9,22 +9,26 @@
     TransferLog /var/log/httpd/access_log
     SSLEngine on
     SSLProtocol all -SSLv2 -SSLv3
-    SSLCipherSuite ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128:AES256:HIGH:!RC4:!aNULL:!eNULL:!EXPORT:!DES:!3DES:!MD5:!PSK
+    SSLCipherSuite ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES128-SHA256:AES128-SHA:CAMELLIA128-SHA:AES256-GCM-SHA384:AES256-SHA256:AES256-SHA:CAMELLIA256-SHA
     SSLHonorCipherOrder on
     SSLCertificateFile /etc/httpd/server.crt
     SSLCertificateKeyFile /etc/httpd/server.key
+    SSLCertificateFile /etc/httpd/server-ecdsa.crt
+    SSLCertificateKeyFile /etc/httpd/server-ecdsa.key
 
     <Directory /srv/web/ipfire/html>
         Options ExecCGI
         AllowOverride None
-        Order allow,deny
+        Require all granted
-        Allow from all
     </Directory>
     <DirectoryMatch "/srv/web/ipfire/html/(graphs|sgraph)">
         AuthName "IPFire - Restricted"
         AuthType Basic
         AuthUserFile /var/ipfire/auth/users
-        Require user admin
+        <RequireAll>
+            Require user admin
+            Require ssl
+        </RequireAll>
     </DirectoryMatch>
     ScriptAlias /cgi-bin/ /srv/web/ipfire/cgi-bin/
     <Directory /srv/web/ipfire/cgi-bin>
@@ -33,30 +37,16 @@
         AuthName "IPFire - Restricted"
         AuthType Basic
         AuthUserFile /var/ipfire/auth/users
-        Require user admin
+        <RequireAll>
-         <Files chpasswd.cgi>
+            Require user admin
-            Satisfy Any
+            Require ssl
-            Allow from All
+        </RequireAll>
+        <Files chpasswd.cgi>
+            Require all granted
         </Files>
         <Files webaccess.cgi>
-            Satisfy Any
+            Require all granted
-            Allow from All
         </Files>
-        <Files credits.cgi>
-            Satisfy Any
-            Allow from All
-        </Files>
-        <Files dial.cgi>
-            Require user admin
-        </Files>
-    </Directory>
-    <Directory /srv/web/ipfire/cgi-bin/dial>
-        AllowOverride None
-        Options None
-        AuthName "IPFire - Restricted"
-        AuthType Basic
-        AuthUserFile /var/ipfire/auth/users
-        Require user dial admin
     </Directory>
     <Files ~ "\.(cgi|shtml?)$">
 	SSLOptions +StdEnvVars
@@ -75,16 +65,14 @@
 	<Directory /var/updatecache>
 		 Options ExecCGI
 		 AllowOverride None
-		 Order deny,allow
+		 Require all granted
-		 Allow from all
 	</Directory>
 
     Alias /repository/ /var/urlrepo/
 	<Directory /var/urlrepo>
 		 Options ExecCGI
 		 AllowOverride None
-		 Order deny,allow
+		 Require all granted
-		 Allow from all
 	</Directory>
 
     Alias /proxy-reports/ /var/log/sarg/
@@ -94,6 +82,9 @@
         AuthName "IPFire - Restricted"
         AuthType Basic
         AuthUserFile /var/ipfire/auth/users
-        Require user admin
+        <RequireAll>
+            Require user admin
+            Require ssl
+        </RequireAll>
     </Directory>
 </VirtualHost>

config/httpd/vhosts.d/ipfire-interface.conf

@@ -9,60 +9,32 @@
     <Directory /srv/web/ipfire/html>
         Options ExecCGI
         AllowOverride None
-        Order allow,deny
+        Require all granted
-        Allow from all
     </Directory>
     <DirectoryMatch "/srv/web/ipfire/html/(graphs|sgraph)">
-        AuthName "IPFire - Restricted"
+        Options SymLinksIfOwnerMatch
-        AuthType Basic
+        RewriteEngine on
-        AuthUserFile /var/ipfire/auth/users
+        RewriteCond %{HTTPS} off
-        Require user admin
+        RewriteRule (.*) https://%{SERVER_NAME}:444/$1 [R=301,L]
     </DirectoryMatch>
     ScriptAlias /cgi-bin/ /srv/web/ipfire/cgi-bin/
     <Directory /srv/web/ipfire/cgi-bin>
-        AllowOverride None
+        Options SymLinksIfOwnerMatch
-        Options None
+        RewriteEngine on
-        AuthName "IPFire - Restricted"
+        RewriteCond %{HTTPS} off
-        AuthType Basic
+        RewriteRule (.*) https://%{SERVER_NAME}:444/$1 [R=301,L]
-        AuthUserFile /var/ipfire/auth/users
-        Require user admin
-         <Files chpasswd.cgi>
-            Satisfy Any
-            Allow from All
-        </Files>
-        <Files webaccess.cgi>
-            Satisfy Any
-            Allow from All
-        </Files>
-        <Files credits.cgi>
-            Satisfy Any
-            Allow from All
-        </Files>
-        <Files dial.cgi>
-            Require user admin
-        </Files>
-    </Directory>
-    <Directory /srv/web/ipfire/cgi-bin/dial>
-        AllowOverride None
-        Options None
-        AuthName "IPFire - Restricted"
-        AuthType Basic
-        AuthUserFile /var/ipfire/auth/users
-        Require user dial admin
     </Directory>
     Alias /updatecache/ /var/updatecache/
 	<Directory /var/updatecache>
 		 Options ExecCGI
 		 AllowOverride None
-		 Order deny,allow
+		 Require all granted
-		 Allow from all
 	</Directory>
     Alias /repository/ /var/urlrepo/
 	<Directory /var/urlrepo>
 		 Options ExecCGI
 		 AllowOverride None
-		 Order deny,allow
+		 Require all granted
-		 Allow from all
 	</Directory>
     Alias /wpad.dat /srv/web/ipfire/html/proxy.pac
 </VirtualHost>

config/httpd/vhosts.d/nagios.conf

@@ -16,11 +16,8 @@ ScriptAlias /nagios/cgi-bin "/usr/share/nagios/cgi-bin"
 #  SSLRequireSSL
    Options ExecCGI
    AllowOverride None
-   Order allow,deny
+#  Require all granted
-   Allow from all
+#  Require ip 127.0.0.1
-#  Order deny,allow
-#  Deny from all
-#  Allow from 127.0.0.1
    AuthName "Nagios Access"
    AuthType Basic
    AuthUserFile /etc/nagios/htpasswd.users
@@ -33,11 +30,8 @@ Alias /nagios "/usr/share/nagios"
 #  SSLRequireSSL
    Options None
    AllowOverride None
-   Order allow,deny
+#  Require all granted
-   Allow from all
+#  Require ip 127.0.0.1
-#  Order deny,allow
-#  Deny from all
-#  Allow from 127.0.0.1
    AuthName "Nagios Access"
    AuthType Basic
    AuthUserFile /etc/nagios/htpasswd.users

config/httpd/vhosts.d/openmailadmin.conf

@@ -9,8 +9,7 @@ Listen 1001
 	<Directory /srv/web/openmailadmin>
 		Options +FollowSymlinks
 		AllowOverride None
-		Order allow,deny
+		Require all granted
-		Allow from all
 	</Directory>
 	
 </VirtualHost>

config/icinga/icinga.conf

@@ -15,9 +15,6 @@ Listen 1010
 		AuthType Basic
 		AuthUserFile /etc/icinga/htpasswd.users
 
-		Order allow,deny
-		Allow from all
-
 		Require valid-user
 	</Directory>
 
@@ -29,9 +26,6 @@ Listen 1010
 		AuthType Basic
 		AuthUserFile /etc/icinga/htpasswd.users
 
-		Order allow,deny
-		Allow from all
-
 		Require valid-user
 	</Directory>
 </VirtualHost>

config/menu/30-network.menu

@@ -23,6 +23,11 @@
 				 'title' => "$Lang::tr{'dhcp server'}",
 				 'enabled' => 1,
 				 };
+	$subnetwork->{'32.captive'} = {'caption' => $Lang::tr{'Captive menu'},
+			        'uri' => '/cgi-bin/captive.cgi',
+			        'title' => $Lang::tr{'Captive menu'},
+			        'enabled' => 1,
+			        };
     $subnetwork->{'40.scheduler'} = {
 				 'caption' => $Lang::tr{'connscheduler'},
 				 'uri' => '/cgi-bin/connscheduler.cgi',

config/nagiosql/nagios.conf

@@ -16,11 +16,8 @@ ScriptAlias /nagios/cgi-bin "/usr/share/nagios/cgi-bin"
 #  SSLRequireSSL
    Options ExecCGI
    AllowOverride None
-   Order allow,deny
+#  Require all granted
-   Allow from all
+#  Require ip 127.0.0.1
-#  Order deny,allow
-#  Deny from all
-#  Allow from 127.0.0.1
    AuthName "Nagios Access"
    AuthType Basic
    AuthUserFile /etc/nagios/htpasswd.users
@@ -33,11 +30,8 @@ Alias /nagios "/usr/share/nagios"
 #  SSLRequireSSL
    Options None
    AllowOverride None
-   Order allow,deny
+#  Require all granted
-   Allow from all
+#  Require ip 127.0.0.1
-#  Order deny,allow
-#  Deny from all
-#  Allow from 127.0.0.1
    AuthName "Nagios Access"
    AuthType Basic
    AuthUserFile /etc/nagios/htpasswd.users
@@ -50,8 +44,7 @@ Alias /nagiosql "/usr/share/nagiosql"
    include /etc/httpd/conf/conf.d/php*.conf
    Options None
    AllowOverride None
-   Order allow,deny
+   Require all granted
-   Allow from all
 </Directory>
 
 </VirtualHost>

config/ovpn/openssl/ovpn.cnf

@@ -77,6 +77,8 @@ basicConstraints		= CA:FALSE
 nsComment			= "OpenSSL Generated Certificate"
 subjectKeyIdentifier		= hash
 authorityKeyIdentifier		= keyid,issuer:always
+extendedKeyUsage               = clientAuth
+keyUsage                       = digitalSignature
 
 [ server ]
 
@@ -86,6 +88,8 @@ nsCertType			= server
 nsComment			= "OpenSSL Generated Server Certificate"
 subjectKeyIdentifier		= hash
 authorityKeyIdentifier		= keyid,issuer:always 
+extendedKeyUsage               = serverAuth
+keyUsage                       = digitalSignature, keyEncipherment
 
 [ v3_req ]
 basicConstraints 		= CA:FALSE

config/owncloud/owncloud.conf

@@ -15,7 +15,6 @@ Listen 1011
 	<Directory /srv/web/owncloud>
 		Options Indexes FollowSymlinks MultiViews
 		AllowOverride ALL
-		Order allow,deny
+		Require all granted
-		Allow from all
 	</Directory>
 </VirtualHost>

config/php/php.ini

@@ -533,7 +533,7 @@ doc_root =
 user_dir =
 
 ; Directory in which the loadable extensions (modules) reside.
-extension_dir = "/usr/lib/php/extensions/no-debug-non-zts-20090626/"
+extension_dir = "/usr/lib/php/extensions/no-debug-zts-20090626/"
 
 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically

config/phpSANE/phpSANE.conf

@@ -9,8 +9,7 @@ Listen 1003
 	<Directory /srv/web/phpSANE>
 		Options None
 		AllowOverride None
-		Order allow,deny
+		Require all granted
-		Allow from all
 	</Directory>
 	
 </VirtualHost>

config/rootfiles/common/apr

@@ -0,0 +1,57 @@
+usr/bin/apr-1-config
+#usr/include/apr-1
+#usr/include/apr-1/apr.h
+#usr/include/apr-1/apr_allocator.h
+#usr/include/apr-1/apr_atomic.h
+#usr/include/apr-1/apr_cstr.h
+#usr/include/apr-1/apr_dso.h
+#usr/include/apr-1/apr_env.h
+#usr/include/apr-1/apr_errno.h
+#usr/include/apr-1/apr_escape.h
+#usr/include/apr-1/apr_file_info.h
+#usr/include/apr-1/apr_file_io.h
+#usr/include/apr-1/apr_fnmatch.h
+#usr/include/apr-1/apr_general.h
+#usr/include/apr-1/apr_getopt.h
+#usr/include/apr-1/apr_global_mutex.h
+#usr/include/apr-1/apr_hash.h
+#usr/include/apr-1/apr_inherit.h
+#usr/include/apr-1/apr_lib.h
+#usr/include/apr-1/apr_mmap.h
+#usr/include/apr-1/apr_network_io.h
+#usr/include/apr-1/apr_perms_set.h
+#usr/include/apr-1/apr_poll.h
+#usr/include/apr-1/apr_pools.h
+#usr/include/apr-1/apr_portable.h
+#usr/include/apr-1/apr_proc_mutex.h
+#usr/include/apr-1/apr_random.h
+#usr/include/apr-1/apr_ring.h
+#usr/include/apr-1/apr_shm.h
+#usr/include/apr-1/apr_signal.h
+#usr/include/apr-1/apr_skiplist.h
+#usr/include/apr-1/apr_strings.h
+#usr/include/apr-1/apr_support.h
+#usr/include/apr-1/apr_tables.h
+#usr/include/apr-1/apr_thread_cond.h
+#usr/include/apr-1/apr_thread_mutex.h
+#usr/include/apr-1/apr_thread_proc.h
+#usr/include/apr-1/apr_thread_rwlock.h
+#usr/include/apr-1/apr_time.h
+#usr/include/apr-1/apr_user.h
+#usr/include/apr-1/apr_version.h
+#usr/include/apr-1/apr_want.h
+#usr/lib/apr.exp
+#usr/lib/libapr-1.la
+#usr/lib/libapr-1.so
+usr/lib/libapr-1.so.0
+usr/lib/libapr-1.so.0.6.2
+#usr/lib/pkgconfig/apr-1.pc
+#usr/share/apr-1
+#usr/share/apr-1/build
+#usr/share/apr-1/build/apr_common.m4
+#usr/share/apr-1/build/apr_rules.mk
+#usr/share/apr-1/build/find_apr.m4
+#usr/share/apr-1/build/libtool
+#usr/share/apr-1/build/make_exports.awk
+#usr/share/apr-1/build/make_var_export.awk
+#usr/share/apr-1/build/mkdir.sh

config/rootfiles/common/aprutil

@@ -0,0 +1,47 @@
+usr/bin/apu-1-config
+#usr/include/apr-1/apr_anylock.h
+#usr/include/apr-1/apr_base64.h
+#usr/include/apr-1/apr_buckets.h
+#usr/include/apr-1/apr_crypto.h
+#usr/include/apr-1/apr_date.h
+#usr/include/apr-1/apr_dbd.h
+#usr/include/apr-1/apr_dbm.h
+#usr/include/apr-1/apr_hooks.h
+#usr/include/apr-1/apr_ldap.h
+#usr/include/apr-1/apr_ldap_init.h
+#usr/include/apr-1/apr_ldap_option.h
+#usr/include/apr-1/apr_ldap_rebind.h
+#usr/include/apr-1/apr_ldap_url.h
+#usr/include/apr-1/apr_md4.h
+#usr/include/apr-1/apr_md5.h
+#usr/include/apr-1/apr_memcache.h
+#usr/include/apr-1/apr_optional.h
+#usr/include/apr-1/apr_optional_hooks.h
+#usr/include/apr-1/apr_queue.h
+#usr/include/apr-1/apr_redis.h
+#usr/include/apr-1/apr_reslist.h
+#usr/include/apr-1/apr_rmm.h
+#usr/include/apr-1/apr_sdbm.h
+#usr/include/apr-1/apr_sha1.h
+#usr/include/apr-1/apr_siphash.h
+#usr/include/apr-1/apr_strmatch.h
+#usr/include/apr-1/apr_thread_pool.h
+#usr/include/apr-1/apr_uri.h
+#usr/include/apr-1/apr_uuid.h
+#usr/include/apr-1/apr_xlate.h
+#usr/include/apr-1/apr_xml.h
+#usr/include/apr-1/apu.h
+#usr/include/apr-1/apu_errno.h
+#usr/include/apr-1/apu_version.h
+#usr/include/apr-1/apu_want.h
+#usr/include/apr-1/expat.h
+#usr/lib/apr-util-1
+usr/lib/apr-util-1/apr_crypto_openssl-1.so
+#usr/lib/apr-util-1/apr_crypto_openssl.la
+usr/lib/apr-util-1/apr_crypto_openssl.so
+#usr/lib/aprutil.exp
+#usr/lib/libaprutil-1.la
+#usr/lib/libaprutil-1.so
+usr/lib/libaprutil-1.so.0
+usr/lib/libaprutil-1.so.0.6.0
+#usr/lib/pkgconfig/apr-util-1.pc

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.28.so
-usr/lib/libopcodes-2.24.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

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/pip-9.0.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/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

config/rootfiles/common/armv5tel/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
@@ -60,7 +63,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
@@ -77,16 +83,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
@@ -95,8 +111,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
@@ -110,7 +124,6 @@ usr/sbin/rtcwake
 #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
@@ -128,16 +141,21 @@ usr/sbin/rtcwake
 #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
@@ -146,6 +164,7 @@ usr/sbin/rtcwake
 #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
@@ -167,10 +186,12 @@ usr/sbin/rtcwake
 #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
@@ -179,44 +200,11 @@ usr/sbin/rtcwake
 #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
@@ -236,6 +224,8 @@ usr/sbin/rtcwake
 #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
@@ -256,6 +246,7 @@ usr/sbin/rtcwake
 #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
@@ -263,7 +254,6 @@ usr/sbin/rtcwake
 #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
@@ -280,13 +270,13 @@ usr/sbin/rtcwake
 #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
@@ -300,5 +290,7 @@ usr/sbin/rtcwake
 #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/zramctl.8

config/rootfiles/common/boost

@@ -13528,15 +13528,6 @@ usr/lib/libboost_container-mt.so.1.64.0
 #usr/lib/libboost_container.a
 #usr/lib/libboost_container.so
 usr/lib/libboost_container.so.1.64.0
-#usr/lib/libboost_context-mt.a
-#usr/lib/libboost_context-mt.so
-usr/lib/libboost_context-mt.so.1.64.0
-#usr/lib/libboost_coroutine-mt.a
-#usr/lib/libboost_coroutine-mt.so
-usr/lib/libboost_coroutine-mt.so.1.64.0
-#usr/lib/libboost_coroutine.a
-#usr/lib/libboost_coroutine.so
-usr/lib/libboost_coroutine.so.1.64.0
 #usr/lib/libboost_date_time-mt.a
 #usr/lib/libboost_date_time-mt.so
 usr/lib/libboost_date_time-mt.so.1.64.0
@@ -13545,9 +13536,6 @@ usr/lib/libboost_date_time-mt.so.1.64.0
 usr/lib/libboost_date_time.so.1.64.0
 #usr/lib/libboost_exception-mt.a
 #usr/lib/libboost_exception.a
-#usr/lib/libboost_fiber-mt.a
-#usr/lib/libboost_fiber-mt.so
-usr/lib/libboost_fiber-mt.so.1.64.0
 #usr/lib/libboost_filesystem-mt.a
 #usr/lib/libboost_filesystem-mt.so
 usr/lib/libboost_filesystem-mt.so.1.64.0
@@ -13623,12 +13611,6 @@ usr/lib/libboost_prg_exec_monitor-mt.so.1.64.0
 #usr/lib/libboost_prg_exec_monitor.a
 #usr/lib/libboost_prg_exec_monitor.so
 usr/lib/libboost_prg_exec_monitor.so.1.64.0
-#usr/lib/libboost_program_options-mt.a
-#usr/lib/libboost_program_options-mt.so
-usr/lib/libboost_program_options-mt.so.1.64.0
-#usr/lib/libboost_program_options.a
-#usr/lib/libboost_program_options.so
-usr/lib/libboost_program_options.so.1.64.0
 #usr/lib/libboost_random-mt.a
 #usr/lib/libboost_random-mt.so
 usr/lib/libboost_random-mt.so.1.64.0

config/rootfiles/common/bootstrap

@@ -0,0 +1,17 @@
+#usr/share/bootstrap
+#usr/share/bootstrap/css
+usr/share/bootstrap/css/bootstrap.css
+usr/share/bootstrap/css/bootstrap.css.map
+usr/share/bootstrap/css/bootstrap-grid.css
+usr/share/bootstrap/css/bootstrap-grid.css.map
+usr/share/bootstrap/css/bootstrap-grid.min.css
+usr/share/bootstrap/css/bootstrap-grid.min.css.map
+usr/share/bootstrap/css/bootstrap.min.css
+usr/share/bootstrap/css/bootstrap.min.css.map
+usr/share/bootstrap/css/bootstrap-reboot.css
+usr/share/bootstrap/css/bootstrap-reboot.css.map
+usr/share/bootstrap/css/bootstrap-reboot.min.css
+usr/share/bootstrap/css/bootstrap-reboot.min.css.map
+#usr/share/bootstrap/js
+usr/share/bootstrap/js/bootstrap.js
+usr/share/bootstrap/js/bootstrap.min.js

config/rootfiles/common/configroot

@@ -11,6 +11,11 @@ var/ipfire/auth
 var/ipfire/backup/exclude.user
 var/ipfire/backup/include.user
 var/ipfire/ca
+var/ipfire/captive
+var/ipfire/captive/agb.txt
+var/ipfire/captive/clients
+var/ipfire/captive/settings
+var/ipfire/captive/voucher_out
 var/ipfire/certs
 #var/ipfire/certs/index.txt
 #var/ipfire/certs/serial
@@ -51,16 +56,14 @@ var/ipfire/extrahd
 #var/ipfire/extrahd/settings
 var/ipfire/firewall
 #var/ipfire/firewall/config
-#var/ipfire/firewall/dmz
 #var/ipfire/firewall/geoipblock
 #var/ipfire/firewall/input
-#var/ipfire/firewall/nat
 #var/ipfire/firewall/outgoing
 #var/ipfire/firewall/p2protocols
 #var/ipfire/firewall/settings
 var/ipfire/fwhosts
-#var/ipfire/fwhosts/customgroups
 #var/ipfire/fwhosts/customgeoipgrp
+#var/ipfire/fwhosts/customgroups
 #var/ipfire/fwhosts/customhosts
 #var/ipfire/fwhosts/customnetworks
 #var/ipfire/fwhosts/customservicegrp
@@ -116,6 +119,7 @@ var/ipfire/menu.d/70-log.menu
 #var/ipfire/menu.d/EX-tor.menu
 #var/ipfire/menu.d/EX-wlanap.menu
 var/ipfire/modem
+var/ipfire/modem-lib.pl
 #var/ipfire/modem/defaults
 #var/ipfire/modem/settings
 var/ipfire/modem-lib.pl

config/rootfiles/common/fwhits

@@ -1 +0,0 @@
-usr/local/bin/logtailfwhits

config/rootfiles/common/gnutls

@@ -33,13 +33,23 @@ usr/lib/libgnutls-dane.so.0.4.1
 #usr/lib/libgnutls.la
 #usr/lib/libgnutls.so
 usr/lib/libgnutls.so.30
-usr/lib/libgnutls.so.30.14.0
+usr/lib/libgnutls.so.30.14.7
 #usr/lib/libgnutlsxx.la
 #usr/lib/libgnutlsxx.so
 usr/lib/libgnutlsxx.so.28
 usr/lib/libgnutlsxx.so.28.1.0
 #usr/lib/pkgconfig/gnutls-dane.pc
 #usr/lib/pkgconfig/gnutls.pc
+#usr/share/doc/gnutls
+#usr/share/doc/gnutls/gnutls-client-server-use-case.png
+#usr/share/doc/gnutls/gnutls-handshake-sequence.png
+#usr/share/doc/gnutls/gnutls-handshake-state.png
+#usr/share/doc/gnutls/gnutls-internals.png
+#usr/share/doc/gnutls/gnutls-layers.png
+#usr/share/doc/gnutls/gnutls-logo.png
+#usr/share/doc/gnutls/gnutls-modauth.png
+#usr/share/doc/gnutls/gnutls-x509.png
+#usr/share/doc/gnutls/pkcs11-vision.png
 #usr/share/info/gnutls-client-server-use-case.png
 #usr/share/info/gnutls-guile.info
 #usr/share/info/gnutls-handshake-sequence.png

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

config/rootfiles/common/kbd

@@ -19,7 +19,7 @@ bin/setfont
 #lib/kbd/consolefonts/Cyr_a8x14.psfu.gz
 #lib/kbd/consolefonts/Cyr_a8x16.psfu.gz
 #lib/kbd/consolefonts/Cyr_a8x8.psfu.gz
-#lib/kbd/consolefonts/ERRORS.gz
+#lib/kbd/consolefonts/ERRORS
 #lib/kbd/consolefonts/Goha-12.psfu.gz
 #lib/kbd/consolefonts/Goha-14.psfu.gz
 #lib/kbd/consolefonts/Goha-16.psfu.gz
@@ -32,19 +32,19 @@ lib/kbd/consolefonts/LatArCyrHeb-16+.psfu.gz
 lib/kbd/consolefonts/LatArCyrHeb-16.psfu.gz
 #lib/kbd/consolefonts/LatArCyrHeb-19.psfu.gz
 #lib/kbd/consolefonts/Mik_8x16.gz
-#lib/kbd/consolefonts/README.12x22.gz
+#lib/kbd/consolefonts/README.12x22
-#lib/kbd/consolefonts/README.Arabic.gz
+#lib/kbd/consolefonts/README.Arabic
-#lib/kbd/consolefonts/README.Cyrillic.gz
+#lib/kbd/consolefonts/README.Cyrillic
-#lib/kbd/consolefonts/README.Ethiopic.gz
+#lib/kbd/consolefonts/README.Ethiopic
-#lib/kbd/consolefonts/README.Greek.gz
+#lib/kbd/consolefonts/README.Greek
-#lib/kbd/consolefonts/README.Hebrew.gz
+#lib/kbd/consolefonts/README.Hebrew
-#lib/kbd/consolefonts/README.cp1250.gz
+#lib/kbd/consolefonts/README.cp1250
-#lib/kbd/consolefonts/README.cybercafe.gz
+#lib/kbd/consolefonts/README.cybercafe
-#lib/kbd/consolefonts/README.drdos.gz
+#lib/kbd/consolefonts/README.drdos
-#lib/kbd/consolefonts/README.lat0.gz
+#lib/kbd/consolefonts/README.lat0
-#lib/kbd/consolefonts/README.lat7.gz
+#lib/kbd/consolefonts/README.lat7
-#lib/kbd/consolefonts/README.lat9.gz
+#lib/kbd/consolefonts/README.lat9
-#lib/kbd/consolefonts/README.psfu.gz
+#lib/kbd/consolefonts/README.psfu
 #lib/kbd/consolefonts/alt-8x14.gz
 #lib/kbd/consolefonts/alt-8x16.gz
 #lib/kbd/consolefonts/alt-8x8.gz

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.7
+usr/lib/libgcrypt.so.20.2.0
 #usr/share/aclocal/libgcrypt.m4
 #usr/share/info/gcrypt.info
 #usr/share/man/man1/hmac256.1

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.4
-#usr/share/doc/libxml2-2.9.3/Copyright
+#usr/share/doc/libxml2-2.9.4/Copyright
-#usr/share/doc/libxml2-2.9.3/examples
+#usr/share/doc/libxml2-2.9.4/examples
-#usr/share/doc/libxml2-2.9.3/examples/testHTML.c
+#usr/share/doc/libxml2-2.9.4/examples/testHTML.c
-#usr/share/doc/libxml2-2.9.3/examples/testSAX.c
+#usr/share/doc/libxml2-2.9.4/examples/testSAX.c
-#usr/share/doc/libxml2-2.9.3/examples/testXPath.c
+#usr/share/doc/libxml2-2.9.4/examples/testXPath.c
-#usr/share/doc/libxml2-2.9.3/examples/xmllint.c
+#usr/share/doc/libxml2-2.9.4/examples/xmllint.c
-#usr/share/doc/libxml2-2.9.3/html
+#usr/share/doc/libxml2-2.9.4/html
-#usr/share/doc/libxml2-2.9.3/html/DOM.gif
+#usr/share/doc/libxml2-2.9.4/html/DOM.gif
-#usr/share/doc/libxml2-2.9.3/html/FAQ.html
+#usr/share/doc/libxml2-2.9.4/html/FAQ.html
-#usr/share/doc/libxml2-2.9.3/html/Libxml2-Logo-180x168.gif
+#usr/share/doc/libxml2-2.9.4/html/Libxml2-Logo-180x168.gif
-#usr/share/doc/libxml2-2.9.3/html/Libxml2-Logo-90x34.gif
+#usr/share/doc/libxml2-2.9.4/html/Libxml2-Logo-90x34.gif
-#usr/share/doc/libxml2-2.9.3/html/encoding.html
+#usr/share/doc/libxml2-2.9.4/html/encoding.html
-#usr/share/doc/libxml2-2.9.3/html/examples.xml
+#usr/share/doc/libxml2-2.9.4/html/examples.xml
-#usr/share/doc/libxml2-2.9.3/html/examples.xsl
+#usr/share/doc/libxml2-2.9.4/html/examples.xsl
-#usr/share/doc/libxml2-2.9.3/html/html
+#usr/share/doc/libxml2-2.9.4/html/html
-#usr/share/doc/libxml2-2.9.3/html/html/book1.html
+#usr/share/doc/libxml2-2.9.4/html/html/book1.html
-#usr/share/doc/libxml2-2.9.3/html/html/home.png
+#usr/share/doc/libxml2-2.9.4/html/html/home.png
-#usr/share/doc/libxml2-2.9.3/html/html/index.html
+#usr/share/doc/libxml2-2.9.4/html/html/index.html
-#usr/share/doc/libxml2-2.9.3/html/html/left.png
+#usr/share/doc/libxml2-2.9.4/html/html/left.png
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-DOCBparser.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-DOCBparser.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-HTMLparser.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-HTMLparser.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-HTMLtree.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-HTMLtree.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-SAX.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-SAX.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-SAX2.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-SAX2.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-c14n.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-c14n.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-catalog.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-catalog.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-chvalid.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-chvalid.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-debugXML.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-debugXML.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-dict.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-dict.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-encoding.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-encoding.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-entities.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-entities.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-globals.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-globals.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-hash.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-hash.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-lib.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-lib.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-list.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-list.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-nanoftp.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-nanoftp.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-nanohttp.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-nanohttp.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-parser.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-parser.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-parserInternals.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-parserInternals.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-pattern.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-pattern.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-relaxng.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-relaxng.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-schemasInternals.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-schemasInternals.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-schematron.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-schematron.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-threads.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-threads.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-tree.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-tree.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-uri.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-uri.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-valid.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-valid.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xinclude.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xinclude.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xlink.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xlink.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlIO.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlIO.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlautomata.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlautomata.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlerror.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlerror.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlexports.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlexports.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlmemory.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlmemory.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlmodule.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlmodule.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlreader.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlreader.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlregexp.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlregexp.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlsave.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlsave.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlschemas.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlschemas.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlschemastypes.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlschemastypes.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlstring.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlstring.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlunicode.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlunicode.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlversion.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlversion.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xmlwriter.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xmlwriter.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xpath.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xpath.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xpathInternals.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xpathInternals.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xpointer.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xpointer.html
-#usr/share/doc/libxml2-2.9.3/html/html/libxml-xzlib.html
+#usr/share/doc/libxml2-2.9.4/html/html/libxml-xzlib.html
-#usr/share/doc/libxml2-2.9.3/html/html/right.png
+#usr/share/doc/libxml2-2.9.4/html/html/right.png
-#usr/share/doc/libxml2-2.9.3/html/html/up.png
+#usr/share/doc/libxml2-2.9.4/html/html/up.png
-#usr/share/doc/libxml2-2.9.3/html/index.html
+#usr/share/doc/libxml2-2.9.4/html/index.html
-#usr/share/doc/libxml2-2.9.3/html/io1.c
+#usr/share/doc/libxml2-2.9.4/html/io1.c
-#usr/share/doc/libxml2-2.9.3/html/io1.res
+#usr/share/doc/libxml2-2.9.4/html/io1.res
-#usr/share/doc/libxml2-2.9.3/html/io2.c
+#usr/share/doc/libxml2-2.9.4/html/io2.c
-#usr/share/doc/libxml2-2.9.3/html/io2.res
+#usr/share/doc/libxml2-2.9.4/html/io2.res
-#usr/share/doc/libxml2-2.9.3/html/libxml.gif
+#usr/share/doc/libxml2-2.9.4/html/libxml.gif
-#usr/share/doc/libxml2-2.9.3/html/parse1.c
+#usr/share/doc/libxml2-2.9.4/html/parse1.c
-#usr/share/doc/libxml2-2.9.3/html/parse2.c
+#usr/share/doc/libxml2-2.9.4/html/parse2.c
-#usr/share/doc/libxml2-2.9.3/html/parse3.c
+#usr/share/doc/libxml2-2.9.4/html/parse3.c
-#usr/share/doc/libxml2-2.9.3/html/parse4.c
+#usr/share/doc/libxml2-2.9.4/html/parse4.c
-#usr/share/doc/libxml2-2.9.3/html/reader1.c
+#usr/share/doc/libxml2-2.9.4/html/reader1.c
-#usr/share/doc/libxml2-2.9.3/html/reader1.res
+#usr/share/doc/libxml2-2.9.4/html/reader1.res
-#usr/share/doc/libxml2-2.9.3/html/reader2.c
+#usr/share/doc/libxml2-2.9.4/html/reader2.c
-#usr/share/doc/libxml2-2.9.3/html/reader3.c
+#usr/share/doc/libxml2-2.9.4/html/reader3.c
-#usr/share/doc/libxml2-2.9.3/html/reader3.res
+#usr/share/doc/libxml2-2.9.4/html/reader3.res
-#usr/share/doc/libxml2-2.9.3/html/reader4.c
+#usr/share/doc/libxml2-2.9.4/html/reader4.c
-#usr/share/doc/libxml2-2.9.3/html/reader4.res
+#usr/share/doc/libxml2-2.9.4/html/reader4.res
-#usr/share/doc/libxml2-2.9.3/html/redhat.gif
+#usr/share/doc/libxml2-2.9.4/html/redhat.gif
-#usr/share/doc/libxml2-2.9.3/html/smallfootonly.gif
+#usr/share/doc/libxml2-2.9.4/html/smallfootonly.gif
-#usr/share/doc/libxml2-2.9.3/html/structure.gif
+#usr/share/doc/libxml2-2.9.4/html/structure.gif
-#usr/share/doc/libxml2-2.9.3/html/test1.xml
+#usr/share/doc/libxml2-2.9.4/html/test1.xml
-#usr/share/doc/libxml2-2.9.3/html/test2.xml
+#usr/share/doc/libxml2-2.9.4/html/test2.xml
-#usr/share/doc/libxml2-2.9.3/html/test3.xml
+#usr/share/doc/libxml2-2.9.4/html/test3.xml
-#usr/share/doc/libxml2-2.9.3/html/testWriter.c
+#usr/share/doc/libxml2-2.9.4/html/testWriter.c
-#usr/share/doc/libxml2-2.9.3/html/tree1.c
+#usr/share/doc/libxml2-2.9.4/html/tree1.c
-#usr/share/doc/libxml2-2.9.3/html/tree1.res
+#usr/share/doc/libxml2-2.9.4/html/tree1.res
-#usr/share/doc/libxml2-2.9.3/html/tree2.c
+#usr/share/doc/libxml2-2.9.4/html/tree2.c
-#usr/share/doc/libxml2-2.9.3/html/tree2.res
+#usr/share/doc/libxml2-2.9.4/html/tree2.res
-#usr/share/doc/libxml2-2.9.3/html/tst.xml
+#usr/share/doc/libxml2-2.9.4/html/tst.xml
-#usr/share/doc/libxml2-2.9.3/html/tutorial
+#usr/share/doc/libxml2-2.9.4/html/tutorial
-#usr/share/doc/libxml2-2.9.3/html/tutorial/apa.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/apa.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/apb.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/apb.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/apc.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/apc.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/apd.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/apd.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ape.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ape.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/apf.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/apf.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/apg.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/apg.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/aph.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/aph.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/api.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/api.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s02.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s02.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s03.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s03.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s04.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s04.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s05.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s05.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s06.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s06.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s07.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s07.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s08.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s08.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ar01s09.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ar01s09.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/blank.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/blank.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/callouts
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/callouts/1.png
+#usr/share/doc/libxml2-2.9.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/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.4/html/tutorial/images/callouts/9.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/caution.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/caution.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/draft.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/draft.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/home.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/home.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/important.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/important.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/next.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/next.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/note.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/note.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/prev.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/prev.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/tip.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/tip.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/toc-blank.png
+#usr/share/doc/libxml2-2.9.4/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.4/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.4/html/tutorial/images/toc-plus.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/up.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/up.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/images/warning.png
+#usr/share/doc/libxml2-2.9.4/html/tutorial/images/warning.png
-#usr/share/doc/libxml2-2.9.3/html/tutorial/includeaddattribute.c
+#usr/share/doc/libxml2-2.9.4/html/tutorial/includeaddattribute.c
-#usr/share/doc/libxml2-2.9.3/html/tutorial/includeaddkeyword.c
+#usr/share/doc/libxml2-2.9.4/html/tutorial/includeaddkeyword.c
-#usr/share/doc/libxml2-2.9.3/html/tutorial/includeconvert.c
+#usr/share/doc/libxml2-2.9.4/html/tutorial/includeconvert.c
-#usr/share/doc/libxml2-2.9.3/html/tutorial/includegetattribute.c
+#usr/share/doc/libxml2-2.9.4/html/tutorial/includegetattribute.c
-#usr/share/doc/libxml2-2.9.3/html/tutorial/includekeyword.c
+#usr/share/doc/libxml2-2.9.4/html/tutorial/includekeyword.c
-#usr/share/doc/libxml2-2.9.3/html/tutorial/includexpath.c
+#usr/share/doc/libxml2-2.9.4/html/tutorial/includexpath.c
-#usr/share/doc/libxml2-2.9.3/html/tutorial/index.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/index.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/ix01.html
+#usr/share/doc/libxml2-2.9.4/html/tutorial/ix01.html
-#usr/share/doc/libxml2-2.9.3/html/tutorial/xmltutorial.pdf
+#usr/share/doc/libxml2-2.9.4/html/tutorial/xmltutorial.pdf
-#usr/share/doc/libxml2-2.9.3/html/w3c.png
+#usr/share/doc/libxml2-2.9.4/html/w3c.png
-#usr/share/doc/libxml2-2.9.3/html/writer.xml
+#usr/share/doc/libxml2-2.9.4/html/writer.xml
-#usr/share/doc/libxml2-2.9.3/html/xml.html
+#usr/share/doc/libxml2-2.9.4/html/xml.html
-#usr/share/doc/libxml2-2.9.3/html/xpath1.c
+#usr/share/doc/libxml2-2.9.4/html/xpath1.c
-#usr/share/doc/libxml2-2.9.3/html/xpath1.res
+#usr/share/doc/libxml2-2.9.4/html/xpath1.res
-#usr/share/doc/libxml2-2.9.3/html/xpath2.c
+#usr/share/doc/libxml2-2.9.4/html/xpath2.c
-#usr/share/doc/libxml2-2.9.3/html/xpath2.res
+#usr/share/doc/libxml2-2.9.4/html/xpath2.res
-#usr/share/doc/libxml2-python-2.9.3
+#usr/share/doc/libxml2-python-2.9.4
-#usr/share/doc/libxml2-python-2.9.3/TODO
+#usr/share/doc/libxml2-python-2.9.4/TODO
-#usr/share/doc/libxml2-python-2.9.3/examples
+#usr/share/doc/libxml2-python-2.9.4/examples
-#usr/share/doc/libxml2-python-2.9.3/examples/attribs.py
+#usr/share/doc/libxml2-python-2.9.4/examples/attribs.py
-#usr/share/doc/libxml2-python-2.9.3/examples/build.py
+#usr/share/doc/libxml2-python-2.9.4/examples/build.py
-#usr/share/doc/libxml2-python-2.9.3/examples/compareNodes.py
+#usr/share/doc/libxml2-python-2.9.4/examples/compareNodes.py
-#usr/share/doc/libxml2-python-2.9.3/examples/ctxterror.py
+#usr/share/doc/libxml2-python-2.9.4/examples/ctxterror.py
-#usr/share/doc/libxml2-python-2.9.3/examples/cutnpaste.py
+#usr/share/doc/libxml2-python-2.9.4/examples/cutnpaste.py
-#usr/share/doc/libxml2-python-2.9.3/examples/dtdvalid.py
+#usr/share/doc/libxml2-python-2.9.4/examples/dtdvalid.py
-#usr/share/doc/libxml2-python-2.9.3/examples/error.py
+#usr/share/doc/libxml2-python-2.9.4/examples/error.py
-#usr/share/doc/libxml2-python-2.9.3/examples/inbuf.py
+#usr/share/doc/libxml2-python-2.9.4/examples/inbuf.py
-#usr/share/doc/libxml2-python-2.9.3/examples/indexes.py
+#usr/share/doc/libxml2-python-2.9.4/examples/indexes.py
-#usr/share/doc/libxml2-python-2.9.3/examples/input_callback.py
+#usr/share/doc/libxml2-python-2.9.4/examples/input_callback.py
-#usr/share/doc/libxml2-python-2.9.3/examples/invalid.xml
+#usr/share/doc/libxml2-python-2.9.4/examples/invalid.xml
-#usr/share/doc/libxml2-python-2.9.3/examples/nsdel.py
+#usr/share/doc/libxml2-python-2.9.4/examples/nsdel.py
-#usr/share/doc/libxml2-python-2.9.3/examples/outbuf.py
+#usr/share/doc/libxml2-python-2.9.4/examples/outbuf.py
-#usr/share/doc/libxml2-python-2.9.3/examples/push.py
+#usr/share/doc/libxml2-python-2.9.4/examples/push.py
-#usr/share/doc/libxml2-python-2.9.3/examples/pushSAX.py
+#usr/share/doc/libxml2-python-2.9.4/examples/pushSAX.py
-#usr/share/doc/libxml2-python-2.9.3/examples/pushSAXhtml.py
+#usr/share/doc/libxml2-python-2.9.4/examples/pushSAXhtml.py
-#usr/share/doc/libxml2-python-2.9.3/examples/reader.py
+#usr/share/doc/libxml2-python-2.9.4/examples/reader.py
-#usr/share/doc/libxml2-python-2.9.3/examples/reader2.py
+#usr/share/doc/libxml2-python-2.9.4/examples/reader2.py
-#usr/share/doc/libxml2-python-2.9.3/examples/reader3.py
+#usr/share/doc/libxml2-python-2.9.4/examples/reader3.py
-#usr/share/doc/libxml2-python-2.9.3/examples/reader4.py
+#usr/share/doc/libxml2-python-2.9.4/examples/reader4.py
-#usr/share/doc/libxml2-python-2.9.3/examples/reader5.py
+#usr/share/doc/libxml2-python-2.9.4/examples/reader5.py
-#usr/share/doc/libxml2-python-2.9.3/examples/reader6.py
+#usr/share/doc/libxml2-python-2.9.4/examples/reader6.py
-#usr/share/doc/libxml2-python-2.9.3/examples/reader7.py
+#usr/share/doc/libxml2-python-2.9.4/examples/reader7.py
-#usr/share/doc/libxml2-python-2.9.3/examples/reader8.py
+#usr/share/doc/libxml2-python-2.9.4/examples/reader8.py
-#usr/share/doc/libxml2-python-2.9.3/examples/readererr.py
+#usr/share/doc/libxml2-python-2.9.4/examples/readererr.py
-#usr/share/doc/libxml2-python-2.9.3/examples/readernext.py
+#usr/share/doc/libxml2-python-2.9.4/examples/readernext.py
-#usr/share/doc/libxml2-python-2.9.3/examples/regexp.py
+#usr/share/doc/libxml2-python-2.9.4/examples/regexp.py
-#usr/share/doc/libxml2-python-2.9.3/examples/relaxng.py
+#usr/share/doc/libxml2-python-2.9.4/examples/relaxng.py
-#usr/share/doc/libxml2-python-2.9.3/examples/resolver.py
+#usr/share/doc/libxml2-python-2.9.4/examples/resolver.py
-#usr/share/doc/libxml2-python-2.9.3/examples/schema.py
+#usr/share/doc/libxml2-python-2.9.4/examples/schema.py
-#usr/share/doc/libxml2-python-2.9.3/examples/serialize.py
+#usr/share/doc/libxml2-python-2.9.4/examples/serialize.py
-#usr/share/doc/libxml2-python-2.9.3/examples/sync.py
+#usr/share/doc/libxml2-python-2.9.4/examples/sync.py
-#usr/share/doc/libxml2-python-2.9.3/examples/test.dtd
+#usr/share/doc/libxml2-python-2.9.4/examples/test.dtd
-#usr/share/doc/libxml2-python-2.9.3/examples/thread2.py
+#usr/share/doc/libxml2-python-2.9.4/examples/thread2.py
-#usr/share/doc/libxml2-python-2.9.3/examples/tst.py
+#usr/share/doc/libxml2-python-2.9.4/examples/tst.py
-#usr/share/doc/libxml2-python-2.9.3/examples/tst.xml
+#usr/share/doc/libxml2-python-2.9.4/examples/tst.xml
-#usr/share/doc/libxml2-python-2.9.3/examples/tstLastError.py
+#usr/share/doc/libxml2-python-2.9.4/examples/tstLastError.py
-#usr/share/doc/libxml2-python-2.9.3/examples/tstURI.py
+#usr/share/doc/libxml2-python-2.9.4/examples/tstURI.py
-#usr/share/doc/libxml2-python-2.9.3/examples/tstmem.py
+#usr/share/doc/libxml2-python-2.9.4/examples/tstmem.py
-#usr/share/doc/libxml2-python-2.9.3/examples/tstxpath.py
+#usr/share/doc/libxml2-python-2.9.4/examples/tstxpath.py
-#usr/share/doc/libxml2-python-2.9.3/examples/valid.xml
+#usr/share/doc/libxml2-python-2.9.4/examples/valid.xml
-#usr/share/doc/libxml2-python-2.9.3/examples/validDTD.py
+#usr/share/doc/libxml2-python-2.9.4/examples/validDTD.py
-#usr/share/doc/libxml2-python-2.9.3/examples/validRNG.py
+#usr/share/doc/libxml2-python-2.9.4/examples/validRNG.py
-#usr/share/doc/libxml2-python-2.9.3/examples/validSchemas.py
+#usr/share/doc/libxml2-python-2.9.4/examples/validSchemas.py
-#usr/share/doc/libxml2-python-2.9.3/examples/validate.py
+#usr/share/doc/libxml2-python-2.9.4/examples/validate.py
-#usr/share/doc/libxml2-python-2.9.3/examples/walker.py
+#usr/share/doc/libxml2-python-2.9.4/examples/walker.py
-#usr/share/doc/libxml2-python-2.9.3/examples/xpath.py
+#usr/share/doc/libxml2-python-2.9.4/examples/xpath.py
-#usr/share/doc/libxml2-python-2.9.3/examples/xpathext.py
+#usr/share/doc/libxml2-python-2.9.4/examples/xpathext.py
-#usr/share/doc/libxml2-python-2.9.3/examples/xpathleak.py
+#usr/share/doc/libxml2-python-2.9.4/examples/xpathleak.py
-#usr/share/doc/libxml2-python-2.9.3/examples/xpathns.py
+#usr/share/doc/libxml2-python-2.9.4/examples/xpathns.py
-#usr/share/doc/libxml2-python-2.9.3/examples/xpathret.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

config/rootfiles/common/misc-progs

@@ -1,12 +1,14 @@
 usr/local/bin/addonctrl
 #usr/local/bin/applejuicectrl
 usr/local/bin/backupctrl
+usr/local/bin/captivectrl
 #usr/local/bin/clamavctrl
 usr/local/bin/collectdctrl
 usr/local/bin/ddnsctrl
 usr/local/bin/dhcpctrl
 usr/local/bin/extrahdctrl
 usr/local/bin/fireinfoctrl
+usr/local/bin/firewallctrl
 usr/local/bin/getconntracktable
 usr/local/bin/getipstat
 #usr/local/bin/iowrap
@@ -16,8 +18,6 @@ usr/local/bin/launch-ether-wake
 usr/local/bin/logwatch
 #usr/local/bin/mpfirectrl
 usr/local/bin/openvpnctrl
-#usr/local/bin/outgoingfwctrl
-usr/local/bin/firewallctrl
 usr/local/bin/pakfire
 usr/local/bin/qosctrl
 usr/local/bin/rebuildhosts
@@ -36,6 +36,8 @@ usr/local/bin/unboundctrl
 usr/local/bin/updxlratorctrl
 usr/local/bin/upnpctrl
 usr/local/bin/urlfilterctrl
+#usr/local/bin/wiohelper
+#usr/local/bin/wioscan
 usr/local/bin/wirelessclient
 usr/local/bin/wirelessctrl
 #usr/local/bin/wlanapctrl

config/rootfiles/common/paxctl

@@ -0,0 +1,2 @@
+sbin/paxctl
+#usr/share/man/man1/paxctl.1

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.8
+usr/lib/libpcre.so.1.2.9
 #usr/lib/libpcre16.la
 usr/lib/libpcre16.so
 usr/lib/libpcre16.so.0
-usr/lib/libpcre16.so.0.2.8
+usr/lib/libpcre16.so.0.2.9
 #usr/lib/libpcre32.la
 usr/lib/libpcre32.so
 usr/lib/libpcre32.so.0
-usr/lib/libpcre32.so.0.0.8
+usr/lib/libpcre32.so.0.0.9
 #usr/lib/libpcrecpp.la
 usr/lib/libpcrecpp.so
 usr/lib/libpcrecpp.so.0
@@ -26,78 +26,78 @@ usr/lib/libpcrecpp.so.0.0.1
 #usr/lib/libpcreposix.la
 usr/lib/libpcreposix.so
 usr/lib/libpcreposix.so.0
-usr/lib/libpcreposix.so.0.0.4
+usr/lib/libpcreposix.so.0.0.5
 #usr/lib/pkgconfig/libpcre.pc
 #usr/lib/pkgconfig/libpcre16.pc
 #usr/lib/pkgconfig/libpcre32.pc
 #usr/lib/pkgconfig/libpcrecpp.pc
 #usr/lib/pkgconfig/libpcreposix.pc
-#usr/share/doc/pcre-pcre-8.40
+#usr/share/doc/pcre-pcre-8.41
-#usr/share/doc/pcre-pcre-8.40/AUTHORS
+#usr/share/doc/pcre-pcre-8.41/AUTHORS
-#usr/share/doc/pcre-pcre-8.40/COPYING
+#usr/share/doc/pcre-pcre-8.41/COPYING
-#usr/share/doc/pcre-pcre-8.40/ChangeLog
+#usr/share/doc/pcre-pcre-8.41/ChangeLog
-#usr/share/doc/pcre-pcre-8.40/LICENCE
+#usr/share/doc/pcre-pcre-8.41/LICENCE
-#usr/share/doc/pcre-pcre-8.40/NEWS
+#usr/share/doc/pcre-pcre-8.41/NEWS
-#usr/share/doc/pcre-pcre-8.40/README
+#usr/share/doc/pcre-pcre-8.41/README
-#usr/share/doc/pcre-pcre-8.40/html
+#usr/share/doc/pcre-pcre-8.41/html
-#usr/share/doc/pcre-pcre-8.40/html/NON-AUTOTOOLS-BUILD.txt
+#usr/share/doc/pcre-pcre-8.41/html/NON-AUTOTOOLS-BUILD.txt
-#usr/share/doc/pcre-pcre-8.40/html/README.txt
+#usr/share/doc/pcre-pcre-8.41/html/README.txt
-#usr/share/doc/pcre-pcre-8.40/html/index.html
+#usr/share/doc/pcre-pcre-8.41/html/index.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre-config.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre-config.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre16.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre16.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre32.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre32.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_assign_jit_stack.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_assign_jit_stack.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_compile.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_compile.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_compile2.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_compile2.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_config.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_config.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_copy_named_substring.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_copy_named_substring.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_copy_substring.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_copy_substring.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_dfa_exec.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_dfa_exec.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_exec.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_exec.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_free_study.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_free_study.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_free_substring.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_free_substring.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_free_substring_list.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_free_substring_list.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_fullinfo.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_fullinfo.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_get_named_substring.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_get_named_substring.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_get_stringnumber.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_get_stringnumber.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_get_stringtable_entries.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_get_stringtable_entries.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_get_substring.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_get_substring.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_get_substring_list.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_get_substring_list.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_jit_exec.html
+#usr/share/doc/pcre-pcre-8.41/html/pcre_jit_exec.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_jit_stack_alloc.html
+#usr/share/doc/pcre-pcre-8.41/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.41/html/pcre_jit_stack_free.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_maketables.html
+#usr/share/doc/pcre-pcre-8.41/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.41/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.41/html/pcre_refcount.html
-#usr/share/doc/pcre-pcre-8.40/html/pcre_study.html
+#usr/share/doc/pcre-pcre-8.41/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.41/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.41/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.41/html/pcre_version.html
-#usr/share/doc/pcre-pcre-8.40/html/pcreapi.html
+#usr/share/doc/pcre-pcre-8.41/html/pcreapi.html
-#usr/share/doc/pcre-pcre-8.40/html/pcrebuild.html
+#usr/share/doc/pcre-pcre-8.41/html/pcrebuild.html
-#usr/share/doc/pcre-pcre-8.40/html/pcrecallout.html
+#usr/share/doc/pcre-pcre-8.41/html/pcrecallout.html
-#usr/share/doc/pcre-pcre-8.40/html/pcrecompat.html
+#usr/share/doc/pcre-pcre-8.41/html/pcrecompat.html
-#usr/share/doc/pcre-pcre-8.40/html/pcrecpp.html
+#usr/share/doc/pcre-pcre-8.41/html/pcrecpp.html
-#usr/share/doc/pcre-pcre-8.40/html/pcredemo.html
+#usr/share/doc/pcre-pcre-8.41/html/pcredemo.html
-#usr/share/doc/pcre-pcre-8.40/html/pcregrep.html
+#usr/share/doc/pcre-pcre-8.41/html/pcregrep.html
-#usr/share/doc/pcre-pcre-8.40/html/pcrejit.html
+#usr/share/doc/pcre-pcre-8.41/html/pcrejit.html
-#usr/share/doc/pcre-pcre-8.40/html/pcrelimits.html
+#usr/share/doc/pcre-pcre-8.41/html/pcrelimits.html
-#usr/share/doc/pcre-pcre-8.40/html/pcrematching.html
+#usr/share/doc/pcre-pcre-8.41/html/pcrematching.html
-#usr/share/doc/pcre-pcre-8.40/html/pcrepartial.html
+#usr/share/doc/pcre-pcre-8.41/html/pcrepartial.html
-#usr/share/doc/pcre-pcre-8.40/html/pcrepattern.html
+#usr/share/doc/pcre-pcre-8.41/html/pcrepattern.html
-#usr/share/doc/pcre-pcre-8.40/html/pcreperform.html
+#usr/share/doc/pcre-pcre-8.41/html/pcreperform.html
-#usr/share/doc/pcre-pcre-8.40/html/pcreposix.html
+#usr/share/doc/pcre-pcre-8.41/html/pcreposix.html
-#usr/share/doc/pcre-pcre-8.40/html/pcreprecompile.html
+#usr/share/doc/pcre-pcre-8.41/html/pcreprecompile.html
-#usr/share/doc/pcre-pcre-8.40/html/pcresample.html
+#usr/share/doc/pcre-pcre-8.41/html/pcresample.html
-#usr/share/doc/pcre-pcre-8.40/html/pcrestack.html
+#usr/share/doc/pcre-pcre-8.41/html/pcrestack.html
-#usr/share/doc/pcre-pcre-8.40/html/pcresyntax.html
+#usr/share/doc/pcre-pcre-8.41/html/pcresyntax.html
-#usr/share/doc/pcre-pcre-8.40/html/pcretest.html
+#usr/share/doc/pcre-pcre-8.41/html/pcretest.html
-#usr/share/doc/pcre-pcre-8.40/html/pcreunicode.html
+#usr/share/doc/pcre-pcre-8.41/html/pcreunicode.html
-#usr/share/doc/pcre-pcre-8.40/pcre-config.txt
+#usr/share/doc/pcre-pcre-8.41/pcre-config.txt
-#usr/share/doc/pcre-pcre-8.40/pcre.txt
+#usr/share/doc/pcre-pcre-8.41/pcre.txt
-#usr/share/doc/pcre-pcre-8.40/pcregrep.txt
+#usr/share/doc/pcre-pcre-8.41/pcregrep.txt
-#usr/share/doc/pcre-pcre-8.40/pcretest.txt
+#usr/share/doc/pcre-pcre-8.41/pcretest.txt
 #usr/share/man/man1/pcre-config.1
 #usr/share/man/man1/pcregrep.1
 #usr/share/man/man1/pcretest.1

config/rootfiles/common/perl-Font-TTF

@@ -0,0 +1,164 @@
+#usr/lib/perl5/site_perl/5.12.3/Font
+#usr/lib/perl5/site_perl/5.12.3/Font/TTF
+usr/lib/perl5/site_perl/5.12.3/Font/TTF.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/AATKern.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/AATutils.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Anchor.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Bsln.pm
+#usr/lib/perl5/site_perl/5.12.3/Font/TTF/Changes_old.txt
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Cmap.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Coverage.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Cvt_.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/DSIG.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Delta.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Dumper.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/EBDT.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/EBLC.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Fdsc.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Feat.pm
+#usr/lib/perl5/site_perl/5.12.3/Font/TTF/Features
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Features/Cvar.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Features/Size.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Features/Sset.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Fmtx.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Font.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Fpgm.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/GDEF.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/GPOS.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/GSUB.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Glat.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Gloc.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Glyf.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Glyph.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/GrFeat.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Hdmx.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Head.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Hhea.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Hmtx.pm
+#usr/lib/perl5/site_perl/5.12.3/Font/TTF/Kern
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Kern.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Kern/ClassArray.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Kern/CompactClassArray.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Kern/OrderedList.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Kern/StateTable.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Kern/Subtable.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/LTSH.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Loca.pm
+#usr/lib/perl5/site_perl/5.12.3/Font/TTF/Manual.pod
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Maxp.pm
+#usr/lib/perl5/site_perl/5.12.3/Font/TTF/Mort
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Mort.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Mort/Chain.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Mort/Contextual.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Mort/Insertion.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Mort/Ligature.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Mort/Noncontextual.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Mort/Rearrangement.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Mort/Subtable.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Name.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/OS_2.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/OTTags.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/OldCmap.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/OldMort.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/PCLT.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/PSNames.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Post.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Prep.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Prop.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Segarr.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Silf.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Sill.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Table.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Ttc.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Ttopen.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Useall.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Utils.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Vhea.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Vmtx.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Win32.pm
+#usr/lib/perl5/site_perl/5.12.3/Font/TTF/Woff
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Woff.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Woff/MetaData.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/Woff/PrivateData.pm
+usr/lib/perl5/site_perl/5.12.3/Font/TTF/XMLparse.pm
+#usr/lib/perl5/site_perl/5.12.3/ttfmod.pl
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Font
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Font/TTF
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Font/TTF/.packlist
+#usr/share/man/man3/Font::TTF.3
+#usr/share/man/man3/Font::TTF::AATKern.3
+#usr/share/man/man3/Font::TTF::AATutils.3
+#usr/share/man/man3/Font::TTF::Anchor.3
+#usr/share/man/man3/Font::TTF::Bsln.3
+#usr/share/man/man3/Font::TTF::Cmap.3
+#usr/share/man/man3/Font::TTF::Coverage.3
+#usr/share/man/man3/Font::TTF::Cvt_.3
+#usr/share/man/man3/Font::TTF::DSIG.3
+#usr/share/man/man3/Font::TTF::Delta.3
+#usr/share/man/man3/Font::TTF::Dumper.3
+#usr/share/man/man3/Font::TTF::EBDT.3
+#usr/share/man/man3/Font::TTF::EBLC.3
+#usr/share/man/man3/Font::TTF::Fdsc.3
+#usr/share/man/man3/Font::TTF::Feat.3
+#usr/share/man/man3/Font::TTF::Features::Cvar.3
+#usr/share/man/man3/Font::TTF::Features::Size.3
+#usr/share/man/man3/Font::TTF::Features::Sset.3
+#usr/share/man/man3/Font::TTF::Fmtx.3
+#usr/share/man/man3/Font::TTF::Font.3
+#usr/share/man/man3/Font::TTF::Fpgm.3
+#usr/share/man/man3/Font::TTF::GDEF.3
+#usr/share/man/man3/Font::TTF::GPOS.3
+#usr/share/man/man3/Font::TTF::GSUB.3
+#usr/share/man/man3/Font::TTF::Glat.3
+#usr/share/man/man3/Font::TTF::Gloc.3
+#usr/share/man/man3/Font::TTF::Glyf.3
+#usr/share/man/man3/Font::TTF::Glyph.3
+#usr/share/man/man3/Font::TTF::GrFeat.3
+#usr/share/man/man3/Font::TTF::Hdmx.3
+#usr/share/man/man3/Font::TTF::Head.3
+#usr/share/man/man3/Font::TTF::Hhea.3
+#usr/share/man/man3/Font::TTF::Hmtx.3
+#usr/share/man/man3/Font::TTF::Kern.3
+#usr/share/man/man3/Font::TTF::Kern::ClassArray.3
+#usr/share/man/man3/Font::TTF::Kern::CompactClassArray.3
+#usr/share/man/man3/Font::TTF::Kern::OrderedList.3
+#usr/share/man/man3/Font::TTF::Kern::StateTable.3
+#usr/share/man/man3/Font::TTF::Kern::Subtable.3
+#usr/share/man/man3/Font::TTF::LTSH.3
+#usr/share/man/man3/Font::TTF::Loca.3
+#usr/share/man/man3/Font::TTF::Manual.3
+#usr/share/man/man3/Font::TTF::Maxp.3
+#usr/share/man/man3/Font::TTF::Mort.3
+#usr/share/man/man3/Font::TTF::Mort::Chain.3
+#usr/share/man/man3/Font::TTF::Mort::Contextual.3
+#usr/share/man/man3/Font::TTF::Mort::Insertion.3
+#usr/share/man/man3/Font::TTF::Mort::Ligature.3
+#usr/share/man/man3/Font::TTF::Mort::Noncontextual.3
+#usr/share/man/man3/Font::TTF::Mort::Rearrangement.3
+#usr/share/man/man3/Font::TTF::Mort::Subtable.3
+#usr/share/man/man3/Font::TTF::Name.3
+#usr/share/man/man3/Font::TTF::OS_2.3
+#usr/share/man/man3/Font::TTF::OTTags.3
+#usr/share/man/man3/Font::TTF::OldCmap.3
+#usr/share/man/man3/Font::TTF::OldMort.3
+#usr/share/man/man3/Font::TTF::PCLT.3
+#usr/share/man/man3/Font::TTF::PSNames.3
+#usr/share/man/man3/Font::TTF::Post.3
+#usr/share/man/man3/Font::TTF::Prep.3
+#usr/share/man/man3/Font::TTF::Prop.3
+#usr/share/man/man3/Font::TTF::Segarr.3
+#usr/share/man/man3/Font::TTF::Silf.3
+#usr/share/man/man3/Font::TTF::Sill.3
+#usr/share/man/man3/Font::TTF::Table.3
+#usr/share/man/man3/Font::TTF::Ttc.3
+#usr/share/man/man3/Font::TTF::Ttopen.3
+#usr/share/man/man3/Font::TTF::Useall.3
+#usr/share/man/man3/Font::TTF::Utils.3
+#usr/share/man/man3/Font::TTF::Vhea.3
+#usr/share/man/man3/Font::TTF::Vmtx.3
+#usr/share/man/man3/Font::TTF::Win32.3
+#usr/share/man/man3/Font::TTF::Woff.3
+#usr/share/man/man3/Font::TTF::Woff::MetaData.3
+#usr/share/man/man3/Font::TTF::Woff::PrivateData.3
+#usr/share/man/man3/Font::TTF::XMLparse.3
+#usr/share/man/man3/ttfmod.3

config/rootfiles/common/perl-IO-String

@@ -0,0 +1,4 @@
+usr/lib/perl5/site_perl/5.12.3/IO/String.pm
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/IO/String
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/IO/String/.packlist
+#usr/share/man/man3/IO::String.3

config/rootfiles/common/perl-PDF-API2

@@ -124,7 +124,9 @@ usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Image/GIF.pm
 usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Image/JPEG.pm
 usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Image/PNG.pm
 usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Image/PNM.pm
+usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Image/TIFF
 usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Image/TIFF.pm
+usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/XObject/Image/TIFF/File.pm
 usr/lib/perl5/site_perl/5.12.3/PDF/API2/Resource/uniglyph.txt
 usr/lib/perl5/site_perl/5.12.3/PDF/API2/UniWrap.pm
 usr/lib/perl5/site_perl/5.12.3/PDF/API2/Util.pm

config/rootfiles/common/php

@@ -522,9 +522,9 @@ usr/lib/php/XML/Util.php
 usr/lib/php/doc/XML_Util/examples/example.php
 usr/lib/php/doc/XML_Util/examples/example2.php
 #usr/lib/php/extensions
-#usr/lib/php/extensions/no-debug-non-zts-20090626
+#usr/lib/php/extensions/no-debug-zts-20090626
-usr/lib/php/extensions/no-debug-non-zts-20090626/dba.so
+usr/lib/php/extensions/no-debug-zts-20090626/dba.so
-usr/lib/php/extensions/no-debug-non-zts-20090626/idn.so
+usr/lib/php/extensions/no-debug-zts-20090626/idn.so
 #usr/lib/php/pearcmd.php
 #usr/lib/php/peclcmd.php
 #usr/lib/php/test
@@ -557,4 +557,3 @@ usr/lib/php/extensions/no-debug-non-zts-20090626/idn.so
 #usr/man/man1/php-config.1
 #usr/man/man1/php.1
 #usr/man/man1/phpize.1
-etc/httpd/conf/conf.d/php5.conf

config/rootfiles/common/snort

@@ -27,10 +27,10 @@ usr/bin/u2spewfoo
 #usr/include/snort/dynamic_output/snort_debug.h
 #usr/include/snort/dynamic_output/stream_api.h
 #usr/include/snort/dynamic_preproc
+#usr/include/snort/dynamic_preproc/appdata_adjuster.h
 #usr/include/snort/dynamic_preproc/bitop.h
 #usr/include/snort/dynamic_preproc/cpuclock.h
 #usr/include/snort/dynamic_preproc/file_api.h
-#usr/include/snort/dynamic_preproc/file_mail_common.h
 #usr/include/snort/dynamic_preproc/idle_processing.h
 #usr/include/snort/dynamic_preproc/ipv6_port.h
 #usr/include/snort/dynamic_preproc/mempool.h
@@ -40,6 +40,8 @@ usr/bin/u2spewfoo
 #usr/include/snort/dynamic_preproc/perf_indicators.h
 #usr/include/snort/dynamic_preproc/preprocids.h
 #usr/include/snort/dynamic_preproc/profiler.h
+#usr/include/snort/dynamic_preproc/reg_test.h
+#usr/include/snort/dynamic_preproc/reload_api.h
 #usr/include/snort/dynamic_preproc/segment_mem.h
 #usr/include/snort/dynamic_preproc/session_api.h
 #usr/include/snort/dynamic_preproc/sfPolicy.h
@@ -60,14 +62,12 @@ usr/bin/u2spewfoo
 #usr/include/snort/dynamic_preproc/sf_snort_plugin_api.h
 #usr/include/snort/dynamic_preproc/sfcommon.h
 #usr/include/snort/dynamic_preproc/sfcontrol.h
-#usr/include/snort/dynamic_preproc/sfdebug.h
 #usr/include/snort/dynamic_preproc/sfrt.h
 #usr/include/snort/dynamic_preproc/sfrt_dir.h
 #usr/include/snort/dynamic_preproc/sfrt_flat.h
 #usr/include/snort/dynamic_preproc/sfrt_flat_dir.h
 #usr/include/snort/dynamic_preproc/sfrt_trie.h
 #usr/include/snort/dynamic_preproc/sidechannel_define.h
-#usr/include/snort/dynamic_preproc/sip_common.h
 #usr/include/snort/dynamic_preproc/snort_bounds.h
 #usr/include/snort/dynamic_preproc/snort_debug.h
 #usr/include/snort/dynamic_preproc/ssl.h
@@ -88,6 +88,8 @@ usr/lib/snort/dynamic_output
 usr/lib/snort/dynamic_preproc
 #usr/lib/snort/dynamic_preproc/libsf_dynamic_preproc.a
 #usr/lib/snort/dynamic_preproc/libsf_dynamic_preproc.la
+#usr/lib/snort/dynamic_preproc/libsf_dynamic_utils.a
+#usr/lib/snort/dynamic_preproc/libsf_dynamic_utils.la
 usr/lib/snort_dynamicengine
 #usr/lib/snort_dynamicengine/libsf_engine.a
 #usr/lib/snort_dynamicengine/libsf_engine.la
@@ -215,7 +217,6 @@ usr/sbin/snort
 #usr/share/doc/snort/README.reload
 #usr/share/doc/snort/README.reputation
 #usr/share/doc/snort/README.sensitive_data
-#usr/share/doc/snort/README.session
 #usr/share/doc/snort/README.sfportscan
 #usr/share/doc/snort/README.sip
 #usr/share/doc/snort/README.ssh

config/rootfiles/common/stage2

@@ -69,6 +69,7 @@ run
 #sbin
 #srv
 #usr/bin
+usr/bin/captive-cleanup
 #usr/bin/perl
 #usr/include
 #usr/lib
@@ -90,7 +91,6 @@ usr/local/bin/connscheduler
 usr/local/bin/consort.sh
 usr/local/bin/convert-ovpn
 usr/local/bin/hddshutdown
-usr/local/bin/httpscert
 usr/local/bin/makegraphs
 usr/local/bin/qosd
 usr/local/bin/readhash

config/rootfiles/common/strongswan

@@ -71,6 +71,7 @@ etc/strongswan.d/starter.conf
 etc/strongswan.d/swanctl.conf
 #etc/swanctl
 etc/swanctl/bliss
+etc/swanctl/conf.d
 etc/swanctl/ecdsa
 etc/swanctl/pkcs12
 etc/swanctl/pkcs8

config/rootfiles/common/ubuntu-font-family

@@ -0,0 +1,13 @@
+usr/share/fonts/Ubuntu-B.ttf
+usr/share/fonts/Ubuntu-BI.ttf
+usr/share/fonts/Ubuntu-C.ttf
+usr/share/fonts/Ubuntu-L.ttf
+usr/share/fonts/Ubuntu-LI.ttf
+usr/share/fonts/Ubuntu-M.ttf
+usr/share/fonts/Ubuntu-MI.ttf
+usr/share/fonts/Ubuntu-R.ttf
+usr/share/fonts/Ubuntu-RI.ttf
+usr/share/fonts/UbuntuMono-B.ttf
+usr/share/fonts/UbuntuMono-BI.ttf
+usr/share/fonts/UbuntuMono-R.ttf
+usr/share/fonts/UbuntuMono-RI.ttf

config/rootfiles/common/unbound

@@ -11,7 +11,7 @@ etc/unbound/unbound.conf
 #usr/lib/libunbound.la
 #usr/lib/libunbound.so
 usr/lib/libunbound.so.2
-usr/lib/libunbound.so.2.5.1
+usr/lib/libunbound.so.2.5.6
 usr/sbin/unbound
 usr/sbin/unbound-anchor
 usr/sbin/unbound-checkconf

config/rootfiles/common/web-user-interface

@@ -8,6 +8,11 @@ srv/web/ipfire/cgi-bin/aliases.cgi
 srv/web/ipfire/cgi-bin/atm-status.cgi
 srv/web/ipfire/cgi-bin/backup.cgi
 srv/web/ipfire/cgi-bin/bluetooth.cgi
+#srv/web/ipfire/cgi-bin/captive
+srv/web/ipfire/cgi-bin/captive.cgi
+srv/web/ipfire/cgi-bin/captive/index.cgi
+srv/web/ipfire/cgi-bin/captive/logo.cgi
+srv/web/ipfire/cgi-bin/captive/redirect.cgi
 srv/web/ipfire/cgi-bin/chpasswd.cgi
 srv/web/ipfire/cgi-bin/connections.cgi
 srv/web/ipfire/cgi-bin/connscheduler.cgi
@@ -23,8 +28,8 @@ srv/web/ipfire/cgi-bin/fireinfo.cgi
 srv/web/ipfire/cgi-bin/firewall.cgi
 srv/web/ipfire/cgi-bin/fwhosts.cgi
 srv/web/ipfire/cgi-bin/geoip-block.cgi
-#srv/web/ipfire/cgi-bin/guardian.cgi
 srv/web/ipfire/cgi-bin/gpl.cgi
+#srv/web/ipfire/cgi-bin/guardian.cgi
 srv/web/ipfire/cgi-bin/gui.cgi
 srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
 srv/web/ipfire/cgi-bin/hosts.cgi
@@ -89,8 +94,20 @@ srv/web/ipfire/cgi-bin/wirelessclient.cgi
 srv/web/ipfire/cgi-bin/wlanap.cgi
 #srv/web/ipfire/html
 srv/web/ipfire/html/blob.gif
+#srv/web/ipfire/html/captive
+#srv/web/ipfire/html/captive/assets
+srv/web/ipfire/html/captive/assets/Ubuntu-L.ttf
+srv/web/ipfire/html/captive/assets/Ubuntu-M.ttf
+srv/web/ipfire/html/captive/assets/Ubuntu-R.ttf
+srv/web/ipfire/html/captive/assets/bootstrap-grid.min.css
+srv/web/ipfire/html/captive/assets/bootstrap-grid.min.css.map
+srv/web/ipfire/html/captive/assets/bootstrap-reboot.min.css
+srv/web/ipfire/html/captive/assets/bootstrap-reboot.min.css.map
+srv/web/ipfire/html/captive/assets/captive.css
+srv/web/ipfire/html/captive/assets/favicon.ico
+srv/web/ipfire/html/captive/assets/ipfire.png
+srv/web/ipfire/html/captive/template.html
 srv/web/ipfire/html/clwarn.cgi
-srv/web/ipfire/html/dial.cgi
 srv/web/ipfire/html/favicon.ico
 #srv/web/ipfire/html/images
 srv/web/ipfire/html/images/IPFire.png

config/rootfiles/common/x86_64/stage2

@@ -70,6 +70,7 @@ run
 #sbin
 #srv
 #usr/bin
+usr/bin/captive-cleanup
 #usr/bin/perl
 #usr/include
 #usr/lib
@@ -92,7 +93,6 @@ usr/local/bin/connscheduler
 usr/local/bin/consort.sh
 usr/local/bin/convert-ovpn
 usr/local/bin/hddshutdown
-usr/local/bin/httpscert
 usr/local/bin/makegraphs
 usr/local/bin/qosd
 usr/local/bin/readhash

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

config/rootfiles/common/xz

@@ -41,7 +41,7 @@ usr/bin/xzmore
 #usr/lib/liblzma.la
 usr/lib/liblzma.so
 usr/lib/liblzma.so.5
-usr/lib/liblzma.so.5.2.2
+usr/lib/liblzma.so.5.2.3
 #usr/lib/pkgconfig/liblzma.pc
 #usr/share/doc/xz
 #usr/share/doc/xz/AUTHORS

config/rootfiles/core/117/filelists/files

@@ -0,0 +1,18 @@
+etc/system-release
+etc/issue
+etc/ssl/certs/ca-bundle.crt
+etc/ssl/certs/ca-bundle.trust.crt
+opt/pakfire/lib/functions.pl
+srv/web/ipfire/cgi-bin/country.cgi
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogcountry.dat
+srv/web/ipfire/cgi-bin/logs.cgi/firewalllogip.dat
+srv/web/ipfire/cgi-bin/logs.cgi/showrequestfromcountry.dat
+srv/web/ipfire/cgi-bin/routing.cgi
+srv/web/ipfire/html/themes/darkdos/include/functions.pl
+srv/web/ipfire/html/themes/ipfire-legacy/include/functions.pl
+srv/web/ipfire/html/themes/ipfire/include/functions.pl
+srv/web/ipfire/html/themes/maniac/include/functions.pl
+usr/local/bin/captivectrl
+var/ipfire/geoip-functions.pl
+var/ipfire/network-functions.pl

config/rootfiles/core/117/update.sh

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

config/rootfiles/oldcore/111/exclude

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