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

config/rootfiles/common/libgcrypt

@@ -6,7 +6,7 @@
 #usr/lib/libgcrypt.la
 #usr/lib/libgcrypt.so
 usr/lib/libgcrypt.so.20
-usr/lib/libgcrypt.so.20.0.1
+usr/lib/libgcrypt.so.20.0.3
 #usr/share/aclocal/libgcrypt.m4
 #usr/share/info/gcrypt.info
 #usr/share/info/gcrypt.info-1

config/rootfiles/common/libgpg-error

@@ -4,7 +4,7 @@ usr/bin/gpg-error
 #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/lib/libgpg-error.so.0.14.0
 #usr/share/aclocal/gpg-error.m4
 #usr/share/common-lisp
 #usr/share/common-lisp/source
@@ -13,19 +13,24 @@ usr/lib/libgpg-error.so.0.11.0
 #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/info/gpgrt.info
 #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/hu/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/pt/LC_MESSAGES/libgpg-error.mo
 #usr/share/locale/ro/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/ru/LC_MESSAGES/libgpg-error.mo
+#usr/share/locale/sr/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
+#usr/share/locale/zh_TW/LC_MESSAGES/libgpg-error.mo
+#usr/share/man/man1/gpg-error-config.1

config/rootfiles/common/libpcap

@@ -15,7 +15,7 @@
 #usr/lib/libpcap.a
 usr/lib/libpcap.so
 usr/lib/libpcap.so.1
-usr/lib/libpcap.so.1.6.2
+usr/lib/libpcap.so.1.7.3
 #usr/share/man/man1/pcap-config.1
 #usr/share/man/man3/pcap.3pcap
 #usr/share/man/man3/pcap_activate.3pcap

config/rootfiles/common/libusb

@@ -1,15 +1,16 @@
 etc/udev/rules.d/23-usb.rules
 #usr/bin/libusb-config
+#usr/include/libusb-1.0
+#usr/include/libusb-1.0/libusb.h
 #usr/include/usb.h
-#usr/include/usbpp.h
-usr/lib/libusb-0.1.so.4
-usr/lib/libusb-0.1.so.4.4.4
-#usr/lib/libusb.a
+#usr/lib/libusb-0.1.so.4
+#usr/lib/libusb-0.1.so.4.4.4
+#usr/lib/libusb-1.0.a
+#usr/lib/libusb-1.0.la
+#usr/lib/libusb-1.0.so
+usr/lib/libusb-1.0.so.0
+usr/lib/libusb-1.0.so.0.1.0
 #usr/lib/libusb.la
-usr/lib/libusb.so
-usr/lib/libusbpp-0.1.so.4
-usr/lib/libusbpp-0.1.so.4.4.4
-#usr/lib/libusbpp.a
-#usr/lib/libusbpp.la
-usr/lib/libusbpp.so
+#usr/lib/libusb.so
+#usr/lib/pkgconfig/libusb-1.0.pc
 #usr/lib/pkgconfig/libusb.pc

config/rootfiles/common/libusb-compat

@@ -0,0 +1,7 @@
+#usr/bin/libusb-config
+#usr/include/usb.h
+usr/lib/libusb-0.1.so.4
+usr/lib/libusb-0.1.so.4.4.4
+#usr/lib/libusb.la
+usr/lib/libusb.so
+#usr/lib/pkgconfig/libusb.pc

config/rootfiles/common/libusbx

@@ -1,8 +0,0 @@
-#usr/include/libusb-1.0
-#usr/include/libusb-1.0/libusb.h
-#usr/lib/libusb-1.0.a
-#usr/lib/libusb-1.0.la
-#usr/lib/libusb-1.0.so
-usr/lib/libusb-1.0.so.0
-usr/lib/libusb-1.0.so.0.1.0
-#usr/lib/pkgconfig/libusb-1.0.pc

config/rootfiles/common/python

@@ -171,12 +171,18 @@ usr/lib/python2.7/__phello__.foo.pyc
 #usr/lib/python2.7/_abcoll.py
 usr/lib/python2.7/_abcoll.pyc
 #usr/lib/python2.7/_abcoll.pyo
+#usr/lib/python2.7/_osx_support.py
+#usr/lib/python2.7/_osx_support.pyc
+#usr/lib/python2.7/_osx_support.pyo
 #usr/lib/python2.7/_pyio.py
 usr/lib/python2.7/_pyio.pyc
 #usr/lib/python2.7/_pyio.pyo
 #usr/lib/python2.7/_strptime.py
 usr/lib/python2.7/_strptime.pyc
 #usr/lib/python2.7/_strptime.pyo
