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

2026-04-12 04:05:53 +02:00 · 2013-09-30 11:06:42 +02:00
parent 2aeb4b256e 83dfa1d7b2
commit a0a5efd768
25 changed files with 466 additions and 629 deletions
--- a/config/rootfiles/common/cyrus-sasl
+++ b/config/rootfiles/common/cyrus-sasl
@@ -37,53 +37,54 @@ usr/lib/sasl2/libsasldb.so
 usr/lib/sasl2/libsasldb.so.2
 usr/lib/sasl2/libsasldb.so.2.0.21
 usr/lib/sasl2/smtpd.conf
-#usr/man/man3/sasl.3
-#usr/man/man3/sasl_authorize_t.3
-#usr/man/man3/sasl_auxprop.3
-#usr/man/man3/sasl_auxprop_getctx.3
-#usr/man/man3/sasl_auxprop_request.3
-#usr/man/man3/sasl_callbacks.3
-#usr/man/man3/sasl_canon_user_t.3
-#usr/man/man3/sasl_chalprompt_t.3
-#usr/man/man3/sasl_checkapop.3
-#usr/man/man3/sasl_checkpass.3
-#usr/man/man3/sasl_client_init.3
-#usr/man/man3/sasl_client_new.3
-#usr/man/man3/sasl_client_start.3
-#usr/man/man3/sasl_client_step.3
-#usr/man/man3/sasl_decode.3
-#usr/man/man3/sasl_dispose.3
-#usr/man/man3/sasl_done.3
-#usr/man/man3/sasl_encode.3
-#usr/man/man3/sasl_encodev.3
-#usr/man/man3/sasl_errdetail.3
-#usr/man/man3/sasl_errors.3
-#usr/man/man3/sasl_errstring.3
-#usr/man/man3/sasl_getopt_t.3
-#usr/man/man3/sasl_getpath_t.3
-#usr/man/man3/sasl_getprop.3
-#usr/man/man3/sasl_getrealm_t.3
-#usr/man/man3/sasl_getsecret_t.3
-#usr/man/man3/sasl_getsimple_t.3
-#usr/man/man3/sasl_global_listmech.3
-#usr/man/man3/sasl_idle.3
-#usr/man/man3/sasl_listmech.3
-#usr/man/man3/sasl_log_t.3
-#usr/man/man3/sasl_server_init.3
-#usr/man/man3/sasl_server_new.3
-#usr/man/man3/sasl_server_start.3
-#usr/man/man3/sasl_server_step.3
-#usr/man/man3/sasl_server_userdb_checkpass_t.3
-#usr/man/man3/sasl_server_userdb_setpass_t.3
-#usr/man/man3/sasl_setpass.3
-#usr/man/man3/sasl_setprop.3
-#usr/man/man3/sasl_user_exists.3
-#usr/man/man3/sasl_verifyfile_t.3
-#usr/man/man8/saslauthd.8
-#usr/man/man8/sasldblistusers2.8
-#usr/man/man8/saslpasswd2.8
+#usr/man/cat8
+#usr/man/cat8/saslauthd.8
 usr/sbin/saslauthd
 usr/sbin/sasldblistusers2
 usr/sbin/saslpasswd2
+#usr/share/man/man3/sasl.3
+#usr/share/man/man3/sasl_authorize_t.3
+#usr/share/man/man3/sasl_auxprop.3
+#usr/share/man/man3/sasl_auxprop_getctx.3
+#usr/share/man/man3/sasl_auxprop_request.3
+#usr/share/man/man3/sasl_callbacks.3
+#usr/share/man/man3/sasl_canon_user_t.3
+#usr/share/man/man3/sasl_chalprompt_t.3
+#usr/share/man/man3/sasl_checkapop.3
+#usr/share/man/man3/sasl_checkpass.3
+#usr/share/man/man3/sasl_client_init.3
+#usr/share/man/man3/sasl_client_new.3
+#usr/share/man/man3/sasl_client_start.3
+#usr/share/man/man3/sasl_client_step.3
+#usr/share/man/man3/sasl_decode.3
+#usr/share/man/man3/sasl_dispose.3
+#usr/share/man/man3/sasl_done.3
+#usr/share/man/man3/sasl_encode.3
+#usr/share/man/man3/sasl_encodev.3
+#usr/share/man/man3/sasl_errdetail.3
+#usr/share/man/man3/sasl_errors.3
+#usr/share/man/man3/sasl_errstring.3
+#usr/share/man/man3/sasl_getopt_t.3
+#usr/share/man/man3/sasl_getpath_t.3
+#usr/share/man/man3/sasl_getprop.3
+#usr/share/man/man3/sasl_getrealm_t.3
+#usr/share/man/man3/sasl_getsecret_t.3
+#usr/share/man/man3/sasl_getsimple_t.3
+#usr/share/man/man3/sasl_global_listmech.3
+#usr/share/man/man3/sasl_idle.3
+#usr/share/man/man3/sasl_listmech.3
+#usr/share/man/man3/sasl_log_t.3
+#usr/share/man/man3/sasl_server_init.3
+#usr/share/man/man3/sasl_server_new.3
+#usr/share/man/man3/sasl_server_start.3
+#usr/share/man/man3/sasl_server_step.3
+#usr/share/man/man3/sasl_server_userdb_checkpass_t.3
+#usr/share/man/man3/sasl_server_userdb_setpass_t.3
+#usr/share/man/man3/sasl_setpass.3
+#usr/share/man/man3/sasl_setprop.3
+#usr/share/man/man3/sasl_user_exists.3
+#usr/share/man/man3/sasl_verifyfile_t.3
+#usr/share/man/man8/sasldblistusers2.8
+#usr/share/man/man8/saslpasswd2.8
 var/lib/sasl
 var/run/saslauthd
--- a/config/rootfiles/common/libxml2
+++ b/config/rootfiles/common/libxml2
@@ -54,7 +54,7 @@
 #usr/lib/libxml2.la
 usr/lib/libxml2.so
 usr/lib/libxml2.so.2
-usr/lib/libxml2.so.2.6.26
+usr/lib/libxml2.so.2.6.32
 #usr/lib/pkgconfig/libxml-2.0.pc
 usr/lib/python2.7/site-packages/drv_libxml2.py
 usr/lib/python2.7/site-packages/libxml2.py
