[tools/depends][target] samba 4.15.13

8 files changed, 82 insertions, 93 deletions

diff --git a/tools/depends/target/samba-gplv3/02-cross_compile.patch b/tools/depends/target/samba-gplv3/02-cross_compile.patch
index 84b40289a1..f1cc07de64 100644
--- a/tools/depends/target/samba-gplv3/02-cross_compile.patch
+++ b/tools/depends/target/samba-gplv3/02-cross_compile.patch
@@ -1,6 +1,6 @@
 --- a/buildtools/wafsamba/samba_autoconf.py
 +++ b/buildtools/wafsamba/samba_autoconf.py
-@@ -318,7 +318,7 @@
+@@ -320,7 +320,7 @@
  
  
  @conf
@@ -9,7 +9,7 @@
      '''check the size of a type'''
      for v in TO_LIST(vars):
          v_define = define
-@@ -331,6 +331,7 @@
+@@ -333,6 +333,7 @@
                        define=v_define,
                        quote=False,
                        headers=headers,
@@ -17,7 +17,7 @@
                        local_include=False,
                        msg="Checking if size of %s == %d" % (v, size)):
                  conf.DEFINE(v_define, size)
-@@ -841,7 +841,6 @@
+@@ -843,7 +844,6 @@
      for key in conf.env.define_key:
          conf.undefine(key, from_env=False)
      conf.env.define_key = []
@@ -68,7 +68,7 @@
      return False
 --- a/buildtools/wafsamba/wscript
 +++ b/buildtools/wafsamba/wscript
