Merge pull request #2583 from MilhouseVH/le82_samba_4.6.14

samba: update to samba-4.6.14

packages/network/samba/package.mk

@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="samba"
-PKG_VERSION="4.6.10"
+PKG_VERSION="4.6.14"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv3+"
 PKG_SITE="https://www.samba.org"

packages/network/samba/patches/samba-950-no-man.patch

@@ -1,37 +1,38 @@
-diff -Naur samba-4.5.5/buildtools/wafsamba/wafsamba.py samba-4.5.5.patch/buildtools/wafsamba/wafsamba.py
---- samba-4.5.5/buildtools/wafsamba/wafsamba.py	2016-08-11 09:51:04.000000000 +0200
-+++ samba-4.5.5.patch/buildtools/wafsamba/wafsamba.py	2017-02-17 15:33:36.453169574 +0100
-@@ -330,9 +330,9 @@
+diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py
+index 4a47dbf..1d8db7a 100644
+--- a/buildtools/wafsamba/wafsamba.py
++++ b/buildtools/wafsamba/wafsamba.py
+@@ -330,11 +330,6 @@ def SAMBA_LIBRARY(bld, libname, source,
      if pc_files is not None and not private_library:
          bld.PKG_CONFIG_FILES(pc_files, vnum=vnum)
  
 -    if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and
 -        bld.env['XSLTPROC_MANPAGES']):
 -        bld.MANPAGES(manpages, install)
-+#    if (manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and
-+#        bld.env['XSLTPROC_MANPAGES']):
-+#        bld.MANPAGES(manpages, install)
- 
- 
+-
+-
  Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY
-@@ -437,8 +437,8 @@
+ 
+ 
+@@ -437,9 +432,6 @@ def SAMBA_BINARY(bld, binname, source,
          samba_ldflags  = pie_ldflags
          )
  
 -    if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
 -        bld.MANPAGES(manpages, install)
-+#    if manpages is not None and 'XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']:
-+#        bld.MANPAGES(manpages, install)
- 
+-
  Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY
  
-diff -Naur samba-4.5.5/docs-xml/wscript_build samba-4.5.5.patch/docs-xml/wscript_build
---- samba-4.5.5/docs-xml/wscript_build	2016-08-11 09:51:04.000000000 +0200
-+++ samba-4.5.5.patch/docs-xml/wscript_build	2017-02-17 15:44:45.142392019 +0100
-@@ -127,17 +127,17 @@
+ 
+diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
+index 093a20d..097fd3b 100644
+--- a/docs-xml/wscript_build
++++ b/docs-xml/wscript_build
+@@ -127,21 +127,3 @@ bld.SAMBA_GENERATOR(parameter_all,
+                     target=parameter_all,
                      rule=smbdotconf_generate_parameter_list,
                      dep_vars=bld.dynconfig_varnames())
- 
+-
 -def SMBDOTCONF_MANPAGE(bld, target):
 -    ''' assemble and build smb.conf.5 manual page'''
 -    bld.SAMBAMANPAGES(target, parameter_all)
@@ -46,17 +47,6 @@ diff -Naur samba-4.5.5/docs-xml/wscript_build samba-4.5.5.patch/docs-xml/wscript
 -
 -    if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
 -        bld.SAMBAMANPAGES(krb5_locator_manpages)
-+#def SMBDOTCONF_MANPAGE(bld, target):
-+#    ''' assemble and build smb.conf.5 manual page'''
-+#    bld.SAMBAMANPAGES(target, parameter_all)
-+#
-+#if ('XSLTPROC_MANPAGES' in bld.env and bld.env['XSLTPROC_MANPAGES']):
-+#
-+#    SMBDOTCONF_MANPAGE(bld, 'manpages/smb.conf.5')
-+#    bld.SAMBAMANPAGES(manpages)
-+#
-+#    if bld.CONFIG_SET('WITH_PAM_MODULES') and bld.CONFIG_SET('HAVE_PAM_START'):
-+#        bld.SAMBAMANPAGES(pam_winbind_manpages)
-+#
-+#    if bld.CONFIG_SET('HAVE_KRB5_LOCATE_PLUGIN_H'):
-+#        bld.SAMBAMANPAGES(krb5_locator_manpages)
+-
+-    if bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'):
+-        bld.SAMBAMANPAGES('manpages/vfs_zfsacl.8')

packages/network/samba/patches/samba-954-fix-build-without-ads.patch

@@ -0,0 +1,22 @@
+diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
+index ffd100c..ab54c4d 100644
+--- a/source3/libads/kerberos_keytab.c
++++ b/source3/libads/kerberos_keytab.c
+@@ -32,8 +32,6 @@
+ 
+ #ifdef HAVE_KRB5
+ 
+-#ifdef HAVE_ADS
+-
+ /* This MAX_NAME_LEN is a constant defined in krb5.h */
+ #ifndef MAX_KEYTAB_NAME_LEN
+ #define MAX_KEYTAB_NAME_LEN 1100
+@@ -85,6 +83,8 @@ out:
+ 	return ret;
+ }
+ 
++#ifdef HAVE_ADS
++
+ /**********************************************************************
+  Adds a single service principal, i.e. 'host' to the system keytab
+ ***********************************************************************/