From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- .../ldb/files/ldb-1.1.27-optional_packages.patch | 92 ---------------------- sys-libs/ldb/files/ldb-1.1.29-disable-python.patch | 48 ----------- .../ldb/files/ldb-1.1.31-optional_packages.patch | 57 -------------- .../files/ldb-1.1.31-talloc-disable-python.patch | 34 -------- sys-libs/ldb/files/ldb-1.2.3-disable_python.patch | 64 --------------- .../ldb/files/ldb-1.4.0-optional_packages.patch | 45 ----------- 6 files changed, 340 deletions(-) delete mode 100644 sys-libs/ldb/files/ldb-1.1.27-optional_packages.patch delete mode 100644 sys-libs/ldb/files/ldb-1.1.29-disable-python.patch delete mode 100644 sys-libs/ldb/files/ldb-1.1.31-optional_packages.patch delete mode 100644 sys-libs/ldb/files/ldb-1.1.31-talloc-disable-python.patch delete mode 100644 sys-libs/ldb/files/ldb-1.2.3-disable_python.patch delete mode 100644 sys-libs/ldb/files/ldb-1.4.0-optional_packages.patch (limited to 'sys-libs/ldb/files') diff --git a/sys-libs/ldb/files/ldb-1.1.27-optional_packages.patch b/sys-libs/ldb/files/ldb-1.1.27-optional_packages.patch deleted file mode 100644 index 92e14c651c86..000000000000 --- a/sys-libs/ldb/files/ldb-1.1.27-optional_packages.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- ldb-1.1.27/lib/talloc/wscript -+++ ldb-1.1.27/lib/talloc/wscript -@@ -48,7 +48,7 @@ - if conf.CHECK_BUNDLED_SYSTEM_PKG('talloc', minversion=VERSION, - implied_deps='replace'): - conf.define('USING_SYSTEM_TALLOC', 1) -- if conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION, -+ if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION, - implied_deps='talloc replace'): - conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1) - ---- ldb-1.1.27/wscript -+++ ldb-1.1.27/wscript -@@ -5,6 +5,7 @@ - - blddir = 'bin' - -+import Logs - import sys, os - - # find the buildtools directory -@@ -13,7 +14,7 @@ - srcdir = srcdir + '/..' - sys.path.insert(0, srcdir + '/buildtools/wafsamba') - --import wafsamba, samba_dist, Utils -+import wafsamba, samba_dist, Utils, Options - - samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc - lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent -@@ -28,8 +29,21 @@ - opt.RECURSE('lib/tevent') - opt.RECURSE('lib/replace') - opt.tool_options('python') # options for disabling pyc or pyo compilation -+ if opt.IN_LAUNCH_DIR(): -+ opt.add_option('--disable-python', -+ help=("disable the pyldb modules"), -+ action="store_true", dest='disable_python', default=False) -+ if opt.IN_LAUNCH_DIR(): -+ opt.add_option('--disable-ldap', -+ help=("disable ldap support"), -+ action="store_true", dest='disable_ldap', default=False) - - def configure(conf): -+ conf.env.standalone_ldb = conf.IN_LAUNCH_DIR() -+ -+ conf.env.disable_python = getattr(Options.options, 'disable_python', False) -+ conf.env.disable_ldap = getattr(Options.options, 'disable_ldap', False) -+ - conf.RECURSE('lib/tdb') - conf.RECURSE('lib/tevent') - -@@ -44,16 +58,18 @@ - conf.RECURSE('lib/replace') - conf.find_program('python', var='PYTHON') - conf.find_program('xsltproc', var='XSLTPROC') -- conf.check_tool('python') -- conf.check_python_version((2,4,2)) -- conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True) -+ -+ if not conf.env.disable_python: -+ conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,4,2)) -+ conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False) -+ if not conf.env.HAVE_PYTHON_H: -+ Logs.warn('Disabling pyldb-util as python devel libs not found') -+ conf.env.disable_python = True - - # where does the default LIBDIR end up? in conf.env somewhere? - # - conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') + '/ldb') - -- conf.env.standalone_ldb = conf.IN_LAUNCH_DIR() -- - if not conf.env.standalone_ldb: - if conf.CHECK_BUNDLED_SYSTEM_PKG('pyldb-util', minversion=VERSION, - onlyif='talloc tdb tevent', -@@ -67,9 +83,12 @@ - if conf.env.standalone_ldb: - conf.CHECK_XSLTPROC_MANPAGES() - -- # we need this for the ldap backend -- if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): -- conf.env.ENABLE_LDAP_BACKEND = True -+ if not conf.env.disable_ldap: -+ # we need this for the ldap backend -+ if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): -+ conf.env.ENABLE_LDAP_BACKEND = True -+ else: -+ conf.env.ENABLE_LDAP_BACKEND = False - - # we don't want any libraries or modules to rely on runtime - # resolution of symbols diff --git a/sys-libs/ldb/files/ldb-1.1.29-disable-python.patch b/sys-libs/ldb/files/ldb-1.1.29-disable-python.patch deleted file mode 100644 index bc4120e8acf6..000000000000 --- a/sys-libs/ldb/files/ldb-1.1.29-disable-python.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/lib/tdb/wscript 2016-11-30 09:56:00.000000000 -0500 -+++ b/lib/tdb/wscript 2017-02-08 16:37:49.160987205 -0500 -@@ -77,16 +77,16 @@ - conf.env.standalone_tdb = conf.IN_LAUNCH_DIR() - conf.env.building_tdb = True - -+ conf.env.disable_python = getattr(Options.options, 'disable_python', False) -+ - if not conf.env.standalone_tdb: - if conf.CHECK_BUNDLED_SYSTEM_PKG('tdb', minversion=VERSION, - implied_deps='replace'): - conf.define('USING_SYSTEM_TDB', 1) - conf.env.building_tdb = False -- if conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytdb', 'tdb', minversion=VERSION): -+ if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytdb', 'tdb', minversion=VERSION): - conf.define('USING_SYSTEM_PYTDB', 1) - -- conf.env.disable_python = getattr(Options.options, 'disable_python', False) -- - if (conf.CONFIG_SET('HAVE_ROBUST_MUTEXES') and - conf.env.building_tdb and - not conf.env.disable_tdb_mutex_locking): ---- a/lib/tevent/wscript 2016-10-07 00:45:35.000000000 -0400 -+++ b/lib/tevent/wscript 2017-02-08 16:39:22.478733175 -0500 -@@ -34,11 +34,13 @@ - - conf.env.standalone_tevent = conf.IN_LAUNCH_DIR() - -+ conf.env.disable_python = getattr(Options.options, 'disable_python', False) -+ - if not conf.env.standalone_tevent: - if conf.CHECK_BUNDLED_SYSTEM_PKG('tevent', minversion=VERSION, - onlyif='talloc', implied_deps='replace talloc'): - conf.define('USING_SYSTEM_TEVENT', 1) -- if conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION): -+ if not conf.env.disable_python and conf.CHECK_BUNDLED_SYSTEM_PYTHON('pytevent', 'tevent', minversion=VERSION): - conf.define('USING_SYSTEM_PYTEVENT', 1) - - if conf.CHECK_FUNCS('epoll_create', headers='sys/epoll.h'): -@@ -61,8 +63,6 @@ - if not conf.CONFIG_SET('USING_SYSTEM_TEVENT'): - conf.DEFINE('TEVENT_NUM_SIGNALS', tevent_num_signals) - -- conf.env.disable_python = getattr(Options.options, 'disable_python', False) -- - if not conf.env.disable_python: - # also disable if we don't have the python libs installed - conf.find_program('python', var='PYTHON') diff --git a/sys-libs/ldb/files/ldb-1.1.31-optional_packages.patch b/sys-libs/ldb/files/ldb-1.1.31-optional_packages.patch deleted file mode 100644 index 1e9b51773570..000000000000 --- a/sys-libs/ldb/files/ldb-1.1.31-optional_packages.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- ldb-1.1.27/wscript -+++ ldb-1.1.27/wscript -@@ -5,6 +5,7 @@ - - blddir = 'bin' - -+import Logs - import sys, os - - # find the buildtools directory -@@ -13,7 +14,7 @@ - srcdir = srcdir + '/..' - sys.path.insert(0, srcdir + '/buildtools/wafsamba') - --import wafsamba, samba_dist, Utils -+import wafsamba, samba_dist, Utils, Options - - samba_dist.DIST_DIRS('''lib/ldb:. lib/replace:lib/replace lib/talloc:lib/talloc - lib/tdb:lib/tdb lib/tdb:lib/tdb lib/tevent:lib/tevent -@@ -28,8 +29,21 @@ - opt.RECURSE('lib/tevent') - opt.RECURSE('lib/replace') - opt.tool_options('python') # options for disabling pyc or pyo compilation -+ if opt.IN_LAUNCH_DIR(): -+ opt.add_option('--disable-python', -+ help=("disable the pyldb modules"), -+ action="store_true", dest='disable_python', default=False) -+ if opt.IN_LAUNCH_DIR(): -+ opt.add_option('--disable-ldap', -+ help=("disable ldap support"), -+ action="store_true", dest='disable_ldap', default=False) - - def configure(conf): -+ conf.env.standalone_ldb = conf.IN_LAUNCH_DIR() -+ -+ conf.env.disable_python = getattr(Options.options, 'disable_python', False) -+ conf.env.disable_ldap = getattr(Options.options, 'disable_ldap', False) -+ - conf.RECURSE('lib/tdb') - conf.RECURSE('lib/tevent') - -@@ -67,9 +81,12 @@ - if conf.env.standalone_ldb: - conf.CHECK_XSLTPROC_MANPAGES() - -- # we need this for the ldap backend -- if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): -- conf.env.ENABLE_LDAP_BACKEND = True -+ if not conf.env.disable_ldap: -+ # we need this for the ldap backend -+ if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): -+ conf.env.ENABLE_LDAP_BACKEND = True -+ else: -+ conf.env.ENABLE_LDAP_BACKEND = False - - # we don't want any libraries or modules to rely on runtime - # resolution of symbols diff --git a/sys-libs/ldb/files/ldb-1.1.31-talloc-disable-python.patch b/sys-libs/ldb/files/ldb-1.1.31-talloc-disable-python.patch deleted file mode 100644 index 6ef45eb37fb8..000000000000 --- a/sys-libs/ldb/files/ldb-1.1.31-talloc-disable-python.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/lib/talloc/wscript 2017-04-28 04:57:26.000000000 -0400 -+++ b/lib/talloc/wscript 2017-07-05 14:30:42.700580464 -0400 -@@ -74,19 +74,22 @@ - implied_deps='replace'): - conf.define('USING_SYSTEM_TALLOC', 1) - -- using_system_pytalloc_util = True -- if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION, -- implied_deps='talloc replace'): -+ if conf.env.disable_python: - using_system_pytalloc_util = False -- -- # We need to get a pytalloc-util for all the python versions -- # we are building for -- if conf.env['EXTRA_PYTHON']: -- name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG'] -- if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, -+ else: -+ using_system_pytalloc_util = True -+ if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION, - implied_deps='talloc replace'): - using_system_pytalloc_util = False - -+ # We need to get a pytalloc-util for all the python versions -+ # we are building for -+ if conf.env['EXTRA_PYTHON']: -+ name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG'] -+ if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, -+ implied_deps='talloc replace'): -+ using_system_pytalloc_util = False -+ - if using_system_pytalloc_util: - conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1) - diff --git a/sys-libs/ldb/files/ldb-1.2.3-disable_python.patch b/sys-libs/ldb/files/ldb-1.2.3-disable_python.patch deleted file mode 100644 index 133e2acf3125..000000000000 --- a/sys-libs/ldb/files/ldb-1.2.3-disable_python.patch +++ /dev/null @@ -1,64 +0,0 @@ -Revert talloc/wscript to the one from ldb-1.2.2 - ---- ldb-1.2.3/lib/talloc/wscript -+++ ldb-1.2.3/lib/talloc/wscript -@@ -1,7 +1,7 @@ - #!/usr/bin/env python - - APPNAME = 'talloc' --VERSION = '2.1.9' -+VERSION = '2.1.10' - - - blddir = 'bin' -@@ -74,19 +74,22 @@ - implied_deps='replace'): - conf.define('USING_SYSTEM_TALLOC', 1) - -- using_system_pytalloc_util = True -- if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION, -- implied_deps='talloc replace'): -+ if conf.env.disable_python: - using_system_pytalloc_util = False -- -- # We need to get a pytalloc-util for all the python versions -- # we are building for -- if conf.env['EXTRA_PYTHON']: -- name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG'] -- if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, -+ else: -+ using_system_pytalloc_util = True -+ if not conf.CHECK_BUNDLED_SYSTEM_PKG('pytalloc-util', minversion=VERSION, - implied_deps='talloc replace'): - using_system_pytalloc_util = False - -+ # We need to get a pytalloc-util for all the python versions -+ # we are building for -+ if conf.env['EXTRA_PYTHON']: -+ name = 'pytalloc-util' + conf.all_envs['extrapython']['PYTHON_SO_ABI_FLAG'] -+ if not conf.CHECK_BUNDLED_SYSTEM_PKG(name, minversion=VERSION, -+ implied_deps='talloc replace'): -+ using_system_pytalloc_util = False -+ - if using_system_pytalloc_util: - conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1) - -@@ -171,12 +174,18 @@ - def test(ctx): - '''run talloc testsuite''' - import Utils, samba_utils -+ -+ samba_utils.ADD_LD_LIBRARY_PATH('bin/shared') -+ samba_utils.ADD_LD_LIBRARY_PATH('bin/shared/private') -+ - cmd = os.path.join(Utils.g_module.blddir, 'talloc_testsuite') - ret = samba_utils.RUN_COMMAND(cmd) - print("testsuite returned %d" % ret) - magic_helper_cmd = os.path.join(Utils.g_module.blddir, 'talloc_test_magic_differs_helper') - magic_cmd = os.path.join(srcdir, 'lib', 'talloc', - 'test_magic_differs.sh') -+ if not os.path.exists(magic_cmd): -+ magic_cmd = os.path.join(srcdir, 'test_magic_differs.sh') - - magic_ret = samba_utils.RUN_COMMAND(magic_cmd + " " + magic_helper_cmd) - print("magic differs test returned %d" % magic_ret) diff --git a/sys-libs/ldb/files/ldb-1.4.0-optional_packages.patch b/sys-libs/ldb/files/ldb-1.4.0-optional_packages.patch deleted file mode 100644 index 37813890dcd9..000000000000 --- a/sys-libs/ldb/files/ldb-1.4.0-optional_packages.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- ldb-1.4.0/wscript -+++ ldb-1.4.0/wscript -@@ -31,6 +31,14 @@ - opt.RECURSE('lib/tevent') - opt.RECURSE('lib/replace') - opt.tool_options('python') # options for disabling pyc or pyo compilation -+ if opt.IN_LAUNCH_DIR(): -+ opt.add_option('--disable-python', -+ help=("disable the pyldb modules"), -+ action="store_true", dest='disable_python', default=False) -+ if opt.IN_LAUNCH_DIR(): -+ opt.add_option('--disable-ldap', -+ help=("disable ldap support"), -+ action="store_true", dest='disable_ldap', default=False) - - opt.add_option('--without-ldb-lmdb', - help='disable new LMDB backend for LDB', -@@ -38,6 +46,11 @@ - - - def configure(conf): -+ conf.env.standalone_ldb = conf.IN_LAUNCH_DIR() -+ -+ conf.env.disable_python = getattr(Options.options, 'disable_python', False) -+ conf.env.disable_ldap = getattr(Options.options, 'disable_ldap', False) -+ - conf.RECURSE('lib/tdb') - conf.RECURSE('lib/tevent') - -@@ -142,9 +155,12 @@ - if conf.env.standalone_ldb: - conf.CHECK_XSLTPROC_MANPAGES() - -- # we need this for the ldap backend -- if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): -- conf.env.ENABLE_LDAP_BACKEND = True -+ if not conf.env.disable_ldap: -+ # we need this for the ldap backend -+ if conf.CHECK_FUNCS_IN('ber_flush ldap_open ldap_initialize', 'lber ldap', headers='lber.h ldap.h'): -+ conf.env.ENABLE_LDAP_BACKEND = True -+ else: -+ conf.env.ENABLE_LDAP_BACKEND = False - - # we don't want any libraries or modules to rely on runtime - # resolution of symbols -- cgit v1.2.3