SF.net SVN: gar:[25241] csw/mgar/pkg/samba/branches/samba4

janholzh at users.sourceforge.net janholzh at users.sourceforge.net
Wed Sep 16 15:00:51 CEST 2015


Revision: 25241
          http://sourceforge.net/p/gar/code/25241
Author:   janholzh
Date:     2015-09-16 13:00:51 +0000 (Wed, 16 Sep 2015)
Log Message:
-----------
samba/branches/samba4: wip to 4.3.0 not done yet

Modified Paths:
--------------
    csw/mgar/pkg/samba/branches/samba4/Makefile
    csw/mgar/pkg/samba/branches/samba4/checksums

Added Paths:
-----------
    csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_10877
    csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11053
    csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11359
    csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11508
    csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11511
    csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11512

Modified: csw/mgar/pkg/samba/branches/samba4/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/Makefile	2015-09-16 12:12:15 UTC (rev 25240)
+++ csw/mgar/pkg/samba/branches/samba4/Makefile	2015-09-16 13:00:51 UTC (rev 25241)
@@ -1,5 +1,5 @@
 NAME = samba
-VERSION = 4.0.9
+VERSION = 4.3.0
 GARTYPE = v2
 
 DESCRIPTION = Tools to access a servers filespace and printers via SMB (server)
@@ -20,7 +20,7 @@
 EXPANDVARS += smb.conf
 
 GARCOMPILER = GNU
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386 solaris11-sparc solaris11-i386
 BUILD_DEP_PKGS += CSWlibtalloc-dev
 BUILD_DEP_PKGS += CSWlibpopt-dev
 BUILD_DEP_PKGS += CSWlibgamin-dev
@@ -31,15 +31,36 @@
 BUILD_DEP_PKGS += CSWlibiconv-dev
 BUILD_DEP_PKGS += CSWlibgcrypt-dev
 
-PATCHFILES += 0001-fix-xml.patch
+#PATCHFILES += 0001-fix-xml.patch
 # From https://bugzilla.samba.org/show_bug.cgi?id=7588
 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
+#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
+#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
+
+NOGITPATCH += 1
+
 # Filesystem layout
 SMBLOCKDIR = $(localstatedir)/samba/locks
 SMBLOGDIR = $(localstatedir)/samba/log
@@ -50,13 +71,17 @@
 # List of modules and libraries
 SMB_VFS_MODULES_A = vfs_audit,vfs_extd_audit,vfs_full_audit,vfs_fake_perms,vfs_fake_acls
 SMB_VFS_MODULES_B = vfs_recycle,vfs_netatalk,vfs_readonly,vfs_cap,vfs_expand_msdfs,vfs_shadow_copy,vfs_shadow_copy2
-SMB_VFS_MODULES_C = vfs_xattr_tdb,vfs_posix_eadb,vfs_solarisacl,vfs_zfsacl,vfs_catia
+#Solaris_acl needs to be linked static
+#SMB_VFS_MODULES_C = vfs_xattr_tdb,vfs_posix_eadb,vfs_solarisacl,vfs_zfsacl,vfs_catia
+SMB_VFS_MODULES_C = vfs_xattr_tdb,vfs_posix_eadb,vfs_zfsacl,vfs_catia
 SMB_VFS_MODULES_D = vfs_streams_xattr,vfs_streams_depot,vfs_cacheprime,vfs_prealloc,vfs_commit,vfs_notify_fam
 SMB_VFS_MODULES_E = vfs_readahead,vfs_aio_pthread,vfs_aio_posix,vfs_preopen,vfs_syncops
 SMB_VFS_MODULES_F = vfs_acl_xattr,vfs_acl_tdb,vfs_smb_traffic_analyzer,vfs_dirsort,vfs_scannedonly,vfs_crossrename
 SMB_VFS_MODULES_G = vfs_time_audit,vfs_media_harmony,vfs_dfs_samba4
 SMB_VFS_MODULES = $(SMB_VFS_MODULES_A),$(SMB_VFS_MODULES_B),$(SMB_VFS_MODULES_C),$(SMB_VFS_MODULES_D),$(SMB_VFS_MODULES_E),$(SMB_VFS_MODULES_F),$(SMB_VFS_MODULES_G)
-SMB_IDMAP_MODULES = idmap_ad,idmap_adex,idmap_autorid,idmap_hash,idmap_ldap,idmap_nss,idmap_rid,idmap_tdb,idmap_tdb2
+# Some IPMAPS don't build e.g idmap_autorid
+#SMB_IDMAP_MODULES = idmap_ad,idmap_adex,idmap_autorid,idmap_hash,idmap_ldap,idmap_nss,idmap_rid,idmap_tdb,idmap_tdb2
+SMB_IDMAP_MODULES = idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
 SMB_PDB_MODULES =  pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4
 SMB_AUTH_MODULES = auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4
 SMB_MODULES = $(SMB_VFS_MODULES),$(SMB_IDMAP_MODULES),$(SMB_PDB_MODULES),$(SMB_AUTH_MODULES)
@@ -87,6 +112,8 @@
 PKGFILES_CSWsamba4 += $(call baseisadirs,$(libdir),mit_samba\.so)
 PKGFILES_CSWsamba4 += $(call baseisadirs,$(libdir),security/pam_smbpass\.so)
 RUNTIME_DEP_PKGS_CSWsamba4 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibssp0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsamba-passdb0
 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibpopt0
 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWsamba4_5.11 += CSWlibgcrypt11
@@ -97,38 +124,39 @@
 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbclient0
 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtdb1
 RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibsamba-credentials0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibdcerpc0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibndr-nbt0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibsmbconf0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibndr-standard0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibpdb0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibsmbldap0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibsamba-hostconfig0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibsmbclient-raw0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibsamdb0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibgensec0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibtevent-util0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibtorture0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibdcerpc-binding0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibregistry0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibnetapi0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibdcerpc-server0
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWsamba4_5.10 += CSWlibndr-krb5pac0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsamba-credentials0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibdcerpc0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibndr-nbt0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbconf0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibndr-standard0
+#RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibpdb0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbldap0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsmbclient-raw0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibsamdb0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgensec0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtorture0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibdcerpc-binding0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibregistry0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibnetapi0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibdcerpc-server0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibndr-krb5pac0
 RUNTIME_DEP_PKGS_CSWsamba4 += $(RUNTIME_DEP_PKGS_CSWsamba4_$(GAROSREL))
 # Silence conflicts with CSWsamba
 CHECKPKG_OVERRIDES_CSWsamba4 += file-collision
 CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/share|root/opt/csw/bin/smbtorture
 CHECKPKG_OVERRIDES_CSWsamba4 += shared-lib-pkgname-mismatch|file=opt/csw/lib/mit_samba.so|soname=mit_samba.so|pkgname=CSWsamba4|expected=CSWmit-samba
 CHECKPKG_OVERRIDES_CSWsamba4 += soname-equals-filename|file=/opt/csw/lib/mit_samba.so