+#usr/lib/python2.7/_sysconfigdata.py
+#usr/lib/python2.7/_sysconfigdata.pyc
+#usr/lib/python2.7/_sysconfigdata.pyo
 #usr/lib/python2.7/_threading_local.py
 usr/lib/python2.7/_threading_local.pyc
 #usr/lib/python2.7/_threading_local.pyo
@@ -488,9 +494,6 @@ usr/lib/python2.7/ctypes/macholib/framework.pyc
 #usr/lib/python2.7/ctypes/test/test_delattr.py
 #usr/lib/python2.7/ctypes/test/test_delattr.pyc
 #usr/lib/python2.7/ctypes/test/test_delattr.pyo
-#usr/lib/python2.7/ctypes/test/test_errcheck.py
-#usr/lib/python2.7/ctypes/test/test_errcheck.pyc
-#usr/lib/python2.7/ctypes/test/test_errcheck.pyo
 #usr/lib/python2.7/ctypes/test/test_errno.py
 #usr/lib/python2.7/ctypes/test/test_errno.pyc
 #usr/lib/python2.7/ctypes/test/test_errno.pyo
@@ -512,9 +515,6 @@ usr/lib/python2.7/ctypes/macholib/framework.pyc
 #usr/lib/python2.7/ctypes/test/test_init.py
 #usr/lib/python2.7/ctypes/test/test_init.pyc
 #usr/lib/python2.7/ctypes/test/test_init.pyo
-#usr/lib/python2.7/ctypes/test/test_integers.py
-#usr/lib/python2.7/ctypes/test/test_integers.pyc
-#usr/lib/python2.7/ctypes/test/test_integers.pyo
 #usr/lib/python2.7/ctypes/test/test_internals.py
 #usr/lib/python2.7/ctypes/test/test_internals.pyc
 #usr/lib/python2.7/ctypes/test/test_internals.pyo
@@ -605,6 +605,9 @@ usr/lib/python2.7/ctypes/macholib/framework.pyc
 #usr/lib/python2.7/ctypes/test/test_win32.py
 #usr/lib/python2.7/ctypes/test/test_win32.pyc
 #usr/lib/python2.7/ctypes/test/test_win32.pyo
+#usr/lib/python2.7/ctypes/test/test_wintypes.py
+#usr/lib/python2.7/ctypes/test/test_wintypes.pyc
+#usr/lib/python2.7/ctypes/test/test_wintypes.pyo
 #usr/lib/python2.7/ctypes/util.py
 usr/lib/python2.7/ctypes/util.pyc
 #usr/lib/python2.7/ctypes/util.pyo
@@ -1452,6 +1455,19 @@ usr/lib/python2.7/encodings/uu_codec.pyc
 #usr/lib/python2.7/encodings/zlib_codec.py
 usr/lib/python2.7/encodings/zlib_codec.pyc
 #usr/lib/python2.7/encodings/zlib_codec.pyo
+#usr/lib/python2.7/ensurepip
+#usr/lib/python2.7/ensurepip/__init__.py
+#usr/lib/python2.7/ensurepip/__init__.pyc
+#usr/lib/python2.7/ensurepip/__init__.pyo
+#usr/lib/python2.7/ensurepip/__main__.py
+#usr/lib/python2.7/ensurepip/__main__.pyc
+#usr/lib/python2.7/ensurepip/__main__.pyo
+#usr/lib/python2.7/ensurepip/_bundled
+#usr/lib/python2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl
+#usr/lib/python2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl
+#usr/lib/python2.7/ensurepip/_uninstall.py
+#usr/lib/python2.7/ensurepip/_uninstall.pyc
+#usr/lib/python2.7/ensurepip/_uninstall.pyo
 #usr/lib/python2.7/filecmp.py
 usr/lib/python2.7/filecmp.pyc
 #usr/lib/python2.7/filecmp.pyo
@@ -1583,6 +1599,13 @@ usr/lib/python2.7/httplib.pyc
 #usr/lib/python2.7/idlelib/Icons
 #usr/lib/python2.7/idlelib/Icons/folder.gif
 #usr/lib/python2.7/idlelib/Icons/idle.icns
+#usr/lib/python2.7/idlelib/Icons/idle.ico
+#usr/lib/python2.7/idlelib/Icons/idle_16.gif
+#usr/lib/python2.7/idlelib/Icons/idle_16.png
+#usr/lib/python2.7/idlelib/Icons/idle_32.gif
+#usr/lib/python2.7/idlelib/Icons/idle_32.png
+#usr/lib/python2.7/idlelib/Icons/idle_48.gif
+#usr/lib/python2.7/idlelib/Icons/idle_48.png
 #usr/lib/python2.7/idlelib/Icons/minusnode.gif
 #usr/lib/python2.7/idlelib/Icons/openfolder.gif
 #usr/lib/python2.7/idlelib/Icons/plusnode.gif
