Merge remote-tracking branch 'origin/next' into install-raid

2026-05-03 00:32:54 +02:00 · 2014-08-20 21:46:49 +02:00
parent 8cd364b41c d2a08170b9
commit aa7f55b2df
273 changed files with 32959 additions and 2113 deletions
--- a/config/rootfiles/common/armv5tel/gmp
+++ b/config/rootfiles/common/armv5tel/gmp
@@ -1,21 +1,15 @@
 #usr/include/gmp.h
 #usr/include/gmpxx.h
-#usr/include/mp.h
 #usr/lib/libgmp.a
 #usr/lib/libgmp.la
 #usr/lib/libgmp.so
 usr/lib/libgmp.so.10
-usr/lib/libgmp.so.10.0.5
+usr/lib/libgmp.so.10.2.0
 #usr/lib/libgmpxx.a
 #usr/lib/libgmpxx.la
 #usr/lib/libgmpxx.so
 usr/lib/libgmpxx.so.4
-usr/lib/libgmpxx.so.4.2.5
-#usr/lib/libmp.a
-#usr/lib/libmp.la
-#usr/lib/libmp.so
-usr/lib/libmp.so.3
-usr/lib/libmp.so.3.1.25
+usr/lib/libgmpxx.so.4.4.0
 #usr/share/info/gmp.info
 #usr/share/info/gmp.info-1
 #usr/share/info/gmp.info-2
--- a/config/rootfiles/common/armv5tel/initscripts
+++ b/config/rootfiles/common/armv5tel/initscripts
@@ -24,6 +24,7 @@ etc/rc.d/init.d/console
 #etc/rc.d/init.d/cyrus-imapd
 #etc/rc.d/init.d/cyrus-sasl
 etc/rc.d/init.d/dhcp
+etc/rc.d/init.d/dhcrelay
 etc/rc.d/init.d/dnsmasq
 etc/rc.d/init.d/fcron
 #etc/rc.d/init.d/fetchmail
@@ -71,13 +72,13 @@ etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq
 etc/rc.d/init.d/networking/red.down/10-ipsec
 etc/rc.d/init.d/networking/red.down/10-miniupnpd
 etc/rc.d/init.d/networking/red.down/10-ovpn
-etc/rc.d/init.d/networking/red.down/20-RL-firewall
+etc/rc.d/init.d/networking/red.down/20-firewall
 #etc/rc.d/init.d/networking/red.up
 etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
 etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
 etc/rc.d/init.d/networking/red.up/10-miniupnpd
 etc/rc.d/init.d/networking/red.up/10-multicast
-etc/rc.d/init.d/networking/red.up/20-RL-firewall
+etc/rc.d/init.d/networking/red.up/20-firewall
 etc/rc.d/init.d/networking/red.up/23-RS-snort
 etc/rc.d/init.d/networking/red.up/24-RS-qos
 etc/rc.d/init.d/networking/red.up/27-RS-squid
@@ -129,7 +130,6 @@ etc/rc.d/init.d/upnpd
 #etc/rc.d/init.d/vdradmin
 #etc/rc.d/init.d/vsftpd
 #etc/rc.d/init.d/watchdog
-#etc/rc.d/init.d/winbind
 etc/rc.d/init.d/wlanclient
 #etc/rc.d/init.d/xinetd
 #etc/rc.d/rc0.d
--- a/config/rootfiles/common/batctl
+++ b/config/rootfiles/common/batctl
@@ -0,0 +1,2 @@
+usr/sbin/batctl
+#usr/share/man/man8/batctl.8
--- a/config/rootfiles/common/bind
+++ b/config/rootfiles/common/bind
@@ -1,8 +1,9 @@
+etc/trusted-key.key
 usr/bin/dig
 usr/bin/host
 usr/bin/nslookup
 usr/bin/nsupdate
-#usr/man/man1/dig.1
-#usr/man/man1/host.1
-#usr/man/man1/nslookup.1
-#usr/man/man8/nsupdate.8
+#usr/share/man/man1/dig.1
+#usr/share/man/man1/host.1
+#usr/share/man/man1/nslookup.1
+#usr/share/man/man1/nsupdate.1
--- a/config/rootfiles/common/boost
+++ b/config/rootfiles/common/boost
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -117,6 +117,7 @@ var/ipfire/modem
 #var/ipfire/modem/defaults
 #var/ipfire/modem/settings
 var/ipfire/modem-lib.pl
+var/ipfire/network-functions.pl
 var/ipfire/net-traffic
 #var/ipfire/net-traffic/net-traffic-admin.pl
 #var/ipfire/net-traffic/net-traffic-lib.pl
