Hello community, here is the log from the commit of package talloc for openSUSE:Factory checked in at 2015-11-24 22:20:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/talloc (Old) and /work/SRC/openSUSE:Factory/.talloc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "talloc" Changes: -------- --- /work/SRC/openSUSE:Factory/talloc/talloc-man.changes 2015-11-10 10:01:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.talloc.new/talloc-man.changes 2015-11-24 22:20:58.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 11 17:49:37 UTC 2015 - lmue...@suse.com + +- Update to 2.1.5; (bsc#954658). + + Minor build fixes + +------------------------------------------------------------------- talloc.changes: same change Old: ---- talloc-2.1.4.tar.asc talloc-2.1.4.tar.gz New: ---- talloc-2.1.5.tar.asc talloc-2.1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ talloc-man.spec ++++++ --- /var/tmp/diff_new_pack.eo6red/_old 2015-11-24 22:20:59.000000000 +0100 +++ /var/tmp/diff_new_pack.eo6red/_new 2015-11-24 22:20:59.000000000 +0100 @@ -52,7 +52,7 @@ %endif %endif # build_man Url: http://talloc.samba.org/ -Version: 2.1.4 +Version: 2.1.5 Release: 0 PreReq: /sbin/ldconfig Summary: Samba talloc Library ++++++ talloc.spec ++++++ --- /var/tmp/diff_new_pack.eo6red/_old 2015-11-24 22:20:59.000000000 +0100 +++ /var/tmp/diff_new_pack.eo6red/_new 2015-11-24 22:20:59.000000000 +0100 @@ -52,7 +52,7 @@ %endif %endif # build_man Url: http://talloc.samba.org/ -Version: 2.1.4 +Version: 2.1.5 Release: 0 PreReq: /sbin/ldconfig Summary: Samba talloc Library ++++++ talloc-2.1.4.tar.gz -> talloc-2.1.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/ABI/pytalloc-util-2.1.5.sigs new/talloc-2.1.5/ABI/pytalloc-util-2.1.5.sigs --- old/talloc-2.1.4/ABI/pytalloc-util-2.1.5.sigs 1970-01-01 01:00:00.000000000 +0100 +++ new/talloc-2.1.5/ABI/pytalloc-util-2.1.5.sigs 2015-11-06 14:28:25.000000000 +0100 @@ -0,0 +1,6 @@ +pytalloc_CObject_FromTallocPtr: PyObject *(void *) +pytalloc_Check: int (PyObject *) +pytalloc_GetObjectType: PyTypeObject *(void) +pytalloc_reference_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *) +pytalloc_steal: PyObject *(PyTypeObject *, void *) +pytalloc_steal_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/ABI/pytalloc-util.py3-2.1.5.sigs new/talloc-2.1.5/ABI/pytalloc-util.py3-2.1.5.sigs --- old/talloc-2.1.4/ABI/pytalloc-util.py3-2.1.5.sigs 1970-01-01 01:00:00.000000000 +0100 +++ new/talloc-2.1.5/ABI/pytalloc-util.py3-2.1.5.sigs 2015-11-06 14:28:25.000000000 +0100 @@ -0,0 +1,5 @@ +pytalloc_Check: int (PyObject *) +pytalloc_GetObjectType: PyTypeObject *(void) +pytalloc_reference_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *) +pytalloc_steal: PyObject *(PyTypeObject *, void *) +pytalloc_steal_ex: PyObject *(PyTypeObject *, TALLOC_CTX *, void *) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/ABI/talloc-2.1.5.sigs new/talloc-2.1.5/ABI/talloc-2.1.5.sigs --- old/talloc-2.1.4/ABI/talloc-2.1.5.sigs 1970-01-01 01:00:00.000000000 +0100 +++ new/talloc-2.1.5/ABI/talloc-2.1.5.sigs 2015-11-06 14:28:25.000000000 +0100 @@ -0,0 +1,65 @@ +_talloc: void *(const void *, size_t) +_talloc_array: void *(const void *, size_t, unsigned int, const char *) +_talloc_free: int (void *, const char *) +_talloc_get_type_abort: void *(const void *, const char *, const char *) +_talloc_memdup: void *(const void *, const void *, size_t, const char *) +_talloc_move: void *(const void *, const void *) +_talloc_pooled_object: void *(const void *, size_t, const char *, unsigned int, size_t) +_talloc_realloc: void *(const void *, void *, size_t, const char *) +_talloc_realloc_array: void *(const void *, void *, size_t, unsigned int, const char *) +_talloc_reference_loc: void *(const void *, const void *, const char *) +_talloc_set_destructor: void (const void *, int (*)(void *)) +_talloc_steal_loc: void *(const void *, const void *, const char *) +_talloc_zero: void *(const void *, size_t, const char *) +_talloc_zero_array: void *(const void *, size_t, unsigned int, const char *) +talloc_asprintf: char *(const void *, const char *, ...) +talloc_asprintf_append: char *(char *, const char *, ...) +talloc_asprintf_append_buffer: char *(char *, const char *, ...) +talloc_autofree_context: void *(void) +talloc_check_name: void *(const void *, const char *) +talloc_disable_null_tracking: void (void) +talloc_enable_leak_report: void (void) +talloc_enable_leak_report_full: void (void) +talloc_enable_null_tracking: void (void) +talloc_enable_null_tracking_no_autofree: void (void) +talloc_find_parent_byname: void *(const void *, const char *) +talloc_free_children: void (void *) +talloc_get_name: const char *(const void *) +talloc_get_size: size_t (const void *) +talloc_increase_ref_count: int (const void *) +talloc_init: void *(const char *, ...) +talloc_is_parent: int (const void *, const void *) +talloc_named: void *(const void *, size_t, const char *, ...) +talloc_named_const: void *(const void *, size_t, const char *) +talloc_parent: void *(const void *) +talloc_parent_name: const char *(const void *) +talloc_pool: void *(const void *, size_t) +talloc_realloc_fn: void *(const void *, void *, size_t) +talloc_reference_count: size_t (const void *) +talloc_reparent: void *(const void *, const void *, const void *) +talloc_report: void (const void *, FILE *) +talloc_report_depth_cb: void (const void *, int, int, void (*)(const void *, int, int, int, void *), void *) +talloc_report_depth_file: void (const void *, int, int, FILE *) +talloc_report_full: void (const void *, FILE *) +talloc_set_abort_fn: void (void (*)(const char *)) +talloc_set_log_fn: void (void (*)(const char *)) +talloc_set_log_stderr: void (void) +talloc_set_memlimit: int (const void *, size_t) +talloc_set_name: const char *(const void *, const char *, ...) +talloc_set_name_const: void (const void *, const char *) +talloc_show_parents: void (const void *, FILE *) +talloc_strdup: char *(const void *, const char *) +talloc_strdup_append: char *(char *, const char *) +talloc_strdup_append_buffer: char *(char *, const char *) +talloc_strndup: char *(const void *, const char *, size_t) +talloc_strndup_append: char *(char *, const char *, size_t) +talloc_strndup_append_buffer: char *(char *, const char *, size_t) +talloc_test_get_magic: int (void) +talloc_total_blocks: size_t (const void *) +talloc_total_size: size_t (const void *) +talloc_unlink: int (const void *, void *) +talloc_vasprintf: char *(const void *, const char *, va_list) +talloc_vasprintf_append: char *(char *, const char *, va_list) +talloc_vasprintf_append_buffer: char *(char *, const char *, va_list) +talloc_version_major: int (void) +talloc_version_minor: int (void) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/configure_file.py new/talloc-2.1.5/buildtools/wafsamba/configure_file.py --- old/talloc-2.1.4/buildtools/wafsamba/configure_file.py 2015-10-03 11:13:50.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/configure_file.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,7 +1,8 @@ # handle substitution of variables in .in files +import re, os import Build, sys, Logs -from samba_utils import * +from samba_utils import SUBST_VARS_RECURSIVE def subst_at_vars(task): '''substiture @VAR@ style variables in a file''' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/gccdeps.py new/talloc-2.1.5/buildtools/wafsamba/gccdeps.py --- old/talloc-2.1.4/buildtools/wafsamba/gccdeps.py 2014-09-16 20:04:31.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/gccdeps.py 2015-11-06 14:25:51.000000000 +0100 @@ -14,7 +14,7 @@ preprocessor_flag = '-MD' -@feature('cc') +@feature('c', 'cc') @before('apply_core') def add_mmd_cc(self): if self.env.get_flat('CCFLAGS').find(preprocessor_flag) < 0: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/nothreads.py new/talloc-2.1.5/buildtools/wafsamba/nothreads.py --- old/talloc-2.1.4/buildtools/wafsamba/nothreads.py 2014-09-16 20:04:31.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/nothreads.py 2015-11-06 14:28:25.000000000 +0100 @@ -10,12 +10,11 @@ "Execute the tasks" -import sys, random, time, threading, traceback, os +import sys, random, threading try: from Queue import Queue except ImportError: from queue import Queue -import Build, Utils, Logs, Options -from Logs import debug, error -from Constants import * +import Utils, Options +from Constants import EXCEPTION, CRASHED, MAXJOBS, ASK_LATER, SKIPPED, SKIP_ME, SUCCESS GAP = 15 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/pkgconfig.py new/talloc-2.1.5/buildtools/wafsamba/pkgconfig.py --- old/talloc-2.1.4/buildtools/wafsamba/pkgconfig.py 2015-10-03 11:13:50.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/pkgconfig.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,7 +1,8 @@ # handle substitution of variables in pc files -import Build, sys, Logs -from samba_utils import * +import os, re, sys +import Build, Logs +from samba_utils import SUBST_VARS_RECURSIVE, TO_LIST def subst_at_vars(task): '''substiture @VAR@ style variables in a file''' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_abi.py new/talloc-2.1.5/buildtools/wafsamba/samba_abi.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_abi.py 2015-10-03 11:13:50.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_abi.py 2015-11-06 14:28:25.000000000 +0100 @@ -137,7 +137,8 @@ topsrc = self.bld.srcnode.abspath() abi_gen = os.path.join(topsrc, 'buildtools/scripts/abi_gen.sh') - abi_file = "%s/%s-%s.sigs" % (self.abi_directory, self.name, self.vnum) + abi_file = "%s/%s-%s.sigs" % (self.abi_directory, self.version_libname, + self.vnum) tsk = self.create_task('abi_check', self.link_task.outputs[0]) tsk.ABI_FILE = abi_file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_autoconf.py new/talloc-2.1.5/buildtools/wafsamba/samba_autoconf.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_autoconf.py 2015-10-03 11:13:50.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_autoconf.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,10 +1,10 @@ # a waf tool to add autoconf-like macros to the configure section -import Build, os, sys, Options, preproc, Logs -import string +import os, sys +import Build, Options, preproc, Logs from Configure import conf -from samba_utils import * -import samba_cross +from TaskGen import feature +from samba_utils import TO_LIST, GET_TARGET_TYPE, SET_TARGET_TYPE, runonce, unique_list, mkdir_p missing_headers = set() @@ -569,7 +569,7 @@ (ccflags, ldflags, cpppath) = library_flags(conf, lib) if shlib: - res = conf.check(features='cc cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper()) + res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper()) else: res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper()) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_autoproto.py new/talloc-2.1.5/buildtools/wafsamba/samba_autoproto.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_autoproto.py 2015-04-29 11:20:16.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_autoproto.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,7 +1,8 @@ # waf build tool for building automatic prototypes from C source +import os import Build -from samba_utils import * +from samba_utils import SET_TARGET_TYPE, os_path_relpath def SAMBA_AUTOPROTO(bld, header, source): '''rule for samba prototype generation''' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_bundled.py new/talloc-2.1.5/buildtools/wafsamba/samba_bundled.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_bundled.py 2015-07-21 22:32:32.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_bundled.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,8 +1,9 @@ # functions to support bundled libraries +import sys +import Build, Options, Logs from Configure import conf -import sys, Logs -from samba_utils import * +from samba_utils import TO_LIST, runonce def PRIVATE_NAME(bld, name, private_extension, private_library): '''possibly rename a library to include a bundled extension''' @@ -107,16 +108,6 @@ return ('ALL' in conf.env.PRIVATE_LIBS or libname in conf.env.PRIVATE_LIBS) -@conf -def CHECK_PREREQUISITES(conf, prereqs): - missing = [] - for syslib in TO_LIST(prereqs): - f = 'FOUND_SYSTEMLIB_%s' % syslib - if not f in conf.env: - missing.append(syslib) - return missing - - @runonce @conf def CHECK_BUNDLED_SYSTEM_PKG(conf, libname, minversion='0.0.0', @@ -141,11 +132,34 @@ this first tries via pkg-config, then if that fails tries by testing for a specified function in the specified lib ''' - if conf.LIB_MUST_BE_BUNDLED(libname): - return False + # We always do a logic validation of 'onlyif' first + missing = [] + if onlyif: + for l in TO_LIST(onlyif): + f = 'FOUND_SYSTEMLIB_%s' % l + if not f in conf.env: + Logs.error('ERROR: CHECK_BUNDLED_SYSTEM(%s) - ' % (libname) + + 'missing prerequisite check for ' + + 'system library %s, onlyif=%r' % (l, onlyif)) + sys.exit(1) + if not conf.env[f]: + missing.append(l) found = 'FOUND_SYSTEMLIB_%s' % libname if found in conf.env: return conf.env[found] + if conf.LIB_MUST_BE_BUNDLED(libname): + conf.env[found] = False + return False + + # see if the library should only use a system version if another dependent + # system version is found. That prevents possible use of mixed library + # versions + if missing: + if not conf.LIB_MAY_BE_BUNDLED(libname): + Logs.error('ERROR: Use of system library %s depends on missing system library/libraries %r' % (libname, missing)) + sys.exit(1) + conf.env[found] = False + return False def check_functions_headers_code(): '''helper function for CHECK_BUNDLED_SYSTEM''' @@ -166,19 +180,6 @@ return False return True - - # see if the library should only use a system version if another dependent - # system version is found. That prevents possible use of mixed library - # versions - if onlyif: - missing = conf.CHECK_PREREQUISITES(onlyif) - if missing: - if not conf.LIB_MAY_BE_BUNDLED(libname): - Logs.error('ERROR: Use of system library %s depends on missing system library/libraries %r' % (libname, missing)) - sys.exit(1) - conf.env[found] = False - return False - minversion = minimum_library_version(conf, libname, minversion) msg = 'Checking for system %s' % libname diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_conftests.py new/talloc-2.1.5/buildtools/wafsamba/samba_conftests.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_conftests.py 2015-10-03 11:13:50.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_conftests.py 2015-11-06 14:28:25.000000000 +0100 @@ -2,10 +2,9 @@ # to test for commonly needed configuration options import os, shutil, re -import Build, Configure, Utils +import Build, Configure, Utils, Options, Logs from Configure import conf -import config_c -from samba_utils import * +from samba_utils import TO_LIST, ADD_LD_LIBRARY_PATH def add_option(self, *k, **kw): @@ -197,7 +196,7 @@ return v * 2; } ''' - return conf.check(features='cc cshlib',vnum="1",fragment=snip,msg=msg) + return conf.check(features='c cshlib',vnum="1",fragment=snip,msg=msg) @conf def CHECK_NEED_LC(conf, msg): @@ -227,7 +226,7 @@ bld.rescan(bld.srcnode) - bld(features='cc cshlib', + bld(features='c cshlib', source='liblctest/liblc1.c', ldflags=conf.env['EXTRA_LDFLAGS'], target='liblc', @@ -247,9 +246,6 @@ '''check if we need -undefined dynamic_lookup''' dir = find_config_dir(conf) - - env = conf.env - snip = ''' #include <Python.h> #include <crt_externs.h> @@ -262,7 +258,7 @@ ldb_module = PyImport_ImportModule("ldb"); return v * 2; }''' - return conf.check(features='cc cshlib',uselib='PYEMBED',fragment=snip,msg=msg) + return conf.check(features='c cshlib',uselib='PYEMBED',fragment=snip,msg=msg) # this one is quite complex, and should probably be broken up # into several parts. I'd quite like to create a set of CHECK_COMPOUND() @@ -306,13 +302,13 @@ ldflags.append("-Wl,--version-script=%s/vscript" % bld.path.abspath()) Utils.writef(os.path.join(dir,'vscript'), 'TEST_1.0A2 { global: *; };\n') - bld(features='cc cshlib', + bld(features='c cshlib', source='libdir/lib1.c', target='libdir/lib1', ldflags=ldflags, name='lib1') - o = bld(features='cc cprogram', + o = bld(features='c cprogram', source='main.c', target='prog1', uselib_local='lib1') @@ -524,53 +520,3 @@ conf.env.STANDARD_LIBPATH = dirlist - -waf_config_c_parse_flags = config_c.parse_flags; -def samba_config_c_parse_flags(line1, uselib, env): - # - # We do a special treatment of the rpath components - # in the linkflags line, because currently the upstream - # parse_flags function is incomplete with respect to - # treatment of the rpath. The remainder of the linkflags - # line is later passed to the original funcion. - # - lst1 = shlex.split(line1) - lst2 = [] - while lst1: - x = lst1.pop(0) - - # - # NOTE on special treatment of -Wl,-R and -Wl,-rpath: - # - # It is important to not put a library provided RPATH - # into the LINKFLAGS but in the RPATH instead, since - # the provided LINKFLAGS get prepended to our own internal - # RPATH later, and hence can potentially lead to linking - # in too old versions of our internal libs. - # - # We do this filtering here on our own because of some - # bugs in the real parse_flags() function. - # - if x == '-Wl,-rpath' or x == '-Wl,-R': - x = lst1.pop(0) - if x.startswith('-Wl,'): - rpath = x[4:] - else: - rpath = x - elif x.startswith('-Wl,-R,'): - rpath = x[7:] - elif x.startswith('-Wl,-R'): - rpath = x[6:] - elif x.startswith('-Wl,-rpath,'): - rpath = x[11:] - else: - lst2.append(x) - continue - - env.append_value('RPATH_' + uselib, rpath) - - line2 = ' '.join(lst2) - waf_config_c_parse_flags(line2, uselib, env) - - return -config_c.parse_flags = samba_config_c_parse_flags diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_cross.py new/talloc-2.1.5/buildtools/wafsamba/samba_cross.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_cross.py 2015-06-13 03:00:10.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_cross.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,8 +1,8 @@ # functions for handling cross-compilation -import Utils, Logs, sys, os, Options, re +import os, sys, re, shlex +import Utils, Logs, Options from Configure import conf -import shlex real_Popen = None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_deps.py new/talloc-2.1.5/buildtools/wafsamba/samba_deps.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_deps.py 2015-10-03 11:13:50.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_deps.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,9 +1,14 @@ # Samba automatic dependency handling and project rules -import Build, os, sys, re, Environment, Logs, time -from samba_utils import * -from samba_autoconf import * +import os, sys, re, time + +import Build, Environment, Options, Logs, Utils +from Logs import debug +from Configure import conf + from samba_bundled import BUILTIN_LIBRARY +from samba_utils import LOCAL_CACHE, TO_LIST, get_tgt_list, unique_list, os_path_relpath +from samba_autoconf import library_flags @conf def ADD_GLOBAL_DEPENDENCY(ctx, dep): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_dist.py new/talloc-2.1.5/buildtools/wafsamba/samba_dist.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_dist.py 2015-06-13 03:00:10.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_dist.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,8 +1,10 @@ # customised version of 'waf dist' for Samba tools # uses git ls-files to get file lists -import Utils, os, sys, tarfile, stat, Scripting, Logs, Options -from samba_utils import * +import os, sys, tarfile +import Utils, Scripting, Logs, Options +from Configure import conf +from samba_utils import os_path_relpath dist_dirs = None dist_files = None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_headers.py new/talloc-2.1.5/buildtools/wafsamba/samba_headers.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_headers.py 2014-09-16 20:04:31.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_headers.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,7 +1,8 @@ # specialist handling of header files for Samba -import Build, re, Task, TaskGen, shutil, sys, Logs -from samba_utils import * +import os, re, sys, fnmatch +import Build, Logs, Utils +from samba_utils import TO_LIST, os_path_relpath def header_install_path(header, header_path): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_install.py new/talloc-2.1.5/buildtools/wafsamba/samba_install.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_install.py 2015-06-13 03:00:10.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_install.py 2015-11-06 14:28:25.000000000 +0100 @@ -3,9 +3,10 @@ # with all the configure options that affect rpath and shared # library use -import Options +import os +import Options, Utils from TaskGen import feature, before, after -from samba_utils import * +from samba_utils import LIB_PATH, MODE_755, install_rpath, build_rpath @feature('install_bin') @after('apply_core') @@ -224,7 +225,6 @@ if self.target.endswith('.inst'): return - blddir = os.path.dirname(self.bld.srcnode.abspath(self.bld.env)) if not self.link_task.outputs or not self.link_task.outputs[0]: raise Utils.WafError('no outputs found for %s in symlink_bin' % self.name) binpath = self.link_task.outputs[0].abspath(self.env) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_optimisation.py new/talloc-2.1.5/buildtools/wafsamba/samba_optimisation.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_optimisation.py 2015-10-03 11:13:50.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_optimisation.py 2015-11-06 14:25:51.000000000 +0100 @@ -11,7 +11,7 @@ from TaskGen import feature, after, before import preproc -@feature('cc', 'cxx') +@feature('c', 'cc', 'cxx') @after('apply_type_vars', 'apply_lib_vars', 'apply_core') def apply_incpaths(self): lst = [] @@ -59,7 +59,7 @@ if node: self.env.append_value('INC_PATHS', node) -@feature('cc') +@feature('c', 'cc') @after('apply_incpaths') def apply_obj_vars_cc(self): """after apply_incpaths for INC_PATHS""" @@ -187,7 +187,7 @@ return ret TaskGen.task_gen.shared_ancestors = shared_ancestors -@feature('cc', 'cxx') +@feature('c', 'cc', 'cxx') @after('apply_link', 'init_cc', 'init_cxx', 'apply_core') def apply_lib_vars(self): """after apply_link because of 'link_task' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_patterns.py new/talloc-2.1.5/buildtools/wafsamba/samba_patterns.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_patterns.py 2015-10-03 11:13:50.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_patterns.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,8 +1,6 @@ # a waf tool to add extension based build patterns for Samba -import Task -from TaskGen import extension -from samba_utils import * +import Build from wafsamba import samba_version_file def write_version_header(task): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_perl.py new/talloc-2.1.5/buildtools/wafsamba/samba_perl.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_perl.py 2014-09-16 20:04:31.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_perl.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,5 +1,4 @@ -import Build -from samba_utils import * +import Utils from Configure import conf done = {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_pidl.py new/talloc-2.1.5/buildtools/wafsamba/samba_pidl.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_pidl.py 2015-10-03 11:13:50.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_pidl.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,8 +1,9 @@ # waf build tool for building IDL files with pidl -from TaskGen import before -import Build, os, sys, Logs -from samba_utils import * +import os +import Build +from TaskGen import feature, before +from samba_utils import SET_TARGET_TYPE, TO_LIST, LOCAL_CACHE def SAMBA_PIDL(bld, pname, source, options='', @@ -112,7 +113,6 @@ ################################################################# # the rule for generating the NDR tables -from TaskGen import feature, before @feature('collect') @before('exec_rule') def collect(self): @@ -128,7 +128,6 @@ def SAMBA_PIDL_TABLES(bld, name, target): '''generate the pidl NDR tables file''' - headers = bld.env.PIDL_HEADERS bld.SET_BUILD_GROUP('main') t = bld( features = 'collect', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_python.py new/talloc-2.1.5/buildtools/wafsamba/samba_python.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_python.py 2015-07-21 22:32:32.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_python.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,9 +1,7 @@ # waf build tool for building IDL files with pidl -import Build -from samba_utils import * -from samba_autoconf import * - +import os +import Build, Logs, Utils from Configure import conf @conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_third_party.py new/talloc-2.1.5/buildtools/wafsamba/samba_third_party.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_third_party.py 2014-09-16 20:04:31.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_third_party.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,8 +1,8 @@ # functions to support third party libraries +import os +import Utils, Build from Configure import conf -import sys, Logs, os -from samba_bundled import * @conf def CHECK_FOR_THIRD_PARTY(conf): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_utils.py new/talloc-2.1.5/buildtools/wafsamba/samba_utils.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_utils.py 2015-10-03 11:13:50.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_utils.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,11 +1,11 @@ # a waf tool to add autoconf-like macros to the configure section # and for SAMBA_ macros for building libraries, binaries etc -import Build, os, sys, Options, Utils, Task, re, fnmatch, Logs +import os, sys, re, fnmatch, shlex +import Build, Options, Utils, Task, Logs, Configure from TaskGen import feature, before from Configure import conf, ConfigurationContext from Logs import debug -import shlex # TODO: make this a --option LIB_PATH="shared" @@ -140,7 +140,6 @@ '''this overrides the 'waf -v' debug output to be in a nice unix like format instead of a python list. Thanks to ita on #waf for this''' - import Utils, Logs _cmd = cmd if isinstance(cmd, list): _cmd = ' '.join(cmd) @@ -164,7 +163,7 @@ Options.Handler.ADD_COMMAND = ADD_COMMAND -@feature('cc', 'cshlib', 'cprogram') +@feature('c', 'cc', 'cshlib', 'cprogram') @before('apply_core','exec_rule') def process_depends_on(self): '''The new depends_on attribute for build rules @@ -657,11 +656,10 @@ You should have file named wscript_<stage>_rule in the current directory where stage is either 'configure' or 'build' ''' - ctxclass = self.__class__.__name__ stage = '' - if ctxclass == 'ConfigurationContext': + if isinstance(self, Configure.ConfigurationContext): stage = 'configure' - elif ctxclass == 'BuildContext': + elif isinstance(self, Build.BuildContext): stage = 'build' file_path = os.path.join(self.curdir, WSCRIPT_FILE+'_'+stage+'_'+rule) txt = load_file(file_path) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/samba_wildcard.py new/talloc-2.1.5/buildtools/wafsamba/samba_wildcard.py --- old/talloc-2.1.4/buildtools/wafsamba/samba_wildcard.py 2014-09-16 20:04:31.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/samba_wildcard.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,9 +1,9 @@ # based on playground/evil in the waf svn tree -import os, datetime -import Scripting, Utils, Options, Logs, Environment, fnmatch -from Constants import * -from samba_utils import * +import os, datetime, fnmatch +import Scripting, Utils, Options, Logs, Environment +from Constants import SRCDIR, BLDDIR +from samba_utils import LOCAL_CACHE, os_path_relpath def run_task(t, k): '''run a single build task''' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/symbols.py new/talloc-2.1.5/buildtools/wafsamba/symbols.py --- old/talloc-2.1.4/buildtools/wafsamba/symbols.py 2015-10-03 11:13:50.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/symbols.py 2015-11-06 14:28:25.000000000 +0100 @@ -1,9 +1,10 @@ # a waf tool to extract symbols from object files or libraries # using nm, producing a set of exposed defined/undefined symbols -import Utils, Build, subprocess, Logs, re -from samba_wildcard import fake_build_environment -from samba_utils import * +import os, re, subprocess +import Utils, Build, Options, Logs +from Logs import debug +from samba_utils import TO_LIST, LOCAL_CACHE, get_tgt_list, os_path_relpath # these are the data structures used in symbols.py: # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/wafsamba.py new/talloc-2.1.5/buildtools/wafsamba/wafsamba.py --- old/talloc-2.1.4/buildtools/wafsamba/wafsamba.py 2015-10-03 11:13:50.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/wafsamba.py 2015-11-06 14:28:25.000000000 +0100 @@ -20,6 +20,7 @@ from samba_deps import * from samba_bundled import * from samba_third_party import * +import samba_cross import samba_install import samba_conftests import samba_abi @@ -243,7 +244,7 @@ if bld.env['ENABLE_RELRO'] is True: ldflags.extend(TO_LIST('-Wl,-z,relro,-z,now')) - features = 'cc cshlib symlink_lib install_lib' + features = 'c cshlib symlink_lib install_lib' if pyext: features += ' pyext' if pyembed: @@ -252,6 +253,15 @@ if abi_directory: 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" + abi_flag = bld.env['PYTHON_SO_ABI_FLAG'] + replacement = '.py%s' % bld.env['PYTHON_VERSION'].split('.')[0] + version_libname = libname.replace(abi_flag, replacement) + else: + version_libname = libname + vscript = None if bld.env.HAVE_LD_VERSION_SCRIPT: if private_library: @@ -262,7 +272,7 @@ version = None if version: vscript = "%s.vscript" % libname - bld.ABI_VSCRIPT(libname, abi_directory, version, vscript, + bld.ABI_VSCRIPT(version_libname, abi_directory, version, vscript, abi_match) fullname = apply_pattern(bundled_name, bld.env.shlib_PATTERN) fullpath = bld.path.find_or_declare(fullname) @@ -288,6 +298,7 @@ samba_deps = deps, samba_includes = includes, version_script = vscript, + version_libname = version_libname, local_include = local_include, global_include = global_include, vnum = vnum, @@ -354,7 +365,7 @@ if not SET_TARGET_TYPE(bld, binname, 'BINARY'): return - features = 'cc cprogram symlink_bin install_bin' + features = 'c cprogram symlink_bin install_bin' if pyembed: features += ' pyembed' @@ -578,7 +589,7 @@ bld.SET_BUILD_GROUP(group) - features = 'cc' + features = 'c' if pyext: features += ' pyext' if pyembed: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/buildtools/wafsamba/wscript new/talloc-2.1.5/buildtools/wafsamba/wscript --- old/talloc-2.1.4/buildtools/wafsamba/wscript 2015-10-13 14:20:30.000000000 +0200 +++ new/talloc-2.1.5/buildtools/wafsamba/wscript 2015-11-06 14:28:25.000000000 +0100 @@ -2,9 +2,9 @@ # this is a base set of waf rules that everything else pulls in first -import sys, wafsamba, Configure, Logs -import Options, os, preproc -from samba_utils import * +import os, sys +import wafsamba, Configure, Logs, Options, Utils +from samba_utils import os_path_relpath from optparse import SUPPRESS_HELP # this forces configure to be re-run if any of the configure @@ -78,9 +78,6 @@ help='additional directory to search for libiconv', action='store', dest='iconv_open', default='/usr/local', match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h']) - opt.add_option('--with-gettext', - help='additional directory to search for gettext', - action='store', dest='gettext_location', default='None') opt.add_option('--without-gettext', help=("Disable use of gettext"), action="store_true", dest='disable_gettext', default=False) @@ -99,9 +96,13 @@ gr.add_option('--enable-developer', help=("Turn on developer warnings and debugging"), action="store_true", dest='developer', default=False) + def picky_developer_callback(option, opt_str, value, parser): + parser.values.developer = True + parser.values.picky_developer = True gr.add_option('--picky-developer', help=("Treat all warnings as errors (enable -Werror)"), - action="store_true", dest='picky_developer', default=False) + action="callback", callback=picky_developer_callback, + dest='picky_developer', default=False) gr.add_option('--fatal-errors', help=("Stop compilation on first error (enable -Wfatal-errors)"), action="store_true", dest='fatal_errors', default=False) @@ -241,7 +242,7 @@ cc.run = Task.compile_fun_noshell('cc', '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT[0].abspath(env)}')[0] try: try: - conf.check(features='cc testd', fragment='int main() {return 0;}\n', ccflags=['-MD'], mandatory=True, msg='Check for -MD') + conf.check(features='c testd', fragment='int main() {return 0;}\n', ccflags=['-MD'], mandatory=True, msg='Check for -MD') except: pass else: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/lib/replace/replace.c new/talloc-2.1.5/lib/replace/replace.c --- old/talloc-2.1.4/lib/replace/replace.c 2015-10-13 14:20:30.000000000 +0200 +++ new/talloc-2.1.5/lib/replace/replace.c 2015-11-06 14:28:25.000000000 +0100 @@ -541,6 +541,7 @@ #undef strtoll long long int rep_strtoll(const char *str, char **endptr, int base) { + int saved_errno = errno; long long int nb = strtoll(str, endptr, base); /* With glibc EINVAL is only returned if base is not ok */ if (errno == EINVAL) { @@ -549,7 +550,7 @@ * able to make the convertion. * Let's reset errno. */ - errno = 0; + errno = saved_errno; } } return nb; @@ -573,25 +574,23 @@ } #else #ifdef HAVE_BSD_STRTOLL -#ifdef HAVE_STRTOUQ +#undef strtoull unsigned long long int rep_strtoull(const char *str, char **endptr, int base) { - unsigned long long int nb = strtouq(str, endptr, base); - /* In linux EINVAL is only returned if base is not ok */ + int saved_errno = errno; + unsigned long long int nb = strtoull(str, endptr, base); + /* With glibc EINVAL is only returned if base is not ok */ if (errno == EINVAL) { if (base == 0 || (base >1 && base <37)) { /* Base was ok so it's because we were not * able to make the convertion. * Let's reset errno. */ - errno = 0; + errno = saved_errno; } } return nb; } -#else -#error "You need the strtouq function" -#endif /* HAVE_STRTOUQ */ #endif /* HAVE_BSD_STRTOLL */ #endif /* HAVE_STRTOULL */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/lib/replace/wscript new/talloc-2.1.5/lib/replace/wscript --- old/talloc-2.1.4/lib/replace/wscript 2015-10-13 14:20:30.000000000 +0200 +++ new/talloc-2.1.5/lib/replace/wscript 2015-11-06 14:28:25.000000000 +0100 @@ -361,13 +361,6 @@ # try to find libintl (if --without-gettext is not given) conf.env.intl_libs='' if not Options.options.disable_gettext: - # any extra path given to look at? - if not Options.options.gettext_location == 'None': - conf.env['CFLAGS'].extend(["-I%s" % Options.options.gettext_location]); - conf.env['LDFLAGS'].extend(["-L%s" % Options.options.gettext_location]); - else: - conf.env['CFLAGS'].extend(["-I/usr/local"]); - conf.env['LDFLAGS'].extend(["-L/usr/local"]); conf.CHECK_HEADERS('libintl.h') conf.CHECK_LIB('intl') conf.CHECK_DECLS('dgettext gettext bindtextdomain textdomain bind_textdomain_codeset', headers="libintl.h") @@ -407,10 +400,6 @@ conf.undefine('HAVE_DGETTEXT') conf.undefine('HAVE_DECL_DGETTEXT') - # did the user insist on gettext (--with-gettext)? - if Options.options.gettext_location != 'None' and (not conf.env['HAVE_GETTEXT'] or not conf.env['HAVE_DGETTEXT']): - conf.fatal('library gettext not found at specified location') - conf.CHECK_FUNCS_IN('pthread_create', 'pthread', checklibc=True, headers='pthread.h') PTHREAD_CFLAGS='error' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/testsuite.c new/talloc-2.1.5/testsuite.c --- old/talloc-2.1.4/testsuite.c 2015-10-13 14:20:30.000000000 +0200 +++ new/talloc-2.1.5/testsuite.c 2015-11-06 14:25:52.000000000 +0100 @@ -1895,10 +1895,13 @@ /* Then the attack takes effect when the memory's freed. */ talloc_free(pool); - } else { - while (wait(&exit_status) != pid); + + /* Never reached. Make compilers happy */ + return true; } + while (wait(&exit_status) != pid); + if (!WIFEXITED(exit_status)) { printf("Child exited through unexpected abnormal means\n"); return false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/third_party/waf/wafadmin/Tools/config_c.py new/talloc-2.1.5/third_party/waf/wafadmin/Tools/config_c.py --- old/talloc-2.1.4/third_party/waf/wafadmin/Tools/config_c.py 2015-04-29 11:20:16.000000000 +0200 +++ new/talloc-2.1.5/third_party/waf/wafadmin/Tools/config_c.py 2015-11-06 14:28:25.000000000 +0100 @@ -82,6 +82,10 @@ # RPATH later, and hence can potentially lead to linking # in too old versions of our internal libs. # + elif x == '-Wl,-rpath' or x == '-Wl,-R': + app('RPATH_' + uselib, lst.pop(0).lstrip('-Wl,')) + elif x.startswith('-Wl,-R,'): + app('RPATH_' + uselib, x[7:]) elif x.startswith('-Wl,-R'): app('RPATH_' + uselib, x[6:]) elif x.startswith('-Wl,-rpath,'): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/talloc-2.1.4/wscript new/talloc-2.1.5/wscript --- old/talloc-2.1.4/wscript 2015-10-13 14:20:30.000000000 +0200 +++ new/talloc-2.1.5/wscript 2015-11-06 14:28:25.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/bin/env python APPNAME = 'talloc' -VERSION = '2.1.4' +VERSION = '2.1.5' blddir = 'bin'