@@ -1701,6 +1724,80 @@ usr/lib/python2.7/httplib.pyc
 #usr/lib/python2.7/idlelib/idle.pyc
 #usr/lib/python2.7/idlelib/idle.pyo
 #usr/lib/python2.7/idlelib/idle.pyw
+#usr/lib/python2.7/idlelib/idle_test
+#usr/lib/python2.7/idlelib/idle_test/README.txt
+#usr/lib/python2.7/idlelib/idle_test/__init__.py
+#usr/lib/python2.7/idlelib/idle_test/__init__.pyc
+#usr/lib/python2.7/idlelib/idle_test/__init__.pyo
+#usr/lib/python2.7/idlelib/idle_test/htest.py
+#usr/lib/python2.7/idlelib/idle_test/htest.pyc
+#usr/lib/python2.7/idlelib/idle_test/htest.pyo
+#usr/lib/python2.7/idlelib/idle_test/mock_idle.py
+#usr/lib/python2.7/idlelib/idle_test/mock_idle.pyc
+#usr/lib/python2.7/idlelib/idle_test/mock_idle.pyo
+#usr/lib/python2.7/idlelib/idle_test/mock_tk.py
+#usr/lib/python2.7/idlelib/idle_test/mock_tk.pyc
+#usr/lib/python2.7/idlelib/idle_test/mock_tk.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.py
+#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_autocomplete.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.py
+#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_autoexpand.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_calltips.py
+#usr/lib/python2.7/idlelib/idle_test/test_calltips.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_calltips.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_config_name.py
+#usr/lib/python2.7/idlelib/idle_test/test_config_name.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_config_name.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_configdialog.py
+#usr/lib/python2.7/idlelib/idle_test/test_configdialog.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_configdialog.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_delegator.py
+#usr/lib/python2.7/idlelib/idle_test/test_delegator.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_delegator.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.py
+#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_grep.py
+#usr/lib/python2.7/idlelib/idle_test/test_grep.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_grep.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.py
+#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_hyperparser.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.py
+#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_idlehistory.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_io.py
+#usr/lib/python2.7/idlelib/idle_test/test_io.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_io.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.py
+#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_parenmatch.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.py
+#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_rstrip.py
+#usr/lib/python2.7/idlelib/idle_test/test_rstrip.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_rstrip.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.py
+#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_searchdialogbase.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_searchengine.py
+#usr/lib/python2.7/idlelib/idle_test/test_searchengine.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_searchengine.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_text.py
+#usr/lib/python2.7/idlelib/idle_test/test_text.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_text.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_textview.py
+#usr/lib/python2.7/idlelib/idle_test/test_textview.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_textview.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_warning.py
+#usr/lib/python2.7/idlelib/idle_test/test_warning.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_warning.pyo
+#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.py
+#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.pyc
+#usr/lib/python2.7/idlelib/idle_test/test_widgetredir.pyo
 #usr/lib/python2.7/idlelib/idlever.py
 #usr/lib/python2.7/idlelib/idlever.pyc
 #usr/lib/python2.7/idlelib/idlever.pyo
@@ -1719,9 +1816,6 @@ usr/lib/python2.7/httplib.pyc
 #usr/lib/python2.7/idlelib/tabbedpages.py
 #usr/lib/python2.7/idlelib/tabbedpages.pyc
 #usr/lib/python2.7/idlelib/tabbedpages.pyo
-#usr/lib/python2.7/idlelib/testcode.py
-#usr/lib/python2.7/idlelib/testcode.pyc
-#usr/lib/python2.7/idlelib/testcode.pyo
 #usr/lib/python2.7/idlelib/textView.py
 #usr/lib/python2.7/idlelib/textView.pyc
 #usr/lib/python2.7/idlelib/textView.pyo
@@ -1809,6 +1903,9 @@ usr/lib/python2.7/json/scanner.pyc
 #usr/lib/python2.7/json/tests/test_speedups.py
 #usr/lib/python2.7/json/tests/test_speedups.pyc
 #usr/lib/python2.7/json/tests/test_speedups.pyo
+#usr/lib/python2.7/json/tests/test_tool.py
+#usr/lib/python2.7/json/tests/test_tool.pyc
+#usr/lib/python2.7/json/tests/test_tool.pyo
 #usr/lib/python2.7/json/tests/test_unicode.py
 #usr/lib/python2.7/json/tests/test_unicode.pyc
 #usr/lib/python2.7/json/tests/test_unicode.pyo
@@ -1819,7 +1916,7 @@ usr/lib/python2.7/json/tool.pyc
 usr/lib/python2.7/keyword.pyc
 #usr/lib/python2.7/keyword.pyo
 #usr/lib/python2.7/lib-dynload
