Merge remote-tracking branch 'mfischer/python' into next

diff --git a/config/rootfiles/common/python b/config/rootfiles/common/python
index 3472e251783a3000d914d0b299203d535e23090b..4f11c5621b261144f00356f0a73589de9aea0665 100644 (file)
--- a/config/rootfiles/common/python
+++ b/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
@@ -605,6 +611,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 +1461,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-1.5.6-py2.py3-none-any.whl
+#usr/lib/python2.7/ensurepip/_bundled/setuptools-7.0-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 +1605,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 +1730,77 @@ 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_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
@@ -1809,6 +1909,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 +1922,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.9-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 +1963,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 +2029,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 +2069,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 +2098,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.9.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.9.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 +2126,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 +2331,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 +2753,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 +2793,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 +2981,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/dh512.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 +3001,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 +3022,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 +3055,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 +3083,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 +3106,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 +3118,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 +3139,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 +3474,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 +3507,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 +3645,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 +3657,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 +3747,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 +3819,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 +4053,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 +4065,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 +4101,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
@@ -3955,6 +4176,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 +4624,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

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index e29541256b06300509675bd555b9d420bf703d51..defb632ceb418ec149c0f1aad571e5ef9450f8ee 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -691,7 +691,7 @@
 'dhcp advopt removed' => 'DHCP Option entfernt',
 'dhcp advopt scope' => 'Options-Wertebereich',
 'dhcp advopt scope global' => 'Global',
-'dhcp advopt scope help' => 'Globaler Bereich oder begenze Bereich auf überprüfte Schnittstellen',
+'dhcp advopt scope help' => 'Globaler Bereich oder begrenze Bereich auf überprüfte Schnittstellen',
 'dhcp advopt unknown' => 'Name der DHCP Option wurde nicht erkannt',
 'dhcp advopt value' => 'Optionswert',
 'dhcp allow bootp' => 'BOOTP Clients zulassen',

diff --git a/lfs/python b/lfs/python
index 6095e5ed02ecb3c6f8a450a8766ebc1bb5b303e0..acd230cb015072d360adf73e8e9a5304efec1ac3 100644 (file)
--- a/lfs/python
+++ b/lfs/python
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2011  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2015  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.7.3
+VER        = 2.7.9
 
 THISAPP    = Python-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 62c4c1699170078c469f79ddfed21bc0
+$(DL_FILE)_MD5 = 38d530f7efc373d64a8fb1637e3baaa7
 
 install : $(TARGET)
 

