Revision: 26302 http://sourceforge.net/p/gar/code/26302 Author: janholzh Date: 2017-11-30 09:49:24 +0000 (Thu, 30 Nov 2017) Log Message: ----------- samba/branches/samba-4.7.x: add samba4-7
Modified Paths: -------------- csw/mgar/pkg/samba/branches/samba-4.7.x/Makefile csw/mgar/pkg/samba/branches/samba-4.7.x/checksums Added Paths: ----------- csw/mgar/pkg/samba/branches/samba-4.7.x/ csw/mgar/pkg/samba/branches/samba-4.7.x/files/0003-zfs_acl-fix-not-seemded-not-merged.patch Removed Paths: ------------- csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_10877 csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_11053 csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_11359 csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_11508 csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_11511 csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_11512 Modified: csw/mgar/pkg/samba/branches/samba-4.7.x/Makefile =================================================================== --- csw/mgar/pkg/samba/branches/samba-4.4.x/Makefile 2017-11-18 17:26:30 UTC (rev 26300) +++ csw/mgar/pkg/samba/branches/samba-4.7.x/Makefile 2017-11-30 09:49:24 UTC (rev 26302) @@ -1,5 +1,5 @@ NAME = samba -VERSION = 4.4.13 +VERSION = 4.7.3 GARTYPE = v2 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server) @@ -43,43 +43,13 @@ PATCHFILES += nss_winbind.patch PATCHFILES += smbd_patch_for_setgroups.patch -# From https://bugzilla.samba.org/show_bug.cgi?id=10112 -#PATCHFILES += 0003-Use-R-linker-flag-instead-of-rpath.patch -# Help the script to find the username -#PATCHFILES += 0004-solaris-id-is-not-xpg4.patch -#From https://bugzilla.samba.org/show_bug.cgi?id=11359 -#PATCHFILES += fix_bugid_11359 - -#From https://bugzilla.samba.org/show_bug.cgi?id=10877 -#PATCHFILES +=fix_bugid_10877 - -#From https://bugzilla.samba.org/show_bug.cgi?id=11053 -#PATCHFILES +=fix_bugid_11053 - -#From https://bugzilla.samba.org/show_bug.cgi?id=11508 -#PATCHFILES +=fix_bugid_11508 - -#From https://bugzilla.samba.org/show_bug.cgi?id=11511 -#PATCHFILES +=fix_bugid_11511 - -#From https://bugzilla.samba.org/show_bug.cgi?id=11512 -#PATCHFILES +=fix_bugid_11512 - -#From https://hg.java.net/hg/solaris-userland~gate/file/73dae8fa5c34/components/samba/samba/patches/talloc_dict_sigbus.patch -#PATCHFILES += talloc_dict_sigbus.patch - -#fix build problems with idmap patch not in 4.3 but master -#https://git.samba.org/?p=samba.git;a=patch;h=5134d29cbb2edcc2326de8896c5465afb3a0f392 -#PATCHFILES +=idmap_fix - -#from https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=208767 -#PATCHFILES += 0004-fix_clearenv.patch - # Add a patch to be able to do s3fs provison of AD. You need to edit smb.conf after that. # http://markmail.org/message/n3iqsplcermy6ast#query:+page:1+mid:uu2drll22g2eo5jl+state:results PATCHFILES += 0004-Add-zfs-to-provision-support.patch +PATCHFILES += 0003-zfs_acl-fix-not-seemded-not-merged.patch + NOGITPATCH += 1 # Filesystem layout @@ -267,8 +237,8 @@ SMB_LIBS = libdcerpc-atsvc.so.0 libdcerpc-binding.so.0 libdcerpc-samr.so.0 libdcerpc-server.so.0 libdcerpc.so.0 libgensec.so.0 SMB_LIBS += libndr-krb5pac.so.0 libndr-nbt.so.0 libndr-standard.so.0 libndr.so.0 libnetapi.so.0 libpdb.so.0 SMB_LIBS += libregistry.so.0 libsamba-credentials.so.0 libsamba-hostconfig.so.0 libsamba-policy.so.0 -SMB_LIBS += libsamba-util.so.0 libsamdb.so.0 libsmbclient-raw.so.0 libsmbconf.so.0 libsmbldap.so.0 libtevent-util.so.0 -SMB_LIBS += libtorture.so.0 libsamba-passdb.so.0 libsmbclient.so.0 libwbclient.so.0 libsamba-errors.so.1 libtevent-unix-util.so.0 +SMB_LIBS += libsamba-util.so.0 libsamdb.so.0 libsmbclient-raw.so.0 libsmbconf.so.0 libsmbldap.so.2 libtevent-util.so.0 +SMB_LIBS += libtorture.so.0 libsamba-passdb.so.0 libsmbclient.so.0 libwbclient.so.0 libsamba-errors.so.1 PKGFILES_CSWsamba4-libs += $(foreach L,$(SMB_LIBS),$(call pkgfiles_lib,$L)) PKGFILES_CSWsamba4-libs += $(SMBPRIVATELIB)/.* @@ -288,6 +258,8 @@ RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibldap2-4-2 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpopt0 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibssp0 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibjansson4 +RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgpgme11 RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibssl1-0-0 RUNTIME_DEP_PKGS_CSWsamba4-libs += $(RUNTIME_DEP_PKGS_CSWsamba4-libs_$(GAROSREL)) #CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += soname-unused @@ -311,20 +283,19 @@ CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libndr-krb5pac.so.0.0.1|soname=libndr-krb5pac.so.0|pkgname=CSWsamba4-libs|expected=CSWlibndr-krb5pac0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libndr-nbt.so.0.0.1|soname=libndr-nbt.so.0|pkgname=CSWsamba4-libs|expected=CSWlibndr-nbt0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libndr-standard.so.0.0.1|soname=libndr-standard.so.0|pkgname=CSWsamba4-libs|expected=CSWlibndr-standard0 -CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libndr.so.0.0.5|soname=libndr.so.0|pkgname=CSWsamba4-libs|expected=CSWlibndr0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libndr.so.0.1.0|soname=libndr.so.0|pkgname=CSWsamba4-libs|expected=CSWlibndr0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libnetapi.so.0|soname=libnetapi.so.0|pkgname=CSWsamba4-libs|expected=CSWlibnetapi0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-credentials.so.0.0.1|soname=libsamba-credentials.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-credentials0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-hostconfig.so.0.0.1|soname=libsamba-hostconfig.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-hostconfig0 -CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-passdb.so.0.25.0|soname=libsamba-passdb.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-passdb0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-passdb.so.0.27.0|soname=libsamba-passdb.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-passdb0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-policy.so.0.0.1|soname=libsamba-policy.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-policy0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-util.so.0.0.1|soname=libsamba-util.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamba-util0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamdb.so.0.0.1|soname=libsamdb.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsamdb0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsmbclient.so.0.2.3|soname=libsmbclient.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsmbclient0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsmbconf.so.0|soname=libsmbconf.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsmbconf0 -CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsmbldap.so.0|soname=libsmbldap.so.0|pkgname=CSWsamba4-libs|expected=CSWlibsmbldap0 -CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwbclient.so.0.12|soname=libwbclient.so.0|pkgname=CSWsamba4-libs|expected=CSWlibwbclient0 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsmbldap.so.2|soname=libsmbldap.so.2|pkgname=CSWsamba4-libs|expected=CSWlibsmbldap2 +CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libwbclient.so.0.14|soname=libwbclient.so.0|pkgname=CSWsamba4-libs|expected=CSWlibwbclient0 CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libsamba-errors.so.1|soname=libsamba-errors.so.1|pkgname=CSWsamba4-libs|expected=CSWlibsamba-errors1 -CHECKPKG_OVERRIDES_CSWsamba4-libs += shared-lib-pkgname-mismatch|file=opt/csw/lib/libtevent-unix-util.so.0.0.1|soname=libtevent-unix-util.so.0|pkgname=CSWsamba4-libs|expected=CSWlibtevent-unix-util0 CHECKPKG_OVERRIDES_CSWsamba4-libs += file-collision|/opt/csw/lib/libwbclient.so.0|CSWlibwbclient0|CSWsamba4-libs CHECKPKG_OVERRIDES_CSWsamba4-libs += file-collision|/opt/csw/lib/libnetapi.so.0|CSWlibnetapi0|CSWsamba4-libs @@ -509,7 +480,7 @@ CONFIGURE_ARGS += --with-ldap CONFIGURE_ARGS += --with-automount CONFIGURE_ARGS += --enable-cups -CONFIGURE_ARGS += --with-ntvfs-fileserver +#CONFIGURE_ARGS += --with-ntvfs-fileserver CONFIGURE_ARGS += --with-privatedir=$(SMBPRIVATEDIR) CONFIGURE_ARGS += --with-configdir=$(SMBCONFIGDIR) CONFIGURE_ARGS += --with-lockdir=$(SMBLOCKDIR) Modified: csw/mgar/pkg/samba/branches/samba-4.7.x/checksums =================================================================== --- csw/mgar/pkg/samba/branches/samba-4.4.x/checksums 2017-11-18 17:26:30 UTC (rev 26300) +++ csw/mgar/pkg/samba/branches/samba-4.7.x/checksums 2017-11-30 09:49:24 UTC (rev 26302) @@ -1 +1 @@ -799ba7ac2e18880ab09c4d3f390c2395 samba-4.4.13.tar.gz +5da8a195094c44a60eb7eb7cf96d6a49 samba-4.7.3.tar.gz Added: csw/mgar/pkg/samba/branches/samba-4.7.x/files/0003-zfs_acl-fix-not-seemded-not-merged.patch =================================================================== --- csw/mgar/pkg/samba/branches/samba-4.7.x/files/0003-zfs_acl-fix-not-seemded-not-merged.patch (rev 0) +++ csw/mgar/pkg/samba/branches/samba-4.7.x/files/0003-zfs_acl-fix-not-seemded-not-merged.patch 2017-11-30 09:49:24 UTC (rev 26302) @@ -0,0 +1,128 @@ +From 56cb341c68240541891f71d7507d714683d74fea Mon Sep 17 00:00:00 2001 +From: Jan Holzhueter <j...@opencsw.org> +Date: Wed, 29 Nov 2017 15:43:35 +0100 +Subject: [PATCH] zfs_acl fix not seemded not merged + +--- + source3/modules/vfs_zfsacl.c | 61 +++++++++++++++----------------------------- + 1 file changed, 20 insertions(+), 41 deletions(-) + +diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c +index dd0f343..f15a964 100644 +--- a/source3/modules/vfs_zfsacl.c ++++ b/source3/modules/vfs_zfsacl.c +@@ -1,4 +1,11 @@ + /* ++ * file is placed here temporary until the bug: ++ * https://bugzilla.samba.org/show_bug.cgi?id=13162 ++ * will not be fixed. ++ * please see COMPONENT_PREP_ACTION in Makefile ++ */ ++ ++/* + * Convert ZFS/NFSv4 acls to NT acls and vice versa. + * + * Copyright (C) Jiri Sasek, 2007 +@@ -40,44 +47,22 @@ + * read the local file's acls and return it in NT form + * using the NFSv4 format conversion + */ +-static NTSTATUS zfs_get_nt_acl_common(struct connection_struct *conn, +- TALLOC_CTX *mem_ctx, +- const struct smb_filename *smb_fname, ++static NTSTATUS zfs_get_nt_acl_common(TALLOC_CTX *mem_ctx, ++ const char *name, + struct SMB4ACL_T **ppacl) + { + int naces, i; + ace_t *acebuf; + struct SMB4ACL_T *pacl; +- SMB_STRUCT_STAT sbuf; +- const SMB_STRUCT_STAT *psbuf = NULL; +- int ret; +- +- if (VALID_STAT(smb_fname->st)) { +- psbuf = &smb_fname->st; +- } +- +- if (psbuf == NULL) { +- ret = vfs_stat_smb_basename(conn, smb_fname, &sbuf); +- if (ret != 0) { +- DBG_INFO("stat [%s]failed: %s\n", +- smb_fname_str_dbg(smb_fname), strerror(errno)); +- return map_nt_error_from_unix(errno); +- } +- psbuf = &sbuf; +- } +- +- if (S_ISDIR(psbuf->st_ex_mode) && (ace->aceMask & SMB_ACE4_ADD_FILE)) { +- ace->aceMask |= SMB_ACE4_DELETE_CHILD; +- } + + /* read the number of file aces */ +- if((naces = acl(smb_fname->base_name, ACE_GETACLCNT, 0, NULL)) == -1) { ++ if((naces = acl(name, ACE_GETACLCNT, 0, NULL)) == -1) { + if(errno == ENOSYS) { + DEBUG(9, ("acl(ACE_GETACLCNT, %s): Operation is not " + "supported on the filesystem where the file " +- "reside\n", smb_fname->base_name)); ++ "reside\n", name)); + } else { +- DEBUG(9, ("acl(ACE_GETACLCNT, %s): %s ", smb_fname->base_name, ++ DEBUG(9, ("acl(ACE_GETACLCNT, %s): %s ", name, + strerror(errno))); + } + return map_nt_error_from_unix(errno); +@@ -89,8 +74,8 @@ static NTSTATUS zfs_get_nt_acl_common(struct connection_struct *conn, + return NT_STATUS_NO_MEMORY; + } + /* read the aces into the field */ +- if(acl(smb_fname->base_name, ACE_GETACL, naces, acebuf) < 0) { +- DEBUG(9, ("acl(ACE_GETACL, %s): %s ", smb_fname->base_name, ++ if(acl(name, ACE_GETACL, naces, acebuf) < 0) { ++ DEBUG(9, ("acl(ACE_GETACL, %s): %s ", name, + strerror(errno))); + return map_nt_error_from_unix(errno); + } +@@ -106,15 +91,6 @@ static NTSTATUS zfs_get_nt_acl_common(struct connection_struct *conn, + aceprop.aceMask = (uint32_t) acebuf[i].a_access_mask; + aceprop.who.id = (uint32_t) acebuf[i].a_who; + +- /* +- * Windows clients expect SYNC on acls to correctly allow +- * rename, cf bug #7909. But not on DENY ace entries, cf bug +- * #8442. +- */ +- if (aceprop.aceType == SMB_ACE4_ACCESS_ALLOWED_ACE_TYPE) { +- aceprop.aceMask |= SMB_ACE4_SYNCHRONIZE; +- } +- + if(aceprop.aceFlags & ACE_OWNER) { + aceprop.flags = SMB_ACE4_ID_SPECIAL; + aceprop.who.special_id = SMB_ACE4_WHO_OWNER; +@@ -232,8 +208,9 @@ static NTSTATUS zfsacl_fget_nt_acl(struct vfs_handle_struct *handle, + NTSTATUS status; + TALLOC_CTX *frame = talloc_stackframe(); + +- status = zfs_get_nt_acl_common(handle->conn, frame, +- fsp->fsp_name, &pacl); ++ status = zfs_get_nt_acl_common(frame, ++ fsp->fsp_name->base_name, ++ &pacl); + if (!NT_STATUS_IS_OK(status)) { + TALLOC_FREE(frame); + return status; +@@ -255,7 +232,9 @@ static NTSTATUS zfsacl_get_nt_acl(struct vfs_handle_struct *handle, + NTSTATUS status; + TALLOC_CTX *frame = talloc_stackframe(); + +- status = zfs_get_nt_acl_common(handle->conn, frame, smb_fname, &pacl); ++ status = zfs_get_nt_acl_common(frame, ++ smb_fname->base_name, ++ &pacl); + if (!NT_STATUS_IS_OK(status)) { + TALLOC_FREE(frame); + return status; +-- +2.4.0 + Deleted: csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_10877 =================================================================== --- csw/mgar/pkg/samba/branches/samba-4.4.x/files/fix_bugid_10877 2017-11-18 17:26:30 UTC (rev 26300) +++ csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_10877 2017-11-30 09:49:24 UTC (rev 26302) @@ -1,165 +0,0 @@ -From 473a56c5adf2af1044666963d11f65b030d17f7b Mon Sep 17 00:00:00 2001 -From: Ralph Boehme <s...@samba.org> -Date: Sat, 25 Apr 2015 03:38:48 +0200 -Subject: [PATCH 1/3] Revert "wafsamba: flags from enviroment are put before - our own internal versions" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This reverts commit b2bb6aeb8057ac725f6ad12378344b201c3a3ba2. - -Bug: https://bugzilla.samba.org/show_bug.cgi?id=10877 - -Signed-off-by: Ralph Boehme <s...@samba.org> -Reviewed-by: Jelmer Vernooij <jel...@samba.org> - -Autobuild-User(master): Ralph Böhme <s...@samba.org> -Autobuild-Date(master): Sun Apr 26 18:40:39 CEST 2015 on sn-devel-104 ---- - buildtools/wafsamba/samba_optimisation.py | 42 ------------------------------- - 1 file changed, 42 deletions(-) - -diff --git a/buildtools/wafsamba/samba_optimisation.py b/buildtools/wafsamba/samba_optimisation.py -index 5def580..51d514e 100644 ---- a/buildtools/wafsamba/samba_optimisation.py -+++ b/buildtools/wafsamba/samba_optimisation.py -@@ -287,45 +287,3 @@ def samba_before_apply_obj_vars(self): - for i in v['LIBPATH']: - if is_standard_libpath(v, i): - v['LIBPATH'].remove(i) -- --@feature('cc') --@before('apply_incpaths', 'apply_obj_vars_cc') --def samba_stash_cppflags(self): -- """Fix broken waf ordering of CPPFLAGS""" -- -- self.env.SAVED_CPPFLAGS = self.env.CPPFLAGS -- self.env.CPPFLAGS = [] -- --@feature('cc') --@after('apply_incpaths', 'apply_obj_vars_cc') --def samba_pop_cppflags(self): -- """append stashed user CPPFLAGS after our internally computed flags""" -- -- # -- # Note that we don't restore the values to 'CPPFLAGS', -- # but to _CCINCFLAGS instead. -- # -- # buildtools/wafadmin/Tools/cc.py defines the 'cc' task generator as -- # '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}' -- # -- # Our goal is to effectively invert the order of ${CPPFLAGS} and -- # ${_CCINCFLAGS}. -- self.env.append_value('_CCINCFLAGS', self.env.SAVED_CPPFLAGS) -- self.env.SAVED_CPPFLAGS = [] -- --@feature('cprogram', 'cshlib', 'cstaticlib') --@before('apply_obj_vars', 'add_extra_flags') --def samba_stash_linkflags(self): -- """stash away LINKFLAGS in order to fix waf's broken ordering wrt or -- user LDFLAGS""" -- -- self.env.SAVE_LINKFLAGS = self.env.LINKFLAGS -- self.env.LINKFLAGS = [] -- --@feature('cprogram', 'cshlib', 'cstaticlib') --@after('apply_obj_vars', 'add_extra_flags') --def samba_pop_linkflags(self): -- """after apply_obj_vars append saved LDFLAGS""" -- -- self.env.append_value('LINKFLAGS', self.env.SAVE_LINKFLAGS) -- self.env.SAVE_LINKFLAGS = [] --- -2.1.0 - - -From 84ba72c85595f95e9aee2731415da79d692aa106 Mon Sep 17 00:00:00 2001 -From: Ralph Boehme <s...@samba.org> -Date: Thu, 21 May 2015 05:00:02 +0200 -Subject: [PATCH 2/3] waf: put user LDFLAGS behind internal search paths but - before LIBS - -Bug: https://bugzilla.samba.org/show_bug.cgi?id=10877 - -Signed-off-by: Ralph Boehme <s...@samba.org> ---- - buildtools/wafadmin/Tools/ccroot.py | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/buildtools/wafadmin/Tools/ccroot.py b/buildtools/wafadmin/Tools/ccroot.py -index 25c5179..64037c8 100644 ---- a/buildtools/wafadmin/Tools/ccroot.py -+++ b/buildtools/wafadmin/Tools/ccroot.py -@@ -461,6 +461,7 @@ def apply_objdeps(self): - def apply_obj_vars(self): - """after apply_lib_vars for uselib""" - v = self.env -+ v['LINKFLAGS_PATHS'] = [] - lib_st = v['LIB_ST'] - staticlib_st = v['STATICLIB_ST'] - libpath_st = v['LIBPATH_ST'] -@@ -469,16 +470,27 @@ def apply_obj_vars(self): - - app = v.append_unique - -+ # The desired final order is LIBPATH/RPATH LINKFLAGS LIBS, so -+ # put library paths and marker in a temp variable - if v['FULLSTATIC']: -- v.append_value('LINKFLAGS', v['FULLSTATIC_MARKER']) -+ v.append_value('LINKFLAGS_PATHS', v['FULLSTATIC_MARKER']) - - for i in v['RPATH']: - if i and rpath_st: -- app('LINKFLAGS', rpath_st % i) -+ app('LINKFLAGS_PATHS', rpath_st % i) -+ - - for i in v['LIBPATH']: -- app('LINKFLAGS', libpath_st % i) -- app('LINKFLAGS', staticlibpath_st % i) -+ app('LINKFLAGS_PATHS', libpath_st % i) -+ app('LINKFLAGS_PATHS', staticlibpath_st % i) -+ -+ # LINKFLAGS_PATHS now contains the library paths. LINKFLAGS -+ # contains the user environment LDFLAGS as well as any flags -+ # added by waf at configuration time. -+ app('LINKFLAGS_PATHS', v['LINKFLAGS']) -+ -+ # Now assign LINKFLAGS, LIBS will be appended below -+ v['LINKFLAGS'] = v['LINKFLAGS_PATHS'] - - if v['STATICLIB']: - v.append_value('LINKFLAGS', v['STATICLIB_MARKER']) --- -2.1.0 - - -From 3a5bbae3af4f7baf816f6ca58cb2c20b60077deb Mon Sep 17 00:00:00 2001 -From: Ralph Boehme <s...@samba.org> -Date: Thu, 21 May 2015 05:12:56 +0200 -Subject: [PATCH 3/3] waf: put user env CPPFLAGS behind internal flags - -Bug: https://bugzilla.samba.org/show_bug.cgi?id=10877 - -Signed-off-by: Ralph Boehme <s...@samba.org> ---- - buildtools/wafadmin/Tools/cc.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/buildtools/wafadmin/Tools/cc.py b/buildtools/wafadmin/Tools/cc.py -index 903a1c5..bfbba27 100644 ---- a/buildtools/wafadmin/Tools/cc.py -+++ b/buildtools/wafadmin/Tools/cc.py -@@ -88,7 +88,7 @@ def c_hook(self, node): - raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self)) - return task - --cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}' -+cc_str = '${CC} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CCFLAGS} ${CPPFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}' - cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False) - cls.scan = ccroot.scan - cls.vars.append('CCDEPS') --- -2.1.0 - Deleted: csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_11053 =================================================================== --- csw/mgar/pkg/samba/branches/samba-4.4.x/files/fix_bugid_11053 2017-11-18 17:26:30 UTC (rev 26300) +++ csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_11053 2017-11-30 09:49:24 UTC (rev 26302) @@ -1,39 +0,0 @@ -From 5250625a23b52399e4f386f49d2608aca3dd1afe Mon Sep 17 00:00:00 2001 -From: Ralph Boehme <r...@sernet.de> -Date: Fri, 16 Jan 2015 10:43:52 +0100 -Subject: [PATCH] lib/msghdr: add defines for Solaris - -Add the proper defines for Solaris to expose the required msg_control -and msg_controllen struct msghdr members and for sockaddr_storage. - -The right thing to do would be to add checks to waf that would set up -the correct compilation environment on Solaris (that would result in -defining _XOPEN_SOURCE=500/600 and __EXTENSISONS__), but unfortunately -that breaks other waf configure checks (cups) and the build (heimdal, -math functions use goto label ERR which is an existing define in -/usr/include/sys/regset.h). - -Signed-off-by: Ralph Boehme <r...@sernet.de> ---- - source3/lib/msghdr.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/source3/lib/msghdr.c b/source3/lib/msghdr.c -index 82f7ca7..3ccf898 100644 ---- a/source3/lib/msghdr.c -+++ b/source3/lib/msghdr.c -@@ -16,6 +16,11 @@ - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -+#ifdef __sun -+#define _XPG4_2 /* for msg_control and msg_controllen */ -+#define __EXTENSIONS__ /* for struct sockaddr_storage */ -+#endif -+ - #include "replace.h" - #include "lib/msghdr.h" - #include "lib/iov_buf.h" --- -1.9.3 - Deleted: csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_11359 =================================================================== --- csw/mgar/pkg/samba/branches/samba-4.4.x/files/fix_bugid_11359 2017-11-18 17:26:30 UTC (rev 26300) +++ csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_11359 2017-11-30 09:49:24 UTC (rev 26302) @@ -1,86 +0,0 @@ -From 6cbc4ec426b00a8b920c758f408530e1a63fdf37 Mon Sep 17 00:00:00 2001 -From: Jeremy Allison <j...@samba.org> -Date: Wed, 15 Jul 2015 10:43:56 -0700 -Subject: [PATCH] lib: replace: Add strsep function (missing on Solaris). - -BUG: https://bugzilla.samba.org/show_bug.cgi?id=11359 - -Signed-off-by: Jeremy Allison <j...@samba.org> ---- - lib/replace/replace.c | 20 ++++++++++++++++++++ - lib/replace/replace.h | 5 +++++ - lib/replace/wscript | 4 ++-- - 3 files changed, 27 insertions(+), 2 deletions(-) - -diff --git a/lib/replace/replace.c b/lib/replace/replace.c -index dccf514..0806ce3 100644 ---- a/lib/replace/replace.c -+++ b/lib/replace/replace.c -@@ -475,6 +475,26 @@ char *rep_strcasestr(const char *haystack, const char *needle) - } - #endif - -+#ifndef HAVE_STRSEP -+char *rep_strsep(char **pps, const char *delim) -+{ -+ char *ret = *pps; -+ char *p = *pps; -+ -+ if (p == NULL) { -+ return NULL; -+ } -+ p += strcspn(p, delim); -+ if (*p == '\0') { -+ *pps = NULL; -+ } else { -+ *p = '\0'; -+ *pps = p + 1; -+ } -+ return ret; -+} -+#endif -+ - #ifndef HAVE_STRTOK_R - /* based on GLIBC version, copyright Free Software Foundation */ - char *rep_strtok_r(char *s, const char *delim, char **save_ptr) -diff --git a/lib/replace/replace.h b/lib/replace/replace.h -index 3ff4e36..c764d06 100644 ---- a/lib/replace/replace.h -+++ b/lib/replace/replace.h -@@ -349,6 +349,11 @@ void rep_setlinebuf(FILE *); - char *rep_strcasestr(const char *haystack, const char *needle); - #endif - -+#ifndef HAVE_STRSEP -+#define strsep rep_strsep -+char *rep_strsep(char **pps, const char *delim); -+#endif -+ - #ifndef HAVE_STRTOK_R - #define strtok_r rep_strtok_r - char *rep_strtok_r(char *s, const char *delim, char **save_ptr); -diff --git a/lib/replace/wscript b/lib/replace/wscript -index 516db2f..30eede2 100644 ---- a/lib/replace/wscript -+++ b/lib/replace/wscript -@@ -240,7 +240,7 @@ def configure(conf): - conf.CHECK_FUNCS('lstat getpgrp utime utimes setuid seteuid setreuid setresuid setgid setegid') - conf.CHECK_FUNCS('setregid setresgid chroot strerror vsyslog setlinebuf mktime') - conf.CHECK_FUNCS('ftruncate chsize rename waitpid wait4') -- conf.CHECK_FUNCS('initgroups pread pwrite strndup strcasestr') -+ conf.CHECK_FUNCS('initgroups pread pwrite strndup strcasestr strsep') - conf.CHECK_FUNCS('strtok_r mkdtemp dup2 dprintf vdprintf isatty chown lchown') - conf.CHECK_FUNCS('link readlink symlink realpath snprintf vsnprintf') - conf.CHECK_FUNCS('asprintf vasprintf setenv unsetenv strnlen strtoull __strtoull') -@@ -630,7 +630,7 @@ REPLACEMENT_FUNCTIONS = { - 'memmove', 'strdup', 'setlinebuf', 'vsyslog', 'strnlen', - 'strndup', 'waitpid', 'seteuid', 'setegid', 'chroot', - 'mkstemp', 'mkdtemp', 'pread', 'pwrite', 'strcasestr', -- 'strtok_r', 'strtoll', 'strtoull', 'setenv', 'unsetenv', -+ 'strsep', 'strtok_r', 'strtoll', 'strtoull', 'setenv', 'unsetenv', - 'utime', 'utimes', 'dup2', 'chown', 'link', 'readlink', - 'symlink', 'lchown', 'realpath', 'memmem', 'vdprintf', - 'dprintf', 'get_current_dir_name', --- -2.4.3.573.g4eafbef - Deleted: csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_11508 =================================================================== --- csw/mgar/pkg/samba/branches/samba-4.4.x/files/fix_bugid_11508 2017-11-18 17:26:30 UTC (rev 26300) +++ csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_11508 2017-11-30 09:49:24 UTC (rev 26302) @@ -1,26 +0,0 @@ ---- a/source4/torture/local/nss_tests.c Tue Jul 21 05:47:50 2015 -+++ b/source4/torture/local/nss_tests.c Mon Sep 14 11:51:08 2015 -@@ -349,7 +349,11 @@ - while (1) { - torture_comment(tctx, "Testing getpwent_r\n"); - -+#ifdef SOLARIS_GETPWENT_R -+ ret = getpwent_r(&pwd, buffer, sizeof(buffer)); -+#else /* SOLARIS_GETPWENT_R */ - ret = getpwent_r(&pwd, buffer, sizeof(buffer), &pwdp); -+#endif /* SOLARIS_GETPWENT_R */ - if (ret != 0) { - if (ret != ENOENT) { - torture_comment(tctx, "got %d return code\n", ret); -@@ -543,7 +547,11 @@ - while (1) { - torture_comment(tctx, "Testing getgrent_r\n"); - -+#ifdef SOLARIS_GETGRENT_R -+ ret = getgrent_r(&grp, buffer, sizeof(buffer)); -+#else /* SOLARIS_GETGRENT_R */ - ret = getgrent_r(&grp, buffer, sizeof(buffer), &grpp); -+#endif /* SOLARIS_GETGRENT_R */ - if (ret != 0) { - if (ret != ENOENT) { - torture_comment(tctx, "got %d return code\n", ret); \ No newline at end of file Deleted: csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_11511 =================================================================== --- csw/mgar/pkg/samba/branches/samba-4.4.x/files/fix_bugid_11511 2017-11-18 17:26:30 UTC (rev 26300) +++ csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_11511 2017-11-30 09:49:24 UTC (rev 26302) @@ -1,8 +0,0 @@ ---- a/lib/texpect/wscript Wed Apr 29 05:20:16 2015 -+++ b/lib/texpect/wscript Thu Sep 10 11:11:39 2015 -@@ -4,4 +4,4 @@ - conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.h bsd/libutil.h libutil.h') - - def build(bld): -- bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util', install=False) -+ bld.SAMBA_BINARY('texpect', 'texpect.c', deps='popt util replace', install=False) Deleted: csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_11512 =================================================================== --- csw/mgar/pkg/samba/branches/samba-4.4.x/files/fix_bugid_11512 2017-11-18 17:26:30 UTC (rev 26300) +++ csw/mgar/pkg/samba/branches/samba-4.7.x/files/fix_bugid_11512 2017-11-30 09:49:24 UTC (rev 26302) @@ -1,33 +0,0 @@ ---- a/source4/torture/local/nss_tests.c Tue Jul 21 05:47:50 2015 -+++ b/source4/torture/local/nss_tests.c Tue Sep 15 12:06:59 2015 -@@ -690,6 +690,7 @@ - return true; - } - -+#ifdef HAVE_GETGROUPLIST - static bool test_getgrouplist(struct torture_context *tctx, - const char *user, - gid_t gid, -@@ -724,6 +725,7 @@ - - return true; - } -+#endif /* HAVE_GETGROUPLIST */ - - static bool test_user_in_group(struct torture_context *tctx, - const struct passwd *pwd, -@@ -751,12 +753,14 @@ - int g, i; - bool primary_group_had_user_member = false; - -+#ifdef HAVE_GETGROUPLIST - torture_assert(tctx, test_getgrouplist(tctx, - pwd->pw_name, - pwd->pw_gid, - &user_groups, - &num_user_groups), - "failed to test getgrouplist"); -+#endif /* HAVE_GETGROUPLIST */ - - for (g=0; g < num_user_groups; g++) { - torture_assert(tctx, test_getgrgid(tctx, user_groups[g], NULL), \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.