--- a/config/rootfiles/common/ddns
+++ b/config/rootfiles/common/ddns
@@ -0,0 +1,66 @@
+usr/bin/ddns
+usr/lib/python2.7/site-packages/ddns
+usr/lib/python2.7/site-packages/ddns/__init__.py
+usr/lib/python2.7/site-packages/ddns/__init__.pyc
+usr/lib/python2.7/site-packages/ddns/__init__.pyo
+usr/lib/python2.7/site-packages/ddns/__version__.py
+usr/lib/python2.7/site-packages/ddns/__version__.pyc
+usr/lib/python2.7/site-packages/ddns/__version__.pyo
+usr/lib/python2.7/site-packages/ddns/errors.py
+usr/lib/python2.7/site-packages/ddns/errors.pyc
+usr/lib/python2.7/site-packages/ddns/errors.pyo
+usr/lib/python2.7/site-packages/ddns/i18n.py
+usr/lib/python2.7/site-packages/ddns/i18n.pyc
+usr/lib/python2.7/site-packages/ddns/i18n.pyo
+usr/lib/python2.7/site-packages/ddns/providers.py
+usr/lib/python2.7/site-packages/ddns/providers.pyc
+usr/lib/python2.7/site-packages/ddns/providers.pyo
+usr/lib/python2.7/site-packages/ddns/system.py
+usr/lib/python2.7/site-packages/ddns/system.pyc
+usr/lib/python2.7/site-packages/ddns/system.pyo
+#usr/share/doc/ddns
+#usr/share/doc/ddns/COPYING
+#usr/share/locale/ar/LC_MESSAGES/ddns.mo
+#usr/share/locale/ca/LC_MESSAGES/ddns.mo
+#usr/share/locale/cs_CZ
+#usr/share/locale/cs_CZ/LC_MESSAGES
+#usr/share/locale/cs_CZ/LC_MESSAGES/ddns.mo
+#usr/share/locale/da/LC_MESSAGES/ddns.mo
+#usr/share/locale/de/LC_MESSAGES/ddns.mo
+#usr/share/locale/el_GR
+#usr/share/locale/el_GR/LC_MESSAGES
+#usr/share/locale/el_GR/LC_MESSAGES/ddns.mo
+#usr/share/locale/es/LC_MESSAGES/ddns.mo
+#usr/share/locale/fa/LC_MESSAGES/ddns.mo
+#usr/share/locale/fr/LC_MESSAGES/ddns.mo
+#usr/share/locale/hu/LC_MESSAGES/ddns.mo
+#usr/share/locale/id/LC_MESSAGES/ddns.mo
+#usr/share/locale/it/LC_MESSAGES/ddns.mo
+#usr/share/locale/ja/LC_MESSAGES/ddns.mo
+#usr/share/locale/km_KH
+#usr/share/locale/km_KH/LC_MESSAGES
+#usr/share/locale/km_KH/LC_MESSAGES/ddns.mo
+#usr/share/locale/nl/LC_MESSAGES/ddns.mo
+#usr/share/locale/pl/LC_MESSAGES/ddns.mo
+#usr/share/locale/pt_BR/LC_MESSAGES/ddns.mo
+#usr/share/locale/pt_PT/LC_MESSAGES/ddns.mo
+#usr/share/locale/ro_RO
+#usr/share/locale/ro_RO/LC_MESSAGES
+#usr/share/locale/ro_RO/LC_MESSAGES/ddns.mo
+#usr/share/locale/ru/LC_MESSAGES/ddns.mo
+#usr/share/locale/sq/LC_MESSAGES/ddns.mo
+#usr/share/locale/sv/LC_MESSAGES/ddns.mo
+#usr/share/locale/th/LC_MESSAGES/ddns.mo
+#usr/share/locale/tk
+#usr/share/locale/tk/LC_MESSAGES
+#usr/share/locale/tk/LC_MESSAGES/ddns.mo
+#usr/share/locale/tr/LC_MESSAGES/ddns.mo
+#usr/share/locale/uk/LC_MESSAGES/ddns.mo
+#usr/share/locale/uz@Latn
+#usr/share/locale/uz@Latn/LC_MESSAGES
+#usr/share/locale/uz@Latn/LC_MESSAGES/ddns.mo
+#usr/share/locale/vi/LC_MESSAGES/ddns.mo
+#usr/share/locale/zh
+#usr/share/locale/zh/LC_MESSAGES
+#usr/share/locale/zh/LC_MESSAGES/ddns.mo
+#var/ipfire/ddns/ddns.conf.sample
--- a/config/rootfiles/common/dhcp
+++ b/config/rootfiles/common/dhcp
@@ -21,7 +21,7 @@ etc/dhcp/dhcpd.conf
 #usr/lib/libomapi.a
 #usr/sbin/dhclient
 usr/sbin/dhcpd
-#usr/sbin/dhcrelay
+usr/sbin/dhcrelay
 #usr/share/man/man1/omshell.1
 #usr/share/man/man3/dhcpctl.3
 #usr/share/man/man3/omapi.3