diff --git a/src/patches/Python-2.7.9-gdbm-1.patch b/src/patches/Python-2.7.9-gdbm-1.patch
new file mode 100644 (file)
index 0000000..c72b452
--- /dev/null
+++ b/src/patches/Python-2.7.9-gdbm-1.patch
@@ -0,0 +1,21 @@
+diff -Naur Python-2.7-org/setup.py Python-2.7/setup.py
+--- Python-2.7-org/setup.py    2010-06-27 14:36:16.000000000 +0200
++++ Python-2.7/setup.py        2010-07-13 22:23:04.000000000 +0200
+@@ -1125,7 +1125,7 @@
+                                                                'ndbm'):
+                             ndbm_libs = ['ndbm']
+                         else:
+-                            ndbm_libs = []
++                            ndbm_libs = ['gdbm', 'gdbm_compat' ]
+                         print "building dbm using ndbm"
+                         dbmext = Extension('dbm', ['dbmmodule.c'],
+                                            define_macros=[
+@@ -1140,7 +1140,7 @@
+                         if self.compiler.find_library_file(lib_dirs,
+                                                                'gdbm_compat'):
+                             gdbm_libs.append('gdbm_compat')
+-                        if find_file("gdbm/ndbm.h", inc_dirs, []) is not None:
++                        if find_file("ndbm.h", inc_dirs, []) is not None:
+                             print "building dbm using gdbm"
+                             dbmext = Extension(
+                                 'dbm', ['dbmmodule.c'],

diff --git a/src/patches/openssl-1.0.2-fix_parallel_build-1.patch b/src/patches/openssl-1.0.2-fix_parallel_build-1.patch
new file mode 100644 (file)
index 0000000..acfaa72
--- /dev/null
+++ b/src/patches/openssl-1.0.2-fix_parallel_build-1.patch
@@ -0,0 +1,340 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2015-01-23
+Initial Package Version: 1.0.1e
+Upstream Status:         Unknown
+Origin:                  https://github.com/Alexpux/Qt-builds/tree/master/patches/openssl
+Description:             Fixes build when using more than one make job to build the package.
+
+--- a/crypto/Makefile  2015-01-22 17:12:09.000000000 +0100
++++ b/crypto/Makefile  2015-01-23 16:42:13.460175569 +0100
+@@ -85,11 +85,11 @@
+       @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
+ 
+ subdirs:
+-      @target=all; $(RECURSIVE_MAKE)
++      +@target=all; $(RECURSIVE_MAKE)
+ 
+ files:
+       $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO
+-      @target=files; $(RECURSIVE_MAKE)
++      +@target=files; $(RECURSIVE_MAKE)
+ 
+ links:
+       @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER)
+@@ -100,7 +100,7 @@
+ # lib: $(LIB): are splitted to avoid end-less loop
+ lib:  $(LIB)
+       @touch lib
+-$(LIB):       $(LIBOBJ)
++$(LIB):       $(LIBOBJ) | subdirs
+       $(AR) $(LIB) $(LIBOBJ)
+       test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o
+       $(RANLIB) $(LIB) || echo Never mind.
+@@ -111,7 +111,7 @@
+       fi
+ 
+ libs:
+-      @target=lib; $(RECURSIVE_MAKE)
++      +@target=lib; $(RECURSIVE_MAKE)
+ 
+ install:
+       @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
+@@ -120,7 +120,7 @@
+       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+       done;
+-      @target=install; $(RECURSIVE_MAKE)
++      +@target=install; $(RECURSIVE_MAKE)
+ 
+ lint:
+       @target=lint; $(RECURSIVE_MAKE)
+--- a/engines/Makefile 2015-01-22 17:12:24.000000000 +0100
++++ b/engines/Makefile 2015-01-23 16:42:13.461175596 +0100
+@@ -72,7 +72,7 @@
+ 
+ all:  lib subdirs
+ 
+-lib:  $(LIBOBJ)
++lib:  $(LIBOBJ) | subdirs
+       @if [ -n "$(SHARED_LIBS)" ]; then \
+               set -e; \
+               for l in $(LIBNAMES); do \
+@@ -89,7 +89,7 @@
+ 
+ subdirs:
+       echo $(EDIRS)
+-      @target=all; $(RECURSIVE_MAKE)
++      +@target=all; $(RECURSIVE_MAKE)
+ 
+ files:
+       $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO
+@@ -128,7 +128,7 @@
+                         mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \
+               done; \
+       fi
+-      @target=install; $(RECURSIVE_MAKE)
++      +@target=install; $(RECURSIVE_MAKE)
+ 
+ tags:
+       ctags $(SRC)
+--- a/Makefile.org     2015-01-22 15:58:06.000000000 +0100
++++ b/Makefile.org     2015-01-23 16:42:13.461175596 +0100
+@@ -274,17 +274,17 @@
+ build_libs: build_crypto build_ssl build_engines
+ 
+ build_crypto:
+-      @dir=crypto; target=all; $(BUILD_ONE_CMD)
+-build_ssl:
+-      @dir=ssl; target=all; $(BUILD_ONE_CMD)
+-build_engines:
+-      @dir=engines; target=all; $(BUILD_ONE_CMD)
+-build_apps:
+-      @dir=apps; target=all; $(BUILD_ONE_CMD)
+-build_tests:
+-      @dir=test; target=all; $(BUILD_ONE_CMD)
+-build_tools:
+-      @dir=tools; target=all; $(BUILD_ONE_CMD)
++      +@dir=crypto; target=all; $(BUILD_ONE_CMD)
++build_ssl: build_crypto
++      +@dir=ssl; target=all; $(BUILD_ONE_CMD)
++build_engines: build_crypto
++      +@dir=engines; target=all; $(BUILD_ONE_CMD)
++build_apps: build_libs
++      +@dir=apps; target=all; $(BUILD_ONE_CMD)
++build_tests: build_libs
++      +@dir=test; target=all; $(BUILD_ONE_CMD)
++build_tools: build_libs
++      +@dir=tools; target=all; $(BUILD_ONE_CMD)
+ 
+ all_testapps: build_libs build_testapps
+ build_testapps:
+@@ -536,9 +536,9 @@
+ dist_pem_h:
+       (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
+ 
+-install: all install_docs install_sw
++install: install_docs install_sw
+ 
+-install_sw:
++install_dirs:
+       @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+               $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
+               $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
+@@ -547,12 +547,19 @@
+               $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+               $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+               $(INSTALL_PREFIX)$(OPENSSLDIR)/private
++      @$(PERL) $(TOP)/util/mkdir-p.pl \
++              $(INSTALL_PREFIX)$(MANDIR)/man1 \
++              $(INSTALL_PREFIX)$(MANDIR)/man3 \
++              $(INSTALL_PREFIX)$(MANDIR)/man5 \
++              $(INSTALL_PREFIX)$(MANDIR)/man7
++
++install_sw: install_dirs
+       @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
+       do \
+       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+       done;
+-      @set -e; target=install; $(RECURSIVE_BUILD_CMD)
++      +@set -e; target=install; $(RECURSIVE_BUILD_CMD)
+       @set -e; liblist="$(LIBS)"; for i in $$liblist ;\
+       do \
+               if [ -f "$$i" ]; then \
+@@ -636,12 +643,7 @@
+               done; \
+       done
+ 
+-install_docs:
+-      @$(PERL) $(TOP)/util/mkdir-p.pl \
+-              $(INSTALL_PREFIX)$(MANDIR)/man1 \
+-              $(INSTALL_PREFIX)$(MANDIR)/man3 \
+-              $(INSTALL_PREFIX)$(MANDIR)/man5 \
+-              $(INSTALL_PREFIX)$(MANDIR)/man7
++install_docs: install_dirs
+       @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \
+       here="`pwd`"; \
+       filecase=; \
+--- a/Makefile.shared  2015-01-20 13:33:36.000000000 +0100
++++ b/Makefile.shared  2015-01-23 16:42:13.461175596 +0100
+@@ -105,6 +105,7 @@
+     SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \
+     LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \
+     LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \
++    [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \
+     LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \
+     $${SHAREDCMD} $${SHAREDFLAGS} \
+       -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
+@@ -122,6 +123,7 @@
+                       done; \
+               fi; \
+               if [ -n "$$SHLIB_SOVER" ]; then \
++                      [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \
+                       ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \
+                         ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
+               fi; \
+--- a/test/Makefile    2015-01-22 17:12:26.000000000 +0100
++++ b/test/Makefile    2015-01-23 16:42:13.461175596 +0100
+@@ -132,7 +132,7 @@
+ tags:
+       ctags $(SRC)
+ 
+-tests:        exe apps $(TESTS)
++tests:        exe $(TESTS)
+ 
+ apps:
+       @(cd ..; $(MAKE) DIRS=apps all)
+@@ -398,109 +398,109 @@
+               link_app.$${shlib_target}
+ 
+ $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO)
+-      @target=$(RSATEST); $(BUILD_CMD)
++      +@target=$(RSATEST); $(BUILD_CMD)
+ 
+ $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO)
+-      @target=$(BNTEST); $(BUILD_CMD)
++      +@target=$(BNTEST); $(BUILD_CMD)
+ 
+ $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO)
+-      @target=$(ECTEST); $(BUILD_CMD)
++      +@target=$(ECTEST); $(BUILD_CMD)
+ 
+ $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO)
+-      @target=$(EXPTEST); $(BUILD_CMD)
++      +@target=$(EXPTEST); $(BUILD_CMD)
+ 
+ $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO)
+-      @target=$(IDEATEST); $(BUILD_CMD)
++      +@target=$(IDEATEST); $(BUILD_CMD)
+ 
+ $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO)
+-      @target=$(MD2TEST); $(BUILD_CMD)
++      +@target=$(MD2TEST); $(BUILD_CMD)
+ 
+ $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO)
+-      @target=$(SHATEST); $(BUILD_CMD)
++      +@target=$(SHATEST); $(BUILD_CMD)
+ 
+ $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO)
+-      @target=$(SHA1TEST); $(BUILD_CMD)
++      +@target=$(SHA1TEST); $(BUILD_CMD)
+ 
+ $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO)
+-      @target=$(SHA256TEST); $(BUILD_CMD)
++      +@target=$(SHA256TEST); $(BUILD_CMD)
+ 
+ $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO)
+-      @target=$(SHA512TEST); $(BUILD_CMD)
++      +@target=$(SHA512TEST); $(BUILD_CMD)
+ 
+ $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO)
+-      @target=$(RMDTEST); $(BUILD_CMD)
++      +@target=$(RMDTEST); $(BUILD_CMD)
+ 
+ $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO)
+-      @target=$(MDC2TEST); $(BUILD_CMD)
++      +@target=$(MDC2TEST); $(BUILD_CMD)
+ 
+ $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO)
+-      @target=$(MD4TEST); $(BUILD_CMD)
++      +@target=$(MD4TEST); $(BUILD_CMD)
+ 
+ $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO)
+-      @target=$(MD5TEST); $(BUILD_CMD)
++      +@target=$(MD5TEST); $(BUILD_CMD)
+ 
+ $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO)
+-      @target=$(HMACTEST); $(BUILD_CMD)
++      +@target=$(HMACTEST); $(BUILD_CMD)
+ 
+ $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO)
+-      @target=$(WPTEST); $(BUILD_CMD)
++      +@target=$(WPTEST); $(BUILD_CMD)
+ 
+ $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO)
+-      @target=$(RC2TEST); $(BUILD_CMD)
++      +@target=$(RC2TEST); $(BUILD_CMD)
+ 
+ $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO)
+-      @target=$(BFTEST); $(BUILD_CMD)
++      +@target=$(BFTEST); $(BUILD_CMD)
+ 
+ $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO)
+-      @target=$(CASTTEST); $(BUILD_CMD)
++      +@target=$(CASTTEST); $(BUILD_CMD)
+ 
+ $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO)
+-      @target=$(RC4TEST); $(BUILD_CMD)
++      +@target=$(RC4TEST); $(BUILD_CMD)
+ 
+ $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO)
+-      @target=$(RC5TEST); $(BUILD_CMD)
++      +@target=$(RC5TEST); $(BUILD_CMD)
+ 
+ $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO)
+-      @target=$(DESTEST); $(BUILD_CMD)
++      +@target=$(DESTEST); $(BUILD_CMD)
+ 
+ $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO)
+-      @target=$(RANDTEST); $(BUILD_CMD)
++      +@target=$(RANDTEST); $(BUILD_CMD)
+ 
+ $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO)
+-      @target=$(DHTEST); $(BUILD_CMD)
++      +@target=$(DHTEST); $(BUILD_CMD)
+ 
+ $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO)
+-      @target=$(DSATEST); $(BUILD_CMD)
++      +@target=$(DSATEST); $(BUILD_CMD)
+ 
+ $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO)
+-      @target=$(METHTEST); $(BUILD_CMD)
++      +@target=$(METHTEST); $(BUILD_CMD)
+ 
+ $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO)
+-      @target=$(SSLTEST); $(FIPS_BUILD_CMD)
++      +@target=$(SSLTEST); $(FIPS_BUILD_CMD)
+ 
+ $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO)
+-      @target=$(ENGINETEST); $(BUILD_CMD)
++      +@target=$(ENGINETEST); $(BUILD_CMD)
+ 
+ $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO)
+-      @target=$(EVPTEST); $(BUILD_CMD)
++      +@target=$(EVPTEST); $(BUILD_CMD)
+ 
+ $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO)
+-      @target=$(ECDSATEST); $(BUILD_CMD)
++      +@target=$(ECDSATEST); $(BUILD_CMD)
+ 
+ $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO)
+-      @target=$(ECDHTEST); $(BUILD_CMD)
++      +@target=$(ECDHTEST); $(BUILD_CMD)
+ 
+ $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO)
+-      @target=$(IGETEST); $(BUILD_CMD)
++      +@target=$(IGETEST); $(BUILD_CMD)
+ 
+ $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO)
+-      @target=$(JPAKETEST); $(BUILD_CMD)
++      +@target=$(JPAKETEST); $(BUILD_CMD)
+ 
+ $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO)
+-      @target=$(ASN1TEST); $(BUILD_CMD)
++      +@target=$(ASN1TEST); $(BUILD_CMD)
+ 
+ $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO)
+-      @target=$(SRPTEST); $(BUILD_CMD)
++      +@target=$(SRPTEST); $(BUILD_CMD)
+ 
+ $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO)
+       @target=$(V3NAMETEST); $(BUILD_CMD)
+@@ -522,7 +522,7 @@
+ #     fi
+ 
+ dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO)
+-      @target=dummytest; $(BUILD_CMD)
++      +@target=dummytest; $(BUILD_CMD)
+ 
+ # DO NOT DELETE THIS LINE -- make depend depends on it.
+