@@ -62,219 +62,217 @@ usr/lib/python2.7/site-packages/libxml2.py
 #usr/lib/python2.7/site-packages/libxml2mod.la
 usr/lib/python2.7/site-packages/libxml2mod.so
 #usr/lib/xml2Conf.sh
-#usr/man/man1/xml2-config.1
-#usr/man/man1/xmlcatalog.1
-#usr/man/man1/xmllint.1
-#usr/man/man3/libxml.3
 #usr/share/aclocal/libxml.m4
-#usr/share/doc/libxml2-2.6.26
-#usr/share/doc/libxml2-2.6.26/Copyright
-#usr/share/doc/libxml2-2.6.26/examples
-#usr/share/doc/libxml2-2.6.26/examples/testHTML.c
-#usr/share/doc/libxml2-2.6.26/examples/testSAX.c
-#usr/share/doc/libxml2-2.6.26/examples/testXPath.c
-#usr/share/doc/libxml2-2.6.26/examples/xmllint.c
-#usr/share/doc/libxml2-2.6.26/html
-#usr/share/doc/libxml2-2.6.26/html/DOM.gif
-#usr/share/doc/libxml2-2.6.26/html/FAQ.html
-#usr/share/doc/libxml2-2.6.26/html/Libxml2-Logo-180x168.gif
-#usr/share/doc/libxml2-2.6.26/html/Libxml2-Logo-90x34.gif
-#usr/share/doc/libxml2-2.6.26/html/encoding.html
-#usr/share/doc/libxml2-2.6.26/html/examples.xml
-#usr/share/doc/libxml2-2.6.26/html/examples.xsl
-#usr/share/doc/libxml2-2.6.26/html/html
-#usr/share/doc/libxml2-2.6.26/html/html/book1.html
-#usr/share/doc/libxml2-2.6.26/html/html/home.png
-#usr/share/doc/libxml2-2.6.26/html/html/index.html
-#usr/share/doc/libxml2-2.6.26/html/html/left.png
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-DOCBparser.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-HTMLparser.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-HTMLtree.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-SAX.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-SAX2.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-c14n.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-catalog.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-chvalid.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-debugXML.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-dict.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-encoding.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-entities.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-globals.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-hash.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-lib.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-list.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-nanoftp.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-nanohttp.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-parser.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-parserInternals.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-pattern.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-relaxng.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-schemasInternals.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-schematron.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-threads.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-tree.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-uri.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-valid.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xinclude.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xlink.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlIO.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlautomata.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlerror.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlexports.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlmemory.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlmodule.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlreader.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlregexp.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlsave.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlschemas.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlschemastypes.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlstring.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlunicode.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlversion.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xmlwriter.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xpath.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xpathInternals.html
-#usr/share/doc/libxml2-2.6.26/html/html/libxml-xpointer.html
-#usr/share/doc/libxml2-2.6.26/html/html/right.png
-#usr/share/doc/libxml2-2.6.26/html/html/up.png
-#usr/share/doc/libxml2-2.6.26/html/io1.c
-#usr/share/doc/libxml2-2.6.26/html/io1.res
-#usr/share/doc/libxml2-2.6.26/html/io2.c
-#usr/share/doc/libxml2-2.6.26/html/io2.res
-#usr/share/doc/libxml2-2.6.26/html/libxml.gif
-#usr/share/doc/libxml2-2.6.26/html/parse1.c
-#usr/share/doc/libxml2-2.6.26/html/parse2.c
-#usr/share/doc/libxml2-2.6.26/html/parse3.c
-#usr/share/doc/libxml2-2.6.26/html/parse4.c
-#usr/share/doc/libxml2-2.6.26/html/reader1.c
-#usr/share/doc/libxml2-2.6.26/html/reader1.res
-#usr/share/doc/libxml2-2.6.26/html/reader2.c
-#usr/share/doc/libxml2-2.6.26/html/reader3.c
-#usr/share/doc/libxml2-2.6.26/html/reader3.res
-#usr/share/doc/libxml2-2.6.26/html/reader4.c
-#usr/share/doc/libxml2-2.6.26/html/reader4.res
-#usr/share/doc/libxml2-2.6.26/html/redhat.gif
-#usr/share/doc/libxml2-2.6.26/html/smallfootonly.gif
-#usr/share/doc/libxml2-2.6.26/html/structure.gif
-#usr/share/doc/libxml2-2.6.26/html/test1.xml
-#usr/share/doc/libxml2-2.6.26/html/test2.xml
-#usr/share/doc/libxml2-2.6.26/html/test3.xml
-#usr/share/doc/libxml2-2.6.26/html/testWriter.c
-#usr/share/doc/libxml2-2.6.26/html/tree1.c
-#usr/share/doc/libxml2-2.6.26/html/tree1.res
-#usr/share/doc/libxml2-2.6.26/html/tree2.c
-#usr/share/doc/libxml2-2.6.26/html/tree2.res
-#usr/share/doc/libxml2-2.6.26/html/tst.xml
-#usr/share/doc/libxml2-2.6.26/html/tutorial
-#usr/share/doc/libxml2-2.6.26/html/tutorial/apa.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/apb.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/apc.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/apd.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/ape.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/apf.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/apg.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/aph.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/api.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/ar01s02.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/ar01s03.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/ar01s04.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/ar01s05.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/ar01s06.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/ar01s07.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/ar01s08.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/ar01s09.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/blank.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/1.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/10.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/2.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/3.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/4.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/5.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/6.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/7.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/8.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/callouts/9.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/caution.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/draft.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/home.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/important.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/next.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/note.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/prev.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/tip.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/toc-blank.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/toc-minus.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/toc-plus.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/up.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/images/warning.png
-#usr/share/doc/libxml2-2.6.26/html/tutorial/includeaddattribute.c
-#usr/share/doc/libxml2-2.6.26/html/tutorial/includeaddkeyword.c
-#usr/share/doc/libxml2-2.6.26/html/tutorial/includeconvert.c
-#usr/share/doc/libxml2-2.6.26/html/tutorial/includegetattribute.c
-#usr/share/doc/libxml2-2.6.26/html/tutorial/includekeyword.c
-#usr/share/doc/libxml2-2.6.26/html/tutorial/includexpath.c
-#usr/share/doc/libxml2-2.6.26/html/tutorial/index.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/ix01.html
-#usr/share/doc/libxml2-2.6.26/html/tutorial/xmltutorial.pdf
-#usr/share/doc/libxml2-2.6.26/html/w3c.png
-#usr/share/doc/libxml2-2.6.26/html/writer.xml
-#usr/share/doc/libxml2-2.6.26/html/xml.html
-#usr/share/doc/libxml2-2.6.26/html/xpath1.c
-#usr/share/doc/libxml2-2.6.26/html/xpath1.res
-#usr/share/doc/libxml2-2.6.26/html/xpath2.c
-#usr/share/doc/libxml2-2.6.26/html/xpath2.res
-#usr/share/doc/libxml2-python-2.6.26
-#usr/share/doc/libxml2-python-2.6.26/TODO
-#usr/share/doc/libxml2-python-2.6.26/examples
-#usr/share/doc/libxml2-python-2.6.26/examples/attribs.py
-#usr/share/doc/libxml2-python-2.6.26/examples/build.py
-#usr/share/doc/libxml2-python-2.6.26/examples/ctxterror.py
-#usr/share/doc/libxml2-python-2.6.26/examples/cutnpaste.py
-#usr/share/doc/libxml2-python-2.6.26/examples/dtdvalid.py
-#usr/share/doc/libxml2-python-2.6.26/examples/error.py
-#usr/share/doc/libxml2-python-2.6.26/examples/inbuf.py
-#usr/share/doc/libxml2-python-2.6.26/examples/indexes.py
-#usr/share/doc/libxml2-python-2.6.26/examples/invalid.xml
-#usr/share/doc/libxml2-python-2.6.26/examples/nsdel.py
-#usr/share/doc/libxml2-python-2.6.26/examples/outbuf.py
-#usr/share/doc/libxml2-python-2.6.26/examples/push.py
-#usr/share/doc/libxml2-python-2.6.26/examples/pushSAX.py
-#usr/share/doc/libxml2-python-2.6.26/examples/pushSAXhtml.py
-#usr/share/doc/libxml2-python-2.6.26/examples/reader.py
-#usr/share/doc/libxml2-python-2.6.26/examples/reader2.py
-#usr/share/doc/libxml2-python-2.6.26/examples/reader3.py
-#usr/share/doc/libxml2-python-2.6.26/examples/reader4.py
-#usr/share/doc/libxml2-python-2.6.26/examples/reader5.py
-#usr/share/doc/libxml2-python-2.6.26/examples/reader6.py
-#usr/share/doc/libxml2-python-2.6.26/examples/reader7.py
-#usr/share/doc/libxml2-python-2.6.26/examples/reader8.py
-#usr/share/doc/libxml2-python-2.6.26/examples/readererr.py
-#usr/share/doc/libxml2-python-2.6.26/examples/readernext.py
-#usr/share/doc/libxml2-python-2.6.26/examples/regexp.py
-#usr/share/doc/libxml2-python-2.6.26/examples/relaxng.py
-#usr/share/doc/libxml2-python-2.6.26/examples/resolver.py
-#usr/share/doc/libxml2-python-2.6.26/examples/schema.py
-#usr/share/doc/libxml2-python-2.6.26/examples/serialize.py
-#usr/share/doc/libxml2-python-2.6.26/examples/sync.py
-#usr/share/doc/libxml2-python-2.6.26/examples/test.dtd
-#usr/share/doc/libxml2-python-2.6.26/examples/thread2.py
-#usr/share/doc/libxml2-python-2.6.26/examples/tst.py
-#usr/share/doc/libxml2-python-2.6.26/examples/tst.xml
-#usr/share/doc/libxml2-python-2.6.26/examples/tstLastError.py
-#usr/share/doc/libxml2-python-2.6.26/examples/tstURI.py
-#usr/share/doc/libxml2-python-2.6.26/examples/tstmem.py
-#usr/share/doc/libxml2-python-2.6.26/examples/tstxpath.py
-#usr/share/doc/libxml2-python-2.6.26/examples/valid.xml
-#usr/share/doc/libxml2-python-2.6.26/examples/validDTD.py
-#usr/share/doc/libxml2-python-2.6.26/examples/validRNG.py
-#usr/share/doc/libxml2-python-2.6.26/examples/validSchemas.py
-#usr/share/doc/libxml2-python-2.6.26/examples/validate.py
-#usr/share/doc/libxml2-python-2.6.26/examples/walker.py
-#usr/share/doc/libxml2-python-2.6.26/examples/xpath.py
-#usr/share/doc/libxml2-python-2.6.26/examples/xpathext.py
-#usr/share/doc/libxml2-python-2.6.26/examples/xpathret.py
+#usr/share/doc/libxml2-2.6.32
+#usr/share/doc/libxml2-2.6.32/Copyright
+#usr/share/doc/libxml2-2.6.32/examples
+#usr/share/doc/libxml2-2.6.32/examples/testHTML.c
+#usr/share/doc/libxml2-2.6.32/examples/testSAX.c
+#usr/share/doc/libxml2-2.6.32/examples/testXPath.c
+#usr/share/doc/libxml2-2.6.32/examples/xmllint.c
+#usr/share/doc/libxml2-2.6.32/html
+#usr/share/doc/libxml2-2.6.32/html/DOM.gif
+#usr/share/doc/libxml2-2.6.32/html/FAQ.html
+#usr/share/doc/libxml2-2.6.32/html/Libxml2-Logo-180x168.gif
+#usr/share/doc/libxml2-2.6.32/html/Libxml2-Logo-90x34.gif
+#usr/share/doc/libxml2-2.6.32/html/encoding.html
+#usr/share/doc/libxml2-2.6.32/html/examples.xml
+#usr/share/doc/libxml2-2.6.32/html/examples.xsl
+#usr/share/doc/libxml2-2.6.32/html/html
+#usr/share/doc/libxml2-2.6.32/html/html/book1.html
+#usr/share/doc/libxml2-2.6.32/html/html/home.png
+#usr/share/doc/libxml2-2.6.32/html/html/index.html
+#usr/share/doc/libxml2-2.6.32/html/html/left.png
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-DOCBparser.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-HTMLparser.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-HTMLtree.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-SAX.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-SAX2.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-c14n.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-catalog.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-chvalid.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-debugXML.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-dict.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-encoding.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-entities.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-globals.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-hash.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-lib.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-list.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-nanoftp.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-nanohttp.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-parser.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-parserInternals.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-pattern.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-relaxng.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-schemasInternals.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-schematron.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-threads.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-tree.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-uri.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-valid.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xinclude.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xlink.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlIO.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlautomata.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlerror.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlexports.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlmemory.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlmodule.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlreader.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlregexp.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlsave.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlschemas.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlschemastypes.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlstring.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlunicode.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlversion.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xmlwriter.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xpath.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xpathInternals.html
+#usr/share/doc/libxml2-2.6.32/html/html/libxml-xpointer.html
+#usr/share/doc/libxml2-2.6.32/html/html/right.png
+#usr/share/doc/libxml2-2.6.32/html/html/up.png
+#usr/share/doc/libxml2-2.6.32/html/io1.c
+#usr/share/doc/libxml2-2.6.32/html/io1.res
+#usr/share/doc/libxml2-2.6.32/html/io2.c
+#usr/share/doc/libxml2-2.6.32/html/io2.res
+#usr/share/doc/libxml2-2.6.32/html/libxml.gif
+#usr/share/doc/libxml2-2.6.32/html/parse1.c
+#usr/share/doc/libxml2-2.6.32/html/parse2.c
+#usr/share/doc/libxml2-2.6.32/html/parse3.c
+#usr/share/doc/libxml2-2.6.32/html/parse4.c
+#usr/share/doc/libxml2-2.6.32/html/reader1.c
+#usr/share/doc/libxml2-2.6.32/html/reader1.res
+#usr/share/doc/libxml2-2.6.32/html/reader2.c
+#usr/share/doc/libxml2-2.6.32/html/reader3.c
+#usr/share/doc/libxml2-2.6.32/html/reader3.res
+#usr/share/doc/libxml2-2.6.32/html/reader4.c
+#usr/share/doc/libxml2-2.6.32/html/reader4.res
+#usr/share/doc/libxml2-2.6.32/html/redhat.gif
+#usr/share/doc/libxml2-2.6.32/html/smallfootonly.gif
+#usr/share/doc/libxml2-2.6.32/html/structure.gif
+#usr/share/doc/libxml2-2.6.32/html/test1.xml
+#usr/share/doc/libxml2-2.6.32/html/test2.xml
+#usr/share/doc/libxml2-2.6.32/html/test3.xml
+#usr/share/doc/libxml2-2.6.32/html/testWriter.c
+#usr/share/doc/libxml2-2.6.32/html/tree1.c
+#usr/share/doc/libxml2-2.6.32/html/tree1.res
+#usr/share/doc/libxml2-2.6.32/html/tree2.c
+#usr/share/doc/libxml2-2.6.32/html/tree2.res
+#usr/share/doc/libxml2-2.6.32/html/tst.xml
+#usr/share/doc/libxml2-2.6.32/html/tutorial
+#usr/share/doc/libxml2-2.6.32/html/tutorial/apa.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/apb.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/apc.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/apd.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/ape.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/apf.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/apg.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/aph.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/api.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s02.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s03.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s04.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s05.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s06.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s07.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s08.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/ar01s09.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/blank.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/1.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/10.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/2.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/3.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/4.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/5.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/6.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/7.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/8.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/callouts/9.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/caution.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/draft.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/home.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/important.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/next.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/note.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/prev.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/tip.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/toc-blank.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/toc-minus.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/toc-plus.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/up.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/images/warning.png
+#usr/share/doc/libxml2-2.6.32/html/tutorial/includeaddattribute.c
+#usr/share/doc/libxml2-2.6.32/html/tutorial/includeaddkeyword.c
+#usr/share/doc/libxml2-2.6.32/html/tutorial/includeconvert.c
+#usr/share/doc/libxml2-2.6.32/html/tutorial/includegetattribute.c
+#usr/share/doc/libxml2-2.6.32/html/tutorial/includekeyword.c
+#usr/share/doc/libxml2-2.6.32/html/tutorial/includexpath.c
+#usr/share/doc/libxml2-2.6.32/html/tutorial/index.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/ix01.html
+#usr/share/doc/libxml2-2.6.32/html/tutorial/xmltutorial.pdf
+#usr/share/doc/libxml2-2.6.32/html/w3c.png
+#usr/share/doc/libxml2-2.6.32/html/writer.xml
+#usr/share/doc/libxml2-2.6.32/html/xml.html
+#usr/share/doc/libxml2-2.6.32/html/xpath1.c
+#usr/share/doc/libxml2-2.6.32/html/xpath1.res
+#usr/share/doc/libxml2-2.6.32/html/xpath2.c
+#usr/share/doc/libxml2-2.6.32/html/xpath2.res
+#usr/share/doc/libxml2-python-2.6.32
+#usr/share/doc/libxml2-python-2.6.32/TODO
+#usr/share/doc/libxml2-python-2.6.32/examples
+#usr/share/doc/libxml2-python-2.6.32/examples/attribs.py
+#usr/share/doc/libxml2-python-2.6.32/examples/build.py
+#usr/share/doc/libxml2-python-2.6.32/examples/compareNodes.py
+#usr/share/doc/libxml2-python-2.6.32/examples/ctxterror.py
+#usr/share/doc/libxml2-python-2.6.32/examples/cutnpaste.py
+#usr/share/doc/libxml2-python-2.6.32/examples/dtdvalid.py
+#usr/share/doc/libxml2-python-2.6.32/examples/error.py
+#usr/share/doc/libxml2-python-2.6.32/examples/inbuf.py
+#usr/share/doc/libxml2-python-2.6.32/examples/indexes.py
+#usr/share/doc/libxml2-python-2.6.32/examples/invalid.xml
+#usr/share/doc/libxml2-python-2.6.32/examples/nsdel.py
+#usr/share/doc/libxml2-python-2.6.32/examples/outbuf.py
+#usr/share/doc/libxml2-python-2.6.32/examples/push.py
+#usr/share/doc/libxml2-python-2.6.32/examples/pushSAX.py
+#usr/share/doc/libxml2-python-2.6.32/examples/pushSAXhtml.py
+#usr/share/doc/libxml2-python-2.6.32/examples/reader.py
+#usr/share/doc/libxml2-python-2.6.32/examples/reader2.py
+#usr/share/doc/libxml2-python-2.6.32/examples/reader3.py
+#usr/share/doc/libxml2-python-2.6.32/examples/reader4.py
+#usr/share/doc/libxml2-python-2.6.32/examples/reader5.py
+#usr/share/doc/libxml2-python-2.6.32/examples/reader6.py
+#usr/share/doc/libxml2-python-2.6.32/examples/reader7.py
+#usr/share/doc/libxml2-python-2.6.32/examples/reader8.py
+#usr/share/doc/libxml2-python-2.6.32/examples/readererr.py
+#usr/share/doc/libxml2-python-2.6.32/examples/readernext.py
+#usr/share/doc/libxml2-python-2.6.32/examples/regexp.py
+#usr/share/doc/libxml2-python-2.6.32/examples/relaxng.py
+#usr/share/doc/libxml2-python-2.6.32/examples/resolver.py
+#usr/share/doc/libxml2-python-2.6.32/examples/schema.py
+#usr/share/doc/libxml2-python-2.6.32/examples/serialize.py
+#usr/share/doc/libxml2-python-2.6.32/examples/sync.py
+#usr/share/doc/libxml2-python-2.6.32/examples/test.dtd
+#usr/share/doc/libxml2-python-2.6.32/examples/thread2.py
+#usr/share/doc/libxml2-python-2.6.32/examples/tst.py
+#usr/share/doc/libxml2-python-2.6.32/examples/tst.xml
+#usr/share/doc/libxml2-python-2.6.32/examples/tstLastError.py
+#usr/share/doc/libxml2-python-2.6.32/examples/tstURI.py
+#usr/share/doc/libxml2-python-2.6.32/examples/tstmem.py
+#usr/share/doc/libxml2-python-2.6.32/examples/tstxpath.py
+#usr/share/doc/libxml2-python-2.6.32/examples/valid.xml
+#usr/share/doc/libxml2-python-2.6.32/examples/validDTD.py
+#usr/share/doc/libxml2-python-2.6.32/examples/validRNG.py
+#usr/share/doc/libxml2-python-2.6.32/examples/validSchemas.py
+#usr/share/doc/libxml2-python-2.6.32/examples/validate.py
+#usr/share/doc/libxml2-python-2.6.32/examples/walker.py
+#usr/share/doc/libxml2-python-2.6.32/examples/xpath.py
+#usr/share/doc/libxml2-python-2.6.32/examples/xpathext.py
+#usr/share/doc/libxml2-python-2.6.32/examples/xpathns.py
+#usr/share/doc/libxml2-python-2.6.32/examples/xpathret.py
 #usr/share/gtk-doc
 #usr/share/gtk-doc/html
 #usr/share/gtk-doc/html/libxml2