--- a/config/rootfiles/common/i586/gmp
+++ b/config/rootfiles/common/i586/gmp
@@ -0,0 +1,17 @@
+#usr/include/gmp.h
+#usr/include/gmpxx.h
+#usr/lib/libgmp.a
+#usr/lib/libgmp.la
+#usr/lib/libgmp.so
+usr/lib/libgmp.so.10
+usr/lib/libgmp.so.10.2.0
+#usr/lib/libgmpxx.a
+#usr/lib/libgmpxx.la
+#usr/lib/libgmpxx.so
+usr/lib/libgmpxx.so.4
+usr/lib/libgmpxx.so.4.4.0
+usr/lib/sse2/libgmp.so.10
+usr/lib/sse2/libgmp.so.10.2.0
+#usr/share/info/gmp.info
+#usr/share/info/gmp.info-1
+#usr/share/info/gmp.info-2
--- a/config/rootfiles/common/i586/initscripts
+++ b/config/rootfiles/common/i586/initscripts
@@ -26,6 +26,7 @@ etc/rc.d/init.d/console
 #etc/rc.d/init.d/cyrus-imapd
 #etc/rc.d/init.d/cyrus-sasl
 etc/rc.d/init.d/dhcp
+etc/rc.d/init.d/dhcrelay
 etc/rc.d/init.d/dnsmasq
 etc/rc.d/init.d/fcron
 #etc/rc.d/init.d/fetchmail
@@ -73,13 +74,13 @@ etc/rc.d/init.d/networking/red.down/05-RS-dnsmasq
 etc/rc.d/init.d/networking/red.down/10-ipsec
 etc/rc.d/init.d/networking/red.down/10-miniupnpd
 etc/rc.d/init.d/networking/red.down/10-ovpn
-etc/rc.d/init.d/networking/red.down/20-RL-firewall
+etc/rc.d/init.d/networking/red.down/20-firewall
 #etc/rc.d/init.d/networking/red.up
 etc/rc.d/init.d/networking/red.up/01-conntrack-cleanup
 etc/rc.d/init.d/networking/red.up/05-RS-dnsmasq
 etc/rc.d/init.d/networking/red.up/10-miniupnpd
 etc/rc.d/init.d/networking/red.up/10-multicast
-etc/rc.d/init.d/networking/red.up/20-RL-firewall
+etc/rc.d/init.d/networking/red.up/20-firewall
 etc/rc.d/init.d/networking/red.up/23-RS-snort
 etc/rc.d/init.d/networking/red.up/24-RS-qos
 etc/rc.d/init.d/networking/red.up/27-RS-squid
@@ -132,7 +133,6 @@ etc/rc.d/init.d/upnpd
 #etc/rc.d/init.d/vdradmin
 #etc/rc.d/init.d/vsftpd
 #etc/rc.d/init.d/watchdog
-#etc/rc.d/init.d/winbind
 etc/rc.d/init.d/wlanclient
 #etc/rc.d/init.d/xinetd
 #etc/rc.d/rc0.d
