[SCM] Samba Shared Repository - branch master updated
Andrew Bartlett
abartlet at samba.org
Thu Mar 21 05:09:02 UTC 2019
The branch, master has been updated
via 81648d576d5 ldb: Release ldb 1.6.3
via 6f227801843 tevent: Release tevent 0.10.0
via fe69d807eae tdb: Release tdb 1.4.0
via b80140ba002 talloc: Release talloc 2.2.0
via a574e8f5170 build: Standardise on calling conf.SAMBA_CHECK_PYTHON() in libraries
via a459650054b build: Remove manual specification of minimum python version
via 63d20d7822e build: Set default minimum python version to 3.4.0
via 760b176d86a build: Do not make python mandatory to build
via 24127acae0f ABI: Remove unused .py3*.sigs files
via ad3ba5998ee build: Remove distinct .py3 ABI files
via 709ac663ab6 selftest: Remove mention of --extra-python from comment
via 6a6a178b3c1 selftest: Remove obsolete py3_compatible=True markers
via beda359bdd0 selftest: Remove support for running multiple tests against python versions in a single run
via fdb6305c861 build: Remove bld.gen_python_environments()
via 270d04e4ea0 build: Remove --extra-python
via fa980eb654a pytalloc: Remove deprecated pytalloc_CObject_FromTallocPtr()
from 2a430625e77 libsmb: Make SMB1-only cli_nt_hardlink calls static
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 81648d576d56e924945b2214ac12ca6a40679db8
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Mar 11 10:47:30 2019 +1300
ldb: Release ldb 1.6.3
* Remove Python 2.x support except to build just the bare C library
* Remove --extra-python (a build time mode to produce Python2 and Python3
bindings at the same time)
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
Autobuild-Date(master): Thu Mar 21 05:08:49 UTC 2019 on sn-devel-144
commit 6f2278018436184785e19f69efc60ec408b14aa7
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Mar 11 10:46:35 2019 +1300
tevent: Release tevent 0.10.0
* Remove Python 2.x support except to build just the bare C library
* Remove --extra-python (a build time mode to produce Python2 and Python3
bindings at the same time)
* New minor version to allow Samba 4.10 to release a tevent if
required from that branch
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit fe69d807eae06cb041f25c2dfe351d4e25d541cd
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Mar 11 10:45:58 2019 +1300
tdb: Release tdb 1.4.0
* Remove Python 2.x support except to build just the bare C library
* Remove --extra-python (a build time mode to produce Python2 and Python3
bindings at the same time)
* New minor version to allow Samba 4.10 to release a tdb if
required from that branch
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit b80140ba00282ce67f7d394bbf684e726df1126e
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Mar 4 22:12:18 2019 +1300
talloc: Release talloc 2.2.0
* Remove pytalloc_CObject_FromTallocPtr()
* Remove --extra-python (a build time mode to produce Python2 and Python3
bindings at the same time)
* New minor version to allow Samba 4.10 to release a talloc if
required from that branch
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit a574e8f51706809fff4b77ff098b28ba1a7d4103
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Feb 15 16:13:48 2019 +1300
build: Standardise on calling conf.SAMBA_CHECK_PYTHON() in libraries
We do this by removing the confusing mandatory option to
conf.SAMBA_CHECK_PYTHON{,_HEADERS}(), instead just use the value of
--disable-python internally
This follows the default minimum of Python 3.4 and keeps things consistent
with the main Samba build where --disable-python is required to skip building
python bindings.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit a459650054b5500026b6387fb0eb2ef29ced9b5f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Feb 15 16:04:53 2019 +1300
build: Remove manual specification of minimum python version
We now used the default of 3.4 from conf.SAMBA_CHECK_PYTHON()
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 63d20d7822ead1626f7cb41fdbae6c9300893314
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Feb 15 16:03:35 2019 +1300
build: Set default minimum python version to 3.4.0
This is the current minimum, but this may change before the 4.11 release.
Python 2.x support is no longer available except to build using --disable-python.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 760b176d86a51048b01f72a5e29718c5c9c558ff
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Feb 15 17:45:27 2019 +1300
build: Do not make python mandatory to build
Clearly we have python or else we would not be running, so this is about if
we have a new enough version.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 24127acae0f05f0011c4008e75f1a1de31584199
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Mar 4 22:15:47 2019 +1300
ABI: Remove unused .py3*.sigs files
These are no longer used by the build system so avoid
confusion by removing them from the tree.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit ad3ba5998eec5cf29fcd33f5f902f8cf524aa6de
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Mar 4 21:48:41 2019 +1300
build: Remove distinct .py3 ABI files
The only difference between the two built libraries is pytalloc_CObject_FromTallocPtr()
which is deprecated.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 709ac663ab686a3b0abec335f7486e7e4c8e7141
Author: Andrew Bartlett <abartlet at samba.org>
Date: Wed Mar 20 16:14:25 2019 +1300
selftest: Remove mention of --extra-python from comment
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit 6a6a178b3c1b6c62165db21c44c2061db7927bac
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Feb 15 17:30:43 2019 +1300
selftest: Remove obsolete py3_compatible=True markers
All our tests now run in python3.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit beda359bdd01fb944783a2cdffbdfc459c9f096b
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Feb 15 16:31:32 2019 +1300
selftest: Remove support for running multiple tests against python versions in a single run
The extra_python support was added to aid the python3 transition
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit fdb6305c861a088f797d29889c51c0553cc048be
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Feb 15 16:37:48 2019 +1300
build: Remove bld.gen_python_environments()
This was part of --extra-python support.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Garming Sam <garming at catalyst.net.nz>
commit 270d04e4ea0e3a7f4443557f5ff65e6f9e426295
Author: Andrew Bartlett <abartlet at samba.org>
Date: Fri Feb 15 16:28:38 2019 +1300
build: Remove --extra-python
This option is quite invasive in waf and was mainly for the python3 transition.
Testing with multiple python versions can be done by testing a full compile against
multiple versions, likewise multiple different binding versions can be created
the same way.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
commit fa980eb654a28a652cec64b2374858645e1bf533
Author: Andrew Bartlett <abartlet at samba.org>
Date: Mon Mar 4 22:11:05 2019 +1300
pytalloc: Remove deprecated pytalloc_CObject_FromTallocPtr()
This function makes it harder to remove the --extra-python handlers and is only
provided for Python 2.x, support for which Samba is removing.
Signed-off-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
auth/credentials/wscript_build | 15 +-
buildtools/wafsamba/samba_install.py | 3 -
buildtools/wafsamba/samba_python.py | 76 +--
buildtools/wafsamba/wafsamba.py | 11 +-
buildtools/wafsamba/wscript | 12 -
ctdb/wscript | 6 +-
lib/crypto/wscript_build | 9 +-
lib/ldb-samba/wscript_build | 15 +-
lib/ldb/ABI/{ldb-1.5.1.sigs => ldb-1.6.3.sigs} | 0
...-util.py3-1.1.23.sigs => pyldb-util-1.6.3.sigs} | 0
lib/ldb/ABI/pyldb-util.py3-1.1.24.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.1.25.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.1.26.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.1.27.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.1.28.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.1.29.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.1.30.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.1.31.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.2.0.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.2.1.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.2.2.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.2.3.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.3.0.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.3.1.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.3.2.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.4.0.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.4.1.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.5.0.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.5.1.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.5.2.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.5.3.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.6.0.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.6.1.sigs | 2 -
lib/ldb/ABI/pyldb-util.py3-1.6.2.sigs | 2 -
lib/ldb/wscript | 68 +--
...il.py3-2.1.10.sigs => pytalloc-util-2.2.0.sigs} | 0
lib/talloc/ABI/pytalloc-util.py3-2.1.11.sigs | 15 -
lib/talloc/ABI/pytalloc-util.py3-2.1.12.sigs | 15 -
lib/talloc/ABI/pytalloc-util.py3-2.1.13.sigs | 15 -
lib/talloc/ABI/pytalloc-util.py3-2.1.14.sigs | 15 -
lib/talloc/ABI/pytalloc-util.py3-2.1.15.sigs | 15 -
lib/talloc/ABI/pytalloc-util.py3-2.1.16.sigs | 15 -
lib/talloc/ABI/pytalloc-util.py3-2.1.5.sigs | 5 -
lib/talloc/ABI/pytalloc-util.py3-2.1.6.sigs | 12 -
lib/talloc/ABI/pytalloc-util.py3-2.1.7.sigs | 12 -
lib/talloc/ABI/pytalloc-util.py3-2.1.8.sigs | 12 -
lib/talloc/ABI/pytalloc-util.py3-2.1.9.sigs | 15 -
.../ABI/{talloc-2.1.10.sigs => talloc-2.2.0.sigs} | 0
lib/talloc/pytalloc.h | 15 -
lib/talloc/pytalloc_util.c | 17 -
lib/talloc/talloc.h | 2 +-
lib/talloc/wscript | 50 +-
lib/tdb/ABI/{tdb-1.3.17.sigs => tdb-1.4.0.sigs} | 0
lib/tdb/wscript | 36 +-
.../ABI/{tevent-0.9.37.sigs => tevent-0.10.0.sigs} | 0
lib/tevent/wscript | 26 +-
libcli/nbt/wscript_build | 3 +-
libcli/security/wscript_build | 13 +-
libcli/util/wscript_build | 5 +-
libgpo/wscript_build | 11 +-
python/samba/tests/samba_tool/user.py | 2 +-
python/wscript | 48 +-
selftest/selftesthelpers.py | 9 +-
selftest/tests.py | 75 ++-
selftest/wscript | 4 -
source3/param/wscript_build | 5 +-
source3/passdb/wscript_build | 7 +-
source3/wscript_build | 14 +-
source4/auth/gensec/wscript_build | 17 +-
source4/auth/wscript_build | 23 +-
source4/dns_server/wscript_build | 19 +-
source4/dsdb/wscript_build | 27 +-
source4/lib/messaging/wscript_build | 8 +-
source4/lib/policy/wscript_build | 13 +-
source4/lib/registry/wscript_build | 7 +-
source4/libnet/wscript_build | 51 +-
source4/librpc/wscript_build | 593 ++++++++++-----------
source4/ntvfs/posix/wscript_build | 9 +-
source4/param/wscript_build | 54 +-
source4/selftest/tests.py | 249 ++++-----
third_party/pam_wrapper/wscript | 9 +-
wscript | 4 +-
82 files changed, 703 insertions(+), 1131 deletions(-)
copy lib/ldb/ABI/{ldb-1.5.1.sigs => ldb-1.6.3.sigs} (100%)
rename lib/ldb/ABI/{pyldb-util.py3-1.1.23.sigs => pyldb-util-1.6.3.sigs} (100%)
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.24.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.25.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.26.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.27.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.28.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.29.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.30.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.1.31.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.2.0.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.2.1.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.2.2.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.2.3.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.3.0.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.3.1.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.3.2.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.4.0.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.4.1.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.5.0.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.5.1.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.5.2.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.5.3.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.6.0.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.6.1.sigs
delete mode 100644 lib/ldb/ABI/pyldb-util.py3-1.6.2.sigs
rename lib/talloc/ABI/{pytalloc-util.py3-2.1.10.sigs => pytalloc-util-2.2.0.sigs} (100%)
delete mode 100644 lib/talloc/ABI/pytalloc-util.py3-2.1.11.sigs
delete mode 100644 lib/talloc/ABI/pytalloc-util.py3-2.1.12.sigs
delete mode 100644 lib/talloc/ABI/pytalloc-util.py3-2.1.13.sigs
delete mode 100644 lib/talloc/ABI/pytalloc-util.py3-2.1.14.sigs
delete mode 100644 lib/talloc/ABI/pytalloc-util.py3-2.1.15.sigs
delete mode 100644 lib/talloc/ABI/pytalloc-util.py3-2.1.16.sigs
delete mode 100644 lib/talloc/ABI/pytalloc-util.py3-2.1.5.sigs
delete mode 100644 lib/talloc/ABI/pytalloc-util.py3-2.1.6.sigs
delete mode 100644 lib/talloc/ABI/pytalloc-util.py3-2.1.7.sigs
delete mode 100644 lib/talloc/ABI/pytalloc-util.py3-2.1.8.sigs
delete mode 100644 lib/talloc/ABI/pytalloc-util.py3-2.1.9.sigs
copy lib/talloc/ABI/{talloc-2.1.10.sigs => talloc-2.2.0.sigs} (100%)
copy lib/tdb/ABI/{tdb-1.3.17.sigs => tdb-1.4.0.sigs} (100%)
copy lib/tevent/ABI/{tevent-0.9.37.sigs => tevent-0.10.0.sigs} (100%)
Changeset truncated at 500 lines:
diff --git a/auth/credentials/wscript_build b/auth/credentials/wscript_build
index aaef541f57a..637b6ccf268 100644
--- a/auth/credentials/wscript_build
+++ b/auth/credentials/wscript_build
@@ -24,12 +24,11 @@ bld.SAMBA_SUBSYSTEM('CREDENTIALS_NTLM',
source='credentials_ntlm.c',
deps='samba-credentials')
-for env in bld.gen_python_environments():
- pytalloc_util = bld.pyembed_libname('pytalloc-util')
- pyparam_util = bld.pyembed_libname('pyparam_util')
+pytalloc_util = bld.pyembed_libname('pytalloc-util')
+pyparam_util = bld.pyembed_libname('pyparam_util')
- bld.SAMBA_PYTHON('pycredentials',
- source='pycredentials.c',
- public_deps='samba-credentials cmdline-credentials %s %s CREDENTIALS_KRB5 CREDENTIALS_SECRETS' % (pytalloc_util, pyparam_util),
- realname='samba/credentials.so'
- )
+bld.SAMBA_PYTHON('pycredentials',
+ source='pycredentials.c',
+ public_deps='samba-credentials cmdline-credentials %s %s CREDENTIALS_KRB5 CREDENTIALS_SECRETS' % (pytalloc_util, pyparam_util),
+ realname='samba/credentials.so'
+)
diff --git a/buildtools/wafsamba/samba_install.py b/buildtools/wafsamba/samba_install.py
index c07b2ce639a..07b01d6ac4b 100644
--- a/buildtools/wafsamba/samba_install.py
+++ b/buildtools/wafsamba/samba_install.py
@@ -62,9 +62,6 @@ def install_library(self):
default_env = bld.all_envs['default']
try:
- if self.env['IS_EXTRA_PYTHON']:
- bld.all_envs['default'] = bld.all_envs['extrapython']
-
install_ldflags = install_rpath(self)
build_ldflags = build_rpath(bld)
diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_python.py
index fac0e34b3f1..4476d335248 100644
--- a/buildtools/wafsamba/samba_python.py
+++ b/buildtools/wafsamba/samba_python.py
@@ -5,7 +5,11 @@ from waflib import Build, Logs, Utils, Configure, Errors
from waflib.Configure import conf
@conf
-def SAMBA_CHECK_PYTHON(conf, mandatory=True, version=(2,6,0)):
+def SAMBA_CHECK_PYTHON(conf, version=(3,4,0)):
+
+ if conf.env.disable_python:
+ version=(2,6,0)
+
# enable tool to build python extensions
if conf.env.HAVE_PYTHON_H:
conf.check_python_version(version)
@@ -13,23 +17,8 @@ def SAMBA_CHECK_PYTHON(conf, mandatory=True, version=(2,6,0)):
interpreters = []
- if conf.env['EXTRA_PYTHON']:
- conf.all_envs['extrapython'] = conf.env.derive()
- conf.setenv('extrapython')
- conf.env['PYTHON'] = conf.env['EXTRA_PYTHON']
- conf.env['IS_EXTRA_PYTHON'] = 'yes'
- conf.find_program('python', var='PYTHON', mandatory=True)
- conf.load('python')
- try:
- conf.check_python_version(version)
- except Exception:
- Logs.warn('extra-python needs to be Python %s.%s.%s or later' %
- (version[0], version[1], version[2]))
- raise
- interpreters.append(conf.env['PYTHON'])
- conf.setenv('default')
-
- conf.find_program('python3', var='PYTHON', mandatory=mandatory)
+ conf.find_program('python3', var='PYTHON',
+ mandatory=not conf.env.disable_python)
conf.load('python')
path_python = conf.find_program('python3')
@@ -41,11 +30,8 @@ def SAMBA_CHECK_PYTHON(conf, mandatory=True, version=(2,6,0)):
@conf
-def SAMBA_CHECK_PYTHON_HEADERS(conf, mandatory=True):
+def SAMBA_CHECK_PYTHON_HEADERS(conf):
if conf.env.disable_python:
- if mandatory:
- raise Errors.WafError("Cannot check for python headers when "
- "--disable-python specified")
conf.msg("python headers", "Check disabled due to --disable-python")
# we don't want PYTHONDIR in config.h, as otherwise changing
@@ -57,19 +43,9 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, mandatory=True):
return
if conf.env["python_headers_checked"] == []:
- if conf.env['EXTRA_PYTHON']:
- conf.setenv('extrapython')
- _check_python_headers(conf, mandatory=True)
- conf.setenv('default')
-
- _check_python_headers(conf, mandatory)
+ _check_python_headers(conf)
conf.env["python_headers_checked"] = "yes"
- if conf.env['EXTRA_PYTHON']:
- extraversion = conf.all_envs['extrapython']['PYTHON_VERSION']
- if extraversion == conf.env['PYTHON_VERSION']:
- raise Errors.WafError("extrapython %s is same as main python %s" % (
- extraversion, conf.env['PYTHON_VERSION']))
else:
conf.msg("python headers", "using cache")
@@ -79,13 +55,8 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, mandatory=True):
if not x.startswith('PYTHONDIR=')
and not x.startswith('PYTHONARCHDIR=')]
-def _check_python_headers(conf, mandatory):
- try:
- conf.errors.ConfigurationError
- conf.check_python_headers()
- except conf.errors.ConfigurationError:
- if mandatory:
- raise
+def _check_python_headers(conf):
+ conf.check_python_headers()
if conf.env['PYTHON_VERSION'] > '3':
abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
@@ -133,9 +104,6 @@ def SAMBA_PYTHON(bld, name,
if not bld.PYTHON_BUILD_IS_ENABLED():
enabled = False
- if bld.env['IS_EXTRA_PYTHON']:
- name = 'extra-' + name
-
# when we support static python modules we'll need to gather
# the list from all the SAMBA_PYTHON() targets
if init_function_sentinel is not None:
@@ -180,7 +148,7 @@ def SAMBA_PYTHON(bld, name,
Build.BuildContext.SAMBA_PYTHON = SAMBA_PYTHON
-def pyembed_libname(bld, name, extrapython=False):
+def pyembed_libname(bld, name):
if bld.env['PYTHON_SO_ABI_FLAG']:
return name + bld.env['PYTHON_SO_ABI_FLAG']
else:
@@ -189,23 +157,3 @@ def pyembed_libname(bld, name, extrapython=False):
Build.BuildContext.pyembed_libname = pyembed_libname
-def gen_python_environments(bld, extra_env_vars=()):
- """Generate all Python environments
-
- To be used in a for loop. Normally, the loop body will be executed once.
-
- When --extra-python is used, the body will additionaly be executed
- with the extra-python environment active.
- """
- yield
-
- if bld.env['EXTRA_PYTHON']:
- copied = ('GLOBAL_DEPENDENCIES', 'TARGET_TYPE') + tuple(extra_env_vars)
- for name in copied:
- bld.all_envs['extrapython'][name] = bld.all_envs['default'][name]
- default_env = bld.all_envs['default']
- bld.all_envs['default'] = bld.all_envs['extrapython']
- yield
- bld.all_envs['default'] = default_env
-
-Build.BuildContext.gen_python_environments = gen_python_environments
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
index 1b98e1ceb2c..cd3e9d3e7a8 100644
--- a/buildtools/wafsamba/wafsamba.py
+++ b/buildtools/wafsamba/wafsamba.py
@@ -136,9 +136,6 @@ def SAMBA_LIBRARY(bld, libname, source,
enabled=True):
'''define a Samba library'''
- if pyembed and bld.env['IS_EXTRA_PYTHON']:
- public_headers = None
-
if private_library and public_headers:
raise Errors.WafError("private library '%s' must not have public header files" %
libname)
@@ -222,7 +219,7 @@ def SAMBA_LIBRARY(bld, libname, source,
if pc_files is None:
raise Errors.WafError("public library '%s' must have pkg-config file" %
libname)
- if public_headers is None and not bld.env['IS_EXTRA_PYTHON']:
+ if public_headers is None:
raise Errors.WafError("public library '%s' must have header files" %
libname)
@@ -254,10 +251,10 @@ def SAMBA_LIBRARY(bld, libname, source,
features += ' abi_check'
if pyembed and bld.env['PYTHON_SO_ABI_FLAG']:
- # For ABI checking, we don't care about the exact Python version.
- # Replace the Python ABI tag (e.g. ".cpython-35m") by a generic ".py3"
+ # For ABI checking, we don't care about the Python version.
+ # Remove the Python ABI tag (e.g. ".cpython-35m")
abi_flag = bld.env['PYTHON_SO_ABI_FLAG']
- replacement = '.py%s' % bld.env['PYTHON_VERSION'].split('.')[0]
+ replacement = ''
version_libname = libname.replace(abi_flag, replacement)
else:
version_libname = libname
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index ab19859a83f..f1ebc1cea9e 100644
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -203,12 +203,6 @@ def options(opt):
help='do not generate python modules',
action='store_true', dest='disable_python', default=False)
- opt.add_option('--extra-python', type=str,
- help=("build selected libraries for the specified "
- "additional version of Python "
- "(example: --extra-python=/usr/bin/python3)"),
- metavar="PYTHON", dest='EXTRA_PYTHON', default=None)
-
@Utils.run_once
def configure(conf):
@@ -266,12 +260,6 @@ def configure(conf):
conf.env.disable_python = Options.options.disable_python
- conf.env.EXTRA_PYTHON = Options.options.EXTRA_PYTHON
-
- if (conf.env.disable_python and conf.env.EXTRA_PYTHON):
- Logs.error('ERROR: cannot specify both --disable-python and --extra-python.')
- sys.exit(1)
-
if (conf.env.AUTOCONF_HOST and
conf.env.AUTOCONF_BUILD and
conf.env.AUTOCONF_BUILD != conf.env.AUTOCONF_HOST):
diff --git a/ctdb/wscript b/ctdb/wscript
index 4adf60046c3..3fa525b564d 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -140,8 +140,10 @@ def configure(conf):
if conf.env.standalone_ctdb:
conf.SAMBA_CHECK_PERL(mandatory=True)
- conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,5,0))
- conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False)
+ # This is just for consistency and to check the version for the
+ # build system, see Options.options.disable_python = True above
+ conf.SAMBA_CHECK_PYTHON()
+ conf.SAMBA_CHECK_PYTHON_HEADERS()
if conf.CHECK_FOR_THIRD_PARTY():
conf.RECURSE('third_party/popt')
diff --git a/lib/crypto/wscript_build b/lib/crypto/wscript_build
index 77c62758ce8..6841f99d568 100644
--- a/lib/crypto/wscript_build
+++ b/lib/crypto/wscript_build
@@ -29,9 +29,8 @@ bld.SAMBA_SUBSYSTEM('TORTURE_LIBCRYPTO',
deps='LIBCRYPTO'
)
-for env in bld.gen_python_environments():
- bld.SAMBA_PYTHON('python_crypto',
- source='py_crypto.c',
- deps='LIBCRYPTO',
- realname='samba/crypto.so'
+bld.SAMBA_PYTHON('python_crypto',
+ source='py_crypto.c',
+ deps='LIBCRYPTO',
+ realname='samba/crypto.so'
)
diff --git a/lib/ldb-samba/wscript_build b/lib/ldb-samba/wscript_build
index c8464261d61..3264757e8b7 100644
--- a/lib/ldb-samba/wscript_build
+++ b/lib/ldb-samba/wscript_build
@@ -18,15 +18,12 @@ bld.SAMBA_SUBSYSTEM('ldbwrap',
deps='ldb samba-util ldbsamba samba-hostconfig'
)
-for env in bld.gen_python_environments():
- pyparam_util = bld.pyembed_libname('pyparam_util')
- pyldb_util = bld.pyembed_libname('pyldb-util')
- pyauth = 'pyauth'
- if bld.env['IS_EXTRA_PYTHON']:
- pyauth = 'extra-' + pyauth
- bld.SAMBA_PYTHON('python_samba__ldb', 'pyldb.c',
- deps='ldbsamba %s ldbwrap %s %s' % (pyparam_util, pyldb_util, pyauth),
- realname='samba/_ldb.so')
+pyparam_util = bld.pyembed_libname('pyparam_util')
+pyldb_util = bld.pyembed_libname('pyldb-util')
+pyauth = 'pyauth'
+bld.SAMBA_PYTHON('python_samba__ldb', 'pyldb.c',
+ deps='ldbsamba %s ldbwrap %s %s' % (pyparam_util, pyldb_util, pyauth),
+ realname='samba/_ldb.so')
bld.SAMBA_MODULE('ldbsamba_extensions',
source='samba_extensions.c',
diff --git a/lib/ldb/ABI/ldb-1.5.1.sigs b/lib/ldb/ABI/ldb-1.6.3.sigs
similarity index 100%
copy from lib/ldb/ABI/ldb-1.5.1.sigs
copy to lib/ldb/ABI/ldb-1.6.3.sigs
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.23.sigs b/lib/ldb/ABI/pyldb-util-1.6.3.sigs
similarity index 100%
rename from lib/ldb/ABI/pyldb-util.py3-1.1.23.sigs
rename to lib/ldb/ABI/pyldb-util-1.6.3.sigs
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.24.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.24.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.24.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.25.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.25.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.25.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.26.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.26.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.26.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.27.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.27.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.27.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.28.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.28.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.28.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.29.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.29.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.29.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.30.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.30.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.30.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.1.31.sigs b/lib/ldb/ABI/pyldb-util.py3-1.1.31.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.1.31.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.2.0.sigs b/lib/ldb/ABI/pyldb-util.py3-1.2.0.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.2.0.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.2.1.sigs b/lib/ldb/ABI/pyldb-util.py3-1.2.1.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.2.1.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.2.2.sigs b/lib/ldb/ABI/pyldb-util.py3-1.2.2.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.2.2.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.2.3.sigs b/lib/ldb/ABI/pyldb-util.py3-1.2.3.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.2.3.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.3.0.sigs b/lib/ldb/ABI/pyldb-util.py3-1.3.0.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.3.0.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.3.1.sigs b/lib/ldb/ABI/pyldb-util.py3-1.3.1.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.3.1.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.3.2.sigs b/lib/ldb/ABI/pyldb-util.py3-1.3.2.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.3.2.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.4.0.sigs b/lib/ldb/ABI/pyldb-util.py3-1.4.0.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.4.0.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.4.1.sigs b/lib/ldb/ABI/pyldb-util.py3-1.4.1.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.4.1.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.5.0.sigs b/lib/ldb/ABI/pyldb-util.py3-1.5.0.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.5.0.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.5.1.sigs b/lib/ldb/ABI/pyldb-util.py3-1.5.1.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.5.1.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.5.2.sigs b/lib/ldb/ABI/pyldb-util.py3-1.5.2.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.5.2.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.5.3.sigs b/lib/ldb/ABI/pyldb-util.py3-1.5.3.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.5.3.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.6.0.sigs b/lib/ldb/ABI/pyldb-util.py3-1.6.0.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.6.0.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.6.1.sigs b/lib/ldb/ABI/pyldb-util.py3-1.6.1.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.6.1.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
-pyldb_Dn_FromDn: PyObject *(struct ldb_dn *)
-pyldb_Object_AsDn: bool (TALLOC_CTX *, PyObject *, struct ldb_context *, struct ldb_dn **)
diff --git a/lib/ldb/ABI/pyldb-util.py3-1.6.2.sigs b/lib/ldb/ABI/pyldb-util.py3-1.6.2.sigs
deleted file mode 100644
index 74d6719d2bc..00000000000
--- a/lib/ldb/ABI/pyldb-util.py3-1.6.2.sigs
+++ /dev/null
@@ -1,2 +0,0 @@
--
Samba Shared Repository
More information about the samba-cvs
mailing list