-usr/lib/python2.7/lib-dynload/Python-2.7.3-py2.7.egg-info
+#usr/lib/python2.7/lib-dynload/Python-2.7.10-py2.7.egg-info
 usr/lib/python2.7/lib-dynload/_bisect.so
 usr/lib/python2.7/lib-dynload/_bsddb.so
 usr/lib/python2.7/lib-dynload/_codecs_cn.so
@@ -1860,7 +1957,7 @@ usr/lib/python2.7/lib-dynload/cStringIO.so
 usr/lib/python2.7/lib-dynload/cmath.so
 usr/lib/python2.7/lib-dynload/crypt.so
 usr/lib/python2.7/lib-dynload/datetime.so
-usr/lib/python2.7/lib-dynload/dbm.so
+#usr/lib/python2.7/lib-dynload/dbm_failed.so
 usr/lib/python2.7/lib-dynload/dl.so
 usr/lib/python2.7/lib-dynload/fcntl.so
 usr/lib/python2.7/lib-dynload/future_builtins.so
@@ -1926,12 +2023,27 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.py
 #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.pyc
 #usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.pyo
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.py
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.pyc
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_font.pyo
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.py
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyc
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.pyo
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.py
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.pyc
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.pyo
 #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.py
 #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyc
 #usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.pyo
 #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.py
 #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyc
 #usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.pyo
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.py
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.pyc
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.pyo
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.py
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.pyc
+#usr/lib/python2.7/lib-tk/test/test_tkinter/test_widgets.pyo
 #usr/lib/python2.7/lib-tk/test/test_ttk
 #usr/lib/python2.7/lib-tk/test/test_ttk/__init__.py
 #usr/lib/python2.7/lib-tk/test/test_ttk/__init__.pyc
@@ -1951,6 +2063,9 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.py
 #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.pyc
 #usr/lib/python2.7/lib-tk/test/test_ttk/test_widgets.pyo
+#usr/lib/python2.7/lib-tk/test/widget_tests.py
+#usr/lib/python2.7/lib-tk/test/widget_tests.pyc
+#usr/lib/python2.7/lib-tk/test/widget_tests.pyo
 #usr/lib/python2.7/lib-tk/tkColorChooser.py
 #usr/lib/python2.7/lib-tk/tkColorChooser.pyc
 #usr/lib/python2.7/lib-tk/tkColorChooser.pyo
@@ -1977,9 +2092,9 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib-tk/turtle.pyo
 #usr/lib/python2.7/lib2to3
 #usr/lib/python2.7/lib2to3/Grammar.txt
-#usr/lib/python2.7/lib2to3/Grammar2.7.3.final.0.pickle
+#usr/lib/python2.7/lib2to3/Grammar2.7.10.final.0.pickle
 #usr/lib/python2.7/lib2to3/PatternGrammar.txt
-#usr/lib/python2.7/lib2to3/PatternGrammar2.7.3.final.0.pickle
+#usr/lib/python2.7/lib2to3/PatternGrammar2.7.10.final.0.pickle
 #usr/lib/python2.7/lib2to3/__init__.py
 #usr/lib/python2.7/lib2to3/__init__.pyc
 #usr/lib/python2.7/lib2to3/__init__.pyo
@@ -2005,6 +2120,9 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib2to3/fixes/fix_apply.py
 #usr/lib/python2.7/lib2to3/fixes/fix_apply.pyc
 #usr/lib/python2.7/lib2to3/fixes/fix_apply.pyo
+#usr/lib/python2.7/lib2to3/fixes/fix_asserts.py
+#usr/lib/python2.7/lib2to3/fixes/fix_asserts.pyc
+#usr/lib/python2.7/lib2to3/fixes/fix_asserts.pyo
 #usr/lib/python2.7/lib2to3/fixes/fix_basestring.py
 #usr/lib/python2.7/lib2to3/fixes/fix_basestring.pyc
 #usr/lib/python2.7/lib2to3/fixes/fix_basestring.pyo
@@ -2207,6 +2325,7 @@ usr/lib/python2.7/lib-dynload/zlib.so
 #usr/lib/python2.7/lib2to3/tests/data/bom.py
 #usr/lib/python2.7/lib2to3/tests/data/crlf.py
 #usr/lib/python2.7/lib2to3/tests/data/different_encoding.py
+#usr/lib/python2.7/lib2to3/tests/data/false_encoding.py
 #usr/lib/python2.7/lib2to3/tests/data/fixers
 #usr/lib/python2.7/lib2to3/tests/data/fixers/bad_order.py
 #usr/lib/python2.7/lib2to3/tests/data/fixers/myfixes
@@ -2628,12 +2747,33 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/__init__.py
 #usr/lib/python2.7/test/__init__.pyc
 #usr/lib/python2.7/test/__init__.pyo