@@ -333,3 +331,7 @@ usr/lib/python2.7/site-packages/libxml2mod.so
 #usr/share/gtk-doc/html/libxml2/right.png
 #usr/share/gtk-doc/html/libxml2/style.css
 #usr/share/gtk-doc/html/libxml2/up.png
+#usr/share/man/man1/xml2-config.1
+#usr/share/man/man1/xmlcatalog.1
+#usr/share/man/man1/xmllint.1
+#usr/share/man/man3/libxml.3
--- a/config/rootfiles/common/lzo
+++ b/config/rootfiles/common/lzo
@@ -17,3 +17,11 @@
 usr/lib/liblzo2.so
 usr/lib/liblzo2.so.2
 usr/lib/liblzo2.so.2.0.0
+#usr/share/doc/lzo
+#usr/share/doc/lzo/AUTHORS
+#usr/share/doc/lzo/COPYING
+#usr/share/doc/lzo/LZO.FAQ
+#usr/share/doc/lzo/LZO.TXT
+#usr/share/doc/lzo/LZOAPI.TXT
+#usr/share/doc/lzo/NEWS
+#usr/share/doc/lzo/THANKS
--- a/config/rootfiles/common/mbr
+++ b/config/rootfiles/common/mbr
@@ -1,2 +0,0 @@
-#usr/sbin/install-mbr
-#usr/share/man/man8/install-mbr.8
--- a/config/rootfiles/common/mysql
+++ b/config/rootfiles/common/mysql
@@ -1,280 +0,0 @@
-#etc/my.cnf
-#srv/mysql
-#srv/mysql/mysql
-#srv/mysql/mysql-bin.000001
-#srv/mysql/mysql-bin.000002
-#srv/mysql/mysql-bin.index
-#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
-#srv/mysql/test
-#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_create_system_tables
-#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/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_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_semaphore.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/info/mysql.info
-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/man/man1/msql2mysql.1
-#usr/man/man1/myisam_ftdump.1
-#usr/man/man1/myisamchk.1
-#usr/man/man1/myisamlog.1
-#usr/man/man1/myisampack.1
-#usr/man/man1/mysql.1
-#usr/man/man1/mysql.server.1
-#usr/man/man1/mysql_config.1
-#usr/man/man1/mysql_explain_log.1
-#usr/man/man1/mysql_fix_privilege_tables.1
-#usr/man/man1/mysql_upgrade.1
-#usr/man/man1/mysql_zap.1
-#usr/man/man1/mysqlaccess.1
-#usr/man/man1/mysqladmin.1
-#usr/man/man1/mysqlbinlog.1
-#usr/man/man1/mysqlcheck.1
-#usr/man/man1/mysqld.1
-#usr/man/man1/mysqld_multi.1
-#usr/man/man1/mysqld_safe.1
-#usr/man/man1/mysqldump.1
-#usr/man/man1/mysqlhotcopy.1
-#usr/man/man1/mysqlimport.1
-#usr/man/man1/mysqlman.1
-#usr/man/man1/mysqlmanager.1
-#usr/man/man1/mysqlshow.1
-#usr/man/man1/perror.1
-#usr/man/man1/replace.1
-#usr/man/man1/safe_mysqld.1
-#usr/sbin/mysqld
-#usr/sbin/mysqlmanager
-#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/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/run/mysql
--- a/config/rootfiles/common/mysql-libs
+++ b/config/rootfiles/common/mysql-libs
@@ -0,0 +1,10 @@
+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
--- a/config/rootfiles/core/fifteen/filelists/coreutils
+++ b/config/rootfiles/core/fifteen/filelists/coreutils
@@ -0,0 +1 @@
+../../../common/coreutils
--- a/config/rootfiles/core/fifteen/filelists/libxml2
+++ b/config/rootfiles/core/fifteen/filelists/libxml2
@@ -0,0 +1 @@
+../../../common/libxml2
--- a/config/rootfiles/core/fifteen/filelists/lzo
+++ b/config/rootfiles/core/fifteen/filelists/lzo
@@ -0,0 +1 @@
+../../../common/lzo
--- a/config/rootfiles/packages/iotop
+++ b/config/rootfiles/packages/iotop
@@ -0,0 +1,20 @@
+usr/lib/python2.7/site-packages/iotop
+#usr/lib/python2.7/site-packages/iotop-0.6-py2.7.egg-info
+#usr/lib/python2.7/site-packages/iotop/__init__.py
+#usr/lib/python2.7/site-packages/iotop/__init__.pyc
+#usr/lib/python2.7/site-packages/iotop/data.py
+#usr/lib/python2.7/site-packages/iotop/data.pyc
+#usr/lib/python2.7/site-packages/iotop/genetlink.py
+#usr/lib/python2.7/site-packages/iotop/genetlink.pyc
+#usr/lib/python2.7/site-packages/iotop/ioprio.py
+#usr/lib/python2.7/site-packages/iotop/ioprio.pyc
+#usr/lib/python2.7/site-packages/iotop/netlink.py
+#usr/lib/python2.7/site-packages/iotop/netlink.pyc
+#usr/lib/python2.7/site-packages/iotop/ui.py
+#usr/lib/python2.7/site-packages/iotop/ui.pyc
+#usr/lib/python2.7/site-packages/iotop/version.py
+#usr/lib/python2.7/site-packages/iotop/version.pyc
+#usr/lib/python2.7/site-packages/iotop/vmstat.py
+#usr/lib/python2.7/site-packages/iotop/vmstat.pyc
+usr/sbin/iotop
+#usr/share/man/man8/iotop.8
--- a/config/rootfiles/packages/mysql
+++ b/config/rootfiles/packages/mysql
@@ -66,7 +66,6 @@ usr/bin/mysql
 usr/bin/mysql_client_test
 usr/bin/mysql_config
 usr/bin/mysql_convert_table_format