-@@ -314,7 +314,7 @@
+@@ -317,7 +317,7 @@
      conf.CHECK_CODE('printf("hello world")',
                      define='HAVE_SIMPLE_C_PROG',
                      mandatory=True,
@@ -79,7 +79,7 @@
  
 --- a/lib/replace/wscript
 +++ b/lib/replace/wscript
-@@ -37,6 +37,7 @@
+@@ -41,6 +41,7 @@
      conf.CHECK_HEADERS('linux/types.h crypt.h locale.h acl/libacl.h compat.h')
      conf.CHECK_HEADERS('acl/libacl.h attr/xattr.h compat.h ctype.h dustat.h')
      conf.CHECK_HEADERS('fcntl.h fnmatch.h glob.h history.h krb5.h langinfo.h')
@@ -87,7 +87,7 @@
      conf.CHECK_HEADERS('locale.h ndir.h pwd.h')
      conf.CHECK_HEADERS('shadow.h sys/acl.h')
      conf.CHECK_HEADERS('sys/attributes.h attr/attributes.h sys/capability.h sys/dir.h sys/epoll.h')
-@@ -692,7 +692,7 @@
+@@ -692,7 +693,7 @@
      conf.CHECK_CODE('''#define LIBREPLACE_CONFIGURE_TEST_STRPTIME
                         #include "tests/strptime.c"''',
                         define='HAVE_WORKING_STRPTIME',
@@ -96,7 +96,7 @@
                         addmain=False,
                         msg='Checking for working strptime')
  
-@@ -707,7 +707,7 @@
+@@ -707,7 +708,7 @@
  
      conf.CHECK_CODE('#include "tests/snprintf.c"',
                      define="HAVE_C99_VSNPRINTF",
@@ -105,7 +105,7 @@
                      addmain=False,
                      msg="Checking for C99 vsnprintf")
  
-@@ -804,7 +804,7 @@
+@@ -802,7 +803,7 @@
                      exit(0);
                      ''',
                      define='HAVE_SECURE_MKSTEMP',
@@ -114,7 +114,7 @@
                      mandatory=True) # lets see if we get a mandatory failure for this one
  
      # look for a method of finding the list of network interfaces
-@@ -816,6 +816,7 @@
+@@ -814,6 +815,7 @@
                             #define %s 1
                             #define NO_CONFIG_H 1
                             #define AUTOCONF_TEST 1
@@ -122,7 +122,7 @@
                             #include "replace.c"
                             #include "inet_ntop.c"
                             #include "snprintf.c"
-@@ -826,7 +826,7 @@
+@@ -824,7 +826,7 @@
                             method,
                             lib='nsl socket' + bsd_for_strlcpy,
                             addmain=False,
@@ -142,9 +142,9 @@
 +            conf.DEFINE('HAVE_ETHTOOL', 1)
 --- a/source3/lib/util.c
 +++ b/source3/lib/util.c
-@@ -82,6 +82,10 @@
- #endif /* WITH_NISPLUS_HOME */
- #endif /* HAVE_NETGROUP && WITH_AUTOMOUNT */
+@@ -51,6 +51,10 @@
+ /* Max allowable allococation - 256mb - 0x10000000 */
+ #define MAX_ALLOC_SIZE (1024*1024*256)
  
 +#ifndef YPERR_KEY
 +#define YPERR_KEY 5
@@ -155,7 +155,7 @@
  enum protocol_types get_Protocol(void)
 --- a/source3/wscript
 +++ b/source3/wscript
-@@ -159,7 +159,7 @@
+@@ -156,7 +156,7 @@
  
      # Check for inotify support (Skip if we are SunOS)
      #NOTE: illumos provides sys/inotify.h but is not an exact match for linux
@@ -164,7 +164,7 @@
      if host_os.rfind('sunos') == -1:
          conf.CHECK_HEADERS('sys/inotify.h')
          if conf.env.HAVE_SYS_INOTIFY_H:
-@@ -481,8 +481,8 @@
+@@ -455,8 +455,8 @@
  
      # FIXME: these should be tests for features, but the old build system just
      # checks for OSes.
@@ -175,7 +175,7 @@
  
      # Python doesn't have case switches... :/
      # FIXME: original was *linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu | *qnx*)
-@@ -1057,7 +1057,7 @@
+@@ -1027,7 +1027,7 @@
                                  ''',
                                  'USE_SETREUID',
                                  addmain=False,
@@ -184,7 +184,7 @@
                                  msg="Checking whether setreuid is available")
      if not seteuid:
          seteuid = conf.CHECK_CODE('''
-@@ -1123,7 +1123,7 @@
+@@ -1088,7 +1088,7 @@
  ''',
                  'HAVE_FCNTL_LOCK',
                  addmain=False,
@@ -257,7 +257,7 @@
  	/*@*/;
 --- a/wscript
 +++ b/wscript
-@@ -182,7 +182,7 @@
+@@ -175,7 +175,7 @@
      conf.SAMBA_CHECK_PYTHON()
      conf.SAMBA_CHECK_PYTHON_HEADERS()
  
@@ -266,7 +266,7 @@
          # Mac OSX needs to have this and it's also needed that the python is compiled with this
          # otherwise you face errors about common symbols
          if not conf.CHECK_SHLIB_W_PYTHON("Checking if -fno-common is needed"):
-@@ -190,7 +190,7 @@
+@@ -183,7 +183,7 @@
          if not conf.CHECK_SHLIB_W_PYTHON("Checking if -undefined dynamic_lookup is not need"):
              conf.env.append_value('cshlib_LINKFLAGS', ['-undefined', 'dynamic_lookup'])
  
@@ -277,7 +277,7 @@
      conf.RECURSE('dynconfig')
 --- a/wscript_configure_embedded_heimdal
 +++ b/wscript_configure_embedded_heimdal
-@@ -1 +1,10 @@
+@@ -8 +8,10 @@
  conf.RECURSE('source4/heimdal_build')
 +
 +def check_system_heimdal_binary(name):
diff --git a/tools/depends/target/samba-gplv3/03-builtin-heimdal.patch b/tools/depends/target/samba-gplv3/03-builtin-heimdal.patch
index 9767ca948b..84dccf9acb 100644
--- a/tools/depends/target/samba-gplv3/03-builtin-heimdal.patch
+++ b/tools/depends/target/samba-gplv3/03-builtin-heimdal.patch
@@ -13,16 +13,16 @@
                           deps='cmocka ldb ldb_tdb_err_map',
 --- a/source4/heimdal_build/wscript_build
 +++ b/source4/heimdal_build/wscript_build
-@@ -4,6 +4,7 @@
- from waflib import Context
+@@ -5,6 +5,7 @@
  from samba_utils import SET_TARGET_TYPE
  from samba_autoconf import CURRENT_CFLAGS
+ from samba_utils import LOAD_ENVIRONMENT, TO_LIST
 +from samba_bundled import BUILTIN_LIBRARY
- from samba_utils import LOAD_ENVIRONMENT
  
- def to_list(str):
-@@ -223,7 +224,10 @@
- def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes=''):
+ def heimdal_path(p, absolute=False):
+     hpath = os.path.join("../heimdal", p)
+@@ -215,7 +216,10 @@
+ def HEIMDAL_LIBRARY(libname, source, deps, vnum, version_script, includes='', cflags=[]):
      '''define a Heimdal library'''
  
 -    obj_target = libname + '.objlist'
