components/python/python27/patches/20-bsddb-harmful.patch
branchs11-update
changeset 3565 2d729d36ded7
parent 3367 ed5024e47b53
equal deleted inserted replaced
3564:8c7929b76aec 3565:2d729d36ded7
     1 Prior to 2.7.4, the bsddb module was a no-op, as it did not get built.
     1 Prior to 2.7.4, the bsddb module was a no-op, as it did not get built.
     2 Starting with 2.7.4, the behavior is different, and it causes tests to
     2 Starting with 2.7.4, the behavior is different, and it causes tests to
     3 dump core.  So skip it.  The module is removed in Python 3, so this patch
     3 dump core.  So skip it.  The module is removed in Python 3, so this patch
     4 is not being submitted upstream.
     4 is not being submitted upstream.
     5 
     5 
     6 --- Python-2.7.7/Makefile.pre.in.~4~	2014-06-02 11:08:40.909703116 -0700
     6 --- Python-2.7.9/Makefile.pre.in.~4~	2014-12-17 11:48:03.048413898 -0800
     7 +++ Python-2.7.7/Makefile.pre.in	2014-06-02 11:08:40.977964319 -0700
     7 +++ Python-2.7.9/Makefile.pre.in	2014-12-17 11:48:03.100768673 -0800
     8 @@ -975,7 +975,7 @@
     8 @@ -1008,7 +1008,7 @@
     9  		email email/mime email/test email/test/data \
     9  		ensurepip ensurepip/_bundled \
    10  		json json/tests \
    10  		json json/tests \
    11  		sqlite3 sqlite3/test \
    11  		sqlite3 sqlite3/test \
    12 -		logging bsddb bsddb/test csv importlib wsgiref \
    12 -		logging bsddb bsddb/test csv importlib wsgiref \
    13 +		logging csv importlib wsgiref \
    13 +		logging csv importlib wsgiref \
    14  		lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
    14  		lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
    15  		lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
    15  		lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
    16  		ctypes ctypes/test ctypes/macholib \
    16  		ctypes ctypes/test ctypes/macholib \
    17 --- Python-2.7.8/setup.py.~6~	2014-07-17 20:49:23.834928506 -0700
    17 --- Python-2.7.9/setup.py.~6~	2014-12-11 09:35:14.246397752 -0800
    18 +++ Python-2.7.8/setup.py	2014-07-17 20:49:23.872603149 -0700
    18 +++ Python-2.7.9/setup.py	2014-12-11 09:35:14.274861676 -0800
    19 @@ -1067,7 +1067,8 @@
    19 @@ -1069,7 +1069,8 @@
    20                                      db_dirs_to_check + lib_dirs, dblib )
    20                                      db_dirs_to_check + lib_dirs, dblib )
    21                      if dblib_file:
    21                      if dblib_file:
    22                          dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
    22                          dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
    23 -                        raise db_found
    23 -                        raise db_found
    24 +                        # Doesn't work; skip.
    24 +                        # Doesn't work; skip.