--- a/config/rootfiles/common/libgcrypt
+++ b/config/rootfiles/common/libgcrypt
@@ -0,0 +1,14 @@
+#usr/bin/dumpsexp
+#usr/bin/hmac256
+#usr/bin/libgcrypt-config
+#usr/bin/mpicalc
+#usr/include/gcrypt.h
+#usr/lib/libgcrypt.la
+#usr/lib/libgcrypt.so
+usr/lib/libgcrypt.so.20
+usr/lib/libgcrypt.so.20.0.1
+#usr/share/aclocal/libgcrypt.m4
+#usr/share/info/gcrypt.info
+#usr/share/info/gcrypt.info-1
+#usr/share/info/gcrypt.info-2
+#usr/share/man/man1/hmac256.1
--- a/config/rootfiles/common/libgpg-error
+++ b/config/rootfiles/common/libgpg-error
@@ -0,0 +1,31 @@
+usr/bin/gpg-error
+#usr/bin/gpg-error-config
+#usr/include/gpg-error.h
+#usr/lib/libgpg-error.la
+#usr/lib/libgpg-error.so
+usr/lib/libgpg-error.so.0
+usr/lib/libgpg-error.so.0.11.0
+#usr/share/aclocal/gpg-error.m4
+#usr/share/common-lisp
+#usr/share/common-lisp/source
+#usr/share/common-lisp/source/gpg-error
+#usr/share/common-lisp/source/gpg-error/gpg-error-codes.lisp
+#usr/share/common-lisp/source/gpg-error/gpg-error-package.lisp
+#usr/share/common-lisp/source/gpg-error/gpg-error.asd
+#usr/share/common-lisp/source/gpg-error/gpg-error.lisp
+#usr/share/locale/cs/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/da/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/de/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/eo
+#usr/share/locale/eo/LC_MESSAGES
+#usr/share/locale/eo/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/fr/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/it/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/ja/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/nl/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/pl/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/sv/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/uk/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/vi/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/zh_CN/LC_MESSAGES/libgpg-error.mo
--- a/config/rootfiles/common/libnl-3
+++ b/config/rootfiles/common/libnl-3
@@ -0,0 +1,204 @@
+#etc/libnl
+etc/libnl/classid
+etc/libnl/pktloc
+#usr/include/libnl3
+#usr/include/libnl3/netlink
+#usr/include/libnl3/netlink/addr.h
+#usr/include/libnl3/netlink/attr.h
+#usr/include/libnl3/netlink/cache-api.h
+#usr/include/libnl3/netlink/cache.h
+#usr/include/libnl3/netlink/cli
+#usr/include/libnl3/netlink/cli/addr.h
+#usr/include/libnl3/netlink/cli/class.h
+#usr/include/libnl3/netlink/cli/cls.h
+#usr/include/libnl3/netlink/cli/ct.h
+#usr/include/libnl3/netlink/cli/exp.h
+#usr/include/libnl3/netlink/cli/link.h
+#usr/include/libnl3/netlink/cli/neigh.h
+#usr/include/libnl3/netlink/cli/qdisc.h
+#usr/include/libnl3/netlink/cli/route.h
+#usr/include/libnl3/netlink/cli/rule.h
+#usr/include/libnl3/netlink/cli/tc.h
+#usr/include/libnl3/netlink/cli/utils.h
+#usr/include/libnl3/netlink/data.h
+#usr/include/libnl3/netlink/errno.h
+#usr/include/libnl3/netlink/fib_lookup
+#usr/include/libnl3/netlink/fib_lookup/lookup.h
+#usr/include/libnl3/netlink/fib_lookup/request.h
+#usr/include/libnl3/netlink/genl
+#usr/include/libnl3/netlink/genl/ctrl.h
+#usr/include/libnl3/netlink/genl/family.h
+#usr/include/libnl3/netlink/genl/genl.h
+#usr/include/libnl3/netlink/genl/mngt.h
+#usr/include/libnl3/netlink/handlers.h
+#usr/include/libnl3/netlink/hash.h
+#usr/include/libnl3/netlink/hashtable.h
+#usr/include/libnl3/netlink/idiag
+#usr/include/libnl3/netlink/idiag/idiagnl.h
+#usr/include/libnl3/netlink/idiag/meminfo.h
+#usr/include/libnl3/netlink/idiag/msg.h
+#usr/include/libnl3/netlink/idiag/req.h
+#usr/include/libnl3/netlink/idiag/vegasinfo.h
+#usr/include/libnl3/netlink/list.h
+#usr/include/libnl3/netlink/msg.h
+#usr/include/libnl3/netlink/netfilter
+#usr/include/libnl3/netlink/netfilter/ct.h
+#usr/include/libnl3/netlink/netfilter/exp.h
+#usr/include/libnl3/netlink/netfilter/log.h
+#usr/include/libnl3/netlink/netfilter/log_msg.h
+#usr/include/libnl3/netlink/netfilter/netfilter.h
+#usr/include/libnl3/netlink/netfilter/nfnl.h
+#usr/include/libnl3/netlink/netfilter/queue.h
+#usr/include/libnl3/netlink/netfilter/queue_msg.h
+#usr/include/libnl3/netlink/netlink-compat.h
+#usr/include/libnl3/netlink/netlink-kernel.h
+#usr/include/libnl3/netlink/netlink.h
+#usr/include/libnl3/netlink/object-api.h
+#usr/include/libnl3/netlink/object.h
+#usr/include/libnl3/netlink/route
+#usr/include/libnl3/netlink/route/act
+#usr/include/libnl3/netlink/route/act/mirred.h
+#usr/include/libnl3/netlink/route/action.h
+#usr/include/libnl3/netlink/route/addr.h
+#usr/include/libnl3/netlink/route/class.h
+#usr/include/libnl3/netlink/route/classifier.h
+#usr/include/libnl3/netlink/route/cls
+#usr/include/libnl3/netlink/route/cls/basic.h
+#usr/include/libnl3/netlink/route/cls/cgroup.h
+#usr/include/libnl3/netlink/route/cls/ematch
+#usr/include/libnl3/netlink/route/cls/ematch.h
+#usr/include/libnl3/netlink/route/cls/ematch/cmp.h
+#usr/include/libnl3/netlink/route/cls/ematch/meta.h
+#usr/include/libnl3/netlink/route/cls/ematch/nbyte.h
+#usr/include/libnl3/netlink/route/cls/ematch/text.h
+#usr/include/libnl3/netlink/route/cls/fw.h
+#usr/include/libnl3/netlink/route/cls/police.h
+#usr/include/libnl3/netlink/route/cls/u32.h
+#usr/include/libnl3/netlink/route/link
+#usr/include/libnl3/netlink/route/link.h
+#usr/include/libnl3/netlink/route/link/api.h
+#usr/include/libnl3/netlink/route/link/bonding.h
+#usr/include/libnl3/netlink/route/link/bridge.h
+#usr/include/libnl3/netlink/route/link/can.h
+#usr/include/libnl3/netlink/route/link/inet.h
+#usr/include/libnl3/netlink/route/link/info-api.h
+#usr/include/libnl3/netlink/route/link/ip6tnl.h
+#usr/include/libnl3/netlink/route/link/ipgre.h
+#usr/include/libnl3/netlink/route/link/ipip.h
+#usr/include/libnl3/netlink/route/link/ipvti.h
+#usr/include/libnl3/netlink/route/link/macvlan.h
+#usr/include/libnl3/netlink/route/link/sit.h
+#usr/include/libnl3/netlink/route/link/veth.h
+#usr/include/libnl3/netlink/route/link/vlan.h
+#usr/include/libnl3/netlink/route/link/vxlan.h
+#usr/include/libnl3/netlink/route/neighbour.h
+#usr/include/libnl3/netlink/route/neightbl.h
+#usr/include/libnl3/netlink/route/nexthop.h
+#usr/include/libnl3/netlink/route/pktloc.h
+#usr/include/libnl3/netlink/route/qdisc
+#usr/include/libnl3/netlink/route/qdisc.h
+#usr/include/libnl3/netlink/route/qdisc/cbq.h
+#usr/include/libnl3/netlink/route/qdisc/dsmark.h
+#usr/include/libnl3/netlink/route/qdisc/fifo.h
+#usr/include/libnl3/netlink/route/qdisc/fq_codel.h
+#usr/include/libnl3/netlink/route/qdisc/htb.h
+#usr/include/libnl3/netlink/route/qdisc/netem.h
+#usr/include/libnl3/netlink/route/qdisc/plug.h
+#usr/include/libnl3/netlink/route/qdisc/prio.h
+#usr/include/libnl3/netlink/route/qdisc/red.h
+#usr/include/libnl3/netlink/route/qdisc/sfq.h
+#usr/include/libnl3/netlink/route/qdisc/tbf.h
+#usr/include/libnl3/netlink/route/route.h
+#usr/include/libnl3/netlink/route/rtnl.h
+#usr/include/libnl3/netlink/route/rule.h
+#usr/include/libnl3/netlink/route/tc-api.h
+#usr/include/libnl3/netlink/route/tc.h
+#usr/include/libnl3/netlink/socket.h
+#usr/include/libnl3/netlink/types.h
+#usr/include/libnl3/netlink/utils.h
+#usr/include/libnl3/netlink/version.h
+#usr/lib/libnl
+#usr/lib/libnl-3.a
+#usr/lib/libnl-3.la
+#usr/lib/libnl-3.so
+usr/lib/libnl-3.so.200
+usr/lib/libnl-3.so.200.20.0
+#usr/lib/libnl-cli-3.a
+#usr/lib/libnl-cli-3.la
+#usr/lib/libnl-cli-3.so
+usr/lib/libnl-cli-3.so.200
+usr/lib/libnl-cli-3.so.200.20.0
+#usr/lib/libnl-genl-3.a
+#usr/lib/libnl-genl-3.la
+#usr/lib/libnl-genl-3.so
+usr/lib/libnl-genl-3.so.200
+usr/lib/libnl-genl-3.so.200.20.0
+#usr/lib/libnl-idiag-3.a
+#usr/lib/libnl-idiag-3.la
+#usr/lib/libnl-idiag-3.so
+usr/lib/libnl-idiag-3.so.200
+usr/lib/libnl-idiag-3.so.200.20.0
+#usr/lib/libnl-nf-3.a
+#usr/lib/libnl-nf-3.la
+#usr/lib/libnl-nf-3.so
+usr/lib/libnl-nf-3.so.200
+usr/lib/libnl-nf-3.so.200.20.0
+#usr/lib/libnl-route-3.a
+#usr/lib/libnl-route-3.la
+#usr/lib/libnl-route-3.so
+usr/lib/libnl-route-3.so.200
+usr/lib/libnl-route-3.so.200.20.0
+#usr/lib/libnl/cli
+#usr/lib/libnl/cli/cls
+#usr/lib/libnl/cli/cls/basic.a
+#usr/lib/libnl/cli/cls/basic.la
+usr/lib/libnl/cli/cls/basic.so
+#usr/lib/libnl/cli/cls/cgroup.a
+#usr/lib/libnl/cli/cls/cgroup.la
+usr/lib/libnl/cli/cls/cgroup.so
+#usr/lib/libnl/cli/qdisc
+#usr/lib/libnl/cli/qdisc/bfifo.a
+#usr/lib/libnl/cli/qdisc/bfifo.la
+usr/lib/libnl/cli/qdisc/bfifo.so
+#usr/lib/libnl/cli/qdisc/blackhole.a
+#usr/lib/libnl/cli/qdisc/blackhole.la
+usr/lib/libnl/cli/qdisc/blackhole.so
+#usr/lib/libnl/cli/qdisc/fq_codel.a
+#usr/lib/libnl/cli/qdisc/fq_codel.la
+usr/lib/libnl/cli/qdisc/fq_codel.so
+#usr/lib/libnl/cli/qdisc/htb.a
+#usr/lib/libnl/cli/qdisc/htb.la
+usr/lib/libnl/cli/qdisc/htb.so
+#usr/lib/libnl/cli/qdisc/ingress.a
+#usr/lib/libnl/cli/qdisc/ingress.la
+usr/lib/libnl/cli/qdisc/ingress.so
+#usr/lib/libnl/cli/qdisc/pfifo.a
+#usr/lib/libnl/cli/qdisc/pfifo.la
+usr/lib/libnl/cli/qdisc/pfifo.so
+#usr/lib/libnl/cli/qdisc/plug.a
+#usr/lib/libnl/cli/qdisc/plug.la
+usr/lib/libnl/cli/qdisc/plug.so
+#usr/lib/pkgconfig/libnl-3.0.pc
+#usr/lib/pkgconfig/libnl-cli-3.0.pc
+#usr/lib/pkgconfig/libnl-genl-3.0.pc
+#usr/lib/pkgconfig/libnl-nf-3.0.pc
+#usr/lib/pkgconfig/libnl-route-3.0.pc
+#usr/sbin/genl-ctrl-list
+usr/sbin/nl-class-add
+usr/sbin/nl-class-delete
+usr/sbin/nl-class-list
+usr/sbin/nl-classid-lookup
+usr/sbin/nl-cls-add
+usr/sbin/nl-cls-delete
+usr/sbin/nl-cls-list
+usr/sbin/nl-link-list
+usr/sbin/nl-pktloc-lookup
+usr/sbin/nl-qdisc-add
+usr/sbin/nl-qdisc-delete
+usr/sbin/nl-qdisc-list
+#usr/share/man/man8/genl-ctrl-list.8
+#usr/share/man/man8/nl-classid-lookup.8
+#usr/share/man/man8/nl-pktloc-lookup.8
+#usr/share/man/man8/nl-qdisc-add.8
+#usr/share/man/man8/nl-qdisc-delete.8
+#usr/share/man/man8/nl-qdisc-list.8
--- a/config/rootfiles/common/mpfr
+++ b/config/rootfiles/common/mpfr
@@ -3,13 +3,13 @@
 #usr/lib/libmpfr.a
 #usr/lib/libmpfr.la
 #usr/lib/libmpfr.so