-usr/bin/mysql_create_system_tables
 usr/bin/mysql_explain_log
 usr/bin/mysql_find_rows
 usr/bin/mysql_fix_extensions
@@ -101,11 +100,13 @@ 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
@@ -115,7 +116,6 @@ usr/bin/resolveip
 #usr/include/mysql/my_net.h
 #usr/include/mysql/my_no_pthread.h
 #usr/include/mysql/my_pthread.h
-#usr/include/mysql/my_semaphore.h
 #usr/include/mysql/my_sys.h
 #usr/include/mysql/my_xml.h
 #usr/include/mysql/mysql.h
@@ -132,7 +132,6 @@ usr/bin/resolveip
 #usr/include/mysql/sslopt-longopts.h
 #usr/include/mysql/sslopt-vars.h
 #usr/include/mysql/typelib.h
-#usr/info/mysql.info
 #usr/lib/libmysqlclient.so
 #usr/lib/libmysqlclient.so.15
 #usr/lib/libmysqlclient.so.15.0.0
@@ -157,39 +156,60 @@ usr/bin/resolveip
 #usr/lib/mysql/libmystrings.a
 #usr/lib/mysql/libmysys.a
 #usr/lib/mysql/libvio.a
-#usr/man/man1/msql2mysql.1
-#usr/man/man1/myisam_ftdump.1
-#usr/man/man1/myisamchk.1
-#usr/man/man1/myisamlog.1
-#usr/man/man1/myisampack.1
-#usr/man/man1/mysql.1
-#usr/man/man1/mysql.server.1
-#usr/man/man1/mysql_config.1
-#usr/man/man1/mysql_explain_log.1
-#usr/man/man1/mysql_fix_privilege_tables.1
-#usr/man/man1/mysql_upgrade.1
-#usr/man/man1/mysql_zap.1
-#usr/man/man1/mysqlaccess.1
-#usr/man/man1/mysqladmin.1
-#usr/man/man1/mysqlbinlog.1
-#usr/man/man1/mysqlcheck.1
-#usr/man/man1/mysqld.1
-#usr/man/man1/mysqld_multi.1
-#usr/man/man1/mysqld_safe.1
-#usr/man/man1/mysqldump.1
-#usr/man/man1/mysqlhotcopy.1
-#usr/man/man1/mysqlimport.1
-#usr/man/man1/mysqlman.1
-#usr/man/man1/mysqlmanager.1
-#usr/man/man1/mysqlshow.1
-#usr/man/man1/perror.1
-#usr/man/man1/replace.1
-#usr/man/man1/safe_mysqld.1
 usr/sbin/mysqld
 usr/sbin/mysqlmanager