+#usr/lib/python2.7/test/_mock_backport.py
+#usr/lib/python2.7/test/_mock_backport.pyc
+#usr/lib/python2.7/test/_mock_backport.pyo
+#usr/lib/python2.7/test/audiodata
+#usr/lib/python2.7/test/audiodata/pluck-pcm16.aiff
+#usr/lib/python2.7/test/audiodata/pluck-pcm16.au
+#usr/lib/python2.7/test/audiodata/pluck-pcm16.wav
+#usr/lib/python2.7/test/audiodata/pluck-pcm24.aiff
+#usr/lib/python2.7/test/audiodata/pluck-pcm24.wav
+#usr/lib/python2.7/test/audiodata/pluck-pcm32.aiff
+#usr/lib/python2.7/test/audiodata/pluck-pcm32.au
+#usr/lib/python2.7/test/audiodata/pluck-pcm32.wav
+#usr/lib/python2.7/test/audiodata/pluck-pcm8.aiff
+#usr/lib/python2.7/test/audiodata/pluck-pcm8.au
+#usr/lib/python2.7/test/audiodata/pluck-pcm8.wav
+#usr/lib/python2.7/test/audiodata/pluck-ulaw.aifc
+#usr/lib/python2.7/test/audiodata/pluck-ulaw.au
 #usr/lib/python2.7/test/audiotest.au
+#usr/lib/python2.7/test/audiotests.py
+#usr/lib/python2.7/test/audiotests.pyc
+#usr/lib/python2.7/test/audiotests.pyo
 #usr/lib/python2.7/test/autotest.py
 #usr/lib/python2.7/test/autotest.pyc
 #usr/lib/python2.7/test/autotest.pyo
 #usr/lib/python2.7/test/bad_coding.py
 #usr/lib/python2.7/test/bad_coding2.py
+#usr/lib/python2.7/test/bad_coding3.py
 #usr/lib/python2.7/test/badcert.pem
 #usr/lib/python2.7/test/badkey.pem
 #usr/lib/python2.7/test/badsyntax_future3.py
@@ -2647,6 +2787,11 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/buffer_tests.py
 #usr/lib/python2.7/test/buffer_tests.pyc
 #usr/lib/python2.7/test/buffer_tests.pyo
+#usr/lib/python2.7/test/capath
+#usr/lib/python2.7/test/capath/4e1295a3.0
+#usr/lib/python2.7/test/capath/5ed36f99.0
+#usr/lib/python2.7/test/capath/6e88d7b8.0
+#usr/lib/python2.7/test/capath/99d0fa06.0
 #usr/lib/python2.7/test/cfgparser.1
 #usr/lib/python2.7/test/check_soundcard.vbs
 #usr/lib/python2.7/test/cjkencodings
@@ -2830,6 +2975,7 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/decimaltestdata/tointegral.decTest
 #usr/lib/python2.7/test/decimaltestdata/tointegralx.decTest
 #usr/lib/python2.7/test/decimaltestdata/xor.decTest
+#usr/lib/python2.7/test/dh1024.pem
 #usr/lib/python2.7/test/doctest_aliases.py
 #usr/lib/python2.7/test/doctest_aliases.pyc
 #usr/lib/python2.7/test/doctest_aliases.pyo
@@ -2849,6 +2995,18 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/greyrgb.uue
 #usr/lib/python2.7/test/https_svn_python_org_root.pem
 #usr/lib/python2.7/test/ieee754.txt
+#usr/lib/python2.7/test/imghdrdata
+#usr/lib/python2.7/test/imghdrdata/python.bmp
+#usr/lib/python2.7/test/imghdrdata/python.gif
+#usr/lib/python2.7/test/imghdrdata/python.jpg
+#usr/lib/python2.7/test/imghdrdata/python.pbm
+#usr/lib/python2.7/test/imghdrdata/python.pgm
+#usr/lib/python2.7/test/imghdrdata/python.png
+#usr/lib/python2.7/test/imghdrdata/python.ppm
+#usr/lib/python2.7/test/imghdrdata/python.ras
+#usr/lib/python2.7/test/imghdrdata/python.sgi
+#usr/lib/python2.7/test/imghdrdata/python.tiff
+#usr/lib/python2.7/test/imghdrdata/python.xbm
 #usr/lib/python2.7/test/infinite_reload.py
 #usr/lib/python2.7/test/infinite_reload.pyc
 #usr/lib/python2.7/test/infinite_reload.pyo
@@ -2858,18 +3016,29 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/inspect_fodder2.py
 #usr/lib/python2.7/test/inspect_fodder2.pyc
 #usr/lib/python2.7/test/inspect_fodder2.pyo
+#usr/lib/python2.7/test/keycert.passwd.pem
 #usr/lib/python2.7/test/keycert.pem