-usr/lib/libmpfr.so.1
-usr/lib/libmpfr.so.1.2.2
+usr/lib/libmpfr.so.4
+usr/lib/libmpfr.so.4.1.2
 #usr/share/doc/mpfr
 #usr/share/doc/mpfr/AUTHORS
 #usr/share/doc/mpfr/BUGS
 #usr/share/doc/mpfr/COPYING
-#usr/share/doc/mpfr/COPYING.LIB
+#usr/share/doc/mpfr/COPYING.LESSER
 #usr/share/doc/mpfr/FAQ.html
 #usr/share/doc/mpfr/NEWS
 #usr/share/doc/mpfr/TODO
@@ -18,4 +18,5 @@ usr/lib/libmpfr.so.1.2.2
 #usr/share/doc/mpfr/examples/divworst.c
 #usr/share/doc/mpfr/examples/rndo-add.c
 #usr/share/doc/mpfr/examples/sample.c
+#usr/share/doc/mpfr/examples/version.c
 #usr/share/info/mpfr.info
--- a/config/rootfiles/common/nettle
+++ b/config/rootfiles/common/nettle
@@ -0,0 +1,71 @@
+#usr/bin/nettle-hash
+#usr/bin/nettle-lfib-stream
+#usr/bin/nettle-pbkdf2
+#usr/bin/pkcs1-conv
+#usr/bin/sexp-conv
+#usr/include/nettle
+#usr/include/nettle/aes.h
+#usr/include/nettle/arcfour.h
+#usr/include/nettle/arctwo.h
+#usr/include/nettle/asn1.h
+#usr/include/nettle/base16.h
+#usr/include/nettle/base64.h
+#usr/include/nettle/bignum.h
+#usr/include/nettle/blowfish.h
+#usr/include/nettle/buffer.h
+#usr/include/nettle/camellia.h
+#usr/include/nettle/cast128.h
+#usr/include/nettle/cbc.h
+#usr/include/nettle/ccm.h
+#usr/include/nettle/chacha-poly1305.h
+#usr/include/nettle/chacha.h
+#usr/include/nettle/ctr.h
+#usr/include/nettle/des-compat.h
+#usr/include/nettle/des.h
+#usr/include/nettle/dsa-compat.h
+#usr/include/nettle/dsa.h
+#usr/include/nettle/eax.h
+#usr/include/nettle/ecc-curve.h
+#usr/include/nettle/ecc.h
+#usr/include/nettle/ecdsa.h
+#usr/include/nettle/gcm.h
+#usr/include/nettle/gosthash94.h
+#usr/include/nettle/hmac.h
+#usr/include/nettle/knuth-lfib.h
+#usr/include/nettle/macros.h
+#usr/include/nettle/md2.h
+#usr/include/nettle/md4.h
+#usr/include/nettle/md5-compat.h
+#usr/include/nettle/md5.h
+#usr/include/nettle/memxor.h
+#usr/include/nettle/nettle-meta.h
+#usr/include/nettle/nettle-stdint.h
+#usr/include/nettle/nettle-types.h
+#usr/include/nettle/pbkdf2.h
+#usr/include/nettle/pgp.h
+#usr/include/nettle/pkcs1.h
+#usr/include/nettle/poly1305.h
+#usr/include/nettle/realloc.h
+#usr/include/nettle/ripemd160.h
+#usr/include/nettle/rsa.h
+#usr/include/nettle/salsa20.h
+#usr/include/nettle/serpent.h
+#usr/include/nettle/sexp.h
+#usr/include/nettle/sha.h
+#usr/include/nettle/sha1.h
+#usr/include/nettle/sha2.h
+#usr/include/nettle/sha3.h
+#usr/include/nettle/twofish.h
+#usr/include/nettle/umac.h
+#usr/include/nettle/yarrow.h
+#usr/lib/libhogweed.a
+#usr/lib/libhogweed.so
+usr/lib/libhogweed.so.3
+usr/lib/libhogweed.so.3.0
+#usr/lib/libnettle.a
+#usr/lib/libnettle.so
+usr/lib/libnettle.so.5
+usr/lib/libnettle.so.5.0
+#usr/lib/pkgconfig/hogweed.pc
+#usr/lib/pkgconfig/nettle.pc
+#usr/share/info/nettle.info
--- a/config/rootfiles/common/ppp
+++ b/config/rootfiles/common/ppp
@@ -33,18 +33,18 @@ etc/ppp/standardloginscript
 #usr/include/pppd/tdb.h
 #usr/include/pppd/upap.h
 usr/lib/pppd
