[SCM] Samba Shared Repository - branch master updated
David Disseldorp
ddiss at samba.org
Mon Mar 30 05:41:02 MDT 2015
The branch, master has been updated
via c3747f9 Check for third party Python modules during configure.
via e50342f Move configure part of third party to third_party/wscript.
via d16c0e3 Pass --recursive to 'git clone' in autobuild.
via b2d2fd2 groupdb: Fix a typo
via 6169ab7 heimdal: Fix a warning
via 578f2c7 heimdal: Fix a warning
via 868f83e vfs_gpfs: Remove warning after failure of get_gpfs_fset_id
from 079575d ctdb-tests: Switch to tcp check in rpcinfo stub
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c3747f9658fe1365a140622d3e12823dad7cb39e
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 28 16:11:51 2015 +0000
Check for third party Python modules during configure.
Inform the user whether the module was found on the system, or if the
bundled copy is being used. If the module is not found, suggest what
they can do to make it available to Samba.
Change-Id: I89ec57a2acf87768ca3714add59575578d2ee399
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
Autobuild-User(master): David Disseldorp <ddiss at samba.org>
Autobuild-Date(master): Mon Mar 30 13:40:33 CEST 2015 on sn-devel-104
commit e50342f33d5969f34e5b83f1ed3e7644470fb2ce
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 28 15:43:29 2015 +0000
Move configure part of third party to third_party/wscript.
Change-Id: I34875a8bde99df2e0a2659677e88640bb0ec1816
Signed-off-by: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit d16c0e369ef58a4051c9c917f9448acebf21d010
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 28 16:15:03 2015 +0000
Pass --recursive to 'git clone' in autobuild.
This makes it possible to use submodules in Samba.
Change-Id: Iccb1876b1daf82864b18486f2dca9036d7d3c75c
Signed-Off-By: Jelmer Vernooij <jelmer at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit b2d2fd2c6785b7d459a9dd0dcbe4a0cc1a922030
Author: Volker Lendecke <vl at samba.org>
Date: Sun Mar 29 18:17:46 2015 +0200
groupdb: Fix a typo
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 6169ab798df7c1f765bc6ac537a9b398b039507e
Author: Volker Lendecke <vl at samba.org>
Date: Sun Mar 29 15:59:41 2015 +0200
heimdal: Fix a warning
99% this is what was meant....
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 578f2c7c7d7a38efd98e3aeb8de2c22a8ce5cfdb
Author: Volker Lendecke <vl at samba.org>
Date: Sun Mar 29 15:59:41 2015 +0200
heimdal: Fix a warning
99% this is what was meant....
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
commit 868f83e5c6c1c904609be8d15e7c569b05c78ea3
Author: Christof Schmitt <cs at samba.org>
Date: Fri Mar 27 13:16:41 2015 -0700
vfs_gpfs: Remove warning after failure of get_gpfs_fset_id
get_gpfs_fset_id already emits more detailed warnings, there is no need
to print an additional warning in the calling function.
Signed-off-by: Christof Schmitt <cs at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
-----------------------------------------------------------------------
Summary of changes:
script/autobuild.py | 4 +-
source3/groupdb/mapping_tdb.c | 2 +-
source3/modules/vfs_gpfs.c | 2 -
source4/heimdal/lib/hcrypto/engine.c | 2 +-
source4/heimdal/lib/hcrypto/md2.c | 2 +-
third_party/wscript | 73 ++++++++++++++++++++++++++++++++++++
third_party/wscript_build | 29 --------------
wscript | 3 +-
8 files changed, 79 insertions(+), 38 deletions(-)
create mode 100644 third_party/wscript
delete mode 100644 third_party/wscript_build
Changeset truncated at 500 lines:
diff --git a/script/autobuild.py b/script/autobuild.py
index 3175ff0..6e1e3e0 100755
--- a/script/autobuild.py
+++ b/script/autobuild.py
@@ -197,7 +197,7 @@ class builder(object):
cleanup_list.append(self.prefix)
os.makedirs(self.sdir)
run_cmd("rm -rf %s" % self.sdir)
- run_cmd("git clone --shared %s %s" % (test_master, self.sdir), dir=test_master, show=True)
+ run_cmd("git clone --recursive --shared %s %s" % (test_master, self.sdir), dir=test_master, show=True)
self.start_next()
def start_next(self):
@@ -575,7 +575,7 @@ while True:
try:
run_cmd("rm -rf %s" % test_master)
cleanup_list.append(test_master)
- run_cmd("git clone --shared %s %s" % (gitroot, test_master), show=True, dir=gitroot)
+ run_cmd("git clone --recursive --shared %s %s" % (gitroot, test_master), show=True, dir=gitroot)
except Exception:
cleanup()
raise
diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index e793ef3..c8156d9 100644
--- a/source3/groupdb/mapping_tdb.c
+++ b/source3/groupdb/mapping_tdb.c
@@ -101,7 +101,7 @@ static bool init_group_mapping(void)
vers_id = DATABASE_VERSION_V2;
}
- /* if its an unknown version we remove everthing in the db */
+ /* if its an unknown version we remove everything in the db */
if (vers_id != DATABASE_VERSION_V2) {
tdb_wipe_all(tdb);
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index 8d9d897..2044a0e 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -2145,8 +2145,6 @@ static int vfs_gpfs_get_quotas(const char *path, uid_t uid, gid_t gid,
err = get_gpfs_fset_id(dir_path, fset_id);
if (err) {
- DEBUG(0, ("Get fset id failed path %s, dir %s, errno %d.\n",
- path, dir_path, errno));
return err;
}
diff --git a/source4/heimdal/lib/hcrypto/engine.c b/source4/heimdal/lib/hcrypto/engine.c
index 3b22e56..2f34d6e 100644
--- a/source4/heimdal/lib/hcrypto/engine.c
+++ b/source4/heimdal/lib/hcrypto/engine.c
@@ -88,7 +88,7 @@ ENGINE_finish(ENGINE *engine)
if(engine->destroy)
(*engine->destroy)(engine);
- memset(engine, 0, sizeof(engine));
+ memset(engine, 0, sizeof(*engine));
engine->references = -1;
diff --git a/source4/heimdal/lib/hcrypto/md2.c b/source4/heimdal/lib/hcrypto/md2.c
index 26254ac..b6517a6 100644
--- a/source4/heimdal/lib/hcrypto/md2.c
+++ b/source4/heimdal/lib/hcrypto/md2.c
@@ -130,5 +130,5 @@ MD2_Final (void *res, struct md2 *m)
MD2_Update(m, pad, 16);
memcpy(res, m->state, MD2_DIGEST_LENGTH);
- memset(m, 0, sizeof(m));
+ memset(m, 0, sizeof(*m));
}
diff --git a/third_party/wscript b/third_party/wscript
new file mode 100644
index 0000000..4f63477
--- /dev/null
+++ b/third_party/wscript
@@ -0,0 +1,73 @@
+#!/usr/bin/env python
+
+import Utils
+import os
+import sys
+
+# work out what python external libraries we need to install
+external_pkgs = {
+ "dns.resolver": "dnspython/dns",
+ "iso8601": "pyiso8601/iso8601",
+ }
+
+
+def find_third_party_module(conf, module, package):
+ conf.COMPOUND_START("Checking for third party Python module %s" % module)
+ try:
+ __import__(module)
+ except ImportError:
+ pass
+ else:
+ # Installed on the system
+ conf.COMPOUND_END("system")
+
+ old_path = sys.path
+ try:
+ sys.path.append(os.path.join(conf.curdir, os.path.dirname(package)))
+ try:
+ __import__(module)
+ except ImportError:
+ if (os.path.isdir(os.path.join(conf.srcdir, ".git")) and
+ os.path.isfile(os.path.join(conf.srcdir, ".gitmodule"))):
+ raise Utils.WafError("""\
+Unable to find Python module '%s'. Please install the system package or check \
+out the relevant submodule by running 'git submodule init; git submodule update'.
+""" % module)
+ else:
+ raise Utils.WafError("""\
+Unable to find Python module '%s'. Please install the system package or place a copy in
+%s.
+""" % (module, package))
+ else:
+ conf.COMPOUND_END("bundled")
+ finally:
+ sys.path = old_path
+
+
+def configure(conf):
+ for module, package in external_pkgs.items():
+ find_third_party_module(conf, module, package)
+ conf.RECURSE('popt')
+ conf.RECURSE('zlib')
+
+
+def build(bld):
+ list = []
+
+ for module, package in external_pkgs.items():
+ try:
+ __import__(module)
+ except ImportError:
+ list.append(package)
+
+ for e in list:
+ bld.INSTALL_WILDCARD('${PYTHONARCHDIR}/samba/third_party', e + '/**/*', flat=False,
+ exclude='*.pyc', trim_path=os.path.dirname(e))
+
+ bld.SAMBA_GENERATOR('third_party_init_py',
+ rule='touch ${TGT}',
+ target='empty_file')
+
+ bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/third_party', 'empty_file', destname='__init__.py')
+ bld.RECURSE('zlib')
+ bld.RECURSE('popt')
diff --git a/third_party/wscript_build b/third_party/wscript_build
deleted file mode 100644
index 9a5fabc..0000000
--- a/third_party/wscript_build
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-
-import os
-
-# work out what python external libraries we need to install
-external_libs = {
- "dns.resolver": "dnspython/dns",
- "iso8601": "pyiso8601",
- }
-
-list = []
-
-for module, package in external_libs.items():
- try:
- __import__(module)
- except ImportError:
- list.append(package)
-
-for e in list:
- bld.INSTALL_WILDCARD('${PYTHONARCHDIR}/samba/third_party', e + '/**/*', flat=False,
- exclude='*.pyc', trim_path=os.path.dirname(e))
-
-bld.SAMBA_GENERATOR('third_party_init_py',
- rule='touch ${TGT}',
- target='empty_file')
-
-bld.INSTALL_FILES('${PYTHONARCHDIR}/samba/third_party', 'empty_file', destname='__init__.py')
-bld.RECURSE('zlib')
-bld.RECURSE('popt')
diff --git a/wscript b/wscript
index 146556b..8cf22f8 100644
--- a/wscript
+++ b/wscript
@@ -114,8 +114,7 @@ def configure(conf):
conf.RECURSE('dynconfig')
if conf.CHECK_FOR_THIRD_PARTY():
- conf.RECURSE('third_party/zlib')
- conf.RECURSE('third_party/popt')
+ conf.RECURSE('third_party')
else:
if not conf.CHECK_ZLIB():
raise Utils.WafError('zlib development packages have not been found.\nIf third_party is installed, check that it is in the proper place.')
--
Samba Shared Repository
More information about the samba-cvs
mailing list