+#usr/lib/python2.7/test/keycert2.pem
+#usr/lib/python2.7/test/keycert3.pem
+#usr/lib/python2.7/test/keycert4.pem
 #usr/lib/python2.7/test/list_tests.py
 #usr/lib/python2.7/test/list_tests.pyc
 #usr/lib/python2.7/test/list_tests.pyo
 #usr/lib/python2.7/test/lock_tests.py
 #usr/lib/python2.7/test/lock_tests.pyc
 #usr/lib/python2.7/test/lock_tests.pyo
+#usr/lib/python2.7/test/make_ssl_certs.py
+#usr/lib/python2.7/test/make_ssl_certs.pyc
+#usr/lib/python2.7/test/make_ssl_certs.pyo
 #usr/lib/python2.7/test/mapping_tests.py
 #usr/lib/python2.7/test/mapping_tests.pyc
 #usr/lib/python2.7/test/mapping_tests.pyo
 #usr/lib/python2.7/test/math_testcases.txt
+#usr/lib/python2.7/test/mp_fork_bomb.py
+#usr/lib/python2.7/test/mp_fork_bomb.pyc
+#usr/lib/python2.7/test/mp_fork_bomb.pyo
 #usr/lib/python2.7/test/nokia.pem
+#usr/lib/python2.7/test/nullbytecert.pem
 #usr/lib/python2.7/test/nullcert.pem
 #usr/lib/python2.7/test/outstanding_bugs.py
 #usr/lib/python2.7/test/outstanding_bugs.pyc
@@ -2880,6 +3049,7 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/profilee.py
 #usr/lib/python2.7/test/profilee.pyc
 #usr/lib/python2.7/test/profilee.pyo
+#usr/lib/python2.7/test/pycacert.pem
 #usr/lib/python2.7/test/pyclbr_input.py
 #usr/lib/python2.7/test/pyclbr_input.pyc
 #usr/lib/python2.7/test/pyclbr_input.pyo
@@ -2907,12 +3077,20 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/reperf.py
 #usr/lib/python2.7/test/reperf.pyc
 #usr/lib/python2.7/test/reperf.pyo
+#usr/lib/python2.7/test/revocation.crl
 #usr/lib/python2.7/test/sample_doctest.py
 #usr/lib/python2.7/test/sample_doctest.pyc
 #usr/lib/python2.7/test/sample_doctest.pyo
+#usr/lib/python2.7/test/sample_doctest_no_docstrings.py
+#usr/lib/python2.7/test/sample_doctest_no_docstrings.pyc
+#usr/lib/python2.7/test/sample_doctest_no_docstrings.pyo
+#usr/lib/python2.7/test/sample_doctest_no_doctests.py
+#usr/lib/python2.7/test/sample_doctest_no_doctests.pyc
+#usr/lib/python2.7/test/sample_doctest_no_doctests.pyo
 #usr/lib/python2.7/test/script_helper.py
 #usr/lib/python2.7/test/script_helper.pyc
 #usr/lib/python2.7/test/script_helper.pyo
+#usr/lib/python2.7/test/selfsigned_pythontestdotnet.pem
 #usr/lib/python2.7/test/seq_tests.py
 #usr/lib/python2.7/test/seq_tests.pyc
 #usr/lib/python2.7/test/seq_tests.pyo
@@ -2922,7 +3100,11 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/sortperf.pyc
 #usr/lib/python2.7/test/sortperf.pyo
 #usr/lib/python2.7/test/ssl_cert.pem
+#usr/lib/python2.7/test/ssl_key.passwd.pem
 #usr/lib/python2.7/test/ssl_key.pem
+#usr/lib/python2.7/test/ssl_servers.py
+#usr/lib/python2.7/test/ssl_servers.pyc
+#usr/lib/python2.7/test/ssl_servers.pyo
 #usr/lib/python2.7/test/string_tests.py
 #usr/lib/python2.7/test/string_tests.pyc
 #usr/lib/python2.7/test/string_tests.pyo
@@ -2930,6 +3112,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py
 #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyc
 #usr/lib/python2.7/test/subprocessdata/sigchild_ignore.pyo
+#usr/lib/python2.7/test/symlink_support.py
+#usr/lib/python2.7/test/symlink_support.pyc
+#usr/lib/python2.7/test/symlink_support.pyo
 #usr/lib/python2.7/test/test_MimeWriter.py
 #usr/lib/python2.7/test/test_MimeWriter.pyc
 #usr/lib/python2.7/test/test_MimeWriter.pyo
@@ -2948,6 +3133,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test__locale.py
 #usr/lib/python2.7/test/test__locale.pyc
 #usr/lib/python2.7/test/test__locale.pyo