-usr/lib/pppd/2.4.6
-usr/lib/pppd/2.4.6/minconn.so
-usr/lib/pppd/2.4.6/openl2tp.so
-usr/lib/pppd/2.4.6/passprompt.so
-usr/lib/pppd/2.4.6/passwordfd.so
-usr/lib/pppd/2.4.6/pppoatm.so
-usr/lib/pppd/2.4.6/pppol2tp.so
-usr/lib/pppd/2.4.6/radattr.so
-usr/lib/pppd/2.4.6/radius.so
-usr/lib/pppd/2.4.6/radrealms.so
-usr/lib/pppd/2.4.6/rp-pppoe.so
-usr/lib/pppd/2.4.6/winbind.so
+usr/lib/pppd/2.4.7
+#usr/lib/pppd/2.4.7/minconn.so
+#usr/lib/pppd/2.4.7/openl2tp.so
+#usr/lib/pppd/2.4.7/passprompt.so
+#usr/lib/pppd/2.4.7/passwordfd.so
+#usr/lib/pppd/2.4.7/pppoatm.so
+#usr/lib/pppd/2.4.7/pppol2tp.so
+#usr/lib/pppd/2.4.7/radattr.so
+#usr/lib/pppd/2.4.7/radius.so
+#usr/lib/pppd/2.4.7/radrealms.so
+#usr/lib/pppd/2.4.7/rp-pppoe.so
+#usr/lib/pppd/2.4.7/winbind.so
 usr/sbin/chat
 usr/sbin/pppd
 usr/sbin/pppdump
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -74,6 +74,7 @@ usr/lib/libgcc_s.so.1
 #usr/lib/libstdc++.la
 #usr/lib/libstdc++.so
 usr/lib/libstdc++.so.6
