From 1584ab7cb7557fa49ea844ed9441d0e1e1e7fa81 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Thu, 28 Mar 2019 01:26:11 +0300 Subject: [PATCH] upd: 4.9.4 -> 4.10.0 --- .abf.yml | 4 +- ...-Add-function-to-set-protocol-levels.patch | 283 ------------------ ...not-call-cli_RNetShareEnum-if-SMB1-i.patch | 41 --- ...rors-printed-if-we-can-connect-with-.patch | 58 ---- ...truct-smbXsrv_client-to-smb1srv_tcon.patch | 60 ---- ...Do-not-call-cli_RNetShareEnum-if-SMB.patch | 71 ----- ...reate_builtin_guests-failing-without.patch | 52 ---- ...BSD-third__party_aesni-intel_wscript.patch | 33 -- ROSA-Force-libsystemd.patch | 73 +++++ ...0001-Print-protocol-version-as-debug.patch | 0 .../OpenBSD-Make-arguements-to-WAF.patch | 0 samba-4.10-fix_make_install.patch | 39 +++ samba.spec | 37 ++- 13 files changed, 132 insertions(+), 619 deletions(-) delete mode 100644 0001-s3-libsmbclient-Add-function-to-set-protocol-levels.patch delete mode 100644 0001-s3-smbclient-Do-not-call-cli_RNetShareEnum-if-SMB1-i.patch delete mode 100644 0001-smbclient-Fix-errors-printed-if-we-can-connect-with-.patch delete mode 100644 0001-smbd-only-pass-struct-smbXsrv_client-to-smb1srv_tcon.patch delete mode 100644 0002-s3-libsmbclient-Do-not-call-cli_RNetShareEnum-if-SMB.patch delete mode 100644 DEBIAN-s3-auth-ignore-create_builtin_guests-failing-without.patch delete mode 100644 FreeBSD-third__party_aesni-intel_wscript.patch create mode 100644 ROSA-Force-libsystemd.patch rename 0001-Print-protocol-version-as-debug.patch => more_patches/0001-Print-protocol-version-as-debug.patch (100%) rename OpenBSD-Make-arguements-to-WAF.patch => more_patches/OpenBSD-Make-arguements-to-WAF.patch (100%) create mode 100644 samba-4.10-fix_make_install.patch diff --git a/.abf.yml b/.abf.yml index 5bbf2bb..cb1ca18 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,4 +1,4 @@ sources: samba-pubkey.asc: 7a27a6974cc0ec939d50fcb1591aa754c4b4b0bf - samba-4.9.4.tar.gz: 7f8e15709e03e52d14bd9c85dd717366c106993f - samba-4.9.4.tar.asc: e2562084ae84516a91c5f1477085d80e21d275a4 + samba-4.10.0.tar.gz: 14769a5f9a296359269e15e989d2995fd79ef2e2 + samba-4.10.0.tar.asc: 9291b90533b94a4b9a15265fafd98556c406f10 diff --git a/0001-s3-libsmbclient-Add-function-to-set-protocol-levels.patch b/0001-s3-libsmbclient-Add-function-to-set-protocol-levels.patch deleted file mode 100644 index 7ebc759..0000000 --- a/0001-s3-libsmbclient-Add-function-to-set-protocol-levels.patch +++ /dev/null @@ -1,283 +0,0 @@ -From 0dae4e2f5c65167fdb2405e232436921a0bb17e6 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Tue, 4 Sep 2018 15:48:03 +0200 -Subject: [PATCH] s3:libsmbclient: Add function to set protocol levels - -Signed-off-by: Andreas Schneider -Reviewed-by: Jeremy Allison - -We need this in ROSA to allow finding and listing smb:/ in KIO (Dolphin), GVFS (Nautilus, Thunar etc.). -https://nixtux.ru/856 -https://bugzilla.redhat.com/show_bug.cgi?id=1513394 ---- - source3/include/libsmbclient.h | 19 ++- - source3/libsmb/ABI/smbclient-0.5.0.sigs | 185 ++++++++++++++++++++++++ - source3/libsmb/libsmb_setget.c | 18 +++ - source3/libsmb/wscript | 2 +- - 4 files changed, 222 insertions(+), 2 deletions(-) - create mode 100644 source3/libsmb/ABI/smbclient-0.5.0.sigs - -diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h -index ca5c7f87f71..5e4a1715402 100644 ---- a/source3/include/libsmbclient.h -+++ b/source3/include/libsmbclient.h -@@ -831,7 +831,24 @@ smbc_getOptionUseNTHash(SMBCCTX *c); - void - smbc_setOptionUseNTHash(SMBCCTX *c, smbc_bool b); - -- -+/** -+ * @brief Set the 'client min protocol' and the 'client max protocol'. -+ * -+ * IMPORTANT: This overrrides the values 'client min protocol' and 'client max -+ * protocol' set in the smb.conf file! -+ * -+ * @param[in] c The smbc context to use. -+ * -+ * @param[in] min_proto The minimal protocol to use or NULL for leaving it -+ * untouched. -+ * -+ * @param[in] max_proto The maximum protocol to use or NULL for leaving it -+ * untouched. -+ * -+ * @returns true for success, false otherwise -+ */ -+smbc_bool -+smbc_setOptionProtocols(SMBCCTX *c, const char *min_proto, const char *max_proto); - - /************************************* - * Getters and setters for FUNCTIONS * -diff --git a/source3/libsmb/ABI/smbclient-0.5.0.sigs b/source3/libsmb/ABI/smbclient-0.5.0.sigs -new file mode 100644 -index 00000000000..b4245979c24 ---- /dev/null -+++ b/source3/libsmb/ABI/smbclient-0.5.0.sigs -@@ -0,0 +1,185 @@ -+smbc_chmod: int (const char *, mode_t) -+smbc_close: int (int) -+smbc_closedir: int (int) -+smbc_creat: int (const char *, mode_t) -+smbc_fgetxattr: int (int, const char *, const void *, size_t) -+smbc_flistxattr: int (int, char *, size_t) -+smbc_free_context: int (SMBCCTX *, int) -+smbc_fremovexattr: int (int, const char *) -+smbc_fsetxattr: int (int, const char *, const void *, size_t, int) -+smbc_fstat: int (int, struct stat *) -+smbc_fstatvfs: int (int, struct statvfs *) -+smbc_ftruncate: int (int, off_t) -+smbc_getDebug: int (SMBCCTX *) -+smbc_getFunctionAddCachedServer: smbc_add_cached_srv_fn (SMBCCTX *) -+smbc_getFunctionAuthData: smbc_get_auth_data_fn (SMBCCTX *) -+smbc_getFunctionAuthDataWithContext: smbc_get_auth_data_with_context_fn (SMBCCTX *) -+smbc_getFunctionCheckServer: smbc_check_server_fn (SMBCCTX *) -+smbc_getFunctionChmod: smbc_chmod_fn (SMBCCTX *) -+smbc_getFunctionClose: smbc_close_fn (SMBCCTX *) -+smbc_getFunctionClosedir: smbc_closedir_fn (SMBCCTX *) -+smbc_getFunctionCreat: smbc_creat_fn (SMBCCTX *) -+smbc_getFunctionFstat: smbc_fstat_fn (SMBCCTX *) -+smbc_getFunctionFstatVFS: smbc_fstatvfs_fn (SMBCCTX *) -+smbc_getFunctionFstatdir: smbc_fstatdir_fn (SMBCCTX *) -+smbc_getFunctionFtruncate: smbc_ftruncate_fn (SMBCCTX *) -+smbc_getFunctionGetCachedServer: smbc_get_cached_srv_fn (SMBCCTX *) -+smbc_getFunctionGetdents: smbc_getdents_fn (SMBCCTX *) -+smbc_getFunctionGetxattr: smbc_getxattr_fn (SMBCCTX *) -+smbc_getFunctionListPrintJobs: smbc_list_print_jobs_fn (SMBCCTX *) -+smbc_getFunctionListxattr: smbc_listxattr_fn (SMBCCTX *) -+smbc_getFunctionLseek: smbc_lseek_fn (SMBCCTX *) -+smbc_getFunctionLseekdir: smbc_lseekdir_fn (SMBCCTX *) -+smbc_getFunctionMkdir: smbc_mkdir_fn (SMBCCTX *) -+smbc_getFunctionNotify: smbc_notify_fn (SMBCCTX *) -+smbc_getFunctionOpen: smbc_open_fn (SMBCCTX *) -+smbc_getFunctionOpenPrintJob: smbc_open_print_job_fn (SMBCCTX *) -+smbc_getFunctionOpendir: smbc_opendir_fn (SMBCCTX *) -+smbc_getFunctionPrintFile: smbc_print_file_fn (SMBCCTX *) -+smbc_getFunctionPurgeCachedServers: smbc_purge_cached_fn (SMBCCTX *) -+smbc_getFunctionRead: smbc_read_fn (SMBCCTX *) -+smbc_getFunctionReaddir: smbc_readdir_fn (SMBCCTX *) -+smbc_getFunctionReaddirPlus: smbc_readdirplus_fn (SMBCCTX *) -+smbc_getFunctionRemoveCachedServer: smbc_remove_cached_srv_fn (SMBCCTX *) -+smbc_getFunctionRemoveUnusedServer: smbc_remove_unused_server_fn (SMBCCTX *) -+smbc_getFunctionRemovexattr: smbc_removexattr_fn (SMBCCTX *) -+smbc_getFunctionRename: smbc_rename_fn (SMBCCTX *) -+smbc_getFunctionRmdir: smbc_rmdir_fn (SMBCCTX *) -+smbc_getFunctionSetxattr: smbc_setxattr_fn (SMBCCTX *) -+smbc_getFunctionSplice: smbc_splice_fn (SMBCCTX *) -+smbc_getFunctionStat: smbc_stat_fn (SMBCCTX *) -+smbc_getFunctionStatVFS: smbc_statvfs_fn (SMBCCTX *) -+smbc_getFunctionTelldir: smbc_telldir_fn (SMBCCTX *) -+smbc_getFunctionUnlink: smbc_unlink_fn (SMBCCTX *) -+smbc_getFunctionUnlinkPrintJob: smbc_unlink_print_job_fn (SMBCCTX *) -+smbc_getFunctionUtimes: smbc_utimes_fn (SMBCCTX *) -+smbc_getFunctionWrite: smbc_write_fn (SMBCCTX *) -+smbc_getNetbiosName: const char *(SMBCCTX *) -+smbc_getOptionBrowseMaxLmbCount: int (SMBCCTX *) -+smbc_getOptionCaseSensitive: smbc_bool (SMBCCTX *) -+smbc_getOptionDebugToStderr: smbc_bool (SMBCCTX *) -+smbc_getOptionFallbackAfterKerberos: smbc_bool (SMBCCTX *) -+smbc_getOptionFullTimeNames: smbc_bool (SMBCCTX *) -+smbc_getOptionNoAutoAnonymousLogin: smbc_bool (SMBCCTX *) -+smbc_getOptionOneSharePerServer: smbc_bool (SMBCCTX *) -+smbc_getOptionOpenShareMode: smbc_share_mode (SMBCCTX *) -+smbc_getOptionSmbEncryptionLevel: smbc_smb_encrypt_level (SMBCCTX *) -+smbc_getOptionUrlEncodeReaddirEntries: smbc_bool (SMBCCTX *) -+smbc_getOptionUseCCache: smbc_bool (SMBCCTX *) -+smbc_getOptionUseKerberos: smbc_bool (SMBCCTX *) -+smbc_getOptionUseNTHash: smbc_bool (SMBCCTX *) -+smbc_getOptionUserData: void *(SMBCCTX *) -+smbc_getPort: uint16_t (SMBCCTX *) -+smbc_getServerCacheData: struct smbc_server_cache *(SMBCCTX *) -+smbc_getTimeout: int (SMBCCTX *) -+smbc_getUser: const char *(SMBCCTX *) -+smbc_getWorkgroup: const char *(SMBCCTX *) -+smbc_getdents: int (unsigned int, struct smbc_dirent *, int) -+smbc_getxattr: int (const char *, const char *, const void *, size_t) -+smbc_init: int (smbc_get_auth_data_fn, int) -+smbc_init_context: SMBCCTX *(SMBCCTX *) -+smbc_lgetxattr: int (const char *, const char *, const void *, size_t) -+smbc_list_print_jobs: int (const char *, smbc_list_print_job_fn) -+smbc_listxattr: int (const char *, char *, size_t) -+smbc_llistxattr: int (const char *, char *, size_t) -+smbc_lremovexattr: int (const char *, const char *) -+smbc_lseek: off_t (int, off_t, int) -+smbc_lseekdir: int (int, off_t) -+smbc_lsetxattr: int (const char *, const char *, const void *, size_t, int) -+smbc_mkdir: int (const char *, mode_t) -+smbc_new_context: SMBCCTX *(void) -+smbc_notify: int (int, smbc_bool, uint32_t, unsigned int, smbc_notify_callback_fn, void *) -+smbc_open: int (const char *, int, mode_t) -+smbc_open_print_job: int (const char *) -+smbc_opendir: int (const char *) -+smbc_option_get: void *(SMBCCTX *, char *) -+smbc_option_set: void (SMBCCTX *, char *, ...) -+smbc_print_file: int (const char *, const char *) -+smbc_read: ssize_t (int, void *, size_t) -+smbc_readdir: struct smbc_dirent *(unsigned int) -+smbc_readdirplus: const struct libsmb_file_info *(unsigned int) -+smbc_removexattr: int (const char *, const char *) -+smbc_rename: int (const char *, const char *) -+smbc_rmdir: int (const char *) -+smbc_setConfiguration: int (SMBCCTX *, const char *) -+smbc_setDebug: void (SMBCCTX *, int) -+smbc_setFunctionAddCachedServer: void (SMBCCTX *, smbc_add_cached_srv_fn) -+smbc_setFunctionAuthData: void (SMBCCTX *, smbc_get_auth_data_fn) -+smbc_setFunctionAuthDataWithContext: void (SMBCCTX *, smbc_get_auth_data_with_context_fn) -+smbc_setFunctionCheckServer: void (SMBCCTX *, smbc_check_server_fn) -+smbc_setFunctionChmod: void (SMBCCTX *, smbc_chmod_fn) -+smbc_setFunctionClose: void (SMBCCTX *, smbc_close_fn) -+smbc_setFunctionClosedir: void (SMBCCTX *, smbc_closedir_fn) -+smbc_setFunctionCreat: void (SMBCCTX *, smbc_creat_fn) -+smbc_setFunctionFstat: void (SMBCCTX *, smbc_fstat_fn) -+smbc_setFunctionFstatVFS: void (SMBCCTX *, smbc_fstatvfs_fn) -+smbc_setFunctionFstatdir: void (SMBCCTX *, smbc_fstatdir_fn) -+smbc_setFunctionFtruncate: void (SMBCCTX *, smbc_ftruncate_fn) -+smbc_setFunctionGetCachedServer: void (SMBCCTX *, smbc_get_cached_srv_fn) -+smbc_setFunctionGetdents: void (SMBCCTX *, smbc_getdents_fn) -+smbc_setFunctionGetxattr: void (SMBCCTX *, smbc_getxattr_fn) -+smbc_setFunctionListPrintJobs: void (SMBCCTX *, smbc_list_print_jobs_fn) -+smbc_setFunctionListxattr: void (SMBCCTX *, smbc_listxattr_fn) -+smbc_setFunctionLseek: void (SMBCCTX *, smbc_lseek_fn) -+smbc_setFunctionLseekdir: void (SMBCCTX *, smbc_lseekdir_fn) -+smbc_setFunctionMkdir: void (SMBCCTX *, smbc_mkdir_fn) -+smbc_setFunctionNotify: void (SMBCCTX *, smbc_notify_fn) -+smbc_setFunctionOpen: void (SMBCCTX *, smbc_open_fn) -+smbc_setFunctionOpenPrintJob: void (SMBCCTX *, smbc_open_print_job_fn) -+smbc_setFunctionOpendir: void (SMBCCTX *, smbc_opendir_fn) -+smbc_setFunctionPrintFile: void (SMBCCTX *, smbc_print_file_fn) -+smbc_setFunctionPurgeCachedServers: void (SMBCCTX *, smbc_purge_cached_fn) -+smbc_setFunctionRead: void (SMBCCTX *, smbc_read_fn) -+smbc_setFunctionReaddir: void (SMBCCTX *, smbc_readdir_fn) -+smbc_setFunctionReaddirPlus: void (SMBCCTX *, smbc_readdirplus_fn) -+smbc_setFunctionRemoveCachedServer: void (SMBCCTX *, smbc_remove_cached_srv_fn) -+smbc_setFunctionRemoveUnusedServer: void (SMBCCTX *, smbc_remove_unused_server_fn) -+smbc_setFunctionRemovexattr: void (SMBCCTX *, smbc_removexattr_fn) -+smbc_setFunctionRename: void (SMBCCTX *, smbc_rename_fn) -+smbc_setFunctionRmdir: void (SMBCCTX *, smbc_rmdir_fn) -+smbc_setFunctionSetxattr: void (SMBCCTX *, smbc_setxattr_fn) -+smbc_setFunctionSplice: void (SMBCCTX *, smbc_splice_fn) -+smbc_setFunctionStat: void (SMBCCTX *, smbc_stat_fn) -+smbc_setFunctionStatVFS: void (SMBCCTX *, smbc_statvfs_fn) -+smbc_setFunctionTelldir: void (SMBCCTX *, smbc_telldir_fn) -+smbc_setFunctionUnlink: void (SMBCCTX *, smbc_unlink_fn) -+smbc_setFunctionUnlinkPrintJob: void (SMBCCTX *, smbc_unlink_print_job_fn) -+smbc_setFunctionUtimes: void (SMBCCTX *, smbc_utimes_fn) -+smbc_setFunctionWrite: void (SMBCCTX *, smbc_write_fn) -+smbc_setLogCallback: void (SMBCCTX *, void *, smbc_debug_callback_fn) -+smbc_setNetbiosName: void (SMBCCTX *, const char *) -+smbc_setOptionBrowseMaxLmbCount: void (SMBCCTX *, int) -+smbc_setOptionCaseSensitive: void (SMBCCTX *, smbc_bool) -+smbc_setOptionDebugToStderr: void (SMBCCTX *, smbc_bool) -+smbc_setOptionFallbackAfterKerberos: void (SMBCCTX *, smbc_bool) -+smbc_setOptionFullTimeNames: void (SMBCCTX *, smbc_bool) -+smbc_setOptionNoAutoAnonymousLogin: void (SMBCCTX *, smbc_bool) -+smbc_setOptionOneSharePerServer: void (SMBCCTX *, smbc_bool) -+smbc_setOptionOpenShareMode: void (SMBCCTX *, smbc_share_mode) -+smbc_setOptionProtocols: smbc_bool (SMBCCTX *, const char *, const char *) -+smbc_setOptionSmbEncryptionLevel: void (SMBCCTX *, smbc_smb_encrypt_level) -+smbc_setOptionUrlEncodeReaddirEntries: void (SMBCCTX *, smbc_bool) -+smbc_setOptionUseCCache: void (SMBCCTX *, smbc_bool) -+smbc_setOptionUseKerberos: void (SMBCCTX *, smbc_bool) -+smbc_setOptionUseNTHash: void (SMBCCTX *, smbc_bool) -+smbc_setOptionUserData: void (SMBCCTX *, void *) -+smbc_setPort: void (SMBCCTX *, uint16_t) -+smbc_setServerCacheData: void (SMBCCTX *, struct smbc_server_cache *) -+smbc_setTimeout: void (SMBCCTX *, int) -+smbc_setUser: void (SMBCCTX *, const char *) -+smbc_setWorkgroup: void (SMBCCTX *, const char *) -+smbc_set_context: SMBCCTX *(SMBCCTX *) -+smbc_set_credentials: void (const char *, const char *, const char *, smbc_bool, const char *) -+smbc_set_credentials_with_fallback: void (SMBCCTX *, const char *, const char *, const char *) -+smbc_setxattr: int (const char *, const char *, const void *, size_t, int) -+smbc_stat: int (const char *, struct stat *) -+smbc_statvfs: int (char *, struct statvfs *) -+smbc_telldir: off_t (int) -+smbc_unlink: int (const char *) -+smbc_unlink_print_job: int (const char *, int) -+smbc_urldecode: int (char *, char *, size_t) -+smbc_urlencode: int (char *, char *, int) -+smbc_utime: int (const char *, struct utimbuf *) -+smbc_utimes: int (const char *, struct timeval *) -+smbc_version: const char *(void) -+smbc_write: ssize_t (int, const void *, size_t) -diff --git a/source3/libsmb/libsmb_setget.c b/source3/libsmb/libsmb_setget.c -index 60b822a395c..b1c4ff3b557 100644 ---- a/source3/libsmb/libsmb_setget.c -+++ b/source3/libsmb/libsmb_setget.c -@@ -526,6 +526,24 @@ smbc_setOptionUseNTHash(SMBCCTX *c, smbc_bool b) - } - } - -+smbc_bool -+smbc_setOptionProtocols(SMBCCTX *c, -+ const char *min_proto, -+ const char *max_proto) -+{ -+ bool ok = true; -+ -+ if (min_proto != NULL) { -+ ok = lp_set_cmdline("client min protocol", min_proto); -+ } -+ -+ if (max_proto != NULL) { -+ ok &= lp_set_cmdline("client min protocol", max_proto); -+ } -+ -+ return ok; -+} -+ - /** Get the function for obtaining authentication data */ - smbc_get_auth_data_fn - smbc_getFunctionAuthData(SMBCCTX *c) -diff --git a/source3/libsmb/wscript b/source3/libsmb/wscript -index a3cf93be63c..d9e933e9e9f 100644 ---- a/source3/libsmb/wscript -+++ b/source3/libsmb/wscript -@@ -25,5 +25,5 @@ def build(bld): - public_headers='../include/libsmbclient.h', - abi_directory='ABI', - abi_match='smbc_*', -- vnum='0.4.0', -+ vnum='0.5.0', - pc_files='smbclient.pc') --- -2.19.2 - diff --git a/0001-s3-smbclient-Do-not-call-cli_RNetShareEnum-if-SMB1-i.patch b/0001-s3-smbclient-Do-not-call-cli_RNetShareEnum-if-SMB1-i.patch deleted file mode 100644 index cd044d3..0000000 --- a/0001-s3-smbclient-Do-not-call-cli_RNetShareEnum-if-SMB1-i.patch +++ /dev/null @@ -1,41 +0,0 @@ -From eddcbfea91d012f70a00c3ff2865fb1a23bec023 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Tue, 4 Sep 2018 11:11:49 +0200 -Subject: [PATCH] s3:smbclient: Do not call cli_RNetShareEnum if SMB1 is - disabled - -Signed-off-by: Andreas Schneider -Reviewed-by: Jeremy Allison ---- - source3/client/client.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/source3/client/client.c b/source3/client/client.c -index adc3fcab476..fc6d9a31c5b 100644 ---- a/source3/client/client.c -+++ b/source3/client/client.c -@@ -4901,6 +4901,7 @@ static bool browse_host_rpc(bool sort) - static bool browse_host(bool sort) - { - int ret; -+ - if (!grepable) { - d_printf("\n\tSharename Type Comment\n"); - d_printf("\t--------- ---- -------\n"); -@@ -4910,7 +4911,12 @@ static bool browse_host(bool sort) - return true; - } - -- if((ret = cli_RNetShareEnum(cli, browse_fn, NULL)) == -1) { -+ if (lp_client_min_protocol() > PROTOCOL_NT1) { -+ return false; -+ } -+ -+ ret = cli_RNetShareEnum(cli, browse_fn, NULL); -+ if (ret == -1) { - NTSTATUS status = cli_nt_error(cli); - d_printf("Error returning browse list: %s\n", - nt_errstr(status)); --- -2.20.1 - diff --git a/0001-smbclient-Fix-errors-printed-if-we-can-connect-with-.patch b/0001-smbclient-Fix-errors-printed-if-we-can-connect-with-.patch deleted file mode 100644 index 740fe36..0000000 --- a/0001-smbclient-Fix-errors-printed-if-we-can-connect-with-.patch +++ /dev/null @@ -1,58 +0,0 @@ -From e0e86e8ae6245341ffd2b32d6abbade1371046e5 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Mon, 3 Sep 2018 12:11:39 +0200 -Subject: [PATCH] smbclient: Fix errors printed if we can connect with SMB1 - -smbclient -L //server - -before: - -Reconnecting with SMB1 for workgroup listing. -Connection to earth.milkyway.site failed (Error NT_STATUS_RESOURCE_NAME_NOT_FOUND) -Failed to connect with SMB1 -- no workgroup available - -after: - -Reconnecting with SMB1 for workgroup listing. -Unable to connect with SMB1 -- no workgroup available - -Signed-off-by: Andreas Schneider -Reviewed-by: Jeremy Allison ---- - source3/client/client.c | 2 +- - source3/libsmb/clidfs.c | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/source3/client/client.c b/source3/client/client.c -index 25ba01d6216..adc3fcab476 100644 ---- a/source3/client/client.c -+++ b/source3/client/client.c -@@ -6227,7 +6227,7 @@ static int do_host_query(const char *query_host) - smb_encrypt, max_proto, - NBT_SMB_PORT, name_type, &cli); - if (!NT_STATUS_IS_OK(status)) { -- d_printf("Failed to connect with SMB1 " -+ d_printf("Unable to connect with SMB1 " - "-- no workgroup available\n"); - return 0; - } -diff --git a/source3/libsmb/clidfs.c b/source3/libsmb/clidfs.c -index 0dfb8b33606..6918802396c 100644 ---- a/source3/libsmb/clidfs.c -+++ b/source3/libsmb/clidfs.c -@@ -196,9 +196,9 @@ static NTSTATUS do_connect(TALLOC_CTX *ctx, - flags, &c); - - if (!NT_STATUS_IS_OK(status)) { -- d_printf("Connection to %s failed (Error %s)\n", -- server, -- nt_errstr(status)); -+ DBG_WARNING("Connection to %s failed (Error %s)\n", -+ server, -+ nt_errstr(status)); - return status; - } - --- -2.20.1 - diff --git a/0001-smbd-only-pass-struct-smbXsrv_client-to-smb1srv_tcon.patch b/0001-smbd-only-pass-struct-smbXsrv_client-to-smb1srv_tcon.patch deleted file mode 100644 index 7a5f3d8..0000000 --- a/0001-smbd-only-pass-struct-smbXsrv_client-to-smb1srv_tcon.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5cb94ca028c3fccd9a778123834bb2681aa73136 Mon Sep 17 00:00:00 2001 -From: Stefan Metzmacher -Date: Tue, 24 Jul 2018 17:13:39 +0200 -Subject: [PATCH] smbd: only pass struct smbXsrv_client to - smb1srv_tcon_disconnect_all() - -That's all it needs. - -Signed-off-by: Stefan Metzmacher -Reviewed-by: Ralph Boehme ---- - source3/smbd/globals.h | 2 +- - source3/smbd/server_exit.c | 2 +- - source3/smbd/smbXsrv_tcon.c | 3 +-- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h -index f463da8a36e..a6213718b6b 100644 ---- a/source3/smbd/globals.h -+++ b/source3/smbd/globals.h -@@ -620,7 +620,7 @@ NTSTATUS smb1srv_tcon_create(struct smbXsrv_connection *conn, - NTSTATUS smb1srv_tcon_lookup(struct smbXsrv_connection *conn, - uint16_t tree_id, NTTIME now, - struct smbXsrv_tcon **tcon); --NTSTATUS smb1srv_tcon_disconnect_all(struct smbXsrv_connection *conn); -+NTSTATUS smb1srv_tcon_disconnect_all(struct smbXsrv_client *client); - NTSTATUS smb2srv_tcon_table_init(struct smbXsrv_session *session); - NTSTATUS smb2srv_tcon_create(struct smbXsrv_session *session, - NTTIME now, -diff --git a/source3/smbd/server_exit.c b/source3/smbd/server_exit.c -index 50b43a1ced4..00d9fefed9a 100644 ---- a/source3/smbd/server_exit.c -+++ b/source3/smbd/server_exit.c -@@ -144,7 +144,7 @@ static void exit_server_common(enum server_exit_reason how, - * Note: this is a no-op for smb2 as - * conn->tcon_table is empty - */ -- status = smb1srv_tcon_disconnect_all(xconn); -+ status = smb1srv_tcon_disconnect_all(client); - if (!NT_STATUS_IS_OK(status)) { - DEBUG(0,("Server exit (%s)\n", - (reason ? reason : "normal exit"))); -diff --git a/source3/smbd/smbXsrv_tcon.c b/source3/smbd/smbXsrv_tcon.c -index 627eeb166d9..4552ebb15eb 100644 ---- a/source3/smbd/smbXsrv_tcon.c -+++ b/source3/smbd/smbXsrv_tcon.c -@@ -1112,9 +1112,8 @@ NTSTATUS smb1srv_tcon_lookup(struct smbXsrv_connection *conn, - local_id, now, tcon); - } - --NTSTATUS smb1srv_tcon_disconnect_all(struct smbXsrv_connection *conn) -+NTSTATUS smb1srv_tcon_disconnect_all(struct smbXsrv_client *client) - { -- struct smbXsrv_client *client = conn->client; - - /* - * We do not pass a vuid here, --- -2.20.1 - diff --git a/0002-s3-libsmbclient-Do-not-call-cli_RNetShareEnum-if-SMB.patch b/0002-s3-libsmbclient-Do-not-call-cli_RNetShareEnum-if-SMB.patch deleted file mode 100644 index 9c60dfe..0000000 --- a/0002-s3-libsmbclient-Do-not-call-cli_RNetShareEnum-if-SMB.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 50f89bcdc9473abf69da1fee6f9014df63adc3e3 Mon Sep 17 00:00:00 2001 -From: Andreas Schneider -Date: Tue, 4 Sep 2018 16:08:58 +0200 -Subject: [PATCH] s3:libsmbclient: Do not call cli_RNetShareEnum if SMB1 is - disabled - -Signed-off-by: Andreas Schneider -Reviewed-by: Jeremy Allison - -"возможность просмотра списка шар на любом сервере" (c) abbra@ ---- - source3/libsmb/libsmb_dir.c | 35 ++++++++++++++++++----------------- - 1 file changed, 18 insertions(+), 17 deletions(-) - -diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c -index ff19ed57f14..886aa626509 100644 ---- a/source3/libsmb/libsmb_dir.c -+++ b/source3/libsmb/libsmb_dir.c -@@ -825,6 +825,7 @@ SMBC_opendir_ctx(SMBCCTX *context, - } - } else if (srv || - (resolve_name(server, &rem_ss, 0x20, false))) { -+ int rc; - - /* - * If we hadn't found the server, get one now -@@ -851,24 +852,24 @@ SMBC_opendir_ctx(SMBCCTX *context, - - /* List the shares ... */ - -- if (net_share_enum_rpc( -- srv->cli, -- list_fn, -- (void *) dir) < 0 && -- cli_RNetShareEnum( -- srv->cli, -- list_fn, -- (void *)dir) < 0) { -- -- errno = cli_errno(srv->cli); -- if (dir) { -- SAFE_FREE(dir->fname); -- SAFE_FREE(dir); -- } -+ rc = net_share_enum_rpc(srv->cli, -+ list_fn, -+ (void *)dir); -+ if (rc != 0 && -+ lp_client_min_protocol() <= PROTOCOL_NT1) { -+ rc = cli_RNetShareEnum(srv->cli, -+ list_fn, -+ (void *)dir); -+ } -+ if (rc != 0) { -+ errno = cli_errno(srv->cli); -+ if (dir != NULL) { -+ SAFE_FREE(dir->fname); -+ SAFE_FREE(dir); -+ } - TALLOC_FREE(frame); -- return NULL; -- -- } -+ return NULL; -+ } - } else { - /* Neither the workgroup nor server exists */ - errno = ECONNREFUSED; --- -2.19.2 - diff --git a/DEBIAN-s3-auth-ignore-create_builtin_guests-failing-without.patch b/DEBIAN-s3-auth-ignore-create_builtin_guests-failing-without.patch deleted file mode 100644 index 77a10cf..0000000 --- a/DEBIAN-s3-auth-ignore-create_builtin_guests-failing-without.patch +++ /dev/null @@ -1,52 +0,0 @@ -From cbdbf5e6e26017084fab0a6f6bd5ad495775fc31 Mon Sep 17 00:00:00 2001 -From: Stefan Metzmacher -Date: Wed, 19 Dec 2018 09:38:33 +0100 -Subject: [PATCH] s3:auth: ignore create_builtin_guests() failing without a - valid idmap configuration - -This happens on standalone servers, where winbindd is automatically -started by init scripts if it's installed. But it's not really -used and may not have a valid idmap configuration ( -"idmap config * : range" has no default!) - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=13697 - -Signed-off-by: Stefan Metzmacher -Reviewed-by: Alexander Bokovoy -(cherry picked from commit 865538fabaea33741f5fa542dbc3f2e08308c2c1) ---- - source3/auth/token_util.c | 18 +++++++++++++++++- - 1 file changed, 17 insertions(+), 1 deletion(-) - -diff --git a/source3/auth/token_util.c b/source3/auth/token_util.c -index f5b0e694433..ee38d6c9645 100644 ---- a/source3/auth/token_util.c -+++ b/source3/auth/token_util.c -@@ -745,7 +745,23 @@ NTSTATUS finalize_local_nt_token(struct security_token *result, - status = create_builtin_guests(domain_sid); - unbecome_root(); - -- if (NT_STATUS_EQUAL(status, NT_STATUS_PROTOCOL_UNREACHABLE)) { -+ /* -+ * NT_STATUS_PROTOCOL_UNREACHABLE: -+ * => winbindd is not running. -+ * -+ * NT_STATUS_ACCESS_DENIED: -+ * => no idmap config at all -+ * and wbint_AllocateGid()/winbind_allocate_gid() -+ * failed. -+ * -+ * NT_STATUS_NO_SUCH_GROUP: -+ * => no idmap config at all and -+ * "tdbsam:map builtin = no" means -+ * wbint_Sids2UnixIDs() fails. -+ */ -+ if (NT_STATUS_EQUAL(status, NT_STATUS_PROTOCOL_UNREACHABLE) || -+ NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) || -+ NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_GROUP)) { - /* - * Add BUILTIN\Guests directly to token. - * But only if the token already indicates --- -2.19.2 - diff --git a/FreeBSD-third__party_aesni-intel_wscript.patch b/FreeBSD-third__party_aesni-intel_wscript.patch deleted file mode 100644 index eb73d3f..0000000 --- a/FreeBSD-third__party_aesni-intel_wscript.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/third_party/aesni-intel/wscript.orig 2017-09-17 19:15:34 UTC -+++ b/third_party/aesni-intel/wscript -@@ -4,14 +4,19 @@ import Utils - - def configure(conf): - if Options.options.accel_aes.lower() == "intelaesni": -- if conf.CHECK_CFLAGS('-Wp,-E,-lang-asm', ''): -- if conf.env['SYSTEM_UNAME_MACHINE'] == 'x86_64': -+ asm_flags = ('-Wp,-E,-lang-asm', '-xassembler-with-cpp') -+ for f in asm_flags: -+ if conf.CHECK_CFLAGS(f, ''): -+ conf.DEFINE('AESNI_INTEL_CFLAGS', f) -+ break -+ if conf.CONFIG_SET('AESNI_INTEL_CFLAGS'): -+ if conf.env['SYSTEM_UNAME_MACHINE'] in ('x86_64', 'amd64'): - print("Compiling with Intel AES instructions") - conf.DEFINE('HAVE_AESNI_INTEL', 1) - else: - raise Utils.WafError('--accel-aes=intelaesni selected and non x86_64 CPU') - else: -- raise Utils.WafError('--accel-aes=intelaesni selected and compiler rejects -Wp,-E,-lang-asm') -+ raise Utils.WafError('--aes-accel=intelaesni selected and compiler rejects ' + str(asm_flags)) - if not conf.CHECK_LDFLAGS('-Wl,-z,noexecstack'): - raise Utils.WafError('--accel-aes=intelaesni selected and linker rejects -z noexecstack') - -@@ -21,6 +26,6 @@ def build(bld): - - bld.SAMBA_LIBRARY('aesni-intel', - source='aesni-intel_asm.c', -- cflags='-Wp,-E,-lang-asm', -+ cflags=bld.CONFIG_GET('AESNI_INTEL_CFLAGS'), - ldflags='-Wl,-z,noexecstack', - private_library=True) diff --git a/ROSA-Force-libsystemd.patch b/ROSA-Force-libsystemd.patch new file mode 100644 index 0000000..a65ac96 --- /dev/null +++ b/ROSA-Force-libsystemd.patch @@ -0,0 +1,73 @@ +From 48c114555e53cf2f15cadbf0089b1fdfd963962a Mon Sep 17 00:00:00 2001 +From: Mikhail Novosyolov +Date: Wed, 27 Mar 2019 23:53:50 +0300 +Subject: [PATCH] Force libsystemd + +For some reason waf failed to switch to libsystemd after not finding libsystemd-daemon, which was depreceated long time ago +--- + lib/util/wscript_build | 4 ++-- + lib/util/wscript_configure | 24 +++--------------------- + 2 files changed, 5 insertions(+), 23 deletions(-) + +diff --git a/lib/util/wscript_build b/lib/util/wscript_build +index e3a004fa3c6..d1f993116d9 100644 +--- a/lib/util/wscript_build ++++ b/lib/util/wscript_build +@@ -50,7 +50,7 @@ if bld.CONFIG_SET('HAVE_GPFS'): + bld.SAMBA_LIBRARY('samba-debug', + source='debug.c', + deps='replace time-basic close-low-fd talloc socket-blocking' + samba_debug_add_deps, +- public_deps='systemd systemd-journal lttng-ust', ++ public_deps='systemd lttng-ust', + local_include=False, + includes=samba_debug_add_inc, + private_library=True) +@@ -75,7 +75,7 @@ bld.SAMBA_SUBSYSTEM('samba-util-core', + become_daemon.c mkdir_p.c''', + deps='''time-basic samba-debug socket-blocking talloc + tevent execinfo pthread strv tini''', +- public_deps='systemd systemd-daemon', ++ public_deps='systemd', + local_include=False) + + bld.SAMBA_LIBRARY('iov_buf', +diff --git a/lib/util/wscript_configure b/lib/util/wscript_configure +index b06f1c14074..5a112102e3f 100644 +--- a/lib/util/wscript_configure ++++ b/lib/util/wscript_configure +@@ -99,29 +99,11 @@ conf.CHECK_CODE('struct statvfs buf; buf.f_flags = 0', + local_include=False, + execute=False) + +-# +-# systemd removed the libsystemd-daemon and libsystemd-journal libraries. In newer +-# versions it is only libsystemd. As waf pkg-config handling does not provide +-# targets which could be used as a dependency based on the package name we need +-# to look for them on our own. This enabled one of the library targets based on +-# which version we detect. +-# +-conf.SET_TARGET_TYPE('systemd-daemon', 'EMPTY') +-conf.SET_TARGET_TYPE('systemd-journal', 'EMPTY') + conf.SET_TARGET_TYPE('systemd', 'EMPTY') +- + if Options.options.enable_systemd != False: +- r_daemon = conf.CHECK_CFG(package='libsystemd-daemon', args='--cflags --libs', +- msg='Checking for libsystemd-daemon') +- r_journal = conf.CHECK_CFG(package='libsystemd-journal', args='--cflags --libs', +- msg='Checking for libsystemd-journal') +- if r_daemon is None and r_journal is None: +- conf.CHECK_CFG(package='libsystemd', args='--cflags --libs', +- msg='Checking for libsystemd') +- conf.CHECK_LIB('systemd', shlib=True) +- else: +- conf.CHECK_LIB('systemd-daemon', shlib=True) +- conf.CHECK_LIB('systemd-journal', shlib=True) ++ conf.CHECK_CFG(package='libsystemd', args='--cflags --libs', ++ msg='Checking for libsystemd') ++ conf.CHECK_LIB('systemd', shlib=True) + + conf.SET_TARGET_TYPE('lttng-ust', 'EMPTY') + +-- +2.20.1 + diff --git a/0001-Print-protocol-version-as-debug.patch b/more_patches/0001-Print-protocol-version-as-debug.patch similarity index 100% rename from 0001-Print-protocol-version-as-debug.patch rename to more_patches/0001-Print-protocol-version-as-debug.patch diff --git a/OpenBSD-Make-arguements-to-WAF.patch b/more_patches/OpenBSD-Make-arguements-to-WAF.patch similarity index 100% rename from OpenBSD-Make-arguements-to-WAF.patch rename to more_patches/OpenBSD-Make-arguements-to-WAF.patch diff --git a/samba-4.10-fix_make_install.patch b/samba-4.10-fix_make_install.patch new file mode 100644 index 0000000..cafd0c1 --- /dev/null +++ b/samba-4.10-fix_make_install.patch @@ -0,0 +1,39 @@ +From 739ac46f26e72a601405a0a59747b27584238b3e Mon Sep 17 00:00:00 2001 +From: Andreas Schneider +Date: Wed, 20 Mar 2019 11:09:21 +0100 +Subject: [PATCH] s4:librpc: Fix installation of Samba + +This breaks installation of Samba 4.10 on Fedora. + +https://bugzilla.samba.org/show_bug.cgi?id=13847 + +Signed-off-by: Andreas Schneider +Reviewed-by: Alexander Bokovoy + +(cherry picked from commit bf469343f577e2d78df0e38d80e7976b351eaf0d) +--- + source4/librpc/wscript_build | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build +index f00571e4bc3..d9b7743c9d1 100644 +--- a/source4/librpc/wscript_build ++++ b/source4/librpc/wscript_build +@@ -412,14 +412,6 @@ for env in bld.gen_python_environments(): + cflags_end=gen_cflags + ) + +- bld.SAMBA_PYTHON('python_idmap', +- source='../../librpc/gen_ndr/py_idmap.c', +- deps='NDR_IDMAP %s %s' % (pytalloc_util, pyrpc_util), +- realname='samba/dcerpc/idmap.so', +- cflags_end=gen_cflags +- ) +- +- + bld.SAMBA_PYTHON('python_drsuapi', + source='../../librpc/gen_ndr/py_drsuapi.c', + deps='RPC_NDR_DRSUAPI %s %s' % (pytalloc_util, pyrpc_util), +-- +2.21.0 + diff --git a/samba.spec b/samba.spec index a225e4d..b1361a0 100644 --- a/samba.spec +++ b/samba.spec @@ -101,8 +101,8 @@ Summary: Samba SMB server Name: samba -Version: 4.9.4 -Release: 17 +Version: 4.10.0 +Release: 1 Epoch: 1 License: GPLv3+ Group: System/Servers @@ -128,21 +128,14 @@ Source100: %{name}.rpmlintrc # in some cases conditions like 'if platform=OpenBSD' are removed; # in some cases patches are just rediffed. Patch2: samba-4.3.11-winbind-service.patch -Patch3: FreeBSD-third__party_aesni-intel_wscript.patch Patch4: OpenBSD-Reverse-order-of-paths-added.patch -Patch5: OpenBSD-Make-arguements-to-WAF.patch Patch7: OpenBSD-Lock-order-violation.patch Patch8: ROSA-bind-GID.patch -Patch9: DEBIAN-s3-auth-ignore-create_builtin_guests-failing-without.patch Patch10: ROSA-vendor-version.patch Patch11: ROSA-smb-default-config.patch Patch12: ROSA-Clearer-debug-about-ulimits.patch -Patch13: 0001-s3-libsmbclient-Add-function-to-set-protocol-levels.patch -Patch14: 0002-s3-libsmbclient-Do-not-call-cli_RNetShareEnum-if-SMB.patch -Patch15: 0001-Print-protocol-version-as-debug.patch -Patch16: 0001-smbd-only-pass-struct-smbXsrv_client-to-smb1srv_tcon.patch -Patch17: 0001-smbclient-Fix-errors-printed-if-we-can-connect-with-.patch -Patch18: 0001-s3-smbclient-Do-not-call-cli_RNetShareEnum-if-SMB1-i.patch +Patch13: ROSA-Force-libsystemd.patch +Patch14: samba-4.10-fix_make_install.patch %if %{with clang} BuildRequires: clang lld @@ -191,6 +184,8 @@ BuildRequires: pkgconfig(tdb) BuildRequires: pkgconfig(tevent) BuildRequires: pkgconfig(jansson) BuildRequires: pkgconfig(libarchive) +BuildRequires: pkgconfig(python3) +BuildRequires: %{_lib}cmocka-devel BuildRequires: gpgme-devel Requires: pam >= 0.64 @@ -395,6 +390,7 @@ Provides libraries for samba-server %{_libdir}/samba/libcli-smb-common-samba4.so %{_libdir}/samba/libcli-spoolss-samba4.so %{_libdir}/samba/libcliauth-samba4.so +%{_libdir}/samba/libclidns-samba4.so %{_libdir}/samba/libcluster-samba4.so %{_libdir}/samba/libcmdline-credentials-samba4.so %{_libdir}/samba/libcmdline-contexts-samba4.so @@ -496,7 +492,6 @@ Provides libraries for samba-server %{_libdir}/samba/libutil-setid-samba4.so %{_libdir}/samba/libutil-tdb-samba4.so %{_libdir}/samba/libwinbind-client-samba4.so -%{_libdir}/samba/libcmocka-samba4.so %{_libdir}/samba/libnon-posix-acls-samba4.so %ifarch x86_64 %{_libdir}/samba/libaesni-intel-samba4.so @@ -660,10 +655,8 @@ packages of Samba. %{_mandir}/man8/vfs_aio_fork.8* %{_mandir}/man8/vfs_aio_pthread.8* %{_mandir}/man8/vfs_audit.8* -%{_mandir}/man8/vfs_cacheprime.8* %{_mandir}/man8/vfs_cap.8* %{_mandir}/man8/vfs_catia.8* -%{_mandir}/man8/vfs_ceph.8* %{_mandir}/man8/vfs_commit.8* %{_mandir}/man8/vfs_crossrename.8* %{_mandir}/man8/vfs_default_quota.8* @@ -673,12 +666,10 @@ packages of Samba. %{_mandir}/man8/vfs_fileid.8* %{_mandir}/man8/vfs_fruit.8* %{_mandir}/man8/vfs_full_audit.8* -%{_mandir}/man8/vfs_glusterfs.8* -%{_mandir}/man8/vfs_gpfs.8* +%{_mandir}/man8/vfs_glusterfs_fuse.8* %{_mandir}/man8/vfs_media_harmony.8* %{_mandir}/man8/vfs_netatalk.8* %{_mandir}/man8/vfs_offline.8* -%{_mandir}/man8/vfs_prealloc.8* %{_mandir}/man8/vfs_preopen.8* %{_mandir}/man8/vfs_readahead.8* %{_mandir}/man8/vfs_readonly.8* @@ -690,14 +681,12 @@ packages of Samba. %{_mandir}/man8/vfs_streams_depot.8* %{_mandir}/man8/vfs_streams_xattr.8* %{_mandir}/man8/vfs_time_audit.8* -%{_mandir}/man8/vfs_tsmsm.8* %{_mandir}/man8/vfs_xattr_tdb.8* %{_mandir}/man8/vfs_unityed_media.8* %{_mandir}/man8/vfs_worm.8* %{_mandir}/man8/vfs_btrfs.8* %{_mandir}/man8/vfs_linux_xfs_sgid.8* %{_mandir}/man8/vfs_syncops.8* -%{_mandir}/man8/vfs_nfs4acl_xattr.8* %{_mandir}/man8/vfs_virusfilter.8* %post common @@ -1478,6 +1467,14 @@ export CPP=clang-cpp export CFLAGS="-O2 -g" +# Starting from samba 4.10.0 python3 is default, +# this temporarily makes python2 still default; +# I don't want to build copies of python2 packages for python3 +# for just one Samba major version, samba 4.11 will remove python2 completely, +# so let's stay with python2 for now and then switch to python3 +# (also, python3 is not the newest in ROSA). +export PYTHON=python2 + chmod +x ./buildtools/bin/waf ./buildtools/bin/waf configure \ --enable-fhs \ @@ -1520,6 +1517,8 @@ chmod +x ./buildtools/bin/waf --with-dnsupdate \ --with-automount \ --without-cluster-support \ + --without-lttng \ + --disable-glusterfs \ --with-sendfile-support \ --with-dnsupdate \ --with-systemd \