+#usr/lib/python2.7/test/test__osx_support.py
+#usr/lib/python2.7/test/test__osx_support.pyc
+#usr/lib/python2.7/test/test__osx_support.pyo
 #usr/lib/python2.7/test/test_abc.py
 #usr/lib/python2.7/test/test_abc.pyc
 #usr/lib/python2.7/test/test_abc.pyo
@@ -3280,6 +3468,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_email_renamed.py
 #usr/lib/python2.7/test/test_email_renamed.pyc
 #usr/lib/python2.7/test/test_email_renamed.pyo
+#usr/lib/python2.7/test/test_ensurepip.py
+#usr/lib/python2.7/test/test_ensurepip.pyc
+#usr/lib/python2.7/test/test_ensurepip.pyo
 #usr/lib/python2.7/test/test_enumerate.py
 #usr/lib/python2.7/test/test_enumerate.pyc
 #usr/lib/python2.7/test/test_enumerate.pyo
@@ -3310,6 +3501,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_file2k.py
 #usr/lib/python2.7/test/test_file2k.pyc
 #usr/lib/python2.7/test/test_file2k.pyo
+#usr/lib/python2.7/test/test_file_eintr.py
+#usr/lib/python2.7/test/test_file_eintr.pyc
+#usr/lib/python2.7/test/test_file_eintr.pyo
 #usr/lib/python2.7/test/test_filecmp.py
 #usr/lib/python2.7/test/test_filecmp.pyc
 #usr/lib/python2.7/test/test_filecmp.pyo
@@ -3445,6 +3639,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_httpservers.py
 #usr/lib/python2.7/test/test_httpservers.pyc
 #usr/lib/python2.7/test/test_httpservers.pyo
+#usr/lib/python2.7/test/test_idle.py
+#usr/lib/python2.7/test/test_idle.pyc
+#usr/lib/python2.7/test/test_idle.pyo
 #usr/lib/python2.7/test/test_imageop.py
 #usr/lib/python2.7/test/test_imageop.pyc
 #usr/lib/python2.7/test/test_imageop.pyo
@@ -3454,6 +3651,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_imgfile.py
 #usr/lib/python2.7/test/test_imgfile.pyc
 #usr/lib/python2.7/test/test_imgfile.pyo
+#usr/lib/python2.7/test/test_imghdr.py
+#usr/lib/python2.7/test/test_imghdr.pyc
+#usr/lib/python2.7/test/test_imghdr.pyo
 #usr/lib/python2.7/test/test_imp.py
 #usr/lib/python2.7/test/test_imp.pyc
 #usr/lib/python2.7/test/test_imp.pyo
@@ -3541,6 +3741,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_macpath.py
 #usr/lib/python2.7/test/test_macpath.pyc
 #usr/lib/python2.7/test/test_macpath.pyo
+#usr/lib/python2.7/test/test_macurl2path.py
+#usr/lib/python2.7/test/test_macurl2path.pyc
+#usr/lib/python2.7/test/test_macurl2path.pyo
 #usr/lib/python2.7/test/test_mailbox.py
 #usr/lib/python2.7/test/test_mailbox.pyc
 #usr/lib/python2.7/test/test_mailbox.pyo
@@ -3610,6 +3813,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_nis.py
 #usr/lib/python2.7/test/test_nis.pyc
 #usr/lib/python2.7/test/test_nis.pyo
+#usr/lib/python2.7/test/test_nntplib.py
+#usr/lib/python2.7/test/test_nntplib.pyc
+#usr/lib/python2.7/test/test_nntplib.pyo
 #usr/lib/python2.7/test/test_normalization.py
 #usr/lib/python2.7/test/test_normalization.pyc
 #usr/lib/python2.7/test/test_normalization.pyo
@@ -3841,6 +4047,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_sort.py
 #usr/lib/python2.7/test/test_sort.pyc
 #usr/lib/python2.7/test/test_sort.pyo
+#usr/lib/python2.7/test/test_spwd.py
+#usr/lib/python2.7/test/test_spwd.pyc
+#usr/lib/python2.7/test/test_spwd.pyo
 #usr/lib/python2.7/test/test_sqlite.py
 #usr/lib/python2.7/test/test_sqlite.pyc
 #usr/lib/python2.7/test/test_sqlite.pyo
@@ -3850,6 +4059,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_startfile.py
 #usr/lib/python2.7/test/test_startfile.pyc
 #usr/lib/python2.7/test/test_startfile.pyo
+#usr/lib/python2.7/test/test_stat.py
+#usr/lib/python2.7/test/test_stat.pyc
+#usr/lib/python2.7/test/test_stat.pyo
 #usr/lib/python2.7/test/test_str.py
 #usr/lib/python2.7/test/test_str.pyc
 #usr/lib/python2.7/test/test_str.pyo