-#usr/share/mysql
+#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
 #usr/share/mysql/charsets/Index.xml
 #usr/share/mysql/charsets/README
 #usr/share/mysql/charsets/armscii8.xml
@@ -223,15 +243,15 @@ usr/share/mysql/charsets
 #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/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/german/errmsg.sys
 #usr/share/mysql/greek
 #usr/share/mysql/greek/errmsg.sys
 #usr/share/mysql/hungarian
@@ -252,6 +272,10 @@ usr/share/mysql/german/errmsg.sys
 #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
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -36,6 +36,10 @@ PAK_VER    = 23

 DEPS       = ""

+ifeq "$(MACHINE_TYPE)" "arm"
+CONFIGURE_FLAGS = --disable-fanotify
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -77,7 +81,10 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire/clamav
+	cd $(DIR_APP) && ./configure \
+		--prefix=/usr \
+		--sysconfdir=/var/ipfire/clamav \
+		$(CONFIGURE_FLAGS)
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	mkdir -p /usr/share/clamav/
@@ -86,5 +93,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	rm -rfv /usr/share/clamav/*.cvd
 	mkdir -p /var/run/clamav
 	chown clamav:clamav /var/run/clamav
+
+	# Disable PaX mprotect for clamd and freshclam
+	paxctl -cm /usr/sbin/clamd
+	paxctl -cm /usr/bin/freshclam
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/cpufrequtils
+++ b/lfs/cpufrequtils
@@ -37,6 +37,8 @@ PAK_VER    = 6

 DEPS       = ""

+CFLAGS    += -fno-PIC
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/cyrus-sasl
+++ b/lfs/cyrus-sasl
@@ -84,7 +84,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/cyrus-sasl-2.1.22-bad-elif.patch
 	cd $(DIR_APP) && sed -i '/sasl_global/s/^static //' lib/client.c
-	cd $(DIR_APP) && sed -i 's/cat8/man8/' saslauthd/Makefile.in
+	cd $(DIR_APP) && sed -i 's/cat8/man8/' saslauthd/Makefile.am
+	cd $(DIR_APP) && autoconf

 ifeq "$(PASS)" ""
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc \
--- a/lfs/ffmpeg
+++ b/lfs/ffmpeg
@@ -35,6 +35,9 @@ PAK_VER    = 4

 DEPS       = "ffmpeg-libs sdl lame libvorbis xvid"

+# Don't use PIC for libavcodec
+CFLAGS    += -fno-PIC -fno-strict-aliasing
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/iotop
+++ b/lfs/iotop
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2013  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        #
@@ -24,14 +24,17 @@

 include Config

-VER        = 1.1.11
+VER        = 0.6

-THISAPP    = mbr-$(VER)
+THISAPP    = iotop-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
-SUP_ARCH   = i586
+
+PROG       = iotop
+PAK_VER    = 1
+DEPS       = ""

 ###############################################################################
 # Top-level Rules
@@ -41,7 +44,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 4e406ded185f94c2d2bf5fc793ac1842
+$(DL_FILE)_MD5 = 080fbb494566b5291a2a27cf6c203562

 install : $(TARGET)

@@ -51,6 +54,9 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects))

 md5 : $(subst %,%_MD5,$(objects))

+dist: 
+	$(PAK)
+
 ###############################################################################
 # Downloading, checking, md5sum
 ###############################################################################
@@ -71,8 +77,6 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && ./configure --prefix=/usr
-	cd $(DIR_APP) && make $(MAKETUNING)
-	cd $(DIR_APP) && make install
+	cd $(DIR_APP) && python setup.py install
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--- a/lfs/libxml2
+++ b/lfs/libxml2
@@ -24,7 +24,7 @@

 include Config

-VER        = 2.6.26
+VER        = 2.6.32

 THISAPP    = libxml2-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,6 +32,8 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)

+CFLAGS    += -fno-strict-aliasing
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -40,7 +42,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 2d8d3805041edab967368b497642f981
+$(DL_FILE)_MD5 = 2621d322c16f0257e30f0ff2b13384de

 install : $(TARGET)

--- a/lfs/linux
+++ b/lfs/linux
@@ -24,10 +24,10 @@

 include Config

-VER        = 3.10.12
+VER        = 3.10.13

 RPI_PATCHES = linux-3.10.10-c1af7c6
-GRS_PATCHES = grsecurity-2.9.1-3.10.12-ipfire1.patch.xz
+GRS_PATCHES = grsecurity-2.9.1-3.10.13-ipfire1.patch.xz

 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -74,9 +74,9 @@ $(DL_FILE)				= $(URL_IPFIRE)/$(DL_FILE)
 rpi-patches-$(RPI_PATCHES).patch.xz	= $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES).patch.xz
 $(GRS_PATCHES)				= $(URL_IPFIRE)/$(GRS_PATCHES)

-$(DL_FILE)_MD5				= 16e43b3c9957cf5af44863d6809efe38
+$(DL_FILE)_MD5				= 64ffe74249442fd7452d12348955ccfd
 rpi-patches-$(RPI_PATCHES).patch.xz_MD5	= ef9274b3ff5d05daaaa4bdbe86ad00fc
-$(GRS_PATCHES)_MD5			= 563b6ff05687289cfebc07f2a66ded92
+$(GRS_PATCHES)_MD5			= f69811dde866170bd9b4fcdcd0f1538e

 install : $(TARGET)

--- a/lfs/lzo
+++ b/lfs/lzo
@@ -24,7 +24,7 @@

 include Config

-VER        = 2.02
+VER        = 2.06

 THISAPP    = lzo-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 6760e5819f4238328709bf93bf10071c
+$(DL_FILE)_MD5 = 95380bd4081f85ef08c5209f4107e9f8

 install : $(TARGET)

--- a/lfs/mysql
+++ b/lfs/mysql
@@ -24,7 +24,7 @@

 include Config

-VER        = 5.0.24a
+VER        = 5.0.96

 THISAPP    = mysql-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = mysql
-PAK_VER    = 1
+PAK_VER    = 2

 ###############################################################################
 # Top-level Rules
@@ -42,7 +42,7 @@ objects = $(DL_FILE)

 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)

-$(DL_FILE)_MD5 = 6b07546389f75c52611adb7af38c3667
+$(DL_FILE)_MD5 = bf280949049161aa68cf29e600d9ec79

 install : $(TARGET)

--- a/lfs/openvmtools
+++ b/lfs/openvmtools
@@ -37,6 +37,8 @@ PAK_VER    = 1

 DEPS       = ""

+CFLAGS    += -fno-PIC
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/lfs/transmission
+++ b/lfs/transmission
@@ -36,6 +36,8 @@ PAK_VER    = 9

 DEPS       = "libevent2"

+CXXFLAGS  += -fno-exceptions
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
--- a/make.sh
+++ b/make.sh
@@ -179,11 +179,12 @@ prepareenv() {
    set +h
    LC_ALL=POSIX
    if [ -z $MAKETUNING ]; then
-        if [ "${MACHINE:0:3}" = "arm" ]; then
-            MAKETUNING="-j2"
-        else
-            MAKETUNING="-j6"
-        fi
+	CPU_COUNT="$(getconf _NPROCESSORS_ONLN 2>/dev/null)"
+	if [ -z "${CPU_COUNT}" ]; then
+		CPU_COUNT=1
+	fi
+
+	MAKETUNING="-j$(( ${CPU_COUNT} * 2 + 1 ))"
    fi
    export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
    unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
@@ -771,6 +772,7 @@ buildipfire() {
  ipfiremake arm
  ipfiremake wavemon
  ipfiremake iptraf-ng
+  ipfiremake iotop
  echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
  cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
  echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -800,7 +802,6 @@ buildinstaller() {
  LOGFILE="$BASEDIR/log/_build.installer.log"
  export LOGFILE
  ipfiremake as86
-  ipfiremake mbr
  ipfiremake memtest
  ipfiremake installer
  installmake strip
--- a/src/patches/coreutils-5.96-uname-1.patch
+++ b/src/patches/coreutils-5.96-uname-1.patch
@@ -1,34 +1,53 @@
-Submitted By: Matthew Burgess <matthew at linuxfromscratch dot org>
-Date: 2005-10-23
-Initial Package Version: 5.92
+Submitted By: Robert Connolly <robert@linuxfromscratch.org> (ashes)
+Date: 2005-11-13
+Initial Package Version: 5.93
 Upstream Status: pending
-Origin: Scot McPherson
-Description: Fix the output of uname once and for all.
+Origin: Scot McPherson and Zack Winkles
+Description: Fix the output of uname once and for all. This is the position independent
+version.

-	$ uname -m	# This always worked.
+	$ uname -m      # This always worked.
 	i686
-	$ uname -i	# Used to report 'unknown'.
+	$ uname -i      # Used to report 'unknown'.
 	i386
-	$ uname -p	# Likewise.
+	$ uname -p      # Likewise.
 	athlon-4

-diff -Naur coreutils-5.92.orig/src/uname.c coreutils-5.92/src/uname.c
--- coreutils-5.92.orig/src/uname.c	2005-09-15 20:34:42.000000000 +0000
-+++ coreutils-5.92/src/uname.c	2005-10-23 10:14:06.000000000 +0000
-@@ -29,6 +29,12 @@
+Now 'uname -p' can be used by GCC's mtune/mcpu and march options. For example:
+
+	CFLAGS="-march=$(uname -m) -mtune=$(uname -p)"
+
+diff -Naur coreutils-5.93.orig/src/uname.c coreutils-5.93/src/uname.c
+--- coreutils-5.93.orig/src/uname.c	2005-09-15 19:57:04.000000000 +0000
+++ coreutils-5.93/src/uname.c	2005-11-13 19:18:35.000000000 +0000
+@@ -29,6 +29,26 @@
 # include <sys/systeminfo.h>
 #endif
 
 +#ifdef linux
-+#define cpuid(in,a,b,c,d)\
-+  asm("cpuid": "=a" (a), "=b" (b), "=c" (c), "=d" (d) : "a" (in));
+/* Thanks to the ffmpeg team for this PIC version of cpuid() */
+#ifdef ARCH_X86_64
+#  define REG_b "rbx"
+#  define REG_S "rsi"
+#else
+#  define REG_b "ebx"
+#  define REG_S "esi"
+#endif
+#define cpuid(index,eax,ebx,ecx,edx)\
+	__asm __volatile\
+	  ("mov %%"REG_b", %%"REG_S"\n\t"\
+	  "cpuid\n\t"\
+	  "xchg %%"REG_b", %%"REG_S\
+	  : "=a" (eax), "=S" (ebx),\
+	  "=c" (ecx), "=d" (edx)\
+	  : "0" (index));
 +int has_sse( void );
 +#endif
 +
 #if HAVE_SYS_SYSCTL_H
 # if HAVE_SYS_PARAM_H
 #  include <sys/param.h> /* needed for OpenBSD 3.0 */
