diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index d3d725131..298e68c5a 100644
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -516,12 +516,14 @@ sub checksubnets
 		&General::readhasharray("${General::swroot}/vpn/config", \%ipsecconf);
 		foreach my $key (keys %ipsecconf){
 			if ($ipsecconf{$key}[11] ne ''){
-				my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]);
-				$ipsecsub=&iporsubtodec($ipsecsub);
-				if($ipsecconf{$key}[1] ne $ccdname){
-					if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){
-						$errormessage=$Lang::tr{'ccd err isipsecnet'}." Name:  $ipsecconf{$key}[1]";
-						return $errormessage;
+				foreach my $ipsecsubitem (split(/\|/, $ipsecconf{$key}[11])) {
+					my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]);
+					$ipsecsub=&iporsubtodec($ipsecsub);
+					if($ipsecconf{$key}[1] ne $ccdname){
+						if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){
+							$errormessage=$Lang::tr{'ccd err isipsecnet'}." Name:  $ipsecconf{$key}[1]";
+							return $errormessage;
+						}
 					}
 				}
 			}
diff --git a/config/menu/30-network.menu b/config/menu/30-network.menu
index c50508f81..8e1336a3b 100644
--- a/config/menu/30-network.menu
+++ b/config/menu/30-network.menu
@@ -3,9 +3,9 @@
 			        'title' => "$Lang::tr{'net config'}",
 			        'enabled' => 0,
 			        };
-    $subnetwork->{'20.proxy'} = {'caption' => 'Webproxy',
+    $subnetwork->{'20.proxy'} = {'caption' => "$Lang::tr{'web proxy'}",
 			        'uri' => '/cgi-bin/proxy.cgi',
-			        'title' => "Webproxy",
+			        'title' => "$Lang::tr{'web proxy'}",
 			        'enabled' => 1,
 			        };
     $subnetwork->{'21.urlfilter'} = {'caption' => $Lang::tr{'url filter'},
diff --git a/config/qemu/65-kvm.rules b/config/qemu/65-kvm.rules
new file mode 100644
index 000000000..569ded9f9
--- /dev/null
+++ b/config/qemu/65-kvm.rules
@@ -0,0 +1,2 @@
+KERNEL=="kvm", GROUP="kvm", MODE="0660"
+KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net"
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index bc253c045..70ed38bfd 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -45,6 +45,7 @@ etc/rc.d/init.d/ipsec
 #etc/rc.d/init.d/lcdproc
 #etc/rc.d/init.d/lcr
 etc/rc.d/init.d/leds
+#etc/rc.d/init.d/libvirtd
 etc/rc.d/init.d/localnet
 etc/rc.d/init.d/mISDN
 #etc/rc.d/init.d/mediatomb
diff --git a/config/rootfiles/common/armv5tel/linux-rpi b/config/rootfiles/common/armv5tel/linux-rpi
index dbde8c05b..1794891f1 100644
--- a/config/rootfiles/common/armv5tel/linux-rpi
+++ b/config/rootfiles/common/armv5tel/linux-rpi
@@ -45,6 +45,7 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/deflate.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/ecb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/fcrypt.ko
+#lib/modules/KVER-ipfire-rpi/kernel/crypto/gcm.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/gf128mul.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/ghash-generic.ko
 #lib/modules/KVER-ipfire-rpi/kernel/crypto/khazad.ko
@@ -981,10 +982,6 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/speakup/speakup_soft.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/vt6656
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/vt6656/vt6656_stage.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/winbond
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/winbond/w35und.ko
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/wlan-ng
-#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/wlan-ng/prism2_usb.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/uio
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/uio/uio.ko
 #lib/modules/KVER-ipfire-rpi/kernel/drivers/uio/uio_pdrv_genirq.ko
@@ -1252,7 +1249,6 @@ lib/modules/KVER-ipfire-rpi
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_SYNPROXY.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_ULOG.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_ah.ko
-#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_ipp2p.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_rpfilter.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/iptable_filter.ko
 #lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/iptable_mangle.ko
diff --git a/config/rootfiles/common/automake b/config/rootfiles/common/automake
index 0c19dc346..3568fe700 100644
--- a/config/rootfiles/common/automake
+++ b/config/rootfiles/common/automake
@@ -1,133 +1,130 @@
 #usr/bin/aclocal
-#usr/bin/aclocal-1.12
+#usr/bin/aclocal-1.15
 #usr/bin/automake
-#usr/bin/automake-1.12
-#usr/share/aclocal-1.12
-#usr/share/aclocal-1.12/amversion.m4
-#usr/share/aclocal-1.12/ar-lib.m4
-#usr/share/aclocal-1.12/as.m4
-#usr/share/aclocal-1.12/auxdir.m4
-#usr/share/aclocal-1.12/ccstdc.m4
-#usr/share/aclocal-1.12/cond-if.m4
-#usr/share/aclocal-1.12/cond.m4
-#usr/share/aclocal-1.12/depend.m4
-#usr/share/aclocal-1.12/depout.m4
-#usr/share/aclocal-1.12/dmalloc.m4
-#usr/share/aclocal-1.12/gcj.m4
-#usr/share/aclocal-1.12/header.m4
-#usr/share/aclocal-1.12/init.m4
-#usr/share/aclocal-1.12/install-sh.m4
-#usr/share/aclocal-1.12/lead-dot.m4
-#usr/share/aclocal-1.12/lex.m4
-#usr/share/aclocal-1.12/lispdir.m4
-#usr/share/aclocal-1.12/maintainer.m4
-#usr/share/aclocal-1.12/make.m4
-#usr/share/aclocal-1.12/minuso.m4
-#usr/share/aclocal-1.12/missing.m4
-#usr/share/aclocal-1.12/mkdirp.m4
-#usr/share/aclocal-1.12/obsol-gt.m4
-#usr/share/aclocal-1.12/obsol-lt.m4
-#usr/share/aclocal-1.12/obsolete.m4
-#usr/share/aclocal-1.12/options.m4
-#usr/share/aclocal-1.12/protos.m4
-#usr/share/aclocal-1.12/python.m4
-#usr/share/aclocal-1.12/runlog.m4
-#usr/share/aclocal-1.12/sanity.m4
-#usr/share/aclocal-1.12/silent.m4
-#usr/share/aclocal-1.12/strip.m4
-#usr/share/aclocal-1.12/substnot.m4
-#usr/share/aclocal-1.12/tar.m4
-#usr/share/aclocal-1.12/upc.m4
-#usr/share/aclocal-1.12/vala.m4
+#usr/bin/automake-1.15
+#usr/share/aclocal
+#usr/share/aclocal-1.15
+#usr/share/aclocal-1.15/amversion.m4
+#usr/share/aclocal-1.15/ar-lib.m4
+#usr/share/aclocal-1.15/as.m4
+#usr/share/aclocal-1.15/auxdir.m4
+#usr/share/aclocal-1.15/cond-if.m4
+#usr/share/aclocal-1.15/cond.m4
+#usr/share/aclocal-1.15/depend.m4
+#usr/share/aclocal-1.15/depout.m4
+#usr/share/aclocal-1.15/dmalloc.m4
+#usr/share/aclocal-1.15/extra-recurs.m4
+#usr/share/aclocal-1.15/gcj.m4
+#usr/share/aclocal-1.15/init.m4
+#usr/share/aclocal-1.15/install-sh.m4
+#usr/share/aclocal-1.15/internal
+#usr/share/aclocal-1.15/internal/ac-config-macro-dirs.m4
+#usr/share/aclocal-1.15/lead-dot.m4
+#usr/share/aclocal-1.15/lex.m4
+#usr/share/aclocal-1.15/lispdir.m4
+#usr/share/aclocal-1.15/maintainer.m4
+#usr/share/aclocal-1.15/make.m4
+#usr/share/aclocal-1.15/missing.m4
+#usr/share/aclocal-1.15/mkdirp.m4
+#usr/share/aclocal-1.15/obsolete.m4
+#usr/share/aclocal-1.15/options.m4
+#usr/share/aclocal-1.15/prog-cc-c-o.m4
+#usr/share/aclocal-1.15/python.m4
+#usr/share/aclocal-1.15/runlog.m4
+#usr/share/aclocal-1.15/sanity.m4
+#usr/share/aclocal-1.15/silent.m4
+#usr/share/aclocal-1.15/strip.m4
+#usr/share/aclocal-1.15/substnot.m4
+#usr/share/aclocal-1.15/tar.m4
+#usr/share/aclocal-1.15/upc.m4
+#usr/share/aclocal-1.15/vala.m4
 #usr/share/aclocal/README
-#usr/share/automake-1.12
-#usr/share/automake-1.12/Automake
-#usr/share/automake-1.12/Automake/ChannelDefs.pm
-#usr/share/automake-1.12/Automake/Channels.pm
-#usr/share/automake-1.12/Automake/Condition.pm
-#usr/share/automake-1.12/Automake/Config.pm
-#usr/share/automake-1.12/Automake/Configure_ac.pm
-#usr/share/automake-1.12/Automake/DisjConditions.pm
-#usr/share/automake-1.12/Automake/FileUtils.pm
-#usr/share/automake-1.12/Automake/General.pm
-#usr/share/automake-1.12/Automake/Getopt.pm
-#usr/share/automake-1.12/Automake/Item.pm
-#usr/share/automake-1.12/Automake/ItemDef.pm
-#usr/share/automake-1.12/Automake/Location.pm
-#usr/share/automake-1.12/Automake/Options.pm
-#usr/share/automake-1.12/Automake/Rule.pm
-#usr/share/automake-1.12/Automake/RuleDef.pm
-#usr/share/automake-1.12/Automake/VarDef.pm
-#usr/share/automake-1.12/Automake/Variable.pm
-#usr/share/automake-1.12/Automake/Version.pm
-#usr/share/automake-1.12/Automake/Wrap.pm
-#usr/share/automake-1.12/Automake/XFile.pm
-#usr/share/automake-1.12/COPYING
-#usr/share/automake-1.12/INSTALL
-#usr/share/automake-1.12/am
-#usr/share/automake-1.12/am/check.am
-#usr/share/automake-1.12/am/check2.am
-#usr/share/automake-1.12/am/clean-hdr.am
-#usr/share/automake-1.12/am/clean.am
-#usr/share/automake-1.12/am/compile.am
-#usr/share/automake-1.12/am/configure.am
-#usr/share/automake-1.12/am/data.am
-#usr/share/automake-1.12/am/dejagnu.am
-#usr/share/automake-1.12/am/depend.am
-#usr/share/automake-1.12/am/depend2.am
-#usr/share/automake-1.12/am/distdir.am
-#usr/share/automake-1.12/am/footer.am
-#usr/share/automake-1.12/am/header-vars.am
-#usr/share/automake-1.12/am/header.am
-#usr/share/automake-1.12/am/inst-vars.am
-#usr/share/automake-1.12/am/install.am
-#usr/share/automake-1.12/am/java.am
-#usr/share/automake-1.12/am/lang-compile.am
-#usr/share/automake-1.12/am/lex.am
-#usr/share/automake-1.12/am/library.am
-#usr/share/automake-1.12/am/libs.am
-#usr/share/automake-1.12/am/libtool.am
-#usr/share/automake-1.12/am/lisp.am
-#usr/share/automake-1.12/am/ltlib.am
-#usr/share/automake-1.12/am/ltlibrary.am
-#usr/share/automake-1.12/am/mans-vars.am
-#usr/share/automake-1.12/am/mans.am
-#usr/share/automake-1.12/am/program.am
-#usr/share/automake-1.12/am/progs.am
-#usr/share/automake-1.12/am/python.am
-#usr/share/automake-1.12/am/remake-hdr.am
-#usr/share/automake-1.12/am/scripts.am
-#usr/share/automake-1.12/am/subdirs.am
-#usr/share/automake-1.12/am/tags.am
-#usr/share/automake-1.12/am/texi-vers.am
-#usr/share/automake-1.12/am/texibuild.am
-#usr/share/automake-1.12/am/texinfos.am
-#usr/share/automake-1.12/am/vala.am
-#usr/share/automake-1.12/am/yacc.am
-#usr/share/automake-1.12/ar-lib
-#usr/share/automake-1.12/compile
-#usr/share/automake-1.12/config.guess
-#usr/share/automake-1.12/config.sub
-#usr/share/automake-1.12/depcomp
-#usr/share/automake-1.12/elisp-comp
-#usr/share/automake-1.12/install-sh
-#usr/share/automake-1.12/mdate-sh
-#usr/share/automake-1.12/missing
-#usr/share/automake-1.12/mkinstalldirs
-#usr/share/automake-1.12/py-compile
-#usr/share/automake-1.12/tap-driver.pl
-#usr/share/automake-1.12/tap-driver.sh
-#usr/share/automake-1.12/test-driver
-#usr/share/automake-1.12/texinfo.tex
-#usr/share/automake-1.12/ylwrap
-#usr/share/doc/automake
-#usr/share/doc/automake/amhello-1.0.tar.gz
+#usr/share/automake-1.15
+#usr/share/automake-1.15/Automake
+#usr/share/automake-1.15/Automake/ChannelDefs.pm
+#usr/share/automake-1.15/Automake/Channels.pm
+#usr/share/automake-1.15/Automake/Condition.pm
+#usr/share/automake-1.15/Automake/Config.pm
+#usr/share/automake-1.15/Automake/Configure_ac.pm
+#usr/share/automake-1.15/Automake/DisjConditions.pm
+#usr/share/automake-1.15/Automake/FileUtils.pm
+#usr/share/automake-1.15/Automake/General.pm
+#usr/share/automake-1.15/Automake/Getopt.pm
+#usr/share/automake-1.15/Automake/Item.pm
+#usr/share/automake-1.15/Automake/ItemDef.pm
+#usr/share/automake-1.15/Automake/Language.pm
+#usr/share/automake-1.15/Automake/Location.pm
+#usr/share/automake-1.15/Automake/Options.pm
+#usr/share/automake-1.15/Automake/Rule.pm
+#usr/share/automake-1.15/Automake/RuleDef.pm
+#usr/share/automake-1.15/Automake/VarDef.pm
+#usr/share/automake-1.15/Automake/Variable.pm
+#usr/share/automake-1.15/Automake/Version.pm
+#usr/share/automake-1.15/Automake/Wrap.pm
+#usr/share/automake-1.15/Automake/XFile.pm
+#usr/share/automake-1.15/COPYING
+#usr/share/automake-1.15/INSTALL
+#usr/share/automake-1.15/am
+#usr/share/automake-1.15/am/check.am
+#usr/share/automake-1.15/am/check2.am
+#usr/share/automake-1.15/am/clean-hdr.am
+#usr/share/automake-1.15/am/clean.am
+#usr/share/automake-1.15/am/compile.am
+#usr/share/automake-1.15/am/configure.am
+#usr/share/automake-1.15/am/data.am
+#usr/share/automake-1.15/am/dejagnu.am
+#usr/share/automake-1.15/am/depend.am
+#usr/share/automake-1.15/am/depend2.am
+#usr/share/automake-1.15/am/distdir.am
+#usr/share/automake-1.15/am/footer.am
+#usr/share/automake-1.15/am/header-vars.am
+#usr/share/automake-1.15/am/header.am
+#usr/share/automake-1.15/am/inst-vars.am
+#usr/share/automake-1.15/am/install.am
+#usr/share/automake-1.15/am/java.am
+#usr/share/automake-1.15/am/lang-compile.am
+#usr/share/automake-1.15/am/lex.am
+#usr/share/automake-1.15/am/library.am
+#usr/share/automake-1.15/am/libs.am
+#usr/share/automake-1.15/am/libtool.am
+#usr/share/automake-1.15/am/lisp.am
+#usr/share/automake-1.15/am/ltlib.am
+#usr/share/automake-1.15/am/ltlibrary.am
+#usr/share/automake-1.15/am/mans-vars.am
+#usr/share/automake-1.15/am/mans.am
+#usr/share/automake-1.15/am/program.am
+#usr/share/automake-1.15/am/progs.am
+#usr/share/automake-1.15/am/python.am
+#usr/share/automake-1.15/am/remake-hdr.am
+#usr/share/automake-1.15/am/scripts.am
+#usr/share/automake-1.15/am/subdirs.am
+#usr/share/automake-1.15/am/tags.am
+#usr/share/automake-1.15/am/texi-vers.am
+#usr/share/automake-1.15/am/texibuild.am
+#usr/share/automake-1.15/am/texinfos.am
+#usr/share/automake-1.15/am/vala.am
+#usr/share/automake-1.15/am/yacc.am
+#usr/share/automake-1.15/ar-lib
+#usr/share/automake-1.15/compile
+#usr/share/automake-1.15/config.guess
+#usr/share/automake-1.15/config.sub
+#usr/share/automake-1.15/depcomp
+#usr/share/automake-1.15/install-sh
+#usr/share/automake-1.15/mdate-sh
+#usr/share/automake-1.15/missing
+#usr/share/automake-1.15/mkinstalldirs
+#usr/share/automake-1.15/py-compile
+#usr/share/automake-1.15/tap-driver.sh
+#usr/share/automake-1.15/test-driver
+#usr/share/automake-1.15/texinfo.tex
+#usr/share/automake-1.15/ylwrap
+#usr/share/doc/automake-1.15
+#usr/share/doc/automake-1.15/amhello-1.0.tar.gz
 #usr/share/info/automake-history.info
 #usr/share/info/automake.info
 #usr/share/info/automake.info-1
 #usr/share/info/automake.info-2
-#usr/share/info/automake.info-3
-#usr/share/man/man1/aclocal-1.12.1
+#usr/share/man/man1/aclocal-1.15.1
 #usr/share/man/man1/aclocal.1
-#usr/share/man/man1/automake-1.12.1
+#usr/share/man/man1/automake-1.15.1
 #usr/share/man/man1/automake.1
diff --git a/config/rootfiles/common/findutils b/config/rootfiles/common/findutils
index ac4fffe95..edb91a9bf 100644
--- a/config/rootfiles/common/findutils
+++ b/config/rootfiles/common/findutils
@@ -1,8 +1,7 @@
+bin/find
 #etc/fcron.weekly
 etc/fcron.weekly/updatedb
-bin/find
 usr/bin/locate
-#usr/bin/oldfind
 usr/bin/updatedb
 usr/bin/xargs
 #usr/lib/findutils
@@ -11,6 +10,8 @@ usr/lib/findutils/code
 usr/lib/findutils/frcode
 #usr/share/info/find-maint.info
 #usr/share/info/find.info
+#usr/share/info/find.info-1
+#usr/share/info/find.info-2
 #usr/share/man/man1/find.1
 #usr/share/man/man1/locate.1
 #usr/share/man/man1/updatedb.1
diff --git a/config/rootfiles/common/flex b/config/rootfiles/common/flex
index 2b693dfef..9b97b57f7 100644
--- a/config/rootfiles/common/flex
+++ b/config/rootfiles/common/flex
@@ -1,6 +1,7 @@
 #usr/bin/flex
 #usr/bin/lex
 #usr/include/FlexLexer.h
+#usr/info/dir
 #usr/info/flex.info
 #usr/info/flex.info-1
 #usr/info/flex.info-2
diff --git a/config/rootfiles/common/gettext b/config/rootfiles/common/gettext
index e7404416f..d3b2140a3 100644
--- a/config/rootfiles/common/gettext
+++ b/config/rootfiles/common/gettext
@@ -1,7 +1,7 @@
 #usr/bin/autopoint
-#usr/bin/envsubst
-#usr/bin/gettext
-#usr/bin/gettext.sh
+usr/bin/envsubst
+usr/bin/gettext
+usr/bin/gettext.sh
 #usr/bin/gettextize
 #usr/bin/msgattrib
 #usr/bin/msgcat
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index f1024a238..43a8e90fb 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -46,6 +46,8 @@ etc/rc.d/init.d/ipsec
 #etc/rc.d/init.d/lcdproc
 #etc/rc.d/init.d/lcr
 etc/rc.d/init.d/leds
+#etc/rc.d/init.d/libvirt-guests
+#etc/rc.d/init.d/libvirtd
 etc/rc.d/init.d/localnet
 etc/rc.d/init.d/mISDN
 #etc/rc.d/init.d/mediatomb
diff --git a/config/rootfiles/common/linux-atm b/config/rootfiles/common/linux-atm
index db5793a3b..7cc832383 100644
--- a/config/rootfiles/common/linux-atm
+++ b/config/rootfiles/common/linux-atm
@@ -21,6 +21,7 @@ usr/lib/libatm.so.1.0.0
 #usr/man/man4/atmsigd.conf.4
 #usr/man/man7/qos.7
 #usr/man/man7/sap.7
+#usr/man/man8
 #usr/man/man8/atmaddr.8
 #usr/man/man8/atmarp.8
 #usr/man/man8/atmarpd.8
diff --git a/config/rootfiles/common/ncurses b/config/rootfiles/common/ncurses
index da434e92d..4f34e39dd 100644
--- a/config/rootfiles/common/ncurses
+++ b/config/rootfiles/common/ncurses
@@ -2,8 +2,7 @@
 usr/bin/clear
 #usr/bin/infocmp
 #usr/bin/infotocap
-#usr/bin/ncurses5-config
-#usr/bin/ncursesw5-config
+#usr/bin/ncursesw6-config
 usr/bin/reset
 #usr/bin/tabs
 #usr/bin/tic
@@ -30,921 +29,902 @@ usr/bin/tset
 #usr/include/termcap.h
 #usr/include/tic.h
 #usr/include/unctrl.h
-#usr/lib/libcurses.a
 #usr/lib/libcurses.so
 #usr/lib/libcursesw.so
-#usr/lib/libform.a
 #usr/lib/libform.so
-usr/lib/libform.so.5
-usr/lib/libform.so.5.9
-#usr/lib/libformw.a
 #usr/lib/libformw.so
-usr/lib/libformw.so.5
-usr/lib/libformw.so.5.9
-#usr/lib/libmenu.a
+usr/lib/libformw.so.6
+usr/lib/libformw.so.6.0
 #usr/lib/libmenu.so
-usr/lib/libmenu.so.5
-usr/lib/libmenu.so.5.9
-#usr/lib/libmenuw.a
 #usr/lib/libmenuw.so
-usr/lib/libmenuw.so.5
-usr/lib/libmenuw.so.5.9
-#usr/lib/libncurses++.a
+usr/lib/libmenuw.so.6
+usr/lib/libmenuw.so.6.0
 #usr/lib/libncurses++w.a
-#usr/lib/libncurses.a
 #usr/lib/libncurses.so
-usr/lib/libncurses.so.5
-usr/lib/libncurses.so.5.9
-#usr/lib/libncursesw.a
 #usr/lib/libncursesw.so
-usr/lib/libncursesw.so.5
-usr/lib/libncursesw.so.5.9
-#usr/lib/libpanel.a
+usr/lib/libncursesw.so.6
+usr/lib/libncursesw.so.6.0
 #usr/lib/libpanel.so
-usr/lib/libpanel.so.5
-usr/lib/libpanel.so.5.9
-#usr/lib/libpanelw.a
 #usr/lib/libpanelw.so
-usr/lib/libpanelw.so.5
-usr/lib/libpanelw.so.5.9
-#usr/lib/libtermcap.so
-#usr/lib/libtic.a
-#usr/lib/libtic.so
-usr/lib/libtic.so.5
-usr/lib/libtic.so.5.9
-#usr/lib/libtinfo.a
-#usr/lib/libtinfo.so
-usr/lib/libtinfo.so.5
-usr/lib/libtinfo.so.5.9
+usr/lib/libpanelw.so.6
+usr/lib/libpanelw.so.6.0
+#usr/lib/pkgconfig/form.pc
+#usr/lib/pkgconfig/formw.pc
+#usr/lib/pkgconfig/menu.pc
+#usr/lib/pkgconfig/menuw.pc
+#usr/lib/pkgconfig/ncurses++w.pc
+#usr/lib/pkgconfig/ncurses.pc
+#usr/lib/pkgconfig/ncursesw.pc
+#usr/lib/pkgconfig/panel.pc
+#usr/lib/pkgconfig/panelw.pc
 #usr/lib/terminfo
-#usr/man
-#usr/man/man1
-#usr/man/man1/captoinfo.1m
-#usr/man/man1/clear.1
-#usr/man/man1/infocmp.1m
-#usr/man/man1/infotocap.1m
-#usr/man/man1/ncursesw5-config.1
-#usr/man/man1/reset.1
-#usr/man/man1/tabs.1
-#usr/man/man1/tic.1m
-#usr/man/man1/toe.1m
-#usr/man/man1/tput.1
-#usr/man/man1/tset.1
-#usr/man/man3
-#usr/man/man3/BC.3x
-#usr/man/man3/COLORS.3x
-#usr/man/man3/COLOR_PAIR.3x
-#usr/man/man3/COLOR_PAIRS.3x
-#usr/man/man3/COLS.3x
-#usr/man/man3/ESCDELAY.3x
-#usr/man/man3/LINES.3x
-#usr/man/man3/PAIR_NUMBER.3x
-#usr/man/man3/PC.3x
-#usr/man/man3/SP.3x
-#usr/man/man3/TABSIZE.3x
-#usr/man/man3/TYPE_ALNUM.3x
-#usr/man/man3/TYPE_ALPHA.3x
-#usr/man/man3/TYPE_ENUM.3x
-#usr/man/man3/TYPE_INTEGER.3x
-#usr/man/man3/TYPE_IPV4.3x
-#usr/man/man3/TYPE_NUMERIC.3x
-#usr/man/man3/TYPE_REGEXP.3x
-#usr/man/man3/UP.3x
-#usr/man/man3/_nc_free_and_exit.3x
-#usr/man/man3/_nc_freeall.3x
-#usr/man/man3/_nc_tracebits.3x
-#usr/man/man3/_traceattr.3x
-#usr/man/man3/_traceattr2.3x
-#usr/man/man3/_tracecchar_t.3x
-#usr/man/man3/_tracecchar_t2.3x
-#usr/man/man3/_tracechar.3x
-#usr/man/man3/_tracechtype.3x
-#usr/man/man3/_tracechtype2.3x
-#usr/man/man3/_tracedump.3x
-#usr/man/man3/_tracef.3x
-#usr/man/man3/_tracemouse.3x
-#usr/man/man3/acs_map.3x
-#usr/man/man3/add_wch.3x
-#usr/man/man3/add_wchnstr.3x
-#usr/man/man3/add_wchstr.3x
-#usr/man/man3/addch.3x
-#usr/man/man3/addchnstr.3x
-#usr/man/man3/addchstr.3x
-#usr/man/man3/addnstr.3x
-#usr/man/man3/addnwstr.3x
-#usr/man/man3/addstr.3x
-#usr/man/man3/addwstr.3x
-#usr/man/man3/assume_default_colors.3x
-#usr/man/man3/assume_default_colors_sp.3x
-#usr/man/man3/attr_get.3x
-#usr/man/man3/attr_off.3x
-#usr/man/man3/attr_on.3x
-#usr/man/man3/attr_set.3x
-#usr/man/man3/attroff.3x
-#usr/man/man3/attron.3x
-#usr/man/man3/attrset.3x
-#usr/man/man3/baudrate.3x
-#usr/man/man3/baudrate_sp.3x
-#usr/man/man3/beep.3x
-#usr/man/man3/beep_sp.3x
-#usr/man/man3/bkgd.3x
-#usr/man/man3/bkgdset.3x
-#usr/man/man3/bkgrnd.3x
-#usr/man/man3/bkgrndset.3x
-#usr/man/man3/boolcodes.3x
-#usr/man/man3/boolfnames.3x
-#usr/man/man3/boolnames.3x
-#usr/man/man3/border.3x
-#usr/man/man3/border_set.3x
-#usr/man/man3/bottom_panel.3x
-#usr/man/man3/box.3x
-#usr/man/man3/box_set.3x
-#usr/man/man3/can_change_color.3x
-#usr/man/man3/can_change_color_sp.3x
-#usr/man/man3/cbreak.3x
-#usr/man/man3/cbreak_sp.3x
-#usr/man/man3/ceiling_panel.3x
-#usr/man/man3/chgat.3x
-#usr/man/man3/clear.3x
-#usr/man/man3/clearok.3x
-#usr/man/man3/clrtobot.3x
-#usr/man/man3/clrtoeol.3x
-#usr/man/man3/color_content.3x
-#usr/man/man3/color_content_sp.3x
-#usr/man/man3/color_set.3x
-#usr/man/man3/copywin.3x
-#usr/man/man3/cur_term.3x
-#usr/man/man3/current_field.3x
-#usr/man/man3/current_item.3x
-#usr/man/man3/curs_add_wch.3x
-#usr/man/man3/curs_add_wchstr.3x
-#usr/man/man3/curs_addch.3x
-#usr/man/man3/curs_addchstr.3x
-#usr/man/man3/curs_addstr.3x
-#usr/man/man3/curs_addwstr.3x
-#usr/man/man3/curs_attr.3x
-#usr/man/man3/curs_beep.3x
-#usr/man/man3/curs_bkgd.3x
-#usr/man/man3/curs_bkgrnd.3x
-#usr/man/man3/curs_border.3x
-#usr/man/man3/curs_border_set.3x
-#usr/man/man3/curs_clear.3x
-#usr/man/man3/curs_color.3x
-#usr/man/man3/curs_delch.3x
-#usr/man/man3/curs_deleteln.3x
-#usr/man/man3/curs_extend.3x
-#usr/man/man3/curs_get_wch.3x
-#usr/man/man3/curs_get_wstr.3x
-#usr/man/man3/curs_getcchar.3x
-#usr/man/man3/curs_getch.3x
-#usr/man/man3/curs_getstr.3x
-#usr/man/man3/curs_getyx.3x
-#usr/man/man3/curs_in_wch.3x
-#usr/man/man3/curs_in_wchstr.3x
-#usr/man/man3/curs_inch.3x
-#usr/man/man3/curs_inchstr.3x
-#usr/man/man3/curs_initscr.3x
-#usr/man/man3/curs_inopts.3x
-#usr/man/man3/curs_ins_wch.3x
-#usr/man/man3/curs_ins_wstr.3x
-#usr/man/man3/curs_insch.3x
-#usr/man/man3/curs_insstr.3x
-#usr/man/man3/curs_instr.3x
-#usr/man/man3/curs_inwstr.3x
-#usr/man/man3/curs_kernel.3x
-#usr/man/man3/curs_legacy.3x
-#usr/man/man3/curs_memleaks.3x
-#usr/man/man3/curs_mouse.3x
-#usr/man/man3/curs_move.3x
-#usr/man/man3/curs_opaque.3x
-#usr/man/man3/curs_outopts.3x
-#usr/man/man3/curs_overlay.3x
-#usr/man/man3/curs_pad.3x
-#usr/man/man3/curs_print.3x
-#usr/man/man3/curs_printw.3x
-#usr/man/man3/curs_refresh.3x
-#usr/man/man3/curs_scanw.3x
-#usr/man/man3/curs_scr_dump.3x
-#usr/man/man3/curs_scroll.3x
-#usr/man/man3/curs_set.3x
-#usr/man/man3/curs_set_sp.3x
-#usr/man/man3/curs_slk.3x
-#usr/man/man3/curs_sp_funcs.3x
-#usr/man/man3/curs_termattrs.3x
-#usr/man/man3/curs_termcap.3x
-#usr/man/man3/curs_terminfo.3x
-#usr/man/man3/curs_threads.3x
-#usr/man/man3/curs_touch.3x
-#usr/man/man3/curs_trace.3x
-#usr/man/man3/curs_util.3x
-#usr/man/man3/curs_variables.3x
-#usr/man/man3/curs_window.3x
-#usr/man/man3/curscr.3x
-#usr/man/man3/curses_version.3x
-#usr/man/man3/data_ahead.3x
-#usr/man/man3/data_behind.3x
-#usr/man/man3/def_prog_mode.3x
-#usr/man/man3/def_prog_mode_sp.3x
-#usr/man/man3/def_shell_mode.3x
-#usr/man/man3/def_shell_mode_sp.3x
-#usr/man/man3/default_colors.3x
-#usr/man/man3/define_key.3x
-#usr/man/man3/define_key_sp.3x
-#usr/man/man3/del_curterm.3x
-#usr/man/man3/del_curterm_sp.3x
-#usr/man/man3/del_panel.3x
-#usr/man/man3/delay_output.3x
-#usr/man/man3/delay_output_sp.3x
-#usr/man/man3/delch.3x
-#usr/man/man3/deleteln.3x
-#usr/man/man3/delscreen.3x
-#usr/man/man3/delwin.3x
-#usr/man/man3/derwin.3x
-#usr/man/man3/doupdate.3x
-#usr/man/man3/doupdate_sp.3x
-#usr/man/man3/dup_field.3x
-#usr/man/man3/dupwin.3x
-#usr/man/man3/dynamic_field_info.3x
-#usr/man/man3/echo.3x
-#usr/man/man3/echo_sp.3x
-#usr/man/man3/echo_wchar.3x
-#usr/man/man3/echochar.3x
-#usr/man/man3/endwin.3x
-#usr/man/man3/endwin_sp.3x
-#usr/man/man3/erase.3x
-#usr/man/man3/erasechar.3x
-#usr/man/man3/erasechar_sp.3x
-#usr/man/man3/erasewchar.3x
-#usr/man/man3/field_arg.3x
-#usr/man/man3/field_back.3x
-#usr/man/man3/field_buffer.3x
-#usr/man/man3/field_count.3x
-#usr/man/man3/field_fore.3x
-#usr/man/man3/field_index.3x
-#usr/man/man3/field_info.3x
-#usr/man/man3/field_init.3x
-#usr/man/man3/field_just.3x
-#usr/man/man3/field_opts.3x
-#usr/man/man3/field_opts_off.3x
-#usr/man/man3/field_opts_on.3x
-#usr/man/man3/field_pad.3x
-#usr/man/man3/field_status.3x
-#usr/man/man3/field_term.3x
-#usr/man/man3/field_type.3x
-#usr/man/man3/field_userptr.3x
-#usr/man/man3/filter.3x
-#usr/man/man3/filter_sp.3x
-#usr/man/man3/flash.3x
-#usr/man/man3/flash_sp.3x
-#usr/man/man3/flushinp.3x
-#usr/man/man3/flushinp_sp.3x
-#usr/man/man3/form.3x
-#usr/man/man3/form_cursor.3x
-#usr/man/man3/form_data.3x
-#usr/man/man3/form_driver.3x
-#usr/man/man3/form_field.3x
-#usr/man/man3/form_field_attributes.3x
-#usr/man/man3/form_field_buffer.3x
-#usr/man/man3/form_field_info.3x
-#usr/man/man3/form_field_just.3x
-#usr/man/man3/form_field_new.3x
-#usr/man/man3/form_field_opts.3x
-#usr/man/man3/form_field_userptr.3x
-#usr/man/man3/form_field_validation.3x
-#usr/man/man3/form_fields.3x
-#usr/man/man3/form_fieldtype.3x
-#usr/man/man3/form_hook.3x
-#usr/man/man3/form_init.3x
-#usr/man/man3/form_new.3x
-#usr/man/man3/form_new_page.3x
-#usr/man/man3/form_opts.3x
-#usr/man/man3/form_opts_off.3x
-#usr/man/man3/form_opts_on.3x
-#usr/man/man3/form_page.3x
-#usr/man/man3/form_post.3x
-#usr/man/man3/form_request_by_name.3x
-#usr/man/man3/form_request_name.3x
-#usr/man/man3/form_requestname.3x
-#usr/man/man3/form_sub.3x
-#usr/man/man3/form_term.3x
-#usr/man/man3/form_userptr.3x
-#usr/man/man3/form_variables.3x
-#usr/man/man3/form_win.3x
-#usr/man/man3/free_field.3x
-#usr/man/man3/free_fieldtype.3x
-#usr/man/man3/free_form.3x
-#usr/man/man3/free_item.3x
-#usr/man/man3/free_menu.3x
-#usr/man/man3/get_escdelay.3x
-#usr/man/man3/get_escdelay_sp.3x
-#usr/man/man3/get_wch.3x
-#usr/man/man3/get_wstr.3x
-#usr/man/man3/getattrs.3x
-#usr/man/man3/getbegx.3x
-#usr/man/man3/getbegy.3x
-#usr/man/man3/getbegyx.3x
-#usr/man/man3/getbkgd.3x
-#usr/man/man3/getbkgrnd.3x
-#usr/man/man3/getcchar.3x
-#usr/man/man3/getch.3x
-#usr/man/man3/getcurx.3x
-#usr/man/man3/getcury.3x
-#usr/man/man3/getmaxx.3x
-#usr/man/man3/getmaxy.3x
-#usr/man/man3/getmaxyx.3x
-#usr/man/man3/getmouse.3x
-#usr/man/man3/getmouse_sp.3x
-#usr/man/man3/getn_wstr.3x
-#usr/man/man3/getnstr.3x
-#usr/man/man3/getparx.3x
-#usr/man/man3/getpary.3x
-#usr/man/man3/getparyx.3x
-#usr/man/man3/getstr.3x
-#usr/man/man3/getsyx.3x
-#usr/man/man3/getwin.3x
-#usr/man/man3/getwin_sp.3x
-#usr/man/man3/getyx.3x
-#usr/man/man3/ground_panel.3x
-#usr/man/man3/halfdelay.3x
-#usr/man/man3/halfdelay_sp.3x
-#usr/man/man3/has_colors.3x
-#usr/man/man3/has_colors_sp.3x
-#usr/man/man3/has_ic.3x
-#usr/man/man3/has_ic_sp.3x
-#usr/man/man3/has_il.3x
-#usr/man/man3/has_il_sp.3x
-#usr/man/man3/has_key.3x
-#usr/man/man3/has_key_sp.3x
-#usr/man/man3/has_mouse.3x
-#usr/man/man3/has_mouse_sp.3x
-#usr/man/man3/hide_panel.3x
-#usr/man/man3/hline.3x
-#usr/man/man3/hline_set.3x
-#usr/man/man3/idcok.3x
-#usr/man/man3/idlok.3x
-#usr/man/man3/immedok.3x
-#usr/man/man3/in_wch.3x
-#usr/man/man3/in_wchnstr.3x
-#usr/man/man3/in_wchstr.3x
-#usr/man/man3/inch.3x
-#usr/man/man3/inchnstr.3x
-#usr/man/man3/inchstr.3x
-#usr/man/man3/init_color.3x
-#usr/man/man3/init_color_sp.3x
-#usr/man/man3/init_pair.3x
-#usr/man/man3/init_pair_sp.3x
-#usr/man/man3/initscr.3x
-#usr/man/man3/innstr.3x
-#usr/man/man3/innwstr.3x
-#usr/man/man3/ins_nwstr.3x
-#usr/man/man3/ins_wch.3x
-#usr/man/man3/ins_wstr.3x
-#usr/man/man3/insch.3x
-#usr/man/man3/insdelln.3x
-#usr/man/man3/insertln.3x
-#usr/man/man3/insnstr.3x
-#usr/man/man3/insstr.3x
-#usr/man/man3/instr.3x
-#usr/man/man3/intrflush.3x
-#usr/man/man3/intrflush_sp.3x
-#usr/man/man3/inwstr.3x
-#usr/man/man3/is_cleared.3x
-#usr/man/man3/is_idcok.3x
-#usr/man/man3/is_idlok.3x
-#usr/man/man3/is_immedok.3x
-#usr/man/man3/is_keypad.3x
-#usr/man/man3/is_leaveok.3x
-#usr/man/man3/is_linetouched.3x
-#usr/man/man3/is_nodelay.3x
-#usr/man/man3/is_notimeout.3x
-#usr/man/man3/is_pad.3x
-#usr/man/man3/is_scrollok.3x
-#usr/man/man3/is_subwin.3x
-#usr/man/man3/is_syncok.3x
-#usr/man/man3/is_term_resized.3x
-#usr/man/man3/is_term_resized_sp.3x
-#usr/man/man3/is_wintouched.3x
-#usr/man/man3/isendwin.3x
-#usr/man/man3/isendwin_sp.3x
-#usr/man/man3/item_count.3x
-#usr/man/man3/item_description.3x
-#usr/man/man3/item_index.3x
-#usr/man/man3/item_init.3x
-#usr/man/man3/item_name.3x
-#usr/man/man3/item_opts.3x
-#usr/man/man3/item_opts_off.3x
-#usr/man/man3/item_opts_on.3x
-#usr/man/man3/item_term.3x
-#usr/man/man3/item_userptr.3x
-#usr/man/man3/item_value.3x
-#usr/man/man3/item_visible.3x
-#usr/man/man3/key_defined.3x
-#usr/man/man3/key_defined_sp.3x
-#usr/man/man3/key_name.3x
-#usr/man/man3/keybound.3x
-#usr/man/man3/keybound_sp.3x
-#usr/man/man3/keyname.3x
-#usr/man/man3/keyname_sp.3x
-#usr/man/man3/keyok.3x
-#usr/man/man3/keyok_sp.3x
-#usr/man/man3/keypad.3x
-#usr/man/man3/killchar.3x
-#usr/man/man3/killchar_sp.3x
-#usr/man/man3/killwchar.3x
-#usr/man/man3/leaveok.3x
-#usr/man/man3/legacy_coding.3x
-#usr/man/man3/link_field.3x
-#usr/man/man3/link_fieldtype.3x
-#usr/man/man3/longname.3x
-#usr/man/man3/mcprint.3x
-#usr/man/man3/mcprint_sp.3x
-#usr/man/man3/menu.3x
-#usr/man/man3/menu_attributes.3x
-#usr/man/man3/menu_back.3x
-#usr/man/man3/menu_cursor.3x
-#usr/man/man3/menu_driver.3x
-#usr/man/man3/menu_fore.3x
-#usr/man/man3/menu_format.3x
-#usr/man/man3/menu_grey.3x
-#usr/man/man3/menu_hook.3x
-#usr/man/man3/menu_init.3x
-#usr/man/man3/menu_items.3x
-#usr/man/man3/menu_mark.3x
-#usr/man/man3/menu_new.3x
-#usr/man/man3/menu_opts.3x
-#usr/man/man3/menu_opts_off.3x
-#usr/man/man3/menu_opts_on.3x
-#usr/man/man3/menu_pad.3x
-#usr/man/man3/menu_pattern.3x
-#usr/man/man3/menu_post.3x
-#usr/man/man3/menu_request_by_name.3x
-#usr/man/man3/menu_request_name.3x
-#usr/man/man3/menu_requestname.3x
-#usr/man/man3/menu_spacing.3x
-#usr/man/man3/menu_sub.3x
-#usr/man/man3/menu_term.3x
-#usr/man/man3/menu_userptr.3x
-#usr/man/man3/menu_win.3x
-#usr/man/man3/meta.3x
-#usr/man/man3/mitem_current.3x
-#usr/man/man3/mitem_name.3x
-#usr/man/man3/mitem_new.3x
-#usr/man/man3/mitem_opts.3x
-#usr/man/man3/mitem_userptr.3x
-#usr/man/man3/mitem_value.3x
-#usr/man/man3/mitem_visible.3x
-#usr/man/man3/mouse_trafo.3x
-#usr/man/man3/mouseinterval.3x
-#usr/man/man3/mouseinterval_sp.3x
-#usr/man/man3/mousemask.3x
-#usr/man/man3/mousemask_sp.3x
-#usr/man/man3/move.3x
-#usr/man/man3/move_field.3x
-#usr/man/man3/move_panel.3x
-#usr/man/man3/mvadd_wch.3x
-#usr/man/man3/mvadd_wchnstr.3x
-#usr/man/man3/mvadd_wchstr.3x
-#usr/man/man3/mvaddch.3x
-#usr/man/man3/mvaddchnstr.3x
-#usr/man/man3/mvaddchstr.3x
-#usr/man/man3/mvaddnstr.3x
-#usr/man/man3/mvaddnwstr.3x
-#usr/man/man3/mvaddstr.3x
-#usr/man/man3/mvaddwstr.3x
-#usr/man/man3/mvchgat.3x
-#usr/man/man3/mvcur.3x
-#usr/man/man3/mvcur_sp.3x
-#usr/man/man3/mvdelch.3x
-#usr/man/man3/mvderwin.3x
-#usr/man/man3/mvget_wch.3x
-#usr/man/man3/mvget_wstr.3x
-#usr/man/man3/mvgetch.3x
-#usr/man/man3/mvgetn_wstr.3x
-#usr/man/man3/mvgetnstr.3x
-#usr/man/man3/mvgetstr.3x
-#usr/man/man3/mvhline.3x
-#usr/man/man3/mvhline_set.3x
-#usr/man/man3/mvin_wch.3x
-#usr/man/man3/mvin_wchnstr.3x
-#usr/man/man3/mvin_wchstr.3x
-#usr/man/man3/mvinch.3x
-#usr/man/man3/mvinchnstr.3x
-#usr/man/man3/mvinchstr.3x
-#usr/man/man3/mvinnstr.3x
-#usr/man/man3/mvinnwstr.3x
-#usr/man/man3/mvins_nwstr.3x
-#usr/man/man3/mvins_wch.3x
-#usr/man/man3/mvins_wstr.3x
-#usr/man/man3/mvinsch.3x
-#usr/man/man3/mvinsnstr.3x
-#usr/man/man3/mvinsstr.3x
-#usr/man/man3/mvinstr.3x
-#usr/man/man3/mvinwstr.3x
-#usr/man/man3/mvprintw.3x
-#usr/man/man3/mvscanw.3x
-#usr/man/man3/mvvline.3x
-#usr/man/man3/mvvline_set.3x
-#usr/man/man3/mvwadd_wch.3x
-#usr/man/man3/mvwadd_wchnstr.3x
-#usr/man/man3/mvwadd_wchstr.3x
-#usr/man/man3/mvwaddch.3x
-#usr/man/man3/mvwaddchnstr.3x
-#usr/man/man3/mvwaddchstr.3x
-#usr/man/man3/mvwaddnstr.3x
-#usr/man/man3/mvwaddnwstr.3x
-#usr/man/man3/mvwaddstr.3x
-#usr/man/man3/mvwaddwstr.3x
-#usr/man/man3/mvwchgat.3x
-#usr/man/man3/mvwdelch.3x
-#usr/man/man3/mvwget_wch.3x
-#usr/man/man3/mvwget_wstr.3x
-#usr/man/man3/mvwgetch.3x
-#usr/man/man3/mvwgetn_wstr.3x
-#usr/man/man3/mvwgetnstr.3x
-#usr/man/man3/mvwgetstr.3x
-#usr/man/man3/mvwhline.3x
-#usr/man/man3/mvwhline_set.3x
-#usr/man/man3/mvwin.3x
-#usr/man/man3/mvwin_wch.3x
-#usr/man/man3/mvwin_wchnstr.3x
-#usr/man/man3/mvwin_wchstr.3x
-#usr/man/man3/mvwinch.3x
-#usr/man/man3/mvwinchnstr.3x
-#usr/man/man3/mvwinchstr.3x
-#usr/man/man3/mvwinnstr.3x
-#usr/man/man3/mvwinnwstr.3x
-#usr/man/man3/mvwins_nwstr.3x
-#usr/man/man3/mvwins_wch.3x
-#usr/man/man3/mvwins_wstr.3x
-#usr/man/man3/mvwinsch.3x
-#usr/man/man3/mvwinsnstr.3x
-#usr/man/man3/mvwinsstr.3x
-#usr/man/man3/mvwinstr.3x
-#usr/man/man3/mvwinwstr.3x
-#usr/man/man3/mvwprintw.3x
-#usr/man/man3/mvwscanw.3x
-#usr/man/man3/mvwvline.3x
-#usr/man/man3/mvwvline_set.3x
-#usr/man/man3/napms.3x
-#usr/man/man3/napms_sp.3x
-#usr/man/man3/ncurses.3x
-#usr/man/man3/new_field.3x
-#usr/man/man3/new_fieldtype.3x
-#usr/man/man3/new_form.3x
-#usr/man/man3/new_form_sp.3x
-#usr/man/man3/new_item.3x
-#usr/man/man3/new_menu.3x
-#usr/man/man3/new_menu_sp.3x
-#usr/man/man3/new_page.3x
-#usr/man/man3/new_panel.3x
-#usr/man/man3/new_prescr.3x
-#usr/man/man3/newpad.3x
-#usr/man/man3/newpad_sp.3x
-#usr/man/man3/newscr.3x
-#usr/man/man3/newterm.3x
-#usr/man/man3/newterm_sp.3x
-#usr/man/man3/newwin.3x
-#usr/man/man3/newwin_sp.3x
-#usr/man/man3/nl.3x
-#usr/man/man3/nl_sp.3x
-#usr/man/man3/nocbreak.3x
-#usr/man/man3/nocbreak_sp.3x
-#usr/man/man3/nodelay.3x
-#usr/man/man3/noecho.3x
-#usr/man/man3/noecho_sp.3x
-#usr/man/man3/nofilter.3x
-#usr/man/man3/nofilter_sp.3x
-#usr/man/man3/nonl.3x
-#usr/man/man3/nonl_sp.3x
-#usr/man/man3/noqiflush.3x
-#usr/man/man3/noqiflush_sp.3x
-#usr/man/man3/noraw.3x
-#usr/man/man3/noraw_sp.3x
-#usr/man/man3/notimeout.3x
-#usr/man/man3/numcodes.3x
-#usr/man/man3/numfnames.3x
-#usr/man/man3/numnames.3x
-#usr/man/man3/ospeed.3x
-#usr/man/man3/overlay.3x
-#usr/man/man3/overwrite.3x
-#usr/man/man3/pair_content.3x
-#usr/man/man3/pair_content_sp.3x
-#usr/man/man3/panel.3x
-#usr/man/man3/panel_above.3x
-#usr/man/man3/panel_below.3x
-#usr/man/man3/panel_hidden.3x
-#usr/man/man3/panel_userptr.3x
-#usr/man/man3/panel_window.3x
-#usr/man/man3/pecho_wchar.3x
-#usr/man/man3/pechochar.3x
-#usr/man/man3/pnoutrefresh.3x
-#usr/man/man3/pos_form_cursor.3x
-#usr/man/man3/pos_menu_cursor.3x
-#usr/man/man3/post_form.3x
-#usr/man/man3/post_menu.3x
-#usr/man/man3/prefresh.3x
-#usr/man/man3/printw.3x
-#usr/man/man3/putp.3x
-#usr/man/man3/putp_sp.3x
-#usr/man/man3/putwin.3x
-#usr/man/man3/qiflush.3x
-#usr/man/man3/qiflush_sp.3x
-#usr/man/man3/raw.3x
-#usr/man/man3/raw_sp.3x
-#usr/man/man3/redrawwin.3x
-#usr/man/man3/refresh.3x
-#usr/man/man3/replace_panel.3x
-#usr/man/man3/reset_prog_mode.3x
-#usr/man/man3/reset_prog_mode_sp.3x
-#usr/man/man3/reset_shell_mode.3x
-#usr/man/man3/reset_shell_mode_sp.3x
-#usr/man/man3/resetty.3x
-#usr/man/man3/resetty_sp.3x
-#usr/man/man3/resize_term.3x
-#usr/man/man3/resize_term_sp.3x
-#usr/man/man3/resizeterm.3x
-#usr/man/man3/resizeterm_sp.3x
-#usr/man/man3/restartterm.3x
-#usr/man/man3/restartterm_sp.3x
-#usr/man/man3/ripoffline.3x
-#usr/man/man3/ripoffline_sp.3x
-#usr/man/man3/savetty.3x
-#usr/man/man3/savetty_sp.3x
-#usr/man/man3/scale_form.3x
-#usr/man/man3/scale_menu.3x
-#usr/man/man3/scanw.3x
-#usr/man/man3/scr_dump.3x
-#usr/man/man3/scr_init.3x
-#usr/man/man3/scr_init_sp.3x
-#usr/man/man3/scr_restore.3x
-#usr/man/man3/scr_restore_sp.3x
-#usr/man/man3/scr_set.3x
-#usr/man/man3/scr_set_sp.3x
-#usr/man/man3/scrl.3x
-#usr/man/man3/scroll.3x
-#usr/man/man3/scrollok.3x
-#usr/man/man3/set_current_field.3x
-#usr/man/man3/set_current_item.3x
-#usr/man/man3/set_curterm.3x
-#usr/man/man3/set_curterm_sp.3x
-#usr/man/man3/set_escdelay.3x
-#usr/man/man3/set_escdelay_sp.3x
-#usr/man/man3/set_field_back.3x
-#usr/man/man3/set_field_buffer.3x
-#usr/man/man3/set_field_fore.3x
-#usr/man/man3/set_field_init.3x
-#usr/man/man3/set_field_just.3x
-#usr/man/man3/set_field_opts.3x
-#usr/man/man3/set_field_pad.3x
-#usr/man/man3/set_field_status.3x
-#usr/man/man3/set_field_term.3x
-#usr/man/man3/set_field_type.3x
-#usr/man/man3/set_field_userptr.3x
-#usr/man/man3/set_fieldtype_arg.3x
-#usr/man/man3/set_fieldtype_choice.3x
-#usr/man/man3/set_form_fields.3x
-#usr/man/man3/set_form_init.3x
-#usr/man/man3/set_form_opts.3x
-#usr/man/man3/set_form_page.3x
-#usr/man/man3/set_form_sub.3x
-#usr/man/man3/set_form_term.3x
-#usr/man/man3/set_form_userptr.3x
-#usr/man/man3/set_form_win.3x
-#usr/man/man3/set_item_init.3x
-#usr/man/man3/set_item_opts.3x
-#usr/man/man3/set_item_term.3x
-#usr/man/man3/set_item_userptr.3x
-#usr/man/man3/set_item_value.3x
-#usr/man/man3/set_max_field.3x
-#usr/man/man3/set_menu_back.3x
-#usr/man/man3/set_menu_fore.3x
-#usr/man/man3/set_menu_format.3x
-#usr/man/man3/set_menu_grey.3x
-#usr/man/man3/set_menu_init.3x
-#usr/man/man3/set_menu_items.3x
-#usr/man/man3/set_menu_mark.3x
-#usr/man/man3/set_menu_opts.3x
-#usr/man/man3/set_menu_pad.3x
-#usr/man/man3/set_menu_pattern.3x
-#usr/man/man3/set_menu_spacing.3x
-#usr/man/man3/set_menu_sub.3x
-#usr/man/man3/set_menu_term.3x
-#usr/man/man3/set_menu_userptr.3x
-#usr/man/man3/set_menu_win.3x
-#usr/man/man3/set_new_page.3x
-#usr/man/man3/set_panel_userptr.3x
-#usr/man/man3/set_tabsize.3x
-#usr/man/man3/set_tabsize_sp.3x
-#usr/man/man3/set_term.3x
-#usr/man/man3/set_top_row.3x
-#usr/man/man3/setcchar.3x
-#usr/man/man3/setscrreg.3x
-#usr/man/man3/setsyx.3x
-#usr/man/man3/setterm.3x
-#usr/man/man3/setupterm.3x
-#usr/man/man3/show_panel.3x
-#usr/man/man3/slk_attr.3x
-#usr/man/man3/slk_attr_off.3x
-#usr/man/man3/slk_attr_on.3x
-#usr/man/man3/slk_attr_set.3x
-#usr/man/man3/slk_attr_set_sp.3x
-#usr/man/man3/slk_attr_sp.3x
-#usr/man/man3/slk_attroff.3x
-#usr/man/man3/slk_attroff_sp.3x
-#usr/man/man3/slk_attron.3x
-#usr/man/man3/slk_attron_sp.3x
-#usr/man/man3/slk_attrset.3x
-#usr/man/man3/slk_attrset_sp.3x
-#usr/man/man3/slk_clear.3x
-#usr/man/man3/slk_clear_sp.3x
-#usr/man/man3/slk_color.3x
-#usr/man/man3/slk_color_sp.3x
-#usr/man/man3/slk_init.3x
-#usr/man/man3/slk_init_sp.3x
-#usr/man/man3/slk_label.3x
-#usr/man/man3/slk_label_sp.3x
-#usr/man/man3/slk_noutrefresh.3x
-#usr/man/man3/slk_noutrefresh_sp.3x
-#usr/man/man3/slk_refresh.3x
-#usr/man/man3/slk_refresh_sp.3x
-#usr/man/man3/slk_restore.3x
-#usr/man/man3/slk_restore_sp.3x
-#usr/man/man3/slk_set.3x
-#usr/man/man3/slk_set_sp.3x
-#usr/man/man3/slk_touch.3x
-#usr/man/man3/slk_touch_sp.3x
-#usr/man/man3/slk_wset.3x
-#usr/man/man3/standend.3x
-#usr/man/man3/standout.3x
-#usr/man/man3/start_color.3x
-#usr/man/man3/start_color_sp.3x
-#usr/man/man3/stdscr.3x
-#usr/man/man3/strcodes.3x
-#usr/man/man3/strfnames.3x
-#usr/man/man3/strnames.3x
-#usr/man/man3/subpad.3x
-#usr/man/man3/subwin.3x
-#usr/man/man3/syncok.3x
-#usr/man/man3/term_attrs.3x
-#usr/man/man3/term_attrs_sp.3x
-#usr/man/man3/term_variables.3x
-#usr/man/man3/termattrs.3x
-#usr/man/man3/termattrs_sp.3x
-#usr/man/man3/termname.3x
-#usr/man/man3/termname_sp.3x
-#usr/man/man3/tgetent.3x
-#usr/man/man3/tgetent_sp.3x
-#usr/man/man3/tgetflag.3x
-#usr/man/man3/tgetflag_sp.3x
-#usr/man/man3/tgetnum.3x
-#usr/man/man3/tgetnum_sp.3x
-#usr/man/man3/tgetstr.3x
-#usr/man/man3/tgetstr_sp.3x
-#usr/man/man3/tgoto.3x
-#usr/man/man3/tigetflag.3x
-#usr/man/man3/tigetflag_sp.3x
-#usr/man/man3/tigetnum.3x
-#usr/man/man3/tigetnum_sp.3x
-#usr/man/man3/tigetstr.3x
-#usr/man/man3/tigetstr_sp.3x
-#usr/man/man3/timeout.3x
-#usr/man/man3/tiparm.3x
-#usr/man/man3/top_panel.3x
-#usr/man/man3/top_row.3x
-#usr/man/man3/touchline.3x
-#usr/man/man3/touchwin.3x
-#usr/man/man3/tparm.3x
-#usr/man/man3/tputs.3x
-#usr/man/man3/tputs_sp.3x
-#usr/man/man3/trace.3x
-#usr/man/man3/ttytype.3x
-#usr/man/man3/typeahead.3x
-#usr/man/man3/typeahead_sp.3x
-#usr/man/man3/unctrl.3x
-#usr/man/man3/unctrl_sp.3x
-#usr/man/man3/unget_wch.3x
-#usr/man/man3/unget_wch_sp.3x
-#usr/man/man3/ungetch.3x
-#usr/man/man3/ungetch_sp.3x
-#usr/man/man3/ungetmouse.3x
-#usr/man/man3/ungetmouse_sp.3x
-#usr/man/man3/unpost_form.3x
-#usr/man/man3/unpost_menu.3x
-#usr/man/man3/untouchwin.3x
-#usr/man/man3/update_panels.3x
-#usr/man/man3/update_panels_sp.3x
-#usr/man/man3/use_default_colors.3x
-#usr/man/man3/use_default_colors_sp.3x
-#usr/man/man3/use_env.3x
-#usr/man/man3/use_env_sp.3x
-#usr/man/man3/use_extended_names.3x
-#usr/man/man3/use_legacy_coding.3x
-#usr/man/man3/use_legacy_coding_sp.3x
-#usr/man/man3/use_screen.3x
-#usr/man/man3/use_window.3x
-#usr/man/man3/vid_attr.3x
-#usr/man/man3/vid_attr_sp.3x
-#usr/man/man3/vid_puts.3x
-#usr/man/man3/vid_puts_sp.3x
-#usr/man/man3/vidattr.3x
-#usr/man/man3/vidattr_sp.3x
-#usr/man/man3/vidputs.3x
-#usr/man/man3/vidputs_sp.3x
-#usr/man/man3/vline.3x
-#usr/man/man3/vline_set.3x
-#usr/man/man3/vw_printw.3x
-#usr/man/man3/vw_scanw.3x
-#usr/man/man3/vwprintw.3x
-#usr/man/man3/vwscanw.3x
-#usr/man/man3/wadd_wch.3x
-#usr/man/man3/wadd_wchnstr.3x
-#usr/man/man3/wadd_wchstr.3x
-#usr/man/man3/waddch.3x
-#usr/man/man3/waddchnstr.3x
-#usr/man/man3/waddchstr.3x
-#usr/man/man3/waddnstr.3x
-#usr/man/man3/waddnwstr.3x
-#usr/man/man3/waddstr.3x
-#usr/man/man3/waddwstr.3x
-#usr/man/man3/wattr_get.3x
-#usr/man/man3/wattr_off.3x
-#usr/man/man3/wattr_on.3x
-#usr/man/man3/wattr_set.3x
-#usr/man/man3/wattroff.3x
-#usr/man/man3/wattron.3x
-#usr/man/man3/wattrset.3x
-#usr/man/man3/wbkgd.3x
-#usr/man/man3/wbkgdset.3x
-#usr/man/man3/wbkgrnd.3x
-#usr/man/man3/wbkgrndset.3x
-#usr/man/man3/wborder.3x
-#usr/man/man3/wborder_set.3x
-#usr/man/man3/wchgat.3x
-#usr/man/man3/wclear.3x
-#usr/man/man3/wclrtobot.3x
-#usr/man/man3/wclrtoeol.3x
-#usr/man/man3/wcolor_set.3x
-#usr/man/man3/wcursyncup.3x
-#usr/man/man3/wdelch.3x
-#usr/man/man3/wdeleteln.3x
-#usr/man/man3/wecho_wchar.3x
-#usr/man/man3/wechochar.3x
-#usr/man/man3/wenclose.3x
-#usr/man/man3/werase.3x
-#usr/man/man3/wget_wch.3x
-#usr/man/man3/wget_wstr.3x
-#usr/man/man3/wgetbkgrnd.3x
-#usr/man/man3/wgetch.3x
-#usr/man/man3/wgetn_wstr.3x
-#usr/man/man3/wgetnstr.3x
-#usr/man/man3/wgetparent.3x
-#usr/man/man3/wgetscrreg.3x
-#usr/man/man3/wgetstr.3x
-#usr/man/man3/whline.3x
-#usr/man/man3/whline_set.3x
-#usr/man/man3/win_wch.3x
-#usr/man/man3/win_wchnstr.3x
-#usr/man/man3/win_wchstr.3x
-#usr/man/man3/winch.3x
-#usr/man/man3/winchnstr.3x
-#usr/man/man3/winchstr.3x
-#usr/man/man3/winnstr.3x
-#usr/man/man3/winnwstr.3x
-#usr/man/man3/wins_nwstr.3x
-#usr/man/man3/wins_wch.3x
-#usr/man/man3/wins_wstr.3x
-#usr/man/man3/winsch.3x
-#usr/man/man3/winsdelln.3x
-#usr/man/man3/winsertln.3x
-#usr/man/man3/winsnstr.3x
-#usr/man/man3/winsstr.3x
-#usr/man/man3/winstr.3x
-#usr/man/man3/winwstr.3x
-#usr/man/man3/wmouse_trafo.3x
-#usr/man/man3/wmove.3x
-#usr/man/man3/wnoutrefresh.3x
-#usr/man/man3/wprintw.3x
-#usr/man/man3/wredrawln.3x
-#usr/man/man3/wrefresh.3x
-#usr/man/man3/wresize.3x
-#usr/man/man3/wscanw.3x
-#usr/man/man3/wscrl.3x
-#usr/man/man3/wsetscrreg.3x
-#usr/man/man3/wstandend.3x
-#usr/man/man3/wstandout.3x
-#usr/man/man3/wsyncdown.3x
-#usr/man/man3/wsyncup.3x
-#usr/man/man3/wtimeout.3x
-#usr/man/man3/wtouchln.3x
-#usr/man/man3/wunctrl.3x
-#usr/man/man3/wunctrl_sp.3x
-#usr/man/man3/wvline.3x
-#usr/man/man3/wvline_set.3x
-#usr/man/man5
-#usr/man/man5/term.5
-#usr/man/man5/terminfo.5
-#usr/man/man7
-#usr/man/man7/term.7
+#usr/share/man/man1/captoinfo.1m
+#usr/share/man/man1/clear.1
+#usr/share/man/man1/infocmp.1m
+#usr/share/man/man1/infotocap.1m
+#usr/share/man/man1/ncursesw6-config.1
+#usr/share/man/man1/reset.1
+#usr/share/man/man1/tabs.1
+#usr/share/man/man1/tic.1m
+#usr/share/man/man1/toe.1m
+#usr/share/man/man1/tput.1
+#usr/share/man/man1/tset.1
+#usr/share/man/man3/BC.3x
+#usr/share/man/man3/COLORS.3x
+#usr/share/man/man3/COLOR_PAIR.3x
+#usr/share/man/man3/COLOR_PAIRS.3x
+#usr/share/man/man3/COLS.3x
+#usr/share/man/man3/ESCDELAY.3x
+#usr/share/man/man3/LINES.3x
+#usr/share/man/man3/PAIR_NUMBER.3x
+#usr/share/man/man3/PC.3x
+#usr/share/man/man3/SP.3x
+#usr/share/man/man3/TABSIZE.3x
+#usr/share/man/man3/TYPE_ALNUM.3x
+#usr/share/man/man3/TYPE_ALPHA.3x
+#usr/share/man/man3/TYPE_ENUM.3x
+#usr/share/man/man3/TYPE_INTEGER.3x
+#usr/share/man/man3/TYPE_IPV4.3x
+#usr/share/man/man3/TYPE_NUMERIC.3x
+#usr/share/man/man3/TYPE_REGEXP.3x
+#usr/share/man/man3/UP.3x
+#usr/share/man/man3/_nc_free_and_exit.3x
+#usr/share/man/man3/_nc_freeall.3x
+#usr/share/man/man3/_nc_tracebits.3x
+#usr/share/man/man3/_traceattr.3x
+#usr/share/man/man3/_traceattr2.3x
+#usr/share/man/man3/_tracecchar_t.3x
+#usr/share/man/man3/_tracecchar_t2.3x
+#usr/share/man/man3/_tracechar.3x
+#usr/share/man/man3/_tracechtype.3x
+#usr/share/man/man3/_tracechtype2.3x
+#usr/share/man/man3/_tracedump.3x
+#usr/share/man/man3/_tracef.3x
+#usr/share/man/man3/_tracemouse.3x
+#usr/share/man/man3/acs_map.3x
+#usr/share/man/man3/add_wch.3x
+#usr/share/man/man3/add_wchnstr.3x
+#usr/share/man/man3/add_wchstr.3x
+#usr/share/man/man3/addch.3x
+#usr/share/man/man3/addchnstr.3x
+#usr/share/man/man3/addchstr.3x
+#usr/share/man/man3/addnstr.3x
+#usr/share/man/man3/addnwstr.3x
+#usr/share/man/man3/addstr.3x
+#usr/share/man/man3/addwstr.3x
+#usr/share/man/man3/assume_default_colors.3x
+#usr/share/man/man3/assume_default_colors_sp.3x
+#usr/share/man/man3/attr_get.3x
+#usr/share/man/man3/attr_off.3x
+#usr/share/man/man3/attr_on.3x
+#usr/share/man/man3/attr_set.3x
+#usr/share/man/man3/attroff.3x
+#usr/share/man/man3/attron.3x
+#usr/share/man/man3/attrset.3x
+#usr/share/man/man3/baudrate.3x
+#usr/share/man/man3/baudrate_sp.3x
+#usr/share/man/man3/beep.3x
+#usr/share/man/man3/beep_sp.3x
+#usr/share/man/man3/bkgd.3x
+#usr/share/man/man3/bkgdset.3x
+#usr/share/man/man3/bkgrnd.3x
+#usr/share/man/man3/bkgrndset.3x
+#usr/share/man/man3/boolcodes.3x
+#usr/share/man/man3/boolfnames.3x
+#usr/share/man/man3/boolnames.3x
+#usr/share/man/man3/border.3x
+#usr/share/man/man3/border_set.3x
+#usr/share/man/man3/bottom_panel.3x
+#usr/share/man/man3/box.3x
+#usr/share/man/man3/box_set.3x
+#usr/share/man/man3/can_change_color.3x
+#usr/share/man/man3/can_change_color_sp.3x
+#usr/share/man/man3/cbreak.3x
+#usr/share/man/man3/cbreak_sp.3x
+#usr/share/man/man3/ceiling_panel.3x
+#usr/share/man/man3/chgat.3x
+#usr/share/man/man3/clear.3x
+#usr/share/man/man3/clearok.3x
+#usr/share/man/man3/clrtobot.3x
+#usr/share/man/man3/clrtoeol.3x
+#usr/share/man/man3/color_content.3x
+#usr/share/man/man3/color_content_sp.3x
+#usr/share/man/man3/color_set.3x
+#usr/share/man/man3/copywin.3x
+#usr/share/man/man3/cur_term.3x
+#usr/share/man/man3/current_field.3x
+#usr/share/man/man3/current_item.3x
+#usr/share/man/man3/curs_add_wch.3x
+#usr/share/man/man3/curs_add_wchstr.3x
+#usr/share/man/man3/curs_addch.3x
+#usr/share/man/man3/curs_addchstr.3x
+#usr/share/man/man3/curs_addstr.3x
+#usr/share/man/man3/curs_addwstr.3x
+#usr/share/man/man3/curs_attr.3x
+#usr/share/man/man3/curs_beep.3x
+#usr/share/man/man3/curs_bkgd.3x
+#usr/share/man/man3/curs_bkgrnd.3x
+#usr/share/man/man3/curs_border.3x
+#usr/share/man/man3/curs_border_set.3x
+#usr/share/man/man3/curs_clear.3x
+#usr/share/man/man3/curs_color.3x
+#usr/share/man/man3/curs_delch.3x
+#usr/share/man/man3/curs_deleteln.3x
+#usr/share/man/man3/curs_extend.3x
+#usr/share/man/man3/curs_get_wch.3x
+#usr/share/man/man3/curs_get_wstr.3x
+#usr/share/man/man3/curs_getcchar.3x
+#usr/share/man/man3/curs_getch.3x
+#usr/share/man/man3/curs_getstr.3x
+#usr/share/man/man3/curs_getyx.3x
+#usr/share/man/man3/curs_in_wch.3x
+#usr/share/man/man3/curs_in_wchstr.3x
+#usr/share/man/man3/curs_inch.3x
+#usr/share/man/man3/curs_inchstr.3x
+#usr/share/man/man3/curs_initscr.3x
+#usr/share/man/man3/curs_inopts.3x
+#usr/share/man/man3/curs_ins_wch.3x
+#usr/share/man/man3/curs_ins_wstr.3x
+#usr/share/man/man3/curs_insch.3x
+#usr/share/man/man3/curs_insstr.3x
+#usr/share/man/man3/curs_instr.3x
+#usr/share/man/man3/curs_inwstr.3x
+#usr/share/man/man3/curs_kernel.3x
+#usr/share/man/man3/curs_legacy.3x
+#usr/share/man/man3/curs_memleaks.3x
+#usr/share/man/man3/curs_mouse.3x
+#usr/share/man/man3/curs_move.3x
+#usr/share/man/man3/curs_opaque.3x
+#usr/share/man/man3/curs_outopts.3x
+#usr/share/man/man3/curs_overlay.3x
+#usr/share/man/man3/curs_pad.3x
+#usr/share/man/man3/curs_print.3x
+#usr/share/man/man3/curs_printw.3x
+#usr/share/man/man3/curs_refresh.3x
+#usr/share/man/man3/curs_scanw.3x
+#usr/share/man/man3/curs_scr_dump.3x
+#usr/share/man/man3/curs_scroll.3x
+#usr/share/man/man3/curs_set.3x
+#usr/share/man/man3/curs_set_sp.3x
+#usr/share/man/man3/curs_slk.3x
+#usr/share/man/man3/curs_sp_funcs.3x
+#usr/share/man/man3/curs_termattrs.3x
+#usr/share/man/man3/curs_termcap.3x
+#usr/share/man/man3/curs_terminfo.3x
+#usr/share/man/man3/curs_threads.3x
+#usr/share/man/man3/curs_touch.3x
+#usr/share/man/man3/curs_trace.3x
+#usr/share/man/man3/curs_util.3x
+#usr/share/man/man3/curs_variables.3x
+#usr/share/man/man3/curs_window.3x
+#usr/share/man/man3/curscr.3x
+#usr/share/man/man3/curses.3x
+#usr/share/man/man3/curses_version.3x
+#usr/share/man/man3/data_ahead.3x
+#usr/share/man/man3/data_behind.3x
+#usr/share/man/man3/def_prog_mode.3x
+#usr/share/man/man3/def_prog_mode_sp.3x
+#usr/share/man/man3/def_shell_mode.3x
+#usr/share/man/man3/def_shell_mode_sp.3x
+#usr/share/man/man3/default_colors.3x
+#usr/share/man/man3/define_key.3x
+#usr/share/man/man3/define_key_sp.3x
+#usr/share/man/man3/del_curterm.3x
+#usr/share/man/man3/del_curterm_sp.3x
+#usr/share/man/man3/del_panel.3x
+#usr/share/man/man3/delay_output.3x
+#usr/share/man/man3/delay_output_sp.3x
+#usr/share/man/man3/delch.3x
+#usr/share/man/man3/deleteln.3x
+#usr/share/man/man3/delscreen.3x
+#usr/share/man/man3/delwin.3x
+#usr/share/man/man3/derwin.3x
+#usr/share/man/man3/doupdate.3x
+#usr/share/man/man3/doupdate_sp.3x
+#usr/share/man/man3/dup_field.3x
+#usr/share/man/man3/dupwin.3x
+#usr/share/man/man3/dynamic_field_info.3x
+#usr/share/man/man3/echo.3x
+#usr/share/man/man3/echo_sp.3x
+#usr/share/man/man3/echo_wchar.3x
+#usr/share/man/man3/echochar.3x
+#usr/share/man/man3/endwin.3x
+#usr/share/man/man3/endwin_sp.3x
+#usr/share/man/man3/erase.3x
+#usr/share/man/man3/erasechar.3x
+#usr/share/man/man3/erasechar_sp.3x
+#usr/share/man/man3/erasewchar.3x
+#usr/share/man/man3/field_arg.3x
+#usr/share/man/man3/field_back.3x
+#usr/share/man/man3/field_buffer.3x
+#usr/share/man/man3/field_count.3x
+#usr/share/man/man3/field_fore.3x
+#usr/share/man/man3/field_index.3x
+#usr/share/man/man3/field_info.3x
+#usr/share/man/man3/field_init.3x
+#usr/share/man/man3/field_just.3x
+#usr/share/man/man3/field_opts.3x
+#usr/share/man/man3/field_opts_off.3x
+#usr/share/man/man3/field_opts_on.3x
+#usr/share/man/man3/field_pad.3x
+#usr/share/man/man3/field_status.3x
+#usr/share/man/man3/field_term.3x
+#usr/share/man/man3/field_type.3x
+#usr/share/man/man3/field_userptr.3x
+#usr/share/man/man3/filter.3x
+#usr/share/man/man3/filter_sp.3x
+#usr/share/man/man3/flash.3x
+#usr/share/man/man3/flash_sp.3x
+#usr/share/man/man3/flushinp.3x
+#usr/share/man/man3/flushinp_sp.3x
+#usr/share/man/man3/form.3x
+#usr/share/man/man3/form_cursor.3x
+#usr/share/man/man3/form_data.3x
+#usr/share/man/man3/form_driver.3x
+#usr/share/man/man3/form_driver_w.3x
+#usr/share/man/man3/form_field.3x
+#usr/share/man/man3/form_field_attributes.3x
+#usr/share/man/man3/form_field_buffer.3x
+#usr/share/man/man3/form_field_info.3x
+#usr/share/man/man3/form_field_just.3x
+#usr/share/man/man3/form_field_new.3x
+#usr/share/man/man3/form_field_opts.3x
+#usr/share/man/man3/form_field_userptr.3x
+#usr/share/man/man3/form_field_validation.3x
+#usr/share/man/man3/form_fields.3x
+#usr/share/man/man3/form_fieldtype.3x
+#usr/share/man/man3/form_hook.3x
+#usr/share/man/man3/form_init.3x
+#usr/share/man/man3/form_new.3x
+#usr/share/man/man3/form_new_page.3x
+#usr/share/man/man3/form_opts.3x
+#usr/share/man/man3/form_opts_off.3x
+#usr/share/man/man3/form_opts_on.3x
+#usr/share/man/man3/form_page.3x
+#usr/share/man/man3/form_post.3x
+#usr/share/man/man3/form_request_by_name.3x
+#usr/share/man/man3/form_request_name.3x
+#usr/share/man/man3/form_requestname.3x
+#usr/share/man/man3/form_sub.3x
+#usr/share/man/man3/form_term.3x
+#usr/share/man/man3/form_userptr.3x
+#usr/share/man/man3/form_variables.3x
+#usr/share/man/man3/form_win.3x
+#usr/share/man/man3/free_field.3x
+#usr/share/man/man3/free_fieldtype.3x
+#usr/share/man/man3/free_form.3x
+#usr/share/man/man3/free_item.3x
+#usr/share/man/man3/free_menu.3x
+#usr/share/man/man3/get_escdelay.3x
+#usr/share/man/man3/get_escdelay_sp.3x
+#usr/share/man/man3/get_wch.3x
+#usr/share/man/man3/get_wstr.3x
+#usr/share/man/man3/getattrs.3x
+#usr/share/man/man3/getbegx.3x
+#usr/share/man/man3/getbegy.3x
+#usr/share/man/man3/getbegyx.3x
+#usr/share/man/man3/getbkgd.3x
+#usr/share/man/man3/getbkgrnd.3x
+#usr/share/man/man3/getcchar.3x
+#usr/share/man/man3/getch.3x
+#usr/share/man/man3/getcurx.3x
+#usr/share/man/man3/getcury.3x
+#usr/share/man/man3/getmaxx.3x
+#usr/share/man/man3/getmaxy.3x
+#usr/share/man/man3/getmaxyx.3x
+#usr/share/man/man3/getmouse.3x
+#usr/share/man/man3/getmouse_sp.3x
+#usr/share/man/man3/getn_wstr.3x
+#usr/share/man/man3/getnstr.3x
+#usr/share/man/man3/getparx.3x
+#usr/share/man/man3/getpary.3x
+#usr/share/man/man3/getparyx.3x
+#usr/share/man/man3/getstr.3x
+#usr/share/man/man3/getsyx.3x
+#usr/share/man/man3/getwin.3x
+#usr/share/man/man3/getwin_sp.3x
+#usr/share/man/man3/getyx.3x
+#usr/share/man/man3/ground_panel.3x
+#usr/share/man/man3/halfdelay.3x
+#usr/share/man/man3/halfdelay_sp.3x
+#usr/share/man/man3/has_colors.3x
+#usr/share/man/man3/has_colors_sp.3x
+#usr/share/man/man3/has_ic.3x
+#usr/share/man/man3/has_ic_sp.3x
+#usr/share/man/man3/has_il.3x
+#usr/share/man/man3/has_il_sp.3x
+#usr/share/man/man3/has_key.3x
+#usr/share/man/man3/has_key_sp.3x
+#usr/share/man/man3/has_mouse.3x
+#usr/share/man/man3/has_mouse_sp.3x
+#usr/share/man/man3/hide_panel.3x
+#usr/share/man/man3/hline.3x
+#usr/share/man/man3/hline_set.3x
+#usr/share/man/man3/idcok.3x
+#usr/share/man/man3/idlok.3x
+#usr/share/man/man3/immedok.3x
+#usr/share/man/man3/in_wch.3x
+#usr/share/man/man3/in_wchnstr.3x
+#usr/share/man/man3/in_wchstr.3x
+#usr/share/man/man3/inch.3x
+#usr/share/man/man3/inchnstr.3x
+#usr/share/man/man3/inchstr.3x
+#usr/share/man/man3/init_color.3x
+#usr/share/man/man3/init_color_sp.3x
+#usr/share/man/man3/init_pair.3x
+#usr/share/man/man3/init_pair_sp.3x
+#usr/share/man/man3/initscr.3x
+#usr/share/man/man3/innstr.3x
+#usr/share/man/man3/innwstr.3x
+#usr/share/man/man3/ins_nwstr.3x
+#usr/share/man/man3/ins_wch.3x
+#usr/share/man/man3/ins_wstr.3x
+#usr/share/man/man3/insch.3x
+#usr/share/man/man3/insdelln.3x
+#usr/share/man/man3/insertln.3x
+#usr/share/man/man3/insnstr.3x
+#usr/share/man/man3/insstr.3x
+#usr/share/man/man3/instr.3x
+#usr/share/man/man3/intrflush.3x
+#usr/share/man/man3/intrflush_sp.3x
+#usr/share/man/man3/inwstr.3x
+#usr/share/man/man3/is_cleared.3x
+#usr/share/man/man3/is_idcok.3x
+#usr/share/man/man3/is_idlok.3x
+#usr/share/man/man3/is_immedok.3x
+#usr/share/man/man3/is_keypad.3x
+#usr/share/man/man3/is_leaveok.3x
+#usr/share/man/man3/is_linetouched.3x
+#usr/share/man/man3/is_nodelay.3x
+#usr/share/man/man3/is_notimeout.3x
+#usr/share/man/man3/is_pad.3x
+#usr/share/man/man3/is_scrollok.3x
+#usr/share/man/man3/is_subwin.3x
+#usr/share/man/man3/is_syncok.3x
+#usr/share/man/man3/is_term_resized.3x
+#usr/share/man/man3/is_term_resized_sp.3x
+#usr/share/man/man3/is_wintouched.3x
+#usr/share/man/man3/isendwin.3x
+#usr/share/man/man3/isendwin_sp.3x
+#usr/share/man/man3/item_count.3x
+#usr/share/man/man3/item_description.3x
+#usr/share/man/man3/item_index.3x
+#usr/share/man/man3/item_init.3x
+#usr/share/man/man3/item_name.3x
+#usr/share/man/man3/item_opts.3x
+#usr/share/man/man3/item_opts_off.3x
+#usr/share/man/man3/item_opts_on.3x
+#usr/share/man/man3/item_term.3x
+#usr/share/man/man3/item_userptr.3x
+#usr/share/man/man3/item_value.3x
+#usr/share/man/man3/item_visible.3x
+#usr/share/man/man3/key_defined.3x
+#usr/share/man/man3/key_defined_sp.3x
+#usr/share/man/man3/key_name.3x
+#usr/share/man/man3/keybound.3x
+#usr/share/man/man3/keybound_sp.3x
+#usr/share/man/man3/keyname.3x
+#usr/share/man/man3/keyname_sp.3x
+#usr/share/man/man3/keyok.3x
+#usr/share/man/man3/keyok_sp.3x
+#usr/share/man/man3/keypad.3x
+#usr/share/man/man3/killchar.3x
+#usr/share/man/man3/killchar_sp.3x
+#usr/share/man/man3/killwchar.3x
+#usr/share/man/man3/leaveok.3x
+#usr/share/man/man3/legacy_coding.3x
+#usr/share/man/man3/link_field.3x
+#usr/share/man/man3/link_fieldtype.3x
+#usr/share/man/man3/longname.3x
+#usr/share/man/man3/mcprint.3x
+#usr/share/man/man3/mcprint_sp.3x
+#usr/share/man/man3/menu.3x
+#usr/share/man/man3/menu_attributes.3x
+#usr/share/man/man3/menu_back.3x
+#usr/share/man/man3/menu_cursor.3x
+#usr/share/man/man3/menu_driver.3x
+#usr/share/man/man3/menu_fore.3x
+#usr/share/man/man3/menu_format.3x
+#usr/share/man/man3/menu_grey.3x
+#usr/share/man/man3/menu_hook.3x
+#usr/share/man/man3/menu_init.3x
+#usr/share/man/man3/menu_items.3x
+#usr/share/man/man3/menu_mark.3x
+#usr/share/man/man3/menu_new.3x
+#usr/share/man/man3/menu_opts.3x
+#usr/share/man/man3/menu_opts_off.3x
+#usr/share/man/man3/menu_opts_on.3x
+#usr/share/man/man3/menu_pad.3x
+#usr/share/man/man3/menu_pattern.3x
+#usr/share/man/man3/menu_post.3x
+#usr/share/man/man3/menu_request_by_name.3x
+#usr/share/man/man3/menu_request_name.3x
+#usr/share/man/man3/menu_requestname.3x
+#usr/share/man/man3/menu_spacing.3x
+#usr/share/man/man3/menu_sub.3x
+#usr/share/man/man3/menu_term.3x
+#usr/share/man/man3/menu_userptr.3x
+#usr/share/man/man3/menu_win.3x
+#usr/share/man/man3/meta.3x
+#usr/share/man/man3/mitem_current.3x
+#usr/share/man/man3/mitem_name.3x
+#usr/share/man/man3/mitem_new.3x
+#usr/share/man/man3/mitem_opts.3x
+#usr/share/man/man3/mitem_userptr.3x
+#usr/share/man/man3/mitem_value.3x
+#usr/share/man/man3/mitem_visible.3x
+#usr/share/man/man3/mouse_trafo.3x
+#usr/share/man/man3/mouseinterval.3x
+#usr/share/man/man3/mouseinterval_sp.3x
+#usr/share/man/man3/mousemask.3x
+#usr/share/man/man3/mousemask_sp.3x
+#usr/share/man/man3/move.3x
+#usr/share/man/man3/move_field.3x
+#usr/share/man/man3/move_panel.3x
+#usr/share/man/man3/mvadd_wch.3x
+#usr/share/man/man3/mvadd_wchnstr.3x
+#usr/share/man/man3/mvadd_wchstr.3x
+#usr/share/man/man3/mvaddch.3x
+#usr/share/man/man3/mvaddchnstr.3x
+#usr/share/man/man3/mvaddchstr.3x
+#usr/share/man/man3/mvaddnstr.3x
+#usr/share/man/man3/mvaddnwstr.3x
+#usr/share/man/man3/mvaddstr.3x
+#usr/share/man/man3/mvaddwstr.3x
+#usr/share/man/man3/mvchgat.3x
+#usr/share/man/man3/mvcur.3x
+#usr/share/man/man3/mvcur_sp.3x
+#usr/share/man/man3/mvdelch.3x
+#usr/share/man/man3/mvderwin.3x
+#usr/share/man/man3/mvget_wch.3x
+#usr/share/man/man3/mvget_wstr.3x
+#usr/share/man/man3/mvgetch.3x
+#usr/share/man/man3/mvgetn_wstr.3x
+#usr/share/man/man3/mvgetnstr.3x
+#usr/share/man/man3/mvgetstr.3x
+#usr/share/man/man3/mvhline.3x
+#usr/share/man/man3/mvhline_set.3x
+#usr/share/man/man3/mvin_wch.3x
+#usr/share/man/man3/mvin_wchnstr.3x
+#usr/share/man/man3/mvin_wchstr.3x
+#usr/share/man/man3/mvinch.3x
+#usr/share/man/man3/mvinchnstr.3x
+#usr/share/man/man3/mvinchstr.3x
+#usr/share/man/man3/mvinnstr.3x
+#usr/share/man/man3/mvinnwstr.3x
+#usr/share/man/man3/mvins_nwstr.3x
+#usr/share/man/man3/mvins_wch.3x
+#usr/share/man/man3/mvins_wstr.3x
+#usr/share/man/man3/mvinsch.3x
+#usr/share/man/man3/mvinsnstr.3x
+#usr/share/man/man3/mvinsstr.3x
+#usr/share/man/man3/mvinstr.3x
+#usr/share/man/man3/mvinwstr.3x
+#usr/share/man/man3/mvprintw.3x
+#usr/share/man/man3/mvscanw.3x
+#usr/share/man/man3/mvvline.3x
+#usr/share/man/man3/mvvline_set.3x
+#usr/share/man/man3/mvwadd_wch.3x
+#usr/share/man/man3/mvwadd_wchnstr.3x
+#usr/share/man/man3/mvwadd_wchstr.3x
+#usr/share/man/man3/mvwaddch.3x
+#usr/share/man/man3/mvwaddchnstr.3x
+#usr/share/man/man3/mvwaddchstr.3x
+#usr/share/man/man3/mvwaddnstr.3x
+#usr/share/man/man3/mvwaddnwstr.3x
+#usr/share/man/man3/mvwaddstr.3x
+#usr/share/man/man3/mvwaddwstr.3x
+#usr/share/man/man3/mvwchgat.3x
+#usr/share/man/man3/mvwdelch.3x
+#usr/share/man/man3/mvwget_wch.3x
+#usr/share/man/man3/mvwget_wstr.3x
+#usr/share/man/man3/mvwgetch.3x
+#usr/share/man/man3/mvwgetn_wstr.3x
+#usr/share/man/man3/mvwgetnstr.3x
+#usr/share/man/man3/mvwgetstr.3x
+#usr/share/man/man3/mvwhline.3x
+#usr/share/man/man3/mvwhline_set.3x
+#usr/share/man/man3/mvwin.3x
+#usr/share/man/man3/mvwin_wch.3x
+#usr/share/man/man3/mvwin_wchnstr.3x
+#usr/share/man/man3/mvwin_wchstr.3x
+#usr/share/man/man3/mvwinch.3x
+#usr/share/man/man3/mvwinchnstr.3x
+#usr/share/man/man3/mvwinchstr.3x
+#usr/share/man/man3/mvwinnstr.3x
+#usr/share/man/man3/mvwinnwstr.3x
+#usr/share/man/man3/mvwins_nwstr.3x
+#usr/share/man/man3/mvwins_wch.3x
+#usr/share/man/man3/mvwins_wstr.3x
+#usr/share/man/man3/mvwinsch.3x
+#usr/share/man/man3/mvwinsnstr.3x
+#usr/share/man/man3/mvwinsstr.3x
+#usr/share/man/man3/mvwinstr.3x
+#usr/share/man/man3/mvwinwstr.3x
+#usr/share/man/man3/mvwprintw.3x
+#usr/share/man/man3/mvwscanw.3x
+#usr/share/man/man3/mvwvline.3x
+#usr/share/man/man3/mvwvline_set.3x
+#usr/share/man/man3/napms.3x
+#usr/share/man/man3/napms_sp.3x
+#usr/share/man/man3/ncurses.3x
+#usr/share/man/man3/new_field.3x
+#usr/share/man/man3/new_fieldtype.3x
+#usr/share/man/man3/new_form.3x
+#usr/share/man/man3/new_form_sp.3x
+#usr/share/man/man3/new_item.3x
+#usr/share/man/man3/new_menu.3x
+#usr/share/man/man3/new_menu_sp.3x
+#usr/share/man/man3/new_page.3x
+#usr/share/man/man3/new_panel.3x
+#usr/share/man/man3/new_prescr.3x
+#usr/share/man/man3/newpad.3x
+#usr/share/man/man3/newpad_sp.3x
+#usr/share/man/man3/newscr.3x
+#usr/share/man/man3/newterm.3x
+#usr/share/man/man3/newterm_sp.3x
+#usr/share/man/man3/newwin.3x
+#usr/share/man/man3/newwin_sp.3x
+#usr/share/man/man3/nl.3x
+#usr/share/man/man3/nl_sp.3x
+#usr/share/man/man3/nocbreak.3x
+#usr/share/man/man3/nocbreak_sp.3x
+#usr/share/man/man3/nodelay.3x
+#usr/share/man/man3/noecho.3x
+#usr/share/man/man3/noecho_sp.3x
+#usr/share/man/man3/nofilter.3x
+#usr/share/man/man3/nofilter_sp.3x
+#usr/share/man/man3/nonl.3x
+#usr/share/man/man3/nonl_sp.3x
+#usr/share/man/man3/noqiflush.3x
+#usr/share/man/man3/noqiflush_sp.3x
+#usr/share/man/man3/noraw.3x
+#usr/share/man/man3/noraw_sp.3x
+#usr/share/man/man3/notimeout.3x
+#usr/share/man/man3/numcodes.3x
+#usr/share/man/man3/numfnames.3x
+#usr/share/man/man3/numnames.3x
+#usr/share/man/man3/ospeed.3x
+#usr/share/man/man3/overlay.3x
+#usr/share/man/man3/overwrite.3x
+#usr/share/man/man3/pair_content.3x
+#usr/share/man/man3/pair_content_sp.3x
+#usr/share/man/man3/panel.3x
+#usr/share/man/man3/panel_above.3x
+#usr/share/man/man3/panel_below.3x
+#usr/share/man/man3/panel_hidden.3x
+#usr/share/man/man3/panel_userptr.3x
+#usr/share/man/man3/panel_window.3x
+#usr/share/man/man3/pecho_wchar.3x
+#usr/share/man/man3/pechochar.3x
+#usr/share/man/man3/pnoutrefresh.3x
+#usr/share/man/man3/pos_form_cursor.3x
+#usr/share/man/man3/pos_menu_cursor.3x
+#usr/share/man/man3/post_form.3x
+#usr/share/man/man3/post_menu.3x
+#usr/share/man/man3/prefresh.3x
+#usr/share/man/man3/printw.3x
+#usr/share/man/man3/putp.3x
+#usr/share/man/man3/putp_sp.3x
+#usr/share/man/man3/putwin.3x
+#usr/share/man/man3/qiflush.3x
+#usr/share/man/man3/qiflush_sp.3x
+#usr/share/man/man3/raw.3x
+#usr/share/man/man3/raw_sp.3x
+#usr/share/man/man3/redrawwin.3x
+#usr/share/man/man3/refresh.3x
+#usr/share/man/man3/replace_panel.3x
+#usr/share/man/man3/reset_prog_mode.3x
+#usr/share/man/man3/reset_prog_mode_sp.3x
+#usr/share/man/man3/reset_shell_mode.3x
+#usr/share/man/man3/reset_shell_mode_sp.3x
+#usr/share/man/man3/resetty.3x
+#usr/share/man/man3/resetty_sp.3x
+#usr/share/man/man3/resize_term.3x
+#usr/share/man/man3/resize_term_sp.3x
+#usr/share/man/man3/resizeterm.3x
+#usr/share/man/man3/resizeterm_sp.3x
+#usr/share/man/man3/restartterm.3x
+#usr/share/man/man3/restartterm_sp.3x
+#usr/share/man/man3/ripoffline.3x
+#usr/share/man/man3/ripoffline_sp.3x
+#usr/share/man/man3/savetty.3x
+#usr/share/man/man3/savetty_sp.3x
+#usr/share/man/man3/scale_form.3x
+#usr/share/man/man3/scale_menu.3x
+#usr/share/man/man3/scanw.3x
+#usr/share/man/man3/scr_dump.3x
+#usr/share/man/man3/scr_init.3x
+#usr/share/man/man3/scr_init_sp.3x
+#usr/share/man/man3/scr_restore.3x
+#usr/share/man/man3/scr_restore_sp.3x
+#usr/share/man/man3/scr_set.3x
+#usr/share/man/man3/scr_set_sp.3x
+#usr/share/man/man3/scrl.3x
+#usr/share/man/man3/scroll.3x
+#usr/share/man/man3/scrollok.3x
+#usr/share/man/man3/set_current_field.3x
+#usr/share/man/man3/set_current_item.3x
+#usr/share/man/man3/set_curterm.3x
+#usr/share/man/man3/set_curterm_sp.3x
+#usr/share/man/man3/set_escdelay.3x
+#usr/share/man/man3/set_escdelay_sp.3x
+#usr/share/man/man3/set_field_back.3x
+#usr/share/man/man3/set_field_buffer.3x
+#usr/share/man/man3/set_field_fore.3x
+#usr/share/man/man3/set_field_init.3x
+#usr/share/man/man3/set_field_just.3x
+#usr/share/man/man3/set_field_opts.3x
+#usr/share/man/man3/set_field_pad.3x
+#usr/share/man/man3/set_field_status.3x
+#usr/share/man/man3/set_field_term.3x
+#usr/share/man/man3/set_field_type.3x
+#usr/share/man/man3/set_field_userptr.3x
+#usr/share/man/man3/set_fieldtype_arg.3x
+#usr/share/man/man3/set_fieldtype_choice.3x
+#usr/share/man/man3/set_form_fields.3x
+#usr/share/man/man3/set_form_init.3x
+#usr/share/man/man3/set_form_opts.3x
+#usr/share/man/man3/set_form_page.3x
+#usr/share/man/man3/set_form_sub.3x
+#usr/share/man/man3/set_form_term.3x
+#usr/share/man/man3/set_form_userptr.3x
+#usr/share/man/man3/set_form_win.3x
+#usr/share/man/man3/set_item_init.3x
+#usr/share/man/man3/set_item_opts.3x
+#usr/share/man/man3/set_item_term.3x
+#usr/share/man/man3/set_item_userptr.3x
+#usr/share/man/man3/set_item_value.3x
+#usr/share/man/man3/set_max_field.3x
+#usr/share/man/man3/set_menu_back.3x
+#usr/share/man/man3/set_menu_fore.3x
+#usr/share/man/man3/set_menu_format.3x
+#usr/share/man/man3/set_menu_grey.3x
+#usr/share/man/man3/set_menu_init.3x
+#usr/share/man/man3/set_menu_items.3x
+#usr/share/man/man3/set_menu_mark.3x
+#usr/share/man/man3/set_menu_opts.3x
+#usr/share/man/man3/set_menu_pad.3x
+#usr/share/man/man3/set_menu_pattern.3x
+#usr/share/man/man3/set_menu_spacing.3x
+#usr/share/man/man3/set_menu_sub.3x
+#usr/share/man/man3/set_menu_term.3x
+#usr/share/man/man3/set_menu_userptr.3x
+#usr/share/man/man3/set_menu_win.3x
+#usr/share/man/man3/set_new_page.3x
+#usr/share/man/man3/set_panel_userptr.3x
+#usr/share/man/man3/set_tabsize.3x
+#usr/share/man/man3/set_tabsize_sp.3x
+#usr/share/man/man3/set_term.3x
+#usr/share/man/man3/set_top_row.3x
+#usr/share/man/man3/setcchar.3x
+#usr/share/man/man3/setscrreg.3x
+#usr/share/man/man3/setsyx.3x
+#usr/share/man/man3/setterm.3x
+#usr/share/man/man3/setupterm.3x
+#usr/share/man/man3/show_panel.3x
+#usr/share/man/man3/slk_attr.3x
+#usr/share/man/man3/slk_attr_off.3x
+#usr/share/man/man3/slk_attr_on.3x
+#usr/share/man/man3/slk_attr_set.3x
+#usr/share/man/man3/slk_attr_set_sp.3x
+#usr/share/man/man3/slk_attr_sp.3x
+#usr/share/man/man3/slk_attroff.3x
+#usr/share/man/man3/slk_attroff_sp.3x
+#usr/share/man/man3/slk_attron.3x
+#usr/share/man/man3/slk_attron_sp.3x
+#usr/share/man/man3/slk_attrset.3x
+#usr/share/man/man3/slk_attrset_sp.3x
+#usr/share/man/man3/slk_clear.3x
+#usr/share/man/man3/slk_clear_sp.3x
+#usr/share/man/man3/slk_color.3x
+#usr/share/man/man3/slk_color_sp.3x
+#usr/share/man/man3/slk_init.3x
+#usr/share/man/man3/slk_init_sp.3x
+#usr/share/man/man3/slk_label.3x
+#usr/share/man/man3/slk_label_sp.3x
+#usr/share/man/man3/slk_noutrefresh.3x
+#usr/share/man/man3/slk_noutrefresh_sp.3x
+#usr/share/man/man3/slk_refresh.3x
+#usr/share/man/man3/slk_refresh_sp.3x
+#usr/share/man/man3/slk_restore.3x
+#usr/share/man/man3/slk_restore_sp.3x
+#usr/share/man/man3/slk_set.3x
+#usr/share/man/man3/slk_set_sp.3x
+#usr/share/man/man3/slk_touch.3x
+#usr/share/man/man3/slk_touch_sp.3x
+#usr/share/man/man3/slk_wset.3x
+#usr/share/man/man3/standend.3x
+#usr/share/man/man3/standout.3x
+#usr/share/man/man3/start_color.3x
+#usr/share/man/man3/start_color_sp.3x
+#usr/share/man/man3/stdscr.3x
+#usr/share/man/man3/strcodes.3x
+#usr/share/man/man3/strfnames.3x
+#usr/share/man/man3/strnames.3x
+#usr/share/man/man3/subpad.3x
+#usr/share/man/man3/subwin.3x
+#usr/share/man/man3/syncok.3x
+#usr/share/man/man3/term_attrs.3x
+#usr/share/man/man3/term_attrs_sp.3x
+#usr/share/man/man3/term_variables.3x
+#usr/share/man/man3/termattrs.3x
+#usr/share/man/man3/termattrs_sp.3x
+#usr/share/man/man3/termname.3x
+#usr/share/man/man3/termname_sp.3x
+#usr/share/man/man3/tgetent.3x
+#usr/share/man/man3/tgetent_sp.3x
+#usr/share/man/man3/tgetflag.3x
+#usr/share/man/man3/tgetflag_sp.3x
+#usr/share/man/man3/tgetnum.3x
+#usr/share/man/man3/tgetnum_sp.3x
+#usr/share/man/man3/tgetstr.3x
+#usr/share/man/man3/tgetstr_sp.3x
+#usr/share/man/man3/tgoto.3x
+#usr/share/man/man3/tigetflag.3x
+#usr/share/man/man3/tigetflag_sp.3x
+#usr/share/man/man3/tigetnum.3x
+#usr/share/man/man3/tigetnum_sp.3x
+#usr/share/man/man3/tigetstr.3x
+#usr/share/man/man3/tigetstr_sp.3x
+#usr/share/man/man3/timeout.3x
+#usr/share/man/man3/tiparm.3x
+#usr/share/man/man3/top_panel.3x
+#usr/share/man/man3/top_row.3x
+#usr/share/man/man3/touchline.3x
+#usr/share/man/man3/touchwin.3x
+#usr/share/man/man3/tparm.3x
+#usr/share/man/man3/tputs.3x
+#usr/share/man/man3/tputs_sp.3x
+#usr/share/man/man3/trace.3x
+#usr/share/man/man3/ttytype.3x
+#usr/share/man/man3/typeahead.3x
+#usr/share/man/man3/typeahead_sp.3x
+#usr/share/man/man3/unctrl.3x
+#usr/share/man/man3/unctrl_sp.3x
+#usr/share/man/man3/unget_wch.3x
+#usr/share/man/man3/unget_wch_sp.3x
+#usr/share/man/man3/ungetch.3x
+#usr/share/man/man3/ungetch_sp.3x
+#usr/share/man/man3/ungetmouse.3x
+#usr/share/man/man3/ungetmouse_sp.3x
+#usr/share/man/man3/unpost_form.3x
+#usr/share/man/man3/unpost_menu.3x
+#usr/share/man/man3/untouchwin.3x
+#usr/share/man/man3/update_panels.3x
+#usr/share/man/man3/update_panels_sp.3x
+#usr/share/man/man3/use_default_colors.3x
+#usr/share/man/man3/use_default_colors_sp.3x
+#usr/share/man/man3/use_env.3x
+#usr/share/man/man3/use_env_sp.3x
+#usr/share/man/man3/use_extended_names.3x
+#usr/share/man/man3/use_legacy_coding.3x
+#usr/share/man/man3/use_legacy_coding_sp.3x
+#usr/share/man/man3/use_screen.3x
+#usr/share/man/man3/use_tioctl.3x
+#usr/share/man/man3/use_window.3x
+#usr/share/man/man3/vid_attr.3x
+#usr/share/man/man3/vid_attr_sp.3x
+#usr/share/man/man3/vid_puts.3x
+#usr/share/man/man3/vid_puts_sp.3x
+#usr/share/man/man3/vidattr.3x
+#usr/share/man/man3/vidattr_sp.3x
+#usr/share/man/man3/vidputs.3x
+#usr/share/man/man3/vidputs_sp.3x
+#usr/share/man/man3/vline.3x
+#usr/share/man/man3/vline_set.3x
+#usr/share/man/man3/vw_printw.3x
+#usr/share/man/man3/vw_scanw.3x
+#usr/share/man/man3/vwprintw.3x
+#usr/share/man/man3/vwscanw.3x
+#usr/share/man/man3/wadd_wch.3x
+#usr/share/man/man3/wadd_wchnstr.3x
+#usr/share/man/man3/wadd_wchstr.3x
+#usr/share/man/man3/waddch.3x
+#usr/share/man/man3/waddchnstr.3x
+#usr/share/man/man3/waddchstr.3x
+#usr/share/man/man3/waddnstr.3x
+#usr/share/man/man3/waddnwstr.3x
+#usr/share/man/man3/waddstr.3x
+#usr/share/man/man3/waddwstr.3x
+#usr/share/man/man3/wattr_get.3x
+#usr/share/man/man3/wattr_off.3x
+#usr/share/man/man3/wattr_on.3x
+#usr/share/man/man3/wattr_set.3x
+#usr/share/man/man3/wattroff.3x
+#usr/share/man/man3/wattron.3x
+#usr/share/man/man3/wattrset.3x
+#usr/share/man/man3/wbkgd.3x
+#usr/share/man/man3/wbkgdset.3x
+#usr/share/man/man3/wbkgrnd.3x
+#usr/share/man/man3/wbkgrndset.3x
+#usr/share/man/man3/wborder.3x
+#usr/share/man/man3/wborder_set.3x
+#usr/share/man/man3/wchgat.3x
+#usr/share/man/man3/wclear.3x
+#usr/share/man/man3/wclrtobot.3x
+#usr/share/man/man3/wclrtoeol.3x
+#usr/share/man/man3/wcolor_set.3x
+#usr/share/man/man3/wcursyncup.3x
+#usr/share/man/man3/wdelch.3x
+#usr/share/man/man3/wdeleteln.3x
+#usr/share/man/man3/wecho_wchar.3x
+#usr/share/man/man3/wechochar.3x
+#usr/share/man/man3/wenclose.3x
+#usr/share/man/man3/werase.3x
+#usr/share/man/man3/wget_wch.3x
+#usr/share/man/man3/wget_wstr.3x
+#usr/share/man/man3/wgetbkgrnd.3x
+#usr/share/man/man3/wgetch.3x
+#usr/share/man/man3/wgetdelay.3x
+#usr/share/man/man3/wgetn_wstr.3x
+#usr/share/man/man3/wgetnstr.3x
+#usr/share/man/man3/wgetparent.3x
+#usr/share/man/man3/wgetscrreg.3x
+#usr/share/man/man3/wgetstr.3x
+#usr/share/man/man3/whline.3x
+#usr/share/man/man3/whline_set.3x
+#usr/share/man/man3/win_wch.3x
+#usr/share/man/man3/win_wchnstr.3x
+#usr/share/man/man3/win_wchstr.3x
+#usr/share/man/man3/winch.3x
+#usr/share/man/man3/winchnstr.3x
+#usr/share/man/man3/winchstr.3x
+#usr/share/man/man3/winnstr.3x
+#usr/share/man/man3/winnwstr.3x
+#usr/share/man/man3/wins_nwstr.3x
+#usr/share/man/man3/wins_wch.3x
+#usr/share/man/man3/wins_wstr.3x
+#usr/share/man/man3/winsch.3x
+#usr/share/man/man3/winsdelln.3x
+#usr/share/man/man3/winsertln.3x
+#usr/share/man/man3/winsnstr.3x
+#usr/share/man/man3/winsstr.3x
+#usr/share/man/man3/winstr.3x
+#usr/share/man/man3/winwstr.3x
+#usr/share/man/man3/wmouse_trafo.3x
+#usr/share/man/man3/wmove.3x
+#usr/share/man/man3/wnoutrefresh.3x
+#usr/share/man/man3/wprintw.3x
+#usr/share/man/man3/wredrawln.3x
+#usr/share/man/man3/wrefresh.3x
+#usr/share/man/man3/wresize.3x
+#usr/share/man/man3/wscanw.3x
+#usr/share/man/man3/wscrl.3x
+#usr/share/man/man3/wsetscrreg.3x
+#usr/share/man/man3/wstandend.3x
+#usr/share/man/man3/wstandout.3x
+#usr/share/man/man3/wsyncdown.3x
+#usr/share/man/man3/wsyncup.3x
+#usr/share/man/man3/wtimeout.3x
+#usr/share/man/man3/wtouchln.3x
+#usr/share/man/man3/wunctrl.3x
+#usr/share/man/man3/wunctrl_sp.3x
+#usr/share/man/man3/wvline.3x
+#usr/share/man/man3/wvline_set.3x
+#usr/share/man/man5/term.5
+#usr/share/man/man5/terminfo.5
+#usr/share/man/man7/term.7
 #usr/share/tabset
 #usr/share/tabset/std
 #usr/share/tabset/stdcrt
@@ -1722,6 +1702,8 @@ usr/share/terminfo/c/cygwin
 #usr/share/terminfo/d/dd5000
 #usr/share/terminfo/d/ddr
 #usr/share/terminfo/d/ddr3180
+#usr/share/terminfo/d/dec+pp
+#usr/share/terminfo/d/dec+sl
 #usr/share/terminfo/d/dec-vt100
 #usr/share/terminfo/d/dec-vt220
 #usr/share/terminfo/d/dec-vt330
@@ -1886,6 +1868,7 @@ usr/share/terminfo/g/gnome
 #usr/share/terminfo/g/gnome+pcfkeys
 #usr/share/terminfo/g/gnome-2007
 #usr/share/terminfo/g/gnome-2008
+#usr/share/terminfo/g/gnome-2012
 usr/share/terminfo/g/gnome-256color
 #usr/share/terminfo/g/gnome-fc5
 #usr/share/terminfo/g/gnome-rh62
@@ -2152,6 +2135,7 @@ usr/share/terminfo/h/hurd
 #usr/share/terminfo/i/iris-ansi-net
 #usr/share/terminfo/i/iris-color
 #usr/share/terminfo/i/iris40
+#usr/share/terminfo/i/iterm
 #usr/share/terminfo/j
 #usr/share/terminfo/j/jaixterm
 #usr/share/terminfo/j/jaixterm-m
@@ -2208,7 +2192,10 @@ usr/share/terminfo/l/linux
 #usr/share/terminfo/l/linux-m
 #usr/share/terminfo/l/linux-nic
 #usr/share/terminfo/l/linux-vt
+#usr/share/terminfo/l/linux2.2
+#usr/share/terminfo/l/linux2.6
 #usr/share/terminfo/l/linux2.6.26
+#usr/share/terminfo/l/linux3.0
 #usr/share/terminfo/l/lisa
 #usr/share/terminfo/l/lisaterm
 #usr/share/terminfo/l/lisaterm-w
@@ -2225,6 +2212,8 @@ usr/share/terminfo/l/linux
 usr/share/terminfo/m/mach
 usr/share/terminfo/m/mach-bold
 usr/share/terminfo/m/mach-color
+usr/share/terminfo/m/mach-gnu
+usr/share/terminfo/m/mach-gnu-color
 #usr/share/terminfo/m/macintosh
 #usr/share/terminfo/m/macterminal-w
 #usr/share/terminfo/m/mai
@@ -2267,11 +2256,14 @@ usr/share/terminfo/m/mach-color
 #usr/share/terminfo/m/minix
 #usr/share/terminfo/m/minix-1.5
 #usr/share/terminfo/m/minix-1.7
+#usr/share/terminfo/m/minix-3.0
 #usr/share/terminfo/m/minix-old
 #usr/share/terminfo/m/minix-old-am
 usr/share/terminfo/m/mlterm
 #usr/share/terminfo/m/mlterm+pcfkeys
 #usr/share/terminfo/m/mlterm-256color
+#usr/share/terminfo/m/mlterm2
+#usr/share/terminfo/m/mlterm3
 #usr/share/terminfo/m/mm314
 #usr/share/terminfo/m/mm340
 #usr/share/terminfo/m/mod
@@ -2374,6 +2366,7 @@ usr/share/terminfo/m/mrxvt
 #usr/share/terminfo/n/ndr9500-nl
 #usr/share/terminfo/n/nec
 #usr/share/terminfo/n/nec5520
+#usr/share/terminfo/n/netbsd6
 #usr/share/terminfo/n/newhp
 #usr/share/terminfo/n/newhpkeyboard
 #usr/share/terminfo/n/news
@@ -2416,6 +2409,7 @@ usr/share/terminfo/n/nsterm
 #usr/share/terminfo/n/nsterm+mac
 #usr/share/terminfo/n/nsterm+s
 #usr/share/terminfo/n/nsterm-16color
+#usr/share/terminfo/n/nsterm-256color
 #usr/share/terminfo/n/nsterm-7
 #usr/share/terminfo/n/nsterm-7-c
 #usr/share/terminfo/n/nsterm-7-c-s
@@ -2429,6 +2423,8 @@ usr/share/terminfo/n/nsterm
 #usr/share/terminfo/n/nsterm-acs-m-s
 #usr/share/terminfo/n/nsterm-acs-s
 #usr/share/terminfo/n/nsterm-bce
+#usr/share/terminfo/n/nsterm-build326
+#usr/share/terminfo/n/nsterm-build343
 #usr/share/terminfo/n/nsterm-c
 #usr/share/terminfo/n/nsterm-c-7
 #usr/share/terminfo/n/nsterm-c-acs
@@ -2497,6 +2493,7 @@ usr/share/terminfo/n/nsterm
 #usr/share/terminfo/o/oconcept
 #usr/share/terminfo/o/ofcons
 #usr/share/terminfo/o/ojerq
+#usr/share/terminfo/o/old-st
 #usr/share/terminfo/o/oldibmpc3
 #usr/share/terminfo/o/oldpc3
 #usr/share/terminfo/o/oldsun
@@ -2577,6 +2574,15 @@ usr/share/terminfo/p/pcansi
 #usr/share/terminfo/p/pcansi33
 #usr/share/terminfo/p/pcansi33m
 #usr/share/terminfo/p/pcansi43
+usr/share/terminfo/p/pccon
+#usr/share/terminfo/p/pccon+base
+#usr/share/terminfo/p/pccon+colors
+#usr/share/terminfo/p/pccon+keys
+#usr/share/terminfo/p/pccon+sgr+acs
+#usr/share/terminfo/p/pccon+sgr+acs0
+#usr/share/terminfo/p/pccon-m
+#usr/share/terminfo/p/pccon0
+#usr/share/terminfo/p/pccon0-m
 #usr/share/terminfo/p/pccons
 #usr/share/terminfo/p/pcconsole
 #usr/share/terminfo/p/pcix
@@ -2653,7 +2659,15 @@ usr/share/terminfo/p/pcansi
 #usr/share/terminfo/p/pt505-24
 #usr/share/terminfo/p/pty
 usr/share/terminfo/p/putty
+usr/share/terminfo/p/putty+fnkeys
+usr/share/terminfo/p/putty+fnkeys+esc
+usr/share/terminfo/p/putty+fnkeys+linux
+usr/share/terminfo/p/putty+fnkeys+sco
+usr/share/terminfo/p/putty+fnkeys+vt100
+usr/share/terminfo/p/putty+fnkeys+vt400
+usr/share/terminfo/p/putty+fnkeys+xterm
 usr/share/terminfo/p/putty-256color
+usr/share/terminfo/p/putty-sco
 usr/share/terminfo/p/putty-vt100
 #usr/share/terminfo/q
 #usr/share/terminfo/q/qansi
@@ -2741,6 +2755,7 @@ usr/share/terminfo/r/rxvt-xpm
 #usr/share/terminfo/s/scoansi-old
 usr/share/terminfo/s/screen
 #usr/share/terminfo/s/screen+fkeys
+#usr/share/terminfo/s/screen+italics
 usr/share/terminfo/s/screen-16color
 #usr/share/terminfo/s/screen-16color-bce
 #usr/share/terminfo/s/screen-16color-bce-s
@@ -2754,7 +2769,6 @@ usr/share/terminfo/s/screen-bce
 #usr/share/terminfo/s/screen-bce.gnome
 #usr/share/terminfo/s/screen-bce.konsole
 #usr/share/terminfo/s/screen-bce.linux
-#usr/share/terminfo/s/screen-bce.mlterm
 #usr/share/terminfo/s/screen-bce.mrxvt
 #usr/share/terminfo/s/screen-bce.rxvt
 #usr/share/terminfo/s/screen-bce.xterm-new
@@ -2763,12 +2777,18 @@ usr/share/terminfo/s/screen-w
 usr/share/terminfo/s/screen.Eterm
 usr/share/terminfo/s/screen.gnome
 usr/share/terminfo/s/screen.konsole
+usr/share/terminfo/s/screen.konsole-256color
 usr/share/terminfo/s/screen.linux
 usr/share/terminfo/s/screen.mlterm
+usr/share/terminfo/s/screen.mlterm-256color
 usr/share/terminfo/s/screen.mrxvt
+usr/share/terminfo/s/screen.putty
+usr/share/terminfo/s/screen.putty-256color
 usr/share/terminfo/s/screen.rxvt
 usr/share/terminfo/s/screen.teraterm
 usr/share/terminfo/s/screen.vte
+usr/share/terminfo/s/screen.vte-256color
+usr/share/terminfo/s/screen.xterm-256color
 usr/share/terminfo/s/screen.xterm-new
 usr/share/terminfo/s/screen.xterm-r6
 usr/share/terminfo/s/screen.xterm-xfree86
@@ -2777,18 +2797,26 @@ usr/share/terminfo/s/screen3
 #usr/share/terminfo/s/screwpoint
 #usr/share/terminfo/s/scrhp
 #usr/share/terminfo/s/sibo
+#usr/share/terminfo/s/simpleterm
 #usr/share/terminfo/s/simterm
 #usr/share/terminfo/s/soroc
 #usr/share/terminfo/s/soroc120
 #usr/share/terminfo/s/soroc140
 #usr/share/terminfo/s/spinwriter
+#usr/share/terminfo/s/st
+#usr/share/terminfo/s/st-16color
+#usr/share/terminfo/s/st-256color
 #usr/share/terminfo/s/st52
 #usr/share/terminfo/s/st52-color
 #usr/share/terminfo/s/st52-m
 #usr/share/terminfo/s/st52-old
+#usr/share/terminfo/s/stterm
+#usr/share/terminfo/s/stterm-16color
+#usr/share/terminfo/s/stterm-256color
 #usr/share/terminfo/s/stv52
 #usr/share/terminfo/s/stv52pc
 usr/share/terminfo/s/sun
+#usr/share/terminfo/s/sun+sl
 #usr/share/terminfo/s/sun-1
 #usr/share/terminfo/s/sun-12
 #usr/share/terminfo/s/sun-17
@@ -2874,14 +2902,17 @@ usr/share/terminfo/s/sun
 #usr/share/terminfo/t/tek4207
 #usr/share/terminfo/t/tek4207-s
 #usr/share/terminfo/t/tek4404
+#usr/share/terminfo/t/teken
 #usr/share/terminfo/t/teleray
 #usr/share/terminfo/t/teletec
 usr/share/terminfo/t/teraterm
 usr/share/terminfo/t/teraterm2.3
 #usr/share/terminfo/t/teraterm4.59
+#usr/share/terminfo/t/terminator
 #usr/share/terminfo/t/terminet
 #usr/share/terminfo/t/terminet1200
 #usr/share/terminfo/t/terminet300
+#usr/share/terminfo/t/terminology
 #usr/share/terminfo/t/tgtelnet
 #usr/share/terminfo/t/ti700
 #usr/share/terminfo/t/ti733
@@ -2905,6 +2936,8 @@ usr/share/terminfo/t/teraterm2.3
 #usr/share/terminfo/t/ti931
 #usr/share/terminfo/t/ti_ansi
 #usr/share/terminfo/t/tkterm
+#usr/share/terminfo/t/tmux
+#usr/share/terminfo/t/tmux-256color
 #usr/share/terminfo/t/tn1200
 #usr/share/terminfo/t/tn300
 #usr/share/terminfo/t/trs16
@@ -3202,6 +3235,7 @@ usr/share/terminfo/v/vt220
 #usr/share/terminfo/v/vt510pcdos
 usr/share/terminfo/v/vt52
 #usr/share/terminfo/v/vt520
+#usr/share/terminfo/v/vt520ansi
 #usr/share/terminfo/v/vt525
 #usr/share/terminfo/v/vt61
 #usr/share/terminfo/v/vt61.5
@@ -3209,6 +3243,8 @@ usr/share/terminfo/v/vte
 #usr/share/terminfo/v/vte+pcfkeys
 #usr/share/terminfo/v/vte-2007
 #usr/share/terminfo/v/vte-2008
+#usr/share/terminfo/v/vte-2012
+#usr/share/terminfo/v/vte-2014
 usr/share/terminfo/v/vte-256color
 #usr/share/terminfo/v/vtnt
 #usr/share/terminfo/v/vv100
@@ -3521,9 +3557,11 @@ usr/share/terminfo/x/xfce
 #usr/share/terminfo/x/xtalk
 usr/share/terminfo/x/xterm
 #usr/share/terminfo/x/xterm+256color
+#usr/share/terminfo/x/xterm+256setaf
 #usr/share/terminfo/x/xterm+88color
 #usr/share/terminfo/x/xterm+app
 #usr/share/terminfo/x/xterm+edit
+#usr/share/terminfo/x/xterm+kbs
 #usr/share/terminfo/x/xterm+noapp
 #usr/share/terminfo/x/xterm+pc+edit
 #usr/share/terminfo/x/xterm+pcc0
@@ -3537,9 +3575,19 @@ usr/share/terminfo/x/xterm
 #usr/share/terminfo/x/xterm+r6f2
 #usr/share/terminfo/x/xterm+sl
 #usr/share/terminfo/x/xterm+sl-twm
+#usr/share/terminfo/x/xterm+sm+1002
+#usr/share/terminfo/x/xterm+sm+1003
+#usr/share/terminfo/x/xterm+sm+1005
+#usr/share/terminfo/x/xterm+sm+1006
+#usr/share/terminfo/x/xterm+tmux
 #usr/share/terminfo/x/xterm+vt+edit
+#usr/share/terminfo/x/xterm+x10mouse
+#usr/share/terminfo/x/xterm+x11hilite
+#usr/share/terminfo/x/xterm+x11mouse
 usr/share/terminfo/x/xterm-1002
 usr/share/terminfo/x/xterm-1003
+usr/share/terminfo/x/xterm-1005
+usr/share/terminfo/x/xterm-1006
 usr/share/terminfo/x/xterm-16color
 usr/share/terminfo/x/xterm-24
 usr/share/terminfo/x/xterm-256color
@@ -3561,6 +3609,9 @@ usr/share/terminfo/x/xterm-sun
 usr/share/terminfo/x/xterm-utf8
 usr/share/terminfo/x/xterm-vt220
 usr/share/terminfo/x/xterm-vt52
+usr/share/terminfo/x/xterm-x10mouse
+usr/share/terminfo/x/xterm-x11hilite
+usr/share/terminfo/x/xterm-x11mouse
 usr/share/terminfo/x/xterm-xf86-v32
 usr/share/terminfo/x/xterm-xf86-v33
 usr/share/terminfo/x/xterm-xf86-v333
diff --git a/config/rootfiles/common/ncurses-compat b/config/rootfiles/common/ncurses-compat
new file mode 100644
index 000000000..821e71b07
--- /dev/null
+++ b/config/rootfiles/common/ncurses-compat
@@ -0,0 +1,3610 @@
+#usr/bin/captoinfo
+#usr/bin/clear
+#usr/bin/infocmp
+#usr/bin/infotocap
+#usr/bin/ncurses5-config
+#usr/bin/ncursesw5-config
+#usr/bin/reset
+#usr/bin/tabs
+#usr/bin/tic
+#usr/bin/toe
+#usr/bin/tput
+#usr/bin/tset
+#usr/include/curses.h
+#usr/include/cursesapp.h
+#usr/include/cursesf.h
+#usr/include/cursesm.h
+#usr/include/cursesp.h
+#usr/include/cursesw.h
+#usr/include/cursslk.h
+#usr/include/eti.h
+#usr/include/etip.h
+#usr/include/form.h
+#usr/include/menu.h
+#usr/include/nc_tparm.h
+#usr/include/ncurses.h
+#usr/include/ncurses_dll.h
+#usr/include/panel.h
+#usr/include/term.h
+#usr/include/term_entry.h
+#usr/include/termcap.h
+#usr/include/tic.h
+#usr/include/unctrl.h
+#usr/lib/libcurses.a
+#usr/lib/libcurses.so
+#usr/lib/libcursesw.so
+#usr/lib/libform.a
+#usr/lib/libform.so
+usr/lib/libform.so.5
+usr/lib/libform.so.5.9
+#usr/lib/libformw.a
+#usr/lib/libformw.so
+usr/lib/libformw.so.5
+usr/lib/libformw.so.5.9
+#usr/lib/libmenu.a
+#usr/lib/libmenu.so
+usr/lib/libmenu.so.5
+usr/lib/libmenu.so.5.9
+#usr/lib/libmenuw.a
+#usr/lib/libmenuw.so
+usr/lib/libmenuw.so.5
+usr/lib/libmenuw.so.5.9
+#usr/lib/libncurses++.a
+#usr/lib/libncurses++w.a
+#usr/lib/libncurses.a
+#usr/lib/libncurses.so
+usr/lib/libncurses.so.5
+usr/lib/libncurses.so.5.9
+#usr/lib/libncursesw.a
+#usr/lib/libncursesw.so
+usr/lib/libncursesw.so.5
+usr/lib/libncursesw.so.5.9
+#usr/lib/libpanel.a
+#usr/lib/libpanel.so
+usr/lib/libpanel.so.5
+usr/lib/libpanel.so.5.9
+#usr/lib/libpanelw.a
+#usr/lib/libpanelw.so
+usr/lib/libpanelw.so.5
+usr/lib/libpanelw.so.5.9
+#usr/lib/libtermcap.so
+#usr/lib/libtic.a
+#usr/lib/libtic.so
+usr/lib/libtic.so.5
+usr/lib/libtic.so.5.9
+#usr/lib/libtinfo.a
+#usr/lib/libtinfo.so
+usr/lib/libtinfo.so.5
+usr/lib/libtinfo.so.5.9
+#usr/lib/terminfo
+#usr/man
+#usr/man/man1
+#usr/man/man1/captoinfo.1m
+#usr/man/man1/clear.1
+#usr/man/man1/infocmp.1m
+#usr/man/man1/infotocap.1m
+#usr/man/man1/ncursesw5-config.1
+#usr/man/man1/reset.1
+#usr/man/man1/tabs.1
+#usr/man/man1/tic.1m
+#usr/man/man1/toe.1m
+#usr/man/man1/tput.1
+#usr/man/man1/tset.1
+#usr/man/man3
+#usr/man/man3/BC.3x
+#usr/man/man3/COLORS.3x
+#usr/man/man3/COLOR_PAIR.3x
+#usr/man/man3/COLOR_PAIRS.3x
+#usr/man/man3/COLS.3x
+#usr/man/man3/ESCDELAY.3x
+#usr/man/man3/LINES.3x
+#usr/man/man3/PAIR_NUMBER.3x
+#usr/man/man3/PC.3x
+#usr/man/man3/SP.3x
+#usr/man/man3/TABSIZE.3x
+#usr/man/man3/TYPE_ALNUM.3x
+#usr/man/man3/TYPE_ALPHA.3x
+#usr/man/man3/TYPE_ENUM.3x
+#usr/man/man3/TYPE_INTEGER.3x
+#usr/man/man3/TYPE_IPV4.3x
+#usr/man/man3/TYPE_NUMERIC.3x
+#usr/man/man3/TYPE_REGEXP.3x
+#usr/man/man3/UP.3x
+#usr/man/man3/_nc_free_and_exit.3x
+#usr/man/man3/_nc_freeall.3x
+#usr/man/man3/_nc_tracebits.3x
+#usr/man/man3/_traceattr.3x
+#usr/man/man3/_traceattr2.3x
+#usr/man/man3/_tracecchar_t.3x
+#usr/man/man3/_tracecchar_t2.3x
+#usr/man/man3/_tracechar.3x
+#usr/man/man3/_tracechtype.3x
+#usr/man/man3/_tracechtype2.3x
+#usr/man/man3/_tracedump.3x
+#usr/man/man3/_tracef.3x
+#usr/man/man3/_tracemouse.3x
+#usr/man/man3/acs_map.3x
+#usr/man/man3/add_wch.3x
+#usr/man/man3/add_wchnstr.3x
+#usr/man/man3/add_wchstr.3x
+#usr/man/man3/addch.3x
+#usr/man/man3/addchnstr.3x
+#usr/man/man3/addchstr.3x
+#usr/man/man3/addnstr.3x
+#usr/man/man3/addnwstr.3x
+#usr/man/man3/addstr.3x
+#usr/man/man3/addwstr.3x
+#usr/man/man3/assume_default_colors.3x
+#usr/man/man3/assume_default_colors_sp.3x
+#usr/man/man3/attr_get.3x
+#usr/man/man3/attr_off.3x
+#usr/man/man3/attr_on.3x
+#usr/man/man3/attr_set.3x
+#usr/man/man3/attroff.3x
+#usr/man/man3/attron.3x
+#usr/man/man3/attrset.3x
+#usr/man/man3/baudrate.3x
+#usr/man/man3/baudrate_sp.3x
+#usr/man/man3/beep.3x
+#usr/man/man3/beep_sp.3x
+#usr/man/man3/bkgd.3x
+#usr/man/man3/bkgdset.3x
+#usr/man/man3/bkgrnd.3x
+#usr/man/man3/bkgrndset.3x
+#usr/man/man3/boolcodes.3x
+#usr/man/man3/boolfnames.3x
+#usr/man/man3/boolnames.3x
+#usr/man/man3/border.3x
+#usr/man/man3/border_set.3x
+#usr/man/man3/bottom_panel.3x
+#usr/man/man3/box.3x
+#usr/man/man3/box_set.3x
+#usr/man/man3/can_change_color.3x
+#usr/man/man3/can_change_color_sp.3x
+#usr/man/man3/cbreak.3x
+#usr/man/man3/cbreak_sp.3x
+#usr/man/man3/ceiling_panel.3x
+#usr/man/man3/chgat.3x
+#usr/man/man3/clear.3x
+#usr/man/man3/clearok.3x
+#usr/man/man3/clrtobot.3x
+#usr/man/man3/clrtoeol.3x
+#usr/man/man3/color_content.3x
+#usr/man/man3/color_content_sp.3x
+#usr/man/man3/color_set.3x
+#usr/man/man3/copywin.3x
+#usr/man/man3/cur_term.3x
+#usr/man/man3/current_field.3x
+#usr/man/man3/current_item.3x
+#usr/man/man3/curs_add_wch.3x
+#usr/man/man3/curs_add_wchstr.3x
+#usr/man/man3/curs_addch.3x
+#usr/man/man3/curs_addchstr.3x
+#usr/man/man3/curs_addstr.3x
+#usr/man/man3/curs_addwstr.3x
+#usr/man/man3/curs_attr.3x
+#usr/man/man3/curs_beep.3x
+#usr/man/man3/curs_bkgd.3x
+#usr/man/man3/curs_bkgrnd.3x
+#usr/man/man3/curs_border.3x
+#usr/man/man3/curs_border_set.3x
+#usr/man/man3/curs_clear.3x
+#usr/man/man3/curs_color.3x
+#usr/man/man3/curs_delch.3x
+#usr/man/man3/curs_deleteln.3x
+#usr/man/man3/curs_extend.3x
+#usr/man/man3/curs_get_wch.3x
+#usr/man/man3/curs_get_wstr.3x
+#usr/man/man3/curs_getcchar.3x
+#usr/man/man3/curs_getch.3x
+#usr/man/man3/curs_getstr.3x
+#usr/man/man3/curs_getyx.3x
+#usr/man/man3/curs_in_wch.3x
+#usr/man/man3/curs_in_wchstr.3x
+#usr/man/man3/curs_inch.3x
+#usr/man/man3/curs_inchstr.3x
+#usr/man/man3/curs_initscr.3x
+#usr/man/man3/curs_inopts.3x
+#usr/man/man3/curs_ins_wch.3x
+#usr/man/man3/curs_ins_wstr.3x
+#usr/man/man3/curs_insch.3x
+#usr/man/man3/curs_insstr.3x
+#usr/man/man3/curs_instr.3x
+#usr/man/man3/curs_inwstr.3x
+#usr/man/man3/curs_kernel.3x
+#usr/man/man3/curs_legacy.3x
+#usr/man/man3/curs_memleaks.3x
+#usr/man/man3/curs_mouse.3x
+#usr/man/man3/curs_move.3x
+#usr/man/man3/curs_opaque.3x
+#usr/man/man3/curs_outopts.3x
+#usr/man/man3/curs_overlay.3x
+#usr/man/man3/curs_pad.3x
+#usr/man/man3/curs_print.3x
+#usr/man/man3/curs_printw.3x
+#usr/man/man3/curs_refresh.3x
+#usr/man/man3/curs_scanw.3x
+#usr/man/man3/curs_scr_dump.3x
+#usr/man/man3/curs_scroll.3x
+#usr/man/man3/curs_set.3x
+#usr/man/man3/curs_set_sp.3x
+#usr/man/man3/curs_slk.3x
+#usr/man/man3/curs_sp_funcs.3x
+#usr/man/man3/curs_termattrs.3x
+#usr/man/man3/curs_termcap.3x
+#usr/man/man3/curs_terminfo.3x
+#usr/man/man3/curs_threads.3x
+#usr/man/man3/curs_touch.3x
+#usr/man/man3/curs_trace.3x
+#usr/man/man3/curs_util.3x
+#usr/man/man3/curs_variables.3x
+#usr/man/man3/curs_window.3x
+#usr/man/man3/curscr.3x
+#usr/man/man3/curses_version.3x
+#usr/man/man3/data_ahead.3x
+#usr/man/man3/data_behind.3x
+#usr/man/man3/def_prog_mode.3x
+#usr/man/man3/def_prog_mode_sp.3x
+#usr/man/man3/def_shell_mode.3x
+#usr/man/man3/def_shell_mode_sp.3x
+#usr/man/man3/default_colors.3x
+#usr/man/man3/define_key.3x
+#usr/man/man3/define_key_sp.3x
+#usr/man/man3/del_curterm.3x
+#usr/man/man3/del_curterm_sp.3x
+#usr/man/man3/del_panel.3x
+#usr/man/man3/delay_output.3x
+#usr/man/man3/delay_output_sp.3x
+#usr/man/man3/delch.3x
+#usr/man/man3/deleteln.3x
+#usr/man/man3/delscreen.3x
+#usr/man/man3/delwin.3x
+#usr/man/man3/derwin.3x
+#usr/man/man3/doupdate.3x
+#usr/man/man3/doupdate_sp.3x
+#usr/man/man3/dup_field.3x
+#usr/man/man3/dupwin.3x
+#usr/man/man3/dynamic_field_info.3x
+#usr/man/man3/echo.3x
+#usr/man/man3/echo_sp.3x
+#usr/man/man3/echo_wchar.3x
+#usr/man/man3/echochar.3x
+#usr/man/man3/endwin.3x
+#usr/man/man3/endwin_sp.3x
+#usr/man/man3/erase.3x
+#usr/man/man3/erasechar.3x
+#usr/man/man3/erasechar_sp.3x
+#usr/man/man3/erasewchar.3x
+#usr/man/man3/field_arg.3x
+#usr/man/man3/field_back.3x
+#usr/man/man3/field_buffer.3x
+#usr/man/man3/field_count.3x
+#usr/man/man3/field_fore.3x
+#usr/man/man3/field_index.3x
+#usr/man/man3/field_info.3x
+#usr/man/man3/field_init.3x
+#usr/man/man3/field_just.3x
+#usr/man/man3/field_opts.3x
+#usr/man/man3/field_opts_off.3x
+#usr/man/man3/field_opts_on.3x
+#usr/man/man3/field_pad.3x
+#usr/man/man3/field_status.3x
+#usr/man/man3/field_term.3x
+#usr/man/man3/field_type.3x
+#usr/man/man3/field_userptr.3x
+#usr/man/man3/filter.3x
+#usr/man/man3/filter_sp.3x
+#usr/man/man3/flash.3x
+#usr/man/man3/flash_sp.3x
+#usr/man/man3/flushinp.3x
+#usr/man/man3/flushinp_sp.3x
+#usr/man/man3/form.3x
+#usr/man/man3/form_cursor.3x
+#usr/man/man3/form_data.3x
+#usr/man/man3/form_driver.3x
+#usr/man/man3/form_field.3x
+#usr/man/man3/form_field_attributes.3x
+#usr/man/man3/form_field_buffer.3x
+#usr/man/man3/form_field_info.3x
+#usr/man/man3/form_field_just.3x
+#usr/man/man3/form_field_new.3x
+#usr/man/man3/form_field_opts.3x
+#usr/man/man3/form_field_userptr.3x
+#usr/man/man3/form_field_validation.3x
+#usr/man/man3/form_fields.3x
+#usr/man/man3/form_fieldtype.3x
+#usr/man/man3/form_hook.3x
+#usr/man/man3/form_init.3x
+#usr/man/man3/form_new.3x
+#usr/man/man3/form_new_page.3x
+#usr/man/man3/form_opts.3x
+#usr/man/man3/form_opts_off.3x
+#usr/man/man3/form_opts_on.3x
+#usr/man/man3/form_page.3x
+#usr/man/man3/form_post.3x
+#usr/man/man3/form_request_by_name.3x
+#usr/man/man3/form_request_name.3x
+#usr/man/man3/form_requestname.3x
+#usr/man/man3/form_sub.3x
+#usr/man/man3/form_term.3x
+#usr/man/man3/form_userptr.3x
+#usr/man/man3/form_variables.3x
+#usr/man/man3/form_win.3x
+#usr/man/man3/free_field.3x
+#usr/man/man3/free_fieldtype.3x
+#usr/man/man3/free_form.3x
+#usr/man/man3/free_item.3x
+#usr/man/man3/free_menu.3x
+#usr/man/man3/get_escdelay.3x
+#usr/man/man3/get_escdelay_sp.3x
+#usr/man/man3/get_wch.3x
+#usr/man/man3/get_wstr.3x
+#usr/man/man3/getattrs.3x
+#usr/man/man3/getbegx.3x
+#usr/man/man3/getbegy.3x
+#usr/man/man3/getbegyx.3x
+#usr/man/man3/getbkgd.3x
+#usr/man/man3/getbkgrnd.3x
+#usr/man/man3/getcchar.3x
+#usr/man/man3/getch.3x
+#usr/man/man3/getcurx.3x
+#usr/man/man3/getcury.3x
+#usr/man/man3/getmaxx.3x
+#usr/man/man3/getmaxy.3x
+#usr/man/man3/getmaxyx.3x
+#usr/man/man3/getmouse.3x
+#usr/man/man3/getmouse_sp.3x
+#usr/man/man3/getn_wstr.3x
+#usr/man/man3/getnstr.3x
+#usr/man/man3/getparx.3x
+#usr/man/man3/getpary.3x
+#usr/man/man3/getparyx.3x
+#usr/man/man3/getstr.3x
+#usr/man/man3/getsyx.3x
+#usr/man/man3/getwin.3x
+#usr/man/man3/getwin_sp.3x
+#usr/man/man3/getyx.3x
+#usr/man/man3/ground_panel.3x
+#usr/man/man3/halfdelay.3x
+#usr/man/man3/halfdelay_sp.3x
+#usr/man/man3/has_colors.3x
+#usr/man/man3/has_colors_sp.3x
+#usr/man/man3/has_ic.3x
+#usr/man/man3/has_ic_sp.3x
+#usr/man/man3/has_il.3x
+#usr/man/man3/has_il_sp.3x
+#usr/man/man3/has_key.3x
+#usr/man/man3/has_key_sp.3x
+#usr/man/man3/has_mouse.3x
+#usr/man/man3/has_mouse_sp.3x
+#usr/man/man3/hide_panel.3x
+#usr/man/man3/hline.3x
+#usr/man/man3/hline_set.3x
+#usr/man/man3/idcok.3x
+#usr/man/man3/idlok.3x
+#usr/man/man3/immedok.3x
+#usr/man/man3/in_wch.3x
+#usr/man/man3/in_wchnstr.3x
+#usr/man/man3/in_wchstr.3x
+#usr/man/man3/inch.3x
+#usr/man/man3/inchnstr.3x
+#usr/man/man3/inchstr.3x
+#usr/man/man3/init_color.3x
+#usr/man/man3/init_color_sp.3x
+#usr/man/man3/init_pair.3x
+#usr/man/man3/init_pair_sp.3x
+#usr/man/man3/initscr.3x
+#usr/man/man3/innstr.3x
+#usr/man/man3/innwstr.3x
+#usr/man/man3/ins_nwstr.3x
+#usr/man/man3/ins_wch.3x
+#usr/man/man3/ins_wstr.3x
+#usr/man/man3/insch.3x
+#usr/man/man3/insdelln.3x
+#usr/man/man3/insertln.3x
+#usr/man/man3/insnstr.3x
+#usr/man/man3/insstr.3x
+#usr/man/man3/instr.3x
+#usr/man/man3/intrflush.3x
+#usr/man/man3/intrflush_sp.3x
+#usr/man/man3/inwstr.3x
+#usr/man/man3/is_cleared.3x
+#usr/man/man3/is_idcok.3x
+#usr/man/man3/is_idlok.3x
+#usr/man/man3/is_immedok.3x
+#usr/man/man3/is_keypad.3x
+#usr/man/man3/is_leaveok.3x
+#usr/man/man3/is_linetouched.3x
+#usr/man/man3/is_nodelay.3x
+#usr/man/man3/is_notimeout.3x
+#usr/man/man3/is_pad.3x
+#usr/man/man3/is_scrollok.3x
+#usr/man/man3/is_subwin.3x
+#usr/man/man3/is_syncok.3x
+#usr/man/man3/is_term_resized.3x
+#usr/man/man3/is_term_resized_sp.3x
+#usr/man/man3/is_wintouched.3x
+#usr/man/man3/isendwin.3x
+#usr/man/man3/isendwin_sp.3x
+#usr/man/man3/item_count.3x
+#usr/man/man3/item_description.3x
+#usr/man/man3/item_index.3x
+#usr/man/man3/item_init.3x
+#usr/man/man3/item_name.3x
+#usr/man/man3/item_opts.3x
+#usr/man/man3/item_opts_off.3x
+#usr/man/man3/item_opts_on.3x
+#usr/man/man3/item_term.3x
+#usr/man/man3/item_userptr.3x
+#usr/man/man3/item_value.3x
+#usr/man/man3/item_visible.3x
+#usr/man/man3/key_defined.3x
+#usr/man/man3/key_defined_sp.3x
+#usr/man/man3/key_name.3x
+#usr/man/man3/keybound.3x
+#usr/man/man3/keybound_sp.3x
+#usr/man/man3/keyname.3x
+#usr/man/man3/keyname_sp.3x
+#usr/man/man3/keyok.3x
+#usr/man/man3/keyok_sp.3x
+#usr/man/man3/keypad.3x
+#usr/man/man3/killchar.3x
+#usr/man/man3/killchar_sp.3x
+#usr/man/man3/killwchar.3x
+#usr/man/man3/leaveok.3x
+#usr/man/man3/legacy_coding.3x
+#usr/man/man3/link_field.3x
+#usr/man/man3/link_fieldtype.3x
+#usr/man/man3/longname.3x
+#usr/man/man3/mcprint.3x
+#usr/man/man3/mcprint_sp.3x
+#usr/man/man3/menu.3x
+#usr/man/man3/menu_attributes.3x
+#usr/man/man3/menu_back.3x
+#usr/man/man3/menu_cursor.3x
+#usr/man/man3/menu_driver.3x
+#usr/man/man3/menu_fore.3x
+#usr/man/man3/menu_format.3x
+#usr/man/man3/menu_grey.3x
+#usr/man/man3/menu_hook.3x
+#usr/man/man3/menu_init.3x
+#usr/man/man3/menu_items.3x
+#usr/man/man3/menu_mark.3x
+#usr/man/man3/menu_new.3x
+#usr/man/man3/menu_opts.3x
+#usr/man/man3/menu_opts_off.3x
+#usr/man/man3/menu_opts_on.3x
+#usr/man/man3/menu_pad.3x
+#usr/man/man3/menu_pattern.3x
+#usr/man/man3/menu_post.3x
+#usr/man/man3/menu_request_by_name.3x
+#usr/man/man3/menu_request_name.3x
+#usr/man/man3/menu_requestname.3x
+#usr/man/man3/menu_spacing.3x
+#usr/man/man3/menu_sub.3x
+#usr/man/man3/menu_term.3x
+#usr/man/man3/menu_userptr.3x
+#usr/man/man3/menu_win.3x
+#usr/man/man3/meta.3x
+#usr/man/man3/mitem_current.3x
+#usr/man/man3/mitem_name.3x
+#usr/man/man3/mitem_new.3x
+#usr/man/man3/mitem_opts.3x
+#usr/man/man3/mitem_userptr.3x
+#usr/man/man3/mitem_value.3x
+#usr/man/man3/mitem_visible.3x
+#usr/man/man3/mouse_trafo.3x
+#usr/man/man3/mouseinterval.3x
+#usr/man/man3/mouseinterval_sp.3x
+#usr/man/man3/mousemask.3x
+#usr/man/man3/mousemask_sp.3x
+#usr/man/man3/move.3x
+#usr/man/man3/move_field.3x
+#usr/man/man3/move_panel.3x
+#usr/man/man3/mvadd_wch.3x
+#usr/man/man3/mvadd_wchnstr.3x
+#usr/man/man3/mvadd_wchstr.3x
+#usr/man/man3/mvaddch.3x
+#usr/man/man3/mvaddchnstr.3x
+#usr/man/man3/mvaddchstr.3x
+#usr/man/man3/mvaddnstr.3x
+#usr/man/man3/mvaddnwstr.3x
+#usr/man/man3/mvaddstr.3x
+#usr/man/man3/mvaddwstr.3x
+#usr/man/man3/mvchgat.3x
+#usr/man/man3/mvcur.3x
+#usr/man/man3/mvcur_sp.3x
+#usr/man/man3/mvdelch.3x
+#usr/man/man3/mvderwin.3x
+#usr/man/man3/mvget_wch.3x
+#usr/man/man3/mvget_wstr.3x
+#usr/man/man3/mvgetch.3x
+#usr/man/man3/mvgetn_wstr.3x
+#usr/man/man3/mvgetnstr.3x
+#usr/man/man3/mvgetstr.3x
+#usr/man/man3/mvhline.3x
+#usr/man/man3/mvhline_set.3x
+#usr/man/man3/mvin_wch.3x
+#usr/man/man3/mvin_wchnstr.3x
+#usr/man/man3/mvin_wchstr.3x
+#usr/man/man3/mvinch.3x
+#usr/man/man3/mvinchnstr.3x
+#usr/man/man3/mvinchstr.3x
+#usr/man/man3/mvinnstr.3x
+#usr/man/man3/mvinnwstr.3x
+#usr/man/man3/mvins_nwstr.3x
+#usr/man/man3/mvins_wch.3x
+#usr/man/man3/mvins_wstr.3x
+#usr/man/man3/mvinsch.3x
+#usr/man/man3/mvinsnstr.3x
+#usr/man/man3/mvinsstr.3x
+#usr/man/man3/mvinstr.3x
+#usr/man/man3/mvinwstr.3x
+#usr/man/man3/mvprintw.3x
+#usr/man/man3/mvscanw.3x
+#usr/man/man3/mvvline.3x
+#usr/man/man3/mvvline_set.3x
+#usr/man/man3/mvwadd_wch.3x
+#usr/man/man3/mvwadd_wchnstr.3x
+#usr/man/man3/mvwadd_wchstr.3x
+#usr/man/man3/mvwaddch.3x
+#usr/man/man3/mvwaddchnstr.3x
+#usr/man/man3/mvwaddchstr.3x
+#usr/man/man3/mvwaddnstr.3x
+#usr/man/man3/mvwaddnwstr.3x
+#usr/man/man3/mvwaddstr.3x
+#usr/man/man3/mvwaddwstr.3x
+#usr/man/man3/mvwchgat.3x
+#usr/man/man3/mvwdelch.3x
+#usr/man/man3/mvwget_wch.3x
+#usr/man/man3/mvwget_wstr.3x
+#usr/man/man3/mvwgetch.3x
+#usr/man/man3/mvwgetn_wstr.3x
+#usr/man/man3/mvwgetnstr.3x
+#usr/man/man3/mvwgetstr.3x
+#usr/man/man3/mvwhline.3x
+#usr/man/man3/mvwhline_set.3x
+#usr/man/man3/mvwin.3x
+#usr/man/man3/mvwin_wch.3x
+#usr/man/man3/mvwin_wchnstr.3x
+#usr/man/man3/mvwin_wchstr.3x
+#usr/man/man3/mvwinch.3x
+#usr/man/man3/mvwinchnstr.3x
+#usr/man/man3/mvwinchstr.3x
+#usr/man/man3/mvwinnstr.3x
+#usr/man/man3/mvwinnwstr.3x
+#usr/man/man3/mvwins_nwstr.3x
+#usr/man/man3/mvwins_wch.3x
+#usr/man/man3/mvwins_wstr.3x
+#usr/man/man3/mvwinsch.3x
+#usr/man/man3/mvwinsnstr.3x
+#usr/man/man3/mvwinsstr.3x
+#usr/man/man3/mvwinstr.3x
+#usr/man/man3/mvwinwstr.3x
+#usr/man/man3/mvwprintw.3x
+#usr/man/man3/mvwscanw.3x
+#usr/man/man3/mvwvline.3x
+#usr/man/man3/mvwvline_set.3x
+#usr/man/man3/napms.3x
+#usr/man/man3/napms_sp.3x
+#usr/man/man3/ncurses.3x
+#usr/man/man3/new_field.3x
+#usr/man/man3/new_fieldtype.3x
+#usr/man/man3/new_form.3x
+#usr/man/man3/new_form_sp.3x
+#usr/man/man3/new_item.3x
+#usr/man/man3/new_menu.3x
+#usr/man/man3/new_menu_sp.3x
+#usr/man/man3/new_page.3x
+#usr/man/man3/new_panel.3x
+#usr/man/man3/new_prescr.3x
+#usr/man/man3/newpad.3x
+#usr/man/man3/newpad_sp.3x
+#usr/man/man3/newscr.3x
+#usr/man/man3/newterm.3x
+#usr/man/man3/newterm_sp.3x
+#usr/man/man3/newwin.3x
+#usr/man/man3/newwin_sp.3x
+#usr/man/man3/nl.3x
+#usr/man/man3/nl_sp.3x
+#usr/man/man3/nocbreak.3x
+#usr/man/man3/nocbreak_sp.3x
+#usr/man/man3/nodelay.3x
+#usr/man/man3/noecho.3x
+#usr/man/man3/noecho_sp.3x
+#usr/man/man3/nofilter.3x
+#usr/man/man3/nofilter_sp.3x
+#usr/man/man3/nonl.3x
+#usr/man/man3/nonl_sp.3x
+#usr/man/man3/noqiflush.3x
+#usr/man/man3/noqiflush_sp.3x
+#usr/man/man3/noraw.3x
+#usr/man/man3/noraw_sp.3x
+#usr/man/man3/notimeout.3x
+#usr/man/man3/numcodes.3x
+#usr/man/man3/numfnames.3x
+#usr/man/man3/numnames.3x
+#usr/man/man3/ospeed.3x
+#usr/man/man3/overlay.3x
+#usr/man/man3/overwrite.3x
+#usr/man/man3/pair_content.3x
+#usr/man/man3/pair_content_sp.3x
+#usr/man/man3/panel.3x
+#usr/man/man3/panel_above.3x
+#usr/man/man3/panel_below.3x
+#usr/man/man3/panel_hidden.3x
+#usr/man/man3/panel_userptr.3x
+#usr/man/man3/panel_window.3x
+#usr/man/man3/pecho_wchar.3x
+#usr/man/man3/pechochar.3x
+#usr/man/man3/pnoutrefresh.3x
+#usr/man/man3/pos_form_cursor.3x
+#usr/man/man3/pos_menu_cursor.3x
+#usr/man/man3/post_form.3x
+#usr/man/man3/post_menu.3x
+#usr/man/man3/prefresh.3x
+#usr/man/man3/printw.3x
+#usr/man/man3/putp.3x
+#usr/man/man3/putp_sp.3x
+#usr/man/man3/putwin.3x
+#usr/man/man3/qiflush.3x
+#usr/man/man3/qiflush_sp.3x
+#usr/man/man3/raw.3x
+#usr/man/man3/raw_sp.3x
+#usr/man/man3/redrawwin.3x
+#usr/man/man3/refresh.3x
+#usr/man/man3/replace_panel.3x
+#usr/man/man3/reset_prog_mode.3x
+#usr/man/man3/reset_prog_mode_sp.3x
+#usr/man/man3/reset_shell_mode.3x
+#usr/man/man3/reset_shell_mode_sp.3x
+#usr/man/man3/resetty.3x
+#usr/man/man3/resetty_sp.3x
+#usr/man/man3/resize_term.3x
+#usr/man/man3/resize_term_sp.3x
+#usr/man/man3/resizeterm.3x
+#usr/man/man3/resizeterm_sp.3x
+#usr/man/man3/restartterm.3x
+#usr/man/man3/restartterm_sp.3x
+#usr/man/man3/ripoffline.3x
+#usr/man/man3/ripoffline_sp.3x
+#usr/man/man3/savetty.3x
+#usr/man/man3/savetty_sp.3x
+#usr/man/man3/scale_form.3x
+#usr/man/man3/scale_menu.3x
+#usr/man/man3/scanw.3x
+#usr/man/man3/scr_dump.3x
+#usr/man/man3/scr_init.3x
+#usr/man/man3/scr_init_sp.3x
+#usr/man/man3/scr_restore.3x
+#usr/man/man3/scr_restore_sp.3x
+#usr/man/man3/scr_set.3x
+#usr/man/man3/scr_set_sp.3x
+#usr/man/man3/scrl.3x
+#usr/man/man3/scroll.3x
+#usr/man/man3/scrollok.3x
+#usr/man/man3/set_current_field.3x
+#usr/man/man3/set_current_item.3x
+#usr/man/man3/set_curterm.3x
+#usr/man/man3/set_curterm_sp.3x
+#usr/man/man3/set_escdelay.3x
+#usr/man/man3/set_escdelay_sp.3x
+#usr/man/man3/set_field_back.3x
+#usr/man/man3/set_field_buffer.3x
+#usr/man/man3/set_field_fore.3x
+#usr/man/man3/set_field_init.3x
+#usr/man/man3/set_field_just.3x
+#usr/man/man3/set_field_opts.3x
+#usr/man/man3/set_field_pad.3x
+#usr/man/man3/set_field_status.3x
+#usr/man/man3/set_field_term.3x
+#usr/man/man3/set_field_type.3x
+#usr/man/man3/set_field_userptr.3x
+#usr/man/man3/set_fieldtype_arg.3x
+#usr/man/man3/set_fieldtype_choice.3x
+#usr/man/man3/set_form_fields.3x
+#usr/man/man3/set_form_init.3x
+#usr/man/man3/set_form_opts.3x
+#usr/man/man3/set_form_page.3x
+#usr/man/man3/set_form_sub.3x
+#usr/man/man3/set_form_term.3x
+#usr/man/man3/set_form_userptr.3x
+#usr/man/man3/set_form_win.3x
+#usr/man/man3/set_item_init.3x
+#usr/man/man3/set_item_opts.3x
+#usr/man/man3/set_item_term.3x
+#usr/man/man3/set_item_userptr.3x
+#usr/man/man3/set_item_value.3x
+#usr/man/man3/set_max_field.3x
+#usr/man/man3/set_menu_back.3x
+#usr/man/man3/set_menu_fore.3x
+#usr/man/man3/set_menu_format.3x
+#usr/man/man3/set_menu_grey.3x
+#usr/man/man3/set_menu_init.3x
+#usr/man/man3/set_menu_items.3x
+#usr/man/man3/set_menu_mark.3x
+#usr/man/man3/set_menu_opts.3x
+#usr/man/man3/set_menu_pad.3x
+#usr/man/man3/set_menu_pattern.3x
+#usr/man/man3/set_menu_spacing.3x
+#usr/man/man3/set_menu_sub.3x
+#usr/man/man3/set_menu_term.3x
+#usr/man/man3/set_menu_userptr.3x
+#usr/man/man3/set_menu_win.3x
+#usr/man/man3/set_new_page.3x
+#usr/man/man3/set_panel_userptr.3x
+#usr/man/man3/set_tabsize.3x
+#usr/man/man3/set_tabsize_sp.3x
+#usr/man/man3/set_term.3x
+#usr/man/man3/set_top_row.3x
+#usr/man/man3/setcchar.3x
+#usr/man/man3/setscrreg.3x
+#usr/man/man3/setsyx.3x
+#usr/man/man3/setterm.3x
+#usr/man/man3/setupterm.3x
+#usr/man/man3/show_panel.3x
+#usr/man/man3/slk_attr.3x
+#usr/man/man3/slk_attr_off.3x
+#usr/man/man3/slk_attr_on.3x
+#usr/man/man3/slk_attr_set.3x
+#usr/man/man3/slk_attr_set_sp.3x
+#usr/man/man3/slk_attr_sp.3x
+#usr/man/man3/slk_attroff.3x
+#usr/man/man3/slk_attroff_sp.3x
+#usr/man/man3/slk_attron.3x
+#usr/man/man3/slk_attron_sp.3x
+#usr/man/man3/slk_attrset.3x
+#usr/man/man3/slk_attrset_sp.3x
+#usr/man/man3/slk_clear.3x
+#usr/man/man3/slk_clear_sp.3x
+#usr/man/man3/slk_color.3x
+#usr/man/man3/slk_color_sp.3x
+#usr/man/man3/slk_init.3x
+#usr/man/man3/slk_init_sp.3x
+#usr/man/man3/slk_label.3x
+#usr/man/man3/slk_label_sp.3x
+#usr/man/man3/slk_noutrefresh.3x
+#usr/man/man3/slk_noutrefresh_sp.3x
+#usr/man/man3/slk_refresh.3x
+#usr/man/man3/slk_refresh_sp.3x
+#usr/man/man3/slk_restore.3x
+#usr/man/man3/slk_restore_sp.3x
+#usr/man/man3/slk_set.3x
+#usr/man/man3/slk_set_sp.3x
+#usr/man/man3/slk_touch.3x
+#usr/man/man3/slk_touch_sp.3x
+#usr/man/man3/slk_wset.3x
+#usr/man/man3/standend.3x
+#usr/man/man3/standout.3x
+#usr/man/man3/start_color.3x
+#usr/man/man3/start_color_sp.3x
+#usr/man/man3/stdscr.3x
+#usr/man/man3/strcodes.3x
+#usr/man/man3/strfnames.3x
+#usr/man/man3/strnames.3x
+#usr/man/man3/subpad.3x
+#usr/man/man3/subwin.3x
+#usr/man/man3/syncok.3x
+#usr/man/man3/term_attrs.3x
+#usr/man/man3/term_attrs_sp.3x
+#usr/man/man3/term_variables.3x
+#usr/man/man3/termattrs.3x
+#usr/man/man3/termattrs_sp.3x
+#usr/man/man3/termname.3x
+#usr/man/man3/termname_sp.3x
+#usr/man/man3/tgetent.3x
+#usr/man/man3/tgetent_sp.3x
+#usr/man/man3/tgetflag.3x
+#usr/man/man3/tgetflag_sp.3x
+#usr/man/man3/tgetnum.3x
+#usr/man/man3/tgetnum_sp.3x
+#usr/man/man3/tgetstr.3x
+#usr/man/man3/tgetstr_sp.3x
+#usr/man/man3/tgoto.3x
+#usr/man/man3/tigetflag.3x
+#usr/man/man3/tigetflag_sp.3x
+#usr/man/man3/tigetnum.3x
+#usr/man/man3/tigetnum_sp.3x
+#usr/man/man3/tigetstr.3x
+#usr/man/man3/tigetstr_sp.3x
+#usr/man/man3/timeout.3x
+#usr/man/man3/tiparm.3x
+#usr/man/man3/top_panel.3x
+#usr/man/man3/top_row.3x
+#usr/man/man3/touchline.3x
+#usr/man/man3/touchwin.3x
+#usr/man/man3/tparm.3x
+#usr/man/man3/tputs.3x
+#usr/man/man3/tputs_sp.3x
+#usr/man/man3/trace.3x
+#usr/man/man3/ttytype.3x
+#usr/man/man3/typeahead.3x
+#usr/man/man3/typeahead_sp.3x
+#usr/man/man3/unctrl.3x
+#usr/man/man3/unctrl_sp.3x
+#usr/man/man3/unget_wch.3x
+#usr/man/man3/unget_wch_sp.3x
+#usr/man/man3/ungetch.3x
+#usr/man/man3/ungetch_sp.3x
+#usr/man/man3/ungetmouse.3x
+#usr/man/man3/ungetmouse_sp.3x
+#usr/man/man3/unpost_form.3x
+#usr/man/man3/unpost_menu.3x
+#usr/man/man3/untouchwin.3x
+#usr/man/man3/update_panels.3x
+#usr/man/man3/update_panels_sp.3x
+#usr/man/man3/use_default_colors.3x
+#usr/man/man3/use_default_colors_sp.3x
+#usr/man/man3/use_env.3x
+#usr/man/man3/use_env_sp.3x
+#usr/man/man3/use_extended_names.3x
+#usr/man/man3/use_legacy_coding.3x
+#usr/man/man3/use_legacy_coding_sp.3x
+#usr/man/man3/use_screen.3x
+#usr/man/man3/use_window.3x
+#usr/man/man3/vid_attr.3x
+#usr/man/man3/vid_attr_sp.3x
+#usr/man/man3/vid_puts.3x
+#usr/man/man3/vid_puts_sp.3x
+#usr/man/man3/vidattr.3x
+#usr/man/man3/vidattr_sp.3x
+#usr/man/man3/vidputs.3x
+#usr/man/man3/vidputs_sp.3x
+#usr/man/man3/vline.3x
+#usr/man/man3/vline_set.3x
+#usr/man/man3/vw_printw.3x
+#usr/man/man3/vw_scanw.3x
+#usr/man/man3/vwprintw.3x
+#usr/man/man3/vwscanw.3x
+#usr/man/man3/wadd_wch.3x
+#usr/man/man3/wadd_wchnstr.3x
+#usr/man/man3/wadd_wchstr.3x
+#usr/man/man3/waddch.3x
+#usr/man/man3/waddchnstr.3x
+#usr/man/man3/waddchstr.3x
+#usr/man/man3/waddnstr.3x
+#usr/man/man3/waddnwstr.3x
+#usr/man/man3/waddstr.3x
+#usr/man/man3/waddwstr.3x
+#usr/man/man3/wattr_get.3x
+#usr/man/man3/wattr_off.3x
+#usr/man/man3/wattr_on.3x
+#usr/man/man3/wattr_set.3x
+#usr/man/man3/wattroff.3x
+#usr/man/man3/wattron.3x
+#usr/man/man3/wattrset.3x
+#usr/man/man3/wbkgd.3x
+#usr/man/man3/wbkgdset.3x
+#usr/man/man3/wbkgrnd.3x
+#usr/man/man3/wbkgrndset.3x
+#usr/man/man3/wborder.3x
+#usr/man/man3/wborder_set.3x
+#usr/man/man3/wchgat.3x
+#usr/man/man3/wclear.3x
+#usr/man/man3/wclrtobot.3x
+#usr/man/man3/wclrtoeol.3x
+#usr/man/man3/wcolor_set.3x
+#usr/man/man3/wcursyncup.3x
+#usr/man/man3/wdelch.3x
+#usr/man/man3/wdeleteln.3x
+#usr/man/man3/wecho_wchar.3x
+#usr/man/man3/wechochar.3x
+#usr/man/man3/wenclose.3x
+#usr/man/man3/werase.3x
+#usr/man/man3/wget_wch.3x
+#usr/man/man3/wget_wstr.3x
+#usr/man/man3/wgetbkgrnd.3x
+#usr/man/man3/wgetch.3x
+#usr/man/man3/wgetn_wstr.3x
+#usr/man/man3/wgetnstr.3x
+#usr/man/man3/wgetparent.3x
+#usr/man/man3/wgetscrreg.3x
+#usr/man/man3/wgetstr.3x
+#usr/man/man3/whline.3x
+#usr/man/man3/whline_set.3x
+#usr/man/man3/win_wch.3x
+#usr/man/man3/win_wchnstr.3x
+#usr/man/man3/win_wchstr.3x
+#usr/man/man3/winch.3x
+#usr/man/man3/winchnstr.3x
+#usr/man/man3/winchstr.3x
+#usr/man/man3/winnstr.3x
+#usr/man/man3/winnwstr.3x
+#usr/man/man3/wins_nwstr.3x
+#usr/man/man3/wins_wch.3x
+#usr/man/man3/wins_wstr.3x
+#usr/man/man3/winsch.3x
+#usr/man/man3/winsdelln.3x
+#usr/man/man3/winsertln.3x
+#usr/man/man3/winsnstr.3x
+#usr/man/man3/winsstr.3x
+#usr/man/man3/winstr.3x
+#usr/man/man3/winwstr.3x
+#usr/man/man3/wmouse_trafo.3x
+#usr/man/man3/wmove.3x
+#usr/man/man3/wnoutrefresh.3x
+#usr/man/man3/wprintw.3x
+#usr/man/man3/wredrawln.3x
+#usr/man/man3/wrefresh.3x
+#usr/man/man3/wresize.3x
+#usr/man/man3/wscanw.3x
+#usr/man/man3/wscrl.3x
+#usr/man/man3/wsetscrreg.3x
+#usr/man/man3/wstandend.3x
+#usr/man/man3/wstandout.3x
+#usr/man/man3/wsyncdown.3x
+#usr/man/man3/wsyncup.3x
+#usr/man/man3/wtimeout.3x
+#usr/man/man3/wtouchln.3x
+#usr/man/man3/wunctrl.3x
+#usr/man/man3/wunctrl_sp.3x
+#usr/man/man3/wvline.3x
+#usr/man/man3/wvline_set.3x
+#usr/man/man5
+#usr/man/man5/term.5
+#usr/man/man5/terminfo.5
+#usr/man/man7
+#usr/man/man7/term.7
+#usr/share/tabset
+#usr/share/tabset/std
+#usr/share/tabset/stdcrt
+#usr/share/tabset/vt100
+#usr/share/tabset/vt300
+#usr/share/terminfo/1
+#usr/share/terminfo/1/1178
+#usr/share/terminfo/1/1730-lm
+#usr/share/terminfo/2
+#usr/share/terminfo/2/2621
+#usr/share/terminfo/2/2621-wl
+#usr/share/terminfo/2/2621A
+#usr/share/terminfo/2/2621a
+#usr/share/terminfo/3
+#usr/share/terminfo/3/386at
+#usr/share/terminfo/3/3b1
+#usr/share/terminfo/4
+#usr/share/terminfo/4/4025ex
+#usr/share/terminfo/4/4027ex
+#usr/share/terminfo/4/4410-w
+#usr/share/terminfo/5
+#usr/share/terminfo/5/5051
+#usr/share/terminfo/5/5410-w
+#usr/share/terminfo/5/5620
+#usr/share/terminfo/5/5630-24
+#usr/share/terminfo/5/5630DMD-24
+#usr/share/terminfo/6
+#usr/share/terminfo/6/6053
+#usr/share/terminfo/6/6053-dg
+#usr/share/terminfo/6/605x
+#usr/share/terminfo/6/605x-dg
+#usr/share/terminfo/6/630-lm
+#usr/share/terminfo/6/630MTG-24
+#usr/share/terminfo/7
+#usr/share/terminfo/7/730MTG-24
+#usr/share/terminfo/7/730MTG-41
+#usr/share/terminfo/7/730MTG-41r
+#usr/share/terminfo/7/730MTGr
+#usr/share/terminfo/7/730MTGr-24
+#usr/share/terminfo/8
+#usr/share/terminfo/8/8510
+#usr/share/terminfo/9
+#usr/share/terminfo/9/955-hb
+#usr/share/terminfo/9/955-w
+#usr/share/terminfo/9/9term
+#usr/share/terminfo/A
+#usr/share/terminfo/A/Apple_Terminal
+#usr/share/terminfo/E
+#usr/share/terminfo/E/Eterm
+#usr/share/terminfo/E/Eterm-256color
+#usr/share/terminfo/E/Eterm-88color
+#usr/share/terminfo/E/Eterm-color
+#usr/share/terminfo/L
+#usr/share/terminfo/L/LFT-PC850
+#usr/share/terminfo/M
+#usr/share/terminfo/M/MtxOrb
+#usr/share/terminfo/M/MtxOrb162
+#usr/share/terminfo/M/MtxOrb204
+#usr/share/terminfo/N
+#usr/share/terminfo/N/NCR260VT300WPP
+#usr/share/terminfo/N/NCRVT100WPP
+#usr/share/terminfo/P
+#usr/share/terminfo/P/P12
+#usr/share/terminfo/P/P12-M
+#usr/share/terminfo/P/P12-M-W
+#usr/share/terminfo/P/P12-W
+#usr/share/terminfo/P/P14
+#usr/share/terminfo/P/P14-M
+#usr/share/terminfo/P/P14-M-W
+#usr/share/terminfo/P/P14-W
+#usr/share/terminfo/P/P4
+#usr/share/terminfo/P/P5
+#usr/share/terminfo/P/P7
+#usr/share/terminfo/P/P8
+#usr/share/terminfo/P/P8-W
+#usr/share/terminfo/P/P9
+#usr/share/terminfo/P/P9-8
+#usr/share/terminfo/P/P9-8-W
+#usr/share/terminfo/P/P9-W
+#usr/share/terminfo/Q
+#usr/share/terminfo/Q/Q306-8-pc
+#usr/share/terminfo/Q/Q310-vip-H
+#usr/share/terminfo/Q/Q310-vip-H-am
+#usr/share/terminfo/Q/Q310-vip-Hw
+#usr/share/terminfo/Q/Q310-vip-w
+#usr/share/terminfo/Q/Q310-vip-w-am
+#usr/share/terminfo/X
+#usr/share/terminfo/X/X-hpterm
+#usr/share/terminfo/a
+#usr/share/terminfo/a/a210
+#usr/share/terminfo/a/a80
+#usr/share/terminfo/a/a980
+#usr/share/terminfo/a/aa4080
+#usr/share/terminfo/a/aaa
+#usr/share/terminfo/a/aaa+dec
+#usr/share/terminfo/a/aaa+rv
+#usr/share/terminfo/a/aaa+unk
+#usr/share/terminfo/a/aaa-18
+#usr/share/terminfo/a/aaa-18-rv
+#usr/share/terminfo/a/aaa-20
+#usr/share/terminfo/a/aaa-22
+#usr/share/terminfo/a/aaa-24
+#usr/share/terminfo/a/aaa-24-rv
+#usr/share/terminfo/a/aaa-26
+#usr/share/terminfo/a/aaa-28
+#usr/share/terminfo/a/aaa-30
+#usr/share/terminfo/a/aaa-30-ctxt
+#usr/share/terminfo/a/aaa-30-rv
+#usr/share/terminfo/a/aaa-30-rv-ctxt
+#usr/share/terminfo/a/aaa-30-s
+#usr/share/terminfo/a/aaa-30-s-ctxt
+#usr/share/terminfo/a/aaa-30-s-rv
+#usr/share/terminfo/a/aaa-30-s-rv-ct
+#usr/share/terminfo/a/aaa-36
+#usr/share/terminfo/a/aaa-36-rv
+#usr/share/terminfo/a/aaa-40
+#usr/share/terminfo/a/aaa-40-rv
+#usr/share/terminfo/a/aaa-48
+#usr/share/terminfo/a/aaa-48-rv
+#usr/share/terminfo/a/aaa-60
+#usr/share/terminfo/a/aaa-60-dec-rv
+#usr/share/terminfo/a/aaa-60-rv
+#usr/share/terminfo/a/aaa-60-s
+#usr/share/terminfo/a/aaa-60-s-rv
+#usr/share/terminfo/a/aaa-ctxt
+#usr/share/terminfo/a/aaa-db
+#usr/share/terminfo/a/aaa-rv
+#usr/share/terminfo/a/aaa-rv-ctxt
+#usr/share/terminfo/a/aaa-rv-unk
+#usr/share/terminfo/a/aaa-s
+#usr/share/terminfo/a/aaa-s-ctxt
+#usr/share/terminfo/a/aaa-s-rv
+#usr/share/terminfo/a/aaa-s-rv-ctxt
+#usr/share/terminfo/a/aaa-unk
+#usr/share/terminfo/a/aas1901
+#usr/share/terminfo/a/abm80
+#usr/share/terminfo/a/abm85
+#usr/share/terminfo/a/abm85e
+#usr/share/terminfo/a/abm85h
+#usr/share/terminfo/a/abm85h-old
+#usr/share/terminfo/a/act4
+#usr/share/terminfo/a/act5
+#usr/share/terminfo/a/addrinfo
+#usr/share/terminfo/a/adds980
+#usr/share/terminfo/a/addsviewpoint
+#usr/share/terminfo/a/addsvp60
+#usr/share/terminfo/a/adm+sgr
+#usr/share/terminfo/a/adm1
+#usr/share/terminfo/a/adm11
+#usr/share/terminfo/a/adm1178
+#usr/share/terminfo/a/adm12
+#usr/share/terminfo/a/adm1a
+#usr/share/terminfo/a/adm2
+#usr/share/terminfo/a/adm20
+#usr/share/terminfo/a/adm21
+#usr/share/terminfo/a/adm22
+#usr/share/terminfo/a/adm3
+#usr/share/terminfo/a/adm31
+#usr/share/terminfo/a/adm31-old
+#usr/share/terminfo/a/adm36
+#usr/share/terminfo/a/adm3a
+#usr/share/terminfo/a/adm3a+
+#usr/share/terminfo/a/adm42
+#usr/share/terminfo/a/adm42-ns
+#usr/share/terminfo/a/adm5
+#usr/share/terminfo/a/aepro
+#usr/share/terminfo/a/aixterm
+#usr/share/terminfo/a/aixterm-16color
+#usr/share/terminfo/a/aixterm-m
+#usr/share/terminfo/a/aixterm-m-old
+#usr/share/terminfo/a/aj
+#usr/share/terminfo/a/aj510
+#usr/share/terminfo/a/aj830
+#usr/share/terminfo/a/aj832
+#usr/share/terminfo/a/alt2
+#usr/share/terminfo/a/alt3
+#usr/share/terminfo/a/alt4
+#usr/share/terminfo/a/alt5
+#usr/share/terminfo/a/alt7
+#usr/share/terminfo/a/alt7pc
+#usr/share/terminfo/a/alto-h19
+#usr/share/terminfo/a/alto-heath
+#usr/share/terminfo/a/altoh19
+#usr/share/terminfo/a/altoheath
+#usr/share/terminfo/a/altos-2
+#usr/share/terminfo/a/altos-3
+#usr/share/terminfo/a/altos-4
+#usr/share/terminfo/a/altos-5
+#usr/share/terminfo/a/altos2
+#usr/share/terminfo/a/altos3
+#usr/share/terminfo/a/altos4
+#usr/share/terminfo/a/altos5
+#usr/share/terminfo/a/altos7
+#usr/share/terminfo/a/altos7pc
+#usr/share/terminfo/a/ambas
+#usr/share/terminfo/a/ambassador
+#usr/share/terminfo/a/amiga
+#usr/share/terminfo/a/amiga-8bit
+#usr/share/terminfo/a/amiga-h
+#usr/share/terminfo/a/amiga-vnc
+#usr/share/terminfo/a/amp219
+#usr/share/terminfo/a/amp219w
+#usr/share/terminfo/a/ampex-219
+#usr/share/terminfo/a/ampex-219w
+#usr/share/terminfo/a/ampex-232
+#usr/share/terminfo/a/ampex175
+#usr/share/terminfo/a/ampex175-b
+#usr/share/terminfo/a/ampex210
+#usr/share/terminfo/a/ampex219
+#usr/share/terminfo/a/ampex219w
+#usr/share/terminfo/a/ampex232
+#usr/share/terminfo/a/ampex232w
+#usr/share/terminfo/a/ampex80
+#usr/share/terminfo/a/annarbor4080
+#usr/share/terminfo/a/ansi
+#usr/share/terminfo/a/ansi+arrows
+#usr/share/terminfo/a/ansi+csr
+#usr/share/terminfo/a/ansi+cup
+#usr/share/terminfo/a/ansi+enq
+#usr/share/terminfo/a/ansi+erase
+#usr/share/terminfo/a/ansi+idc
+#usr/share/terminfo/a/ansi+idl
+#usr/share/terminfo/a/ansi+idl1
+#usr/share/terminfo/a/ansi+inittabs
+#usr/share/terminfo/a/ansi+local
+#usr/share/terminfo/a/ansi+local1
+#usr/share/terminfo/a/ansi+pp
+#usr/share/terminfo/a/ansi+rca
+#usr/share/terminfo/a/ansi+rep
+#usr/share/terminfo/a/ansi+sgr
+#usr/share/terminfo/a/ansi+sgrbold
+#usr/share/terminfo/a/ansi+sgrdim
+#usr/share/terminfo/a/ansi+sgrso
+#usr/share/terminfo/a/ansi+sgrul
+#usr/share/terminfo/a/ansi+tabs
+#usr/share/terminfo/a/ansi-color-2-emx
+#usr/share/terminfo/a/ansi-color-3-emx
+#usr/share/terminfo/a/ansi-emx
+#usr/share/terminfo/a/ansi-generic
+#usr/share/terminfo/a/ansi-m
+#usr/share/terminfo/a/ansi-mini
+#usr/share/terminfo/a/ansi-mono
+#usr/share/terminfo/a/ansi-mr
+#usr/share/terminfo/a/ansi-mtabs
+#usr/share/terminfo/a/ansi-nt
+#usr/share/terminfo/a/ansi.sys
+#usr/share/terminfo/a/ansi.sys-old
+#usr/share/terminfo/a/ansi.sysk
+#usr/share/terminfo/a/ansi43m
+#usr/share/terminfo/a/ansi77
+#usr/share/terminfo/a/ansi80x25
+#usr/share/terminfo/a/ansi80x25-mono
+#usr/share/terminfo/a/ansi80x25-raw
+#usr/share/terminfo/a/ansi80x30
+#usr/share/terminfo/a/ansi80x30-mono
+#usr/share/terminfo/a/ansi80x43
+#usr/share/terminfo/a/ansi80x43-mono
+#usr/share/terminfo/a/ansi80x50
+#usr/share/terminfo/a/ansi80x50-mono
+#usr/share/terminfo/a/ansi80x60
+#usr/share/terminfo/a/ansi80x60-mono
+#usr/share/terminfo/a/ansil
+#usr/share/terminfo/a/ansil-mono
+#usr/share/terminfo/a/ansis
+#usr/share/terminfo/a/ansis-mono
+#usr/share/terminfo/a/ansisysk
+#usr/share/terminfo/a/ansiw
+#usr/share/terminfo/a/ap-vm80
+#usr/share/terminfo/a/apl
+#usr/share/terminfo/a/apollo
+#usr/share/terminfo/a/apollo_15P
+#usr/share/terminfo/a/apollo_19L
+#usr/share/terminfo/a/apollo_color
+#usr/share/terminfo/a/apple-80
+#usr/share/terminfo/a/apple-ae
+#usr/share/terminfo/a/apple-soroc
+#usr/share/terminfo/a/apple-uterm
+#usr/share/terminfo/a/apple-uterm-vb
+#usr/share/terminfo/a/apple-videx
+#usr/share/terminfo/a/apple-videx2
+#usr/share/terminfo/a/apple-videx3
+#usr/share/terminfo/a/apple-vm80
+#usr/share/terminfo/a/apple2e
+#usr/share/terminfo/a/apple2e-p
+#usr/share/terminfo/a/apple80p
+#usr/share/terminfo/a/appleII
+#usr/share/terminfo/a/appleIIc
+#usr/share/terminfo/a/appleIIe
+#usr/share/terminfo/a/appleIIgs
+#usr/share/terminfo/a/arm100
+#usr/share/terminfo/a/arm100-am
+#usr/share/terminfo/a/arm100-w
+#usr/share/terminfo/a/arm100-wam
+#usr/share/terminfo/a/at
+#usr/share/terminfo/a/at-color
+#usr/share/terminfo/a/at-m
+#usr/share/terminfo/a/at386
+#usr/share/terminfo/a/atari
+#usr/share/terminfo/a/atari-color
+#usr/share/terminfo/a/atari-m
+#usr/share/terminfo/a/atari-old
+#usr/share/terminfo/a/atari_st
+#usr/share/terminfo/a/atari_st-color
+#usr/share/terminfo/a/atarist-m
+#usr/share/terminfo/a/aterm
+#usr/share/terminfo/a/att2300
+#usr/share/terminfo/a/att2350
+#usr/share/terminfo/a/att4410
+#usr/share/terminfo/a/att4410-w
+#usr/share/terminfo/a/att4410v1
+#usr/share/terminfo/a/att4410v1-w
+#usr/share/terminfo/a/att4415
+#usr/share/terminfo/a/att4415+nl
+#usr/share/terminfo/a/att4415-nl
+#usr/share/terminfo/a/att4415-rv
+#usr/share/terminfo/a/att4415-rv-nl
+#usr/share/terminfo/a/att4415-w
+#usr/share/terminfo/a/att4415-w-nl
+#usr/share/terminfo/a/att4415-w-rv
+#usr/share/terminfo/a/att4415-w-rv-n
+#usr/share/terminfo/a/att4418
+#usr/share/terminfo/a/att4418-w
+#usr/share/terminfo/a/att4420
+#usr/share/terminfo/a/att4424
+#usr/share/terminfo/a/att4424-1
+#usr/share/terminfo/a/att4424m
+#usr/share/terminfo/a/att4425
+#usr/share/terminfo/a/att4425-nl
+#usr/share/terminfo/a/att4425-w
+#usr/share/terminfo/a/att4426
+#usr/share/terminfo/a/att500
+#usr/share/terminfo/a/att505
+#usr/share/terminfo/a/att505-24
+#usr/share/terminfo/a/att510a
+#usr/share/terminfo/a/att510d
+#usr/share/terminfo/a/att513
+#usr/share/terminfo/a/att5310
+#usr/share/terminfo/a/att5320
+#usr/share/terminfo/a/att5410
+#usr/share/terminfo/a/att5410-w
+#usr/share/terminfo/a/att5410v1
+#usr/share/terminfo/a/att5410v1-w
+#usr/share/terminfo/a/att5418
+#usr/share/terminfo/a/att5418-w
+#usr/share/terminfo/a/att5420
+#usr/share/terminfo/a/att5420+nl
+#usr/share/terminfo/a/att5420-nl
+#usr/share/terminfo/a/att5420-rv
+#usr/share/terminfo/a/att5420-rv-nl
+#usr/share/terminfo/a/att5420-w
+#usr/share/terminfo/a/att5420-w-nl
+#usr/share/terminfo/a/att5420-w-rv
+#usr/share/terminfo/a/att5420-w-rv-n
+#usr/share/terminfo/a/att5420_2
+#usr/share/terminfo/a/att5420_2-w
+#usr/share/terminfo/a/att5425
+#usr/share/terminfo/a/att5425-nl
+#usr/share/terminfo/a/att5425-w
+#usr/share/terminfo/a/att5430
+#usr/share/terminfo/a/att5620
+#usr/share/terminfo/a/att5620-1
+#usr/share/terminfo/a/att5620-24
+#usr/share/terminfo/a/att5620-34
+#usr/share/terminfo/a/att5620-s
+#usr/share/terminfo/a/att605
+#usr/share/terminfo/a/att605-pc
+#usr/share/terminfo/a/att605-w
+#usr/share/terminfo/a/att610
+#usr/share/terminfo/a/att610-103k
+#usr/share/terminfo/a/att610-103k-w
+#usr/share/terminfo/a/att610-w
+#usr/share/terminfo/a/att615
+#usr/share/terminfo/a/att615-103k
+#usr/share/terminfo/a/att615-103k-w
+#usr/share/terminfo/a/att615-w
+#usr/share/terminfo/a/att620
+#usr/share/terminfo/a/att620-103k
+#usr/share/terminfo/a/att620-103k-w
+#usr/share/terminfo/a/att620-w
+#usr/share/terminfo/a/att630
+#usr/share/terminfo/a/att630-24
+#usr/share/terminfo/a/att6386
+#usr/share/terminfo/a/att700
+#usr/share/terminfo/a/att730
+#usr/share/terminfo/a/att730-24
+#usr/share/terminfo/a/att730-41
+#usr/share/terminfo/a/att7300
+#usr/share/terminfo/a/att730r
+#usr/share/terminfo/a/att730r-24
+#usr/share/terminfo/a/att730r-41
+#usr/share/terminfo/a/avatar
+#usr/share/terminfo/a/avatar0
+#usr/share/terminfo/a/avatar0+
+#usr/share/terminfo/a/avatar1
+#usr/share/terminfo/a/avt
+#usr/share/terminfo/a/avt+s
+#usr/share/terminfo/a/avt-ns
+#usr/share/terminfo/a/avt-rv
+#usr/share/terminfo/a/avt-rv-ns
+#usr/share/terminfo/a/avt-rv-s
+#usr/share/terminfo/a/avt-s
+#usr/share/terminfo/a/avt-w
+#usr/share/terminfo/a/avt-w-ns
+#usr/share/terminfo/a/avt-w-rv
+#usr/share/terminfo/a/avt-w-rv-ns
+#usr/share/terminfo/a/avt-w-rv-s
+#usr/share/terminfo/a/avt-w-s
+#usr/share/terminfo/a/aws
+#usr/share/terminfo/a/awsc
+#usr/share/terminfo/b
+#usr/share/terminfo/b/b-128
+#usr/share/terminfo/b/bantam
+#usr/share/terminfo/b/basic4
+#usr/share/terminfo/b/basis
+#usr/share/terminfo/b/bct510a
+#usr/share/terminfo/b/bct510d
+#usr/share/terminfo/b/beacon
+#usr/share/terminfo/b/bee
+#usr/share/terminfo/b/beehive
+#usr/share/terminfo/b/beehive3
+#usr/share/terminfo/b/beehive4
+#usr/share/terminfo/b/beehiveIIIm
+#usr/share/terminfo/b/beterm
+#usr/share/terminfo/b/bg1.25
+#usr/share/terminfo/b/bg1.25nv
+#usr/share/terminfo/b/bg1.25rv
+#usr/share/terminfo/b/bg2.0
+#usr/share/terminfo/b/bg2.0nv
+#usr/share/terminfo/b/bg2.0rv
+#usr/share/terminfo/b/bg3.10
+#usr/share/terminfo/b/bg3.10nv
+#usr/share/terminfo/b/bg3.10rv
+#usr/share/terminfo/b/bh3m
+#usr/share/terminfo/b/bh4
+#usr/share/terminfo/b/bitgraph
+#usr/share/terminfo/b/blit
+#usr/share/terminfo/b/bobcat
+#usr/share/terminfo/b/bq300
+#usr/share/terminfo/b/bq300-8
+#usr/share/terminfo/b/bq300-8-pc
+#usr/share/terminfo/b/bq300-8-pc-rv
+#usr/share/terminfo/b/bq300-8-pc-w
+#usr/share/terminfo/b/bq300-8-pc-w-rv
+#usr/share/terminfo/b/bq300-8rv
+#usr/share/terminfo/b/bq300-8w
+#usr/share/terminfo/b/bq300-pc
+#usr/share/terminfo/b/bq300-pc-rv
+#usr/share/terminfo/b/bq300-pc-w
+#usr/share/terminfo/b/bq300-pc-w-rv
+#usr/share/terminfo/b/bq300-rv
+#usr/share/terminfo/b/bq300-w
+#usr/share/terminfo/b/bq300-w-8rv
+#usr/share/terminfo/b/bq300-w-rv
+#usr/share/terminfo/b/bsdos-pc
+#usr/share/terminfo/b/bsdos-pc-m
+#usr/share/terminfo/b/bsdos-pc-mono
+#usr/share/terminfo/b/bsdos-pc-nobold
+#usr/share/terminfo/b/bsdos-ppc
+#usr/share/terminfo/b/bsdos-sparc
+#usr/share/terminfo/b/bterm
+#usr/share/terminfo/c
+#usr/share/terminfo/c/c100
+#usr/share/terminfo/c/c100-1p
+#usr/share/terminfo/c/c100-4p
+#usr/share/terminfo/c/c100-rv
+#usr/share/terminfo/c/c100-rv-4p
+#usr/share/terminfo/c/c104
+#usr/share/terminfo/c/c108
+#usr/share/terminfo/c/c108-4p
+#usr/share/terminfo/c/c108-8p
+#usr/share/terminfo/c/c108-rv
+#usr/share/terminfo/c/c108-rv-4p
+#usr/share/terminfo/c/c108-rv-8p
+#usr/share/terminfo/c/c108-w
+#usr/share/terminfo/c/c108-w-8p
+#usr/share/terminfo/c/c300
+#usr/share/terminfo/c/c301
+#usr/share/terminfo/c/c321
+#usr/share/terminfo/c/ca22851
+#usr/share/terminfo/c/cad68-2
+#usr/share/terminfo/c/cad68-3
+#usr/share/terminfo/c/cbblit
+#usr/share/terminfo/c/cbunix
+#usr/share/terminfo/c/cci
+#usr/share/terminfo/c/cci1
+#usr/share/terminfo/c/cdc456
+#usr/share/terminfo/c/cdc721
+#usr/share/terminfo/c/cdc721-esc
+#usr/share/terminfo/c/cdc721ll
+#usr/share/terminfo/c/cdc752
+#usr/share/terminfo/c/cdc756
+#usr/share/terminfo/c/cg7900
+#usr/share/terminfo/c/cgc2
+#usr/share/terminfo/c/cgc3
+#usr/share/terminfo/c/chromatics
+#usr/share/terminfo/c/ci8510
+#usr/share/terminfo/c/cit-80
+#usr/share/terminfo/c/cit101
+#usr/share/terminfo/c/cit101e
+#usr/share/terminfo/c/cit101e-132
+#usr/share/terminfo/c/cit101e-n
+#usr/share/terminfo/c/cit101e-n132
+#usr/share/terminfo/c/cit101e-rv
+#usr/share/terminfo/c/cit500
+#usr/share/terminfo/c/cit80
+#usr/share/terminfo/c/citc
+#usr/share/terminfo/c/citoh
+#usr/share/terminfo/c/citoh-6lpi
+#usr/share/terminfo/c/citoh-8lpi
+#usr/share/terminfo/c/citoh-comp
+#usr/share/terminfo/c/citoh-elite
+#usr/share/terminfo/c/citoh-pica
+#usr/share/terminfo/c/citoh-prop
+#usr/share/terminfo/c/citoh-ps
+#usr/share/terminfo/c/coco3
+#usr/share/terminfo/c/coherent
+#usr/share/terminfo/c/color_xterm
+#usr/share/terminfo/c/colorscan
+#usr/share/terminfo/c/commodore
+#usr/share/terminfo/c/concept
+#usr/share/terminfo/c/concept-avt
+#usr/share/terminfo/c/concept100
+#usr/share/terminfo/c/concept100-rv
+#usr/share/terminfo/c/concept108
+#usr/share/terminfo/c/concept108-4p
+#usr/share/terminfo/c/concept108-8p
+#usr/share/terminfo/c/concept108-w-8
+#usr/share/terminfo/c/concept108-w8p
+#usr/share/terminfo/c/concept108rv4p
+#usr/share/terminfo/c/cons25
+#usr/share/terminfo/c/cons25-debian
+#usr/share/terminfo/c/cons25-iso-m
+#usr/share/terminfo/c/cons25-iso8859
+#usr/share/terminfo/c/cons25-koi8-r
+#usr/share/terminfo/c/cons25-koi8r-m
+#usr/share/terminfo/c/cons25-m
+#usr/share/terminfo/c/cons25l1
+#usr/share/terminfo/c/cons25l1-m
+#usr/share/terminfo/c/cons25r
+#usr/share/terminfo/c/cons25r-m
+#usr/share/terminfo/c/cons25w
+#usr/share/terminfo/c/cons30
+#usr/share/terminfo/c/cons30-m
+#usr/share/terminfo/c/cons43
+#usr/share/terminfo/c/cons43-m
+#usr/share/terminfo/c/cons50
+#usr/share/terminfo/c/cons50-iso-m
+#usr/share/terminfo/c/cons50-iso8859
+#usr/share/terminfo/c/cons50-koi8r
+#usr/share/terminfo/c/cons50-koi8r-m
+#usr/share/terminfo/c/cons50-m
+#usr/share/terminfo/c/cons50l1
+#usr/share/terminfo/c/cons50l1-m
+#usr/share/terminfo/c/cons50r
+#usr/share/terminfo/c/cons50r-m
+#usr/share/terminfo/c/cons60
+#usr/share/terminfo/c/cons60-iso
+#usr/share/terminfo/c/cons60-iso-m
+#usr/share/terminfo/c/cons60-koi8r
+#usr/share/terminfo/c/cons60-koi8r-m
+#usr/share/terminfo/c/cons60-m
+#usr/share/terminfo/c/cons60l1
+#usr/share/terminfo/c/cons60l1-m
+#usr/share/terminfo/c/cons60r
+#usr/share/terminfo/c/cons60r-m
+#usr/share/terminfo/c/contel300
+#usr/share/terminfo/c/contel301
+#usr/share/terminfo/c/contel320
+#usr/share/terminfo/c/contel321
+#usr/share/terminfo/c/cops
+#usr/share/terminfo/c/cops-10
+#usr/share/terminfo/c/cops10
+#usr/share/terminfo/c/crt
+#usr/share/terminfo/c/crt-vt220
+#usr/share/terminfo/c/cs10
+#usr/share/terminfo/c/cs10-w
+#usr/share/terminfo/c/ct82
+#usr/share/terminfo/c/ct8500
+#usr/share/terminfo/c/ctrm
+#usr/share/terminfo/c/cx
+#usr/share/terminfo/c/cx100
+#usr/share/terminfo/c/cyb110
+#usr/share/terminfo/c/cyb83
+#usr/share/terminfo/c/cygwin
+#usr/share/terminfo/c/cygwinB19
+#usr/share/terminfo/c/cygwinDBG
+#usr/share/terminfo/d
+#usr/share/terminfo/d/d132
+#usr/share/terminfo/d/d2
+#usr/share/terminfo/d/d2-dg
+#usr/share/terminfo/d/d200
+#usr/share/terminfo/d/d200-dg
+#usr/share/terminfo/d/d210
+#usr/share/terminfo/d/d210-dg
+#usr/share/terminfo/d/d211
+#usr/share/terminfo/d/d211-7b
+#usr/share/terminfo/d/d211-dg
+#usr/share/terminfo/d/d214
+#usr/share/terminfo/d/d214-dg
+#usr/share/terminfo/d/d215
+#usr/share/terminfo/d/d215-7b
+#usr/share/terminfo/d/d215-dg
+#usr/share/terminfo/d/d216+
+#usr/share/terminfo/d/d216+25
+#usr/share/terminfo/d/d216+dg
+#usr/share/terminfo/d/d216-dg
+#usr/share/terminfo/d/d216-unix
+#usr/share/terminfo/d/d216-unix-25
+#usr/share/terminfo/d/d216e+
+#usr/share/terminfo/d/d216e+dg
+#usr/share/terminfo/d/d216e-dg
+#usr/share/terminfo/d/d216e-unix
+#usr/share/terminfo/d/d217-dg
+#usr/share/terminfo/d/d217-unix
+#usr/share/terminfo/d/d217-unix-25
+#usr/share/terminfo/d/d220
+#usr/share/terminfo/d/d220-7b
+#usr/share/terminfo/d/d220-dg
+#usr/share/terminfo/d/d230
+#usr/share/terminfo/d/d230-dg
+#usr/share/terminfo/d/d230c
+#usr/share/terminfo/d/d230c-dg
+#usr/share/terminfo/d/d400
+#usr/share/terminfo/d/d400-dg
+#usr/share/terminfo/d/d410
+#usr/share/terminfo/d/d410-7b
+#usr/share/terminfo/d/d410-7b-w
+#usr/share/terminfo/d/d410-dg
+#usr/share/terminfo/d/d410-w
+#usr/share/terminfo/d/d411
+#usr/share/terminfo/d/d411-7b
+#usr/share/terminfo/d/d411-7b-w
+#usr/share/terminfo/d/d411-dg
+#usr/share/terminfo/d/d411-w
+#usr/share/terminfo/d/d412+
+#usr/share/terminfo/d/d412+25
+#usr/share/terminfo/d/d412+dg
+#usr/share/terminfo/d/d412+s
+#usr/share/terminfo/d/d412+sr
+#usr/share/terminfo/d/d412+w
+#usr/share/terminfo/d/d412-dg
+#usr/share/terminfo/d/d412-unix
+#usr/share/terminfo/d/d412-unix-25
+#usr/share/terminfo/d/d412-unix-s
+#usr/share/terminfo/d/d412-unix-sr
+#usr/share/terminfo/d/d412-unix-w
+#usr/share/terminfo/d/d413-dg
+#usr/share/terminfo/d/d413-unix
+#usr/share/terminfo/d/d413-unix-25
+#usr/share/terminfo/d/d413-unix-s
+#usr/share/terminfo/d/d413-unix-sr
+#usr/share/terminfo/d/d413-unix-w
+#usr/share/terminfo/d/d414-unix
+#usr/share/terminfo/d/d414-unix-25
+#usr/share/terminfo/d/d414-unix-s
+#usr/share/terminfo/d/d414-unix-sr
+#usr/share/terminfo/d/d414-unix-w
+#usr/share/terminfo/d/d430-dg
+#usr/share/terminfo/d/d430-dg-ccc
+#usr/share/terminfo/d/d430-unix
+#usr/share/terminfo/d/d430-unix-25
+#usr/share/terminfo/d/d430-unix-25-ccc
+#usr/share/terminfo/d/d430-unix-ccc
+#usr/share/terminfo/d/d430-unix-s
+#usr/share/terminfo/d/d430-unix-s-ccc
+#usr/share/terminfo/d/d430-unix-sr
+#usr/share/terminfo/d/d430-unix-sr-ccc
+#usr/share/terminfo/d/d430-unix-w
+#usr/share/terminfo/d/d430-unix-w-ccc
+#usr/share/terminfo/d/d430c-dg
+#usr/share/terminfo/d/d430c-dg-ccc
+#usr/share/terminfo/d/d430c-unix
+#usr/share/terminfo/d/d430c-unix-25
+#usr/share/terminfo/d/d430c-unix-25-ccc
+#usr/share/terminfo/d/d430c-unix-ccc
+#usr/share/terminfo/d/d430c-unix-s
+#usr/share/terminfo/d/d430c-unix-s-ccc
+#usr/share/terminfo/d/d430c-unix-sr
+#usr/share/terminfo/d/d430c-unix-sr-ccc
+#usr/share/terminfo/d/d430c-unix-w
+#usr/share/terminfo/d/d430c-unix-w-ccc
+#usr/share/terminfo/d/d450
+#usr/share/terminfo/d/d450-dg
+#usr/share/terminfo/d/d460
+#usr/share/terminfo/d/d460-7b
+#usr/share/terminfo/d/d460-7b-w
+#usr/share/terminfo/d/d460-dg
+#usr/share/terminfo/d/d460-w
+#usr/share/terminfo/d/d461
+#usr/share/terminfo/d/d461-7b
+#usr/share/terminfo/d/d461-7b-w
+#usr/share/terminfo/d/d461-dg
+#usr/share/terminfo/d/d461-w
+#usr/share/terminfo/d/d462+
+#usr/share/terminfo/d/d462+25
+#usr/share/terminfo/d/d462+dg
+#usr/share/terminfo/d/d462+s
+#usr/share/terminfo/d/d462+sr
+#usr/share/terminfo/d/d462+w
+#usr/share/terminfo/d/d462-dg
+#usr/share/terminfo/d/d462-unix
+#usr/share/terminfo/d/d462-unix-25
+#usr/share/terminfo/d/d462-unix-s
+#usr/share/terminfo/d/d462-unix-sr
+#usr/share/terminfo/d/d462-unix-w
+#usr/share/terminfo/d/d462e-dg
+#usr/share/terminfo/d/d463-dg
+#usr/share/terminfo/d/d463-unix
+#usr/share/terminfo/d/d463-unix-25
+#usr/share/terminfo/d/d463-unix-s
+#usr/share/terminfo/d/d463-unix-sr
+#usr/share/terminfo/d/d463-unix-w
+#usr/share/terminfo/d/d464-unix
+#usr/share/terminfo/d/d464-unix-25
+#usr/share/terminfo/d/d464-unix-s
+#usr/share/terminfo/d/d464-unix-sr
+#usr/share/terminfo/d/d464-unix-w
+#usr/share/terminfo/d/d470
+#usr/share/terminfo/d/d470-7b
+#usr/share/terminfo/d/d470-dg
+#usr/share/terminfo/d/d470c
+#usr/share/terminfo/d/d470c-7b
+#usr/share/terminfo/d/d470c-dg
+#usr/share/terminfo/d/d555
+#usr/share/terminfo/d/d555-7b
+#usr/share/terminfo/d/d555-7b-w
+#usr/share/terminfo/d/d555-dg
+#usr/share/terminfo/d/d555-w
+#usr/share/terminfo/d/d577
+#usr/share/terminfo/d/d577-7b
+#usr/share/terminfo/d/d577-7b-w
+#usr/share/terminfo/d/d577-dg
+#usr/share/terminfo/d/d577-w
+#usr/share/terminfo/d/d578
+#usr/share/terminfo/d/d578-7b
+#usr/share/terminfo/d/d578-dg
+#usr/share/terminfo/d/d80
+#usr/share/terminfo/d/d800
+#usr/share/terminfo/d/darwin
+#usr/share/terminfo/d/darwin-100x37
+#usr/share/terminfo/d/darwin-100x37-m
+#usr/share/terminfo/d/darwin-112x37
+#usr/share/terminfo/d/darwin-112x37-m
+#usr/share/terminfo/d/darwin-128x40
+#usr/share/terminfo/d/darwin-128x40-m
+#usr/share/terminfo/d/darwin-128x48
+#usr/share/terminfo/d/darwin-128x48-m
+#usr/share/terminfo/d/darwin-144x48
+#usr/share/terminfo/d/darwin-144x48-m
+#usr/share/terminfo/d/darwin-160x64
+#usr/share/terminfo/d/darwin-160x64-m
+#usr/share/terminfo/d/darwin-200x64
+#usr/share/terminfo/d/darwin-200x64-m
+#usr/share/terminfo/d/darwin-200x75
+#usr/share/terminfo/d/darwin-200x75-m
+#usr/share/terminfo/d/darwin-256x96
+#usr/share/terminfo/d/darwin-256x96-m
+#usr/share/terminfo/d/darwin-80x25
+#usr/share/terminfo/d/darwin-80x25-m
+#usr/share/terminfo/d/darwin-80x30
+#usr/share/terminfo/d/darwin-80x30-m
+#usr/share/terminfo/d/darwin-90x30
+#usr/share/terminfo/d/darwin-90x30-m
+#usr/share/terminfo/d/darwin-b
+#usr/share/terminfo/d/darwin-f
+#usr/share/terminfo/d/darwin-f2
+#usr/share/terminfo/d/darwin-m
+#usr/share/terminfo/d/darwin-m-b
+#usr/share/terminfo/d/darwin-m-f
+#usr/share/terminfo/d/darwin-m-f2
+#usr/share/terminfo/d/datagraphix
+#usr/share/terminfo/d/datamedia2500
+#usr/share/terminfo/d/datapoint
+#usr/share/terminfo/d/dataspeed40
+#usr/share/terminfo/d/dd5000
+#usr/share/terminfo/d/ddr
+#usr/share/terminfo/d/ddr3180
+#usr/share/terminfo/d/dec-vt100
+#usr/share/terminfo/d/dec-vt220
+#usr/share/terminfo/d/dec-vt330
+#usr/share/terminfo/d/dec-vt340
+#usr/share/terminfo/d/dec-vt400
+#usr/share/terminfo/d/decansi
+#usr/share/terminfo/d/decpro
+#usr/share/terminfo/d/decwriter
+#usr/share/terminfo/d/delta
+#usr/share/terminfo/d/dg+ccc
+#usr/share/terminfo/d/dg+color
+#usr/share/terminfo/d/dg+color8
+#usr/share/terminfo/d/dg+fixed
+#usr/share/terminfo/d/dg-ansi
+#usr/share/terminfo/d/dg-generic
+#usr/share/terminfo/d/dg100
+#usr/share/terminfo/d/dg200
+#usr/share/terminfo/d/dg210
+#usr/share/terminfo/d/dg211
+#usr/share/terminfo/d/dg450
+#usr/share/terminfo/d/dg460-ansi
+#usr/share/terminfo/d/dg6053
+#usr/share/terminfo/d/dg6053-old
+#usr/share/terminfo/d/dg605x
+#usr/share/terminfo/d/dg6134
+#usr/share/terminfo/d/dgkeys+11
+#usr/share/terminfo/d/dgkeys+15
+#usr/share/terminfo/d/dgkeys+7b
+#usr/share/terminfo/d/dgkeys+8b
+#usr/share/terminfo/d/dgmode+color
+#usr/share/terminfo/d/dgmode+color8
+#usr/share/terminfo/d/dgunix+ccc
+#usr/share/terminfo/d/dgunix+fixed
+#usr/share/terminfo/d/diablo
+#usr/share/terminfo/d/diablo-lm
+#usr/share/terminfo/d/diablo1620
+#usr/share/terminfo/d/diablo1620-m8
+#usr/share/terminfo/d/diablo1640
+#usr/share/terminfo/d/diablo1640-lm
+#usr/share/terminfo/d/diablo1640-m8
+#usr/share/terminfo/d/diablo1720
+#usr/share/terminfo/d/diablo1730
+#usr/share/terminfo/d/diablo1740
+#usr/share/terminfo/d/diablo1740-lm
+#usr/share/terminfo/d/diablo450
+#usr/share/terminfo/d/diablo630
+#usr/share/terminfo/d/dialogue
+#usr/share/terminfo/d/dialogue80
+#usr/share/terminfo/d/digilog
+#usr/share/terminfo/d/djgpp
+#usr/share/terminfo/d/djgpp203
+#usr/share/terminfo/d/djgpp204
+#usr/share/terminfo/d/dku7003
+#usr/share/terminfo/d/dku7003-dumb
+#usr/share/terminfo/d/dku7102
+#usr/share/terminfo/d/dku7102-old
+#usr/share/terminfo/d/dku7102-sna
+#usr/share/terminfo/d/dku7103-sna
+#usr/share/terminfo/d/dku7202
+#usr/share/terminfo/d/dm1520
+#usr/share/terminfo/d/dm1521
+#usr/share/terminfo/d/dm2500
+#usr/share/terminfo/d/dm3025
+#usr/share/terminfo/d/dm3045
+#usr/share/terminfo/d/dm80
+#usr/share/terminfo/d/dm80w
+#usr/share/terminfo/d/dmchat
+#usr/share/terminfo/d/dmd
+#usr/share/terminfo/d/dmd-24
+#usr/share/terminfo/d/dmd-34
+#usr/share/terminfo/d/dmd1
+#usr/share/terminfo/d/dmdt80
+#usr/share/terminfo/d/dmdt80w
+#usr/share/terminfo/d/dmterm
+#usr/share/terminfo/d/dp3360
+#usr/share/terminfo/d/dp8242
+#usr/share/terminfo/d/ds40
+#usr/share/terminfo/d/ds40-2
+#usr/share/terminfo/d/dt-100
+#usr/share/terminfo/d/dt-100w
+#usr/share/terminfo/d/dt100
+#usr/share/terminfo/d/dt100w
+#usr/share/terminfo/d/dt110
+#usr/share/terminfo/d/dt80
+#usr/share/terminfo/d/dt80-sas
+#usr/share/terminfo/d/dt80w
+#usr/share/terminfo/d/dtc300s
+#usr/share/terminfo/d/dtc382
+#usr/share/terminfo/d/dtterm
+#usr/share/terminfo/d/dumb
+#usr/share/terminfo/d/dw
+#usr/share/terminfo/d/dw1
+#usr/share/terminfo/d/dw2
+#usr/share/terminfo/d/dw3
+#usr/share/terminfo/d/dw4
+#usr/share/terminfo/d/dwk
+#usr/share/terminfo/d/dwk-vt
+#usr/share/terminfo/e
+#usr/share/terminfo/e/ecma+color
+#usr/share/terminfo/e/ecma+sgr
+#usr/share/terminfo/e/elks
+#usr/share/terminfo/e/elks-ansi
+#usr/share/terminfo/e/elks-glasstty
+#usr/share/terminfo/e/elks-vt52
+#usr/share/terminfo/e/emots
+#usr/share/terminfo/e/emu
+#usr/share/terminfo/e/emu-220
+#usr/share/terminfo/e/emx-base
+#usr/share/terminfo/e/env230
+#usr/share/terminfo/e/envision230
+#usr/share/terminfo/e/ep40
+#usr/share/terminfo/e/ep4000
+#usr/share/terminfo/e/ep4080
+#usr/share/terminfo/e/ep48
+#usr/share/terminfo/e/ergo4000
+#usr/share/terminfo/e/esprit
+#usr/share/terminfo/e/esprit-am
+#usr/share/terminfo/e/eterm
+#usr/share/terminfo/e/eterm-color
+#usr/share/terminfo/e/ex155
+#usr/share/terminfo/e/excel62
+#usr/share/terminfo/e/excel62-rv
+#usr/share/terminfo/e/excel62-w
+#usr/share/terminfo/e/excel64
+#usr/share/terminfo/e/excel64-rv
+#usr/share/terminfo/e/excel64-w
+#usr/share/terminfo/e/exec80
+#usr/share/terminfo/f
+#usr/share/terminfo/f/f100
+#usr/share/terminfo/f/f100-rv
+#usr/share/terminfo/f/f110
+#usr/share/terminfo/f/f110-14
+#usr/share/terminfo/f/f110-14w
+#usr/share/terminfo/f/f110-w
+#usr/share/terminfo/f/f1720
+#usr/share/terminfo/f/f1720a
+#usr/share/terminfo/f/f200
+#usr/share/terminfo/f/f200-w
+#usr/share/terminfo/f/f200vi
+#usr/share/terminfo/f/f200vi-w
+#usr/share/terminfo/f/falco
+#usr/share/terminfo/f/falco-p
+#usr/share/terminfo/f/fenix
+#usr/share/terminfo/f/fenixw
+#usr/share/terminfo/f/fixterm
+#usr/share/terminfo/f/fortune
+#usr/share/terminfo/f/fos
+#usr/share/terminfo/f/fox
+#usr/share/terminfo/f/freedom
+#usr/share/terminfo/f/freedom-rv
+#usr/share/terminfo/f/freedom100
+#usr/share/terminfo/f/freedom110
+#usr/share/terminfo/f/freedom200
+#usr/share/terminfo/g
+#usr/share/terminfo/g/gator
+#usr/share/terminfo/g/gator-52
+#usr/share/terminfo/g/gator-52t
+#usr/share/terminfo/g/gator-t
+#usr/share/terminfo/g/gigi
+#usr/share/terminfo/g/glasstty
+#usr/share/terminfo/g/gnome
+#usr/share/terminfo/g/gnome+pcfkeys
+#usr/share/terminfo/g/gnome-2007
+#usr/share/terminfo/g/gnome-2008
+#usr/share/terminfo/g/gnome-256color
+#usr/share/terminfo/g/gnome-fc5
+#usr/share/terminfo/g/gnome-rh62
+#usr/share/terminfo/g/gnome-rh72
+#usr/share/terminfo/g/gnome-rh80
+#usr/share/terminfo/g/gnome-rh90
+#usr/share/terminfo/g/go-225
+#usr/share/terminfo/g/go140
+#usr/share/terminfo/g/go140w
+#usr/share/terminfo/g/go225
+#usr/share/terminfo/g/graphos
+#usr/share/terminfo/g/graphos-30
+#usr/share/terminfo/g/gs5430
+#usr/share/terminfo/g/gs5430-22
+#usr/share/terminfo/g/gs5430-24
+#usr/share/terminfo/g/gs6300
+#usr/share/terminfo/g/gsi
+#usr/share/terminfo/g/gt100
+#usr/share/terminfo/g/gt100a
+#usr/share/terminfo/g/gt40
+#usr/share/terminfo/g/gt42
+#usr/share/terminfo/g/guru
+#usr/share/terminfo/g/guru+rv
+#usr/share/terminfo/g/guru+s
+#usr/share/terminfo/g/guru+unk
+#usr/share/terminfo/g/guru-24
+#usr/share/terminfo/g/guru-33
+#usr/share/terminfo/g/guru-33-rv
+#usr/share/terminfo/g/guru-33-s
+#usr/share/terminfo/g/guru-44
+#usr/share/terminfo/g/guru-44-s
+#usr/share/terminfo/g/guru-76
+#usr/share/terminfo/g/guru-76-lp
+#usr/share/terminfo/g/guru-76-s
+#usr/share/terminfo/g/guru-76-w
+#usr/share/terminfo/g/guru-76-w-s
+#usr/share/terminfo/g/guru-76-wm
+#usr/share/terminfo/g/guru-lp
+#usr/share/terminfo/g/guru-nctxt
+#usr/share/terminfo/g/guru-rv
+#usr/share/terminfo/g/guru-s
+#usr/share/terminfo/h
+#usr/share/terminfo/h/h-100
+#usr/share/terminfo/h/h-100bw
+#usr/share/terminfo/h/h100
+#usr/share/terminfo/h/h100bw
+#usr/share/terminfo/h/h19
+#usr/share/terminfo/h/h19-a
+#usr/share/terminfo/h/h19-b
+#usr/share/terminfo/h/h19-bs
+#usr/share/terminfo/h/h19-g
+#usr/share/terminfo/h/h19-smul
+#usr/share/terminfo/h/h19-u
+#usr/share/terminfo/h/h19-us
+#usr/share/terminfo/h/h19a
+#usr/share/terminfo/h/h19g
+#usr/share/terminfo/h/h19k
+#usr/share/terminfo/h/h19kermit
+#usr/share/terminfo/h/h19us
+#usr/share/terminfo/h/h29a-kc-bc
+#usr/share/terminfo/h/h29a-kc-uc
+#usr/share/terminfo/h/h29a-nkc-bc
+#usr/share/terminfo/h/h29a-nkc-uc
+#usr/share/terminfo/h/h80
+#usr/share/terminfo/h/ha8675
+#usr/share/terminfo/h/ha8686
+#usr/share/terminfo/h/hazel
+#usr/share/terminfo/h/hds200
+#usr/share/terminfo/h/he80
+#usr/share/terminfo/h/heath
+#usr/share/terminfo/h/heath-19
+#usr/share/terminfo/h/heath-ansi
+#usr/share/terminfo/h/heathkit
+#usr/share/terminfo/h/heathkit-a
+#usr/share/terminfo/h/hft
+#usr/share/terminfo/h/hft-c
+#usr/share/terminfo/h/hft-c-old
+#usr/share/terminfo/h/hft-old
+#usr/share/terminfo/h/hirez100
+#usr/share/terminfo/h/hirez100-w
+#usr/share/terminfo/h/hmod1
+#usr/share/terminfo/h/hp
+#usr/share/terminfo/h/hp+arrows
+#usr/share/terminfo/h/hp+color
+#usr/share/terminfo/h/hp+labels
+#usr/share/terminfo/h/hp+pfk+arrows
+#usr/share/terminfo/h/hp+pfk+cr
+#usr/share/terminfo/h/hp+pfk-cr
+#usr/share/terminfo/h/hp+printer
+#usr/share/terminfo/h/hp110
+#usr/share/terminfo/h/hp150
+#usr/share/terminfo/h/hp2
+#usr/share/terminfo/h/hp236
+#usr/share/terminfo/h/hp2382
+#usr/share/terminfo/h/hp2382a
+#usr/share/terminfo/h/hp2392
+#usr/share/terminfo/h/hp2397
+#usr/share/terminfo/h/hp2397a
+#usr/share/terminfo/h/hp2621
+#usr/share/terminfo/h/hp2621-48
+#usr/share/terminfo/h/hp2621-a
+#usr/share/terminfo/h/hp2621-ba
+#usr/share/terminfo/h/hp2621-fl
+#usr/share/terminfo/h/hp2621-k45
+#usr/share/terminfo/h/hp2621-nl
+#usr/share/terminfo/h/hp2621-nt
+#usr/share/terminfo/h/hp2621-wl
+#usr/share/terminfo/h/hp2621A
+#usr/share/terminfo/h/hp2621a
+#usr/share/terminfo/h/hp2621a-a
+#usr/share/terminfo/h/hp2621b
+#usr/share/terminfo/h/hp2621b-kx
+#usr/share/terminfo/h/hp2621b-kx-p
+#usr/share/terminfo/h/hp2621b-p
+#usr/share/terminfo/h/hp2621k45
+#usr/share/terminfo/h/hp2621p
+#usr/share/terminfo/h/hp2621p-a
+#usr/share/terminfo/h/hp2622
+#usr/share/terminfo/h/hp2622a
+#usr/share/terminfo/h/hp2623
+#usr/share/terminfo/h/hp2623a
+#usr/share/terminfo/h/hp2624
+#usr/share/terminfo/h/hp2624-10p
+#usr/share/terminfo/h/hp2624a
+#usr/share/terminfo/h/hp2624a-10p
+#usr/share/terminfo/h/hp2624b
+#usr/share/terminfo/h/hp2624b-10p
+#usr/share/terminfo/h/hp2624b-10p-p
+#usr/share/terminfo/h/hp2624b-4p
+#usr/share/terminfo/h/hp2624b-4p-p
+#usr/share/terminfo/h/hp2624b-p
+#usr/share/terminfo/h/hp2626
+#usr/share/terminfo/h/hp2626-12
+#usr/share/terminfo/h/hp2626-12-s
+#usr/share/terminfo/h/hp2626-12x40
+#usr/share/terminfo/h/hp2626-ns
+#usr/share/terminfo/h/hp2626-s
+#usr/share/terminfo/h/hp2626-x40
+#usr/share/terminfo/h/hp2626a
+#usr/share/terminfo/h/hp2626p
+#usr/share/terminfo/h/hp2627a
+#usr/share/terminfo/h/hp2627a-rev
+#usr/share/terminfo/h/hp2627c
+#usr/share/terminfo/h/hp262x
+#usr/share/terminfo/h/hp2640a
+#usr/share/terminfo/h/hp2640b
+#usr/share/terminfo/h/hp2641a
+#usr/share/terminfo/h/hp2644a
+#usr/share/terminfo/h/hp2645
+#usr/share/terminfo/h/hp2645a
+#usr/share/terminfo/h/hp2647a
+#usr/share/terminfo/h/hp2648
+#usr/share/terminfo/h/hp2648a
+#usr/share/terminfo/h/hp300h
+#usr/share/terminfo/h/hp45
+#usr/share/terminfo/h/hp700
+#usr/share/terminfo/h/hp700-wy
+#usr/share/terminfo/h/hp70092
+#usr/share/terminfo/h/hp70092A
+#usr/share/terminfo/h/hp70092a
+#usr/share/terminfo/h/hp9837
+#usr/share/terminfo/h/hp9845
+#usr/share/terminfo/h/hp98550
+#usr/share/terminfo/h/hp98550a
+#usr/share/terminfo/h/hp98720
+#usr/share/terminfo/h/hp98721
+#usr/share/terminfo/h/hpansi
+#usr/share/terminfo/h/hpex
+#usr/share/terminfo/h/hpex2
+#usr/share/terminfo/h/hpgeneric
+#usr/share/terminfo/h/hpsub
+#usr/share/terminfo/h/hpterm
+#usr/share/terminfo/h/hpterm-color
+#usr/share/terminfo/h/htx11
+#usr/share/terminfo/h/hurd
+#usr/share/terminfo/h/hz1000
+#usr/share/terminfo/h/hz1420
+#usr/share/terminfo/h/hz1500
+#usr/share/terminfo/h/hz1510
+#usr/share/terminfo/h/hz1520
+#usr/share/terminfo/h/hz1520-noesc
+#usr/share/terminfo/h/hz1552
+#usr/share/terminfo/h/hz1552-rv
+#usr/share/terminfo/h/hz2000
+#usr/share/terminfo/i
+#usr/share/terminfo/i/i100
+#usr/share/terminfo/i/i3101
+#usr/share/terminfo/i/i3164
+#usr/share/terminfo/i/i400
+#usr/share/terminfo/i/iTerm.app
+#usr/share/terminfo/i/ibcs2
+#usr/share/terminfo/i/ibm+16color
+#usr/share/terminfo/i/ibm+color
+#usr/share/terminfo/i/ibm-apl
+#usr/share/terminfo/i/ibm-pc
+#usr/share/terminfo/i/ibm-system1
+#usr/share/terminfo/i/ibm3101
+#usr/share/terminfo/i/ibm3151
+#usr/share/terminfo/i/ibm3161
+#usr/share/terminfo/i/ibm3161-C
+#usr/share/terminfo/i/ibm3162
+#usr/share/terminfo/i/ibm3163
+#usr/share/terminfo/i/ibm3164
+#usr/share/terminfo/i/ibm327x
+#usr/share/terminfo/i/ibm5051
+#usr/share/terminfo/i/ibm5081
+#usr/share/terminfo/i/ibm5081-c
+#usr/share/terminfo/i/ibm5151
+#usr/share/terminfo/i/ibm5154
+#usr/share/terminfo/i/ibm5154-c
+#usr/share/terminfo/i/ibm6153
+#usr/share/terminfo/i/ibm6153-40
+#usr/share/terminfo/i/ibm6153-90
+#usr/share/terminfo/i/ibm6154
+#usr/share/terminfo/i/ibm6154-c
+#usr/share/terminfo/i/ibm6155
+#usr/share/terminfo/i/ibm8503
+#usr/share/terminfo/i/ibm8507
+#usr/share/terminfo/i/ibm8512
+#usr/share/terminfo/i/ibm8513
+#usr/share/terminfo/i/ibm8514
+#usr/share/terminfo/i/ibm8514-c
+#usr/share/terminfo/i/ibm8604
+#usr/share/terminfo/i/ibmaed
+#usr/share/terminfo/i/ibmapa16
+#usr/share/terminfo/i/ibmapa8
+#usr/share/terminfo/i/ibmapa8c
+#usr/share/terminfo/i/ibmapa8c-c
+#usr/share/terminfo/i/ibmega
+#usr/share/terminfo/i/ibmega-c
+#usr/share/terminfo/i/ibmmono
+#usr/share/terminfo/i/ibmmpel-c
+#usr/share/terminfo/i/ibmpc
+#usr/share/terminfo/i/ibmpc3
+#usr/share/terminfo/i/ibmpc3r
+#usr/share/terminfo/i/ibmpc3r-mono
+#usr/share/terminfo/i/ibmpcx
+#usr/share/terminfo/i/ibmvga
+#usr/share/terminfo/i/ibmvga-c
+#usr/share/terminfo/i/ibmx
+#usr/share/terminfo/i/icl6402
+#usr/share/terminfo/i/icl6404
+#usr/share/terminfo/i/icl6404-w
+#usr/share/terminfo/i/ifmr
+#usr/share/terminfo/i/ims-ansi
+#usr/share/terminfo/i/ims950
+#usr/share/terminfo/i/ims950-b
+#usr/share/terminfo/i/ims950-rv
+#usr/share/terminfo/i/infoton
+#usr/share/terminfo/i/interix
+#usr/share/terminfo/i/interix-nti
+#usr/share/terminfo/i/intertec
+#usr/share/terminfo/i/intertube
+#usr/share/terminfo/i/intertube2
+#usr/share/terminfo/i/intext
+#usr/share/terminfo/i/intext2
+#usr/share/terminfo/i/intextii
+#usr/share/terminfo/i/ips
+#usr/share/terminfo/i/ipsi
+#usr/share/terminfo/i/iq120
+#usr/share/terminfo/i/iq140
+#usr/share/terminfo/i/iris-ansi
+#usr/share/terminfo/i/iris-ansi-ap
+#usr/share/terminfo/i/iris-ansi-net
+#usr/share/terminfo/i/iris-color
+#usr/share/terminfo/i/iris40
+#usr/share/terminfo/j
+#usr/share/terminfo/j/jaixterm
+#usr/share/terminfo/j/jaixterm-m
+#usr/share/terminfo/j/jerq
+#usr/share/terminfo/j/jfbterm
+#usr/share/terminfo/k
+#usr/share/terminfo/k/k45
+#usr/share/terminfo/k/kaypro
+#usr/share/terminfo/k/kaypro2
+#usr/share/terminfo/k/kds6402
+#usr/share/terminfo/k/kds7372
+#usr/share/terminfo/k/kds7372-w
+#usr/share/terminfo/k/kermit
+#usr/share/terminfo/k/kermit-am
+#usr/share/terminfo/k/klone+acs
+#usr/share/terminfo/k/klone+color
+#usr/share/terminfo/k/klone+koi8acs
+#usr/share/terminfo/k/klone+sgr
+#usr/share/terminfo/k/klone+sgr-dumb
+#usr/share/terminfo/k/klone+sgr8
+#usr/share/terminfo/k/kon
+#usr/share/terminfo/k/kon2
+#usr/share/terminfo/k/konsole
+#usr/share/terminfo/k/konsole+pcfkeys
+#usr/share/terminfo/k/konsole-16color
+#usr/share/terminfo/k/konsole-256color
+#usr/share/terminfo/k/konsole-base
+#usr/share/terminfo/k/konsole-linux
+#usr/share/terminfo/k/konsole-solaris
+#usr/share/terminfo/k/konsole-vt100
+#usr/share/terminfo/k/konsole-vt420pc
+#usr/share/terminfo/k/konsole-xf3x
+#usr/share/terminfo/k/konsole-xf4x
+#usr/share/terminfo/k/kt7
+#usr/share/terminfo/k/kt7ix
+#usr/share/terminfo/k/kterm
+#usr/share/terminfo/k/kterm-co
+#usr/share/terminfo/k/kterm-color
+#usr/share/terminfo/k/ktm
+#usr/share/terminfo/k/kvt
+#usr/share/terminfo/l
+#usr/share/terminfo/l/la120
+#usr/share/terminfo/l/layer
+#usr/share/terminfo/l/lft
+#usr/share/terminfo/l/lft-pc850
+#usr/share/terminfo/l/linux
+#usr/share/terminfo/l/linux-16color
+#usr/share/terminfo/l/linux-basic
+#usr/share/terminfo/l/linux-c
+#usr/share/terminfo/l/linux-c-nc
+#usr/share/terminfo/l/linux-koi8
+#usr/share/terminfo/l/linux-koi8r
+#usr/share/terminfo/l/linux-lat
+#usr/share/terminfo/l/linux-m
+#usr/share/terminfo/l/linux-nic
+#usr/share/terminfo/l/linux-vt
+#usr/share/terminfo/l/linux2.6.26
+#usr/share/terminfo/l/lisa
+#usr/share/terminfo/l/lisaterm
+#usr/share/terminfo/l/lisaterm-w
+#usr/share/terminfo/l/liswb
+#usr/share/terminfo/l/ln03
+#usr/share/terminfo/l/ln03-w
+#usr/share/terminfo/l/lpr
+#usr/share/terminfo/l/luna
+#usr/share/terminfo/l/luna68k
+#usr/share/terminfo/m
+#usr/share/terminfo/m/m2-nam
+#usr/share/terminfo/m/mac
+#usr/share/terminfo/m/mac-w
+#usr/share/terminfo/m/mach
+#usr/share/terminfo/m/mach-bold
+#usr/share/terminfo/m/mach-color
+#usr/share/terminfo/m/macintosh
+#usr/share/terminfo/m/macterminal-w
+#usr/share/terminfo/m/mai
+#usr/share/terminfo/m/masscomp
+#usr/share/terminfo/m/masscomp1
+#usr/share/terminfo/m/masscomp2
+#usr/share/terminfo/m/mdl110
+#usr/share/terminfo/m/megatek
+#usr/share/terminfo/m/memhp
+#usr/share/terminfo/m/mgr
+#usr/share/terminfo/m/mgr-linux
+#usr/share/terminfo/m/mgr-sun
+#usr/share/terminfo/m/mgt
+#usr/share/terminfo/m/mgterm
+#usr/share/terminfo/m/microb
+#usr/share/terminfo/m/microbee
+#usr/share/terminfo/m/microterm
+#usr/share/terminfo/m/microterm5
+#usr/share/terminfo/m/mime
+#usr/share/terminfo/m/mime-3ax
+#usr/share/terminfo/m/mime-fb
+#usr/share/terminfo/m/mime-hb
+#usr/share/terminfo/m/mime1
+#usr/share/terminfo/m/mime2
+#usr/share/terminfo/m/mime2a
+#usr/share/terminfo/m/mime2a-s
+#usr/share/terminfo/m/mime2a-v
+#usr/share/terminfo/m/mime314
+#usr/share/terminfo/m/mime340
+#usr/share/terminfo/m/mime3a
+#usr/share/terminfo/m/mime3ax
+#usr/share/terminfo/m/mimei
+#usr/share/terminfo/m/mimeii
+#usr/share/terminfo/m/minitel
+#usr/share/terminfo/m/minitel-2
+#usr/share/terminfo/m/minitel-2-nam
+#usr/share/terminfo/m/minitel1
+#usr/share/terminfo/m/minitel1b
+#usr/share/terminfo/m/minitel1b-80
+#usr/share/terminfo/m/minix
+#usr/share/terminfo/m/minix-1.5
+#usr/share/terminfo/m/minix-1.7
+#usr/share/terminfo/m/minix-old
+#usr/share/terminfo/m/minix-old-am
+#usr/share/terminfo/m/mlterm
+#usr/share/terminfo/m/mlterm+pcfkeys
+#usr/share/terminfo/m/mlterm-256color
+#usr/share/terminfo/m/mm314
+#usr/share/terminfo/m/mm340
+#usr/share/terminfo/m/mod
+#usr/share/terminfo/m/mod24
+#usr/share/terminfo/m/modgraph
+#usr/share/terminfo/m/modgraph2
+#usr/share/terminfo/m/modgraph48
+#usr/share/terminfo/m/mono-emx
+#usr/share/terminfo/m/morphos
+#usr/share/terminfo/m/mouse-sun
+#usr/share/terminfo/m/mrxvt
+#usr/share/terminfo/m/mrxvt-256color
+#usr/share/terminfo/m/ms-vt-utf8
+#usr/share/terminfo/m/ms-vt100
+#usr/share/terminfo/m/ms-vt100+
+#usr/share/terminfo/m/ms-vt100-color
+#usr/share/terminfo/m/msk227
+#usr/share/terminfo/m/msk22714
+#usr/share/terminfo/m/msk227am
+#usr/share/terminfo/m/mskermit227
+#usr/share/terminfo/m/mskermit22714
+#usr/share/terminfo/m/mskermit227am
+#usr/share/terminfo/m/mt-70
+#usr/share/terminfo/m/mt4520-rv
+#usr/share/terminfo/m/mt70
+#usr/share/terminfo/m/mterm
+#usr/share/terminfo/m/mterm-ansi
+#usr/share/terminfo/m/mvterm
+#usr/share/terminfo/n
+#usr/share/terminfo/n/nansi.sys
+#usr/share/terminfo/n/nansi.sysk
+#usr/share/terminfo/n/nansisys
+#usr/share/terminfo/n/nansisysk
+#usr/share/terminfo/n/ncr160vppp
+#usr/share/terminfo/n/ncr160vpwpp
+#usr/share/terminfo/n/ncr160vt100an
+#usr/share/terminfo/n/ncr160vt100pp
+#usr/share/terminfo/n/ncr160vt100wan
+#usr/share/terminfo/n/ncr160vt100wpp
+#usr/share/terminfo/n/ncr160vt200an
+#usr/share/terminfo/n/ncr160vt200pp
+#usr/share/terminfo/n/ncr160vt200wan
+#usr/share/terminfo/n/ncr160vt200wpp
+#usr/share/terminfo/n/ncr160vt300an
+#usr/share/terminfo/n/ncr160vt300pp
+#usr/share/terminfo/n/ncr160vt300wan
+#usr/share/terminfo/n/ncr160vt300wpp
+#usr/share/terminfo/n/ncr160wy50+pp
+#usr/share/terminfo/n/ncr160wy50+wpp
+#usr/share/terminfo/n/ncr160wy60pp
+#usr/share/terminfo/n/ncr160wy60wpp
+#usr/share/terminfo/n/ncr260intan
+#usr/share/terminfo/n/ncr260intpp
+#usr/share/terminfo/n/ncr260intwan
+#usr/share/terminfo/n/ncr260intwpp
+#usr/share/terminfo/n/ncr260vppp
+#usr/share/terminfo/n/ncr260vpwpp
+#usr/share/terminfo/n/ncr260vt100an
+#usr/share/terminfo/n/ncr260vt100pp
+#usr/share/terminfo/n/ncr260vt100wan
+#usr/share/terminfo/n/ncr260vt100wpp
+#usr/share/terminfo/n/ncr260vt200an
+#usr/share/terminfo/n/ncr260vt200pp
+#usr/share/terminfo/n/ncr260vt200wan
+#usr/share/terminfo/n/ncr260vt200wpp
+#usr/share/terminfo/n/ncr260vt300an
+#usr/share/terminfo/n/ncr260vt300pp
+#usr/share/terminfo/n/ncr260vt300wan
+#usr/share/terminfo/n/ncr260vt300wpp
+#usr/share/terminfo/n/ncr260wy325pp
+#usr/share/terminfo/n/ncr260wy325wpp
+#usr/share/terminfo/n/ncr260wy350pp
+#usr/share/terminfo/n/ncr260wy350wpp
+#usr/share/terminfo/n/ncr260wy50+pp
+#usr/share/terminfo/n/ncr260wy50+wpp
+#usr/share/terminfo/n/ncr260wy60pp
+#usr/share/terminfo/n/ncr260wy60wpp
+#usr/share/terminfo/n/ncr7900
+#usr/share/terminfo/n/ncr7900i
+#usr/share/terminfo/n/ncr7900iv
+#usr/share/terminfo/n/ncr7901
+#usr/share/terminfo/n/ncrvt100an
+#usr/share/terminfo/n/ncrvt100pp
+#usr/share/terminfo/n/ncrvt100wan
+#usr/share/terminfo/n/ncrvt100wpp
+#usr/share/terminfo/n/ncsa
+#usr/share/terminfo/n/ncsa-m
+#usr/share/terminfo/n/ncsa-m-ns
+#usr/share/terminfo/n/ncsa-ns
+#usr/share/terminfo/n/ncsa-vt220
+#usr/share/terminfo/n/ncsa-vt220-8
+#usr/share/terminfo/n/nd9500
+#usr/share/terminfo/n/ndr9500
+#usr/share/terminfo/n/ndr9500-25
+#usr/share/terminfo/n/ndr9500-25-mc
+#usr/share/terminfo/n/ndr9500-25-mc-nl
+#usr/share/terminfo/n/ndr9500-25-nl
+#usr/share/terminfo/n/ndr9500-mc
+#usr/share/terminfo/n/ndr9500-mc-nl
+#usr/share/terminfo/n/ndr9500-nl
+#usr/share/terminfo/n/nec
+#usr/share/terminfo/n/nec5520
+#usr/share/terminfo/n/newhp
+#usr/share/terminfo/n/newhpkeyboard
+#usr/share/terminfo/n/news
+#usr/share/terminfo/n/news-29
+#usr/share/terminfo/n/news-29-euc
+#usr/share/terminfo/n/news-29-sjis
+#usr/share/terminfo/n/news-33
+#usr/share/terminfo/n/news-33-euc
+#usr/share/terminfo/n/news-33-sjis
+#usr/share/terminfo/n/news-42
+#usr/share/terminfo/n/news-42-euc
+#usr/share/terminfo/n/news-42-sjis
+#usr/share/terminfo/n/news-a
+#usr/share/terminfo/n/news-o
+#usr/share/terminfo/n/news-old-unk
+#usr/share/terminfo/n/news-unk
+#usr/share/terminfo/n/news28
+#usr/share/terminfo/n/news28-a
+#usr/share/terminfo/n/news29
+#usr/share/terminfo/n/news31
+#usr/share/terminfo/n/news31-a
+#usr/share/terminfo/n/news31-o
+#usr/share/terminfo/n/news33
+#usr/share/terminfo/n/news40
+#usr/share/terminfo/n/news40-a
+#usr/share/terminfo/n/news40-o
+#usr/share/terminfo/n/news42
+#usr/share/terminfo/n/newscbm
+#usr/share/terminfo/n/newscbm-a
+#usr/share/terminfo/n/newscbm-o
+#usr/share/terminfo/n/newscbm33
+#usr/share/terminfo/n/next
+#usr/share/terminfo/n/nextshell
+#usr/share/terminfo/n/northstar
+#usr/share/terminfo/n/nsterm
+#usr/share/terminfo/n/nsterm+7
+#usr/share/terminfo/n/nsterm+acs
+#usr/share/terminfo/n/nsterm+c
+#usr/share/terminfo/n/nsterm+c41
+#usr/share/terminfo/n/nsterm+mac
+#usr/share/terminfo/n/nsterm+s
+#usr/share/terminfo/n/nsterm-16color
+#usr/share/terminfo/n/nsterm-7
+#usr/share/terminfo/n/nsterm-7-c
+#usr/share/terminfo/n/nsterm-7-c-s
+#usr/share/terminfo/n/nsterm-7-m
+#usr/share/terminfo/n/nsterm-7-m-s
+#usr/share/terminfo/n/nsterm-7-s
+#usr/share/terminfo/n/nsterm-acs
+#usr/share/terminfo/n/nsterm-acs-c
+#usr/share/terminfo/n/nsterm-acs-c-s
+#usr/share/terminfo/n/nsterm-acs-m
+#usr/share/terminfo/n/nsterm-acs-m-s
+#usr/share/terminfo/n/nsterm-acs-s
+#usr/share/terminfo/n/nsterm-bce
+#usr/share/terminfo/n/nsterm-c
+#usr/share/terminfo/n/nsterm-c-7
+#usr/share/terminfo/n/nsterm-c-acs
+#usr/share/terminfo/n/nsterm-c-s
+#usr/share/terminfo/n/nsterm-c-s-7
+#usr/share/terminfo/n/nsterm-c-s-acs
+#usr/share/terminfo/n/nsterm-m
+#usr/share/terminfo/n/nsterm-m-7
+#usr/share/terminfo/n/nsterm-m-acs
+#usr/share/terminfo/n/nsterm-m-s
+#usr/share/terminfo/n/nsterm-m-s-7
+#usr/share/terminfo/n/nsterm-m-s-acs
+#usr/share/terminfo/n/nsterm-old
+#usr/share/terminfo/n/nsterm-s
+#usr/share/terminfo/n/nsterm-s-7
+#usr/share/terminfo/n/nsterm-s-acs
+#usr/share/terminfo/n/ntconsole
+#usr/share/terminfo/n/ntconsole-100
+#usr/share/terminfo/n/ntconsole-100-nti
+#usr/share/terminfo/n/ntconsole-25
+#usr/share/terminfo/n/ntconsole-25-nti
+#usr/share/terminfo/n/ntconsole-25-w
+#usr/share/terminfo/n/ntconsole-25-w-vt
+#usr/share/terminfo/n/ntconsole-35
+#usr/share/terminfo/n/ntconsole-35-nti
+#usr/share/terminfo/n/ntconsole-35-w
+#usr/share/terminfo/n/ntconsole-50
+#usr/share/terminfo/n/ntconsole-50-nti
+#usr/share/terminfo/n/ntconsole-50-w
+#usr/share/terminfo/n/ntconsole-60
+#usr/share/terminfo/n/ntconsole-60-nti
+#usr/share/terminfo/n/ntconsole-60-w
+#usr/share/terminfo/n/ntconsole-w
+#usr/share/terminfo/n/ntconsole-w-vt
+#usr/share/terminfo/n/nwe501
+#usr/share/terminfo/n/nwe501-a
+#usr/share/terminfo/n/nwe501-o
+#usr/share/terminfo/n/nwp-511
+#usr/share/terminfo/n/nwp-517
+#usr/share/terminfo/n/nwp-517-w
+#usr/share/terminfo/n/nwp251-a
+#usr/share/terminfo/n/nwp251-o
+#usr/share/terminfo/n/nwp511
+#usr/share/terminfo/n/nwp512
+#usr/share/terminfo/n/nwp512-a
+#usr/share/terminfo/n/nwp512-o
+#usr/share/terminfo/n/nwp513
+#usr/share/terminfo/n/nwp513-a
+#usr/share/terminfo/n/nwp513-o
+#usr/share/terminfo/n/nwp514
+#usr/share/terminfo/n/nwp514-a
+#usr/share/terminfo/n/nwp514-o
+#usr/share/terminfo/n/nwp517
+#usr/share/terminfo/n/nwp517-w
+#usr/share/terminfo/n/nwp518
+#usr/share/terminfo/n/nwp518-a
+#usr/share/terminfo/n/nwp518-o
+#usr/share/terminfo/n/nxterm
+#usr/share/terminfo/o
+#usr/share/terminfo/o/o31
+#usr/share/terminfo/o/o4112-nd
+#usr/share/terminfo/o/o85h
+#usr/share/terminfo/o/oabm85h
+#usr/share/terminfo/o/oblit
+#usr/share/terminfo/o/oc100
+#usr/share/terminfo/o/oconcept
+#usr/share/terminfo/o/ofcons
+#usr/share/terminfo/o/ojerq
+#usr/share/terminfo/o/oldibmpc3
+#usr/share/terminfo/o/oldpc3
+#usr/share/terminfo/o/oldsun
+#usr/share/terminfo/o/omron
+#usr/share/terminfo/o/opennt
+#usr/share/terminfo/o/opennt-100
+#usr/share/terminfo/o/opennt-100-nti
+#usr/share/terminfo/o/opennt-25
+#usr/share/terminfo/o/opennt-25-nti
+#usr/share/terminfo/o/opennt-25-w
+#usr/share/terminfo/o/opennt-25-w-vt
+#usr/share/terminfo/o/opennt-35
+#usr/share/terminfo/o/opennt-35-nti
+#usr/share/terminfo/o/opennt-35-w
+#usr/share/terminfo/o/opennt-50
+#usr/share/terminfo/o/opennt-50-nti
+#usr/share/terminfo/o/opennt-50-w
+#usr/share/terminfo/o/opennt-60
+#usr/share/terminfo/o/opennt-60-nti
+#usr/share/terminfo/o/opennt-60-w
+#usr/share/terminfo/o/opennt-nti
+#usr/share/terminfo/o/opennt-w
+#usr/share/terminfo/o/opennt-w-vt
+#usr/share/terminfo/o/opus3n1+
+#usr/share/terminfo/o/origibmpc3
+#usr/share/terminfo/o/origpc3
+#usr/share/terminfo/o/os9LII
+#usr/share/terminfo/o/osborne
+#usr/share/terminfo/o/osborne-w
+#usr/share/terminfo/o/osborne1
+#usr/share/terminfo/o/osborne1-w
+#usr/share/terminfo/o/osexec
+#usr/share/terminfo/o/otek4112
+#usr/share/terminfo/o/otek4113
+#usr/share/terminfo/o/otek4114
+#usr/share/terminfo/o/otek4115
+#usr/share/terminfo/o/owl
+#usr/share/terminfo/p
+#usr/share/terminfo/p/p12
+#usr/share/terminfo/p/p12-m
+#usr/share/terminfo/p/p12-m-w
+#usr/share/terminfo/p/p12-w
+#usr/share/terminfo/p/p14
+#usr/share/terminfo/p/p14-m
+#usr/share/terminfo/p/p14-m-w
+#usr/share/terminfo/p/p14-w
+#usr/share/terminfo/p/p19
+#usr/share/terminfo/p/p4
+#usr/share/terminfo/p/p5
+#usr/share/terminfo/p/p7
+#usr/share/terminfo/p/p8
+#usr/share/terminfo/p/p8-w
+#usr/share/terminfo/p/p8gl
+#usr/share/terminfo/p/p9
+#usr/share/terminfo/p/p9-8
+#usr/share/terminfo/p/p9-8-w
+#usr/share/terminfo/p/p9-w
+#usr/share/terminfo/p/pc-coherent
+#usr/share/terminfo/p/pc-minix
+#usr/share/terminfo/p/pc-venix
+#usr/share/terminfo/p/pc3
+#usr/share/terminfo/p/pc3-bold
+#usr/share/terminfo/p/pc3r
+#usr/share/terminfo/p/pc3r-m
+#usr/share/terminfo/p/pc6300plus
+#usr/share/terminfo/p/pc7300
+#usr/share/terminfo/p/pcansi
+#usr/share/terminfo/p/pcansi-25
+#usr/share/terminfo/p/pcansi-25-m
+#usr/share/terminfo/p/pcansi-33
+#usr/share/terminfo/p/pcansi-33-m
+#usr/share/terminfo/p/pcansi-43
+#usr/share/terminfo/p/pcansi-43-m
+#usr/share/terminfo/p/pcansi-m
+#usr/share/terminfo/p/pcansi-mono
+#usr/share/terminfo/p/pcansi25
+#usr/share/terminfo/p/pcansi25m
+#usr/share/terminfo/p/pcansi33
+#usr/share/terminfo/p/pcansi33m
+#usr/share/terminfo/p/pcansi43
+#usr/share/terminfo/p/pccons
+#usr/share/terminfo/p/pcconsole
+#usr/share/terminfo/p/pcix
+#usr/share/terminfo/p/pckermit
+#usr/share/terminfo/p/pckermit12
+#usr/share/terminfo/p/pckermit120
+#usr/share/terminfo/p/pcmw
+#usr/share/terminfo/p/pcplot
+#usr/share/terminfo/p/pcvt25
+#usr/share/terminfo/p/pcvt25-color
+#usr/share/terminfo/p/pcvt25w
+#usr/share/terminfo/p/pcvt28
+#usr/share/terminfo/p/pcvt28w
+#usr/share/terminfo/p/pcvt35
+#usr/share/terminfo/p/pcvt35w
+#usr/share/terminfo/p/pcvt40
+#usr/share/terminfo/p/pcvt40w
+#usr/share/terminfo/p/pcvt43
+#usr/share/terminfo/p/pcvt43w
+#usr/share/terminfo/p/pcvt50
+#usr/share/terminfo/p/pcvt50w
+#usr/share/terminfo/p/pcvtXX
+#usr/share/terminfo/p/pcz19
+#usr/share/terminfo/p/pe1100
+#usr/share/terminfo/p/pe1200
+#usr/share/terminfo/p/pe1251
+#usr/share/terminfo/p/pe550
+#usr/share/terminfo/p/pe6100
+#usr/share/terminfo/p/pe6300
+#usr/share/terminfo/p/pe6312
+#usr/share/terminfo/p/pe7000c
+#usr/share/terminfo/p/pe7000m
+#usr/share/terminfo/p/pilot
+#usr/share/terminfo/p/pmcons
+#usr/share/terminfo/p/pmconsole
+#usr/share/terminfo/p/printer
+#usr/share/terminfo/p/prism12
+#usr/share/terminfo/p/prism12-m
+#usr/share/terminfo/p/prism12-m-w
+#usr/share/terminfo/p/prism12-w
+#usr/share/terminfo/p/prism14
+#usr/share/terminfo/p/prism14-m
+#usr/share/terminfo/p/prism14-m-w
+#usr/share/terminfo/p/prism14-w
+#usr/share/terminfo/p/prism2
+#usr/share/terminfo/p/prism4
+#usr/share/terminfo/p/prism5
+#usr/share/terminfo/p/prism7
+#usr/share/terminfo/p/prism8
+#usr/share/terminfo/p/prism8-w
+#usr/share/terminfo/p/prism8gl
+#usr/share/terminfo/p/prism9
+#usr/share/terminfo/p/prism9-8
+#usr/share/terminfo/p/prism9-8-w
+#usr/share/terminfo/p/prism9-w
+#usr/share/terminfo/p/pro350
+#usr/share/terminfo/p/ps300
+#usr/share/terminfo/p/psterm
+#usr/share/terminfo/p/psterm-80x24
+#usr/share/terminfo/p/psterm-90x28
+#usr/share/terminfo/p/psterm-96x48
+#usr/share/terminfo/p/psterm-basic
+#usr/share/terminfo/p/psterm-fast
+#usr/share/terminfo/p/psx_ansi
+#usr/share/terminfo/p/pt100
+#usr/share/terminfo/p/pt100w
+#usr/share/terminfo/p/pt200
+#usr/share/terminfo/p/pt200w
+#usr/share/terminfo/p/pt210
+#usr/share/terminfo/p/pt250
+#usr/share/terminfo/p/pt250w
+#usr/share/terminfo/p/pt505
+#usr/share/terminfo/p/pt505-22
+#usr/share/terminfo/p/pt505-24
+#usr/share/terminfo/p/pty
+#usr/share/terminfo/p/putty
+#usr/share/terminfo/p/putty-256color
+#usr/share/terminfo/p/putty-vt100
+#usr/share/terminfo/q
+#usr/share/terminfo/q/qansi
+#usr/share/terminfo/q/qansi-g
+#usr/share/terminfo/q/qansi-m
+#usr/share/terminfo/q/qansi-t
+#usr/share/terminfo/q/qansi-w
+#usr/share/terminfo/q/qdcons
+#usr/share/terminfo/q/qdss
+#usr/share/terminfo/q/qnx
+#usr/share/terminfo/q/qnx4
+#usr/share/terminfo/q/qnxm
+#usr/share/terminfo/q/qnxt
+#usr/share/terminfo/q/qnxt2
+#usr/share/terminfo/q/qnxt4
+#usr/share/terminfo/q/qnxtmono
+#usr/share/terminfo/q/qnxw
+#usr/share/terminfo/q/qume
+#usr/share/terminfo/q/qume5
+#usr/share/terminfo/q/qvt101
+#usr/share/terminfo/q/qvt101+
+#usr/share/terminfo/q/qvt101p
+#usr/share/terminfo/q/qvt102
+#usr/share/terminfo/q/qvt103
+#usr/share/terminfo/q/qvt103-w
+#usr/share/terminfo/q/qvt108
+#usr/share/terminfo/q/qvt119
+#usr/share/terminfo/q/qvt119+
+#usr/share/terminfo/q/qvt119+-25
+#usr/share/terminfo/q/qvt119+-25-w
+#usr/share/terminfo/q/qvt119+-w
+#usr/share/terminfo/q/qvt119-25-w
+#usr/share/terminfo/q/qvt119-w
+#usr/share/terminfo/q/qvt119p
+#usr/share/terminfo/q/qvt119p-25
+#usr/share/terminfo/q/qvt119p-25-w
+#usr/share/terminfo/q/qvt119p-w
+#usr/share/terminfo/q/qvt203
+#usr/share/terminfo/q/qvt203+
+#usr/share/terminfo/q/qvt203-25
+#usr/share/terminfo/q/qvt203-25-w
+#usr/share/terminfo/q/qvt203-w
+#usr/share/terminfo/q/qvt203-w-am
+#usr/share/terminfo/r
+#usr/share/terminfo/r/rbcomm
+#usr/share/terminfo/r/rbcomm-nam
+#usr/share/terminfo/r/rbcomm-w
+#usr/share/terminfo/r/rca
+#usr/share/terminfo/r/rcons
+#usr/share/terminfo/r/rcons-color
+#usr/share/terminfo/r/rebus3180
+#usr/share/terminfo/r/regent
+#usr/share/terminfo/r/regent100
+#usr/share/terminfo/r/regent20
+#usr/share/terminfo/r/regent200
+#usr/share/terminfo/r/regent25
+#usr/share/terminfo/r/regent40
+#usr/share/terminfo/r/regent40+
+#usr/share/terminfo/r/regent60
+#usr/share/terminfo/r/rt6221
+#usr/share/terminfo/r/rt6221-w
+#usr/share/terminfo/r/rtpc
+#usr/share/terminfo/r/rxvt
+#usr/share/terminfo/r/rxvt+pcfkeys
+#usr/share/terminfo/r/rxvt-16color
+#usr/share/terminfo/r/rxvt-256color
+#usr/share/terminfo/r/rxvt-88color
+#usr/share/terminfo/r/rxvt-basic
+#usr/share/terminfo/r/rxvt-color
+#usr/share/terminfo/r/rxvt-cygwin
+#usr/share/terminfo/r/rxvt-cygwin-native
+#usr/share/terminfo/r/rxvt-xpm
+#usr/share/terminfo/s
+#usr/share/terminfo/s/s4
+#usr/share/terminfo/s/sb1
+#usr/share/terminfo/s/sb2
+#usr/share/terminfo/s/sb3
+#usr/share/terminfo/s/sbi
+#usr/share/terminfo/s/sbobcat
+#usr/share/terminfo/s/sc410
+#usr/share/terminfo/s/sc415
+#usr/share/terminfo/s/scanset
+#usr/share/terminfo/s/scoansi
+#usr/share/terminfo/s/scoansi-new
+#usr/share/terminfo/s/scoansi-old
+#usr/share/terminfo/s/screen
+#usr/share/terminfo/s/screen+fkeys
+#usr/share/terminfo/s/screen-16color
+#usr/share/terminfo/s/screen-16color-bce
+#usr/share/terminfo/s/screen-16color-bce-s
+#usr/share/terminfo/s/screen-16color-s
+#usr/share/terminfo/s/screen-256color
+#usr/share/terminfo/s/screen-256color-bce
+#usr/share/terminfo/s/screen-256color-bce-s
+#usr/share/terminfo/s/screen-256color-s
+#usr/share/terminfo/s/screen-bce
+#usr/share/terminfo/s/screen-bce.Eterm
+#usr/share/terminfo/s/screen-bce.gnome
+#usr/share/terminfo/s/screen-bce.konsole
+#usr/share/terminfo/s/screen-bce.linux
+#usr/share/terminfo/s/screen-bce.mlterm
+#usr/share/terminfo/s/screen-bce.mrxvt
+#usr/share/terminfo/s/screen-bce.rxvt
+#usr/share/terminfo/s/screen-bce.xterm-new
+#usr/share/terminfo/s/screen-s
+#usr/share/terminfo/s/screen-w
+#usr/share/terminfo/s/screen.Eterm
+#usr/share/terminfo/s/screen.gnome
+#usr/share/terminfo/s/screen.konsole
+#usr/share/terminfo/s/screen.linux
+#usr/share/terminfo/s/screen.mlterm
+#usr/share/terminfo/s/screen.mrxvt
+#usr/share/terminfo/s/screen.rxvt
+#usr/share/terminfo/s/screen.teraterm
+#usr/share/terminfo/s/screen.vte
+#usr/share/terminfo/s/screen.xterm-new
+#usr/share/terminfo/s/screen.xterm-r6
+#usr/share/terminfo/s/screen.xterm-xfree86
+#usr/share/terminfo/s/screen2
+#usr/share/terminfo/s/screen3
+#usr/share/terminfo/s/screwpoint
+#usr/share/terminfo/s/scrhp
+#usr/share/terminfo/s/sibo
+#usr/share/terminfo/s/simterm
+#usr/share/terminfo/s/soroc
+#usr/share/terminfo/s/soroc120
+#usr/share/terminfo/s/soroc140
+#usr/share/terminfo/s/spinwriter
+#usr/share/terminfo/s/st52
+#usr/share/terminfo/s/st52-color
+#usr/share/terminfo/s/st52-m
+#usr/share/terminfo/s/st52-old
+#usr/share/terminfo/s/stv52
+#usr/share/terminfo/s/stv52pc
+#usr/share/terminfo/s/sun
+#usr/share/terminfo/s/sun-1
+#usr/share/terminfo/s/sun-12
+#usr/share/terminfo/s/sun-17
+#usr/share/terminfo/s/sun-24
+#usr/share/terminfo/s/sun-34
+#usr/share/terminfo/s/sun-48
+#usr/share/terminfo/s/sun-c
+#usr/share/terminfo/s/sun-cgsix
+#usr/share/terminfo/s/sun-cmd
+#usr/share/terminfo/s/sun-color
+#usr/share/terminfo/s/sun-e
+#usr/share/terminfo/s/sun-e-s
+#usr/share/terminfo/s/sun-il
+#usr/share/terminfo/s/sun-nic
+#usr/share/terminfo/s/sun-s
+#usr/share/terminfo/s/sun-s-e
+#usr/share/terminfo/s/sun-ss5
+#usr/share/terminfo/s/sun-type4
+#usr/share/terminfo/s/sun1
+#usr/share/terminfo/s/sun2
+#usr/share/terminfo/s/sune
+#usr/share/terminfo/s/superbee
+#usr/share/terminfo/s/superbee-xsb
+#usr/share/terminfo/s/superbeeic
+#usr/share/terminfo/s/superbrain
+#usr/share/terminfo/s/sv80
+#usr/share/terminfo/s/swtp
+#usr/share/terminfo/s/synertek
+#usr/share/terminfo/s/synertek380
+#usr/share/terminfo/s/system1
+#usr/share/terminfo/t
+#usr/share/terminfo/t/t10
+#usr/share/terminfo/t/t1061
+#usr/share/terminfo/t/t1061f
+#usr/share/terminfo/t/t16
+#usr/share/terminfo/t/t3700
+#usr/share/terminfo/t/t3800
+#usr/share/terminfo/t/t653x
+#usr/share/terminfo/t/tab
+#usr/share/terminfo/t/tab132
+#usr/share/terminfo/t/tab132-15
+#usr/share/terminfo/t/tab132-rv
+#usr/share/terminfo/t/tab132-w
+#usr/share/terminfo/t/tab132-w-rv
+#usr/share/terminfo/t/tandem6510
+#usr/share/terminfo/t/tandem653
+#usr/share/terminfo/t/tek
+#usr/share/terminfo/t/tek4012
+#usr/share/terminfo/t/tek4013
+#usr/share/terminfo/t/tek4014
+#usr/share/terminfo/t/tek4014-sm
+#usr/share/terminfo/t/tek4015
+#usr/share/terminfo/t/tek4015-sm
+#usr/share/terminfo/t/tek4023
+#usr/share/terminfo/t/tek4024
+#usr/share/terminfo/t/tek4025
+#usr/share/terminfo/t/tek4025-17
+#usr/share/terminfo/t/tek4025-17-ws
+#usr/share/terminfo/t/tek4025-cr
+#usr/share/terminfo/t/tek4025-ex
+#usr/share/terminfo/t/tek4025a
+#usr/share/terminfo/t/tek4025ex
+#usr/share/terminfo/t/tek4027
+#usr/share/terminfo/t/tek4027-ex
+#usr/share/terminfo/t/tek4105
+#usr/share/terminfo/t/tek4105-30
+#usr/share/terminfo/t/tek4105a
+#usr/share/terminfo/t/tek4106brl
+#usr/share/terminfo/t/tek4107
+#usr/share/terminfo/t/tek4107brl
+#usr/share/terminfo/t/tek4109
+#usr/share/terminfo/t/tek4109brl
+#usr/share/terminfo/t/tek4112
+#usr/share/terminfo/t/tek4112-5
+#usr/share/terminfo/t/tek4112-nd
+#usr/share/terminfo/t/tek4113
+#usr/share/terminfo/t/tek4113-34
+#usr/share/terminfo/t/tek4113-nd
+#usr/share/terminfo/t/tek4114
+#usr/share/terminfo/t/tek4115
+#usr/share/terminfo/t/tek4125
+#usr/share/terminfo/t/tek4205
+#usr/share/terminfo/t/tek4207
+#usr/share/terminfo/t/tek4207-s
+#usr/share/terminfo/t/tek4404
+#usr/share/terminfo/t/teleray
+#usr/share/terminfo/t/teletec
+#usr/share/terminfo/t/teraterm
+#usr/share/terminfo/t/teraterm2.3
+#usr/share/terminfo/t/teraterm4.59
+#usr/share/terminfo/t/terminet
+#usr/share/terminfo/t/terminet1200
+#usr/share/terminfo/t/terminet300
+#usr/share/terminfo/t/tgtelnet
+#usr/share/terminfo/t/ti700
+#usr/share/terminfo/t/ti733
+#usr/share/terminfo/t/ti735
+#usr/share/terminfo/t/ti745
+#usr/share/terminfo/t/ti800
+#usr/share/terminfo/t/ti916
+#usr/share/terminfo/t/ti916-132
+#usr/share/terminfo/t/ti916-220-7
+#usr/share/terminfo/t/ti916-220-8
+#usr/share/terminfo/t/ti916-8
+#usr/share/terminfo/t/ti916-8-132
+#usr/share/terminfo/t/ti924
+#usr/share/terminfo/t/ti924-8
+#usr/share/terminfo/t/ti924-8w
+#usr/share/terminfo/t/ti924w
+#usr/share/terminfo/t/ti926
+#usr/share/terminfo/t/ti926-8
+#usr/share/terminfo/t/ti928
+#usr/share/terminfo/t/ti928-8
+#usr/share/terminfo/t/ti931
+#usr/share/terminfo/t/ti_ansi
+#usr/share/terminfo/t/tkterm
+#usr/share/terminfo/t/tn1200
+#usr/share/terminfo/t/tn300
+#usr/share/terminfo/t/trs16
+#usr/share/terminfo/t/trs2
+#usr/share/terminfo/t/trs80II
+#usr/share/terminfo/t/trsII
+#usr/share/terminfo/t/ts-1
+#usr/share/terminfo/t/ts-1p
+#usr/share/terminfo/t/ts1
+#usr/share/terminfo/t/ts100
+#usr/share/terminfo/t/ts100-ctxt
+#usr/share/terminfo/t/ts100-sp
+#usr/share/terminfo/t/ts1p
+#usr/share/terminfo/t/tt
+#usr/share/terminfo/t/tt505-22
+#usr/share/terminfo/t/tt52
+#usr/share/terminfo/t/tty33
+#usr/share/terminfo/t/tty35
+#usr/share/terminfo/t/tty37
+#usr/share/terminfo/t/tty40
+#usr/share/terminfo/t/tty43
+#usr/share/terminfo/t/tty4420
+#usr/share/terminfo/t/tty4424
+#usr/share/terminfo/t/tty4424-1
+#usr/share/terminfo/t/tty4424m
+#usr/share/terminfo/t/tty4426
+#usr/share/terminfo/t/tty5410
+#usr/share/terminfo/t/tty5410-w
+#usr/share/terminfo/t/tty5410v1
+#usr/share/terminfo/t/tty5410v1-w
+#usr/share/terminfo/t/tty5420
+#usr/share/terminfo/t/tty5420+nl
+#usr/share/terminfo/t/tty5420-nl
+#usr/share/terminfo/t/tty5420-rv
+#usr/share/terminfo/t/tty5420-rv-nl
+#usr/share/terminfo/t/tty5420-w
+#usr/share/terminfo/t/tty5420-w-nl
+#usr/share/terminfo/t/tty5420-w-rv
+#usr/share/terminfo/t/tty5420-w-rv-n
+#usr/share/terminfo/t/tty5425
+#usr/share/terminfo/t/tty5425-nl
+#usr/share/terminfo/t/tty5425-w
+#usr/share/terminfo/t/tty5620
+#usr/share/terminfo/t/tty5620-1
+#usr/share/terminfo/t/tty5620-24
+#usr/share/terminfo/t/tty5620-34
+#usr/share/terminfo/t/tty5620-s
+#usr/share/terminfo/t/ttydmd
+#usr/share/terminfo/t/tvi803
+#usr/share/terminfo/t/tvi9065
+#usr/share/terminfo/t/tvi910
+#usr/share/terminfo/t/tvi910+
+#usr/share/terminfo/t/tvi912
+#usr/share/terminfo/t/tvi912b
+#usr/share/terminfo/t/tvi912b+2p
+#usr/share/terminfo/t/tvi912b+dim
+#usr/share/terminfo/t/tvi912b+mc
+#usr/share/terminfo/t/tvi912b+printer
+#usr/share/terminfo/t/tvi912b+vb
+#usr/share/terminfo/t/tvi912b-2p
+#usr/share/terminfo/t/tvi912b-2p-mc
+#usr/share/terminfo/t/tvi912b-2p-p
+#usr/share/terminfo/t/tvi912b-2p-unk
+#usr/share/terminfo/t/tvi912b-mc
+#usr/share/terminfo/t/tvi912b-mc-2p
+#usr/share/terminfo/t/tvi912b-mc-vb
+#usr/share/terminfo/t/tvi912b-p
+#usr/share/terminfo/t/tvi912b-p-2p
+#usr/share/terminfo/t/tvi912b-p-vb
+#usr/share/terminfo/t/tvi912b-unk
+#usr/share/terminfo/t/tvi912b-unk-2p
+#usr/share/terminfo/t/tvi912b-unk-vb
+#usr/share/terminfo/t/tvi912b-vb
+#usr/share/terminfo/t/tvi912b-vb-mc
+#usr/share/terminfo/t/tvi912b-vb-p
+#usr/share/terminfo/t/tvi912b-vb-unk
+#usr/share/terminfo/t/tvi912c
+#usr/share/terminfo/t/tvi912c-2p
+#usr/share/terminfo/t/tvi912c-2p-mc
+#usr/share/terminfo/t/tvi912c-2p-p
+#usr/share/terminfo/t/tvi912c-2p-unk
+#usr/share/terminfo/t/tvi912c-mc
+#usr/share/terminfo/t/tvi912c-mc-2p
+#usr/share/terminfo/t/tvi912c-mc-vb
+#usr/share/terminfo/t/tvi912c-p
+#usr/share/terminfo/t/tvi912c-p-2p
+#usr/share/terminfo/t/tvi912c-p-vb
+#usr/share/terminfo/t/tvi912c-unk
+#usr/share/terminfo/t/tvi912c-unk-2p
+#usr/share/terminfo/t/tvi912c-unk-vb
+#usr/share/terminfo/t/tvi912c-vb
+#usr/share/terminfo/t/tvi912c-vb-mc
+#usr/share/terminfo/t/tvi912c-vb-p
+#usr/share/terminfo/t/tvi912c-vb-unk
+#usr/share/terminfo/t/tvi912cc
+#usr/share/terminfo/t/tvi914
+#usr/share/terminfo/t/tvi920
+#usr/share/terminfo/t/tvi920b
+#usr/share/terminfo/t/tvi920b+fn
+#usr/share/terminfo/t/tvi920b-2p
+#usr/share/terminfo/t/tvi920b-2p-mc
+#usr/share/terminfo/t/tvi920b-2p-p
+#usr/share/terminfo/t/tvi920b-2p-unk
+#usr/share/terminfo/t/tvi920b-mc
+#usr/share/terminfo/t/tvi920b-mc-2p
+#usr/share/terminfo/t/tvi920b-mc-vb
+#usr/share/terminfo/t/tvi920b-p
+#usr/share/terminfo/t/tvi920b-p-2p
+#usr/share/terminfo/t/tvi920b-p-vb
+#usr/share/terminfo/t/tvi920b-unk
+#usr/share/terminfo/t/tvi920b-unk-2p
+#usr/share/terminfo/t/tvi920b-unk-vb
+#usr/share/terminfo/t/tvi920b-vb
+#usr/share/terminfo/t/tvi920b-vb-mc
+#usr/share/terminfo/t/tvi920b-vb-p
+#usr/share/terminfo/t/tvi920b-vb-unk
+#usr/share/terminfo/t/tvi920c
+#usr/share/terminfo/t/tvi920c-2p
+#usr/share/terminfo/t/tvi920c-2p-mc
+#usr/share/terminfo/t/tvi920c-2p-p
+#usr/share/terminfo/t/tvi920c-2p-unk
+#usr/share/terminfo/t/tvi920c-mc
+#usr/share/terminfo/t/tvi920c-mc-2p
+#usr/share/terminfo/t/tvi920c-mc-vb
+#usr/share/terminfo/t/tvi920c-p
+#usr/share/terminfo/t/tvi920c-p-2p
+#usr/share/terminfo/t/tvi920c-p-vb
+#usr/share/terminfo/t/tvi920c-unk
+#usr/share/terminfo/t/tvi920c-unk-2p
+#usr/share/terminfo/t/tvi920c-unk-vb
+#usr/share/terminfo/t/tvi920c-vb
+#usr/share/terminfo/t/tvi920c-vb-mc
+#usr/share/terminfo/t/tvi920c-vb-p
+#usr/share/terminfo/t/tvi920c-vb-unk
+#usr/share/terminfo/t/tvi921
+#usr/share/terminfo/t/tvi924
+#usr/share/terminfo/t/tvi925
+#usr/share/terminfo/t/tvi925-hi
+#usr/share/terminfo/t/tvi92B
+#usr/share/terminfo/t/tvi92D
+#usr/share/terminfo/t/tvi950
+#usr/share/terminfo/t/tvi950-2p
+#usr/share/terminfo/t/tvi950-4p
+#usr/share/terminfo/t/tvi950-rv
+#usr/share/terminfo/t/tvi950-rv-2p
+#usr/share/terminfo/t/tvi950-rv-4p
+#usr/share/terminfo/t/tvi955
+#usr/share/terminfo/t/tvi955-hb
+#usr/share/terminfo/t/tvi955-w
+#usr/share/terminfo/t/tvi970
+#usr/share/terminfo/t/tvi970-2p
+#usr/share/terminfo/t/tvi970-vb
+#usr/share/terminfo/t/tvipt
+#usr/share/terminfo/t/tw100
+#usr/share/terminfo/t/tw52
+#usr/share/terminfo/t/tw52-color
+#usr/share/terminfo/t/tw52-m
+#usr/share/terminfo/t/tws-generic
+#usr/share/terminfo/t/tws2102-sna
+#usr/share/terminfo/t/tws2103
+#usr/share/terminfo/t/tws2103-sna
+#usr/share/terminfo/u
+#usr/share/terminfo/u/ultima2
+#usr/share/terminfo/u/ultimaII
+#usr/share/terminfo/u/uniterm
+#usr/share/terminfo/u/uniterm49
+#usr/share/terminfo/u/unixpc
+#usr/share/terminfo/u/unknown
+#usr/share/terminfo/u/uts30
+#usr/share/terminfo/u/uwin
+#usr/share/terminfo/v
+#usr/share/terminfo/v/v200-nam
+#usr/share/terminfo/v/v320n
+#usr/share/terminfo/v/v3220
+#usr/share/terminfo/v/v5410
+#usr/share/terminfo/v/vanilla
+#usr/share/terminfo/v/vapple
+#usr/share/terminfo/v/vc103
+#usr/share/terminfo/v/vc203
+#usr/share/terminfo/v/vc303
+#usr/share/terminfo/v/vc303a
+#usr/share/terminfo/v/vc403a
+#usr/share/terminfo/v/vc404
+#usr/share/terminfo/v/vc404-s
+#usr/share/terminfo/v/vc414
+#usr/share/terminfo/v/vc414h
+#usr/share/terminfo/v/vc415
+#usr/share/terminfo/v/venix
+#usr/share/terminfo/v/versaterm
+#usr/share/terminfo/v/vi200
+#usr/share/terminfo/v/vi200-f
+#usr/share/terminfo/v/vi200-rv
+#usr/share/terminfo/v/vi300
+#usr/share/terminfo/v/vi300-old
+#usr/share/terminfo/v/vi50
+#usr/share/terminfo/v/vi500
+#usr/share/terminfo/v/vi50adm
+#usr/share/terminfo/v/vi55
+#usr/share/terminfo/v/vi550
+#usr/share/terminfo/v/vi603
+#usr/share/terminfo/v/viewpoint
+#usr/share/terminfo/v/viewpoint3a+
+#usr/share/terminfo/v/viewpoint60
+#usr/share/terminfo/v/viewpoint90
+#usr/share/terminfo/v/vip
+#usr/share/terminfo/v/vip-H
+#usr/share/terminfo/v/vip-Hw
+#usr/share/terminfo/v/vip-w
+#usr/share/terminfo/v/vip7800-H
+#usr/share/terminfo/v/vip7800-Hw
+#usr/share/terminfo/v/vip7800-w
+#usr/share/terminfo/v/visa50
+#usr/share/terminfo/v/visual603
+#usr/share/terminfo/v/vitty
+#usr/share/terminfo/v/vk100
+#usr/share/terminfo/v/vp3a+
+#usr/share/terminfo/v/vp60
+#usr/share/terminfo/v/vp90
+#usr/share/terminfo/v/vremote
+#usr/share/terminfo/v/vs100
+#usr/share/terminfo/v/vs100-x10
+#usr/share/terminfo/v/vsc
+#usr/share/terminfo/v/vt-61
+#usr/share/terminfo/v/vt-utf8
+#usr/share/terminfo/v/vt100
+#usr/share/terminfo/v/vt100+
+#usr/share/terminfo/v/vt100+enq
+#usr/share/terminfo/v/vt100+fnkeys
+#usr/share/terminfo/v/vt100+keypad
+#usr/share/terminfo/v/vt100+pfkeys
+#usr/share/terminfo/v/vt100-am
+#usr/share/terminfo/v/vt100-bm
+#usr/share/terminfo/v/vt100-bm-o
+#usr/share/terminfo/v/vt100-bot-s
+#usr/share/terminfo/v/vt100-nam
+#usr/share/terminfo/v/vt100-nam-w
+#usr/share/terminfo/v/vt100-nav
+#usr/share/terminfo/v/vt100-nav-w
+#usr/share/terminfo/v/vt100-putty
+#usr/share/terminfo/v/vt100-s
+#usr/share/terminfo/v/vt100-s-bot
+#usr/share/terminfo/v/vt100-s-top
+#usr/share/terminfo/v/vt100-top-s
+#usr/share/terminfo/v/vt100-vb
+#usr/share/terminfo/v/vt100-w
+#usr/share/terminfo/v/vt100-w-am
+#usr/share/terminfo/v/vt100-w-nam
+#usr/share/terminfo/v/vt100-w-nav
+#usr/share/terminfo/v/vt100nam
+#usr/share/terminfo/v/vt102
+#usr/share/terminfo/v/vt102+enq
+#usr/share/terminfo/v/vt102-nsgr
+#usr/share/terminfo/v/vt102-w
+#usr/share/terminfo/v/vt125
+#usr/share/terminfo/v/vt131
+#usr/share/terminfo/v/vt132
+#usr/share/terminfo/v/vt200
+#usr/share/terminfo/v/vt200-8
+#usr/share/terminfo/v/vt200-8bit
+#usr/share/terminfo/v/vt200-js
+#usr/share/terminfo/v/vt200-old
+#usr/share/terminfo/v/vt200-w
+#usr/share/terminfo/v/vt220
+#usr/share/terminfo/v/vt220+keypad
+#usr/share/terminfo/v/vt220-8
+#usr/share/terminfo/v/vt220-8bit
+#usr/share/terminfo/v/vt220-js
+#usr/share/terminfo/v/vt220-nam
+#usr/share/terminfo/v/vt220-old
+#usr/share/terminfo/v/vt220-w
+#usr/share/terminfo/v/vt220d
+#usr/share/terminfo/v/vt300
+#usr/share/terminfo/v/vt300-nam
+#usr/share/terminfo/v/vt300-w
+#usr/share/terminfo/v/vt300-w-nam
+#usr/share/terminfo/v/vt320
+#usr/share/terminfo/v/vt320-k3
+#usr/share/terminfo/v/vt320-k311
+#usr/share/terminfo/v/vt320-nam
+#usr/share/terminfo/v/vt320-w
+#usr/share/terminfo/v/vt320-w-nam
+#usr/share/terminfo/v/vt320nam
+#usr/share/terminfo/v/vt330
+#usr/share/terminfo/v/vt340
+#usr/share/terminfo/v/vt400
+#usr/share/terminfo/v/vt400-24
+#usr/share/terminfo/v/vt420
+#usr/share/terminfo/v/vt420f
+#usr/share/terminfo/v/vt420pc
+#usr/share/terminfo/v/vt420pcdos
+#usr/share/terminfo/v/vt50
+#usr/share/terminfo/v/vt50h
+#usr/share/terminfo/v/vt510
+#usr/share/terminfo/v/vt510pc
+#usr/share/terminfo/v/vt510pcdos
+#usr/share/terminfo/v/vt52
+#usr/share/terminfo/v/vt520
+#usr/share/terminfo/v/vt525
+#usr/share/terminfo/v/vt61
+#usr/share/terminfo/v/vt61.5
+#usr/share/terminfo/v/vte
+#usr/share/terminfo/v/vte+pcfkeys
+#usr/share/terminfo/v/vte-2007
+#usr/share/terminfo/v/vte-2008
+#usr/share/terminfo/v/vte-256color
+#usr/share/terminfo/v/vtnt
+#usr/share/terminfo/v/vv100
+usr/share/terminfo/v/vwmterm
+#usr/share/terminfo/w
+#usr/share/terminfo/w/wren
+#usr/share/terminfo/w/wrenw
+#usr/share/terminfo/w/wsiris
+#usr/share/terminfo/w/wsvt25
+#usr/share/terminfo/w/wsvt25m
+#usr/share/terminfo/w/wy-75ap
+#usr/share/terminfo/w/wy-99fgt
+#usr/share/terminfo/w/wy-99fgta
+#usr/share/terminfo/w/wy100
+#usr/share/terminfo/w/wy100q
+#usr/share/terminfo/w/wy120
+#usr/share/terminfo/w/wy120-25
+#usr/share/terminfo/w/wy120-25-w
+#usr/share/terminfo/w/wy120-vb
+#usr/share/terminfo/w/wy120-w
+#usr/share/terminfo/w/wy120-w-vb
+#usr/share/terminfo/w/wy120-wvb
+#usr/share/terminfo/w/wy150
+#usr/share/terminfo/w/wy150-25
+#usr/share/terminfo/w/wy150-25-w
+#usr/share/terminfo/w/wy150-vb
+#usr/share/terminfo/w/wy150-w
+#usr/share/terminfo/w/wy150-w-vb
+#usr/share/terminfo/w/wy160
+#usr/share/terminfo/w/wy160-25
+#usr/share/terminfo/w/wy160-25-w
+#usr/share/terminfo/w/wy160-42
+#usr/share/terminfo/w/wy160-42-w
+#usr/share/terminfo/w/wy160-43
+#usr/share/terminfo/w/wy160-43-w
+#usr/share/terminfo/w/wy160-tek
+#usr/share/terminfo/w/wy160-vb
+#usr/share/terminfo/w/wy160-w
+#usr/share/terminfo/w/wy160-w-vb
+#usr/share/terminfo/w/wy160-wvb
+#usr/share/terminfo/w/wy185
+#usr/share/terminfo/w/wy185-24
+#usr/share/terminfo/w/wy185-vb
+#usr/share/terminfo/w/wy185-w
+#usr/share/terminfo/w/wy185-wvb
+#usr/share/terminfo/w/wy30
+#usr/share/terminfo/w/wy30-mc
+#usr/share/terminfo/w/wy30-vb
+#usr/share/terminfo/w/wy325
+#usr/share/terminfo/w/wy325-25
+#usr/share/terminfo/w/wy325-25w
+#usr/share/terminfo/w/wy325-42
+#usr/share/terminfo/w/wy325-42w
+#usr/share/terminfo/w/wy325-42w-vb
+#usr/share/terminfo/w/wy325-42wvb
+#usr/share/terminfo/w/wy325-43
+#usr/share/terminfo/w/wy325-43w
+#usr/share/terminfo/w/wy325-43w-vb
+#usr/share/terminfo/w/wy325-43wvb
+#usr/share/terminfo/w/wy325-80
+#usr/share/terminfo/w/wy325-vb
+#usr/share/terminfo/w/wy325-w
+#usr/share/terminfo/w/wy325-w-vb
+#usr/share/terminfo/w/wy325-wvb
+#usr/share/terminfo/w/wy325w-24
+#usr/share/terminfo/w/wy350
+#usr/share/terminfo/w/wy350-vb
+#usr/share/terminfo/w/wy350-w
+#usr/share/terminfo/w/wy350-wvb
+#usr/share/terminfo/w/wy370
+#usr/share/terminfo/w/wy370-101k
+#usr/share/terminfo/w/wy370-105k
+#usr/share/terminfo/w/wy370-EPC
+#usr/share/terminfo/w/wy370-nk
+#usr/share/terminfo/w/wy370-rv
+#usr/share/terminfo/w/wy370-tek
+#usr/share/terminfo/w/wy370-vb
+#usr/share/terminfo/w/wy370-w
+#usr/share/terminfo/w/wy370-wvb
+#usr/share/terminfo/w/wy50
+#usr/share/terminfo/w/wy50-mc
+#usr/share/terminfo/w/wy50-vb
+#usr/share/terminfo/w/wy50-w
+#usr/share/terminfo/w/wy50-wvb
+#usr/share/terminfo/w/wy520
+#usr/share/terminfo/w/wy520-24
+#usr/share/terminfo/w/wy520-36
+#usr/share/terminfo/w/wy520-36pc
+#usr/share/terminfo/w/wy520-36w
+#usr/share/terminfo/w/wy520-36wpc
+#usr/share/terminfo/w/wy520-48
+#usr/share/terminfo/w/wy520-48pc
+#usr/share/terminfo/w/wy520-48w
+#usr/share/terminfo/w/wy520-48wpc
+#usr/share/terminfo/w/wy520-epc
+#usr/share/terminfo/w/wy520-epc-24
+#usr/share/terminfo/w/wy520-epc-vb
+#usr/share/terminfo/w/wy520-epc-w
+#usr/share/terminfo/w/wy520-epc-wvb
+#usr/share/terminfo/w/wy520-vb
+#usr/share/terminfo/w/wy520-w
+#usr/share/terminfo/w/wy520-wvb
+#usr/share/terminfo/w/wy60
+#usr/share/terminfo/w/wy60-25
+#usr/share/terminfo/w/wy60-25-w
+#usr/share/terminfo/w/wy60-316X
+#usr/share/terminfo/w/wy60-42
+#usr/share/terminfo/w/wy60-42-w
+#usr/share/terminfo/w/wy60-43
+#usr/share/terminfo/w/wy60-43-w
+#usr/share/terminfo/w/wy60-AT
+#usr/share/terminfo/w/wy60-PC
+#usr/share/terminfo/w/wy60-vb
+#usr/share/terminfo/w/wy60-w
+#usr/share/terminfo/w/wy60-w-vb
+#usr/share/terminfo/w/wy60-wvb
+#usr/share/terminfo/w/wy75
+#usr/share/terminfo/w/wy75-mc
+#usr/share/terminfo/w/wy75-vb
+#usr/share/terminfo/w/wy75-w
+#usr/share/terminfo/w/wy75-wvb
+#usr/share/terminfo/w/wy75ap
+#usr/share/terminfo/w/wy85
+#usr/share/terminfo/w/wy85-8bit
+#usr/share/terminfo/w/wy85-vb
+#usr/share/terminfo/w/wy85-w
+#usr/share/terminfo/w/wy85-wvb
+#usr/share/terminfo/w/wy99-ansi
+#usr/share/terminfo/w/wy99a-ansi
+#usr/share/terminfo/w/wy99f
+#usr/share/terminfo/w/wy99fa
+#usr/share/terminfo/w/wy99fgt
+#usr/share/terminfo/w/wy99fgta
+#usr/share/terminfo/w/wy99gt
+#usr/share/terminfo/w/wy99gt-25
+#usr/share/terminfo/w/wy99gt-25-w
+#usr/share/terminfo/w/wy99gt-tek
+#usr/share/terminfo/w/wy99gt-vb
+#usr/share/terminfo/w/wy99gt-w
+#usr/share/terminfo/w/wy99gt-w-vb
+#usr/share/terminfo/w/wy99gt-wvb
+#usr/share/terminfo/w/wyse-325
+#usr/share/terminfo/w/wyse-75ap
+#usr/share/terminfo/w/wyse-vp
+#usr/share/terminfo/w/wyse120
+#usr/share/terminfo/w/wyse120-25
+#usr/share/terminfo/w/wyse120-25-w
+#usr/share/terminfo/w/wyse120-vb
+#usr/share/terminfo/w/wyse120-w
+#usr/share/terminfo/w/wyse120-wvb
+#usr/share/terminfo/w/wyse150
+#usr/share/terminfo/w/wyse150-25
+#usr/share/terminfo/w/wyse150-25-w
+#usr/share/terminfo/w/wyse150-vb
+#usr/share/terminfo/w/wyse150-w
+#usr/share/terminfo/w/wyse150-w-vb
+#usr/share/terminfo/w/wyse160
+#usr/share/terminfo/w/wyse160-25
+#usr/share/terminfo/w/wyse160-25-w
+#usr/share/terminfo/w/wyse160-42
+#usr/share/terminfo/w/wyse160-42-w
+#usr/share/terminfo/w/wyse160-43
+#usr/share/terminfo/w/wyse160-43-w
+#usr/share/terminfo/w/wyse160-vb
+#usr/share/terminfo/w/wyse160-w
+#usr/share/terminfo/w/wyse160-wvb
+#usr/share/terminfo/w/wyse185
+#usr/share/terminfo/w/wyse185-24
+#usr/share/terminfo/w/wyse185-vb
+#usr/share/terminfo/w/wyse185-w
+#usr/share/terminfo/w/wyse185-wvb
+#usr/share/terminfo/w/wyse30
+#usr/share/terminfo/w/wyse30-mc
+#usr/share/terminfo/w/wyse30-vb
+#usr/share/terminfo/w/wyse325
+#usr/share/terminfo/w/wyse325-25
+#usr/share/terminfo/w/wyse325-25w
+#usr/share/terminfo/w/wyse325-42
+#usr/share/terminfo/w/wyse325-42w
+#usr/share/terminfo/w/wyse325-43
+#usr/share/terminfo/w/wyse325-43w
+#usr/share/terminfo/w/wyse325-vb
+#usr/share/terminfo/w/wyse325-w
+#usr/share/terminfo/w/wyse325-wvb
+#usr/share/terminfo/w/wyse350
+#usr/share/terminfo/w/wyse350-vb
+#usr/share/terminfo/w/wyse350-w
+#usr/share/terminfo/w/wyse350-wvb
+#usr/share/terminfo/w/wyse370
+#usr/share/terminfo/w/wyse50
+#usr/share/terminfo/w/wyse50-mc
+#usr/share/terminfo/w/wyse50-vb
+#usr/share/terminfo/w/wyse50-w
+#usr/share/terminfo/w/wyse50-wvb
+#usr/share/terminfo/w/wyse520
+#usr/share/terminfo/w/wyse520-24
+#usr/share/terminfo/w/wyse520-36
+#usr/share/terminfo/w/wyse520-36pc
+#usr/share/terminfo/w/wyse520-36w
+#usr/share/terminfo/w/wyse520-36wpc
+#usr/share/terminfo/w/wyse520-48
+#usr/share/terminfo/w/wyse520-48pc
+#usr/share/terminfo/w/wyse520-48w
+#usr/share/terminfo/w/wyse520-48wpc
+#usr/share/terminfo/w/wyse520-epc
+#usr/share/terminfo/w/wyse520-epc-w
+#usr/share/terminfo/w/wyse520-p-wvb
+#usr/share/terminfo/w/wyse520-pc-24
+#usr/share/terminfo/w/wyse520-pc-vb
+#usr/share/terminfo/w/wyse520-vb
+#usr/share/terminfo/w/wyse520-w
+#usr/share/terminfo/w/wyse520-wvb
+#usr/share/terminfo/w/wyse60
+#usr/share/terminfo/w/wyse60-25
+#usr/share/terminfo/w/wyse60-25-w
+#usr/share/terminfo/w/wyse60-316X
+#usr/share/terminfo/w/wyse60-42
+#usr/share/terminfo/w/wyse60-42-w
+#usr/share/terminfo/w/wyse60-43
+#usr/share/terminfo/w/wyse60-43-w
+#usr/share/terminfo/w/wyse60-AT
+#usr/share/terminfo/w/wyse60-PC
+#usr/share/terminfo/w/wyse60-vb
+#usr/share/terminfo/w/wyse60-w
+#usr/share/terminfo/w/wyse60-wvb
+#usr/share/terminfo/w/wyse75
+#usr/share/terminfo/w/wyse75-mc
+#usr/share/terminfo/w/wyse75-vb
+#usr/share/terminfo/w/wyse75-w
+#usr/share/terminfo/w/wyse75-wvb
+#usr/share/terminfo/w/wyse75ap
+#usr/share/terminfo/w/wyse85
+#usr/share/terminfo/w/wyse85-8bit
+#usr/share/terminfo/w/wyse85-vb
+#usr/share/terminfo/w/wyse85-w
+#usr/share/terminfo/w/wyse85-wvb
+#usr/share/terminfo/w/wyse99gt
+#usr/share/terminfo/w/wyse99gt-25
+#usr/share/terminfo/w/wyse99gt-25-w
+#usr/share/terminfo/w/wyse99gt-vb
+#usr/share/terminfo/w/wyse99gt-w
+#usr/share/terminfo/w/wyse99gt-wvb
+#usr/share/terminfo/x
+#usr/share/terminfo/x/x10term
+#usr/share/terminfo/x/x1700
+#usr/share/terminfo/x/x1700-lm
+#usr/share/terminfo/x/x1720
+#usr/share/terminfo/x/x1750
+#usr/share/terminfo/x/x68k
+#usr/share/terminfo/x/x68k-ite
+#usr/share/terminfo/x/x820
+#usr/share/terminfo/x/xdku
+#usr/share/terminfo/x/xenix
+#usr/share/terminfo/x/xerox
+#usr/share/terminfo/x/xerox-lm
+#usr/share/terminfo/x/xerox1720
+#usr/share/terminfo/x/xerox820
+#usr/share/terminfo/x/xfce
+#usr/share/terminfo/x/xiterm
+#usr/share/terminfo/x/xl83
+#usr/share/terminfo/x/xnuppc
+#usr/share/terminfo/x/xnuppc+100x37
+#usr/share/terminfo/x/xnuppc+112x37
+#usr/share/terminfo/x/xnuppc+128x40
+#usr/share/terminfo/x/xnuppc+128x48
+#usr/share/terminfo/x/xnuppc+144x48
+#usr/share/terminfo/x/xnuppc+160x64
+#usr/share/terminfo/x/xnuppc+200x64
+#usr/share/terminfo/x/xnuppc+200x75
+#usr/share/terminfo/x/xnuppc+256x96
+#usr/share/terminfo/x/xnuppc+80x25
+#usr/share/terminfo/x/xnuppc+80x30
+#usr/share/terminfo/x/xnuppc+90x30
+#usr/share/terminfo/x/xnuppc+b
+#usr/share/terminfo/x/xnuppc+basic
+#usr/share/terminfo/x/xnuppc+c
+#usr/share/terminfo/x/xnuppc+f
+#usr/share/terminfo/x/xnuppc+f2
+#usr/share/terminfo/x/xnuppc-100x37
+#usr/share/terminfo/x/xnuppc-100x37-m
+#usr/share/terminfo/x/xnuppc-112x37
+#usr/share/terminfo/x/xnuppc-112x37-m
+#usr/share/terminfo/x/xnuppc-128x40
+#usr/share/terminfo/x/xnuppc-128x40-m
+#usr/share/terminfo/x/xnuppc-128x48
+#usr/share/terminfo/x/xnuppc-128x48-m
+#usr/share/terminfo/x/xnuppc-144x48
+#usr/share/terminfo/x/xnuppc-144x48-m
+#usr/share/terminfo/x/xnuppc-160x64
+#usr/share/terminfo/x/xnuppc-160x64-m
+#usr/share/terminfo/x/xnuppc-200x64
+#usr/share/terminfo/x/xnuppc-200x64-m
+#usr/share/terminfo/x/xnuppc-200x75
+#usr/share/terminfo/x/xnuppc-200x75-m
+#usr/share/terminfo/x/xnuppc-256x96
+#usr/share/terminfo/x/xnuppc-256x96-m
+#usr/share/terminfo/x/xnuppc-80x25
+#usr/share/terminfo/x/xnuppc-80x25-m
+#usr/share/terminfo/x/xnuppc-80x30
+#usr/share/terminfo/x/xnuppc-80x30-m
+#usr/share/terminfo/x/xnuppc-90x30
+#usr/share/terminfo/x/xnuppc-90x30-m
+#usr/share/terminfo/x/xnuppc-b
+#usr/share/terminfo/x/xnuppc-f
+#usr/share/terminfo/x/xnuppc-f2
+#usr/share/terminfo/x/xnuppc-m
+#usr/share/terminfo/x/xnuppc-m-b
+#usr/share/terminfo/x/xnuppc-m-f
+#usr/share/terminfo/x/xnuppc-m-f2
+#usr/share/terminfo/x/xtalk
+#usr/share/terminfo/x/xterm
+#usr/share/terminfo/x/xterm+256color
+#usr/share/terminfo/x/xterm+88color
+#usr/share/terminfo/x/xterm+app
+#usr/share/terminfo/x/xterm+edit
+#usr/share/terminfo/x/xterm+noapp
+#usr/share/terminfo/x/xterm+pc+edit
+#usr/share/terminfo/x/xterm+pcc0
+#usr/share/terminfo/x/xterm+pcc1
+#usr/share/terminfo/x/xterm+pcc2
+#usr/share/terminfo/x/xterm+pcc3
+#usr/share/terminfo/x/xterm+pce2
+#usr/share/terminfo/x/xterm+pcf0
+#usr/share/terminfo/x/xterm+pcf2
+#usr/share/terminfo/x/xterm+pcfkeys
+#usr/share/terminfo/x/xterm+r6f2
+#usr/share/terminfo/x/xterm+sl
+#usr/share/terminfo/x/xterm+sl-twm
+#usr/share/terminfo/x/xterm+vt+edit
+#usr/share/terminfo/x/xterm-1002
+#usr/share/terminfo/x/xterm-1003
+#usr/share/terminfo/x/xterm-16color
+#usr/share/terminfo/x/xterm-24
+#usr/share/terminfo/x/xterm-256color
+#usr/share/terminfo/x/xterm-88color
+#usr/share/terminfo/x/xterm-8bit
+#usr/share/terminfo/x/xterm-basic
+#usr/share/terminfo/x/xterm-bold
+#usr/share/terminfo/x/xterm-color
+#usr/share/terminfo/x/xterm-hp
+#usr/share/terminfo/x/xterm-new
+#usr/share/terminfo/x/xterm-nic
+#usr/share/terminfo/x/xterm-noapp
+#usr/share/terminfo/x/xterm-old
+#usr/share/terminfo/x/xterm-pcolor
+#usr/share/terminfo/x/xterm-r5
+#usr/share/terminfo/x/xterm-r6
+#usr/share/terminfo/x/xterm-sco
+#usr/share/terminfo/x/xterm-sun
+#usr/share/terminfo/x/xterm-utf8
+#usr/share/terminfo/x/xterm-vt220
+#usr/share/terminfo/x/xterm-vt52
+#usr/share/terminfo/x/xterm-xf86-v32
+#usr/share/terminfo/x/xterm-xf86-v33
+#usr/share/terminfo/x/xterm-xf86-v333
+#usr/share/terminfo/x/xterm-xf86-v40
+#usr/share/terminfo/x/xterm-xf86-v43
+#usr/share/terminfo/x/xterm-xf86-v44
+#usr/share/terminfo/x/xterm-xfree86
+#usr/share/terminfo/x/xterm-xi
+#usr/share/terminfo/x/xterm1
+#usr/share/terminfo/x/xtermc
+#usr/share/terminfo/x/xtermm
+#usr/share/terminfo/x/xterms
+#usr/share/terminfo/x/xterms-sun
+#usr/share/terminfo/x/xwsh
+#usr/share/terminfo/z
+#usr/share/terminfo/z/z-100
+#usr/share/terminfo/z/z-100bw
+#usr/share/terminfo/z/z100
+#usr/share/terminfo/z/z100bw
+#usr/share/terminfo/z/z110
+#usr/share/terminfo/z/z110bw
+#usr/share/terminfo/z/z19
+#usr/share/terminfo/z/z29
+#usr/share/terminfo/z/z29a
+#usr/share/terminfo/z/z29a-kc-bc
+#usr/share/terminfo/z/z29a-kc-uc
+#usr/share/terminfo/z/z29a-nkc-bc
+#usr/share/terminfo/z/z29a-nkc-uc
+#usr/share/terminfo/z/z29b
+#usr/share/terminfo/z/z30
+#usr/share/terminfo/z/z340
+#usr/share/terminfo/z/z340-nam
+#usr/share/terminfo/z/z39-a
+#usr/share/terminfo/z/z39a
+#usr/share/terminfo/z/z50
+#usr/share/terminfo/z/z8001
+#usr/share/terminfo/z/zen30
+#usr/share/terminfo/z/zen50
+#usr/share/terminfo/z/zen8001
+#usr/share/terminfo/z/zenith
+#usr/share/terminfo/z/zenith29
+#usr/share/terminfo/z/zenith39-a
+#usr/share/terminfo/z/zenith39-ansi
+#usr/share/terminfo/z/zt-1
+#usr/share/terminfo/z/ztx
+#usr/share/terminfo/z/ztx-1-a
+#usr/share/terminfo/z/ztx11
diff --git a/config/rootfiles/common/newt b/config/rootfiles/common/newt
index adc9b7581..9505c3626 100644
--- a/config/rootfiles/common/newt
+++ b/config/rootfiles/common/newt
@@ -13,6 +13,8 @@ usr/lib/libnewt.so.0.52.18
 #usr/share/locale/as
 #usr/share/locale/as/LC_MESSAGES
 #usr/share/locale/as/LC_MESSAGES/newt.mo
+#usr/share/locale/ast
+#usr/share/locale/ast/LC_MESSAGES
 #usr/share/locale/ast/LC_MESSAGES/newt.mo
 #usr/share/locale/bal
 #usr/share/locale/bal/LC_MESSAGES
@@ -100,6 +102,8 @@ usr/lib/libnewt.so.0.52.18
 #usr/share/locale/nn
 #usr/share/locale/nn/LC_MESSAGES
 #usr/share/locale/nn/LC_MESSAGES/newt.mo
+#usr/share/locale/pa
+#usr/share/locale/pa/LC_MESSAGES
 #usr/share/locale/pa/LC_MESSAGES/newt.mo
 #usr/share/locale/pl/LC_MESSAGES/newt.mo
 #usr/share/locale/pt/LC_MESSAGES/newt.mo
diff --git a/config/rootfiles/common/shadow b/config/rootfiles/common/shadow
index ec9054efe..0b0c83f57 100644
--- a/config/rootfiles/common/shadow
+++ b/config/rootfiles/common/shadow
@@ -1,17 +1,16 @@
-bin/groups
 bin/login
 bin/passwd
 bin/su
 #etc/.pwd.lock
 #etc/default
+#etc/default/useradd
 etc/limits
 etc/login.access
 etc/login.defs
 #etc/passwd-
 etc/shadow
 #etc/shadow-
-lib/libshadow.so.0
-lib/libshadow.so.0.0.0
+sbin/nologin
 #usr/bin/chage
 #usr/bin/chfn
 #usr/bin/chsh
@@ -19,64 +18,22 @@ lib/libshadow.so.0.0.0
 #usr/bin/faillog
 #usr/bin/gpasswd
 #usr/bin/lastlog
+#usr/bin/newgidmap
 #usr/bin/newgrp
+#usr/bin/newuidmap
 #usr/bin/sg
-#usr/lib/libshadow.a
-#usr/lib/libshadow.la
 #usr/lib/libshadow.so
-#usr/man/man1/chage.1
-#usr/man/man1/chfn.1
-#usr/man/man1/chsh.1
-#usr/man/man1/expiry.1
-#usr/man/man1/gpasswd.1
-#usr/man/man1/login.1
-#usr/man/man1/newgrp.1
-#usr/man/man1/passwd.1
-#usr/man/man1/sg.1
-#usr/man/man1/su.1
-#usr/man/man3/getspnam.3
-#usr/man/man3/shadow.3
-#usr/man/man5/faillog.5
-#usr/man/man5/gshadow.5
-#usr/man/man5/limits.5
-#usr/man/man5/login.access.5
-#usr/man/man5/login.defs.5
-#usr/man/man5/passwd.5
-#usr/man/man5/porttime.5
-#usr/man/man5/shadow.5
-#usr/man/man5/suauth.5
-#usr/man/man8
-#usr/man/man8/chpasswd.8
-#usr/man/man8/faillog.8
-#usr/man/man8/groupadd.8
-#usr/man/man8/groupdel.8
-#usr/man/man8/groupmod.8
-#usr/man/man8/grpck.8
-#usr/man/man8/grpconv.8
-#usr/man/man8/grpunconv.8
-#usr/man/man8/lastlog.8
-#usr/man/man8/logoutd.8
-#usr/man/man8/newusers.8
-#usr/man/man8/nologin.8
-#usr/man/man8/pwck.8
-#usr/man/man8/pwconv.8
-#usr/man/man8/pwunconv.8
-#usr/man/man8/useradd.8
-#usr/man/man8/userdel.8
-#usr/man/man8/usermod.8
-#usr/man/man8/vigr.8
-#usr/man/man8/vipw.8
 #usr/sbin/chgpasswd
 usr/sbin/chpasswd
 usr/sbin/groupadd
 usr/sbin/groupdel
+usr/sbin/groupmems
 usr/sbin/groupmod
 #usr/sbin/grpck
 usr/sbin/grpconv
 #usr/sbin/grpunconv
 #usr/sbin/logoutd
 #usr/sbin/newusers
-#usr/sbin/nologin
 #usr/sbin/pwck
 usr/sbin/pwconv
 #usr/sbin/pwunconv
@@ -85,3 +42,48 @@ usr/sbin/userdel
 usr/sbin/usermod
 #usr/sbin/vigr
 #usr/sbin/vipw
+#usr/share/man/man1/chage.1
+#usr/share/man/man1/chfn.1
+#usr/share/man/man1/chsh.1
+#usr/share/man/man1/expiry.1
+#usr/share/man/man1/gpasswd.1
+#usr/share/man/man1/login.1
+#usr/share/man/man1/newgidmap.1
+#usr/share/man/man1/newgrp.1
+#usr/share/man/man1/newuidmap.1
+#usr/share/man/man1/passwd.1
+#usr/share/man/man1/sg.1
+#usr/share/man/man1/su.1
+#usr/share/man/man3/shadow.3
+#usr/share/man/man5/faillog.5
+#usr/share/man/man5/gshadow.5
+#usr/share/man/man5/limits.5
+#usr/share/man/man5/login.access.5
+#usr/share/man/man5/login.defs.5
+#usr/share/man/man5/porttime.5
+#usr/share/man/man5/shadow.5
+#usr/share/man/man5/suauth.5
+#usr/share/man/man5/subgid.5
+#usr/share/man/man5/subuid.5
+#usr/share/man/man8/chgpasswd.8
+#usr/share/man/man8/chpasswd.8
+#usr/share/man/man8/faillog.8
+#usr/share/man/man8/groupadd.8
+#usr/share/man/man8/groupdel.8
+#usr/share/man/man8/groupmems.8
+#usr/share/man/man8/groupmod.8
+#usr/share/man/man8/grpck.8
+#usr/share/man/man8/grpconv.8
+#usr/share/man/man8/grpunconv.8
+#usr/share/man/man8/lastlog.8
+#usr/share/man/man8/logoutd.8
+#usr/share/man/man8/newusers.8
+#usr/share/man/man8/nologin.8
+#usr/share/man/man8/pwck.8
+#usr/share/man/man8/pwconv.8
+#usr/share/man/man8/pwunconv.8
+#usr/share/man/man8/useradd.8
+#usr/share/man/man8/userdel.8
+#usr/share/man/man8/usermod.8
+#usr/share/man/man8/vigr.8
+#usr/share/man/man8/vipw.8
diff --git a/config/rootfiles/common/udev b/config/rootfiles/common/udev
index 4d519544d..e1f4bd5fb 100644
--- a/config/rootfiles/common/udev
+++ b/config/rootfiles/common/udev
@@ -28,6 +28,7 @@ lib/udev
 #lib/udev/hwdb.d/60-keyboard.hwdb
 #lib/udev/init-net-rules.sh
 #lib/udev/mtd_probe
+#lib/udev/network-hotplug-macvtap
 #lib/udev/network-hotplug-rename
 #lib/udev/network-hotplug-vlan
 #lib/udev/rule_generator.functions
diff --git a/config/rootfiles/common/util-macros b/config/rootfiles/common/util-macros
new file mode 100644
index 000000000..1858667b3
--- /dev/null
+++ b/config/rootfiles/common/util-macros
@@ -0,0 +1,4 @@
+#usr/share/aclocal/xorg-macros.m4
+#usr/share/pkgconfig/xorg-macros.pc
+#usr/share/util-macros
+#usr/share/util-macros/INSTALL
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index f1024a238..43a8e90fb 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -46,6 +46,8 @@ etc/rc.d/init.d/ipsec
 #etc/rc.d/init.d/lcdproc
 #etc/rc.d/init.d/lcr
 etc/rc.d/init.d/leds
+#etc/rc.d/init.d/libvirt-guests
+#etc/rc.d/init.d/libvirtd
 etc/rc.d/init.d/localnet
 etc/rc.d/init.d/mISDN
 #etc/rc.d/init.d/mediatomb
diff --git a/config/rootfiles/core/103/exclude b/config/rootfiles/core/104/exclude
similarity index 100%
rename from config/rootfiles/core/103/exclude
rename to config/rootfiles/core/104/exclude
diff --git a/config/rootfiles/core/103/filelists/files b/config/rootfiles/core/104/filelists/files
similarity index 50%
rename from config/rootfiles/core/103/filelists/files
rename to config/rootfiles/core/104/filelists/files
index 409e5fe8a..2fbdb5d1c 100644
--- a/config/rootfiles/core/103/filelists/files
+++ b/config/rootfiles/core/104/filelists/files
@@ -1,2 +1,3 @@
 etc/system-release
 etc/issue
+opt/pakfire/lib/functions.sh
diff --git a/config/rootfiles/core/104/filelists/ntp b/config/rootfiles/core/104/filelists/ntp
new file mode 120000
index 000000000..7542d86cb
--- /dev/null
+++ b/config/rootfiles/core/104/filelists/ntp
@@ -0,0 +1 @@
+../../../common/ntp
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/shadow b/config/rootfiles/core/104/filelists/shadow
new file mode 120000
index 000000000..c0824b7b9
--- /dev/null
+++ b/config/rootfiles/core/104/filelists/shadow
@@ -0,0 +1 @@
+../../../common/shadow
\ No newline at end of file
diff --git a/config/rootfiles/core/104/filelists/wget b/config/rootfiles/core/104/filelists/wget
new file mode 120000
index 000000000..fcb57dfec
--- /dev/null
+++ b/config/rootfiles/core/104/filelists/wget
@@ -0,0 +1 @@
+../../../common/wget
\ No newline at end of file
diff --git a/config/rootfiles/core/103/meta b/config/rootfiles/core/104/meta
similarity index 100%
rename from config/rootfiles/core/103/meta
rename to config/rootfiles/core/104/meta
diff --git a/config/rootfiles/core/103/update.sh b/config/rootfiles/core/104/update.sh
similarity index 94%
rename from config/rootfiles/core/103/update.sh
rename to config/rootfiles/core/104/update.sh
index 65a85a207..c21247b8a 100644
--- a/config/rootfiles/core/103/update.sh
+++ b/config/rootfiles/core/104/update.sh
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 
-core=103
+core=104
 
 function exit_with_error() {
 	# Set last succesfull installed core.
@@ -40,16 +40,14 @@ do
 	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
 
-
 # Stop services
 
-# Remove checkfstab
-rm -f /etc/rc.d/init.d/checkfstab
-rm -f /etc/rc.d/rcsysinit.d/S19checkfstab
-
 # Extract files
 extract_files
 
+# Remove some old files
+rm -f /bin/groups /lib/libshadow.so.0*
+
 # update linker config
 ldconfig
 
@@ -57,11 +55,10 @@ ldconfig
 #/usr/local/bin/update-lang-cache
 
 # Start services
-/etc/init.d/dnsmasq restart
 
-sync
 # This update need a reboot...
 touch /var/run/need_reboot
+sync
 
 # Finish
 /etc/init.d/fireinfo start
diff --git a/config/rootfiles/oldcore/103/exclude b/config/rootfiles/oldcore/103/exclude
new file mode 100644
index 000000000..7ddeae0ba
--- /dev/null
+++ b/config/rootfiles/oldcore/103/exclude
@@ -0,0 +1,28 @@
+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/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/oldcore/103/filelists/coreutils b/config/rootfiles/oldcore/103/filelists/coreutils
new file mode 120000
index 000000000..7351ed2cf
--- /dev/null
+++ b/config/rootfiles/oldcore/103/filelists/coreutils
@@ -0,0 +1 @@
+../../../common/coreutils
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/103/filelists/curl b/config/rootfiles/oldcore/103/filelists/curl
new file mode 120000
index 000000000..4b84bef53
--- /dev/null
+++ b/config/rootfiles/oldcore/103/filelists/curl
@@ -0,0 +1 @@
+../../../common/curl
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/103/filelists/diffutils b/config/rootfiles/oldcore/103/filelists/diffutils
new file mode 120000
index 000000000..a5c02f3ff
--- /dev/null
+++ b/config/rootfiles/oldcore/103/filelists/diffutils
@@ -0,0 +1 @@
+../../../common/diffutils
\ No newline at end of file
diff --git a/config/rootfiles/core/103/filelists/dnsmasq b/config/rootfiles/oldcore/103/filelists/dnsmasq
similarity index 100%
rename from config/rootfiles/core/103/filelists/dnsmasq
rename to config/rootfiles/oldcore/103/filelists/dnsmasq
diff --git a/config/rootfiles/oldcore/103/filelists/files b/config/rootfiles/oldcore/103/filelists/files
new file mode 100644
index 000000000..2294a5ee5
--- /dev/null
+++ b/config/rootfiles/oldcore/103/filelists/files
@@ -0,0 +1,9 @@
+etc/system-release
+etc/issue
+lib/udev/network-hotplug-macvtap
+lib/udev/network-hotplug-rename
+lib/udev/rules.d/60-net.rules
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat
+usr/sbin/setup
+var/ipfire/general-functions.pl
+var/ipfire/menu.d/30-network.menu
diff --git a/config/rootfiles/oldcore/103/filelists/findutils b/config/rootfiles/oldcore/103/filelists/findutils
new file mode 120000
index 000000000..545280ac5
--- /dev/null
+++ b/config/rootfiles/oldcore/103/filelists/findutils
@@ -0,0 +1 @@
+../../../common/findutils
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/103/filelists/gawk b/config/rootfiles/oldcore/103/filelists/gawk
new file mode 120000
index 000000000..a3bbe32ce
--- /dev/null
+++ b/config/rootfiles/oldcore/103/filelists/gawk
@@ -0,0 +1 @@
+../../../common/gawk
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/103/filelists/gettext b/config/rootfiles/oldcore/103/filelists/gettext
new file mode 120000
index 000000000..b6c6c6f4f
--- /dev/null
+++ b/config/rootfiles/oldcore/103/filelists/gettext
@@ -0,0 +1 @@
+../../../common/gettext
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/103/filelists/grep b/config/rootfiles/oldcore/103/filelists/grep
new file mode 120000
index 000000000..ab5ef8b0e
--- /dev/null
+++ b/config/rootfiles/oldcore/103/filelists/grep
@@ -0,0 +1 @@
+../../../common/grep
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/103/filelists/less b/config/rootfiles/oldcore/103/filelists/less
new file mode 120000
index 000000000..65c0e0771
--- /dev/null
+++ b/config/rootfiles/oldcore/103/filelists/less
@@ -0,0 +1 @@
+../../../common/less
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/103/filelists/ncurses b/config/rootfiles/oldcore/103/filelists/ncurses
new file mode 120000
index 000000000..512faef6a
--- /dev/null
+++ b/config/rootfiles/oldcore/103/filelists/ncurses
@@ -0,0 +1 @@
+../../../common/ncurses
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/103/filelists/ncurses-compat b/config/rootfiles/oldcore/103/filelists/ncurses-compat
new file mode 120000
index 000000000..5ecff5330
--- /dev/null
+++ b/config/rootfiles/oldcore/103/filelists/ncurses-compat
@@ -0,0 +1 @@
+../../../common/ncurses-compat
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/103/filelists/procps b/config/rootfiles/oldcore/103/filelists/procps
new file mode 120000
index 000000000..e17e8ed70
--- /dev/null
+++ b/config/rootfiles/oldcore/103/filelists/procps
@@ -0,0 +1 @@
+../../../common/procps
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/103/filelists/sdparm b/config/rootfiles/oldcore/103/filelists/sdparm
new file mode 120000
index 000000000..86d9c247f
--- /dev/null
+++ b/config/rootfiles/oldcore/103/filelists/sdparm
@@ -0,0 +1 @@
+../../../common/sdparm
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/103/filelists/squid b/config/rootfiles/oldcore/103/filelists/squid
new file mode 120000
index 000000000..2dc8372a0
--- /dev/null
+++ b/config/rootfiles/oldcore/103/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/103/filelists/tzdata b/config/rootfiles/oldcore/103/filelists/tzdata
new file mode 120000
index 000000000..5a6e3252f
--- /dev/null
+++ b/config/rootfiles/oldcore/103/filelists/tzdata
@@ -0,0 +1 @@
+../../../common/tzdata
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/103/filelists/wpa_supplicant b/config/rootfiles/oldcore/103/filelists/wpa_supplicant
new file mode 120000
index 000000000..1d04c03c0
--- /dev/null
+++ b/config/rootfiles/oldcore/103/filelists/wpa_supplicant
@@ -0,0 +1 @@
+../../../common/wpa_supplicant
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/103/meta b/config/rootfiles/oldcore/103/meta
new file mode 100644
index 000000000..d547fa86f
--- /dev/null
+++ b/config/rootfiles/oldcore/103/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/103/update.sh b/config/rootfiles/oldcore/103/update.sh
new file mode 100644
index 000000000..3f45eaa91
--- /dev/null
+++ b/config/rootfiles/oldcore/103/update.sh
@@ -0,0 +1,82 @@
+#!/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) 2016 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=103
+
+function exit_with_error() {
+	# Set last succesfull installed core.
+	echo $(($core-1)) > /opt/pakfire/db/core/mine
+	/usr/bin/logger -p syslog.emerg -t ipfire \
+		"core-update-${core}: $1"
+	exit $2
+}
+
+# Remove old core updates from pakfire cache to save space...
+for (( i=1; i<=$core; i++ ))
+do
+	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+
+# Stop services
+/etc/init.d/squid stop
+
+# Remove checkfstab
+rm -f /etc/rc.d/init.d/checkfstab
+rm -f /etc/rc.d/rcsysinit.d/S19checkfstab
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# Update Language cache
+#/usr/local/bin/update-lang-cache
+
+# Remove potentially broken squid cache index (will be recreated after the next start)
+rm -f /var/log/cache/swap.state
+
+# Start services
+/etc/init.d/dnsmasq restart
+/etc/init.d/squid start
+
+sync
+# 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
diff --git a/config/rootfiles/packages/igmpproxy b/config/rootfiles/packages/igmpproxy
index 1b3452140..f857d2bc4 100644
--- a/config/rootfiles/packages/igmpproxy
+++ b/config/rootfiles/packages/igmpproxy
@@ -1,5 +1,5 @@
 etc/igmpproxy.conf
-usr/local/sbin/igmpproxy
-#usr/local/share/man/man5/igmpproxy.conf.5
-#usr/local/share/man/man8/igmpproxy.8
+usr/sbin/igmpproxy
+#usr/share/man/man5/igmpproxy.conf.5
+#usr/share/man/man8/igmpproxy.8
 var/ipfire/backup/addons/includes/igmpproxy
diff --git a/config/rootfiles/packages/libpciaccess b/config/rootfiles/packages/libpciaccess
new file mode 100644
index 000000000..d4a3c419e
--- /dev/null
+++ b/config/rootfiles/packages/libpciaccess
@@ -0,0 +1,7 @@
+#usr/include/pciaccess.h
+#usr/lib/libpciaccess.a
+#usr/lib/libpciaccess.la
+#usr/lib/libpciaccess.so
+usr/lib/libpciaccess.so.0
+usr/lib/libpciaccess.so.0.11.1
+#usr/lib/pkgconfig/pciaccess.pc
diff --git a/config/rootfiles/packages/libvirt b/config/rootfiles/packages/libvirt
new file mode 100644
index 000000000..aa20aaa62
--- /dev/null
+++ b/config/rootfiles/packages/libvirt
@@ -0,0 +1,287 @@
+#etc/libvirt
+etc/libvirt/libvirt.conf
+etc/libvirt/libvirtd.conf
+#etc/libvirt/nwfilter
+#etc/libvirt/nwfilter/allow-arp.xml
+#etc/libvirt/nwfilter/allow-dhcp-server.xml
+#etc/libvirt/nwfilter/allow-dhcp.xml
+#etc/libvirt/nwfilter/allow-incoming-ipv4.xml
+#etc/libvirt/nwfilter/allow-ipv4.xml
+#etc/libvirt/nwfilter/clean-traffic.xml
+#etc/libvirt/nwfilter/no-arp-ip-spoofing.xml
+#etc/libvirt/nwfilter/no-arp-mac-spoofing.xml
+#etc/libvirt/nwfilter/no-arp-spoofing.xml
+#etc/libvirt/nwfilter/no-ip-multicast.xml
+#etc/libvirt/nwfilter/no-ip-spoofing.xml
+#etc/libvirt/nwfilter/no-mac-broadcast.xml
+#etc/libvirt/nwfilter/no-mac-spoofing.xml
+#etc/libvirt/nwfilter/no-other-l2-traffic.xml
+#etc/libvirt/nwfilter/no-other-rarp-traffic.xml
+#etc/libvirt/nwfilter/qemu-announce-self-rarp.xml
+#etc/libvirt/nwfilter/qemu-announce-self.xml
+etc/libvirt/qemu-lockd.conf
+etc/libvirt/qemu.conf
+etc/libvirt/virtlockd.conf
+etc/logrotate.d/libvirtd
+etc/logrotate.d/libvirtd.libxl
+#etc/logrotate.d/libvirtd.lxc
+etc/logrotate.d/libvirtd.qemu
+#etc/logrotate.d/libvirtd.uml
+etc/rc.d/init.d/libvirt-guests
+etc/rc.d/init.d/libvirtd
+usr/bin/virsh
+usr/bin/virt-host-validate
+usr/bin/virt-pki-validate
+usr/bin/virt-xml-validate
+#usr/include/libvirt
+#usr/include/libvirt/libvirt-domain-snapshot.h
+#usr/include/libvirt/libvirt-domain.h
+#usr/include/libvirt/libvirt-event.h
+#usr/include/libvirt/libvirt-host.h
+#usr/include/libvirt/libvirt-interface.h
+#usr/include/libvirt/libvirt-lxc.h
+#usr/include/libvirt/libvirt-network.h
+#usr/include/libvirt/libvirt-nodedev.h
+#usr/include/libvirt/libvirt-nwfilter.h
+#usr/include/libvirt/libvirt-qemu.h
+#usr/include/libvirt/libvirt-secret.h
+#usr/include/libvirt/libvirt-storage.h
+#usr/include/libvirt/libvirt-stream.h
+#usr/include/libvirt/libvirt.h
+#usr/include/libvirt/virterror.h
+#usr/lib/libvirt
+#usr/lib/libvirt-admin.la
+#usr/lib/libvirt-admin.so
+usr/lib/libvirt-admin.so.0
+usr/lib/libvirt-admin.so.0.1002.18
+#usr/lib/libvirt-lxc.la
+#usr/lib/libvirt-lxc.so
+usr/lib/libvirt-lxc.so.0
+usr/lib/libvirt-lxc.so.0.1002.18
+#usr/lib/libvirt-qemu.la
+#usr/lib/libvirt-qemu.so
+usr/lib/libvirt-qemu.so.0
+usr/lib/libvirt-qemu.so.0.1002.18
+#usr/lib/libvirt.la
+#usr/lib/libvirt.so
+usr/lib/libvirt.so.0
+usr/lib/libvirt.so.0.1002.18
+#usr/lib/libvirt/connection-driver
+#usr/lib/libvirt/connection-driver/libvirt_driver_interface.la
+usr/lib/libvirt/connection-driver/libvirt_driver_interface.so
+#usr/lib/libvirt/connection-driver/libvirt_driver_nodedev.la
+usr/lib/libvirt/connection-driver/libvirt_driver_nodedev.so
+#usr/lib/libvirt/connection-driver/libvirt_driver_nwfilter.la
+usr/lib/libvirt/connection-driver/libvirt_driver_nwfilter.so
+#usr/lib/libvirt/connection-driver/libvirt_driver_qemu.la
+usr/lib/libvirt/connection-driver/libvirt_driver_qemu.so
+#usr/lib/libvirt/connection-driver/libvirt_driver_secret.la
+usr/lib/libvirt/connection-driver/libvirt_driver_secret.so
+#usr/lib/libvirt/connection-driver/libvirt_driver_storage.la
+usr/lib/libvirt/connection-driver/libvirt_driver_storage.so
+#usr/lib/libvirt/lock-driver
+#usr/lib/libvirt/lock-driver/lockd.la
+usr/lib/libvirt/lock-driver/lockd.so
+#usr/lib/pkgconfig/libvirt-lxc.pc
+#usr/lib/pkgconfig/libvirt-qemu.pc
+#usr/lib/pkgconfig/libvirt.pc
+#usr/lib/sysctl.d
+usr/lib/sysctl.d/60-libvirtd.conf
+usr/libexec/libvirt_iohelper
+usr/sbin/libvirtd
+usr/sbin/virtlockd
+#usr/share/augeas
+#usr/share/augeas/lenses
+#usr/share/augeas/lenses/libvirt_lockd.aug
+#usr/share/augeas/lenses/libvirtd.aug
+#usr/share/augeas/lenses/libvirtd_qemu.aug
+#usr/share/augeas/lenses/tests
+#usr/share/augeas/lenses/tests/test_libvirt_lockd.aug
+#usr/share/augeas/lenses/tests/test_libvirtd.aug
+#usr/share/augeas/lenses/tests/test_libvirtd_qemu.aug
+#usr/share/augeas/lenses/tests/test_virtlockd.aug
+#usr/share/augeas/lenses/virtlockd.aug
+#usr/share/doc/libvirt-1.2.18.3
+#usr/share/doc/libvirt-1.2.18.3/html
+#usr/share/doc/libvirt-1.2.18.3/html/32favicon.png
+#usr/share/doc/libvirt-1.2.18.3/html/404.html
+#usr/share/doc/libvirt-1.2.18.3/html/acl.html
+#usr/share/doc/libvirt-1.2.18.3/html/aclpolkit.html
+#usr/share/doc/libvirt-1.2.18.3/html/api.html
+#usr/share/doc/libvirt-1.2.18.3/html/api_extension.html
+#usr/share/doc/libvirt-1.2.18.3/html/apps.html
+#usr/share/doc/libvirt-1.2.18.3/html/archdomain.html
+#usr/share/doc/libvirt-1.2.18.3/html/architecture.gif
+#usr/share/doc/libvirt-1.2.18.3/html/architecture.html
+#usr/share/doc/libvirt-1.2.18.3/html/archnetwork.html
+#usr/share/doc/libvirt-1.2.18.3/html/archnode.html
+#usr/share/doc/libvirt-1.2.18.3/html/archstorage.html
+#usr/share/doc/libvirt-1.2.18.3/html/auditlog.html
+#usr/share/doc/libvirt-1.2.18.3/html/auth.html
+#usr/share/doc/libvirt-1.2.18.3/html/bindings.html
+#usr/share/doc/libvirt-1.2.18.3/html/bugs.html
+#usr/share/doc/libvirt-1.2.18.3/html/cgroups.html
+#usr/share/doc/libvirt-1.2.18.3/html/compiling.html
+#usr/share/doc/libvirt-1.2.18.3/html/contact.html
+#usr/share/doc/libvirt-1.2.18.3/html/csharp.html
+#usr/share/doc/libvirt-1.2.18.3/html/deployment.html
+#usr/share/doc/libvirt-1.2.18.3/html/devguide.html
+#usr/share/doc/libvirt-1.2.18.3/html/docs.html
+#usr/share/doc/libvirt-1.2.18.3/html/downloads.html
+#usr/share/doc/libvirt-1.2.18.3/html/drivers.html
+#usr/share/doc/libvirt-1.2.18.3/html/drvbhyve.html
+#usr/share/doc/libvirt-1.2.18.3/html/drvesx.html
+#usr/share/doc/libvirt-1.2.18.3/html/drvhyperv.html
+#usr/share/doc/libvirt-1.2.18.3/html/drvlxc.html
+#usr/share/doc/libvirt-1.2.18.3/html/drvopenvz.html
+#usr/share/doc/libvirt-1.2.18.3/html/drvparallels.html
+#usr/share/doc/libvirt-1.2.18.3/html/drvphyp.html
+#usr/share/doc/libvirt-1.2.18.3/html/drvqemu.html
+#usr/share/doc/libvirt-1.2.18.3/html/drvremote.html
+#usr/share/doc/libvirt-1.2.18.3/html/drvtest.html
+#usr/share/doc/libvirt-1.2.18.3/html/drvuml.html
+#usr/share/doc/libvirt-1.2.18.3/html/drvvbox.html
+#usr/share/doc/libvirt-1.2.18.3/html/drvvmware.html
+#usr/share/doc/libvirt-1.2.18.3/html/drvxen.html
+#usr/share/doc/libvirt-1.2.18.3/html/errors.html
+#usr/share/doc/libvirt-1.2.18.3/html/et.png
+#usr/share/doc/libvirt-1.2.18.3/html/firewall.html
+#usr/share/doc/libvirt-1.2.18.3/html/footer_corner.png
+#usr/share/doc/libvirt-1.2.18.3/html/footer_pattern.png
+#usr/share/doc/libvirt-1.2.18.3/html/format.html
+#usr/share/doc/libvirt-1.2.18.3/html/formatcaps.html
+#usr/share/doc/libvirt-1.2.18.3/html/formatdomain.html
+#usr/share/doc/libvirt-1.2.18.3/html/formatdomaincaps.html
+#usr/share/doc/libvirt-1.2.18.3/html/formatnetwork.html
+#usr/share/doc/libvirt-1.2.18.3/html/formatnode.html
+#usr/share/doc/libvirt-1.2.18.3/html/formatnwfilter.html
+#usr/share/doc/libvirt-1.2.18.3/html/formatsecret.html
+#usr/share/doc/libvirt-1.2.18.3/html/formatsnapshot.html
+#usr/share/doc/libvirt-1.2.18.3/html/formatstorage.html
+#usr/share/doc/libvirt-1.2.18.3/html/formatstorageencryption.html
+#usr/share/doc/libvirt-1.2.18.3/html/generic.css
+#usr/share/doc/libvirt-1.2.18.3/html/goals.html
+#usr/share/doc/libvirt-1.2.18.3/html/governance.html
+#usr/share/doc/libvirt-1.2.18.3/html/hacking.html
+#usr/share/doc/libvirt-1.2.18.3/html/hooks.html
+#usr/share/doc/libvirt-1.2.18.3/html/html
+#usr/share/doc/libvirt-1.2.18.3/html/html/home.png
+#usr/share/doc/libvirt-1.2.18.3/html/html/index.html
+#usr/share/doc/libvirt-1.2.18.3/html/html/left.png
+#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-domain-snapshot.html
+#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-domain.html
+#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-event.html
+#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-host.html
+#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-interface.html
+#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-network.html
+#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-nodedev.html
+#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-nwfilter.html
+#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-secret.html
+#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-storage.html
+#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-stream.html
+#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-virterror.html
+#usr/share/doc/libvirt-1.2.18.3/html/html/right.png
+#usr/share/doc/libvirt-1.2.18.3/html/html/up.png
+#usr/share/doc/libvirt-1.2.18.3/html/hvsupport.html
+#usr/share/doc/libvirt-1.2.18.3/html/index.html
+#usr/share/doc/libvirt-1.2.18.3/html/internals
+#usr/share/doc/libvirt-1.2.18.3/html/internals.html
+#usr/share/doc/libvirt-1.2.18.3/html/internals/command.html
+#usr/share/doc/libvirt-1.2.18.3/html/internals/locking.html
+#usr/share/doc/libvirt-1.2.18.3/html/internals/oomtesting.html
+#usr/share/doc/libvirt-1.2.18.3/html/internals/rpc.html
+#usr/share/doc/libvirt-1.2.18.3/html/intro.html
+#usr/share/doc/libvirt-1.2.18.3/html/java.html
+#usr/share/doc/libvirt-1.2.18.3/html/libvirt-daemon-arch.png
+#usr/share/doc/libvirt-1.2.18.3/html/libvirt-driver-arch.png
+#usr/share/doc/libvirt-1.2.18.3/html/libvirt-header-bg.png
+#usr/share/doc/libvirt-1.2.18.3/html/libvirt-header-logo.png
+#usr/share/doc/libvirt-1.2.18.3/html/libvirt-net-logical.png
+#usr/share/doc/libvirt-1.2.18.3/html/libvirt-net-physical.png
+#usr/share/doc/libvirt-1.2.18.3/html/libvirt-object-model.png
+#usr/share/doc/libvirt-1.2.18.3/html/libvirt.css
+#usr/share/doc/libvirt-1.2.18.3/html/libvirtLogo.png
+#usr/share/doc/libvirt-1.2.18.3/html/locking-lockd.html
+#usr/share/doc/libvirt-1.2.18.3/html/locking-sanlock.html
+#usr/share/doc/libvirt-1.2.18.3/html/locking.html
+#usr/share/doc/libvirt-1.2.18.3/html/logging.html
+#usr/share/doc/libvirt-1.2.18.3/html/madeWith.png
+#usr/share/doc/libvirt-1.2.18.3/html/main.css
+#usr/share/doc/libvirt-1.2.18.3/html/migration-managed-direct.png
+#usr/share/doc/libvirt-1.2.18.3/html/migration-managed-p2p.png
+#usr/share/doc/libvirt-1.2.18.3/html/migration-native.png
+#usr/share/doc/libvirt-1.2.18.3/html/migration-tunnel.png
+#usr/share/doc/libvirt-1.2.18.3/html/migration-unmanaged-direct.png
+#usr/share/doc/libvirt-1.2.18.3/html/migration.html
+#usr/share/doc/libvirt-1.2.18.3/html/news.html
+#usr/share/doc/libvirt-1.2.18.3/html/node.gif
+#usr/share/doc/libvirt-1.2.18.3/html/pending.html
+#usr/share/doc/libvirt-1.2.18.3/html/php.html
+#usr/share/doc/libvirt-1.2.18.3/html/python.html
+#usr/share/doc/libvirt-1.2.18.3/html/relatedlinks.html
+#usr/share/doc/libvirt-1.2.18.3/html/remote.html
+#usr/share/doc/libvirt-1.2.18.3/html/secureusage.html
+#usr/share/doc/libvirt-1.2.18.3/html/securityprocess.html
+#usr/share/doc/libvirt-1.2.18.3/html/sitemap.html
+#usr/share/doc/libvirt-1.2.18.3/html/storage.html
+#usr/share/doc/libvirt-1.2.18.3/html/testapi.html
+#usr/share/doc/libvirt-1.2.18.3/html/testsuites.html
+#usr/share/doc/libvirt-1.2.18.3/html/testtck.html
+#usr/share/doc/libvirt-1.2.18.3/html/todo.html
+#usr/share/doc/libvirt-1.2.18.3/html/uri.html
+#usr/share/doc/libvirt-1.2.18.3/html/virshcmdref.html
+#usr/share/doc/libvirt-1.2.18.3/html/windows.html
+#usr/share/gtk-doc/html/libvirt
+#usr/share/gtk-doc/html/libvirt/general.html
+#usr/share/gtk-doc/html/libvirt/home.png
+#usr/share/gtk-doc/html/libvirt/index.html
+#usr/share/gtk-doc/html/libvirt/left.png
+#usr/share/gtk-doc/html/libvirt/libvirt-virterror.html
+#usr/share/gtk-doc/html/libvirt/libvirt.devhelp
+#usr/share/gtk-doc/html/libvirt/right.png
+#usr/share/gtk-doc/html/libvirt/style.css
+#usr/share/gtk-doc/html/libvirt/up.png
+#usr/share/libvirt
+#usr/share/libvirt/api
+usr/share/libvirt/api/libvirt-api.xml
+usr/share/libvirt/api/libvirt-lxc-api.xml
+usr/share/libvirt/api/libvirt-qemu-api.xml
+usr/share/libvirt/cpu_map.xml
+#usr/share/libvirt/libvirtLogo.png
+#usr/share/libvirt/schemas
+usr/share/libvirt/schemas/basictypes.rng
+usr/share/libvirt/schemas/capability.rng
+usr/share/libvirt/schemas/domain.rng
+usr/share/libvirt/schemas/domaincaps.rng
+usr/share/libvirt/schemas/domaincommon.rng
+usr/share/libvirt/schemas/domainsnapshot.rng
+usr/share/libvirt/schemas/interface.rng
+usr/share/libvirt/schemas/network.rng
+usr/share/libvirt/schemas/networkcommon.rng
+usr/share/libvirt/schemas/nodedev.rng
+usr/share/libvirt/schemas/nwfilter.rng
+usr/share/libvirt/schemas/secret.rng
+usr/share/libvirt/schemas/storagecommon.rng
+usr/share/libvirt/schemas/storagepool.rng
+usr/share/libvirt/schemas/storagevol.rng
+#usr/share/man/man1/virsh.1
+#usr/share/man/man1/virt-host-validate.1
+#usr/share/man/man1/virt-pki-validate.1
+#usr/share/man/man1/virt-xml-validate.1
+#usr/share/man/man8/libvirtd.8
+#usr/share/man/man8/virtlockd.8
+#var/cache/libvirt
+var/cache/libvirt/qemu
+#var/lib/libvirt
+var/lib/libvirt/boot
+var/lib/libvirt/filesystems
+var/lib/libvirt/images
+#var/lib/libvirt/lockd
+var/lib/libvirt/lockd/files
+var/lib/libvirt/qemu
+#var/log/libvirt
+#var/log/libvirt/lxc
+var/log/libvirt/qemu
+#var/log/libvirt/uml
+etc/rc.d/init.d/libvirt-guests
+etc/rc.d/init.d/libvirtd
diff --git a/config/rootfiles/packages/libyajl b/config/rootfiles/packages/libyajl
new file mode 100644
index 000000000..f575f6a1b
--- /dev/null
+++ b/config/rootfiles/packages/libyajl
@@ -0,0 +1,13 @@
+usr/bin/json_reformat
+usr/bin/json_verify
+#usr/include/yajl
+#usr/include/yajl/yajl_common.h
+#usr/include/yajl/yajl_gen.h
+#usr/include/yajl/yajl_parse.h
+#usr/include/yajl/yajl_tree.h
+#usr/include/yajl/yajl_version.h
+#usr/lib/libyajl.so
+usr/lib/libyajl.so.2
+usr/lib/libyajl.so.2.1.0
+#usr/lib/libyajl_s.a
+#usr/share/pkgconfig/yajl.pc
diff --git a/config/rootfiles/packages/qemu b/config/rootfiles/packages/qemu
index 482087b7b..3b3f3616d 100644
--- a/config/rootfiles/packages/qemu
+++ b/config/rootfiles/packages/qemu
@@ -1,3 +1,4 @@
+lib/udev/rules.d/65-kvm.rules
 usr/bin/qemu
 usr/bin/qemu-arm
 usr/bin/qemu-ga
diff --git a/config/udev/60-net.rules b/config/udev/60-net.rules
index e82320cfe..e031e7a1e 100644
--- a/config/udev/60-net.rules
+++ b/config/udev/60-net.rules
@@ -5,3 +5,6 @@ ACTION=="add", SUBSYSTEM=="net", PROGRAM="/lib/udev/network-hotplug-rename", RES
 # Call a script that will create all virtual devices for a parent device
 # that has just come up.
 ACTION=="add", SUBSYSTEM=="net", RUN+="/lib/udev/network-hotplug-vlan"
+
+# Call a script that will set up macvtap interfaces
+ACTION=="add", SUBSYSTEM=="net", RUN+="/lib/udev/network-hotplug-macvtap"
diff --git a/config/udev/network-hotplug-macvtap b/config/udev/network-hotplug-macvtap
new file mode 100644
index 000000000..7f5da12cb
--- /dev/null
+++ b/config/udev/network-hotplug-macvtap
@@ -0,0 +1,46 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2016 IPFire Team <info@ipfire.org>                         #
+#                                                                          #
+############################################################################
+
+[ -n "${INTERFACE}" ] || exit 2
+
+PHYSICAL_INTERFACE="${INTERFACE}"
+VIRTUAL_INTERFACE="${INTERFACE%phys}"
+#VIRTUAL_INTERFACE="${VIRTUAL_INTERFACE}0"
+
+# Do nothing if the physical interface does not end with "phys"
+case "${PHYSICAL_INTERFACE}" in
+	*phys)
+		;;
+	*)
+		exit 0
+		;;
+esac
+
+ADDRESS="$(</sys/class/net/${PHYSICAL_INTERFACE}/address)"
+rand="$(</proc/sys/kernel/random/uuid)"
+rand="${rand//-/}"
+GENERATED_ADDRESS=$(echo "02:${rand:0:2}:${rand:2:2}:${rand:4:2}:${rand:6:2}:${rand:8:2}")
+
+ip link add link "${PHYSICAL_INTERFACE}" "${VIRTUAL_INTERFACE}" address "${ADDRESS}" type macvlan mode bridge
+ip link set "${PHYSICAL_INTERFACE}" address "${GENERATED_ADDRESS}"
+ip link set "${PHYSICAL_INTERFACE}" up
diff --git a/config/udev/network-hotplug-rename b/config/udev/network-hotplug-rename
index 331b78818..aaae641e1 100644
--- a/config/udev/network-hotplug-rename
+++ b/config/udev/network-hotplug-rename
@@ -57,16 +57,23 @@ ADDRESS="$(</sys/class/net/${INTERFACE}/address)"
 for zone in ${ZONES}; do
 	address="${zone}_MACADDR"
 	device="${zone}_DEV"
+	mode="${zone}_MODE"
 
 	# Skip if address or device is unset
 	[ -n "${!address}" -a -n "${!device}" ] || continue
 
+	# Compare MAC addresses
+	[ "${ADDRESS}" = "${!address}" ] || continue
+
 	# If a matching interface has been found we will
 	# print the name to which udev will rename it.
-	if [ "${ADDRESS}" = "${!address}" ]; then
+	if [ "${!mode}" = "macvtap" ]; then
+		echo "${!device}phys"
+	else
 		echo "${!device}"
-		exit 0
 	fi
+
+	exit 0
 done
 
 # If we get here we have not found a matching device,
diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index e8635d7a3..a8a7ba41e 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -65,20 +65,22 @@ my %sections = (
         'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
         'openvpn' => '(openvpnserver\[.*\]: |.*n2n\[.*\]: )',
         'pakfire' => '(pakfire:) ',
-        'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) '
+        'wireless' => '(hostapd:|kernel: ath.*:|kernel: wifi[0-9]:) ',
+        'squid' => '(squid\[.*\]: |squid: )',
+        'snort' => '(snort\[.*\]: )'
 	 );
 
 # Translations for the %sections array.
 my %trsections = (
         'ipfire' => 'IPFire',
         'red' => 'RED',
-        'ddns' => $Lang::tr{'dynamic dns'},
+        'ddns' => "$Lang::tr{'dynamic dns'}",
         'dns' => 'DNS',
         'dma' => 'Mail',
         'dhcp' => "$Lang::tr{'dhcp server'}",
         'cron' => 'Cron',
         'collectd' => 'Collectd',
-				'clamav' => 'ClamAV',
+        'clamav' => 'ClamAV',
         'ntp' => 'NTP',
         'ssh' => 'SSH',
         'auth' => "$Lang::tr{'loginlogout'}",
@@ -86,7 +88,9 @@ my %trsections = (
         'ipsec' => 'IPSec',
         'openvpn' => 'OpenVPN',
         'pakfire' => 'Pakfire',
-        'wireless' => 'Wireless'
+        'wireless' => 'Wireless',
+        'squid' => "$Lang::tr{'web proxy'}",
+        'snort' => "$Lang::tr{'intrusion detection'}"
 	);
 
 
diff --git a/lfs/automake b/lfs/automake
index 9b19a1b17..a372443b3 100644
--- a/lfs/automake
+++ b/lfs/automake
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.12.4
+VER        = 1.15
 
 THISAPP    = automake-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -32,6 +32,16 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+# Normal build or /tools build.
+#
+ifeq "$(ROOT)" ""
+	PREFIX = /usr
+	TARGET = $(DIR_INFO)/$(THISAPP)
+else
+	PREFIX = /tools
+	TARGET = $(DIR_INFO)/$(THISAPP)-tools
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +50,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7395a0420ecb5c9bc43e5fcf4824df36
+$(DL_FILE)_MD5 = 9a1ddb0e053474d9d1105cfe39b0c48d
 
 install : $(TARGET)
 
@@ -70,7 +80,9 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/automake-1.15_perl_warning.patch
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls \
+			--docdir=/usr/share/doc/automake-1.15
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/coreutils b/lfs/coreutils
index ede049391..644871f6a 100644
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 8.24
+VER        = 8.25
 
 THISAPP    = coreutils-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -42,7 +42,6 @@ else
 endif
 
 CONFIGURE_OPTIONS += \
-	--disable-selinux \
 	--enable-largefile \
 	--disable-rpath \
 	--enable-install-program=arch \
@@ -60,7 +59,7 @@ objects =$(DL_FILE)
 
 $(DL_FILE)                      = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5                  = 40efdbce865d2458d8da0a9dcee7c16c
+$(DL_FILE)_MD5                  = 070e43ba7f618d747414ef56ab248a48
 
 install : $(TARGET)
 
@@ -90,7 +89,8 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure $(CONFIGURE_OPTIONS)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/coreutils-8.25-i18n-2.patch
+	cd $(DIR_APP) && FORCE_UNSAFE_CONFIGURE=1 && ./configure $(CONFIGURE_OPTIONS)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
diff --git a/lfs/expect b/lfs/expect
index d885f2f7f..93d6fe6e6 100644
--- a/lfs/expect
+++ b/lfs/expect
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016   IPFire Team   <info@ipfire.org>                   #
+# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,12 +24,12 @@
 
 include Config
 
-VER        = 5.43.0
+VER        = 5.45
 
-THISAPP    = expect-$(VER)
+THISAPP    = expect$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/expect-5.43
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)-tools
 
 ###############################################################################
@@ -40,7 +40,7 @@ objects=$(DL_FILE)
 
 $(DL_FILE)        = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5    = 43e1dc0e0bc9492cf2e1a6f59f276bc3
+$(DL_FILE)_MD5    = 44e1a4f4c877e9ddc5a542dfa7ecc92b
 
 install : $(TARGET)
 
@@ -70,8 +70,13 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_SRC)/tcl* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-spawn-1.patch
-	cd $(DIR_APP) && ./configure --prefix=/tools --host=$(BUILDTARGET) --with-tcl=/tools/lib --with-tclinclude=/tools/include --with-x=no --disable-nls
+	cd $(DIR_APP) && ./configure \
+			--prefix=/tools \
+			--build=$(BUILDTARGET) \
+			--with-tcl=/tools/lib \
+			--with-tclinclude=/tools/include \
+			--with-x=no \
+			--disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make SCRIPTS="" install
 	@rm -rf $(DIR_APP) $(DIR_SRC)/tcl*
diff --git a/lfs/findutils b/lfs/findutils
index ac1ffdb92..d1a520b3f 100644
--- a/lfs/findutils
+++ b/lfs/findutils
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.4.2
+VER        = 4.6.0
 
 THISAPP    = findutils-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -54,7 +54,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 351cc4adb07d54877fa15f75fb77d39f
+$(DL_FILE)_MD5 = 9936aa8009438ce185bea2694a997fc1
 
 install : $(TARGET)
 
diff --git a/lfs/gcc b/lfs/gcc
index 52d1daefc..e0cd10274 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -61,6 +61,8 @@ else
 ifeq "$(PASS)" "1"
   CFLAGS    := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CFLAGS))
   CXXFLAGS  := $(patsubst -fstack-protector-strong,-fstack-protector-all,$(CXXFLAGS))
+  CXXFLAGS  += -std=gnu++98
+
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = \
 	--target=$(CROSSTARGET) \
diff --git a/lfs/igmpproxy b/lfs/igmpproxy
index fb1426fe5..7a943dd54 100644
--- a/lfs/igmpproxy
+++ b/lfs/igmpproxy
@@ -82,8 +82,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1  < $(DIR_SRC)/src/patches/igmpproxy-003-Restrict-igmp-reports-for-downstream-interfaces-wrt-.patch
 	cd $(DIR_APP) && patch -Np1  < $(DIR_SRC)/src/patches/igmpproxy-004-Restrict-igmp-reports-forwarding-to-upstream-interfa.patch
 	cd $(DIR_APP) && patch -Np1  < $(DIR_SRC)/src/patches/igmpproxy-100-use-monotic-clock-instead-of-time-of-day.patch
-	cd $(DIR_APP) && autoreconf
-	cd $(DIR_APP) && ./configure --sysconfdir=/etc
+	cd $(DIR_APP) && aclocal && automake --add-missing && autoreconf
+	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/igmpproxy \
diff --git a/lfs/libpciaccess b/lfs/libpciaccess
new file mode 100644
index 000000000..0df4f453e
--- /dev/null
+++ b/lfs/libpciaccess
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.13.4
+
+THISAPP    = libpciaccess-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = libpciaccess
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = cc1fad87da60682af1d5fa43a5da45a4
+
+install : $(TARGET)
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:.
+	$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/libvirt b/lfs/libvirt
new file mode 100644
index 000000000..5af28cb41
--- /dev/null
+++ b/lfs/libvirt
@@ -0,0 +1,95 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.2.18.3
+
+THISAPP    = libvirt-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+SUP_ARCH   = i586 x86_64
+PROG       = libvirt
+PAK_VER    = 3
+
+DEPS       = "libpciaccess libyajl ncat qemu"
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = bcb0738ff66972ddb25cfe0d086c5c37
+
+install : $(TARGET)
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:.
+	$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0001-Change-default-behavior-of-libvirt-guests.sh-for-IPF.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch
+	cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc \
+			--with-openssl --without-sasl \
+			--without-uml --without-vbox --without-lxc --without-esx --without-vmware --without-openvz \
+			--without-firewalld --without-network -with-interface --with-virtualport --with-macvtap \
+			--disable-nls --without-avahi --without-test-suite -without-dbus \
+			--with-qemu-user=nobody --with-qemu-group=kvm \
+			--with-storage-dir --without-storage-fs --without-storage-lvm  --without-storage-iscsi \
+			--without-storage-scsi --without-storage-mpath --without-storage-disk --without-storage-rbd --without-storage-sheepdog --without-storage-gluster  --without-storage-zfs
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make install
+	install -v -m 754 $(DIR_SRC)/src/initscripts/init.d/libvirtd /etc/rc.d/init.d/libvirtd
+	mv /usr/libexec/libvirt-guests.sh /etc/rc.d/init.d/libvirt-guests
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/libyajl b/lfs/libyajl
new file mode 100644
index 000000000..87483860f
--- /dev/null
+++ b/lfs/libyajl
@@ -0,0 +1,84 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.1.0
+
+THISAPP    = libyajl-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = libyajl
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 58c61232e1be991fd9a7ceecfc78836c
+
+install: $(TARGET)
+
+check: $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download: $(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5: $(subst %,%_MD5,$(objects))
+
+dist:
+	$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && cmake -DCMAKE_INSTALL_PREFIX=/usr .
+	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/ncurses b/lfs/ncurses
index 552a6fc34..dd6e56f1c 100644
--- a/lfs/ncurses
+++ b/lfs/ncurses
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.9
+VER        = 6.0
 
 THISAPP    = ncurses-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -44,17 +44,13 @@ endif
 
 EXTRA_CONFIG += \
 	--prefix=$(PREFIX) \
+	--enable-widec \
 	--with-shared \
 	--without-debug \
-	--without-ada \
-	--with-ospeed=unsigned \
-	--with-chtype=long \
-	--enable-hard-tabs \
-	--enable-xmc-glitch \
-	--enable-colorfgbg \
-	--enable-overwrite \
-	--with-termlib=tinfo \
-	--disable-nls
+	--without-normal \
+	--enable-pc-files \
+	--disable-nls \
+	--mandir=/usr/share/man
 
 ###############################################################################
 # Top-level Rules
@@ -64,7 +60,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8cb9c412e5f2d96bc6f459aa8c6282a1
+$(DL_FILE)_MD5 = ee13d052e1ead260d7c28071f46eefb1
 
 install : $(TARGET)
 
@@ -94,35 +90,27 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && mkdir -pv narrowc widec
+	# Don't install a static library
+	cd $(DIR_APP) && sed -i '/LIBTOOL_INSTALL/d' c++/Makefile.in
+	# Create pkgconfig dir in toolchain
+ifneq "$(ROOT)" ""
+	mkdir -pv /tools/lib/pkgconfig/
+endif
+	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 
-	# Build narrowc version.
-	cd $(DIR_APP)/narrowc && ln -svf ../configure .
-	cd $(DIR_APP)/narrowc && ./configure $(EXTRA_CONFIG) --with-ticlib
-	cd $(DIR_APP)/narrowc && make libs
-	cd $(DIR_APP)/narrowc && make -C progs
-
-	# Build widec version.
-	cd $(DIR_APP)/widec && ln -svf ../configure .
-	cd $(DIR_APP)/widec && ./configure $(EXTRA_CONFIG) \
-		--enable-widec --without-progs
-	cd $(DIR_APP)/widec && make libs
-
-	# Install everything.
-	cd $(DIR_APP) && make -C narrowc install.{libs,progs,data}
-	rm -vf $(PREFIX)/lib/libtinfo.*
-	cd $(DIR_APP) && make -C widec install.{libs,includes,man}
-
-	# don't require -ltinfo when linking with --no-add-needed
-	for l in $(PREFIX)/lib/libncurses{,w}.so; do \
-		soname=$$(basename $$(readlink $$l)); \
-		rm -f $$l; \
-		echo "INPUT($$soname -ltinfo)" > $$l; \
+	# allow the linker to find non-wide-character ncurses libraries
+	for lib in ncurses form panel menu; do \
+	rm -vf                     $(PREFIX)/lib/lib$${lib}.so; \
+	echo "INPUT(-l$${lib}w)" > $(PREFIX)/lib/lib$${lib}.so; \
+	ln -sfv $${lib}w.pc        $(PREFIX)/lib/pkgconfig/$${lib}.pc; \
 	done
 
-	rm -vf $(PREFIX)/lib/libcurses{,w}.so
-	echo "INPUT(-lncurses)" > $(PREFIX)/lib/libcurses.so
+	# old applications that look for -lcurses at build time are still buildable
+	rm -vf /usr/lib/libcursesw.so
 	echo "INPUT(-lncursesw)" > $(PREFIX)/lib/libcursesw.so
-	echo "INPUT(-ltinfo)" > $(PREFIX)/lib/libtermcap.so
+	ln -sfv libncurses.so      $(PREFIX)/lib/libcurses.so
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/ncurses-compat b/lfs/ncurses-compat
new file mode 100644
index 000000000..1c0fb0427
--- /dev/null
+++ b/lfs/ncurses-compat
@@ -0,0 +1,127 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 5.9
+
+THISAPP    = ncurses-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+
+# Normal build or /tools build.
+#
+ifeq "$(ROOT)" ""
+  TARGET = $(DIR_INFO)/$(THISAPP)
+  PREFIX = /usr
+else
+  TARGET = $(DIR_INFO)/$(THISAPP)-tools
+  PREFIX = /tools
+endif
+
+EXTRA_CONFIG += \
+	--prefix=$(PREFIX) \
+	--with-shared \
+	--without-debug \
+	--without-ada \
+	--with-ospeed=unsigned \
+	--with-chtype=long \
+	--enable-hard-tabs \
+	--enable-xmc-glitch \
+	--enable-colorfgbg \
+	--enable-overwrite \
+	--with-termlib=tinfo \
+	--disable-nls
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 8cb9c412e5f2d96bc6f459aa8c6282a1
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && mkdir -pv narrowc widec
+
+	# Build narrowc version.
+	cd $(DIR_APP)/narrowc && ln -svf ../configure .
+	cd $(DIR_APP)/narrowc && ./configure $(EXTRA_CONFIG) --with-ticlib
+	cd $(DIR_APP)/narrowc && make libs
+	cd $(DIR_APP)/narrowc && make -C progs
+
+	# Build widec version.
+	cd $(DIR_APP)/widec && ln -svf ../configure .
+	cd $(DIR_APP)/widec && ./configure $(EXTRA_CONFIG) \
+		--enable-widec --without-progs
+	cd $(DIR_APP)/widec && make libs
+
+	# Install everything.
+	cd $(DIR_APP) && make -C narrowc install.{libs,progs,data}
+	rm -vf $(PREFIX)/lib/libtinfo.*
+	cd $(DIR_APP) && make -C widec install.{libs,includes,man}
+
+	# don't require -ltinfo when linking with --no-add-needed
+	for l in $(PREFIX)/lib/libncurses{,w}.so; do \
+		soname=$$(basename $$(readlink $$l)); \
+		rm -f $$l; \
+		echo "INPUT($$soname -ltinfo)" > $$l; \
+	done
+
+	rm -vf $(PREFIX)/lib/libcurses{,w}.so
+	echo "INPUT(-lncurses)" > $(PREFIX)/lib/libcurses.so
+	echo "INPUT(-lncursesw)" > $(PREFIX)/lib/libcursesw.so
+	echo "INPUT(-ltinfo)" > $(PREFIX)/lib/libtermcap.so
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/ntp b/lfs/ntp
index 3393f9059..536a4a8cf 100644
--- a/lfs/ntp
+++ b/lfs/ntp
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.2.8p5
+VER        = 4.2.8p8
 
 THISAPP    = ntp-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 9f02b2a0acc1617ce2716d529a58d2d8
+$(DL_FILE)_MD5 = 4a8636260435b230636f053ffd070e34
 
 install : $(TARGET)
 
diff --git a/lfs/pkg-config b/lfs/pkg-config
index 3da8556ef..cd07978ea 100644
--- a/lfs/pkg-config
+++ b/lfs/pkg-config
@@ -32,6 +32,16 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+# Normal build or /tools build.
+#
+ifeq "$(ROOT)" ""
+  TARGET = $(DIR_INFO)/$(THISAPP)
+  PREFIX = /usr
+else
+  TARGET = $(DIR_INFO)/$(THISAPP)-tools
+  PREFIX = /tools
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -70,7 +80,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --with-internal-glib
+ifeq "$(ROOT)" ""
+else
+	mkdir /tools/lib/pkgconfig
+endif
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --with-internal-glib
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/qemu b/lfs/qemu
index 804ec269f..c32953c97 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -33,7 +33,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = i586 x86_64
 PROG       = qemu
-PAK_VER    = 18
+PAK_VER    = 19
 
 DEPS       = "sdl spice"
 
@@ -95,6 +95,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	paxctl -m -r /usr/bin/qemu-arm
 	paxctl -m -r /usr/bin/qemu-i386
 	paxctl -m -r /usr/bin/qemu-x86_64
+	# install an udev script to set the permissions of /dev/kvm
+	cp -avf $(DIR_SRC)/config/qemu/65-kvm.rules /lib/udev/rules.d/65-kvm.rules
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/samba b/lfs/samba
index f77198635..369f48633 100644
--- a/lfs/samba
+++ b/lfs/samba
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = samba
-PAK_VER    = 62
+PAK_VER    = 63
 
 DEPS       = "cups krb5"
 
@@ -88,10 +88,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2016-2118-v3-6.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/CVE-2015-5370-v3-6.patch
 
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/1-samba.git-82fa625540abf8b8ec23d43c41e2ca906a9928a5.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/2-samba.git-0abef6992dc342d443137f8a2ac6c01f490cecee.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/samba/3-samba.git-2d0424e7bb2c30bf9049529b207c73b55370dfc8.patch
-
 	cd $(DIR_APP)/source3 && ./autogen.sh
 	cd $(DIR_APP)/source3 && ./configure \
 		--prefix=/usr \
diff --git a/lfs/shadow b/lfs/shadow
index f2814314d..b4777b9b5 100644
--- a/lfs/shadow
+++ b/lfs/shadow
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 4.0.15
+VER        = 4.2.1
 
 THISAPP    = shadow-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a0452fa989f8ba45023cc5a08136568e
+$(DL_FILE)_MD5 = 2bfafe7d4962682d31b5eba65dba4fc8
 
 install : $(TARGET)
 
@@ -69,11 +69,15 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --libdir=/lib --enable-shared --without-selinux --disable-nls
-	cd $(DIR_APP) && sed -i 's/groups$(EXEEXT) //' src/Makefile
-	cd $(DIR_APP) && find man -name Makefile -exec sed -i '/groups/d' {} \;
-	cd $(DIR_APP) && sed -i -e 's/ ko//' -e 's/ zh_CN zh_TW//' man/Makefile
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/shadow-4.2.1-SHA512_password_hashing.patch
+	cd $(DIR_APP) && ./configure --libdir=/lib	\
+				--sysconfdir=/etc	\
+				--enable-shared		\
+				--without-selinux	\
+				--disable-nls		\
+				--with-group-name-max-length=32
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && cp -v etc/{limits,login.access} /etc
@@ -81,10 +85,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 				-e 's@/var/spool/mail@/var/mail@' \
 				etc/login.defs > /etc/login.defs
 	mv -v /usr/bin/passwd /bin
-	mv -v /lib/libshadow.*a /usr/lib
-	rm -v /lib/libshadow.so
 	ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so
-	mkdir -v /etc/default
 	touch /etc/shadow
 	chmod 600 /etc/shadow
 	pwconv
diff --git a/lfs/squid b/lfs/squid
index 74a4f19a3..edaf943d6 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -70,6 +70,12 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14051.patch
+	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14052.patch
+	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14053.patch
+	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14054.patch
+	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14055.patch
+	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-3.5-14056.patch
 	cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid-3.5.17-fix-max-file-descriptors.patch
 
 	cd $(DIR_APP) && autoreconf -vfi
diff --git a/lfs/udev b/lfs/udev
index 7d5bdbca1..61bd33741 100644
--- a/lfs/udev
+++ b/lfs/udev
@@ -109,6 +109,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		/lib/udev/network-hotplug-rename
 	install -v -m 755 $(DIR_SRC)/config/udev/network-hotplug-vlan \
 		/lib/udev/network-hotplug-vlan
+	install -v -m 755 $(DIR_SRC)/config/udev/network-hotplug-macvtap \
+		/lib/udev/network-hotplug-macvtap
 	install -v -m 644 $(DIR_SRC)/config/udev/60-net.rules \
 		/lib/udev/rules.d
 
diff --git a/lfs/util-macros b/lfs/util-macros
new file mode 100644
index 000000000..f2c347f18
--- /dev/null
+++ b/lfs/util-macros
@@ -0,0 +1,83 @@
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 1.19.0
+
+THISAPP    = util-macros-$(VER)
+DL_FILE    = $(THISAPP).tar.gz
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+PROG       = util-macros
+PAK_VER    = 1
+
+DEPS       = ""
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 40e1caa49a71a26e0aa68ddd00203717
+
+install : $(TARGET)
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:.
+	$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)
diff --git a/lfs/wget b/lfs/wget
index eef2a2597..c22a9782e 100644
--- a/lfs/wget
+++ b/lfs/wget
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team <info@ipfire.org>                      #
+# Copyright (C) 2007-2016  IPFire Team <info@ipfire.org>                      #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.16
+VER        = 1.18
 
 THISAPP    = wget-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = fe102975ab3a6c049777883f1bb9ad07
+$(DL_FILE)_MD5 = af9ca95a4bb8ac4a9bf10aeae66fa5ec
 
 install : $(TARGET)
 
diff --git a/make.sh b/make.sh
index 3293fd87b..3d5b4a3a6 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.19"							# Version number
-CORE="103"							# Core Level (Filename)
-PAKFIRE_CORE="102"						# Core Level (PAKFIRE)
+CORE="104"							# Core Level (Filename)
+PAKFIRE_CORE="103"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`			# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
@@ -36,7 +36,7 @@ BUILD_IMAGES=1							# Flash and Xen Downloader
 KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 GIT_TAG=$(git tag | tail -1)					# Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)	# Last commit
-TOOLCHAINVER=11
+TOOLCHAINVER=12
 
 # New architecture variables
 BUILD_ARCH="$(uname -m)"
@@ -294,6 +294,7 @@ buildtoolchain() {
     lfsmake1 tcl
     lfsmake1 expect
     lfsmake1 dejagnu
+    lfsmake1 pkg-config
     lfsmake1 ncurses
     lfsmake1 bash
     lfsmake1 bzip2
@@ -336,10 +337,13 @@ buildbase() {
     lfsmake2 gcc
     lfsmake2 sed
     lfsmake2 berkeley
+    lfsmake2 autoconf
+    lfsmake2 automake
     lfsmake2 coreutils
     lfsmake2 iana-etc
     lfsmake2 m4
     lfsmake2 bison
+    lfsmake2 ncurses-compat
     lfsmake2 ncurses
     lfsmake2 procps
     lfsmake2 libtool
@@ -348,8 +352,6 @@ buildbase() {
     lfsmake2 readline-compat
     lfsmake2 pcre
     lfsmake2 pcre-compat
-    lfsmake2 autoconf
-    lfsmake2 automake
     lfsmake2 bash
     lfsmake2 bzip2
     lfsmake2 diffutils
@@ -863,6 +865,10 @@ buildipfire() {
   ipfiremake dmidecode
   ipfiremake mcelog
   ipfiremake rtpproxy
+  ipfiremake util-macros
+  ipfiremake libpciaccess
+  ipfiremake libyajl
+  ipfiremake libvirt
 }
 
 buildinstaller() {
diff --git a/src/initscripts/init.d/libvirtd b/src/initscripts/init.d/libvirtd
new file mode 100644
index 000000000..f97d208f4
--- /dev/null
+++ b/src/initscripts/init.d/libvirtd
@@ -0,0 +1,49 @@
+#!/bin/sh
+########################################################################
+# Begin $rc_base/init.d/libvirtd
+#
+# Description : libvirtd init script
+#
+# Authors     : Jonatan Schlag - jonatan.schlag@ipfire.org
+#
+# Version     : 01.00
+#
+# Notes       :
+#
+########################################################################
+
+. /etc/sysconfig/rc
+. $rc_functions
+
+case $1 in
+	start)
+		boot_mesg "Load required kernel modules for Libvirt"
+		modprobe tun
+		evaluate_retval
+		boot_mesg "Starting Libvirt Daemon..."
+		loadproc /usr/sbin/libvirtd -d
+
+		;;
+
+	stop)
+		boot_mesg "Stopping Libvirt Daemon..."
+		killproc /usr/sbin/libvirtd
+		;;
+
+	restart)
+		$0 stop
+		sleep 1
+		$0 start
+		;;
+
+	status)
+		statusproc /usr/sbin/libvirtd
+		;;
+
+	*)
+		echo "Usage: $0 {start|stop|restart|status}"
+		exit 1
+		;;
+esac
+
+# End $rc_base/init.d/libvirtd
diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh
index 3f7dbff55..375169760 100644
--- a/src/pakfire/lib/functions.sh
+++ b/src/pakfire/lib/functions.sh
@@ -86,7 +86,7 @@ start_service() {
 		esac
 	done
 
-	if [ -e "/etc/init.d/${1}" ]; then
+	if [ -f "/etc/init.d/${1}" ]; then
 	    if [ -n "${BACKGROUND}" ]; then
 				(sleep ${DELAY} && /etc/init.d/${1} start) &
 			else
@@ -96,7 +96,7 @@ start_service() {
 }
 
 stop_service() {
-	if [ -e "/etc/init.d/${1}" ]; then
+	if [ -f "/etc/init.d/${1}" ]; then
 		/etc/init.d/${1} stop
 	fi
 }
diff --git a/src/paks/libvirt/install.sh b/src/paks/libvirt/install.sh
new file mode 100644
index 000000000..2009b0ea9
--- /dev/null
+++ b/src/paks/libvirt/install.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+
+# creates a new user and group called libvirt-remote if they not exist
+getent group libvirt-remote >/dev/null || groupadd  libvirt-remote
+getent passwd libvirt-remote >/dev/null || \
+useradd -m -g libvirt-remote -s /bin/bash "libvirt-remote"
+
+extract_files
+start_service --delay 300 --background ${NAME}
+ln -svf /etc/init.d/libvirtd /etc/rc.d/rc0.d/K20libvirtd
+ln -svf /etc/init.d/libvirtd /etc/rc.d/rc3.d/S70libvirtd
+ln -svf /etc/init.d/libvirtd /etc/rc.d/rc6.d/K20libvirtd
+
+ln -svf /etc/init.d/libvirt-guests /etc/rc.d/rc0.d/K19libvirt-guests
+ln -svf /etc/init.d/libvirt-guests /etc/rc.d/rc3.d/S71libvirt-guests
+ln -svf /etc/init.d/libvirt-guests /etc/rc.d/rc6.d/K19libvirt-guests
diff --git a/src/paks/libvirt/uninstall.sh b/src/paks/libvirt/uninstall.sh
new file mode 100644
index 000000000..a558460c1
--- /dev/null
+++ b/src/paks/libvirt/uninstall.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+stop_service ${NAME}
+remove_files
+
+rm -f /etc/rc.d/rc*.d/*libvirt-guests
+rm -f /etc/rc.d/rc*.d/*libvirtd
+
diff --git a/src/paks/libvirt/update.sh b/src/paks/libvirt/update.sh
new file mode 100644
index 000000000..d0b3ba163
--- /dev/null
+++ b/src/paks/libvirt/update.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2007 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh
+
diff --git a/src/paks/qemu/install.sh b/src/paks/qemu/install.sh
index a9f7321c0..e44ba5eca 100644
--- a/src/paks/qemu/install.sh
+++ b/src/paks/qemu/install.sh
@@ -22,6 +22,8 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+#create the group kvm when they not exist
+getent group kvm >/dev/null || groupadd kvm
 extract_files
 restore_backup ${NAME}
 echo shm	/dev/shm	tmpfs	defaults,size=256M	0	0 >> /etc/fstab
diff --git a/src/patches/automake-1.15_perl_warning.patch b/src/patches/automake-1.15_perl_warning.patch
new file mode 100644
index 000000000..9a031e8da
--- /dev/null
+++ b/src/patches/automake-1.15_perl_warning.patch
@@ -0,0 +1,10 @@
+--- automake-1.15/bin/automake.in
++++ automake-1.15/bin/automake.in
+@@ -3878,7 +3878,7 @@
+ sub substitute_ac_subst_variables
+ {
+   my ($text) = @_;
+-  $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
++  $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
+   return $text;
+ }
diff --git a/src/patches/coreutils-8.25-i18n-2.patch b/src/patches/coreutils-8.25-i18n-2.patch
new file mode 100644
index 000000000..ad984ec87
--- /dev/null
+++ b/src/patches/coreutils-8.25-i18n-2.patch
@@ -0,0 +1,4790 @@
+Submitted by:            DJ Lucas (dj_AT_linuxfromscratch_DOT_org)
+Date:                    2016-02-09
+Initial Package Version: 8.25
+Upstream Status:         Rejected
+Origin:                  Based on Suse's i18n patches at https://build.opensuse.org/package/view_file/Base:System/coreutils/coreutils-i18n.patch
+Description:             Fixes several i18n issues with various Coreutils programs
+
+diff -Naurp coreutils-8.25-orig/lib/linebuffer.h coreutils-8.25/lib/linebuffer.h
+--- coreutils-8.25-orig/lib/linebuffer.h	2016-01-01 07:45:55.000000000 -0600
++++ coreutils-8.25/lib/linebuffer.h	2016-02-08 19:07:10.298944609 -0600
+@@ -21,6 +21,11 @@
+ 
+ # include <stdio.h>
+ 
++/* Get mbstate_t.  */
++# if HAVE_WCHAR_H
++#  include <wchar.h>
++# endif
++
+ /* A 'struct linebuffer' holds a line of text. */
+ 
+ struct linebuffer
+@@ -28,6 +33,9 @@ struct linebuffer
+   size_t size;                  /* Allocated. */
+   size_t length;                /* Used. */
+   char *buffer;
++# if HAVE_WCHAR_H
++  mbstate_t state;
++# endif
+ };
+ 
+ /* Initialize linebuffer LINEBUFFER for use. */
+diff -Naurp coreutils-8.25-orig/src/cut.c coreutils-8.25/src/cut.c
+--- coreutils-8.25-orig/src/cut.c	2016-01-13 05:08:59.000000000 -0600
++++ coreutils-8.25/src/cut.c	2016-02-08 19:07:10.300944616 -0600
+@@ -28,6 +28,11 @@
+ #include <assert.h>
+ #include <getopt.h>
+ #include <sys/types.h>
++
++/* Get mbstate_t, mbrtowc().  */
++#if HAVE_WCHAR_H
++# include <wchar.h>
++#endif
+ #include "system.h"
+ 
+ #include "error.h"
+@@ -38,6 +43,18 @@
+ 
+ #include "set-fields.h"
+ 
++/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC
++   installation; work around this configuration error.        */
++#if !defined MB_LEN_MAX || MB_LEN_MAX < 2
++# undef MB_LEN_MAX
++# define MB_LEN_MAX 16
++#endif
++
++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t.  */
++#if HAVE_MBRTOWC && defined mbstate_t
++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
++#endif
++
+ /* The official name of this program (e.g., no 'g' prefix).  */
+ #define PROGRAM_NAME "cut"
+ 
+@@ -54,6 +71,52 @@
+     }									\
+   while (0)
+ 
++/* Refill the buffer BUF to get a multibyte character. */
++#define REFILL_BUFFER(BUF, BUFPOS, BUFLEN, STREAM)                        \
++  do                                                                        \
++    {                                                                        \
++      if (BUFLEN < MB_LEN_MAX && !feof (STREAM) && !ferror (STREAM))        \
++        {                                                                \
++          memmove (BUF, BUFPOS, BUFLEN);                                \
++          BUFLEN += fread (BUF + BUFLEN, sizeof(char), BUFSIZ, STREAM); \
++          BUFPOS = BUF;                                                        \
++        }                                                                \
++    }                                                                        \
++  while (0)
++
++/* Get wide character on BUFPOS. BUFPOS is not included after that.
++   If byte sequence is not valid as a character, CONVFAIL is true. Otherwise false. */
++#define GET_NEXT_WC_FROM_BUFFER(WC, BUFPOS, BUFLEN, MBLENGTH, STATE, CONVFAIL) \
++  do                                                                        \
++    {                                                                        \
++      mbstate_t state_bak;                                                \
++                                                                        \
++      if (BUFLEN < 1)                                                        \
++        {                                                                \
++          WC = WEOF;                                                        \
++          break;                                                        \
++        }                                                                \
++                                                                        \
++      /* Get a wide character. */                                        \
++      CONVFAIL = false;                                                        \
++      state_bak = STATE;                                                \
++      MBLENGTH = mbrtowc ((wchar_t *)&WC, BUFPOS, BUFLEN, &STATE);        \
++                                                                        \
++      switch (MBLENGTH)                                                        \
++        {                                                                \
++        case (size_t)-1:                                                \
++        case (size_t)-2:                                                \
++          CONVFAIL = true;                                                        \
++          STATE = state_bak;                                                \
++          /* Fall througn. */                                                \
++                                                                        \
++        case 0:                                                                \
++          MBLENGTH = 1;                                                        \
++          break;                                                        \
++        }                                                                \
++    }                                                                        \
++  while (0)
++
+ 
+ /* Pointer inside RP.  When checking if a byte or field is selected
+    by a finite range, we check if it is between CURRENT_RP.LO
+@@ -61,6 +124,9 @@
+    CURRENT_RP.HI then we make CURRENT_RP to point to the next range pair. */
+ static struct field_range_pair *current_rp;
+ 
++/* Length of the delimiter given as argument to -d.  */
++size_t delimlen;
++
+ /* This buffer is used to support the semantics of the -s option
+    (or lack of same) when the specified field list includes (does
+    not include) the first field.  In both of those cases, the entire
+@@ -77,15 +143,25 @@ enum operating_mode
+   {
+     undefined_mode,
+ 
+-    /* Output characters that are in the given bytes. */
++    /* Output bytes that are at the given positions. */
+     byte_mode,
+ 
++    /* Output characters that are at the given positions. */
++    character_mode,
++
+     /* Output the given delimiter-separated fields. */
+     field_mode
+   };
+ 
+ static enum operating_mode operating_mode;
+ 
++/* If nonzero, when in byte mode, don't split multibyte characters.  */
++static int byte_mode_character_aware;
++
++/* If nonzero, the function for single byte locale is work
++   if this program runs on multibyte locale. */
++static int force_singlebyte_mode;
++
+ /* If true do not output lines containing no delimiter characters.
+    Otherwise, all such lines are printed.  This option is valid only
+    with field mode.  */
+@@ -97,6 +173,9 @@ static bool complement;
+ 
+ /* The delimiter character for field mode. */
+ static unsigned char delim;
++#if HAVE_WCHAR_H
++static wchar_t wcdelim;
++#endif
+ 
+ /* The delimiter for each line/record. */
+ static unsigned char line_delim = '\n';
+@@ -164,7 +243,7 @@ Print selected parts of lines from each
+   -f, --fields=LIST       select only these fields;  also print any line\n\
+                             that contains no delimiter character, unless\n\
+                             the -s option is specified\n\
+-  -n                      (ignored)\n\
++  -n                      with -b: don't split multibyte characters\n\
+ "), stdout);
+       fputs (_("\
+       --complement        complement the set of selected bytes, characters\n\
+@@ -280,6 +359,82 @@ cut_bytes (FILE *stream)
+     }
+ }
+ 
++#if HAVE_MBRTOWC
++/* This function is in use for the following case.
++
++   1. Read from the stream STREAM, printing to standard output any selected
++   characters.
++
++   2. Read from stream STREAM, printing to standard output any selected bytes,
++   without splitting multibyte characters.  */
++
++static void
++cut_characters_or_cut_bytes_no_split (FILE *stream)
++{
++  size_t idx;                /* number of bytes or characters in the line so far. */
++  char buf[MB_LEN_MAX + BUFSIZ];  /* For spooling a read byte sequence. */
++  char *bufpos;                /* Next read position of BUF. */
++  size_t buflen;        /* The length of the byte sequence in buf. */
++  wint_t wc;                /* A gotten wide character. */
++  size_t mblength;        /* The byte size of a multibyte character which shows
++                           as same character as WC. */
++  mbstate_t state;        /* State of the stream. */
++  bool convfail = false;  /* true, when conversion failed. Otherwise false. */
++  /* Whether to begin printing delimiters between ranges for the current line.
++     Set after we've begun printing data corresponding to the first range.  */
++  bool print_delimiter = false;
++
++  idx = 0;
++  buflen = 0;
++  bufpos = buf;
++  memset (&state, '\0', sizeof(mbstate_t));
++
++  current_rp = frp;
++
++  while (1)
++    {
++      REFILL_BUFFER (buf, bufpos, buflen, stream);
++
++      GET_NEXT_WC_FROM_BUFFER (wc, bufpos, buflen, mblength, state, convfail);
++      (void) convfail;  /* ignore unused */
++
++      if (wc == WEOF)
++        {
++          if (idx > 0)
++            putchar (line_delim);
++          break;
++        }
++      else if (wc == line_delim)
++        {
++          putchar (line_delim);
++          idx = 0;
++          print_delimiter = false;
++          current_rp = frp;
++        }
++      else
++        {
++          next_item (&idx);
++          if (print_kth (idx))
++            {
++              if (output_delimiter_specified)
++                {
++                  if (print_delimiter && is_range_start_index (idx))
++                    {
++                      fwrite (output_delimiter_string, sizeof (char),
++                              output_delimiter_length, stdout);
++                    }
++                  print_delimiter = true;
++                }
++              fwrite (bufpos, mblength, sizeof(char), stdout);
++            }
++        }
++
++      buflen -= mblength;
++      bufpos += mblength;
++    }
++}
++#endif
++
+ /* Read from stream STREAM, printing to standard output any selected fields.  */
+ 
+ static void
+@@ -425,13 +580,211 @@ cut_fields (FILE *stream)
+     }
+ }
+ 
++#if HAVE_MBRTOWC
++static void
++cut_fields_mb (FILE *stream)
++{
++  int c;
++  size_t field_idx;
++  int found_any_selected_field;
++  int buffer_first_field;
++  int empty_input;
++  char buf[MB_LEN_MAX + BUFSIZ];  /* For spooling a read byte sequence. */
++  char *bufpos;                /* Next read position of BUF. */
++  size_t buflen;        /* The length of the byte sequence in buf. */
++  wint_t wc = 0;        /* A gotten wide character. */
++  size_t mblength;        /* The byte size of a multibyte character which shows
++                           as same character as WC. */
++  mbstate_t state;        /* State of the stream. */
++  bool convfail = false;  /* true, when conversion failed. Otherwise false. */
++
++  current_rp = frp;
++
++  found_any_selected_field = 0;
++  field_idx = 1;
++  bufpos = buf;
++  buflen = 0;
++  memset (&state, '\0', sizeof(mbstate_t));
++
++  c = getc (stream);
++  empty_input = (c == EOF);
++  if (c != EOF)
++  {
++    ungetc (c, stream);
++    wc = 0;
++  }
++  else
++    wc = WEOF;
++
++  /* To support the semantics of the -s flag, we may have to buffer
++     all of the first field to determine whether it is `delimited.'
++     But that is unnecessary if all non-delimited lines must be printed
++     and the first field has been selected, or if non-delimited lines
++     must be suppressed and the first field has *not* been selected.
++     That is because a non-delimited line has exactly one field.  */
++  buffer_first_field = (suppress_non_delimited ^ !print_kth (1));
++
++  while (1)
++    {
++      if (field_idx == 1 && buffer_first_field)
++        {
++          int len = 0;
++
++          while (1)
++            {
++              REFILL_BUFFER (buf, bufpos, buflen, stream);
++
++              GET_NEXT_WC_FROM_BUFFER
++                (wc, bufpos, buflen, mblength, state, convfail);
++
++              if (wc == WEOF)
++                break;
++
++              field_1_buffer = xrealloc (field_1_buffer, len + mblength);
++              memcpy (field_1_buffer + len, bufpos, mblength);
++              len += mblength;
++              buflen -= mblength;
++              bufpos += mblength;
++
++              if (!convfail && (wc == line_delim || wc == wcdelim))
++                break;
++            }
++
++          if (len <= 0 && wc == WEOF)
++            break;
++
++          /* If the first field extends to the end of line (it is not
++             delimited) and we are printing all non-delimited lines,
++             print this one.  */
++          if (convfail || (!convfail && wc != wcdelim))
++            {
++              if (suppress_non_delimited)
++                {
++                  /* Empty.        */
++                }
++              else
++                {
++                  fwrite (field_1_buffer, sizeof (char), len, stdout);
++                  /* Make sure the output line is newline terminated.  */
++                  if (convfail || (!convfail && wc != line_delim))
++                    putchar (line_delim);
++                }
++              continue;
++            }
++
++          if (print_kth (1))
++            {
++              /* Print the field, but not the trailing delimiter.  */
++              fwrite (field_1_buffer, sizeof (char), len - 1, stdout);
++              found_any_selected_field = 1;
++            }
++          next_item (&field_idx);
++        }
++
++      if (wc != WEOF)
++        {
++          if (print_kth (field_idx))
++            {
++              if (found_any_selected_field)
++                {
++                  fwrite (output_delimiter_string, sizeof (char),
++                          output_delimiter_length, stdout);
++                }
++              found_any_selected_field = 1;
++            }
++
++          while (1)
++            {
++              REFILL_BUFFER (buf, bufpos, buflen, stream);
++
++              GET_NEXT_WC_FROM_BUFFER
++                (wc, bufpos, buflen, mblength, state, convfail);
++
++              if (wc == WEOF)
++                break;
++              else if (!convfail && (wc == wcdelim || wc == line_delim))
++                {
++                  buflen -= mblength;
++                  bufpos += mblength;
++                  break;
++                }
++
++              if (print_kth (field_idx))
++                fwrite (bufpos, mblength, sizeof(char), stdout);
++
++              buflen -= mblength;
++              bufpos += mblength;
++            }
++        }
++
++      if ((!convfail || wc == line_delim) && buflen < 1)
++        wc = WEOF;
++
++      if (!convfail && wc == wcdelim)
++        next_item (&field_idx);
++      else if (wc == WEOF || (!convfail && wc == line_delim))
++        {
++          if (found_any_selected_field
++              || (!empty_input && !(suppress_non_delimited && field_idx == 1)))
++            putchar (line_delim);
++          if (wc == WEOF)
++            break;
++          field_idx = 1;
++          current_rp = frp;
++          found_any_selected_field = 0;
++        }
++    }
++}
++#endif
++
+ static void
+ cut_stream (FILE *stream)
+ {
+-  if (operating_mode == byte_mode)
+-    cut_bytes (stream);
++#if HAVE_MBRTOWC
++  if (MB_CUR_MAX > 1 && !force_singlebyte_mode)
++    {
++      switch (operating_mode)
++        {
++        case byte_mode:
++          if (byte_mode_character_aware)
++            cut_characters_or_cut_bytes_no_split (stream);
++          else
++            cut_bytes (stream);
++          break;
++
++        case character_mode:
++          cut_characters_or_cut_bytes_no_split (stream);
++          break;
++
++        case field_mode:
++          if (delimlen == 1)
++            {
++              /* Check if we have utf8 multibyte locale, so we can use this
++                 optimization because of uniqueness of characters, which is
++                 not true for e.g. SJIS */
++              char * loc = setlocale(LC_CTYPE, NULL);
++              if (loc && (strstr (loc, "UTF-8") || strstr (loc, "utf-8") ||
++                  strstr (loc, "UTF8") || strstr (loc, "utf8")))
++                {
++                  cut_fields (stream);
++                  break;
++                }
++            }
++          cut_fields_mb (stream);
++          break;
++
++        default:
++          abort ();
++        }
++    }
+   else
+-    cut_fields (stream);
++#endif
++    {
++      if (operating_mode == field_mode)
++        cut_fields (stream);
++      else
++        cut_bytes (stream);
++    }
+ }
+ 
+ /* Process file FILE to standard output.
+@@ -483,6 +836,7 @@ main (int argc, char **argv)
+   bool ok;
+   bool delim_specified = false;
+   char *spec_list_string IF_LINT ( = NULL);
++  char mbdelim[MB_LEN_MAX + 1];
+ 
+   initialize_main (&argc, &argv);
+   set_program_name (argv[0]);
+@@ -505,7 +859,6 @@ main (int argc, char **argv)
+       switch (optc)
+         {
+         case 'b':
+-        case 'c':
+           /* Build the byte list. */
+           if (operating_mode != undefined_mode)
+             FATAL_ERROR (_("only one type of list may be specified"));
+@@ -513,6 +866,14 @@ main (int argc, char **argv)
+           spec_list_string = optarg;
+           break;
+ 
++        case 'c':
++          /* Build the character list. */
++          if (operating_mode != undefined_mode)
++            FATAL_ERROR (_("only one type of list may be specified"));
++          operating_mode = character_mode;
++          spec_list_string = optarg;
++          break;
++
+         case 'f':
+           /* Build the field list. */
+           if (operating_mode != undefined_mode)
+@@ -524,10 +885,38 @@ main (int argc, char **argv)
+         case 'd':
+           /* New delimiter. */
+           /* Interpret -d '' to mean 'use the NUL byte as the delimiter.'  */
+-          if (optarg[0] != '\0' && optarg[1] != '\0')
+-            FATAL_ERROR (_("the delimiter must be a single character"));
+-          delim = optarg[0];
+-          delim_specified = true;
++            {
++#if HAVE_MBRTOWC
++              if(MB_CUR_MAX > 1)
++                {
++                  mbstate_t state;
++
++                  memset (&state, '\0', sizeof(mbstate_t));
++                  delimlen = mbrtowc (&wcdelim, optarg, strnlen(optarg, MB_LEN_MAX), &state);
++
++                  if (delimlen == (size_t)-1 || delimlen == (size_t)-2)
++                    ++force_singlebyte_mode;
++                  else
++                    {
++                      delimlen = (delimlen < 1) ? 1 : delimlen;
++                      if (wcdelim != L'\0' && *(optarg + delimlen) != '\0')
++                        FATAL_ERROR (_("the delimiter must be a single character"));
++                      memcpy (mbdelim, optarg, delimlen);
++                      mbdelim[delimlen] = '\0';
++                      if (delimlen == 1)
++                        delim = *optarg;
++                    }
++                }
++
++              if (MB_CUR_MAX <= 1 || force_singlebyte_mode)
++#endif
++                {
++                  if (optarg[0] != '\0' && optarg[1] != '\0')
++                    FATAL_ERROR (_("the delimiter must be a single character"));
++                  delim = (unsigned char) optarg[0];
++                }
++            delim_specified = true;
++          }
+           break;
+ 
+         case OUTPUT_DELIMITER_OPTION:
+@@ -540,6 +929,7 @@ main (int argc, char **argv)
+           break;
+ 
+         case 'n':
++          byte_mode_character_aware = 1;
+           break;
+ 
+         case 's':
+@@ -579,15 +969,34 @@ main (int argc, char **argv)
+               | (complement ? SETFLD_COMPLEMENT : 0) );
+ 
+   if (!delim_specified)
+-    delim = '\t';
++    {
++      delim = '\t';
++#ifdef HAVE_MBRTOWC
++      wcdelim = L'\t';
++      mbdelim[0] = '\t';
++      mbdelim[1] = '\0';
++      delimlen = 1;
++#endif
++    }
+ 
+   if (output_delimiter_string == NULL)
+     {
+-      static char dummy[2];
+-      dummy[0] = delim;
+-      dummy[1] = '\0';
+-      output_delimiter_string = dummy;
+-      output_delimiter_length = 1;
++#ifdef HAVE_MBRTOWC
++      if (MB_CUR_MAX > 1 && !force_singlebyte_mode)
++        {
++          output_delimiter_string = xstrdup(mbdelim);
++          output_delimiter_length = delimlen;
++        }
++
++      if (MB_CUR_MAX <= 1 || force_singlebyte_mode)
++#endif
++        {
++          static char dummy[2];
++          dummy[0] = delim;
++          dummy[1] = '\0';
++          output_delimiter_string = dummy;
++          output_delimiter_length = 1;
++        }
+     }
+ 
+   if (optind == argc)
+diff -Naurp coreutils-8.25-orig/src/expand.c coreutils-8.25/src/expand.c
+--- coreutils-8.25-orig/src/expand.c	2016-01-01 07:48:50.000000000 -0600
++++ coreutils-8.25/src/expand.c	2016-02-08 19:07:10.301944619 -0600
+@@ -37,12 +37,34 @@
+ #include <stdio.h>
+ #include <getopt.h>
+ #include <sys/types.h>
++
++/* Get mbstate_t, mbrtowc(), wcwidth(). */
++#if HAVE_WCHAR_H
++# include <wchar.h>
++#endif
++
++/* Get iswblank(). */
++#if HAVE_WCTYPE_H
++# include <wctype.h>
++#endif
++
+ #include "system.h"
+ #include "error.h"
+ #include "fadvise.h"
+ #include "quote.h"
+ #include "xstrndup.h"
+ 
++/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC
++   installation; work around this configuration error.  */
++#if !defined MB_LEN_MAX || MB_LEN_MAX < 2
++# define MB_LEN_MAX 16
++#endif
++
++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t.  */
++#if HAVE_MBRTOWC && defined mbstate_t
++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
++#endif
++
+ /* The official name of this program (e.g., no 'g' prefix).  */
+ #define PROGRAM_NAME "expand"
+ 
+@@ -357,6 +379,142 @@ expand (void)
+     }
+ }
+ 
++#if HAVE_MBRTOWC
++static void
++expand_multibyte (void)
++{
++  FILE *fp;			/* Input strem. */
++  mbstate_t i_state;		/* Current shift state of the input stream. */
++  mbstate_t i_state_bak;	/* Back up the I_STATE. */
++  mbstate_t o_state;		/* Current shift state of the output stream. */
++  char buf[MB_LEN_MAX + BUFSIZ];  /* For spooling a read byte sequence. */
++  char *bufpos = buf;			/* Next read position of BUF. */
++  size_t buflen = 0;		/* The length of the byte sequence in buf. */
++  wchar_t wc;			/* A gotten wide character. */
++  size_t mblength;		/* The byte size of a multibyte character
++				   which shows as same character as WC. */
++  int tab_index = 0;		/* Index in `tab_list' of next tabstop. */
++  int column = 0;		/* Column on screen of the next char. */
++  int next_tab_column;		/* Column the next tab stop is on. */
++  int convert = 1;		/* If nonzero, perform translations. */
++
++  fp = next_file ((FILE *) NULL);
++  if (fp == NULL)
++    return;
++
++  memset (&o_state, '\0', sizeof(mbstate_t));
++  memset (&i_state, '\0', sizeof(mbstate_t));
++
++  for (;;)
++    {
++      /* Refill the buffer BUF. */
++      if (buflen < MB_LEN_MAX && !feof(fp) && !ferror(fp))
++	{
++	  memmove (buf, bufpos, buflen);
++	  buflen += fread (buf + buflen, sizeof(char), BUFSIZ, fp);
++	  bufpos = buf;
++	}
++
++      /* No character is left in BUF. */
++      if (buflen < 1)
++	{
++	  fp = next_file (fp);
++
++	  if (fp == NULL)
++	    break;		/* No more files. */
++	  else
++	    {
++	      memset (&i_state, '\0', sizeof(mbstate_t));
++	      continue;
++	    }
++	}
++
++      /* Get a wide character. */
++      i_state_bak = i_state;
++      mblength = mbrtowc (&wc, bufpos, buflen, &i_state);
++
++      switch (mblength)
++	{
++	case (size_t)-1:	/* illegal byte sequence. */
++	case (size_t)-2:
++	  mblength = 1;
++	  i_state = i_state_bak;
++	  if (convert)
++	    {
++	      ++column;
++	      if (convert_entire_line == 0 && !isblank(*bufpos))
++		convert = 0;
++	    }
++	  putchar (*bufpos);
++	  break;
++
++	case 0:		/* null. */
++	  mblength = 1;
++	  if (convert && convert_entire_line == 0)
++	    convert = 0;
++	  putchar ('\0');
++	  break;
++
++	default:
++	  if (wc == L'\n')   /* LF. */
++	    {
++	      tab_index = 0;
++	      column = 0;
++	      convert = 1;
++	      putchar ('\n');
++	    }
++	  else if (wc == L'\t' && convert)	/* Tab. */
++	    {
++	      if (tab_size == 0)
++		{
++		  /* Do not let tab_index == first_free_tab;
++		     stop when it is 1 less. */
++		  while (tab_index < first_free_tab - 1
++		      && column >= tab_list[tab_index])
++		    tab_index++;
++		  next_tab_column = tab_list[tab_index];
++		  if (tab_index < first_free_tab - 1)
++		    tab_index++;
++		  if (column >= next_tab_column)
++		    next_tab_column = column + 1;
++		}
++	      else
++		next_tab_column = column + tab_size - column % tab_size;
++
++	      while (column < next_tab_column)
++		{
++		  putchar (' ');
++		  ++column;
++		}
++	    }
++	  else  /* Others. */
++	    {
++	      if (convert)
++		{
++		  if (wc == L'\b')
++		    {
++		      if (column > 0)
++			--column;
++		    }
++		  else
++		    {
++		      int width;		/* The width of WC. */
++
++		      width = wcwidth (wc);
++		      column += (width > 0) ? width : 0;
++		      if (convert_entire_line == 0 && !iswblank(wc))
++			convert = 0;
++		    }
++		}
++	      fwrite (bufpos, sizeof(char), mblength, stdout);
++	    }
++	}
++      buflen -= mblength;
++      bufpos += mblength;
++    }
++}
++#endif
++
+ int
+ main (int argc, char **argv)
+ {
+@@ -421,7 +579,12 @@ main (int argc, char **argv)
+ 
+   file_list = (optind < argc ? &argv[optind] : stdin_argv);
+ 
+-  expand ();
++#if HAVE_MBRTOWC
++  if (MB_CUR_MAX > 1)
++    expand_multibyte ();
++  else
++#endif
++    expand ();
+ 
+   if (have_read_stdin && fclose (stdin) != 0)
+     error (EXIT_FAILURE, errno, "-");
+diff -Naurp coreutils-8.25-orig/src/fold.c coreutils-8.25/src/fold.c
+--- coreutils-8.25-orig/src/fold.c	2016-01-01 07:48:50.000000000 -0600
++++ coreutils-8.25/src/fold.c	2016-02-08 19:07:10.302944622 -0600
+@@ -22,11 +22,33 @@
+ #include <getopt.h>
+ #include <sys/types.h>
+ 
++/* Get mbstate_t, mbrtowc(), wcwidth().  */
++#if HAVE_WCHAR_H
++# include <wchar.h>
++#endif
++
++/* Get iswprint(), iswblank(), wcwidth().  */
++#if HAVE_WCTYPE_H
++# include <wctype.h>
++#endif
++
+ #include "system.h"
+ #include "error.h"
+ #include "fadvise.h"
+ #include "xdectoint.h"
+ 
++/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC
++      installation; work around this configuration error.  */
++#if !defined MB_LEN_MAX || MB_LEN_MAX < 2
++# undef MB_LEN_MAX
++# define MB_LEN_MAX 16
++#endif
++
++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t.  */
++#if HAVE_MBRTOWC && defined mbstate_t
++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
++#endif
++
+ #define TAB_WIDTH 8
+ 
+ /* The official name of this program (e.g., no 'g' prefix).  */
+@@ -34,20 +56,41 @@
+ 
+ #define AUTHORS proper_name ("David MacKenzie")
+ 
++#define FATAL_ERROR(Message)                                            \
++  do                                                                    \
++    {                                                                   \
++      error (0, 0, (Message));                                          \
++      usage (2);                                                        \
++    }                                                                   \
++  while (0)
++
++enum operating_mode
++{
++  /* Fold texts by columns that are at the given positions. */
++  column_mode,
++
++  /* Fold texts by bytes that are at the given positions. */
++  byte_mode,
++
++  /* Fold texts by characters that are at the given positions. */
++  character_mode,
++};
++
++/* The argument shows current mode. (Default: column_mode) */
++static enum operating_mode operating_mode;
++
+ /* If nonzero, try to break on whitespace. */
+ static bool break_spaces;
+ 
+-/* If nonzero, count bytes, not column positions. */
+-static bool count_bytes;
+-
+ /* If nonzero, at least one of the files we read was standard input. */
+ static bool have_read_stdin;
+ 
+-static char const shortopts[] = "bsw:0::1::2::3::4::5::6::7::8::9::";
++static char const shortopts[] = "bcsw:0::1::2::3::4::5::6::7::8::9::";
+ 
+ static struct option const longopts[] =
+ {
+   {"bytes", no_argument, NULL, 'b'},
++  {"characters", no_argument, NULL, 'c'},
+   {"spaces", no_argument, NULL, 's'},
+   {"width", required_argument, NULL, 'w'},
+   {GETOPT_HELP_OPTION_DECL},
+@@ -75,6 +118,7 @@ Wrap input lines in each FILE, writing t
+ 
+       fputs (_("\
+   -b, --bytes         count bytes rather than columns\n\
++  -c, --characters    count characters rather than columns\n\
+   -s, --spaces        break at spaces\n\
+   -w, --width=WIDTH   use WIDTH columns instead of 80\n\
+ "), stdout);
+@@ -92,7 +136,7 @@ Wrap input lines in each FILE, writing t
+ static size_t
+ adjust_column (size_t column, char c)
+ {
+-  if (!count_bytes)
++  if (operating_mode != byte_mode)
+     {
+       if (c == '\b')
+         {
+@@ -115,30 +159,14 @@ adjust_column (size_t column, char c)
+    to stdout, with maximum line length WIDTH.
+    Return true if successful.  */
+ 
+-static bool
+-fold_file (char const *filename, size_t width)
++static void
++fold_text (FILE *istream, size_t width, int *saved_errno)
+ {
+-  FILE *istream;
+   int c;
+   size_t column = 0;		/* Screen column where next char will go. */
+   size_t offset_out = 0;	/* Index in 'line_out' for next char. */
+   static char *line_out = NULL;
+   static size_t allocated_out = 0;
+-  int saved_errno;
+-
+-  if (STREQ (filename, "-"))
+-    {
+-      istream = stdin;
+-      have_read_stdin = true;
+-    }
+-  else
+-    istream = fopen (filename, "r");
+-
+-  if (istream == NULL)
+-    {
+-      error (0, errno, "%s", quotef (filename));
+-      return false;
+-    }
+ 
+   fadvise (istream, FADVISE_SEQUENTIAL);
+ 
+@@ -168,6 +196,15 @@ fold_file (char const *filename, size_t
+               bool found_blank = false;
+               size_t logical_end = offset_out;
+ 
++              /* If LINE_OUT has no wide character,
++                 put a new wide character in LINE_OUT
++                 if column is bigger than width. */
++              if (offset_out == 0)
++                {
++                  line_out[offset_out++] = c;
++                  continue;
++                }
++
+               /* Look for the last blank. */
+               while (logical_end)
+                 {
+@@ -214,11 +251,221 @@ fold_file (char const *filename, size_t
+       line_out[offset_out++] = c;
+     }
+ 
+-  saved_errno = errno;
++  *saved_errno = errno;
++
++  if (offset_out)
++    fwrite (line_out, sizeof (char), (size_t) offset_out, stdout);
++
++}
++
++#if HAVE_MBRTOWC
++static void
++fold_multibyte_text (FILE *istream, size_t width, int *saved_errno)
++{
++  char buf[MB_LEN_MAX + BUFSIZ];  /* For spooling a read byte sequence. */
++  size_t buflen = 0;        /* The length of the byte sequence in buf. */
++  char *bufpos = buf;         /* Next read position of BUF. */
++  wint_t wc;                /* A gotten wide character. */
++  size_t mblength;        /* The byte size of a multibyte character which shows
++                           as same character as WC. */
++  mbstate_t state, state_bak;        /* State of the stream. */
++  int convfail = 0;                /* 1, when conversion is failed. Otherwise 0. */
++
++  static char *line_out = NULL;
++  size_t offset_out = 0;        /* Index in `line_out' for next char. */
++  static size_t allocated_out = 0;
++
++  int increment;
++  size_t column = 0;
++
++  size_t last_blank_pos;
++  size_t last_blank_column;
++  int is_blank_seen;
++  int last_blank_increment = 0;
++  int is_bs_following_last_blank;
++  size_t bs_following_last_blank_num;
++  int is_cr_after_last_blank;
++
++#define CLEAR_FLAGS                                \
++   do                                                \
++     {                                                \
++        last_blank_pos = 0;                        \
++        last_blank_column = 0;                        \
++        is_blank_seen = 0;                        \
++        is_bs_following_last_blank = 0;                \
++        bs_following_last_blank_num = 0;        \
++        is_cr_after_last_blank = 0;                \
++     }                                                \
++   while (0)
++
++#define START_NEW_LINE                        \
++   do                                        \
++     {                                        \
++      putchar ('\n');                        \
++      column = 0;                        \
++      offset_out = 0;                        \
++      CLEAR_FLAGS;                        \
++    }                                        \
++   while (0)
++
++  CLEAR_FLAGS;
++  memset (&state, '\0', sizeof(mbstate_t));
++
++  for (;; bufpos += mblength, buflen -= mblength)
++    {
++      if (buflen < MB_LEN_MAX && !feof (istream) && !ferror (istream))
++        {
++          memmove (buf, bufpos, buflen);
++          buflen += fread (buf + buflen, sizeof(char), BUFSIZ, istream);
++          bufpos = buf;
++        }
++
++      if (buflen < 1)
++        break;
++
++      /* Get a wide character. */
++      state_bak = state;
++      mblength = mbrtowc ((wchar_t *)&wc, bufpos, buflen, &state);
++
++      switch (mblength)
++        {
++        case (size_t)-1:
++        case (size_t)-2:
++          convfail++;
++          state = state_bak;
++          /* Fall through. */
++
++        case 0:
++          mblength = 1;
++          break;
++        }
++
++rescan:
++      if (operating_mode == byte_mode)                        /* byte mode */
++        increment = mblength;
++      else if (operating_mode == character_mode)        /* character mode */
++        increment = 1;
++      else                                                /* column mode */
++        {
++          if (convfail)
++            increment = 1;
++          else
++            {
++              switch (wc)
++                {
++                case L'\n':
++                  fwrite (line_out, sizeof(char), offset_out, stdout);
++                  START_NEW_LINE;
++                  continue;
++
++                case L'\b':
++                  increment = (column > 0) ? -1 : 0;
++                  break;
++
++                case L'\r':
++                  increment = -1 * column;
++                  break;
++
++                case L'\t':
++                  increment = 8 - column % 8;
++                  break;
++
++                default:
++                  increment = wcwidth (wc);
++                  increment = (increment < 0) ? 0 : increment;
++                }
++            }
++        }
++
++      if (column + increment > width && break_spaces && last_blank_pos)
++        {
++          fwrite (line_out, sizeof(char), last_blank_pos, stdout);
++          putchar ('\n');
++
++          offset_out = offset_out - last_blank_pos;
++          column = column - last_blank_column + ((is_cr_after_last_blank)
++              ? last_blank_increment : bs_following_last_blank_num);
++          memmove (line_out, line_out + last_blank_pos, offset_out);
++          CLEAR_FLAGS;
++          goto rescan;
++        }
++
++      if (column + increment > width && column != 0)
++        {
++          fwrite (line_out, sizeof(char), offset_out, stdout);
++          START_NEW_LINE;
++          goto rescan;
++        }
++
++      if (allocated_out < offset_out + mblength)
++        {
++          line_out = X2REALLOC (line_out, &allocated_out);
++        }
++
++      memcpy (line_out + offset_out, bufpos, mblength);
++      offset_out += mblength;
++      column += increment;
++
++      if (is_blank_seen && !convfail && wc == L'\r')
++        is_cr_after_last_blank = 1;
++
++      if (is_bs_following_last_blank && !convfail && wc == L'\b')
++        ++bs_following_last_blank_num;
++      else
++        is_bs_following_last_blank = 0;
++
++      if (break_spaces && !convfail && iswblank (wc))
++        {
++          last_blank_pos = offset_out;
++          last_blank_column = column;
++          is_blank_seen = 1;
++          last_blank_increment = increment;
++          is_bs_following_last_blank = 1;
++          bs_following_last_blank_num = 0;
++          is_cr_after_last_blank = 0;
++        }
++    }
++
++  *saved_errno = errno;
+ 
+   if (offset_out)
+     fwrite (line_out, sizeof (char), (size_t) offset_out, stdout);
+ 
++}
++#endif
++
++/* Fold file FILENAME, or standard input if FILENAME is "-",
++   to stdout, with maximum line length WIDTH.
++   Return 0 if successful, 1 if an error occurs. */
++
++static bool
++fold_file (char const *filename, size_t width)
++{
++  FILE *istream;
++  int saved_errno;
++
++  if (STREQ (filename, "-"))
++    {
++      istream = stdin;
++      have_read_stdin = 1;
++    }
++  else
++    istream = fopen (filename, "r");
++
++  if (istream == NULL)
++    {
++      error (0, errno, "%s", quotef (filename));
++      return 1;
++    }
++
++  /* Define how ISTREAM is being folded. */
++#if HAVE_MBRTOWC
++  if (MB_CUR_MAX > 1)
++    fold_multibyte_text (istream, width, &saved_errno);
++  else
++#endif
++    fold_text (istream, width, &saved_errno);
++
+   if (ferror (istream))
+     {
+       error (0, saved_errno, "%s", quotef (filename));
+@@ -251,7 +498,8 @@ main (int argc, char **argv)
+ 
+   atexit (close_stdout);
+ 
+-  break_spaces = count_bytes = have_read_stdin = false;
++  operating_mode = column_mode;
++  break_spaces = have_read_stdin = false;
+ 
+   while ((optc = getopt_long (argc, argv, shortopts, longopts, NULL)) != -1)
+     {
+@@ -260,7 +508,15 @@ main (int argc, char **argv)
+       switch (optc)
+         {
+         case 'b':		/* Count bytes rather than columns. */
+-          count_bytes = true;
++          if (operating_mode != column_mode)
++            FATAL_ERROR (_("only one way of folding may be specified"));
++          operating_mode = byte_mode;
++          break;
++
++        case 'c':
++          if (operating_mode != column_mode)
++            FATAL_ERROR (_("only one way of folding may be specified"));
++          operating_mode = character_mode;
+           break;
+ 
+         case 's':		/* Break at word boundaries. */
+diff -Naurp coreutils-8.25-orig/src/join.c coreutils-8.25/src/join.c
+--- coreutils-8.25-orig/src/join.c	2016-01-13 05:08:59.000000000 -0600
++++ coreutils-8.25/src/join.c	2016-02-08 19:07:10.303944625 -0600
+@@ -22,18 +22,32 @@
+ #include <sys/types.h>
+ #include <getopt.h>
+ 
++/* Get mbstate_t, mbrtowc(), mbrtowc(), wcwidth().  */
++#if HAVE_WCHAR_H
++# include <wchar.h>
++#endif
++
++/* Get iswblank(), towupper.  */
++#if HAVE_WCTYPE_H
++# include <wctype.h>
++#endif
++
+ #include "system.h"
+ #include "error.h"
+ #include "fadvise.h"
+ #include "hard-locale.h"
+ #include "linebuffer.h"
+-#include "memcasecmp.h"
+ #include "quote.h"
+ #include "stdio--.h"
+ #include "xmemcoll.h"
+ #include "xstrtol.h"
+ #include "argmatch.h"
+ 
++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t.  */
++#if HAVE_MBRTOWC && defined mbstate_t
++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
++#endif
++
+ /* The official name of this program (e.g., no 'g' prefix).  */
+ #define PROGRAM_NAME "join"
+ 
+@@ -135,10 +149,12 @@ static struct outlist outlist_head;
+ /* Last element in 'outlist', where a new element can be added.  */
+ static struct outlist *outlist_end = &outlist_head;
+ 
+-/* Tab character separating fields.  If negative, fields are separated
+-   by any nonempty string of blanks, otherwise by exactly one
+-   tab character whose value (when cast to unsigned char) equals TAB.  */
+-static int tab = -1;
++/* Tab character separating fields.  If NULL, fields are separated
++   by any nonempty string of blanks.  */
++static char *tab = NULL;
++
++/* The number of bytes used for tab. */
++static size_t tablen = 0;
+ 
+ /* If nonzero, check that the input is correctly ordered. */
+ static enum
+@@ -275,13 +291,14 @@ xfields (struct line *line)
+   if (ptr == lim)
+     return;
+ 
+-  if (0 <= tab && tab != '\n')
++  if (tab != NULL)
+     {
++      unsigned char t = tab[0];
+       char *sep;
+-      for (; (sep = memchr (ptr, tab, lim - ptr)) != NULL; ptr = sep + 1)
++      for (; (sep = memchr (ptr, t, lim - ptr)) != NULL; ptr = sep + 1)
+         extract_field (line, ptr, sep - ptr);
+     }
+-  else if (tab < 0)
++   else
+     {
+       /* Skip leading blanks before the first field.  */
+       while (field_sep (*ptr))
+@@ -305,6 +322,147 @@ xfields (struct line *line)
+   extract_field (line, ptr, lim - ptr);
+ }
+ 
++#if HAVE_MBRTOWC
++static void
++xfields_multibyte (struct line *line)
++{
++  char *ptr = line->buf.buffer;
++  char const *lim = ptr + line->buf.length - 1;
++  wchar_t wc = 0;
++  size_t mblength = 1;
++  mbstate_t state, state_bak;
++
++  memset (&state, 0, sizeof (mbstate_t));
++
++  if (ptr >= lim)
++    return;
++
++  if (tab != NULL)
++    {
++      char *sep = ptr;
++      for (; ptr < lim; ptr = sep + mblength)
++	{
++	  sep = ptr;
++	  while (sep < lim)
++	    {
++	      state_bak = state;
++	      mblength = mbrtowc (&wc, sep, lim - sep + 1, &state);
++
++	      if (mblength == (size_t)-1 || mblength == (size_t)-2)
++		{
++		  mblength = 1;
++		  state = state_bak;
++		}
++	      mblength = (mblength < 1) ? 1 : mblength;
++
++	      if (mblength == tablen && !memcmp (sep, tab, mblength))
++		break;
++	      else
++		{
++		  sep += mblength;
++		  continue;
++		}
++	    }
++
++	  if (sep >= lim)
++	    break;
++
++	  extract_field (line, ptr, sep - ptr);
++	}
++    }
++  else
++    {
++      /* Skip leading blanks before the first field.  */
++      while(ptr < lim)
++      {
++        state_bak = state;
++        mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state);
++
++        if (mblength == (size_t)-1 || mblength == (size_t)-2)
++          {
++            mblength = 1;
++            state = state_bak;
++            break;
++          }
++        mblength = (mblength < 1) ? 1 : mblength;
++
++        if (!iswblank(wc) && wc != '\n')
++          break;
++        ptr += mblength;
++      }
++
++      do
++	{
++	  char *sep;
++	  state_bak = state;
++	  mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state);
++	  if (mblength == (size_t)-1 || mblength == (size_t)-2)
++	    {
++	      mblength = 1;
++	      state = state_bak;
++	      break;
++	    }
++	  mblength = (mblength < 1) ? 1 : mblength;
++
++	  sep = ptr + mblength;
++	  while (sep < lim)
++	    {
++	      state_bak = state;
++	      mblength = mbrtowc (&wc, sep, lim - sep + 1, &state);
++	      if (mblength == (size_t)-1 || mblength == (size_t)-2)
++		{
++		  mblength = 1;
++		  state = state_bak;
++		  break;
++		}
++	      mblength = (mblength < 1) ? 1 : mblength;
++
++	      if (iswblank (wc) || wc == '\n')
++		break;
++
++	      sep += mblength;
++	    }
++
++	  extract_field (line, ptr, sep - ptr);
++	  if (sep >= lim)
++	    return;
++
++	  state_bak = state;
++	  mblength = mbrtowc (&wc, sep, lim - sep + 1, &state);
++	  if (mblength == (size_t)-1 || mblength == (size_t)-2)
++	    {
++	      mblength = 1;
++	      state = state_bak;
++	      break;
++	    }
++	  mblength = (mblength < 1) ? 1 : mblength;
++
++	  ptr = sep + mblength;
++	  while (ptr < lim)
++	    {
++	      state_bak = state;
++	      mblength = mbrtowc (&wc, ptr, lim - ptr + 1, &state);
++	      if (mblength == (size_t)-1 || mblength == (size_t)-2)
++		{
++		  mblength = 1;
++		  state = state_bak;
++		  break;
++		}
++	      mblength = (mblength < 1) ? 1 : mblength;
++
++	      if (!iswblank (wc) && wc != '\n')
++		break;
++
++	      ptr += mblength;
++	    }
++	}
++      while (ptr < lim);
++    }
++
++  extract_field (line, ptr, lim - ptr);
++}
++#endif
++
+ static void
+ freeline (struct line *line)
+ {
+@@ -326,56 +484,133 @@ keycmp (struct line const *line1, struct
+         size_t jf_1, size_t jf_2)
+ {
+   /* Start of field to compare in each file.  */
+-  char *beg1;
+-  char *beg2;
+-
+-  size_t len1;
+-  size_t len2;		/* Length of fields to compare.  */
++  char *beg[2];
++  char *copy[2];
++  size_t len[2]; 	/* Length of fields to compare.  */
+   int diff;
++  int i, j;
++  int mallocd = 0;
+ 
+   if (jf_1 < line1->nfields)
+     {
+-      beg1 = line1->fields[jf_1].beg;
+-      len1 = line1->fields[jf_1].len;
++      beg[0] = line1->fields[jf_1].beg;
++      len[0] = line1->fields[jf_1].len;
+     }
+   else
+     {
+-      beg1 = NULL;
+-      len1 = 0;
++      beg[0] = NULL;
++      len[0] = 0;
+     }
+ 
+   if (jf_2 < line2->nfields)
+     {
+-      beg2 = line2->fields[jf_2].beg;
+-      len2 = line2->fields[jf_2].len;
++      beg[1] = line2->fields[jf_2].beg;
++      len[1] = line2->fields[jf_2].len;
+     }
+   else
+     {
+-      beg2 = NULL;
+-      len2 = 0;
++      beg[1] = NULL;
++      len[1] = 0;
+     }
+ 
+-  if (len1 == 0)
+-    return len2 == 0 ? 0 : -1;
+-  if (len2 == 0)
++  if (len[0] == 0)
++    return len[1] == 0 ? 0 : -1;
++  if (len[1] == 0)
+     return 1;
+ 
+   if (ignore_case)
+     {
+-      /* FIXME: ignore_case does not work with NLS (in particular,
+-         with multibyte chars).  */
+-      diff = memcasecmp (beg1, beg2, MIN (len1, len2));
++#ifdef HAVE_MBRTOWC
++      if (MB_CUR_MAX > 1)
++      {
++        size_t mblength;
++        wchar_t wc, uwc;
++        mbstate_t state, state_bak;
++
++        memset (&state, '\0', sizeof (mbstate_t));
++
++        for (i = 0; i < 2; i++)
++          {
++            mallocd = 1;
++            copy[i] = xmalloc (len[i] + 1);
++            memset (copy[i], '\0',len[i] + 1);
++
++            for (j = 0; j < MIN (len[0], len[1]);)
++              {
++                state_bak = state;
++                mblength = mbrtowc (&wc, beg[i] + j, len[i] - j, &state);
++
++                switch (mblength)
++                  {
++                  case (size_t) -1:
++                  case (size_t) -2:
++                    state = state_bak;
++                    /* Fall through */
++                  case 0:
++                    mblength = 1;
++                    break;
++
++                  default:
++                    uwc = towupper (wc);
++
++                    if (uwc != wc)
++                      {
++                        mbstate_t state_wc;
++                        size_t mblen;
++
++                        memset (&state_wc, '\0', sizeof (mbstate_t));
++                        mblen = wcrtomb (copy[i] + j, uwc, &state_wc);
++                        assert (mblen != (size_t)-1);
++                      }
++                    else
++                      memcpy (copy[i] + j, beg[i] + j, mblength);
++                  }
++                j += mblength;
++              }
++            copy[i][j] = '\0';
++          }
++      }
++      else
++#endif
++      {
++        for (i = 0; i < 2; i++)
++          {
++            mallocd = 1;
++            copy[i] = xmalloc (len[i] + 1);
++
++            for (j = 0; j < MIN (len[0], len[1]); j++)
++              copy[i][j] = toupper (beg[i][j]);
++
++            copy[i][j] = '\0';
++          }
++      }
+     }
+   else
+     {
+-      if (hard_LC_COLLATE)
+-        return xmemcoll (beg1, len1, beg2, len2);
+-      diff = memcmp (beg1, beg2, MIN (len1, len2));
++      copy[0] = beg[0];
++      copy[1] = beg[1];
++    }
++
++  if (hard_LC_COLLATE)
++    {
++      diff = xmemcoll ((char *) copy[0], len[0], (char *) copy[1], len[1]);
++
++      if (mallocd)
++        for (i = 0; i < 2; i++)
++          free (copy[i]);
++
++      return diff;
+     }
++  diff = memcmp (copy[0], copy[1], MIN (len[0], len[1]));
++
++  if (mallocd)
++    for (i = 0; i < 2; i++)
++      free (copy[i]);
++
+ 
+   if (diff)
+     return diff;
+-  return len1 < len2 ? -1 : len1 != len2;
++  return len[0] - len[1];
+ }
+ 
+ /* Check that successive input lines PREV and CURRENT from input file
+@@ -467,6 +702,11 @@ get_line (FILE *fp, struct line **linep,
+     }
+   ++line_no[which - 1];
+ 
++#if HAVE_MBRTOWC
++  if (MB_CUR_MAX > 1)
++    xfields_multibyte (line);
++  else
++#endif
+   xfields (line);
+ 
+   if (prevline[which - 1])
+@@ -566,21 +806,28 @@ prfield (size_t n, struct line const *li
+ 
+ /* Output all the fields in line, other than the join field.  */
+ 
++#define PUT_TAB_CHAR							\
++  do									\
++    {									\
++      (tab != NULL) ?							\
++	fwrite(tab, sizeof(char), tablen, stdout) : putchar (' ');	\
++    }									\
++  while (0)
++
+ static void
+ prfields (struct line const *line, size_t join_field, size_t autocount)
+ {
+   size_t i;
+   size_t nfields = autoformat ? autocount : line->nfields;
+-  char output_separator = tab < 0 ? ' ' : tab;
+ 
+   for (i = 0; i < join_field && i < nfields; ++i)
+     {
+-      putchar (output_separator);
++      PUT_TAB_CHAR;
+       prfield (i, line);
+     }
+   for (i = join_field + 1; i < nfields; ++i)
+     {
+-      putchar (output_separator);
++      PUT_TAB_CHAR;
+       prfield (i, line);
+     }
+ }
+@@ -591,7 +838,6 @@ static void
+ prjoin (struct line const *line1, struct line const *line2)
+ {
+   const struct outlist *outlist;
+-  char output_separator = tab < 0 ? ' ' : tab;
+   size_t field;
+   struct line const *line;
+ 
+@@ -625,7 +871,7 @@ prjoin (struct line const *line1, struct
+           o = o->next;
+           if (o == NULL)
+             break;
+-          putchar (output_separator);
++          PUT_TAB_CHAR;
+         }
+       putchar (eolchar);
+     }
+@@ -1103,21 +1349,46 @@ main (int argc, char **argv)
+ 
+         case 't':
+           {
+-            unsigned char newtab = optarg[0];
++            char *newtab = NULL;
++            size_t newtablen;
++            newtab = xstrdup (optarg);
++#if HAVE_MBRTOWC
++            if (MB_CUR_MAX > 1)
++              {
++                mbstate_t state;
++
++                memset (&state, 0, sizeof (mbstate_t));
++                newtablen = mbrtowc (NULL, newtab,
++                                     strnlen (newtab, MB_LEN_MAX),
++                                     &state);
++                if (newtablen == (size_t) 0
++                    || newtablen == (size_t) -1
++                    || newtablen == (size_t) -2)
++                  newtablen = 1;
++              }
++            else
++#endif
++              newtablen = 1;
+             if (! newtab)
+-              newtab = '\n'; /* '' => process the whole line.  */
++            {
++              newtab = (char*)"\n"; /* '' => process the whole line.  */
++            }
+             else if (optarg[1])
+               {
+-                if (STREQ (optarg, "\\0"))
+-                  newtab = '\0';
+-                else
+-                  error (EXIT_FAILURE, 0, _("multi-character tab %s"),
+-                         quote (optarg));
++                if (newtablen == 1 && newtab[1])
++                {
++                  if (STREQ (newtab, "\\0"))
++                     newtab[0] = '\0';
++                }
++              }
++            if (tab != NULL && strcmp (tab, newtab))
++              {
++                free (newtab);
++                error (EXIT_FAILURE, 0, _("incompatible tabs"));
+               }
+-            if (0 <= tab && tab != newtab)
+-              error (EXIT_FAILURE, 0, _("incompatible tabs"));
+             tab = newtab;
+-          }
++            tablen = newtablen;
++           }
+           break;
+ 
+         case 'z':
+diff -Naurp coreutils-8.25-orig/src/pr.c coreutils-8.25/src/pr.c
+--- coreutils-8.25-orig/src/pr.c	2016-01-01 07:48:50.000000000 -0600
++++ coreutils-8.25/src/pr.c	2016-02-08 19:07:10.306944635 -0600
+@@ -311,6 +311,24 @@
+ 
+ #include <getopt.h>
+ #include <sys/types.h>
++
++/* Get MB_LEN_MAX.  */
++#include <limits.h>
++/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC
++   installation; work around this configuration error.  */
++#if !defined MB_LEN_MAX || MB_LEN_MAX == 1
++# define MB_LEN_MAX 16
++#endif
++
++/* Get MB_CUR_MAX.  */
++#include <stdlib.h>
++
++/* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.  */
++/* Get mbstate_t, mbrtowc(), wcwidth().  */
++#if HAVE_WCHAR_H
++# include <wchar.h>
++#endif
++
+ #include "system.h"
+ #include "error.h"
+ #include "fadvise.h"
+@@ -323,6 +341,18 @@
+ #include "xstrtol.h"
+ #include "xdectoint.h"
+ 
++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t.  */
++#if HAVE_MBRTOWC && defined mbstate_t
++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
++#endif
++
++#ifndef HAVE_DECL_WCWIDTH
++"this configure-time declaration test was not run"
++#endif
++#if !HAVE_DECL_WCWIDTH
++extern int wcwidth ();
++#endif
++
+ /* The official name of this program (e.g., no 'g' prefix).  */
+ #define PROGRAM_NAME "pr"
+ 
+@@ -415,7 +445,20 @@ struct COLUMN
+ 
+ typedef struct COLUMN COLUMN;
+ 
+-static int char_to_clump (char c);
++/* Funtion pointers to switch functions for single byte locale or for
++   multibyte locale. If multibyte functions do not exist in your sysytem,
++   these pointers always point the function for single byte locale. */
++static void (*print_char) (char c);
++static int (*char_to_clump) (char c);
++
++/* Functions for single byte locale. */
++static void print_char_single (char c);
++static int char_to_clump_single (char c);
++
++/* Functions for multibyte locale. */
++static void print_char_multi (char c);
++static int char_to_clump_multi (char c);
++
+ static bool read_line (COLUMN *p);
+ static bool print_page (void);
+ static bool print_stored (COLUMN *p);
+@@ -427,6 +470,7 @@ static void add_line_number (COLUMN *p);
+ static void getoptnum (const char *n_str, int min, int *num,
+                        const char *errfmt);
+ static void getoptarg (char *arg, char switch_char, char *character,
++                       int *character_length, int *character_width,
+                        int *number);
+ static void print_files (int number_of_files, char **av);
+ static void init_parameters (int number_of_files);
+@@ -440,7 +484,6 @@ static void store_char (char c);
+ static void pad_down (unsigned int lines);
+ static void read_rest_of_line (COLUMN *p);
+ static void skip_read (COLUMN *p, int column_number);
+-static void print_char (char c);
+ static void cleanup (void);
+ static void print_sep_string (void);
+ static void separator_string (const char *optarg_S);
+@@ -452,7 +495,7 @@ static COLUMN *column_vector;
+    we store the leftmost columns contiguously in buff.
+    To print a line from buff, get the index of the first character
+    from line_vector[i], and print up to line_vector[i + 1]. */
+-static char *buff;
++static unsigned char *buff;
+ 
+ /* Index of the position in buff where the next character
+    will be stored. */
+@@ -556,7 +599,7 @@ static int chars_per_column;
+ static bool untabify_input = false;
+ 
+ /* (-e) The input tab character. */
+-static char input_tab_char = '\t';
++static char input_tab_char[MB_LEN_MAX] = "\t";
+ 
+ /* (-e) Tabstops are at chars_per_tab, 2*chars_per_tab, 3*chars_per_tab, ...
+    where the leftmost column is 1. */
+@@ -566,7 +609,10 @@ static int chars_per_input_tab = 8;
+ static bool tabify_output = false;
+ 
+ /* (-i) The output tab character. */
+-static char output_tab_char = '\t';
++static char output_tab_char[MB_LEN_MAX] = "\t";
++
++/* (-i) The byte length of output tab character. */
++static int output_tab_char_length = 1;
+ 
+ /* (-i) The width of the output tab. */
+ static int chars_per_output_tab = 8;
+@@ -636,7 +682,13 @@ static int line_number;
+ static bool numbered_lines = false;
+ 
+ /* (-n) Character which follows each line number. */
+-static char number_separator = '\t';
++static char number_separator[MB_LEN_MAX] = "\t";
++
++/* (-n) The byte length of the character which follows each line number. */
++static int number_separator_length = 1;
++
++/* (-n) The character width of the character which follows each line number. */
++static int number_separator_width = 0;
+ 
+ /* (-n) line counting starts with 1st line of input file (not with 1st
+    line of 1st page printed). */
+@@ -689,6 +741,7 @@ static bool use_col_separator = false;
+    -a|COLUMN|-m is a 'space' and with the -J option a 'tab'. */
+ static char *col_sep_string = (char *) "";
+ static int col_sep_length = 0;
++static int col_sep_width = 0;
+ static char *column_separator = (char *) " ";
+ static char *line_separator = (char *) "\t";
+ 
+@@ -839,6 +892,13 @@ separator_string (const char *optarg_S)
+   col_sep_length = (int) strlen (optarg_S);
+   col_sep_string = xmalloc (col_sep_length + 1);
+   strcpy (col_sep_string, optarg_S);
++
++#if HAVE_MBRTOWC
++  if (MB_CUR_MAX > 1)
++    col_sep_width = mbswidth (col_sep_string, 0);
++  else
++#endif
++    col_sep_width = col_sep_length;
+ }
+ 
+ int
+@@ -863,6 +923,21 @@ main (int argc, char **argv)
+ 
+   atexit (close_stdout);
+ 
++/* Define which functions are used, the ones for single byte locale or the ones
++   for multibyte locale. */
++#if HAVE_MBRTOWC
++  if (MB_CUR_MAX > 1)
++    {
++      print_char = print_char_multi;
++      char_to_clump = char_to_clump_multi;
++    }
++  else
++#endif
++    {
++      print_char = print_char_single;
++      char_to_clump = char_to_clump_single;
++    }
++
+   n_files = 0;
+   file_names = (argc > 1
+                 ? xmalloc ((argc - 1) * sizeof (char *))
+@@ -939,8 +1014,12 @@ main (int argc, char **argv)
+           break;
+         case 'e':
+           if (optarg)
+-            getoptarg (optarg, 'e', &input_tab_char,
+-                       &chars_per_input_tab);
++            {
++              int dummy_length, dummy_width;
++
++              getoptarg (optarg, 'e', input_tab_char, &dummy_length,
++                         &dummy_width, &chars_per_input_tab);
++            }
+           /* Could check tab width > 0. */
+           untabify_input = true;
+           break;
+@@ -953,8 +1032,12 @@ main (int argc, char **argv)
+           break;
+         case 'i':
+           if (optarg)
+-            getoptarg (optarg, 'i', &output_tab_char,
+-                       &chars_per_output_tab);
++            {
++              int dummy_width;
++
++              getoptarg (optarg, 'i', output_tab_char, &output_tab_char_length,
++                         &dummy_width, &chars_per_output_tab);
++            }
+           /* Could check tab width > 0. */
+           tabify_output = true;
+           break;
+@@ -972,8 +1055,8 @@ main (int argc, char **argv)
+         case 'n':
+           numbered_lines = true;
+           if (optarg)
+-            getoptarg (optarg, 'n', &number_separator,
+-                       &chars_per_number);
++            getoptarg (optarg, 'n', number_separator, &number_separator_length,
++                       &number_separator_width, &chars_per_number);
+           break;
+         case 'N':
+           skip_count = false;
+@@ -997,7 +1080,7 @@ main (int argc, char **argv)
+           old_s = false;
+           /* Reset an additional input of -s, -S dominates -s */
+           col_sep_string = bad_cast ("");
+-          col_sep_length = 0;
++          col_sep_length = col_sep_width = 0;
+           use_col_separator = true;
+           if (optarg)
+             separator_string (optarg);
+@@ -1152,10 +1235,45 @@ getoptnum (const char *n_str, int min, i
+    a number. */
+ 
+ static void
+-getoptarg (char *arg, char switch_char, char *character, int *number)
++getoptarg (char *arg, char switch_char, char *character, int *character_length,
++           int *character_width, int *number)
+ {
+   if (!ISDIGIT (*arg))
+-    *character = *arg++;
++    {
++#ifdef HAVE_MBRTOWC
++      if (MB_CUR_MAX > 1)        /* for multibyte locale. */
++        {
++          wchar_t wc;
++          size_t mblength;
++          int width;
++          mbstate_t state = {'\0'};
++
++          mblength = mbrtowc (&wc, arg, strnlen(arg, MB_LEN_MAX), &state);
++
++          if (mblength == (size_t)-1 || mblength == (size_t)-2)
++            {
++              *character_length = 1;
++              *character_width = 1;
++            }
++          else
++            {
++              *character_length = (mblength < 1) ? 1 : mblength;
++              width = wcwidth (wc);
++              *character_width = (width < 0) ? 0 : width;
++            }
++
++          strncpy (character, arg, *character_length);
++          arg += *character_length;
++        }
++      else                        /* for single byte locale. */
++#endif
++        {
++          *character = *arg++;
++          *character_length = 1;
++          *character_width = 1;
++        }
++    }
++
+   if (*arg)
+     {
+       long int tmp_long;
+@@ -1177,6 +1295,11 @@ static void
+ init_parameters (int number_of_files)
+ {
+   int chars_used_by_number = 0;
++  int mb_len = 1;
++#if HAVE_MBRTOWC
++  if (MB_CUR_MAX > 1)
++    mb_len = MB_LEN_MAX;
++#endif
+ 
+   lines_per_body = lines_per_page - lines_per_header - lines_per_footer;
+   if (lines_per_body <= 0)
+@@ -1214,7 +1337,7 @@ init_parameters (int number_of_files)
+           else
+             col_sep_string = column_separator;
+ 
+-          col_sep_length = 1;
++          col_sep_length = col_sep_width = 1;
+           use_col_separator = true;
+         }
+       /* It's rather pointless to define a TAB separator with column
+@@ -1244,11 +1367,11 @@ init_parameters (int number_of_files)
+              + TAB_WIDTH (chars_per_input_tab, chars_per_number);   */
+ 
+       /* Estimate chars_per_text without any margin and keep it constant. */
+-      if (number_separator == '\t')
++      if (number_separator[0] == '\t')
+         number_width = (chars_per_number
+                         + TAB_WIDTH (chars_per_default_tab, chars_per_number));
+       else
+-        number_width = chars_per_number + 1;
++        number_width = chars_per_number + number_separator_width;
+ 
+       /* The number is part of the column width unless we are
+          printing files in parallel. */
+@@ -1257,7 +1380,7 @@ init_parameters (int number_of_files)
+     }
+ 
+   chars_per_column = (chars_per_line - chars_used_by_number
+-                      - (columns - 1) * col_sep_length) / columns;
++                      - (columns - 1) * col_sep_width) / columns;
+ 
+   if (chars_per_column < 1)
+     error (EXIT_FAILURE, 0, _("page width too narrow"));
+@@ -1275,7 +1398,7 @@ init_parameters (int number_of_files)
+      We've to use 8 as the lower limit, if we use chars_per_default_tab = 8
+      to expand a tab which is not an input_tab-char. */
+   free (clump_buff);
+-  clump_buff = xmalloc (MAX (8, chars_per_input_tab));
++  clump_buff = xmalloc (mb_len * MAX (8, chars_per_input_tab));
+ }
+ 
+ /* Open the necessary files,
+@@ -1383,7 +1506,7 @@ init_funcs (void)
+ 
+   /* Enlarge p->start_position of first column to use the same form of
+      padding_not_printed with all columns. */
+-  h = h + col_sep_length;
++  h = h + col_sep_width;
+ 
+   /* This loop takes care of all but the rightmost column. */
+ 
+@@ -1417,7 +1540,7 @@ init_funcs (void)
+         }
+       else
+         {
+-          h = h_next + col_sep_length;
++          h = h_next + col_sep_width;
+           h_next = h + chars_per_column;
+         }
+     }
+@@ -1708,9 +1831,9 @@ static void
+ align_column (COLUMN *p)
+ {
+   padding_not_printed = p->start_position;
+-  if (padding_not_printed - col_sep_length > 0)
++  if (padding_not_printed - col_sep_width > 0)
+     {
+-      pad_across_to (padding_not_printed - col_sep_length);
++      pad_across_to (padding_not_printed - col_sep_width);
+       padding_not_printed = ANYWHERE;
+     }
+ 
+@@ -1981,13 +2104,13 @@ store_char (char c)
+       /* May be too generous. */
+       buff = X2REALLOC (buff, &buff_allocated);
+     }
+-  buff[buff_current++] = c;
++  buff[buff_current++] = (unsigned char) c;
+ }
+ 
+ static void
+ add_line_number (COLUMN *p)
+ {
+-  int i;
++  int i, j;
+   char *s;
+   int num_width;
+ 
+@@ -2004,22 +2127,24 @@ add_line_number (COLUMN *p)
+       /* Tabification is assumed for multiple columns, also for n-separators,
+          but 'default n-separator = TAB' hasn't been given priority over
+          equal column_width also specified by POSIX. */
+-      if (number_separator == '\t')
++      if (number_separator[0] == '\t')
+         {
+           i = number_width - chars_per_number;
+           while (i-- > 0)
+             (p->char_func) (' ');
+         }
+       else
+-        (p->char_func) (number_separator);
++        for (j = 0; j < number_separator_length; j++)
++          (p->char_func) (number_separator[j]);
+     }
+   else
+     /* To comply with POSIX, we avoid any expansion of default TAB
+        separator with a single column output. No column_width requirement
+        has to be considered. */
+     {
+-      (p->char_func) (number_separator);
+-      if (number_separator == '\t')
++      for (j = 0; j < number_separator_length; j++)
++        (p->char_func) (number_separator[j]);
++      if (number_separator[0] == '\t')
+         output_position = POS_AFTER_TAB (chars_per_output_tab,
+                           output_position);
+     }
+@@ -2180,7 +2305,7 @@ print_white_space (void)
+   while (goal - h_old > 1
+          && (h_new = POS_AFTER_TAB (chars_per_output_tab, h_old)) <= goal)
+     {
+-      putchar (output_tab_char);
++      fwrite (output_tab_char, sizeof(char), output_tab_char_length, stdout);
+       h_old = h_new;
+     }
+   while (++h_old <= goal)
+@@ -2200,6 +2325,7 @@ print_sep_string (void)
+ {
+   char *s;
+   int l = col_sep_length;
++  int not_space_flag;
+ 
+   s = col_sep_string;
+ 
+@@ -2213,6 +2339,7 @@ print_sep_string (void)
+     {
+       for (; separators_not_printed > 0; --separators_not_printed)
+         {
++          not_space_flag = 0;
+           while (l-- > 0)
+             {
+               /* 3 types of sep_strings: spaces only, spaces and chars,
+@@ -2226,12 +2353,15 @@ print_sep_string (void)
+                 }
+               else
+                 {
++                  not_space_flag = 1;
+                   if (spaces_not_printed > 0)
+                     print_white_space ();
+                   putchar (*s++);
+-                  ++output_position;
+                 }
+             }
++          if (not_space_flag)
++            output_position += col_sep_width;
++
+           /* sep_string ends with some spaces */
+           if (spaces_not_printed > 0)
+             print_white_space ();
+@@ -2259,7 +2389,7 @@ print_clump (COLUMN *p, int n, char *clu
+    required number of tabs and spaces. */
+ 
+ static void
+-print_char (char c)
++print_char_single (char c)
+ {
+   if (tabify_output)
+     {
+@@ -2283,6 +2413,74 @@ print_char (char c)
+   putchar (c);
+ }
+ 
++#ifdef HAVE_MBRTOWC
++static void
++print_char_multi (char c)
++{
++  static size_t mbc_pos = 0;
++  static char mbc[MB_LEN_MAX] = {'\0'};
++  static mbstate_t state = {'\0'};
++  mbstate_t state_bak;
++  wchar_t wc;
++  size_t mblength;
++  int width;
++
++  if (tabify_output)
++    {
++      state_bak = state;
++      mbc[mbc_pos++] = c;
++      mblength = mbrtowc (&wc, mbc, mbc_pos, &state);
++
++      while (mbc_pos > 0)
++        {
++          switch (mblength)
++            {
++            case (size_t)-2:
++              state = state_bak;
++              return;
++
++            case (size_t)-1:
++              state = state_bak;
++              ++output_position;
++              putchar (mbc[0]);
++              memmove (mbc, mbc + 1, MB_CUR_MAX - 1);
++              --mbc_pos;
++              break;
++
++            case 0:
++              mblength = 1;
++
++            default:
++              if (wc == L' ')
++                {
++                  memmove (mbc, mbc + mblength, MB_CUR_MAX - mblength);
++                  --mbc_pos;
++                  ++spaces_not_printed;
++                  return;
++                }
++              else if (spaces_not_printed > 0)
++                print_white_space ();
++
++              /* Nonprintables are assumed to have width 0, except L'\b'. */
++              if ((width = wcwidth (wc)) < 1)
++                {
++                  if (wc == L'\b')
++                    --output_position;
++                }
++              else
++                output_position += width;
++
++              fwrite (mbc, sizeof(char), mblength, stdout);
++              memmove (mbc, mbc + mblength, MB_CUR_MAX - mblength);
++              mbc_pos -= mblength;
++            }
++        }
++      return;
++    }
++  putchar (c);
++}
++#endif
++
+ /* Skip to page PAGE before printing.
+    PAGE may be larger than total number of pages. */
+ 
+@@ -2462,9 +2660,9 @@ read_line (COLUMN *p)
+           align_empty_cols = false;
+         }
+ 
+-      if (padding_not_printed - col_sep_length > 0)
++      if (padding_not_printed - col_sep_width > 0)
+         {
+-          pad_across_to (padding_not_printed - col_sep_length);
++          pad_across_to (padding_not_printed - col_sep_width);
+           padding_not_printed = ANYWHERE;
+         }
+ 
+@@ -2534,7 +2732,7 @@ print_stored (COLUMN *p)
+   int i;
+ 
+   int line = p->current_line++;
+-  char *first = &buff[line_vector[line]];
++  unsigned char *first = &buff[line_vector[line]];
+   /* FIXME
+      UMR: Uninitialized memory read:
+      * This is occurring while in:
+@@ -2546,7 +2744,7 @@ print_stored (COLUMN *p)
+      xmalloc        [xmalloc.c:94]
+      init_store_cols [pr.c:1648]
+      */
+-  char *last = &buff[line_vector[line + 1]];
++  unsigned char *last = &buff[line_vector[line + 1]];
+ 
+   pad_vertically = true;
+ 
+@@ -2565,9 +2763,9 @@ print_stored (COLUMN *p)
+         }
+     }
+ 
+-  if (padding_not_printed - col_sep_length > 0)
++  if (padding_not_printed - col_sep_width > 0)
+     {
+-      pad_across_to (padding_not_printed - col_sep_length);
++      pad_across_to (padding_not_printed - col_sep_width);
+       padding_not_printed = ANYWHERE;
+     }
+ 
+@@ -2580,8 +2778,8 @@ print_stored (COLUMN *p)
+   if (spaces_not_printed == 0)
+     {
+       output_position = p->start_position + end_vector[line];
+-      if (p->start_position - col_sep_length == chars_per_margin)
+-        output_position -= col_sep_length;
++      if (p->start_position - col_sep_width == chars_per_margin)
++        output_position -= col_sep_width;
+     }
+ 
+   return true;
+@@ -2600,7 +2798,7 @@ print_stored (COLUMN *p)
+    number of characters is 1.) */
+ 
+ static int
+-char_to_clump (char c)
++char_to_clump_single (char c)
+ {
+   unsigned char uc = c;
+   char *s = clump_buff;
+@@ -2610,10 +2808,10 @@ char_to_clump (char c)
+   int chars;
+   int chars_per_c = 8;
+ 
+-  if (c == input_tab_char)
++  if (c == input_tab_char[0])
+     chars_per_c = chars_per_input_tab;
+ 
+-  if (c == input_tab_char || c == '\t')
++  if (c == input_tab_char[0] || c == '\t')
+     {
+       width = TAB_WIDTH (chars_per_c, input_position);
+ 
+@@ -2694,6 +2892,164 @@ char_to_clump (char c)
+   return chars;
+ }
+ 
++#ifdef HAVE_MBRTOWC
++static int
++char_to_clump_multi (char c)
++{
++  static size_t mbc_pos = 0;
++  static char mbc[MB_LEN_MAX] = {'\0'};
++  static mbstate_t state = {'\0'};
++  mbstate_t state_bak;
++  wchar_t wc;
++  size_t mblength;
++  int wc_width;
++  register char *s = clump_buff;
++  register int i, j;
++  char esc_buff[4];
++  int width;
++  int chars;
++  int chars_per_c = 8;
++
++  state_bak = state;
++  mbc[mbc_pos++] = c;
++  mblength = mbrtowc (&wc, mbc, mbc_pos, &state);
++
++  width = 0;
++  chars = 0;
++  while (mbc_pos > 0)
++    {
++      switch (mblength)
++        {
++        case (size_t)-2:
++          state = state_bak;
++          return 0;
++
++        case (size_t)-1:
++          state = state_bak;
++          mblength = 1;
++
++          if (use_esc_sequence || use_cntrl_prefix)
++            {
++              width = +4;
++              chars = +4;
++              *s++ = '\\';
++              sprintf (esc_buff, "%03o", (unsigned char) mbc[0]);
++              for (i = 0; i <= 2; ++i)
++                *s++ = (int) esc_buff[i];
++            }
++          else
++            {
++              width += 1;
++              chars += 1;
++              *s++ = mbc[0];
++            }
++          break;
++
++        case 0:
++          mblength = 1;
++                /* Fall through */
++
++        default:
++          if (memcmp (mbc, input_tab_char, mblength) == 0)
++            chars_per_c = chars_per_input_tab;
++
++          if (memcmp (mbc, input_tab_char, mblength) == 0 || c == '\t')
++            {
++              int  width_inc;
++
++              width_inc = TAB_WIDTH (chars_per_c, input_position);
++              width += width_inc;
++
++              if (untabify_input)
++                {
++                  for (i = width_inc; i; --i)
++                    *s++ = ' ';
++                  chars += width_inc;
++                }
++              else
++                {
++                  for (i = 0; i <  mblength; i++)
++                    *s++ = mbc[i];
++                  chars += mblength;
++                }
++            }
++          else if ((wc_width = wcwidth (wc)) < 1)
++            {
++              if (use_esc_sequence)
++                {
++                  for (i = 0; i < mblength; i++)
++                    {
++                      width += 4;
++                      chars += 4;
++                      *s++ = '\\';
++                      sprintf (esc_buff, "%03o", (unsigned char) mbc[i]);
++                      for (j = 0; j <= 2; ++j)
++                        *s++ = (int) esc_buff[j];
++                    }
++                }
++              else if (use_cntrl_prefix)
++                {
++                  if (wc < 0200)
++                    {
++                      width += 2;
++                      chars += 2;
++                      *s++ = '^';
++                      *s++ = wc ^ 0100;
++                    }
++                  else
++                    {
++                      for (i = 0; i < mblength; i++)
++                        {
++                          width += 4;
++                          chars += 4;
++                          *s++ = '\\';
++                          sprintf (esc_buff, "%03o", (unsigned char) mbc[i]);
++                          for (j = 0; j <= 2; ++j)
++                            *s++ = (int) esc_buff[j];
++                        }
++                    }
++                }
++              else if (wc == L'\b')
++                {
++                  width += -1;
++                  chars += 1;
++                  *s++ = c;
++                }
++              else
++                {
++                  width += 0;
++                  chars += mblength;
++                  for (i = 0; i < mblength; i++)
++                    *s++ = mbc[i];
++                }
++            }
++          else
++            {
++              width += wc_width;
++              chars += mblength;
++              for (i = 0; i < mblength; i++)
++                *s++ = mbc[i];
++            }
++        }
++      memmove (mbc, mbc + mblength, MB_CUR_MAX - mblength);
++      mbc_pos -= mblength;
++    }
++
++  /* Too many backspaces must put us in position 0 -- never negative. */
++  if (width < 0 && input_position == 0)
++    {
++      chars = 0;
++      input_position = 0;
++    }
++  else if (width < 0 && input_position <= -width)
++    input_position = 0;
++  else
++   input_position += width;
++
++  return chars;
++}
++#endif
++
+ /* We've just printed some files and need to clean up things before
+    looking for more options and printing the next batch of files.
+ 
+diff -Naurp coreutils-8.25-orig/src/sort.c coreutils-8.25/src/sort.c
+--- coreutils-8.25-orig/src/sort.c	2016-01-16 13:09:33.000000000 -0600
++++ coreutils-8.25/src/sort.c	2016-02-08 19:07:10.310944648 -0600
+@@ -29,6 +29,14 @@
+ #include <sys/wait.h>
+ #include <signal.h>
+ #include <assert.h>
++#if HAVE_WCHAR_H
++# include <wchar.h>
++#endif
++/* Get isw* functions. */
++#if HAVE_WCTYPE_H
++# include <wctype.h>
++#endif
++
+ #include "system.h"
+ #include "argmatch.h"
+ #include "error.h"
+@@ -163,14 +171,39 @@ static int decimal_point;
+ /* Thousands separator; if -1, then there isn't one.  */
+ static int thousands_sep;
+ 
++/* True if -f is specified.  */
++static bool folding;
++
+ /* Nonzero if the corresponding locales are hard.  */
+ static bool hard_LC_COLLATE;
+-#if HAVE_NL_LANGINFO
++#if HAVE_LANGINFO_CODESET
+ static bool hard_LC_TIME;
+ #endif
+ 
+ #define NONZERO(x) ((x) != 0)
+ 
++/* get a multibyte character's byte length. */
++#define GET_BYTELEN_OF_CHAR(LIM, PTR, MBLENGTH, STATE)                        \
++  do                                                                        \
++    {                                                                        \
++      wchar_t wc;                                                        \
++      mbstate_t state_bak;                                                \
++                                                                        \
++      state_bak = STATE;                                                \
++      mblength = mbrtowc (&wc, PTR, LIM - PTR, &STATE);                        \
++                                                                        \
++      switch (MBLENGTH)                                                        \
++        {                                                                \
++        case (size_t)-1:                                                \
++        case (size_t)-2:                                                \
++          STATE = state_bak;                                                \
++                /* Fall through. */                                        \
++        case 0:                                                                \
++          MBLENGTH = 1;                                                        \
++      }                                                                        \
++    }                                                                        \
++  while (0)
++
+ /* The kind of blanks for '-b' to skip in various options. */
+ enum blanktype { bl_start, bl_end, bl_both };
+ 
+@@ -344,13 +377,11 @@ static bool reverse;
+    they were read if all keys compare equal.  */
+ static bool stable;
+ 
+-/* If TAB has this value, blanks separate fields.  */
+-enum { TAB_DEFAULT = CHAR_MAX + 1 };
+-
+-/* Tab character separating fields.  If TAB_DEFAULT, then fields are
++/* Tab character separating fields.  If tab_length is 0, then fields are
+    separated by the empty string between a non-blank character and a blank
+    character. */
+-static int tab = TAB_DEFAULT;
++static char tab[MB_LEN_MAX + 1];
++static size_t tab_length = 0;
+ 
+ /* Flag to remove consecutive duplicate lines from the output.
+    Only the last of a sequence of equal lines will be output. */
+@@ -810,6 +841,46 @@ reap_all (void)
+     reap (-1);
+ }
+ 
++/* Function pointers. */
++static void
++(*inittables) (void);
++static char *
++(*begfield) (const struct line*, const struct keyfield *);
++static char *
++(*limfield) (const struct line*, const struct keyfield *);
++static void
++(*skipblanks) (char **ptr, char *lim);
++static int
++(*getmonth) (char const *, size_t, char **);
++static int
++(*keycompare) (const struct line *, const struct line *);
++static int
++(*numcompare) (const char *, const char *);
++
++/* Test for white space multibyte character.
++   Set LENGTH the byte length of investigated multibyte character. */
++#if HAVE_MBRTOWC
++static int
++ismbblank (const char *str, size_t len, size_t *length)
++{
++  size_t mblength;
++  wchar_t wc;
++  mbstate_t state;
++
++  memset (&state, '\0', sizeof(mbstate_t));
++  mblength = mbrtowc (&wc, str, len, &state);
++
++  if (mblength == (size_t)-1 || mblength == (size_t)-2)
++    {
++      *length = 1;
++      return 0;
++    }
++
++  *length = (mblength < 1) ? 1 : mblength;
++  return iswblank (wc) || wc == '\n';
++}
++#endif
++
+ /* Clean up any remaining temporary files.  */
+ 
+ static void
+@@ -1254,7 +1325,7 @@ zaptemp (char const *name)
+   free (node);
+ }
+ 
+-#if HAVE_NL_LANGINFO
++#if HAVE_LANGINFO_CODESET
+ 
+ static int
+ struct_month_cmp (void const *m1, void const *m2)
+@@ -1269,7 +1340,7 @@ struct_month_cmp (void const *m1, void c
+ /* Initialize the character class tables. */
+ 
+ static void
+-inittables (void)
++inittables_uni (void)
+ {
+   size_t i;
+ 
+@@ -1281,7 +1352,7 @@ inittables (void)
+       fold_toupper[i] = toupper (i);
+     }
+ 
+-#if HAVE_NL_LANGINFO
++#if HAVE_LANGINFO_CODESET
+   /* If we're not in the "C" locale, read different names for months.  */
+   if (hard_LC_TIME)
+     {
+@@ -1363,6 +1434,84 @@ specify_nmerge (int oi, char c, char con
+     xstrtol_fatal (e, oi, c, long_options, s);
+ }
+ 
++#if HAVE_MBRTOWC
++static void
++inittables_mb (void)
++{
++  int i, j, k, l;
++  char *name, *s, *lc_time, *lc_ctype;
++  size_t s_len, mblength;
++  char mbc[MB_LEN_MAX];
++  wchar_t wc, pwc;
++  mbstate_t state_mb, state_wc;
++
++  lc_time = setlocale (LC_TIME, "");
++  if (lc_time)
++    lc_time = xstrdup (lc_time);
++
++  lc_ctype = setlocale (LC_CTYPE, "");
++  if (lc_ctype)
++    lc_ctype = xstrdup (lc_ctype);
++
++  if (lc_time && lc_ctype)
++    /* temporarily set LC_CTYPE to match LC_TIME, so that we can convert
++     * the names of months to upper case */
++    setlocale (LC_CTYPE, lc_time);
++
++  for (i = 0; i < MONTHS_PER_YEAR; i++)
++    {
++      s = (char *) nl_langinfo (ABMON_1 + i);
++      s_len = strlen (s);
++      monthtab[i].name = name = (char *) xmalloc (s_len + 1);
++      monthtab[i].val = i + 1;
++
++      memset (&state_mb, '\0', sizeof (mbstate_t));
++      memset (&state_wc, '\0', sizeof (mbstate_t));
++
++      for (j = 0; j < s_len;)
++        {
++          if (!ismbblank (s + j, s_len - j, &mblength))
++            break;
++          j += mblength;
++        }
++
++      for (k = 0; j < s_len;)
++        {
++          mblength = mbrtowc (&wc, (s + j), (s_len - j), &state_mb);
++          assert (mblength != (size_t)-1 && mblength != (size_t)-2);
++          if (mblength == 0)
++            break;
++
++          pwc = towupper (wc);
++          if (pwc == wc)
++            {
++              memcpy (mbc, s + j, mblength);
++              j += mblength;
++            }
++          else
++            {
++              j += mblength;
++              mblength = wcrtomb (mbc, pwc, &state_wc);
++              assert (mblength != (size_t)0 && mblength != (size_t)-1);
++            }
++
++          for (l = 0; l < mblength; l++)
++            name[k++] = mbc[l];
++        }
++      name[k] = '\0';
++    }
++  qsort ((void *) monthtab, MONTHS_PER_YEAR,
++      sizeof (struct month), struct_month_cmp);
++
++  if (lc_time && lc_ctype)
++    /* restore the original locales */
++    setlocale (LC_CTYPE, lc_ctype);
++
++  free (lc_ctype);
++  free (lc_time);
++}
++#endif
++
+ /* Specify the amount of main memory to use when sorting.  */
+ static void
+ specify_sort_size (int oi, char c, char const *s)
+@@ -1596,7 +1745,7 @@ buffer_linelim (struct buffer const *buf
+    by KEY in LINE. */
+ 
+ static char *
+-begfield (struct line const *line, struct keyfield const *key)
++begfield_uni (const struct line *line, const struct keyfield *key)
+ {
+   char *ptr = line->text, *lim = ptr + line->length - 1;
+   size_t sword = key->sword;
+@@ -1605,10 +1754,10 @@ begfield (struct line const *line, struc
+   /* The leading field separator itself is included in a field when -t
+      is absent.  */
+ 
+-  if (tab != TAB_DEFAULT)
++  if (tab_length)
+     while (ptr < lim && sword--)
+       {
+-        while (ptr < lim && *ptr != tab)
++        while (ptr < lim && *ptr != tab[0])
+           ++ptr;
+         if (ptr < lim)
+           ++ptr;
+@@ -1634,11 +1783,70 @@ begfield (struct line const *line, struc
+   return ptr;
+ }
+ 
++#if HAVE_MBRTOWC
++static char *
++begfield_mb (const struct line *line, const struct keyfield *key)
++{
++  int i;
++  char *ptr = line->text, *lim = ptr + line->length - 1;
++  size_t sword = key->sword;
++  size_t schar = key->schar;
++  size_t mblength;
++  mbstate_t state;
++
++  memset (&state, '\0', sizeof(mbstate_t));
++
++  if (tab_length)
++    while (ptr < lim && sword--)
++      {
++        while (ptr < lim && memcmp (ptr, tab, tab_length) != 0)
++          {
++            GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state);
++            ptr += mblength;
++          }
++        if (ptr < lim)
++          {
++            GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state);
++            ptr += mblength;
++          }
++      }
++  else
++    while (ptr < lim && sword--)
++      {
++        while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength))
++          ptr += mblength;
++        if (ptr < lim)
++          {
++            GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state);
++            ptr += mblength;
++          }
++        while (ptr < lim && !ismbblank (ptr, lim - ptr, &mblength))
++          ptr += mblength;
++      }
++
++  if (key->skipsblanks)
++    while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength))
++      ptr += mblength;
++
++  for (i = 0; i < schar; i++)
++    {
++      GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state);
++
++      if (ptr + mblength > lim)
++        break;
++      else
++        ptr += mblength;
++    }
++
++  return ptr;
++}
++#endif
++
+ /* Return the limit of (a pointer to the first character after) the field
+    in LINE specified by KEY. */
+ 
+ static char *
+-limfield (struct line const *line, struct keyfield const *key)
++limfield_uni (const struct line *line, const struct keyfield *key)
+ {
+   char *ptr = line->text, *lim = ptr + line->length - 1;
+   size_t eword = key->eword, echar = key->echar;
+@@ -1653,10 +1861,10 @@ limfield (struct line const *line, struc
+      'beginning' is the first character following the delimiting TAB.
+      Otherwise, leave PTR pointing at the first 'blank' character after
+      the preceding field.  */
+-  if (tab != TAB_DEFAULT)
++  if (tab_length)
+     while (ptr < lim && eword--)
+       {
+-        while (ptr < lim && *ptr != tab)
++        while (ptr < lim && *ptr != tab[0])
+           ++ptr;
+         if (ptr < lim && (eword || echar))
+           ++ptr;
+@@ -1702,10 +1910,10 @@ limfield (struct line const *line, struc
+      */
+ 
+   /* Make LIM point to the end of (one byte past) the current field.  */
+-  if (tab != TAB_DEFAULT)
++  if (tab_length)
+     {
+       char *newlim;
+-      newlim = memchr (ptr, tab, lim - ptr);
++      newlim = memchr (ptr, tab[0], lim - ptr);
+       if (newlim)
+         lim = newlim;
+     }
+@@ -1736,6 +1944,130 @@ limfield (struct line const *line, struc
+   return ptr;
+ }
+ 
++#if HAVE_MBRTOWC
++static char *
++limfield_mb (const struct line *line, const struct keyfield *key)
++{
++  char *ptr = line->text, *lim = ptr + line->length - 1;
++  size_t eword = key->eword, echar = key->echar;
++  int i;
++  size_t mblength;
++  mbstate_t state;
++
++  if (echar == 0)
++    eword++; /* skip all of end field. */
++
++  memset (&state, '\0', sizeof(mbstate_t));
++
++  if (tab_length)
++    while (ptr < lim && eword--)
++      {
++        while (ptr < lim && memcmp (ptr, tab, tab_length) != 0)
++          {
++            GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state);
++            ptr += mblength;
++          }
++        if (ptr < lim && (eword | echar))
++          {
++            GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state);
++            ptr += mblength;
++          }
++      }
++  else
++    while (ptr < lim && eword--)
++      {
++        while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength))
++          ptr += mblength;
++        if (ptr < lim)
++          {
++            GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state);
++            ptr += mblength;
++          }
++        while (ptr < lim && !ismbblank (ptr, lim - ptr, &mblength))
++          ptr += mblength;
++      }
++
++
++# ifdef POSIX_UNSPECIFIED
++  /* Make LIM point to the end of (one byte past) the current field.  */
++  if (tab_length)
++    {
++      char *newlim, *p;
++
++      newlim = NULL;
++      for (p = ptr; p < lim;)
++         {
++          if (memcmp (p, tab, tab_length) == 0)
++            {
++              newlim = p;
++              break;
++            }
++
++          GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state);
++          p += mblength;
++        }
++    }
++  else
++    {
++      char *newlim;
++      newlim = ptr;
++
++      while (newlim < lim && ismbblank (newlim, lim - newlim, &mblength))
++        newlim += mblength;
++      if (ptr < lim)
++        {
++          GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state);
++          ptr += mblength;
++        }
++      while (newlim < lim && !ismbblank (newlim, lim - newlim, &mblength))
++        newlim += mblength;
++      lim = newlim;
++    }
++# endif
++
++  if (echar != 0)
++  {
++    /* If we're skipping leading blanks, don't start counting characters
++     *      until after skipping past any leading blanks.  */
++    if (key->skipeblanks)
++      while (ptr < lim && ismbblank (ptr, lim - ptr, &mblength))
++        ptr += mblength;
++
++    memset (&state, '\0', sizeof(mbstate_t));
++
++    /* Advance PTR by ECHAR (if possible), but no further than LIM.  */
++    for (i = 0; i < echar; i++)
++     {
++        GET_BYTELEN_OF_CHAR (lim, ptr, mblength, state);
++
++        if (ptr + mblength > lim)
++          break;
++        else
++          ptr += mblength;
++      }
++  }
++
++  return ptr;
++}
++#endif
++
++static void
++skipblanks_uni (char **ptr, char *lim)
++{
++  while (*ptr < lim && blanks[to_uchar (**ptr)])
++    ++(*ptr);
++}
++
++#if HAVE_MBRTOWC
++static void
++skipblanks_mb (char **ptr, char *lim)
++{
++  size_t mblength;
++  while (*ptr < lim && ismbblank (*ptr, lim - *ptr, &mblength))
++    (*ptr) += mblength;
++}
++#endif
++
+ /* Fill BUF reading from FP, moving buf->left bytes from the end
+    of buf->buf to the beginning first.  If EOF is reached and the
+    file wasn't terminated by a newline, supply one.  Set up BUF's line
+@@ -1822,8 +2154,22 @@ fillbuf (struct buffer *buf, FILE *fp, c
+                   else
+                     {
+                       if (key->skipsblanks)
+-                        while (blanks[to_uchar (*line_start)])
+-                          line_start++;
++                        {
++#if HAVE_MBRTOWC
++                          if (MB_CUR_MAX > 1)
++                            {
++                              size_t mblength;
++                              while (line_start < line->keylim &&
++                                     ismbblank (line_start,
++                                                line->keylim - line_start,
++                                                &mblength))
++                                line_start += mblength;
++                            }
++                          else
++#endif
++                          while (blanks[to_uchar (*line_start)])
++                            line_start++;
++                        }
+                       line->keybeg = line_start;
+                     }
+                 }
+@@ -1944,7 +2290,7 @@ human_numcompare (char const *a, char co
+    hideously fast. */
+ 
+ static int
+-numcompare (char const *a, char const *b)
++numcompare_uni (const char *a, const char *b)
+ {
+   while (blanks[to_uchar (*a)])
+     a++;
+@@ -1954,6 +2300,25 @@ numcompare (char const *a, char const *b
+   return strnumcmp (a, b, decimal_point, thousands_sep);
+ }
+ 
++#if HAVE_MBRTOWC
++static int
++numcompare_mb (const char *a, const char *b)
++{
++  size_t mblength, len;
++  len = strlen (a); /* okay for UTF-8 */
++  while (*a && ismbblank (a, len > MB_CUR_MAX ? MB_CUR_MAX : len, &mblength))
++    {
++      a += mblength;
++      len -= mblength;
++    }
++  len = strlen (b); /* okay for UTF-8 */
++  while (*b && ismbblank (b, len > MB_CUR_MAX ? MB_CUR_MAX : len, &mblength))
++    b += mblength;
++
++  return strnumcmp (a, b, decimal_point, thousands_sep);
++}
++#endif /* HAV_EMBRTOWC */
++
+ /* Work around a problem whereby the long double value returned by glibc's
+    strtold ("NaN", ...) contains uninitialized bits: clear all bytes of
+    A and B before calling strtold.  FIXME: remove this function once
+@@ -2004,7 +2369,7 @@ general_numcompare (char const *sa, char
+    Return 0 if the name in S is not recognized.  */
+ 
+ static int
+-getmonth (char const *month, char **ea)
++getmonth_uni (char const *month, size_t len, char **ea)
+ {
+   size_t lo = 0;
+   size_t hi = MONTHS_PER_YEAR;
+@@ -2280,15 +2645,14 @@ debug_key (struct line const *line, stru
+           char saved = *lim;
+           *lim = '\0';
+ 
+-          while (blanks[to_uchar (*beg)])
+-            beg++;
++          skipblanks (&beg, lim);
+ 
+           char *tighter_lim = beg;
+ 
+           if (lim < beg)
+             tighter_lim = lim;
+           else if (key->month)
+-            getmonth (beg, &tighter_lim);
++            getmonth (beg, lim-beg, &tighter_lim);
+           else if (key->general_numeric)
+             ignore_value (strtold (beg, &tighter_lim));
+           else if (key->numeric || key->human_numeric)
+@@ -2432,7 +2796,7 @@ key_warnings (struct keyfield const *gke
+       bool maybe_space_aligned = !hard_LC_COLLATE && default_key_compare (key)
+                                  && !(key->schar || key->echar);
+       bool line_offset = key->eword == 0 && key->echar != 0; /* -k1.x,1.y  */
+-      if (!gkey_only && tab == TAB_DEFAULT && !line_offset
++      if (!gkey_only && !tab_length && !line_offset
+           && ((!key->skipsblanks && !(implicit_skip || maybe_space_aligned))
+               || (!key->skipsblanks && key->schar)
+               || (!key->skipeblanks && key->echar)))
+@@ -2490,11 +2854,87 @@ key_warnings (struct keyfield const *gke
+     error (0, 0, _("option '-r' only applies to last-resort comparison"));
+ }
+ 
++#if HAVE_MBRTOWC
++static int
++getmonth_mb (const char *s, size_t len, char **ea)
++{
++  char *month;
++  register size_t i;
++  register int lo = 0, hi = MONTHS_PER_YEAR, result;
++  char *tmp;
++  size_t wclength, mblength;
++  const char *pp;
++  const wchar_t *wpp;
++  wchar_t *month_wcs;
++  mbstate_t state;
++
++  while (len > 0 && ismbblank (s, len, &mblength))
++    {
++      s += mblength;
++      len -= mblength;
++    }
++
++  if (len == 0)
++    return 0;
++
++  if (SIZE_MAX - len < 1)
++    xalloc_die ();
++
++  month = (char *) xnmalloc (len + 1, MB_CUR_MAX);
++
++  pp = tmp = (char *) xnmalloc (len + 1, MB_CUR_MAX);
++  memcpy (tmp, s, len);
++  tmp[len] = '\0';
++  wpp = month_wcs = (wchar_t *) xnmalloc (len + 1, sizeof (wchar_t));
++  memset (&state, '\0', sizeof (mbstate_t));
++
++  wclength = mbsrtowcs (month_wcs, &pp, len + 1, &state);
++  if (wclength == (size_t)-1 || pp != NULL)
++    error (SORT_FAILURE, 0, _("Invalid multibyte input %s."), quote(s));
++
++  for (i = 0; i < wclength; i++)
++    {
++      month_wcs[i] = towupper(month_wcs[i]);
++      if (iswblank (month_wcs[i]))
++        {
++          month_wcs[i] = L'\0';
++          break;
++        }
++    }
++
++  mblength = wcsrtombs (month, &wpp, (len + 1) * MB_CUR_MAX, &state);
++  assert (mblength != (-1) && wpp == NULL);
++
++  do
++    {
++      int ix = (lo + hi) / 2;
++
++      if (strncmp (month, monthtab[ix].name, strlen (monthtab[ix].name)) < 0)
++        hi = ix;
++      else
++        lo = ix;
++    }
++  while (hi - lo > 1);
++
++  result = (!strncmp (month, monthtab[lo].name, strlen (monthtab[lo].name))
++      ? monthtab[lo].val : 0);
++
++  if (ea && result)
++     *ea = (char*) s + strlen (monthtab[lo].name);
++
++  free (month);
++  free (tmp);
++  free (month_wcs);
++
++  return result;
++}
++#endif
++
+ /* Compare two lines A and B trying every key in sequence until there
+    are no more keys or a difference is found. */
+ 
+ static int
+-keycompare (struct line const *a, struct line const *b)
++keycompare_uni (const struct line *a, const struct line *b)
+ {
+   struct keyfield *key = keylist;
+ 
+@@ -2579,7 +3019,7 @@ keycompare (struct line const *a, struct
+           else if (key->human_numeric)
+             diff = human_numcompare (ta, tb);
+           else if (key->month)
+-            diff = getmonth (ta, NULL) - getmonth (tb, NULL);
++            diff = getmonth (ta, tlena, NULL) - getmonth (tb, tlenb, NULL);
+           else if (key->random)
+             diff = compare_random (ta, tlena, tb, tlenb);
+           else if (key->version)
+@@ -2695,6 +3135,211 @@ keycompare (struct line const *a, struct
+   return key->reverse ? -diff : diff;
+ }
+ 
++#if HAVE_MBRTOWC
++static int
++keycompare_mb (const struct line *a, const struct line *b)
++{
++  struct keyfield *key = keylist;
++
++  /* For the first iteration only, the key positions have been
++     precomputed for us. */
++  char *texta = a->keybeg;
++  char *textb = b->keybeg;
++  char *lima = a->keylim;
++  char *limb = b->keylim;
++
++  size_t mblength_a, mblength_b;
++  wchar_t wc_a, wc_b;
++  mbstate_t state_a, state_b;
++
++  int diff = 0;
++
++  memset (&state_a, '\0', sizeof(mbstate_t));
++  memset (&state_b, '\0', sizeof(mbstate_t));
++  /* Ignore keys with start after end.  */
++  if (a->keybeg - a->keylim > 0)
++    return 0;
++
++
++              /* Ignore and/or translate chars before comparing.  */
++# define IGNORE_CHARS(NEW_LEN, LEN, TEXT, COPY, WC, MBLENGTH, STATE)        \
++  do                                                                        \
++    {                                                                        \
++      wchar_t uwc;                                                        \
++      char mbc[MB_LEN_MAX];                                                \
++      mbstate_t state_wc;                                                \
++                                                                        \
++      for (NEW_LEN = i = 0; i < LEN;)                                        \
++        {                                                                \
++          mbstate_t state_bak;                                                \
++                                                                        \
++          state_bak = STATE;                                                \
++          MBLENGTH = mbrtowc (&WC, TEXT + i, LEN - i, &STATE);                \
++                                                                        \
++          if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1                \
++              || MBLENGTH == 0)                                                \
++            {                                                                \
++              if (MBLENGTH == (size_t)-2 || MBLENGTH == (size_t)-1)        \
++                STATE = state_bak;                                        \
++              if (!ignore)                                                \
++                COPY[NEW_LEN++] = TEXT[i];                                \
++              i++;                                                         \
++              continue;                                                        \
++            }                                                                \
++                                                                        \
++          if (ignore)                                                        \
++            {                                                                \
++              if ((ignore == nonprinting && !iswprint (WC))                \
++                   || (ignore == nondictionary                                \
++                       && !iswalnum (WC) && !iswblank (WC)))                \
++                {                                                        \
++                  i += MBLENGTH;                                        \
++                  continue;                                                \
++                }                                                        \
++            }                                                                \
++                                                                        \
++          if (translate)                                                \
++            {                                                                \
++                                                                        \
++              uwc = towupper(WC);                                        \
++              if (WC == uwc)                                                \
++                {                                                        \
++                  memcpy (mbc, TEXT + i, MBLENGTH);                        \
++                  i += MBLENGTH;                                        \
++                }                                                        \
++              else                                                        \
++                {                                                        \
++                  i += MBLENGTH;                                        \
++                  WC = uwc;                                                \
++                  memset (&state_wc, '\0', sizeof (mbstate_t));                \
++                                                                        \
++                  MBLENGTH = wcrtomb (mbc, WC, &state_wc);                \
++                  assert (MBLENGTH != (size_t)-1 && MBLENGTH != 0);        \
++                }                                                        \
++                                                                        \
++              for (j = 0; j < MBLENGTH; j++)                                \
++                COPY[NEW_LEN++] = mbc[j];                                \
++            }                                                                \
++          else                                                                \
++            for (j = 0; j < MBLENGTH; j++)                                \
++              COPY[NEW_LEN++] = TEXT[i++];                                \
++        }                                                                \
++      COPY[NEW_LEN] = '\0';                                                \
++    }                                                                        \
++  while (0)
++
++      /* Actually compare the fields. */
++
++  for (;;)
++    {
++      /* Find the lengths. */
++      size_t lena = lima <= texta ? 0 : lima - texta;
++      size_t lenb = limb <= textb ? 0 : limb - textb;
++
++      char enda IF_LINT (= 0);
++      char endb IF_LINT (= 0);
++
++      char const *translate = key->translate;
++      bool const *ignore = key->ignore;
++
++      if (ignore || translate)
++        {
++          if (SIZE_MAX - lenb - 2 < lena)
++            xalloc_die ();
++          char *copy_a = (char *) xnmalloc (lena + lenb + 2, MB_CUR_MAX);
++          char *copy_b = copy_a + lena * MB_CUR_MAX + 1;
++          size_t new_len_a, new_len_b;
++          size_t i, j;
++
++          IGNORE_CHARS (new_len_a, lena, texta, copy_a,
++                        wc_a, mblength_a, state_a);
++          IGNORE_CHARS (new_len_b, lenb, textb, copy_b,
++                        wc_b, mblength_b, state_b);
++          texta = copy_a; textb = copy_b;
++          lena = new_len_a; lenb = new_len_b;
++        }
++      else
++        {
++          /* Use the keys in-place, temporarily null-terminated.  */
++          enda = texta[lena]; texta[lena] = '\0';
++          endb = textb[lenb]; textb[lenb] = '\0';
++        }
++
++      if (key->random)
++        diff = compare_random (texta, lena, textb, lenb);
++      else if (key->numeric | key->general_numeric | key->human_numeric)
++        {
++          char savea = *lima, saveb = *limb;
++
++          *lima = *limb = '\0';
++          diff = (key->numeric ? numcompare (texta, textb)
++                  : key->general_numeric ? general_numcompare (texta, textb)
++                  : human_numcompare (texta, textb));
++          *lima = savea, *limb = saveb;
++        }
++      else if (key->version)
++        diff = filevercmp (texta, textb);
++      else if (key->month)
++        diff = getmonth (texta, lena, NULL) - getmonth (textb, lenb, NULL);
++      else if (lena == 0)
++        diff = - NONZERO (lenb);
++      else if (lenb == 0)
++        diff = 1;
++      else if (hard_LC_COLLATE && !folding)
++        {
++          diff = xmemcoll0 (texta, lena + 1, textb, lenb + 1);
++        }
++      else
++        {
++          diff = memcmp (texta, textb, MIN (lena, lenb));
++          if (diff == 0)
++            diff = lena < lenb ? -1 : lena != lenb;
++        }
++
++      if (ignore || translate)
++        free (texta);
++      else
++        {
++          texta[lena] = enda;
++          textb[lenb] = endb;
++        }
++
++      if (diff)
++        goto not_equal;
++
++      key = key->next;
++      if (! key)
++        break;
++
++      /* Find the beginning and limit of the next field.  */
++      if (key->eword != -1)
++        lima = limfield (a, key), limb = limfield (b, key);
++      else
++        lima = a->text + a->length - 1, limb = b->text + b->length - 1;
++
++      if (key->sword != -1)
++        texta = begfield (a, key), textb = begfield (b, key);
++      else
++        {
++          texta = a->text, textb = b->text;
++          if (key->skipsblanks)
++            {
++              while (texta < lima && ismbblank (texta, lima - texta, &mblength_a))
++                texta += mblength_a;
++              while (textb < limb && ismbblank (textb, limb - textb, &mblength_b))
++                textb += mblength_b;
++            }
++        }
++    }
++
++not_equal:
++  if (key && key->reverse)
++    return -diff;
++  else
++    return diff;
++}
++#endif
++
+ /* Compare two lines A and B, returning negative, zero, or positive
+    depending on whether A compares less than, equal to, or greater than B. */
+ 
+@@ -2722,7 +3367,7 @@ compare (struct line const *a, struct li
+     diff = - NONZERO (blen);
+   else if (blen == 0)
+     diff = 1;
+-  else if (hard_LC_COLLATE)
++  else if (hard_LC_COLLATE && !folding)
+     {
+       /* Note xmemcoll0 is a performance enhancement as
+          it will not unconditionally write '\0' after the
+@@ -4121,6 +4766,7 @@ set_ordering (char const *s, struct keyf
+           break;
+         case 'f':
+           key->translate = fold_toupper;
++          folding = true;
+           break;
+         case 'g':
+           key->general_numeric = true;
+@@ -4199,7 +4845,7 @@ main (int argc, char **argv)
+   initialize_exit_failure (SORT_FAILURE);
+ 
+   hard_LC_COLLATE = hard_locale (LC_COLLATE);
+-#if HAVE_NL_LANGINFO
++#if HAVE_LANGINFO_CODESET
+   hard_LC_TIME = hard_locale (LC_TIME);
+ #endif
+ 
+@@ -4220,6 +4866,29 @@ main (int argc, char **argv)
+       thousands_sep = -1;
+   }
+ 
++#if HAVE_MBRTOWC
++  if (MB_CUR_MAX > 1)
++    {
++      inittables = inittables_mb;
++      begfield = begfield_mb;
++      limfield = limfield_mb;
++      skipblanks = skipblanks_mb;
++      getmonth = getmonth_mb;
++      keycompare = keycompare_mb;
++      numcompare = numcompare_mb;
++    }
++  else
++#endif
++    {
++      inittables = inittables_uni;
++      begfield = begfield_uni;
++      limfield = limfield_uni;
++      skipblanks = skipblanks_uni;
++      getmonth = getmonth_uni;
++      keycompare = keycompare_uni;
++      numcompare = numcompare_uni;
++    }
++
+   have_read_stdin = false;
+   inittables ();
+ 
+@@ -4494,13 +5163,34 @@ main (int argc, char **argv)
+ 
+         case 't':
+           {
+-            char newtab = optarg[0];
+-            if (! newtab)
++            char newtab[MB_LEN_MAX + 1];
++            size_t newtab_length = 1;
++            strncpy (newtab, optarg, MB_LEN_MAX);
++            if (! newtab[0])
+               error (SORT_FAILURE, 0, _("empty tab"));
+-            if (optarg[1])
++#if HAVE_MBRTOWC
++            if (MB_CUR_MAX > 1)
++              {
++                wchar_t wc;
++                mbstate_t state;
++
++                memset (&state, '\0', sizeof (mbstate_t));
++                newtab_length = mbrtowc (&wc, newtab, strnlen (newtab,
++                                                               MB_LEN_MAX),
++                                         &state);
++                switch (newtab_length)
++                  {
++                  case (size_t) -1:
++                  case (size_t) -2:
++                  case 0:
++                    newtab_length = 1;
++                  }
++              }
++#endif
++            if (newtab_length == 1 && optarg[1])
+               {
+                 if (STREQ (optarg, "\\0"))
+-                  newtab = '\0';
++                  newtab[0] = '\0';
+                 else
+                   {
+                     /* Provoke with 'sort -txx'.  Complain about
+@@ -4511,9 +5201,12 @@ main (int argc, char **argv)
+                            quote (optarg));
+                   }
+               }
+-            if (tab != TAB_DEFAULT && tab != newtab)
++            if (tab_length
++                && (tab_length != newtab_length
++                    || memcmp (tab, newtab, tab_length) != 0))
+               error (SORT_FAILURE, 0, _("incompatible tabs"));
+-            tab = newtab;
++            memcpy (tab, newtab, newtab_length);
++            tab_length = newtab_length;
+           }
+           break;
+ 
+@@ -4751,12 +5444,10 @@ main (int argc, char **argv)
+       sort (files, nfiles, outfile, nthreads);
+     }
+ 
+-#ifdef lint
+   if (files_from)
+     readtokens0_free (&tok);
+   else
+     free (files);
+-#endif
+ 
+   if (have_read_stdin && fclose (stdin) == EOF)
+     die (_("close failed"), "-");
+diff -Naurp coreutils-8.25-orig/src/unexpand.c coreutils-8.25/src/unexpand.c
+--- coreutils-8.25-orig/src/unexpand.c	2016-01-01 07:48:50.000000000 -0600
++++ coreutils-8.25/src/unexpand.c	2016-02-08 19:07:10.311944651 -0600
+@@ -38,12 +38,29 @@
+ #include <stdio.h>
+ #include <getopt.h>
+ #include <sys/types.h>
++
++/* Get mbstate_t, mbrtowc(), wcwidth(). */
++#if HAVE_WCHAR_H
++# include <wchar.h>
++#endif
++
+ #include "system.h"
+ #include "error.h"
+ #include "fadvise.h"
+ #include "quote.h"
+ #include "xstrndup.h"
+ 
++/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC
++      installation; work around this configuration error.  */
++#if !defined MB_LEN_MAX || MB_LEN_MAX < 2
++# define MB_LEN_MAX 16
++#endif
++
++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t.  */
++#if HAVE_MBRTOWC && defined mbstate_t
++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
++#endif
++
+ /* The official name of this program (e.g., no 'g' prefix).  */
+ #define PROGRAM_NAME "unexpand"
+ 
+@@ -103,6 +120,210 @@ static struct option const longopts[] =
+   {NULL, 0, NULL, 0}
+ };
+ 
++static FILE *next_file (FILE *fp);
++
++#if HAVE_MBRTOWC
++static void
++unexpand_multibyte (void)
++{
++  FILE *fp;			/* Input stream. */
++  mbstate_t i_state;		/* Current shift state of the input stream. */
++  mbstate_t i_state_bak;	/* Back up the I_STATE. */
++  mbstate_t o_state;		/* Current shift state of the output stream. */
++  char buf[MB_LEN_MAX + BUFSIZ];  /* For spooling a read byte sequence. */
++  char *bufpos = buf;			/* Next read position of BUF. */
++  size_t buflen = 0;		/* The length of the byte sequence in buf. */
++  wint_t wc;			/* A gotten wide character. */
++  size_t mblength;		/* The byte size of a multibyte character
++				   which shows as same character as WC. */
++  bool prev_tab = false;
++
++  /* Index in `tab_list' of next tabstop: */
++  int tab_index = 0;		/* For calculating width of pending tabs. */
++  int print_tab_index = 0;	/* For printing as many tabs as possible. */
++  unsigned int column = 0;	/* Column on screen of next char. */
++  int next_tab_column;		/* Column the next tab stop is on. */
++  int convert = 1;		/* If nonzero, perform translations. */
++  unsigned int pending = 0;	/* Pending columns of blanks. */
++
++  fp = next_file ((FILE *) NULL);
++  if (fp == NULL)
++    return;
++
++  memset (&o_state, '\0', sizeof(mbstate_t));
++  memset (&i_state, '\0', sizeof(mbstate_t));
++
++  for (;;)
++    {
++      if (buflen < MB_LEN_MAX && !feof(fp) && !ferror(fp))
++	{
++	  memmove (buf, bufpos, buflen);
++	  buflen += fread (buf + buflen, sizeof(char), BUFSIZ, fp);
++	  bufpos = buf;
++	}
++
++      /* Get a wide character. */
++      if (buflen < 1)
++	{
++	  mblength = 1;
++	  wc = WEOF;
++	}
++      else
++	{
++	  i_state_bak = i_state;
++	  mblength = mbrtowc ((wchar_t *)&wc, bufpos, buflen, &i_state);
++	}
++
++      if (mblength == (size_t)-1 || mblength == (size_t)-2)
++	{
++	  i_state = i_state_bak;
++	  wc = L'\0';
++	}
++
++      if (wc == L' ' && convert && column < INT_MAX)
++	{
++	  ++pending;
++	  ++column;
++	}
++      else if (wc == L'\t' && convert)
++	{
++	  if (tab_size == 0)
++	    {
++	      /* Do not let tab_index == first_free_tab;
++		 stop when it is 1 less. */
++	      while (tab_index < first_free_tab - 1
++		  && column >= tab_list[tab_index])
++		tab_index++;
++	      next_tab_column = tab_list[tab_index];
++	      if (tab_index < first_free_tab - 1)
++		tab_index++;
++	      if (column >= next_tab_column)
++		{
++		  convert = 0;	/* Ran out of tab stops. */
++		  goto flush_pend_mb;
++		}
++	    }
++	  else
++	    {
++	      next_tab_column = column + tab_size - column % tab_size;
++	    }
++	  pending += next_tab_column - column;
++	  column = next_tab_column;
++	}
++      else
++	{
++flush_pend_mb:
++	  /* Flush pending spaces.  Print as many tabs as possible,
++	     then print the rest as spaces. */
++	  if (pending == 1 && column != 1 && !prev_tab)
++	    {
++	      putchar (' ');
++	      pending = 0;
++	    }
++	  column -= pending;
++	  while (pending > 0)
++	    {
++	      if (tab_size == 0)
++		{
++		  /* Do not let print_tab_index == first_free_tab;
++		     stop when it is 1 less. */
++		  while (print_tab_index < first_free_tab - 1
++		      && column >= tab_list[print_tab_index])
++		    print_tab_index++;
++		  next_tab_column = tab_list[print_tab_index];
++		  if (print_tab_index < first_free_tab - 1)
++		    print_tab_index++;
++		}
++	      else
++		{
++		  next_tab_column =
++		    column + tab_size - column % tab_size;
++		}
++	      if (next_tab_column - column <= pending)
++		{
++		  putchar ('\t');
++		  pending -= next_tab_column - column;
++		  column = next_tab_column;
++		}
++	      else
++		{
++		  --print_tab_index;
++		  column += pending;
++		  while (pending != 0)
++		    {
++		      putchar (' ');
++		      pending--;
++		    }
++		}
++	    }
++
++	  if (wc == WEOF)
++	    {
++	      fp = next_file (fp);
++	      if (fp == NULL)
++		break;          /* No more files. */
++	      else
++		{
++		  memset (&i_state, '\0', sizeof(mbstate_t));
++		  continue;
++		}
++	    }
++
++	  if (mblength == (size_t)-1 || mblength == (size_t)-2)
++	    {
++	      if (convert)
++		{
++		  ++column;
++		  if (convert_entire_line == 0)
++		    convert = 0;
++		}
++	      mblength = 1;
++	      putchar (buf[0]);
++	    }
++	  else if (mblength == 0)
++	    {
++	      if (convert && convert_entire_line == 0)
++		convert = 0;
++	      mblength = 1;
++	      putchar ('\0');
++	    }
++	  else
++	    {
++	      if (convert)
++		{
++		  if (wc == L'\b')
++		    {
++		      if (column > 0)
++			--column;
++		    }
++		  else
++		    {
++		      int width;            /* The width of WC. */
++
++		      width = wcwidth (wc);
++		      column += (width > 0) ? width : 0;
++		      if (convert_entire_line == 0)
++			convert = 0;
++		    }
++		}
++
++	      if (wc == L'\n')
++		{
++		  tab_index = print_tab_index = 0;
++		  column = pending = 0;
++		  convert = 1;
++		}
++	      fwrite (bufpos, sizeof(char), mblength, stdout);
++	    }
++	}
++      prev_tab = wc == L'\t';
++      buflen -= mblength;
++      bufpos += mblength;
++    }
++}
++#endif
++
++
+ void
+ usage (int status)
+ {
+@@ -523,7 +744,12 @@ main (int argc, char **argv)
+ 
+   file_list = (optind < argc ? &argv[optind] : stdin_argv);
+ 
+-  unexpand ();
++#if HAVE_MBRTOWC
++  if (MB_CUR_MAX > 1)
++    unexpand_multibyte ();
++  else
++#endif
++    unexpand ();
+ 
+   if (have_read_stdin && fclose (stdin) != 0)
+     error (EXIT_FAILURE, errno, "-");
+diff -Naurp coreutils-8.25-orig/src/uniq.c coreutils-8.25/src/uniq.c
+--- coreutils-8.25-orig/src/uniq.c	2016-01-13 05:08:59.000000000 -0600
++++ coreutils-8.25/src/uniq.c	2016-02-08 19:07:10.312944654 -0600
+@@ -21,6 +21,17 @@
+ #include <getopt.h>
+ #include <sys/types.h>
+ 
++/* Get mbstate_t, mbrtowc(). */
++#if HAVE_WCHAR_H
++# include <wchar.h>
++#endif
++
++/* Get isw* functions. */
++#if HAVE_WCTYPE_H
++# include <wctype.h>
++#endif
++#include <assert.h>
++
+ #include "system.h"
+ #include "argmatch.h"
+ #include "linebuffer.h"
+@@ -33,6 +44,18 @@
+ #include "xstrtol.h"
+ #include "memcasecmp.h"
+ #include "quote.h"
++#include "xmemcoll.h"
++
++/* MB_LEN_MAX is incorrectly defined to be 1 in at least one GCC
++   installation; work around this configuration error.  */
++#if !defined MB_LEN_MAX || MB_LEN_MAX < 2
++# define MB_LEN_MAX 16
++#endif
++
++/* Some systems, like BeOS, have multibyte encodings but lack mbstate_t.  */
++#if HAVE_MBRTOWC && defined mbstate_t
++# define mbrtowc(pwc, s, n, ps) (mbrtowc) (pwc, s, n, 0)
++#endif
+ 
+ /* The official name of this program (e.g., no 'g' prefix).  */
+ #define PROGRAM_NAME "uniq"
+@@ -143,6 +166,10 @@ enum
+   GROUP_OPTION = CHAR_MAX + 1
+ };
+ 
++/* Function pointers. */
++static char *
++(*find_field) (struct linebuffer *line);
++
+ static struct option const longopts[] =
+ {
+   {"count", no_argument, NULL, 'c'},
+@@ -252,7 +279,7 @@ size_opt (char const *opt, char const *m
+    return a pointer to the beginning of the line's field to be compared. */
+ 
+ static char * _GL_ATTRIBUTE_PURE
+-find_field (struct linebuffer const *line)
++find_field_uni (struct linebuffer *line)
+ {
+   size_t count;
+   char const *lp = line->buffer;
+@@ -272,6 +299,83 @@ find_field (struct linebuffer const *lin
+   return line->buffer + i;
+ }
+ 
++#if HAVE_MBRTOWC
++
++# define MBCHAR_TO_WCHAR(WC, MBLENGTH, LP, POS, SIZE, STATEP, CONVFAIL)  \
++  do                                                                        \
++    {                                                                        \
++      mbstate_t state_bak;                                                \
++                                                                        \
++      CONVFAIL = 0;                                                        \
++      state_bak = *STATEP;                                                \
++                                                                        \
++      MBLENGTH = mbrtowc (&WC, LP + POS, SIZE - POS, STATEP);                \
++                                                                        \
++      switch (MBLENGTH)                                                        \
++        {                                                                \
++        case (size_t)-2:                                                \
++        case (size_t)-1:                                                \
++          *STATEP = state_bak;                                                \
++          CONVFAIL++;                                                        \
++          /* Fall through */                                                \
++        case 0:                                                                \
++          MBLENGTH = 1;                                                        \
++        }                                                                \
++    }                                                                        \
++  while (0)
++
++static char *
++find_field_multi (struct linebuffer *line)
++{
++  size_t count;
++  char *lp = line->buffer;
++  size_t size = line->length - 1;
++  size_t pos;
++  size_t mblength;
++  wchar_t wc;
++  mbstate_t *statep;
++  int convfail = 0;
++
++  pos = 0;
++  statep = &(line->state);
++
++  /* skip fields. */
++  for (count = 0; count < skip_fields && pos < size; count++)
++    {
++      while (pos < size)
++        {
++          MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail);
++
++          if (convfail || !(iswblank (wc) || wc == '\n'))
++            {
++              pos += mblength;
++              break;
++            }
++          pos += mblength;
++        }
++
++      while (pos < size)
++        {
++          MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail);
++
++          if (!convfail && (iswblank (wc) || wc == '\n'))
++            break;
++
++          pos += mblength;
++        }
++    }
++
++  /* skip fields. */
++  for (count = 0; count < skip_chars && pos < size; count++)
++    {
++      MBCHAR_TO_WCHAR (wc, mblength, lp, pos, size, statep, convfail);
++      pos += mblength;
++    }
++
++  return lp + pos;
++}
++#endif
++
+ /* Return false if two strings OLD and NEW match, true if not.
+    OLD and NEW point not to the beginnings of the lines
+    but rather to the beginnings of the fields to compare.
+@@ -280,6 +384,8 @@ find_field (struct linebuffer const *lin
+ static bool
+ different (char *old, char *new, size_t oldlen, size_t newlen)
+ {
++  char *copy_old, *copy_new;
++
+   if (check_chars < oldlen)
+     oldlen = check_chars;
+   if (check_chars < newlen)
+@@ -287,15 +393,104 @@ different (char *old, char *new, size_t
+ 
+   if (ignore_case)
+     {
+-      /* FIXME: This should invoke strcoll somehow.  */
+-      return oldlen != newlen || memcasecmp (old, new, oldlen);
++      size_t i;
++
++      copy_old = xmalloc (oldlen + 1);
++      copy_new = xmalloc (oldlen + 1);
++
++      for (i = 0; i < oldlen; i++)
++        {
++          copy_old[i] = toupper (old[i]);
++          copy_new[i] = toupper (new[i]);
++        }
++      bool rc = xmemcoll (copy_old, oldlen, copy_new, newlen);
++      free (copy_old);
++      free (copy_new);
++      return rc;
+     }
+-  else if (hard_LC_COLLATE)
+-    return xmemcoll (old, oldlen, new, newlen) != 0;
+   else
+-    return oldlen != newlen || memcmp (old, new, oldlen);
++    {
++      copy_old = (char *)old;
++      copy_new = (char *)new;
++    }
++
++  return xmemcoll (copy_old, oldlen, copy_new, newlen);
++
+ }
+ 
++#if HAVE_MBRTOWC
++static int
++different_multi (const char *old, const char *new, size_t oldlen, size_t newlen, mbstate_t oldstate, mbstate_t newstate)
++{
++  size_t i, j, chars;
++  const char *str[2];
++  char *copy[2];
++  size_t len[2];
++  mbstate_t state[2];
++  size_t mblength;
++  wchar_t wc, uwc;
++  mbstate_t state_bak;
++
++  str[0] = old;
++  str[1] = new;
++  len[0] = oldlen;
++  len[1] = newlen;
++  state[0] = oldstate;
++  state[1] = newstate;
++
++  for (i = 0; i < 2; i++)
++    {
++      copy[i] = xmalloc (len[i] + 1);
++      memset (copy[i], '\0', len[i] + 1);
++
++      for (j = 0, chars = 0; j < len[i] && chars < check_chars; chars++)
++        {
++          state_bak = state[i];
++          mblength = mbrtowc (&wc, str[i] + j, len[i] - j, &(state[i]));
++
++          switch (mblength)
++            {
++            case (size_t)-1:
++            case (size_t)-2:
++              state[i] = state_bak;
++              /* Fall through */
++            case 0:
++              mblength = 1;
++              break;
++
++            default:
++              if (ignore_case)
++                {
++                  uwc = towupper (wc);
++
++                  if (uwc != wc)
++                    {
++                      mbstate_t state_wc;
++                      size_t mblen;
++
++                      memset (&state_wc, '\0', sizeof(mbstate_t));
++                      mblen = wcrtomb (copy[i] + j, uwc, &state_wc);
++                      assert (mblen != (size_t)-1);
++                    }
++                  else
++                    memcpy (copy[i] + j, str[i] + j, mblength);
++                }
++              else
++                memcpy (copy[i] + j, str[i] + j, mblength);
++            }
++          j += mblength;
++        }
++      copy[i][j] = '\0';
++      len[i] = j;
++    }
++  int rc = xmemcoll (copy[0], len[0], copy[1], len[1]);
++  free (copy[0]);
++  free (copy[1]);
++  return rc;
++
++}
++#endif
++
+ /* Output the line in linebuffer LINE to standard output
+    provided that the switches say it should be output.
+    MATCH is true if the line matches the previous line.
+@@ -359,19 +554,38 @@ check_file (const char *infile, const ch
+       char *prevfield IF_LINT ( = NULL);
+       size_t prevlen IF_LINT ( = 0);
+       bool first_group_printed = false;
++#if HAVE_MBRTOWC
++      mbstate_t prevstate;
++
++      memset (&prevstate, '\0', sizeof (mbstate_t));
++#endif
+ 
+       while (!feof (stdin))
+         {
+           char *thisfield;
+           size_t thislen;
+           bool new_group;
++#if HAVE_MBRTOWC
++          mbstate_t thisstate;
++#endif
+ 
+           if (readlinebuffer_delim (thisline, stdin, delimiter) == 0)
+             break;
+ 
+           thisfield = find_field (thisline);
+           thislen = thisline->length - 1 - (thisfield - thisline->buffer);
++#if HAVE_MBRTOWC
++          if (MB_CUR_MAX > 1)
++            {
++              thisstate = thisline->state;
+ 
++              new_group = (prevline->length == 0
++                           || different_multi (thisfield, prevfield,
++                                               thislen, prevlen,
++                                               thisstate, prevstate));
++            }
++          else
++#endif
+           new_group = (prevline->length == 0
+                        || different (thisfield, prevfield, thislen, prevlen));
+ 
+@@ -389,6 +603,10 @@ check_file (const char *infile, const ch
+               SWAP_LINES (prevline, thisline);
+               prevfield = thisfield;
+               prevlen = thislen;
++#if HAVE_MBRTOWC
++              if (MB_CUR_MAX > 1)
++                prevstate = thisstate;
++#endif
+               first_group_printed = true;
+             }
+         }
+@@ -401,17 +619,26 @@ check_file (const char *infile, const ch
+       size_t prevlen;
+       uintmax_t match_count = 0;
+       bool first_delimiter = true;
++#if HAVE_MBRTOWC
++      mbstate_t prevstate;
++#endif
+ 
+       if (readlinebuffer_delim (prevline, stdin, delimiter) == 0)
+         goto closefiles;
+       prevfield = find_field (prevline);
+       prevlen = prevline->length - 1 - (prevfield - prevline->buffer);
++#if HAVE_MBRTOWC
++      prevstate = prevline->state;
++#endif
+ 
+       while (!feof (stdin))
+         {
+           bool match;
+           char *thisfield;
+           size_t thislen;
++#if HAVE_MBRTOWC
++          mbstate_t thisstate = thisline->state;
++#endif
+           if (readlinebuffer_delim (thisline, stdin, delimiter) == 0)
+             {
+               if (ferror (stdin))
+@@ -420,6 +647,14 @@ check_file (const char *infile, const ch
+             }
+           thisfield = find_field (thisline);
+           thislen = thisline->length - 1 - (thisfield - thisline->buffer);
++#if HAVE_MBRTOWC
++          if (MB_CUR_MAX > 1)
++            {
++              match = !different_multi (thisfield, prevfield,
++                                thislen, prevlen, thisstate, prevstate);
++            }
++          else
++#endif
+           match = !different (thisfield, prevfield, thislen, prevlen);
+           match_count += match;
+ 
+@@ -452,6 +687,9 @@ check_file (const char *infile, const ch
+               SWAP_LINES (prevline, thisline);
+               prevfield = thisfield;
+               prevlen = thislen;
++#if HAVE_MBRTOWC
++              prevstate = thisstate;
++#endif
+               if (!match)
+                 match_count = 0;
+             }
+@@ -498,6 +736,19 @@ main (int argc, char **argv)
+ 
+   atexit (close_stdout);
+ 
++#if HAVE_MBRTOWC
++  if (MB_CUR_MAX > 1)
++    {
++      find_field = find_field_multi;
++    }
++  else
++#endif
++    {
++      find_field = find_field_uni;
++    }
++
++
++
+   skip_chars = 0;
+   skip_fields = 0;
+   check_chars = SIZE_MAX;
+diff -Naurp coreutils-8.25-orig/tests/i18n/sort-month.sh coreutils-8.25/tests/i18n/sort-month.sh
+--- coreutils-8.25-orig/tests/i18n/sort-month.sh	1969-12-31 18:00:00.000000000 -0600
++++ coreutils-8.25/tests/i18n/sort-month.sh	2016-02-08 19:07:10.312944654 -0600
+@@ -0,0 +1,34 @@
++#!/bin/sh
++# Verify sort -M multi-byte support.
++
++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++print_ver_ sort
++require_valgrind_
++
++# Skip this test if some deallocations are
++# avoided at process end.
++grep '^#define lint 1' $CONFIG_HEADER > /dev/null ||
++  skip_ 'Allocation checks only work reliably in "lint" mode'
++
++export LC_ALL=en_US.UTF-8
++locale -k LC_CTYPE | grep -q "charmap.*UTF-8" \
++  || skip_ "No UTF-8 locale available"
++
++# Note the use of ɑ here which expands to
++# a wider representation upon case conversion
++# which triggered an assertion in sort -M
++cat <<EOF > exp
++.
++ɑ
++EOF
++
++
++# check large mem leak with --month-sort
++# https://bugzilla.redhat.com/show_bug.cgi?id=1259942
++valgrind --leak-check=full \
++         --error-exitcode=1 --errors-for-leak-kinds=definite \
++         sort -M < exp > out || fail=1
++compare exp out || { fail=1; cat out; }
++
++
++Exit $fail
+diff -Naurp coreutils-8.25-orig/tests/i18n/sort.sh coreutils-8.25/tests/i18n/sort.sh
+--- coreutils-8.25-orig/tests/i18n/sort.sh	1969-12-31 18:00:00.000000000 -0600
++++ coreutils-8.25/tests/i18n/sort.sh	2016-02-08 19:07:10.312944654 -0600
+@@ -0,0 +1,29 @@
++#!/bin/sh
++# Verify sort's multi-byte support.
++
++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++print_ver_ sort
++
++export LC_ALL=en_US.UTF-8
++locale -k LC_CTYPE | grep -q "charmap.*UTF-8" \
++  || skip_ "No UTF-8 locale available"
++
++# Enable heap consistency checkng on older systems
++export MALLOC_CHECK_=2
++
++
++# check buffer overflow issue due to
++# expanding multi-byte representation due to case conversion
++# https://bugzilla.suse.com/show_bug.cgi?id=928749
++cat <<EOF > exp
++.
++ɑ
++EOF
++cat <<EOF | sort -f > out || fail=1
++.
++ɑ
++EOF
++compare exp out || { fail=1; cat out; }
++
++
++Exit $fail
+diff -Naurp coreutils-8.25-orig/tests/local.mk coreutils-8.25/tests/local.mk
+--- coreutils-8.25-orig/tests/local.mk	2016-01-16 12:18:13.000000000 -0600
++++ coreutils-8.25/tests/local.mk	2016-02-08 19:07:10.313944658 -0600
+@@ -344,6 +344,9 @@ all_tests =					\
+   tests/misc/sort-discrim.sh			\
+   tests/misc/sort-files0-from.pl		\
+   tests/misc/sort-float.sh			\
++  tests/misc/sort-mb-tests.sh			\
++  tests/i18n/sort.sh				\
++  tests/i18n/sort-month.sh			\
+   tests/misc/sort-merge.pl			\
+   tests/misc/sort-merge-fdlimit.sh		\
+   tests/misc/sort-month.sh			\
+diff -Naurp coreutils-8.25-orig/tests/misc/cut.pl coreutils-8.25/tests/misc/cut.pl
+--- coreutils-8.25-orig/tests/misc/cut.pl	2016-01-16 12:18:13.000000000 -0600
++++ coreutils-8.25/tests/misc/cut.pl	2016-02-08 19:07:10.314944661 -0600
+@@ -23,9 +23,11 @@ use strict;
+ # Turn off localization of executable's output.
+ @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
+ 
+-my $mb_locale = $ENV{LOCALE_FR_UTF8};
++my $mb_locale;
++# uncommented enable multibyte paths
++$mb_locale = $ENV{LOCALE_FR_UTF8};
+ ! defined $mb_locale || $mb_locale eq 'none'
+-  and $mb_locale = 'C';
++ and $mb_locale = 'C';
+ 
+ my $prog = 'cut';
+ my $try = "Try '$prog --help' for more information.\n";
+@@ -240,6 +242,7 @@ if ($mb_locale ne 'C')
+         my @new_t = @$t;
+         my $test_name = shift @new_t;
+ 
++        next if ($test_name =~ "newline-[12][0-9]");
+         push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}];
+       }
+     push @Tests, @new;
+diff -Naurp coreutils-8.25-orig/tests/misc/expand.pl coreutils-8.25/tests/misc/expand.pl
+--- coreutils-8.25-orig/tests/misc/expand.pl	2016-01-16 12:18:13.000000000 -0600
++++ coreutils-8.25/tests/misc/expand.pl	2016-02-08 19:07:10.314944661 -0600
+@@ -23,6 +23,15 @@ use strict;
+ # Turn off localization of executable's output.
+ @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
+ 
++#comment out next line to disable multibyte tests
++my $mb_locale = $ENV{LOCALE_FR_UTF8};
++! defined $mb_locale || $mb_locale eq 'none'
++ and $mb_locale = 'C';
++
++my $prog = 'expand';
++my $try = "Try \`$prog --help' for more information.\n";
++my $inval = "$prog: invalid byte, character or field list\n$try";
++
+ my @Tests =
+   (
+    ['t1', '--tabs=3',     {IN=>"a\tb"}, {OUT=>"a  b"}],
+@@ -31,6 +40,37 @@ my @Tests =
+    ['i2', '--tabs=3 -i', {IN=>" \ta\tb"}, {OUT=>"   a\tb"}],
+   );
+ 
++if ($mb_locale ne 'C')
++  {
++    # Duplicate each test vector, appending "-mb" to the test name and
++    # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we
++    # provide coverage for the distro-added multi-byte code paths.
++    my @new;
++    foreach my $t (@Tests)
++      {
++        my @new_t = @$t;
++        my $test_name = shift @new_t;
++
++        # Depending on whether expand is multi-byte-patched,
++        # it emits different diagnostics:
++        #   non-MB: invalid byte or field list
++        #   MB:     invalid byte, character or field list
++        # Adjust the expected error output accordingly.
++        if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval}
++            (@new_t))
++          {
++            my $sub = {ERR_SUBST => 's/, character//'};
++            push @new_t, $sub;
++            push @$t, $sub;
++          }
++        push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}];
++      }
++    push @Tests, @new;
++  }
++
++
++@Tests = triple_test \@Tests;
++
+ my $save_temps = $ENV{DEBUG};
+ my $verbose = $ENV{VERBOSE};
+ 
+diff -Naurp coreutils-8.25-orig/tests/misc/fold.pl coreutils-8.25/tests/misc/fold.pl
+--- coreutils-8.25-orig/tests/misc/fold.pl	2016-01-16 12:18:13.000000000 -0600
++++ coreutils-8.25/tests/misc/fold.pl	2016-02-08 19:07:10.314944661 -0600
+@@ -20,9 +20,18 @@ use strict;
+ 
+ (my $program_name = $0) =~ s|.*/||;
+ 
++my $prog = 'fold';
++my $try = "Try \`$prog --help' for more information.\n";
++my $inval = "$prog: invalid byte, character or field list\n$try";
++
+ # Turn off localization of executable's output.
+ @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
+ 
++# uncommented to enable multibyte paths
++my $mb_locale = $ENV{LOCALE_FR_UTF8};
++! defined $mb_locale || $mb_locale eq 'none'
++ and $mb_locale = 'C';
++
+ my @Tests =
+   (
+    ['s1', '-w2 -s', {IN=>"a\t"}, {OUT=>"a\n\t"}],
+@@ -31,9 +40,48 @@ my @Tests =
+    ['s4', '-w4 -s', {IN=>"abc ef\n"}, {OUT=>"abc \nef\n"}],
+   );
+ 
++# Add _POSIX2_VERSION=199209 to the environment of each test
++# that uses an old-style option like +1.
++if ($mb_locale ne 'C')
++  {
++    # Duplicate each test vector, appending "-mb" to the test name and
++    # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we
++    # provide coverage for the distro-added multi-byte code paths.
++    my @new;
++    foreach my $t (@Tests)
++      {
++        my @new_t = @$t;
++        my $test_name = shift @new_t;
++
++        # Depending on whether fold is multi-byte-patched,
++        # it emits different diagnostics:
++        #   non-MB: invalid byte or field list
++        #   MB:     invalid byte, character or field list
++        # Adjust the expected error output accordingly.
++        if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval}
++            (@new_t))
++          {
++            my $sub = {ERR_SUBST => 's/, character//'};
++            push @new_t, $sub;
++            push @$t, $sub;
++          }
++        push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}];
++      }
++    push @Tests, @new;
++  }
++
++@Tests = triple_test \@Tests;
++
++# Remember that triple_test creates from each test with exactly one "IN"
++# file two more tests (.p and .r suffix on name) corresponding to reading
++# input from a file and from a pipe.  The pipe-reading test would fail
++# due to a race condition about 1 in 20 times.
++# Remove the IN_PIPE version of the "output-is-input" test above.
++# The others aren't susceptible because they have three inputs each.
++@Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests;
++
+ my $save_temps = $ENV{DEBUG};
+ my $verbose = $ENV{VERBOSE};
+ 
+-my $prog = 'fold';
+ my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
+ exit $fail;
+diff -Naurp coreutils-8.25-orig/tests/misc/join.pl coreutils-8.25/tests/misc/join.pl
+--- coreutils-8.25-orig/tests/misc/join.pl	2016-01-16 12:18:13.000000000 -0600
++++ coreutils-8.25/tests/misc/join.pl	2016-02-08 19:07:10.315944664 -0600
+@@ -25,6 +25,15 @@ my $limits = getlimits ();
+ 
+ my $prog = 'join';
+ 
++my $try = "Try \`$prog --help' for more information.\n";
++my $inval = "$prog: invalid byte, character or field list\n$try";
++
++my $mb_locale;
++#Comment out next line to disable multibyte tests
++$mb_locale = $ENV{LOCALE_FR_UTF8};
++! defined $mb_locale || $mb_locale eq 'none'
++  and $mb_locale = 'C';
++
+ my $delim = chr 0247;
+ sub t_subst ($)
+ {
+@@ -329,8 +338,49 @@ foreach my $t (@tv)
+     push @Tests, $new_ent;
+   }
+ 
++# Add _POSIX2_VERSION=199209 to the environment of each test
++# that uses an old-style option like +1.
++if ($mb_locale ne 'C')
++  {
++    # Duplicate each test vector, appending "-mb" to the test name and
++    # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we
++    # provide coverage for the distro-added multi-byte code paths.
++    my @new;
++    foreach my $t (@Tests)
++      {
++        my @new_t = @$t;
++        my $test_name = shift @new_t;
++
++        # Depending on whether join is multi-byte-patched,
++        # it emits different diagnostics:
++        #   non-MB: invalid byte or field list
++        #   MB:     invalid byte, character or field list
++        # Adjust the expected error output accordingly.
++        if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval}
++            (@new_t))
++          {
++            my $sub = {ERR_SUBST => 's/, character//'};
++            push @new_t, $sub;
++            push @$t, $sub;
++          }
++        #Adjust the output some error messages including test_name for mb
++        if (grep {ref $_ eq 'HASH' && exists $_->{ERR}}
++             (@new_t))
++          {
++            my $sub2 = {ERR_SUBST => "s/$test_name-mb/$test_name/"};
++            push @new_t, $sub2;
++            push @$t, $sub2;
++          }
++        push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}];
++      }
++    push @Tests, @new;
++  }
++
+ @Tests = triple_test \@Tests;
+ 
++#skip invalid-j-mb test, it is failing because of the format
++@Tests = grep {$_->[0] ne 'invalid-j-mb'} @Tests;
++
+ my $save_temps = $ENV{DEBUG};
+ my $verbose = $ENV{VERBOSE};
+ 
+diff -Naurp coreutils-8.25-orig/tests/misc/sort-mb-tests.sh coreutils-8.25/tests/misc/sort-mb-tests.sh
+--- coreutils-8.25-orig/tests/misc/sort-mb-tests.sh	1969-12-31 18:00:00.000000000 -0600
++++ coreutils-8.25/tests/misc/sort-mb-tests.sh	2016-02-08 19:07:10.315944664 -0600
+@@ -0,0 +1,45 @@
++#!/bin/sh
++# Verify sort's multi-byte support.
++
++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++print_ver_ sort
++
++export LC_ALL=en_US.UTF-8
++locale -k LC_CTYPE | grep -q "charmap.*UTF-8" \
++  || skip_ "No UTF-8 locale available"
++
++
++cat <<EOF > exp
++Banana＠5
++Apple＠10
++Citrus＠20
++Cherry＠30
++EOF
++
++cat <<EOF | sort -t ＠ -k2 -n > out || fail=1
++Apple＠10
++Banana＠5
++Citrus＠20
++Cherry＠30
++EOF
++
++compare exp out || { fail=1; cat out; }
++
++
++cat <<EOF > exp
++Citrus＠ＡＡ20＠＠5
++Cherry＠ＡＡ30＠＠10
++Apple＠ＡＡ10＠＠20
++Banana＠ＡＡ5＠＠30
++EOF
++
++cat <<EOF | sort -t ＠ -k4 -n > out || fail=1
++Apple＠ＡＡ10＠＠20
++Banana＠ＡＡ5＠＠30
++Citrus＠ＡＡ20＠＠5
++Cherry＠ＡＡ30＠＠10
++EOF
++
++compare exp out || { fail=1; cat out; }
++
++Exit $fail
+diff -Naurp coreutils-8.25-orig/tests/misc/sort-merge.pl coreutils-8.25/tests/misc/sort-merge.pl
+--- coreutils-8.25-orig/tests/misc/sort-merge.pl	2016-01-16 12:18:14.000000000 -0600
++++ coreutils-8.25/tests/misc/sort-merge.pl	2016-02-08 19:07:10.316944667 -0600
+@@ -26,6 +26,15 @@ my $prog = 'sort';
+ # Turn off localization of executable's output.
+ @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
+ 
++my $mb_locale;
++# uncommented according to upstream commit enabling multibyte paths
++$mb_locale = $ENV{LOCALE_FR_UTF8};
++! defined $mb_locale || $mb_locale eq 'none'
++ and $mb_locale = 'C';
++
++my $try = "Try \`$prog --help' for more information.\n";
++my $inval = "$prog: invalid byte, character or field list\n$try";
++
+ # three empty files and one that says 'foo'
+ my @inputs = (+(map{{IN=> {"empty$_"=> ''}}}1..3), {IN=> {foo=> "foo\n"}});
+ 
+@@ -77,6 +86,39 @@ my @Tests =
+         {OUT=>$big_input}],
+     );
+ 
++# Add _POSIX2_VERSION=199209 to the environment of each test
++# that uses an old-style option like +1.
++if ($mb_locale ne 'C')
++  {
++    # Duplicate each test vector, appending "-mb" to the test name and
++    # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we
++    # provide coverage for the distro-added multi-byte code paths.
++    my @new;
++    foreach my $t (@Tests)
++      {
++        my @new_t = @$t;
++        my $test_name = shift @new_t;
++
++        # Depending on whether sort is multi-byte-patched,
++        # it emits different diagnostics:
++        #   non-MB: invalid byte or field list
++        #   MB:     invalid byte, character or field list
++        # Adjust the expected error output accordingly.
++        if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval}
++            (@new_t))
++          {
++            my $sub = {ERR_SUBST => 's/, character//'};
++            push @new_t, $sub;
++            push @$t, $sub;
++          }
++        next if ($test_name =~ "nmerge-.");
++        push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}];
++      }
++    push @Tests, @new;
++  }
++
++@Tests = triple_test \@Tests;
++
+ my $save_temps = $ENV{DEBUG};
+ my $verbose = $ENV{VERBOSE};
+ 
+diff -Naurp coreutils-8.25-orig/tests/misc/sort.pl coreutils-8.25/tests/misc/sort.pl
+--- coreutils-8.25-orig/tests/misc/sort.pl	2016-01-16 12:18:14.000000000 -0600
++++ coreutils-8.25/tests/misc/sort.pl	2016-02-08 19:07:10.316944667 -0600
+@@ -24,10 +24,15 @@ my $prog = 'sort';
+ # Turn off localization of executable's output.
+ @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
+ 
+-my $mb_locale = $ENV{LOCALE_FR_UTF8};
++my $mb_locale;
++#Comment out next line to disable multibyte tests
++$mb_locale = $ENV{LOCALE_FR_UTF8};
+ ! defined $mb_locale || $mb_locale eq 'none'
+   and $mb_locale = 'C';
+ 
++my $try = "Try \`$prog --help' for more information.\n";
++my $inval = "$prog: invalid byte, character or field list\n$try";
++
+ # Since each test is run with a file name and with redirected stdin,
+ # the name in the diagnostic is either the file name or "-".
+ # Normalize each diagnostic to use '-'.
+@@ -424,6 +429,38 @@ foreach my $t (@Tests)
+       }
+   }
+ 
++if ($mb_locale ne 'C')
++   {
++    # Duplicate each test vector, appending "-mb" to the test name and
++    # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we
++    # provide coverage for the distro-added multi-byte code paths.
++    my @new;
++    foreach my $t (@Tests)
++       {
++        my @new_t = @$t;
++        my $test_name = shift @new_t;
++
++        # Depending on whether sort is multi-byte-patched,
++        # it emits different diagnostics:
++        #   non-MB: invalid byte or field list
++        #   MB:     invalid byte, character or field list
++        # Adjust the expected error output accordingly.
++        if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval}
++            (@new_t))
++          {
++            my $sub = {ERR_SUBST => 's/, character//'};
++            push @new_t, $sub;
++            push @$t, $sub;
++          }
++        #disable several failing tests until investigation, disable all tests with envvars set
++        next if (grep {ref $_ eq 'HASH' && exists $_->{ENV}} (@new_t));
++        next if ($test_name =~ "18g" or $test_name =~ "sort-numeric" or $test_name =~ "08[ab]" or $test_name =~ "03[def]" or $test_name =~ "h4" or $test_name =~ "n1" or $test_name =~ "2[01]a");
++        next if ($test_name =~ "11[ab]"); # avoid FP: expected result differs to MB result due to collation rules.
++        push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}];
++       }
++    push @Tests, @new;
++   }
++
+ @Tests = triple_test \@Tests;
+ 
+ # Remember that triple_test creates from each test with exactly one "IN"
+@@ -433,6 +470,7 @@ foreach my $t (@Tests)
+ # Remove the IN_PIPE version of the "output-is-input" test above.
+ # The others aren't susceptible because they have three inputs each.
+ @Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests;
++@Tests = grep {$_->[0] ne 'output-is-input-mb.p'} @Tests;
+ 
+ my $save_temps = $ENV{DEBUG};
+ my $verbose = $ENV{VERBOSE};
+diff -Naurp coreutils-8.25-orig/tests/misc/unexpand.pl coreutils-8.25/tests/misc/unexpand.pl
+--- coreutils-8.25-orig/tests/misc/unexpand.pl	2016-01-16 12:18:14.000000000 -0600
++++ coreutils-8.25/tests/misc/unexpand.pl	2016-02-08 19:07:10.317944671 -0600
+@@ -27,6 +27,14 @@ my $limits = getlimits ();
+ 
+ my $prog = 'unexpand';
+ 
++# comment out next line to disable multibyte tests
++my $mb_locale = $ENV{LOCALE_FR_UTF8};
++! defined $mb_locale || $mb_locale eq 'none'
++ and $mb_locale = 'C';
++
++my $try = "Try \`$prog --help' for more information.\n";
++my $inval = "$prog: invalid byte, character or field list\n$try";
++
+ my @Tests =
+     (
+      ['a1', {IN=> ' 'x 1 ."y\n"}, {OUT=> ' 'x 1 ."y\n"}],
+@@ -92,6 +100,37 @@ my @Tests =
+       {EXIT => 1}, {ERR => "$prog: tab stop value is too large\n"}],
+     );
+ 
++if ($mb_locale ne 'C')
++  {
++    # Duplicate each test vector, appending "-mb" to the test name and
++    # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we
++    # provide coverage for the distro-added multi-byte code paths.
++    my @new;
++    foreach my $t (@Tests)
++      {
++        my @new_t = @$t;
++        my $test_name = shift @new_t;
++
++        # Depending on whether unexpand is multi-byte-patched,
++        # it emits different diagnostics:
++        #   non-MB: invalid byte or field list
++        #   MB:     invalid byte, character or field list
++        # Adjust the expected error output accordingly.
++        if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval}
++            (@new_t))
++          {
++            my $sub = {ERR_SUBST => 's/, character//'};
++            push @new_t, $sub;
++            push @$t, $sub;
++          }
++        next if ($test_name =~ 'b-1');
++        push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}];
++      }
++    push @Tests, @new;
++  }
++
++@Tests = triple_test \@Tests;
++
+ my $save_temps = $ENV{DEBUG};
+ my $verbose = $ENV{VERBOSE};
+ 
+diff -Naurp coreutils-8.25-orig/tests/misc/uniq.pl coreutils-8.25/tests/misc/uniq.pl
+--- coreutils-8.25-orig/tests/misc/uniq.pl	2016-01-16 12:18:14.000000000 -0600
++++ coreutils-8.25/tests/misc/uniq.pl	2016-02-08 19:07:10.317944671 -0600
+@@ -23,9 +23,17 @@ my $limits = getlimits ();
+ my $prog = 'uniq';
+ my $try = "Try '$prog --help' for more information.\n";
+ 
++my $inval = "$prog: invalid byte, character or field list\n$try";
++
+ # Turn off localization of executable's output.
+ @ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
+ 
++my $mb_locale;
++#Comment out next line to disable multibyte tests
++$mb_locale = $ENV{LOCALE_FR_UTF8};
++! defined $mb_locale || $mb_locale eq 'none'
++  and $mb_locale = 'C';
++
+ # When possible, create a "-z"-testing variant of each test.
+ sub add_z_variants($)
+ {
+@@ -262,6 +270,53 @@ foreach my $t (@Tests)
+       and push @$t, {ENV=>'_POSIX2_VERSION=199209'};
+   }
+ 
++if ($mb_locale ne 'C')
++  {
++    # Duplicate each test vector, appending "-mb" to the test name and
++    # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we
++    # provide coverage for the distro-added multi-byte code paths.
++    my @new;
++    foreach my $t (@Tests)
++      {
++        my @new_t = @$t;
++        my $test_name = shift @new_t;
++
++        # Depending on whether uniq is multi-byte-patched,
++        # it emits different diagnostics:
++        #   non-MB: invalid byte or field list
++        #   MB:     invalid byte, character or field list
++        # Adjust the expected error output accordingly.
++        if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval}
++            (@new_t))
++          {
++            my $sub = {ERR_SUBST => 's/, character//'};
++            push @new_t, $sub;
++            push @$t, $sub;
++          }
++        # In test #145, replace the each ‘...’ by '...'.
++        if ($test_name =~ "145")
++          {
++            my $sub = { ERR_SUBST => "s/‘([^’]+)’/'\$1'/g"};
++            push @new_t, $sub;
++            push @$t, $sub;
++          }
++        next if (   $test_name =~ "schar"
++                 or $test_name =~ "^obs-plus"
++                 or $test_name =~ "119");
++        push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}];
++      }
++    push @Tests, @new;
++   }
++
++# Remember that triple_test creates from each test with exactly one "IN"
++# file two more tests (.p and .r suffix on name) corresponding to reading
++# input from a file and from a pipe.  The pipe-reading test would fail
++# due to a race condition about 1 in 20 times.
++# Remove the IN_PIPE version of the "output-is-input" test above.
++# The others aren't susceptible because they have three inputs each.
++
++@Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests;
++
+ @Tests = add_z_variants \@Tests;
+ @Tests = triple_test \@Tests;
+ 
+diff -Naurp coreutils-8.25-orig/tests/pr/pr-tests.pl coreutils-8.25/tests/pr/pr-tests.pl
+--- coreutils-8.25-orig/tests/pr/pr-tests.pl	2016-01-16 12:18:14.000000000 -0600
++++ coreutils-8.25/tests/pr/pr-tests.pl	2016-02-08 19:07:10.318944674 -0600
+@@ -24,6 +24,15 @@ use strict;
+ my $prog = 'pr';
+ my $normalize_strerror = "s/': .*/'/";
+ 
++my $mb_locale;
++#Uncomment the following line to enable multibyte tests
++$mb_locale = $ENV{LOCALE_FR_UTF8};
++! defined $mb_locale || $mb_locale eq 'none'
++  and $mb_locale = 'C';
++
++my $try = "Try \`$prog --help' for more information.\n";
++my $inval = "$prog: invalid byte, character or field list\n$try";
++
+ my @tv = (
+ 
+ # -b option is no longer an official option. But it's still working to
+@@ -467,8 +476,48 @@ push @Tests,
+     {IN=>{3=>"x\ty\tz\n"}},
+      {OUT=>join("\t", qw(a b c m n o x y z)) . "\n"} ];
+ 
++# Add _POSIX2_VERSION=199209 to the environment of each test
++# that uses an old-style option like +1.
++if ($mb_locale ne 'C')
++  {
++    # Duplicate each test vector, appending "-mb" to the test name and
++    # inserting {ENV => "LC_ALL=$mb_locale"} in the copy, so that we
++    # provide coverage for the distro-added multi-byte code paths.
++    my @new;
++    foreach my $t (@Tests)
++      {
++        my @new_t = @$t;
++        my $test_name = shift @new_t;
++
++        # Depending on whether pr is multi-byte-patched,
++        # it emits different diagnostics:
++        #   non-MB: invalid byte or field list
++        #   MB:     invalid byte, character or field list
++        # Adjust the expected error output accordingly.
++        if (grep {ref $_ eq 'HASH' && exists $_->{ERR} && $_->{ERR} eq $inval}
++            (@new_t))
++          {
++            my $sub = {ERR_SUBST => 's/, character//'};
++            push @new_t, $sub;
++            push @$t, $sub;
++          }
++        #temporarily skip some failing tests
++        next if ($test_name =~ "col-0" or $test_name =~ "col-inval");
++        push @new, ["$test_name-mb", @new_t, {ENV => "LC_ALL=$mb_locale"}];
++      }
++    push @Tests, @new;
++  }
++
+ @Tests = triple_test \@Tests;
+ 
++# Remember that triple_test creates from each test with exactly one "IN"
++# file two more tests (.p and .r suffix on name) corresponding to reading
++# input from a file and from a pipe.  The pipe-reading test would fail
++# due to a race condition about 1 in 20 times.
++# Remove the IN_PIPE version of the "output-is-input" test above.
++# The others aren't susceptible because they have three inputs each.
++@Tests = grep {$_->[0] ne 'output-is-input.p'} @Tests;
++
+ my $save_temps = $ENV{DEBUG};
+ my $verbose = $ENV{VERBOSE};
+ 
diff --git a/src/patches/expect-5.43.0-spawn-1.patch b/src/patches/expect-5.43.0-spawn-1.patch
deleted file mode 100644
index c2033c0d2..000000000
--- a/src/patches/expect-5.43.0-spawn-1.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-Submitted By: LFS Book <lfs-book@linuxfromscratch.org>
-Date: 2003-10-05
-Initial Package Version: 5.38
-Origin: Redhat RPM (Patch by HJ Lu)
-Description: NA
-diff -uNr expect-5.38.orig/exp_chan.c expect-5.38/exp_chan.c
---- expect-5.38.orig/exp_chan.c	2002-02-12 13:00:55.000000000 +1100
-+++ expect-5.38/exp_chan.c	2003-03-01 10:36:18.000000000 +1100
-@@ -519,6 +519,7 @@
-     esPtr->buffer = Tcl_NewStringObj("",0);
-     Tcl_IncrRefCount(esPtr->buffer);
-     esPtr->umsize = exp_default_match_max;
-+    esPtr->umsize_changed = exp_default_match_max_changed;
-     /* this will reallocate object with an appropriate sized buffer */
-     expAdjust(esPtr);
- 
-diff -uNr expect-5.38.orig/exp_command.h expect-5.38/exp_command.h
---- expect-5.38.orig/exp_command.h	2002-04-08 08:57:20.000000000 +1000
-+++ expect-5.38/exp_command.h	2003-03-01 10:36:18.000000000 +1100
-@@ -25,6 +25,7 @@
- EXTERN char *		exp_get_var _ANSI_ARGS_((Tcl_Interp *,char *));
- 
- EXTERN int exp_default_match_max;
-+EXTERN int exp_default_match_max_changed;
- EXTERN int exp_default_parity;
- EXTERN int exp_default_rm_nulls;
- 
-@@ -97,6 +98,7 @@
-     int msize;	        /* # of bytes that buffer can hold (max) */
-     int umsize;	        /* # of bytes (min) that is guaranteed to match */
- 			/* this comes from match_max command */
-+    int umsize_changed;	/* is umsize changed by user?  */
-     int printed;	/* # of bytes written to stdout (if logging on) */
-                         /* but not actually returned via a match yet */
-     int echoed;	        /* additional # of bytes (beyond "printed" above) */
-diff -uNr expect-5.38.orig/expect.c expect-5.38/expect.c
---- expect-5.38.orig/expect.c	2002-04-08 09:00:33.000000000 +1000
-+++ expect-5.38/expect.c	2003-03-01 10:36:18.000000000 +1100
-@@ -41,8 +41,17 @@
- #include "tcldbg.h"
- #endif
- 
-+/* The initial length is 2000. We increment it by 2000. The maximum
-+   is 8MB (0x800000).  */
-+#define EXP_MATCH_MAX		2000
-+#define EXP_MATCH_INC		2000
-+#define EXP_MATCH_STEP_LIMIT	0x700000
-+#define EXP_MATCH_LIMIT		0x800000
-+#define EXP_MATCH_LIMIT_QUOTE	"0x800000"
-+
- /* initial length of strings that we can guarantee patterns can match */
--int exp_default_match_max =	2000;
-+int exp_default_match_max =	EXP_MATCH_MAX;
-+int exp_default_match_max_changed = 0;
- #define INIT_EXPECT_TIMEOUT_LIT	"10"	/* seconds */
- #define INIT_EXPECT_TIMEOUT	10	/* seconds */
- int exp_default_parity =	TRUE;
-@@ -1618,6 +1627,76 @@
-     return newsize;
- }
- 
-+/* returns # of bytes until we see a newline at the end or EOF.  */
-+/*ARGSUSED*/
-+static int
-+expReadNewLine(interp,esPtr,save_flags) /* INTL */
-+Tcl_Interp *interp;
-+ExpState *esPtr;
-+int save_flags;
-+{
-+    int size;
-+    int exp_size;
-+    int full_size;
-+    int count;
-+    char *str;
-+
-+    count = 0;
-+    for (;;) {
-+	exp_size = expSizeGet(esPtr);
-+
-+	/* When we reach the limit, we will only read one char at a
-+	   time.  */
-+	if (esPtr->umsize >= EXP_MATCH_STEP_LIMIT)
-+	    size = TCL_UTF_MAX;
-+	else
-+	    size = exp_size;
-+
-+	if (exp_size + TCL_UTF_MAX >= esPtr->msize) {
-+	    if (esPtr->umsize >= EXP_MATCH_LIMIT) {
-+		expDiagLogU("WARNING: interact buffer is full. probably your program\r\n");
-+		expDiagLogU("is not interactive or has a very long output line. The\r\n");
-+		expDiagLogU("current limit is " EXP_MATCH_LIMIT_QUOTE ".\r\n");
-+		expDiagLogU("Dumping first half of buffer in order to continue\r\n");
-+		expDiagLogU("Recommend you enlarge the buffer.\r\n");
-+		exp_buffer_shuffle(interp,esPtr,save_flags,EXPECT_OUT,"expect");
-+		return count;
-+	    }
-+	    else {
-+		esPtr->umsize += EXP_MATCH_INC;
-+		expAdjust(esPtr);
-+	    }
-+	}
-+
-+	full_size = esPtr->msize - (size / TCL_UTF_MAX);
-+	size = Tcl_ReadChars(esPtr->channel,
-+			esPtr->buffer,
-+			full_size,
-+			1 /* append */);
-+	if (size > 0) {
-+	    count += size;
-+	    /* We try again if there are more to read and we haven't
-+	       seen a newline at the end. */
-+	    if (size == full_size) {
-+		str = Tcl_GetStringFromObj(esPtr->buffer, &size);
-+		if (str[size - 1] != '\n')
-+		    continue;
-+	    }
-+	}
-+	else {
-+	    /* It is even trickier. We got an error from read. We have
-+	       to recover from it. Let's make sure the size of
-+	       buffer is correct. It can be corrupted. */
-+	    str = Tcl_GetString(esPtr->buffer);
-+	    Tcl_SetObjLength(esPtr->buffer, strlen(str));
-+	}
-+
-+	break;
-+    }
-+
-+    return count;
-+}
-+
- /* returns # of bytes read or (non-positive) error of form EXP_XXX */
- /* returns 0 for end of file */
- /* If timeout is non-zero, set an alarm before doing the read, else assume */
-@@ -1632,6 +1711,8 @@
- {
-     int cc = EXP_TIMEOUT;
-     int size = expSizeGet(esPtr);
-+    int full_size;
-+    int count;
- 
-     if (size + TCL_UTF_MAX >= esPtr->msize) 
- 	exp_buffer_shuffle(interp,esPtr,save_flags,EXPECT_OUT,"expect");
-@@ -1648,11 +1729,43 @@
-     }
- #endif
- 
--    
-+    /* FIXME: If we ask less than what is available in the tcl buffer
-+       when tcl has seen EOF, we will throw away the remaining data
-+       since the next read will get EOF. Since expect is line-oriented,
-+       we exand our buffer to get EOF or the next newline at the end of
-+       the input buffer. I don't know if it is the right fix.  H.J. */
-+    count = 0;
-+    full_size = esPtr->msize - (size / TCL_UTF_MAX);
-     cc = Tcl_ReadChars(esPtr->channel,
--	    esPtr->buffer,
--	    esPtr->msize - (size / TCL_UTF_MAX),
--	    1 /* append */);
-+		esPtr->buffer,
-+		full_size,
-+		1 /* append */);
-+    if (cc > 0) {
-+	count += cc;
-+	/* It gets very tricky. There are more to read. We will expand
-+	   our buffer and get EOF or a newline at the end unless the
-+	   buffer length has been changed.  */
-+	if (cc == full_size) {
-+	    char *str;
-+	    str = Tcl_GetStringFromObj(esPtr->buffer, &size);
-+	    if (str[size - 1] != '\n') {
-+		if (esPtr->umsize_changed) {
-+		    char buf[20];	/* big enough for 64bit int in hex.  */
-+		    snprintf(buf,sizeof(buf),"0x%x", esPtr->umsize);
-+		    expDiagLogU("WARNING: interact buffer is not large enough to hold\r\n");
-+		    expDiagLogU("all output. probably your program is not interactive or\r\n");
-+		    expDiagLogU("has a very long output line. The current limit is ");
-+		    expDiagLogU(buf);
-+		    expDiagLogU(".\r\n");
-+		}
-+		else {
-+		    cc = expReadNewLine(interp,esPtr,save_flags);
-+		    if (cc > 0)
-+			count += cc;
-+		}
-+	    }
-+	}
-+    }
-     i_read_errno = errno;
- 
- #ifdef SIMPLE_EVENT
-@@ -1673,7 +1786,7 @@
- 	}
-     }
- #endif
--    return cc;	
-+    return count > 0 ? count : cc;
- }
- 
- /*
-@@ -2746,8 +2859,14 @@
- 	return(TCL_ERROR);
-     }
- 
--    if (Default) exp_default_match_max = size;
--    else esPtr->umsize = size;
-+    if (Default) {
-+	exp_default_match_max = size;
-+	exp_default_match_max_changed = 1;
-+    }
-+    else {
-+	esPtr->umsize = size;
-+	esPtr->umsize_changed = 1;
-+    }
- 
-     return(TCL_OK);
- }
diff --git a/src/patches/libvirt/0001-Change-default-behavior-of-libvirt-guests.sh-for-IPF.patch b/src/patches/libvirt/0001-Change-default-behavior-of-libvirt-guests.sh-for-IPF.patch
new file mode 100644
index 000000000..12af9a5f3
--- /dev/null
+++ b/src/patches/libvirt/0001-Change-default-behavior-of-libvirt-guests.sh-for-IPF.patch
@@ -0,0 +1,30 @@
+From a50fa0195e36773d57593006152828ce2c0523fd Mon Sep 17 00:00:00 2001
+From: Jonatan Schlag <jonatan.schlag@ipfire.org>
+Date: Fri, 6 May 2016 11:38:08 +0200
+Subject: [PATCH] Change default behavior of libvirt-guests.sh for IPFire
+
+Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
+---
+ tools/libvirt-guests.sh.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
+index 7f74b85..87aceb7 100644
+--- a/tools/libvirt-guests.sh.in
++++ b/tools/libvirt-guests.sh.in
+@@ -30,9 +30,9 @@ test ! -r "$sysconfdir"/rc.d/init.d/functions ||
+ 
+ export TEXTDOMAIN="@PACKAGE@" TEXTDOMAINDIR="@localedir@"
+ 
+-URIS=default
+-ON_BOOT=start
+-ON_SHUTDOWN=suspend
++URIS=qemu:///system
++ON_BOOT=ignore
++ON_SHUTDOWN=shutdown
+ SHUTDOWN_TIMEOUT=300
+ PARALLEL_SHUTDOWN=0
+ START_DELAY=0
+-- 
+2.1.4
+
diff --git a/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch b/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch
new file mode 100644
index 000000000..ed685e830
--- /dev/null
+++ b/src/patches/libvirt/0002-Change-options-in-libvirtd.conf-for-IPFire.patch
@@ -0,0 +1,43 @@
+From 69d6e8ce6c636f78d1db0eebe7fb1cc02ae4fb9a Mon Sep 17 00:00:00 2001
+From: Jonatan Schlag <jonatan.schlag@ipfire.org>
+Date: Mon, 6 Jun 2016 19:40:50 +0200
+Subject: [PATCH 2/2] Change options in libvirtd.conf for IPFire
+
+Signed-off-by: Jonatan Schlag <jonatan.schlag@ipfire.org>
+---
+ daemon/libvirtd.conf | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/daemon/libvirtd.conf b/daemon/libvirtd.conf
+index ac06cdd..1a41914 100644
+--- a/daemon/libvirtd.conf
++++ b/daemon/libvirtd.conf
+@@ -87,14 +87,14 @@
+ # without becoming root.
+ #
+ # This is restricted to 'root' by default.
+-#unix_sock_group = "libvirt"
++unix_sock_group = "libvirt-remote"
+ 
+ # Set the UNIX socket permissions for the R/O socket. This is used
+ # for monitoring VM status only
+ #
+ # Default allows any user. If setting group ownership, you may want to
+ # restrict this too.
+-#unix_sock_ro_perms = "0777"
++unix_sock_ro_perms = "0770"
+ 
+ # Set the UNIX socket permissions for the R/W socket. This is used
+ # for full management of VMs
+@@ -104,7 +104,7 @@
+ #
+ # If not using PolicyKit and setting group ownership for access
+ # control, then you may want to relax this too.
+-#unix_sock_rw_perms = "0770"
++unix_sock_rw_perms = "0770"
+ 
+ # Set the UNIX socket permissions for the admin interface socket.
+ #
+-- 
+2.1.4
+
diff --git a/src/patches/samba/1-samba.git-82fa625540abf8b8ec23d43c41e2ca906a9928a5.patch b/src/patches/samba/1-samba.git-82fa625540abf8b8ec23d43c41e2ca906a9928a5.patch
deleted file mode 100644
index ec449c331..000000000
--- a/src/patches/samba/1-samba.git-82fa625540abf8b8ec23d43c41e2ca906a9928a5.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 82fa625540abf8b8ec23d43c41e2ca906a9928a5 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@samba.org>
-Date: Fri, 15 Apr 2016 11:56:08 +0200
-Subject: [PATCH] s3:rpc_server: Fix a regression verifying the security
- trailer
-
-We do not support header signing so we should not check verify it if a
-client sends the flag.
-
-Signed-off-by: Andreas Schneider <asn@samba.org>
-Reviewed-by: Guenther Deschner <gd@samba.org>
----
- source3/rpc_server/srv_pipe.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/source3/rpc_server/srv_pipe.c b/source3/rpc_server/srv_pipe.c
-index d659705..fa354a6 100644
---- a/source3/rpc_server/srv_pipe.c
-+++ b/source3/rpc_server/srv_pipe.c
-@@ -1552,7 +1552,6 @@ static bool srv_pipe_check_verification_trailer(struct pipes_struct *p,
- {
- 	TALLOC_CTX *frame = talloc_stackframe();
- 	struct dcerpc_sec_verification_trailer *vt = NULL;
--	const uint32_t bitmask1 = 0;
- 	const struct dcerpc_sec_vt_pcontext pcontext = {
- 		.abstract_syntax = pipe_fns->syntax,
- 		.transfer_syntax = ndr_transfer_syntax,
-@@ -1573,7 +1572,7 @@ static bool srv_pipe_check_verification_trailer(struct pipes_struct *p,
- 		goto done;
- 	}
- 
--	ret = dcerpc_sec_verification_trailer_check(vt, &bitmask1,
-+	ret = dcerpc_sec_verification_trailer_check(vt, NULL,
- 						    &pcontext, &header2);
- done:
- 	TALLOC_FREE(frame);
--- 
-1.9.1
-
diff --git a/src/patches/samba/2-samba.git-0abef6992dc342d443137f8a2ac6c01f490cecee.patch b/src/patches/samba/2-samba.git-0abef6992dc342d443137f8a2ac6c01f490cecee.patch
deleted file mode 100644
index 074653c43..000000000
--- a/src/patches/samba/2-samba.git-0abef6992dc342d443137f8a2ac6c01f490cecee.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 0abef6992dc342d443137f8a2ac6c01f490cecee Mon Sep 17 00:00:00 2001
-From: Christian Ambach <ambi@samba.org>
-Date: Wed, 20 Feb 2013 16:59:05 +0100
-Subject: [PATCH] s3:rpc_client fix a crash
-
-state->cli->dc does not have to be set (e.g. when running
-net rpc join against an older Samba PDC), so check it before dereferencing it
-
-This fixes Bug 9669 - net rpc join crashes against a Samba 3.0.33 PDC
-
-Bug: https://bugzilla.samba.org/show_bug.cgi?id=9669
-
-Signed-off-by: Christian Ambach <ambi@samba.org>
-Reviewed-by: Andreas Schneider <asn@samba.org>
-
-Autobuild-User(master): Christian Ambach <ambi@samba.org>
-Autobuild-Date(master): Wed Feb 20 19:00:52 CET 2013 on sn-devel-104
-(cherry picked from commit 3d29bb2d37b02909ecb500e864f3c13e06957a86)
-
-(cherry picked from commit ff658bb36c28c9db91fc80a68725e893ffe300aa)
----
- source3/rpc_client/cli_pipe.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
-index 5ddabb7..a211d92 100644
---- a/source3/rpc_client/cli_pipe.c
-+++ b/source3/rpc_client/cli_pipe.c
-@@ -2136,7 +2136,7 @@ static void rpc_pipe_bind_step_two_done(struct tevent_req *subreq)
- 	status = dcerpc_netr_LogonGetCapabilities_r_recv(subreq, talloc_tos());
- 	TALLOC_FREE(subreq);
- 	if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) {
--		if (state->cli->dc->negotiate_flags &
-+		if (state->cli->dc && state->cli->dc->negotiate_flags &
- 		    NETLOGON_NEG_SUPPORTS_AES) {
- 			DEBUG(5, ("AES is not supported and the error was %s\n",
- 				  nt_errstr(status)));
--- 
-1.9.1
-
diff --git a/src/patches/samba/3-samba.git-2d0424e7bb2c30bf9049529b207c73b55370dfc8.patch b/src/patches/samba/3-samba.git-2d0424e7bb2c30bf9049529b207c73b55370dfc8.patch
deleted file mode 100644
index 75aedd80e..000000000
--- a/src/patches/samba/3-samba.git-2d0424e7bb2c30bf9049529b207c73b55370dfc8.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 2d0424e7bb2c30bf9049529b207c73b55370dfc8 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@samba.org>
-Date: Tue, 10 Jan 2012 16:38:16 +0100
-Subject: [PATCH] s3-rpc_client: Fix updating netlogon credentials.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Günther Deschner <gd@samba.org>
-(cherry picked from commit 33206b1e240e55acedad606aed4f1952f7496b35)
----
- source3/rpc_client/cli_pipe.c | 15 +++++++--------
- 1 file changed, 7 insertions(+), 8 deletions(-)
-
-diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c
-index a211d92..92ca494 100644
---- a/source3/rpc_client/cli_pipe.c
-+++ b/source3/rpc_client/cli_pipe.c
-@@ -2128,9 +2128,6 @@ static void rpc_pipe_bind_step_two_done(struct tevent_req *subreq)
- 	struct rpc_pipe_bind_state *state =
- 		tevent_req_data(req,
- 				struct rpc_pipe_bind_state);
--	struct schannel_state *schannel_auth =
--		talloc_get_type_abort(state->cli->auth->auth_ctx,
--				      struct schannel_state);
- 	NTSTATUS status;
- 
- 	status = dcerpc_netr_LogonGetCapabilities_r_recv(subreq, talloc_tos());
-@@ -2188,8 +2185,8 @@ static void rpc_pipe_bind_step_two_done(struct tevent_req *subreq)
- 		return;
- 	}
- 
--	TALLOC_FREE(schannel_auth->creds);
--	schannel_auth->creds = talloc_steal(state->cli, state->creds);
-+	TALLOC_FREE(state->cli->dc);
-+	state->cli->dc = talloc_steal(state->cli, state->creds);
- 
- 	if (!NT_STATUS_IS_OK(state->r.out.result)) {
- 		DEBUG(0, ("dcerpc_netr_LogonGetCapabilities_r_recv failed with %s\n",
-@@ -3385,10 +3382,12 @@ NTSTATUS cli_rpc_pipe_open_schannel_with_key(struct cli_state *cli,
- 	 * The credentials on a new netlogon pipe are the ones we are passed
- 	 * in - copy them over
- 	 */
--	result->dc = netlogon_creds_copy(result, *pdc);
- 	if (result->dc == NULL) {
--		TALLOC_FREE(result);
--		return NT_STATUS_NO_MEMORY;
-+		result->dc = netlogon_creds_copy(result, *pdc);
-+		if (result->dc == NULL) {
-+			TALLOC_FREE(result);
-+			return NT_STATUS_NO_MEMORY;
-+		}
- 	}
- 
- 	DEBUG(10,("cli_rpc_pipe_open_schannel_with_key: opened pipe %s to machine %s "
--- 
-1.9.1
-
diff --git a/src/patches/samba/CVE-preparation-v3-6.patch b/src/patches/samba/CVE-preparation-v3-6.patch
index 48af30c7e..c4891d6a5 100644
--- a/src/patches/samba/CVE-preparation-v3-6.patch
+++ b/src/patches/samba/CVE-preparation-v3-6.patch
@@ -1,7 +1,7 @@
 From 39a3fa39967faaf216be8e108ca57d07de1aa95a Mon Sep 17 00:00:00 2001
 From: Vadim Zhukov <persgray@gmail.com>
 Date: Sat, 25 May 2013 15:19:24 +0100
-Subject: [PATCH 01/41] pidl: Recent Perl warns about "defined(@var)"
+Subject: [PATCH 01/44] pidl: Recent Perl warns about "defined(@var)"
  constructs.
 
 Signed-off-by: Jelmer Vernooij <jelmer@samba.org>
@@ -1170,7 +1170,7 @@ Index: samba-3.6.23/source3/Makefile.in
 -	  lib/bitmap.o lib/dprintf.o $(UTIL_REG_OBJ) \
 +	  ../lib/util/bitmap.o lib/dprintf.o $(UTIL_REG_OBJ) \
  	  lib/wins_srv.o \
- 	  lib/util_str.o lib/clobber.o lib/util_sid.o \
+ 	  lib/util_str.o lib/clobber.o lib/util_sid.o lib/util_specialsids.o \
  	  lib/util_unistr.o ../lib/util/charset/codepoints.o lib/util_file.o \
 @@ -988,7 +989,9 @@ SWAT_OBJ = $(SWAT_OBJ1) $(PARAM_OBJ) $(P
  	   $(POPT_LIB_OBJ) $(SMBLDAP_OBJ) $(LIBMSRPC_GEN_OBJ) $(LIBMSRPC_OBJ) \
@@ -2376,7 +2376,7 @@ Index: samba-3.6.23/source3/rpc_client/cli_pipe.c
  	case DCERPC_AUTH_TYPE_NTLMSSP:
  	case DCERPC_AUTH_TYPE_SPNEGO:
  	case DCERPC_AUTH_TYPE_KRB5:
-@@ -1869,6 +2068,153 @@ err_out:
+@@ -1869,6 +2068,150 @@ err_out:
  	tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
  }
  
@@ -2440,15 +2440,12 @@ Index: samba-3.6.23/source3/rpc_client/cli_pipe.c
 +	struct rpc_pipe_bind_state *state =
 +		tevent_req_data(req,
 +				struct rpc_pipe_bind_state);
-+	struct schannel_state *schannel_auth =
-+		talloc_get_type_abort(state->cli->auth->auth_ctx,
-+				      struct schannel_state);
 +	NTSTATUS status;
 +
 +	status = dcerpc_netr_LogonGetCapabilities_r_recv(subreq, talloc_tos());
 +	TALLOC_FREE(subreq);
 +	if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE)) {
-+		if (state->cli->dc->negotiate_flags &
++		if (state->cli->dc && state->cli->dc->negotiate_flags &
 +		    NETLOGON_NEG_SUPPORTS_AES) {
 +			DEBUG(5, ("AES is not supported and the error was %s\n",
 +				  nt_errstr(status)));
@@ -2500,8 +2497,8 @@ Index: samba-3.6.23/source3/rpc_client/cli_pipe.c
 +		return;
 +	}
 +
-+	TALLOC_FREE(schannel_auth->creds);
-+	schannel_auth->creds = talloc_steal(state->cli, state->creds);
++	TALLOC_FREE(state->cli->dc);
++	state->cli->dc = talloc_steal(state->cli, state->creds);
 +
 +	if (!NT_STATUS_IS_OK(state->r.out.result)) {
 +		DEBUG(0, ("dcerpc_netr_LogonGetCapabilities_r_recv failed with %s\n",
@@ -2530,6 +2527,22 @@ Index: samba-3.6.23/source3/rpc_client/cli_pipe.c
  static NTSTATUS rpc_bind_next_send(struct tevent_req *req,
  				   struct rpc_pipe_bind_state *state,
  				   DATA_BLOB *auth_token)
+@@ -3039,10 +3382,12 @@ NTSTATUS cli_rpc_pipe_open_schannel_with
+ 	 * The credentials on a new netlogon pipe are the ones we are passed
+ 	 * in - copy them over
+ 	 */
+-	result->dc = netlogon_creds_copy(result, *pdc);
+ 	if (result->dc == NULL) {
+-		TALLOC_FREE(result);
+-		return NT_STATUS_NO_MEMORY;
++		result->dc = netlogon_creds_copy(result, *pdc);
++		if (result->dc == NULL) {
++			TALLOC_FREE(result);
++			return NT_STATUS_NO_MEMORY;
++		}
+ 	}
+ 
+ 	DEBUG(10,("cli_rpc_pipe_open_schannel_with_key: opened pipe %s to machine %s "
 Index: samba-3.6.23/source3/librpc/rpc/dcerpc.h
 ===================================================================
 --- samba-3.6.23.orig/source3/librpc/rpc/dcerpc.h
@@ -3688,7 +3701,7 @@ Index: samba-3.6.23/source3/rpc_server/srv_pipe.c
  
  	/* add to the list of open contexts */
  
-@@ -1541,7 +1543,42 @@ static PIPE_RPC_FNS* find_pipe_fns_by_co
+@@ -1541,7 +1543,41 @@ static PIPE_RPC_FNS* find_pipe_fns_by_co
  }
  
  static bool api_rpcTNP(struct pipes_struct *p, struct ncacn_packet *pkt,
@@ -3702,7 +3715,6 @@ Index: samba-3.6.23/source3/rpc_server/srv_pipe.c
 +{
 +	TALLOC_CTX *frame = talloc_stackframe();
 +	struct dcerpc_sec_verification_trailer *vt = NULL;
-+	const uint32_t bitmask1 = 0;
 +	const struct dcerpc_sec_vt_pcontext pcontext = {
 +		.abstract_syntax = pipe_fns->syntax,
 +		.transfer_syntax = ndr_transfer_syntax,
@@ -3723,7 +3735,7 @@ Index: samba-3.6.23/source3/rpc_server/srv_pipe.c
 +		goto done;
 +	}
 +
-+	ret = dcerpc_sec_verification_trailer_check(vt, &bitmask1,
++	ret = dcerpc_sec_verification_trailer_check(vt, NULL,
 +						    &pcontext, &header2);
 +done:
 +	TALLOC_FREE(frame);
@@ -3732,7 +3744,7 @@ Index: samba-3.6.23/source3/rpc_server/srv_pipe.c
  
  /****************************************************************************
   Find the correct RPC function to call for this request.
-@@ -1552,46 +1589,53 @@ static bool api_rpcTNP(struct pipes_stru
+@@ -1552,46 +1588,53 @@ static bool api_rpcTNP(struct pipes_stru
  static bool api_pipe_request(struct pipes_struct *p,
  				struct ncacn_packet *pkt)
  {
@@ -3811,7 +3823,7 @@ Index: samba-3.6.23/source3/rpc_server/srv_pipe.c
  	return ret;
  }
  
-@@ -1600,20 +1644,21 @@ static bool api_pipe_request(struct pipe
+@@ -1600,20 +1643,21 @@ static bool api_pipe_request(struct pipe
   ********************************************************************/
  
  static bool api_rpcTNP(struct pipes_struct *p, struct ncacn_packet *pkt,
@@ -3836,7 +3848,7 @@ Index: samba-3.6.23/source3/rpc_server/srv_pipe.c
  		dump_pdu_region(name, pkt->u.request.opnum,
  				&p->in_data.data, 0,
  				p->in_data.data.length);
-@@ -1646,37 +1691,30 @@ static bool api_rpcTNP(struct pipes_stru
+@@ -1646,37 +1690,30 @@ static bool api_rpcTNP(struct pipes_stru
  	/* do the actual command */
  	if(!api_rpc_cmds[fn_num].fn(p)) {
  		DEBUG(0,("api_rpcTNP: %s: %s failed.\n",
@@ -3882,7 +3894,7 @@ Index: samba-3.6.23/source3/rpc_server/srv_pipe.c
  
  	/* Check for buffer underflow in rpc parsing */
  	if ((DEBUGLEVEL >= 10) &&
-@@ -1718,9 +1756,9 @@ void set_incoming_fault(struct pipes_str
+@@ -1718,9 +1755,9 @@ void set_incoming_fault(struct pipes_str
  	data_blob_free(&p->in_data.data);
  	p->in_data.pdu_needed_len = 0;
  	p->in_data.pdu.length = 0;
@@ -5626,7 +5638,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
 ===================================================================
 --- samba-3.6.23.orig/source3/rpc_server/spoolss/srv_spoolss_nt.c
 +++ samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
-@@ -10201,7 +10201,7 @@ WERROR _spoolss_AddPort(struct pipes_str
+@@ -10207,7 +10207,7 @@ WERROR _spoolss_AddPort(struct pipes_str
  WERROR _spoolss_GetPrinterDriver(struct pipes_struct *p,
  				 struct spoolss_GetPrinterDriver *r)
  {
@@ -5635,7 +5647,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10212,7 +10212,7 @@ WERROR _spoolss_GetPrinterDriver(struct
+@@ -10218,7 +10218,7 @@ WERROR _spoolss_GetPrinterDriver(struct
  WERROR _spoolss_ReadPrinter(struct pipes_struct *p,
  			    struct spoolss_ReadPrinter *r)
  {
@@ -5644,7 +5656,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10223,7 +10223,7 @@ WERROR _spoolss_ReadPrinter(struct pipes
+@@ -10229,7 +10229,7 @@ WERROR _spoolss_ReadPrinter(struct pipes
  WERROR _spoolss_WaitForPrinterChange(struct pipes_struct *p,
  				     struct spoolss_WaitForPrinterChange *r)
  {
@@ -5653,7 +5665,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10234,7 +10234,7 @@ WERROR _spoolss_WaitForPrinterChange(str
+@@ -10240,7 +10240,7 @@ WERROR _spoolss_WaitForPrinterChange(str
  WERROR _spoolss_ConfigurePort(struct pipes_struct *p,
  			      struct spoolss_ConfigurePort *r)
  {
@@ -5662,7 +5674,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10245,7 +10245,7 @@ WERROR _spoolss_ConfigurePort(struct pip
+@@ -10251,7 +10251,7 @@ WERROR _spoolss_ConfigurePort(struct pip
  WERROR _spoolss_DeletePort(struct pipes_struct *p,
  			   struct spoolss_DeletePort *r)
  {
@@ -5671,7 +5683,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10256,7 +10256,7 @@ WERROR _spoolss_DeletePort(struct pipes_
+@@ -10262,7 +10262,7 @@ WERROR _spoolss_DeletePort(struct pipes_
  WERROR _spoolss_CreatePrinterIC(struct pipes_struct *p,
  				struct spoolss_CreatePrinterIC *r)
  {
@@ -5680,7 +5692,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10267,7 +10267,7 @@ WERROR _spoolss_CreatePrinterIC(struct p
+@@ -10273,7 +10273,7 @@ WERROR _spoolss_CreatePrinterIC(struct p
  WERROR _spoolss_PlayGDIScriptOnPrinterIC(struct pipes_struct *p,
  					 struct spoolss_PlayGDIScriptOnPrinterIC *r)
  {
@@ -5689,7 +5701,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10278,7 +10278,7 @@ WERROR _spoolss_PlayGDIScriptOnPrinterIC
+@@ -10284,7 +10284,7 @@ WERROR _spoolss_PlayGDIScriptOnPrinterIC
  WERROR _spoolss_DeletePrinterIC(struct pipes_struct *p,
  				struct spoolss_DeletePrinterIC *r)
  {
@@ -5698,7 +5710,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10289,7 +10289,7 @@ WERROR _spoolss_DeletePrinterIC(struct p
+@@ -10295,7 +10295,7 @@ WERROR _spoolss_DeletePrinterIC(struct p
  WERROR _spoolss_AddPrinterConnection(struct pipes_struct *p,
  				     struct spoolss_AddPrinterConnection *r)
  {
@@ -5707,7 +5719,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10300,7 +10300,7 @@ WERROR _spoolss_AddPrinterConnection(str
+@@ -10306,7 +10306,7 @@ WERROR _spoolss_AddPrinterConnection(str
  WERROR _spoolss_DeletePrinterConnection(struct pipes_struct *p,
  					struct spoolss_DeletePrinterConnection *r)
  {
@@ -5716,7 +5728,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10311,7 +10311,7 @@ WERROR _spoolss_DeletePrinterConnection(
+@@ -10317,7 +10317,7 @@ WERROR _spoolss_DeletePrinterConnection(
  WERROR _spoolss_PrinterMessageBox(struct pipes_struct *p,
  				  struct spoolss_PrinterMessageBox *r)
  {
@@ -5725,7 +5737,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10322,7 +10322,7 @@ WERROR _spoolss_PrinterMessageBox(struct
+@@ -10328,7 +10328,7 @@ WERROR _spoolss_PrinterMessageBox(struct
  WERROR _spoolss_AddMonitor(struct pipes_struct *p,
  			   struct spoolss_AddMonitor *r)
  {
@@ -5734,7 +5746,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10333,7 +10333,7 @@ WERROR _spoolss_AddMonitor(struct pipes_
+@@ -10339,7 +10339,7 @@ WERROR _spoolss_AddMonitor(struct pipes_
  WERROR _spoolss_DeleteMonitor(struct pipes_struct *p,
  			      struct spoolss_DeleteMonitor *r)
  {
@@ -5743,7 +5755,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10344,7 +10344,7 @@ WERROR _spoolss_DeleteMonitor(struct pip
+@@ -10350,7 +10350,7 @@ WERROR _spoolss_DeleteMonitor(struct pip
  WERROR _spoolss_DeletePrintProcessor(struct pipes_struct *p,
  				     struct spoolss_DeletePrintProcessor *r)
  {
@@ -5752,7 +5764,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10355,7 +10355,7 @@ WERROR _spoolss_DeletePrintProcessor(str
+@@ -10361,7 +10361,7 @@ WERROR _spoolss_DeletePrintProcessor(str
  WERROR _spoolss_AddPrintProvidor(struct pipes_struct *p,
  				 struct spoolss_AddPrintProvidor *r)
  {
@@ -5761,7 +5773,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10366,7 +10366,7 @@ WERROR _spoolss_AddPrintProvidor(struct
+@@ -10372,7 +10372,7 @@ WERROR _spoolss_AddPrintProvidor(struct
  WERROR _spoolss_DeletePrintProvidor(struct pipes_struct *p,
  				    struct spoolss_DeletePrintProvidor *r)
  {
@@ -5770,7 +5782,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10377,7 +10377,7 @@ WERROR _spoolss_DeletePrintProvidor(stru
+@@ -10383,7 +10383,7 @@ WERROR _spoolss_DeletePrintProvidor(stru
  WERROR _spoolss_FindFirstPrinterChangeNotification(struct pipes_struct *p,
  						   struct spoolss_FindFirstPrinterChangeNotification *r)
  {
@@ -5779,7 +5791,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10388,7 +10388,7 @@ WERROR _spoolss_FindFirstPrinterChangeNo
+@@ -10394,7 +10394,7 @@ WERROR _spoolss_FindFirstPrinterChangeNo
  WERROR _spoolss_FindNextPrinterChangeNotification(struct pipes_struct *p,
  						  struct spoolss_FindNextPrinterChangeNotification *r)
  {
@@ -5788,7 +5800,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10399,7 +10399,7 @@ WERROR _spoolss_FindNextPrinterChangeNot
+@@ -10405,7 +10405,7 @@ WERROR _spoolss_FindNextPrinterChangeNot
  WERROR _spoolss_RouterFindFirstPrinterChangeNotificationOld(struct pipes_struct *p,
  							    struct spoolss_RouterFindFirstPrinterChangeNotificationOld *r)
  {
@@ -5797,7 +5809,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10410,7 +10410,7 @@ WERROR _spoolss_RouterFindFirstPrinterCh
+@@ -10416,7 +10416,7 @@ WERROR _spoolss_RouterFindFirstPrinterCh
  WERROR _spoolss_ReplyOpenPrinter(struct pipes_struct *p,
  				 struct spoolss_ReplyOpenPrinter *r)
  {
@@ -5806,7 +5818,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10421,7 +10421,7 @@ WERROR _spoolss_ReplyOpenPrinter(struct
+@@ -10427,7 +10427,7 @@ WERROR _spoolss_ReplyOpenPrinter(struct
  WERROR _spoolss_RouterReplyPrinter(struct pipes_struct *p,
  				   struct spoolss_RouterReplyPrinter *r)
  {
@@ -5815,7 +5827,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10432,7 +10432,7 @@ WERROR _spoolss_RouterReplyPrinter(struc
+@@ -10438,7 +10438,7 @@ WERROR _spoolss_RouterReplyPrinter(struc
  WERROR _spoolss_ReplyClosePrinter(struct pipes_struct *p,
  				  struct spoolss_ReplyClosePrinter *r)
  {
@@ -5824,7 +5836,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10443,7 +10443,7 @@ WERROR _spoolss_ReplyClosePrinter(struct
+@@ -10449,7 +10449,7 @@ WERROR _spoolss_ReplyClosePrinter(struct
  WERROR _spoolss_AddPortEx(struct pipes_struct *p,
  			  struct spoolss_AddPortEx *r)
  {
@@ -5833,7 +5845,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10454,7 +10454,7 @@ WERROR _spoolss_AddPortEx(struct pipes_s
+@@ -10460,7 +10460,7 @@ WERROR _spoolss_AddPortEx(struct pipes_s
  WERROR _spoolss_RouterFindFirstPrinterChangeNotification(struct pipes_struct *p,
  							 struct spoolss_RouterFindFirstPrinterChangeNotification *r)
  {
@@ -5842,7 +5854,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10465,7 +10465,7 @@ WERROR _spoolss_RouterFindFirstPrinterCh
+@@ -10471,7 +10471,7 @@ WERROR _spoolss_RouterFindFirstPrinterCh
  WERROR _spoolss_SpoolerInit(struct pipes_struct *p,
  			    struct spoolss_SpoolerInit *r)
  {
@@ -5851,7 +5863,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10476,7 +10476,7 @@ WERROR _spoolss_SpoolerInit(struct pipes
+@@ -10482,7 +10482,7 @@ WERROR _spoolss_SpoolerInit(struct pipes
  WERROR _spoolss_ResetPrinterEx(struct pipes_struct *p,
  			       struct spoolss_ResetPrinterEx *r)
  {
@@ -5860,7 +5872,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10487,7 +10487,7 @@ WERROR _spoolss_ResetPrinterEx(struct pi
+@@ -10493,7 +10493,7 @@ WERROR _spoolss_ResetPrinterEx(struct pi
  WERROR _spoolss_RouterReplyPrinterEx(struct pipes_struct *p,
  				     struct spoolss_RouterReplyPrinterEx *r)
  {
@@ -5869,7 +5881,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10498,7 +10498,7 @@ WERROR _spoolss_RouterReplyPrinterEx(str
+@@ -10504,7 +10504,7 @@ WERROR _spoolss_RouterReplyPrinterEx(str
  WERROR _spoolss_44(struct pipes_struct *p,
  		   struct spoolss_44 *r)
  {
@@ -5878,7 +5890,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10509,7 +10509,7 @@ WERROR _spoolss_44(struct pipes_struct *
+@@ -10515,7 +10515,7 @@ WERROR _spoolss_44(struct pipes_struct *
  WERROR _spoolss_SetPort(struct pipes_struct *p,
  			struct spoolss_SetPort *r)
  {
@@ -5887,7 +5899,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10520,7 +10520,7 @@ WERROR _spoolss_SetPort(struct pipes_str
+@@ -10526,7 +10526,7 @@ WERROR _spoolss_SetPort(struct pipes_str
  WERROR _spoolss_4a(struct pipes_struct *p,
  		   struct spoolss_4a *r)
  {
@@ -5896,7 +5908,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10531,7 +10531,7 @@ WERROR _spoolss_4a(struct pipes_struct *
+@@ -10537,7 +10537,7 @@ WERROR _spoolss_4a(struct pipes_struct *
  WERROR _spoolss_4b(struct pipes_struct *p,
  		   struct spoolss_4b *r)
  {
@@ -5905,7 +5917,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10542,7 +10542,7 @@ WERROR _spoolss_4b(struct pipes_struct *
+@@ -10548,7 +10548,7 @@ WERROR _spoolss_4b(struct pipes_struct *
  WERROR _spoolss_4c(struct pipes_struct *p,
  		   struct spoolss_4c *r)
  {
@@ -5914,7 +5926,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10553,7 +10553,7 @@ WERROR _spoolss_4c(struct pipes_struct *
+@@ -10559,7 +10559,7 @@ WERROR _spoolss_4c(struct pipes_struct *
  WERROR _spoolss_53(struct pipes_struct *p,
  		   struct spoolss_53 *r)
  {
@@ -5923,7 +5935,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10564,7 +10564,7 @@ WERROR _spoolss_53(struct pipes_struct *
+@@ -10570,7 +10570,7 @@ WERROR _spoolss_53(struct pipes_struct *
  WERROR _spoolss_AddPerMachineConnection(struct pipes_struct *p,
  					struct spoolss_AddPerMachineConnection *r)
  {
@@ -5932,7 +5944,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10575,7 +10575,7 @@ WERROR _spoolss_AddPerMachineConnection(
+@@ -10581,7 +10581,7 @@ WERROR _spoolss_AddPerMachineConnection(
  WERROR _spoolss_DeletePerMachineConnection(struct pipes_struct *p,
  					   struct spoolss_DeletePerMachineConnection *r)
  {
@@ -5941,7 +5953,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10586,7 +10586,7 @@ WERROR _spoolss_DeletePerMachineConnecti
+@@ -10592,7 +10592,7 @@ WERROR _spoolss_DeletePerMachineConnecti
  WERROR _spoolss_EnumPerMachineConnections(struct pipes_struct *p,
  					  struct spoolss_EnumPerMachineConnections *r)
  {
@@ -5950,7 +5962,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10597,7 +10597,7 @@ WERROR _spoolss_EnumPerMachineConnection
+@@ -10603,7 +10603,7 @@ WERROR _spoolss_EnumPerMachineConnection
  WERROR _spoolss_5a(struct pipes_struct *p,
  		   struct spoolss_5a *r)
  {
@@ -5959,7 +5971,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10608,7 +10608,7 @@ WERROR _spoolss_5a(struct pipes_struct *
+@@ -10614,7 +10614,7 @@ WERROR _spoolss_5a(struct pipes_struct *
  WERROR _spoolss_5b(struct pipes_struct *p,
  		   struct spoolss_5b *r)
  {
@@ -5968,7 +5980,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10619,7 +10619,7 @@ WERROR _spoolss_5b(struct pipes_struct *
+@@ -10625,7 +10625,7 @@ WERROR _spoolss_5b(struct pipes_struct *
  WERROR _spoolss_5c(struct pipes_struct *p,
  		   struct spoolss_5c *r)
  {
@@ -5977,7 +5989,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10630,7 +10630,7 @@ WERROR _spoolss_5c(struct pipes_struct *
+@@ -10636,7 +10636,7 @@ WERROR _spoolss_5c(struct pipes_struct *
  WERROR _spoolss_5d(struct pipes_struct *p,
  		   struct spoolss_5d *r)
  {
@@ -5986,7 +5998,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10641,7 +10641,7 @@ WERROR _spoolss_5d(struct pipes_struct *
+@@ -10647,7 +10647,7 @@ WERROR _spoolss_5d(struct pipes_struct *
  WERROR _spoolss_5e(struct pipes_struct *p,
  		   struct spoolss_5e *r)
  {
@@ -5995,7 +6007,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10652,7 +10652,7 @@ WERROR _spoolss_5e(struct pipes_struct *
+@@ -10658,7 +10658,7 @@ WERROR _spoolss_5e(struct pipes_struct *
  WERROR _spoolss_5f(struct pipes_struct *p,
  		   struct spoolss_5f *r)
  {
@@ -6004,7 +6016,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10663,7 +10663,7 @@ WERROR _spoolss_5f(struct pipes_struct *
+@@ -10669,7 +10669,7 @@ WERROR _spoolss_5f(struct pipes_struct *
  WERROR _spoolss_60(struct pipes_struct *p,
  		   struct spoolss_60 *r)
  {
@@ -6013,7 +6025,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10674,7 +10674,7 @@ WERROR _spoolss_60(struct pipes_struct *
+@@ -10680,7 +10680,7 @@ WERROR _spoolss_60(struct pipes_struct *
  WERROR _spoolss_61(struct pipes_struct *p,
  		   struct spoolss_61 *r)
  {
@@ -6022,7 +6034,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10685,7 +10685,7 @@ WERROR _spoolss_61(struct pipes_struct *
+@@ -10691,7 +10691,7 @@ WERROR _spoolss_61(struct pipes_struct *
  WERROR _spoolss_62(struct pipes_struct *p,
  		   struct spoolss_62 *r)
  {
@@ -6031,7 +6043,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10696,7 +10696,7 @@ WERROR _spoolss_62(struct pipes_struct *
+@@ -10702,7 +10702,7 @@ WERROR _spoolss_62(struct pipes_struct *
  WERROR _spoolss_63(struct pipes_struct *p,
  		   struct spoolss_63 *r)
  {
@@ -6040,7 +6052,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10707,7 +10707,7 @@ WERROR _spoolss_63(struct pipes_struct *
+@@ -10713,7 +10713,7 @@ WERROR _spoolss_63(struct pipes_struct *
  WERROR _spoolss_64(struct pipes_struct *p,
  		   struct spoolss_64 *r)
  {
@@ -6049,7 +6061,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10718,7 +10718,7 @@ WERROR _spoolss_64(struct pipes_struct *
+@@ -10724,7 +10724,7 @@ WERROR _spoolss_64(struct pipes_struct *
  WERROR _spoolss_65(struct pipes_struct *p,
  		   struct spoolss_65 *r)
  {
@@ -6058,7 +6070,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10729,7 +10729,7 @@ WERROR _spoolss_65(struct pipes_struct *
+@@ -10735,7 +10735,7 @@ WERROR _spoolss_65(struct pipes_struct *
  WERROR _spoolss_GetCorePrinterDrivers(struct pipes_struct *p,
  				      struct spoolss_GetCorePrinterDrivers *r)
  {
@@ -6067,7 +6079,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10740,7 +10740,7 @@ WERROR _spoolss_GetCorePrinterDrivers(st
+@@ -10746,7 +10746,7 @@ WERROR _spoolss_GetCorePrinterDrivers(st
  WERROR _spoolss_67(struct pipes_struct *p,
  		   struct spoolss_67 *r)
  {
@@ -6076,7 +6088,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10751,7 +10751,7 @@ WERROR _spoolss_67(struct pipes_struct *
+@@ -10757,7 +10757,7 @@ WERROR _spoolss_67(struct pipes_struct *
  WERROR _spoolss_GetPrinterDriverPackagePath(struct pipes_struct *p,
  					    struct spoolss_GetPrinterDriverPackagePath *r)
  {
@@ -6085,7 +6097,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10762,7 +10762,7 @@ WERROR _spoolss_GetPrinterDriverPackageP
+@@ -10768,7 +10768,7 @@ WERROR _spoolss_GetPrinterDriverPackageP
  WERROR _spoolss_69(struct pipes_struct *p,
  		   struct spoolss_69 *r)
  {
@@ -6094,7 +6106,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10773,7 +10773,7 @@ WERROR _spoolss_69(struct pipes_struct *
+@@ -10779,7 +10779,7 @@ WERROR _spoolss_69(struct pipes_struct *
  WERROR _spoolss_6a(struct pipes_struct *p,
  		   struct spoolss_6a *r)
  {
@@ -6103,7 +6115,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10784,7 +10784,7 @@ WERROR _spoolss_6a(struct pipes_struct *
+@@ -10790,7 +10790,7 @@ WERROR _spoolss_6a(struct pipes_struct *
  WERROR _spoolss_6b(struct pipes_struct *p,
  		   struct spoolss_6b *r)
  {
@@ -6112,7 +6124,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10795,7 +10795,7 @@ WERROR _spoolss_6b(struct pipes_struct *
+@@ -10801,7 +10801,7 @@ WERROR _spoolss_6b(struct pipes_struct *
  WERROR _spoolss_6c(struct pipes_struct *p,
  		   struct spoolss_6c *r)
  {
@@ -6121,7 +6133,7 @@ Index: samba-3.6.23/source3/rpc_server/spoolss/srv_spoolss_nt.c
  	return WERR_NOT_SUPPORTED;
  }
  
-@@ -10806,6 +10806,6 @@ WERROR _spoolss_6c(struct pipes_struct *
+@@ -10812,6 +10812,6 @@ WERROR _spoolss_6c(struct pipes_struct *
  WERROR _spoolss_6d(struct pipes_struct *p,
  		   struct spoolss_6d *r)
  {
diff --git a/src/patches/shadow-4.2.1-SHA512_password_hashing.patch b/src/patches/shadow-4.2.1-SHA512_password_hashing.patch
new file mode 100644
index 000000000..7fc5bc93f
--- /dev/null
+++ b/src/patches/shadow-4.2.1-SHA512_password_hashing.patch
@@ -0,0 +1,38 @@
+diff -crB shadow-4.2.1-a/etc/login.defs shadow-4.2.1-b/etc/login.defs
+*** shadow-4.2.1-a/etc/login.defs	2014-05-09 10:20:28.000000000 +0000
+--- shadow-4.2.1-b/etc/login.defs	2016-03-13 10:51:09.680171239 +0000
+***************
+*** 118,124 ****
+  #   Directory where mailboxes reside, _or_ name of file, relative to the
+  #   home directory.  If you _do_ define both, MAIL_DIR takes precedence.
+  #
+! MAIL_DIR	/var/spool/mail
+  #MAIL_FILE	.mail
+  
+  #
+--- 118,124 ----
+  #   Directory where mailboxes reside, _or_ name of file, relative to the
+  #   home directory.  If you _do_ define both, MAIL_DIR takes precedence.
+  #
+! MAIL_DIR	/var/mail
+  #MAIL_FILE	.mail
+  
+  #
+***************
+*** 317,323 ****
+  # Note: If you use PAM, it is recommended to use a value consistent with
+  # the PAM modules configuration.
+  #
+! #ENCRYPT_METHOD DES
+  
+  #
+  # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512.
+--- 317,323 ----
+  # Note: If you use PAM, it is recommended to use a value consistent with
+  # the PAM modules configuration.
+  #
+! ENCRYPT_METHOD SHA512
+  
+  #
+  # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512.
+Only in shadow-4.2.1-b: SHA512_password_hashing.patch
diff --git a/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch b/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch
new file mode 100644
index 000000000..f9f09c4ec
--- /dev/null
+++ b/src/patches/shadow-4.2.1-suppress_installation_of_groups.patch
@@ -0,0 +1,446 @@
+diff -crB shadow-4.2.1-a/man/cs/Makefile.in shadow-4.2.1-b/man/cs/Makefile.in
+*** shadow-4.2.1-a/man/cs/Makefile.in	2014-05-09 16:49:46.000000000 +0000
+--- shadow-4.2.1-b/man/cs/Makefile.in	2016-03-13 10:47:55.924166976 +0000
+***************
+*** 300,311 ****
+  	man8/groupadd.8 \
+  	man8/groupdel.8 \
+  	man8/groupmod.8 \
+! 	man1/groups.1 \
+  	man8/grpck.8 \
+  	man5/gshadow.5 \
+  	man8/lastlog.8 \
+  	man8/nologin.8 \
+! 	man5/passwd.5 \
+  	man5/shadow.5 \
+  	man1/su.1 \
+  	man8/vipw.8
+--- 300,311 ----
+  	man8/groupadd.8 \
+  	man8/groupdel.8 \
+  	man8/groupmod.8 \
+! 	man1/ \
+  	man8/grpck.8 \
+  	man5/gshadow.5 \
+  	man8/lastlog.8 \
+  	man8/nologin.8 \
+! 	man5/ \
+  	man5/shadow.5 \
+  	man1/su.1 \
+  	man8/vipw.8
+diff -crB shadow-4.2.1-a/man/da/Makefile.in shadow-4.2.1-b/man/da/Makefile.in
+*** shadow-4.2.1-a/man/da/Makefile.in	2014-05-09 16:49:46.000000000 +0000
+--- shadow-4.2.1-b/man/da/Makefile.in	2016-03-13 10:47:55.928166977 +0000
+***************
+*** 298,304 ****
+  top_srcdir = @top_srcdir@
+  
+  # 2012.01.28 - activate manpages with more than 50% translated messages
+! man_MANS = man1/chfn.1 man8/groupdel.8 man1/groups.1 man5/gshadow.5 \
+  	man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \
+  	man8/vigr.8 man8/vipw.8 $(am__append_1)
+  man_nopam = 
+--- 298,304 ----
+  top_srcdir = @top_srcdir@
+  
+  # 2012.01.28 - activate manpages with more than 50% translated messages
+! man_MANS = man1/chfn.1 man8/groupdel.8 man1/ man5/gshadow.5 \
+  	man8/logoutd.8 man1/newgrp.1 man8/nologin.8 man1/sg.1 \
+  	man8/vigr.8 man8/vipw.8 $(am__append_1)
+  man_nopam = 
+diff -crB shadow-4.2.1-a/man/de/Makefile.in shadow-4.2.1-b/man/de/Makefile.in
+*** shadow-4.2.1-a/man/de/Makefile.in	2014-05-09 16:49:46.000000000 +0000
+--- shadow-4.2.1-b/man/de/Makefile.in	2016-03-13 10:47:55.916166976 +0000
+***************
+*** 299,309 ****
+  top_srcdir = @top_srcdir@
+  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+! 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+! 	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
+  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
+  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
+  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
+--- 299,309 ----
+  top_srcdir = @top_srcdir@
+  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+! 	man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+! 	man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
+  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
+  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
+  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
+  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
+diff -crB shadow-4.2.1-a/man/es/Makefile.in shadow-4.2.1-b/man/es/Makefile.in
+*** shadow-4.2.1-a/man/es/Makefile.in	2014-05-09 16:49:46.000000000 +0000
+--- shadow-4.2.1-b/man/es/Makefile.in	2016-03-13 10:47:55.872166975 +0000
+***************
+*** 266,272 ****
+  #	man1/login.1 \
+  #	man1/newgrp.1 \
+  #	man1/passwd.1 \
+! #	man5/passwd.5 \
+  #	man1/su.1 \
+  #	man8/vigr.8 \
+  #	man8/vipw.8
+--- 266,272 ----
+  #	man1/login.1 \
+  #	man1/newgrp.1 \
+  #	man1/passwd.1 \
+! #	man5/ \
+  #	man1/su.1 \
+  #	man8/vigr.8 \
+  #	man8/vipw.8
+diff -crB shadow-4.2.1-a/man/fr/Makefile.in shadow-4.2.1-b/man/fr/Makefile.in
+*** shadow-4.2.1-a/man/fr/Makefile.in	2014-05-09 16:49:46.000000000 +0000
+--- shadow-4.2.1-b/man/fr/Makefile.in	2016-03-13 10:47:55.984166978 +0000
+***************
+*** 301,311 ****
+  top_srcdir = @top_srcdir@
+  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+! 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+! 	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
+  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
+  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
+  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
+--- 301,311 ----
+  top_srcdir = @top_srcdir@
+  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+! 	man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+! 	man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
+  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
+  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
+  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
+  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
+diff -crB shadow-4.2.1-a/man/hu/Makefile.in shadow-4.2.1-b/man/hu/Makefile.in
+*** shadow-4.2.1-a/man/hu/Makefile.in	2014-05-09 16:49:46.000000000 +0000
+--- shadow-4.2.1-b/man/hu/Makefile.in	2016-03-13 10:47:55.972166978 +0000
+***************
+*** 295,306 ****
+  man_MANS = \
+  	man1/chsh.1 \
+  	man1/gpasswd.1 \
+! 	man1/groups.1 \
+  	man8/lastlog.8 \
+  	man1/login.1 \
+  	man1/newgrp.1 \
+  	man1/passwd.1 \
+! 	man5/passwd.5 \
+  	man1/sg.1 \
+  	man1/su.1
+  
+--- 295,306 ----
+  man_MANS = \
+  	man1/chsh.1 \
+  	man1/gpasswd.1 \
+! 	man1/ \
+  	man8/lastlog.8 \
+  	man1/login.1 \
+  	man1/newgrp.1 \
+  	man1/passwd.1 \
+! 	man5/ \
+  	man1/sg.1 \
+  	man1/su.1
+  
+diff -crB shadow-4.2.1-a/man/it/Makefile.in shadow-4.2.1-b/man/it/Makefile.in
+*** shadow-4.2.1-a/man/it/Makefile.in	2014-05-09 16:49:47.000000000 +0000
+--- shadow-4.2.1-b/man/it/Makefile.in	2016-03-13 10:47:55.896166976 +0000
+***************
+*** 299,309 ****
+  top_srcdir = @top_srcdir@
+  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+! 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+! 	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
+  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
+  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
+  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
+--- 299,309 ----
+  top_srcdir = @top_srcdir@
+  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+! 	man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+! 	man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
+  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
+  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
+  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
+  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
+diff -crB shadow-4.2.1-a/man/ja/Makefile.in shadow-4.2.1-b/man/ja/Makefile.in
+*** shadow-4.2.1-a/man/ja/Makefile.in	2014-05-09 16:49:47.000000000 +0000
+--- shadow-4.2.1-b/man/ja/Makefile.in	2016-03-13 10:47:55.932166977 +0000
+***************
+*** 296,305 ****
+  top_srcdir = @top_srcdir@
+  man_MANS = man1/chage.1 man1/chfn.1 man8/chpasswd.8 man1/chsh.1 \
+  	man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \
+! 	man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/groups.1 \
+  	man8/grpck.8 man8/grpconv.8 man8/grpunconv.8 man8/lastlog.8 \
+  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+! 	man8/newusers.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
+  	man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man5/shadow.5 \
+  	man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
+  	man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1)
+--- 296,305 ----
+  top_srcdir = @top_srcdir@
+  man_MANS = man1/chage.1 man1/chfn.1 man8/chpasswd.8 man1/chsh.1 \
+  	man1/expiry.1 man5/faillog.5 man8/faillog.8 man1/gpasswd.1 \
+! 	man8/groupadd.8 man8/groupdel.8 man8/groupmod.8 man1/ \
+  	man8/grpck.8 man8/grpconv.8 man8/grpunconv.8 man8/lastlog.8 \
+  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+! 	man8/newusers.8 man1/passwd.1 man5/ man8/pwck.8 \
+  	man8/pwconv.8 man8/pwunconv.8 man1/sg.1 man5/shadow.5 \
+  	man1/su.1 man5/suauth.5 man8/useradd.8 man8/userdel.8 \
+  	man8/usermod.8 man8/vigr.8 man8/vipw.8 $(am__append_1)
+diff -crB shadow-4.2.1-a/man/ko/Makefile.in shadow-4.2.1-b/man/ko/Makefile.in
+*** shadow-4.2.1-a/man/ko/Makefile.in	2014-05-09 16:49:47.000000000 +0000
+--- shadow-4.2.1-b/man/ko/Makefile.in	2016-03-13 10:47:55.940166977 +0000
+***************
+*** 295,303 ****
+  man_MANS = \
+  	man1/chfn.1 \
+  	man1/chsh.1 \
+! 	man1/groups.1 \
+  	man1/login.1 \
+! 	man5/passwd.5 \
+  	man1/su.1 \
+  	man8/vigr.8 \
+  	man8/vipw.8
+--- 295,303 ----
+  man_MANS = \
+  	man1/chfn.1 \
+  	man1/chsh.1 \
+! 	man1/ \
+  	man1/login.1 \
+! 	man5/ \
+  	man1/su.1 \
+  	man8/vigr.8 \
+  	man8/vipw.8
+diff -crB shadow-4.2.1-a/man/Makefile.in shadow-4.2.1-b/man/Makefile.in
+*** shadow-4.2.1-a/man/Makefile.in	2014-05-09 16:49:46.000000000 +0000
+--- shadow-4.2.1-b/man/Makefile.in	2016-03-13 10:47:55.880166976 +0000
+***************
+*** 365,375 ****
+  @USE_NLS_TRUE@SUBDIRS = po cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW
+  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+! 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+! 	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
+  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
+  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
+  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
+--- 365,375 ----
+  @USE_NLS_TRUE@SUBDIRS = po cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW
+  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+! 	man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+! 	man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
+  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
+  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
+  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
+  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
+diff -crB shadow-4.2.1-a/man/pl/Makefile.in shadow-4.2.1-b/man/pl/Makefile.in
+*** shadow-4.2.1-a/man/pl/Makefile.in	2014-05-09 16:49:47.000000000 +0000
+--- shadow-4.2.1-b/man/pl/Makefile.in	2016-03-13 10:47:55.912166976 +0000
+***************
+*** 300,307 ****
+  
+  # 2012.01.28 - activate manpages with more than 50% translated messages
+  man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
+! 	man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \
+! 	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
+  	man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 man1/sg.1 \
+  	man3/shadow.3 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
+  	man8/vipw.8 $(am__append_1)
+--- 300,307 ----
+  
+  # 2012.01.28 - activate manpages with more than 50% translated messages
+  man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
+! 	man8/faillog.8 man3/ man8/groupadd.8 man8/groupdel.8 \
+! 	man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
+  	man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 man1/sg.1 \
+  	man3/shadow.3 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
+  	man8/vipw.8 $(am__append_1)
+diff -crB shadow-4.2.1-a/man/pt_BR/Makefile.in shadow-4.2.1-b/man/pt_BR/Makefile.in
+*** shadow-4.2.1-a/man/pt_BR/Makefile.in	2014-05-09 16:49:47.000000000 +0000
+--- shadow-4.2.1-b/man/pt_BR/Makefile.in	2016-03-13 10:47:55.904166976 +0000
+***************
+*** 297,303 ****
+  	man8/groupadd.8 \
+  	man8/groupdel.8 \
+  	man8/groupmod.8 \
+! 	man5/passwd.5 \
+  	man5/shadow.5
+  
+  EXTRA_DIST = $(man_MANS)
+--- 297,303 ----
+  	man8/groupadd.8 \
+  	man8/groupdel.8 \
+  	man8/groupmod.8 \
+! 	man5/ \
+  	man5/shadow.5
+  
+  EXTRA_DIST = $(man_MANS)
+diff -crB shadow-4.2.1-a/man/ru/Makefile.in shadow-4.2.1-b/man/ru/Makefile.in
+*** shadow-4.2.1-a/man/ru/Makefile.in	2014-05-09 16:49:47.000000000 +0000
+--- shadow-4.2.1-b/man/ru/Makefile.in	2016-03-13 10:47:55.944166977 +0000
+***************
+*** 299,309 ****
+  top_srcdir = @top_srcdir@
+  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+! 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+! 	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
+  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
+  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
+  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
+--- 299,309 ----
+  top_srcdir = @top_srcdir@
+  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+! 	man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+! 	man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
+  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
+  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
+  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
+  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
+diff -crB shadow-4.2.1-a/man/sv/Makefile.in shadow-4.2.1-b/man/sv/Makefile.in
+*** shadow-4.2.1-a/man/sv/Makefile.in	2014-05-09 16:49:47.000000000 +0000
+--- shadow-4.2.1-b/man/sv/Makefile.in	2016-03-13 10:47:55.988166978 +0000
+***************
+*** 300,309 ****
+  
+  # 2012.01.28 - activate manpages with more than 50% translated messages
+  man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
+! 	man8/faillog.8 man3/getspnam.3 man8/groupadd.8 man8/groupdel.8 \
+! 	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
+  	man5/gshadow.5 man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 \
+! 	man8/nologin.8 man1/passwd.1 man5/passwd.5 man8/pwck.8 \
+  	man1/sg.1 man3/shadow.3 man5/suauth.5 man8/userdel.8 \
+  	man8/vigr.8 man8/vipw.8 $(am__append_1)
+  man_nopam = \
+--- 300,309 ----
+  
+  # 2012.01.28 - activate manpages with more than 50% translated messages
+  man_MANS = man1/chage.1 man1/chsh.1 man1/expiry.1 man5/faillog.5 \
+! 	man8/faillog.8 man3/ man8/groupadd.8 man8/groupdel.8 \
+! 	man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
+  	man5/gshadow.5 man8/lastlog.8 man8/logoutd.8 man1/newgrp.1 \
+! 	man8/nologin.8 man1/passwd.1 man5/ man8/pwck.8 \
+  	man1/sg.1 man3/shadow.3 man5/suauth.5 man8/userdel.8 \
+  	man8/vigr.8 man8/vipw.8 $(am__append_1)
+  man_nopam = \
+diff -crB shadow-4.2.1-a/man/tr/Makefile.in shadow-4.2.1-b/man/tr/Makefile.in
+*** shadow-4.2.1-a/man/tr/Makefile.in	2014-05-09 16:49:47.000000000 +0000
+--- shadow-4.2.1-b/man/tr/Makefile.in	2016-03-13 10:47:55.964166977 +0000
+***************
+*** 300,306 ****
+  	man8/groupmod.8 \
+  	man1/login.1 \
+  	man1/passwd.1 \
+! 	man5/passwd.5 \
+  	man5/shadow.5 \
+  	man1/su.1 \
+  	man8/useradd.8 \
+--- 300,306 ----
+  	man8/groupmod.8 \
+  	man1/login.1 \
+  	man1/passwd.1 \
+! 	man5/ \
+  	man5/shadow.5 \
+  	man1/su.1 \
+  	man8/useradd.8 \
+diff -crB shadow-4.2.1-a/man/zh_CN/Makefile.in shadow-4.2.1-b/man/zh_CN/Makefile.in
+*** shadow-4.2.1-a/man/zh_CN/Makefile.in	2014-05-09 16:49:47.000000000 +0000
+--- shadow-4.2.1-b/man/zh_CN/Makefile.in	2016-03-13 10:47:55.952166977 +0000
+***************
+*** 299,309 ****
+  top_srcdir = @top_srcdir@
+  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+! 	man3/getspnam.3 man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+! 	man8/groupmems.8 man8/groupmod.8 man1/groups.1 man8/grpck.8 \
+  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/passwd.5 \
+  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
+  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
+  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
+--- 299,309 ----
+  top_srcdir = @top_srcdir@
+  man_MANS = man1/chage.1 man1/chfn.1 man8/chgpasswd.8 man8/chpasswd.8 \
+  	man1/chsh.1 man1/expiry.1 man5/faillog.5 man8/faillog.8 \
+! 	man3/ man1/gpasswd.1 man8/groupadd.8 man8/groupdel.8 \
+! 	man8/groupmems.8 man8/groupmod.8 man1/ man8/grpck.8 \
+  	man8/grpconv.8 man8/grpunconv.8 man5/gshadow.5 man8/lastlog.8 \
+  	man1/login.1 man5/login.defs.5 man8/logoutd.8 man1/newgrp.1 \
+! 	man8/newusers.8 man8/nologin.8 man1/passwd.1 man5/ \
+  	man8/pwck.8 man8/pwconv.8 man8/pwunconv.8 man1/sg.1 \
+  	man3/shadow.3 man5/shadow.5 man1/su.1 man5/suauth.5 \
+  	man8/useradd.8 man8/userdel.8 man8/usermod.8 man8/vigr.8 \
+diff -crB shadow-4.2.1-a/man/zh_TW/Makefile.in shadow-4.2.1-b/man/zh_TW/Makefile.in
+*** shadow-4.2.1-a/man/zh_TW/Makefile.in	2014-05-09 16:49:48.000000000 +0000
+--- shadow-4.2.1-b/man/zh_TW/Makefile.in	2016-03-13 10:47:55.956166977 +0000
+***************
+*** 302,308 ****
+  	man8/groupadd.8 \
+  	man8/groupdel.8 \
+  	man8/groupmod.8 \
+! 	man5/passwd.5 \
+  	man1/su.1 \
+  	man8/useradd.8 \
+  	man8/userdel.8 \
+--- 302,308 ----
+  	man8/groupadd.8 \
+  	man8/groupdel.8 \
+  	man8/groupmod.8 \
+! 	man5/ \
+  	man1/su.1 \
+  	man8/useradd.8 \
+  	man8/userdel.8 \
+diff -crB shadow-4.2.1-a/src/Makefile.in shadow-4.2.1-b/src/Makefile.in
+*** shadow-4.2.1-a/src/Makefile.in	2014-05-09 16:49:48.000000000 +0000
+--- shadow-4.2.1-b/src/Makefile.in	2016-03-13 10:47:38.824166600 +0000
+***************
+*** 78,84 ****
+  POST_UNINSTALL = :
+  build_triplet = @build@
+  host_triplet = @host@
+! bin_PROGRAMS = groups$(EXEEXT) login$(EXEEXT) su$(EXEEXT)
+  sbin_PROGRAMS = nologin$(EXEEXT)
+  ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \
+  	chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \
+--- 78,84 ----
+  POST_UNINSTALL = :
+  build_triplet = @build@
+  host_triplet = @host@
+! bin_PROGRAMS = login$(EXEEXT) su$(EXEEXT)
+  sbin_PROGRAMS = nologin$(EXEEXT)
+  ubin_PROGRAMS = faillog$(EXEEXT) lastlog$(EXEEXT) chage$(EXEEXT) \
+  	chfn$(EXEEXT) chsh$(EXEEXT) expiry$(EXEEXT) gpasswd$(EXEEXT) \
diff --git a/src/patches/squid/squid-3.5-14051.patch b/src/patches/squid/squid-3.5-14051.patch
new file mode 100644
index 000000000..58892dc87
--- /dev/null
+++ b/src/patches/squid/squid-3.5-14051.patch
@@ -0,0 +1,63 @@
+------------------------------------------------------------
+revno: 14051
+revision-id: squid3@treenet.co.nz-20160517145850-uos9z00nrt7xd9ik
+parent: squid3@treenet.co.nz-20160508124125-fytgvn68zppfr8ix
+author: Steve Hill <steve@opendium.com>
+committer: Amos Jeffries <squid3@treenet.co.nz>
+branch nick: 3.5
+timestamp: Wed 2016-05-18 02:58:50 +1200
+message:
+  Support unified EUI format code in external_acl_type
+  
+  Squid supports %>eui as a logformat specifier, which produces an EUI-48 
+  for IPv4 clients and an EUI-64 for IPv6 clients.  However, This is not 
+  allowed as a format specifier for the external ACLs, and you have to use 
+  %SRCEUI48 and %SRCEUI64 instead.  %SRCEUI48 is only useful for IPv4 
+  clients and %SRCEUI64 is only useful for IPv6 clients, so supporting 
+  both v4 and v6 is a bit messy.
+  
+  Adds the %>eui specifier for external ACLs and behaves in the same way
+  as the logformat specifier.
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3@treenet.co.nz-20160517145850-uos9z00nrt7xd9ik
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# testament_sha1: ad0743717948a65cfd4f306acc2bbaa9343e9a76
+# timestamp: 2016-05-17 15:50:54 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# base_revision_id: squid3@treenet.co.nz-20160508124125-\
+#   fytgvn68zppfr8ix
+# 
+# Begin patch
+=== modified file 'src/external_acl.cc'
+--- src/external_acl.cc	2016-01-01 00:14:27 +0000
++++ src/external_acl.cc	2016-05-17 14:58:50 +0000
+@@ -356,6 +356,8 @@
+         else if (strcmp(token, "%SRCPORT") == 0 || strcmp(token, "%>p") == 0)
+             format->type = Format::LFT_CLIENT_PORT;
+ #if USE_SQUID_EUI
++        else if (strcmp(token, "%>eui") == 0)
++            format->type = Format::LFT_CLIENT_EUI;
+         else if (strcmp(token, "%SRCEUI48") == 0)
+             format->type = Format::LFT_EXT_ACL_CLIENT_EUI48;
+         else if (strcmp(token, "%SRCEUI64") == 0)
+@@ -944,6 +946,18 @@
+             break;
+ 
+ #if USE_SQUID_EUI
++        case Format::LFT_CLIENT_EUI:
++            // TODO make the ACL checklist have a direct link to any TCP details.
++            if (request->clientConnectionManager.valid() && request->clientConnectionManager->clientConnection != NULL)
++            {
++                if (request->clientConnectionManager->clientConnection->remote.isIPv4())
++                    request->clientConnectionManager->clientConnection->remoteEui48.encode(buf, sizeof(buf));
++                else
++                    request->clientConnectionManager->clientConnection->remoteEui64.encode(buf, sizeof(buf));
++                str = buf;
++            }
++	    break;
++
+         case Format::LFT_EXT_ACL_CLIENT_EUI48:
+             if (request->clientConnectionManager.valid() && request->clientConnectionManager->clientConnection != NULL &&
+                     request->clientConnectionManager->clientConnection->remoteEui48.encode(buf, sizeof(buf)))
+
diff --git a/src/patches/squid/squid-3.5-14052.patch b/src/patches/squid/squid-3.5-14052.patch
new file mode 100644
index 000000000..4fba15956
--- /dev/null
+++ b/src/patches/squid/squid-3.5-14052.patch
@@ -0,0 +1,34 @@
+------------------------------------------------------------
+revno: 14052
+revision-id: squidadm@squid-cache.org-20160517181416-sfrjdosd9dhx7u8o
+parent: squid3@treenet.co.nz-20160517145850-uos9z00nrt7xd9ik
+committer: Source Maintenance <squidadm@squid-cache.org>
+branch nick: 3.5
+timestamp: Tue 2016-05-17 18:14:16 +0000
+message:
+  SourceFormat Enforcement
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squidadm@squid-cache.org-20160517181416-\
+#   sfrjdosd9dhx7u8o
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# testament_sha1: e30c12805cacdb559925da08cc6a25fe4a39c19b
+# timestamp: 2016-05-17 18:51:06 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# base_revision_id: squid3@treenet.co.nz-20160517145850-\
+#   uos9z00nrt7xd9ik
+# 
+# Begin patch
+=== modified file 'src/external_acl.cc'
+--- src/external_acl.cc	2016-05-17 14:58:50 +0000
++++ src/external_acl.cc	2016-05-17 18:14:16 +0000
+@@ -956,7 +956,7 @@
+                     request->clientConnectionManager->clientConnection->remoteEui64.encode(buf, sizeof(buf));
+                 str = buf;
+             }
+-	    break;
++            break;
+ 
+         case Format::LFT_EXT_ACL_CLIENT_EUI48:
+             if (request->clientConnectionManager.valid() && request->clientConnectionManager->clientConnection != NULL &&
+
diff --git a/src/patches/squid/squid-3.5-14053.patch b/src/patches/squid/squid-3.5-14053.patch
new file mode 100644
index 000000000..f669449ae
--- /dev/null
+++ b/src/patches/squid/squid-3.5-14053.patch
@@ -0,0 +1,46 @@
+------------------------------------------------------------
+revno: 14053
+revision-id: squid3@treenet.co.nz-20160521130058-zq8zugw0fohwfu3z
+parent: squidadm@squid-cache.org-20160517181416-sfrjdosd9dhx7u8o
+committer: Amos Jeffries <squid3@treenet.co.nz>
+branch nick: 3.5
+timestamp: Sun 2016-05-22 01:00:58 +1200
+message:
+  Do not override user defined -std option
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3@treenet.co.nz-20160521130058-zq8zugw0fohwfu3z
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# testament_sha1: a75245a622ccfa385ef5e4722f9a9fb438a16135
+# timestamp: 2016-05-21 13:08:06 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# base_revision_id: squidadm@squid-cache.org-20160517181416-\
+#   sfrjdosd9dhx7u8o
+# 
+# Begin patch
+=== modified file 'configure.ac'
+--- configure.ac	2016-05-08 12:41:25 +0000
++++ configure.ac	2016-05-21 13:00:58 +0000
+@@ -95,6 +95,9 @@
+ # Guess the compiler type (sets squid_cv_compiler)
+ SQUID_CC_GUESS_VARIANT
+ 
++# If the user did not specify a C++ version.
++user_cxx=`echo "$PRESET_CXXFLAGS" | grep -o -E "\-std="`
++if test "x$user_cxx" = "x"; then
+ # Check for C++11 compiler support
+ #
+ # BUG 3613: when clang -std=c++0x is used, it activates a "strict mode"
+@@ -103,8 +106,9 @@
+ #
+ # Similar POSIX issues on MinGW 32-bit and Cygwin
+ #
+-if ! test "x$squid_host_os" = "xmingw" -o "x$squid_host_os" = "xcygwin" -o "x$squid_cv_compiler" = "xclang"; then
+-  AX_CXX_COMPILE_STDCXX_11([noext],[optional])
++  if ! test "x$squid_host_os" = "xmingw" -o "x$squid_host_os" = "xcygwin" -o "x$squid_cv_compiler" = "xclang"; then
++    AX_CXX_COMPILE_STDCXX_11([noext],[optional])
++  fi
+ fi
+ 
+ # test for programs
+
diff --git a/src/patches/squid/squid-3.5-14054.patch b/src/patches/squid/squid-3.5-14054.patch
new file mode 100644
index 000000000..90b34c13f
--- /dev/null
+++ b/src/patches/squid/squid-3.5-14054.patch
@@ -0,0 +1,37 @@
+------------------------------------------------------------
+revno: 14054
+revision-id: squid3@treenet.co.nz-20160521130144-6xtcayieij00fm5v
+parent: squid3@treenet.co.nz-20160521130058-zq8zugw0fohwfu3z
+committer: Amos Jeffries <squid3@treenet.co.nz>
+branch nick: 3.5
+timestamp: Sun 2016-05-22 01:01:44 +1200
+message:
+  Fix OpenSSL detection on FreeBSD
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3@treenet.co.nz-20160521130144-6xtcayieij00fm5v
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# testament_sha1: 3d8c0d7a9f1886523ac55d79e4d3e8f0340e2ec9
+# timestamp: 2016-05-21 13:08:08 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# base_revision_id: squid3@treenet.co.nz-20160521130058-\
+#   zq8zugw0fohwfu3z
+# 
+# Begin patch
+=== modified file 'configure.ac'
+--- configure.ac	2016-05-21 13:00:58 +0000
++++ configure.ac	2016-05-21 13:01:44 +0000
+@@ -1348,10 +1348,10 @@
+ 
+     AC_CHECK_LIB(crypto,[CRYPTO_new_ex_data],[LIBOPENSSL_LIBS="-lcrypto $LIBOPENSSL_LIBS"],[
+       AC_MSG_ERROR([library 'crypto' is required for OpenSSL])
+-    ])
++    ],$LIBOPENSSL_LIBS)
+     AC_CHECK_LIB(ssl,[SSL_library_init],[LIBOPENSSL_LIBS="-lssl $LIBOPENSSL_LIBS"],[
+       AC_MSG_ERROR([library 'ssl' is required for OpenSSL])
+-    ])
++    ],$LIBOPENSSL_LIBS)
+   ])
+ 
+   # This is a workaround for RedHat 9 brain damage..
+
diff --git a/src/patches/squid/squid-3.5-14055.patch b/src/patches/squid/squid-3.5-14055.patch
new file mode 100644
index 000000000..ac04bb61a
--- /dev/null
+++ b/src/patches/squid/squid-3.5-14055.patch
@@ -0,0 +1,39 @@
+------------------------------------------------------------
+revno: 14055
+revision-id: squid3@treenet.co.nz-20160521155202-pp53utwamdhkugvg
+parent: squid3@treenet.co.nz-20160521130144-6xtcayieij00fm5v
+author: Alex Rousskov <rousskov@measurement-factory.com>
+committer: Amos Jeffries <squid3@treenet.co.nz>
+branch nick: 3.5
+timestamp: Sun 2016-05-22 03:52:02 +1200
+message:
+  Fix icons loading speed.
+  
+  Since trunk r14100 (Bug 3875: bad mimeLoadIconFile error handling), each
+  icon was read from disk and written to Store one character at a time. I
+  did not measure startup delays in production, but in debugging runs,
+  fixing this bug sped up icons loading from 1 minute to 4 seconds.
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3@treenet.co.nz-20160521155202-pp53utwamdhkugvg
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# testament_sha1: 79b78480d81666c15406d23837608ba9a578da4b
+# timestamp: 2016-05-21 16:51:00 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# base_revision_id: squid3@treenet.co.nz-20160521130144-\
+#   6xtcayieij00fm5v
+# 
+# Begin patch
+=== modified file 'src/mime.cc'
+--- src/mime.cc	2016-01-01 00:14:27 +0000
++++ src/mime.cc	2016-05-21 15:52:02 +0000
+@@ -430,7 +430,7 @@
+         /* read the file into the buffer and append it to store */
+         int n;
+         char *buf = (char *)memAllocate(MEM_4K_BUF);
+-        while ((n = FD_READ_METHOD(fd, buf, sizeof(*buf))) > 0)
++        while ((n = FD_READ_METHOD(fd, buf, 4096)) > 0)
+             e->append(buf, n);
+ 
+         file_close(fd);
+
diff --git a/src/patches/squid/squid-3.5-14056.patch b/src/patches/squid/squid-3.5-14056.patch
new file mode 100644
index 000000000..4ea3808b5
--- /dev/null
+++ b/src/patches/squid/squid-3.5-14056.patch
@@ -0,0 +1,36 @@
+------------------------------------------------------------
+revno: 14056
+revision-id: squid3@treenet.co.nz-20160521172919-du6cbdirqcxdjbtr
+parent: squid3@treenet.co.nz-20160521155202-pp53utwamdhkugvg
+author: Christos Tsantilas <chtsanti@users.sourceforge.net>
+committer: Amos Jeffries <squid3@treenet.co.nz>
+branch nick: 3.5
+timestamp: Sun 2016-05-22 05:29:19 +1200
+message:
+  Increase debug level in a peek-and-splice related debug message
+  
+  It may produced one debugging line for each SSL transaction in some cases
+------------------------------------------------------------
+# Bazaar merge directive format 2 (Bazaar 0.90)
+# revision_id: squid3@treenet.co.nz-20160521172919-du6cbdirqcxdjbtr
+# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# testament_sha1: 76c2e864289dabb1065c470c954f9fc5ec4c7b4f
+# timestamp: 2016-05-21 17:50:54 +0000
+# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
+# base_revision_id: squid3@treenet.co.nz-20160521155202-\
+#   pp53utwamdhkugvg
+# 
+# Begin patch
+=== modified file 'src/ssl/PeerConnector.cc'
+--- src/ssl/PeerConnector.cc	2016-02-15 11:29:50 +0000
++++ src/ssl/PeerConnector.cc	2016-05-21 17:29:19 +0000
+@@ -598,7 +598,7 @@
+ 
+     case SSL_ERROR_WANT_WRITE:
+         if ((srvBio->bumpMode() == Ssl::bumpPeek || srvBio->bumpMode() == Ssl::bumpStare) && srvBio->holdWrite()) {
+-            debugs(81, DBG_IMPORTANT, "hold write on SSL connection on FD " << fd);
++            debugs(81, 3, "hold write on SSL connection on FD " << fd);
+             checkForPeekAndSplice();
+             return;
+         }
+
diff --git a/tools/check_strings.pl b/tools/check_strings.pl
index d521068c2..b623778b7 100755
--- a/tools/check_strings.pl
+++ b/tools/check_strings.pl
@@ -36,7 +36,7 @@ require "${basedir}/langs/$lang/cgi-bin/$lang.pl";
 sub wanted {
 	if ( -f $File::Find::name && open(FILE, $File::Find::name)) {
 		while (<FILE>) {
-			while ($_ =~ /\$Lang::tr{'([A-Za-z0-9,:_\s\/\.-]+)'}/g) {
+			while ($_ =~ /\$Lang::tr\{'([A-Za-z0-9,:_\s\/\.-]+)'\}/g) {
 				$tr2{$1} = 'empty string';
 			}
 		}