diff --git a/config/backup/include b/config/backup/include
index ba78c69f5..59430c576 100644
--- a/config/backup/include
+++ b/config/backup/include
@@ -13,7 +13,12 @@
 /etc/ipsec.user-post.conf
 /etc/sysconfig/*
 /etc/hosts*
-/etc/httpd/*
+/etc/httpd/server.crt
+/etc/httpd/server.csr
+/etc/httpd/server.key
+/etc/httpd/server-ecdsa.crt
+/etc/httpd/server-ecdsa.csr
+/etc/httpd/server-ecdsa.key
 /etc/ssh/ssh_host*
 /etc/ssh/sshd_config
 /etc/logrotate.d
diff --git a/config/backup/includes/mysql b/config/backup/includes/mysql
deleted file mode 100644
index bcb837c71..000000000
--- a/config/backup/includes/mysql
+++ /dev/null
@@ -1,2 +0,0 @@
-/etc/my.cnf
-/srv/mysql
diff --git a/config/collectd/collectd.conf b/config/collectd/collectd.conf
index 486077a9e..aea72fc3f 100644
--- a/config/collectd/collectd.conf
+++ b/config/collectd/collectd.conf
@@ -78,7 +78,6 @@ include "/etc/collectd.precache"
 	Process "mpd"
 	Process "asterisk"
 	Process "java"
-	Process "mysqld"
 	Process "spamd"
 </Plugin>
 
diff --git a/config/etc/group b/config/etc/group
index 03f5dce0b..198b68aa3 100644
--- a/config/etc/group
+++ b/config/etc/group
@@ -17,7 +17,6 @@ utmp:x:22:
 squid:x:23:nobody
 ntp:x:38:
 dip:x:40:
-mysql:x:41:
 ftp:x:45:
 rsyncd:x:48:
 stunnel:x:51:
diff --git a/config/etc/passwd b/config/etc/passwd
index 247faa2a1..7eb4718f1 100644
--- a/config/etc/passwd
+++ b/config/etc/passwd
@@ -4,7 +4,6 @@ daemon:x:2:2:daemon:/sbin:/bin/false
 mail:x:8:12:mail:/var/spool/mail:/bin/false
 squid:x:23:23:ftp:/var/spool/squid:/bin/false
 ntp:x:38:38::/etc/ntp:/bin/false
-mysql:x:41:41:MySQL Server:/dev/null:/bin/false
 ftp:x:45:45:anonymous_user:/home/ftp:/bin/false
 rsyncd:x:48:48:rsyncd Daemon:/home/rsync:/bin/false
 stunnel:x:51:51:stunnel Daemon:/var/lib/stunnel:/bin/false
diff --git a/config/httpd/global.conf b/config/httpd/global.conf
index 6cc69b55e..cc8000379 100644
--- a/config/httpd/global.conf
+++ b/config/httpd/global.conf
@@ -1,5 +1,5 @@
 Timeout 300
-ServerSignature on
+ServerSignature off
 UseCanonicalName off
 ServerTokens Prod
 LogLevel warn
diff --git a/config/lcr/routing.conf b/config/lcr/routing.conf
deleted file mode 100644
index b540e7fb6..000000000
--- a/config/lcr/routing.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# Linux-Call-Router routing configuration route all over asterisk
-
-[main]
-	: remote application=asterisk
diff --git a/config/mysql/my.cnf b/config/mysql/my.cnf
deleted file mode 100644
index d9b75e8c0..000000000
--- a/config/mysql/my.cnf
+++ /dev/null
@@ -1,23 +0,0 @@
-[client]
-password = mysqlfire
-port = 3306
-socket = /var/run/mysql/mysql.sock
-
-[mysqld]
-port = 3306
-socket = /var/run/mysql/mysql.sock
-datadir = /srv/mysql
-bind-address=127.0.0.1
-
-[mysql.server]
-user=mysql
-basedir=/var/lib
-
-[mysqld_safe]
-log-error=/var/log/mysqld.log
-#pid-file=/var/run/mysqld/mysqld.pid
-
-[mysql]
-no-auto-rehash
-# Remove the next comment character if you are not familiar with SQL
-#safe-updates
diff --git a/config/pam/ftp b/config/pam/ftp
deleted file mode 100644
index 3475b4822..000000000
--- a/config/pam/ftp
+++ /dev/null
@@ -1,2 +0,0 @@
-auth	required	pam_unix.so nullok shadow
-account	required	pam_unix.so
diff --git a/config/pam/imap b/config/pam/imap
deleted file mode 100644
index f8f411f3d..000000000
--- a/config/pam/imap
+++ /dev/null
@@ -1,2 +0,0 @@
-auth    sufficient pam_mysql.so user=root passwd=mysqlfire host=localhost db=mail table=user usercolumn=mbox passwdcolumn=password crypt=0 sqlLog=0
-account required   pam_mysql.so user=root passwd=mysqlfire host=localhost db=mail table=user usercolumn=mbox passwdcolumn=password crypt=0 sqlLog=0
diff --git a/config/pam/other b/config/pam/other
deleted file mode 100644
index c286c823c..000000000
--- a/config/pam/other
+++ /dev/null
@@ -1,5 +0,0 @@
-#%PAM-1.0
-auth     required       pam_deny.so
-account  required       pam_deny.so
-password required       pam_deny.so
-session  required       pam_deny.so
diff --git a/config/pam/pop b/config/pam/pop
deleted file mode 100644
index f8f411f3d..000000000
--- a/config/pam/pop
+++ /dev/null
@@ -1,2 +0,0 @@
-auth    sufficient pam_mysql.so user=root passwd=mysqlfire host=localhost db=mail table=user usercolumn=mbox passwdcolumn=password crypt=0 sqlLog=0
-account required   pam_mysql.so user=root passwd=mysqlfire host=localhost db=mail table=user usercolumn=mbox passwdcolumn=password crypt=0 sqlLog=0
diff --git a/config/pam/sieve b/config/pam/sieve
deleted file mode 100644
index f8f411f3d..000000000
--- a/config/pam/sieve
+++ /dev/null
@@ -1,2 +0,0 @@
-auth    sufficient pam_mysql.so user=root passwd=mysqlfire host=localhost db=mail table=user usercolumn=mbox passwdcolumn=password crypt=0 sqlLog=0
-account required   pam_mysql.so user=root passwd=mysqlfire host=localhost db=mail table=user usercolumn=mbox passwdcolumn=password crypt=0 sqlLog=0
diff --git a/config/pam/smtp b/config/pam/smtp
deleted file mode 100644
index f8f411f3d..000000000
--- a/config/pam/smtp
+++ /dev/null
@@ -1,2 +0,0 @@
-auth    sufficient pam_mysql.so user=root passwd=mysqlfire host=localhost db=mail table=user usercolumn=mbox passwdcolumn=password crypt=0 sqlLog=0
-account required   pam_mysql.so user=root passwd=mysqlfire host=localhost db=mail table=user usercolumn=mbox passwdcolumn=password crypt=0 sqlLog=0
diff --git a/config/postfix/aliases b/config/postfix/aliases
deleted file mode 100644
index fbe7299cf..000000000
--- a/config/postfix/aliases
+++ /dev/null
@@ -1,6 +0,0 @@
-# Begin /etc/aliases
-
-MAILER-DAEMON:     postmaster
-postmaster:        root
-
-# End /etc/aliases
diff --git a/config/postfix/body_checks b/config/postfix/body_checks
deleted file mode 100644
index e2eeacc24..000000000
--- a/config/postfix/body_checks
+++ /dev/null
@@ -1 +0,0 @@
-/^((Content-(Disposition: attachment;|Type:).*|\ +)| *)(file)?name\ *=\ *"?.*\.(lnk|asd|hlp|ocx|reg|bat|c[ho]m|cmd|exe|dll|vxd|pif|scr|hta|jse?|sh[mbs]|vb[esx]|ws[fh]|wmf)"?\ *$/      REJECT  attachment type not allowed
diff --git a/config/postfix/header_checks b/config/postfix/header_checks
deleted file mode 100644
index 038470778..000000000
--- a/config/postfix/header_checks
+++ /dev/null
@@ -1,379 +0,0 @@
-# HEADER_CHECKS(5)                                              HEADER_CHECKS(5)
-# 
-# NAME
-#        header_checks - Postfix built-in header/body inspection
-# 
-# SYNOPSIS
-#        header_checks = pcre:/etc/postfix/header_checks
-#        mime_header_checks = pcre:/etc/postfix/mime_header_checks
-#        nested_header_checks = pcre:/etc/postfix/nested_header_checks
-#        body_checks = pcre:/etc/postfix/body_checks
-# 
-#        postmap -fq "string" pcre:/etc/postfix/filename
-#        postmap -fq - pcre:/etc/postfix/filename <inputfile
-# 
-# DESCRIPTION
-#        Postfix  provides  a  simple  built-in  content inspection
-#        mechanism that examines incoming mail one  message  header
-#        or one message body line at a time. Each input is compared
-#        against a list of patterns, and when a match is found  the
-#        corresponding  action is executed.  This feature is imple-
-#        mented by the Postfix cleanup(8) server.
-# 
-#        For examples, see the EXAMPLES section at the end of  this
-#        manual page.
-# 
-#        Postfix header or body_checks are designed to stop a flood
-#        of mail from worms or viruses; they do not decode  attach-
-#        ments,  and  they do not unzip archives. See the documents
-#        referenced below in the README FILES section if  you  need
-#        more sophisticated content analysis.
-# 
-#        Postfix supports four built-in content inspection classes:
-# 
-#        header_checks
-#               These  are  applied  to  initial  message   headers
-#               (except  for  the  headers  that are processed with
-#               mime_header_checks).
-# 
-#        mime_header_checks (default: $header_checks)
-#               These are applied to MIME related  message  headers
-#               only.
-# 
-#               This feature is available in Postfix 2.0 and later.
-# 
-#        nested_header_checks (default: $header_checks)
-#               These are applied to message  headers  of  attached
-#               email  messages  (except  for  the headers that are
-#               processed with mime_header_checks).
-# 
-#               This feature is available in Postfix 2.0 and later.
-# 
-#        body_checks
-#               These  are  applied to all other content, including
-#               multi-part message boundaries.
-# 
-#               With Postfix versions before 2.0, all content after
-#               the initial message headers is treated as body con-
-#               tent.
-# 
-#        Note: message headers are examined one logical header at a
-#        time,  even  when  a  message header spans multiple lines.
-#        Body lines are always examined one line at a time.
-# 
-# TABLE FORMAT
-#        This document assumes that header  and  body_checks  rules
-#        are  specified  in  the form of Postfix regular expression
-#        lookup tables. Usually the best  performance  is  obtained
-#        with pcre (Perl Compatible Regular Expression) tables, but
-#        the slower regexp (POSIX regular expressions)  support  is
-#        more  widely  available.  Use the command "postconf -m" to
-#        find out what lookup table types your Postfix system  sup-
-#        ports.
-# 
-#        The general format of Postfix regular expression tables is
-#        given below.  For a  discussion  of  specific  pattern  or
-#        flags   syntax,   see  pcre_table(5)  or  regexp_table(5),
-#        respectively.
-# 
-#        /pattern/flags action
-#               When pattern matches the input string, execute  the
-#               corresponding  action. See below for a list of pos-
-#               sible actions.
-# 
-#        !/pattern/flags action
-#               When pattern does not match the input string,  exe-
-#               cute the corresponding action.
-# 
-#        if /pattern/flags
-# 
-#        endif  Match the input string against the patterns between
-#               if and endif, if and only if the input string  also
-#               matches pattern. The if..endif can nest.
-# 
-#               Note:  do not prepend whitespace to patterns inside
-#               if..endif.
-# 
-#        if !/pattern/flags
-# 
-#        endif  Match the input string against the patterns between
-#               if  and endif, if and only if the input string does
-#               not match pattern. The if..endif can nest.
-# 
-#        blank lines and comments
-#               Empty lines and whitespace-only lines are  ignored,
-#               as  are  lines whose first non-whitespace character
-#               is a `#'.
-# 
-#        multi-line text
-#               A pattern/action line  starts  with  non-whitespace
-#               text.  A line that starts with whitespace continues
-#               a logical line.
-# 
-# TABLE SEARCH ORDER
-#        For each line of message input, the patterns  are  applied
-#        in  the order as specified in the table. When a pattern is
-#        found that  matches  the  input  line,  the  corresponding
-#        action  is  executed  and  then  the  next  input  line is
-#        inspected.
-# 
-# TEXT SUBSTITUTION
-#        Substitution of substrings  from  the  matched  expression
-#        into  the action string is possible using the conventional
-#        Perl syntax ($1, $2, etc.).   The  macros  in  the  result
-#        string  may  need  to  be  written as ${n} or $(n) if they
-#        aren't followed by whitespace.
-# 
-#        Note: since negated patterns (those preceded by !)  return
-#        a result when the expression does not match, substitutions
-#        are not available for negated patterns.
-# 
-# ACTIONS
-#        Action names are case insensitive. They are shown in upper
-#        case for consistency with other Postfix documentation.
-# 
-#        DISCARD optional text...
-#               Claim  successful delivery and silently discard the
-#               message.  Log the optional text if specified,  oth-
-#               erwise log a generic message.
-# 
-#               Note:   this  action  disables  further  header  or
-#               body_checks inspection of the current  message  and
-#               affects all recipients.
-# 
-#               This feature is available in Postfix 2.0 and later.
-# 
-#        DUNNO  Pretend that the input line did not match any  pat-
-#               tern,  and inspect the next input line. This action
-#               can be used to shorten the table search.
-# 
-#               For backwards compatibility reasons,  Postfix  also
-#               accepts  OK but it is (and always has been) treated
-#               as DUNNO.
-# 
-#               This feature is available in Postfix 2.1 and later.
-# 
-#        FILTER transport:destination
-#               Write  a  content  filter request to the queue file
-#               and inspect the next input line.   After  the  com-
-#               plete  message  is received it will be sent through
-#               the specified external content filter.  More infor-
-#               mation  about  external  content  filters is in the
-#               Postfix FILTER_README file.
-# 
-#               Note:  this  action  overrides  the  main.cf   con-
-#               tent_filter  setting, and affects all recipients of
-#               the message.  In  the  case  that  multiple  FILTER
-#               actions fire, only the last one is executed.
-# 
-#               This feature is available in Postfix 2.0 and later.
-# 
-#        HOLD optional text...
-#               Arrange for the message to be placed  on  the  hold
-#               queue,  and  inspect the next input line.  The mes-
-#               sage remains on hold until someone  either  deletes
-#               it  or  releases it for delivery.  Log the optional
-#               text if specified, otherwise log a generic message.
-# 
-#               Mail  that  is  placed on hold can be examined with
-#               the postcat(1) command, and  can  be  destroyed  or
-#               released with the postsuper(1) command.
-# 
-#               Note:  use  "postsuper -r" to release mail that was
-#               kept on hold for a significant fraction  of  $maxi-
-#               mal_queue_lifetime  or  $bounce_queue_lifetime,  or
-#               longer.
-# 
-#               Note: this action affects  all  recipients  of  the
-#               message.
-# 
-#               This feature is available in Postfix 2.0 and later.
-# 
-#        IGNORE Delete the current line from the input and  inspect
-#               the next input line.
-# 
-#        PREPEND text...
-#               Prepend  one  line  with  the  specified  text  and
-#               inspect the next input line.
-# 
-#               Notes:
-# 
-#               o      The prepended text is output on  a  separate
-#                      line,  immediately  before  the  input  that
-#                      triggered the PREPEND action.
-# 
-#               o      The prepended text is not considered part of
-#                      the  input  stream:  it  is  not  subject to
-#                      header/body checks or address rewriting, and
-#                      it does not affect the way that Postfix adds
-#                      missing message headers.
-# 
-#               o      When prepending text before a message header
-#                      line,  the  prepended text must begin with a
-#                      valid message header label.
-# 
-#               o      This action cannot be used to prepend multi-
-#                      line text.
-# 
-#               This feature is available in Postfix 2.1 and later.
-# 
-#        REDIRECT user@domain
-#               Write a message redirection request  to  the  queue
-#               file  and  inspect  the  next input line. After the
-#               message is queued, it will be sent to the specified
-#               address instead of the intended recipient(s).
-# 
-#               Note:  this action overrides the FILTER action, and
-#               affects all recipients of the message. If  multiple
-#               REDIRECT  actions  fire,  only the last one is exe-
-#               cuted.
-# 
-#               This feature is available in Postfix 2.1 and later.
-# 
-#        REPLACE text...
-#               Replace  the  current  line with the specified text
-#               and inspect the next input line.
-# 
-#               This feature is available in Postfix 2.2 and later.
-#               The  description below applies to Postfix 2.2.2 and
-#               later.
-# 
-#               Notes:
-# 
-#               o      When replacing a message  header  line,  the
-#                      replacement  text  must  begin  with a valid
-#                      header label.
-# 
-#               o      The replaced text remains part of the  input
-#                      stream.  Unlike  the result from the PREPEND
-#                      action, a replaced  message  header  may  be
-#                      subject  to address rewriting and may affect
-#                      the way that Postfix  adds  missing  message
-#                      headers.
-# 
-#        REJECT optional text...
-#               Reject  the  entire  message.  Reply  with optional
-#               text... when the optional text is specified, other-
-#               wise reply with a generic error message.
-# 
-#               Note:   this  action  disables  further  header  or
-#               body_checks inspection of the current  message  and
-#               affects all recipients.
-# 
-#        WARN optional text...
-#               Log  a  warning with the optional text... (or log a
-#               generic message) and inspect the next  input  line.
-#               This action is useful for debugging and for testing
-#               a pattern before applying more drastic actions.
-# 
-# BUGS
-#        Many people overlook the main limitations  of  header  and
-#        body_checks  rules.   These  rules  operate on one logical
-#        message header or one body line at a time, and a  decision
-#        made  for  one  line is not carried over to the next line.
-#        If text in the message body is encoded (RFC 2045) then the
-#        rules  have  to specified for the encoded form.  Likewise,
-#        when message headers are encoded (RFC 2047) then the rules
-#        need to be specified for the encoded form.
-# 
-#        Message  headers added by the cleanup(8) daemon itself are
-#        excluded from inspection. Examples of such message headers
-#        are From:, To:, Message-ID:, Date:.
-# 
-#        Message  headers  deleted by the cleanup(8) daemon will be
-#        examined before they are deleted. Examples are: Bcc:, Con-
-#        tent-Length:, Return-Path:.
-# 
-# CONFIGURATION PARAMETERS
-#        body_checks
-#               Lookup tables with content filter rules for message
-#               body lines.  These filters see one physical line at
-#               a  time,  in  chunks  of at most $line_length_limit
-#               bytes.
-# 
-#        body_checks_size_limit
-#               The amount of  content  per  message  body  segment
-#               (attachment) that is subjected to $body_checks fil-
-#               tering.
-# 
-#        header_checks
-# 
-#        mime_header_checks (default: $header_checks)
-# 
-#        nested_header_checks (default: $header_checks)
-#               Lookup tables with content filter rules for message
-#               header  lines:  respectively,  these are applied to
-#               the initial message  headers  (not  including  MIME
-#               headers),  to the MIME headers anywhere in the mes-
-#               sage, and to the initial headers of  attached  mes-
-#               sages.
-# 
-#               Note:  these filters see one logical message header
-#               at a time, even when a message header spans  multi-
-#               ple  lines.  Message  headers  that are longer than
-#               $header_size_limit characters are truncated.
-# 
-#        disable_mime_input_processing
-#               While receiving mail, give no special treatment  to
-#               MIME  related  message  headers; all text after the
-#               initial message headers is considered to be part of
-#               the  message body. This means that header_checks is
-#               applied to all the  initial  message  headers,  and
-#               that body_checks is applied to the remainder of the
-#               message.
-# 
-#               Note: when used in this  manner,  body_checks  will
-#               process  a  multi-line message header one line at a
-#               time.
-# 
-# EXAMPLES
-#        Header pattern to block attachments  with  bad  file  name
-#        extensions.
-# 
-#        /etc/postfix/main.cf:
-#            header_checks = regexp:/etc/postfix/header_checks
-# 
-#        /etc/postfix/header_checks:
-#            /^content-(type|disposition):.*name[[:space:]]*=.*\.(exe|vbs)/
-#                REJECT Bad attachment file name extension: $2
-# 
-#        Body pattern to stop a specific HTML browser vulnerability
-#        exploit.
-# 
-#        /etc/postfix/main.cf:
-#            body_checks = regexp:/etc/postfix/body_checks
-# 
-#        /etc/postfix/body_checks:
-#            /^<iframe src=(3D)?cid:.* height=(3D)?0 width=(3D)?0>$/
-#                REJECT IFRAME vulnerability exploit
-# 
-# SEE ALSO
-#        cleanup(8), canonicalize and enqueue Postfix message
-#        pcre_table(5), format of PCRE lookup tables
-#        regexp_table(5), format of POSIX regular expression tables
-#        postconf(1), Postfix configuration utility
-#        postmap(1), Postfix lookup table management
-#        postsuper(1), Postfix janitor
-#        postcat(1), show Postfix queue file contents
-#        RFC 2045, base64 and quoted-printable encoding rules
-#        RFC 2047, message header encoding for non-ASCII text
-# 
-# README FILES
-#        Use "postconf readme_directory" or  "postconf  html_direc-
-#        tory" to locate this information.
-#        DATABASE_README, Postfix lookup table overview
-#        CONTENT_INSPECTION_README, Postfix content inspection overview
-#        BUILTIN_FILTER_README, Postfix built-in content inspection
-#        BACKSCATTER_README, blocking returned forged mail
-# 
-# LICENSE
-#        The  Secure  Mailer  license must be distributed with this
-#        software.
-# 
-# AUTHOR(S)
-#        Wietse Venema
-#        IBM T.J. Watson Research
-#        P.O. Box 704
-#        Yorktown Heights, NY 10598, USA
-# 
-#                                                               HEADER_CHECKS(5)
diff --git a/config/postfix/main.cf b/config/postfix/main.cf
deleted file mode 100644
index a3d7c321b..000000000
--- a/config/postfix/main.cf
+++ /dev/null
@@ -1,83 +0,0 @@
-###
-### main.cf for IPFire
-###
-queue_directory = /var/spool/postfix
-command_directory = /usr/sbin
-daemon_directory = /usr/lib/postfix
-manpage_directory = /usr/share/man
-sample_directory = /etc/postfix
-html_directory = no
-readme_directory = no
-
-sendmail_path = /usr/sbin/sendmail
-newaliases_path = /usr/bin/newaliases
-mailq_path = /usr/bin/mailq
-
-mail_owner = postfix
-setgid_group = postdrop
-
-myhostname = ipfire.localdomain
-myorigin = $myhostname
-
-inet_interfaces = all
-#proxy_interfaces =
-mydestination = $myhostname, localhost, mysql:/etc/postfix/mysql-mydestination.cf
-unknown_local_recipient_reject_code = 550
-
-mynetworks_style = host
-mynetworks = 127.0.0.0/8
-
-#relay_domains = $mydestination
-#relayhost = $mydomain
-#relayhost = [gateway.my.domain]
-#relayhost = [mailserver.isp.tld]
-#relayhost = uucphost
-#relayhost = [an.ip.add.ress]
-#relay_recipient_maps = hash:/etc/postfix/relay_recipients
-#in_flow_delay = 1s
-alias_maps = hash:/etc/aliases
-alias_database = hash:/etc/aliases
-recipient_delimiter = +
-
-mailbox_transport = cyrus
-cyrus_destination_recipient_limit=1
-
-header_checks = regexp:/etc/postfix/header_checks
-#fast_flush_domains = $relay_domains
-
-smtpd_banner = $myhostname ESMTP $mail_name ($mail_version)
-#local_destination_concurrency_limit = 2
-#default_destination_concurrency_limit = 20
-
-virtual_alias_maps = mysql:/etc/postfix/mysql-virtual.cf
-sender_canonical_maps = mysql:/etc/postfix/mysql-canonical.cf
-
-smtpd_sasl_type = cyrus
-smtpd_sasl_auth_enable = yes
-smtpd_sasl_security_options = noanonymous
-smtpd_sasl_local_domain = $myhostname
-broken_sasl_auth_clients = yes
-
-#smtp_sasl_password_maps = hash:/etc/postfix/sasl_passwd
-
-#content_filter=amavis:[127.0.0.1]:10024
-
-smtpd_helo_required = yes
-mime_header_checks=pcre:/etc/postfix/body_checks
-smtpd_recipient_restrictions =
-            reject_invalid_hostname,
-            #reject_non_fqdn_hostname,
-            reject_non_fqdn_sender,
-            reject_non_fqdn_recipient,
-            reject_unknown_sender_domain,
-            reject_unknown_recipient_domain,
-            reject_unauth_pipelining,
-            permit_mynetworks,
-            permit_sasl_authenticated,
-            reject_unauth_destination,
-            reject_rbl_client zombie.dnsbl.sorbs.net,
-            reject_rbl_client opm.blitzed.org,
-            reject_rbl_client list.dsbl.org,
-            reject_rbl_client sbl.spamhaus.org,
-            permit
-            
diff --git a/config/postfix/master.cf b/config/postfix/master.cf
deleted file mode 100644
index 6c2395df1..000000000
--- a/config/postfix/master.cf
+++ /dev/null
@@ -1,103 +0,0 @@
-#
-# Postfix master process configuration file.  For details on the format
-# of the file, see the Postfix master(5) manual page.
-#
-# ==========================================================================
-# service type  private unpriv  chroot  wakeup  maxproc command + args
-#               (yes)   (yes)   (yes)   (never) (100)
-# ==========================================================================
-smtp      inet  n       -       n       -       -       smtpd
-#submission inet n      -       n       -       -       smtpd
-#	-o smtpd_etrn_restrictions=reject
-#	-o smtpd_client_restrictions=permit_sasl_authenticated,reject
-#smtps    inet  n       -       n       -       -       smtpd
-#  -o smtpd_tls_wrappermode=yes -o smtpd_sasl_auth_enable=yes
-#submission   inet    n       -       n       -       -       smtpd
-#  -o smtpd_etrn_restrictions=reject
-#  -o smtpd_enforce_tls=yes -o smtpd_sasl_auth_enable=yes
-#628      inet  n       -       n       -       -       qmqpd
-pickup    fifo  n       -       n       60      1       pickup
-cleanup   unix  n       -       n       -       0       cleanup
-qmgr      fifo  n       -       n       300     1       qmgr
-#qmgr     fifo  n       -       n       300     1       oqmgr
-tlsmgr    unix  -       -       n       1000?   1       tlsmgr
-rewrite   unix  -       -       n       -       -       trivial-rewrite
-bounce    unix  -       -       n       -       0       bounce
-defer     unix  -       -       n       -       0       bounce
-trace     unix  -       -       n       -       0       bounce
-verify    unix  -       -       n       -       1       verify
-flush     unix  n       -       n       1000?   0       flush
-proxymap  unix  -       -       n       -       -       proxymap
-smtp      unix  -       -       n       -       -       smtp
-# When relaying mail as backup MX, disable fallback_relay to avoid MX loops
-relay     unix  -       -       n       -       -       smtp
-	-o fallback_relay=
-#       -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
-showq     unix  n       -       n       -       -       showq
-error     unix  -       -       n       -       -       error
-discard   unix  -       -       n       -       -       discard
-local     unix  -       n       n       -       -       local
-virtual   unix  -       n       n       -       -       virtual
-lmtp      unix  -       -       n       -       -       lmtp
-anvil     unix  -       -       n       -       1       anvil
-scache	  unix	-	-	n	-	1	scache
-#
-# ====================================================================
-# Interfaces to non-Postfix software. Be sure to examine the manual
-# pages of the non-Postfix software to find out what options it wants.
-#
-# Many of the following services use the Postfix pipe(8) delivery
-# agent.  See the pipe(8) man page for information about ${recipient}
-# and other message envelope options.
-# ====================================================================
-#
-# maildrop. See the Postfix MAILDROP_README file for details.
-# Also specify in main.cf: maildrop_destination_recipient_limit=1
-#
-maildrop  unix  -       n       n       -       -       pipe
-  flags=DRhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}
-#
-# The Cyrus deliver program has changed incompatibly, multiple times.
-#
-old-cyrus unix  -       n       n       -       -       pipe
-  flags= user=cyrus argv=/usr/cyrus/bin/deliver -r ${sender} -m ${extension} ${user}
-# Cyrus 2.1.5 (Amos Gouaux)
-# Also specify in main.cf: cyrus_destination_recipient_limit=1
-cyrus     unix  -       n       n       -       -       pipe
-  user=cyrus argv=/usr/lib/cyrus/deliver -e -r ${sender} -m ${extension} ${user}
-#
-# See the Postfix UUCP_README file for configuration details.
-#
-uucp      unix  -       n       n       -       -       pipe
-  flags=Fqhu user=uucp argv=uux -r -n -z -a$sender - $nexthop!rmail ($recipient)
-#
-# Other external delivery methods.
-#
-procmail  unix  -       n       n       -       20      pipe
-  flags=R user=cyrus argv=/usr/bin/procmail -r SENDER=${sender} -t -m USER=${user} EXTENSION=${extension} /etc/procmailrc
-
-amavis    unix  -       -       n       -      2        lmtp
-    -o lmtp_data_done_timeout=1200
-    -o lmtp_send_xforward_command=yes
-    -o disable_dns_lookups=yes
-    -o max_use=20
-
-127.0.0.1:10025 inet n  -       n       -       -       smtpd
-    -o content_filter=
-    -o local_recipient_maps=
-    -o relay_recipient_maps=
-    -o smtpd_delay_reject=no
-    -o smtpd_restriction_classes=
-    -o smtpd_client_restrictions=
-    -o smtpd_helo_restrictions=
-    -o smtpd_sender_restrictions=
-    -o smtpd_recipient_restrictions=permit_mynetworks,reject
-    -o smtpd_data_restrictions=reject_unauth_pipelining
-    -o smtpd_end_of_data_restrictions=
-    -o mynetworks=127.0.0.0/8
-    -o smtpd_error_sleep_time=0
-    -o smtpd_soft_error_limit=1001
-    -o smtpd_hard_error_limit=1000
-    -o smtpd_client_connection_count_limit=0
-    -o smtpd_client_connection_rate_limit=0
-    -o receive_override_options=no_header_body_checks,no_unknown_recipient_checks
diff --git a/config/postfix/mysql-canonical.cf b/config/postfix/mysql-canonical.cf
deleted file mode 100644
index 2f51e35ff..000000000
--- a/config/postfix/mysql-canonical.cf
+++ /dev/null
@@ -1,8 +0,0 @@
-hosts = localhost
-user = root
-password = mysqlfire
-table = user
-dbname = mail
-select_field = canonical
-where_field = mbox
-additional_conditions = and active = '1' limit 1
diff --git a/config/postfix/mysql-mydestination.cf b/config/postfix/mysql-mydestination.cf
deleted file mode 100644
index 99924241a..000000000
--- a/config/postfix/mysql-mydestination.cf
+++ /dev/null
@@ -1,7 +0,0 @@
-hosts = localhost
-user = root
-password = mysqlfire
-dbname = mail
-table = domains
-select_field = domain
-where_field = domain
diff --git a/config/postfix/mysql-virtual.cf b/config/postfix/mysql-virtual.cf
deleted file mode 100644
index d133592ac..000000000
--- a/config/postfix/mysql-virtual.cf
+++ /dev/null
@@ -1,8 +0,0 @@
-hosts = localhost
-user = root
-password = mysqlfire
-dbname = mail
-table = virtual
-select_field = dest
-where_field = address
-additional_conditions = and active = '1'
diff --git a/config/rootfiles/common/armv5tel/binutils b/config/rootfiles/common/armv5tel/binutils
index 8ac4c7504..c12b90fe2 100644
--- a/config/rootfiles/common/armv5tel/binutils
+++ b/config/rootfiles/common/armv5tel/binutils
@@ -25,34 +25,52 @@
 #usr/lib/ldscripts/armelf_linux_eabi.x
 #usr/lib/ldscripts/armelf_linux_eabi.xbn
 #usr/lib/ldscripts/armelf_linux_eabi.xc
+#usr/lib/ldscripts/armelf_linux_eabi.xce
 #usr/lib/ldscripts/armelf_linux_eabi.xd
 #usr/lib/ldscripts/armelf_linux_eabi.xdc
+#usr/lib/ldscripts/armelf_linux_eabi.xdce
+#usr/lib/ldscripts/armelf_linux_eabi.xde
 #usr/lib/ldscripts/armelf_linux_eabi.xdw
+#usr/lib/ldscripts/armelf_linux_eabi.xdwe
+#usr/lib/ldscripts/armelf_linux_eabi.xe
 #usr/lib/ldscripts/armelf_linux_eabi.xn
 #usr/lib/ldscripts/armelf_linux_eabi.xr
 #usr/lib/ldscripts/armelf_linux_eabi.xs
 #usr/lib/ldscripts/armelf_linux_eabi.xsc
+#usr/lib/ldscripts/armelf_linux_eabi.xsce
+#usr/lib/ldscripts/armelf_linux_eabi.xse
 #usr/lib/ldscripts/armelf_linux_eabi.xsw
+#usr/lib/ldscripts/armelf_linux_eabi.xswe
 #usr/lib/ldscripts/armelf_linux_eabi.xu
 #usr/lib/ldscripts/armelf_linux_eabi.xw
+#usr/lib/ldscripts/armelf_linux_eabi.xwe
 #usr/lib/ldscripts/armelfb_linux_eabi.x
 #usr/lib/ldscripts/armelfb_linux_eabi.xbn
 #usr/lib/ldscripts/armelfb_linux_eabi.xc
+#usr/lib/ldscripts/armelfb_linux_eabi.xce
 #usr/lib/ldscripts/armelfb_linux_eabi.xd
 #usr/lib/ldscripts/armelfb_linux_eabi.xdc
+#usr/lib/ldscripts/armelfb_linux_eabi.xdce
+#usr/lib/ldscripts/armelfb_linux_eabi.xde
 #usr/lib/ldscripts/armelfb_linux_eabi.xdw
+#usr/lib/ldscripts/armelfb_linux_eabi.xdwe
+#usr/lib/ldscripts/armelfb_linux_eabi.xe
 #usr/lib/ldscripts/armelfb_linux_eabi.xn
 #usr/lib/ldscripts/armelfb_linux_eabi.xr
 #usr/lib/ldscripts/armelfb_linux_eabi.xs
 #usr/lib/ldscripts/armelfb_linux_eabi.xsc
+#usr/lib/ldscripts/armelfb_linux_eabi.xsce
+#usr/lib/ldscripts/armelfb_linux_eabi.xse
 #usr/lib/ldscripts/armelfb_linux_eabi.xsw
+#usr/lib/ldscripts/armelfb_linux_eabi.xswe
 #usr/lib/ldscripts/armelfb_linux_eabi.xu
 #usr/lib/ldscripts/armelfb_linux_eabi.xw
-usr/lib/libbfd-2.28.so
+#usr/lib/ldscripts/armelfb_linux_eabi.xwe
+usr/lib/libbfd-2.30.so
 #usr/lib/libbfd.a
 #usr/lib/libbfd.la
 #usr/lib/libbfd.so
-usr/lib/libopcodes-2.28.so
+usr/lib/libopcodes-2.30.so
 #usr/lib/libopcodes.a
 #usr/lib/libopcodes.la
 #usr/lib/libopcodes.so
@@ -71,6 +89,7 @@ usr/lib/libopcodes-2.28.so
 #usr/share/locale/da/LC_MESSAGES/ld.mo
 #usr/share/locale/da/LC_MESSAGES/opcodes.mo
 #usr/share/locale/de/LC_MESSAGES/gprof.mo
+#usr/share/locale/de/LC_MESSAGES/ld.mo
 #usr/share/locale/de/LC_MESSAGES/opcodes.mo
 #usr/share/locale/eo/LC_MESSAGES/gprof.mo
 #usr/share/locale/es/LC_MESSAGES/bfd.mo
@@ -96,6 +115,7 @@ usr/lib/libopcodes-2.28.so
 #usr/share/locale/ga/LC_MESSAGES/gprof.mo
 #usr/share/locale/ga/LC_MESSAGES/ld.mo
 #usr/share/locale/ga/LC_MESSAGES/opcodes.mo
+#usr/share/locale/hr/LC_MESSAGES/bfd.mo
 #usr/share/locale/hr/LC_MESSAGES/binutils.mo
 #usr/share/locale/hu/LC_MESSAGES/gprof.mo
 #usr/share/locale/id/LC_MESSAGES/bfd.mo
@@ -119,6 +139,7 @@ usr/lib/libopcodes-2.28.so
 #usr/share/locale/nl/LC_MESSAGES/gprof.mo
 #usr/share/locale/nl/LC_MESSAGES/opcodes.mo
 #usr/share/locale/pt_BR/LC_MESSAGES/gprof.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/ld.mo
 #usr/share/locale/pt_BR/LC_MESSAGES/opcodes.mo
 #usr/share/locale/ro
 #usr/share/locale/ro/LC_MESSAGES
@@ -130,6 +151,7 @@ usr/lib/libopcodes-2.28.so
 #usr/share/locale/ru/LC_MESSAGES/binutils.mo
 #usr/share/locale/ru/LC_MESSAGES/gas.mo
 #usr/share/locale/ru/LC_MESSAGES/gprof.mo
+#usr/share/locale/ru/LC_MESSAGES/ld.mo
 #usr/share/locale/rw/LC_MESSAGES/bfd.mo
 #usr/share/locale/rw/LC_MESSAGES/binutils.mo
 #usr/share/locale/rw/LC_MESSAGES/gas.mo
@@ -140,8 +162,11 @@ usr/lib/libopcodes-2.28.so
 #usr/share/locale/sr/LC_MESSAGES/bfd.mo
 #usr/share/locale/sr/LC_MESSAGES/binutils.mo
 #usr/share/locale/sr/LC_MESSAGES/gprof.mo
+#usr/share/locale/sr/LC_MESSAGES/ld.mo
+#usr/share/locale/sr/LC_MESSAGES/opcodes.mo
 #usr/share/locale/sv/LC_MESSAGES/bfd.mo
 #usr/share/locale/sv/LC_MESSAGES/binutils.mo
+#usr/share/locale/sv/LC_MESSAGES/gas.mo
 #usr/share/locale/sv/LC_MESSAGES/gprof.mo
 #usr/share/locale/sv/LC_MESSAGES/ld.mo
 #usr/share/locale/sv/LC_MESSAGES/opcodes.mo
diff --git a/config/rootfiles/common/armv5tel/glibc b/config/rootfiles/common/armv5tel/glibc
index 88e2868ff..8e69b9287 100644
--- a/config/rootfiles/common/armv5tel/glibc
+++ b/config/rootfiles/common/armv5tel/glibc
@@ -1,49 +1,49 @@
 #etc/ld.so.cache
 etc/rpc
-lib/ld-2.25.so
+lib/ld-2.27.so
 lib/ld-linux.so.3
-lib/libBrokenLocale-2.25.so
+lib/libBrokenLocale-2.27.so
 lib/libBrokenLocale.so.1
 #lib/libSegFault.so
-lib/libanl-2.25.so
+lib/libanl-2.27.so
 lib/libanl.so.1
-lib/libc-2.25.so
+lib/libc-2.27.so
 lib/libc.so.6
-lib/libcidn-2.25.so
+lib/libcidn-2.27.so
 lib/libcidn.so.1
-lib/libcrypt-2.25.so
+lib/libcrypt-2.27.so
 lib/libcrypt.so.1
-lib/libdl-2.25.so
+lib/libdl-2.27.so
 lib/libdl.so.2
-lib/libm-2.25.so
+lib/libm-2.27.so
 lib/libm.so.6
 #lib/libmemusage.so
-lib/libnsl-2.25.so
+lib/libnsl-2.27.so
 lib/libnsl.so.1
-lib/libnss_compat-2.25.so
+lib/libnss_compat-2.27.so
 lib/libnss_compat.so.2
-lib/libnss_db-2.25.so
+lib/libnss_db-2.27.so
 lib/libnss_db.so.2
-lib/libnss_dns-2.25.so
+lib/libnss_dns-2.27.so
 lib/libnss_dns.so.2
-lib/libnss_files-2.25.so
+lib/libnss_files-2.27.so
 lib/libnss_files.so.2
-lib/libnss_hesiod-2.25.so
+lib/libnss_hesiod-2.27.so
 lib/libnss_hesiod.so.2
-lib/libnss_nis-2.25.so
+lib/libnss_nis-2.27.so
 lib/libnss_nis.so.2
-lib/libnss_nisplus-2.25.so
+lib/libnss_nisplus-2.27.so
 lib/libnss_nisplus.so.2
 #lib/libpcprofile.so
-lib/libpthread-2.25.so
+lib/libpthread-2.27.so
 lib/libpthread.so.0
-lib/libresolv-2.25.so
+lib/libresolv-2.27.so
 lib/libresolv.so.2
-lib/librt-2.25.so
+lib/librt-2.27.so
 lib/librt.so.1
 lib/libthread_db-1.0.so
 lib/libthread_db.so.1
-lib/libutil-2.25.so
+lib/libutil-2.27.so
 lib/libutil.so.1
 sbin/ldconfig
 #sbin/sln
@@ -81,11 +81,13 @@ usr/bin/locale
 #usr/include/arpa/tftp.h
 #usr/include/assert.h
 #usr/include/bits
+#usr/include/bits/_G_config.h
 #usr/include/bits/a.out.h
 #usr/include/bits/byteswap-16.h
 #usr/include/bits/byteswap.h
 #usr/include/bits/cmathcalls.h
 #usr/include/bits/confname.h
+#usr/include/bits/cpu-set.h
 #usr/include/bits/dirent.h
 #usr/include/bits/dlfcn.h
 #usr/include/bits/elfclass.h
@@ -100,15 +102,16 @@ usr/bin/locale
 #usr/include/bits/fcntl2.h
 #usr/include/bits/fenv.h
 #usr/include/bits/fenvinline.h
+#usr/include/bits/floatn-common.h
+#usr/include/bits/floatn.h
 #usr/include/bits/flt-eval-method.h
 #usr/include/bits/fp-fast.h
 #usr/include/bits/fp-logb.h
-#usr/include/bits/huge_val.h
-#usr/include/bits/huge_valf.h
-#usr/include/bits/huge_vall.h
+#usr/include/bits/getopt_core.h
+#usr/include/bits/getopt_ext.h
+#usr/include/bits/getopt_posix.h
 #usr/include/bits/hwcap.h
 #usr/include/bits/in.h
-#usr/include/bits/inf.h
 #usr/include/bits/initspin.h
 #usr/include/bits/inotify.h
 #usr/include/bits/ioctl-types.h
@@ -118,6 +121,7 @@ usr/bin/locale
 #usr/include/bits/iscanonical.h
 #usr/include/bits/libc-header-start.h
 #usr/include/bits/libio-ldbl.h
+#usr/include/bits/libio.h
 #usr/include/bits/libm-simd-decl-stubs.h
 #usr/include/bits/link.h
 #usr/include/bits/local_lim.h
@@ -125,16 +129,17 @@ usr/bin/locale
 #usr/include/bits/long-double.h
 #usr/include/bits/math-finite.h
 #usr/include/bits/math-vector.h
+#usr/include/bits/mathcalls-helper-functions.h
 #usr/include/bits/mathcalls.h
 #usr/include/bits/mathdef.h
 #usr/include/bits/mathinline.h
 #usr/include/bits/mman-linux.h
+#usr/include/bits/mman-shared.h
 #usr/include/bits/mman.h
 #usr/include/bits/monetary-ldbl.h
 #usr/include/bits/mqueue.h
 #usr/include/bits/mqueue2.h
 #usr/include/bits/msq.h
-#usr/include/bits/nan.h
 #usr/include/bits/netdb.h
 #usr/include/bits/param.h
 #usr/include/bits/poll.h
@@ -143,7 +148,9 @@ usr/bin/locale
 #usr/include/bits/posix2_lim.h
 #usr/include/bits/posix_opt.h
 #usr/include/bits/printf-ldbl.h
+#usr/include/bits/pthreadtypes-arch.h
 #usr/include/bits/pthreadtypes.h
+#usr/include/bits/ptrace-shared.h
 #usr/include/bits/resource.h
 #usr/include/bits/sched.h
 #usr/include/bits/select.h
@@ -155,20 +162,26 @@ usr/bin/locale
 #usr/include/bits/shm.h
 #usr/include/bits/sigaction.h
 #usr/include/bits/sigcontext.h
-#usr/include/bits/siginfo.h
+#usr/include/bits/sigevent-consts.h
+#usr/include/bits/siginfo-arch.h
+#usr/include/bits/siginfo-consts-arch.h
+#usr/include/bits/siginfo-consts.h
 #usr/include/bits/signalfd.h
+#usr/include/bits/signum-generic.h
 #usr/include/bits/signum.h
-#usr/include/bits/sigset.h
 #usr/include/bits/sigstack.h
 #usr/include/bits/sigthread.h
 #usr/include/bits/sockaddr.h
 #usr/include/bits/socket.h
 #usr/include/bits/socket2.h
 #usr/include/bits/socket_type.h
+#usr/include/bits/ss_flags.h
 #usr/include/bits/stab.def
 #usr/include/bits/stat.h
 #usr/include/bits/statfs.h
 #usr/include/bits/statvfs.h
+#usr/include/bits/stdint-intn.h
+#usr/include/bits/stdint-uintn.h
 #usr/include/bits/stdio-ldbl.h
 #usr/include/bits/stdio.h
 #usr/include/bits/stdio2.h
@@ -177,9 +190,7 @@ usr/bin/locale
 #usr/include/bits/stdlib-float.h
 #usr/include/bits/stdlib-ldbl.h
 #usr/include/bits/stdlib.h
-#usr/include/bits/string.h
-#usr/include/bits/string2.h
-#usr/include/bits/string3.h
+#usr/include/bits/string_fortified.h
 #usr/include/bits/strings_fortified.h
 #usr/include/bits/stropts.h
 #usr/include/bits/sys_errlist.h
@@ -190,23 +201,44 @@ usr/bin/locale
 #usr/include/bits/syslog.h
 #usr/include/bits/sysmacros.h
 #usr/include/bits/termios.h
+#usr/include/bits/thread-shared-types.h
 #usr/include/bits/time.h
 #usr/include/bits/timerfd.h
 #usr/include/bits/timex.h
 #usr/include/bits/types
 #usr/include/bits/types.h
+#usr/include/bits/types/FILE.h
+#usr/include/bits/types/__FILE.h
+#usr/include/bits/types/__locale_t.h
+#usr/include/bits/types/__mbstate_t.h
+#usr/include/bits/types/__sigset_t.h
+#usr/include/bits/types/__sigval_t.h
 #usr/include/bits/types/clock_t.h
 #usr/include/bits/types/clockid_t.h
+#usr/include/bits/types/locale_t.h
+#usr/include/bits/types/mbstate_t.h
+#usr/include/bits/types/res_state.h
+#usr/include/bits/types/sig_atomic_t.h
+#usr/include/bits/types/sigevent_t.h
+#usr/include/bits/types/siginfo_t.h
+#usr/include/bits/types/sigset_t.h
+#usr/include/bits/types/sigval_t.h
+#usr/include/bits/types/stack_t.h
+#usr/include/bits/types/struct_iovec.h
 #usr/include/bits/types/struct_itimerspec.h
 #usr/include/bits/types/struct_osockaddr.h
+#usr/include/bits/types/struct_rusage.h
+#usr/include/bits/types/struct_sigstack.h
 #usr/include/bits/types/struct_timespec.h
 #usr/include/bits/types/struct_timeval.h
 #usr/include/bits/types/struct_tm.h
 #usr/include/bits/types/time_t.h
 #usr/include/bits/types/timer_t.h
+#usr/include/bits/types/wint_t.h
 #usr/include/bits/typesizes.h
 #usr/include/bits/uintn-identity.h
-#usr/include/bits/uio.h
+#usr/include/bits/uio-ext.h
+#usr/include/bits/uio_lim.h
 #usr/include/bits/unistd.h
 #usr/include/bits/ustat.h
 #usr/include/bits/utmp.h
@@ -217,6 +249,7 @@ usr/bin/locale
 #usr/include/bits/wchar-ldbl.h
 #usr/include/bits/wchar.h
 #usr/include/bits/wchar2.h
+#usr/include/bits/wctype-wchar.h
 #usr/include/bits/wordsize.h
 #usr/include/bits/xopen_lim.h
 #usr/include/bits/xtitypes.h
@@ -487,7 +520,6 @@ usr/bin/locale
 #usr/include/sys/types.h
 #usr/include/sys/ucontext.h
 #usr/include/sys/uio.h
-#usr/include/sys/ultrasound.h
 #usr/include/sys/un.h
 #usr/include/sys/unistd.h
 #usr/include/sys/user.h
@@ -522,7 +554,6 @@ usr/bin/locale
 #usr/include/wchar.h
 #usr/include/wctype.h
 #usr/include/wordexp.h
-#usr/include/xlocale.h
 #usr/lib/Mcrt1.o
 #usr/lib/Scrt1.o
 #usr/lib/audit
@@ -675,6 +706,7 @@ usr/lib/gconv
 #usr/lib/gconv/IBM855.so
 #usr/lib/gconv/IBM856.so
 #usr/lib/gconv/IBM857.so
+#usr/lib/gconv/IBM858.so
 #usr/lib/gconv/IBM860.so
 #usr/lib/gconv/IBM861.so
 #usr/lib/gconv/IBM862.so
@@ -806,7 +838,6 @@ usr/lib/gconv
 #usr/lib/libdl.a
 #usr/lib/libdl.so
 #usr/lib/libg.a
-#usr/lib/libieee.a
 #usr/lib/libm.a
 #usr/lib/libm.so
 #usr/lib/libmcheck.a
@@ -929,6 +960,20 @@ usr/lib/locale
 #usr/lib/locale/af_ZA/LC_PAPER
 #usr/lib/locale/af_ZA/LC_TELEPHONE
 #usr/lib/locale/af_ZA/LC_TIME
+#usr/lib/locale/agr_PE
+#usr/lib/locale/agr_PE/LC_ADDRESS
+#usr/lib/locale/agr_PE/LC_COLLATE
+#usr/lib/locale/agr_PE/LC_CTYPE
+#usr/lib/locale/agr_PE/LC_IDENTIFICATION
+#usr/lib/locale/agr_PE/LC_MEASUREMENT
+#usr/lib/locale/agr_PE/LC_MESSAGES
+#usr/lib/locale/agr_PE/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/agr_PE/LC_MONETARY
+#usr/lib/locale/agr_PE/LC_NAME
+#usr/lib/locale/agr_PE/LC_NUMERIC
+#usr/lib/locale/agr_PE/LC_PAPER
+#usr/lib/locale/agr_PE/LC_TELEPHONE
+#usr/lib/locale/agr_PE/LC_TIME
 #usr/lib/locale/ak_GH
 #usr/lib/locale/ak_GH/LC_ADDRESS
 #usr/lib/locale/ak_GH/LC_COLLATE
@@ -1573,6 +1618,20 @@ usr/lib/locale
 #usr/lib/locale/az_AZ/LC_PAPER
 #usr/lib/locale/az_AZ/LC_TELEPHONE
 #usr/lib/locale/az_AZ/LC_TIME
+#usr/lib/locale/az_IR
+#usr/lib/locale/az_IR/LC_ADDRESS
+#usr/lib/locale/az_IR/LC_COLLATE
+#usr/lib/locale/az_IR/LC_CTYPE
+#usr/lib/locale/az_IR/LC_IDENTIFICATION
+#usr/lib/locale/az_IR/LC_MEASUREMENT
+#usr/lib/locale/az_IR/LC_MESSAGES
+#usr/lib/locale/az_IR/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/az_IR/LC_MONETARY
+#usr/lib/locale/az_IR/LC_NAME
+#usr/lib/locale/az_IR/LC_NUMERIC
+#usr/lib/locale/az_IR/LC_PAPER
+#usr/lib/locale/az_IR/LC_TELEPHONE
+#usr/lib/locale/az_IR/LC_TIME
 #usr/lib/locale/be_BY
 #usr/lib/locale/be_BY.utf8
 #usr/lib/locale/be_BY.utf8/LC_ADDRESS
@@ -1713,6 +1772,34 @@ usr/lib/locale
 #usr/lib/locale/bho_IN/LC_PAPER
 #usr/lib/locale/bho_IN/LC_TELEPHONE
 #usr/lib/locale/bho_IN/LC_TIME
+#usr/lib/locale/bho_NP
+#usr/lib/locale/bho_NP/LC_ADDRESS
+#usr/lib/locale/bho_NP/LC_COLLATE
+#usr/lib/locale/bho_NP/LC_CTYPE
+#usr/lib/locale/bho_NP/LC_IDENTIFICATION
+#usr/lib/locale/bho_NP/LC_MEASUREMENT
+#usr/lib/locale/bho_NP/LC_MESSAGES
+#usr/lib/locale/bho_NP/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/bho_NP/LC_MONETARY
+#usr/lib/locale/bho_NP/LC_NAME
+#usr/lib/locale/bho_NP/LC_NUMERIC
+#usr/lib/locale/bho_NP/LC_PAPER
+#usr/lib/locale/bho_NP/LC_TELEPHONE
+#usr/lib/locale/bho_NP/LC_TIME
+#usr/lib/locale/bi_VU
+#usr/lib/locale/bi_VU/LC_ADDRESS
+#usr/lib/locale/bi_VU/LC_COLLATE
+#usr/lib/locale/bi_VU/LC_CTYPE
+#usr/lib/locale/bi_VU/LC_IDENTIFICATION
+#usr/lib/locale/bi_VU/LC_MEASUREMENT
+#usr/lib/locale/bi_VU/LC_MESSAGES
+#usr/lib/locale/bi_VU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/bi_VU/LC_MONETARY
+#usr/lib/locale/bi_VU/LC_NAME
+#usr/lib/locale/bi_VU/LC_NUMERIC
+#usr/lib/locale/bi_VU/LC_PAPER
+#usr/lib/locale/bi_VU/LC_TELEPHONE
+#usr/lib/locale/bi_VU/LC_TIME
 #usr/lib/locale/bn_BD
 #usr/lib/locale/bn_BD/LC_ADDRESS
 #usr/lib/locale/bn_BD/LC_COLLATE
@@ -1937,6 +2024,20 @@ usr/lib/locale
 #usr/lib/locale/ca_ES@euro/LC_PAPER
 #usr/lib/locale/ca_ES@euro/LC_TELEPHONE
 #usr/lib/locale/ca_ES@euro/LC_TIME
+#usr/lib/locale/ca_ES@valencia
+#usr/lib/locale/ca_ES@valencia/LC_ADDRESS
+#usr/lib/locale/ca_ES@valencia/LC_COLLATE
+#usr/lib/locale/ca_ES@valencia/LC_CTYPE
+#usr/lib/locale/ca_ES@valencia/LC_IDENTIFICATION
+#usr/lib/locale/ca_ES@valencia/LC_MEASUREMENT
+#usr/lib/locale/ca_ES@valencia/LC_MESSAGES
+#usr/lib/locale/ca_ES@valencia/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/ca_ES@valencia/LC_MONETARY
+#usr/lib/locale/ca_ES@valencia/LC_NAME
+#usr/lib/locale/ca_ES@valencia/LC_NUMERIC
+#usr/lib/locale/ca_ES@valencia/LC_PAPER
+#usr/lib/locale/ca_ES@valencia/LC_TELEPHONE
+#usr/lib/locale/ca_ES@valencia/LC_TIME
 #usr/lib/locale/ca_FR
 #usr/lib/locale/ca_FR.utf8
 #usr/lib/locale/ca_FR.utf8/LC_ADDRESS
@@ -2497,6 +2598,20 @@ usr/lib/locale
 #usr/lib/locale/el_GR/LC_PAPER
 #usr/lib/locale/el_GR/LC_TELEPHONE
 #usr/lib/locale/el_GR/LC_TIME
+#usr/lib/locale/el_GR@euro
+#usr/lib/locale/el_GR@euro/LC_ADDRESS
+#usr/lib/locale/el_GR@euro/LC_COLLATE
+#usr/lib/locale/el_GR@euro/LC_CTYPE
+#usr/lib/locale/el_GR@euro/LC_IDENTIFICATION
+#usr/lib/locale/el_GR@euro/LC_MEASUREMENT
+#usr/lib/locale/el_GR@euro/LC_MESSAGES
+#usr/lib/locale/el_GR@euro/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/el_GR@euro/LC_MONETARY
+#usr/lib/locale/el_GR@euro/LC_NAME
+#usr/lib/locale/el_GR@euro/LC_NUMERIC
+#usr/lib/locale/el_GR@euro/LC_PAPER
+#usr/lib/locale/el_GR@euro/LC_TELEPHONE
+#usr/lib/locale/el_GR@euro/LC_TIME
 #usr/lib/locale/en_AG
 #usr/lib/locale/en_AG/LC_ADDRESS
 #usr/lib/locale/en_AG/LC_COLLATE
@@ -2819,6 +2934,20 @@ usr/lib/locale
 #usr/lib/locale/en_PH/LC_PAPER
 #usr/lib/locale/en_PH/LC_TELEPHONE
 #usr/lib/locale/en_PH/LC_TIME
+#usr/lib/locale/en_SC.utf8
+#usr/lib/locale/en_SC.utf8/LC_ADDRESS
+#usr/lib/locale/en_SC.utf8/LC_COLLATE
+#usr/lib/locale/en_SC.utf8/LC_CTYPE
+#usr/lib/locale/en_SC.utf8/LC_IDENTIFICATION
+#usr/lib/locale/en_SC.utf8/LC_MEASUREMENT
+#usr/lib/locale/en_SC.utf8/LC_MESSAGES
+#usr/lib/locale/en_SC.utf8/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/en_SC.utf8/LC_MONETARY
+#usr/lib/locale/en_SC.utf8/LC_NAME
+#usr/lib/locale/en_SC.utf8/LC_NUMERIC
+#usr/lib/locale/en_SC.utf8/LC_PAPER
+#usr/lib/locale/en_SC.utf8/LC_TELEPHONE
+#usr/lib/locale/en_SC.utf8/LC_TIME
 #usr/lib/locale/en_SG
 #usr/lib/locale/en_SG.utf8
 #usr/lib/locale/en_SG.utf8/LC_ADDRESS
@@ -4247,6 +4376,20 @@ usr/lib/locale
 #usr/lib/locale/hi_IN/LC_PAPER
 #usr/lib/locale/hi_IN/LC_TELEPHONE
 #usr/lib/locale/hi_IN/LC_TIME
+#usr/lib/locale/hif_FJ
+#usr/lib/locale/hif_FJ/LC_ADDRESS
+#usr/lib/locale/hif_FJ/LC_COLLATE
+#usr/lib/locale/hif_FJ/LC_CTYPE
+#usr/lib/locale/hif_FJ/LC_IDENTIFICATION
+#usr/lib/locale/hif_FJ/LC_MEASUREMENT
+#usr/lib/locale/hif_FJ/LC_MESSAGES
+#usr/lib/locale/hif_FJ/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/hif_FJ/LC_MONETARY
+#usr/lib/locale/hif_FJ/LC_NAME
+#usr/lib/locale/hif_FJ/LC_NUMERIC
+#usr/lib/locale/hif_FJ/LC_PAPER
+#usr/lib/locale/hif_FJ/LC_TELEPHONE
+#usr/lib/locale/hif_FJ/LC_TIME
 #usr/lib/locale/hne_IN
 #usr/lib/locale/hne_IN/LC_ADDRESS
 #usr/lib/locale/hne_IN/LC_COLLATE
@@ -4625,6 +4768,20 @@ usr/lib/locale
 #usr/lib/locale/ka_GE/LC_PAPER
 #usr/lib/locale/ka_GE/LC_TELEPHONE
 #usr/lib/locale/ka_GE/LC_TIME
+#usr/lib/locale/kab_DZ
+#usr/lib/locale/kab_DZ/LC_ADDRESS
+#usr/lib/locale/kab_DZ/LC_COLLATE
+#usr/lib/locale/kab_DZ/LC_CTYPE
+#usr/lib/locale/kab_DZ/LC_IDENTIFICATION
+#usr/lib/locale/kab_DZ/LC_MEASUREMENT
+#usr/lib/locale/kab_DZ/LC_MESSAGES
+#usr/lib/locale/kab_DZ/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/kab_DZ/LC_MONETARY
+#usr/lib/locale/kab_DZ/LC_NAME
+#usr/lib/locale/kab_DZ/LC_NUMERIC
+#usr/lib/locale/kab_DZ/LC_PAPER
+#usr/lib/locale/kab_DZ/LC_TELEPHONE
+#usr/lib/locale/kab_DZ/LC_TIME
 #usr/lib/locale/kk_KZ
 #usr/lib/locale/kk_KZ.utf8
 #usr/lib/locale/kk_KZ.utf8/LC_ADDRESS
@@ -5059,6 +5216,34 @@ usr/lib/locale
 #usr/lib/locale/mai_IN/LC_PAPER
 #usr/lib/locale/mai_IN/LC_TELEPHONE
 #usr/lib/locale/mai_IN/LC_TIME
+#usr/lib/locale/mai_NP
+#usr/lib/locale/mai_NP/LC_ADDRESS
+#usr/lib/locale/mai_NP/LC_COLLATE
+#usr/lib/locale/mai_NP/LC_CTYPE
+#usr/lib/locale/mai_NP/LC_IDENTIFICATION
+#usr/lib/locale/mai_NP/LC_MEASUREMENT
+#usr/lib/locale/mai_NP/LC_MESSAGES
+#usr/lib/locale/mai_NP/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/mai_NP/LC_MONETARY
+#usr/lib/locale/mai_NP/LC_NAME
+#usr/lib/locale/mai_NP/LC_NUMERIC
+#usr/lib/locale/mai_NP/LC_PAPER
+#usr/lib/locale/mai_NP/LC_TELEPHONE
+#usr/lib/locale/mai_NP/LC_TIME
+#usr/lib/locale/mfe_MU
+#usr/lib/locale/mfe_MU/LC_ADDRESS
+#usr/lib/locale/mfe_MU/LC_COLLATE
+#usr/lib/locale/mfe_MU/LC_CTYPE
+#usr/lib/locale/mfe_MU/LC_IDENTIFICATION
+#usr/lib/locale/mfe_MU/LC_MEASUREMENT
+#usr/lib/locale/mfe_MU/LC_MESSAGES
+#usr/lib/locale/mfe_MU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/mfe_MU/LC_MONETARY
+#usr/lib/locale/mfe_MU/LC_NAME
+#usr/lib/locale/mfe_MU/LC_NUMERIC
+#usr/lib/locale/mfe_MU/LC_PAPER
+#usr/lib/locale/mfe_MU/LC_TELEPHONE
+#usr/lib/locale/mfe_MU/LC_TIME
 #usr/lib/locale/mg_MG
 #usr/lib/locale/mg_MG.utf8
 #usr/lib/locale/mg_MG.utf8/LC_ADDRESS
@@ -5129,6 +5314,34 @@ usr/lib/locale
 #usr/lib/locale/mi_NZ/LC_PAPER
 #usr/lib/locale/mi_NZ/LC_TELEPHONE
 #usr/lib/locale/mi_NZ/LC_TIME
+#usr/lib/locale/miq_NI
+#usr/lib/locale/miq_NI/LC_ADDRESS
+#usr/lib/locale/miq_NI/LC_COLLATE
+#usr/lib/locale/miq_NI/LC_CTYPE
+#usr/lib/locale/miq_NI/LC_IDENTIFICATION
+#usr/lib/locale/miq_NI/LC_MEASUREMENT
+#usr/lib/locale/miq_NI/LC_MESSAGES
+#usr/lib/locale/miq_NI/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/miq_NI/LC_MONETARY
+#usr/lib/locale/miq_NI/LC_NAME
+#usr/lib/locale/miq_NI/LC_NUMERIC
+#usr/lib/locale/miq_NI/LC_PAPER
+#usr/lib/locale/miq_NI/LC_TELEPHONE
+#usr/lib/locale/miq_NI/LC_TIME
+#usr/lib/locale/mjw_IN
+#usr/lib/locale/mjw_IN/LC_ADDRESS
+#usr/lib/locale/mjw_IN/LC_COLLATE
+#usr/lib/locale/mjw_IN/LC_CTYPE
+#usr/lib/locale/mjw_IN/LC_IDENTIFICATION
+#usr/lib/locale/mjw_IN/LC_MEASUREMENT
+#usr/lib/locale/mjw_IN/LC_MESSAGES
+#usr/lib/locale/mjw_IN/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/mjw_IN/LC_MONETARY
+#usr/lib/locale/mjw_IN/LC_NAME
+#usr/lib/locale/mjw_IN/LC_NUMERIC
+#usr/lib/locale/mjw_IN/LC_PAPER
+#usr/lib/locale/mjw_IN/LC_TELEPHONE
+#usr/lib/locale/mjw_IN/LC_TIME
 #usr/lib/locale/mk_MK
 #usr/lib/locale/mk_MK.utf8
 #usr/lib/locale/mk_MK.utf8/LC_ADDRESS
@@ -6081,6 +6294,20 @@ usr/lib/locale
 #usr/lib/locale/sgs_LT/LC_PAPER
 #usr/lib/locale/sgs_LT/LC_TELEPHONE
 #usr/lib/locale/sgs_LT/LC_TIME
+#usr/lib/locale/shn_MM
+#usr/lib/locale/shn_MM/LC_ADDRESS
+#usr/lib/locale/shn_MM/LC_COLLATE
+#usr/lib/locale/shn_MM/LC_CTYPE
+#usr/lib/locale/shn_MM/LC_IDENTIFICATION
+#usr/lib/locale/shn_MM/LC_MEASUREMENT
+#usr/lib/locale/shn_MM/LC_MESSAGES
+#usr/lib/locale/shn_MM/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/shn_MM/LC_MONETARY
+#usr/lib/locale/shn_MM/LC_NAME
+#usr/lib/locale/shn_MM/LC_NUMERIC
+#usr/lib/locale/shn_MM/LC_PAPER
+#usr/lib/locale/shn_MM/LC_TELEPHONE
+#usr/lib/locale/shn_MM/LC_TIME
 #usr/lib/locale/shs_CA
 #usr/lib/locale/shs_CA/LC_ADDRESS
 #usr/lib/locale/shs_CA/LC_COLLATE
@@ -6179,6 +6406,20 @@ usr/lib/locale
 #usr/lib/locale/sl_SI/LC_PAPER
 #usr/lib/locale/sl_SI/LC_TELEPHONE
 #usr/lib/locale/sl_SI/LC_TIME
+#usr/lib/locale/sm_WS
+#usr/lib/locale/sm_WS/LC_ADDRESS
+#usr/lib/locale/sm_WS/LC_COLLATE
+#usr/lib/locale/sm_WS/LC_CTYPE
+#usr/lib/locale/sm_WS/LC_IDENTIFICATION
+#usr/lib/locale/sm_WS/LC_MEASUREMENT
+#usr/lib/locale/sm_WS/LC_MESSAGES
+#usr/lib/locale/sm_WS/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/sm_WS/LC_MONETARY
+#usr/lib/locale/sm_WS/LC_NAME
+#usr/lib/locale/sm_WS/LC_NUMERIC
+#usr/lib/locale/sm_WS/LC_PAPER
+#usr/lib/locale/sm_WS/LC_TELEPHONE
+#usr/lib/locale/sm_WS/LC_TIME
 #usr/lib/locale/so_DJ
 #usr/lib/locale/so_DJ.utf8
 #usr/lib/locale/so_DJ.utf8/LC_ADDRESS
@@ -6739,6 +6980,34 @@ usr/lib/locale
 #usr/lib/locale/tn_ZA/LC_PAPER
 #usr/lib/locale/tn_ZA/LC_TELEPHONE
 #usr/lib/locale/tn_ZA/LC_TIME
+#usr/lib/locale/to_TO
+#usr/lib/locale/to_TO/LC_ADDRESS
+#usr/lib/locale/to_TO/LC_COLLATE
+#usr/lib/locale/to_TO/LC_CTYPE
+#usr/lib/locale/to_TO/LC_IDENTIFICATION
+#usr/lib/locale/to_TO/LC_MEASUREMENT
+#usr/lib/locale/to_TO/LC_MESSAGES
+#usr/lib/locale/to_TO/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/to_TO/LC_MONETARY
+#usr/lib/locale/to_TO/LC_NAME
+#usr/lib/locale/to_TO/LC_NUMERIC
+#usr/lib/locale/to_TO/LC_PAPER
+#usr/lib/locale/to_TO/LC_TELEPHONE
+#usr/lib/locale/to_TO/LC_TIME
+#usr/lib/locale/tpi_PG
+#usr/lib/locale/tpi_PG/LC_ADDRESS
+#usr/lib/locale/tpi_PG/LC_COLLATE
+#usr/lib/locale/tpi_PG/LC_CTYPE
+#usr/lib/locale/tpi_PG/LC_IDENTIFICATION
+#usr/lib/locale/tpi_PG/LC_MEASUREMENT
+#usr/lib/locale/tpi_PG/LC_MESSAGES
+#usr/lib/locale/tpi_PG/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/tpi_PG/LC_MONETARY
+#usr/lib/locale/tpi_PG/LC_NAME
+#usr/lib/locale/tpi_PG/LC_NUMERIC
+#usr/lib/locale/tpi_PG/LC_PAPER
+#usr/lib/locale/tpi_PG/LC_TELEPHONE
+#usr/lib/locale/tpi_PG/LC_TIME
 #usr/lib/locale/tr_CY
 #usr/lib/locale/tr_CY.utf8
 #usr/lib/locale/tr_CY.utf8/LC_ADDRESS
@@ -7159,6 +7428,20 @@ usr/lib/locale
 #usr/lib/locale/yue_HK/LC_PAPER
 #usr/lib/locale/yue_HK/LC_TELEPHONE
 #usr/lib/locale/yue_HK/LC_TIME
+#usr/lib/locale/yuw_PG
+#usr/lib/locale/yuw_PG/LC_ADDRESS
+#usr/lib/locale/yuw_PG/LC_COLLATE
+#usr/lib/locale/yuw_PG/LC_CTYPE
+#usr/lib/locale/yuw_PG/LC_IDENTIFICATION
+#usr/lib/locale/yuw_PG/LC_MEASUREMENT
+#usr/lib/locale/yuw_PG/LC_MESSAGES
+#usr/lib/locale/yuw_PG/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/yuw_PG/LC_MONETARY
+#usr/lib/locale/yuw_PG/LC_NAME
+#usr/lib/locale/yuw_PG/LC_NUMERIC
+#usr/lib/locale/yuw_PG/LC_PAPER
+#usr/lib/locale/yuw_PG/LC_TELEPHONE
+#usr/lib/locale/yuw_PG/LC_TIME
 #usr/lib/locale/zh_CN
 #usr/lib/locale/zh_CN.gb18030
 #usr/lib/locale/zh_CN.gb18030/LC_ADDRESS
@@ -7473,6 +7756,7 @@ usr/lib/locale
 #usr/share/i18n/charmaps/IBM855.gz
 #usr/share/i18n/charmaps/IBM856.gz
 #usr/share/i18n/charmaps/IBM857.gz
+#usr/share/i18n/charmaps/IBM858.gz
 #usr/share/i18n/charmaps/IBM860.gz
 #usr/share/i18n/charmaps/IBM861.gz
 #usr/share/i18n/charmaps/IBM862.gz
@@ -7600,6 +7884,7 @@ usr/lib/locale
 #usr/share/i18n/locales/aa_ER@saaho
 #usr/share/i18n/locales/aa_ET
 #usr/share/i18n/locales/af_ZA
+#usr/share/i18n/locales/agr_PE
 #usr/share/i18n/locales/ak_GH
 #usr/share/i18n/locales/am_ET
 #usr/share/i18n/locales/an_ES
@@ -7627,6 +7912,7 @@ usr/lib/locale
 #usr/share/i18n/locales/ast_ES
 #usr/share/i18n/locales/ayc_PE
 #usr/share/i18n/locales/az_AZ
+#usr/share/i18n/locales/az_IR
 #usr/share/i18n/locales/be_BY
 #usr/share/i18n/locales/be_BY@latin
 #usr/share/i18n/locales/bem_ZM
@@ -7635,6 +7921,8 @@ usr/lib/locale
 #usr/share/i18n/locales/bg_BG
 #usr/share/i18n/locales/bhb_IN
 #usr/share/i18n/locales/bho_IN
+#usr/share/i18n/locales/bho_NP
+#usr/share/i18n/locales/bi_VU
 #usr/share/i18n/locales/bn_BD
 #usr/share/i18n/locales/bn_IN
 #usr/share/i18n/locales/bo_CN
@@ -7647,11 +7935,13 @@ usr/lib/locale
 #usr/share/i18n/locales/ca_AD
 #usr/share/i18n/locales/ca_ES
 #usr/share/i18n/locales/ca_ES@euro
+#usr/share/i18n/locales/ca_ES@valencia
 #usr/share/i18n/locales/ca_FR
 #usr/share/i18n/locales/ca_IT
 #usr/share/i18n/locales/ce_RU
 #usr/share/i18n/locales/chr_US
 #usr/share/i18n/locales/cmn_TW
+#usr/share/i18n/locales/cns11643_stroke
 #usr/share/i18n/locales/crh_UA
 #usr/share/i18n/locales/cs_CZ
 #usr/share/i18n/locales/csb_PL
@@ -7689,6 +7979,7 @@ usr/lib/locale
 #usr/share/i18n/locales/en_NG
 #usr/share/i18n/locales/en_NZ
 #usr/share/i18n/locales/en_PH
+#usr/share/i18n/locales/en_SC
 #usr/share/i18n/locales/en_SG
 #usr/share/i18n/locales/en_US
 #usr/share/i18n/locales/en_ZA
@@ -7752,6 +8043,7 @@ usr/lib/locale
 #usr/share/i18n/locales/hak_TW
 #usr/share/i18n/locales/he_IL
 #usr/share/i18n/locales/hi_IN
+#usr/share/i18n/locales/hif_FJ
 #usr/share/i18n/locales/hne_IN
 #usr/share/i18n/locales/hr_HR
 #usr/share/i18n/locales/hsb_DE
@@ -7759,6 +8051,7 @@ usr/lib/locale
 #usr/share/i18n/locales/hu_HU
 #usr/share/i18n/locales/hy_AM
 #usr/share/i18n/locales/i18n
+#usr/share/i18n/locales/i18n_ctype
 #usr/share/i18n/locales/ia_FR
 #usr/share/i18n/locales/id_ID
 #usr/share/i18n/locales/ig_NG
@@ -7773,6 +8066,7 @@ usr/lib/locale
 #usr/share/i18n/locales/iu_CA
 #usr/share/i18n/locales/ja_JP
 #usr/share/i18n/locales/ka_GE
+#usr/share/i18n/locales/kab_DZ
 #usr/share/i18n/locales/kk_KZ
 #usr/share/i18n/locales/kl_GL
 #usr/share/i18n/locales/km_KH
@@ -7796,9 +8090,13 @@ usr/lib/locale
 #usr/share/i18n/locales/lzh_TW
 #usr/share/i18n/locales/mag_IN
 #usr/share/i18n/locales/mai_IN
+#usr/share/i18n/locales/mai_NP
+#usr/share/i18n/locales/mfe_MU
 #usr/share/i18n/locales/mg_MG
 #usr/share/i18n/locales/mhr_RU
 #usr/share/i18n/locales/mi_NZ
+#usr/share/i18n/locales/miq_NI
+#usr/share/i18n/locales/mjw_IN
 #usr/share/i18n/locales/mk_MK
 #usr/share/i18n/locales/ml_IN
 #usr/share/i18n/locales/mn_MN
@@ -7851,11 +8149,13 @@ usr/lib/locale
 #usr/share/i18n/locales/sd_IN@devanagari
 #usr/share/i18n/locales/se_NO
 #usr/share/i18n/locales/sgs_LT
+#usr/share/i18n/locales/shn_MM
 #usr/share/i18n/locales/shs_CA
 #usr/share/i18n/locales/si_LK
 #usr/share/i18n/locales/sid_ET
 #usr/share/i18n/locales/sk_SK
 #usr/share/i18n/locales/sl_SI
+#usr/share/i18n/locales/sm_WS
 #usr/share/i18n/locales/so_DJ
 #usr/share/i18n/locales/so_ET
 #usr/share/i18n/locales/so_KE
@@ -7886,6 +8186,8 @@ usr/lib/locale
 #usr/share/i18n/locales/tk_TM
 #usr/share/i18n/locales/tl_PH
 #usr/share/i18n/locales/tn_ZA
+#usr/share/i18n/locales/to_TO
+#usr/share/i18n/locales/tpi_PG
 #usr/share/i18n/locales/tr_CY
 #usr/share/i18n/locales/tr_TR
 #usr/share/i18n/locales/translit_circle
@@ -7921,6 +8223,7 @@ usr/lib/locale
 #usr/share/i18n/locales/yi_US
 #usr/share/i18n/locales/yo_NG
 #usr/share/i18n/locales/yue_HK
+#usr/share/i18n/locales/yuw_PG
 #usr/share/i18n/locales/zh_CN
 #usr/share/i18n/locales/zh_HK
 #usr/share/i18n/locales/zh_SG
@@ -7935,6 +8238,8 @@ usr/lib/locale
 #usr/share/info/libc.info-13
 #usr/share/info/libc.info-14
 #usr/share/info/libc.info-15
+#usr/share/info/libc.info-16
+#usr/share/info/libc.info-17
 #usr/share/info/libc.info-2
 #usr/share/info/libc.info-3
 #usr/share/info/libc.info-4
diff --git a/config/rootfiles/common/armv5tel/initscripts b/config/rootfiles/common/armv5tel/initscripts
index d3a3cf829..43802216d 100644
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -22,7 +22,6 @@ etc/rc.d/init.d/halt
 etc/rc.d/init.d/ipsec
 etc/rc.d/init.d/leds
 etc/rc.d/init.d/localnet
-etc/rc.d/init.d/mISDN
 etc/rc.d/init.d/modules
 etc/rc.d/init.d/mountfs
 etc/rc.d/init.d/mountkernfs
diff --git a/config/rootfiles/common/automake b/config/rootfiles/common/automake
index 3568fe700..21a6720ad 100644
--- a/config/rootfiles/common/automake
+++ b/config/rootfiles/common/automake
@@ -118,8 +118,8 @@
 #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/doc/automake
+#usr/share/doc/automake/amhello-1.0.tar.gz
 #usr/share/info/automake-history.info
 #usr/share/info/automake.info
 #usr/share/info/automake.info-1
diff --git a/config/rootfiles/common/bison b/config/rootfiles/common/bison
index 2304eca1b..2ecfc75fb 100644
--- a/config/rootfiles/common/bison
+++ b/config/rootfiles/common/bison
@@ -1,7 +1,6 @@
 #usr/bin/bison
 #usr/bin/yacc
 #usr/lib/liby.a
-#usr/share/aclocal
 #usr/share/aclocal/bison-i18n.m4
 #usr/share/bison
 #usr/share/bison/README
@@ -29,25 +28,101 @@
 #usr/share/bison/xslt/xml2text.xsl
 #usr/share/bison/xslt/xml2xhtml.xsl
 #usr/share/bison/yacc.c
-#usr/share/doc/bison-3.0.4
-#usr/share/doc/bison-3.0.4/AUTHORS
-#usr/share/doc/bison-3.0.4/COPYING
-#usr/share/doc/bison-3.0.4/NEWS
-#usr/share/doc/bison-3.0.4/README
-#usr/share/doc/bison-3.0.4/THANKS
-#usr/share/doc/bison-3.0.4/TODO
-#usr/share/doc/bison-3.0.4/examples
-#usr/share/doc/bison-3.0.4/examples/calc++
-#usr/share/doc/bison-3.0.4/examples/calc++/calc++-driver.cc
-#usr/share/doc/bison-3.0.4/examples/calc++/calc++-driver.hh
-#usr/share/doc/bison-3.0.4/examples/calc++/calc++-parser.yy
-#usr/share/doc/bison-3.0.4/examples/calc++/calc++-scanner.ll
-#usr/share/doc/bison-3.0.4/examples/calc++/calc++.cc
-#usr/share/doc/bison-3.0.4/examples/mfcalc
-#usr/share/doc/bison-3.0.4/examples/mfcalc/calc.h
-#usr/share/doc/bison-3.0.4/examples/mfcalc/mfcalc.y
-#usr/share/doc/bison-3.0.4/examples/rpcalc
-#usr/share/doc/bison-3.0.4/examples/rpcalc/rpcalc.y
+#usr/share/doc/bison
+#usr/share/doc/bison/AUTHORS
+#usr/share/doc/bison/COPYING
+#usr/share/doc/bison/NEWS
+#usr/share/doc/bison/README
+#usr/share/doc/bison/THANKS
+#usr/share/doc/bison/TODO
+#usr/share/doc/bison/examples
+#usr/share/doc/bison/examples/calc++
+#usr/share/doc/bison/examples/calc++/calc++-driver.cc
+#usr/share/doc/bison/examples/calc++/calc++-driver.hh
+#usr/share/doc/bison/examples/calc++/calc++-parser.yy
+#usr/share/doc/bison/examples/calc++/calc++-scanner.ll
+#usr/share/doc/bison/examples/calc++/calc++.cc
+#usr/share/doc/bison/examples/mfcalc
+#usr/share/doc/bison/examples/mfcalc/calc.h
+#usr/share/doc/bison/examples/mfcalc/mfcalc.y
+#usr/share/doc/bison/examples/rpcalc
+#usr/share/doc/bison/examples/rpcalc/rpcalc.y
 #usr/share/info/bison.info
+#usr/share/locale/ast
+#usr/share/locale/ast/LC_MESSAGES
+#usr/share/locale/ast/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/da/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/da/LC_MESSAGES/bison.mo
+#usr/share/locale/de/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/de/LC_MESSAGES/bison.mo
+#usr/share/locale/el/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/el/LC_MESSAGES/bison.mo
+#usr/share/locale/eo/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/eo/LC_MESSAGES/bison.mo
+#usr/share/locale/es/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/es/LC_MESSAGES/bison.mo
+#usr/share/locale/et/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/et/LC_MESSAGES/bison.mo
+#usr/share/locale/fi/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/fi/LC_MESSAGES/bison.mo
+#usr/share/locale/fr/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/fr/LC_MESSAGES/bison.mo
+#usr/share/locale/ga/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/ga/LC_MESSAGES/bison.mo
+#usr/share/locale/gl/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/hr/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/hr/LC_MESSAGES/bison.mo
+#usr/share/locale/hu/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/ia/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/id/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/id/LC_MESSAGES/bison.mo
+#usr/share/locale/it/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/it/LC_MESSAGES/bison.mo
+#usr/share/locale/ja/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/ja/LC_MESSAGES/bison.mo
+#usr/share/locale/ky
+#usr/share/locale/ky/LC_MESSAGES
+#usr/share/locale/ky/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/lt/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/lv
+#usr/share/locale/lv/LC_MESSAGES
+#usr/share/locale/lv/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/ms/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/ms/LC_MESSAGES/bison.mo
+#usr/share/locale/nb/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/nb/LC_MESSAGES/bison.mo
+#usr/share/locale/nl/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/nl/LC_MESSAGES/bison.mo
+#usr/share/locale/pl/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/pl/LC_MESSAGES/bison.mo
+#usr/share/locale/pt/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/pt/LC_MESSAGES/bison.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/bison.mo
+#usr/share/locale/ro/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/ro/LC_MESSAGES/bison.mo
+#usr/share/locale/ru/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/ru/LC_MESSAGES/bison.mo
+#usr/share/locale/sl/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/sq
+#usr/share/locale/sq/LC_MESSAGES
+#usr/share/locale/sq/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/sr/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/sr/LC_MESSAGES/bison.mo
+#usr/share/locale/sv/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/sv/LC_MESSAGES/bison.mo
+#usr/share/locale/th
+#usr/share/locale/th/LC_MESSAGES
+#usr/share/locale/th/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/tr/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/tr/LC_MESSAGES/bison.mo
+#usr/share/locale/uk/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/uk/LC_MESSAGES/bison.mo
+#usr/share/locale/vi/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/vi/LC_MESSAGES/bison.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/bison.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo
+#usr/share/locale/zh_TW/LC_MESSAGES/bison.mo
 #usr/share/man/man1/bison.1
 #usr/share/man/man1/yacc.1
diff --git a/config/rootfiles/common/capi4k-utils b/config/rootfiles/common/capi4k-utils
deleted file mode 100644
index 3a5d66a80..000000000
--- a/config/rootfiles/common/capi4k-utils
+++ /dev/null
@@ -1,12 +0,0 @@
-sbin/capiinit
-usr/bin/capiinfo
-#usr/include/capi20.h
-#usr/include/capicmd.h
-#usr/include/capiutils.h
-#usr/lib/libcapi20.a
-#usr/lib/libcapi20.la
-usr/lib/libcapi20.so
-usr/lib/libcapi20.so.3
-usr/lib/libcapi20.so.3.0.4
-#usr/lib/libcapi20dyn.a
-#usr/man/man8/capiinfo.8
diff --git a/config/rootfiles/common/hostname b/config/rootfiles/common/hostname
index 83cbfc450..7378b8dcf 100644
--- a/config/rootfiles/common/hostname
+++ b/config/rootfiles/common/hostname
@@ -1,10 +1,2 @@
-bin/dnsdomainname
-bin/domainname
 bin/hostname
-bin/nisdomainname
-bin/ypdomainname
-#usr/share/man/man1/dnsdomainname.1
-#usr/share/man/man1/domainname.1
 #usr/share/man/man1/hostname.1
-#usr/share/man/man1/nisdomainname.1
-#usr/share/man/man1/ypdomainname.1
diff --git a/config/rootfiles/common/i2c-tools b/config/rootfiles/common/i2c-tools
new file mode 100644
index 000000000..fb5ee8326
--- /dev/null
+++ b/config/rootfiles/common/i2c-tools
@@ -0,0 +1,16 @@
+usr/bin/ddcmon
+usr/bin/decode-dimms
+usr/bin/decode-edid
+usr/bin/decode-vaio
+usr/sbin/i2c-stub-from-dump
+usr/sbin/i2cdetect
+usr/sbin/i2cdump
+usr/sbin/i2cget
+usr/sbin/i2cset
+#usr/share/man/man1/decode-dimms.1
+#usr/share/man/man1/decode-vaio.1
+#usr/share/man/man8/i2c-stub-from-dump.8
+#usr/share/man/man8/i2cdetect.8
+#usr/share/man/man8/i2cdump.8
+#usr/share/man/man8/i2cget.8
+#usr/share/man/man8/i2cset.8
diff --git a/config/rootfiles/common/i586/binutils b/config/rootfiles/common/i586/binutils
index 886cdb4bf..42c82cbd7 100644
--- a/config/rootfiles/common/i586/binutils
+++ b/config/rootfiles/common/i586/binutils
@@ -25,91 +25,146 @@
 #usr/lib/ldscripts/elf32_x86_64.x
 #usr/lib/ldscripts/elf32_x86_64.xbn
 #usr/lib/ldscripts/elf32_x86_64.xc
+#usr/lib/ldscripts/elf32_x86_64.xce
 #usr/lib/ldscripts/elf32_x86_64.xd
 #usr/lib/ldscripts/elf32_x86_64.xdc
+#usr/lib/ldscripts/elf32_x86_64.xdce
+#usr/lib/ldscripts/elf32_x86_64.xde
 #usr/lib/ldscripts/elf32_x86_64.xdw
+#usr/lib/ldscripts/elf32_x86_64.xdwe
+#usr/lib/ldscripts/elf32_x86_64.xe
 #usr/lib/ldscripts/elf32_x86_64.xn
 #usr/lib/ldscripts/elf32_x86_64.xr
 #usr/lib/ldscripts/elf32_x86_64.xs
 #usr/lib/ldscripts/elf32_x86_64.xsc
+#usr/lib/ldscripts/elf32_x86_64.xsce
+#usr/lib/ldscripts/elf32_x86_64.xse
 #usr/lib/ldscripts/elf32_x86_64.xsw
+#usr/lib/ldscripts/elf32_x86_64.xswe
 #usr/lib/ldscripts/elf32_x86_64.xu
 #usr/lib/ldscripts/elf32_x86_64.xw
+#usr/lib/ldscripts/elf32_x86_64.xwe
 #usr/lib/ldscripts/elf_i386.x
 #usr/lib/ldscripts/elf_i386.xbn
 #usr/lib/ldscripts/elf_i386.xc
+#usr/lib/ldscripts/elf_i386.xce
 #usr/lib/ldscripts/elf_i386.xd
 #usr/lib/ldscripts/elf_i386.xdc
+#usr/lib/ldscripts/elf_i386.xdce
+#usr/lib/ldscripts/elf_i386.xde
 #usr/lib/ldscripts/elf_i386.xdw
+#usr/lib/ldscripts/elf_i386.xdwe
+#usr/lib/ldscripts/elf_i386.xe
 #usr/lib/ldscripts/elf_i386.xn
 #usr/lib/ldscripts/elf_i386.xr
 #usr/lib/ldscripts/elf_i386.xs
 #usr/lib/ldscripts/elf_i386.xsc
+#usr/lib/ldscripts/elf_i386.xsce
+#usr/lib/ldscripts/elf_i386.xse
 #usr/lib/ldscripts/elf_i386.xsw
+#usr/lib/ldscripts/elf_i386.xswe
 #usr/lib/ldscripts/elf_i386.xu
 #usr/lib/ldscripts/elf_i386.xw
+#usr/lib/ldscripts/elf_i386.xwe
 #usr/lib/ldscripts/elf_iamcu.x
 #usr/lib/ldscripts/elf_iamcu.xbn
 #usr/lib/ldscripts/elf_iamcu.xc
+#usr/lib/ldscripts/elf_iamcu.xce
 #usr/lib/ldscripts/elf_iamcu.xd
 #usr/lib/ldscripts/elf_iamcu.xdc
+#usr/lib/ldscripts/elf_iamcu.xdce
+#usr/lib/ldscripts/elf_iamcu.xde
 #usr/lib/ldscripts/elf_iamcu.xdw
+#usr/lib/ldscripts/elf_iamcu.xdwe
+#usr/lib/ldscripts/elf_iamcu.xe
 #usr/lib/ldscripts/elf_iamcu.xn
 #usr/lib/ldscripts/elf_iamcu.xr
 #usr/lib/ldscripts/elf_iamcu.xs
 #usr/lib/ldscripts/elf_iamcu.xsc
+#usr/lib/ldscripts/elf_iamcu.xsce
+#usr/lib/ldscripts/elf_iamcu.xse
 #usr/lib/ldscripts/elf_iamcu.xsw
+#usr/lib/ldscripts/elf_iamcu.xswe
 #usr/lib/ldscripts/elf_iamcu.xu
 #usr/lib/ldscripts/elf_iamcu.xw
+#usr/lib/ldscripts/elf_iamcu.xwe
 #usr/lib/ldscripts/elf_k1om.x
 #usr/lib/ldscripts/elf_k1om.xbn
 #usr/lib/ldscripts/elf_k1om.xc
+#usr/lib/ldscripts/elf_k1om.xce
 #usr/lib/ldscripts/elf_k1om.xd
 #usr/lib/ldscripts/elf_k1om.xdc
+#usr/lib/ldscripts/elf_k1om.xdce
+#usr/lib/ldscripts/elf_k1om.xde
 #usr/lib/ldscripts/elf_k1om.xdw
+#usr/lib/ldscripts/elf_k1om.xdwe
+#usr/lib/ldscripts/elf_k1om.xe
 #usr/lib/ldscripts/elf_k1om.xn
 #usr/lib/ldscripts/elf_k1om.xr
 #usr/lib/ldscripts/elf_k1om.xs
 #usr/lib/ldscripts/elf_k1om.xsc
+#usr/lib/ldscripts/elf_k1om.xsce
+#usr/lib/ldscripts/elf_k1om.xse
 #usr/lib/ldscripts/elf_k1om.xsw
+#usr/lib/ldscripts/elf_k1om.xswe
 #usr/lib/ldscripts/elf_k1om.xu
 #usr/lib/ldscripts/elf_k1om.xw
+#usr/lib/ldscripts/elf_k1om.xwe
 #usr/lib/ldscripts/elf_l1om.x
 #usr/lib/ldscripts/elf_l1om.xbn
 #usr/lib/ldscripts/elf_l1om.xc
+#usr/lib/ldscripts/elf_l1om.xce
 #usr/lib/ldscripts/elf_l1om.xd
 #usr/lib/ldscripts/elf_l1om.xdc
+#usr/lib/ldscripts/elf_l1om.xdce
+#usr/lib/ldscripts/elf_l1om.xde
 #usr/lib/ldscripts/elf_l1om.xdw
+#usr/lib/ldscripts/elf_l1om.xdwe
+#usr/lib/ldscripts/elf_l1om.xe
 #usr/lib/ldscripts/elf_l1om.xn
 #usr/lib/ldscripts/elf_l1om.xr
 #usr/lib/ldscripts/elf_l1om.xs
 #usr/lib/ldscripts/elf_l1om.xsc
+#usr/lib/ldscripts/elf_l1om.xsce
+#usr/lib/ldscripts/elf_l1om.xse
 #usr/lib/ldscripts/elf_l1om.xsw
+#usr/lib/ldscripts/elf_l1om.xswe
 #usr/lib/ldscripts/elf_l1om.xu
 #usr/lib/ldscripts/elf_l1om.xw
+#usr/lib/ldscripts/elf_l1om.xwe
 #usr/lib/ldscripts/elf_x86_64.x
 #usr/lib/ldscripts/elf_x86_64.xbn
 #usr/lib/ldscripts/elf_x86_64.xc
+#usr/lib/ldscripts/elf_x86_64.xce
 #usr/lib/ldscripts/elf_x86_64.xd
 #usr/lib/ldscripts/elf_x86_64.xdc
+#usr/lib/ldscripts/elf_x86_64.xdce
+#usr/lib/ldscripts/elf_x86_64.xde
 #usr/lib/ldscripts/elf_x86_64.xdw
+#usr/lib/ldscripts/elf_x86_64.xdwe
+#usr/lib/ldscripts/elf_x86_64.xe
 #usr/lib/ldscripts/elf_x86_64.xn
 #usr/lib/ldscripts/elf_x86_64.xr
 #usr/lib/ldscripts/elf_x86_64.xs
 #usr/lib/ldscripts/elf_x86_64.xsc
+#usr/lib/ldscripts/elf_x86_64.xsce
+#usr/lib/ldscripts/elf_x86_64.xse
 #usr/lib/ldscripts/elf_x86_64.xsw
+#usr/lib/ldscripts/elf_x86_64.xswe
 #usr/lib/ldscripts/elf_x86_64.xu
 #usr/lib/ldscripts/elf_x86_64.xw
+#usr/lib/ldscripts/elf_x86_64.xwe
 #usr/lib/ldscripts/i386linux.x
 #usr/lib/ldscripts/i386linux.xbn
+#usr/lib/ldscripts/i386linux.xe
 #usr/lib/ldscripts/i386linux.xn
 #usr/lib/ldscripts/i386linux.xr
 #usr/lib/ldscripts/i386linux.xu
-usr/lib/libbfd-2.28.so
+usr/lib/libbfd-2.30.so
 #usr/lib/libbfd.a
 #usr/lib/libbfd.la
 #usr/lib/libbfd.so
-usr/lib/libopcodes-2.28.so
+usr/lib/libopcodes-2.30.so
 #usr/lib/libopcodes.a
 #usr/lib/libopcodes.la
 #usr/lib/libopcodes.so
@@ -128,6 +183,7 @@ usr/lib/libopcodes-2.28.so
 #usr/share/locale/da/LC_MESSAGES/ld.mo
 #usr/share/locale/da/LC_MESSAGES/opcodes.mo
 #usr/share/locale/de/LC_MESSAGES/gprof.mo
+#usr/share/locale/de/LC_MESSAGES/ld.mo
 #usr/share/locale/de/LC_MESSAGES/opcodes.mo
 #usr/share/locale/eo/LC_MESSAGES/gprof.mo
 #usr/share/locale/es/LC_MESSAGES/bfd.mo
@@ -153,6 +209,7 @@ usr/lib/libopcodes-2.28.so
 #usr/share/locale/ga/LC_MESSAGES/gprof.mo
 #usr/share/locale/ga/LC_MESSAGES/ld.mo
 #usr/share/locale/ga/LC_MESSAGES/opcodes.mo
+#usr/share/locale/hr/LC_MESSAGES/bfd.mo
 #usr/share/locale/hr/LC_MESSAGES/binutils.mo
 #usr/share/locale/hu/LC_MESSAGES/gprof.mo
 #usr/share/locale/id/LC_MESSAGES/bfd.mo
@@ -176,6 +233,7 @@ usr/lib/libopcodes-2.28.so
 #usr/share/locale/nl/LC_MESSAGES/gprof.mo
 #usr/share/locale/nl/LC_MESSAGES/opcodes.mo
 #usr/share/locale/pt_BR/LC_MESSAGES/gprof.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/ld.mo
 #usr/share/locale/pt_BR/LC_MESSAGES/opcodes.mo
 #usr/share/locale/ro
 #usr/share/locale/ro/LC_MESSAGES
@@ -187,6 +245,7 @@ usr/lib/libopcodes-2.28.so
 #usr/share/locale/ru/LC_MESSAGES/binutils.mo
 #usr/share/locale/ru/LC_MESSAGES/gas.mo
 #usr/share/locale/ru/LC_MESSAGES/gprof.mo
+#usr/share/locale/ru/LC_MESSAGES/ld.mo
 #usr/share/locale/rw/LC_MESSAGES/bfd.mo
 #usr/share/locale/rw/LC_MESSAGES/binutils.mo
 #usr/share/locale/rw/LC_MESSAGES/gas.mo
@@ -197,8 +256,11 @@ usr/lib/libopcodes-2.28.so
 #usr/share/locale/sr/LC_MESSAGES/bfd.mo
 #usr/share/locale/sr/LC_MESSAGES/binutils.mo
 #usr/share/locale/sr/LC_MESSAGES/gprof.mo
+#usr/share/locale/sr/LC_MESSAGES/ld.mo
+#usr/share/locale/sr/LC_MESSAGES/opcodes.mo
 #usr/share/locale/sv/LC_MESSAGES/bfd.mo
 #usr/share/locale/sv/LC_MESSAGES/binutils.mo
+#usr/share/locale/sv/LC_MESSAGES/gas.mo
 #usr/share/locale/sv/LC_MESSAGES/gprof.mo
 #usr/share/locale/sv/LC_MESSAGES/ld.mo
 #usr/share/locale/sv/LC_MESSAGES/opcodes.mo
diff --git a/config/rootfiles/common/i586/glibc b/config/rootfiles/common/i586/glibc
index a169be147..40bb8c63d 100644
--- a/config/rootfiles/common/i586/glibc
+++ b/config/rootfiles/common/i586/glibc
@@ -1,49 +1,49 @@
 #etc/ld.so.cache
 etc/rpc
-lib/ld-2.25.so
+lib/ld-2.27.so
 lib/ld-linux.so.2
-lib/libBrokenLocale-2.25.so
+lib/libBrokenLocale-2.27.so
 lib/libBrokenLocale.so.1
 #lib/libSegFault.so
-lib/libanl-2.25.so
+lib/libanl-2.27.so
 lib/libanl.so.1
-lib/libc-2.25.so
+lib/libc-2.27.so
 lib/libc.so.6
-lib/libcidn-2.25.so
+lib/libcidn-2.27.so
 lib/libcidn.so.1
-lib/libcrypt-2.25.so
+lib/libcrypt-2.27.so
 lib/libcrypt.so.1
-lib/libdl-2.25.so
+lib/libdl-2.27.so
 lib/libdl.so.2
-lib/libm-2.25.so
+lib/libm-2.27.so
 lib/libm.so.6
 #lib/libmemusage.so
-lib/libnsl-2.25.so
+lib/libnsl-2.27.so
 lib/libnsl.so.1
-lib/libnss_compat-2.25.so
+lib/libnss_compat-2.27.so
 lib/libnss_compat.so.2
-lib/libnss_db-2.25.so
+lib/libnss_db-2.27.so
 lib/libnss_db.so.2
-lib/libnss_dns-2.25.so
+lib/libnss_dns-2.27.so
 lib/libnss_dns.so.2
-lib/libnss_files-2.25.so
+lib/libnss_files-2.27.so
 lib/libnss_files.so.2
-lib/libnss_hesiod-2.25.so
+lib/libnss_hesiod-2.27.so
 lib/libnss_hesiod.so.2
-lib/libnss_nis-2.25.so
+lib/libnss_nis-2.27.so
 lib/libnss_nis.so.2
-lib/libnss_nisplus-2.25.so
+lib/libnss_nisplus-2.27.so
 lib/libnss_nisplus.so.2
 #lib/libpcprofile.so
-lib/libpthread-2.25.so
+lib/libpthread-2.27.so
 lib/libpthread.so.0
-lib/libresolv-2.25.so
+lib/libresolv-2.27.so
 lib/libresolv.so.2
-lib/librt-2.25.so
+lib/librt-2.27.so
 lib/librt.so.1
 lib/libthread_db-1.0.so
 lib/libthread_db.so.1
-lib/libutil-2.25.so
+lib/libutil-2.27.so
 lib/libutil.so.1
 sbin/ldconfig
 #sbin/sln
@@ -82,11 +82,13 @@ usr/bin/locale
 #usr/include/arpa/tftp.h
 #usr/include/assert.h
 #usr/include/bits
+#usr/include/bits/_G_config.h
 #usr/include/bits/a.out.h
 #usr/include/bits/byteswap-16.h
 #usr/include/bits/byteswap.h
 #usr/include/bits/cmathcalls.h
 #usr/include/bits/confname.h
+#usr/include/bits/cpu-set.h
 #usr/include/bits/dirent.h
 #usr/include/bits/dlfcn.h
 #usr/include/bits/elfclass.h
@@ -101,15 +103,16 @@ usr/bin/locale
 #usr/include/bits/fcntl2.h
 #usr/include/bits/fenv.h
 #usr/include/bits/fenvinline.h
+#usr/include/bits/floatn-common.h
+#usr/include/bits/floatn.h
 #usr/include/bits/flt-eval-method.h
 #usr/include/bits/fp-fast.h
 #usr/include/bits/fp-logb.h
-#usr/include/bits/huge_val.h
-#usr/include/bits/huge_valf.h
-#usr/include/bits/huge_vall.h
+#usr/include/bits/getopt_core.h
+#usr/include/bits/getopt_ext.h
+#usr/include/bits/getopt_posix.h
 #usr/include/bits/hwcap.h
 #usr/include/bits/in.h
-#usr/include/bits/inf.h
 #usr/include/bits/initspin.h
 #usr/include/bits/inotify.h
 #usr/include/bits/ioctl-types.h
@@ -119,6 +122,7 @@ usr/bin/locale
 #usr/include/bits/iscanonical.h
 #usr/include/bits/libc-header-start.h
 #usr/include/bits/libio-ldbl.h
+#usr/include/bits/libio.h
 #usr/include/bits/libm-simd-decl-stubs.h
 #usr/include/bits/link.h
 #usr/include/bits/local_lim.h
@@ -126,16 +130,17 @@ usr/bin/locale
 #usr/include/bits/long-double.h
 #usr/include/bits/math-finite.h
 #usr/include/bits/math-vector.h
+#usr/include/bits/mathcalls-helper-functions.h
 #usr/include/bits/mathcalls.h
 #usr/include/bits/mathdef.h
 #usr/include/bits/mathinline.h
 #usr/include/bits/mman-linux.h
+#usr/include/bits/mman-shared.h
 #usr/include/bits/mman.h
 #usr/include/bits/monetary-ldbl.h
 #usr/include/bits/mqueue.h
 #usr/include/bits/mqueue2.h
 #usr/include/bits/msq.h
-#usr/include/bits/nan.h
 #usr/include/bits/netdb.h
 #usr/include/bits/param.h
 #usr/include/bits/poll.h
@@ -144,7 +149,9 @@ usr/bin/locale
 #usr/include/bits/posix2_lim.h
 #usr/include/bits/posix_opt.h
 #usr/include/bits/printf-ldbl.h
+#usr/include/bits/pthreadtypes-arch.h
 #usr/include/bits/pthreadtypes.h
+#usr/include/bits/ptrace-shared.h
 #usr/include/bits/resource.h
 #usr/include/bits/sched.h
 #usr/include/bits/select.h
@@ -156,20 +163,26 @@ usr/bin/locale
 #usr/include/bits/shm.h
 #usr/include/bits/sigaction.h
 #usr/include/bits/sigcontext.h
-#usr/include/bits/siginfo.h
+#usr/include/bits/sigevent-consts.h
+#usr/include/bits/siginfo-arch.h
+#usr/include/bits/siginfo-consts-arch.h
+#usr/include/bits/siginfo-consts.h
 #usr/include/bits/signalfd.h
+#usr/include/bits/signum-generic.h
 #usr/include/bits/signum.h
-#usr/include/bits/sigset.h
 #usr/include/bits/sigstack.h
 #usr/include/bits/sigthread.h
 #usr/include/bits/sockaddr.h
 #usr/include/bits/socket.h
 #usr/include/bits/socket2.h
 #usr/include/bits/socket_type.h
+#usr/include/bits/ss_flags.h
 #usr/include/bits/stab.def
 #usr/include/bits/stat.h
 #usr/include/bits/statfs.h
 #usr/include/bits/statvfs.h
+#usr/include/bits/stdint-intn.h
+#usr/include/bits/stdint-uintn.h
 #usr/include/bits/stdio-ldbl.h
 #usr/include/bits/stdio.h
 #usr/include/bits/stdio2.h
@@ -178,9 +191,7 @@ usr/bin/locale
 #usr/include/bits/stdlib-float.h
 #usr/include/bits/stdlib-ldbl.h
 #usr/include/bits/stdlib.h
-#usr/include/bits/string.h
-#usr/include/bits/string2.h
-#usr/include/bits/string3.h
+#usr/include/bits/string_fortified.h
 #usr/include/bits/strings_fortified.h
 #usr/include/bits/stropts.h
 #usr/include/bits/sys_errlist.h
@@ -191,23 +202,44 @@ usr/bin/locale
 #usr/include/bits/syslog.h
 #usr/include/bits/sysmacros.h
 #usr/include/bits/termios.h
+#usr/include/bits/thread-shared-types.h
 #usr/include/bits/time.h
 #usr/include/bits/timerfd.h
 #usr/include/bits/timex.h
 #usr/include/bits/types
 #usr/include/bits/types.h
+#usr/include/bits/types/FILE.h
+#usr/include/bits/types/__FILE.h
+#usr/include/bits/types/__locale_t.h
+#usr/include/bits/types/__mbstate_t.h
+#usr/include/bits/types/__sigset_t.h
+#usr/include/bits/types/__sigval_t.h
 #usr/include/bits/types/clock_t.h
 #usr/include/bits/types/clockid_t.h
+#usr/include/bits/types/locale_t.h
+#usr/include/bits/types/mbstate_t.h
+#usr/include/bits/types/res_state.h
+#usr/include/bits/types/sig_atomic_t.h
+#usr/include/bits/types/sigevent_t.h
+#usr/include/bits/types/siginfo_t.h
+#usr/include/bits/types/sigset_t.h
+#usr/include/bits/types/sigval_t.h
+#usr/include/bits/types/stack_t.h
+#usr/include/bits/types/struct_iovec.h
 #usr/include/bits/types/struct_itimerspec.h
 #usr/include/bits/types/struct_osockaddr.h
+#usr/include/bits/types/struct_rusage.h
+#usr/include/bits/types/struct_sigstack.h
 #usr/include/bits/types/struct_timespec.h
 #usr/include/bits/types/struct_timeval.h
 #usr/include/bits/types/struct_tm.h
 #usr/include/bits/types/time_t.h
 #usr/include/bits/types/timer_t.h
+#usr/include/bits/types/wint_t.h
 #usr/include/bits/typesizes.h
 #usr/include/bits/uintn-identity.h
-#usr/include/bits/uio.h
+#usr/include/bits/uio-ext.h
+#usr/include/bits/uio_lim.h
 #usr/include/bits/unistd.h
 #usr/include/bits/ustat.h
 #usr/include/bits/utmp.h
@@ -218,6 +250,7 @@ usr/bin/locale
 #usr/include/bits/wchar-ldbl.h
 #usr/include/bits/wchar.h
 #usr/include/bits/wchar2.h
+#usr/include/bits/wctype-wchar.h
 #usr/include/bits/wordsize.h
 #usr/include/bits/xopen_lim.h
 #usr/include/bits/xtitypes.h
@@ -491,7 +524,6 @@ usr/bin/locale
 #usr/include/sys/types.h
 #usr/include/sys/ucontext.h
 #usr/include/sys/uio.h
-#usr/include/sys/ultrasound.h
 #usr/include/sys/un.h
 #usr/include/sys/unistd.h
 #usr/include/sys/user.h
@@ -527,7 +559,6 @@ usr/bin/locale
 #usr/include/wchar.h
 #usr/include/wctype.h
 #usr/include/wordexp.h
-#usr/include/xlocale.h
 #usr/lib/Mcrt1.o
 #usr/lib/Scrt1.o
 #usr/lib/audit
@@ -680,6 +711,7 @@ usr/lib/gconv
 #usr/lib/gconv/IBM855.so
 #usr/lib/gconv/IBM856.so
 #usr/lib/gconv/IBM857.so
+#usr/lib/gconv/IBM858.so
 #usr/lib/gconv/IBM860.so
 #usr/lib/gconv/IBM861.so
 #usr/lib/gconv/IBM862.so
@@ -811,7 +843,6 @@ usr/lib/gconv
 #usr/lib/libdl.a
 #usr/lib/libdl.so
 #usr/lib/libg.a
-#usr/lib/libieee.a
 #usr/lib/libm.a
 #usr/lib/libm.so
 #usr/lib/libmcheck.a
@@ -934,6 +965,20 @@ usr/lib/locale
 #usr/lib/locale/af_ZA/LC_PAPER
 #usr/lib/locale/af_ZA/LC_TELEPHONE
 #usr/lib/locale/af_ZA/LC_TIME
+#usr/lib/locale/agr_PE
+#usr/lib/locale/agr_PE/LC_ADDRESS
+#usr/lib/locale/agr_PE/LC_COLLATE
+#usr/lib/locale/agr_PE/LC_CTYPE
+#usr/lib/locale/agr_PE/LC_IDENTIFICATION
+#usr/lib/locale/agr_PE/LC_MEASUREMENT
+#usr/lib/locale/agr_PE/LC_MESSAGES
+#usr/lib/locale/agr_PE/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/agr_PE/LC_MONETARY
+#usr/lib/locale/agr_PE/LC_NAME
+#usr/lib/locale/agr_PE/LC_NUMERIC
+#usr/lib/locale/agr_PE/LC_PAPER
+#usr/lib/locale/agr_PE/LC_TELEPHONE
+#usr/lib/locale/agr_PE/LC_TIME
 #usr/lib/locale/ak_GH
 #usr/lib/locale/ak_GH/LC_ADDRESS
 #usr/lib/locale/ak_GH/LC_COLLATE
@@ -1578,6 +1623,20 @@ usr/lib/locale
 #usr/lib/locale/az_AZ/LC_PAPER
 #usr/lib/locale/az_AZ/LC_TELEPHONE
 #usr/lib/locale/az_AZ/LC_TIME
+#usr/lib/locale/az_IR
+#usr/lib/locale/az_IR/LC_ADDRESS
+#usr/lib/locale/az_IR/LC_COLLATE
+#usr/lib/locale/az_IR/LC_CTYPE
+#usr/lib/locale/az_IR/LC_IDENTIFICATION
+#usr/lib/locale/az_IR/LC_MEASUREMENT
+#usr/lib/locale/az_IR/LC_MESSAGES
+#usr/lib/locale/az_IR/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/az_IR/LC_MONETARY
+#usr/lib/locale/az_IR/LC_NAME
+#usr/lib/locale/az_IR/LC_NUMERIC
+#usr/lib/locale/az_IR/LC_PAPER
+#usr/lib/locale/az_IR/LC_TELEPHONE
+#usr/lib/locale/az_IR/LC_TIME
 #usr/lib/locale/be_BY
 #usr/lib/locale/be_BY.utf8
 #usr/lib/locale/be_BY.utf8/LC_ADDRESS
@@ -1718,6 +1777,34 @@ usr/lib/locale
 #usr/lib/locale/bho_IN/LC_PAPER
 #usr/lib/locale/bho_IN/LC_TELEPHONE
 #usr/lib/locale/bho_IN/LC_TIME
+#usr/lib/locale/bho_NP
+#usr/lib/locale/bho_NP/LC_ADDRESS
+#usr/lib/locale/bho_NP/LC_COLLATE
+#usr/lib/locale/bho_NP/LC_CTYPE
+#usr/lib/locale/bho_NP/LC_IDENTIFICATION
+#usr/lib/locale/bho_NP/LC_MEASUREMENT
+#usr/lib/locale/bho_NP/LC_MESSAGES
+#usr/lib/locale/bho_NP/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/bho_NP/LC_MONETARY
+#usr/lib/locale/bho_NP/LC_NAME
+#usr/lib/locale/bho_NP/LC_NUMERIC
+#usr/lib/locale/bho_NP/LC_PAPER
+#usr/lib/locale/bho_NP/LC_TELEPHONE
+#usr/lib/locale/bho_NP/LC_TIME
+#usr/lib/locale/bi_VU
+#usr/lib/locale/bi_VU/LC_ADDRESS
+#usr/lib/locale/bi_VU/LC_COLLATE
+#usr/lib/locale/bi_VU/LC_CTYPE
+#usr/lib/locale/bi_VU/LC_IDENTIFICATION
+#usr/lib/locale/bi_VU/LC_MEASUREMENT
+#usr/lib/locale/bi_VU/LC_MESSAGES
+#usr/lib/locale/bi_VU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/bi_VU/LC_MONETARY
+#usr/lib/locale/bi_VU/LC_NAME
+#usr/lib/locale/bi_VU/LC_NUMERIC
+#usr/lib/locale/bi_VU/LC_PAPER
+#usr/lib/locale/bi_VU/LC_TELEPHONE
+#usr/lib/locale/bi_VU/LC_TIME
 #usr/lib/locale/bn_BD
 #usr/lib/locale/bn_BD/LC_ADDRESS
 #usr/lib/locale/bn_BD/LC_COLLATE
@@ -1942,6 +2029,20 @@ usr/lib/locale
 #usr/lib/locale/ca_ES@euro/LC_PAPER
 #usr/lib/locale/ca_ES@euro/LC_TELEPHONE
 #usr/lib/locale/ca_ES@euro/LC_TIME
+#usr/lib/locale/ca_ES@valencia
+#usr/lib/locale/ca_ES@valencia/LC_ADDRESS
+#usr/lib/locale/ca_ES@valencia/LC_COLLATE
+#usr/lib/locale/ca_ES@valencia/LC_CTYPE
+#usr/lib/locale/ca_ES@valencia/LC_IDENTIFICATION
+#usr/lib/locale/ca_ES@valencia/LC_MEASUREMENT
+#usr/lib/locale/ca_ES@valencia/LC_MESSAGES
+#usr/lib/locale/ca_ES@valencia/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/ca_ES@valencia/LC_MONETARY
+#usr/lib/locale/ca_ES@valencia/LC_NAME
+#usr/lib/locale/ca_ES@valencia/LC_NUMERIC
+#usr/lib/locale/ca_ES@valencia/LC_PAPER
+#usr/lib/locale/ca_ES@valencia/LC_TELEPHONE
+#usr/lib/locale/ca_ES@valencia/LC_TIME
 #usr/lib/locale/ca_FR
 #usr/lib/locale/ca_FR.utf8
 #usr/lib/locale/ca_FR.utf8/LC_ADDRESS
@@ -2502,6 +2603,20 @@ usr/lib/locale
 #usr/lib/locale/el_GR/LC_PAPER
 #usr/lib/locale/el_GR/LC_TELEPHONE
 #usr/lib/locale/el_GR/LC_TIME
+#usr/lib/locale/el_GR@euro
+#usr/lib/locale/el_GR@euro/LC_ADDRESS
+#usr/lib/locale/el_GR@euro/LC_COLLATE
+#usr/lib/locale/el_GR@euro/LC_CTYPE
+#usr/lib/locale/el_GR@euro/LC_IDENTIFICATION
+#usr/lib/locale/el_GR@euro/LC_MEASUREMENT
+#usr/lib/locale/el_GR@euro/LC_MESSAGES
+#usr/lib/locale/el_GR@euro/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/el_GR@euro/LC_MONETARY
+#usr/lib/locale/el_GR@euro/LC_NAME
+#usr/lib/locale/el_GR@euro/LC_NUMERIC
+#usr/lib/locale/el_GR@euro/LC_PAPER
+#usr/lib/locale/el_GR@euro/LC_TELEPHONE
+#usr/lib/locale/el_GR@euro/LC_TIME
 #usr/lib/locale/en_AG
 #usr/lib/locale/en_AG/LC_ADDRESS
 #usr/lib/locale/en_AG/LC_COLLATE
@@ -2824,6 +2939,20 @@ usr/lib/locale
 #usr/lib/locale/en_PH/LC_PAPER
 #usr/lib/locale/en_PH/LC_TELEPHONE
 #usr/lib/locale/en_PH/LC_TIME
+#usr/lib/locale/en_SC.utf8
+#usr/lib/locale/en_SC.utf8/LC_ADDRESS
+#usr/lib/locale/en_SC.utf8/LC_COLLATE
+#usr/lib/locale/en_SC.utf8/LC_CTYPE
+#usr/lib/locale/en_SC.utf8/LC_IDENTIFICATION
+#usr/lib/locale/en_SC.utf8/LC_MEASUREMENT
+#usr/lib/locale/en_SC.utf8/LC_MESSAGES
+#usr/lib/locale/en_SC.utf8/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/en_SC.utf8/LC_MONETARY
+#usr/lib/locale/en_SC.utf8/LC_NAME
+#usr/lib/locale/en_SC.utf8/LC_NUMERIC
+#usr/lib/locale/en_SC.utf8/LC_PAPER
+#usr/lib/locale/en_SC.utf8/LC_TELEPHONE
+#usr/lib/locale/en_SC.utf8/LC_TIME
 #usr/lib/locale/en_SG
 #usr/lib/locale/en_SG.utf8
 #usr/lib/locale/en_SG.utf8/LC_ADDRESS
@@ -4252,6 +4381,20 @@ usr/lib/locale
 #usr/lib/locale/hi_IN/LC_PAPER
 #usr/lib/locale/hi_IN/LC_TELEPHONE
 #usr/lib/locale/hi_IN/LC_TIME
+#usr/lib/locale/hif_FJ
+#usr/lib/locale/hif_FJ/LC_ADDRESS
+#usr/lib/locale/hif_FJ/LC_COLLATE
+#usr/lib/locale/hif_FJ/LC_CTYPE
+#usr/lib/locale/hif_FJ/LC_IDENTIFICATION
+#usr/lib/locale/hif_FJ/LC_MEASUREMENT
+#usr/lib/locale/hif_FJ/LC_MESSAGES
+#usr/lib/locale/hif_FJ/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/hif_FJ/LC_MONETARY
+#usr/lib/locale/hif_FJ/LC_NAME
+#usr/lib/locale/hif_FJ/LC_NUMERIC
+#usr/lib/locale/hif_FJ/LC_PAPER
+#usr/lib/locale/hif_FJ/LC_TELEPHONE
+#usr/lib/locale/hif_FJ/LC_TIME
 #usr/lib/locale/hne_IN
 #usr/lib/locale/hne_IN/LC_ADDRESS
 #usr/lib/locale/hne_IN/LC_COLLATE
@@ -4630,6 +4773,20 @@ usr/lib/locale
 #usr/lib/locale/ka_GE/LC_PAPER
 #usr/lib/locale/ka_GE/LC_TELEPHONE
 #usr/lib/locale/ka_GE/LC_TIME
+#usr/lib/locale/kab_DZ
+#usr/lib/locale/kab_DZ/LC_ADDRESS
+#usr/lib/locale/kab_DZ/LC_COLLATE
+#usr/lib/locale/kab_DZ/LC_CTYPE
+#usr/lib/locale/kab_DZ/LC_IDENTIFICATION
+#usr/lib/locale/kab_DZ/LC_MEASUREMENT
+#usr/lib/locale/kab_DZ/LC_MESSAGES
+#usr/lib/locale/kab_DZ/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/kab_DZ/LC_MONETARY
+#usr/lib/locale/kab_DZ/LC_NAME
+#usr/lib/locale/kab_DZ/LC_NUMERIC
+#usr/lib/locale/kab_DZ/LC_PAPER
+#usr/lib/locale/kab_DZ/LC_TELEPHONE
+#usr/lib/locale/kab_DZ/LC_TIME
 #usr/lib/locale/kk_KZ
 #usr/lib/locale/kk_KZ.utf8
 #usr/lib/locale/kk_KZ.utf8/LC_ADDRESS
@@ -5064,6 +5221,34 @@ usr/lib/locale
 #usr/lib/locale/mai_IN/LC_PAPER
 #usr/lib/locale/mai_IN/LC_TELEPHONE
 #usr/lib/locale/mai_IN/LC_TIME
+#usr/lib/locale/mai_NP
+#usr/lib/locale/mai_NP/LC_ADDRESS
+#usr/lib/locale/mai_NP/LC_COLLATE
+#usr/lib/locale/mai_NP/LC_CTYPE
+#usr/lib/locale/mai_NP/LC_IDENTIFICATION
+#usr/lib/locale/mai_NP/LC_MEASUREMENT
+#usr/lib/locale/mai_NP/LC_MESSAGES
+#usr/lib/locale/mai_NP/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/mai_NP/LC_MONETARY
+#usr/lib/locale/mai_NP/LC_NAME
+#usr/lib/locale/mai_NP/LC_NUMERIC
+#usr/lib/locale/mai_NP/LC_PAPER
+#usr/lib/locale/mai_NP/LC_TELEPHONE
+#usr/lib/locale/mai_NP/LC_TIME
+#usr/lib/locale/mfe_MU
+#usr/lib/locale/mfe_MU/LC_ADDRESS
+#usr/lib/locale/mfe_MU/LC_COLLATE
+#usr/lib/locale/mfe_MU/LC_CTYPE
+#usr/lib/locale/mfe_MU/LC_IDENTIFICATION
+#usr/lib/locale/mfe_MU/LC_MEASUREMENT
+#usr/lib/locale/mfe_MU/LC_MESSAGES
+#usr/lib/locale/mfe_MU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/mfe_MU/LC_MONETARY
+#usr/lib/locale/mfe_MU/LC_NAME
+#usr/lib/locale/mfe_MU/LC_NUMERIC
+#usr/lib/locale/mfe_MU/LC_PAPER
+#usr/lib/locale/mfe_MU/LC_TELEPHONE
+#usr/lib/locale/mfe_MU/LC_TIME
 #usr/lib/locale/mg_MG
 #usr/lib/locale/mg_MG.utf8
 #usr/lib/locale/mg_MG.utf8/LC_ADDRESS
@@ -5134,6 +5319,34 @@ usr/lib/locale
 #usr/lib/locale/mi_NZ/LC_PAPER
 #usr/lib/locale/mi_NZ/LC_TELEPHONE
 #usr/lib/locale/mi_NZ/LC_TIME
+#usr/lib/locale/miq_NI
+#usr/lib/locale/miq_NI/LC_ADDRESS
+#usr/lib/locale/miq_NI/LC_COLLATE
+#usr/lib/locale/miq_NI/LC_CTYPE
+#usr/lib/locale/miq_NI/LC_IDENTIFICATION
+#usr/lib/locale/miq_NI/LC_MEASUREMENT
+#usr/lib/locale/miq_NI/LC_MESSAGES
+#usr/lib/locale/miq_NI/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/miq_NI/LC_MONETARY
+#usr/lib/locale/miq_NI/LC_NAME
+#usr/lib/locale/miq_NI/LC_NUMERIC
+#usr/lib/locale/miq_NI/LC_PAPER
+#usr/lib/locale/miq_NI/LC_TELEPHONE
+#usr/lib/locale/miq_NI/LC_TIME
+#usr/lib/locale/mjw_IN
+#usr/lib/locale/mjw_IN/LC_ADDRESS
+#usr/lib/locale/mjw_IN/LC_COLLATE
+#usr/lib/locale/mjw_IN/LC_CTYPE
+#usr/lib/locale/mjw_IN/LC_IDENTIFICATION
+#usr/lib/locale/mjw_IN/LC_MEASUREMENT
+#usr/lib/locale/mjw_IN/LC_MESSAGES
+#usr/lib/locale/mjw_IN/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/mjw_IN/LC_MONETARY
+#usr/lib/locale/mjw_IN/LC_NAME
+#usr/lib/locale/mjw_IN/LC_NUMERIC
+#usr/lib/locale/mjw_IN/LC_PAPER
+#usr/lib/locale/mjw_IN/LC_TELEPHONE
+#usr/lib/locale/mjw_IN/LC_TIME
 #usr/lib/locale/mk_MK
 #usr/lib/locale/mk_MK.utf8
 #usr/lib/locale/mk_MK.utf8/LC_ADDRESS
@@ -6086,6 +6299,20 @@ usr/lib/locale
 #usr/lib/locale/sgs_LT/LC_PAPER
 #usr/lib/locale/sgs_LT/LC_TELEPHONE
 #usr/lib/locale/sgs_LT/LC_TIME
+#usr/lib/locale/shn_MM
+#usr/lib/locale/shn_MM/LC_ADDRESS
+#usr/lib/locale/shn_MM/LC_COLLATE
+#usr/lib/locale/shn_MM/LC_CTYPE
+#usr/lib/locale/shn_MM/LC_IDENTIFICATION
+#usr/lib/locale/shn_MM/LC_MEASUREMENT
+#usr/lib/locale/shn_MM/LC_MESSAGES
+#usr/lib/locale/shn_MM/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/shn_MM/LC_MONETARY
+#usr/lib/locale/shn_MM/LC_NAME
+#usr/lib/locale/shn_MM/LC_NUMERIC
+#usr/lib/locale/shn_MM/LC_PAPER
+#usr/lib/locale/shn_MM/LC_TELEPHONE
+#usr/lib/locale/shn_MM/LC_TIME
 #usr/lib/locale/shs_CA
 #usr/lib/locale/shs_CA/LC_ADDRESS
 #usr/lib/locale/shs_CA/LC_COLLATE
@@ -6184,6 +6411,20 @@ usr/lib/locale
 #usr/lib/locale/sl_SI/LC_PAPER
 #usr/lib/locale/sl_SI/LC_TELEPHONE
 #usr/lib/locale/sl_SI/LC_TIME
+#usr/lib/locale/sm_WS
+#usr/lib/locale/sm_WS/LC_ADDRESS
+#usr/lib/locale/sm_WS/LC_COLLATE
+#usr/lib/locale/sm_WS/LC_CTYPE
+#usr/lib/locale/sm_WS/LC_IDENTIFICATION
+#usr/lib/locale/sm_WS/LC_MEASUREMENT
+#usr/lib/locale/sm_WS/LC_MESSAGES
+#usr/lib/locale/sm_WS/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/sm_WS/LC_MONETARY
+#usr/lib/locale/sm_WS/LC_NAME
+#usr/lib/locale/sm_WS/LC_NUMERIC
+#usr/lib/locale/sm_WS/LC_PAPER
+#usr/lib/locale/sm_WS/LC_TELEPHONE
+#usr/lib/locale/sm_WS/LC_TIME
 #usr/lib/locale/so_DJ
 #usr/lib/locale/so_DJ.utf8
 #usr/lib/locale/so_DJ.utf8/LC_ADDRESS
@@ -6744,6 +6985,34 @@ usr/lib/locale
 #usr/lib/locale/tn_ZA/LC_PAPER
 #usr/lib/locale/tn_ZA/LC_TELEPHONE
 #usr/lib/locale/tn_ZA/LC_TIME
+#usr/lib/locale/to_TO
+#usr/lib/locale/to_TO/LC_ADDRESS
+#usr/lib/locale/to_TO/LC_COLLATE
+#usr/lib/locale/to_TO/LC_CTYPE
+#usr/lib/locale/to_TO/LC_IDENTIFICATION
+#usr/lib/locale/to_TO/LC_MEASUREMENT
+#usr/lib/locale/to_TO/LC_MESSAGES
+#usr/lib/locale/to_TO/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/to_TO/LC_MONETARY
+#usr/lib/locale/to_TO/LC_NAME
+#usr/lib/locale/to_TO/LC_NUMERIC
+#usr/lib/locale/to_TO/LC_PAPER
+#usr/lib/locale/to_TO/LC_TELEPHONE
+#usr/lib/locale/to_TO/LC_TIME
+#usr/lib/locale/tpi_PG
+#usr/lib/locale/tpi_PG/LC_ADDRESS
+#usr/lib/locale/tpi_PG/LC_COLLATE
+#usr/lib/locale/tpi_PG/LC_CTYPE
+#usr/lib/locale/tpi_PG/LC_IDENTIFICATION
+#usr/lib/locale/tpi_PG/LC_MEASUREMENT
+#usr/lib/locale/tpi_PG/LC_MESSAGES
+#usr/lib/locale/tpi_PG/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/tpi_PG/LC_MONETARY
+#usr/lib/locale/tpi_PG/LC_NAME
+#usr/lib/locale/tpi_PG/LC_NUMERIC
+#usr/lib/locale/tpi_PG/LC_PAPER
+#usr/lib/locale/tpi_PG/LC_TELEPHONE
+#usr/lib/locale/tpi_PG/LC_TIME
 #usr/lib/locale/tr_CY
 #usr/lib/locale/tr_CY.utf8
 #usr/lib/locale/tr_CY.utf8/LC_ADDRESS
@@ -7164,6 +7433,20 @@ usr/lib/locale
 #usr/lib/locale/yue_HK/LC_PAPER
 #usr/lib/locale/yue_HK/LC_TELEPHONE
 #usr/lib/locale/yue_HK/LC_TIME
+#usr/lib/locale/yuw_PG
+#usr/lib/locale/yuw_PG/LC_ADDRESS
+#usr/lib/locale/yuw_PG/LC_COLLATE
+#usr/lib/locale/yuw_PG/LC_CTYPE
+#usr/lib/locale/yuw_PG/LC_IDENTIFICATION
+#usr/lib/locale/yuw_PG/LC_MEASUREMENT
+#usr/lib/locale/yuw_PG/LC_MESSAGES
+#usr/lib/locale/yuw_PG/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/yuw_PG/LC_MONETARY
+#usr/lib/locale/yuw_PG/LC_NAME
+#usr/lib/locale/yuw_PG/LC_NUMERIC
+#usr/lib/locale/yuw_PG/LC_PAPER
+#usr/lib/locale/yuw_PG/LC_TELEPHONE
+#usr/lib/locale/yuw_PG/LC_TIME
 #usr/lib/locale/zh_CN
 #usr/lib/locale/zh_CN.gb18030
 #usr/lib/locale/zh_CN.gb18030/LC_ADDRESS
@@ -7478,6 +7761,7 @@ usr/lib/locale
 #usr/share/i18n/charmaps/IBM855.gz
 #usr/share/i18n/charmaps/IBM856.gz
 #usr/share/i18n/charmaps/IBM857.gz
+#usr/share/i18n/charmaps/IBM858.gz
 #usr/share/i18n/charmaps/IBM860.gz
 #usr/share/i18n/charmaps/IBM861.gz
 #usr/share/i18n/charmaps/IBM862.gz
@@ -7605,6 +7889,7 @@ usr/lib/locale
 #usr/share/i18n/locales/aa_ER@saaho
 #usr/share/i18n/locales/aa_ET
 #usr/share/i18n/locales/af_ZA
+#usr/share/i18n/locales/agr_PE
 #usr/share/i18n/locales/ak_GH
 #usr/share/i18n/locales/am_ET
 #usr/share/i18n/locales/an_ES
@@ -7632,6 +7917,7 @@ usr/lib/locale
 #usr/share/i18n/locales/ast_ES
 #usr/share/i18n/locales/ayc_PE
 #usr/share/i18n/locales/az_AZ
+#usr/share/i18n/locales/az_IR
 #usr/share/i18n/locales/be_BY
 #usr/share/i18n/locales/be_BY@latin
 #usr/share/i18n/locales/bem_ZM
@@ -7640,6 +7926,8 @@ usr/lib/locale
 #usr/share/i18n/locales/bg_BG
 #usr/share/i18n/locales/bhb_IN
 #usr/share/i18n/locales/bho_IN
+#usr/share/i18n/locales/bho_NP
+#usr/share/i18n/locales/bi_VU
 #usr/share/i18n/locales/bn_BD
 #usr/share/i18n/locales/bn_IN
 #usr/share/i18n/locales/bo_CN
@@ -7652,11 +7940,13 @@ usr/lib/locale
 #usr/share/i18n/locales/ca_AD
 #usr/share/i18n/locales/ca_ES
 #usr/share/i18n/locales/ca_ES@euro
+#usr/share/i18n/locales/ca_ES@valencia
 #usr/share/i18n/locales/ca_FR
 #usr/share/i18n/locales/ca_IT
 #usr/share/i18n/locales/ce_RU
 #usr/share/i18n/locales/chr_US
 #usr/share/i18n/locales/cmn_TW
+#usr/share/i18n/locales/cns11643_stroke
 #usr/share/i18n/locales/crh_UA
 #usr/share/i18n/locales/cs_CZ
 #usr/share/i18n/locales/csb_PL
@@ -7694,6 +7984,7 @@ usr/lib/locale
 #usr/share/i18n/locales/en_NG
 #usr/share/i18n/locales/en_NZ
 #usr/share/i18n/locales/en_PH
+#usr/share/i18n/locales/en_SC
 #usr/share/i18n/locales/en_SG
 #usr/share/i18n/locales/en_US
 #usr/share/i18n/locales/en_ZA
@@ -7757,6 +8048,7 @@ usr/lib/locale
 #usr/share/i18n/locales/hak_TW
 #usr/share/i18n/locales/he_IL
 #usr/share/i18n/locales/hi_IN
+#usr/share/i18n/locales/hif_FJ
 #usr/share/i18n/locales/hne_IN
 #usr/share/i18n/locales/hr_HR
 #usr/share/i18n/locales/hsb_DE
@@ -7764,6 +8056,7 @@ usr/lib/locale
 #usr/share/i18n/locales/hu_HU
 #usr/share/i18n/locales/hy_AM
 #usr/share/i18n/locales/i18n
+#usr/share/i18n/locales/i18n_ctype
 #usr/share/i18n/locales/ia_FR
 #usr/share/i18n/locales/id_ID
 #usr/share/i18n/locales/ig_NG
@@ -7778,6 +8071,7 @@ usr/lib/locale
 #usr/share/i18n/locales/iu_CA
 #usr/share/i18n/locales/ja_JP
 #usr/share/i18n/locales/ka_GE
+#usr/share/i18n/locales/kab_DZ
 #usr/share/i18n/locales/kk_KZ
 #usr/share/i18n/locales/kl_GL
 #usr/share/i18n/locales/km_KH
@@ -7801,9 +8095,13 @@ usr/lib/locale
 #usr/share/i18n/locales/lzh_TW
 #usr/share/i18n/locales/mag_IN
 #usr/share/i18n/locales/mai_IN
+#usr/share/i18n/locales/mai_NP
+#usr/share/i18n/locales/mfe_MU
 #usr/share/i18n/locales/mg_MG
 #usr/share/i18n/locales/mhr_RU
 #usr/share/i18n/locales/mi_NZ
+#usr/share/i18n/locales/miq_NI
+#usr/share/i18n/locales/mjw_IN
 #usr/share/i18n/locales/mk_MK
 #usr/share/i18n/locales/ml_IN
 #usr/share/i18n/locales/mn_MN
@@ -7856,11 +8154,13 @@ usr/lib/locale
 #usr/share/i18n/locales/sd_IN@devanagari
 #usr/share/i18n/locales/se_NO
 #usr/share/i18n/locales/sgs_LT
+#usr/share/i18n/locales/shn_MM
 #usr/share/i18n/locales/shs_CA
 #usr/share/i18n/locales/si_LK
 #usr/share/i18n/locales/sid_ET
 #usr/share/i18n/locales/sk_SK
 #usr/share/i18n/locales/sl_SI
+#usr/share/i18n/locales/sm_WS
 #usr/share/i18n/locales/so_DJ
 #usr/share/i18n/locales/so_ET
 #usr/share/i18n/locales/so_KE
@@ -7891,6 +8191,8 @@ usr/lib/locale
 #usr/share/i18n/locales/tk_TM
 #usr/share/i18n/locales/tl_PH
 #usr/share/i18n/locales/tn_ZA
+#usr/share/i18n/locales/to_TO
+#usr/share/i18n/locales/tpi_PG
 #usr/share/i18n/locales/tr_CY
 #usr/share/i18n/locales/tr_TR
 #usr/share/i18n/locales/translit_circle
@@ -7926,6 +8228,7 @@ usr/lib/locale
 #usr/share/i18n/locales/yi_US
 #usr/share/i18n/locales/yo_NG
 #usr/share/i18n/locales/yue_HK
+#usr/share/i18n/locales/yuw_PG
 #usr/share/i18n/locales/zh_CN
 #usr/share/i18n/locales/zh_HK
 #usr/share/i18n/locales/zh_SG
@@ -7940,6 +8243,8 @@ usr/lib/locale
 #usr/share/info/libc.info-13
 #usr/share/info/libc.info-14
 #usr/share/info/libc.info-15
+#usr/share/info/libc.info-16
+#usr/share/info/libc.info-17
 #usr/share/info/libc.info-2
 #usr/share/info/libc.info-3
 #usr/share/info/libc.info-4
diff --git a/config/rootfiles/common/i586/initscripts b/config/rootfiles/common/i586/initscripts
index 67e495c4a..5463f675d 100644
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -23,7 +23,6 @@ etc/rc.d/init.d/halt
 etc/rc.d/init.d/ipsec
 etc/rc.d/init.d/leds
 etc/rc.d/init.d/localnet
-etc/rc.d/init.d/mISDN
 etc/rc.d/init.d/modules
 etc/rc.d/init.d/mountfs
 etc/rc.d/init.d/mountkernfs
diff --git a/config/rootfiles/common/iproute2 b/config/rootfiles/common/iproute2
index 2339d8320..afa30467f 100644
--- a/config/rootfiles/common/iproute2
+++ b/config/rootfiles/common/iproute2
@@ -24,6 +24,8 @@ sbin/rtpr
 sbin/rtstat
 sbin/ss
 sbin/tc
+#usr/include/iproute2
+#usr/include/iproute2/bpf_elf.h
 #usr/lib/tc
 #usr/lib/tc/experimental.dist
 #usr/lib/tc/normal.dist
@@ -34,9 +36,6 @@ sbin/tc
 #usr/share/bash-completion/completions
 usr/share/bash-completion/completions/tc
 #usr/share/doc/iproute2
-#usr/share/doc/iproute2/SNAPSHOT.tex
-#usr/share/doc/iproute2/api-ip6-flowlabels.tex
-#usr/share/doc/iproute2/arpd.sgml
 #usr/share/doc/iproute2/examples
 #usr/share/doc/iproute2/examples/README.cbq
 #usr/share/doc/iproute2/examples/README.iproute2+tc
@@ -58,15 +57,9 @@ usr/share/bash-completion/completions/tc
 #usr/share/doc/iproute2/examples/diffserv/efcbq
 #usr/share/doc/iproute2/examples/diffserv/regression-testing
 #usr/share/doc/iproute2/examples/gaiconf
-#usr/share/doc/iproute2/ip-cref.tex
-#usr/share/doc/iproute2/ip-tunnels.tex
-#usr/share/doc/iproute2/nstat.sgml
-#usr/share/doc/iproute2/preamble.tex
-#usr/share/doc/iproute2/rtstat.sgml
-#usr/share/doc/iproute2/ss.sgml
-#usr/share/doc/iproute2/tc-filters.tex
 #usr/share/man/man3/libnetlink.3
 #usr/share/man/man7/tc-hfsc.7
+#usr/share/man/man8/arpd.8
 #usr/share/man/man8/bridge.8
 #usr/share/man/man8/ctstat.8
 #usr/share/man/man8/devlink-dev.8
@@ -74,6 +67,9 @@ usr/share/bash-completion/completions/tc
 #usr/share/man/man8/devlink-port.8
 #usr/share/man/man8/devlink-sb.8
 #usr/share/man/man8/devlink.8
+#usr/share/man/man8/genl.8
+#usr/share/man/man8/ifcfg.8
+#usr/share/man/man8/ifstat.8
 #usr/share/man/man8/ip-address.8
 #usr/share/man/man8/ip-addrlabel.8
 #usr/share/man/man8/ip-fou.8
@@ -90,13 +86,18 @@ usr/share/bash-completion/completions/tc
 #usr/share/man/man8/ip-ntable.8
 #usr/share/man/man8/ip-route.8
 #usr/share/man/man8/ip-rule.8
+#usr/share/man/man8/ip-sr.8
 #usr/share/man/man8/ip-tcp_metrics.8
 #usr/share/man/man8/ip-token.8
 #usr/share/man/man8/ip-tunnel.8
+#usr/share/man/man8/ip-vrf.8
 #usr/share/man/man8/ip-xfrm.8
 #usr/share/man/man8/ip.8
 #usr/share/man/man8/lnstat.8
 #usr/share/man/man8/nstat.8
+#usr/share/man/man8/rdma-dev.8
+#usr/share/man/man8/rdma-link.8
+#usr/share/man/man8/rdma.8
 #usr/share/man/man8/routef.8
 #usr/share/man/man8/routel.8
 #usr/share/man/man8/rtacct.8
@@ -104,6 +105,7 @@ usr/share/bash-completion/completions/tc
 #usr/share/man/man8/rtpr.8
 #usr/share/man/man8/rtstat.8
 #usr/share/man/man8/ss.8
+#usr/share/man/man8/tc-actions.8
 #usr/share/man/man8/tc-basic.8
 #usr/share/man/man8/tc-bfifo.8
 #usr/share/man/man8/tc-bpf.8
@@ -123,6 +125,8 @@ usr/share/bash-completion/completions/tc
 #usr/share/man/man8/tc-fw.8
 #usr/share/man/man8/tc-hfsc.8
 #usr/share/man/man8/tc-htb.8
+#usr/share/man/man8/tc-ife.8
+#usr/share/man/man8/tc-matchall.8
 #usr/share/man/man8/tc-mirred.8
 #usr/share/man/man8/tc-mqprio.8
 #usr/share/man/man8/tc-nat.8
@@ -135,13 +139,16 @@ usr/share/bash-completion/completions/tc
 #usr/share/man/man8/tc-prio.8
 #usr/share/man/man8/tc-red.8
 #usr/share/man/man8/tc-route.8
+#usr/share/man/man8/tc-sample.8
 #usr/share/man/man8/tc-sfb.8
 #usr/share/man/man8/tc-sfq.8
 #usr/share/man/man8/tc-simple.8
 #usr/share/man/man8/tc-skbedit.8
+#usr/share/man/man8/tc-skbmod.8
 #usr/share/man/man8/tc-stab.8
 #usr/share/man/man8/tc-tbf.8
 #usr/share/man/man8/tc-tcindex.8
+#usr/share/man/man8/tc-tunnel_key.8
 #usr/share/man/man8/tc-u32.8
 #usr/share/man/man8/tc-vlan.8
 #usr/share/man/man8/tc-xt.8
@@ -151,5 +158,7 @@ usr/share/bash-completion/completions/tc
 #usr/share/man/man8/tipc-media.8
 #usr/share/man/man8/tipc-nametable.8
 #usr/share/man/man8/tipc-node.8
+#usr/share/man/man8/tipc-peer.8
 #usr/share/man/man8/tipc-socket.8
 #usr/share/man/man8/tipc.8
+#var/lib/arpd
diff --git a/config/rootfiles/common/libevent2-compat b/config/rootfiles/common/libevent2-compat
deleted file mode 100644
index edeb449e2..000000000
--- a/config/rootfiles/common/libevent2-compat
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/lib/libevent-2.0.so.5
-usr/lib/libevent-2.0.so.5.1.9
-usr/lib/libevent_core-2.0.so.5
-usr/lib/libevent_core-2.0.so.5.1.9
-usr/lib/libevent_extra-2.0.so.5
-usr/lib/libevent_extra-2.0.so.5.1.9
-usr/lib/libevent_openssl-2.0.so.5
-usr/lib/libevent_openssl-2.0.so.5.1.9
-usr/lib/libevent_pthreads-2.0.so.5
-usr/lib/libevent_pthreads-2.0.so.5.1.9
diff --git a/config/rootfiles/common/mISDNuser b/config/rootfiles/common/mISDNuser
deleted file mode 100644
index 9c424c4a5..000000000
--- a/config/rootfiles/common/mISDNuser
+++ /dev/null
@@ -1,26 +0,0 @@
-usr/bin/isdn_text2wireshark
-usr/bin/l1oipctrl
-usr/bin/misdn_E1test
-usr/bin/misdn_bridge
-usr/bin/misdn_info
-usr/bin/misdn_log
-#usr/etc
-#usr/etc/udev
-#usr/etc/udev/rules.d
-#usr/etc/udev/rules.d/45-misdn.rules
-#usr/include/mISDN
-#usr/include/mISDN/l3dss1.h
-#usr/include/mISDN/mISDNcompat.h
-#usr/include/mISDN/mISDNif.h
-#usr/include/mISDN/mbuffer.h
-#usr/include/mISDN/mlayer3.h
-#usr/include/mISDN/q931.h
-#usr/include/mISDN/suppserv.h
-#usr/lib/libmisdn.a
-#usr/lib/libmisdn.la
-usr/lib/libmisdn.so
-usr/lib/libmisdn.so.1
-usr/lib/libmisdn.so.1.0.0
-usr/sbin/misdn_cleanl2
-usr/sbin/misdn_rename
-etc/rc.d/init.d/mISDN
diff --git a/config/rootfiles/common/mysql-libs b/config/rootfiles/common/mysql-libs
deleted file mode 100644
index 6eb0384e7..000000000
--- a/config/rootfiles/common/mysql-libs
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/lib/libmysqlclient.so.15
-usr/lib/libmysqlclient.so.15.0.0
-usr/lib/libmysqlclient_r.so.15
-usr/lib/libmysqlclient_r.so.15.0.0
-usr/lib/mysql/libmysqlclient.so
-usr/lib/mysql/libmysqlclient.so.15
-usr/lib/mysql/libmysqlclient.so.15.0.0
-usr/lib/mysql/libmysqlclient_r.so
-usr/lib/mysql/libmysqlclient_r.so.15
-usr/lib/mysql/libmysqlclient_r.so.15.0.0
diff --git a/config/rootfiles/common/pam b/config/rootfiles/common/pam
index 3335a544a..0ca320f8f 100644
--- a/config/rootfiles/common/pam
+++ b/config/rootfiles/common/pam
@@ -1,11 +1,5 @@
 #etc/environment
 etc/pam.d
-#etc/pam.d/ftp
-#etc/pam.d/imap
-#etc/pam.d/other
-#etc/pam.d/pop
-#etc/pam.d/sieve
-#etc/pam.d/smtp
 etc/security
 #etc/security/access.conf
 #etc/security/group.conf
@@ -16,13 +10,8 @@ etc/security
 #etc/security/namespace.init
 #etc/security/pam_env.conf
 #etc/security/time.conf
-lib/libpam.so.0
-lib/libpam.so.0.81.10
-lib/libpam_misc.so.0
-lib/libpam_misc.so.0.81.3
-lib/libpamc.so.0
-lib/libpamc.so.0.81.0
 #lib/security
+#lib/security/mkhomedir_helper
 #lib/security/pam_access.la
 lib/security/pam_access.so
 #lib/security/pam_debug.la
@@ -71,6 +60,8 @@ lib/security/pam_mail.so
 lib/security/pam_nologin.so
 #lib/security/pam_permit.la
 lib/security/pam_permit.so
+#lib/security/pam_pwhistory.la
+lib/security/pam_pwhistory.so
 #lib/security/pam_rhosts.la
 lib/security/pam_rhosts.so
 #lib/security/pam_rootok.la
@@ -83,10 +74,17 @@ lib/security/pam_shells.so
 #lib/security/pam_stress.so
 #lib/security/pam_succeed_if.la
 #lib/security/pam_succeed_if.so
+#lib/security/pam_tally
 #lib/security/pam_tally.la
 #lib/security/pam_tally.so
+#lib/security/pam_tally2
+#lib/security/pam_tally2.la
+#lib/security/pam_tally2.so
 #lib/security/pam_time.la
 #lib/security/pam_time.so
+#lib/security/pam_timestamp.la
+#lib/security/pam_timestamp.so
+#lib/security/pam_timestamp_check
 #lib/security/pam_umask.la
 #lib/security/pam_umask.so
 #lib/security/pam_unix.la
@@ -101,7 +99,6 @@ lib/security/pam_unix.so
 #lib/security/pam_xauth.so
 lib/security/unix_chkpwd
 lib/security/unix_update
-#sbin/pam_tally
 #usr/include/security
 #usr/include/security/_pam_compat.h
 #usr/include/security/_pam_macros.h
@@ -114,11 +111,17 @@ lib/security/unix_update
 #usr/include/security/pam_modules.h
 #usr/include/security/pam_modutil.h
 #usr/lib/libpam.la
-usr/lib/libpam.so
+#usr/lib/libpam.so
+usr/lib/libpam.so.0
+usr/lib/libpam.so.0.84.2
 #usr/lib/libpam_misc.la
-usr/lib/libpam_misc.so
+#usr/lib/libpam_misc.so
+usr/lib/libpam_misc.so.0
+usr/lib/libpam_misc.so.0.82.1
 #usr/lib/libpamc.la
-usr/lib/libpamc.so
+#usr/lib/libpamc.so
+usr/lib/libpamc.so.0
+usr/lib/libpamc.so.0.82.1
 #usr/share/doc/Linux-PAM
 #usr/share/doc/Linux-PAM/draft-morgan-pam-current.txt
 #usr/share/doc/Linux-PAM/index.html
@@ -133,6 +136,9 @@ usr/lib/libpamc.so
 #usr/share/man/man3/pam_end.3
 #usr/share/man/man3/pam_error.3
 #usr/share/man/man3/pam_fail_delay.3
+#usr/share/man/man3/pam_get_authtok.3
+#usr/share/man/man3/pam_get_authtok_noverify.3
+#usr/share/man/man3/pam_get_authtok_verify.3
 #usr/share/man/man3/pam_get_data.3
 #usr/share/man/man3/pam_get_item.3
 #usr/share/man/man3/pam_get_user.3
@@ -163,6 +169,7 @@ usr/lib/libpamc.so
 #usr/share/man/man3/pam_vsyslog.3
 #usr/share/man/man3/pam_xauth_data.3
 #usr/share/man/man5/access.conf.5
+#usr/share/man/man5/environment.5
 #usr/share/man/man5/group.conf.5
 #usr/share/man/man5/limits.conf.5
 #usr/share/man/man5/namespace.conf.5
@@ -171,9 +178,9 @@ usr/lib/libpamc.so
 #usr/share/man/man5/pam_env.conf.5
 #usr/share/man/man5/time.conf.5
 #usr/share/man/man8/PAM.8
+#usr/share/man/man8/mkhomedir_helper.8
 #usr/share/man/man8/pam.8
 #usr/share/man/man8/pam_access.8
-#usr/share/man/man8/pam_cracklib.8
 #usr/share/man/man8/pam_debug.8
 #usr/share/man/man8/pam_deny.8
 #usr/share/man/man8/pam_echo.8
@@ -196,14 +203,17 @@ usr/lib/libpamc.so
 #usr/share/man/man8/pam_namespace.8
 #usr/share/man/man8/pam_nologin.8
 #usr/share/man/man8/pam_permit.8
+#usr/share/man/man8/pam_pwhistory.8
 #usr/share/man/man8/pam_rhosts.8
 #usr/share/man/man8/pam_rootok.8
 #usr/share/man/man8/pam_securetty.8
 #usr/share/man/man8/pam_shells.8
 #usr/share/man/man8/pam_succeed_if.8
 #usr/share/man/man8/pam_tally.8
+#usr/share/man/man8/pam_tally2.8
 #usr/share/man/man8/pam_time.8
-#usr/share/man/man8/pam_tty_audit.8
+#usr/share/man/man8/pam_timestamp.8
+#usr/share/man/man8/pam_timestamp_check.8
 #usr/share/man/man8/pam_umask.8
 #usr/share/man/man8/pam_unix.8
 #usr/share/man/man8/pam_userdb.8
@@ -212,4 +222,3 @@ usr/lib/libpamc.so
 #usr/share/man/man8/pam_xauth.8
 #usr/share/man/man8/unix_chkpwd.8
 #usr/share/man/man8/unix_update.8
-#var/run/sepermit
diff --git a/config/rootfiles/common/pammysql b/config/rootfiles/common/pammysql
deleted file mode 100644
index fbdfadd3a..000000000
--- a/config/rootfiles/common/pammysql
+++ /dev/null
@@ -1,2 +0,0 @@
-#lib/security/pam_mysql.la
-lib/security/pam_mysql.so
diff --git a/config/rootfiles/common/smartmontools b/config/rootfiles/common/smartmontools
index f1df27bb9..dceb1d707 100644
--- a/config/rootfiles/common/smartmontools
+++ b/config/rootfiles/common/smartmontools
@@ -1,3 +1,4 @@
+#usr/etc
 #usr/etc/rc.d
 #usr/etc/rc.d/init.d
 #usr/etc/rc.d/init.d/smartd
@@ -16,7 +17,6 @@ usr/sbin/update-smart-drivedb
 #usr/share/doc/smartmontools/NEWS
 #usr/share/doc/smartmontools/README
 #usr/share/doc/smartmontools/TODO
-#usr/share/doc/smartmontools/WARNINGS
 #usr/share/doc/smartmontools/examplescripts
 #usr/share/doc/smartmontools/examplescripts/Example1
 #usr/share/doc/smartmontools/examplescripts/Example2
diff --git a/config/rootfiles/common/swig b/config/rootfiles/common/swig
index 713d4be2a..f028767e2 100644
--- a/config/rootfiles/common/swig
+++ b/config/rootfiles/common/swig
@@ -2,584 +2,780 @@
 #usr/bin/swig
 #usr/share/man/man1/ccache-swig.1
 #usr/share/swig
-#usr/share/swig/2.0.1
-#usr/share/swig/2.0.1/allegrocl
-#usr/share/swig/2.0.1/allegrocl/allegrocl.swg
-#usr/share/swig/2.0.1/allegrocl/inout_typemaps.i
-#usr/share/swig/2.0.1/allegrocl/longlongs.i
-#usr/share/swig/2.0.1/allegrocl/std_list.i
-#usr/share/swig/2.0.1/allegrocl/std_string.i
-#usr/share/swig/2.0.1/allegrocl/typemaps.i
-#usr/share/swig/2.0.1/allkw.swg
-#usr/share/swig/2.0.1/attribute.i
-#usr/share/swig/2.0.1/carrays.i
-#usr/share/swig/2.0.1/cdata.i
-#usr/share/swig/2.0.1/cffi
-#usr/share/swig/2.0.1/cffi/cffi.swg
-#usr/share/swig/2.0.1/chicken
-#usr/share/swig/2.0.1/chicken/chicken.swg
-#usr/share/swig/2.0.1/chicken/chickenkw.swg
-#usr/share/swig/2.0.1/chicken/chickenrun.swg
-#usr/share/swig/2.0.1/chicken/multi-generic.scm
-#usr/share/swig/2.0.1/chicken/std_string.i
-#usr/share/swig/2.0.1/chicken/swigclosprefix.scm
-#usr/share/swig/2.0.1/chicken/tinyclos-multi-generic.patch
-#usr/share/swig/2.0.1/chicken/typemaps.i
-#usr/share/swig/2.0.1/clisp
-#usr/share/swig/2.0.1/clisp/clisp.swg
-#usr/share/swig/2.0.1/cmalloc.i
-#usr/share/swig/2.0.1/constraints.i
-#usr/share/swig/2.0.1/cpointer.i
-#usr/share/swig/2.0.1/csharp
-#usr/share/swig/2.0.1/csharp/arrays_csharp.i
-#usr/share/swig/2.0.1/csharp/boost_shared_ptr.i
-#usr/share/swig/2.0.1/csharp/csharp.swg
-#usr/share/swig/2.0.1/csharp/csharphead.swg
-#usr/share/swig/2.0.1/csharp/csharpkw.swg
-#usr/share/swig/2.0.1/csharp/director.swg
-#usr/share/swig/2.0.1/csharp/enums.swg
-#usr/share/swig/2.0.1/csharp/enumsimple.swg
-#usr/share/swig/2.0.1/csharp/enumtypesafe.swg
-#usr/share/swig/2.0.1/csharp/std_common.i
-#usr/share/swig/2.0.1/csharp/std_deque.i
-#usr/share/swig/2.0.1/csharp/std_except.i
-#usr/share/swig/2.0.1/csharp/std_map.i
-#usr/share/swig/2.0.1/csharp/std_pair.i
-#usr/share/swig/2.0.1/csharp/std_shared_ptr.i
-#usr/share/swig/2.0.1/csharp/std_string.i
-#usr/share/swig/2.0.1/csharp/std_vector.i
-#usr/share/swig/2.0.1/csharp/std_wstring.i
-#usr/share/swig/2.0.1/csharp/stl.i
-#usr/share/swig/2.0.1/csharp/typemaps.i
-#usr/share/swig/2.0.1/csharp/wchar.i
-#usr/share/swig/2.0.1/cstring.i
-#usr/share/swig/2.0.1/cwstring.i
-#usr/share/swig/2.0.1/exception.i
-#usr/share/swig/2.0.1/gcj
-#usr/share/swig/2.0.1/gcj/cni.i
-#usr/share/swig/2.0.1/gcj/cni.swg
-#usr/share/swig/2.0.1/gcj/javaprims.i
-#usr/share/swig/2.0.1/go
-#usr/share/swig/2.0.1/go/cdata.i
-#usr/share/swig/2.0.1/go/exception.i
-#usr/share/swig/2.0.1/go/go.swg
-#usr/share/swig/2.0.1/go/gokw.swg
-#usr/share/swig/2.0.1/go/goruntime.swg
-#usr/share/swig/2.0.1/go/std_common.i
-#usr/share/swig/2.0.1/go/std_deque.i
-#usr/share/swig/2.0.1/go/std_except.i
-#usr/share/swig/2.0.1/go/std_map.i
-#usr/share/swig/2.0.1/go/std_pair.i
-#usr/share/swig/2.0.1/go/std_string.i
-#usr/share/swig/2.0.1/go/std_vector.i
-#usr/share/swig/2.0.1/go/stl.i
-#usr/share/swig/2.0.1/go/typemaps.i
-#usr/share/swig/2.0.1/guile
-#usr/share/swig/2.0.1/guile/common.scm
-#usr/share/swig/2.0.1/guile/cplusplus.i
-#usr/share/swig/2.0.1/guile/ghinterface.i
-#usr/share/swig/2.0.1/guile/guile.i
-#usr/share/swig/2.0.1/guile/guile_gh.swg
-#usr/share/swig/2.0.1/guile/guile_gh_run.swg
-#usr/share/swig/2.0.1/guile/guile_scm.swg
-#usr/share/swig/2.0.1/guile/guile_scm_run.swg
-#usr/share/swig/2.0.1/guile/guilemain.i
-#usr/share/swig/2.0.1/guile/interpreter.i
-#usr/share/swig/2.0.1/guile/list-vector.i
-#usr/share/swig/2.0.1/guile/pointer-in-out.i
-#usr/share/swig/2.0.1/guile/ports.i
-#usr/share/swig/2.0.1/guile/std_common.i
-#usr/share/swig/2.0.1/guile/std_deque.i
-#usr/share/swig/2.0.1/guile/std_except.i
-#usr/share/swig/2.0.1/guile/std_map.i
-#usr/share/swig/2.0.1/guile/std_pair.i
-#usr/share/swig/2.0.1/guile/std_string.i
-#usr/share/swig/2.0.1/guile/std_vector.i
-#usr/share/swig/2.0.1/guile/stl.i
-#usr/share/swig/2.0.1/guile/swigrun.i
-#usr/share/swig/2.0.1/guile/typemaps.i
-#usr/share/swig/2.0.1/intrusive_ptr.i
-#usr/share/swig/2.0.1/inttypes.i
-#usr/share/swig/2.0.1/java
-#usr/share/swig/2.0.1/java/arrays_java.i
-#usr/share/swig/2.0.1/java/boost_intrusive_ptr.i
-#usr/share/swig/2.0.1/java/boost_shared_ptr.i
-#usr/share/swig/2.0.1/java/director.swg
-#usr/share/swig/2.0.1/java/enums.swg
-#usr/share/swig/2.0.1/java/enumsimple.swg
-#usr/share/swig/2.0.1/java/enumtypesafe.swg
-#usr/share/swig/2.0.1/java/enumtypeunsafe.swg
-#usr/share/swig/2.0.1/java/java.swg
-#usr/share/swig/2.0.1/java/javahead.swg
-#usr/share/swig/2.0.1/java/javakw.swg
-#usr/share/swig/2.0.1/java/std_common.i
-#usr/share/swig/2.0.1/java/std_deque.i
-#usr/share/swig/2.0.1/java/std_except.i
-#usr/share/swig/2.0.1/java/std_map.i
-#usr/share/swig/2.0.1/java/std_pair.i
-#usr/share/swig/2.0.1/java/std_shared_ptr.i
-#usr/share/swig/2.0.1/java/std_string.i
-#usr/share/swig/2.0.1/java/std_vector.i
-#usr/share/swig/2.0.1/java/std_wstring.i
-#usr/share/swig/2.0.1/java/stl.i
-#usr/share/swig/2.0.1/java/typemaps.i
-#usr/share/swig/2.0.1/java/various.i
-#usr/share/swig/2.0.1/lua
-#usr/share/swig/2.0.1/lua/_std_common.i
-#usr/share/swig/2.0.1/lua/carrays.i
-#usr/share/swig/2.0.1/lua/lua.swg
-#usr/share/swig/2.0.1/lua/lua_fnptr.i
-#usr/share/swig/2.0.1/lua/luarun.swg
-#usr/share/swig/2.0.1/lua/luaruntime.swg
-#usr/share/swig/2.0.1/lua/luatypemaps.swg
-#usr/share/swig/2.0.1/lua/std_common.i
-#usr/share/swig/2.0.1/lua/std_deque.i
-#usr/share/swig/2.0.1/lua/std_except.i
-#usr/share/swig/2.0.1/lua/std_map.i
-#usr/share/swig/2.0.1/lua/std_pair.i
-#usr/share/swig/2.0.1/lua/std_string.i
-#usr/share/swig/2.0.1/lua/std_vector.i
-#usr/share/swig/2.0.1/lua/stl.i
-#usr/share/swig/2.0.1/lua/typemaps.i
-#usr/share/swig/2.0.1/lua/wchar.i
-#usr/share/swig/2.0.1/math.i
-#usr/share/swig/2.0.1/modula3
-#usr/share/swig/2.0.1/modula3/modula3.swg
-#usr/share/swig/2.0.1/modula3/modula3head.swg
-#usr/share/swig/2.0.1/modula3/typemaps.i
-#usr/share/swig/2.0.1/mzscheme
-#usr/share/swig/2.0.1/mzscheme/mzrun.swg
-#usr/share/swig/2.0.1/mzscheme/mzscheme.swg
-#usr/share/swig/2.0.1/mzscheme/std_common.i
-#usr/share/swig/2.0.1/mzscheme/std_deque.i
-#usr/share/swig/2.0.1/mzscheme/std_map.i
-#usr/share/swig/2.0.1/mzscheme/std_pair.i
-#usr/share/swig/2.0.1/mzscheme/std_string.i
-#usr/share/swig/2.0.1/mzscheme/std_vector.i
-#usr/share/swig/2.0.1/mzscheme/stl.i
-#usr/share/swig/2.0.1/mzscheme/typemaps.i
-#usr/share/swig/2.0.1/ocaml
-#usr/share/swig/2.0.1/ocaml/carray.i
-#usr/share/swig/2.0.1/ocaml/class.swg
-#usr/share/swig/2.0.1/ocaml/cstring.i
-#usr/share/swig/2.0.1/ocaml/director.swg
-#usr/share/swig/2.0.1/ocaml/ocaml.i
-#usr/share/swig/2.0.1/ocaml/ocaml.swg
-#usr/share/swig/2.0.1/ocaml/ocamldec.swg
-#usr/share/swig/2.0.1/ocaml/ocamlkw.swg
-#usr/share/swig/2.0.1/ocaml/preamble.swg
-#usr/share/swig/2.0.1/ocaml/std_common.i
-#usr/share/swig/2.0.1/ocaml/std_complex.i
-#usr/share/swig/2.0.1/ocaml/std_deque.i
-#usr/share/swig/2.0.1/ocaml/std_list.i
-#usr/share/swig/2.0.1/ocaml/std_map.i
-#usr/share/swig/2.0.1/ocaml/std_pair.i
-#usr/share/swig/2.0.1/ocaml/std_string.i
-#usr/share/swig/2.0.1/ocaml/std_vector.i
-#usr/share/swig/2.0.1/ocaml/stl.i
-#usr/share/swig/2.0.1/ocaml/swig.ml
-#usr/share/swig/2.0.1/ocaml/swig.mli
-#usr/share/swig/2.0.1/ocaml/swigp4.ml
-#usr/share/swig/2.0.1/ocaml/typecheck.i
-#usr/share/swig/2.0.1/ocaml/typemaps.i
-#usr/share/swig/2.0.1/ocaml/typeregister.swg
-#usr/share/swig/2.0.1/octave
-#usr/share/swig/2.0.1/octave/attribute.i
-#usr/share/swig/2.0.1/octave/boost_shared_ptr.i
-#usr/share/swig/2.0.1/octave/carrays.i
-#usr/share/swig/2.0.1/octave/cdata.i
-#usr/share/swig/2.0.1/octave/cmalloc.i
-#usr/share/swig/2.0.1/octave/director.swg
-#usr/share/swig/2.0.1/octave/exception.i
-#usr/share/swig/2.0.1/octave/factory.i
-#usr/share/swig/2.0.1/octave/implicit.i
-#usr/share/swig/2.0.1/octave/octave.swg
-#usr/share/swig/2.0.1/octave/octcomplex.swg
-#usr/share/swig/2.0.1/octave/octcontainer.swg
-#usr/share/swig/2.0.1/octave/octfragments.swg
-#usr/share/swig/2.0.1/octave/octiterators.swg
-#usr/share/swig/2.0.1/octave/octopers.swg
-#usr/share/swig/2.0.1/octave/octprimtypes.swg
-#usr/share/swig/2.0.1/octave/octrun.swg
-#usr/share/swig/2.0.1/octave/octruntime.swg
-#usr/share/swig/2.0.1/octave/octstdcommon.swg
-#usr/share/swig/2.0.1/octave/octtypemaps.swg
-#usr/share/swig/2.0.1/octave/octuserdir.swg
-#usr/share/swig/2.0.1/octave/std_alloc.i
-#usr/share/swig/2.0.1/octave/std_basic_string.i
-#usr/share/swig/2.0.1/octave/std_carray.i
-#usr/share/swig/2.0.1/octave/std_char_traits.i
-#usr/share/swig/2.0.1/octave/std_common.i
-#usr/share/swig/2.0.1/octave/std_complex.i
-#usr/share/swig/2.0.1/octave/std_container.i
-#usr/share/swig/2.0.1/octave/std_deque.i
-#usr/share/swig/2.0.1/octave/std_except.i
-#usr/share/swig/2.0.1/octave/std_map.i
-#usr/share/swig/2.0.1/octave/std_pair.i
-#usr/share/swig/2.0.1/octave/std_string.i
-#usr/share/swig/2.0.1/octave/std_vector.i
-#usr/share/swig/2.0.1/octave/stl.i
-#usr/share/swig/2.0.1/octave/typemaps.i
-#usr/share/swig/2.0.1/perl5
-#usr/share/swig/2.0.1/perl5/Makefile.pl
-#usr/share/swig/2.0.1/perl5/attribute.i
-#usr/share/swig/2.0.1/perl5/carrays.i
-#usr/share/swig/2.0.1/perl5/cdata.i
-#usr/share/swig/2.0.1/perl5/cmalloc.i
-#usr/share/swig/2.0.1/perl5/cni.i
-#usr/share/swig/2.0.1/perl5/cpointer.i
-#usr/share/swig/2.0.1/perl5/cstring.i
-#usr/share/swig/2.0.1/perl5/exception.i
-#usr/share/swig/2.0.1/perl5/factory.i
-#usr/share/swig/2.0.1/perl5/jstring.i
-#usr/share/swig/2.0.1/perl5/noembed.h
-#usr/share/swig/2.0.1/perl5/perl5.swg
-#usr/share/swig/2.0.1/perl5/perlerrors.swg
-#usr/share/swig/2.0.1/perl5/perlfragments.swg
-#usr/share/swig/2.0.1/perl5/perlhead.swg
-#usr/share/swig/2.0.1/perl5/perlinit.swg
-#usr/share/swig/2.0.1/perl5/perlkw.swg
-#usr/share/swig/2.0.1/perl5/perlmacros.swg
-#usr/share/swig/2.0.1/perl5/perlmain.i
-#usr/share/swig/2.0.1/perl5/perlopers.swg
-#usr/share/swig/2.0.1/perl5/perlprimtypes.swg
-#usr/share/swig/2.0.1/perl5/perlrun.swg
-#usr/share/swig/2.0.1/perl5/perlruntime.swg
-#usr/share/swig/2.0.1/perl5/perlstrings.swg
-#usr/share/swig/2.0.1/perl5/perltypemaps.swg
-#usr/share/swig/2.0.1/perl5/perluserdir.swg
-#usr/share/swig/2.0.1/perl5/reference.i
-#usr/share/swig/2.0.1/perl5/std_common.i
-#usr/share/swig/2.0.1/perl5/std_deque.i
-#usr/share/swig/2.0.1/perl5/std_except.i
-#usr/share/swig/2.0.1/perl5/std_list.i
-#usr/share/swig/2.0.1/perl5/std_map.i
-#usr/share/swig/2.0.1/perl5/std_pair.i
-#usr/share/swig/2.0.1/perl5/std_string.i
-#usr/share/swig/2.0.1/perl5/std_vector.i
-#usr/share/swig/2.0.1/perl5/stl.i
-#usr/share/swig/2.0.1/perl5/typemaps.i
-#usr/share/swig/2.0.1/php
-#usr/share/swig/2.0.1/php/const.i
-#usr/share/swig/2.0.1/php/director.swg
-#usr/share/swig/2.0.1/php/factory.i
-#usr/share/swig/2.0.1/php/globalvar.i
-#usr/share/swig/2.0.1/php/php.swg
-#usr/share/swig/2.0.1/php/phpinit.swg
-#usr/share/swig/2.0.1/php/phpkw.swg
-#usr/share/swig/2.0.1/php/phppointers.i
-#usr/share/swig/2.0.1/php/phprun.swg
-#usr/share/swig/2.0.1/php/std_common.i
-#usr/share/swig/2.0.1/php/std_deque.i
-#usr/share/swig/2.0.1/php/std_map.i
-#usr/share/swig/2.0.1/php/std_pair.i
-#usr/share/swig/2.0.1/php/std_string.i
-#usr/share/swig/2.0.1/php/std_vector.i
-#usr/share/swig/2.0.1/php/stl.i
-#usr/share/swig/2.0.1/php/typemaps.i
-#usr/share/swig/2.0.1/php/utils.i
-#usr/share/swig/2.0.1/pike
-#usr/share/swig/2.0.1/pike/pike.swg
-#usr/share/swig/2.0.1/pike/pikekw.swg
-#usr/share/swig/2.0.1/pike/pikerun.swg
-#usr/share/swig/2.0.1/pike/std_string.i
-#usr/share/swig/2.0.1/pointer.i
-#usr/share/swig/2.0.1/python
-#usr/share/swig/2.0.1/python/argcargv.i
-#usr/share/swig/2.0.1/python/attribute.i
-#usr/share/swig/2.0.1/python/boost_shared_ptr.i
-#usr/share/swig/2.0.1/python/carrays.i
-#usr/share/swig/2.0.1/python/ccomplex.i
-#usr/share/swig/2.0.1/python/cdata.i
-#usr/share/swig/2.0.1/python/cmalloc.i
-#usr/share/swig/2.0.1/python/cni.i
-#usr/share/swig/2.0.1/python/complex.i
-#usr/share/swig/2.0.1/python/cpointer.i
-#usr/share/swig/2.0.1/python/cstring.i
-#usr/share/swig/2.0.1/python/cwstring.i
-#usr/share/swig/2.0.1/python/defarg.swg
-#usr/share/swig/2.0.1/python/director.swg
-#usr/share/swig/2.0.1/python/embed.i
-#usr/share/swig/2.0.1/python/embed15.i
-#usr/share/swig/2.0.1/python/exception.i
-#usr/share/swig/2.0.1/python/factory.i
-#usr/share/swig/2.0.1/python/file.i
-#usr/share/swig/2.0.1/python/implicit.i
-#usr/share/swig/2.0.1/python/jstring.i
-#usr/share/swig/2.0.1/python/pyabc.i
-#usr/share/swig/2.0.1/python/pyapi.swg
-#usr/share/swig/2.0.1/python/pybackward.swg
-#usr/share/swig/2.0.1/python/pybuffer.i
-#usr/share/swig/2.0.1/python/pyclasses.swg
-#usr/share/swig/2.0.1/python/pycomplex.swg
-#usr/share/swig/2.0.1/python/pycontainer.swg
-#usr/share/swig/2.0.1/python/pydocs.swg
-#usr/share/swig/2.0.1/python/pyerrors.swg
-#usr/share/swig/2.0.1/python/pyfragments.swg
-#usr/share/swig/2.0.1/python/pyhead.swg
-#usr/share/swig/2.0.1/python/pyinit.swg
-#usr/share/swig/2.0.1/python/pyiterators.swg
-#usr/share/swig/2.0.1/python/pymacros.swg
-#usr/share/swig/2.0.1/python/pyname_compat.i
-#usr/share/swig/2.0.1/python/pyopers.swg
-#usr/share/swig/2.0.1/python/pyprimtypes.swg
-#usr/share/swig/2.0.1/python/pyrun.swg
-#usr/share/swig/2.0.1/python/pyruntime.swg
-#usr/share/swig/2.0.1/python/pystdcommon.swg
-#usr/share/swig/2.0.1/python/pystrings.swg
-#usr/share/swig/2.0.1/python/python.swg
-#usr/share/swig/2.0.1/python/pythonkw.swg
-#usr/share/swig/2.0.1/python/pythreads.swg
-#usr/share/swig/2.0.1/python/pytuplehlp.swg
-#usr/share/swig/2.0.1/python/pytypemaps.swg
-#usr/share/swig/2.0.1/python/pyuserdir.swg
-#usr/share/swig/2.0.1/python/pywstrings.swg
-#usr/share/swig/2.0.1/python/std_alloc.i
-#usr/share/swig/2.0.1/python/std_basic_string.i
-#usr/share/swig/2.0.1/python/std_carray.i
-#usr/share/swig/2.0.1/python/std_char_traits.i
-#usr/share/swig/2.0.1/python/std_common.i
-#usr/share/swig/2.0.1/python/std_complex.i
-#usr/share/swig/2.0.1/python/std_container.i
-#usr/share/swig/2.0.1/python/std_deque.i
-#usr/share/swig/2.0.1/python/std_except.i
-#usr/share/swig/2.0.1/python/std_ios.i
-#usr/share/swig/2.0.1/python/std_iostream.i
-#usr/share/swig/2.0.1/python/std_list.i
-#usr/share/swig/2.0.1/python/std_map.i
-#usr/share/swig/2.0.1/python/std_multimap.i
-#usr/share/swig/2.0.1/python/std_multiset.i
-#usr/share/swig/2.0.1/python/std_pair.i
-#usr/share/swig/2.0.1/python/std_set.i
-#usr/share/swig/2.0.1/python/std_shared_ptr.i
-#usr/share/swig/2.0.1/python/std_sstream.i
-#usr/share/swig/2.0.1/python/std_streambuf.i
-#usr/share/swig/2.0.1/python/std_string.i
-#usr/share/swig/2.0.1/python/std_vector.i
-#usr/share/swig/2.0.1/python/std_vectora.i
-#usr/share/swig/2.0.1/python/std_wios.i
-#usr/share/swig/2.0.1/python/std_wiostream.i
-#usr/share/swig/2.0.1/python/std_wsstream.i
-#usr/share/swig/2.0.1/python/std_wstreambuf.i
-#usr/share/swig/2.0.1/python/std_wstring.i
-#usr/share/swig/2.0.1/python/stl.i
-#usr/share/swig/2.0.1/python/typemaps.i
-#usr/share/swig/2.0.1/python/wchar.i
-#usr/share/swig/2.0.1/r
-#usr/share/swig/2.0.1/r/cdata.i
-#usr/share/swig/2.0.1/r/exception.i
-#usr/share/swig/2.0.1/r/r.swg
-#usr/share/swig/2.0.1/r/rcontainer.swg
-#usr/share/swig/2.0.1/r/rfragments.swg
-#usr/share/swig/2.0.1/r/rkw.swg
-#usr/share/swig/2.0.1/r/ropers.swg
-#usr/share/swig/2.0.1/r/rrun.swg
-#usr/share/swig/2.0.1/r/rstdcommon.swg
-#usr/share/swig/2.0.1/r/rtype.swg
-#usr/share/swig/2.0.1/r/srun.swg
-#usr/share/swig/2.0.1/r/std_alloc.i
-#usr/share/swig/2.0.1/r/std_common.i
-#usr/share/swig/2.0.1/r/std_container.i
-#usr/share/swig/2.0.1/r/std_deque.i
-#usr/share/swig/2.0.1/r/std_except.i
-#usr/share/swig/2.0.1/r/std_map.i
-#usr/share/swig/2.0.1/r/std_pair.i
-#usr/share/swig/2.0.1/r/std_string.i
-#usr/share/swig/2.0.1/r/std_vector.i
-#usr/share/swig/2.0.1/r/stl.i
-#usr/share/swig/2.0.1/r/typemaps.i
-#usr/share/swig/2.0.1/ruby
-#usr/share/swig/2.0.1/ruby/Makefile.swig
-#usr/share/swig/2.0.1/ruby/argcargv.i
-#usr/share/swig/2.0.1/ruby/attribute.i
-#usr/share/swig/2.0.1/ruby/carrays.i
-#usr/share/swig/2.0.1/ruby/cdata.i
-#usr/share/swig/2.0.1/ruby/cmalloc.i
-#usr/share/swig/2.0.1/ruby/cni.i
-#usr/share/swig/2.0.1/ruby/cpointer.i
-#usr/share/swig/2.0.1/ruby/cstring.i
-#usr/share/swig/2.0.1/ruby/director.swg
-#usr/share/swig/2.0.1/ruby/embed.i
-#usr/share/swig/2.0.1/ruby/exception.i
-#usr/share/swig/2.0.1/ruby/extconf.rb
-#usr/share/swig/2.0.1/ruby/factory.i
-#usr/share/swig/2.0.1/ruby/file.i
-#usr/share/swig/2.0.1/ruby/jstring.i
-#usr/share/swig/2.0.1/ruby/progargcargv.i
-#usr/share/swig/2.0.1/ruby/ruby.swg
-#usr/share/swig/2.0.1/ruby/rubyapi.swg
-#usr/share/swig/2.0.1/ruby/rubyautodoc.swg
-#usr/share/swig/2.0.1/ruby/rubyclasses.swg
-#usr/share/swig/2.0.1/ruby/rubycomplex.swg
-#usr/share/swig/2.0.1/ruby/rubycontainer.swg
-#usr/share/swig/2.0.1/ruby/rubycontainer_extended.swg
-#usr/share/swig/2.0.1/ruby/rubydef.swg
-#usr/share/swig/2.0.1/ruby/rubyerrors.swg
-#usr/share/swig/2.0.1/ruby/rubyfragments.swg
-#usr/share/swig/2.0.1/ruby/rubyhead.swg
-#usr/share/swig/2.0.1/ruby/rubyinit.swg
-#usr/share/swig/2.0.1/ruby/rubyiterators.swg
-#usr/share/swig/2.0.1/ruby/rubykw.swg
-#usr/share/swig/2.0.1/ruby/rubymacros.swg
-#usr/share/swig/2.0.1/ruby/rubyopers.swg
-#usr/share/swig/2.0.1/ruby/rubyprimtypes.swg
-#usr/share/swig/2.0.1/ruby/rubyrun.swg
-#usr/share/swig/2.0.1/ruby/rubyruntime.swg
-#usr/share/swig/2.0.1/ruby/rubystdautodoc.swg
-#usr/share/swig/2.0.1/ruby/rubystdcommon.swg
-#usr/share/swig/2.0.1/ruby/rubystdfunctors.swg
-#usr/share/swig/2.0.1/ruby/rubystrings.swg
-#usr/share/swig/2.0.1/ruby/rubytracking.swg
-#usr/share/swig/2.0.1/ruby/rubytypemaps.swg
-#usr/share/swig/2.0.1/ruby/rubyuserdir.swg
-#usr/share/swig/2.0.1/ruby/rubywstrings.swg
-#usr/share/swig/2.0.1/ruby/std_alloc.i
-#usr/share/swig/2.0.1/ruby/std_basic_string.i
-#usr/share/swig/2.0.1/ruby/std_char_traits.i
-#usr/share/swig/2.0.1/ruby/std_common.i
-#usr/share/swig/2.0.1/ruby/std_complex.i
-#usr/share/swig/2.0.1/ruby/std_container.i
-#usr/share/swig/2.0.1/ruby/std_deque.i
-#usr/share/swig/2.0.1/ruby/std_except.i
-#usr/share/swig/2.0.1/ruby/std_functors.i
-#usr/share/swig/2.0.1/ruby/std_ios.i
-#usr/share/swig/2.0.1/ruby/std_iostream.i
-#usr/share/swig/2.0.1/ruby/std_list.i
-#usr/share/swig/2.0.1/ruby/std_map.i
-#usr/share/swig/2.0.1/ruby/std_multimap.i
-#usr/share/swig/2.0.1/ruby/std_multiset.i
-#usr/share/swig/2.0.1/ruby/std_pair.i
-#usr/share/swig/2.0.1/ruby/std_queue.i
-#usr/share/swig/2.0.1/ruby/std_set.i
-#usr/share/swig/2.0.1/ruby/std_sstream.i
-#usr/share/swig/2.0.1/ruby/std_stack.i
-#usr/share/swig/2.0.1/ruby/std_streambuf.i
-#usr/share/swig/2.0.1/ruby/std_string.i
-#usr/share/swig/2.0.1/ruby/std_vector.i
-#usr/share/swig/2.0.1/ruby/std_vectora.i
-#usr/share/swig/2.0.1/ruby/std_wstring.i
-#usr/share/swig/2.0.1/ruby/stl.i
-#usr/share/swig/2.0.1/ruby/timeval.i
-#usr/share/swig/2.0.1/ruby/typemaps.i
-#usr/share/swig/2.0.1/runtime.swg
-#usr/share/swig/2.0.1/shared_ptr.i
-#usr/share/swig/2.0.1/std
-#usr/share/swig/2.0.1/std/_std_deque.i
-#usr/share/swig/2.0.1/std/std_alloc.i
-#usr/share/swig/2.0.1/std/std_basic_string.i
-#usr/share/swig/2.0.1/std/std_carray.swg
-#usr/share/swig/2.0.1/std/std_char_traits.i
-#usr/share/swig/2.0.1/std/std_common.i
-#usr/share/swig/2.0.1/std/std_container.i
-#usr/share/swig/2.0.1/std/std_deque.i
-#usr/share/swig/2.0.1/std/std_except.i
-#usr/share/swig/2.0.1/std/std_ios.i
-#usr/share/swig/2.0.1/std/std_iostream.i
-#usr/share/swig/2.0.1/std/std_list.i
-#usr/share/swig/2.0.1/std/std_map.i
-#usr/share/swig/2.0.1/std/std_multimap.i
-#usr/share/swig/2.0.1/std/std_multiset.i
-#usr/share/swig/2.0.1/std/std_pair.i
-#usr/share/swig/2.0.1/std/std_queue.i
-#usr/share/swig/2.0.1/std/std_set.i
-#usr/share/swig/2.0.1/std/std_sstream.i
-#usr/share/swig/2.0.1/std/std_stack.i
-#usr/share/swig/2.0.1/std/std_streambuf.i
-#usr/share/swig/2.0.1/std/std_string.i
-#usr/share/swig/2.0.1/std/std_vector.i
-#usr/share/swig/2.0.1/std/std_vectora.i
-#usr/share/swig/2.0.1/std/std_wios.i
-#usr/share/swig/2.0.1/std/std_wiostream.i
-#usr/share/swig/2.0.1/std/std_wsstream.i
-#usr/share/swig/2.0.1/std/std_wstreambuf.i
-#usr/share/swig/2.0.1/std/std_wstring.i
-#usr/share/swig/2.0.1/std_except.i
-#usr/share/swig/2.0.1/stdint.i
-#usr/share/swig/2.0.1/stl.i
-#usr/share/swig/2.0.1/swig.swg
-#usr/share/swig/2.0.1/swigarch.i
-#usr/share/swig/2.0.1/swigerrors.swg
-#usr/share/swig/2.0.1/swiginit.swg
-#usr/share/swig/2.0.1/swiglabels.swg
-#usr/share/swig/2.0.1/swigrun.i
-#usr/share/swig/2.0.1/swigrun.swg
-#usr/share/swig/2.0.1/swigwarn.swg
-#usr/share/swig/2.0.1/swigwarnings.swg
-#usr/share/swig/2.0.1/tcl
-#usr/share/swig/2.0.1/tcl/attribute.i
-#usr/share/swig/2.0.1/tcl/carrays.i
-#usr/share/swig/2.0.1/tcl/cdata.i
-#usr/share/swig/2.0.1/tcl/cmalloc.i
-#usr/share/swig/2.0.1/tcl/cni.i
-#usr/share/swig/2.0.1/tcl/cpointer.i
-#usr/share/swig/2.0.1/tcl/cstring.i
-#usr/share/swig/2.0.1/tcl/cwstring.i
-#usr/share/swig/2.0.1/tcl/exception.i
-#usr/share/swig/2.0.1/tcl/factory.i
-#usr/share/swig/2.0.1/tcl/jstring.i
-#usr/share/swig/2.0.1/tcl/std_common.i
-#usr/share/swig/2.0.1/tcl/std_deque.i
-#usr/share/swig/2.0.1/tcl/std_except.i
-#usr/share/swig/2.0.1/tcl/std_map.i
-#usr/share/swig/2.0.1/tcl/std_pair.i
-#usr/share/swig/2.0.1/tcl/std_string.i
-#usr/share/swig/2.0.1/tcl/std_vector.i
-#usr/share/swig/2.0.1/tcl/std_wstring.i
-#usr/share/swig/2.0.1/tcl/stl.i
-#usr/share/swig/2.0.1/tcl/tcl8.swg
-#usr/share/swig/2.0.1/tcl/tclapi.swg
-#usr/share/swig/2.0.1/tcl/tclerrors.swg
-#usr/share/swig/2.0.1/tcl/tclfragments.swg
-#usr/share/swig/2.0.1/tcl/tclinit.swg
-#usr/share/swig/2.0.1/tcl/tclinterp.i
-#usr/share/swig/2.0.1/tcl/tclkw.swg
-#usr/share/swig/2.0.1/tcl/tclmacros.swg
-#usr/share/swig/2.0.1/tcl/tclopers.swg
-#usr/share/swig/2.0.1/tcl/tclprimtypes.swg
-#usr/share/swig/2.0.1/tcl/tclresult.i
-#usr/share/swig/2.0.1/tcl/tclrun.swg
-#usr/share/swig/2.0.1/tcl/tclruntime.swg
-#usr/share/swig/2.0.1/tcl/tclsh.i
-#usr/share/swig/2.0.1/tcl/tclstrings.swg
-#usr/share/swig/2.0.1/tcl/tcltypemaps.swg
-#usr/share/swig/2.0.1/tcl/tcluserdir.swg
-#usr/share/swig/2.0.1/tcl/tclwstrings.swg
-#usr/share/swig/2.0.1/tcl/typemaps.i
-#usr/share/swig/2.0.1/tcl/wish.i
-#usr/share/swig/2.0.1/typemaps
-#usr/share/swig/2.0.1/typemaps/attribute.swg
-#usr/share/swig/2.0.1/typemaps/carrays.swg
-#usr/share/swig/2.0.1/typemaps/cdata.swg
-#usr/share/swig/2.0.1/typemaps/cmalloc.swg
-#usr/share/swig/2.0.1/typemaps/cpointer.swg
-#usr/share/swig/2.0.1/typemaps/cstring.swg
-#usr/share/swig/2.0.1/typemaps/cstrings.swg
-#usr/share/swig/2.0.1/typemaps/cwstring.swg
-#usr/share/swig/2.0.1/typemaps/enumint.swg
-#usr/share/swig/2.0.1/typemaps/exception.swg
-#usr/share/swig/2.0.1/typemaps/factory.swg
-#usr/share/swig/2.0.1/typemaps/fragments.swg
-#usr/share/swig/2.0.1/typemaps/implicit.swg
-#usr/share/swig/2.0.1/typemaps/inoutlist.swg
-#usr/share/swig/2.0.1/typemaps/misctypes.swg
-#usr/share/swig/2.0.1/typemaps/primtypes.swg
-#usr/share/swig/2.0.1/typemaps/ptrtypes.swg
-#usr/share/swig/2.0.1/typemaps/std_except.swg
-#usr/share/swig/2.0.1/typemaps/std_string.swg
-#usr/share/swig/2.0.1/typemaps/std_strings.swg
-#usr/share/swig/2.0.1/typemaps/std_wstring.swg
-#usr/share/swig/2.0.1/typemaps/string.swg
-#usr/share/swig/2.0.1/typemaps/strings.swg
-#usr/share/swig/2.0.1/typemaps/swigmacros.swg
-#usr/share/swig/2.0.1/typemaps/swigobject.swg
-#usr/share/swig/2.0.1/typemaps/swigtype.swg
-#usr/share/swig/2.0.1/typemaps/swigtypemaps.swg
-#usr/share/swig/2.0.1/typemaps/traits.swg
-#usr/share/swig/2.0.1/typemaps/typemaps.swg
-#usr/share/swig/2.0.1/typemaps/valtypes.swg
-#usr/share/swig/2.0.1/typemaps/void.swg
-#usr/share/swig/2.0.1/typemaps/wstring.swg
-#usr/share/swig/2.0.1/uffi
-#usr/share/swig/2.0.1/uffi/uffi.swg
-#usr/share/swig/2.0.1/wchar.i
-#usr/share/swig/2.0.1/windows.i
+#usr/share/swig/3.0.12
+#usr/share/swig/3.0.12/allegrocl
+#usr/share/swig/3.0.12/allegrocl/allegrocl.swg
+#usr/share/swig/3.0.12/allegrocl/inout_typemaps.i
+#usr/share/swig/3.0.12/allegrocl/longlongs.i
+#usr/share/swig/3.0.12/allegrocl/std_list.i
+#usr/share/swig/3.0.12/allegrocl/std_string.i
+#usr/share/swig/3.0.12/allegrocl/typemaps.i
+#usr/share/swig/3.0.12/allkw.swg
+#usr/share/swig/3.0.12/attribute.i
+#usr/share/swig/3.0.12/carrays.i
+#usr/share/swig/3.0.12/cdata.i
+#usr/share/swig/3.0.12/cffi
+#usr/share/swig/3.0.12/cffi/cffi.swg
+#usr/share/swig/3.0.12/chicken
+#usr/share/swig/3.0.12/chicken/chicken.swg
+#usr/share/swig/3.0.12/chicken/chickenkw.swg
+#usr/share/swig/3.0.12/chicken/chickenrun.swg
+#usr/share/swig/3.0.12/chicken/multi-generic.scm
+#usr/share/swig/3.0.12/chicken/std_string.i
+#usr/share/swig/3.0.12/chicken/swigclosprefix.scm
+#usr/share/swig/3.0.12/chicken/tinyclos-multi-generic.patch
+#usr/share/swig/3.0.12/chicken/typemaps.i
+#usr/share/swig/3.0.12/clisp
+#usr/share/swig/3.0.12/clisp/clisp.swg
+#usr/share/swig/3.0.12/cmalloc.i
+#usr/share/swig/3.0.12/constraints.i
+#usr/share/swig/3.0.12/cpointer.i
+#usr/share/swig/3.0.12/csharp
+#usr/share/swig/3.0.12/csharp/arrays_csharp.i
+#usr/share/swig/3.0.12/csharp/boost_intrusive_ptr.i
+#usr/share/swig/3.0.12/csharp/boost_shared_ptr.i
+#usr/share/swig/3.0.12/csharp/csharp.swg
+#usr/share/swig/3.0.12/csharp/csharphead.swg
+#usr/share/swig/3.0.12/csharp/csharpkw.swg
+#usr/share/swig/3.0.12/csharp/director.swg
+#usr/share/swig/3.0.12/csharp/enums.swg
+#usr/share/swig/3.0.12/csharp/enumsimple.swg
+#usr/share/swig/3.0.12/csharp/enumtypesafe.swg
+#usr/share/swig/3.0.12/csharp/std_array.i
+#usr/share/swig/3.0.12/csharp/std_auto_ptr.i
+#usr/share/swig/3.0.12/csharp/std_common.i
+#usr/share/swig/3.0.12/csharp/std_deque.i
+#usr/share/swig/3.0.12/csharp/std_except.i
+#usr/share/swig/3.0.12/csharp/std_map.i
+#usr/share/swig/3.0.12/csharp/std_pair.i
+#usr/share/swig/3.0.12/csharp/std_shared_ptr.i
+#usr/share/swig/3.0.12/csharp/std_string.i
+#usr/share/swig/3.0.12/csharp/std_vector.i
+#usr/share/swig/3.0.12/csharp/std_wstring.i
+#usr/share/swig/3.0.12/csharp/stl.i
+#usr/share/swig/3.0.12/csharp/swiginterface.i
+#usr/share/swig/3.0.12/csharp/swigtype_inout.i
+#usr/share/swig/3.0.12/csharp/typemaps.i
+#usr/share/swig/3.0.12/csharp/wchar.i
+#usr/share/swig/3.0.12/cstring.i
+#usr/share/swig/3.0.12/cwstring.i
+#usr/share/swig/3.0.12/d
+#usr/share/swig/3.0.12/d/boost_shared_ptr.i
+#usr/share/swig/3.0.12/d/carrays.i
+#usr/share/swig/3.0.12/d/cpointer.i
+#usr/share/swig/3.0.12/d/d.swg
+#usr/share/swig/3.0.12/d/dclassgen.swg
+#usr/share/swig/3.0.12/d/ddirectives.swg
+#usr/share/swig/3.0.12/d/denums.swg
+#usr/share/swig/3.0.12/d/dexception.swg
+#usr/share/swig/3.0.12/d/dhead.swg
+#usr/share/swig/3.0.12/d/director.swg
+#usr/share/swig/3.0.12/d/dkw.swg
+#usr/share/swig/3.0.12/d/dmemberfunctionpointers.swg
+#usr/share/swig/3.0.12/d/doperators.swg
+#usr/share/swig/3.0.12/d/dprimitives.swg
+#usr/share/swig/3.0.12/d/dstrings.swg
+#usr/share/swig/3.0.12/d/dswigtype.swg
+#usr/share/swig/3.0.12/d/dvoid.swg
+#usr/share/swig/3.0.12/d/std_common.i
+#usr/share/swig/3.0.12/d/std_deque.i
+#usr/share/swig/3.0.12/d/std_except.i
+#usr/share/swig/3.0.12/d/std_map.i
+#usr/share/swig/3.0.12/d/std_pair.i
+#usr/share/swig/3.0.12/d/std_shared_ptr.i
+#usr/share/swig/3.0.12/d/std_string.i
+#usr/share/swig/3.0.12/d/std_vector.i
+#usr/share/swig/3.0.12/d/stl.i
+#usr/share/swig/3.0.12/d/typemaps.i
+#usr/share/swig/3.0.12/d/wrapperloader.swg
+#usr/share/swig/3.0.12/director_common.swg
+#usr/share/swig/3.0.12/exception.i
+#usr/share/swig/3.0.12/gcj
+#usr/share/swig/3.0.12/gcj/cni.i
+#usr/share/swig/3.0.12/gcj/cni.swg
+#usr/share/swig/3.0.12/gcj/javaprims.i
+#usr/share/swig/3.0.12/go
+#usr/share/swig/3.0.12/go/cdata.i
+#usr/share/swig/3.0.12/go/exception.i
+#usr/share/swig/3.0.12/go/go.swg
+#usr/share/swig/3.0.12/go/gokw.swg
+#usr/share/swig/3.0.12/go/goruntime.swg
+#usr/share/swig/3.0.12/go/gostring.swg
+#usr/share/swig/3.0.12/go/std_common.i
+#usr/share/swig/3.0.12/go/std_deque.i
+#usr/share/swig/3.0.12/go/std_except.i
+#usr/share/swig/3.0.12/go/std_list.i
+#usr/share/swig/3.0.12/go/std_map.i
+#usr/share/swig/3.0.12/go/std_pair.i
+#usr/share/swig/3.0.12/go/std_string.i
+#usr/share/swig/3.0.12/go/std_vector.i
+#usr/share/swig/3.0.12/go/stl.i
+#usr/share/swig/3.0.12/go/typemaps.i
+#usr/share/swig/3.0.12/guile
+#usr/share/swig/3.0.12/guile/common.scm
+#usr/share/swig/3.0.12/guile/cplusplus.i
+#usr/share/swig/3.0.12/guile/guile.i
+#usr/share/swig/3.0.12/guile/guile_scm.swg
+#usr/share/swig/3.0.12/guile/guile_scm_run.swg
+#usr/share/swig/3.0.12/guile/guilemain.i
+#usr/share/swig/3.0.12/guile/interpreter.i
+#usr/share/swig/3.0.12/guile/list-vector.i
+#usr/share/swig/3.0.12/guile/pointer-in-out.i
+#usr/share/swig/3.0.12/guile/ports.i
+#usr/share/swig/3.0.12/guile/std_common.i
+#usr/share/swig/3.0.12/guile/std_deque.i
+#usr/share/swig/3.0.12/guile/std_except.i
+#usr/share/swig/3.0.12/guile/std_map.i
+#usr/share/swig/3.0.12/guile/std_pair.i
+#usr/share/swig/3.0.12/guile/std_string.i
+#usr/share/swig/3.0.12/guile/std_vector.i
+#usr/share/swig/3.0.12/guile/stl.i
+#usr/share/swig/3.0.12/guile/swigrun.i
+#usr/share/swig/3.0.12/guile/typemaps.i
+#usr/share/swig/3.0.12/intrusive_ptr.i
+#usr/share/swig/3.0.12/inttypes.i
+#usr/share/swig/3.0.12/java
+#usr/share/swig/3.0.12/java/arrays_java.i
+#usr/share/swig/3.0.12/java/boost_intrusive_ptr.i
+#usr/share/swig/3.0.12/java/boost_shared_ptr.i
+#usr/share/swig/3.0.12/java/director.swg
+#usr/share/swig/3.0.12/java/enums.swg
+#usr/share/swig/3.0.12/java/enumsimple.swg
+#usr/share/swig/3.0.12/java/enumtypesafe.swg
+#usr/share/swig/3.0.12/java/enumtypeunsafe.swg
+#usr/share/swig/3.0.12/java/java.swg
+#usr/share/swig/3.0.12/java/javahead.swg
+#usr/share/swig/3.0.12/java/javakw.swg
+#usr/share/swig/3.0.12/java/std_array.i
+#usr/share/swig/3.0.12/java/std_auto_ptr.i
+#usr/share/swig/3.0.12/java/std_common.i
+#usr/share/swig/3.0.12/java/std_deque.i
+#usr/share/swig/3.0.12/java/std_except.i
+#usr/share/swig/3.0.12/java/std_map.i
+#usr/share/swig/3.0.12/java/std_pair.i
+#usr/share/swig/3.0.12/java/std_shared_ptr.i
+#usr/share/swig/3.0.12/java/std_string.i
+#usr/share/swig/3.0.12/java/std_vector.i
+#usr/share/swig/3.0.12/java/std_wstring.i
+#usr/share/swig/3.0.12/java/stl.i
+#usr/share/swig/3.0.12/java/swiginterface.i
+#usr/share/swig/3.0.12/java/typemaps.i
+#usr/share/swig/3.0.12/java/various.i
+#usr/share/swig/3.0.12/javascript
+#usr/share/swig/3.0.12/javascript/jsc
+#usr/share/swig/3.0.12/javascript/jsc/arrays_javascript.i
+#usr/share/swig/3.0.12/javascript/jsc/ccomplex.i
+#usr/share/swig/3.0.12/javascript/jsc/cdata.i
+#usr/share/swig/3.0.12/javascript/jsc/complex.i
+#usr/share/swig/3.0.12/javascript/jsc/exception.i
+#usr/share/swig/3.0.12/javascript/jsc/javascript.swg
+#usr/share/swig/3.0.12/javascript/jsc/javascriptcode.swg
+#usr/share/swig/3.0.12/javascript/jsc/javascriptcomplex.swg
+#usr/share/swig/3.0.12/javascript/jsc/javascriptfragments.swg
+#usr/share/swig/3.0.12/javascript/jsc/javascripthelpers.swg
+#usr/share/swig/3.0.12/javascript/jsc/javascriptinit.swg
+#usr/share/swig/3.0.12/javascript/jsc/javascriptkw.swg
+#usr/share/swig/3.0.12/javascript/jsc/javascriptprimtypes.swg
+#usr/share/swig/3.0.12/javascript/jsc/javascriptrun.swg
+#usr/share/swig/3.0.12/javascript/jsc/javascriptruntime.swg
+#usr/share/swig/3.0.12/javascript/jsc/javascriptstrings.swg
+#usr/share/swig/3.0.12/javascript/jsc/javascripttypemaps.swg
+#usr/share/swig/3.0.12/javascript/jsc/std_common.i
+#usr/share/swig/3.0.12/javascript/jsc/std_complex.i
+#usr/share/swig/3.0.12/javascript/jsc/std_deque.i
+#usr/share/swig/3.0.12/javascript/jsc/std_except.i
+#usr/share/swig/3.0.12/javascript/jsc/std_map.i
+#usr/share/swig/3.0.12/javascript/jsc/std_pair.i
+#usr/share/swig/3.0.12/javascript/jsc/std_string.i
+#usr/share/swig/3.0.12/javascript/jsc/std_vector.i
+#usr/share/swig/3.0.12/javascript/jsc/stl.i
+#usr/share/swig/3.0.12/javascript/jsc/typemaps.i
+#usr/share/swig/3.0.12/javascript/v8
+#usr/share/swig/3.0.12/javascript/v8/arrays_javascript.i
+#usr/share/swig/3.0.12/javascript/v8/ccomplex.i
+#usr/share/swig/3.0.12/javascript/v8/cdata.i
+#usr/share/swig/3.0.12/javascript/v8/complex.i
+#usr/share/swig/3.0.12/javascript/v8/exception.i
+#usr/share/swig/3.0.12/javascript/v8/javascript.swg
+#usr/share/swig/3.0.12/javascript/v8/javascriptcode.swg
+#usr/share/swig/3.0.12/javascript/v8/javascriptcomplex.swg
+#usr/share/swig/3.0.12/javascript/v8/javascriptfragments.swg
+#usr/share/swig/3.0.12/javascript/v8/javascripthelpers.swg
+#usr/share/swig/3.0.12/javascript/v8/javascriptinit.swg
+#usr/share/swig/3.0.12/javascript/v8/javascriptkw.swg
+#usr/share/swig/3.0.12/javascript/v8/javascriptprimtypes.swg
+#usr/share/swig/3.0.12/javascript/v8/javascriptrun.swg
+#usr/share/swig/3.0.12/javascript/v8/javascriptruntime.swg
+#usr/share/swig/3.0.12/javascript/v8/javascriptstrings.swg
+#usr/share/swig/3.0.12/javascript/v8/javascripttypemaps.swg
+#usr/share/swig/3.0.12/javascript/v8/std_common.i
+#usr/share/swig/3.0.12/javascript/v8/std_complex.i
+#usr/share/swig/3.0.12/javascript/v8/std_deque.i
+#usr/share/swig/3.0.12/javascript/v8/std_except.i
+#usr/share/swig/3.0.12/javascript/v8/std_map.i
+#usr/share/swig/3.0.12/javascript/v8/std_pair.i
+#usr/share/swig/3.0.12/javascript/v8/std_string.i
+#usr/share/swig/3.0.12/javascript/v8/std_vector.i
+#usr/share/swig/3.0.12/javascript/v8/stl.i
+#usr/share/swig/3.0.12/javascript/v8/typemaps.i
+#usr/share/swig/3.0.12/lua
+#usr/share/swig/3.0.12/lua/_std_common.i
+#usr/share/swig/3.0.12/lua/carrays.i
+#usr/share/swig/3.0.12/lua/factory.i
+#usr/share/swig/3.0.12/lua/lua.swg
+#usr/share/swig/3.0.12/lua/lua_fnptr.i
+#usr/share/swig/3.0.12/lua/luakw.swg
+#usr/share/swig/3.0.12/lua/luarun.swg
+#usr/share/swig/3.0.12/lua/luaruntime.swg
+#usr/share/swig/3.0.12/lua/luatypemaps.swg
+#usr/share/swig/3.0.12/lua/std_common.i
+#usr/share/swig/3.0.12/lua/std_deque.i
+#usr/share/swig/3.0.12/lua/std_except.i
+#usr/share/swig/3.0.12/lua/std_map.i
+#usr/share/swig/3.0.12/lua/std_pair.i
+#usr/share/swig/3.0.12/lua/std_string.i
+#usr/share/swig/3.0.12/lua/std_vector.i
+#usr/share/swig/3.0.12/lua/stl.i
+#usr/share/swig/3.0.12/lua/typemaps.i
+#usr/share/swig/3.0.12/lua/wchar.i
+#usr/share/swig/3.0.12/math.i
+#usr/share/swig/3.0.12/modula3
+#usr/share/swig/3.0.12/modula3/modula3.swg
+#usr/share/swig/3.0.12/modula3/modula3head.swg
+#usr/share/swig/3.0.12/modula3/typemaps.i
+#usr/share/swig/3.0.12/mzscheme
+#usr/share/swig/3.0.12/mzscheme/mzrun.swg
+#usr/share/swig/3.0.12/mzscheme/mzscheme.swg
+#usr/share/swig/3.0.12/mzscheme/std_common.i
+#usr/share/swig/3.0.12/mzscheme/std_deque.i
+#usr/share/swig/3.0.12/mzscheme/std_map.i
+#usr/share/swig/3.0.12/mzscheme/std_pair.i
+#usr/share/swig/3.0.12/mzscheme/std_string.i
+#usr/share/swig/3.0.12/mzscheme/std_vector.i
+#usr/share/swig/3.0.12/mzscheme/stl.i
+#usr/share/swig/3.0.12/mzscheme/typemaps.i
+#usr/share/swig/3.0.12/ocaml
+#usr/share/swig/3.0.12/ocaml/carray.i
+#usr/share/swig/3.0.12/ocaml/class.swg
+#usr/share/swig/3.0.12/ocaml/cstring.i
+#usr/share/swig/3.0.12/ocaml/director.swg
+#usr/share/swig/3.0.12/ocaml/ocaml.i
+#usr/share/swig/3.0.12/ocaml/ocaml.swg
+#usr/share/swig/3.0.12/ocaml/ocamldec.swg
+#usr/share/swig/3.0.12/ocaml/ocamlkw.swg
+#usr/share/swig/3.0.12/ocaml/preamble.swg
+#usr/share/swig/3.0.12/ocaml/std_common.i
+#usr/share/swig/3.0.12/ocaml/std_complex.i
+#usr/share/swig/3.0.12/ocaml/std_deque.i
+#usr/share/swig/3.0.12/ocaml/std_list.i
+#usr/share/swig/3.0.12/ocaml/std_map.i
+#usr/share/swig/3.0.12/ocaml/std_pair.i
+#usr/share/swig/3.0.12/ocaml/std_string.i
+#usr/share/swig/3.0.12/ocaml/std_vector.i
+#usr/share/swig/3.0.12/ocaml/stl.i
+#usr/share/swig/3.0.12/ocaml/swig.ml
+#usr/share/swig/3.0.12/ocaml/swig.mli
+#usr/share/swig/3.0.12/ocaml/swigp4.ml
+#usr/share/swig/3.0.12/ocaml/typecheck.i
+#usr/share/swig/3.0.12/ocaml/typemaps.i
+#usr/share/swig/3.0.12/ocaml/typeregister.swg
+#usr/share/swig/3.0.12/octave
+#usr/share/swig/3.0.12/octave/attribute.i
+#usr/share/swig/3.0.12/octave/boost_shared_ptr.i
+#usr/share/swig/3.0.12/octave/carrays.i
+#usr/share/swig/3.0.12/octave/cdata.i
+#usr/share/swig/3.0.12/octave/cmalloc.i
+#usr/share/swig/3.0.12/octave/director.swg
+#usr/share/swig/3.0.12/octave/exception.i
+#usr/share/swig/3.0.12/octave/factory.i
+#usr/share/swig/3.0.12/octave/implicit.i
+#usr/share/swig/3.0.12/octave/octave.swg
+#usr/share/swig/3.0.12/octave/octcomplex.swg
+#usr/share/swig/3.0.12/octave/octcontainer.swg
+#usr/share/swig/3.0.12/octave/octfragments.swg
+#usr/share/swig/3.0.12/octave/octiterators.swg
+#usr/share/swig/3.0.12/octave/octopers.swg
+#usr/share/swig/3.0.12/octave/octprimtypes.swg
+#usr/share/swig/3.0.12/octave/octrun.swg
+#usr/share/swig/3.0.12/octave/octruntime.swg
+#usr/share/swig/3.0.12/octave/octstdcommon.swg
+#usr/share/swig/3.0.12/octave/octtypemaps.swg
+#usr/share/swig/3.0.12/octave/octuserdir.swg
+#usr/share/swig/3.0.12/octave/std_alloc.i
+#usr/share/swig/3.0.12/octave/std_basic_string.i
+#usr/share/swig/3.0.12/octave/std_carray.i
+#usr/share/swig/3.0.12/octave/std_char_traits.i
+#usr/share/swig/3.0.12/octave/std_common.i
+#usr/share/swig/3.0.12/octave/std_complex.i
+#usr/share/swig/3.0.12/octave/std_container.i
+#usr/share/swig/3.0.12/octave/std_deque.i
+#usr/share/swig/3.0.12/octave/std_except.i
+#usr/share/swig/3.0.12/octave/std_list.i
+#usr/share/swig/3.0.12/octave/std_map.i
+#usr/share/swig/3.0.12/octave/std_pair.i
+#usr/share/swig/3.0.12/octave/std_shared_ptr.i
+#usr/share/swig/3.0.12/octave/std_string.i
+#usr/share/swig/3.0.12/octave/std_vector.i
+#usr/share/swig/3.0.12/octave/std_wstring.i
+#usr/share/swig/3.0.12/octave/stl.i
+#usr/share/swig/3.0.12/octave/typemaps.i
+#usr/share/swig/3.0.12/perl5
+#usr/share/swig/3.0.12/perl5/Makefile.pl
+#usr/share/swig/3.0.12/perl5/attribute.i
+#usr/share/swig/3.0.12/perl5/carrays.i
+#usr/share/swig/3.0.12/perl5/cdata.i
+#usr/share/swig/3.0.12/perl5/cmalloc.i
+#usr/share/swig/3.0.12/perl5/cni.i
+#usr/share/swig/3.0.12/perl5/cpointer.i
+#usr/share/swig/3.0.12/perl5/cstring.i
+#usr/share/swig/3.0.12/perl5/director.swg
+#usr/share/swig/3.0.12/perl5/exception.i
+#usr/share/swig/3.0.12/perl5/factory.i
+#usr/share/swig/3.0.12/perl5/jstring.i
+#usr/share/swig/3.0.12/perl5/noembed.h
+#usr/share/swig/3.0.12/perl5/perl5.swg
+#usr/share/swig/3.0.12/perl5/perlerrors.swg
+#usr/share/swig/3.0.12/perl5/perlfragments.swg
+#usr/share/swig/3.0.12/perl5/perlhead.swg
+#usr/share/swig/3.0.12/perl5/perlinit.swg
+#usr/share/swig/3.0.12/perl5/perlkw.swg
+#usr/share/swig/3.0.12/perl5/perlmacros.swg
+#usr/share/swig/3.0.12/perl5/perlmain.i
+#usr/share/swig/3.0.12/perl5/perlopers.swg
+#usr/share/swig/3.0.12/perl5/perlprimtypes.swg
+#usr/share/swig/3.0.12/perl5/perlrun.swg
+#usr/share/swig/3.0.12/perl5/perlruntime.swg
+#usr/share/swig/3.0.12/perl5/perlstrings.swg
+#usr/share/swig/3.0.12/perl5/perltypemaps.swg
+#usr/share/swig/3.0.12/perl5/perluserdir.swg
+#usr/share/swig/3.0.12/perl5/reference.i
+#usr/share/swig/3.0.12/perl5/std_common.i
+#usr/share/swig/3.0.12/perl5/std_deque.i
+#usr/share/swig/3.0.12/perl5/std_except.i
+#usr/share/swig/3.0.12/perl5/std_list.i
+#usr/share/swig/3.0.12/perl5/std_map.i
+#usr/share/swig/3.0.12/perl5/std_pair.i
+#usr/share/swig/3.0.12/perl5/std_string.i
+#usr/share/swig/3.0.12/perl5/std_vector.i
+#usr/share/swig/3.0.12/perl5/stl.i
+#usr/share/swig/3.0.12/perl5/typemaps.i
+#usr/share/swig/3.0.12/php
+#usr/share/swig/3.0.12/php/const.i
+#usr/share/swig/3.0.12/php/director.swg
+#usr/share/swig/3.0.12/php/factory.i
+#usr/share/swig/3.0.12/php/globalvar.i
+#usr/share/swig/3.0.12/php/php.swg
+#usr/share/swig/3.0.12/php/phpinit.swg
+#usr/share/swig/3.0.12/php/phpkw.swg
+#usr/share/swig/3.0.12/php/phppointers.i
+#usr/share/swig/3.0.12/php/phprun.swg
+#usr/share/swig/3.0.12/php/std_common.i
+#usr/share/swig/3.0.12/php/std_deque.i
+#usr/share/swig/3.0.12/php/std_map.i
+#usr/share/swig/3.0.12/php/std_pair.i
+#usr/share/swig/3.0.12/php/std_string.i
+#usr/share/swig/3.0.12/php/std_vector.i
+#usr/share/swig/3.0.12/php/stl.i
+#usr/share/swig/3.0.12/php/typemaps.i
+#usr/share/swig/3.0.12/php/utils.i
+#usr/share/swig/3.0.12/php5
+#usr/share/swig/3.0.12/php5/const.i
+#usr/share/swig/3.0.12/php5/director.swg
+#usr/share/swig/3.0.12/php5/factory.i
+#usr/share/swig/3.0.12/php5/globalvar.i
+#usr/share/swig/3.0.12/php5/php.swg
+#usr/share/swig/3.0.12/php5/phpinit.swg
+#usr/share/swig/3.0.12/php5/phpkw.swg
+#usr/share/swig/3.0.12/php5/phppointers.i
+#usr/share/swig/3.0.12/php5/phprun.swg
+#usr/share/swig/3.0.12/php5/std_common.i
+#usr/share/swig/3.0.12/php5/std_deque.i
+#usr/share/swig/3.0.12/php5/std_map.i
+#usr/share/swig/3.0.12/php5/std_pair.i
+#usr/share/swig/3.0.12/php5/std_string.i
+#usr/share/swig/3.0.12/php5/std_vector.i
+#usr/share/swig/3.0.12/php5/stl.i
+#usr/share/swig/3.0.12/php5/typemaps.i
+#usr/share/swig/3.0.12/php5/utils.i
+#usr/share/swig/3.0.12/pike
+#usr/share/swig/3.0.12/pike/pike.swg
+#usr/share/swig/3.0.12/pike/pikekw.swg
+#usr/share/swig/3.0.12/pike/pikerun.swg
+#usr/share/swig/3.0.12/pike/std_string.i
+#usr/share/swig/3.0.12/pointer.i
+#usr/share/swig/3.0.12/python
+#usr/share/swig/3.0.12/python/argcargv.i
+#usr/share/swig/3.0.12/python/attribute.i
+#usr/share/swig/3.0.12/python/boost_shared_ptr.i
+#usr/share/swig/3.0.12/python/builtin.swg
+#usr/share/swig/3.0.12/python/carrays.i
+#usr/share/swig/3.0.12/python/ccomplex.i
+#usr/share/swig/3.0.12/python/cdata.i
+#usr/share/swig/3.0.12/python/cmalloc.i
+#usr/share/swig/3.0.12/python/cni.i
+#usr/share/swig/3.0.12/python/complex.i
+#usr/share/swig/3.0.12/python/cpointer.i
+#usr/share/swig/3.0.12/python/cstring.i
+#usr/share/swig/3.0.12/python/cwstring.i
+#usr/share/swig/3.0.12/python/defarg.swg
+#usr/share/swig/3.0.12/python/director.swg
+#usr/share/swig/3.0.12/python/embed.i
+#usr/share/swig/3.0.12/python/exception.i
+#usr/share/swig/3.0.12/python/factory.i
+#usr/share/swig/3.0.12/python/file.i
+#usr/share/swig/3.0.12/python/implicit.i
+#usr/share/swig/3.0.12/python/jstring.i
+#usr/share/swig/3.0.12/python/pyabc.i
+#usr/share/swig/3.0.12/python/pyapi.swg
+#usr/share/swig/3.0.12/python/pybackward.swg
+#usr/share/swig/3.0.12/python/pybuffer.i
+#usr/share/swig/3.0.12/python/pyclasses.swg
+#usr/share/swig/3.0.12/python/pycomplex.swg
+#usr/share/swig/3.0.12/python/pycontainer.swg
+#usr/share/swig/3.0.12/python/pydocs.swg
+#usr/share/swig/3.0.12/python/pyerrors.swg
+#usr/share/swig/3.0.12/python/pyfragments.swg
+#usr/share/swig/3.0.12/python/pyhead.swg
+#usr/share/swig/3.0.12/python/pyinit.swg
+#usr/share/swig/3.0.12/python/pyiterators.swg
+#usr/share/swig/3.0.12/python/pymacros.swg
+#usr/share/swig/3.0.12/python/pyname_compat.i
+#usr/share/swig/3.0.12/python/pyopers.swg
+#usr/share/swig/3.0.12/python/pyprimtypes.swg
+#usr/share/swig/3.0.12/python/pyrun.swg
+#usr/share/swig/3.0.12/python/pyruntime.swg
+#usr/share/swig/3.0.12/python/pystdcommon.swg
+#usr/share/swig/3.0.12/python/pystrings.swg
+#usr/share/swig/3.0.12/python/python.swg
+#usr/share/swig/3.0.12/python/pythonkw.swg
+#usr/share/swig/3.0.12/python/pythreads.swg
+#usr/share/swig/3.0.12/python/pytuplehlp.swg
+#usr/share/swig/3.0.12/python/pytypemaps.swg
+#usr/share/swig/3.0.12/python/pyuserdir.swg
+#usr/share/swig/3.0.12/python/pywstrings.swg
+#usr/share/swig/3.0.12/python/std_alloc.i
+#usr/share/swig/3.0.12/python/std_array.i
+#usr/share/swig/3.0.12/python/std_auto_ptr.i
+#usr/share/swig/3.0.12/python/std_basic_string.i
+#usr/share/swig/3.0.12/python/std_carray.i
+#usr/share/swig/3.0.12/python/std_char_traits.i
+#usr/share/swig/3.0.12/python/std_common.i
+#usr/share/swig/3.0.12/python/std_complex.i
+#usr/share/swig/3.0.12/python/std_container.i
+#usr/share/swig/3.0.12/python/std_deque.i
+#usr/share/swig/3.0.12/python/std_except.i
+#usr/share/swig/3.0.12/python/std_ios.i
+#usr/share/swig/3.0.12/python/std_iostream.i
+#usr/share/swig/3.0.12/python/std_list.i
+#usr/share/swig/3.0.12/python/std_map.i
+#usr/share/swig/3.0.12/python/std_multimap.i
+#usr/share/swig/3.0.12/python/std_multiset.i
+#usr/share/swig/3.0.12/python/std_pair.i
+#usr/share/swig/3.0.12/python/std_set.i
+#usr/share/swig/3.0.12/python/std_shared_ptr.i
+#usr/share/swig/3.0.12/python/std_sstream.i
+#usr/share/swig/3.0.12/python/std_streambuf.i
+#usr/share/swig/3.0.12/python/std_string.i
+#usr/share/swig/3.0.12/python/std_unordered_map.i
+#usr/share/swig/3.0.12/python/std_unordered_multimap.i
+#usr/share/swig/3.0.12/python/std_unordered_multiset.i
+#usr/share/swig/3.0.12/python/std_unordered_set.i
+#usr/share/swig/3.0.12/python/std_vector.i
+#usr/share/swig/3.0.12/python/std_vectora.i
+#usr/share/swig/3.0.12/python/std_wios.i
+#usr/share/swig/3.0.12/python/std_wiostream.i
+#usr/share/swig/3.0.12/python/std_wsstream.i
+#usr/share/swig/3.0.12/python/std_wstreambuf.i
+#usr/share/swig/3.0.12/python/std_wstring.i
+#usr/share/swig/3.0.12/python/stl.i
+#usr/share/swig/3.0.12/python/typemaps.i
+#usr/share/swig/3.0.12/python/wchar.i
+#usr/share/swig/3.0.12/r
+#usr/share/swig/3.0.12/r/boost_shared_ptr.i
+#usr/share/swig/3.0.12/r/cdata.i
+#usr/share/swig/3.0.12/r/exception.i
+#usr/share/swig/3.0.12/r/r.swg
+#usr/share/swig/3.0.12/r/rcontainer.swg
+#usr/share/swig/3.0.12/r/rfragments.swg
+#usr/share/swig/3.0.12/r/rkw.swg
+#usr/share/swig/3.0.12/r/ropers.swg
+#usr/share/swig/3.0.12/r/rrun.swg
+#usr/share/swig/3.0.12/r/rstdcommon.swg
+#usr/share/swig/3.0.12/r/rtype.swg
+#usr/share/swig/3.0.12/r/srun.swg
+#usr/share/swig/3.0.12/r/std_alloc.i
+#usr/share/swig/3.0.12/r/std_common.i
+#usr/share/swig/3.0.12/r/std_container.i
+#usr/share/swig/3.0.12/r/std_deque.i
+#usr/share/swig/3.0.12/r/std_except.i
+#usr/share/swig/3.0.12/r/std_list.i
+#usr/share/swig/3.0.12/r/std_map.i
+#usr/share/swig/3.0.12/r/std_pair.i
+#usr/share/swig/3.0.12/r/std_string.i
+#usr/share/swig/3.0.12/r/std_vector.i
+#usr/share/swig/3.0.12/r/stl.i
+#usr/share/swig/3.0.12/r/typemaps.i
+#usr/share/swig/3.0.12/ruby
+#usr/share/swig/3.0.12/ruby/Makefile.swig
+#usr/share/swig/3.0.12/ruby/argcargv.i
+#usr/share/swig/3.0.12/ruby/attribute.i
+#usr/share/swig/3.0.12/ruby/boost_shared_ptr.i
+#usr/share/swig/3.0.12/ruby/carrays.i
+#usr/share/swig/3.0.12/ruby/cdata.i
+#usr/share/swig/3.0.12/ruby/cmalloc.i
+#usr/share/swig/3.0.12/ruby/cni.i
+#usr/share/swig/3.0.12/ruby/cpointer.i
+#usr/share/swig/3.0.12/ruby/cstring.i
+#usr/share/swig/3.0.12/ruby/director.swg
+#usr/share/swig/3.0.12/ruby/embed.i
+#usr/share/swig/3.0.12/ruby/exception.i
+#usr/share/swig/3.0.12/ruby/extconf.rb
+#usr/share/swig/3.0.12/ruby/factory.i
+#usr/share/swig/3.0.12/ruby/file.i
+#usr/share/swig/3.0.12/ruby/jstring.i
+#usr/share/swig/3.0.12/ruby/progargcargv.i
+#usr/share/swig/3.0.12/ruby/ruby.swg
+#usr/share/swig/3.0.12/ruby/rubyapi.swg
+#usr/share/swig/3.0.12/ruby/rubyautodoc.swg
+#usr/share/swig/3.0.12/ruby/rubyclasses.swg
+#usr/share/swig/3.0.12/ruby/rubycomplex.swg
+#usr/share/swig/3.0.12/ruby/rubycontainer.swg
+#usr/share/swig/3.0.12/ruby/rubycontainer_extended.swg
+#usr/share/swig/3.0.12/ruby/rubydef.swg
+#usr/share/swig/3.0.12/ruby/rubyerrors.swg
+#usr/share/swig/3.0.12/ruby/rubyfragments.swg
+#usr/share/swig/3.0.12/ruby/rubyhead.swg
+#usr/share/swig/3.0.12/ruby/rubyinit.swg
+#usr/share/swig/3.0.12/ruby/rubyiterators.swg
+#usr/share/swig/3.0.12/ruby/rubykw.swg
+#usr/share/swig/3.0.12/ruby/rubymacros.swg
+#usr/share/swig/3.0.12/ruby/rubyopers.swg
+#usr/share/swig/3.0.12/ruby/rubyprimtypes.swg
+#usr/share/swig/3.0.12/ruby/rubyrun.swg
+#usr/share/swig/3.0.12/ruby/rubyruntime.swg
+#usr/share/swig/3.0.12/ruby/rubystdautodoc.swg
+#usr/share/swig/3.0.12/ruby/rubystdcommon.swg
+#usr/share/swig/3.0.12/ruby/rubystdfunctors.swg
+#usr/share/swig/3.0.12/ruby/rubystrings.swg
+#usr/share/swig/3.0.12/ruby/rubytracking.swg
+#usr/share/swig/3.0.12/ruby/rubytypemaps.swg
+#usr/share/swig/3.0.12/ruby/rubyuserdir.swg
+#usr/share/swig/3.0.12/ruby/rubywstrings.swg
+#usr/share/swig/3.0.12/ruby/std_alloc.i
+#usr/share/swig/3.0.12/ruby/std_array.i
+#usr/share/swig/3.0.12/ruby/std_basic_string.i
+#usr/share/swig/3.0.12/ruby/std_char_traits.i
+#usr/share/swig/3.0.12/ruby/std_common.i
+#usr/share/swig/3.0.12/ruby/std_complex.i
+#usr/share/swig/3.0.12/ruby/std_container.i
+#usr/share/swig/3.0.12/ruby/std_deque.i
+#usr/share/swig/3.0.12/ruby/std_except.i
+#usr/share/swig/3.0.12/ruby/std_functors.i
+#usr/share/swig/3.0.12/ruby/std_ios.i
+#usr/share/swig/3.0.12/ruby/std_iostream.i
+#usr/share/swig/3.0.12/ruby/std_list.i
+#usr/share/swig/3.0.12/ruby/std_map.i
+#usr/share/swig/3.0.12/ruby/std_multimap.i
+#usr/share/swig/3.0.12/ruby/std_multiset.i
+#usr/share/swig/3.0.12/ruby/std_pair.i
+#usr/share/swig/3.0.12/ruby/std_queue.i
+#usr/share/swig/3.0.12/ruby/std_set.i
+#usr/share/swig/3.0.12/ruby/std_shared_ptr.i
+#usr/share/swig/3.0.12/ruby/std_sstream.i
+#usr/share/swig/3.0.12/ruby/std_stack.i
+#usr/share/swig/3.0.12/ruby/std_streambuf.i
+#usr/share/swig/3.0.12/ruby/std_string.i
+#usr/share/swig/3.0.12/ruby/std_vector.i
+#usr/share/swig/3.0.12/ruby/std_vectora.i
+#usr/share/swig/3.0.12/ruby/std_wstring.i
+#usr/share/swig/3.0.12/ruby/stl.i
+#usr/share/swig/3.0.12/ruby/timeval.i
+#usr/share/swig/3.0.12/ruby/typemaps.i
+#usr/share/swig/3.0.12/runtime.swg
+#usr/share/swig/3.0.12/scilab
+#usr/share/swig/3.0.12/scilab/boost_shared_ptr.i
+#usr/share/swig/3.0.12/scilab/carrays.i
+#usr/share/swig/3.0.12/scilab/cmalloc.i
+#usr/share/swig/3.0.12/scilab/cpointer.i
+#usr/share/swig/3.0.12/scilab/exception.i
+#usr/share/swig/3.0.12/scilab/matrix.i
+#usr/share/swig/3.0.12/scilab/sciarray.swg
+#usr/share/swig/3.0.12/scilab/scibool.swg
+#usr/share/swig/3.0.12/scilab/scichar.swg
+#usr/share/swig/3.0.12/scilab/scicontainer.swg
+#usr/share/swig/3.0.12/scilab/scidouble.swg
+#usr/share/swig/3.0.12/scilab/scienum.swg
+#usr/share/swig/3.0.12/scilab/sciexception.swg
+#usr/share/swig/3.0.12/scilab/scifloat.swg
+#usr/share/swig/3.0.12/scilab/sciint.swg
+#usr/share/swig/3.0.12/scilab/sciiterators.swg
+#usr/share/swig/3.0.12/scilab/scilab.swg
+#usr/share/swig/3.0.12/scilab/scilist.swg
+#usr/share/swig/3.0.12/scilab/scilong.swg
+#usr/share/swig/3.0.12/scilab/scilonglong.swg
+#usr/share/swig/3.0.12/scilab/scimacros.swg
+#usr/share/swig/3.0.12/scilab/scimatrixbool.swg
+#usr/share/swig/3.0.12/scilab/scimatrixchar.swg
+#usr/share/swig/3.0.12/scilab/scimatrixdouble.swg
+#usr/share/swig/3.0.12/scilab/scimatrixint.swg
+#usr/share/swig/3.0.12/scilab/scimisctypes.swg
+#usr/share/swig/3.0.12/scilab/scipointer.swg
+#usr/share/swig/3.0.12/scilab/sciprimtypes.swg
+#usr/share/swig/3.0.12/scilab/scirun.swg
+#usr/share/swig/3.0.12/scilab/sciruntime.swg
+#usr/share/swig/3.0.12/scilab/scisequence.swg
+#usr/share/swig/3.0.12/scilab/scisequencebool.swg
+#usr/share/swig/3.0.12/scilab/scisequencedouble.swg
+#usr/share/swig/3.0.12/scilab/scisequencefloat.swg
+#usr/share/swig/3.0.12/scilab/scisequenceint.swg
+#usr/share/swig/3.0.12/scilab/scisequencepointer.swg
+#usr/share/swig/3.0.12/scilab/scisequencestring.swg
+#usr/share/swig/3.0.12/scilab/scishort.swg
+#usr/share/swig/3.0.12/scilab/scisignedchar.swg
+#usr/share/swig/3.0.12/scilab/scistdcommon.swg
+#usr/share/swig/3.0.12/scilab/scitypemaps.swg
+#usr/share/swig/3.0.12/scilab/sciunsignedchar.swg
+#usr/share/swig/3.0.12/scilab/sciunsignedint.swg
+#usr/share/swig/3.0.12/scilab/sciunsignedlong.swg
+#usr/share/swig/3.0.12/scilab/sciunsignedshort.swg
+#usr/share/swig/3.0.12/scilab/std_alloc.i
+#usr/share/swig/3.0.12/scilab/std_basic_string.i
+#usr/share/swig/3.0.12/scilab/std_char_traits.i
+#usr/share/swig/3.0.12/scilab/std_common.i
+#usr/share/swig/3.0.12/scilab/std_container.i
+#usr/share/swig/3.0.12/scilab/std_deque.i
+#usr/share/swig/3.0.12/scilab/std_except.i
+#usr/share/swig/3.0.12/scilab/std_list.i
+#usr/share/swig/3.0.12/scilab/std_map.i
+#usr/share/swig/3.0.12/scilab/std_multiset.i
+#usr/share/swig/3.0.12/scilab/std_pair.i
+#usr/share/swig/3.0.12/scilab/std_set.i
+#usr/share/swig/3.0.12/scilab/std_string.i
+#usr/share/swig/3.0.12/scilab/std_vector.i
+#usr/share/swig/3.0.12/scilab/stl.i
+#usr/share/swig/3.0.12/scilab/typemaps.i
+#usr/share/swig/3.0.12/shared_ptr.i
+#usr/share/swig/3.0.12/std
+#usr/share/swig/3.0.12/std/_std_deque.i
+#usr/share/swig/3.0.12/std/std_alloc.i
+#usr/share/swig/3.0.12/std/std_array.i
+#usr/share/swig/3.0.12/std/std_basic_string.i
+#usr/share/swig/3.0.12/std/std_carray.swg
+#usr/share/swig/3.0.12/std/std_char_traits.i
+#usr/share/swig/3.0.12/std/std_common.i
+#usr/share/swig/3.0.12/std/std_container.i
+#usr/share/swig/3.0.12/std/std_deque.i
+#usr/share/swig/3.0.12/std/std_except.i
+#usr/share/swig/3.0.12/std/std_ios.i
+#usr/share/swig/3.0.12/std/std_iostream.i
+#usr/share/swig/3.0.12/std/std_list.i
+#usr/share/swig/3.0.12/std/std_map.i
+#usr/share/swig/3.0.12/std/std_multimap.i
+#usr/share/swig/3.0.12/std/std_multiset.i
+#usr/share/swig/3.0.12/std/std_pair.i
+#usr/share/swig/3.0.12/std/std_queue.i
+#usr/share/swig/3.0.12/std/std_set.i
+#usr/share/swig/3.0.12/std/std_sstream.i
+#usr/share/swig/3.0.12/std/std_stack.i
+#usr/share/swig/3.0.12/std/std_streambuf.i
+#usr/share/swig/3.0.12/std/std_string.i
+#usr/share/swig/3.0.12/std/std_unordered_map.i
+#usr/share/swig/3.0.12/std/std_unordered_multimap.i
+#usr/share/swig/3.0.12/std/std_unordered_multiset.i
+#usr/share/swig/3.0.12/std/std_unordered_set.i
+#usr/share/swig/3.0.12/std/std_vector.i
+#usr/share/swig/3.0.12/std/std_vectora.i
+#usr/share/swig/3.0.12/std/std_wios.i
+#usr/share/swig/3.0.12/std/std_wiostream.i
+#usr/share/swig/3.0.12/std/std_wsstream.i
+#usr/share/swig/3.0.12/std/std_wstreambuf.i
+#usr/share/swig/3.0.12/std/std_wstring.i
+#usr/share/swig/3.0.12/std_except.i
+#usr/share/swig/3.0.12/stdint.i
+#usr/share/swig/3.0.12/stl.i
+#usr/share/swig/3.0.12/swig.swg
+#usr/share/swig/3.0.12/swigarch.i
+#usr/share/swig/3.0.12/swigerrors.swg
+#usr/share/swig/3.0.12/swiginit.swg
+#usr/share/swig/3.0.12/swiglabels.swg
+#usr/share/swig/3.0.12/swigrun.i
+#usr/share/swig/3.0.12/swigrun.swg
+#usr/share/swig/3.0.12/swigwarn.swg
+#usr/share/swig/3.0.12/swigwarnings.swg
+#usr/share/swig/3.0.12/tcl
+#usr/share/swig/3.0.12/tcl/attribute.i
+#usr/share/swig/3.0.12/tcl/carrays.i
+#usr/share/swig/3.0.12/tcl/cdata.i
+#usr/share/swig/3.0.12/tcl/cmalloc.i
+#usr/share/swig/3.0.12/tcl/cni.i
+#usr/share/swig/3.0.12/tcl/cpointer.i
+#usr/share/swig/3.0.12/tcl/cstring.i
+#usr/share/swig/3.0.12/tcl/cwstring.i
+#usr/share/swig/3.0.12/tcl/exception.i
+#usr/share/swig/3.0.12/tcl/factory.i
+#usr/share/swig/3.0.12/tcl/jstring.i
+#usr/share/swig/3.0.12/tcl/std_common.i
+#usr/share/swig/3.0.12/tcl/std_deque.i
+#usr/share/swig/3.0.12/tcl/std_except.i
+#usr/share/swig/3.0.12/tcl/std_map.i
+#usr/share/swig/3.0.12/tcl/std_pair.i
+#usr/share/swig/3.0.12/tcl/std_string.i
+#usr/share/swig/3.0.12/tcl/std_vector.i
+#usr/share/swig/3.0.12/tcl/std_wstring.i
+#usr/share/swig/3.0.12/tcl/stl.i
+#usr/share/swig/3.0.12/tcl/tcl8.swg
+#usr/share/swig/3.0.12/tcl/tclapi.swg
+#usr/share/swig/3.0.12/tcl/tclerrors.swg
+#usr/share/swig/3.0.12/tcl/tclfragments.swg
+#usr/share/swig/3.0.12/tcl/tclinit.swg
+#usr/share/swig/3.0.12/tcl/tclinterp.i
+#usr/share/swig/3.0.12/tcl/tclkw.swg
+#usr/share/swig/3.0.12/tcl/tclmacros.swg
+#usr/share/swig/3.0.12/tcl/tclopers.swg
+#usr/share/swig/3.0.12/tcl/tclprimtypes.swg
+#usr/share/swig/3.0.12/tcl/tclresult.i
+#usr/share/swig/3.0.12/tcl/tclrun.swg
+#usr/share/swig/3.0.12/tcl/tclruntime.swg
+#usr/share/swig/3.0.12/tcl/tclsh.i
+#usr/share/swig/3.0.12/tcl/tclstrings.swg
+#usr/share/swig/3.0.12/tcl/tcltypemaps.swg
+#usr/share/swig/3.0.12/tcl/tcluserdir.swg
+#usr/share/swig/3.0.12/tcl/tclwstrings.swg
+#usr/share/swig/3.0.12/tcl/typemaps.i
+#usr/share/swig/3.0.12/tcl/wish.i
+#usr/share/swig/3.0.12/typemaps
+#usr/share/swig/3.0.12/typemaps/attribute.swg
+#usr/share/swig/3.0.12/typemaps/carrays.swg
+#usr/share/swig/3.0.12/typemaps/cdata.swg
+#usr/share/swig/3.0.12/typemaps/cmalloc.swg
+#usr/share/swig/3.0.12/typemaps/cpointer.swg
+#usr/share/swig/3.0.12/typemaps/cstring.swg
+#usr/share/swig/3.0.12/typemaps/cstrings.swg
+#usr/share/swig/3.0.12/typemaps/cwstring.swg
+#usr/share/swig/3.0.12/typemaps/enumint.swg
+#usr/share/swig/3.0.12/typemaps/exception.swg
+#usr/share/swig/3.0.12/typemaps/factory.swg
+#usr/share/swig/3.0.12/typemaps/fragments.swg
+#usr/share/swig/3.0.12/typemaps/implicit.swg
+#usr/share/swig/3.0.12/typemaps/inoutlist.swg
+#usr/share/swig/3.0.12/typemaps/misctypes.swg
+#usr/share/swig/3.0.12/typemaps/primtypes.swg
+#usr/share/swig/3.0.12/typemaps/ptrtypes.swg
+#usr/share/swig/3.0.12/typemaps/std_except.swg
+#usr/share/swig/3.0.12/typemaps/std_string.swg
+#usr/share/swig/3.0.12/typemaps/std_strings.swg
+#usr/share/swig/3.0.12/typemaps/std_wstring.swg
+#usr/share/swig/3.0.12/typemaps/string.swg
+#usr/share/swig/3.0.12/typemaps/strings.swg
+#usr/share/swig/3.0.12/typemaps/swigmacros.swg
+#usr/share/swig/3.0.12/typemaps/swigobject.swg
+#usr/share/swig/3.0.12/typemaps/swigtype.swg
+#usr/share/swig/3.0.12/typemaps/swigtypemaps.swg
+#usr/share/swig/3.0.12/typemaps/typemaps.swg
+#usr/share/swig/3.0.12/typemaps/valtypes.swg
+#usr/share/swig/3.0.12/typemaps/void.swg
+#usr/share/swig/3.0.12/typemaps/wstring.swg
+#usr/share/swig/3.0.12/uffi
+#usr/share/swig/3.0.12/uffi/uffi.swg
+#usr/share/swig/3.0.12/wchar.i
+#usr/share/swig/3.0.12/windows.i
diff --git a/config/rootfiles/common/tcpwrapper b/config/rootfiles/common/tcpwrapper
deleted file mode 100644
index febe49722..000000000
--- a/config/rootfiles/common/tcpwrapper
+++ /dev/null
@@ -1,21 +0,0 @@
-#usr/include/tcpd.h
-#usr/lib/libwrap.a
-usr/lib/libwrap.so
-usr/lib/libwrap.so.0
-usr/lib/libwrap.so.0.7.6
-#usr/sbin/safe_finger
-#usr/sbin/tcpd
-#usr/sbin/tcpdchk
-#usr/sbin/tcpdmatch
-#usr/sbin/try-from
-#usr/share/man/man3/hosts_access.3
-#usr/share/man/man3/hosts_ctl.3
-#usr/share/man/man3/request_init.3
-#usr/share/man/man3/request_set.3
-#usr/share/man/man5/hosts_access.5
-#usr/share/man/man5/hosts_options.5
-#usr/share/man/man8/safe_finger.8
-#usr/share/man/man8/tcpd.8
-#usr/share/man/man8/tcpdchk.8
-#usr/share/man/man8/tcpdmatch.8
-#usr/share/man/man8/try-from.8
diff --git a/config/rootfiles/common/x86_64/binutils b/config/rootfiles/common/x86_64/binutils
index 88c1da36e..42c82cbd7 100644
--- a/config/rootfiles/common/x86_64/binutils
+++ b/config/rootfiles/common/x86_64/binutils
@@ -25,91 +25,146 @@
 #usr/lib/ldscripts/elf32_x86_64.x
 #usr/lib/ldscripts/elf32_x86_64.xbn
 #usr/lib/ldscripts/elf32_x86_64.xc
+#usr/lib/ldscripts/elf32_x86_64.xce
 #usr/lib/ldscripts/elf32_x86_64.xd
 #usr/lib/ldscripts/elf32_x86_64.xdc
+#usr/lib/ldscripts/elf32_x86_64.xdce
+#usr/lib/ldscripts/elf32_x86_64.xde
 #usr/lib/ldscripts/elf32_x86_64.xdw
+#usr/lib/ldscripts/elf32_x86_64.xdwe
+#usr/lib/ldscripts/elf32_x86_64.xe
 #usr/lib/ldscripts/elf32_x86_64.xn
 #usr/lib/ldscripts/elf32_x86_64.xr
 #usr/lib/ldscripts/elf32_x86_64.xs
 #usr/lib/ldscripts/elf32_x86_64.xsc
+#usr/lib/ldscripts/elf32_x86_64.xsce
+#usr/lib/ldscripts/elf32_x86_64.xse
 #usr/lib/ldscripts/elf32_x86_64.xsw
+#usr/lib/ldscripts/elf32_x86_64.xswe
 #usr/lib/ldscripts/elf32_x86_64.xu
 #usr/lib/ldscripts/elf32_x86_64.xw
+#usr/lib/ldscripts/elf32_x86_64.xwe
 #usr/lib/ldscripts/elf_i386.x
 #usr/lib/ldscripts/elf_i386.xbn
 #usr/lib/ldscripts/elf_i386.xc
+#usr/lib/ldscripts/elf_i386.xce
 #usr/lib/ldscripts/elf_i386.xd
 #usr/lib/ldscripts/elf_i386.xdc
+#usr/lib/ldscripts/elf_i386.xdce
+#usr/lib/ldscripts/elf_i386.xde
 #usr/lib/ldscripts/elf_i386.xdw
+#usr/lib/ldscripts/elf_i386.xdwe
+#usr/lib/ldscripts/elf_i386.xe
 #usr/lib/ldscripts/elf_i386.xn
 #usr/lib/ldscripts/elf_i386.xr
 #usr/lib/ldscripts/elf_i386.xs
 #usr/lib/ldscripts/elf_i386.xsc
+#usr/lib/ldscripts/elf_i386.xsce
+#usr/lib/ldscripts/elf_i386.xse
 #usr/lib/ldscripts/elf_i386.xsw
+#usr/lib/ldscripts/elf_i386.xswe
 #usr/lib/ldscripts/elf_i386.xu
 #usr/lib/ldscripts/elf_i386.xw
+#usr/lib/ldscripts/elf_i386.xwe
 #usr/lib/ldscripts/elf_iamcu.x
 #usr/lib/ldscripts/elf_iamcu.xbn
 #usr/lib/ldscripts/elf_iamcu.xc
+#usr/lib/ldscripts/elf_iamcu.xce
 #usr/lib/ldscripts/elf_iamcu.xd
 #usr/lib/ldscripts/elf_iamcu.xdc
+#usr/lib/ldscripts/elf_iamcu.xdce
+#usr/lib/ldscripts/elf_iamcu.xde
 #usr/lib/ldscripts/elf_iamcu.xdw
+#usr/lib/ldscripts/elf_iamcu.xdwe
+#usr/lib/ldscripts/elf_iamcu.xe
 #usr/lib/ldscripts/elf_iamcu.xn
 #usr/lib/ldscripts/elf_iamcu.xr
 #usr/lib/ldscripts/elf_iamcu.xs
 #usr/lib/ldscripts/elf_iamcu.xsc
+#usr/lib/ldscripts/elf_iamcu.xsce
+#usr/lib/ldscripts/elf_iamcu.xse
 #usr/lib/ldscripts/elf_iamcu.xsw
+#usr/lib/ldscripts/elf_iamcu.xswe
 #usr/lib/ldscripts/elf_iamcu.xu
 #usr/lib/ldscripts/elf_iamcu.xw
+#usr/lib/ldscripts/elf_iamcu.xwe
 #usr/lib/ldscripts/elf_k1om.x
 #usr/lib/ldscripts/elf_k1om.xbn
 #usr/lib/ldscripts/elf_k1om.xc
+#usr/lib/ldscripts/elf_k1om.xce
 #usr/lib/ldscripts/elf_k1om.xd
 #usr/lib/ldscripts/elf_k1om.xdc
+#usr/lib/ldscripts/elf_k1om.xdce
+#usr/lib/ldscripts/elf_k1om.xde
 #usr/lib/ldscripts/elf_k1om.xdw
+#usr/lib/ldscripts/elf_k1om.xdwe
+#usr/lib/ldscripts/elf_k1om.xe
 #usr/lib/ldscripts/elf_k1om.xn
 #usr/lib/ldscripts/elf_k1om.xr
 #usr/lib/ldscripts/elf_k1om.xs
 #usr/lib/ldscripts/elf_k1om.xsc
+#usr/lib/ldscripts/elf_k1om.xsce
+#usr/lib/ldscripts/elf_k1om.xse
 #usr/lib/ldscripts/elf_k1om.xsw
+#usr/lib/ldscripts/elf_k1om.xswe
 #usr/lib/ldscripts/elf_k1om.xu
 #usr/lib/ldscripts/elf_k1om.xw
+#usr/lib/ldscripts/elf_k1om.xwe
 #usr/lib/ldscripts/elf_l1om.x
 #usr/lib/ldscripts/elf_l1om.xbn
 #usr/lib/ldscripts/elf_l1om.xc
+#usr/lib/ldscripts/elf_l1om.xce
 #usr/lib/ldscripts/elf_l1om.xd
 #usr/lib/ldscripts/elf_l1om.xdc
+#usr/lib/ldscripts/elf_l1om.xdce
+#usr/lib/ldscripts/elf_l1om.xde
 #usr/lib/ldscripts/elf_l1om.xdw
+#usr/lib/ldscripts/elf_l1om.xdwe
+#usr/lib/ldscripts/elf_l1om.xe
 #usr/lib/ldscripts/elf_l1om.xn
 #usr/lib/ldscripts/elf_l1om.xr
 #usr/lib/ldscripts/elf_l1om.xs
 #usr/lib/ldscripts/elf_l1om.xsc
+#usr/lib/ldscripts/elf_l1om.xsce
+#usr/lib/ldscripts/elf_l1om.xse
 #usr/lib/ldscripts/elf_l1om.xsw
+#usr/lib/ldscripts/elf_l1om.xswe
 #usr/lib/ldscripts/elf_l1om.xu
 #usr/lib/ldscripts/elf_l1om.xw
+#usr/lib/ldscripts/elf_l1om.xwe
 #usr/lib/ldscripts/elf_x86_64.x
 #usr/lib/ldscripts/elf_x86_64.xbn
 #usr/lib/ldscripts/elf_x86_64.xc
+#usr/lib/ldscripts/elf_x86_64.xce
 #usr/lib/ldscripts/elf_x86_64.xd
 #usr/lib/ldscripts/elf_x86_64.xdc
+#usr/lib/ldscripts/elf_x86_64.xdce
+#usr/lib/ldscripts/elf_x86_64.xde
 #usr/lib/ldscripts/elf_x86_64.xdw
+#usr/lib/ldscripts/elf_x86_64.xdwe
+#usr/lib/ldscripts/elf_x86_64.xe
 #usr/lib/ldscripts/elf_x86_64.xn
 #usr/lib/ldscripts/elf_x86_64.xr
 #usr/lib/ldscripts/elf_x86_64.xs
 #usr/lib/ldscripts/elf_x86_64.xsc
+#usr/lib/ldscripts/elf_x86_64.xsce
+#usr/lib/ldscripts/elf_x86_64.xse
 #usr/lib/ldscripts/elf_x86_64.xsw
+#usr/lib/ldscripts/elf_x86_64.xswe
 #usr/lib/ldscripts/elf_x86_64.xu
 #usr/lib/ldscripts/elf_x86_64.xw
+#usr/lib/ldscripts/elf_x86_64.xwe
 #usr/lib/ldscripts/i386linux.x
 #usr/lib/ldscripts/i386linux.xbn
+#usr/lib/ldscripts/i386linux.xe
 #usr/lib/ldscripts/i386linux.xn
 #usr/lib/ldscripts/i386linux.xr
 #usr/lib/ldscripts/i386linux.xu
-#usr/lib/libbfd-2.28.so
+usr/lib/libbfd-2.30.so
 #usr/lib/libbfd.a
 #usr/lib/libbfd.la
 #usr/lib/libbfd.so
-#usr/lib/libopcodes-2.28.so
+usr/lib/libopcodes-2.30.so
 #usr/lib/libopcodes.a
 #usr/lib/libopcodes.la
 #usr/lib/libopcodes.so
@@ -128,6 +183,7 @@
 #usr/share/locale/da/LC_MESSAGES/ld.mo
 #usr/share/locale/da/LC_MESSAGES/opcodes.mo
 #usr/share/locale/de/LC_MESSAGES/gprof.mo
+#usr/share/locale/de/LC_MESSAGES/ld.mo
 #usr/share/locale/de/LC_MESSAGES/opcodes.mo
 #usr/share/locale/eo/LC_MESSAGES/gprof.mo
 #usr/share/locale/es/LC_MESSAGES/bfd.mo
@@ -153,6 +209,7 @@
 #usr/share/locale/ga/LC_MESSAGES/gprof.mo
 #usr/share/locale/ga/LC_MESSAGES/ld.mo
 #usr/share/locale/ga/LC_MESSAGES/opcodes.mo
+#usr/share/locale/hr/LC_MESSAGES/bfd.mo
 #usr/share/locale/hr/LC_MESSAGES/binutils.mo
 #usr/share/locale/hu/LC_MESSAGES/gprof.mo
 #usr/share/locale/id/LC_MESSAGES/bfd.mo
@@ -176,6 +233,7 @@
 #usr/share/locale/nl/LC_MESSAGES/gprof.mo
 #usr/share/locale/nl/LC_MESSAGES/opcodes.mo
 #usr/share/locale/pt_BR/LC_MESSAGES/gprof.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/ld.mo
 #usr/share/locale/pt_BR/LC_MESSAGES/opcodes.mo
 #usr/share/locale/ro
 #usr/share/locale/ro/LC_MESSAGES
@@ -187,6 +245,7 @@
 #usr/share/locale/ru/LC_MESSAGES/binutils.mo
 #usr/share/locale/ru/LC_MESSAGES/gas.mo
 #usr/share/locale/ru/LC_MESSAGES/gprof.mo
+#usr/share/locale/ru/LC_MESSAGES/ld.mo
 #usr/share/locale/rw/LC_MESSAGES/bfd.mo
 #usr/share/locale/rw/LC_MESSAGES/binutils.mo
 #usr/share/locale/rw/LC_MESSAGES/gas.mo
@@ -197,8 +256,11 @@
 #usr/share/locale/sr/LC_MESSAGES/bfd.mo
 #usr/share/locale/sr/LC_MESSAGES/binutils.mo
 #usr/share/locale/sr/LC_MESSAGES/gprof.mo
+#usr/share/locale/sr/LC_MESSAGES/ld.mo
+#usr/share/locale/sr/LC_MESSAGES/opcodes.mo
 #usr/share/locale/sv/LC_MESSAGES/bfd.mo
 #usr/share/locale/sv/LC_MESSAGES/binutils.mo
+#usr/share/locale/sv/LC_MESSAGES/gas.mo
 #usr/share/locale/sv/LC_MESSAGES/gprof.mo
 #usr/share/locale/sv/LC_MESSAGES/ld.mo
 #usr/share/locale/sv/LC_MESSAGES/opcodes.mo
diff --git a/config/rootfiles/common/x86_64/glibc b/config/rootfiles/common/x86_64/glibc
index d42de2fe4..82bb3010a 100644
--- a/config/rootfiles/common/x86_64/glibc
+++ b/config/rootfiles/common/x86_64/glibc
@@ -1,51 +1,51 @@
 #etc/ld.so.cache
 etc/rpc
-lib/ld-2.25.so
+lib/ld-2.27.so
 lib/ld-linux-x86-64.so.2
-lib/libBrokenLocale-2.25.so
+lib/libBrokenLocale-2.27.so
 lib/libBrokenLocale.so.1
 #lib/libSegFault.so
-lib/libanl-2.25.so
+lib/libanl-2.27.so
 lib/libanl.so.1
-lib/libc-2.25.so
+lib/libc-2.27.so
 lib/libc.so.6
-lib/libcidn-2.25.so
+lib/libcidn-2.27.so
 lib/libcidn.so.1
-lib/libcrypt-2.25.so
+lib/libcrypt-2.27.so
 lib/libcrypt.so.1
-lib/libdl-2.25.so
+lib/libdl-2.27.so
 lib/libdl.so.2
-lib/libm-2.25.so
+lib/libm-2.27.so
 lib/libm.so.6
 #lib/libmemusage.so
-lib/libmvec-2.25.so
+lib/libmvec-2.27.so
 lib/libmvec.so.1
-lib/libnsl-2.25.so
+lib/libnsl-2.27.so
 lib/libnsl.so.1
-lib/libnss_compat-2.25.so
+lib/libnss_compat-2.27.so
 lib/libnss_compat.so.2
-lib/libnss_db-2.25.so
+lib/libnss_db-2.27.so
 lib/libnss_db.so.2
-lib/libnss_dns-2.25.so
+lib/libnss_dns-2.27.so
 lib/libnss_dns.so.2
-lib/libnss_files-2.25.so
+lib/libnss_files-2.27.so
 lib/libnss_files.so.2
-lib/libnss_hesiod-2.25.so
+lib/libnss_hesiod-2.27.so
 lib/libnss_hesiod.so.2
-lib/libnss_nis-2.25.so
+lib/libnss_nis-2.27.so
 lib/libnss_nis.so.2
-lib/libnss_nisplus-2.25.so
+lib/libnss_nisplus-2.27.so
 lib/libnss_nisplus.so.2
 #lib/libpcprofile.so
-lib/libpthread-2.25.so
+lib/libpthread-2.27.so
 lib/libpthread.so.0
-lib/libresolv-2.25.so
+lib/libresolv-2.27.so
 lib/libresolv.so.2
-lib/librt-2.25.so
+lib/librt-2.27.so
 lib/librt.so.1
 lib/libthread_db-1.0.so
 lib/libthread_db.so.1
-lib/libutil-2.25.so
+lib/libutil-2.27.so
 lib/libutil.so.1
 sbin/ldconfig
 #sbin/sln
@@ -83,11 +83,13 @@ usr/bin/locale
 #usr/include/arpa/tftp.h
 #usr/include/assert.h
 #usr/include/bits
+#usr/include/bits/_G_config.h
 #usr/include/bits/a.out.h
 #usr/include/bits/byteswap-16.h
 #usr/include/bits/byteswap.h
 #usr/include/bits/cmathcalls.h
 #usr/include/bits/confname.h
+#usr/include/bits/cpu-set.h
 #usr/include/bits/dirent.h
 #usr/include/bits/dlfcn.h
 #usr/include/bits/elfclass.h
@@ -102,15 +104,16 @@ usr/bin/locale
 #usr/include/bits/fcntl2.h
 #usr/include/bits/fenv.h
 #usr/include/bits/fenvinline.h
+#usr/include/bits/floatn-common.h
+#usr/include/bits/floatn.h
 #usr/include/bits/flt-eval-method.h
 #usr/include/bits/fp-fast.h
 #usr/include/bits/fp-logb.h
-#usr/include/bits/huge_val.h
-#usr/include/bits/huge_valf.h
-#usr/include/bits/huge_vall.h
+#usr/include/bits/getopt_core.h
+#usr/include/bits/getopt_ext.h
+#usr/include/bits/getopt_posix.h
 #usr/include/bits/hwcap.h
 #usr/include/bits/in.h
-#usr/include/bits/inf.h
 #usr/include/bits/initspin.h
 #usr/include/bits/inotify.h
 #usr/include/bits/ioctl-types.h
@@ -120,6 +123,7 @@ usr/bin/locale
 #usr/include/bits/iscanonical.h
 #usr/include/bits/libc-header-start.h
 #usr/include/bits/libio-ldbl.h
+#usr/include/bits/libio.h
 #usr/include/bits/libm-simd-decl-stubs.h
 #usr/include/bits/link.h
 #usr/include/bits/local_lim.h
@@ -127,16 +131,17 @@ usr/bin/locale
 #usr/include/bits/long-double.h
 #usr/include/bits/math-finite.h
 #usr/include/bits/math-vector.h
+#usr/include/bits/mathcalls-helper-functions.h
 #usr/include/bits/mathcalls.h
 #usr/include/bits/mathdef.h
 #usr/include/bits/mathinline.h
 #usr/include/bits/mman-linux.h
+#usr/include/bits/mman-shared.h
 #usr/include/bits/mman.h
 #usr/include/bits/monetary-ldbl.h
 #usr/include/bits/mqueue.h
 #usr/include/bits/mqueue2.h
 #usr/include/bits/msq.h
-#usr/include/bits/nan.h
 #usr/include/bits/netdb.h
 #usr/include/bits/param.h
 #usr/include/bits/poll.h
@@ -145,7 +150,9 @@ usr/bin/locale
 #usr/include/bits/posix2_lim.h
 #usr/include/bits/posix_opt.h
 #usr/include/bits/printf-ldbl.h
+#usr/include/bits/pthreadtypes-arch.h
 #usr/include/bits/pthreadtypes.h
+#usr/include/bits/ptrace-shared.h
 #usr/include/bits/resource.h
 #usr/include/bits/sched.h
 #usr/include/bits/select.h
@@ -157,20 +164,26 @@ usr/bin/locale
 #usr/include/bits/shm.h
 #usr/include/bits/sigaction.h
 #usr/include/bits/sigcontext.h
-#usr/include/bits/siginfo.h
+#usr/include/bits/sigevent-consts.h
+#usr/include/bits/siginfo-arch.h
+#usr/include/bits/siginfo-consts-arch.h
+#usr/include/bits/siginfo-consts.h
 #usr/include/bits/signalfd.h
+#usr/include/bits/signum-generic.h
 #usr/include/bits/signum.h
-#usr/include/bits/sigset.h
 #usr/include/bits/sigstack.h
 #usr/include/bits/sigthread.h
 #usr/include/bits/sockaddr.h
 #usr/include/bits/socket.h
 #usr/include/bits/socket2.h
 #usr/include/bits/socket_type.h
+#usr/include/bits/ss_flags.h
 #usr/include/bits/stab.def
 #usr/include/bits/stat.h
 #usr/include/bits/statfs.h
 #usr/include/bits/statvfs.h
+#usr/include/bits/stdint-intn.h
+#usr/include/bits/stdint-uintn.h
 #usr/include/bits/stdio-ldbl.h
 #usr/include/bits/stdio.h
 #usr/include/bits/stdio2.h
@@ -179,9 +192,7 @@ usr/bin/locale
 #usr/include/bits/stdlib-float.h
 #usr/include/bits/stdlib-ldbl.h
 #usr/include/bits/stdlib.h
-#usr/include/bits/string.h
-#usr/include/bits/string2.h
-#usr/include/bits/string3.h
+#usr/include/bits/string_fortified.h
 #usr/include/bits/strings_fortified.h
 #usr/include/bits/stropts.h
 #usr/include/bits/sys_errlist.h
@@ -192,23 +203,44 @@ usr/bin/locale
 #usr/include/bits/syslog.h
 #usr/include/bits/sysmacros.h
 #usr/include/bits/termios.h
+#usr/include/bits/thread-shared-types.h
 #usr/include/bits/time.h
 #usr/include/bits/timerfd.h
 #usr/include/bits/timex.h
 #usr/include/bits/types
 #usr/include/bits/types.h
+#usr/include/bits/types/FILE.h
+#usr/include/bits/types/__FILE.h
+#usr/include/bits/types/__locale_t.h
+#usr/include/bits/types/__mbstate_t.h
+#usr/include/bits/types/__sigset_t.h
+#usr/include/bits/types/__sigval_t.h
 #usr/include/bits/types/clock_t.h
 #usr/include/bits/types/clockid_t.h
+#usr/include/bits/types/locale_t.h
+#usr/include/bits/types/mbstate_t.h
+#usr/include/bits/types/res_state.h
+#usr/include/bits/types/sig_atomic_t.h
+#usr/include/bits/types/sigevent_t.h
+#usr/include/bits/types/siginfo_t.h
+#usr/include/bits/types/sigset_t.h
+#usr/include/bits/types/sigval_t.h
+#usr/include/bits/types/stack_t.h
+#usr/include/bits/types/struct_iovec.h
 #usr/include/bits/types/struct_itimerspec.h
 #usr/include/bits/types/struct_osockaddr.h
+#usr/include/bits/types/struct_rusage.h
+#usr/include/bits/types/struct_sigstack.h
 #usr/include/bits/types/struct_timespec.h
 #usr/include/bits/types/struct_timeval.h
 #usr/include/bits/types/struct_tm.h
 #usr/include/bits/types/time_t.h
 #usr/include/bits/types/timer_t.h
+#usr/include/bits/types/wint_t.h
 #usr/include/bits/typesizes.h
 #usr/include/bits/uintn-identity.h
-#usr/include/bits/uio.h
+#usr/include/bits/uio-ext.h
+#usr/include/bits/uio_lim.h
 #usr/include/bits/unistd.h
 #usr/include/bits/ustat.h
 #usr/include/bits/utmp.h
@@ -219,6 +251,7 @@ usr/bin/locale
 #usr/include/bits/wchar-ldbl.h
 #usr/include/bits/wchar.h
 #usr/include/bits/wchar2.h
+#usr/include/bits/wctype-wchar.h
 #usr/include/bits/wordsize.h
 #usr/include/bits/xopen_lim.h
 #usr/include/bits/xtitypes.h
@@ -492,7 +525,6 @@ usr/bin/locale
 #usr/include/sys/types.h
 #usr/include/sys/ucontext.h
 #usr/include/sys/uio.h
-#usr/include/sys/ultrasound.h
 #usr/include/sys/un.h
 #usr/include/sys/unistd.h
 #usr/include/sys/user.h
@@ -528,7 +560,6 @@ usr/bin/locale
 #usr/include/wchar.h
 #usr/include/wctype.h
 #usr/include/wordexp.h
-#usr/include/xlocale.h
 #usr/lib/Mcrt1.o
 #usr/lib/Scrt1.o
 #usr/lib/audit
@@ -681,6 +712,7 @@ usr/lib/gconv
 #usr/lib/gconv/IBM855.so
 #usr/lib/gconv/IBM856.so
 #usr/lib/gconv/IBM857.so
+#usr/lib/gconv/IBM858.so
 #usr/lib/gconv/IBM860.so
 #usr/lib/gconv/IBM861.so
 #usr/lib/gconv/IBM862.so
@@ -809,8 +841,7 @@ usr/lib/gconv
 #usr/lib/libdl.a
 #usr/lib/libdl.so
 #usr/lib/libg.a
-#usr/lib/libieee.a
-#usr/lib/libm-2.25.a
+#usr/lib/libm-2.27.a
 #usr/lib/libm.a
 #usr/lib/libm.so
 #usr/lib/libmcheck.a
@@ -936,6 +967,20 @@ usr/lib/locale
 #usr/lib/locale/af_ZA/LC_PAPER
 #usr/lib/locale/af_ZA/LC_TELEPHONE
 #usr/lib/locale/af_ZA/LC_TIME
+#usr/lib/locale/agr_PE
+#usr/lib/locale/agr_PE/LC_ADDRESS
+#usr/lib/locale/agr_PE/LC_COLLATE
+#usr/lib/locale/agr_PE/LC_CTYPE
+#usr/lib/locale/agr_PE/LC_IDENTIFICATION
+#usr/lib/locale/agr_PE/LC_MEASUREMENT
+#usr/lib/locale/agr_PE/LC_MESSAGES
+#usr/lib/locale/agr_PE/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/agr_PE/LC_MONETARY
+#usr/lib/locale/agr_PE/LC_NAME
+#usr/lib/locale/agr_PE/LC_NUMERIC
+#usr/lib/locale/agr_PE/LC_PAPER
+#usr/lib/locale/agr_PE/LC_TELEPHONE
+#usr/lib/locale/agr_PE/LC_TIME
 #usr/lib/locale/ak_GH
 #usr/lib/locale/ak_GH/LC_ADDRESS
 #usr/lib/locale/ak_GH/LC_COLLATE
@@ -1580,6 +1625,20 @@ usr/lib/locale
 #usr/lib/locale/az_AZ/LC_PAPER
 #usr/lib/locale/az_AZ/LC_TELEPHONE
 #usr/lib/locale/az_AZ/LC_TIME
+#usr/lib/locale/az_IR
+#usr/lib/locale/az_IR/LC_ADDRESS
+#usr/lib/locale/az_IR/LC_COLLATE
+#usr/lib/locale/az_IR/LC_CTYPE
+#usr/lib/locale/az_IR/LC_IDENTIFICATION
+#usr/lib/locale/az_IR/LC_MEASUREMENT
+#usr/lib/locale/az_IR/LC_MESSAGES
+#usr/lib/locale/az_IR/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/az_IR/LC_MONETARY
+#usr/lib/locale/az_IR/LC_NAME
+#usr/lib/locale/az_IR/LC_NUMERIC
+#usr/lib/locale/az_IR/LC_PAPER
+#usr/lib/locale/az_IR/LC_TELEPHONE
+#usr/lib/locale/az_IR/LC_TIME
 #usr/lib/locale/be_BY
 #usr/lib/locale/be_BY.utf8
 #usr/lib/locale/be_BY.utf8/LC_ADDRESS
@@ -1720,6 +1779,34 @@ usr/lib/locale
 #usr/lib/locale/bho_IN/LC_PAPER
 #usr/lib/locale/bho_IN/LC_TELEPHONE
 #usr/lib/locale/bho_IN/LC_TIME
+#usr/lib/locale/bho_NP
+#usr/lib/locale/bho_NP/LC_ADDRESS
+#usr/lib/locale/bho_NP/LC_COLLATE
+#usr/lib/locale/bho_NP/LC_CTYPE
+#usr/lib/locale/bho_NP/LC_IDENTIFICATION
+#usr/lib/locale/bho_NP/LC_MEASUREMENT
+#usr/lib/locale/bho_NP/LC_MESSAGES
+#usr/lib/locale/bho_NP/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/bho_NP/LC_MONETARY
+#usr/lib/locale/bho_NP/LC_NAME
+#usr/lib/locale/bho_NP/LC_NUMERIC
+#usr/lib/locale/bho_NP/LC_PAPER
+#usr/lib/locale/bho_NP/LC_TELEPHONE
+#usr/lib/locale/bho_NP/LC_TIME
+#usr/lib/locale/bi_VU
+#usr/lib/locale/bi_VU/LC_ADDRESS
+#usr/lib/locale/bi_VU/LC_COLLATE
+#usr/lib/locale/bi_VU/LC_CTYPE
+#usr/lib/locale/bi_VU/LC_IDENTIFICATION
+#usr/lib/locale/bi_VU/LC_MEASUREMENT
+#usr/lib/locale/bi_VU/LC_MESSAGES
+#usr/lib/locale/bi_VU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/bi_VU/LC_MONETARY
+#usr/lib/locale/bi_VU/LC_NAME
+#usr/lib/locale/bi_VU/LC_NUMERIC
+#usr/lib/locale/bi_VU/LC_PAPER
+#usr/lib/locale/bi_VU/LC_TELEPHONE
+#usr/lib/locale/bi_VU/LC_TIME
 #usr/lib/locale/bn_BD
 #usr/lib/locale/bn_BD/LC_ADDRESS
 #usr/lib/locale/bn_BD/LC_COLLATE
@@ -1944,6 +2031,20 @@ usr/lib/locale
 #usr/lib/locale/ca_ES@euro/LC_PAPER
 #usr/lib/locale/ca_ES@euro/LC_TELEPHONE
 #usr/lib/locale/ca_ES@euro/LC_TIME
+#usr/lib/locale/ca_ES@valencia
+#usr/lib/locale/ca_ES@valencia/LC_ADDRESS
+#usr/lib/locale/ca_ES@valencia/LC_COLLATE
+#usr/lib/locale/ca_ES@valencia/LC_CTYPE
+#usr/lib/locale/ca_ES@valencia/LC_IDENTIFICATION
+#usr/lib/locale/ca_ES@valencia/LC_MEASUREMENT
+#usr/lib/locale/ca_ES@valencia/LC_MESSAGES
+#usr/lib/locale/ca_ES@valencia/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/ca_ES@valencia/LC_MONETARY
+#usr/lib/locale/ca_ES@valencia/LC_NAME
+#usr/lib/locale/ca_ES@valencia/LC_NUMERIC
+#usr/lib/locale/ca_ES@valencia/LC_PAPER
+#usr/lib/locale/ca_ES@valencia/LC_TELEPHONE
+#usr/lib/locale/ca_ES@valencia/LC_TIME
 #usr/lib/locale/ca_FR
 #usr/lib/locale/ca_FR.utf8
 #usr/lib/locale/ca_FR.utf8/LC_ADDRESS
@@ -2504,6 +2605,20 @@ usr/lib/locale
 #usr/lib/locale/el_GR/LC_PAPER
 #usr/lib/locale/el_GR/LC_TELEPHONE
 #usr/lib/locale/el_GR/LC_TIME
+#usr/lib/locale/el_GR@euro
+#usr/lib/locale/el_GR@euro/LC_ADDRESS
+#usr/lib/locale/el_GR@euro/LC_COLLATE
+#usr/lib/locale/el_GR@euro/LC_CTYPE
+#usr/lib/locale/el_GR@euro/LC_IDENTIFICATION
+#usr/lib/locale/el_GR@euro/LC_MEASUREMENT
+#usr/lib/locale/el_GR@euro/LC_MESSAGES
+#usr/lib/locale/el_GR@euro/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/el_GR@euro/LC_MONETARY
+#usr/lib/locale/el_GR@euro/LC_NAME
+#usr/lib/locale/el_GR@euro/LC_NUMERIC
+#usr/lib/locale/el_GR@euro/LC_PAPER
+#usr/lib/locale/el_GR@euro/LC_TELEPHONE
+#usr/lib/locale/el_GR@euro/LC_TIME
 #usr/lib/locale/en_AG
 #usr/lib/locale/en_AG/LC_ADDRESS
 #usr/lib/locale/en_AG/LC_COLLATE
@@ -2826,6 +2941,20 @@ usr/lib/locale
 #usr/lib/locale/en_PH/LC_PAPER
 #usr/lib/locale/en_PH/LC_TELEPHONE
 #usr/lib/locale/en_PH/LC_TIME
+#usr/lib/locale/en_SC.utf8
+#usr/lib/locale/en_SC.utf8/LC_ADDRESS
+#usr/lib/locale/en_SC.utf8/LC_COLLATE
+#usr/lib/locale/en_SC.utf8/LC_CTYPE
+#usr/lib/locale/en_SC.utf8/LC_IDENTIFICATION
+#usr/lib/locale/en_SC.utf8/LC_MEASUREMENT
+#usr/lib/locale/en_SC.utf8/LC_MESSAGES
+#usr/lib/locale/en_SC.utf8/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/en_SC.utf8/LC_MONETARY
+#usr/lib/locale/en_SC.utf8/LC_NAME
+#usr/lib/locale/en_SC.utf8/LC_NUMERIC
+#usr/lib/locale/en_SC.utf8/LC_PAPER
+#usr/lib/locale/en_SC.utf8/LC_TELEPHONE
+#usr/lib/locale/en_SC.utf8/LC_TIME
 #usr/lib/locale/en_SG
 #usr/lib/locale/en_SG.utf8
 #usr/lib/locale/en_SG.utf8/LC_ADDRESS
@@ -4254,6 +4383,20 @@ usr/lib/locale
 #usr/lib/locale/hi_IN/LC_PAPER
 #usr/lib/locale/hi_IN/LC_TELEPHONE
 #usr/lib/locale/hi_IN/LC_TIME
+#usr/lib/locale/hif_FJ
+#usr/lib/locale/hif_FJ/LC_ADDRESS
+#usr/lib/locale/hif_FJ/LC_COLLATE
+#usr/lib/locale/hif_FJ/LC_CTYPE
+#usr/lib/locale/hif_FJ/LC_IDENTIFICATION
+#usr/lib/locale/hif_FJ/LC_MEASUREMENT
+#usr/lib/locale/hif_FJ/LC_MESSAGES
+#usr/lib/locale/hif_FJ/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/hif_FJ/LC_MONETARY
+#usr/lib/locale/hif_FJ/LC_NAME
+#usr/lib/locale/hif_FJ/LC_NUMERIC
+#usr/lib/locale/hif_FJ/LC_PAPER
+#usr/lib/locale/hif_FJ/LC_TELEPHONE
+#usr/lib/locale/hif_FJ/LC_TIME
 #usr/lib/locale/hne_IN
 #usr/lib/locale/hne_IN/LC_ADDRESS
 #usr/lib/locale/hne_IN/LC_COLLATE
@@ -4632,6 +4775,20 @@ usr/lib/locale
 #usr/lib/locale/ka_GE/LC_PAPER
 #usr/lib/locale/ka_GE/LC_TELEPHONE
 #usr/lib/locale/ka_GE/LC_TIME
+#usr/lib/locale/kab_DZ
+#usr/lib/locale/kab_DZ/LC_ADDRESS
+#usr/lib/locale/kab_DZ/LC_COLLATE
+#usr/lib/locale/kab_DZ/LC_CTYPE
+#usr/lib/locale/kab_DZ/LC_IDENTIFICATION
+#usr/lib/locale/kab_DZ/LC_MEASUREMENT
+#usr/lib/locale/kab_DZ/LC_MESSAGES
+#usr/lib/locale/kab_DZ/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/kab_DZ/LC_MONETARY
+#usr/lib/locale/kab_DZ/LC_NAME
+#usr/lib/locale/kab_DZ/LC_NUMERIC
+#usr/lib/locale/kab_DZ/LC_PAPER
+#usr/lib/locale/kab_DZ/LC_TELEPHONE
+#usr/lib/locale/kab_DZ/LC_TIME
 #usr/lib/locale/kk_KZ
 #usr/lib/locale/kk_KZ.utf8
 #usr/lib/locale/kk_KZ.utf8/LC_ADDRESS
@@ -5066,6 +5223,34 @@ usr/lib/locale
 #usr/lib/locale/mai_IN/LC_PAPER
 #usr/lib/locale/mai_IN/LC_TELEPHONE
 #usr/lib/locale/mai_IN/LC_TIME
+#usr/lib/locale/mai_NP
+#usr/lib/locale/mai_NP/LC_ADDRESS
+#usr/lib/locale/mai_NP/LC_COLLATE
+#usr/lib/locale/mai_NP/LC_CTYPE
+#usr/lib/locale/mai_NP/LC_IDENTIFICATION
+#usr/lib/locale/mai_NP/LC_MEASUREMENT
+#usr/lib/locale/mai_NP/LC_MESSAGES
+#usr/lib/locale/mai_NP/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/mai_NP/LC_MONETARY
+#usr/lib/locale/mai_NP/LC_NAME
+#usr/lib/locale/mai_NP/LC_NUMERIC
+#usr/lib/locale/mai_NP/LC_PAPER
+#usr/lib/locale/mai_NP/LC_TELEPHONE
+#usr/lib/locale/mai_NP/LC_TIME
+#usr/lib/locale/mfe_MU
+#usr/lib/locale/mfe_MU/LC_ADDRESS
+#usr/lib/locale/mfe_MU/LC_COLLATE
+#usr/lib/locale/mfe_MU/LC_CTYPE
+#usr/lib/locale/mfe_MU/LC_IDENTIFICATION
+#usr/lib/locale/mfe_MU/LC_MEASUREMENT
+#usr/lib/locale/mfe_MU/LC_MESSAGES
+#usr/lib/locale/mfe_MU/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/mfe_MU/LC_MONETARY
+#usr/lib/locale/mfe_MU/LC_NAME
+#usr/lib/locale/mfe_MU/LC_NUMERIC
+#usr/lib/locale/mfe_MU/LC_PAPER
+#usr/lib/locale/mfe_MU/LC_TELEPHONE
+#usr/lib/locale/mfe_MU/LC_TIME
 #usr/lib/locale/mg_MG
 #usr/lib/locale/mg_MG.utf8
 #usr/lib/locale/mg_MG.utf8/LC_ADDRESS
@@ -5136,6 +5321,34 @@ usr/lib/locale
 #usr/lib/locale/mi_NZ/LC_PAPER
 #usr/lib/locale/mi_NZ/LC_TELEPHONE
 #usr/lib/locale/mi_NZ/LC_TIME
+#usr/lib/locale/miq_NI
+#usr/lib/locale/miq_NI/LC_ADDRESS
+#usr/lib/locale/miq_NI/LC_COLLATE
+#usr/lib/locale/miq_NI/LC_CTYPE
+#usr/lib/locale/miq_NI/LC_IDENTIFICATION
+#usr/lib/locale/miq_NI/LC_MEASUREMENT
+#usr/lib/locale/miq_NI/LC_MESSAGES
+#usr/lib/locale/miq_NI/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/miq_NI/LC_MONETARY
+#usr/lib/locale/miq_NI/LC_NAME
+#usr/lib/locale/miq_NI/LC_NUMERIC
+#usr/lib/locale/miq_NI/LC_PAPER
+#usr/lib/locale/miq_NI/LC_TELEPHONE
+#usr/lib/locale/miq_NI/LC_TIME
+#usr/lib/locale/mjw_IN
+#usr/lib/locale/mjw_IN/LC_ADDRESS
+#usr/lib/locale/mjw_IN/LC_COLLATE
+#usr/lib/locale/mjw_IN/LC_CTYPE
+#usr/lib/locale/mjw_IN/LC_IDENTIFICATION
+#usr/lib/locale/mjw_IN/LC_MEASUREMENT
+#usr/lib/locale/mjw_IN/LC_MESSAGES
+#usr/lib/locale/mjw_IN/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/mjw_IN/LC_MONETARY
+#usr/lib/locale/mjw_IN/LC_NAME
+#usr/lib/locale/mjw_IN/LC_NUMERIC
+#usr/lib/locale/mjw_IN/LC_PAPER
+#usr/lib/locale/mjw_IN/LC_TELEPHONE
+#usr/lib/locale/mjw_IN/LC_TIME
 #usr/lib/locale/mk_MK
 #usr/lib/locale/mk_MK.utf8
 #usr/lib/locale/mk_MK.utf8/LC_ADDRESS
@@ -6088,6 +6301,20 @@ usr/lib/locale
 #usr/lib/locale/sgs_LT/LC_PAPER
 #usr/lib/locale/sgs_LT/LC_TELEPHONE
 #usr/lib/locale/sgs_LT/LC_TIME
+#usr/lib/locale/shn_MM
+#usr/lib/locale/shn_MM/LC_ADDRESS
+#usr/lib/locale/shn_MM/LC_COLLATE
+#usr/lib/locale/shn_MM/LC_CTYPE
+#usr/lib/locale/shn_MM/LC_IDENTIFICATION
+#usr/lib/locale/shn_MM/LC_MEASUREMENT
+#usr/lib/locale/shn_MM/LC_MESSAGES
+#usr/lib/locale/shn_MM/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/shn_MM/LC_MONETARY
+#usr/lib/locale/shn_MM/LC_NAME
+#usr/lib/locale/shn_MM/LC_NUMERIC
+#usr/lib/locale/shn_MM/LC_PAPER
+#usr/lib/locale/shn_MM/LC_TELEPHONE
+#usr/lib/locale/shn_MM/LC_TIME
 #usr/lib/locale/shs_CA
 #usr/lib/locale/shs_CA/LC_ADDRESS
 #usr/lib/locale/shs_CA/LC_COLLATE
@@ -6186,6 +6413,20 @@ usr/lib/locale
 #usr/lib/locale/sl_SI/LC_PAPER
 #usr/lib/locale/sl_SI/LC_TELEPHONE
 #usr/lib/locale/sl_SI/LC_TIME
+#usr/lib/locale/sm_WS
+#usr/lib/locale/sm_WS/LC_ADDRESS
+#usr/lib/locale/sm_WS/LC_COLLATE
+#usr/lib/locale/sm_WS/LC_CTYPE
+#usr/lib/locale/sm_WS/LC_IDENTIFICATION
+#usr/lib/locale/sm_WS/LC_MEASUREMENT
+#usr/lib/locale/sm_WS/LC_MESSAGES
+#usr/lib/locale/sm_WS/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/sm_WS/LC_MONETARY
+#usr/lib/locale/sm_WS/LC_NAME
+#usr/lib/locale/sm_WS/LC_NUMERIC
+#usr/lib/locale/sm_WS/LC_PAPER
+#usr/lib/locale/sm_WS/LC_TELEPHONE
+#usr/lib/locale/sm_WS/LC_TIME
 #usr/lib/locale/so_DJ
 #usr/lib/locale/so_DJ.utf8
 #usr/lib/locale/so_DJ.utf8/LC_ADDRESS
@@ -6746,6 +6987,34 @@ usr/lib/locale
 #usr/lib/locale/tn_ZA/LC_PAPER
 #usr/lib/locale/tn_ZA/LC_TELEPHONE
 #usr/lib/locale/tn_ZA/LC_TIME
+#usr/lib/locale/to_TO
+#usr/lib/locale/to_TO/LC_ADDRESS
+#usr/lib/locale/to_TO/LC_COLLATE
+#usr/lib/locale/to_TO/LC_CTYPE
+#usr/lib/locale/to_TO/LC_IDENTIFICATION
+#usr/lib/locale/to_TO/LC_MEASUREMENT
+#usr/lib/locale/to_TO/LC_MESSAGES
+#usr/lib/locale/to_TO/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/to_TO/LC_MONETARY
+#usr/lib/locale/to_TO/LC_NAME
+#usr/lib/locale/to_TO/LC_NUMERIC
+#usr/lib/locale/to_TO/LC_PAPER
+#usr/lib/locale/to_TO/LC_TELEPHONE
+#usr/lib/locale/to_TO/LC_TIME
+#usr/lib/locale/tpi_PG
+#usr/lib/locale/tpi_PG/LC_ADDRESS
+#usr/lib/locale/tpi_PG/LC_COLLATE
+#usr/lib/locale/tpi_PG/LC_CTYPE
+#usr/lib/locale/tpi_PG/LC_IDENTIFICATION
+#usr/lib/locale/tpi_PG/LC_MEASUREMENT
+#usr/lib/locale/tpi_PG/LC_MESSAGES
+#usr/lib/locale/tpi_PG/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/tpi_PG/LC_MONETARY
+#usr/lib/locale/tpi_PG/LC_NAME
+#usr/lib/locale/tpi_PG/LC_NUMERIC
+#usr/lib/locale/tpi_PG/LC_PAPER
+#usr/lib/locale/tpi_PG/LC_TELEPHONE
+#usr/lib/locale/tpi_PG/LC_TIME
 #usr/lib/locale/tr_CY
 #usr/lib/locale/tr_CY.utf8
 #usr/lib/locale/tr_CY.utf8/LC_ADDRESS
@@ -7166,6 +7435,20 @@ usr/lib/locale
 #usr/lib/locale/yue_HK/LC_PAPER
 #usr/lib/locale/yue_HK/LC_TELEPHONE
 #usr/lib/locale/yue_HK/LC_TIME
+#usr/lib/locale/yuw_PG
+#usr/lib/locale/yuw_PG/LC_ADDRESS
+#usr/lib/locale/yuw_PG/LC_COLLATE
+#usr/lib/locale/yuw_PG/LC_CTYPE
+#usr/lib/locale/yuw_PG/LC_IDENTIFICATION
+#usr/lib/locale/yuw_PG/LC_MEASUREMENT
+#usr/lib/locale/yuw_PG/LC_MESSAGES
+#usr/lib/locale/yuw_PG/LC_MESSAGES/SYS_LC_MESSAGES
+#usr/lib/locale/yuw_PG/LC_MONETARY
+#usr/lib/locale/yuw_PG/LC_NAME
+#usr/lib/locale/yuw_PG/LC_NUMERIC
+#usr/lib/locale/yuw_PG/LC_PAPER
+#usr/lib/locale/yuw_PG/LC_TELEPHONE
+#usr/lib/locale/yuw_PG/LC_TIME
 #usr/lib/locale/zh_CN
 #usr/lib/locale/zh_CN.gb18030
 #usr/lib/locale/zh_CN.gb18030/LC_ADDRESS
@@ -7480,6 +7763,7 @@ usr/lib/locale
 #usr/share/i18n/charmaps/IBM855.gz
 #usr/share/i18n/charmaps/IBM856.gz
 #usr/share/i18n/charmaps/IBM857.gz
+#usr/share/i18n/charmaps/IBM858.gz
 #usr/share/i18n/charmaps/IBM860.gz
 #usr/share/i18n/charmaps/IBM861.gz
 #usr/share/i18n/charmaps/IBM862.gz
@@ -7607,6 +7891,7 @@ usr/lib/locale
 #usr/share/i18n/locales/aa_ER@saaho
 #usr/share/i18n/locales/aa_ET
 #usr/share/i18n/locales/af_ZA
+#usr/share/i18n/locales/agr_PE
 #usr/share/i18n/locales/ak_GH
 #usr/share/i18n/locales/am_ET
 #usr/share/i18n/locales/an_ES
@@ -7634,6 +7919,7 @@ usr/lib/locale
 #usr/share/i18n/locales/ast_ES
 #usr/share/i18n/locales/ayc_PE
 #usr/share/i18n/locales/az_AZ
+#usr/share/i18n/locales/az_IR
 #usr/share/i18n/locales/be_BY
 #usr/share/i18n/locales/be_BY@latin
 #usr/share/i18n/locales/bem_ZM
@@ -7642,6 +7928,8 @@ usr/lib/locale
 #usr/share/i18n/locales/bg_BG
 #usr/share/i18n/locales/bhb_IN
 #usr/share/i18n/locales/bho_IN
+#usr/share/i18n/locales/bho_NP
+#usr/share/i18n/locales/bi_VU
 #usr/share/i18n/locales/bn_BD
 #usr/share/i18n/locales/bn_IN
 #usr/share/i18n/locales/bo_CN
@@ -7654,11 +7942,13 @@ usr/lib/locale
 #usr/share/i18n/locales/ca_AD
 #usr/share/i18n/locales/ca_ES
 #usr/share/i18n/locales/ca_ES@euro
+#usr/share/i18n/locales/ca_ES@valencia
 #usr/share/i18n/locales/ca_FR
 #usr/share/i18n/locales/ca_IT
 #usr/share/i18n/locales/ce_RU
 #usr/share/i18n/locales/chr_US
 #usr/share/i18n/locales/cmn_TW
+#usr/share/i18n/locales/cns11643_stroke
 #usr/share/i18n/locales/crh_UA
 #usr/share/i18n/locales/cs_CZ
 #usr/share/i18n/locales/csb_PL
@@ -7696,6 +7986,7 @@ usr/lib/locale
 #usr/share/i18n/locales/en_NG
 #usr/share/i18n/locales/en_NZ
 #usr/share/i18n/locales/en_PH
+#usr/share/i18n/locales/en_SC
 #usr/share/i18n/locales/en_SG
 #usr/share/i18n/locales/en_US
 #usr/share/i18n/locales/en_ZA
@@ -7759,6 +8050,7 @@ usr/lib/locale
 #usr/share/i18n/locales/hak_TW
 #usr/share/i18n/locales/he_IL
 #usr/share/i18n/locales/hi_IN
+#usr/share/i18n/locales/hif_FJ
 #usr/share/i18n/locales/hne_IN
 #usr/share/i18n/locales/hr_HR
 #usr/share/i18n/locales/hsb_DE
@@ -7766,6 +8058,7 @@ usr/lib/locale
 #usr/share/i18n/locales/hu_HU
 #usr/share/i18n/locales/hy_AM
 #usr/share/i18n/locales/i18n
+#usr/share/i18n/locales/i18n_ctype
 #usr/share/i18n/locales/ia_FR
 #usr/share/i18n/locales/id_ID
 #usr/share/i18n/locales/ig_NG
@@ -7780,6 +8073,7 @@ usr/lib/locale
 #usr/share/i18n/locales/iu_CA
 #usr/share/i18n/locales/ja_JP
 #usr/share/i18n/locales/ka_GE
+#usr/share/i18n/locales/kab_DZ
 #usr/share/i18n/locales/kk_KZ
 #usr/share/i18n/locales/kl_GL
 #usr/share/i18n/locales/km_KH
@@ -7803,9 +8097,13 @@ usr/lib/locale
 #usr/share/i18n/locales/lzh_TW
 #usr/share/i18n/locales/mag_IN
 #usr/share/i18n/locales/mai_IN
+#usr/share/i18n/locales/mai_NP
+#usr/share/i18n/locales/mfe_MU
 #usr/share/i18n/locales/mg_MG
 #usr/share/i18n/locales/mhr_RU
 #usr/share/i18n/locales/mi_NZ
+#usr/share/i18n/locales/miq_NI
+#usr/share/i18n/locales/mjw_IN
 #usr/share/i18n/locales/mk_MK
 #usr/share/i18n/locales/ml_IN
 #usr/share/i18n/locales/mn_MN
@@ -7858,11 +8156,13 @@ usr/lib/locale
 #usr/share/i18n/locales/sd_IN@devanagari
 #usr/share/i18n/locales/se_NO
 #usr/share/i18n/locales/sgs_LT
+#usr/share/i18n/locales/shn_MM
 #usr/share/i18n/locales/shs_CA
 #usr/share/i18n/locales/si_LK
 #usr/share/i18n/locales/sid_ET
 #usr/share/i18n/locales/sk_SK
 #usr/share/i18n/locales/sl_SI
+#usr/share/i18n/locales/sm_WS
 #usr/share/i18n/locales/so_DJ
 #usr/share/i18n/locales/so_ET
 #usr/share/i18n/locales/so_KE
@@ -7893,6 +8193,8 @@ usr/lib/locale
 #usr/share/i18n/locales/tk_TM
 #usr/share/i18n/locales/tl_PH
 #usr/share/i18n/locales/tn_ZA
+#usr/share/i18n/locales/to_TO
+#usr/share/i18n/locales/tpi_PG
 #usr/share/i18n/locales/tr_CY
 #usr/share/i18n/locales/tr_TR
 #usr/share/i18n/locales/translit_circle
@@ -7928,6 +8230,7 @@ usr/lib/locale
 #usr/share/i18n/locales/yi_US
 #usr/share/i18n/locales/yo_NG
 #usr/share/i18n/locales/yue_HK
+#usr/share/i18n/locales/yuw_PG
 #usr/share/i18n/locales/zh_CN
 #usr/share/i18n/locales/zh_HK
 #usr/share/i18n/locales/zh_SG
@@ -7942,6 +8245,8 @@ usr/lib/locale
 #usr/share/info/libc.info-13
 #usr/share/info/libc.info-14
 #usr/share/info/libc.info-15
+#usr/share/info/libc.info-16
+#usr/share/info/libc.info-17
 #usr/share/info/libc.info-2
 #usr/share/info/libc.info-3
 #usr/share/info/libc.info-4
diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts
index 67e495c4a..5463f675d 100644
--- a/config/rootfiles/common/x86_64/initscripts
+++ b/config/rootfiles/common/x86_64/initscripts
@@ -23,7 +23,6 @@ etc/rc.d/init.d/halt
 etc/rc.d/init.d/ipsec
 etc/rc.d/init.d/leds
 etc/rc.d/init.d/localnet
-etc/rc.d/init.d/mISDN
 etc/rc.d/init.d/modules
 etc/rc.d/init.d/mountfs
 etc/rc.d/init.d/mountkernfs
diff --git a/config/rootfiles/core/118/exclude b/config/rootfiles/core/119/exclude
similarity index 100%
rename from config/rootfiles/core/118/exclude
rename to config/rootfiles/core/119/exclude
diff --git a/config/rootfiles/core/119/filelists/armv5tel/binutils b/config/rootfiles/core/119/filelists/armv5tel/binutils
new file mode 120000
index 000000000..ac971f931
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/armv5tel/binutils
@@ -0,0 +1 @@
+../../../../common/armv5tel/binutils
\ No newline at end of file
diff --git a/config/rootfiles/core/119/filelists/armv5tel/gcc b/config/rootfiles/core/119/filelists/armv5tel/gcc
new file mode 120000
index 000000000..84f7b9344
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/armv5tel/gcc
@@ -0,0 +1 @@
+../../../../common/armv5tel/gcc
\ No newline at end of file
diff --git a/config/rootfiles/core/119/filelists/armv5tel/glibc b/config/rootfiles/core/119/filelists/armv5tel/glibc
new file mode 120000
index 000000000..4c70d724b
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/armv5tel/glibc
@@ -0,0 +1 @@
+../../../../common/armv5tel/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/119/filelists/dma b/config/rootfiles/core/119/filelists/dma
new file mode 120000
index 000000000..60f4682da
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/dma
@@ -0,0 +1 @@
+../../../common/dma
\ No newline at end of file
diff --git a/config/rootfiles/core/119/filelists/files b/config/rootfiles/core/119/filelists/files
new file mode 100644
index 000000000..c6d38e2ae
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/files
@@ -0,0 +1,12 @@
+etc/system-release
+etc/issue
+etc/httpd/conf/global.conf
+etc/rc.d/init.d/cleanfs
+etc/rc.d/init.d/unbound
+srv/web/ipfire/cgi-bin/index.cgi
+srv/web/ipfire/cgi-bin/ovpnmain.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+usr/lib/libgcc_s.so.1
+var/ipfire/backup/include
+var/ipfire/langs
diff --git a/config/rootfiles/core/119/filelists/hostname b/config/rootfiles/core/119/filelists/hostname
new file mode 120000
index 000000000..2a96fdd31
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/hostname
@@ -0,0 +1 @@
+../../../common/hostname
\ No newline at end of file
diff --git a/config/rootfiles/core/119/filelists/i2c-tools b/config/rootfiles/core/119/filelists/i2c-tools
new file mode 120000
index 000000000..c5f5af9e4
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/i2c-tools
@@ -0,0 +1 @@
+../../../common/i2c-tools
\ No newline at end of file
diff --git a/config/rootfiles/core/119/filelists/i586/binutils b/config/rootfiles/core/119/filelists/i586/binutils
new file mode 120000
index 000000000..78695d73a
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/i586/binutils
@@ -0,0 +1 @@
+../../../../common/i586/binutils
\ No newline at end of file
diff --git a/config/rootfiles/core/119/filelists/i586/gcc b/config/rootfiles/core/119/filelists/i586/gcc
new file mode 120000
index 000000000..ba328e3b6
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/i586/gcc
@@ -0,0 +1 @@
+../../../../common/i586/gcc
\ No newline at end of file
diff --git a/config/rootfiles/core/119/filelists/i586/glibc b/config/rootfiles/core/119/filelists/i586/glibc
new file mode 120000
index 000000000..943021f19
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/i586/glibc
@@ -0,0 +1 @@
+../../../../common/i586/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/119/filelists/iproute2 b/config/rootfiles/core/119/filelists/iproute2
new file mode 120000
index 000000000..05f0f71fb
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/iproute2
@@ -0,0 +1 @@
+../../../common/iproute2
\ No newline at end of file
diff --git a/config/rootfiles/core/119/filelists/pam b/config/rootfiles/core/119/filelists/pam
new file mode 120000
index 000000000..660a1d80e
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/pam
@@ -0,0 +1 @@
+../../../common/pam
\ No newline at end of file
diff --git a/config/rootfiles/core/119/filelists/setup b/config/rootfiles/core/119/filelists/setup
new file mode 120000
index 000000000..209374bbc
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/setup
@@ -0,0 +1 @@
+../../../common/setup
\ No newline at end of file
diff --git a/config/rootfiles/core/119/filelists/strongswan b/config/rootfiles/core/119/filelists/strongswan
new file mode 120000
index 000000000..90c727e26
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/119/filelists/x86_64/binutils b/config/rootfiles/core/119/filelists/x86_64/binutils
new file mode 120000
index 000000000..7d0fda554
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/x86_64/binutils
@@ -0,0 +1 @@
+../../../../common/x86_64/binutils
\ No newline at end of file
diff --git a/config/rootfiles/core/119/filelists/x86_64/gcc b/config/rootfiles/core/119/filelists/x86_64/gcc
new file mode 120000
index 000000000..d1616d377
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/x86_64/gcc
@@ -0,0 +1 @@
+../../../../common/x86_64/gcc
\ No newline at end of file
diff --git a/config/rootfiles/core/119/filelists/x86_64/glibc b/config/rootfiles/core/119/filelists/x86_64/glibc
new file mode 120000
index 000000000..111909966
--- /dev/null
+++ b/config/rootfiles/core/119/filelists/x86_64/glibc
@@ -0,0 +1 @@
+../../../../common/x86_64/glibc
\ No newline at end of file
diff --git a/config/rootfiles/core/118/meta b/config/rootfiles/core/119/meta
similarity index 100%
rename from config/rootfiles/core/118/meta
rename to config/rootfiles/core/119/meta
diff --git a/config/rootfiles/core/119/update.sh b/config/rootfiles/core/119/update.sh
new file mode 100644
index 000000000..8ada47455
--- /dev/null
+++ b/config/rootfiles/core/119/update.sh
@@ -0,0 +1,102 @@
+#!/bin/bash
+############################################################################
+#                                                                          #
+# This file is part of the IPFire Firewall.                                #
+#                                                                          #
+# IPFire is free software; you can redistribute it and/or modify           #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 3 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPFire is distributed in the hope that it will be useful,                #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPFire; if not, write to the Free Software                    #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2017 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+core=119
+
+# 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
+ipsec stop
+
+# Remove old files
+rm -vf \
+	/sbin/capiinit \
+	/usr/bin/capiinfo \
+	/usr/lib/libcapi20* \
+	/usr/bin/isdn_text2wireshark \
+	/usr/bin/l1oipctrl \
+	/usr/bin/msidn_* \
+	/usr/lib/libmisdn* \
+	/usr/sbin/misdn_* \
+	/etc/rc.d/init.d/mISDN \
+	/usr/lib/libwrap* \
+	/lib/security/pam_mysql.so
+
+# Extract files
+extract_files
+
+# update linker config
+ldconfig
+
+# restart init
+telinit u
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# remove dropped packages
+for package in lcr perl-DBD-mysql mysql; do
+	if [ -e /opt/pakfire/db/installed/meta-$package ]; then
+		pakfire remove -y $package
+	fi
+	rm -f /opt/pakfire/db/installed/meta-$package
+	rm -f /opt/pakfire/db/meta/meta-$package
+	rm -f /opt/pakfire/db/rootfiles/$package
+done
+
+# Remove more old files
+rm -vf \
+	/usr/lib/libmysqlclient* \
+	/usr/lib/mysql
+
+# Start services
+/etc/init.d/apache reload
+
+# Regenerate IPsec configuration
+sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+	/etc/init.d/ipsec restart
+fi
+
+# This update needs 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/oldcore/118/exclude b/config/rootfiles/oldcore/118/exclude
new file mode 100644
index 000000000..d6fd053b6
--- /dev/null
+++ b/config/rootfiles/oldcore/118/exclude
@@ -0,0 +1,30 @@
+boot/config.txt
+boot/grub/grub.cfg
+boot/grub/grubenv
+etc/alternatives
+etc/collectd.custom
+etc/default/grub
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+etc/localtime
+etc/shadow
+etc/snort/snort.conf
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+etc/sudoers
+etc/sysconfig/firewall.local
+etc/sysconfig/rc.local
+etc/udev/rules.d/30-persistent-network.rules
+srv/web/ipfire/html/proxy.pac
+var/ipfire/dma
+var/ipfire/time
+var/ipfire/ovpn
+var/lib/alternatives
+var/log/cache
+var/log/dhcpcd.log
+var/log/messages
+var/state/dhcp/dhcpd.leases
+var/updatecache
diff --git a/config/rootfiles/core/118/filelists/bind b/config/rootfiles/oldcore/118/filelists/bind
similarity index 100%
rename from config/rootfiles/core/118/filelists/bind
rename to config/rootfiles/oldcore/118/filelists/bind
diff --git a/config/rootfiles/core/118/filelists/files b/config/rootfiles/oldcore/118/filelists/files
similarity index 100%
rename from config/rootfiles/core/118/filelists/files
rename to config/rootfiles/oldcore/118/filelists/files
diff --git a/config/rootfiles/core/118/filelists/glib b/config/rootfiles/oldcore/118/filelists/glib
similarity index 100%
rename from config/rootfiles/core/118/filelists/glib
rename to config/rootfiles/oldcore/118/filelists/glib
diff --git a/config/rootfiles/core/118/filelists/gzip b/config/rootfiles/oldcore/118/filelists/gzip
similarity index 100%
rename from config/rootfiles/core/118/filelists/gzip
rename to config/rootfiles/oldcore/118/filelists/gzip
diff --git a/config/rootfiles/core/118/filelists/hdparm b/config/rootfiles/oldcore/118/filelists/hdparm
similarity index 100%
rename from config/rootfiles/core/118/filelists/hdparm
rename to config/rootfiles/oldcore/118/filelists/hdparm
diff --git a/config/rootfiles/core/118/filelists/i586/dmidecode b/config/rootfiles/oldcore/118/filelists/i586/dmidecode
similarity index 100%
rename from config/rootfiles/core/118/filelists/i586/dmidecode
rename to config/rootfiles/oldcore/118/filelists/i586/dmidecode
diff --git a/config/rootfiles/core/118/filelists/lz4 b/config/rootfiles/oldcore/118/filelists/lz4
similarity index 100%
rename from config/rootfiles/core/118/filelists/lz4
rename to config/rootfiles/oldcore/118/filelists/lz4
diff --git a/config/rootfiles/core/118/filelists/openssh b/config/rootfiles/oldcore/118/filelists/openssh
similarity index 100%
rename from config/rootfiles/core/118/filelists/openssh
rename to config/rootfiles/oldcore/118/filelists/openssh
diff --git a/config/rootfiles/core/118/filelists/poppler b/config/rootfiles/oldcore/118/filelists/poppler
similarity index 100%
rename from config/rootfiles/core/118/filelists/poppler
rename to config/rootfiles/oldcore/118/filelists/poppler
diff --git a/config/rootfiles/core/118/filelists/sed b/config/rootfiles/oldcore/118/filelists/sed
similarity index 100%
rename from config/rootfiles/core/118/filelists/sed
rename to config/rootfiles/oldcore/118/filelists/sed
diff --git a/config/rootfiles/core/118/filelists/snort b/config/rootfiles/oldcore/118/filelists/snort
similarity index 100%
rename from config/rootfiles/core/118/filelists/snort
rename to config/rootfiles/oldcore/118/filelists/snort
diff --git a/config/rootfiles/core/118/filelists/squid b/config/rootfiles/oldcore/118/filelists/squid
similarity index 100%
rename from config/rootfiles/core/118/filelists/squid
rename to config/rootfiles/oldcore/118/filelists/squid
diff --git a/config/rootfiles/core/118/filelists/unbound b/config/rootfiles/oldcore/118/filelists/unbound
similarity index 100%
rename from config/rootfiles/core/118/filelists/unbound
rename to config/rootfiles/oldcore/118/filelists/unbound
diff --git a/config/rootfiles/core/118/filelists/wget b/config/rootfiles/oldcore/118/filelists/wget
similarity index 100%
rename from config/rootfiles/core/118/filelists/wget
rename to config/rootfiles/oldcore/118/filelists/wget
diff --git a/config/rootfiles/core/118/filelists/x86_64/dmidecode b/config/rootfiles/oldcore/118/filelists/x86_64/dmidecode
similarity index 100%
rename from config/rootfiles/core/118/filelists/x86_64/dmidecode
rename to config/rootfiles/oldcore/118/filelists/x86_64/dmidecode
diff --git a/config/rootfiles/oldcore/118/meta b/config/rootfiles/oldcore/118/meta
new file mode 100644
index 000000000..d547fa86f
--- /dev/null
+++ b/config/rootfiles/oldcore/118/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/118/update.sh b/config/rootfiles/oldcore/118/update.sh
similarity index 100%
rename from config/rootfiles/core/118/update.sh
rename to config/rootfiles/oldcore/118/update.sh
diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk
index d1a3097c6..92712e540 100644
--- a/config/rootfiles/packages/asterisk
+++ b/config/rootfiles/packages/asterisk
@@ -1,5 +1,6 @@
 etc/asterisk
 etc/logrotate.d/asterisk
+etc/rc.d/init.d/asterisk
 etc/rc.d/rc0.d/K30asterisk
 etc/rc.d/rc3.d/S30asterisk
 etc/rc.d/rc6.d/K30asterisk
@@ -12,8 +13,10 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/ael_structs.h
 #usr/include/asterisk/agi.h
 #usr/include/asterisk/alaw.h
+#usr/include/asterisk/alertpipe.h
 #usr/include/asterisk/aoc.h
 #usr/include/asterisk/app.h
+#usr/include/asterisk/ari.h
 #usr/include/asterisk/ast_expr.h
 #usr/include/asterisk/ast_version.h
 #usr/include/asterisk/astdb.h
@@ -24,9 +27,18 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/audiohook.h
 #usr/include/asterisk/autochan.h
 #usr/include/asterisk/autoconfig.h
-#usr/include/asterisk/bridging.h
-#usr/include/asterisk/bridging_features.h
-#usr/include/asterisk/bridging_technology.h
+#usr/include/asterisk/backtrace.h
+#usr/include/asterisk/beep.h
+#usr/include/asterisk/bridge.h
+#usr/include/asterisk/bridge_after.h
+#usr/include/asterisk/bridge_basic.h
+#usr/include/asterisk/bridge_channel.h
+#usr/include/asterisk/bridge_channel_internal.h
+#usr/include/asterisk/bridge_features.h
+#usr/include/asterisk/bridge_internal.h
+#usr/include/asterisk/bridge_roles.h
+#usr/include/asterisk/bridge_technology.h
+#usr/include/asterisk/bucket.h
 #usr/include/asterisk/build.h
 #usr/include/asterisk/buildinfo.h
 #usr/include/asterisk/buildopts.h
@@ -42,10 +54,13 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/channelstate.h
 #usr/include/asterisk/chanvars.h
 #usr/include/asterisk/cli.h
+#usr/include/asterisk/codec.h
 #usr/include/asterisk/compat.h
 #usr/include/asterisk/compiler.h
 #usr/include/asterisk/config.h
 #usr/include/asterisk/config_options.h
+#usr/include/asterisk/core_local.h
+#usr/include/asterisk/core_unreal.h
 #usr/include/asterisk/crypto.h
 #usr/include/asterisk/data.h
 #usr/include/asterisk/datastore.h
@@ -59,24 +74,25 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/doxygen/asterisk-git-howto.h
 #usr/include/asterisk/doxygen/commits.h
 #usr/include/asterisk/doxygen/licensing.h
-#usr/include/asterisk/doxygen/mantisworkflow.h
 #usr/include/asterisk/doxygen/releases.h
 #usr/include/asterisk/doxygen/reviewboard.h
 #usr/include/asterisk/doxyref.h
 #usr/include/asterisk/dsp.h
 #usr/include/asterisk/dundi.h
 #usr/include/asterisk/endian.h
+#usr/include/asterisk/endpoints.h
 #usr/include/asterisk/enum.h
 #usr/include/asterisk/event.h
 #usr/include/asterisk/event_defs.h
 #usr/include/asterisk/extconf.h
 #usr/include/asterisk/features.h
+#usr/include/asterisk/features_config.h
 #usr/include/asterisk/file.h
 #usr/include/asterisk/format.h
+#usr/include/asterisk/format_cache.h
 #usr/include/asterisk/format_cap.h
-#usr/include/asterisk/format_pref.h
+#usr/include/asterisk/format_compatibility.h
 #usr/include/asterisk/frame.h
-#usr/include/asterisk/frame_defs.h
 #usr/include/asterisk/framehook.h
 #usr/include/asterisk/fskmodem.h
 #usr/include/asterisk/fskmodem_float.h
@@ -90,26 +106,34 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/indications.h
 #usr/include/asterisk/inline_api.h
 #usr/include/asterisk/io.h
-#usr/include/asterisk/jabber.h
-#usr/include/asterisk/jingle.h
+#usr/include/asterisk/json.h
 #usr/include/asterisk/linkedlists.h
 #usr/include/asterisk/localtime.h
 #usr/include/asterisk/lock.h
 #usr/include/asterisk/logger.h
 #usr/include/asterisk/manager.h
+#usr/include/asterisk/max_forwards.h
 #usr/include/asterisk/md5.h
+#usr/include/asterisk/media_index.h
 #usr/include/asterisk/message.h
+#usr/include/asterisk/mixmonitor.h
 #usr/include/asterisk/mod_format.h
 #usr/include/asterisk/module.h
 #usr/include/asterisk/monitor.h
+#usr/include/asterisk/multicast_rtp.h
 #usr/include/asterisk/musiconhold.h
+#usr/include/asterisk/named_locks.h
 #usr/include/asterisk/netsock.h
 #usr/include/asterisk/netsock2.h
 #usr/include/asterisk/network.h
 #usr/include/asterisk/optional_api.h
 #usr/include/asterisk/options.h
+#usr/include/asterisk/opus.h
+#usr/include/asterisk/parking.h
 #usr/include/asterisk/paths.h
 #usr/include/asterisk/pbx.h
+#usr/include/asterisk/phoneprov.h
+#usr/include/asterisk/pickup.h
 #usr/include/asterisk/pktccops.h
 #usr/include/asterisk/plc.h
 #usr/include/asterisk/poll-compat.h
@@ -117,22 +141,56 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/privacy.h
 #usr/include/asterisk/pval.h
 #usr/include/asterisk/res_fax.h
+#usr/include/asterisk/res_hep.h
+#usr/include/asterisk/res_mwi_external.h
 #usr/include/asterisk/res_odbc.h
+#usr/include/asterisk/res_odbc_transaction.h
+#usr/include/asterisk/res_pjproject.h
+#usr/include/asterisk/res_pjsip.h
+#usr/include/asterisk/res_pjsip_body_generator_types.h
+#usr/include/asterisk/res_pjsip_cli.h
+#usr/include/asterisk/res_pjsip_outbound_publish.h
+#usr/include/asterisk/res_pjsip_presence_xml.h
+#usr/include/asterisk/res_pjsip_pubsub.h
+#usr/include/asterisk/res_pjsip_session.h
 #usr/include/asterisk/res_srtp.h
 #usr/include/asterisk/rtp_engine.h
 #usr/include/asterisk/say.h
 #usr/include/asterisk/sched.h
+#usr/include/asterisk/sdp_srtp.h
 #usr/include/asterisk/security_events.h
 #usr/include/asterisk/security_events_defs.h
 #usr/include/asterisk/select.h
+#usr/include/asterisk/sem.h
 #usr/include/asterisk/sha1.h
 #usr/include/asterisk/silk.h
 #usr/include/asterisk/sip_api.h
 #usr/include/asterisk/slin.h
 #usr/include/asterisk/slinfactory.h
 #usr/include/asterisk/smdi.h
+#usr/include/asterisk/smoother.h
+#usr/include/asterisk/sorcery.h
+#usr/include/asterisk/sounds_index.h
 #usr/include/asterisk/speech.h
+#usr/include/asterisk/spinlock.h
 #usr/include/asterisk/srv.h
+#usr/include/asterisk/stasis.h
+#usr/include/asterisk/stasis_app.h
+#usr/include/asterisk/stasis_app_device_state.h
+#usr/include/asterisk/stasis_app_impl.h
+#usr/include/asterisk/stasis_app_mailbox.h
+#usr/include/asterisk/stasis_app_playback.h
+#usr/include/asterisk/stasis_app_recording.h
+#usr/include/asterisk/stasis_app_snoop.h
+#usr/include/asterisk/stasis_bridges.h
+#usr/include/asterisk/stasis_cache_pattern.h
+#usr/include/asterisk/stasis_channels.h
+#usr/include/asterisk/stasis_endpoints.h
+#usr/include/asterisk/stasis_internal.h
+#usr/include/asterisk/stasis_message_router.h
+#usr/include/asterisk/stasis_system.h
+#usr/include/asterisk/stasis_test.h
+#usr/include/asterisk/statsd.h
 #usr/include/asterisk/stringfields.h
 #usr/include/asterisk/strings.h
 #usr/include/asterisk/stun.h
@@ -142,6 +200,7 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/tdd.h
 #usr/include/asterisk/term.h
 #usr/include/asterisk/test.h
+#usr/include/asterisk/threadpool.h
 #usr/include/asterisk/threadstorage.h
 #usr/include/asterisk/time.h
 #usr/include/asterisk/timing.h
@@ -150,7 +209,9 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/include/asterisk/udptl.h
 #usr/include/asterisk/ulaw.h
 #usr/include/asterisk/unaligned.h
+#usr/include/asterisk/uri.h
 #usr/include/asterisk/utils.h
+#usr/include/asterisk/uuid.h
 #usr/include/asterisk/vector.h
 #usr/include/asterisk/version.h
 #usr/include/asterisk/xml.h
@@ -159,9 +220,11 @@ etc/rc.d/rc6.d/K30asterisk
 #usr/lib/asterisk
 #usr/lib/asterisk/modules
 usr/lib/asterisk/modules/app_adsiprog.so
+usr/lib/asterisk/modules/app_agent_pool.so
 usr/lib/asterisk/modules/app_alarmreceiver.so
 usr/lib/asterisk/modules/app_amd.so
 usr/lib/asterisk/modules/app_authenticate.so
+usr/lib/asterisk/modules/app_bridgewait.so
 usr/lib/asterisk/modules/app_cdr.so
 usr/lib/asterisk/modules/app_celgenuserevent.so
 usr/lib/asterisk/modules/app_chanisavail.so
@@ -191,11 +254,9 @@ usr/lib/asterisk/modules/app_minivm.so
 usr/lib/asterisk/modules/app_mixmonitor.so
 usr/lib/asterisk/modules/app_morsecode.so
 usr/lib/asterisk/modules/app_mp3.so
-usr/lib/asterisk/modules/app_mysql.so
 usr/lib/asterisk/modules/app_nbscat.so
 usr/lib/asterisk/modules/app_originate.so
 usr/lib/asterisk/modules/app_page.so
-usr/lib/asterisk/modules/app_parkandannounce.so
 usr/lib/asterisk/modules/app_playback.so
 usr/lib/asterisk/modules/app_playtones.so
 usr/lib/asterisk/modules/app_privacy.so
@@ -210,6 +271,7 @@ usr/lib/asterisk/modules/app_sms.so
 usr/lib/asterisk/modules/app_softhangup.so
 usr/lib/asterisk/modules/app_speech_utils.so
 usr/lib/asterisk/modules/app_stack.so
+usr/lib/asterisk/modules/app_stasis.so
 usr/lib/asterisk/modules/app_system.so
 usr/lib/asterisk/modules/app_talkdetect.so
 usr/lib/asterisk/modules/app_test.so
@@ -224,26 +286,25 @@ usr/lib/asterisk/modules/app_waituntil.so
 usr/lib/asterisk/modules/app_while.so
 usr/lib/asterisk/modules/app_zapateller.so
 usr/lib/asterisk/modules/bridge_builtin_features.so
-usr/lib/asterisk/modules/bridge_multiplexed.so
+usr/lib/asterisk/modules/bridge_builtin_interval_features.so
+usr/lib/asterisk/modules/bridge_holding.so
+usr/lib/asterisk/modules/bridge_native_rtp.so
 usr/lib/asterisk/modules/bridge_simple.so
 usr/lib/asterisk/modules/bridge_softmix.so
 usr/lib/asterisk/modules/cdr_csv.so
 usr/lib/asterisk/modules/cdr_custom.so
 usr/lib/asterisk/modules/cdr_manager.so
-usr/lib/asterisk/modules/cdr_mysql.so
 usr/lib/asterisk/modules/cdr_sqlite3_custom.so
 usr/lib/asterisk/modules/cdr_syslog.so
 usr/lib/asterisk/modules/cel_custom.so
 usr/lib/asterisk/modules/cel_manager.so
 usr/lib/asterisk/modules/cel_sqlite3_custom.so
-usr/lib/asterisk/modules/chan_agent.so
 usr/lib/asterisk/modules/chan_alsa.so
-usr/lib/asterisk/modules/chan_bridge.so
+usr/lib/asterisk/modules/chan_bridge_media.so
 usr/lib/asterisk/modules/chan_iax2.so
-usr/lib/asterisk/modules/chan_local.so
 usr/lib/asterisk/modules/chan_mgcp.so
-usr/lib/asterisk/modules/chan_multicast_rtp.so
 usr/lib/asterisk/modules/chan_phone.so
+usr/lib/asterisk/modules/chan_rtp.so
 usr/lib/asterisk/modules/chan_sip.so
 usr/lib/asterisk/modules/chan_skinny.so
 usr/lib/asterisk/modules/chan_unistim.so
@@ -295,6 +356,7 @@ usr/lib/asterisk/modules/func_frame_trace.so
 usr/lib/asterisk/modules/func_global.so
 usr/lib/asterisk/modules/func_groupcount.so
 usr/lib/asterisk/modules/func_hangupcause.so
+usr/lib/asterisk/modules/func_holdintercept.so
 usr/lib/asterisk/modules/func_iconv.so
 usr/lib/asterisk/modules/func_jitterbuffer.so
 usr/lib/asterisk/modules/func_lock.so
@@ -302,16 +364,19 @@ usr/lib/asterisk/modules/func_logic.so
 usr/lib/asterisk/modules/func_math.so
 usr/lib/asterisk/modules/func_md5.so
 usr/lib/asterisk/modules/func_module.so
+usr/lib/asterisk/modules/func_periodic_hook.so
 usr/lib/asterisk/modules/func_pitchshift.so
 usr/lib/asterisk/modules/func_presencestate.so
 usr/lib/asterisk/modules/func_rand.so
 usr/lib/asterisk/modules/func_realtime.so
 usr/lib/asterisk/modules/func_sha1.so
 usr/lib/asterisk/modules/func_shell.so
+usr/lib/asterisk/modules/func_sorcery.so
 usr/lib/asterisk/modules/func_sprintf.so
 usr/lib/asterisk/modules/func_srv.so
 usr/lib/asterisk/modules/func_strings.so
 usr/lib/asterisk/modules/func_sysinfo.so
+usr/lib/asterisk/modules/func_talkdetect.so
 usr/lib/asterisk/modules/func_timeout.so
 usr/lib/asterisk/modules/func_uri.so
 usr/lib/asterisk/modules/func_version.so
@@ -326,34 +391,68 @@ usr/lib/asterisk/modules/pbx_spool.so
 usr/lib/asterisk/modules/res_adsi.so
 usr/lib/asterisk/modules/res_ael_share.so
 usr/lib/asterisk/modules/res_agi.so
+usr/lib/asterisk/modules/res_ari.so
+usr/lib/asterisk/modules/res_ari_applications.so
+usr/lib/asterisk/modules/res_ari_asterisk.so
+usr/lib/asterisk/modules/res_ari_bridges.so
+usr/lib/asterisk/modules/res_ari_channels.so
+usr/lib/asterisk/modules/res_ari_device_states.so
+usr/lib/asterisk/modules/res_ari_endpoints.so
+usr/lib/asterisk/modules/res_ari_events.so
+usr/lib/asterisk/modules/res_ari_model.so
+usr/lib/asterisk/modules/res_ari_playbacks.so
+usr/lib/asterisk/modules/res_ari_recordings.so
+usr/lib/asterisk/modules/res_ari_sounds.so
 usr/lib/asterisk/modules/res_calendar.so
 usr/lib/asterisk/modules/res_clialiases.so
 usr/lib/asterisk/modules/res_clioriginate.so
 usr/lib/asterisk/modules/res_config_curl.so
 usr/lib/asterisk/modules/res_config_ldap.so
-usr/lib/asterisk/modules/res_config_mysql.so
 usr/lib/asterisk/modules/res_config_sqlite3.so
 usr/lib/asterisk/modules/res_convert.so
 usr/lib/asterisk/modules/res_crypto.so
 usr/lib/asterisk/modules/res_curl.so
 usr/lib/asterisk/modules/res_fax.so
+usr/lib/asterisk/modules/res_fax_spandsp.so
 usr/lib/asterisk/modules/res_format_attr_celt.so
+usr/lib/asterisk/modules/res_format_attr_g729.so
 usr/lib/asterisk/modules/res_format_attr_h263.so
 usr/lib/asterisk/modules/res_format_attr_h264.so
+usr/lib/asterisk/modules/res_format_attr_opus.so
 usr/lib/asterisk/modules/res_format_attr_silk.so
+usr/lib/asterisk/modules/res_format_attr_siren14.so
+usr/lib/asterisk/modules/res_format_attr_siren7.so
+usr/lib/asterisk/modules/res_format_attr_vp8.so
+usr/lib/asterisk/modules/res_hep.so
+usr/lib/asterisk/modules/res_hep_rtcp.so
 usr/lib/asterisk/modules/res_http_websocket.so
 usr/lib/asterisk/modules/res_limit.so
+usr/lib/asterisk/modules/res_manager_devicestate.so
+usr/lib/asterisk/modules/res_manager_presencestate.so
 usr/lib/asterisk/modules/res_monitor.so
 usr/lib/asterisk/modules/res_musiconhold.so
 usr/lib/asterisk/modules/res_mutestream.so
+usr/lib/asterisk/modules/res_parking.so
 usr/lib/asterisk/modules/res_phoneprov.so
 usr/lib/asterisk/modules/res_realtime.so
 usr/lib/asterisk/modules/res_rtp_asterisk.so
 usr/lib/asterisk/modules/res_rtp_multicast.so
 usr/lib/asterisk/modules/res_security_log.so
 usr/lib/asterisk/modules/res_smdi.so
+usr/lib/asterisk/modules/res_sorcery_astdb.so
+usr/lib/asterisk/modules/res_sorcery_config.so
+usr/lib/asterisk/modules/res_sorcery_memory.so
+usr/lib/asterisk/modules/res_sorcery_memory_cache.so
+usr/lib/asterisk/modules/res_sorcery_realtime.so
 usr/lib/asterisk/modules/res_speech.so
 usr/lib/asterisk/modules/res_srtp.so
+usr/lib/asterisk/modules/res_stasis.so
+usr/lib/asterisk/modules/res_stasis_answer.so
+usr/lib/asterisk/modules/res_stasis_device_state.so
+usr/lib/asterisk/modules/res_stasis_playback.so
+usr/lib/asterisk/modules/res_stasis_recording.so
+usr/lib/asterisk/modules/res_stasis_snoop.so
+usr/lib/asterisk/modules/res_statsd.so
 usr/lib/asterisk/modules/res_stun_monitor.so
 usr/lib/asterisk/modules/res_timing_pthread.so
 usr/lib/asterisk/modules/res_timing_timerfd.so
@@ -365,6 +464,7 @@ usr/sbin/astdb2bdb
 usr/sbin/astdb2sqlite3
 usr/sbin/asterisk
 usr/sbin/astgenkey
+usr/sbin/astversion
 usr/sbin/autosupport
 usr/sbin/rasterisk
 usr/sbin/safe_asterisk
@@ -383,6 +483,8 @@ var/ipfire/asterisk/alsa.conf
 var/ipfire/asterisk/amd.conf
 var/ipfire/asterisk/app_mysql.conf
 var/ipfire/asterisk/app_skel.conf
+var/ipfire/asterisk/ari.conf
+var/ipfire/asterisk/ast_debug_tools.conf
 var/ipfire/asterisk/asterisk.adsi
 var/ipfire/asterisk/asterisk.conf
 var/ipfire/asterisk/asterisk.logrotate
@@ -427,14 +529,11 @@ var/ipfire/asterisk/features.conf
 var/ipfire/asterisk/festival.conf
 var/ipfire/asterisk/followme.conf
 var/ipfire/asterisk/func_odbc.conf
-var/ipfire/asterisk/gtalk.conf
-var/ipfire/asterisk/h323.conf
+var/ipfire/asterisk/hep.conf
 var/ipfire/asterisk/http.conf
 var/ipfire/asterisk/iax.conf
 var/ipfire/asterisk/iaxprov.conf
 var/ipfire/asterisk/indications.conf
-var/ipfire/asterisk/jabber.conf
-var/ipfire/asterisk/jingle.conf
 var/ipfire/asterisk/logger.conf
 var/ipfire/asterisk/manager.conf
 var/ipfire/asterisk/meetme.conf
@@ -450,6 +549,10 @@ var/ipfire/asterisk/osp.conf
 var/ipfire/asterisk/oss.conf
 var/ipfire/asterisk/phone.conf
 var/ipfire/asterisk/phoneprov.conf
+var/ipfire/asterisk/pjproject.conf
+var/ipfire/asterisk/pjsip.conf
+var/ipfire/asterisk/pjsip_notify.conf
+var/ipfire/asterisk/pjsip_wizard.conf
 var/ipfire/asterisk/queuerules.conf
 var/ipfire/asterisk/queues.conf
 var/ipfire/asterisk/res_config_mysql.conf
@@ -460,6 +563,7 @@ var/ipfire/asterisk/res_curl.conf
 var/ipfire/asterisk/res_fax.conf
 var/ipfire/asterisk/res_ldap.conf
 var/ipfire/asterisk/res_odbc.conf
+var/ipfire/asterisk/res_parking.conf
 var/ipfire/asterisk/res_pgsql.conf
 var/ipfire/asterisk/res_pktccops.conf
 var/ipfire/asterisk/res_snmp.conf
@@ -471,7 +575,12 @@ var/ipfire/asterisk/sip_notify.conf
 var/ipfire/asterisk/skinny.conf
 var/ipfire/asterisk/sla.conf
 var/ipfire/asterisk/smdi.conf
+var/ipfire/asterisk/sorcery.conf
+var/ipfire/asterisk/ss7.timers
+var/ipfire/asterisk/stasis.conf
+var/ipfire/asterisk/statsd.conf
 var/ipfire/asterisk/telcordia-1.adsi
+var/ipfire/asterisk/test_sorcery.conf
 var/ipfire/asterisk/udptl.conf
 var/ipfire/asterisk/unistim.conf
 var/ipfire/asterisk/users.conf
@@ -483,6 +592,7 @@ var/ipfire/backup/addons/includes/asterisk
 var/lib/asterisk/agi-bin
 #var/lib/asterisk/documentation
 #var/lib/asterisk/documentation/appdocsxml.dtd
+#var/lib/asterisk/documentation/appdocsxml.xslt
 #var/lib/asterisk/documentation/core-en_US.xml
 #var/lib/asterisk/documentation/thirdparty
 #var/lib/asterisk/firmware
@@ -517,6 +627,24 @@ var/lib/asterisk/phoneprov/000000000000.cfg
 var/lib/asterisk/phoneprov/polycom.xml
 var/lib/asterisk/phoneprov/polycom_line.xml
 var/lib/asterisk/phoneprov/snom-mac.xml
+var/lib/asterisk/rest-api
+#var/lib/asterisk/rest-api/applications.json
+#var/lib/asterisk/rest-api/asterisk.json
+#var/lib/asterisk/rest-api/bridges.json
+#var/lib/asterisk/rest-api/channels.json
+#var/lib/asterisk/rest-api/deviceStates.json
+#var/lib/asterisk/rest-api/endpoints.json
+#var/lib/asterisk/rest-api/events.json
+#var/lib/asterisk/rest-api/mailboxes.json
+#var/lib/asterisk/rest-api/playbacks.json
+#var/lib/asterisk/rest-api/recordings.json
+#var/lib/asterisk/rest-api/resources.json
+#var/lib/asterisk/rest-api/sounds.json
+var/lib/asterisk/scripts
+#var/lib/asterisk/scripts/ast_coredumper
+#var/lib/asterisk/scripts/ast_logescalator
+#var/lib/asterisk/scripts/ast_loggrabber
+#var/lib/asterisk/scripts/refcounter.py
 #var/lib/asterisk/sounds
 #var/lib/asterisk/sounds/de
 var/lib/asterisk/sounds/de/.DS_Store
@@ -835,16 +963,16 @@ var/lib/asterisk/sounds/digits/de/xh-8x.gsm
 var/lib/asterisk/sounds/digits/de/xh-9x.gsm
 var/lib/asterisk/sounds/digits/de/yesterday.gsm
 var/lib/asterisk/sounds/en
-var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.5
-var/lib/asterisk/sounds/en/.asterisk-extra-sounds-en-gsm-1.5
+#var/lib/asterisk/sounds/en/.asterisk-core-sounds-en-gsm-1.6
+#var/lib/asterisk/sounds/en/.asterisk-extra-sounds-en-gsm-1.5.1
 var/lib/asterisk/sounds/en/1-for-am-2-for-pm.gsm
 var/lib/asterisk/sounds/en/1-yes-2-no.gsm
-#var/lib/asterisk/sounds/en/CHANGES-asterisk-core-en-1.5
-#var/lib/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.5
-#var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.5
-#var/lib/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.5
-#var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.5
-#var/lib/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.5
+#var/lib/asterisk/sounds/en/CHANGES-asterisk-core-en-1.6
+#var/lib/asterisk/sounds/en/CHANGES-asterisk-extra-en-1.5.1
+#var/lib/asterisk/sounds/en/CREDITS-asterisk-core-en-1.6
+#var/lib/asterisk/sounds/en/CREDITS-asterisk-extra-en-1.5.1
+#var/lib/asterisk/sounds/en/LICENSE-asterisk-core-en-1.6
+#var/lib/asterisk/sounds/en/LICENSE-asterisk-extra-en-1.5.1
 var/lib/asterisk/sounds/en/OfficeSpace.gsm
 var/lib/asterisk/sounds/en/Randulo-allison.gsm
 var/lib/asterisk/sounds/en/SIP_Test_Failure.gsm
@@ -1110,6 +1238,8 @@ var/lib/asterisk/sounds/en/confbridge-begin-glorious-a.gsm
 var/lib/asterisk/sounds/en/confbridge-begin-glorious-b.gsm
 var/lib/asterisk/sounds/en/confbridge-begin-glorious-c.gsm
 var/lib/asterisk/sounds/en/confbridge-begin-leader.gsm
+var/lib/asterisk/sounds/en/confbridge-binaural-off.gsm
+var/lib/asterisk/sounds/en/confbridge-binaural-on.gsm
 var/lib/asterisk/sounds/en/confbridge-conf-begin.gsm
 var/lib/asterisk/sounds/en/confbridge-conf-end.gsm
 var/lib/asterisk/sounds/en/confbridge-dec-list-vol-in.gsm
@@ -2833,11 +2963,13 @@ var/lib/asterisk/sounds/phonetic/de/y_p.gsm
 var/lib/asterisk/sounds/phonetic/de/z_p.gsm
 #var/lib/asterisk/static-http
 #var/lib/asterisk/static-http/ajamdemo.html
+#var/lib/asterisk/static-http/appdocsxml.xslt
 #var/lib/asterisk/static-http/astman.css
 #var/lib/asterisk/static-http/astman.js
 #var/lib/asterisk/static-http/core-en_US.xml
 #var/lib/asterisk/static-http/mantest.html
 #var/lib/asterisk/static-http/prototype.js
+#var/lib/asterisk/third-party
 #var/log/asterisk
 var/log/asterisk/cdr-csv
 var/log/asterisk/cdr-custom
@@ -2846,6 +2978,7 @@ var/log/asterisk/cel-custom
 var/spool/asterisk/dictate
 var/spool/asterisk/meetme
 var/spool/asterisk/monitor
+var/spool/asterisk/recording
 var/spool/asterisk/system
 var/spool/asterisk/tmp
 #var/spool/asterisk/voicemail
@@ -2855,4 +2988,3 @@ var/spool/asterisk/voicemail/default/1234/INBOX
 var/spool/asterisk/voicemail/default/1234/en
 var/spool/asterisk/voicemail/default/1234/en/busy.gsm
 var/spool/asterisk/voicemail/default/1234/en/unavail.gsm
-etc/rc.d/init.d/asterisk
diff --git a/config/rootfiles/packages/bacula b/config/rootfiles/packages/bacula
index 908434795..64fb0d2ca 100644
--- a/config/rootfiles/packages/bacula
+++ b/config/rootfiles/packages/bacula
@@ -4,44 +4,46 @@
 etc/bacula/bacula-ctl-fd
 #etc/bacula/bacula-ctl-sd
 etc/bacula/bacula-fd.conf
+#etc/bacula/bacula-tray-monitor.desktop
 #etc/bacula/bacula_config
+#etc/bacula/baculabackupreport
 #etc/bacula/bconsole
 #etc/bacula/bconsole.conf
 #etc/bacula/btraceback.dbx
 #etc/bacula/btraceback.gdb
 #etc/bacula/btraceback.mdb
 #etc/bacula/disk-changer
-#etc/bacula/dvd-handler
 #etc/bacula/mtx-changer
 #etc/bacula/mtx-changer.conf
+#etc/bacula/tapealert
 etc/rc.d/init.d/bacula
+#opt/bacula
+#opt/bacula/log
 usr/lib/bpipe-fd.so
-usr/lib/libbac-5.2.13.so
+usr/lib/libbac-9.0.6.so
 #usr/lib/libbac.la
 #usr/lib/libbac.so
-usr/lib/libbaccfg-5.2.13.so
+usr/lib/libbaccfg-9.0.6.so
 #usr/lib/libbaccfg.la
 #usr/lib/libbaccfg.so
-usr/lib/libbacfind-5.2.13.so
+usr/lib/libbacfind-9.0.6.so
 #usr/lib/libbacfind.la
 #usr/lib/libbacfind.so
-usr/lib/libbacpy-5.2.13.so
-#usr/lib/libbacpy.la
-#usr/lib/libbacpy.so
 #usr/sbin/bacula
 usr/sbin/bacula-fd
+#usr/sbin/bbconsjson
 #usr/sbin/bconsole
+#usr/sbin/bfdjson
 #usr/sbin/btraceback
 #usr/share/doc/bacula
 #usr/share/doc/bacula/ChangeLog
 #usr/share/doc/bacula/INSTALL
 #usr/share/doc/bacula/LICENSE
+#usr/share/doc/bacula/LICENSE-FAQ
+#usr/share/doc/bacula/LICENSE-FOSS
 #usr/share/doc/bacula/README
 #usr/share/doc/bacula/ReleaseNotes
 #usr/share/doc/bacula/VERIFYING
-#usr/share/doc/bacula/technotes
-#usr/share/man/man1/bacula-bwxconsole.1.gz
-#usr/share/man/man1/bacula-tray-monitor.1.gz
 #usr/share/man/man1/bat.1.gz
 #usr/share/man/man1/bsmtp.1.gz
 #usr/share/man/man8/bacula-dir.8.gz
diff --git a/config/rootfiles/packages/flac b/config/rootfiles/packages/flac
index e841bbff8..6ea1dc958 100644
--- a/config/rootfiles/packages/flac
+++ b/config/rootfiles/packages/flac
@@ -16,299 +16,41 @@ usr/bin/metaflac
 #usr/include/FLAC/ordinals.h
 #usr/include/FLAC/stream_decoder.h
 #usr/include/FLAC/stream_encoder.h
-#usr/lib/libFLAC++.a
 #usr/lib/libFLAC++.la
 #usr/lib/libFLAC++.so
 usr/lib/libFLAC++.so.6
-usr/lib/libFLAC++.so.6.2.0
-#usr/lib/libFLAC.a
+usr/lib/libFLAC++.so.6.3.0
 #usr/lib/libFLAC.la
 #usr/lib/libFLAC.so
 usr/lib/libFLAC.so.8
-usr/lib/libFLAC.so.8.2.0
+usr/lib/libFLAC.so.8.3.0
 #usr/lib/pkgconfig/flac++.pc
 #usr/lib/pkgconfig/flac.pc
 #usr/share/aclocal/libFLAC++.m4
 #usr/share/aclocal/libFLAC.m4
-#usr/share/doc/flac-1.2.1
-#usr/share/doc/flac-1.2.1/FLAC.tag
-#usr/share/doc/flac-1.2.1/html
-#usr/share/doc/flac-1.2.1/html/api
-#usr/share/doc/flac-1.2.1/html/api/+_2all_8h-source.html
-#usr/share/doc/flac-1.2.1/html/api/+_2export_8h-source.html
-#usr/share/doc/flac-1.2.1/html/api/+_2export_8h.html
-#usr/share/doc/flac-1.2.1/html/api/+_2metadata_8h-source.html
-#usr/share/doc/flac-1.2.1/html/api/+_2metadata_8h.html
-#usr/share/doc/flac-1.2.1/html/api/all_8h-source.html
-#usr/share/doc/flac-1.2.1/html/api/annotated.html
-#usr/share/doc/flac-1.2.1/html/api/assert_8h-source.html
-#usr/share/doc/flac-1.2.1/html/api/callback_8h-source.html
-#usr/share/doc/flac-1.2.1/html/api/callback_8h.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1File-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1File.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1File.png
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1Stream-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1Stream.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1Stream.png
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1File-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1File.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1File.png
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1Stream-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1Stream.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1Stream.png
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Application-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Application.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Application.png
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Chain-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Chain.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1CueSheet.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1CueSheet.png
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Iterator.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Padding-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Padding.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Padding.png
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Picture-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Picture.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Picture.png
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Prototype.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Prototype.png
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SeekTable.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SeekTable.png
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1StreamInfo.png
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Unknown.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1Unknown.png
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1VorbisComment.png
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html
-#usr/share/doc/flac-1.2.1/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html
-#usr/share/doc/flac-1.2.1/html/api/classes.html
-#usr/share/doc/flac-1.2.1/html/api/decoder_8h-source.html
-#usr/share/doc/flac-1.2.1/html/api/decoder_8h.html
-#usr/share/doc/flac-1.2.1/html/api/dir_000000.html
-#usr/share/doc/flac-1.2.1/html/api/dir_000001.html
-#usr/share/doc/flac-1.2.1/html/api/dir_000002.html
-#usr/share/doc/flac-1.2.1/html/api/dirs.html
-#usr/share/doc/flac-1.2.1/html/api/doxygen.css
-#usr/share/doc/flac-1.2.1/html/api/doxygen.png
-#usr/share/doc/flac-1.2.1/html/api/encoder_8h-source.html
-#usr/share/doc/flac-1.2.1/html/api/encoder_8h.html
-#usr/share/doc/flac-1.2.1/html/api/export_8h-source.html
-#usr/share/doc/flac-1.2.1/html/api/export_8h.html
-#usr/share/doc/flac-1.2.1/html/api/files.html
-#usr/share/doc/flac-1.2.1/html/api/format_8h-source.html
-#usr/share/doc/flac-1.2.1/html/api/format_8h.html
-#usr/share/doc/flac-1.2.1/html/api/functions.html
-#usr/share/doc/flac-1.2.1/html/api/functions_func.html
-#usr/share/doc/flac-1.2.1/html/api/functions_vars.html
-#usr/share/doc/flac-1.2.1/html/api/globals.html
-#usr/share/doc/flac-1.2.1/html/api/globals_0x66.html
-#usr/share/doc/flac-1.2.1/html/api/globals_0x67.html
-#usr/share/doc/flac-1.2.1/html/api/globals_defs.html
-#usr/share/doc/flac-1.2.1/html/api/globals_enum.html
-#usr/share/doc/flac-1.2.1/html/api/globals_eval.html
-#usr/share/doc/flac-1.2.1/html/api/globals_func.html
-#usr/share/doc/flac-1.2.1/html/api/globals_type.html
-#usr/share/doc/flac-1.2.1/html/api/globals_vars.html
-#usr/share/doc/flac-1.2.1/html/api/group__flac.html
-#usr/share/doc/flac-1.2.1/html/api/group__flac__callbacks.html
-#usr/share/doc/flac-1.2.1/html/api/group__flac__decoder.html
-#usr/share/doc/flac-1.2.1/html/api/group__flac__encoder.html
-#usr/share/doc/flac-1.2.1/html/api/group__flac__export.html
-#usr/share/doc/flac-1.2.1/html/api/group__flac__format.html
-#usr/share/doc/flac-1.2.1/html/api/group__flac__metadata.html
-#usr/share/doc/flac-1.2.1/html/api/group__flac__metadata__level0.html
-#usr/share/doc/flac-1.2.1/html/api/group__flac__metadata__level1.html
-#usr/share/doc/flac-1.2.1/html/api/group__flac__metadata__level2.html
-#usr/share/doc/flac-1.2.1/html/api/group__flac__metadata__object.html
-#usr/share/doc/flac-1.2.1/html/api/group__flac__stream__decoder.html
-#usr/share/doc/flac-1.2.1/html/api/group__flac__stream__encoder.html
-#usr/share/doc/flac-1.2.1/html/api/group__flacpp.html
-#usr/share/doc/flac-1.2.1/html/api/group__flacpp__decoder.html
-#usr/share/doc/flac-1.2.1/html/api/group__flacpp__encoder.html
-#usr/share/doc/flac-1.2.1/html/api/group__flacpp__export.html
-#usr/share/doc/flac-1.2.1/html/api/group__flacpp__metadata.html
-#usr/share/doc/flac-1.2.1/html/api/group__flacpp__metadata__level0.html
-#usr/share/doc/flac-1.2.1/html/api/group__flacpp__metadata__level1.html
-#usr/share/doc/flac-1.2.1/html/api/group__flacpp__metadata__level2.html
-#usr/share/doc/flac-1.2.1/html/api/group__flacpp__metadata__object.html
-#usr/share/doc/flac-1.2.1/html/api/group__porting.html
-#usr/share/doc/flac-1.2.1/html/api/group__porting__1__1__2__to__1__1__3.html
-#usr/share/doc/flac-1.2.1/html/api/group__porting__1__1__3__to__1__1__4.html
-#usr/share/doc/flac-1.2.1/html/api/group__porting__1__1__4__to__1__2__0.html
-#usr/share/doc/flac-1.2.1/html/api/hierarchy.html
-#usr/share/doc/flac-1.2.1/html/api/index.html
-#usr/share/doc/flac-1.2.1/html/api/metadata_8h-source.html
-#usr/share/doc/flac-1.2.1/html/api/metadata_8h.html
-#usr/share/doc/flac-1.2.1/html/api/modules.html
-#usr/share/doc/flac-1.2.1/html/api/ordinals_8h-source.html
-#usr/share/doc/flac-1.2.1/html/api/stream__decoder_8h-source.html
-#usr/share/doc/flac-1.2.1/html/api/stream__decoder_8h.html
-#usr/share/doc/flac-1.2.1/html/api/stream__encoder_8h-source.html
-#usr/share/doc/flac-1.2.1/html/api/stream__encoder_8h.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____Frame-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____Frame.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____FrameFooter-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____FrameFooter.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____FrameHeader-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____FrameHeader.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____IOCallbacks-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____IOCallbacks.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamDecoder-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamDecoder.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamEncoder-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamEncoder.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Application-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Application.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet__Index-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet__Index.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet__Track-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__CueSheet__Track.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Padding-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Padding.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Picture-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Picture.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__SeekPoint-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__SeekPoint.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__SeekTable-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__SeekTable.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__StreamInfo-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__StreamInfo.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Unknown-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__Unknown.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__VorbisComment-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__VorbisComment.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__VorbisComment__Entry-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____StreamMetadata__VorbisComment__Entry.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Constant-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Constant.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Fixed-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Fixed.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__LPC-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__LPC.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Verbatim-members.html
-#usr/share/doc/flac-1.2.1/html/api/structFLAC____Subframe__Verbatim.html
-#usr/share/doc/flac-1.2.1/html/changelog.html
-#usr/share/doc/flac-1.2.1/html/comparison.html
-#usr/share/doc/flac-1.2.1/html/comparison__chopin_prelude_24.html
-#usr/share/doc/flac-1.2.1/html/comparison__dream_theater_600.html
-#usr/share/doc/flac-1.2.1/html/comparison__eddie_warner_titus.html
-#usr/share/doc/flac-1.2.1/html/comparison__fanfare_de_l_eventail_de_jeanne.html
-#usr/share/doc/flac-1.2.1/html/comparison__gloria_estefan_conga.html
-#usr/share/doc/flac-1.2.1/html/comparison__hand_in_my_pocket.html
-#usr/share/doc/flac-1.2.1/html/comparison__l_sub_raga_sivapriya.html
-#usr/share/doc/flac-1.2.1/html/comparison__laetatus_sum.html
-#usr/share/doc/flac-1.2.1/html/comparison__mummified_in_barbed_wire.html
-#usr/share/doc/flac-1.2.1/html/comparison__prokofiev_pcon3_3.html
-#usr/share/doc/flac-1.2.1/html/comparison__ravel_sq4_4.html
-#usr/share/doc/flac-1.2.1/html/comparison__scarlatti_k42.html
-#usr/share/doc/flac-1.2.1/html/comparison__tool_forty_six_and_2.html
-#usr/share/doc/flac-1.2.1/html/comparison__white_room.html
-#usr/share/doc/flac-1.2.1/html/comparison_all_cpudectime.html
-#usr/share/doc/flac-1.2.1/html/comparison_all_cpuenctime.html
-#usr/share/doc/flac-1.2.1/html/comparison_all_procdectime.html
-#usr/share/doc/flac-1.2.1/html/comparison_all_procenctime.html
-#usr/share/doc/flac-1.2.1/html/comparison_all_ratio.html
-#usr/share/doc/flac-1.2.1/html/developers.html
-#usr/share/doc/flac-1.2.1/html/documentation.html
-#usr/share/doc/flac-1.2.1/html/documentation_bugs.html
-#usr/share/doc/flac-1.2.1/html/documentation_example_code.html
-#usr/share/doc/flac-1.2.1/html/documentation_format_overview.html
-#usr/share/doc/flac-1.2.1/html/documentation_tasks.html
-#usr/share/doc/flac-1.2.1/html/documentation_tools.html
-#usr/share/doc/flac-1.2.1/html/documentation_tools_flac.html
-#usr/share/doc/flac-1.2.1/html/documentation_tools_metaflac.html
-#usr/share/doc/flac-1.2.1/html/documentation_tools_plugins.html
-#usr/share/doc/flac-1.2.1/html/download.html
-#usr/share/doc/flac-1.2.1/html/faq.html
-#usr/share/doc/flac-1.2.1/html/favicon.ico
-#usr/share/doc/flac-1.2.1/html/features.html
-#usr/share/doc/flac-1.2.1/html/flac.css
-#usr/share/doc/flac-1.2.1/html/format.html
-#usr/share/doc/flac-1.2.1/html/id.html
-#usr/share/doc/flac-1.2.1/html/images
-#usr/share/doc/flac-1.2.1/html/images/1x1.gif
-#usr/share/doc/flac-1.2.1/html/images/cafebug.gif
-#usr/share/doc/flac-1.2.1/html/images/hw
-#usr/share/doc/flac-1.2.1/html/images/hw/Blackbird_Front_low3_325x87.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/MS300frontsmall_270x108.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/MediaBox_Frt_170x325.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/SB_Hero_Black_325x182.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/Sooloos-ControlOne_325x328.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/Z500_front_325x94.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/a2_01_325x252.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/arcus_325x135.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/bmp-1430_325x241.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/cs505_front_lrg_325x113.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/enus_3-4lft-hires_product_eva8000_325x127.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/escient_ProductLine_325x163.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/hifidelio_bl_front_Z_RGB_325x163.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/i-station-mini-dx_325x237.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/iwod-g10_325x257.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/knc_hr-2800_325x209.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/mediaready_prodmain_MRMCa_325x232.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/meizu_m6_325x206.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/musica_artwork_325x90.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/neodigits_x5000_325x124.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/onda-vx737_325x240.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/request_n_front_325x103.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/rio_karma_279x254.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/sonos_family_RGB_325x200.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/teclast-tl29_325x244.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/transporter_hero_grey_325x208.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/tvix-4000_325x204.jpg
-#usr/share/doc/flac-1.2.1/html/images/hw/vibez_nofm_combi_black_b_325x220.jpg
-#usr/share/doc/flac-1.2.1/html/images/logo100.gif
-#usr/share/doc/flac-1.2.1/html/images/logo130.gif
-#usr/share/doc/flac-1.2.1/html/index.html
-#usr/share/doc/flac-1.2.1/html/itunes.html
-#usr/share/doc/flac-1.2.1/html/license.html
-#usr/share/doc/flac-1.2.1/html/links.html
-#usr/share/doc/flac-1.2.1/html/news.html
-#usr/share/doc/flac-1.2.1/html/ogg_mapping.html
-#usr/share/doc/flac-1.2.1/html/ru
-#usr/share/doc/flac-1.2.1/html/ru/authors.html
-#usr/share/doc/flac-1.2.1/html/ru/comparison.html
-#usr/share/doc/flac-1.2.1/html/ru/developers.html
-#usr/share/doc/flac-1.2.1/html/ru/documentation.html
-#usr/share/doc/flac-1.2.1/html/ru/download.html
-#usr/share/doc/flac-1.2.1/html/ru/features.html
-#usr/share/doc/flac-1.2.1/html/ru/format.html
-#usr/share/doc/flac-1.2.1/html/ru/goals.html
-#usr/share/doc/flac-1.2.1/html/ru/id.html
-#usr/share/doc/flac-1.2.1/html/ru/index.html
-#usr/share/doc/flac-1.2.1/html/ru/links.html
-#usr/share/doc/flac-1.2.1/html/ru/news.html
+#usr/share/doc/flac-1.3.2
+#usr/share/doc/flac-1.3.2/FLAC.tag
+#usr/share/doc/flac-1.3.2/html
+#usr/share/doc/flac-1.3.2/html/changelog.html
+#usr/share/doc/flac-1.3.2/html/developers.html
+#usr/share/doc/flac-1.3.2/html/documentation.html
+#usr/share/doc/flac-1.3.2/html/documentation_bugs.html
+#usr/share/doc/flac-1.3.2/html/documentation_example_code.html
+#usr/share/doc/flac-1.3.2/html/documentation_format_overview.html
+#usr/share/doc/flac-1.3.2/html/documentation_tools.html
+#usr/share/doc/flac-1.3.2/html/documentation_tools_flac.html
+#usr/share/doc/flac-1.3.2/html/documentation_tools_metaflac.html
+#usr/share/doc/flac-1.3.2/html/faq.html
+#usr/share/doc/flac-1.3.2/html/favicon.ico
+#usr/share/doc/flac-1.3.2/html/features.html
+#usr/share/doc/flac-1.3.2/html/flac.css
+#usr/share/doc/flac-1.3.2/html/format.html
+#usr/share/doc/flac-1.3.2/html/id.html
+#usr/share/doc/flac-1.3.2/html/images
+#usr/share/doc/flac-1.3.2/html/images/logo.svg
+#usr/share/doc/flac-1.3.2/html/images/logo130.gif
+#usr/share/doc/flac-1.3.2/html/index.html
+#usr/share/doc/flac-1.3.2/html/license.html
+#usr/share/doc/flac-1.3.2/html/ogg_mapping.html
 #usr/share/man/man1/flac.1
 #usr/share/man/man1/metaflac.1
diff --git a/config/rootfiles/packages/jansson b/config/rootfiles/packages/jansson
new file mode 100644
index 000000000..3901a0690
--- /dev/null
+++ b/config/rootfiles/packages/jansson
@@ -0,0 +1,8 @@
+#usr/include/jansson.h
+#usr/include/jansson_config.h
+#usr/lib/libjansson.a
+#usr/lib/libjansson.la
+#usr/lib/libjansson.so
+usr/lib/libjansson.so.4
+usr/lib/libjansson.so.4.10.0
+#usr/lib/pkgconfig/jansson.pc
diff --git a/config/rootfiles/packages/lcr b/config/rootfiles/packages/lcr
deleted file mode 100644
index 0739db445..000000000
--- a/config/rootfiles/packages/lcr
+++ /dev/null
@@ -1,391 +0,0 @@
-etc/rc.d/init.d/lcr
-usr/bin/gentones
-usr/bin/genwave
-usr/bin/lcradmin
-usr/lib/asterisk/modules/chan_lcr.so
-var/ipfire/backup/addons/includes/lcr
-#var/ipfire/lcr
-var/ipfire/lcr/directory.list
-var/ipfire/lcr/extensions
-var/ipfire/lcr/interface.conf
-var/ipfire/lcr/options.conf
-var/ipfire/lcr/routing.conf
-var/ipfire/lcr/routing.conf.org
-#var/ipfire/lcr/tones_american
-var/ipfire/lcr/tones_american/activated_loop.isdn
-var/ipfire/lcr/tones_american/busy_loop.isdn
-var/ipfire/lcr/tones_american/cause_01_loop.isdn
-var/ipfire/lcr/tones_american/cause_02_loop.isdn
-var/ipfire/lcr/tones_american/cause_03_loop.isdn
-var/ipfire/lcr/tones_american/cause_05_loop.isdn
-var/ipfire/lcr/tones_american/cause_06_loop.isdn
-var/ipfire/lcr/tones_american/cause_12_loop.isdn
-var/ipfire/lcr/tones_american/cause_13_loop.isdn
-var/ipfire/lcr/tones_american/cause_14_loop.isdn
-var/ipfire/lcr/tones_american/cause_15_loop.isdn
-var/ipfire/lcr/tones_american/cause_16_loop.isdn
-var/ipfire/lcr/tones_american/cause_1b_loop.isdn
-var/ipfire/lcr/tones_american/cause_1c_loop.isdn
-var/ipfire/lcr/tones_american/cause_1d_loop.isdn
-var/ipfire/lcr/tones_american/cause_1f_loop.isdn
-var/ipfire/lcr/tones_american/cause_22_loop.isdn
-var/ipfire/lcr/tones_american/cause_26_loop.isdn
-var/ipfire/lcr/tones_american/cause_29_loop.isdn
-var/ipfire/lcr/tones_american/cause_2a_loop.isdn
-var/ipfire/lcr/tones_american/cause_2f_loop.isdn
-var/ipfire/lcr/tones_american/cause_31_loop.isdn
-var/ipfire/lcr/tones_american/cause_32_loop.isdn
-var/ipfire/lcr/tones_american/cause_39_loop.isdn
-var/ipfire/lcr/tones_american/cause_3a_loop.isdn
-var/ipfire/lcr/tones_american/cause_3f_loop.isdn
-var/ipfire/lcr/tones_american/cause_41_loop.isdn
-var/ipfire/lcr/tones_american/cause_42_loop.isdn
-var/ipfire/lcr/tones_american/cause_45_loop.isdn
-var/ipfire/lcr/tones_american/cause_46_loop.isdn
-var/ipfire/lcr/tones_american/cause_55_loop.isdn
-var/ipfire/lcr/tones_american/cause_80_loop.isdn
-var/ipfire/lcr/tones_american/cause_81_loop.isdn
-var/ipfire/lcr/tones_american/cause_82_loop.isdn
-var/ipfire/lcr/tones_american/cause_83_loop.isdn
-var/ipfire/lcr/tones_american/cause_84_loop.isdn
-var/ipfire/lcr/tones_american/cause_85_loop.isdn
-var/ipfire/lcr/tones_american/cause_86_loop.isdn
-var/ipfire/lcr/tones_american/cause_87_loop.isdn
-var/ipfire/lcr/tones_american/crypt_off.isdn
-var/ipfire/lcr/tones_american/crypt_on.isdn
-var/ipfire/lcr/tones_american/deactivated_loop.isdn
-var/ipfire/lcr/tones_american/dialpbx.isdn
-var/ipfire/lcr/tones_american/dialpbx_loop.isdn
-var/ipfire/lcr/tones_american/dialtone_loop.isdn
-var/ipfire/lcr/tones_american/error_loop.isdn
-var/ipfire/lcr/tones_american/hold_loop.isdn
-var/ipfire/lcr/tones_american/joined.isdn
-var/ipfire/lcr/tones_american/left.isdn
-var/ipfire/lcr/tones_american/password_loop.isdn
-var/ipfire/lcr/tones_american/redial.isdn
-var/ipfire/lcr/tones_american/release_loop.isdn
-var/ipfire/lcr/tones_american/ringing_loop.isdn
-var/ipfire/lcr/tones_american/ringpbx_loop.isdn
-var/ipfire/lcr/tones_american/test_loop.isdn
-#var/ipfire/lcr/tones_efi
-var/ipfire/lcr/tones_efi/benutzerdefinierte.isdn
-var/ipfire/lcr/tones_efi/die.isdn
-var/ipfire/lcr/tones_efi/hello.isdn
-var/ipfire/lcr/tones_efi/ich_wiederhole.isdn
-var/ipfire/lcr/tones_efi/number_00.isdn
-var/ipfire/lcr/tones_efi/number_01.isdn
-var/ipfire/lcr/tones_efi/number_02.isdn
-var/ipfire/lcr/tones_efi/number_03.isdn
-var/ipfire/lcr/tones_efi/number_04.isdn
-var/ipfire/lcr/tones_efi/number_05.isdn
-var/ipfire/lcr/tones_efi/number_06.isdn
-var/ipfire/lcr/tones_efi/number_07.isdn
-var/ipfire/lcr/tones_efi/number_08.isdn
-var/ipfire/lcr/tones_efi/number_09.isdn
-var/ipfire/lcr/tones_efi/rufnummer_lautet.isdn
-var/ipfire/lcr/tones_efi/unterdrueckte.isdn
-#var/ipfire/lcr/tones_german
-var/ipfire/lcr/tones_german/activated_loop.isdn
-var/ipfire/lcr/tones_german/busy_loop.isdn
-var/ipfire/lcr/tones_german/cause_01_loop.isdn
-var/ipfire/lcr/tones_german/cause_02_loop.isdn
-var/ipfire/lcr/tones_german/cause_03_loop.isdn
-var/ipfire/lcr/tones_german/cause_05_loop.isdn
-var/ipfire/lcr/tones_german/cause_06_loop.isdn
-var/ipfire/lcr/tones_german/cause_12_loop.isdn
-var/ipfire/lcr/tones_german/cause_13_loop.isdn
-var/ipfire/lcr/tones_german/cause_14_loop.isdn
-var/ipfire/lcr/tones_german/cause_15_loop.isdn
-var/ipfire/lcr/tones_german/cause_16_loop.isdn
-var/ipfire/lcr/tones_german/cause_1b_loop.isdn
-var/ipfire/lcr/tones_german/cause_1c_loop.isdn
-var/ipfire/lcr/tones_german/cause_1d_loop.isdn
-var/ipfire/lcr/tones_german/cause_1f_loop.isdn
-var/ipfire/lcr/tones_german/cause_22_loop.isdn
-var/ipfire/lcr/tones_german/cause_26_loop.isdn
-var/ipfire/lcr/tones_german/cause_29_loop.isdn
-var/ipfire/lcr/tones_german/cause_2a_loop.isdn
-var/ipfire/lcr/tones_german/cause_2f_loop.isdn
-var/ipfire/lcr/tones_german/cause_31_loop.isdn
-var/ipfire/lcr/tones_german/cause_32_loop.isdn
-var/ipfire/lcr/tones_german/cause_39_loop.isdn
-var/ipfire/lcr/tones_german/cause_3a_loop.isdn
-var/ipfire/lcr/tones_german/cause_3f_loop.isdn
-var/ipfire/lcr/tones_german/cause_41_loop.isdn
-var/ipfire/lcr/tones_german/cause_42_loop.isdn
-var/ipfire/lcr/tones_german/cause_45_loop.isdn
-var/ipfire/lcr/tones_german/cause_46_loop.isdn
-var/ipfire/lcr/tones_german/cause_55_loop.isdn
-var/ipfire/lcr/tones_german/cause_80_loop.isdn
-var/ipfire/lcr/tones_german/cause_81_loop.isdn
-var/ipfire/lcr/tones_german/cause_82_loop.isdn
-var/ipfire/lcr/tones_german/cause_83_loop.isdn
-var/ipfire/lcr/tones_german/cause_84_loop.isdn
-var/ipfire/lcr/tones_german/cause_85_loop.isdn
-var/ipfire/lcr/tones_german/cause_86_loop.isdn
-var/ipfire/lcr/tones_german/cause_87_loop.isdn
-var/ipfire/lcr/tones_german/crypt_off.isdn
-var/ipfire/lcr/tones_german/crypt_on.isdn
-var/ipfire/lcr/tones_german/deactivated_loop.isdn
-var/ipfire/lcr/tones_german/dialpbx_loop.isdn
-var/ipfire/lcr/tones_german/dialtone_loop.isdn
-var/ipfire/lcr/tones_german/error_loop.isdn
-var/ipfire/lcr/tones_german/hold_loop.isdn
-var/ipfire/lcr/tones_german/joined.isdn
-var/ipfire/lcr/tones_german/left.isdn
-var/ipfire/lcr/tones_german/password_loop.isdn
-var/ipfire/lcr/tones_german/redial.isdn
-var/ipfire/lcr/tones_german/release_loop.isdn
-var/ipfire/lcr/tones_german/ringing.isdn
-var/ipfire/lcr/tones_german/ringing_loop.isdn
-var/ipfire/lcr/tones_german/ringpbx_loop.isdn
-var/ipfire/lcr/tones_german/test_loop.isdn
-#var/ipfire/lcr/vbox_english
-var/ipfire/lcr/vbox_english/call_anonymous.isdn
-var/ipfire/lcr/vbox_english/call_from.isdn
-var/ipfire/lcr/vbox_english/day_01.isdn
-var/ipfire/lcr/vbox_english/day_02.isdn
-var/ipfire/lcr/vbox_english/day_03.isdn
-var/ipfire/lcr/vbox_english/day_04.isdn
-var/ipfire/lcr/vbox_english/day_05.isdn
-var/ipfire/lcr/vbox_english/day_06.isdn
-var/ipfire/lcr/vbox_english/day_07.isdn
-var/ipfire/lcr/vbox_english/day_08.isdn
-var/ipfire/lcr/vbox_english/day_09.isdn
-var/ipfire/lcr/vbox_english/day_10.isdn
-var/ipfire/lcr/vbox_english/day_11.isdn
-var/ipfire/lcr/vbox_english/day_12.isdn
-var/ipfire/lcr/vbox_english/day_13.isdn
-var/ipfire/lcr/vbox_english/day_14.isdn
-var/ipfire/lcr/vbox_english/day_15.isdn
-var/ipfire/lcr/vbox_english/day_16.isdn
-var/ipfire/lcr/vbox_english/day_17.isdn
-var/ipfire/lcr/vbox_english/day_18.isdn
-var/ipfire/lcr/vbox_english/day_19.isdn
-var/ipfire/lcr/vbox_english/day_20.isdn
-var/ipfire/lcr/vbox_english/day_21.isdn
-var/ipfire/lcr/vbox_english/day_22.isdn
-var/ipfire/lcr/vbox_english/day_23.isdn
-var/ipfire/lcr/vbox_english/day_24.isdn
-var/ipfire/lcr/vbox_english/day_25.isdn
-var/ipfire/lcr/vbox_english/day_26.isdn
-var/ipfire/lcr/vbox_english/day_27.isdn
-var/ipfire/lcr/vbox_english/day_28.isdn
-var/ipfire/lcr/vbox_english/day_29.isdn
-var/ipfire/lcr/vbox_english/day_30.isdn
-var/ipfire/lcr/vbox_english/day_31.isdn
-var/ipfire/lcr/vbox_english/delete_ask.isdn
-var/ipfire/lcr/vbox_english/delete_done.isdn
-var/ipfire/lcr/vbox_english/intro.isdn
-var/ipfire/lcr/vbox_english/menu.isdn
-var/ipfire/lcr/vbox_english/minute.isdn
-var/ipfire/lcr/vbox_english/minutes.isdn
-var/ipfire/lcr/vbox_english/month_01.isdn
-var/ipfire/lcr/vbox_english/month_02.isdn
-var/ipfire/lcr/vbox_english/month_03.isdn
-var/ipfire/lcr/vbox_english/month_04.isdn
-var/ipfire/lcr/vbox_english/month_05.isdn
-var/ipfire/lcr/vbox_english/month_06.isdn
-var/ipfire/lcr/vbox_english/month_07.isdn
-var/ipfire/lcr/vbox_english/month_08.isdn
-var/ipfire/lcr/vbox_english/month_09.isdn
-var/ipfire/lcr/vbox_english/month_10.isdn
-var/ipfire/lcr/vbox_english/month_11.isdn
-var/ipfire/lcr/vbox_english/month_12.isdn
-var/ipfire/lcr/vbox_english/nothing.isdn
-var/ipfire/lcr/vbox_english/number_00.isdn
-var/ipfire/lcr/vbox_english/number_01.isdn
-var/ipfire/lcr/vbox_english/number_02.isdn
-var/ipfire/lcr/vbox_english/number_03.isdn
-var/ipfire/lcr/vbox_english/number_04.isdn
-var/ipfire/lcr/vbox_english/number_05.isdn
-var/ipfire/lcr/vbox_english/number_06.isdn
-var/ipfire/lcr/vbox_english/number_07.isdn
-var/ipfire/lcr/vbox_english/number_08.isdn
-var/ipfire/lcr/vbox_english/number_09.isdn
-var/ipfire/lcr/vbox_english/number_10.isdn
-var/ipfire/lcr/vbox_english/number_11.isdn
-var/ipfire/lcr/vbox_english/number_12.isdn
-var/ipfire/lcr/vbox_english/number_13.isdn
-var/ipfire/lcr/vbox_english/number_14.isdn
-var/ipfire/lcr/vbox_english/number_15.isdn
-var/ipfire/lcr/vbox_english/number_16.isdn
-var/ipfire/lcr/vbox_english/number_17.isdn
-var/ipfire/lcr/vbox_english/number_18.isdn
-var/ipfire/lcr/vbox_english/number_19.isdn
-var/ipfire/lcr/vbox_english/number_20.isdn
-var/ipfire/lcr/vbox_english/number_21.isdn
-var/ipfire/lcr/vbox_english/number_22.isdn
-var/ipfire/lcr/vbox_english/number_23.isdn
-var/ipfire/lcr/vbox_english/number_24.isdn
-var/ipfire/lcr/vbox_english/number_25.isdn
-var/ipfire/lcr/vbox_english/number_26.isdn
-var/ipfire/lcr/vbox_english/number_27.isdn
-var/ipfire/lcr/vbox_english/number_28.isdn
-var/ipfire/lcr/vbox_english/number_29.isdn
-var/ipfire/lcr/vbox_english/number_30.isdn
-var/ipfire/lcr/vbox_english/number_31.isdn
-var/ipfire/lcr/vbox_english/number_32.isdn
-var/ipfire/lcr/vbox_english/number_33.isdn
-var/ipfire/lcr/vbox_english/number_34.isdn
-var/ipfire/lcr/vbox_english/number_35.isdn
-var/ipfire/lcr/vbox_english/number_36.isdn
-var/ipfire/lcr/vbox_english/number_37.isdn
-var/ipfire/lcr/vbox_english/number_38.isdn
-var/ipfire/lcr/vbox_english/number_39.isdn
-var/ipfire/lcr/vbox_english/number_40.isdn
-var/ipfire/lcr/vbox_english/number_41.isdn
-var/ipfire/lcr/vbox_english/number_42.isdn
-var/ipfire/lcr/vbox_english/number_43.isdn
-var/ipfire/lcr/vbox_english/number_44.isdn
-var/ipfire/lcr/vbox_english/number_45.isdn
-var/ipfire/lcr/vbox_english/number_46.isdn
-var/ipfire/lcr/vbox_english/number_47.isdn
-var/ipfire/lcr/vbox_english/number_48.isdn
-var/ipfire/lcr/vbox_english/number_49.isdn
-var/ipfire/lcr/vbox_english/number_50.isdn
-var/ipfire/lcr/vbox_english/number_51.isdn
-var/ipfire/lcr/vbox_english/number_52.isdn
-var/ipfire/lcr/vbox_english/number_53.isdn
-var/ipfire/lcr/vbox_english/number_54.isdn
-var/ipfire/lcr/vbox_english/number_55.isdn
-var/ipfire/lcr/vbox_english/number_56.isdn
-var/ipfire/lcr/vbox_english/number_57.isdn
-var/ipfire/lcr/vbox_english/number_58.isdn
-var/ipfire/lcr/vbox_english/number_59.isdn
-var/ipfire/lcr/vbox_english/oclock_am.isdn
-var/ipfire/lcr/vbox_english/oclock_pm.isdn
-var/ipfire/lcr/vbox_english/pause.isdn
-var/ipfire/lcr/vbox_english/play.isdn
-var/ipfire/lcr/vbox_english/record_ask.isdn
-var/ipfire/lcr/vbox_english/record_play.isdn
-var/ipfire/lcr/vbox_english/record_record.isdn
-var/ipfire/lcr/vbox_english/store_ask.isdn
-var/ipfire/lcr/vbox_english/store_done.isdn
-#var/ipfire/lcr/vbox_german
-var/ipfire/lcr/vbox_german/call_anonymous.isdn
-var/ipfire/lcr/vbox_german/call_from.isdn
-var/ipfire/lcr/vbox_german/day_01.isdn
-var/ipfire/lcr/vbox_german/day_02.isdn
-var/ipfire/lcr/vbox_german/day_03.isdn
-var/ipfire/lcr/vbox_german/day_04.isdn
-var/ipfire/lcr/vbox_german/day_05.isdn
-var/ipfire/lcr/vbox_german/day_06.isdn
-var/ipfire/lcr/vbox_german/day_07.isdn
-var/ipfire/lcr/vbox_german/day_08.isdn
-var/ipfire/lcr/vbox_german/day_09.isdn
-var/ipfire/lcr/vbox_german/day_10.isdn
-var/ipfire/lcr/vbox_german/day_11.isdn
-var/ipfire/lcr/vbox_german/day_12.isdn
-var/ipfire/lcr/vbox_german/day_13.isdn
-var/ipfire/lcr/vbox_german/day_14.isdn
-var/ipfire/lcr/vbox_german/day_15.isdn
-var/ipfire/lcr/vbox_german/day_16.isdn
-var/ipfire/lcr/vbox_german/day_17.isdn
-var/ipfire/lcr/vbox_german/day_18.isdn
-var/ipfire/lcr/vbox_german/day_19.isdn
-var/ipfire/lcr/vbox_german/day_20.isdn
-var/ipfire/lcr/vbox_german/day_21.isdn
-var/ipfire/lcr/vbox_german/day_22.isdn
-var/ipfire/lcr/vbox_german/day_23.isdn
-var/ipfire/lcr/vbox_german/day_24.isdn
-var/ipfire/lcr/vbox_german/day_25.isdn
-var/ipfire/lcr/vbox_german/day_26.isdn
-var/ipfire/lcr/vbox_german/day_27.isdn
-var/ipfire/lcr/vbox_german/day_28.isdn
-var/ipfire/lcr/vbox_german/day_29.isdn
-var/ipfire/lcr/vbox_german/day_30.isdn
-var/ipfire/lcr/vbox_german/day_31.isdn
-var/ipfire/lcr/vbox_german/delete_ask.isdn
-var/ipfire/lcr/vbox_german/delete_done.isdn
-var/ipfire/lcr/vbox_german/intro.isdn
-var/ipfire/lcr/vbox_german/menu.isdn
-var/ipfire/lcr/vbox_german/minute.isdn
-var/ipfire/lcr/vbox_german/minutes.isdn
-var/ipfire/lcr/vbox_german/month_01.isdn
-var/ipfire/lcr/vbox_german/month_02.isdn
-var/ipfire/lcr/vbox_german/month_03.isdn
-var/ipfire/lcr/vbox_german/month_04.isdn
-var/ipfire/lcr/vbox_german/month_05.isdn
-var/ipfire/lcr/vbox_german/month_06.isdn
-var/ipfire/lcr/vbox_german/month_07.isdn
-var/ipfire/lcr/vbox_german/month_08.isdn
-var/ipfire/lcr/vbox_german/month_09.isdn
-var/ipfire/lcr/vbox_german/month_10.isdn
-var/ipfire/lcr/vbox_german/month_11.isdn
-var/ipfire/lcr/vbox_german/month_12.isdn
-var/ipfire/lcr/vbox_german/nothing.isdn
-var/ipfire/lcr/vbox_german/number_00.isdn
-var/ipfire/lcr/vbox_german/number_01.isdn
-var/ipfire/lcr/vbox_german/number_02.isdn
-var/ipfire/lcr/vbox_german/number_03.isdn
-var/ipfire/lcr/vbox_german/number_04.isdn
-var/ipfire/lcr/vbox_german/number_05.isdn
-var/ipfire/lcr/vbox_german/number_06.isdn
-var/ipfire/lcr/vbox_german/number_07.isdn
-var/ipfire/lcr/vbox_german/number_08.isdn
-var/ipfire/lcr/vbox_german/number_09.isdn
-var/ipfire/lcr/vbox_german/number_10.isdn
-var/ipfire/lcr/vbox_german/number_11.isdn
-var/ipfire/lcr/vbox_german/number_12.isdn
-var/ipfire/lcr/vbox_german/number_13.isdn
-var/ipfire/lcr/vbox_german/number_14.isdn
-var/ipfire/lcr/vbox_german/number_15.isdn
-var/ipfire/lcr/vbox_german/number_16.isdn
-var/ipfire/lcr/vbox_german/number_17.isdn
-var/ipfire/lcr/vbox_german/number_18.isdn
-var/ipfire/lcr/vbox_german/number_19.isdn
-var/ipfire/lcr/vbox_german/number_20.isdn
-var/ipfire/lcr/vbox_german/number_21.isdn
-var/ipfire/lcr/vbox_german/number_22.isdn
-var/ipfire/lcr/vbox_german/number_23.isdn
-var/ipfire/lcr/vbox_german/number_24.isdn
-var/ipfire/lcr/vbox_german/number_25.isdn
-var/ipfire/lcr/vbox_german/number_26.isdn
-var/ipfire/lcr/vbox_german/number_27.isdn
-var/ipfire/lcr/vbox_german/number_28.isdn
-var/ipfire/lcr/vbox_german/number_29.isdn
-var/ipfire/lcr/vbox_german/number_30.isdn
-var/ipfire/lcr/vbox_german/number_31.isdn
-var/ipfire/lcr/vbox_german/number_32.isdn
-var/ipfire/lcr/vbox_german/number_33.isdn
-var/ipfire/lcr/vbox_german/number_34.isdn
-var/ipfire/lcr/vbox_german/number_35.isdn
-var/ipfire/lcr/vbox_german/number_36.isdn
-var/ipfire/lcr/vbox_german/number_37.isdn
-var/ipfire/lcr/vbox_german/number_38.isdn
-var/ipfire/lcr/vbox_german/number_39.isdn
-var/ipfire/lcr/vbox_german/number_40.isdn
-var/ipfire/lcr/vbox_german/number_41.isdn
-var/ipfire/lcr/vbox_german/number_42.isdn
-var/ipfire/lcr/vbox_german/number_43.isdn
-var/ipfire/lcr/vbox_german/number_44.isdn
-var/ipfire/lcr/vbox_german/number_45.isdn
-var/ipfire/lcr/vbox_german/number_46.isdn
-var/ipfire/lcr/vbox_german/number_47.isdn
-var/ipfire/lcr/vbox_german/number_48.isdn
-var/ipfire/lcr/vbox_german/number_49.isdn
-var/ipfire/lcr/vbox_german/number_50.isdn
-var/ipfire/lcr/vbox_german/number_51.isdn
-var/ipfire/lcr/vbox_german/number_52.isdn
-var/ipfire/lcr/vbox_german/number_53.isdn
-var/ipfire/lcr/vbox_german/number_54.isdn
-var/ipfire/lcr/vbox_german/number_55.isdn
-var/ipfire/lcr/vbox_german/number_56.isdn
-var/ipfire/lcr/vbox_german/number_57.isdn
-var/ipfire/lcr/vbox_german/number_58.isdn
-var/ipfire/lcr/vbox_german/number_59.isdn
-var/ipfire/lcr/vbox_german/number_ein.isdn
-var/ipfire/lcr/vbox_german/number_eine.isdn
-var/ipfire/lcr/vbox_german/oclock.isdn
-var/ipfire/lcr/vbox_german/pause.isdn
-var/ipfire/lcr/vbox_german/play.isdn
-var/ipfire/lcr/vbox_german/record_ask.isdn
-var/ipfire/lcr/vbox_german/record_play.isdn
-var/ipfire/lcr/vbox_german/record_record.isdn
-var/ipfire/lcr/vbox_german/store_ask.isdn
-var/ipfire/lcr/vbox_german/store_done.isdn
-var/log/lcr
-usr/sbin/genextension
-usr/sbin/genrc
-usr/sbin/lcr
diff --git a/config/rootfiles/packages/mysql b/config/rootfiles/packages/mysql
deleted file mode 100644
index 292324662..000000000
--- a/config/rootfiles/packages/mysql
+++ /dev/null
@@ -1,302 +0,0 @@
-etc/my.cnf
-etc/rc.d/init.d/mysql
-srv/mysql
-#srv/mysql/mysql
-#srv/mysql/mysql/columns_priv.MYD
-#srv/mysql/mysql/columns_priv.MYI
-#srv/mysql/mysql/columns_priv.frm
-#srv/mysql/mysql/db.MYD
-#srv/mysql/mysql/db.MYI
-#srv/mysql/mysql/db.frm
-#srv/mysql/mysql/func.MYD
-#srv/mysql/mysql/func.MYI
-#srv/mysql/mysql/func.frm
-#srv/mysql/mysql/help_category.MYD
-#srv/mysql/mysql/help_category.MYI
-#srv/mysql/mysql/help_category.frm
-#srv/mysql/mysql/help_keyword.MYD
-#srv/mysql/mysql/help_keyword.MYI
-#srv/mysql/mysql/help_keyword.frm
-#srv/mysql/mysql/help_relation.MYD
-#srv/mysql/mysql/help_relation.MYI
-#srv/mysql/mysql/help_relation.frm
-#srv/mysql/mysql/help_topic.MYD
-#srv/mysql/mysql/help_topic.MYI
-#srv/mysql/mysql/help_topic.frm
-#srv/mysql/mysql/host.MYD
-#srv/mysql/mysql/host.MYI
-#srv/mysql/mysql/host.frm
-#srv/mysql/mysql/proc.MYD
-#srv/mysql/mysql/proc.MYI
-#srv/mysql/mysql/proc.frm
-#srv/mysql/mysql/procs_priv.MYD
-#srv/mysql/mysql/procs_priv.MYI
-#srv/mysql/mysql/procs_priv.frm
-#srv/mysql/mysql/tables_priv.MYD
-#srv/mysql/mysql/tables_priv.MYI
-#srv/mysql/mysql/tables_priv.frm
-#srv/mysql/mysql/time_zone.MYD
-#srv/mysql/mysql/time_zone.MYI
-#srv/mysql/mysql/time_zone.frm
-#srv/mysql/mysql/time_zone_leap_second.MYD
-#srv/mysql/mysql/time_zone_leap_second.MYI
-#srv/mysql/mysql/time_zone_leap_second.frm
-#srv/mysql/mysql/time_zone_name.MYD
-#srv/mysql/mysql/time_zone_name.MYI
-#srv/mysql/mysql/time_zone_name.frm
-#srv/mysql/mysql/time_zone_transition.MYD
-#srv/mysql/mysql/time_zone_transition.MYI
-#srv/mysql/mysql/time_zone_transition.frm
-#srv/mysql/mysql/time_zone_transition_type.MYD
-#srv/mysql/mysql/time_zone_transition_type.MYI
-#srv/mysql/mysql/time_zone_transition_type.frm
-#srv/mysql/mysql/user.MYD
-#srv/mysql/mysql/user.MYI
-#srv/mysql/mysql/user.frm
-usr/bin/comp_err
-usr/bin/innochecksum
-usr/bin/msql2mysql
-usr/bin/my_print_defaults
-usr/bin/myisam_ftdump
-usr/bin/myisamchk
-usr/bin/myisamlog
-usr/bin/myisampack
-usr/bin/mysql
-usr/bin/mysql_client_test
-usr/bin/mysql_config
-usr/bin/mysql_convert_table_format
-usr/bin/mysql_explain_log
-usr/bin/mysql_find_rows
-usr/bin/mysql_fix_extensions
-usr/bin/mysql_fix_privilege_tables
-usr/bin/mysql_install_db
-usr/bin/mysql_secure_installation
-usr/bin/mysql_setpermission
-usr/bin/mysql_tableinfo
-usr/bin/mysql_tzinfo_to_sql
-usr/bin/mysql_upgrade
-usr/bin/mysql_upgrade_shell
-usr/bin/mysql_waitpid
-usr/bin/mysql_zap
-usr/bin/mysqlaccess
-usr/bin/mysqladmin
-usr/bin/mysqlbinlog
-usr/bin/mysqlbug
-usr/bin/mysqlcheck
-usr/bin/mysqld_multi
-usr/bin/mysqld_safe
-usr/bin/mysqldump
-usr/bin/mysqldumpslow
-usr/bin/mysqlhotcopy
-usr/bin/mysqlimport
-usr/bin/mysqlshow
-usr/bin/mysqltest
-usr/bin/mysqltestmanager
-usr/bin/mysqltestmanager-pwgen
-usr/bin/mysqltestmanagerc
-usr/bin/perror
-usr/bin/replace
-usr/bin/resolve_stack_dump
-usr/bin/resolveip
-#usr/include/mysql
-#usr/include/mysql/decimal.h
-#usr/include/mysql/errmsg.h
-#usr/include/mysql/keycache.h
-#usr/include/mysql/m_ctype.h
-#usr/include/mysql/m_string.h
-#usr/include/mysql/my_alloc.h
-#usr/include/mysql/my_attribute.h
-#usr/include/mysql/my_config.h
-#usr/include/mysql/my_dbug.h
-#usr/include/mysql/my_dir.h
-#usr/include/mysql/my_getopt.h
-#usr/include/mysql/my_global.h
-#usr/include/mysql/my_list.h
-#usr/include/mysql/my_net.h
-#usr/include/mysql/my_no_pthread.h
-#usr/include/mysql/my_pthread.h
-#usr/include/mysql/my_sys.h
-#usr/include/mysql/my_xml.h
-#usr/include/mysql/mysql.h
-#usr/include/mysql/mysql_com.h
-#usr/include/mysql/mysql_embed.h
-#usr/include/mysql/mysql_time.h
-#usr/include/mysql/mysql_version.h
-#usr/include/mysql/mysqld_ername.h
-#usr/include/mysql/mysqld_error.h
-#usr/include/mysql/raid.h
-#usr/include/mysql/sql_common.h
-#usr/include/mysql/sql_state.h
-#usr/include/mysql/sslopt-case.h
-#usr/include/mysql/sslopt-longopts.h
-#usr/include/mysql/sslopt-vars.h
-#usr/include/mysql/typelib.h
-#usr/lib/libmysqlclient.so
-#usr/lib/libmysqlclient.so.15
-#usr/lib/libmysqlclient.so.15.0.0
-#usr/lib/libmysqlclient_r.so
-#usr/lib/libmysqlclient_r.so.15
-#usr/lib/libmysqlclient_r.so.15.0.0
-#usr/lib/mysql
-#usr/lib/mysql/libdbug.a
-#usr/lib/mysql/libheap.a
-#usr/lib/mysql/libmyisam.a
-#usr/lib/mysql/libmyisammrg.a
-#usr/lib/mysql/libmysqlclient.a
-#usr/lib/mysql/libmysqlclient.la
-#usr/lib/mysql/libmysqlclient.so
-#usr/lib/mysql/libmysqlclient.so.15
-#usr/lib/mysql/libmysqlclient.so.15.0.0
-#usr/lib/mysql/libmysqlclient_r.a
-#usr/lib/mysql/libmysqlclient_r.la
-#usr/lib/mysql/libmysqlclient_r.so
-#usr/lib/mysql/libmysqlclient_r.so.15
-#usr/lib/mysql/libmysqlclient_r.so.15.0.0
-#usr/lib/mysql/libmystrings.a
-#usr/lib/mysql/libmysys.a
-#usr/lib/mysql/libvio.a
-usr/sbin/mysqld
-usr/sbin/mysqlmanager
-#usr/share/info/mysql.info
-#usr/share/man/man1/comp_err.1
-#usr/share/man/man1/innochecksum.1
-#usr/share/man/man1/msql2mysql.1
-#usr/share/man/man1/my_print_defaults.1
-#usr/share/man/man1/myisam_ftdump.1
-#usr/share/man/man1/myisamchk.1
-#usr/share/man/man1/myisamlog.1
-#usr/share/man/man1/myisampack.1
-#usr/share/man/man1/mysql-stress-test.pl.1
-#usr/share/man/man1/mysql-test-run.pl.1
-#usr/share/man/man1/mysql.1
-#usr/share/man/man1/mysql.server.1
-#usr/share/man/man1/mysql_client_test.1
-#usr/share/man/man1/mysql_config.1
-#usr/share/man/man1/mysql_convert_table_format.1
-#usr/share/man/man1/mysql_explain_log.1
-#usr/share/man/man1/mysql_find_rows.1
-#usr/share/man/man1/mysql_fix_extensions.1
-#usr/share/man/man1/mysql_fix_privilege_tables.1
-#usr/share/man/man1/mysql_install_db.1
-#usr/share/man/man1/mysql_secure_installation.1
-#usr/share/man/man1/mysql_setpermission.1
-#usr/share/man/man1/mysql_tableinfo.1
-#usr/share/man/man1/mysql_tzinfo_to_sql.1
-#usr/share/man/man1/mysql_upgrade.1
-#usr/share/man/man1/mysql_waitpid.1
-#usr/share/man/man1/mysql_zap.1
-#usr/share/man/man1/mysqlaccess.1
-#usr/share/man/man1/mysqladmin.1
-#usr/share/man/man1/mysqlbinlog.1
-#usr/share/man/man1/mysqlbug.1
-#usr/share/man/man1/mysqlcheck.1
-#usr/share/man/man1/mysqld_multi.1
-#usr/share/man/man1/mysqld_safe.1
-#usr/share/man/man1/mysqldump.1
-#usr/share/man/man1/mysqldumpslow.1
-#usr/share/man/man1/mysqlhotcopy.1
-#usr/share/man/man1/mysqlimport.1
-#usr/share/man/man1/mysqlman.1
-#usr/share/man/man1/mysqlshow.1
-#usr/share/man/man1/mysqltest.1
-#usr/share/man/man1/perror.1
-#usr/share/man/man1/replace.1
-#usr/share/man/man1/resolve_stack_dump.1
-#usr/share/man/man1/resolveip.1
-#usr/share/man/man1/safe_mysqld.1
-#usr/share/man/man8/mysqld.8
-#usr/share/man/man8/mysqlmanager.8
-usr/share/mysql
-#usr/share/mysql/binary-configure
-#usr/share/mysql/charsets
-#usr/share/mysql/charsets/Index.xml
-#usr/share/mysql/charsets/README
-#usr/share/mysql/charsets/armscii8.xml
-#usr/share/mysql/charsets/ascii.xml
-#usr/share/mysql/charsets/cp1250.xml
-#usr/share/mysql/charsets/cp1251.xml
-#usr/share/mysql/charsets/cp1256.xml
-#usr/share/mysql/charsets/cp1257.xml
-#usr/share/mysql/charsets/cp850.xml
-#usr/share/mysql/charsets/cp852.xml
-#usr/share/mysql/charsets/cp866.xml
-#usr/share/mysql/charsets/dec8.xml
-#usr/share/mysql/charsets/geostd8.xml
-#usr/share/mysql/charsets/greek.xml
-#usr/share/mysql/charsets/hebrew.xml
-#usr/share/mysql/charsets/hp8.xml
-#usr/share/mysql/charsets/keybcs2.xml
-#usr/share/mysql/charsets/koi8r.xml
-#usr/share/mysql/charsets/koi8u.xml
-#usr/share/mysql/charsets/latin1.xml
-#usr/share/mysql/charsets/latin2.xml
-#usr/share/mysql/charsets/latin5.xml
-#usr/share/mysql/charsets/latin7.xml
-#usr/share/mysql/charsets/macce.xml
-#usr/share/mysql/charsets/macroman.xml
-#usr/share/mysql/charsets/swe7.xml
-#usr/share/mysql/czech
-#usr/share/mysql/czech/errmsg.sys
-#usr/share/mysql/danish
-#usr/share/mysql/danish/errmsg.sys
-#usr/share/mysql/dutch
-#usr/share/mysql/dutch/errmsg.sys
-#usr/share/mysql/english
-#usr/share/mysql/english/errmsg.sys
-#usr/share/mysql/errmsg.txt
-#usr/share/mysql/estonian
-#usr/share/mysql/estonian/errmsg.sys
-#usr/share/mysql/fill_help_tables.sql
-#usr/share/mysql/french
-#usr/share/mysql/french/errmsg.sys
-#usr/share/mysql/german
-#usr/share/mysql/german/errmsg.sys
-#usr/share/mysql/greek
-#usr/share/mysql/greek/errmsg.sys
-#usr/share/mysql/hungarian
-#usr/share/mysql/hungarian/errmsg.sys
-#usr/share/mysql/italian
-#usr/share/mysql/italian/errmsg.sys
-#usr/share/mysql/japanese
-#usr/share/mysql/japanese/errmsg.sys
-#usr/share/mysql/korean
-#usr/share/mysql/korean/errmsg.sys
-#usr/share/mysql/mi_test_all
-#usr/share/mysql/mi_test_all.res
-#usr/share/mysql/my-huge.cnf
-#usr/share/mysql/my-innodb-heavy-4G.cnf
-#usr/share/mysql/my-large.cnf
-#usr/share/mysql/my-medium.cnf
-#usr/share/mysql/my-small.cnf
-#usr/share/mysql/mysql-log-rotate
-#usr/share/mysql/mysql.server
-#usr/share/mysql/mysql_fix_privilege_tables.sql
-#usr/share/mysql/mysql_system_tables.sql
-#usr/share/mysql/mysql_system_tables_data.sql
-#usr/share/mysql/mysql_test_data_timezone.sql
-#usr/share/mysql/mysqld_multi.server
-#usr/share/mysql/ndb-config-2-node.ini
-#usr/share/mysql/norwegian
-#usr/share/mysql/norwegian-ny
-#usr/share/mysql/norwegian-ny/errmsg.sys
-#usr/share/mysql/norwegian/errmsg.sys
-#usr/share/mysql/polish
-#usr/share/mysql/polish/errmsg.sys
-#usr/share/mysql/portuguese
-#usr/share/mysql/portuguese/errmsg.sys
-#usr/share/mysql/romanian
-#usr/share/mysql/romanian/errmsg.sys
-#usr/share/mysql/russian
-#usr/share/mysql/russian/errmsg.sys
-#usr/share/mysql/serbian
-#usr/share/mysql/serbian/errmsg.sys
-#usr/share/mysql/slovak
-#usr/share/mysql/slovak/errmsg.sys
-#usr/share/mysql/spanish
-#usr/share/mysql/spanish/errmsg.sys
-#usr/share/mysql/swedish
-#usr/share/mysql/swedish/errmsg.sys
-#usr/share/mysql/ukrainian
-#usr/share/mysql/ukrainian/errmsg.sys
-var/ipfire/backup/addons/includes/mysql
-#var/run/mysql
diff --git a/config/rootfiles/packages/nagios-plugins b/config/rootfiles/packages/nagios-plugins
index 8e409d495..0c01a5ab7 100644
--- a/config/rootfiles/packages/nagios-plugins
+++ b/config/rootfiles/packages/nagios-plugins
@@ -29,8 +29,6 @@ usr/lib/nagios/plugins/check_log
 usr/lib/nagios/plugins/check_mailq
 usr/lib/nagios/plugins/check_mrtg
 usr/lib/nagios/plugins/check_mrtgtraf
-usr/lib/nagios/plugins/check_mysql
-usr/lib/nagios/plugins/check_mysql_query
 usr/lib/nagios/plugins/check_nagios
 usr/lib/nagios/plugins/check_nntp
 usr/lib/nagios/plugins/check_nntps
diff --git a/config/rootfiles/packages/nut b/config/rootfiles/packages/nut
index 4e6167e0d..b01381d74 100644
--- a/config/rootfiles/packages/nut
+++ b/config/rootfiles/packages/nut
@@ -5,7 +5,7 @@ etc/nut/upsd.conf.sample
 etc/nut/upsd.users.sample
 etc/nut/upsmon.conf.sample
 etc/nut/upssched.conf.sample
-etc/udev/rules.d/52-nut-usbups.rules
+etc/udev/rules.d/62-nut-usbups.rules
 usr/bin/al175
 usr/bin/apcsmart
 usr/bin/apcsmart-old
diff --git a/config/rootfiles/packages/openvmtools b/config/rootfiles/packages/openvmtools
index caeb568f1..35a33dd97 100644
--- a/config/rootfiles/packages/openvmtools
+++ b/config/rootfiles/packages/openvmtools
@@ -3,7 +3,6 @@ etc/rc.d/rc0.d/K01openvmtools
 etc/rc.d/rc3.d/S60openvmtools
 etc/rc.d/rc6.d/K01openvmtools
 etc/vmware-tools
-etc/vmware-tools/guestproxy-ssl.conf
 etc/vmware-tools/poweroff-vm-default
 etc/vmware-tools/poweron-vm-default
 etc/vmware-tools/resume-vm-default
@@ -13,12 +12,13 @@ etc/vmware-tools/scripts/vmware/network
 etc/vmware-tools/statechange.subr
 etc/vmware-tools/suspend-vm-default
 etc/vmware-tools/vm-support
+lib/udev/rules.d/99-vmware-scsi-udev.rules
 sbin/mount.vmhgfs
 usr/bin/vmhgfs-fuse
 usr/bin/vmtoolsd
 usr/bin/vmware-checkvm
-usr/bin/vmware-guestproxycerttool
 usr/bin/vmware-hgfsclient
+usr/bin/vmware-namespace-cmd
 usr/bin/vmware-rpctool
 usr/bin/vmware-toolbox-cmd
 usr/bin/vmware-vmblock-fuse
@@ -51,9 +51,9 @@ usr/lib/open-vm-tools/plugins/common/libhgfsServer.so
 #usr/lib/open-vm-tools/plugins/common/libvix.la
 usr/lib/open-vm-tools/plugins/common/libvix.so
 usr/lib/open-vm-tools/plugins/vmsvc
-usr/lib/open-vm-tools/plugins/vmsvc/libgrabbitmqProxy.so
 usr/lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
 usr/lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
+usr/lib/open-vm-tools/plugins/vmsvc/libresolutionKMS.so
 usr/lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
 usr/lib/open-vm-tools/plugins/vmsvc/libvmbackup.so
 #usr/lib/pkgconfig/vmguestlib.pc
diff --git a/config/rootfiles/packages/perl-DBD-SQLite b/config/rootfiles/packages/perl-DBD-SQLite
index 74a1fe6c5..cc1635aac 100644
--- a/config/rootfiles/packages/perl-DBD-SQLite
+++ b/config/rootfiles/packages/perl-DBD-SQLite
@@ -1,6 +1,7 @@
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/SQLite
 usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/SQLite.pm
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/SQLite/Cookbook.pod
+#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/SQLite
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/SQLite/.packlist
 #usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/SQLite/SQLite.bs
diff --git a/config/rootfiles/packages/perl-DBD-mysql b/config/rootfiles/packages/perl-DBD-mysql
deleted file mode 100644
index 177b3ee85..000000000
--- a/config/rootfiles/packages/perl-DBD-mysql
+++ /dev/null
@@ -1,14 +0,0 @@
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle/DBD
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle/DBD/mysql.pm
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/mysql
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/mysql.pm
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/mysql/GetInfo.pm
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/DBD/mysql/INSTALL.pod
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/mysql
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/mysql/.packlist
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/mysql/mysql.bs
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/DBD/mysql/mysql.so
-#usr/share/man/man3/Bundle::DBD::mysql.3
-#usr/share/man/man3/DBD::mysql.3
-#usr/share/man/man3/DBD::mysql::INSTALL.3
diff --git a/config/rootfiles/packages/postfix b/config/rootfiles/packages/postfix
index bc4739d0b..138c1dd7f 100644
--- a/config/rootfiles/packages/postfix
+++ b/config/rootfiles/packages/postfix
@@ -1,19 +1,19 @@
-etc/aliases
 #etc/postfix
 #etc/postfix/LICENSE
 #etc/postfix/TLS_LICENSE
 etc/postfix/access
-etc/postfix/body_checks
+etc/postfix/aliases
 #etc/postfix/bounce.cf.default
 etc/postfix/canonical
 etc/postfix/generic
 etc/postfix/header_checks
 etc/postfix/main.cf
+etc/postfix/main.cf.proto
 #etc/postfix/makedefs.out
 etc/postfix/master.cf
-etc/postfix/mysql-canonical.cf
-etc/postfix/mysql-mydestination.cf
-etc/postfix/mysql-virtual.cf
+etc/postfix/master.cf.proto
+etc/postfix/postfix-files
+etc/postfix/postfix-files.d
 etc/postfix/relocated
 etc/postfix/transport
 etc/postfix/virtual
@@ -30,16 +30,14 @@ usr/lib/postfix/error
 usr/lib/postfix/flush
 usr/lib/postfix/lmtp
 usr/lib/postfix/local
-usr/lib/postfix/main.cf
 usr/lib/postfix/master
-usr/lib/postfix/master.cf
 usr/lib/postfix/nqmgr
 usr/lib/postfix/oqmgr
 usr/lib/postfix/pickup
 usr/lib/postfix/pipe
 usr/lib/postfix/post-install
-usr/lib/postfix/postfix-files
 usr/lib/postfix/postfix-script
+usr/lib/postfix/postfix-tls-script
 usr/lib/postfix/postfix-wrapper
 usr/lib/postfix/postmulti-script
 usr/lib/postfix/postscreen
@@ -75,6 +73,7 @@ usr/sbin/sendmail.postfix
 #usr/share/man/man1/postcat.1
 #usr/share/man/man1/postconf.1
 #usr/share/man/man1/postdrop.1
+#usr/share/man/man1/postfix-tls.1
 #usr/share/man/man1/postfix.1
 #usr/share/man/man1/postkick.1
 #usr/share/man/man1/postlock.1
@@ -93,6 +92,7 @@ usr/sbin/sendmail.postfix
 #usr/share/man/man5/generic.5
 #usr/share/man/man5/header_checks.5
 #usr/share/man/man5/ldap_table.5
+#usr/share/man/man5/lmdb_table.5
 #usr/share/man/man5/master.5
 #usr/share/man/man5/memcache_table.5
 #usr/share/man/man5/mysql_table.5
@@ -103,6 +103,7 @@ usr/sbin/sendmail.postfix
 #usr/share/man/man5/postfix-wrapper.5
 #usr/share/man/man5/regexp_table.5
 #usr/share/man/man5/relocated.5
+#usr/share/man/man5/socketmap_table.5
 #usr/share/man/man5/sqlite_table.5
 #usr/share/man/man5/tcp_table.5
 #usr/share/man/man5/transport.5
diff --git a/config/rootfiles/packages/stunnel b/config/rootfiles/packages/stunnel
index eaf7fcece..6ec82dacd 100644
--- a/config/rootfiles/packages/stunnel
+++ b/config/rootfiles/packages/stunnel
@@ -28,13 +28,13 @@ usr/lib/stunnel/libstunnel.so
 #usr/share/doc/stunnel/examples/importCA.sh
 #usr/share/doc/stunnel/examples/script.sh
 #usr/share/doc/stunnel/examples/stunnel.init
+#usr/share/doc/stunnel/examples/stunnel.logrotate
+#usr/share/doc/stunnel/examples/stunnel.rh.init
 #usr/share/doc/stunnel/examples/stunnel.service
 #usr/share/doc/stunnel/examples/stunnel.spec
-#usr/share/doc/stunnel/stunnel.fr.html
 #usr/share/doc/stunnel/stunnel.html
 #usr/share/doc/stunnel/stunnel.pl.html
 #usr/share/man/man8/stunnel.8
-#usr/share/man/man8/stunnel.fr.8
 #usr/share/man/man8/stunnel.pl.8
 var/ipfire/backup/addons/includes/stunnel
 var/lib/stunnel
diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index ea91e0c20..580671b71 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -444,9 +444,16 @@ END
 		foreach my $key (sort { uc($vpnconfig{$a}[1]) cmp uc($vpnconfig{$b}[1]) } keys %vpnconfig) {
 			if ($vpnconfig{$key}[0] eq 'on' && $vpnconfig{$key}[3] ne 'host') {
 				$count++;
-				my ($vpnip,$vpnsub) = split("/",$vpnconfig{$key}[11]);
-				$vpnsub=&General::iporsubtocidr($vpnsub);
-				$vpnip="$vpnip/$vpnsub";
+
+				my @n = ();
+
+				my @networks = split(/\|/, $vpnconfig{$key}[11]);
+				foreach my $network (@networks) {
+					my ($vpnip, $vpnsub) = split("/", $network);
+					$vpnsub = &Network::convert_netmask2prefix($vpnsub) || $vpnsub;
+					push(@n, "$vpnip/$vpnsub");
+				}
+
 				if ($count % 2){
 					$col = $color{'color22'};
 				}else{
@@ -454,7 +461,7 @@ END
 				}
 				print "<tr>";
 				print "<td style='text-align:left; color:white; background-color:$Header::colourvpn;'>$vpnconfig{$key}[1]</td>";
-				print "<td style='text-align:center; background-color:$col'>$vpnip</td>";
+				print "<td style='text-align:center; background-color:$col'>" . join("<br>", @n) . "</td>";
 
 				my $activecolor = $Header::colourred;
 				my $activestatus = $Lang::tr{'capsclosed'};
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 9f5e682bd..0fa1d046e 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -2002,7 +2002,7 @@ END
 	    </select></td>
 	<tr><td class='base'>$Lang::tr{'ovpn dh'}:</td>
 		<td class='base'><select name='DHLENGHT'>
-				<option value='1024' $selected{'DHLENGHT'}{'1024'}>1024 $Lang::tr{'bit'}</option>
+				<option value='1024' $selected{'DHLENGHT'}{'1024'}>1024 $Lang::tr{'bit'} ($Lang::tr{'vpn weak'}</option>
 				<option value='2048' $selected{'DHLENGHT'}{'2048'}>2048 $Lang::tr{'bit'}</option>
 				<option value='3072' $selected{'DHLENGHT'}{'3072'}>3072 $Lang::tr{'bit'}</option>
 				<option value='4096' $selected{'DHLENGHT'}{'4096'}>4096 $Lang::tr{'bit'}</option>
@@ -4713,12 +4713,12 @@ if ($cgiparams{'TYPE'} eq 'net') {
 				<option value='AES-256-CBC' 	 	$selected{'DCIPHER'}{'AES-256-CBC'}>AES-CBC (256 $Lang::tr{'bit'}, $Lang::tr{'default'})</option>
 				<option value='AES-192-CBC' 	 	$selected{'DCIPHER'}{'AES-192-CBC'}>AES-CBC (192 $Lang::tr{'bit'})</option>
 				<option value='AES-128-CBC' 	 	$selected{'DCIPHER'}{'AES-128-CBC'}>AES-CBC (128 $Lang::tr{'bit'})</option>
-				<option value='DES-EDE3-CBC'	 	$selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC (192 $Lang::tr{'bit'})</option>
-				<option value='DESX-CBC' 		$selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC (192 $Lang::tr{'bit'})</option>
-				<option value='SEED-CBC' 		$selected{'DCIPHER'}{'SEED-CBC'}>SEED-CBC (128 $Lang::tr{'bit'})</option>
-				<option value='DES-EDE-CBC' 		$selected{'DCIPHER'}{'DES-EDE-CBC'}>DES-EDE-CBC (128 $Lang::tr{'bit'})</option>
-				<option value='BF-CBC' 			$selected{'DCIPHER'}{'BF-CBC'}>BF-CBC (128 $Lang::tr{'bit'})</option>
-				<option value='CAST5-CBC' 		$selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC (128 $Lang::tr{'bit'})</option>
+				<option value='SEED-CBC' 			$selected{'DCIPHER'}{'SEED-CBC'}>SEED-CBC (128 $Lang::tr{'bit'})</option>
+				<option value='DES-EDE3-CBC'	 	$selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC (192 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
+				<option value='DESX-CBC' 			$selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC (192 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
+				<option value='DES-EDE-CBC' 		$selected{'DCIPHER'}{'DES-EDE-CBC'}>DES-EDE-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
+				<option value='BF-CBC' 				$selected{'DCIPHER'}{'BF-CBC'}>BF-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
+				<option value='CAST5-CBC' 			$selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
 			</select>
 		</td>
 
@@ -5210,12 +5210,12 @@ END
 				<option value='AES-256-CBC' $selected{'DCIPHER'}{'AES-256-CBC'}>AES-CBC (256 $Lang::tr{'bit'})</option>
 				<option value='AES-192-CBC' $selected{'DCIPHER'}{'AES-192-CBC'}>AES-CBC (192 $Lang::tr{'bit'})</option>
 				<option value='AES-128-CBC' $selected{'DCIPHER'}{'AES-128-CBC'}>AES-CBC (128 $Lang::tr{'bit'})</option>
-				<option value='DES-EDE3-CBC' $selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC (192 $Lang::tr{'bit'})</option>
-				<option value='DESX-CBC' $selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC (192 $Lang::tr{'bit'})</option>
 				<option value='SEED-CBC' $selected{'DCIPHER'}{'SEED-CBC'}>SEED-CBC (128 $Lang::tr{'bit'})</option>
-				<option value='DES-EDE-CBC' $selected{'DCIPHER'}{'DES-EDE-CBC'}>DES-EDE-CBC (128 $Lang::tr{'bit'})</option>
-				<option value='BF-CBC' $selected{'DCIPHER'}{'BF-CBC'}>BF-CBC (128 $Lang::tr{'bit'})</option>
-				<option value='CAST5-CBC' $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC (128 $Lang::tr{'bit'})</option>
+				<option value='DES-EDE3-CBC' $selected{'DCIPHER'}{'DES-EDE3-CBC'}>DES-EDE3-CBC (192 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
+				<option value='DESX-CBC' $selected{'DCIPHER'}{'DESX-CBC'}>DESX-CBC (192 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
+				<option value='DES-EDE-CBC' $selected{'DCIPHER'}{'DES-EDE-CBC'}>DES-EDE-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
+				<option value='BF-CBC' $selected{'DCIPHER'}{'BF-CBC'}>BF-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
+				<option value='CAST5-CBC' $selected{'DCIPHER'}{'CAST5-CBC'}>CAST5-CBC (128 $Lang::tr{'bit'}, $Lang::tr{'vpn weak'})</option>
 			</select>
 		</td>
     <tr><td class='boldbase' nowrap='nowrap'>$Lang::tr{'comp-lzo'}</td>
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index 6aa14e15a..66ca86953 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3077,8 +3077,6 @@ END
 			print FILE "\n";
 
 			print FILE <<END
-
-
    )
      return "PROXY $netsettings{'GREEN_ADDRESS'}:$proxysettings{'PROXY_PORT'}";
 END
diff --git a/html/cgi-bin/vpnmain.cgi b/html/cgi-bin/vpnmain.cgi
index 17873d62b..2a0351ea0 100644
--- a/html/cgi-bin/vpnmain.cgi
+++ b/html/cgi-bin/vpnmain.cgi
@@ -436,6 +436,12 @@ sub writeipsecfiles {
 			if ($start_action eq 'route' && $inactivity_timeout > 0) {
 				print CONF "\tinactivity=$inactivity_timeout\n";
 			}
+
+			# Restart the connection immediately when it has gone down
+			# unexpectedly
+			if ($start_action eq 'start') {
+				print CONF "\tcloseaction=restart\n";
+			}
 		}
 
 		# Fragmentation
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index a22c4b566..a343b3bd7 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2059,7 +2059,7 @@
 'restore settings' => 'Reset Settings',
 'reverse sort' => 'Sort in reverse chronological order',
 'root' => 'Root',
-'root certificate' => 'Root certificate',
+'root certificate' => 'Root Certificate',
 'root path' => 'Root path',
 'root user password' => 'Root password',
 'route subnet is invalid' => 'Additional push route subnet is invalid',
diff --git a/lfs/Config b/lfs/Config
index a45b76b99..d63a1dc9a 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -41,6 +41,12 @@ ifeq "$(BUILD_ARCH)" "x86_64"
 	IS_64BIT = 1
 endif
 
+ifeq "$(TOOLCHAIN)" "1"
+	PREFIX = $(TOOLS_DIR)
+else
+	PREFIX = /usr
+endif
+
 # URLs that are common sources of downloads.  If you're having trouble with
 # a site you should change its URL to that of a suitable mirror site.
 #
diff --git a/lfs/asterisk b/lfs/asterisk
index 31f6ec0fe..8b0da1648 100755
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -20,7 +20,7 @@
 
 include Config
 
-VER        = 11.23.1
+VER        = 13.18.5
 
 THISAPP    = asterisk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -28,9 +28,9 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
-PAK_VER    = 20
+PAK_VER    = 22
 
-DEPS       = "libsrtp"
+DEPS       = "jansson libsrtp opus"
 
 ###############################################################################
 # Top-level Rules
@@ -38,16 +38,16 @@ DEPS       = "libsrtp"
 
 objects = $(DL_FILE) \
 	asterisk-1.4-de-prompts.tar.gz \
-	asterisk-extra-sounds-en-gsm-1.5.tar.gz \
+	asterisk-extra-sounds-en-gsm-1.5.1.tar.gz \
 	asterisk-moh-opsound-gsm-2.03.tar.gz 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-asterisk-extra-sounds-en-gsm-1.5.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.5.tar.gz
+asterisk-extra-sounds-en-gsm-1.5.1.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.5.1.tar.gz
 asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz
 asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz
 
-$(DL_FILE)_MD5 = 8dadfcda24eac2f6df431c71f5f01947
-asterisk-extra-sounds-en-gsm-1.5.tar.gz_MD5 = 49f2baefc7aad424f30ff18d883501d2
+$(DL_FILE)_MD5 = 4ad2a5ab1dd12cba5f37fca52961aa2a
+asterisk-extra-sounds-en-gsm-1.5.1.tar.gz_MD5 = aa1003ed984239f18e123decc39c2178
 asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf
 asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c
 
@@ -81,13 +81,8 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-
-	# remove old directories and extract asterisk
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 
-	# patch asterisk
-	cd $(DIR_APP) && patch -p4 < $(DIR_SRC)/src/patches/asterisk-no-ffmpeg.patch
-
 	# configure asterisk
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire \
 		--without-oss \
@@ -97,21 +92,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		--without-avcodec \
 		--without-vorbis \
 		--without-ogg \
-		--without-spandsp \
 		--disable-xmldoc
 
 	# enable additional features (include following sound-tars)
 	cd $(DIR_APP) && make menuselect.makeopts && menuselect/menuselect \
 		--enable res_srtp \
-		--enable app_mysql \
-		--enable cdr_mysql \
-		--enable res_config_mysql \
 		--enable EXTRA-SOUNDS-EN-GSM \
 		--enable MOH-OPSOUND-GSM  \
 		menuselect.makeopts
 
 	# add additional sounds
-	cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.5.tar.gz $(DIR_APP)/sounds/
+	cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.5.1.tar.gz $(DIR_APP)/sounds/
 	cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-moh-opsound-gsm-2.03.tar.gz $(DIR_APP)/sounds/
 
 	# Fix wrong cpu optimization (march=armv5tel)
@@ -139,14 +130,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	chown nobody:nobody -R /var/ipfire/asterisk
 	chown nobody:nobody -R /var/lib/asterisk
 
-# be sure all source is removed
-	@rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-* $(DIR_SRC)/libsrtp*
-
 	# remember backup-location
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/asterisk /var/ipfire/backup/addons/includes/asterisk
 
-	# Logrotate                                                                                                                                                                           
-	mkdir -pv /etc/logrotate.d                                                                                                                                                            
+	# Logrotate
+	mkdir -pv /etc/logrotate.d
 	install -v -m 644 $(DIR_SRC)/config/asterisk/asterisk.logrotate /etc/logrotate.d/asterisk   
 
 	# generate softlink (or asterisk will not work properly)
@@ -160,5 +148,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	ln -sf /etc/rc.d/init.d/asterisk /etc/rc.d/rc6.d/K30asterisk
 	ln -sf /etc/rc.d/init.d/asterisk /etc/rc.d/rc3.d/S30asterisk
 
-	# all done
+	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/automake b/lfs/automake
index 0b3d9cce8..d18439443 100644
--- a/lfs/automake
+++ b/lfs/automake
@@ -35,10 +35,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 # Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
-	PREFIX = /usr
 	TARGET = $(DIR_INFO)/$(THISAPP)
 else
-	PREFIX = $(TOOLS_DIR)
 	TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif
 
@@ -81,10 +79,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/automake-1.15_perl_warning.patch
-	cd $(DIR_APP) && ./configure \
-		--prefix=$(PREFIX) \
-		--docdir=/usr/share/doc/automake-1.15
-
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/bacula b/lfs/bacula
index 0e7d39ba6..15597f303 100644
--- a/lfs/bacula
+++ b/lfs/bacula
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.2.13
+VER        = 9.0.6
 
 THISAPP    = bacula-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = bacula
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 43417bae0c221afb1f30a581c9e0f2fe
+$(DL_FILE)_MD5 = 9168e398808c42bf290515f60892f643
 
 install : $(TARGET)
 
diff --git a/lfs/bash b/lfs/bash
index 99a293dbb..bb2a38b34 100644
--- a/lfs/bash
+++ b/lfs/bash
@@ -35,11 +35,11 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  CONFIGURE_OPTIONS = --prefix=/usr --bindir=/bin \
-    --with-installed-readline
+  CONFIGURE_OPTIONS = \
+	--bindir=/bin \
+	--with-installed-readline
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  CONFIGURE_OPTIONS = --prefix=$(TOOLS_DIR)
 endif
 
 CONFIGURE_OPTIONS += \
@@ -95,7 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-4.0-profile-1.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/bash-3.2-ssh_source_bash.patch
 
-	cd $(DIR_APP) && ./configure $(CONFIGURE_OPTIONS)
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX) $(CONFIGURE_OPTIONS)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
diff --git a/lfs/binutils b/lfs/binutils
index 13e1eab35..525e43661 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.28
+VER        = 2.30
 
 THISAPP    = binutils-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
@@ -94,7 +94,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = d5d270fd0b698ed59ca5ade8e1b5059c
+$(DL_FILE)_MD5 = ffc476dd46c96f932875d1b2e27e929f
 
 install : $(TARGET)
 
diff --git a/lfs/bison b/lfs/bison
index 322dd26f0..65746f59e 100644
--- a/lfs/bison
+++ b/lfs/bison
@@ -30,7 +30,12 @@ THISAPP    = bison-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+
+ifeq "$(TOOLCHAIN)" "1"
+  TARGET = $(DIR_INFO)/$(THISAPP)-tools
+else
+  TARGET = $(DIR_INFO)/$(THISAPP)
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -70,8 +75,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 --prefix=/usr --disable-nls --docdir=/usr/share/doc/$(THISAPP)
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
 	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/capi4k-utils b/lfs/capi4k-utils
deleted file mode 100644
index b82c156e0..000000000
--- a/lfs/capi4k-utils
+++ /dev/null
@@ -1,89 +0,0 @@
-###############################################################################
-#                                                                             #
-# 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        = 2005-07-18
-
-THISAPP    = capi4k-utils-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/capi4k-utils
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = c745759b6b3d64e19763727176648cdf
-
-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)/capiinit && sed -i -e 's/-O2/$(CFLAGS)/' configure
-	cd $(DIR_APP)/capiinit && ./configure
-	cd $(DIR_APP)/capiinit && make $(MAKETUNING)
-	cd $(DIR_APP)/capiinit && make install
-	cd $(DIR_APP)/capi20 && sed -i -e 's/include <linux\/capi.h>/include <linux\/types.h>\n#include <linux\/capi.h>/' capidyn.c
-	cd $(DIR_APP)/capi20 && sed -i -e 's/include <linux\/capi.h>/include <linux\/types.h>\n#include <linux\/capi.h>/' capi20.c
-	cd $(DIR_APP)/capi20 && sed -i "/include/a #include <stddef.h>" capi20.h
-	cd $(DIR_APP)/capi20 && sed -i -e 's/-O2/$(CFLAGS)/' configure
-	cd $(DIR_APP)/capi20 && SED=sed ./configure
-	cd $(DIR_APP)/capi20 && SED=sed make $(MAKETUNING)
-	cd $(DIR_APP)/capi20 && make install
-	cd $(DIR_APP)/capiinfo && sed -i -e 's/-O2/$(CFLAGS)/' configure
-	cd $(DIR_APP)/capiinfo && ./configure
-	cd $(DIR_APP)/capiinfo && make $(MAKETUNING)
-	cd $(DIR_APP)/capiinfo && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/ccache b/lfs/ccache
index 8f6a18152..9ed6c311a 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.3.4
+VER        = 3.4.1
 
 THISAPP    = ccache-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -51,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 95ab3c56284129cc2a32460c23069516
+$(DL_FILE)_MD5 = 39492aea565c3e6d5affa633672a93bd
 
 install : $(TARGET)
 
diff --git a/lfs/coreutils b/lfs/coreutils
index 904bd2bdf..26482aa0f 100644
--- a/lfs/coreutils
+++ b/lfs/coreutils
@@ -35,13 +35,12 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  CONFIGURE_OPTIONS = --prefix=/usr
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  CONFIGURE_OPTIONS = --prefix=$(TOOLS_DIR)
 endif
 
 CONFIGURE_OPTIONS += \
+	--prefix=$(PREFIX) \
 	--enable-largefile \
 	--disable-rpath \
 	--enable-install-program=arch \
diff --git a/lfs/diffutils b/lfs/diffutils
index 02586d836..d37dff7b2 100644
--- a/lfs/diffutils
+++ b/lfs/diffutils
@@ -35,14 +35,8 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls --build=$(BUILDTARGET)
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
 endif
 
 ###############################################################################
@@ -83,8 +77,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 $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/dma b/lfs/dma
index fc49122d0..507967158 100644
--- a/lfs/dma
+++ b/lfs/dma
@@ -74,6 +74,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	mkdir -pv /var/ipfire/dma
 	touch /var/ipfire/dma/mail.conf
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.10-better-authentication.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/dma-0.10-better-tls.patch
 	cd $(DIR_APP) && sed -i '/PREFIX/s/usr\/local/usr/g' Makefile
 	cd $(DIR_APP) && sed -i '/CONFDIR/s/etc\/dma/var\/ipfire\/dma/g' Makefile
 	cd $(DIR_APP) && make
diff --git a/lfs/findutils b/lfs/findutils
index 6b9e0fc74..ebffc2e58 100644
--- a/lfs/findutils
+++ b/lfs/findutils
@@ -37,13 +37,9 @@ ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --libexecdir=/usr/lib/findutils \
     --localstatedir=/var/lib/locate --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
   EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls --build=$(BUILDTARGET)
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
 endif
 
 ###############################################################################
@@ -85,8 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 ifeq "$(ROOT)" ""
 	mv -v /usr/bin/find /bin
 	sed -i -e 's|BINDIR=/usr/bin|BINDIR=/bin|' /usr/bin/updatedb
diff --git a/lfs/flac b/lfs/flac
index 2143d3621..4331af8b9 100644
--- a/lfs/flac
+++ b/lfs/flac
@@ -24,15 +24,15 @@
 
 include Config
 
-VER        = 1.2.1
+VER        = 1.3.2
 
 THISAPP    = flac-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = flac
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = "libogg"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 153c8b15a54da428d1f0fadc756c22c7
+$(DL_FILE)_MD5 = 454f1bfa3f93cc708098d7890d0499bd
 
 install : $(TARGET)
 
@@ -77,19 +77,12 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/flac-1.2.1-asm.patch
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/flac-1.2.1-bitreader.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/flac-1.2.1-cflags.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/flac-1.2.1-gcc43.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/flac-1.2.1-hidesyms.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/flac-1.2.1-tests.patch
-	cd $(DIR_APP) && ./autogen.sh -V
 	cd $(DIR_APP) && \
 		./configure \
 		--prefix=/usr \
 		--disable-xmms-plugin \
 		--disable-thorough-tests
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/flex b/lfs/flex
index d665c47be..ff3efccfe 100644
--- a/lfs/flex
+++ b/lfs/flex
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016 IPFire Team  <info@ipfire.org>                      #
+# Copyright (C) 2007-2018 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        #
@@ -41,9 +41,6 @@ ifeq "$(ROOT)" ""
 
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
 endif
 
 
@@ -85,10 +82,11 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/flex-2.6.4-fix-build-width-glibc-2.6+.patch
 	cd $(DIR_APP) && HELP2MAN=$(TOOLS_DIR)/bin/true \
-		./configure $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+		./configure --prefix=$(PREFIX) --disable-nls
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 ifeq "$(ROOT)" ""
 	ln -sfv libfl.a /usr/lib/libl.a
 	echo "#!/bin/sh"			>  /usr/bin/lex
diff --git a/lfs/gettext b/lfs/gettext
index e4eeb7299..b1bc96306 100644
--- a/lfs/gettext
+++ b/lfs/gettext
@@ -36,13 +36,9 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --disable-nls
-  EXTRA_MAKE = 
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
   EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-shared --disable-nls --build=$(BUILDTARGET)
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
 endif
 
 ###############################################################################
@@ -85,8 +81,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 ifeq "$(ROOT)" ""
 	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(EXTRA_MAKE)
-	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make install
 else
 	cd $(DIR_APP)/gettext-tools && ./configure $(EXTRA_CONFIG)
 	cd $(DIR_APP)/gettext-tools && make -C gnulib-lib
diff --git a/lfs/glibc b/lfs/glibc
index 985fe671c..1fd7b6ae1 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.25
+VER        = 2.27
 
 THISAPP    = glibc-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
@@ -80,7 +80,10 @@ EXTRA_CONFIG += \
 	--enable-add-ons \
 	--without-selinux \
 	--enable-experimental-malloc \
-	--enable-bind-now
+	--enable-bind-now \
+	--enable-obsolete-rpc \
+	--enable-obsolete-nsl \
+	--disable-nss-crypt
 
 ###############################################################################
 # Top-level Rules
@@ -90,7 +93,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0c9f827298841dbf3bff3060f3d7f19c
+$(DL_FILE)_MD5 = 898cd5656519ffbc3a03fe811dd89e82
 
 install : $(TARGET)
 
@@ -122,7 +125,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	@mkdir $(DIR_SRC)/glibc-build
 
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-2.25-gcc-7.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-localedef-no-archive.patch
 
 ifneq "$(TOOLCHAIN)" "1"
@@ -149,6 +151,8 @@ endif
 	cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
 		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
 
+	cd $(DIR_APP) && sed '/test-installation/s@\$$(PERL)@echo not running@' -i Makefile
+
 	cd $(DIR_SRC)/glibc-build && make install
 
 ifneq "$(TOOLCHAIN)" "1"
diff --git a/lfs/grep b/lfs/grep
index 3c3d97696..703e2f7c5 100644
--- a/lfs/grep
+++ b/lfs/grep
@@ -40,7 +40,6 @@ else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
   EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls \
     --disable-perl-regexp --without-included-regex
-
 endif
 
 ###############################################################################
diff --git a/lfs/haproxy b/lfs/haproxy
index 0e5a067f8..02e3b25f8 100644
--- a/lfs/haproxy
+++ b/lfs/haproxy
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.5.11
+VER        = 1.8.0
 
 THISAPP    = haproxy-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,10 +32,14 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = haproxy
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
+ifeq "$(BUILD_ARCH)" "armv5tel"
+	LDFLAGS += -latomic
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -44,7 +48,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5500a79d0d2b238d4a1e9749bd0c2cb2
+$(DL_FILE)_MD5 = 6ccea4619b7183fbcc8c98bae1f9823d
 
 install : $(TARGET)
 
diff --git a/lfs/hostname b/lfs/hostname
index feac3a0f8..02b065651 100644
--- a/lfs/hostname
+++ b/lfs/hostname
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 3.15
+VER        = 3.20
 
 THISAPP    = hostname_$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = f93c87de2517850de5f47234e3bcb563
+$(DL_FILE)_MD5 = 9919d0f4e0a70a0d4161deef729e8514
 
 install : $(TARGET)
 
@@ -70,8 +70,8 @@ $(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) && patch -Np1 -i $(DIR_SRC)/src/patches/hostname-rh.patch
 	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install BINDIR=/bin
+	cd $(DIR_APP) && install -m 755 hostname /bin
+	cd $(DIR_APP) && install hostname.1 /usr/share/man/man1
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/pammysql b/lfs/i2c-tools
similarity index 86%
rename from lfs/pammysql
rename to lfs/i2c-tools
index a9f15bbe7..ef60ebd46 100644
--- a/lfs/pammysql
+++ b/lfs/i2c-tools
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 0.7RC1
+VER        = 3.1.2
 
-THISAPP    = pam_mysql-0.7RC1
-DL_FILE    = $(THISAPP).tar.gz
+THISAPP    = i2c-tools-$(VER)
+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 = 6177183d7e98dc12f2e444c9fbd4f13c
+$(DL_FILE)_MD5 = 7fad5c6f6eb8aa35cf588a2fda5bcede
 
 install : $(TARGET)
 
@@ -50,6 +50,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))
 
 md5 : $(subst %,%_MD5,$(objects))
 
+dist: 
+	@$(PAK)
+
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -69,9 +72,8 @@ $(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 --with-pam=/usr --with-pam-mods-dir=/lib/security --with-mysql=/usr --with-openssl=/usr    # --with-cyrus-sasl2=/usr
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install prefix=/usr
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/iproute2 b/lfs/iproute2
index 47ce07791..e93988d32 100644
--- a/lfs/iproute2
+++ b/lfs/iproute2
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 4.7.0
+VER        = 4.14.1
 
 THISAPP    = iproute2-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE)             = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5         = d4b205830cdc2702f8a0cbd6232129cd
+$(DL_FILE)_MD5         = 1075423d7029e02a8f23ed4f42b7e372
 
 install : $(TARGET)
 
@@ -70,7 +70,6 @@ $(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) && cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)_remove_arpd.patch
 	cd $(DIR_APP) && make $(MAKETUNING) SBINDIR=/sbin
 	cd $(DIR_APP) && make SBINDIR=/sbin install
 	cd $(DIR_APP) && mv -v /sbin/arpd /usr/sbin
diff --git a/lfs/perl-DBD-mysql b/lfs/jansson
similarity index 89%
rename from lfs/perl-DBD-mysql
rename to lfs/jansson
index 48105d4ed..21f0171bc 100644
--- a/lfs/perl-DBD-mysql
+++ b/lfs/jansson
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2011  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,17 +24,17 @@
 
 include Config
 
-VER        = 4.010
+VER        = 2.10
 
-THISAPP    = DBD-mysql-$(VER)
+THISAPP    = jansson-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = perl-DBD-mysql
-PAK_VER    = 2
-DEPS       = perl-DBI
+PROG       = jansson
+PAK_VER    = 1
 
+DEPS       = ""
 
 ###############################################################################
 # Top-level Rules
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a63c9f73afef70b6c80d899424b003e9
+$(DL_FILE)_MD5 = 16a2c4e84c0a80ca61bd6e619a0f9358
 
 install : $(TARGET)
 
@@ -76,8 +76,8 @@ $(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) && perl Makefile.PL
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && ./configure --prefix=/usr 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/lcr b/lfs/lcr
deleted file mode 100644
index 9f5ab8c6d..000000000
--- a/lfs/lcr
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  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        = 20140403
-
-THISAPP    = lcr-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = lcr
-PAK_VER    = 6
-
-DEPS       = ""
-
-CXXFLAGS  += -std=gnu++98
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = c81c5862d51720a3efc06fd2c02cd58d
-
-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_SRC)/lcr && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_SRC)/lcr && sed -i -e "s|^EXTENSIONdir=.*|EXTENSIONdir=/var/ipfire/lcr/extensions|g" Makefile.am
-	cd $(DIR_SRC)/lcr && sed -i -e "s|-D_GNU_SOURCE|-D_GNU_SOURCE -DASTERISK_VERSION_NUM=110000|g" Makefile.am
-	cd $(DIR_SRC)/lcr && ./autogen.sh
-	cd $(DIR_SRC)/lcr && ./configure --prefix=/usr \
-					 --sysconfdir=/var/ipfire \
-					 --localstatedir=/var \
-					 --datarootdir=/var/ipfire
-	cd $(DIR_SRC)/lcr && make $(MAKETUNING)
-	cd $(DIR_SRC)/lcr && make install
-	mv /var/ipfire/lcr/routing.conf /var/ipfire/lcr/routing.conf.org
-	install -v -m 644 $(DIR_SRC)/config/lcr/routing.conf \
-	                        /var/ipfire/lcr/routing.conf
-	install -v -m 644 $(DIR_SRC)/config/backup/includes/lcr \
-	                 /var/ipfire/backup/addons/includes/lcr
-	#install initscripts
-	$(call INSTALL_INITSCRIPT,lcr)
-
-	@rm -rf $(DIR_SRC)/lcr
-	@$(POSTBUILD)
diff --git a/lfs/libevent2-compat b/lfs/libevent2-compat
deleted file mode 100644
index 954b7dd75..000000000
--- a/lfs/libevent2-compat
+++ /dev/null
@@ -1,95 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2017  IPFire Team  <info@ipfire.de>                      #
-#                                                                             #
-# 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.0.22-stable
-
-THISAPP    = libevent-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = c4c56f986aa985677ca1db89630a2e11
-
-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) && ./configure \
-		--prefix=/usr \
-		--disable-static
-
-	cd $(DIR_APP) && make $(MAKETUNING)
-
-	cd $(DIR_APP) && install -m 755 .libs/libevent-2.0.so.5.1.9 /usr/lib
-	ln -svf libevent-2.0.so.5.1.9 /usr/lib/libevent-2.0.so.5
-
-	cd $(DIR_APP) && install -m 755 .libs/libevent_core-2.0.so.5.1.9 /usr/lib
-	ln -svf libevent_core-2.0.so.5.1.9 /usr/lib/libevent_core-2.0.so.5
-
-	cd $(DIR_APP) && install -m 755 .libs/libevent_extra-2.0.so.5.1.9 /usr/lib
-	ln -svf libevent_extra-2.0.so.5.1.9 /usr/lib/libevent_extra-2.0.so.5
-
-	cd $(DIR_APP) && install -m 755 .libs/libevent_openssl-2.0.so.5.1.9 /usr/lib
-	ln -svf libevent_openssl-2.0.so.5.1.9 /usr/lib/libevent_openssl-2.0.so.5
-
-	cd $(DIR_APP) && install -m 755 .libs/libevent_pthreads-2.0.so.5.1.9 /usr/lib
-	ln -svf libevent_pthreads-2.0.so.5.1.9 /usr/lib/libevent_pthreads-2.0.so.5
-
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/libtirpc b/lfs/libtirpc
index 382d7e565..e7662c67a 100644
--- a/lfs/libtirpc
+++ b/lfs/libtirpc
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.0.1
+VER        = 1.0.2
 
 THISAPP    = libtirpc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = libtirpc
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 36ce1c0ff80863bb0839d54aa0b94014
+$(DL_FILE)_MD5 = d5a37f1dccec484f9cabe2b97e54e9a6
 
 install : $(TARGET)
 
@@ -77,6 +77,7 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/libtirpc-1.0.2-glibc-2.26.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --disable-gssapi --disable-ipv6
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
diff --git a/lfs/m4 b/lfs/m4
index 5bb860444..7d624d985 100644
--- a/lfs/m4
+++ b/lfs/m4
@@ -35,12 +35,8 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr
-  EXTRA_MAKE =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
-  EXTRA_MAKE =
 endif
 
 ###############################################################################
@@ -81,8 +77,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 $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
+	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/mISDNuser b/lfs/mISDNuser
deleted file mode 100644
index 923696a80..000000000
--- a/lfs/mISDNuser
+++ /dev/null
@@ -1,79 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2012  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        = 20121008
-
-THISAPP    = mISDNuser-$(VER)
-DL_FILE    = $(THISAPP).tar.xz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = 86dd2c68ef5b2fdff653f9f635771127
-
-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_SRC)/mISDNuser && cd $(DIR_SRC) && tar Jxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_SRC)/mISDNuser && sed -e "s/-Werror//g" -i */Makefile.*
-	cd $(DIR_SRC)/mISDNuser && make
-	cd $(DIR_SRC)/mISDNuser && ./configure --prefix=/usr --with-AF_ISDN=34
-	cd $(DIR_SRC)/mISDNuser && make MISDNDIR=/usr/src/linux
-	cd $(DIR_SRC)/mISDNuser && make install MISDNDIR=/usr/src/linux
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/make b/lfs/make
index 979357eca..bee734ba4 100644
--- a/lfs/make
+++ b/lfs/make
@@ -39,14 +39,8 @@ DEPS       = ""
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
 endif
 
 ifeq "$(PASS)" "1"
@@ -94,8 +88,10 @@ $(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 $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+	cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/make-4.2.1-glob-build-fix.patch
+	cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/make-4.2.1-glob-SEGV.patch
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/mpd b/lfs/mpd
index 2beb422fa..0e57a2846 100644
--- a/lfs/mpd
+++ b/lfs/mpd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/${THISAPP}
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mpd
-PAK_VER    = 17
+PAK_VER    = 18
 
 DEPS       = "alsa faad2 ffmpeg flac lame libmad libshout libogg libid3tag libvorbis opus"
 
diff --git a/lfs/mysql b/lfs/mysql
deleted file mode 100644
index 8c739c26a..000000000
--- a/lfs/mysql
+++ /dev/null
@@ -1,110 +0,0 @@
-###############################################################################
-#                                                                             #
-# 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.0.96
-
-THISAPP    = mysql-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-PROG       = mysql
-PAK_VER    = 3
-
-CFLAGS    += -fno-strict-aliasing
-CXXFLAGS  += -std=gnu++98
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = bf280949049161aa68cf29e600d9ec79
-
-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)
-	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && ./configure --prefix=/usr \
-		            --sysconfdir=/etc \
-		            --libexecdir=/usr/sbin \
-		            --localstatedir=/srv/mysql \
-		            --enable-thread-safe-client \
-		            --enable-assembler \
-		            --enable-local-infile \
-		            --with-unix-socket-path=/var/run/mysql/mysql.sock \
-		            --without-debug \
-		            --without-bench \
-		            --without-readline \
-		            --with-berkeley-db \
-		            --with-extra-charsets=all
-	cd $(DIR_APP) && make testdir=/tmp/mysql $(MAKETUNING)
-	cd $(DIR_APP) && make testdir=/tmp/mysql install
-	rm -rf /tmp/mysql
-	cd /usr/lib && ln -v -sf mysql/libmysqlclient{,_r}.so* .
-	install -v -m644 $(DIR_SRC)/config/mysql/my.cnf /etc/my.cnf
-	mkdir -p /srv/mysql
-	chown mysql.mysql /srv/mysql/
-	install -v -m755 -o mysql -g mysql -d /var/run/mysql
-	install -v -m 644 $(DIR_SRC)/config/backup/includes/mysql \
-		/var/ipfire/backup/addons/includes/mysql
-
-	#install initscripts
-	$(call INSTALL_INITSCRIPT,mysql)
-
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/nagios-plugins b/lfs/nagios-plugins
index 30eb23fbc..27a716262 100644
--- a/lfs/nagios-plugins
+++ b/lfs/nagios-plugins
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nagios-plugins
-PAK_VER    = 1
+PAK_VER    = 2
 
 DEPS       = ""
 
diff --git a/lfs/ncurses b/lfs/ncurses
index 1186b5244..09efd733e 100644
--- a/lfs/ncurses
+++ b/lfs/ncurses
@@ -35,10 +35,8 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  PREFIX = /usr
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  PREFIX = $(TOOLS_DIR)
   EXTRA_CONFIG = --build=$(BUILDTARGET)
 endif
 
diff --git a/lfs/nfs b/lfs/nfs
index 2a8e331b5..242b3caaf 100644
--- a/lfs/nfs
+++ b/lfs/nfs
@@ -88,13 +88,15 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP)/libnfsidmap* && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP)/libnfsidmap* && make install
 
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/nfs-1.3.3-glibc-stdint.patch
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc  \
 		--disable-gss \
 		--disable-tirpc \
 		--disable-nfsv41 \
-		--without-tcp-wrappers --disable-ipv6
+		--without-tcp-wrappers \
+		--disable-ipv6
 
 	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
diff --git a/lfs/nginx b/lfs/nginx
index d27e4de2d..14b5ca4b3 100644
--- a/lfs/nginx
+++ b/lfs/nginx
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.8.1
+VER        = 1.13.7
 
 THISAPP    = nginx-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG	   = nginx
-PAK_VER	   = 5
+PAK_VER	   = 6
 
 ###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 2e91695074dbdfbf1bcec0ada9fda462
+$(DL_FILE)_MD5 = 5fcd056b40cb5c47b053fb14a2a89e7d
 
 install : $(TARGET)
 
diff --git a/lfs/nut b/lfs/nut
index 2045dce6c..41aae4124 100644
--- a/lfs/nut
+++ b/lfs/nut
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.7.2
+VER        = 2.7.4
 
 THISAPP    = nut-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = nut
-PAK_VER    = 5
+PAK_VER    = 6
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = c3568b42e058cfc385b46d25140dced4
+$(DL_FILE)_MD5 = 3ba53656933d7471f95140b32a5b8d5c
 
 install : $(TARGET)
 
@@ -83,7 +83,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make
 	cd $(DIR_APP) && make install
 #	sed -i -e "s|ATTR{|SYSFS{|g" /etc/udev/rules.d/52-nut-usbups.rules
-	-mkdir -p /var/state/ups
+	mkdir -p /var/state/ups
 
 	#install initscripts
 	$(call INSTALL_INITSCRIPT,nut)
diff --git a/lfs/openvmtools b/lfs/openvmtools
index b5b1fefa2..6ca27e618 100644
--- a/lfs/openvmtools
+++ b/lfs/openvmtools
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 10.0.5-3227872
+VER        = 10.2.0-7253323
 
 THISAPP    = open-vm-tools-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -33,12 +33,10 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 SUP_ARCH   = x86_64 i586
 PROG       = openvmtools
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
-#CFLAGS    += -fno-PIC
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -47,7 +45,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 734eccf6e9e007cb37dc4eb3ed6707b5
+$(DL_FILE)_MD5 = 9256c2402640ad19eb79cf49635e01b5
 
 install : $(TARGET)
 
@@ -79,12 +77,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) && sed -e "s/-Werror//g" -i configure.ac
-	cd $(DIR_APP) && autoreconf -vfi
-
 	cd $(DIR_APP) && ./configure \
 		--prefix=/usr \
+		--sysconfdir=/etc \
 		--with-kernel-release=$(KVER)-ipfire \
+		--without-ssl \
 		--without-pam \
 		--without-gtk2 \
 		--without-gtkmm \
@@ -98,12 +95,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+
 	#install initscripts
 	$(call INSTALL_INITSCRIPT,openvmtools)
 	ln -sf ../init.d/openvmtools /etc/rc.d/rc3.d/S60openvmtools
 	ln -sf ../init.d/openvmtools /etc/rc.d/rc0.d/K01openvmtools
 	ln -sf ../init.d/openvmtools /etc/rc.d/rc6.d/K01openvmtools
-	rm -rvf /usr/etc/pam.d /usr/share/openvmtools
+	rm -rvf /usr/share/openvmtools
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/pam b/lfs/pam
index 96e8956f9..f379c22d6 100644
--- a/lfs/pam
+++ b/lfs/pam
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 0.99.10.0
+VER        = 1.3.0
 
 THISAPP    = Linux-PAM-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 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 = be4dd1d34ac5933408e13e48f3eb710a
+$(DL_FILE)_MD5 = 642c994edb9cf39b74cb1bca0649613b
 
 install : $(TARGET)
 
@@ -69,9 +69,8 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	$(UPDATE_AUTOMAKE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/pam-0.99.10.0-rlimit-build-fix.patch
 	cd $(DIR_APP) && ./configure --libdir=/usr/lib \
 		            --sbindir=/lib/security \
 		            --enable-securedir=/lib/security \
@@ -79,14 +78,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 		            --enable-read-both-confs --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
-	chmod -v 4755 /lib/security/unix_chkpwd
-	mv -v /lib/security/pam_tally /sbin
-	mv -v /usr/lib/libpam*.so.0* /lib
-	ln -v -sf ../../lib/libpam.so.0.81.10 /usr/lib/libpam.so
-	ln -v -sf ../../lib/libpamc.so.0.81.0 /usr/lib/libpamc.so
-	ln -v -sf ../../lib/libpam_misc.so.0.81.3 /usr/lib/libpam_misc.so
+
+	# Install configuration
 	-mkdir -p /etc/pam.d
-	cp $(DIR_SRC)/config/pam/* /etc/pam.d
-	chown root.root -R /etc/pam.d
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/patch b/lfs/patch
index 065314d51..10b03d43b 100644
--- a/lfs/patch
+++ b/lfs/patch
@@ -35,14 +35,8 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 endif
 
 ###############################################################################
@@ -83,8 +77,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 $(EXTRA_CONFIG)
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX)
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/pkg-config b/lfs/pkg-config
index fe2752a0d..3d039ddf2 100644
--- a/lfs/pkg-config
+++ b/lfs/pkg-config
@@ -36,10 +36,8 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  PREFIX = /usr
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  PREFIX = $(TOOLS_DIR)
 endif
 
 ###############################################################################
@@ -80,12 +78,13 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifeq "$(ROOT)" ""
-else
-	mkdir -pv $(TOOLS_DIR)/lib/pkgconfig
-endif
 	cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --with-internal-glib
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+
+ifeq "$(TOOLCHAIN)" "1"
+	mkdir -pv $(TOOLS_DIR)/lib/pkgconfig
+endif
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/postfix b/lfs/postfix
index 9f5ad3809..bd8b75ccc 100644
--- a/lfs/postfix
+++ b/lfs/postfix
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.10.0
+VER        = 3.2.4
 
 THISAPP    = postfix-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,13 +32,14 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = postfix
-PAK_VER    = 9
+PAK_VER    = 13
 
-DEPS       = "amavisd mysql"
+DEPS       = ""
 
 CCARGS     = `getconf LFS_CFLAGS` \
 	-DDEF_DAEMON_DIR="'\"/usr/lib/postfix\"'" \
-	-DDEF_MANPAGE_DIR="'\"/usr/share/man\"'"
+	-DDEF_MANPAGE_DIR="'\"/usr/share/man\"'" \
+	-DNO_NIS
 AUXLIBS    =
 
 # LDAP
@@ -49,10 +50,6 @@ AUXLIBS   += -lldap -llber
 CCARGS    += -DHAS_PCRE -I/usr/include/pcre
 AUXLIBS   += -lpcre
 
-# MySQL
-CCARGS    += -DHAS_MYSQL -I/usr/include/mysql
-AUXLIBS   += -L/usr/lib/mysql -lmysqlclient -lm
-
 # SASL
 CCARGS    += -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl
 AUXLIBS   += -L/usr/lib/sasl2 -lsasl2
@@ -69,7 +66,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = b2a563b2d5c53462952886e6fc4e4b7b
+$(DL_FILE)_MD5 = 60d8418278ef9f3c7d1251480ea84a42
 
 install : $(TARGET)
 
@@ -102,15 +99,12 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-build_with_kernel4x.patch
 	cd $(DIR_APP) && make -f Makefile.init makefiles \
 		DEBUG="" OPT="$(CFLAGS) -fno-strict-aliasing" CCARGS="$(CCARGS)" AUXLIBS="$(AUXLIBS)"
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && sh postfix-install -non-interactive
 	## Install configuration
 	rm -vf /etc/postfix/main.cf.default
-	cp -vf $(DIR_CONF)/postfix/* /etc/postfix
-	mv -vf /etc/postfix/aliases /etc/aliases
 	mkdir -p /var/lib/postfix
 	chown postfix.root /var/lib/postfix
 
diff --git a/lfs/qemu b/lfs/qemu
index 4a83b86db..4bf3f07a9 100644
--- a/lfs/qemu
+++ b/lfs/qemu
@@ -78,6 +78,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/qemu-2.11.0-memfd-collision.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
 		--localstatedir=/var --enable-kvm --disable-bluez --disable-attr \
 		--target-list="i386-linux-user x86_64-linux-user arm-linux-user i386-softmmu x86_64-softmmu arm-softmmu" \
diff --git a/lfs/sslh b/lfs/sslh
index 8262a5fc6..f70cfa84b 100644
--- a/lfs/sslh
+++ b/lfs/sslh
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = sslh
-PAK_VER    = 4
+PAK_VER    = 5
 
 DEPS       = ""
 
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(MAKETUNING)
+	cd $(DIR_APP) && make CFLAGS="$(CFLAGS)" $(MAKETUNING) USELIBWRAP=
 	cd $(DIR_APP) && install -v -m 755 sslh /usr/sbin
 
 	#install initscripts
diff --git a/lfs/strongswan b/lfs/strongswan
index f012492d0..58f8c5e9b 100644
--- a/lfs/strongswan
+++ b/lfs/strongswan
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.6.1
+VER        = 5.6.2
 
 THISAPP    = strongswan-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = cb2241f1b96c524cd15b1c0f50ed9a27
+$(DL_FILE)_MD5 = 46aa3aa18fbc4bd528f9a0345ce79913
 
 install : $(TARGET)
 
diff --git a/lfs/stunnel b/lfs/stunnel
index 684e4522d..d78d8d035 100644
--- a/lfs/stunnel
+++ b/lfs/stunnel
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 5.01
+VER        = 5.44
 
 THISAPP    = stunnel-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = stunnel
-PAK_VER    = 2
+PAK_VER    = 3
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 7b63266b6fa05da696729e245100da65
+$(DL_FILE)_MD5 = 47697dee496c80c8e352b2b705c4a571
 
 install : $(TARGET)
 
diff --git a/lfs/swig b/lfs/swig
index 5c5073f06..b210cac13 100644
--- a/lfs/swig
+++ b/lfs/swig
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.0.1
+VER        = 3.0.12
 
 THISAPP    = swig-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = df4465a62ccc5f0120fee0890ea1a31f
+$(DL_FILE)_MD5 = 82133dfa7bba75ff9ad98a7046be687c
 
 install : $(TARGET)
 
diff --git a/lfs/tar b/lfs/tar
index 2cca09935..6a949a003 100644
--- a/lfs/tar
+++ b/lfs/tar
@@ -37,13 +37,9 @@ ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr --bindir=/bin \
 	--libexecdir=/usr/sbin --disable-nls
-  EXTRA_MAKE =
-  EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
   EXTRA_CONFIG = --prefix=$(TOOLS_DIR) --disable-nls
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
 endif
 
 ###############################################################################
@@ -85,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) FORCE_UNSAFE_CONFIGURE=1
-	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_APP) && make $(EXTRA_INSTALL) install
+	cd $(DIR_APP) && make $(MAKETUNING)
+	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/lfs/tcl b/lfs/tcl
index fb464dca3..73c92cc81 100644
--- a/lfs/tcl
+++ b/lfs/tcl
@@ -75,11 +75,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-ifneq "$(ROOT)" ""
-	cd $(DIR_APP)/unix && ./configure --prefix=$(TOOLS_DIR)
-else
-	cd $(DIR_APP)/unix && ./configure --prefix=/usr
-endif
+	cd $(DIR_APP)/unix && ./configure --prefix=$(PREFIX)
 	cd $(DIR_APP)/unix && make $(MAKETUNING)
 	cd $(DIR_APP)/unix && make install
 ifneq "$(ROOT)" ""
diff --git a/lfs/tcpwrapper b/lfs/tcpwrapper
deleted file mode 100644
index 464022978..000000000
--- a/lfs/tcpwrapper
+++ /dev/null
@@ -1,79 +0,0 @@
-###############################################################################
-#                                                                             #
-# 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        = 7.6
-
-THISAPP    = tcp_wrappers_$(VER)
-DL_FILE    = $(THISAPP).tar.gz
-DL_FROM    = $(URL_IPFIRE)
-DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-objects = $(DL_FILE)
-
-$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-
-$(DL_FILE)_MD5 = e6fa25f71226d090f34de3f6b122fb5a
-
-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) && patch -Np1 -i /usr/src/src/patches/tcp_wrappers-7.6-shared_lib_plus_plus-1.patch
-	cd $(DIR_APP) && sed -i -e "s,^extern char \*malloc();,/* & */," scaffold.c
-	cd $(DIR_APP) && make REAL_DAEMON_DIR=/usr/sbin STYLE=-DPROCESS_OPTIONS linux
-	cd $(DIR_APP) && make install
-	@rm -rf $(DIR_APP)
-	@$(POSTBUILD)
diff --git a/lfs/texinfo b/lfs/texinfo
index 892715644..535612c44 100644
--- a/lfs/texinfo
+++ b/lfs/texinfo
@@ -35,10 +35,8 @@ DIR_APP    = $(DIR_SRC)/texinfo-6.3
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=$(TOOLS_DIR)
 endif
 
 ###############################################################################
@@ -79,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure $(EXTRA_CONFIG) --disable-nls
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --disable-nls
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	@rm -rf $(DIR_APP)
diff --git a/lfs/xz b/lfs/xz
index 219c160b9..f8940ab4e 100644
--- a/lfs/xz
+++ b/lfs/xz
@@ -32,10 +32,8 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 ifeq "$(ROOT)" ""
-	PREFIX = /usr
 	TARGET = $(DIR_INFO)/$(THISAPP)
 else
-	PREFIX = $(TOOLS_DIR)
 	TARGET = $(DIR_INFO)/$(THISAPP)-tools
 endif
 
diff --git a/lfs/zlib b/lfs/zlib
index d0607513e..757995f41 100644
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -30,7 +30,12 @@ THISAPP    = zlib-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-TARGET     = $(DIR_INFO)/$(THISAPP)
+
+ifeq "$(TOOLCHAIN)" "1"
+  TARGET = $(DIR_INFO)/$(THISAPP)-tools
+else
+  TARGET = $(DIR_INFO)/$(THISAPP)
+endif
 
 CFLAGS    += -fPIC -DPIC
 
@@ -71,15 +76,17 @@ $(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 --prefix=/usr --shared
+	cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --shared
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
+ifneq "$(TOOLCHAIN)" "1"
 	mv -v /usr/lib/libz.so.$(VER) /lib/libz.so.$(VER)
 	ln -svf libz.so.$(VER) /lib/libz.so.1
 	ln -svf libz.so.$(VER) /lib/libz.so
 	rm -vf /usr/lib/libz.so.1
 	rm -vf /usr/lib/libz.so
+endif
 
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index eb2c972a5..d733b4eae 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="118"							# Core Level (Filename)
-PAKFIRE_CORE="118"						# Core Level (PAKFIRE)
+CORE="119"							# Core Level (Filename)
+PAKFIRE_CORE="119"						# 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
@@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 GIT_TAG=$(git tag | tail -1)					# Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)	# Last commit
 
-TOOLCHAINVER=20180126
+TOOLCHAINVER=20180213
 
 ###############################################################################
 #
@@ -195,7 +195,7 @@ configure_build() {
 	TOOLS_DIR="/tools_${BUILD_ARCH}"
 
 	# Enables hardening
-	HARDENING_CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong --param=ssp-buffer-size=4"
+	HARDENING_CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong"
 
 	CFLAGS="-O2 -pipe -Wall -fexceptions -fPIC ${CFLAGS_ARCH}"
 	CXXFLAGS="${CFLAGS}"
@@ -928,6 +928,7 @@ buildtoolchain() {
 	lfsmake1 gcc			PASS=L
 	lfsmake1 binutils			PASS=2
 	lfsmake1 gcc			PASS=2
+	lfsmake1 zlib
 	lfsmake1 ccache			PASS=2
 	lfsmake1 tcl
 	lfsmake1 expect
@@ -952,6 +953,7 @@ buildtoolchain() {
 	lfsmake1 tar
 	lfsmake1 texinfo
 	lfsmake1 xz
+	lfsmake1 bison
 	lfsmake1 flex
 	lfsmake1 fake-environ
 	lfsmake1 strip
@@ -1009,6 +1011,7 @@ buildbase() {
 	lfsmake2 jwhois
 	lfsmake2 kbd
 	lfsmake2 less
+	lfsmake2 pkg-config
 	lfsmake2 make
 	lfsmake2 man
 	lfsmake2 kmod
@@ -1033,7 +1036,6 @@ buildipfire() {
   lfsmake2 configroot
   lfsmake2 initscripts
   lfsmake2 backup
-  lfsmake2 pkg-config
   lfsmake2 libusb
   lfsmake2 libusb-compat
   lfsmake2 libpcap
@@ -1128,7 +1130,6 @@ buildipfire() {
   lfsmake2 nettle
   lfsmake2 libevent
   lfsmake2 libevent2
-  lfsmake2 libevent2-compat
   lfsmake2 expat
   lfsmake2 apr
   lfsmake2 aprutil
@@ -1173,7 +1174,6 @@ buildipfire() {
   lfsmake2 libxml2
   lfsmake2 libxslt
   lfsmake2 BerkeleyDB
-  lfsmake2 mysql
   lfsmake2 cyrus-sasl
   lfsmake2 openldap
   lfsmake2 apache2
@@ -1209,8 +1209,6 @@ buildipfire() {
   lfsmake2 ipaddr
   lfsmake2 iputils
   lfsmake2 l7-protocols
-  lfsmake2 mISDNuser
-  lfsmake2 capi4k-utils
   lfsmake2 hwdata
   lfsmake2 logrotate
   lfsmake2 logwatch
@@ -1283,7 +1281,6 @@ buildipfire() {
   lfsmake2 lz4
   lfsmake2 lzo
   lfsmake2 openvpn
-  lfsmake2 pammysql
   lfsmake2 mpage
   lfsmake2 dbus
   lfsmake2 intltool
@@ -1333,7 +1330,6 @@ buildipfire() {
   lfsmake2 cmake
   lfsmake2 gnump3d
   lfsmake2 rsync
-  lfsmake2 tcpwrapper
   lfsmake2 libtirpc
   lfsmake2 rpcbind
   lfsmake2 nfs
@@ -1415,7 +1411,6 @@ buildipfire() {
   lfsmake2 vdradmin
   lfsmake2 miau
   lfsmake2 perl-DBI
-  lfsmake2 perl-DBD-mysql
   lfsmake2 perl-DBD-SQLite
   lfsmake2 perl-File-ReadBackwards
   lfsmake2 openvmtools
@@ -1426,8 +1421,8 @@ buildipfire() {
   lfsmake2 watchdog
   lfsmake2 libpri
   lfsmake2 libsrtp
+  lfsmake2 jansson
   lfsmake2 asterisk
-  lfsmake2 lcr
   lfsmake2 usb_modeswitch
   lfsmake2 usb_modeswitch_data
   lfsmake2 zerofree
@@ -1515,6 +1510,7 @@ buildipfire() {
   lfsmake2 wio
   lfsmake2 iftop
   lfsmake2 mdns-repeater
+  lfsmake2 i2c-tools
 }
 
 buildinstaller() {
diff --git a/src/initscripts/packages/mysql b/src/initscripts/packages/mysql
deleted file mode 100644
index 994e3c220..000000000
--- a/src/initscripts/packages/mysql
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-# Begin $rc_base/init.d/mysql
-
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org
-
-#$LastChangedBy: bdubbs $
-#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $
-
-. /etc/sysconfig/rc
-. $rc_functions
-
-PIDFILE=/srv/mysql/`/bin/hostname`.pid
-KILLDELAY=20
-
-case "$1" in
-	start)
-		boot_mesg -n "Starting MySQL daemon..."
-		failure=0
-		if [ -f "$PIDFILE" ]
-		then
-			if /bin/ps p `cat $PIDFILE` | grep mysqld >/dev/null
-			then
-				boot_mesg "mysqld already running!" ${WARNING}
-				echo_warning
-				exit 0
-			else
-				rm -f "$PIDFILE"
-				if [ -f "$PIDFILE" ]
-				then
-					failure=1
-				fi
-			fi
-		fi
-		if [ "$failure" = "1" ]
-		then
-			echo ""
-			echo_failure
-		else
-			echo ""
-			/usr/bin/mysqld_safe --user=mysql 2>&1 >/dev/null &
-			evaluate_retval
-		fi
-		;;
-
-	stop)
-		boot_mesg -n "Stopping MySQL daemon..."
-		if [ -e "$PIDFILE" ]
-		then
-			echo ""
-			killproc -p ${PIDFILE} /usr/bin/mysqld_safe
-		else
-			boot_mesg "mysqld not running!" ${WARNING}
-			echo_warning
-			if [ -e "$PIDFILE" ]
-			then
-				rm -f $PIDFILE
-			fi
-		fi
-		;;
-
-	restart)
-		$0 stop
-		sleep 1
-		$0 start
-		;;
-
-	status)
-		statusproc /usr/sbin/mysqld
-		;;
-
-	*)
-		echo "Usage: $0 {start|stop|restart|status}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/mysql
diff --git a/src/initscripts/system/cleanfs b/src/initscripts/system/cleanfs
index 2d5778df9..28bafd2a1 100644
--- a/src/initscripts/system/cleanfs
+++ b/src/initscripts/system/cleanfs
@@ -97,10 +97,6 @@ case "${1}" in
 		if [ ! -e /var/run/dbus ]; then
 			mkdir -p /var/run/dbus
 		fi
-		if [ ! -e /var/run/mysql ]; then
-			mkdir -p /var/run/mysql
-			chown mysql:mysql /var/run/mysql
-		fi
 		if [ ! -e /var/run/saslauthd ]; then
 			mkdir -p /var/run/saslauthd
 		fi
diff --git a/src/initscripts/system/mISDN b/src/initscripts/system/mISDN
deleted file mode 100644
index 49f00b020..000000000
--- a/src/initscripts/system/mISDN
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh
-########################################################################
-# Begin $rc_base/init.d/mISDN
-#
-# Description : Start mISDN v2
-#
-# Authors     : Arne Fitzenreiter - arne_f@ipfire.org
-#
-# Version     : 01.00
-#
-# Notes       :
-#
-########################################################################
-
-. /etc/sysconfig/rc
-. ${rc_functions}
-
-case "${1}" in
-	start)
-
-		boot_mesg "Starting mISDNv2 ... "
-
-		# load mISDN modules
-		for module in mISDN_core hfcpci hfcsusb hfcmulti avmfritz speedfax mISDNinfineon xhfc; do
-		    modprobe $module > /dev/null 2>&1;
-		done
-
-		modprobe mISDN_dsp
-		modprobe mISDN_dsp_oslec
-		if [ ${?} = 0 ]; then
-		    echo_ok;
-		else
-		    echo_failure;
-		fi
-		exit 0;
-		;;
-
-	stop)
-
-		boot_mesg "Stopping mISDNv2 ... "
-
-		# unload mISDN hardware modules
-		for module in mISDN_dsp_oslec mISDN_dsp hfcpci hfcsusb hfcmulti avmfritz speedfax mISDNinfineon xhfc mISDNipac mISDNisar; do
-		    rmmod $module > /dev/null 2>&1;
-		done
-
-		rmmod mISDN_core > /dev/null 2>&1
-		echo_ok;
-		exit 0;
-		;;
-
-	config)
-		boot_mesg "mISDNv2 - config not needed!"
-		exit 0;
-		;;
-
-	scan)
-		boot_mesg "mISDNv2 - scan not supported!"
-		exit 0;
-		;;
-
-	*)
-		echo "Usage: ${0} {start}{stop}"
-		exit 1
-		;;
-esac
-
-# End $rc_base/init.d/mISDN
diff --git a/src/initscripts/system/unbound b/src/initscripts/system/unbound
index 4e7e63e5f..a46999992 100644
--- a/src/initscripts/system/unbound
+++ b/src/initscripts/system/unbound
@@ -210,10 +210,24 @@ write_forward_conf() {
 					;;
 			esac
 
-			echo "forward-zone:"
-			echo "	name: ${zone}"
-			echo "	forward-addr: ${server}"
-			echo
+			# Reverse-lookup zones must be stubs
+			case "${zone}" in
+				*.in-addr.arpa)
+					echo "stub-zone:"
+					echo "	name: ${zone}."
+					echo "	stub-addr: ${server}"
+					echo
+					echo "server:"
+					echo "	local-zone: \"${zone}.\" transparent"
+					echo
+					;;
+				*)
+					echo "forward-zone:"
+					echo "	name: ${zone}."
+					echo "	forward-addr: ${server}"
+					echo
+					;;
+			esac
 		done < /var/ipfire/dnsforward/config
 
 		if [ -n "${insecure_zones}" ]; then
diff --git a/src/paks/mysql/install.sh b/src/paks/mysql/install.sh
deleted file mode 100644
index 1653c9abf..000000000
--- a/src/paks/mysql/install.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/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
-
-extract_files
-
-ln -svf  ../init.d/mysql /etc/rc.d/rc0.d/K26mysql
-ln -svf  ../init.d/mysql /etc/rc.d/rc3.d/S34mysql
-ln -svf  ../init.d/mysql /etc/rc.d/rc6.d/K26mysql
-
-# Initialise database
-mysql_install_db --user=mysql
-
-restore_backup "${NAME}"
-
-start_service "${NAME}"
-
-COUNTER=0
-while [ "$COUNTER" -lt "10" ]; do
-	[ -e "/var/run/mysql/mysql.sock" ] && break
-	echo "MySQL server is still not running. Waiting 5 seconds."
-	sleep 5
-	COUNTER=$(($COUNTER + 1))
-done 
-
-[ -e "/var/run/mysql/mysql.sock" ] || (echo "MySQL still noch running... Exiting."; \
-	exit 1)
-
-mysqladmin -u root --password='' password 'mysqlfire'
diff --git a/src/paks/mysql/uninstall.sh b/src/paks/mysql/uninstall.sh
deleted file mode 100644
index a312b2e18..000000000
--- a/src/paks/mysql/uninstall.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/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 the mysql service
-stop_service "${NAME}"
-
-# Make backup
-make_backup "${NAME}"
-
-remove_files
-
-# Remove start links.
-rm -rvf /etc/rc.d/rc*.d/*mysql
diff --git a/src/paks/mysql/update.sh b/src/paks/mysql/update.sh
deleted file mode 100644
index 548b9dbd3..000000000
--- a/src/paks/mysql/update.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/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
-
-# Create backup include file if it is missing.
-if [ ! -e "/var/ipfire/backup/addons/includes/mysql" ]; then
-	cat <<EOF > /var/ipfire/backup/addons/includes/mysql
-/etc/my.cnf
-/srv/mysql
-EOF
-fi
-
-# Stop the mysql service
-stop_service "${NAME}"
-
-# Make backup
-make_backup "${NAME}"
-
-# Update files
-remove_files
-extract_files
-
-# Restore backup
-restore_backup "${NAME}"
-
-# Restart the service
-start_service "${NAME}"
-
-exit 0
diff --git a/src/patches/dma-0.10-better-tls.patch b/src/patches/dma-0.10-better-tls.patch
new file mode 100644
index 000000000..8f60fdd04
--- /dev/null
+++ b/src/patches/dma-0.10-better-tls.patch
@@ -0,0 +1,26 @@
+commit e94f50bbbe7318eec5b6b165ff73d94bbc9d20b0
+Author: Michael Tremer <michael.tremer@ipfire.org>
+Date:   Sun Feb 11 11:05:43 2018 +0000
+
+    crypto: Don't limit to TLSv1 only
+    
+    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
+
+diff --git a/crypto.c b/crypto.c
+index 897b55bfdcfc..440c882880b5 100644
+--- a/crypto.c
++++ b/crypto.c
+@@ -93,7 +93,12 @@ smtp_init_crypto(int fd, int feature)
+ 	SSL_library_init();
+ 	SSL_load_error_strings();
+ 
+-	meth = TLSv1_client_method();
++	// Allow any possible version
++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
++	meth = TLS_client_method();
++#else
++	meth = SSLv23_client_method();
++#endif
+ 
+ 	ctx = SSL_CTX_new(meth);
+ 	if (ctx == NULL) {
diff --git a/src/patches/flac-1.2.1-asm.patch b/src/patches/flac-1.2.1-asm.patch
deleted file mode 100644
index 932a76192..000000000
--- a/src/patches/flac-1.2.1-asm.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -up flac-1.2.1/src/libFLAC/stream_decoder.c.asm flac-1.2.1/src/libFLAC/stream_decoder.c
---- flac-1.2.1/src/libFLAC/stream_decoder.c.asm	2007-09-13 17:38:05.000000000 +0200
-+++ flac-1.2.1/src/libFLAC/stream_decoder.c	2008-01-29 10:32:17.000000000 +0100
-@@ -421,7 +421,7 @@ static FLAC__StreamDecoderInitStatus ini
- #ifdef FLAC__CPU_IA32
- 		FLAC__ASSERT(decoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32);
- #ifdef FLAC__HAS_NASM
--#if 1 /*@@@@@@ OPT: not clearly faster, needs more testing */
-+#if 0 /*@@@@@@ OPT: not clearly faster, needs more testing */
- 		if(decoder->private_->cpuinfo.data.ia32.bswap)
- 			decoder->private_->local_bitreader_read_rice_signed_block = FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap;
- #endif
-diff -up flac-1.2.1/src/libFLAC/ia32/lpc_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/lpc_asm.nasm
---- flac-1.2.1/src/libFLAC/ia32/lpc_asm.nasm.asm	2007-03-22 05:13:05.000000000 +0100
-+++ flac-1.2.1/src/libFLAC/ia32/lpc_asm.nasm	2008-01-29 10:34:09.000000000 +0100
-@@ -1507,5 +1507,5 @@ cident FLAC__lpc_restore_signal_asm_ia32
- end
- 
- %ifdef OBJ_FORMAT_elf
--       section .note.GNU-stack noalloc
-+       section .note.GNU-stack progbits noalloc noexec nowrite align=1
- %endif
-diff -up flac-1.2.1/src/libFLAC/ia32/Makefile.am.asm flac-1.2.1/src/libFLAC/ia32/Makefile.am
---- flac-1.2.1/src/libFLAC/ia32/Makefile.am.asm	2007-04-04 02:01:13.000000000 +0200
-+++ flac-1.2.1/src/libFLAC/ia32/Makefile.am	2008-03-17 14:04:37.000000000 +0100
-@@ -37,7 +37,6 @@ STRIP_NON_ASM = sh $(top_srcdir)/strip_n
- 
- noinst_LTLIBRARIES = libFLAC-asm.la
- libFLAC_asm_la_SOURCES = \
--	bitreader_asm.nasm \
- 	cpu_asm.nasm \
- 	fixed_asm.nasm \
- 	lpc_asm.nasm \
-diff -up flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm
---- flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm.asm	2007-03-30 02:54:53.000000000 +0200
-+++ flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm	2008-01-29 10:32:57.000000000 +0100
-@@ -564,5 +564,5 @@ cident FLAC__bitreader_read_rice_signed_
- end
- 
- %ifdef OBJ_FORMAT_elf
--	section .note.GNU-stack noalloc
-+	section .note.GNU-stack progbits noalloc noexec nowrite align=1
- %endif
-diff -up flac-1.2.1/src/libFLAC/ia32/fixed_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/fixed_asm.nasm
---- flac-1.2.1/src/libFLAC/ia32/fixed_asm.nasm.asm	2007-03-22 05:13:05.000000000 +0100
-+++ flac-1.2.1/src/libFLAC/ia32/fixed_asm.nasm	2008-01-29 10:33:52.000000000 +0100
-@@ -308,5 +308,5 @@ cident FLAC__fixed_compute_best_predicto
- end
- 
- %ifdef OBJ_FORMAT_elf
--       section .note.GNU-stack noalloc
-+       section .note.GNU-stack progbits noalloc noexec nowrite align=1
- %endif
-diff -up flac-1.2.1/src/libFLAC/ia32/cpu_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/cpu_asm.nasm
---- flac-1.2.1/src/libFLAC/ia32/cpu_asm.nasm.asm	2007-03-22 05:13:05.000000000 +0100
-+++ flac-1.2.1/src/libFLAC/ia32/cpu_asm.nasm	2008-01-29 10:33:24.000000000 +0100
-@@ -117,5 +117,5 @@ cident FLAC__cpu_info_extended_amd_asm_i
- end
- 
- %ifdef OBJ_FORMAT_elf
--       section .note.GNU-stack noalloc
-+       section .note.GNU-stack progbits noalloc noexec nowrite align=1
- %endif
-diff -up flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm
---- flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm.asm	2007-06-19 22:01:27.000000000 +0200
-+++ flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm	2008-01-29 10:34:40.000000000 +0100
-@@ -155,5 +155,5 @@ cident precompute_partition_info_sums_32
- end
- 
- %ifdef OBJ_FORMAT_elf
--	section .note.GNU-stack noalloc
-+	section .note.GNU-stack progbits noalloc noexec nowrite align=1
- %endif
diff --git a/src/patches/flac-1.2.1-bitreader.patch b/src/patches/flac-1.2.1-bitreader.patch
deleted file mode 100644
index 9d47af33e..000000000
--- a/src/patches/flac-1.2.1-bitreader.patch
+++ /dev/null
@@ -1,558 +0,0 @@
-Index: src/libFLAC/bitreader.c
-===================================================================
-RCS file: /cvsroot/flac/flac/src/libFLAC/bitreader.c,v
-retrieving revision 1.15
-diff -u -r1.15 bitreader.c
---- src/libFLAC/bitreader.c	28 Feb 2008 05:34:26 -0000	1.15
-+++ src/libFLAC/bitreader.c	14 Mar 2008 11:07:07 -0000
-@@ -69,13 +69,12 @@
- #endif
- /* counts the # of zero MSBs in a word */
- #define COUNT_ZERO_MSBS(word) ( \
--	(word) <= 0xffff ? \
--		( (word) <= 0xff? byte_to_unary_table[word] + 24 : byte_to_unary_table[(word) >> 8] + 16 ) : \
--		( (word) <= 0xffffff? byte_to_unary_table[word >> 16] + 8 : byte_to_unary_table[(word) >> 24] ) \
-+	word > 0xffffff ? byte_to_unary_table[(word) >> 24] : \
-+	!word ? 32 : \
-+	word > 0xffff ? byte_to_unary_table[word >> 16] + 8 : \
-+	word > 0xff ? byte_to_unary_table[(word) >> 8] + 16 : \
-+	byte_to_unary_table[word] + 24 \
- )
--/* this alternate might be slightly faster on some systems/compilers: */
--#define COUNT_ZERO_MSBS2(word) ( (word) <= 0xff ? byte_to_unary_table[word] + 24 : ((word) <= 0xffff ? byte_to_unary_table[(word) >> 8] + 16 : ((word) <= 0xffffff ? byte_to_unary_table[(word) >> 16] + 8 : byte_to_unary_table[(word) >> 24])) )
--
- 
- /*
-  * This should be at least twice as large as the largest number of words
-Index: src/libFLAC/bitreader.c
-===================================================================
-RCS file: /cvsroot/flac/flac/src/libFLAC/bitreader.c,v
-retrieving revision 1.15
-diff -u -r1.15 bitreader.c
---- src/libFLAC/bitreader.c	28 Feb 2008 05:34:26 -0000	1.15
-+++ src/libFLAC/bitreader.c	14 Mar 2008 13:19:46 -0000
-@@ -149,6 +148,7 @@
- 	FLAC__CPUInfo cpu_info;
- };
- 
-+#if FLAC__BYTES_PER_WORD == 4 && FLAC__CPU_IA32
- #ifdef _MSC_VER
- /* OPT: an MSVC built-in would be better */
- static _inline FLAC__uint32 local_swap32_(FLAC__uint32 x)
-@@ -173,6 +173,15 @@
- done1:
- 	}
- }
-+#elif __GNUC__
-+static void local_swap32_block_(FLAC__uint32 *start, FLAC__uint32 len)
-+{
-+	FLAC__uint32 *end;
-+
-+	for(end = start + len; start < end; start++)
-+		asm ("bswap %0" : "=r"(*start) : "0"(*start));
-+}
-+#endif
- #endif
- 
- static FLaC__INLINE void crc16_update_word_(FLAC__BitReader *br, brword word)
-@@ -263,7 +272,7 @@
- #if WORDS_BIGENDIAN
- #else
- 	end = (br->words*FLAC__BYTES_PER_WORD + br->bytes + bytes + (FLAC__BYTES_PER_WORD-1)) / FLAC__BYTES_PER_WORD;
--# if defined(_MSC_VER) && (FLAC__BYTES_PER_WORD == 4)
-+# if FLAC__CPU_IA32 && (__GNUC__ || defined(_MSC_VER)) && FLAC__BYTES_PER_WORD == 4
- 	if(br->cpu_info.type == FLAC__CPUINFO_TYPE_IA32 && br->cpu_info.data.ia32.bswap) {
- 		start = br->words;
- 		local_swap32_block_(br->buffer + start, end - start);
-Index: src/libFLAC/bitreader.c
-===================================================================
-RCS file: /cvsroot/flac/flac/src/libFLAC/bitreader.c,v
-retrieving revision 1.15
-diff -u -r1.15 bitreader.c
---- src/libFLAC/bitreader.c	28 Feb 2008 05:34:26 -0000	1.15
-+++ src/libFLAC/bitreader.c	17 Mar 2008 15:42:57 -0000
-@@ -803,379 +812,144 @@
- }
- 
- /* this is by far the most heavily used reader call.  it ain't pretty but it's fast */
--/* a lot of the logic is copied, then adapted, from FLAC__bitreader_read_unary_unsigned() and FLAC__bitreader_read_raw_uint32() */
- FLAC__bool FLAC__bitreader_read_rice_signed_block(FLAC__BitReader *br, int vals[], unsigned nvals, unsigned parameter)
--/* OPT: possibly faster version for use with MSVC */
--#ifdef _MSC_VER
- {
--	unsigned i;
--	unsigned uval = 0;
--	unsigned bits; /* the # of binary LSBs left to read to finish a rice codeword */
--
- 	/* try and get br->consumed_words and br->consumed_bits into register;
- 	 * must remember to flush them back to *br before calling other
--	 * bitwriter functions that use them, and before returning */
--	register unsigned cwords;
--	register unsigned cbits;
-+	 * bitreader functions that use them, and before returning */
-+	unsigned cwords, words, lsbs, msbs, x, y;
-+	unsigned ucbits; /* keep track of the number of unconsumed bits in word */
-+	brword b;
-+	int *val, *end;
- 
- 	FLAC__ASSERT(0 != br);
- 	FLAC__ASSERT(0 != br->buffer);
- 	/* WATCHOUT: code does not work with <32bit words; we can make things much faster with this assertion */
- 	FLAC__ASSERT(FLAC__BITS_PER_WORD >= 32);
- 	FLAC__ASSERT(parameter < 32);
--	/* the above two asserts also guarantee that the binary part never straddles more that 2 words, so we don't have to loop to read it */
--
--	if(nvals == 0)
--		return true;
--
--	cbits = br->consumed_bits;
--	cwords = br->consumed_words;
-+	/* the above two asserts also guarantee that the binary part never straddles more than 2 words, so we don't have to loop to read it */
- 
--	while(1) {
-+	val = vals;
-+	end = vals + nvals;
- 
--		/* read unary part */
--		while(1) {
--			while(cwords < br->words) { /* if we've not consumed up to a partial tail word... */
--				brword b = br->buffer[cwords] << cbits;
--				if(b) {
--#if 0 /* slower, probably due to bad register allocation... */ && defined FLAC__CPU_IA32 && !defined FLAC__NO_ASM && FLAC__BITS_PER_WORD == 32
--					__asm {
--						bsr eax, b
--						not eax
--						and eax, 31
--						mov i, eax
--					}
--#else
--					i = COUNT_ZERO_MSBS(b);
--#endif
--					uval += i;
--					bits = parameter;
--					i++;
--					cbits += i;
--					if(cbits == FLAC__BITS_PER_WORD) {
--						crc16_update_word_(br, br->buffer[cwords]);
--						cwords++;
--						cbits = 0;
--					}
--					goto break1;
--				}
--				else {
--					uval += FLAC__BITS_PER_WORD - cbits;
--					crc16_update_word_(br, br->buffer[cwords]);
--					cwords++;
--					cbits = 0;
--					/* didn't find stop bit yet, have to keep going... */
--				}
--			}
--			/* at this point we've eaten up all the whole words; have to try
--			 * reading through any tail bytes before calling the read callback.
--			 * this is a repeat of the above logic adjusted for the fact we
--			 * don't have a whole word.  note though if the client is feeding
--			 * us data a byte at a time (unlikely), br->consumed_bits may not
--			 * be zero.
--			 */
--			if(br->bytes) {
--				const unsigned end = br->bytes * 8;
--				brword b = (br->buffer[cwords] & (FLAC__WORD_ALL_ONES << (FLAC__BITS_PER_WORD-end))) << cbits;
--				if(b) {
--					i = COUNT_ZERO_MSBS(b);
--					uval += i;
--					bits = parameter;
--					i++;
--					cbits += i;
--					FLAC__ASSERT(cbits < FLAC__BITS_PER_WORD);
--					goto break1;
--				}
--				else {
--					uval += end - cbits;
--					cbits += end;
--					FLAC__ASSERT(cbits < FLAC__BITS_PER_WORD);
--					/* didn't find stop bit yet, have to keep going... */
--				}
--			}
--			/* flush registers and read; bitreader_read_from_client_() does
--			 * not touch br->consumed_bits at all but we still need to set
--			 * it in case it fails and we have to return false.
--			 */
--			br->consumed_bits = cbits;
--			br->consumed_words = cwords;
--			if(!bitreader_read_from_client_(br))
-+	if(parameter == 0) {
-+		while(val < end) {
-+			/* read the unary MSBs and end bit */
-+			if(!FLAC__bitreader_read_unary_unsigned(br, &msbs))
- 				return false;
--			cwords = br->consumed_words;
--		}
--break1:
--		/* read binary part */
--		FLAC__ASSERT(cwords <= br->words);
--
--		if(bits) {
--			while((br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits < bits) {
--				/* flush registers and read; bitreader_read_from_client_() does
--				 * not touch br->consumed_bits at all but we still need to set
--				 * it in case it fails and we have to return false.
--				 */
--				br->consumed_bits = cbits;
--				br->consumed_words = cwords;
--				if(!bitreader_read_from_client_(br))
--					return false;
--				cwords = br->consumed_words;
--			}
--			if(cwords < br->words) { /* if we've not consumed up to a partial tail word... */
--				if(cbits) {
--					/* this also works when consumed_bits==0, it's just a little slower than necessary for that case */
--					const unsigned n = FLAC__BITS_PER_WORD - cbits;
--					const brword word = br->buffer[cwords];
--					if(bits < n) {
--						uval <<= bits;
--						uval |= (word & (FLAC__WORD_ALL_ONES >> cbits)) >> (n-bits);
--						cbits += bits;
--						goto break2;
--					}
--					uval <<= n;
--					uval |= word & (FLAC__WORD_ALL_ONES >> cbits);
--					bits -= n;
--					crc16_update_word_(br, word);
--					cwords++;
--					cbits = 0;
--					if(bits) { /* if there are still bits left to read, there have to be less than 32 so they will all be in the next word */
--						uval <<= bits;
--						uval |= (br->buffer[cwords] >> (FLAC__BITS_PER_WORD-bits));
--						cbits = bits;
--					}
--					goto break2;
--				}
--				else {
--					FLAC__ASSERT(bits < FLAC__BITS_PER_WORD);
--					uval <<= bits;
--					uval |= br->buffer[cwords] >> (FLAC__BITS_PER_WORD-bits);
--					cbits = bits;
--					goto break2;
--				}
--			}
--			else {
--				/* in this case we're starting our read at a partial tail word;
--				 * the reader has guaranteed that we have at least 'bits' bits
--				 * available to read, which makes this case simpler.
--				 */
--				uval <<= bits;
--				if(cbits) {
--					/* this also works when consumed_bits==0, it's just a little slower than necessary for that case */
--					FLAC__ASSERT(cbits + bits <= br->bytes*8);
--					uval |= (br->buffer[cwords] & (FLAC__WORD_ALL_ONES >> cbits)) >> (FLAC__BITS_PER_WORD-cbits-bits);
--					cbits += bits;
--					goto break2;
--				}
--				else {
--					uval |= br->buffer[cwords] >> (FLAC__BITS_PER_WORD-bits);
--					cbits += bits;
--					goto break2;
--				}
--			}
--		}
--break2:
--		/* compose the value */
--		*vals = (int)(uval >> 1 ^ -(int)(uval & 1));
- 
--		/* are we done? */
--		--nvals;
--		if(nvals == 0) {
--			br->consumed_bits = cbits;
--			br->consumed_words = cwords;
--			return true;
-+			*val++ = (int)(msbs >> 1) ^ -(int)(msbs & 1);
- 		}
- 
--		uval = 0;
--		++vals;
--
-+		return true;
- 	}
--}
--#else
--{
--	unsigned i;
--	unsigned uval = 0;
- 
--	/* try and get br->consumed_words and br->consumed_bits into register;
--	 * must remember to flush them back to *br before calling other
--	 * bitwriter functions that use them, and before returning */
--	register unsigned cwords;
--	register unsigned cbits;
--	unsigned ucbits; /* keep track of the number of unconsumed bits in the buffer */
-+	FLAC__ASSERT(parameter > 0);
- 
--	FLAC__ASSERT(0 != br);
--	FLAC__ASSERT(0 != br->buffer);
--	/* WATCHOUT: code does not work with <32bit words; we can make things much faster with this assertion */
--	FLAC__ASSERT(FLAC__BITS_PER_WORD >= 32);
--	FLAC__ASSERT(parameter < 32);
--	/* the above two asserts also guarantee that the binary part never straddles more than 2 words, so we don't have to loop to read it */
-+	cwords = br->consumed_words;
-+	words = br->words;
- 
--	if(nvals == 0)
--		return true;
-+	/* if we've not consumed up to a partial tail word... */
-+	if(cwords >= words) {
-+		x = 0;
-+		goto process_tail;
-+	}
-+
-+	ucbits = FLAC__BITS_PER_WORD - br->consumed_bits;
-+	b = br->buffer[cwords] << br->consumed_bits;  /* keep unconsumed bits aligned to left */
-+
-+	while(val < end) {
-+		/* read the unary MSBs and end bit */
-+		x = y = COUNT_ZERO_MSBS(b);
-+		if(x == FLAC__BITS_PER_WORD) {
-+			x = ucbits;
-+			do {
-+				/* didn't find stop bit yet, have to keep going... */
-+				crc16_update_word_(br, br->buffer[cwords++]);
-+				if (cwords >= words)
-+					goto incomplete_msbs;
-+				b = br->buffer[cwords];
-+				y = COUNT_ZERO_MSBS(b);
-+				x += y;
-+			} while(y == FLAC__BITS_PER_WORD);
-+		}
-+		b <<= y;
-+		b <<= 1; /* account for stop bit */
-+		ucbits = (ucbits - x - 1) % FLAC__BITS_PER_WORD;
-+		msbs = x;
-+
-+		/* read the binary LSBs */
-+		x = b >> (FLAC__BITS_PER_WORD - parameter);
-+		if(parameter <= ucbits) {
-+			ucbits -= parameter;
-+			b <<= parameter;
-+		} else {
-+			/* there are still bits left to read, they will all be in the next word */
-+			crc16_update_word_(br, br->buffer[cwords++]);
-+			if (cwords >= words)
-+				goto incomplete_lsbs;
-+			b = br->buffer[cwords];
-+			ucbits += FLAC__BITS_PER_WORD - parameter;
-+			x |= b >> ucbits;
-+			b <<= FLAC__BITS_PER_WORD - ucbits;
-+		}
-+		lsbs = x;
- 
--	cbits = br->consumed_bits;
--	cwords = br->consumed_words;
--	ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits;
-+		/* compose the value */
-+		x = (msbs << parameter) | lsbs;
-+		*val++ = (int)(x >> 1) ^ -(int)(x & 1);
- 
--	while(1) {
-+		continue;
- 
--		/* read unary part */
--		while(1) {
--			while(cwords < br->words) { /* if we've not consumed up to a partial tail word... */
--				brword b = br->buffer[cwords] << cbits;
--				if(b) {
--#if 0 /* is not discernably faster... */ && defined FLAC__CPU_IA32 && !defined FLAC__NO_ASM && FLAC__BITS_PER_WORD == 32 && defined __GNUC__
--					asm volatile (
--						"bsrl %1, %0;"
--						"notl %0;"
--						"andl $31, %0;"
--						: "=r"(i)
--						: "r"(b)
--					);
--#else
--					i = COUNT_ZERO_MSBS(b);
--#endif
--					uval += i;
--					cbits += i;
--					cbits++; /* skip over stop bit */
--					if(cbits >= FLAC__BITS_PER_WORD) { /* faster way of testing if(cbits == FLAC__BITS_PER_WORD) */
--						crc16_update_word_(br, br->buffer[cwords]);
--						cwords++;
--						cbits = 0;
--					}
--					goto break1;
--				}
--				else {
--					uval += FLAC__BITS_PER_WORD - cbits;
--					crc16_update_word_(br, br->buffer[cwords]);
--					cwords++;
--					cbits = 0;
--					/* didn't find stop bit yet, have to keep going... */
--				}
--			}
--			/* at this point we've eaten up all the whole words; have to try
--			 * reading through any tail bytes before calling the read callback.
--			 * this is a repeat of the above logic adjusted for the fact we
--			 * don't have a whole word.  note though if the client is feeding
--			 * us data a byte at a time (unlikely), br->consumed_bits may not
--			 * be zero.
--			 */
--			if(br->bytes) {
--				const unsigned end = br->bytes * 8;
--				brword b = (br->buffer[cwords] & ~(FLAC__WORD_ALL_ONES >> end)) << cbits;
--				if(b) {
--					i = COUNT_ZERO_MSBS(b);
--					uval += i;
--					cbits += i;
--					cbits++; /* skip over stop bit */
--					FLAC__ASSERT(cbits < FLAC__BITS_PER_WORD);
--					goto break1;
--				}
--				else {
--					uval += end - cbits;
--					cbits += end;
--					FLAC__ASSERT(cbits < FLAC__BITS_PER_WORD);
--					/* didn't find stop bit yet, have to keep going... */
--				}
-+		/* at this point we've eaten up all the whole words */
-+process_tail:
-+		do {
-+			if(0) {
-+incomplete_msbs:
-+				br->consumed_bits = 0;
-+				br->consumed_words = cwords;
- 			}
--			/* flush registers and read; bitreader_read_from_client_() does
--			 * not touch br->consumed_bits at all but we still need to set
--			 * it in case it fails and we have to return false.
--			 */
--			br->consumed_bits = cbits;
--			br->consumed_words = cwords;
--			if(!bitreader_read_from_client_(br))
-+			
-+			/* read the unary MSBs and end bit */
-+			if(!FLAC__bitreader_read_unary_unsigned(br, &msbs))
- 				return false;
--			cwords = br->consumed_words;
--			ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits + uval;
--			/* + uval to offset our count by the # of unary bits already
--			 * consumed before the read, because we will add these back
--			 * in all at once at break1
--			 */
--		}
--break1:
--		ucbits -= uval;
--		ucbits--; /* account for stop bit */
--
--		/* read binary part */
--		FLAC__ASSERT(cwords <= br->words);
--
--		if(parameter) {
--			while(ucbits < parameter) {
--				/* flush registers and read; bitreader_read_from_client_() does
--				 * not touch br->consumed_bits at all but we still need to set
--				 * it in case it fails and we have to return false.
--				 */
--				br->consumed_bits = cbits;
-+			msbs += x;
-+			x = ucbits = 0;
-+
-+			if(0) {
-+incomplete_lsbs:
-+				br->consumed_bits = 0;
- 				br->consumed_words = cwords;
--				if(!bitreader_read_from_client_(br))
--					return false;
--				cwords = br->consumed_words;
--				ucbits = (br->words-cwords)*FLAC__BITS_PER_WORD + br->bytes*8 - cbits;
--			}
--			if(cwords < br->words) { /* if we've not consumed up to a partial tail word... */
--				if(cbits) {
--					/* this also works when consumed_bits==0, it's just slower than necessary for that case */
--					const unsigned n = FLAC__BITS_PER_WORD - cbits;
--					const brword word = br->buffer[cwords];
--					if(parameter < n) {
--						uval <<= parameter;
--						uval |= (word & (FLAC__WORD_ALL_ONES >> cbits)) >> (n-parameter);
--						cbits += parameter;
--					}
--					else {
--						uval <<= n;
--						uval |= word & (FLAC__WORD_ALL_ONES >> cbits);
--						crc16_update_word_(br, word);
--						cwords++;
--						cbits = parameter - n;
--						if(cbits) { /* parameter > n, i.e. if there are still bits left to read, there have to be less than 32 so they will all be in the next word */
--							uval <<= cbits;
--							uval |= (br->buffer[cwords] >> (FLAC__BITS_PER_WORD-cbits));
--						}
--					}
--				}
--				else {
--					cbits = parameter;
--					uval <<= parameter;
--					uval |= br->buffer[cwords] >> (FLAC__BITS_PER_WORD-cbits);
--				}
- 			}
--			else {
--				/* in this case we're starting our read at a partial tail word;
--				 * the reader has guaranteed that we have at least 'parameter'
--				 * bits available to read, which makes this case simpler.
--				 */
--				uval <<= parameter;
--				if(cbits) {
--					/* this also works when consumed_bits==0, it's just a little slower than necessary for that case */
--					FLAC__ASSERT(cbits + parameter <= br->bytes*8);
--					uval |= (br->buffer[cwords] & (FLAC__WORD_ALL_ONES >> cbits)) >> (FLAC__BITS_PER_WORD-cbits-parameter);
--					cbits += parameter;
--				}
--				else {
--					cbits = parameter;
--					uval |= br->buffer[cwords] >> (FLAC__BITS_PER_WORD-cbits);
--				}
--			}
--		}
- 
--		ucbits -= parameter;
--
--		/* compose the value */
--		*vals = (int)(uval >> 1 ^ -(int)(uval & 1));
-+			/* read the binary LSBs */
-+			if(!FLAC__bitreader_read_raw_uint32(br, &lsbs, parameter - ucbits))
-+				return false;
-+			lsbs = x | lsbs;
- 
--		/* are we done? */
--		--nvals;
--		if(nvals == 0) {
--			br->consumed_bits = cbits;
--			br->consumed_words = cwords;
--			return true;
--		}
-+			/* compose the value */
-+			x = (msbs << parameter) | lsbs;
-+			*val++ = (int)(x >> 1) ^ -(int)(x & 1);
-+			x = 0;
- 
--		uval = 0;
--		++vals;
-+			cwords = br->consumed_words;
-+			words = br->words;
-+			ucbits = FLAC__BITS_PER_WORD - br->consumed_bits;
-+			b = br->buffer[cwords] << br->consumed_bits;
-+		} while(cwords >= words && val < end);
-+	}
- 
-+	if(ucbits == 0 && cwords < words) {
-+		/* don't leave the head word with no unconsumed bits */
-+		crc16_update_word_(br, br->buffer[cwords++]);
-+		ucbits = FLAC__BITS_PER_WORD;
- 	}
-+
-+	br->consumed_bits = FLAC__BITS_PER_WORD - ucbits;
-+	br->consumed_words = cwords;
-+
-+	return true;
- }
--#endif
- 
- #if 0 /* UNUSED */
- FLAC__bool FLAC__bitreader_read_golomb_signed(FLAC__BitReader *br, int *val, unsigned parameter)
diff --git a/src/patches/flac-1.2.1-cflags.patch b/src/patches/flac-1.2.1-cflags.patch
deleted file mode 100644
index 032fa5e2b..000000000
--- a/src/patches/flac-1.2.1-cflags.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -up flac-1.2.1/src/libFLAC/Makefile.am.cflags flac-1.2.1/src/libFLAC/Makefile.am
---- flac-1.2.1/src/libFLAC/Makefile.am.cflags	2007-09-14 23:06:17.000000000 +0200
-+++ flac-1.2.1/src/libFLAC/Makefile.am	2008-03-17 14:19:29.000000000 +0100
-@@ -41,7 +41,7 @@ CPUCFLAGS = -faltivec -force_cpusubtype_
- else
- # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific
- #@@@ PPC optimizations temporarily disabled
--CPUCFLAGS = -maltivec -mabi=altivec -DFLAC__NO_ASM
-+CPUCFLAGS = -DFLAC__NO_ASM
- endif
- endif
- 
-@@ -69,7 +69,7 @@ endif
- endif
- endif
- 
--libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
-+libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@ libFLAC_extracflags.la
- 
- SUBDIRS = $(ARCH_SUBDIRS) include .
- 
-@@ -112,7 +112,10 @@ libFLAC_la_SOURCES = \
- 	metadata_iterators.c \
- 	metadata_object.c \
- 	stream_decoder.c \
--	stream_encoder.c \
- 	stream_encoder_framing.c \
- 	window.c \
- 	$(extra_ogg_sources)
-+
-+noinst_LTLIBRARIES = libFLAC_extracflags.la
-+libFLAC_extracflags_la_SOURCES = stream_encoder.c
-+libFLAC_extracflags_la_CFLAGS = $(AM_CFLAGS) -funroll-loops
-diff -up flac-1.2.1/configure.in.cflags flac-1.2.1/configure.in
---- flac-1.2.1/configure.in.cflags	2007-09-13 17:48:42.000000000 +0200
-+++ flac-1.2.1/configure.in	2008-03-17 14:17:08.000000000 +0100
-@@ -301,7 +301,7 @@ else
- 	CPPFLAGS="-DNDEBUG $CPPFLAGS"
- 	if test "x$GCC" = xyes; then
- 		CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
--		CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
-+		CFLAGS="-Wall -W -Winline $CFLAGS"
- 	fi
- fi
- 
diff --git a/src/patches/flac-1.2.1-gcc43.patch b/src/patches/flac-1.2.1-gcc43.patch
deleted file mode 100644
index 7fdbf8067..000000000
--- a/src/patches/flac-1.2.1-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43 flac-1.2.1/examples/cpp/encode/file/main.cpp
---- flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43	2007-09-13 17:58:03.000000000 +0200
-+++ flac-1.2.1/examples/cpp/encode/file/main.cpp	2008-01-08 10:27:39.000000000 +0100
-@@ -29,6 +29,7 @@
- #endif
- 
- #include <stdio.h>
-+#include <string.h>
- #include <stdlib.h>
- #include "FLAC++/metadata.h"
- #include "FLAC++/encoder.h"
diff --git a/src/patches/flac-1.2.1-hidesyms.patch b/src/patches/flac-1.2.1-hidesyms.patch
deleted file mode 100644
index 0f4c10418..000000000
--- a/src/patches/flac-1.2.1-hidesyms.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -up flac-1.2.1/src/libFLAC/include/private/ogg_helper.h.hidesyms flac-1.2.1/src/libFLAC/include/private/ogg_helper.h
---- flac-1.2.1/src/libFLAC/include/private/ogg_helper.h.hidesyms	2007-02-02 07:22:40.000000000 +0100
-+++ flac-1.2.1/src/libFLAC/include/private/ogg_helper.h	2008-01-29 15:27:13.000000000 +0100
-@@ -35,9 +35,13 @@
- #include <ogg/ogg.h>
- #include "FLAC/stream_encoder.h" /* for FLAC__StreamEncoder */
- 
-+__attribute__((__visibility__("hidden")))
- void simple_ogg_page__init(ogg_page *page);
-+__attribute__((__visibility__("hidden")))
- void simple_ogg_page__clear(ogg_page *page);
-+__attribute__((__visibility__("hidden")))
- FLAC__bool simple_ogg_page__get_at(FLAC__StreamEncoder *encoder, FLAC__uint64 position, ogg_page *page, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderReadCallback read_callback, void *client_data);
-+__attribute__((__visibility__("hidden")))
- FLAC__bool simple_ogg_page__set_at(FLAC__StreamEncoder *encoder, FLAC__uint64 position, ogg_page *page, FLAC__StreamEncoderSeekCallback seek_callback, FLAC__StreamEncoderWriteCallback write_callback, void *client_data);
- 
- #endif
-diff -up flac-1.2.1/src/libFLAC/include/private/bitreader.h.hidesyms flac-1.2.1/src/libFLAC/include/private/bitreader.h
---- flac-1.2.1/src/libFLAC/include/private/bitreader.h.hidesyms	2007-07-10 22:22:19.000000000 +0200
-+++ flac-1.2.1/src/libFLAC/include/private/bitreader.h	2008-01-29 15:27:13.000000000 +0100
-@@ -95,5 +95,6 @@ FLAC__bool FLAC__bitreader_read_golomb_u
- FLAC__bool FLAC__bitreader_read_utf8_uint32(FLAC__BitReader *br, FLAC__uint32 *val, FLAC__byte *raw, unsigned *rawlen);
- FLAC__bool FLAC__bitreader_read_utf8_uint64(FLAC__BitReader *br, FLAC__uint64 *val, FLAC__byte *raw, unsigned *rawlen);
- 
-+__attribute__((__visibility__("hidden")))
- FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br);
- #endif
-diff -up flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm.hidesyms flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm
---- flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm.hidesyms	2008-01-29 15:27:13.000000000 +0100
-+++ flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm	2008-01-29 15:28:32.000000000 +0100
-@@ -34,7 +34,7 @@
- 
- 	data_section
- 
--cglobal precompute_partition_info_sums_32bit_asm_ia32_
-+cglobal precompute_partition_info_sums_32bit_asm_ia32_:function hidden
- 
- 	code_section
- 
diff --git a/src/patches/flac-1.2.1-tests.patch b/src/patches/flac-1.2.1-tests.patch
deleted file mode 100644
index 89c59216d..000000000
--- a/src/patches/flac-1.2.1-tests.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -up flac-1.2.1/test/test_seeking.sh.tests flac-1.2.1/test/test_seeking.sh
---- flac-1.2.1/test/test_seeking.sh.tests	2007-09-11 09:33:04.000000000 +0200
-+++ flac-1.2.1/test/test_seeking.sh	2008-01-29 13:52:03.000000000 +0100
-@@ -103,7 +103,7 @@ tiny_seek_count=100
- if [ "$FLAC__TEST_LEVEL" -gt 1 ] ; then
- 	small_seek_count=10000
- else
--	small_seek_count=100000
-+	small_seek_count=100
- fi
- 
- for suffix in '' '-s' ; do
-diff -up flac-1.2.1/test/test_streams.sh.tests flac-1.2.1/test/test_streams.sh
---- flac-1.2.1/test/test_streams.sh.tests	2007-06-16 21:58:39.000000000 +0200
-+++ flac-1.2.1/test/test_streams.sh	2008-03-17 13:57:39.000000000 +0100
-@@ -39,6 +39,10 @@ if [ x"$FLAC__TEST_LEVEL" = x ] ; then
- 	FLAC__TEST_LEVEL=1
- fi
- 
-+if [ "$FLAC__TEST_LEVEL" -eq 0 ] ; then
-+	exit 0
-+fi
-+
- flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable"
- 
- run_flac ()
-diff -up flac-1.2.1/src/test_streams/main.c.tests flac-1.2.1/src/test_streams/main.c
---- flac-1.2.1/src/test_streams/main.c.tests	2007-08-31 07:54:49.000000000 +0200
-+++ flac-1.2.1/src/test_streams/main.c	2008-01-29 13:53:46.000000000 +0100
-@@ -898,9 +898,9 @@ int main(int argc, char *argv[])
- 	if(!generate_noise("noise.raw", 65536 * 8 * 3)) return 1;
- 	if(!generate_noise("noise8m32.raw", 32)) return 1;
- 	if(!generate_wackywavs()) return 1;
--	for(channels = 1; channels <= 8; channels++) {
-+	for(channels = 1; channels <= 2; channels++) {
- 		unsigned bits_per_sample;
--		for(bits_per_sample = 4; bits_per_sample <= 24; bits_per_sample++) {
-+		for(bits_per_sample = 8; bits_per_sample <= 24; bits_per_sample += 8) {
- 			static const unsigned nsamples[] = { 1, 111, 4777 } ;
- 			unsigned samples;
- 			for(samples = 0; samples < sizeof(nsamples)/sizeof(nsamples[0]); samples++) {
diff --git a/src/patches/flex-2.6.4-fix-build-width-glibc-2.6+.patch b/src/patches/flex-2.6.4-fix-build-width-glibc-2.6+.patch
new file mode 100644
index 000000000..328b57524
--- /dev/null
+++ b/src/patches/flex-2.6.4-fix-build-width-glibc-2.6+.patch
@@ -0,0 +1,767 @@
+Backport of https://github.com/westes/flex/commit/24fd0551333e7eded87b64dd36062da3df2f6380
+
+Bug: https://bugs.gentoo.org/628744
+
+--- a/configure
++++ b/configure
+@@ -3605,13 +3605,142 @@ test -z "$SED" && SED=sed
+ Xsed="$SED -e 1s/^X//"
+ 
+ 
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
++$as_echo_n "checking how to run the C preprocessor... " >&6; }
++# On Suns, sometimes $CPP names a directory.
++if test -n "$CPP" && test -d "$CPP"; then
++  CPP=
++fi
++if test -z "$CPP"; then
++  if ${ac_cv_prog_CPP+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++      # Double quotes because CPP needs to be expanded
++    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
++    do
++      ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++
++else
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
++
++  # OK, works on sane cases.  Now check whether nonexistent headers
++  # can be detected and how.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++  # Broken: success on invalid input.
++continue
++else
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
++
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.i conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
++  break
++fi
+ 
++    done
++    ac_cv_prog_CPP=$CPP
+ 
++fi
++  CPP=$ac_cv_prog_CPP
++else
++  ac_cv_prog_CPP=$CPP
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
++$as_echo "$CPP" >&6; }
++ac_preproc_ok=false
++for ac_c_preproc_warn_flag in '' yes
++do
++  # Use a header file that comes with gcc, so configuring glibc
++  # with a fresh cross-compiler works.
++  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++  # <limits.h> exists even on freestanding compilers.
++  # On the NeXT, cc -E runs the code through the compiler's parser,
++  # not just through cpp. "Syntax error" is here to catch this case.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++		     Syntax error
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
+ 
++else
++  # Broken: fails on valid input.
++continue
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
++  # OK, works on sane cases.  Now check whether nonexistent headers
++  # can be detected and how.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <ac_nonexistent.h>
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++  # Broken: success on invalid input.
++continue
++else
++  # Passes both tests.
++ac_preproc_ok=:
++break
++fi
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
++done
++# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
++rm -f conftest.i conftest.err conftest.$ac_ext
++if $ac_preproc_ok; then :
+ 
++else
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5; }
++fi
+ 
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+@@ -3744,91 +3873,208 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
+  EGREP="$ac_cv_path_EGREP"
+ 
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+-$as_echo_n "checking for fgrep... " >&6; }
+-if ${ac_cv_path_FGREP+:} false; then :
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
++$as_echo_n "checking for ANSI C header files... " >&6; }
++if ${ac_cv_header_stdc+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+-   then ac_cv_path_FGREP="$GREP -F"
+-   else
+-     if test -z "$FGREP"; then
+-  ac_path_FGREP_found=false
+-  # Loop through the user's path and test for each of PROGNAME-LIST
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_prog in fgrep; do
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+-      as_fn_executable_p "$ac_path_FGREP" || continue
+-# Check for GNU ac_path_FGREP and select it if it is found.
+-  # Check for GNU $ac_path_FGREP
+-case `"$ac_path_FGREP" --version 2>&1` in
+-*GNU*)
+-  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
+-*)
+-  ac_count=0
+-  $as_echo_n 0123456789 >"conftest.in"
+-  while :
+-  do
+-    cat "conftest.in" "conftest.in" >"conftest.tmp"
+-    mv "conftest.tmp" "conftest.in"
+-    cp "conftest.in" "conftest.nl"
+-    $as_echo 'FGREP' >> "conftest.nl"
+-    "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+-    as_fn_arith $ac_count + 1 && ac_count=$as_val
+-    if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+-      # Best one so far, save it but keep looking for a better one
+-      ac_cv_path_FGREP="$ac_path_FGREP"
+-      ac_path_FGREP_max=$ac_count
+-    fi
+-    # 10*(2^10) chars as input seems more than enough
+-    test $ac_count -gt 10 && break
+-  done
+-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+-esac
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdlib.h>
++#include <stdarg.h>
++#include <string.h>
++#include <float.h>
+ 
+-      $ac_path_FGREP_found && break 3
+-    done
+-  done
+-  done
+-IFS=$as_save_IFS
+-  if test -z "$ac_cv_path_FGREP"; then
+-    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+-  fi
+-else
+-  ac_cv_path_FGREP=$FGREP
+-fi
++int
++main ()
++{
+ 
+-   fi
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_header_stdc=yes
++else
++  ac_cv_header_stdc=no
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+-$as_echo "$ac_cv_path_FGREP" >&6; }
+- FGREP="$ac_cv_path_FGREP"
+-
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-test -z "$GREP" && GREP=grep
++if test $ac_cv_header_stdc = yes; then
++  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <string.h>
+ 
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "memchr" >/dev/null 2>&1; then :
+ 
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
+ 
++fi
+ 
++if test $ac_cv_header_stdc = yes; then
++  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdlib.h>
+ 
++_ACEOF
++if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
++  $EGREP "free" >/dev/null 2>&1; then :
+ 
++else
++  ac_cv_header_stdc=no
++fi
++rm -f conftest*
+ 
++fi
+ 
++if test $ac_cv_header_stdc = yes; then
++  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
++  if test "$cross_compiling" = yes; then :
++  :
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <ctype.h>
++#include <stdlib.h>
++#if ((' ' & 0x0FF) == 0x020)
++# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
++# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
++#else
++# define ISLOWER(c) \
++		   (('a' <= (c) && (c) <= 'i') \
++		     || ('j' <= (c) && (c) <= 'r') \
++		     || ('s' <= (c) && (c) <= 'z'))
++# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
++#endif
+ 
++#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
++int
++main ()
++{
++  int i;
++  for (i = 0; i < 256; i++)
++    if (XOR (islower (i), ISLOWER (i))
++	|| toupper (i) != TOUPPER (i))
++      return 2;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_run "$LINENO"; then :
+ 
++else
++  ac_cv_header_stdc=no
++fi
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
++fi
+ 
++fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
++$as_echo "$ac_cv_header_stdc" >&6; }
++if test $ac_cv_header_stdc = yes; then
+ 
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+ 
++fi
+ 
++# On IRIX 5.3, sys/types and inttypes.h are conflicting.
++for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
++		  inttypes.h stdint.h unistd.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++
++
++  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
++if test "x$ac_cv_header_minix_config_h" = xyes; then :
++  MINIX=yes
++else
++  MINIX=
++fi
++
++
++  if test "$MINIX" = yes; then
+ 
++$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
+ 
+ 
++$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
++
++
++$as_echo "#define _MINIX 1" >>confdefs.h
++
++  fi
++
++
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
++$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
++if ${ac_cv_safe_to_define___extensions__+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++#         define __EXTENSIONS__ 1
++          $ac_includes_default
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_cv_safe_to_define___extensions__=yes
++else
++  ac_cv_safe_to_define___extensions__=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
++$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
++  test $ac_cv_safe_to_define___extensions__ = yes &&
++    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
++
++  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
++
++  $as_echo "#define _GNU_SOURCE 1" >>confdefs.h
++
++  $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
++
++  $as_echo "#define _TANDEM_SOURCE 1" >>confdefs.h
++
++
++for ac_header in dlfcn.h
++do :
++  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
++"
++if test "x$ac_cv_header_dlfcn_h" = xyes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_DLFCN_H 1
++_ACEOF
++
++fi
++
++done
+ 
+ 
+ # Check whether --with-gnu-ld was given.
+@@ -6898,288 +7144,6 @@ func_munge_path_list ()
+     esac
+ }
+ 
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+-$as_echo_n "checking how to run the C preprocessor... " >&6; }
+-# On Suns, sometimes $CPP names a directory.
+-if test -n "$CPP" && test -d "$CPP"; then
+-  CPP=
+-fi
+-if test -z "$CPP"; then
+-  if ${ac_cv_prog_CPP+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-      # Double quotes because CPP needs to be expanded
+-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
+-    do
+-      ac_preproc_ok=false
+-for ac_c_preproc_warn_flag in '' yes
+-do
+-  # Use a header file that comes with gcc, so configuring glibc
+-  # with a fresh cross-compiler works.
+-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-  # <limits.h> exists even on freestanding compilers.
+-  # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp. "Syntax error" is here to catch this case.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-		     Syntax error
+-_ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+-
+-else
+-  # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
+-
+-  # OK, works on sane cases.  Now check whether nonexistent headers
+-  # can be detected and how.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+-  # Broken: success on invalid input.
+-continue
+-else
+-  # Passes both tests.
+-ac_preproc_ok=:
+-break
+-fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
+-
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.i conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then :
+-  break
+-fi
+-
+-    done
+-    ac_cv_prog_CPP=$CPP
+-
+-fi
+-  CPP=$ac_cv_prog_CPP
+-else
+-  ac_cv_prog_CPP=$CPP
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+-$as_echo "$CPP" >&6; }
+-ac_preproc_ok=false
+-for ac_c_preproc_warn_flag in '' yes
+-do
+-  # Use a header file that comes with gcc, so configuring glibc
+-  # with a fresh cross-compiler works.
+-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-  # <limits.h> exists even on freestanding compilers.
+-  # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp. "Syntax error" is here to catch this case.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-		     Syntax error
+-_ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+-
+-else
+-  # Broken: fails on valid input.
+-continue
+-fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
+-
+-  # OK, works on sane cases.  Now check whether nonexistent headers
+-  # can be detected and how.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <ac_nonexistent.h>
+-_ACEOF
+-if ac_fn_c_try_cpp "$LINENO"; then :
+-  # Broken: success on invalid input.
+-continue
+-else
+-  # Passes both tests.
+-ac_preproc_ok=:
+-break
+-fi
+-rm -f conftest.err conftest.i conftest.$ac_ext
+-
+-done
+-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.i conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then :
+-
+-else
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details" "$LINENO" 5; }
+-fi
+-
+-ac_ext=c
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+-$as_echo_n "checking for ANSI C header files... " >&6; }
+-if ${ac_cv_header_stdc+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <stdlib.h>
+-#include <stdarg.h>
+-#include <string.h>
+-#include <float.h>
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_compile "$LINENO"; then :
+-  ac_cv_header_stdc=yes
+-else
+-  ac_cv_header_stdc=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-
+-if test $ac_cv_header_stdc = yes; then
+-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <string.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "memchr" >/dev/null 2>&1; then :
+-
+-else
+-  ac_cv_header_stdc=no
+-fi
+-rm -f conftest*
+-
+-fi
+-
+-if test $ac_cv_header_stdc = yes; then
+-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <stdlib.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "free" >/dev/null 2>&1; then :
+-
+-else
+-  ac_cv_header_stdc=no
+-fi
+-rm -f conftest*
+-
+-fi
+-
+-if test $ac_cv_header_stdc = yes; then
+-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+-  if test "$cross_compiling" = yes; then :
+-  :
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <ctype.h>
+-#include <stdlib.h>
+-#if ((' ' & 0x0FF) == 0x020)
+-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+-#else
+-# define ISLOWER(c) \
+-		   (('a' <= (c) && (c) <= 'i') \
+-		     || ('j' <= (c) && (c) <= 'r') \
+-		     || ('s' <= (c) && (c) <= 'z'))
+-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+-#endif
+-
+-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+-int
+-main ()
+-{
+-  int i;
+-  for (i = 0; i < 256; i++)
+-    if (XOR (islower (i), ISLOWER (i))
+-	|| toupper (i) != TOUPPER (i))
+-      return 2;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-
+-else
+-  ac_cv_header_stdc=no
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-fi
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+-$as_echo "$ac_cv_header_stdc" >&6; }
+-if test $ac_cv_header_stdc = yes; then
+-
+-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+-
+-fi
+-
+-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+-		  inttypes.h stdint.h unistd.h
+-do :
+-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+-"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+-for ac_header in dlfcn.h
+-do :
+-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+-"
+-if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_DLFCN_H 1
+-_ACEOF
+-
+-fi
+-
+-done
+-
+-
+-
+ 
+ 
+ # Set options
+--- a/src/config.h.in
++++ b/src/config.h.in
+@@ -207,6 +207,9 @@
+ /* Define to the m4 executable name. */
+ #undef M4
+ 
++/* Define to 1 if your C compiler doesn't accept -c and -o together. */
++#undef NO_MINUS_C_MINUS_O
++
+ /* Name of package */
+ #undef PACKAGE
+ 
+@@ -239,6 +242,28 @@
+ /* Define to 1 if you have the ANSI C header files. */
+ #undef STDC_HEADERS
+ 
++/* Enable extensions on AIX 3, Interix.  */
++#ifndef _ALL_SOURCE
++# undef _ALL_SOURCE
++#endif
++/* Enable GNU extensions on systems that have them.  */
++#ifndef _GNU_SOURCE
++# undef _GNU_SOURCE
++#endif
++/* Enable threading extensions on Solaris.  */
++#ifndef _POSIX_PTHREAD_SEMANTICS
++# undef _POSIX_PTHREAD_SEMANTICS
++#endif
++/* Enable extensions on HP NonStop.  */
++#ifndef _TANDEM_SOURCE
++# undef _TANDEM_SOURCE
++#endif
++/* Enable general extensions on Solaris.  */
++#ifndef __EXTENSIONS__
++# undef __EXTENSIONS__
++#endif
++
++
+ /* Version number of package */
+ #undef VERSION
+ 
+@@ -246,6 +271,16 @@
+    `char[]'. */
+ #undef YYTEXT_POINTER
+ 
++/* Define to 1 if on MINIX. */
++#undef _MINIX
++
++/* Define to 2 if the system does not provide POSIX.1 features except with
++   this defined. */
++#undef _POSIX_1_SOURCE
++
++/* Define to 1 if you need to in order for `stat' and other things to work. */
++#undef _POSIX_SOURCE
++
+ /* Define to empty if `const' does not conform to ANSI C. */
+ #undef const
+ 
diff --git a/src/patches/glibc-localedef-no-archive.patch b/src/patches/glibc-localedef-no-archive.patch
index c4a39f6e1..40bc68dc3 100644
--- a/src/patches/glibc-localedef-no-archive.patch
+++ b/src/patches/glibc-localedef-no-archive.patch
@@ -1,11 +1,10 @@
-diff -Nrup a/localedata/Makefile b/localedata/Makefile
---- a/localedata/Makefile	2012-06-05 07:42:49.000000000 -0600
-+++ b/localedata/Makefile	2012-06-07 12:15:21.776318827 -0600
-@@ -211,6 +211,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
+--- glibc-2.27/localedata/Makefile~	2018-02-07 22:31:00.968944449 +0000
++++ glibc-2.27/localedata/Makefile	2018-02-07 22:31:26.201764894 +0000
+@@ -223,6 +223,7 @@ $(INSTALL-SUPPORTED-LOCALES): install-lo
  	echo -n '...'; \
  	input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
- 	$(LOCALEDEF) --alias-file=../intl/locale.alias \
+ 	$(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \
 +		     --no-archive \
- 		     -i locales/$$input -c -f charmaps/$$charset \
+ 		     -i locales/$$input -f charmaps/$$charset \
  		     $(addprefix --prefix=,$(install_root)) $$locale \
  	&& echo ' done'; \
diff --git a/src/patches/glibc/glibc-2.25-gcc-7.patch b/src/patches/glibc/glibc-2.25-gcc-7.patch
deleted file mode 100644
index 1e68b09d1..000000000
--- a/src/patches/glibc/glibc-2.25-gcc-7.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/malloc/hooks.c b/malloc/hooks.c
-index 4398c0a017..2c6cebc889 100644
---- a/malloc/hooks.c
-+++ b/malloc/hooks.c
-@@ -347,11 +347,18 @@ realloc_check (void *oldmem, size_t bytes, const void *caller)
-       newmem = _int_realloc (&main_arena, oldp, oldsize, nb);
-     }
- 
-+  DIAG_PUSH_NEEDS_COMMENT;
-+#if __GNUC_PREREQ (7, 0)
-+  /* GCC 7 warns about magic_p may be used uninitialized.  But we never
-+     reach here if magic_p is uninitialized.  */
-+  DIAG_IGNORE_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
-+#endif
-   /* mem2chunk_check changed the magic byte in the old chunk.
-      If newmem is NULL, then the old chunk will still be used though,
-      so we need to invert that change here.  */
-   if (newmem == NULL)
-     *magic_p ^= 0xFF;
-+  DIAG_POP_NEEDS_COMMENT;
- 
-   __libc_lock_unlock (main_arena.mutex);
- 
\ No newline at end of file
diff --git a/src/patches/hostname-rh.patch b/src/patches/hostname-rh.patch
deleted file mode 100644
index d56ae59a9..000000000
--- a/src/patches/hostname-rh.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -up hostname/Makefile.rh hostname/Makefile
---- hostname/Makefile.rh	2013-11-04 10:12:59.670379153 +0100
-+++ hostname/Makefile	2013-11-04 10:15:04.957314495 +0100
-@@ -10,21 +10,17 @@ OBJS=hostname.o
- 
- hostname: $(OBJS)
- 	$(CC) $(CFLAGS) -o $@ $(OBJS) $(LDFLAGS) -lnsl
--	ln -fs hostname dnsdomainname
--	ln -fs hostname domainname
--	ln -fs hostname ypdomainname
--	ln -fs hostname nisdomainname
- 
- install: hostname
- 	install -d ${BASEDIR}$(MANDIR)/man1
--	install -o root -g root -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1
-+	install -m 0644 hostname.1 ${BASEDIR}$(MANDIR)/man1
- 	ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/dnsdomainname.1
- 	ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/domainname.1
- 	ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/ypdomainname.1
- 	ln -fs hostname.1 ${BASEDIR}$(MANDIR)/man1/nisdomainname.1
- 
- 	install -d ${BASEDIR}$(BINDIR)
--	install -o root -g root -m 0755 hostname ${BASEDIR}$(BINDIR)
-+	install -m 0755 hostname ${BASEDIR}$(BINDIR)
- 	ln -fs hostname ${BASEDIR}$(BINDIR)/dnsdomainname
- 	ln -fs hostname ${BASEDIR}$(BINDIR)/domainname
- 	ln -fs hostname ${BASEDIR}$(BINDIR)/nisdomainname
-diff -up hostname/hostname.1.rh hostname/hostname.1
---- hostname/hostname.1.rh	2013-11-03 15:24:23.000000000 +0100
-+++ hostname/hostname.1	2013-11-04 10:12:59.670379153 +0100
-@@ -80,6 +80,28 @@ complete FQDN of the system is returned
- .B "THE FQDN"
- below).
- 
-+.LP
-+The function 
-+.BR gethostname(2)
-+is used to get the hostname.  When the 
-+.BR "hostname \-a, \-d, \-f or \-i" 
-+is called will 
-+.BR gethostbyname(3)
-+be called.  The difference in 
-+.BR gethostname(2)
-+and
-+.BR gethostbyname(3)
-+is that
-+.BR gethostbyname(3)
-+is network aware, so it consults 
-+.IR /etc/nsswitch.conf
-+and
-+.IR /etc/host.conf
-+to decide whether to read information in
-+.IR /etc/hostname
-+or
-+.IR /etc/hosts
-+
- .SS "SET NAME"
- When called with one argument or with the
- .B \-\-file
-@@ -105,8 +127,7 @@ command (see
- .B "THE FQDN"
- below).
- .LP
--The host name is usually set once at system startup in
--.I /etc/init.d/hostname.sh
-+The host name is usually set once at system startup
- (normally by reading the contents of a file which contains
- the host name, e.g.
- .IR /etc/hostname ).
diff --git a/src/patches/iproute2-4.7.0_remove_arpd.patch b/src/patches/iproute2-4.7.0_remove_arpd.patch
deleted file mode 100644
index 786c03129..000000000
--- a/src/patches/iproute2-4.7.0_remove_arpd.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff -Naur a/doc/arpd.sgml b/doc/arpd.sgml
---- a/doc/arpd.sgml
-+++ b/doc/arpd.sgml
-@@ -1,130 +0,0 @@
--<!doctype linuxdoc system>
--
--<article>
--
--<title>ARPD Daemon
--<author>Alexey Kuznetsov, <tt/kuznet@ms2.inr.ac.ru/
--<date>some_negative_number, 20 Sep 2001
--<abstract>
--<tt/arpd/ is daemon collecting gratuitous ARP information, saving
--it on local disk and feeding it to kernel on demand to avoid
--redundant broadcasting due to limited size of kernel ARP cache. 
--</abstract>
--
--
--<p><bf/Description/
--
--<p>The format of the command is:
--
--<tscreen><verb>
--       arpd OPTIONS [ INTERFACE [ INTERFACE ... ] ]
--</verb></tscreen>
--
--<p> <tt/OPTIONS/ are:
--
--<itemize>
--
--<item><tt/-l/ - dump <tt/arpd/ database to stdout and exit. Output consists
--of three columns: interface index, IP address and MAC address.
--Negative entries for dead hosts are also shown, in this case MAC address
--is replaced by word <tt/FAILED/ followed by colon and time when the fact
--that host is dead was proven the last time.
--
--<item><tt/-f FILE/  - read and load <tt/arpd/ database from <tt/FILE/
--in text format similar dumped by option <tt/-l/. Exit after load,
--probably listing resulting database, if option <tt/-l/ is also given.
--If <tt/FILE/ is <tt/-/, <tt/stdin/ is read to get ARP table.
-- 
--<item><tt/-b DATABASE/  - location of database file. Default location is
--<tt>/var/lib/arpd/arpd.db</tt>.
--
--<item><tt/-a NUMBER/ - <tt/arpd/ not only passively listens ARP on wire, but
--also send brodcast queries itself. <tt/NUMBER/ is number of such queries
--to make before destination is considered as dead. When <tt/arpd/ is started
--as kernel helper (i.e. with <tt/app_solicit/ enabled in <tt/sysctl/
--or even with option <tt/-k/) without this option and still did not learn enough
--information, you can observe 1 second gaps in service. Not fatal, but
--not good.
--
--<item><tt/-k/ - suppress sending broadcast queries by kernel. It takes
--sense together with option <tt/-a/.
--
--<item><tt/-n TIME/ - timeout of negative cache. When resolution fails <tt/arpd/
--suppresses further attempts to resolve for this period. It makes sense
--only together with option <tt/-k/. This timeout should not be too much
--longer than boot time of a typical host not supporting gratuitous ARP.
--Default value is 60 seconds.
--
--<item><tt/-R RATE/ - maximal steady rate of broadcasts sent by <tt/arpd/
--in packets per second. Default value is 1.
--
--<item><tt/-B NUMBER/ - number of broadcasts sent by <tt/arpd/ back to back.
--Default value is 3. Together with option <tt/-R/ this option allows
--to police broadcasting not to exceed <tt/B+R*T/ over any interval
--of time <tt/T/.
--
--</itemize>
--
--<p><tt/INTERFACE/ is name of networking inteface to watch.
--If no interfaces given, <tt/arpd/ monitors all the interfaces.
--In this case <tt/arpd/ does not adjust <tt/sysctl/ parameters,
--it is supposed user does this himself after <tt/arpd/ is started.
--
--
--<p> Signals
--
--<p> <tt/arpd/ exits gracefully syncing database and restoring adjusted
--<tt/sysctl/ parameters, when receives <tt/SIGINT/ or <tt/SIGTERM/.
--<tt/SIGHUP/ syncs database to disk. <tt/SIGUSR1/ sends some statistics
--to <tt/syslog/. Effect of another signals is undefined, they may corrupt
--database and leave <tt/sysctl/ parameters in an unpredictable state.
--
--<p> Note
--
--<p> In order to <tt/arpd/ be able to serve as ARP resolver, kernel must be
--compiled with the option <tt/CONFIG_ARPD/ and, in the case when interface list
--is not given on command line, variable <tt/app_solicit/
--on interfaces of interest should be set in <tt>/proc/sys/net/ipv4/neigh/*</tt>.
--If this is not made <tt/arpd/ still collects gratuitous ARP information
--in its database.
--
--<p> Examples
--
--<enum>
--<item> Start <tt/arpd/ to collect gratuitous ARP, but not messing
--with kernel functionality:
--
--<tscreen><verb>
--   arpd -b /var/tmp/arpd.db
--</verb></tscreen>
--
--<item> Look at result after some time:
--
--<tscreen><verb>
--   killall arpd
--   arpd -l -b /var/tmp/arpd.db
--</verb></tscreen>
--
--<item> To enable kernel helper, leaving leading role to kernel:
--
--<tscreen><verb>
--   arpd -b /var/tmp/arpd.db -a 1 eth0 eth1
--</verb></tscreen>
--
--<item> Completely replace kernel resolution on interfaces <tt/eth0/
--and <tt/eth1/. In this case kernel still does unicast probing to
--validate entries, but all the broadcast activity is suppressed
--and made under authority of <tt/arpd/: 
--
--<tscreen><verb>
--   arpd -b /var/tmp/arpd.db -a 3 -k eth0 eth1
--</verb></tscreen>
--
--This is mode which <tt/arpd/ is supposed to work normally.
--It is not default just to prevent occasional enabling of too aggressive
--mode occasionally.
--
--</enum>
--
--</article>
--
-diff -Naur a/Makefile b/Makefile
---- a/Makefile
-+++ b/Makefile
-@@ -9,7 +9,6 @@
- DATADIR?=$(PREFIX)/share
- DOCDIR?=$(DATADIR)/doc/iproute2
- MANDIR?=$(DATADIR)/man
--ARPDDIR?=/var/lib/arpd
- KERNEL_INCLUDE?=/usr/include
- BASH_COMPDIR?=$(DATADIR)/bash-completion/completions
- 
-@@ -62,7 +61,6 @@
- install: all
- 	install -m 0755 -d $(DESTDIR)$(SBINDIR)
- 	install -m 0755 -d $(DESTDIR)$(CONFDIR)
--	install -m 0755 -d $(DESTDIR)$(ARPDDIR)
- 	install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples
- 	install -m 0755 -d $(DESTDIR)$(DOCDIR)/examples/diffserv
- 	install -m 0644 README.iproute2+tc $(shell find examples -maxdepth 1 -type f) \
-diff -Naur a/man/man8/Makefile b/man/man8/Makefile
---- a/man/man8/Makefile
-+++ b/man/man8/Makefile
-@@ -1,6 +1,6 @@
- TARGETS = ip-address.8 ip-link.8 ip-route.8
- 
--MAN8PAGES = $(TARGETS) ip.8 arpd.8 lnstat.8 routel.8 rtacct.8 rtmon.8 rtpr.8 ss.8 \
-+MAN8PAGES = $(TARGETS) ip.8  lnstat.8 routel.8 rtacct.8 rtmon.8 rtpr.8 ss.8 \
- 	tc.8 tc-bfifo.8 tc-bpf.8 tc-cbq.8 tc-cbq-details.8 tc-choke.8 tc-codel.8 \
- 	tc-fq.8 \
- 	tc-drr.8 tc-ematch.8 tc-fq_codel.8 tc-hfsc.8 tc-htb.8 tc-pie.8 \
-diff -Naur a/tc/Makefile b/tc/Makefile
---- a/tc/Makefile
-+++ b/tc/Makefile
-@@ -89,7 +89,7 @@
- 	CFLAGS += -DTC_CONFIG_XT_H
- 	TCSO += m_xt_old.so
-     else
--      TCMODULES += m_ipt.o
-+      TCMODULES += 
-     endif
-   endif
- endif
diff --git a/src/patches/libtirpc-1.0.2-glibc-2.26.patch b/src/patches/libtirpc-1.0.2-glibc-2.26.patch
new file mode 100644
index 000000000..6d583e614
--- /dev/null
+++ b/src/patches/libtirpc-1.0.2-glibc-2.26.patch
@@ -0,0 +1,12 @@
+diff --git a/src/xdr_sizeof.c b/src/xdr_sizeof.c
+index d23fbd1..79d6707 100644
+--- a/src/xdr_sizeof.c
++++ b/src/xdr_sizeof.c
+@@ -39,6 +39,7 @@
+ #include <rpc/xdr.h>
+ #include <sys/types.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ #include "un-namespace.h"
+ 
+ /* ARGSUSED */
diff --git a/src/patches/make-4.2.1-glob-SEGV.patch b/src/patches/make-4.2.1-glob-SEGV.patch
new file mode 100644
index 000000000..911e3152e
--- /dev/null
+++ b/src/patches/make-4.2.1-glob-SEGV.patch
@@ -0,0 +1,67 @@
+From 193f1e81edd6b1b56b0eb0ff8aa4b41c7b4257b4 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Sun, 24 Sep 2017 09:12:58 -0400
+Subject: glob: Do not assume glibc glob internals.
+
+It has been proposed that glibc glob start using gl_lstat,
+which the API allows it to do.  GNU 'make' should not get in
+the way of this.  See:
+https://sourceware.org/ml/libc-alpha/2017-09/msg00409.html
+
+* dir.c (local_lstat): New function, like local_stat.
+(dir_setup_glob): Use it to initialize gl_lstat too, as the API
+requires.
+---
+ dir.c | 29 +++++++++++++++++++++++++++--
+ 1 file changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/dir.c b/dir.c
+index adbb8a9..c343e4c 100644
+--- a/dir.c
++++ b/dir.c
+@@ -1299,15 +1299,40 @@ local_stat (const char *path, struct stat *buf)
+ }
+ #endif
+ 
++/* Similarly for lstat.  */
++#if !defined(lstat) && !defined(WINDOWS32) || defined(VMS)
++# ifndef VMS
++#  ifndef HAVE_SYS_STAT_H
++int lstat (const char *path, struct stat *sbuf);
++#  endif
++# else
++    /* We are done with the fake lstat.  Go back to the real lstat */
++#   ifdef lstat
++#     undef lstat
++#   endif
++# endif
++# define local_lstat lstat
++#elif defined(WINDOWS32)
++/* Windows doesn't support lstat().  */
++# define local_lstat local_stat
++#else
++static int
++local_lstat (const char *path, struct stat *buf)
++{
++  int e;
++  EINTRLOOP (e, lstat (path, buf));
++  return e;
++}
++#endif
++
+ void
+ dir_setup_glob (glob_t *gl)
+ {
+   gl->gl_opendir = open_dirstream;
+   gl->gl_readdir = read_dirstream;
+   gl->gl_closedir = free;
++  gl->gl_lstat = local_lstat;
+   gl->gl_stat = local_stat;
+-  /* We don't bother setting gl_lstat, since glob never calls it.
+-     The slot is only there for compatibility with 4.4 BSD.  */
+ }
+ 
+ void
+-- 
+cgit v1.0-41-gc330
+
diff --git a/src/patches/make-4.2.1-glob-build-fix.patch b/src/patches/make-4.2.1-glob-build-fix.patch
new file mode 100644
index 000000000..d5303b053
--- /dev/null
+++ b/src/patches/make-4.2.1-glob-build-fix.patch
@@ -0,0 +1,11 @@
+--- make-4.2.1/configure.ac~	2018-02-08 12:31:17.105922978 +0000
++++ make-4.2.1/configure.ac	2018-02-08 12:31:35.249509647 +0000
+@@ -402,7 +402,7 @@ AC_CACHE_CHECK([if system libc has GNU g
+ #define GLOB_INTERFACE_VERSION 1
+ #if !defined _LIBC && defined __GNU_LIBRARY__ && __GNU_LIBRARY__ > 1
+ # include <gnu-versions.h>
+-# if _GNU_GLOB_INTERFACE_VERSION == GLOB_INTERFACE_VERSION
++# if _GNU_GLOB_INTERFACE_VERSION >= GLOB_INTERFACE_VERSION
+    gnu glob
+ # endif
+ #endif],
diff --git a/src/patches/nfs-1.3.3-glibc-stdint.patch b/src/patches/nfs-1.3.3-glibc-stdint.patch
new file mode 100644
index 000000000..9a65cd1f8
--- /dev/null
+++ b/src/patches/nfs-1.3.3-glibc-stdint.patch
@@ -0,0 +1,10 @@
+--- nfs-utils-1.3.3/support/nsm/rpc.c~	2018-02-11 17:01:31.137039166 +0000
++++ nfs-utils-1.3.3/support/nsm/rpc.c	2018-02-11 17:01:45.683511380 +0000
+@@ -40,6 +40,7 @@
+ 
+ #include <time.h>
+ #include <stdbool.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff --git a/src/patches/postfix-2.10.0-build_with_kernel4x.patch b/src/patches/postfix-2.10.0-build_with_kernel4x.patch
deleted file mode 100644
index 73b685996..000000000
--- a/src/patches/postfix-2.10.0-build_with_kernel4x.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur postfix-2.10.0.org/makedefs postfix-2.10.0/makedefs
---- postfix-2.10.0.org/makedefs	2013-02-04 02:33:13.000000000 +0100
-+++ postfix-2.10.0/makedefs	2017-02-08 10:10:56.713314716 +0100
-@@ -347,7 +347,7 @@
- 		       fi;;
- 		esac
- 		;;
--    Linux.3*)	SYSTYPE=LINUX3
-+    Linux.[34]*)	SYSTYPE=LINUX3
- 		case "$CCARGS" in
- 		 *-DNO_DB*) ;;
- 		 *) if [ -f /usr/include/db.h ]
diff --git a/src/patches/qemu-2.11.0-memfd-collision.patch b/src/patches/qemu-2.11.0-memfd-collision.patch
new file mode 100644
index 000000000..62e8d3800
--- /dev/null
+++ b/src/patches/qemu-2.11.0-memfd-collision.patch
@@ -0,0 +1,57 @@
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.burton@intel.com>
+
+From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Tue, 28 Nov 2017 11:51:27 +0100
+Subject: [PATCH] memfd: fix configure test
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Recent glibc added memfd_create in sys/mman.h.  This conflicts with
+the definition in util/memfd.c:
+
+    /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration
+
+Fix the configure test, and remove the sys/memfd.h inclusion since the
+file actually does not exist---it is a typo in the memfd_create(2) man
+page.
+
+Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+---
+ configure    | 2 +-
+ util/memfd.c | 4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 9c8aa5a98b..99ccc1725a 100755
+--- a/configure
++++ b/configure
+@@ -3923,7 +3923,7 @@ fi
+ # check if memfd is supported
+ memfd=no
+ cat > $TMPC << EOF
+-#include <sys/memfd.h>
++#include <sys/mman.h>
+ 
+ int main(void)
+ {
+diff --git a/util/memfd.c b/util/memfd.c
+index 4571d1aba8..412e94a405 100644
+--- a/util/memfd.c
++++ b/util/memfd.c
+@@ -31,9 +31,7 @@
+ 
+ #include "qemu/memfd.h"
+ 
+-#ifdef CONFIG_MEMFD
+-#include <sys/memfd.h>
+-#elif defined CONFIG_LINUX
++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
+ #include <sys/syscall.h>
+ #include <asm/unistd.h>
+ 
+-- 
+2.11.0
diff --git a/src/setup/main.c b/src/setup/main.c
index 33f4d2142..adb98a231 100644
--- a/src/setup/main.c
+++ b/src/setup/main.c
@@ -25,7 +25,7 @@ struct knic knics[20] = { { "" , "" , "" , "" } };
 int main(int argc, char *argv[])
 {
 	int choice;
-	char *sections[11]; /* need to fill this out AFTER knowning lang */
+	char *sections[8]; /* need to fill this out AFTER knowning lang */
 	int rc;
 	struct keyvalue *kv;
 	char lang[STRING_SIZE] = "en_US.utf8";
@@ -69,10 +69,9 @@ int main(int argc, char *argv[])
 	sections[2] = _("Hostname");
 	sections[3] = _("Domain name");
 	sections[4] = _("Networking");
-	sections[5] = _("ISDN");
-	sections[6] = _("'root' password");
-	sections[7] = _("'admin' password");
-	sections[8] = NULL;
+	sections[5] = _("'root' password");
+	sections[6] = _("'admin' password");
+	sections[7] = NULL;
 
 	newtInit();
 	newtCls();
@@ -124,14 +123,10 @@ int main(int argc, char *argv[])
 					break;
 				
 				case 5:
-					handleisdn();
-					break;
-
-				case 6:
 					handlerootpassword();
 					break;
 					
-				case 7:
+				case 6:
 					handleadminpassword();
 					break;
 		
@@ -154,8 +149,6 @@ int main(int argc, char *argv[])
 			goto EXIT;
 		if (!(handleadminpassword()))
 			goto EXIT;
-		if (!(handleisdn()))
-			goto EXIT;
 		if (!(handlenetworking()))
 			goto EXIT;
 		if (!(handledhcp()))
diff --git a/src/setup/misc.c b/src/setup/misc.c
index 3b258e0f1..a31b1d8a8 100644
--- a/src/setup/misc.c
+++ b/src/setup/misc.c
@@ -139,13 +139,3 @@ int writehostsfiles(void)
 	
 	return 1;
 }	
-
-int handleisdn(void)
-{
-	char command[STRING_SIZE];
-	sprintf(command, "/etc/rc.d/init.d/mISDN config");
-	if (runcommandwithstatus(command, _("ISDN"), _("Scanning and configuring ISDN devices."), NULL))
-		errorbox(_("Unable to scan for ISDN devices."));
-	// Need to write some lines that count the cards and say the names...
-	return 1;
-}
diff --git a/src/setup/setup.h b/src/setup/setup.h
index a368b78ae..e44bb1c7a 100644
--- a/src/setup/setup.h
+++ b/src/setup/setup.h
@@ -32,7 +32,6 @@ int handleadminpassword(void);
 
 /* misc.c */
 int writehostsfiles(void);
-int handleisdn(void);
 
 /* keymap.c */
 int handlekeymap(void);