Update supplimentary Samba libs to the latest versions.

Sponsored by:	iXsystems Inc.

3 files changed, 66 insertions, 6 deletions

diff --git a/databases/tdb/files/patch-buildtools__wafsamba__samba_autoconf.py b/databases/tdb/files/patch-buildtools__wafsamba__samba_autoconf.py
index 5245d0e4857b..c92d308462be 100644
--- a/databases/tdb/files/patch-buildtools__wafsamba__samba_autoconf.py
+++ b/databases/tdb/files/patch-buildtools__wafsamba__samba_autoconf.py
@@ -1,6 +1,47 @@
 --- buildtools/wafsamba/samba_autoconf.py.orig	2016-10-07 04:45:35 UTC
 +++ buildtools/wafsamba/samba_autoconf.py
-@@ -873,7 +873,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
+@@ -548,7 +548,7 @@ def library_flags(self, libs):
+ 
+ 
+ @conf
+-def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False):
++def CHECK_LIB(conf, libs, mandatory=False, empty_decl=True, set_target=True, shlib=False, msg=None):
+     '''check if a set of libraries exist as system libraries
+ 
+     returns the sublist of libs that do exist as a syslib or []
+@@ -568,11 +568,29 @@ int foo()
+             ret.append(lib)
+             continue
+ 
++        if msg is None:
++            msg = 'Checking for library %s' % lib
++
+         (ccflags, ldflags, cpppath) = library_flags(conf, lib)
++
+         if shlib:
+-            res = conf.check(features='c cshlib', fragment=fragment, lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(features='c cshlib',
++                             fragment=fragment,
++                             lib=lib,
++                             uselib_store=lib,
++                             ccflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+         else:
+-            res = conf.check(lib=lib, uselib_store=lib, ccflags=ccflags, ldflags=ldflags, uselib=lib.upper(), mandatory=False)
++            res = conf.check(lib=lib,
++                             uselib_store=lib,
++                             ccflags=ccflags,
++                             ldflags=ldflags,
++                             uselib=lib.upper(),
++                             mandatory=False,
++                             msg=msg)
+ 
+         if not res:
+             if mandatory:
+@@ -873,7 +891,7 @@ def SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS(c
          conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
  
      if not sys.platform.startswith("openbsd") and conf.env.undefined_ignore_ldflags == []:
diff --git a/databases/tdb/files/patch-buildtools__wafsamba__samba_python.py b/databases/tdb/files/patch-buildtools__wafsamba__samba_python.py
index dcea3ffd78c3..429ec5e778f9 100644
--- a/databases/tdb/files/patch-buildtools__wafsamba__samba_python.py
+++ b/databases/tdb/files/patch-buildtools__wafsamba__samba_python.py
@@ -1,6 +1,6 @@
---- buildtools/wafsamba/samba_python.py.orig	2017-04-28 08:57:26 UTC
+--- buildtools/wafsamba/samba_python.py.orig	2018-01-13 09:07:51 UTC
 +++ buildtools/wafsamba/samba_python.py
-@@ -76,17 +76,31 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
+@@ -76,17 +76,35 @@ def SAMBA_CHECK_PYTHON_HEADERS(conf, man
  
  def _check_python_headers(conf, mandatory):
      try:
@@ -19,12 +19,16 @@
      if conf.env['PYTHON_VERSION'] > '3':
 -        abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
 -        conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
-+        override_PYTHON3_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
-+        if override_PYTHON3_SO_ABI_FLAG is not None:
-+            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON3_SO_ABI_FLAG
++        '''Be caucious here - conf parameter is PYTHON_SO_ABI_FLAG,
++           while environment variable is PYTHON3_SO_ABI_FLAG'''
++        override_PYTHON_SO_ABI_FLAG = os.getenv('PYTHON3_SO_ABI_FLAG', None)
++        if override_PYTHON_SO_ABI_FLAG is not None:
++            conf.env['PYTHON_SO_ABI_FLAG'] = override_PYTHON_SO_ABI_FLAG
++            conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
 +        if not conf.env['PYTHON_SO_ABI_FLAG']:
 +            if conf.env['PYTHON_SO_ABI']:
 +                conf.env['PYTHON_SO_ABI_FLAG'] = '.'+conf.env['PYTHON_SO_ABI']
++                conf.env['pyext_PATTERN'] = '%%s%s.%s' % (conf.env['PYTHON_SO_ABI_FLAG'], conf.env['SHLIBEXT'])
 +            else:
 +                abi_pattern = os.path.splitext(conf.env['pyext_PATTERN'])[0]
 +                conf.env['PYTHON_SO_ABI_FLAG'] = abi_pattern % ''
diff --git a/databases/tdb/files/patch-buildtools__wafsamba__wscript b/databases/tdb/files/patch-buildtools__wafsamba__wscript
new file mode 100644
index 000000000000..9399a316c14e
--- /dev/null
+++ b/databases/tdb/files/patch-buildtools__wafsamba__wscript
@@ -0,0 +1,15 @@
+--- buildtools/wafsamba/wscript.orig	2017-04-28 11:57:26 UTC
++++ buildtools/wafsamba/wscript
+@@ -76,10 +76,10 @@ def set_options(opt):
+ 
+     opt.add_option('--with-libiconv',
+                    help='additional directory to search for libiconv',
+-                   action='store', dest='iconv_open', default='/usr/local',
++                   action='store', dest='iconv_open', default=None,
+                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
+     opt.add_option('--without-gettext',
+-                   help=("Disable use of gettext"),
++                   help=("disable use of gettext"),
+                    action="store_true", dest='disable_gettext', default=False)
+ 
+     gr = opt.option_group('developer options')