@@ -33,8 +33,8 @@
  
      # first create a target for building the object files for this library
      # by separating in this way, we avoid recompiling the C files
-@@ -234,6 +238,9 @@
-                         includes       = includes,
+@@ -227,6 +231,9 @@
+                         cflags         = cflags,
                          group          = 'main')
  
 +    if BUILTIN_LIBRARY(bld, libname):
diff --git a/tools/depends/target/samba-gplv3/05-apple-disable-zlib-pkgconfig.patch b/tools/depends/target/samba-gplv3/05-apple-disable-zlib-pkgconfig.patch
index 97642ab5c8..08a66b8688 100644
--- a/tools/depends/target/samba-gplv3/05-apple-disable-zlib-pkgconfig.patch
+++ b/tools/depends/target/samba-gplv3/05-apple-disable-zlib-pkgconfig.patch
@@ -1,6 +1,6 @@
 --- a/wscript
 +++ b/wscript
-@@ -198,7 +198,7 @@
+@@ -191,7 +191,7 @@
  
      conf.CHECK_CFG(package='zlib', minversion='1.2.3',
                     args='--cflags --libs',
diff --git a/tools/depends/target/samba-gplv3/06-apple-fix-st_atim.patch b/tools/depends/target/samba-gplv3/06-apple-fix-st_atim.patch
index 21b55af7bd..357b5f87a7 100644
--- a/tools/depends/target/samba-gplv3/06-apple-fix-st_atim.patch
+++ b/tools/depends/target/samba-gplv3/06-apple-fix-st_atim.patch
@@ -1,48 +1,30 @@
 --- a/source3/libsmb/libsmb_stat.c
 +++ b/source3/libsmb/libsmb_stat.c
-@@ -102,18 +102,18 @@ void setup_stat(struct stat *st,
- 	}
-
- 	st->st_dev = dev;
--	st->st_atim = access_time_ts;
--	st->st_ctim = change_time_ts;
--	st->st_mtim = write_time_ts;
-+	st->st_atimespec = access_time_ts;
-+	st->st_ctimespec = change_time_ts;
-+	st->st_mtimespec = write_time_ts;
- }
-
- void setup_stat_from_stat_ex(const struct stat_ex *stex,
- 			     const char *fname,
- 			     struct stat *st)
- {
--	st->st_atim = stex->st_ex_atime;
--	st->st_ctim = stex->st_ex_ctime;
--	st->st_mtim = stex->st_ex_mtime;
-+	st->st_atimespec = stex->st_ex_atime;
-+	st->st_ctimespec = stex->st_ex_ctime;
-+	st->st_mtimespec = stex->st_ex_mtime;
-
- 	st->st_mode = stex->st_ex_mode;
- 	st->st_size = stex->st_ex_size;
+@@ -29,6 +29,12 @@
+ #include "../libcli/smb/smbXcli_base.h"
+ #include "lib/util/time.h"
+ 
++#if defined(__APPLE__)
++#define st_atim st_atimespec
++#define st_ctim st_ctimespec
++#define st_mtim st_mtimespec
++#endif
++
+ /*
+  * Generate an inode number from file name for those things that need it
+  */
 --- a/source4/torture/libsmbclient/libsmbclient.c
 +++ b/source4/torture/libsmbclient/libsmbclient.c
-@@ -1231,8 +1231,8 @@ static bool torture_libsmbclient_utimes(struct torture_context *tctx)
- 	ret = smbc_fstat(fhandle, &st);
- 	torture_assert_int_not_equal(tctx, ret, -1, "smbc_fstat failed");
-
--	tbuf[0] = convert_timespec_to_timeval(st.st_atim);
--	tbuf[1] = convert_timespec_to_timeval(st.st_mtim);
-+	tbuf[0] = convert_timespec_to_timeval(st.st_atimespec);
-+	tbuf[1] = convert_timespec_to_timeval(st.st_mtimespec);
-
- 	tbuf[1] = timeval_add(&tbuf[1], 0, 100000); /* 100 msec */
-
-@@ -1244,7 +1244,7 @@ static bool torture_libsmbclient_utimes(struct torture_context *tctx)
-
- 	torture_assert_int_equal(
- 		tctx,
--		st.st_mtim.tv_nsec / 1000,
-+		st.st_mtimespec.tv_nsec / 1000,
- 		tbuf[1].tv_usec,
- 		"smbc_utimes did not update msec");
+@@ -30,6 +30,12 @@
+ #include "dynconfig.h"
+ #include "lib/util/time.h"
+ 
++#if defined(__APPLE__)
++#define st_atim st_atimespec
++#define st_ctim st_ctimespec
++#define st_mtim st_mtimespec
++#endif
++
+ /* test string to compare with when debug_callback is called */
+ #define TEST_STRING "smbc_setLogCallback test"
+ 
diff --git a/tools/depends/target/samba-gplv3/Makefile b/tools/depends/target/samba-gplv3/Makefile
index 5c4765b81b..1f59cfd73d 100644
--- a/tools/depends/target/samba-gplv3/Makefile
+++ b/tools/depends/target/samba-gplv3/Makefile
@@ -10,13 +10,19 @@ DEPS= ../../Makefile.include Makefile SAMBA-GPLV3-VERSION ../../download-files.i
 # vfs_snapper requires dbus, so disable.
 CONFIGURE=./configure --prefix=$(PREFIX) \
           --cross-compile --cross-answers=cross-answers.txt \
-          --without-cluster-support --without-ldap \
-          --without-pam --enable-fhs \
-          --without-winbind --disable-cups --without-ads \
-          --disable-avahi --without-gettext \
-          --without-dnsupdate \
-          --without-ad-dc --without-acl-support \
-          --without-utmp --disable-iprint \
+          --without-cluster-support \
+          --without-ldap \
+          --without-pam \
+          --enable-fhs \
+          --without-winbind \
+          --without-ads \
+          --disable-avahi \
+          --disable-cups \
+          --without-gettext \
+          --without-ad-dc \
+          --without-acl-support \
+          --without-utmp \
+          --disable-iprint \
           --nopyc --nopyo \
           --builtin-libraries=!smbclient,!smbd_base,!smbstatus,ALL \
           --with-shared-modules=!vfs_snapper \
diff --git a/tools/depends/target/samba-gplv3/SAMBA-GPLV3-VERSION b/tools/depends/target/samba-gplv3/SAMBA-GPLV3-VERSION
index 57d2c983bf..8765f10bcb 100644
--- a/tools/depends/target/samba-gplv3/SAMBA-GPLV3-VERSION
+++ b/tools/depends/target/samba-gplv3/SAMBA-GPLV3-VERSION
@@ -1,4 +1,5 @@
 LIBNAME=samba
-VERSION=4.13.17
+VERSION=4.15.13
 ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
-SHA512=3f47cc588c370510a11a1d5dc1a9f64872d765a2940a0dd39f02718f9a81b134dda9c9cb593f291f2aa1657de65b26458adcda33369c0858e16edf7f088edaf4
+SHA512=58477c50705f72846a591896bf4ef048e93b5a7488d5731da9d29b0064728baadc94115f22141e2ca4f6ab3114c83f3bfff5a0d589f10f8239f2b0b77e0f7dd3
+
diff --git a/tools/depends/target/samba-gplv3/no_fork_and_exec.patch b/tools/depends/target/samba-gplv3/no_fork_and_exec.patch
index fe678e061a..f240dabce7 100644
--- a/tools/depends/target/samba-gplv3/no_fork_and_exec.patch
+++ b/tools/depends/target/samba-gplv3/no_fork_and_exec.patch
@@ -1,6 +1,6 @@
 --- a/lib/util/become_daemon.c
 +++ b/lib/util/become_daemon.c
-@@ -68,7 +68,7 @@
+@@ -53,7 +53,7 @@
  {
  	pid_t newpid;
  	if (do_fork) {
@@ -11,9 +11,9 @@
  		}
 --- a/lib/util/fault.c
 +++ b/lib/util/fault.c
-@@ -137,7 +137,7 @@
- 			snprintf(pidstr, sizeof(pidstr), "%d", (int) getpid());
- 			all_string_sub(cmdstring, "%d", pidstr, sizeof(cmdstring));
+@@ -150,7 +150,7 @@
+ 			}
+ 
  			DEBUG(0, ("smb_panic(): calling panic action [%s]\n", cmdstring));
 -			result = system(cmdstring);
 +			result = -1;
@@ -62,7 +62,7 @@
  		_exit(0);
 --- a/lib/util/util_runcmd.c
 +++ b/lib/util/util_runcmd.c
-@@ -258,7 +258,6 @@
+@@ -261,7 +261,6 @@
  	}
  	va_end(ap);
  