-CHECKPKG_OVERRIDES_CSWsamba4_5.11 += soname-unused
-CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibwbclient0
-CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibtevent0
-CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWsamba
-CHECKPKG_OVERRIDES_CSWsamba4_5.11 += surplus-dependency|CSWsamba4-libs
+CHECKPKG_OVERRIDES_CSWsamba4 += surplus-dependency|CSWperl
+#CHECKPKG_OVERRIDES_CSWsamba4_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibwbclient0
+#CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWlibtevent0
+#CHECKPKG_OVERRIDES_CSWsamba4_5.11 += missing-dependency|CSWsamba
+#CHECKPKG_OVERRIDES_CSWsamba4_5.11 += surplus-dependency|CSWsamba4-libs
 CHECKPKG_OVERRIDES_CSWsamba4 += $(CHECKPKG_OVERRIDES_CSWsamba4_$(GAROSREL))
 
 INCOMPATIBLE_PKGS_CSWsamba4 += CSWsamba
@@ -142,31 +170,35 @@
 SMB_CLIENT_BINS += ldbadd ldbdel ldbedit ldbmodify ldbrename ldbsearch
 PKGFILES_CSWsamba4-client += $(foreach C,$(SMB_CLIENT_BINS),$(call baseisadirs,$(bindir),$C))
 PKGFILES_CSWsamba4-client += $(foreach C,$(SMB_CLIENT_BINS),$(call baseisadirs,$(mandir),man1/$C\.1))
-RUNTIME_DEP_PKGS_CSWsamba4-client_5.11 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsamba-passdb0
 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpopt0
 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibreadline6
 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsmbclient0
 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtdb1
 RUNTIME_DEP_PKGS_CSWsamba4-client += CSWsamba4-libs
-RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibsamba-credentials0
-RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibdcerpc0
-RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibndr-nbt0
-RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibsmbconf0
-RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibndr-standard0
-RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibpdb0
-RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibsamba-hostconfig0
-RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibgensec0
-RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibtevent-util0
-RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibdcerpc-binding0
-RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibregistry0
-RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWsamba4-client_5.10 += CSWlibsmbclient-raw0
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsamba-credentials0
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibndr-nbt0
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsmbconf0
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibndr-standard0
+#RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpdb0
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibgensec0
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibdcerpc-binding0
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibregistry0
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibsmbclient-raw0
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibform5
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibncurses5
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibssp0
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpanel5
 RUNTIME_DEP_PKGS_CSWsamba4-client += $(RUNTIME_DEP_PKGS_CSWsamba4-client_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += soname-unused
-CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += missing-dependency|CSWlibtevent0
-CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += surplus-dependency|CSWsamba4-libs
+#CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += missing-dependency|CSWlibtevent0
+#CHECKPKG_OVERRIDES_CSWsamba4-client_5.11 += surplus-dependency|CSWsamba4-libs
 CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbtree.1|CSWsamba-client|CSWsamba4-client
 CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/bin/smbget|CSWsamba-client|CSWsamba4-client
 CHECKPKG_OVERRIDES_CSWsamba4-client += file-collision|/opt/csw/share/man/man1/smbtar.1|CSWsamba-client|CSWsamba4-client
@@ -205,6 +237,7 @@
 PKGFILES_CSWsamba4-dev += $(mandir)/man3/.*\.3
 PKGFILES_CSWsamba4-dev += $(mandir)/man3/.*\.3perl
 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-server0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-passdb0
 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-atsvc0
 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibregistry0
 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtorture0
@@ -216,7 +249,7 @@
 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4-winbind
 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr-krb5pac0
 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibpdb0
+#RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibpdb0
 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbconf0
 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtevent-util0
 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-samr0
@@ -227,8 +260,8 @@
 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-hostconfig0
 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgensec0
 RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-binding0
-RUNTIME_DEP_PKGS_CSWsamba4-dev_5.10 += CSWlibndr-standard0
-RUNTIME_DEP_PKGS_CSWsamba4-dev_5.11 += CSWsamba4
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr-standard0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4
 RUNTIME_DEP_PKGS_CSWsamba4-dev += $(RUNTIME_DEP_PKGS_CSWsamba4-dev_$(GAROSREL))
 CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/smb_share_modes.h|CSWsamba-dev|CSWsamba4-dev
 CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/share/man/man3/talloc.3|CSWlibtalloc-dev|CSWsamba4-dev
@@ -237,8 +270,8 @@
 CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/netapi.h|CSWsamba-dev|CSWsamba4-dev
 CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/pytalloc.h|CSWpy-talloc-dev|CSWsamba4-dev
 CHECKPKG_OVERRIDES_CSWsamba4-dev += file-collision|/opt/csw/include/wbclient.h|CSWsamba-dev|CSWsamba4-dev
-CHECKPKG_OVERRIDES_CSWsamba4-dev_5.11 += surplus-dependency
-CHECKPKG_OVERRIDES_CSWsamba4-dev += $(CHECKPKG_OVERRIDES_CSWsamba4-dev_$(GAROSREL))
+CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWsamba4-winbind
+CHECKPKG_OVERRIDES_CSWsamba4-dev += surplus-dependency|CSWsamba4
 INCOMPATIBLE_PKGS_CSWsamba4-dev += CSWsamba-dev
 
 # Package CSWsamba4 libraries
@@ -253,44 +286,46 @@
 PKGFILES_CSWsamba4-libs += $(SMBPRIVATELIB)/.*
 PKGFILES_CSWsamba4-libs += $(mandir)/man7/libsmbclient.7
 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpopt0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibssp0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsamba-passdb0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibdbus1-3
 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibz1
 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibfam0
-RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpython2-6-1-0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpython2-7-1-0
 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibcups2
 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpytalloc-util2
 RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtdb1
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibsamba-credentials0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibdcerpc0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibndr-nbt0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibgcrypt11
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibsmbconf0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibndr-standard0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibpdb0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibsmbldap0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibsamba-hostconfig0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibsamdb0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibgensec0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibdcerpc-server0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibtevent-util0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibdcerpc-binding0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibnetapi0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibgnutls28
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibsmbclient-raw0
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWsamba4-libs_5.10 += CSWlibndr-krb5pac0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsamba-credentials0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibdcerpc0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibndr-nbt0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsmbconf0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibndr-standard0
+#RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpdb0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsmbldap0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsamdb0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgensec0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibdcerpc-server0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibdcerpc-binding0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibnetapi0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgnutls28
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibsmbclient-raw0
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibndr-krb5pac0
 RUNTIME_DEP_PKGS_CSWsamba4-libs += $(RUNTIME_DEP_PKGS_CSWsamba4-libs_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += soname-unused
 CHECKPKG_OVERRIDES_CSWsamba4-libs += file-collision|/opt/csw/share/man/man7/libsmbclient.7|CSWlibsmbclient0|CSWsamba4-libs
-CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += no-direct-binding|/opt/csw/lib/samba4/libtdb_compat.so|is|not|directly|bound|to|soname|libgcc_s.so.1
-CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += missing-dependency|CSWlibwbclient0
-CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += missing-dependency|CSWlibtevent0
+#CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += no-direct-binding|/opt/csw/lib/samba4/libtdb_compat.so|is|not|directly|bound|to|soname|libgcc_s.so.1
+#CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += missing-dependency|CSWlibwbclient0
+#CHECKPKG_OVERRIDES_CSWsamba4-libs_5.11 += missing-dependency|CSWlibtevent0
 CHECKPKG_OVERRIDES_CSWsamba4-libs += $(CHECKPKG_OVERRIDES_CSWsamba4-libs_$(GAROSREL))
 INCOMPATIBLE_PKGS_CSWsamba4-libs += CSWlibwbclient0 CSWlibsmbclient0 CSWlibnetapi0 CSWlibsmbsharemodes0
 
@@ -298,11 +333,11 @@
 PKGFILES_CSWlibdcerpc-atsvc0 += $(call baseisadirs,$(libdir),libdcerpc-atsvc\.so\.0\.0\.1)
 PKGFILES_CSWlibdcerpc-atsvc0 += $(call baseisadirs,$(libdir),libdcerpc-atsvc\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibdcerpc-atsvc0 += $(DESCRIPTION), libdcerpc-atsvc.so.0
-RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0_5.11 += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0_5.11 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0_(GAROSREL))
-CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0_5.11 += soname-unused
 CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc-atsvc0_$(GAROSREL))
 
 PACKAGES += CSWlibdcerpc-binding0
@@ -310,25 +345,26 @@
 PKGFILES_CSWlibdcerpc-binding0 += $(call baseisadirs,$(libdir),libdcerpc-binding\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibdcerpc-binding0 += $(DESCRIPTION), libdcerpc-binding.so.0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0_5.10 += CSWlibtevent-util0
-RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0_5.10 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0_5.10 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibsamba-util0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0_5.11 += missing-dependency|CSWlibtevent0
-CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0_5.11 += surplus-dependency|CSWsamba4-libs
+#CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0_5.11 += missing-dependency|CSWlibtevent0
+#CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0_5.11 += surplus-dependency|CSWsamba4-libs
 CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc-binding0_$(GAROSREL))
 
 PACKAGES += CSWlibdcerpc-samr0
 PKGFILES_CSWlibdcerpc-samr0 += $(call baseisadirs,$(libdir),libdcerpc-samr\.so\.0\.0\.1)
 PKGFILES_CSWlibdcerpc-samr0 += $(call baseisadirs,$(libdir),libdcerpc-samr\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibdcerpc-samr0 += $(DESCRIPTION), libdcerpc-samr.so.0
-RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0_5.11 += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0_5.11 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0_5.11 += soname-unused
 CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc-samr0_$(GAROSREL))
 
 PACKAGES += CSWlibdcerpc-server0
@@ -337,23 +373,25 @@
 SPKG_DESC_CSWlibdcerpc-server0 += $(DESCRIPTION), libdcerpc-server.so.0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWsamba4-libs
-RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.11 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgnutls28
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibndr-standard0
-RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibdcerpc0
-RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibsamba-credentials0
-RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibsamba-hostconfig0
-RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibsamdb0
-RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibgensec0
-RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibtevent-util0
-RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibdcerpc-binding0
-RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibregistry0
-RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_5.10 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibndr-standard0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibdcerpc0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-credentials0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamdb0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgensec0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibdcerpc-binding0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibregistry0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibndr0
 RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc-server0_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_5.11 += soname-unused
-CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_5.11 += missing-dependency|CSWlibtevent0
-CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_5.11 += surplus-dependency|CSWsamba4-libs
+#CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_5.11 += missing-dependency|CSWlibtevent0
+#CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_5.11 += surplus-dependency|CSWsamba4-libs
 CHECKPKG_OVERRIDES_CSWlibdcerpc-server0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc-server0_$(GAROSREL))
 
 PACKAGES += CSWlibdcerpc0