@@ -3883,6 +4095,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_subprocess.py
 #usr/lib/python2.7/test/test_subprocess.pyc
 #usr/lib/python2.7/test/test_subprocess.pyo
+#usr/lib/python2.7/test/test_sunau.py
+#usr/lib/python2.7/test/test_sunau.pyc
+#usr/lib/python2.7/test/test_sunau.pyo
 #usr/lib/python2.7/test/test_sunaudiodev.py
 #usr/lib/python2.7/test/test_sunaudiodev.pyc
 #usr/lib/python2.7/test/test_sunaudiodev.pyo
@@ -3946,6 +4161,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_time.py
 #usr/lib/python2.7/test/test_time.pyc
 #usr/lib/python2.7/test/test_time.pyo
+#usr/lib/python2.7/test/test_timeit.py
+#usr/lib/python2.7/test/test_timeit.pyc
+#usr/lib/python2.7/test/test_timeit.pyo
 #usr/lib/python2.7/test/test_timeout.py
 #usr/lib/python2.7/test/test_timeout.pyc
 #usr/lib/python2.7/test/test_timeout.pyo
@@ -3955,6 +4173,9 @@ usr/lib/python2.7/tempfile.pyc
 #usr/lib/python2.7/test/test_tokenize.py
 #usr/lib/python2.7/test/test_tokenize.pyc
 #usr/lib/python2.7/test/test_tokenize.pyo
+#usr/lib/python2.7/test/test_tools.py
+#usr/lib/python2.7/test/test_tools.pyc
+#usr/lib/python2.7/test/test_tools.pyo
 #usr/lib/python2.7/test/test_trace.py
 #usr/lib/python2.7/test/test_trace.pyc
 #usr/lib/python2.7/test/test_trace.pyo
@@ -4400,4 +4621,6 @@ usr/lib/python2.7/xmlrpclib.pyc
 #usr/lib/python2.7/zipfile.py
 usr/lib/python2.7/zipfile.pyc
 #usr/lib/python2.7/zipfile.pyo
+#usr/share/man/man1/python.1
+#usr/share/man/man1/python2.1
 #usr/share/man/man1/python2.7.1

config/rootfiles/common/web-user-interface

@@ -341,7 +341,6 @@ srv/web/ipfire/html/themes/ipfire/include/js/refreshInetInfo.js
 srv/web/ipfire/html/themes/maniac
 srv/web/ipfire/html/themes/maniac/images
 srv/web/ipfire/html/themes/maniac/images/IPFire.png
-srv/web/ipfire/html/themes/maniac/images/Thumbs.db
 srv/web/ipfire/html/themes/maniac/images/b1.gif
 srv/web/ipfire/html/themes/maniac/images/b2.gif
 srv/web/ipfire/html/themes/maniac/images/b3.gif

config/rootfiles/core/92/filelists/files

@@ -0,0 +1,10 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/connections.cgi
+srv/web/ipfire/cgi-bin/dhcp.cgi
+srv/web/ipfire/cgi-bin/vpnmain.cgi
+srv/web/ipfire/cgi-bin/webaccess.cgi
+var/ipfire/graphs.pl
+var/ipfire/network-functions.pl
+var/ipfire/langs
+var/ipfire/urlfilter/bin/autoupdate.pl

config/rootfiles/core/92/filelists/libgcrypt

@@ -0,0 +1 @@
+../../../common/libgcrypt

config/rootfiles/core/92/filelists/libgpg-error

@@ -0,0 +1 @@
+../../../common/libgpg-error

config/rootfiles/core/92/filelists/libusb

@@ -0,0 +1 @@
+../../../common/libusb

config/rootfiles/core/92/filelists/libusb-compat

@@ -0,0 +1 @@
+../../../common/libusb-compat

config/rootfiles/core/92/filelists/rrdtool

@@ -0,0 +1 @@
+../../../common/rrdtool

config/rootfiles/core/92/update.sh

@@ -0,0 +1,61 @@
+#!/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) 2015 IPFire-Team <info@ipfire.org>.                        #
+#                                                                          #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+# Remove old core updates from pakfire cache to save space...
+core=92
+for (( i=1; i<=$core; i++ ))
+do
+	rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+/etc/init.d/ipsec stop
+
+# Extract files
+extract_files
+
+# Update Language cache
+/usr/local/bin/update-lang-cache
+
+# Regenerate IPsec configuration
+sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi
+
+sync
+
+# Start services
+if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then
+	/etc/init.d/ipsec start
+fi
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Don't report the exitcode last command
+exit 0

config/rootfiles/oldcore/89/filelists/libpcap

@@ -0,0 +1 @@
+../../../common/libpcap

config/rootfiles/oldcore/90/filelists/dnsmasq

@@ -0,0 +1 @@
+../../../common/dnsmasq