[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Tue Feb 26 11:11:02 UTC 2019
The branch, master has been updated
via 09d281d69b6 ldb: version 1.6.2
via db58a502960 tevent: version 0.9.39
via 3fe1551b534 talloc: version 2.1.16
via f0d26dd1816 tdb: version 1.3.18
via 5ed5c337644 Search for location of waf script
from de3bb5cd523 CVE-2019-3824 ldb: Release ldb 1.6.1
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 09d281d69b668a71e4457889bb5e949414a664fb
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 26 10:19:44 2019 +0100
ldb: version 1.6.2
* Fix standalone build of ldb.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Tue Feb 26 12:10:40 CET 2019 on sn-devel-144
commit db58a50296041ca57675daee15caea8850f1d3f8
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 26 10:19:44 2019 +0100
tevent: version 0.9.39
* py_tevent: add_timer takes float argument
* C99 build fixes.
* Fix standalone build of tevent.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 3fe1551b5347934a20b9161a23e6a16220c3aeb6
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 26 10:19:44 2019 +0100
talloc: version 2.1.16
* Fix standalone build of talloc.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit f0d26dd1816f35a00abf52b640f42547ffdfa01b
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Feb 26 10:19:44 2019 +0100
tdb: version 1.3.18
* Fix build problems with older python versions.
* C99 build fixes.
* Fix standalone build of tdb.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
commit 5ed5c337644c641aba0d07f3668d478050e5f69e
Author: David Mulder <dmulder at suse.com>
Date: Thu Feb 7 10:47:47 2019 -0700
Search for location of waf script
When calling make from the ldb, talloc, tdb, and
tevent bundles, we need to first find the
location of the waf script. Currently the build
fails since it can't find waf.
Fixes regression caused by a660b7f.
Signed-off-by: David Mulder <dmulder at suse.com>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/ldb/ABI/{ldb-1.5.1.sigs => ldb-1.6.2.sigs} | 0
lib/ldb/ABI/{pyldb-util-1.1.10.sigs => pyldb-util-1.6.2.sigs} | 0
lib/ldb/ABI/{pyldb-util-1.1.10.sigs => pyldb-util.py3-1.6.2.sigs} | 0
lib/ldb/Makefile | 3 ++-
lib/ldb/wscript | 2 +-
.../ABI/{pytalloc-util-2.1.10.sigs => pytalloc-util-2.1.16.sigs} | 0
.../{pytalloc-util.py3-2.1.10.sigs => pytalloc-util.py3-2.1.16.sigs} | 0
lib/talloc/ABI/{talloc-2.1.10.sigs => talloc-2.1.16.sigs} | 0
lib/talloc/Makefile | 3 ++-
lib/talloc/wscript | 2 +-
lib/tdb/ABI/{tdb-1.3.17.sigs => tdb-1.3.18.sigs} | 0
lib/tdb/Makefile | 3 ++-
lib/tdb/wscript | 2 +-
lib/tevent/ABI/{tevent-0.9.37.sigs => tevent-0.9.39.sigs} | 0
lib/tevent/Makefile | 3 ++-
lib/tevent/wscript | 2 +-
16 files changed, 12 insertions(+), 8 deletions(-)
copy lib/ldb/ABI/{ldb-1.5.1.sigs => ldb-1.6.2.sigs} (100%)
copy lib/ldb/ABI/{pyldb-util-1.1.10.sigs => pyldb-util-1.6.2.sigs} (100%)
copy lib/ldb/ABI/{pyldb-util-1.1.10.sigs => pyldb-util.py3-1.6.2.sigs} (100%)
copy lib/talloc/ABI/{pytalloc-util-2.1.10.sigs => pytalloc-util-2.1.16.sigs} (100%)
copy lib/talloc/ABI/{pytalloc-util.py3-2.1.10.sigs => pytalloc-util.py3-2.1.16.sigs} (100%)
copy lib/talloc/ABI/{talloc-2.1.10.sigs => talloc-2.1.16.sigs} (100%)
copy lib/tdb/ABI/{tdb-1.3.17.sigs => tdb-1.3.18.sigs} (100%)
copy lib/tevent/ABI/{tevent-0.9.37.sigs => tevent-0.9.39.sigs} (100%)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/ABI/ldb-1.5.1.sigs b/lib/ldb/ABI/ldb-1.6.2.sigs
similarity index 100%
copy from lib/ldb/ABI/ldb-1.5.1.sigs
copy to lib/ldb/ABI/ldb-1.6.2.sigs
diff --git a/lib/ldb/ABI/pyldb-util-1.1.10.sigs b/lib/ldb/ABI/pyldb-util-1.6.2.sigs
similarity index 100%
copy from lib/ldb/ABI/pyldb-util-1.1.10.sigs
copy to lib/ldb/ABI/pyldb-util-1.6.2.sigs
diff --git a/lib/ldb/ABI/pyldb-util-1.1.10.sigs b/lib/ldb/ABI/pyldb-util.py3-1.6.2.sigs
similarity index 100%
copy from lib/ldb/ABI/pyldb-util-1.1.10.sigs
copy to lib/ldb/ABI/pyldb-util.py3-1.6.2.sigs
diff --git a/lib/ldb/Makefile b/lib/ldb/Makefile
index 18ef459eb16..b82723f35ed 100644
--- a/lib/ldb/Makefile
+++ b/lib/ldb/Makefile
@@ -1,6 +1,7 @@
# simple makefile wrapper to run waf
-WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
+WAF_BIN=`PATH=buildtools/bin:../../buildtools/bin:$$PATH which waf`
+WAF_BINARY=$(PYTHON) $(WAF_BIN)
WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
all:
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 028b1c4677c..c59d4ead7b9 100644
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -1,7 +1,7 @@
#!/usr/bin/env python
APPNAME = 'ldb'
-VERSION = '1.6.1'
+VERSION = '1.6.2'
import sys, os
diff --git a/lib/talloc/ABI/pytalloc-util-2.1.10.sigs b/lib/talloc/ABI/pytalloc-util-2.1.16.sigs
similarity index 100%
copy from lib/talloc/ABI/pytalloc-util-2.1.10.sigs
copy to lib/talloc/ABI/pytalloc-util-2.1.16.sigs
diff --git a/lib/talloc/ABI/pytalloc-util.py3-2.1.10.sigs b/lib/talloc/ABI/pytalloc-util.py3-2.1.16.sigs
similarity index 100%
copy from lib/talloc/ABI/pytalloc-util.py3-2.1.10.sigs
copy to lib/talloc/ABI/pytalloc-util.py3-2.1.16.sigs
diff --git a/lib/talloc/ABI/talloc-2.1.10.sigs b/lib/talloc/ABI/talloc-2.1.16.sigs
similarity index 100%
copy from lib/talloc/ABI/talloc-2.1.10.sigs
copy to lib/talloc/ABI/talloc-2.1.16.sigs
diff --git a/lib/talloc/Makefile b/lib/talloc/Makefile
index 36048e56e2d..db2275c7397 100644
--- a/lib/talloc/Makefile
+++ b/lib/talloc/Makefile
@@ -1,6 +1,7 @@
# simple makefile wrapper to run waf
-WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
+WAF_BIN=`PATH=buildtools/bin:../../buildtools/bin:$$PATH which waf`
+WAF_BINARY=$(PYTHON) $(WAF_BIN)
WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
all:
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index f254e55654b..6a0da625362 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -1,7 +1,7 @@
#!/usr/bin/env python
APPNAME = 'talloc'
-VERSION = '2.1.15'
+VERSION = '2.1.16'
import os
import sys
diff --git a/lib/tdb/ABI/tdb-1.3.17.sigs b/lib/tdb/ABI/tdb-1.3.18.sigs
similarity index 100%
copy from lib/tdb/ABI/tdb-1.3.17.sigs
copy to lib/tdb/ABI/tdb-1.3.18.sigs
diff --git a/lib/tdb/Makefile b/lib/tdb/Makefile
index 3e70146c248..8fd56c814ec 100644
--- a/lib/tdb/Makefile
+++ b/lib/tdb/Makefile
@@ -1,6 +1,7 @@
# simple makefile wrapper to run waf
-WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
+WAF_BIN=`PATH=buildtools/bin:../../buildtools/bin:$$PATH which waf`
+WAF_BINARY=$(PYTHON) $(WAF_BIN)
WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
all:
diff --git a/lib/tdb/wscript b/lib/tdb/wscript
index 2c31f696808..d4f2e88e279 100644
--- a/lib/tdb/wscript
+++ b/lib/tdb/wscript
@@ -1,7 +1,7 @@
#!/usr/bin/env python
APPNAME = 'tdb'
-VERSION = '1.3.17'
+VERSION = '1.3.18'
import sys, os
diff --git a/lib/tevent/ABI/tevent-0.9.37.sigs b/lib/tevent/ABI/tevent-0.9.39.sigs
similarity index 100%
copy from lib/tevent/ABI/tevent-0.9.37.sigs
copy to lib/tevent/ABI/tevent-0.9.39.sigs
diff --git a/lib/tevent/Makefile b/lib/tevent/Makefile
index c3676a4f425..6a3aab0cabb 100644
--- a/lib/tevent/Makefile
+++ b/lib/tevent/Makefile
@@ -1,5 +1,6 @@
# simple makefile wrapper to run waf
-WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
+WAF_BIN=`PATH=buildtools/bin:../../buildtools/bin:$$PATH which waf`
+WAF_BINARY=$(PYTHON) $(WAF_BIN)
WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
all:
diff --git a/lib/tevent/wscript b/lib/tevent/wscript
index b2a103d021a..ce6e12f4792 100644
--- a/lib/tevent/wscript
+++ b/lib/tevent/wscript
@@ -1,7 +1,7 @@
#!/usr/bin/env python
APPNAME = 'tevent'
-VERSION = '0.9.38'
+VERSION = '0.9.39'
import sys, os
--
Samba Shared Repository
More information about the samba-cvs
mailing list