+#usr/lib/sse2
 #usr/local
 #usr/local/bin
 #usr/local/bin/archive.files
@@ -90,7 +91,6 @@ usr/local/bin/rebuild-initrd
 usr/local/bin/run-parts
 #usr/local/bin/sanedloop
 usr/local/bin/scanhd
-usr/local/bin/setddns.pl
 usr/local/bin/settime
 usr/local/bin/timecheck
 usr/local/bin/timezone-transition
@@ -98,6 +98,7 @@ usr/local/bin/timezone-transition
 usr/local/bin/update-lang-cache
 #usr/local/include
 #usr/local/lib
+#usr/local/lib/sse2
 #usr/local/sbin
 #usr/local/share
 #usr/local/share/doc
--- a/config/rootfiles/common/strongswan
+++ b/config/rootfiles/common/strongswan
@@ -30,6 +30,7 @@ etc/strongswan.d/charon/eap-tls.conf
 etc/strongswan.d/charon/eap-ttls.conf
 etc/strongswan.d/charon/farp.conf
 etc/strongswan.d/charon/fips-prf.conf
+etc/strongswan.d/charon/gcrypt.conf
 etc/strongswan.d/charon/gmp.conf
 etc/strongswan.d/charon/hmac.conf
 etc/strongswan.d/charon/kernel-netlink.conf