@@ -361,56 +399,59 @@
 PKGFILES_CSWlibdcerpc0 += $(call baseisadirs,$(libdir),libdcerpc\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibdcerpc0 += $(DESCRIPTION), libdcerpc.so.0
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.11 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibsamba-credentials0
-RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibndr-nbt0
-RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibndr-standard0
-RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibsmbclient-raw0
-RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibgensec0
-RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibtevent-util0
-RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibdcerpc-binding0
-RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWlibdcerpc0_5.10 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-credentials0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr-nbt0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr-standard0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsmbclient-raw0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgensec0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibdcerpc-binding0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-hostconfig0
 RUNTIME_DEP_PKGS_CSWlibdcerpc0 += $(RUNTIME_DEP_PKGS_CSWlibdcerpc0_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWlibdcerpc0_5.11 += soname-unused
-CHECKPKG_OVERRIDES_CSWlibdcerpc0_5.11 += missing-dependency|CSWlibtevent0
-CHECKPKG_OVERRIDES_CSWlibdcerpc0_5.11 += surplus-dependency|CSWsamba4-libs
-CHECKPKG_OVERRIDES_CSWlibdcerpc0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc0_$(GAROSREL))
+#CHECKPKG_OVERRIDES_CSWlibdcerpc0_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWlibdcerpc0_5.11 += missing-dependency|CSWlibtevent0
+#CHECKPKG_OVERRIDES_CSWlibdcerpc0_5.11 += surplus-dependency|CSWsamba4-libs
+#CHECKPKG_OVERRIDES_CSWlibdcerpc0 += $(CHECKPKG_OVERRIDES_CSWlibdcerpc0_$(GAROSREL))
 
 PACKAGES += CSWlibgensec0
 PKGFILES_CSWlibgensec0 += $(call baseisadirs,$(libdir),libgensec\.so\.0\.0\.1)
 PKGFILES_CSWlibgensec0 += $(call baseisadirs,$(libdir),libgensec\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibgensec0 += $(DESCRIPTION), libgensec.so.0
-RUNTIME_DEP_PKGS_CSWlibgensec0_5.11 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWlibgensec0_5.10 += CSWlibsamba-credentials0
-RUNTIME_DEP_PKGS_CSWlibgensec0_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibgensec0_5.10 += CSWlibsamba-hostconfig0
-RUNTIME_DEP_PKGS_CSWlibgensec0_5.10 += CSWlibsamdb0
-RUNTIME_DEP_PKGS_CSWlibgensec0_5.10 += CSWlibsasl2-2
-RUNTIME_DEP_PKGS_CSWlibgensec0_5.10 += CSWlibtevent-util0
-RUNTIME_DEP_PKGS_CSWlibgensec0_5.10 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-credentials0
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamdb0
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsasl2-2
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibndr0
 RUNTIME_DEP_PKGS_CSWlibgensec0 += $(RUNTIME_DEP_PKGS_CSWlibgensec0_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += soname-unused
-CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += surplus-dependency|CSWsamba4-libs
-CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += missing-dependency|CSWlibtevent0
-CHECKPKG_OVERRIDES_CSWlibgensec += $(CHECKPKG_OVERRIDES_CSWlibgensec_$(GAROSREL))
+#CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += surplus-dependency|CSWsamba4-libs
+#CHECKPKG_OVERRIDES_CSWlibgensec0_5.11 += missing-dependency|CSWlibtevent0
+#CHECKPKG_OVERRIDES_CSWlibgensec += $(CHECKPKG_OVERRIDES_CSWlibgensec_$(GAROSREL))
 
 PACKAGES += CSWlibndr-krb5pac0
 PKGFILES_CSWlibndr-krb5pac0 += $(call baseisadirs,$(libdir),libndr-krb5pac\.so\.0\.0\.1)
 PKGFILES_CSWlibndr-krb5pac0 += $(call baseisadirs,$(libdir),libndr-krb5pac\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibndr-krb5pac0 += $(DESCRIPTION), libndr-krb5pac.so.0
 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0_5.10 += CSWlibndr-standard0
-RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0_5.10 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0_5.10 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibndr-standard0
+RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += $(RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0_$(GAROSREL))
 
 PACKAGES += CSWlibndr-nbt0
@@ -418,22 +459,23 @@
 PKGFILES_CSWlibndr-nbt0 += $(call baseisadirs,$(libdir),libndr-nbt\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibndr-nbt0 += $(DESCRIPTION), libndr-nbt.so.0
 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibndr-nbt0_5.10 += CSWsamba4-libs
-RUNTIME_DEP_PKGS_CSWlibndr-nbt0_5.10 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWlibndr-nbt0_5.10 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibsamba-util0
 RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += $(RUNTIME_DEP_PKGS_CSWlibndr-nbt0_$(GAROSREL))
 
 PACKAGES += CSWlibndr-standard0
 PKGFILES_CSWlibndr-standard0 += $(call baseisadirs,$(libdir),libndr-standard\.so\.0\.0\.1)
 PKGFILES_CSWlibndr-standard0 += $(call baseisadirs,$(libdir),libndr-standard\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibndr-standard0 += $(DESCRIPTION), libndr-standard.so.0
+RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibndr-standard0_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibndr-standard0_5.10 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWlibndr-standard0_5.10 += CSWsamba4-libs
-RUNTIME_DEP_PKGS_CSWlibndr-standard0 += $(RUNTIME_DEP_PKGS_CSWlibndr-standard0_$(GAROSREL))
+RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibndr-standard0 += CSWsamba4-libs
 
 PACKAGES += CSWlibndr0
 PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0\.0\.1)
@@ -441,8 +483,10 @@
 SPKG_DESC_CSWlibndr0 += $(DESCRIPTION), libndr.so.0
 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibndr0_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibndr0_5.10 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibssp0
+RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibndr0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibndr0 += $(RUNTIME_DEP_PKGS_CSWlibndr0_$(GAROSREL))
 
 PACKAGES += CSWlibnetapi0
@@ -450,53 +494,55 @@
 PKGFILES_CSWlibnetapi0 += $(call baseisadirs,$(libdir),libnetapi\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibnetapi0 += $(DESCRIPTION), libnetapi.so.0
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWlibnetapi0_5.11 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibnetapi0_5.11 += CSWliblber2-4-2
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsamba-passdb0
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibssp0
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibnetapi0_5.10 += CSWlibndr-standard0
-RUNTIME_DEP_PKGS_CSWlibnetapi0_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibnetapi0_5.10 += CSWlibsmbconf0
-RUNTIME_DEP_PKGS_CSWlibnetapi0_5.10 += CSWlibpdb0
-RUNTIME_DEP_PKGS_CSWlibnetapi0_5.10 += CSWsamba4-libs
-RUNTIME_DEP_PKGS_CSWlibnetapi0_5.10 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibndr-standard0
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsmbconf0
+#RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibpdb0
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibndr0
 RUNTIME_DEP_PKGS_CSWlibnetapi0 += $(RUNTIME_DEP_PKGS_CSWlibnetapi0_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWlibnetapi0_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWlibnetapi0_5.11 += soname-unused
 CHECKPKG_OVERRIDES_CSWlibnetapi0 += $(CHECKPKG_OVERRIDES_CSWlibnetapi0_$(GAROSREL))
 
-PACKAGES += CSWlibpdb0
-PKGFILES_CSWlibpdb0 += $(call baseisadirs,$(libdir),libpdb\.so\.0)
-PKGFILES_CSWlibpdb0 += $(call baseisadirs,$(libdir),libpdb\.so\.0(\.\d+)*)
-SPKG_DESC_CSWlibpdb0 += $(DESCRIPTION), libpdb.so.0
-RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWlibpdb0_5.11 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtdb1
-RUNTIME_DEP_PKGS_CSWlibpdb0_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibpdb0_5.10 += CSWlibsmbconf0
-RUNTIME_DEP_PKGS_CSWlibpdb0_5.10 += CSWlibsamba-hostconfig0
-RUNTIME_DEP_PKGS_CSWlibpdb0_5.10 += CSWlibsamdb0
-RUNTIME_DEP_PKGS_CSWlibpdb0_5.10 += CSWsamba4-libs
-RUNTIME_DEP_PKGS_CSWlibpdb0_5.10 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWlibpdb0 += $(RUNTIME_DEP_PKGS_CSWlibpdb0_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWlibpdb0_5.11 += soname-unused
-CHECKPKG_OVERRIDES_CSWlibpdb0_5.11 += missing-dependency|CSWlibwbclient0
-CHECKPKG_OVERRIDES_CSWlibpdb0 += $(CHECKPKG_OVERRIDES_CSWlibpdb0_$(GAROSREL))
+#PACKAGES += CSWlibpdb0
+#PKGFILES_CSWlibpdb0 += $(call baseisadirs,$(libdir),libpdb\.so\.0)
+#PKGFILES_CSWlibpdb0 += $(call baseisadirs,$(libdir),libpdb\.so\.0(\.\d+)*)
+#SPKG_DESC_CSWlibpdb0 += $(DESCRIPTION), libpdb.so.0
+#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibgcc-s1
+#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtalloc2
+#RUNTIME_DEP_PKGS_CSWlibpdb0_5.11 += CSWlibintl8
+#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtdb1
+#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamba-util0
+#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsmbconf0
+#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamba-hostconfig0
+#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamdb0
+#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWsamba4-libs
+#RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibndr0
+#RUNTIME_DEP_PKGS_CSWlibpdb0 += $(RUNTIME_DEP_PKGS_CSWlibpdb0_$(GAROSREL))
+#CHECKPKG_OVERRIDES_CSWlibpdb0_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWlibpdb0_5.11 += missing-dependency|CSWlibwbclient0
+#CHECKPKG_OVERRIDES_CSWlibpdb0 += $(CHECKPKG_OVERRIDES_CSWlibpdb0_$(GAROSREL))
 
 PACKAGES += CSWlibregistry0
 PKGFILES_CSWlibregistry0 += $(call baseisadirs,$(libdir),libregistry\.so\.0\.0\.1)
 PKGFILES_CSWlibregistry0 += $(call baseisadirs,$(libdir),libregistry\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibregistry0 += $(DESCRIPTION), libregistry.so.0
 RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWlibregistry0_5.11 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibregistry0_5.10 += CSWlibndr-standard0
-RUNTIME_DEP_PKGS_CSWlibregistry0_5.10 += CSWlibdcerpc0
-RUNTIME_DEP_PKGS_CSWlibregistry0_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibregistry0_5.10 += CSWlibsamba-hostconfig0
-RUNTIME_DEP_PKGS_CSWlibregistry0_5.10 += CSWsamba4-libs
-RUNTIME_DEP_PKGS_CSWlibregistry0_5.10 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibndr-standard0
+RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibdcerpc0
+RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibndr0
 RUNTIME_DEP_PKGS_CSWlibregistry0 += $(RUNTIME_DEP_PKGS_CSWlibregistry0_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWlibregistry0_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWlibregistry0_5.11 += soname-unused
 CHECKPKG_OVERRIDES_CSWlibregistry0 += $(CHECKPKG_OVERRIDES_CSWlibregistry0_$(GAROSREL))
 
 PACKAGES += CSWlibsamba-credentials0
@@ -504,24 +550,41 @@
 PKGFILES_CSWlibsamba-credentials0 += $(call baseisadirs,$(libdir),libsamba-credentials\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibsamba-credentials0 += $(DESCRIPTION), libsamba-credentials.so.0
 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWlibsamba-credentials0_5.11 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibsamba-credentials0_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibsamba-credentials0_5.10 += CSWlibsamba-hostconfig0
-RUNTIME_DEP_PKGS_CSWlibsamba-credentials0_5.10 += CSWsamba4-libs
-RUNTIME_DEP_PKGS_CSWlibsamba-credentials0_5.10 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibndr0
 RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-credentials0_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWlibsamba-credentials0_5.11 += soname-unused
-CHECKPKG_OVERRIDES_CSWlibsamba-credentials0 += $(CHECKPKG_OVERRIDES_CSWlibsamba-credentials0_$(GAROSREL))
+#CHECKPKG_OVERRIDES_CSWlibsamba-credentials0_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWlibsamba-credentials0 += $(CHECKPKG_OVERRIDES_CSWlibsamba-credentials0_$(GAROSREL))
 
+PACKAGES += CSWlibsamba-passdb0
+PKGFILES_CSWlibsamba-passdb0 += $(call baseisadirs,$(libdir),libsamba-passdb\.so\.0\.0\.1)
+PKGFILES_CSWlibsamba-passdb0 += $(call baseisadirs,$(libdir),libsamba-passdb\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibsamba-passdb0 += $(DESCRIPTION), libsamba-passdb.so.0
+RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamba-credentials0
+RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibssp0
+RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsmbconf0
+RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibsamba-passdb0 += CSWlibsamdb0
+
 PACKAGES += CSWlibsamba-hostconfig0
 PKGFILES_CSWlibsamba-hostconfig0 += $(call baseisadirs,$(libdir),libsamba-hostconfig\.so\.0\.0\.1)
 PKGFILES_CSWlibsamba-hostconfig0 += $(call baseisadirs,$(libdir),libsamba-hostconfig\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibsamba-hostconfig0 += $(DESCRIPTION), libsamba-hostconfig.so.0
 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0_5.10 += CSWsamba4-libs
-RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0_5.10 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibsamba-util0
 RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0_$(GAROSREL))
 
 PACKAGES += CSWlibsamba-policy0
@@ -529,16 +592,17 @@
 PKGFILES_CSWlibsamba-policy0 += $(call baseisadirs,$(libdir),libsamba-policy\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibsamba-policy0 += $(DESCRIPTION), libsamba-policy.so.0
 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWlibsamba-policy0_5.11 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibsamba-policy0_5.10 += CSWlibdcerpc0
-RUNTIME_DEP_PKGS_CSWlibsamba-policy0_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibsamba-policy0_5.10 += CSWlibsamba-hostconfig0
-RUNTIME_DEP_PKGS_CSWlibsamba-policy0_5.10 += CSWsamba4-libs
-RUNTIME_DEP_PKGS_CSWlibsamba-policy0_5.10 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWlibsamba-policy0_5.10 += CSWlibsmbclient-raw0
+RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibdcerpc0
+RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsmbclient-raw0
 RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-policy0_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWlibsamba-policy0_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWlibsamba-policy0_5.11 += soname-unused
 CHECKPKG_OVERRIDES_CSWlibsamba-policy0 += $(CHECKPKG_OVERRIDES_CSWlibsamba-policy0_$(GAROSREL))
 
 PACKAGES += CSWlibsamba-util0
@@ -548,7 +612,9 @@
 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibgcc-s1
 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWlibsamba-util0_5.10 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWlibsamba-util0 += $(RUNTIME_DEP_PKGS_CSWlibsamba-util0_$(GAROSREL))
 
 PACKAGES += CSWlibsamdb0
@@ -556,35 +622,37 @@
 PKGFILES_CSWlibsamdb0 += $(call baseisadirs,$(libdir),libsamdb\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibsamdb0 += $(DESCRIPTION), libsamdb.so.0
 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWlibsamdb0_5.11 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibsamdb0_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibsamdb0_5.10 += CSWlibsamba-credentials0
-RUNTIME_DEP_PKGS_CSWlibsamdb0_5.10 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWlibsamdb0_5.10 += CSWsamba4-libs
-RUNTIME_DEP_PKGS_CSWlibsamdb0_5.10 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-credentials0
+RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-hostconfig0
 RUNTIME_DEP_PKGS_CSWlibsamdb0 += $(RUNTIME_DEP_PKGS_CSWlibsamdb0_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWlibsamdb0_5.11 += soname-unused
-CHECKPKG_OVERRIDES_CSWlibsamdb0 += $(CHECKPKG_OVERRIDES_CSWlibsamdb0_$(GAROSREL))
+#CHECKPKG_OVERRIDES_CSWlibsamdb0_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWlibsamdb0 += $(CHECKPKG_OVERRIDES_CSWlibsamdb0_$(GAROSREL))
 
 PACKAGES += CSWlibsmbclient-raw0
 PKGFILES_CSWlibsmbclient-raw0 += $(call baseisadirs,$(libdir),libsmbclient-raw\.so\.0\.0\.1)
 PKGFILES_CSWlibsmbclient-raw0 += $(call baseisadirs,$(libdir),libsmbclient-raw\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibsmbclient-raw0 += $(DESCRIPTION), libsmbclient-raw.so.0
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_5.11 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_5.10 += CSWlibsamba-credentials0
-RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_5.10 += CSWlibndr-nbt0
-RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_5.10 += CSWlibgensec0
-RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_5.10 += CSWlibtevent-util0
-RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_5.10 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibsamba-credentials0
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibndr-nbt0
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgensec0
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibndr0
 RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += $(RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += soname-unused
-CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += missing-dependency|CSWlibtevent0
-CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += surplus-dependency|CSWsamba4-libs
+#CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += missing-dependency|CSWlibtevent0
+#CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_5.11 += surplus-dependency|CSWsamba4-libs
 CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0 += $(CHECKPKG_OVERRIDES_CSWlibsmbclient-raw0_$(GAROSREL))
 
 PACKAGES += CSWlibsmbconf0
@@ -592,21 +660,22 @@
 PKGFILES_CSWlibsmbconf0 += $(call baseisadirs,$(libdir),libsmbconf\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibsmbconf0 += $(DESCRIPTION), libsmbconf.so.0
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWlibsmbconf0_5.11 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtdb1
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibsmbconf0_5.10 += CSWlibndr-standard0
-RUNTIME_DEP_PKGS_CSWlibsmbconf0_5.10 += CSWliblber2-4-2
-RUNTIME_DEP_PKGS_CSWlibsmbconf0_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibsmbconf0_5.10 += CSWlibsamba-hostconfig0
-RUNTIME_DEP_PKGS_CSWlibsmbconf0_5.10 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWlibsmbconf0_5.10 += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWlibsmbconf0_5.10 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibndr-standard0
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWliblber2-4-2
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent-util0
 RUNTIME_DEP_PKGS_CSWlibsmbconf0 += $(RUNTIME_DEP_PKGS_CSWlibsmbconf0_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += soname-unused
-CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += missing-dependency|CSWlibtevent0
-CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += surplus-dependency|CSWsamba4-libs
+#CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += missing-dependency|CSWlibtevent0
+#CHECKPKG_OVERRIDES_CSWlibsmbconf0_5.11 += surplus-dependency|CSWsamba4-libs
 CHECKPKG_OVERRIDES_CSWlibsmbconf0 += $(CHECKPKG_OVERRIDES_CSWlibsmbconf0_$(GAROSREL))
 
 PACKAGES += CSWlibsmbldap0
@@ -615,28 +684,30 @@
 SPKG_DESC_CSWlibsmbldap0 += $(DESCRIPTION), libsmbldap.so.0
 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWliblber2-4-2
-RUNTIME_DEP_PKGS_CSWlibsmbldap0_5.11 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibsmbldap0_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibsmbldap0_5.10 += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWlibsmbldap0_5.10 += CSWlibsmbconf0
+RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsmbconf0
 RUNTIME_DEP_PKGS_CSWlibsmbldap0 += $(RUNTIME_DEP_PKGS_CSWlibsmbldap0_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += soname-unused
-CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += missing-dependency|CSWlibtevent0
-CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += surplus-dependency|CSWsamba4-libs
-CHECKPKG_OVERRIDES_CSWlibsmbldap0 += $(CHECKPKG_OVERRIDES_CSWlibsmbldap0_$(GAROSREL))
+#CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += missing-dependency|CSWlibtevent0
+#CHECKPKG_OVERRIDES_CSWlibsmbldap0_5.11 += surplus-dependency|CSWsamba4-libs
+#CHECKPKG_OVERRIDES_CSWlibsmbldap0 += $(CHECKPKG_OVERRIDES_CSWlibsmbldap0_$(GAROSREL))
 
 PACKAGES += CSWlibtevent-util0
 PKGFILES_CSWlibtevent-util0 += $(call baseisadirs,$(libdir),libtevent-util\.so\.0\.0\.1)
 PKGFILES_CSWlibtevent-util0 += $(call baseisadirs,$(libdir),libtevent-util\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibtevent-util0 += $(DESCRIPTION), libtevent-util.so.0
 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibgcc-s1
-CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += soname-unused
-CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += missing-dependency|CSWlibtevent0
-CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += surplus-dependency|CSWsamba4-libs
+#CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += missing-dependency|CSWlibtevent0
+#CHECKPKG_OVERRIDES_CSWlibtevent-util0_5.11 += surplus-dependency|CSWsamba4-libs
 CHECKPKG_OVERRIDES_CSWlibtevent-util0 += $(CHECKPKG_OVERRIDES_CSWlibtevent-util0_$(GAROSREL))
 
 PACKAGES += CSWlibtorture0
@@ -644,49 +715,58 @@
 PKGFILES_CSWlibtorture0 += $(call baseisadirs,$(libdir),libtorture\.so\.0(\.\d+)*)
 SPKG_DESC_CSWlibtorture0 += $(DESCRIPTION), libtorture.so.0
 RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibtorture0_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWlibtorture0_5.10 += CSWlibsamba-hostconfig0
-RUNTIME_DEP_PKGS_CSWlibtorture0_5.10 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWlibtorture0 += $(RUNTIME_DEP_PKGS_CSWlibtorture0_$(GAROSREL))
 
 # Python package
 PACKAGES += CSWsamba4-python
 SPKG_DESC_CSWsamba4-python = Samba 4 python files
-PKGFILES_CSWsamba4-python += $(call baseisadirs,$(libdir),python2.6/site-packages/.*)
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.11 += CSWlibintl8
+PKGFILES_CSWsamba4-python += $(call baseisadirs,$(libdir),python2.7/site-packages/.*)
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamba-passdb0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibssp0
 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpython2-6-1-0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpython2-7-1-0
 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpytalloc-util2
 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtdb1
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibndr-standard0
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibdcerpc0
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibndr-nbt0
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibsmbconf0
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibsamba-credentials0
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibpdb0
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibsamba-hostconfig0
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibsamba-policy0
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibsamdb0
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibgensec0
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibtevent-util0
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibdcerpc-binding0
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibregistry0
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibsmbclient-raw0
-RUNTIME_DEP_PKGS_CSWsamba4-python_5.10 += CSWlibndr-krb5pac0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibndr-standard0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibdcerpc0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibndr-nbt0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsmbconf0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamba-credentials0
+#RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpdb0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamba-policy0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsamdb0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibgensec0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibdcerpc-binding0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibregistry0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibsmbclient-raw0
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibndr-krb5pac0
 RUNTIME_DEP_PKGS_CSWsamba4-python += $(RUNTIME_DEP_PKGS_CSWsamba4-python_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += soname-unused
-CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/samba/provision/backend.py
+#CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += soname-unused
+CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/samba/provision/backend.py
 CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.6/site-packages/samba/external/testtools/tests/test_compat.py
+CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/samba/netcmd/domain.py
+CHECKPKG_OVERRIDES_CSWsamba4-python += file-with-bad-content|/usr/local|root/opt/csw/lib/python2.7/site-packages/samba/external/testtools/tests/test_compat.py
 CHECKPKG_OVERRIDES_CSWsamba4-python += pkgname-does-not-start-with-CSWpy-
+CHECKPKG_OVERRIDES_CSWsamba4-python += soname-not-found|libsamba-passdb.so.0|is|needed|by|opt/csw/lib/python2.7/site-packages/samba/samba3/passdb.so
 CHECKPKG_OVERRIDES_CSWsamba4-python += catalogname-does-not-start-with-py_
 CHECKPKG_OVERRIDES_CSWsamba4-python += soname-not-part-of-filename
-CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += missing-dependency|CSWlibtevent0
-CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += surplus-dependency|CSWsamba4-libs
+#needs some fix
+CHECKPKG_OVERRIDES_CSWsamba4-python += file-collision|/opt/csw/lib/python2.7/site-packages/talloc.so|CSWpy-talloc|CSWsamba4-python
+#CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += missing-dependency|CSWlibtevent0
+#CHECKPKG_OVERRIDES_CSWsamba4-python_5.11 += surplus-dependency|CSWsamba4-libs
 CHECKPKG_OVERRIDES_CSWsamba4-python += $(CHECKPKG_OVERRIDES_CSWsamba4-python_$(GAROSREL))
 
 # winbind daemon, NSS and PAM modules
@@ -696,7 +776,7 @@
 PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(bindir),wbinfo)
 PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(libdir),security/pam_winbind\.so)
 PKGFILES_CSWsamba4-winbind += $(call pkgfiles_lib,nss_winbind.so.1)
-PKGFILES_CSWsamba4-winbind += $(call pkgfiles_lib,libnss_wins.so.2)
+#PKGFILES_CSWsamba4-winbind += $(call pkgfiles_lib,libnss_wins.so.2)
 PKGFILES_CSWsamba4-winbind += $(call pkgfiles_lib,winbind_krb5_locator.so)
 PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(sbindir),winbindd)
 PKGFILES_CSWsamba4-winbind += $(sharedstatedir)/locale/.*/pam_winbind\.mo
@@ -708,29 +788,30 @@
 PKGFILES_CSWsamba4-winbind += $(sysconfdir)/init.d/cswwinbind4
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibintl8
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibsamba-passdb0
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibpopt0
-RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWliblber2-4-2
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtalloc2
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWsamba4-libs
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtdb1
-RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibndr-standard0
-RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibsamba-util0
-RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibsmbconf0
-RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibpdb0
-RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibsamba-hostconfig0
-RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibgensec0
-RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibtevent-util0
-RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibdcerpc-binding0
-RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibndr0
-RUNTIME_DEP_PKGS_CSWsamba4-winbind_5.10 += CSWlibldap2-4-2
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibndr-standard0
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibsamba-credentials0
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibssp0
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibsmbconf0
+#RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibpdb0
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibgensec0
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibdcerpc-binding0
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibldap2-4-2
 RUNTIME_DEP_PKGS_CSWsamba4-winbind += $(RUNTIME_DEP_PKGS_CSWsamba4-winbind_$(GAROSREL))
-CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += soname-unused
+#CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += soname-unused
 CHECKPKG_OVERRIDES_CSWsamba4-winbind += file-collision
-CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += missing-dependency|CSWlibtevent0
-CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += missing-dependency|CSWlibwbclient0
-CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += surplus-dependency|CSWsamba4-libs
-CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWliblber2-4-2
-CHECKPKG_OVERRIDES_CSWsamba4-winbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/libnss_wins.so.2|soname=libnss_wins.so|pkgname=CSWsamba4-winbind|expected=CSWlibnss-wins
+#CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += missing-dependency|CSWlibtevent0
+#CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += missing-dependency|CSWlibwbclient0
+#CHECKPKG_OVERRIDES_CSWsamba4-winbind_5.11 += surplus-dependency|CSWsamba4-libs
+#CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWliblber2-4-2
 CHECKPKG_OVERRIDES_CSWsamba4-winbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/nss_winbind.so.1|soname=nss_winbind.so.1|pkgname=CSWsamba4-winbind|expected=CSWnss-winbind1
 CHECKPKG_OVERRIDES_CSWsamba4-winbind += shared-lib-pkgname-mismatch|file=opt/csw/lib/winbind_krb5_locator.so|soname=winbind_krb5_locator.so|pkgname=CSWsamba4-winbind|expected=CSWwinbind-krb5locator
 CHECKPKG_OVERRIDES_CSWsamba4-winbind += soname-equals-filename|file=/opt/csw/lib/winbind_krb5_locator.so
@@ -741,11 +822,8 @@
 CATALOGNAME_CSWsamba4-nss-system-links = samba4_nss_system_links
 INCOMPATIBLE_PKGS_CSWsamba4-nss-system-links += CSWsamba-nss-system-links
 PKGFILES_CSWsamba4-nss-system-links  = /usr/lib/nss_winbind_csw.so.1
-PKGFILES_CSWsamba4-nss-system-links += /usr/lib/nss_wins_csw.so.2
 PKGFILES_CSWsamba4-nss-system-links += /usr/lib/amd64/nss_winbind_csw.so.1
-PKGFILES_CSWsamba4-nss-system-links += /usr/lib/amd64/nss_wins_csw.so.2
 PKGFILES_CSWsamba4-nss-system-links += /usr/lib/sparcv9/nss_winbind_csw.so.1
-PKGFILES_CSWsamba4-nss-system-links += /usr/lib/sparcv9/nss_wins_csw.so.2
 SPKG_DESC_CSWsamba4-nss-system-links += Samba 4 nss modules links for the system
 RUNTIME_DEP_PKGS_CSWsamba4-nss-system-links += CSWsamba4-winbind
 CHECKPKG_OVERRIDES_CSWsamba4-nss-system-links += bad-location-of-file
@@ -785,6 +863,10 @@
 EXTRA_LDFLAGS = -R$(SMBPRIVATELIB) -Wl,-zignore -Wl,-Bdirect
 EXTRA_LD_OPTIONS = -Bdirect -z ignore -z nolazyload
 
+EXTRA_CFLAGS += -lrt -lintl -lsec 
+EXTRA_LDFLAGS += -lrt -lintl -lsec 
+
+
 # At the moment there are errors about python headers missing on 64 bit
 #BUILD64 = 1
 #ISAEXEC = 1
@@ -798,6 +880,8 @@
 CONFIGURE_ARGS += --with-pam
 CONFIGURE_ARGS += --with-winbind
 CONFIGURE_ARGS += --with-shared-modules=$(SMB_MODULES)
+CONFIGURE_ARGS += --with-static-modules=vfs_solarisacl
+#CONFIGURE_ARGS += --with-shared-modules=vfs_zfsacl,vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
 CONFIGURE_ARGS += --with-ads
 CONFIGURE_ARGS += --with-ldap
 CONFIGURE_ARGS += --with-automount
@@ -851,9 +935,9 @@
 
 # Define the targets for the links
 NSS_WINBIND_32 = ../..$(libdir)/nss_winbind.so.1
-NSS_WINS_32    = ../..$(libdir)/libnss_wins.so.2
+#NSS_WINS_32    = ../..$(libdir)/libnss_wins.so.2
 NSS_WINBIND_64 = ../../..$(libdir)/nss_winbind.so.1
-NSS_WINS_64    = ../../..$(libdir)/libnss_wins.so.2
+#NSS_WINS_64    = ../../..$(libdir)/libnss_wins.so.2
 
 PAM_WINBIND_32 = ../../..$(libdir)/security/pam_winbind.so
 PAM_SMBPASS_32 = ../../..$(libdir)/security/pam_smbpass.so
@@ -872,7 +956,7 @@
 	# system's nsswitch.conf
 	ginstall -d  -m 0755 $(DESTDIR)$(NSS_MODULE_DIR)
 	gln -s $(NSS_WINBIND_$(MEMORYMODEL)) $(DESTDIR)$(NSS_MODULE_DIR)/nss_winbind_csw.so.1
-	gln -s $(NSS_WINS_$(MEMORYMODEL)) $(DESTDIR)$(NSS_MODULE_DIR)/nss_wins_csw.so.2
+	#gln -s $(NSS_WINS_$(MEMORYMODEL)) $(DESTDIR)$(NSS_MODULE_DIR)/nss_wins_csw.so.2
 	# This bit is to install the symlinks to use the PAM modules with the
 	# system's pam.conf
 	ginstall -d  -m 0755 $(DESTDIR)$(PAM_MODULE_DIR)

Modified: csw/mgar/pkg/samba/branches/samba4/checksums
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/checksums	2015-09-16 12:12:15 UTC (rev 25240)
+++ csw/mgar/pkg/samba/branches/samba4/checksums	2015-09-16 13:00:51 UTC (rev 25241)
@@ -1 +1 @@
-f5f2ad0e2aabf024e2e3e2f297a0631a  samba-4.0.9.tar.gz
+8f6452eca69f8b38f97bb8d8a738180a  samba-4.3.0.tar.gz

Added: csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_10877
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_10877	                        (rev 0)
+++ csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_10877	2015-09-16 13:00:51 UTC (rev 25241)
@@ -0,0 +1,165 @@
+From 473a56c5adf2af1044666963d11f65b030d17f7b Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <slow at 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 <slow at samba.org>
+Reviewed-by: Jelmer Vernooij <jelmer at samba.org>
+
+Autobuild-User(master): Ralph Böhme <slow at 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)
+-
+- at feature('cc')
+- at 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 = []
+-
+- at feature('cc')
+- at 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 = []
+-
+- at feature('cprogram', 'cshlib', 'cstaticlib')
+- at 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 = []
+-
+- at feature('cprogram', 'cshlib', 'cstaticlib')
+- at 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 <slow at 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 <slow at 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 <slow at 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 <slow at 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
+

Added: csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11053
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11053	                        (rev 0)
+++ csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11053	2015-09-16 13:00:51 UTC (rev 25241)
@@ -0,0 +1,39 @@
+From 5250625a23b52399e4f386f49d2608aca3dd1afe Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <rb at 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 <rb at 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
+

Added: csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11359
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11359	                        (rev 0)
+++ csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11359	2015-09-16 13:00:51 UTC (rev 25241)
@@ -0,0 +1,86 @@
+From 6cbc4ec426b00a8b920c758f408530e1a63fdf37 Mon Sep 17 00:00:00 2001
+From: Jeremy Allison <jra at 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 <jra at 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
+

Added: csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11508
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11508	                        (rev 0)
+++ csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11508	2015-09-16 13:00:51 UTC (rev 25241)
@@ -0,0 +1,26 @@
+--- 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

Added: csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11511
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11511	                        (rev 0)
+++ csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11511	2015-09-16 13:00:51 UTC (rev 25241)
@@ -0,0 +1,8 @@
+--- 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)

Added: csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11512
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11512	                        (rev 0)
+++ csw/mgar/pkg/samba/branches/samba4/files/fix_bugid_11512	2015-09-16 13:00:51 UTC (rev 25241)
@@ -0,0 +1,33 @@
+--- 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.



More information about the devel mailing list