@@ -83,7 +83,7 @@
  		close(fds[0]);
 --- a/source3/lib/server_prefork.c
 +++ b/source3/lib/server_prefork.c
-@@ -106,7 +106,7 @@
+@@ -109,7 +109,7 @@
  		pfp->pool[i].allowed_clients = 1;
  		pfp->pool[i].started = now;
  
@@ -92,7 +92,7 @@
  		switch (pid) {
  		case -1:
  			DEBUG(1, ("Failed to prefork child n. %d !\n", i));
-@@ -194,7 +194,7 @@
+@@ -199,7 +199,7 @@
  		pfp->pool[i].allowed_clients = 1;
  		pfp->pool[i].started = now;
  
@@ -148,7 +148,7 @@
  	return 1;
 --- a/source3/lib/util.c
 +++ b/source3/lib/util.c
-@@ -840,7 +840,7 @@
+@@ -695,7 +695,7 @@
  	cmd = lp_panic_action(talloc_tos(), lp_sub);
  	if (cmd && *cmd) {
  		DEBUG(0, ("smb_panic(): calling panic action [%s]\n", cmd));
@@ -206,7 +206,7 @@
  	return wait_for_process_timed(pid, func, ptr, timeout);
 --- a/source4/libcli/resolve/dns_ex.c
 +++ b/source4/libcli/resolve/dns_ex.c
-@@ -612,7 +612,7 @@
+@@ -620,7 +620,7 @@
  	}
  	tevent_fd_set_auto_close(state->fde);
  
diff --git a/tools/depends/target/samba-gplv3/samba_android.patch b/tools/depends/target/samba-gplv3/samba_android.patch
index a81f2bee6d..292f473fc5 100644
--- a/tools/depends/target/samba-gplv3/samba_android.patch
+++ b/tools/depends/target/samba-gplv3/samba_android.patch
@@ -1,6 +1,6 @@
 --- a/lib/util/charset/iconv.c
 +++ b/lib/util/charset/iconv.c
-@@ -33,6 +33,10 @@
+@@ -31,6 +31,10 @@
  #include <unicode/utrans.h>
  #endif
  
@@ -11,7 +11,7 @@
  #ifdef strcasecmp
  #undef strcasecmp
  #endif
-@@ -756,6 +756,19 @@
+@@ -755,6 +755,19 @@
  	return 0;
  }