@@ -53,15 +54,15 @@ etc/strongswan.d/charon/sha2.conf
 etc/strongswan.d/charon/socket-default.conf
 etc/strongswan.d/charon/sshkey.conf
 etc/strongswan.d/charon/stroke.conf
-etc/strongswan.d/charon/unity.conf
 etc/strongswan.d/charon/updown.conf
 etc/strongswan.d/charon/x509.conf
 etc/strongswan.d/charon/xauth-eap.conf
 etc/strongswan.d/charon/xauth-generic.conf
 etc/strongswan.d/charon/xauth-noauth.conf
 etc/strongswan.d/charon/xcbc.conf
+etc/strongswan.d/pki.conf
+etc/strongswan.d/scepclient.conf
 etc/strongswan.d/starter.conf
-etc/strongswan.d/tools.conf
 usr/bin/pki
 #usr/lib/ipsec
 #usr/lib/ipsec/libcharon.a
@@ -106,6 +107,7 @@ usr/lib/ipsec/plugins/libstrongswan-eap-tls.so
 usr/lib/ipsec/plugins/libstrongswan-eap-ttls.so
 usr/lib/ipsec/plugins/libstrongswan-farp.so
 usr/lib/ipsec/plugins/libstrongswan-fips-prf.so
+usr/lib/ipsec/plugins/libstrongswan-gcrypt.so
 usr/lib/ipsec/plugins/libstrongswan-gmp.so
 usr/lib/ipsec/plugins/libstrongswan-hmac.so
 usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so
@@ -130,7 +132,6 @@ usr/lib/ipsec/plugins/libstrongswan-sha2.so
 usr/lib/ipsec/plugins/libstrongswan-socket-default.so
 usr/lib/ipsec/plugins/libstrongswan-sshkey.so
 usr/lib/ipsec/plugins/libstrongswan-stroke.so
-usr/lib/ipsec/plugins/libstrongswan-unity.so
 usr/lib/ipsec/plugins/libstrongswan-updown.so
 usr/lib/ipsec/plugins/libstrongswan-x509.so
 usr/lib/ipsec/plugins/libstrongswan-xauth-eap.so
@@ -186,6 +187,7 @@ usr/sbin/ipsec
 #usr/share/strongswan/templates/config/plugins/eap-ttls.conf
 #usr/share/strongswan/templates/config/plugins/farp.conf
 #usr/share/strongswan/templates/config/plugins/fips-prf.conf
+#usr/share/strongswan/templates/config/plugins/gcrypt.conf
 #usr/share/strongswan/templates/config/plugins/gmp.conf
 #usr/share/strongswan/templates/config/plugins/hmac.conf
 #usr/share/strongswan/templates/config/plugins/kernel-netlink.conf
@@ -209,7 +211,6 @@ usr/sbin/ipsec
 #usr/share/strongswan/templates/config/plugins/socket-default.conf
 #usr/share/strongswan/templates/config/plugins/sshkey.conf
 #usr/share/strongswan/templates/config/plugins/stroke.conf
-#usr/share/strongswan/templates/config/plugins/unity.conf
 #usr/share/strongswan/templates/config/plugins/updown.conf
 #usr/share/strongswan/templates/config/plugins/x509.conf
 #usr/share/strongswan/templates/config/plugins/xauth-eap.conf
@@ -220,5 +221,6 @@ usr/sbin/ipsec
 #usr/share/strongswan/templates/config/strongswan.d
 #usr/share/strongswan/templates/config/strongswan.d/charon-logging.conf
 #usr/share/strongswan/templates/config/strongswan.d/charon.conf
+#usr/share/strongswan/templates/config/strongswan.d/pki.conf
+#usr/share/strongswan/templates/config/strongswan.d/scepclient.conf
 #usr/share/strongswan/templates/config/strongswan.d/starter.conf
-#usr/share/strongswan/templates/config/strongswan.d/tools.conf