-@@ -256,6 +262,96 @@
+@@ -256,6 +276,99 @@
 	if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
 	  element = processor;
       }
@@ -75,6 +94,9 @@ diff -Naur coreutils-5.92.orig/src/uname.c coreutils-5.92/src/uname.c
 +		element="pentium3";
 +	      break;
 +	    case 15: // Pentium4
+	      if( model == 3 ) // Prescott
+                element="prescott";
+	      else
 +	      element="pentium4";
 +	      break;
 +	    default:
@@ -125,7 +147,7 @@ diff -Naur coreutils-5.92.orig/src/uname.c coreutils-5.92/src/uname.c
 #endif
 #ifdef UNAME_PROCESSOR
       if (element == unknown)
-@@ -293,7 +389,7 @@
+@@ -293,7 +406,7 @@
 
   if (toprint & PRINT_HARDWARE_PLATFORM)
     {
@@ -134,7 +156,7 @@ diff -Naur coreutils-5.92.orig/src/uname.c coreutils-5.92/src/uname.c
 #if HAVE_SYSINFO && defined SI_PLATFORM
       {
 	static char hardware_platform[257];
-@@ -301,6 +397,15 @@
+@@ -301,6 +414,15 @@
 			  hardware_platform, sizeof hardware_platform))
 	  element = hardware_platform;
       }
@@ -150,7 +172,7 @@ diff -Naur coreutils-5.92.orig/src/uname.c coreutils-5.92/src/uname.c
 #endif
 #ifdef UNAME_HARDWARE_PLATFORM
       if (element == unknown)
-@@ -323,3 +428,29 @@
+@@ -323,3 +445,29 @@
 
   exit (EXIT_SUCCESS);
 }
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -222,25 +222,25 @@ if [ 'x86_64' = $MACHINE -o 'i686' = $MACHINE -o 'i586' = $MACHINE ]; then
 	MACHINE=i586
 	CROSSTARGET=${MACHINE}-cross-linux-gnu
 	BUILDTARGET=i586-pc-linux-gnu
-	CFLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer"
-	CXXFLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer"
-	C2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer"
-	CXX2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer"
+	CFLAGS_ARCH="${GLOBAL_CFLAGS} -march=i586 -fomit-frame-pointer"
 elif [ 'armv5tejl' = $MACHINE -o 'armv5tel' = $MACHINE -o 'armv6l' = $MACHINE -o 'armv7l' = $MACHINE ]; then
 	echo "`date -u '+%b %e %T'`: Machine is ARM (or equivalent)" >> $LOGFILE
 	MACHINE=armv5tel
 	MACHINE_TYPE=arm
 	CROSSTARGET=${MACHINE}-cross-linux-gnueabi
 	BUILDTARGET=${MACHINE}-unknown-linux-gnueabi
-	CFLAGS="-O2 -march=armv5te -mfloat-abi=soft -fomit-frame-pointer -pipe"
-	CXXFLAGS="$CFLAGS"
-	C2FLAGS="$CFLAGS"
-	CXX2FLAGS="$CXXFLAGS"
+	CFLAGS_ARCH="-march=armv5te -mfloat-abi=soft -fomit-frame-pointer"
 else
 	echo "`date -u '+%b %e %T'`: Can't determine your architecture - $MACHINE"
 	exit 1
 fi

+CFLAGS="-O2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fPIC"
+CFLAGS="${CFLAGS} -fstack-protector-all --param=ssp-buffer-size=4 ${CFLAGS_ARCH}"
+CXXFLAGS="${CFLAGS}"
+C2FLAGS="${CFLAGS}"
+CXX2FLAGS="${CXXFLAGS}"
+
 # Define immediately
 stdumount() {
 	umount $BASEDIR/build/sys			2>/dev/null;