[csw-devel] SF.net SVN: gar:[21993] csw/mgar/pkg/samba/branches/samba4
slowfranklin at users.sourceforge.net
slowfranklin at users.sourceforge.net
Tue Sep 24 20:49:34 CEST 2013
Revision: 21993
http://gar.svn.sourceforge.net/gar/?rev=21993&view=rev
Author: slowfranklin
Date: 2013-09-24 18:49:34 +0000 (Tue, 24 Sep 2013)
Log Message:
-----------
samba/branches/samba4: Another work in progress Samba4 package
Modified Paths:
--------------
csw/mgar/pkg/samba/branches/samba4/Makefile
Added Paths:
-----------
csw/mgar/pkg/samba/branches/samba4/files/0003-Use-R-linker-flag-instead-of-rpath.patch
Modified: csw/mgar/pkg/samba/branches/samba4/Makefile
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-24 18:46:55 UTC (rev 21992)
+++ csw/mgar/pkg/samba/branches/samba4/Makefile 2013-09-24 18:49:34 UTC (rev 21993)
@@ -1,10 +1,5 @@
-#Todo stuff
-# There are lots of files and libs which are part of samba 3 package too. There should be removed from packinging
-# See http://sources.debian.net/src/samba4/4.0.3%2Bdfsg1-0.1/debian/rules
-# All remaining libs are need to be split off. See debian package too.
-
NAME = samba
-VERSION = 4.0.6
+VERSION = 4.0.9
GARTYPE = v2
DESCRIPTION = Tools to access a servers filespace and printers via SMB (server)
@@ -16,249 +11,539 @@
DISTFILES = $(NAME)-$(VERSION).tar.gz
DISTFILES += cswsamba
DISTFILES += cswwinbind
+# From http://www.reallylinux.com/docs/smb.conf
+DISTFILES += smb.conf
+# This is taken from the old Samba package
+DISTFILES += cswkrb5.conf
EXPANDVARS += cswsamba
EXPANDVARS += cswwinbind
EXPANDVARS += smb.conf
-# From http://www.reallylinux.com/docs/smb.conf
-DISTFILES += smb.conf
+GARCOMPILER = GNU
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+BUILD_DEP_PKGS += CSWlibtalloc-dev
-# This is taken from the old Samba package
-DISTFILES += cswkrb5.conf
-
PATCHFILES += 0001-fix-xml.patch
-#From https://bugzilla.samba.org/show_bug.cgi?id=7588
+# 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
-BUILD_DEP_PKGS += CSWlibtalloc-dev
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+# Filesystem layout
+SMBLOCKDIR = $(localstatedir)/samba/locks
+SMBLOGDIR = $(localstatedir)/samba/log
+SMBPRIVATEDIR = $(sysconfdir)/samba/private
+SMBCONFIGDIR = $(sysconfdir)/samba
+SMBPRIVATELIB = $(libdir)/samba4
+# 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
+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
+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)
+
+# Main package CSWsamba4
PACKAGES += CSWsamba4
SPKG_DESC_CSWsamba4 = $(DESCRIPTION)
-# PKGFILES is catchall
+# OBSOLETED_BY_CSWsamba4 += CSWsamba
+SMB_BINS = eventlogadm gentest locktest masktest ndrdump net ntlm_auth pdbedit pidl
+SMB_BINS += profiles samba-tool smbcontrol smbstatus smbtorture testparm
+SMB_SBINS = smbd nmbd samba samba_dnsupdate samba_kcc samba_spnupdate samba_upgradedns
+SMB_MANPAGES = findsmb\.1 log2pcap\.1 vfstest\.1
+SMB_MANPAGES += lmhosts\.5 smb.conf\.5 smbpasswd\.5 smbgetrc\.5
+SMB_MANPAGES += samba\.7
+SMB_MANPAGES += net\.8 pdbedit\.8 eventlogadm\.8 smbd\.8 nmbd\.8 samba\.8 samba-tool\.8 smbpasswd\.8 smbspool\.8 smbta-util\.8
+SMB_MANPAGES += tdbbackup\.8 tdbdump\.8 tdbrestore\.8 tdbtool\.8
+PKGFILES_CSWsamba4 += $(call baseisadirs,$(sysconfdir),init\.d/cswsamba4)
+PKGFILES_CSWsamba4 += $(call baseisadirs,$(sysconfdir),openldap/schema/samba\.schema)
+PKGFILES_CSWsamba4 += $(foreach B,$(SMB_BINS),$(call baseisadirs,$(bindir),$B))
+PKGFILES_CSWsamba4 += $(foreach B,$(SMB_BINS),$(call baseisadirs,$(mandir),man1/$B\.1))
+PKGFILES_CSWsamba4 += $(foreach B,$(SMB_SBINS),$(call baseisadirs,$(sbindir),$B))
+PKGFILES_CSWsamba4 += $(call baseisadirs,$(sharedstatedir),codepages/.*)
+PKGFILES_CSWsamba4 += $(call baseisadirs,$(sharedstatedir),setup/.*)
+PKGFILES_CSWsamba4 += $(call baseisadirs,$(sharedstatedir),perl5/.*)
+PKGFILES_CSWsamba4 += $(call baseisadirs,$(SMBCONFIGDIR),smb.conf.CSW)
+PKGFILES_CSWsamba4 += $(foreach M,$(SMB_MANPAGES),$(call baseisadirs,$(mandir),man./$M))
+PKGFILES_CSWsamba4 += $(call baseisadirs,$(mandir),man8/vfs_.*)
+PKGFILES_CSWsamba4 += $(call baseisadirs,$(mandir),man8/idmap_.*)
+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 += CSWlibpopt0
RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcrypt11
RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibfam0
-RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgssapi-krb5-2
-RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibcom-err3
RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibreadline6
-RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibcups2
-RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWsamba4 += CSWliblber2-4-2
-RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibwbclient0
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWperl
+RUNTIME_DEP_PKGS_CSWsamba4 += CSWlibgcc-s1
-# Just docs override for now
-CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/lmhosts.5
-CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man5/smb.conf.5
-CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/nmbd.8
-CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/smbd.8
-CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/tdbbackup.8
-CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/idmap_tdb2.8
-CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/net.8
-CHECKPKG_OVERRIDES_CSWsamba4 += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/swat.8
-
+# Package with clients, finished
PACKAGES += CSWsamba4-client
-SPKG_DESC_CSWsamba4-client = Client binaries for samba4
-SMB_CLIENT_TOOLS = cifsdd smbclient4 nmblookup4
-PKGFILES_CSWsamba4-client += $(foreach T,$(SMB_CLIENT_TOOLS),$(call baseisadirs,$(bindir),$T) $(mandir)/man1/$T\.1)
+SPKG_DESC_CSWsamba4-client = Samba 4 clients
+# OBSOLETED_BY_CSWsamba4-client += CSWsamba-client
+SMB_CLIENT_BINS = cifsdd dbwrap_tool nmblookup nmblookup4 oLschema2ldif regdiff regpatch regshell regtree rpcclient
+SMB_CLIENT_BINS += samba-regedit sharesec smbcacls smbclient smbclient4 smbcquotas smbget smbpasswd smbprint
+SMB_CLIENT_BINS += smbspool smbta-util smbtar smbtree tdbbackup tdbdump tdbrestore tdbtool
+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 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibintl8
RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibpopt0
-RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibz1
-RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibgssapi-krb5-2
RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibreadline6
-RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWsamba4-client += CSWliblber2-4-2
-RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibwbclient0
-RUNTIME_DEP_PKGS_CSWsamba4-client += CSWlibtdb1
+# Development package
+PACKAGES += CSWsamba4-dev
+SPKG_DESC_CSWsamba4-dev = Development files for Samba 4
+# OBSOLETED_BY_CSWsamba4-dev += CSWsamba-dev
+PKGFILES_CSWsamba4-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWsamba4-dev += $(libdir)/lib.*\.so)
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-server0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-atsvc0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibregistry0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtorture0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibndr-nbt0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-util0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbclient-raw0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-policy0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamdb0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibwbclient0
+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 += CSWlibsmbconf0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-samr0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibnetapi0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-credentials0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtevent0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbldap0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgensec0
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibdcerpc-binding0
-# Just docs, override for now
-CHECKPKG_OVERRIDES_CSWsamba4-client += file-with-bad-content|/usr/local|root/opt/csw/share/man/man1/smbclient.1
+# Package CSWsamba4 libraries
+PACKAGES += CSWsamba4-libs
+SPKG_DESC_CSWsamba4-libs = Samba 4 libraries
+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
+# PKGFILES_CSWsamba4-libs += $(foreach L,$(SMB_LIBS),$(call pkgfiles_lib,$L))
+PKGFILES_CSWsamba4-libs += $(SMBPRIVATELIB)/.*
+PKGFILES_CSWsamba4-libs += $(mandir)/man7/libsmbclient.7
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibpopt0
+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 += CSWlibcups2
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWsamba4-libs += CSWlibgcc-s1
-#PACKAGES += CSWsambadoc
-SPKG_DESC_CSWsambadoc = Samba documentation
-ARCHALL_CSWsambadoc = 1
+PACKAGES += CSWlibdcerpc-atsvc0
+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 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibdcerpc-atsvc0 += CSWlibsamba-util0
+PACKAGES += CSWlibdcerpc-binding0
+PKGFILES_CSWlibdcerpc-binding0 += $(call baseisadirs,$(libdir),libdcerpc-binding\.so\.0\.0\.1)
+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 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibdcerpc-binding0 += CSWlibsamba-util0
+
+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 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibdcerpc-samr0 += CSWlibsamba-util0
+
+PACKAGES += CSWlibdcerpc-server0
+PKGFILES_CSWlibdcerpc-server0 += $(call baseisadirs,$(libdir),libdcerpc-server\.so\.0\.0\.1)
+PKGFILES_CSWlibdcerpc-server0 += $(call baseisadirs,$(libdir),libdcerpc-server\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibdcerpc-server0 += $(DESCRIPTION), libdcerpc-server.so.0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-credentials0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtevent0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibdcerpc0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibregistry0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamdb0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgensec0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibdcerpc-binding0
+RUNTIME_DEP_PKGS_CSWlibdcerpc-server0 += CSWlibsamba-util0
+
+PACKAGES += CSWlibdcerpc0
+PKGFILES_CSWlibdcerpc0 += $(call baseisadirs,$(libdir),libdcerpc\.so\.0\.0\.1)
+PKGFILES_CSWlibdcerpc0 += $(call baseisadirs,$(libdir),libdcerpc\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibdcerpc0 += $(DESCRIPTION), libdcerpc.so.0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-credentials0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsmbclient-raw0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgensec0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibdcerpc-binding0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibndr-nbt0
+RUNTIME_DEP_PKGS_CSWlibdcerpc0 += CSWlibsamba-util0
+
+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 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-credentials0
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent0
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamdb0
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgensec0 += CSWlibsamba-util0
+
+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 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibndr-krb5pac0 += CSWlibsamba-util0
+
+PACKAGES += CSWlibndr-nbt0
+PKGFILES_CSWlibndr-nbt0 += $(call baseisadirs,$(libdir),libndr-nbt\.so\.0\.0\.1)
+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 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibndr-nbt0 += CSWlibsamba-util0
+
+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
+
+PACKAGES += CSWlibndr0
+PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0\.0\.1)
+PKGFILES_CSWlibndr0 += $(call baseisadirs,$(libdir),libndr\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibndr0 += $(DESCRIPTION), libndr.so.0
+RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibndr0 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibndr0 += CSWlibsamba-util0
+
PACKAGES += CSWlibnetapi0
-PKGFILES_CSWlibnetapi0 += $(call pkgfiles_lib,libnetapi.so.0)
-SPKG_DESC_CSWlibnetapi0 += Samba client library, libnetapi.so.0
+PKGFILES_CSWlibnetapi0 += $(call baseisadirs,$(libdir),libnetapi\.so\.0)
+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 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibpdb0
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsmbconf0
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWliblber2-4-2
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibnetapi0 += CSWlibsamba-util0
-PACKAGES += CSWlibnss-winbind1
-PKGFILES_CSWlibnss-winbind1 += $(call pkgfiles_lib,libnss_winbind.so.1)
-SPKG_DESC_CSWlibnss-winbind1 += Winbind nss libary,libnss_winbind.so.1
+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 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsmbconf0
+RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibtdb1
+RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamdb0
+RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibwbclient0
+RUNTIME_DEP_PKGS_CSWlibpdb0 += CSWlibsamba-util0
-PACKAGES += CSWsamba4-dev
-SPKG_DESC_CSWsamba4-dev = Development files for Samba, libsmbclient.so.0
-PKGFILES_CSWsamba4-dev += $(PKGFILES_DEVEL)
-RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbclient0
-RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibwbclient0
-RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibnetapi0
-RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibtdb1
-RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWlibsmbsharemodes0
-RUNTIME_DEP_PKGS_CSWsamba4-dev += CSWsamba
+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 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibdcerpc0
+RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibregistry0 += CSWlibsamba-util0
+PACKAGES += CSWlibsamba-credentials0
+PKGFILES_CSWlibsamba-credentials0 += $(call baseisadirs,$(libdir),libsamba-credentials\.so\.0\.0\.1)
+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 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibsamba-credentials0 += CSWlibsamba-util0
-PACKAGES += CSWsamba4-swat
-SPKG_DESC_CSWsamba4-swat = Web-based samba administration tools
-PKGFILES_CSWsamba4-swat += $(call baseisadirs,$(sbindir),swat)
-PKGFILES_CSWsamba4-swat += $(mandir)/.*/swat\.*
-PKGFILES_CSWsamba4-swat += $(sharedstatedir)/samba/swat/.*
-PKGFILES_CSWsamba4-swat += $(prefix)/swat/.*
-RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibpopt0
-RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibz1
-RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibgssapi-krb5-2
-RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibcups2
-RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibtalloc2
-RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWliblber2-4-2
-RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibwbclient0
-RUNTIME_DEP_PKGS_CSWsamba4-swat += CSWlibtdb1
+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 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibsamba-hostconfig0 += CSWlibsamba-util0
-# Just docs, override for now
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/ix01.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/appendix.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/upgrades.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/secure.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-ByExample/nw4migration.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-Developers-Guide/pwencrypt.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/classicalprinting.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/bugreport.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/VFS.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/compiling.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/NetworkBrowsing.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/domain-member.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/SWAT.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/locking.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/ix01.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/samba-pdc.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/install.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/diagnosis.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/FastStart.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/pam.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/winbind.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/Samba3-HOWTO/AccessControls.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/swat.8.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/lmhosts.5.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/nmbd.8.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/idmap_tdb2.8.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/smb.conf.5.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/winbindd.8.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/smbd.8.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/net.8.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/tdbbackup.8.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/local|root/opt/csw/swat/help/manpages/smbclient.1.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/export/home|root/opt/csw/swat/help/Samba3-HOWTO/msdfs.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/ix01.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/appendix.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/upgrades.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-ByExample/happy.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/VFS.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/CUPS-printing.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/SWAT.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/ix01.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/FastStart.html
-CHECKPKG_OVERRIDES_CSWsamba4-swat += file-with-bad-content|/usr/share|root/opt/csw/swat/help/Samba3-HOWTO/ch-ldap-tls.html
+PACKAGES += CSWlibsamba-policy0
+PKGFILES_CSWlibsamba-policy0 += $(call baseisadirs,$(libdir),libsamba-policy\.so\.0\.0\.1)
+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 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibdcerpc0
+RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsmbclient-raw0
+RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibsamba-policy0 += CSWlibsamba-util0
+PACKAGES += CSWlibsamba-util0
+PKGFILES_CSWlibsamba-util0 += $(call baseisadirs,$(libdir),libsamba-util\.so\.0\.0\.1)
+PKGFILES_CSWlibsamba-util0 += $(call baseisadirs,$(libdir),libsamba-util\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibsamba-util0 += $(DESCRIPTION), libsamba-util.so.0
+RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibsamba-util0 += CSWlibiconv2
+
+PACKAGES += CSWlibsamdb0
+PKGFILES_CSWlibsamdb0 += $(call baseisadirs,$(libdir),libsamdb\.so\.0\.0\.1)
+PKGFILES_CSWlibsamdb0 += $(call baseisadirs,$(libdir),libsamdb\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibsamdb0 += $(DESCRIPTION), libsamdb.so.0
+RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-credentials0
+RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibsamdb0 += CSWlibsamba-util0
+
+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 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibsamba-credentials0
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent0
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgensec0
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibndr-nbt0
+RUNTIME_DEP_PKGS_CSWlibsmbclient-raw0 += CSWlibsamba-util0
+
+PACKAGES += CSWlibsmbconf0
+PKGFILES_CSWlibsmbconf0 += $(call baseisadirs,$(libdir),libsmbconf\.so\.0)
+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 += CSWlibndr0
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent0
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtdb1
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibtevent-util0
+RUNTIME_DEP_PKGS_CSWlibsmbconf0 += CSWlibsamba-util0
+
+
+PACKAGES += CSWlibsmbldap0
+PKGFILES_CSWlibsmbldap0 += $(call baseisadirs,$(libdir),libsmbldap\.so\.0)
+PKGFILES_CSWlibsmbldap0 += $(call baseisadirs,$(libdir),libsmbldap\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibsmbldap0 += $(DESCRIPTION), libsmbldap.so.0
+RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibtalloc2
+RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWliblber2-4-2
+RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibtevent0
+RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsmbconf0
+RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibsmbldap0 += CSWlibsamba-util0
+
+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 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibtevent0
+RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibtevent-util0 += CSWlibsamba-util0
+
+PACKAGES += CSWlibtorture0
+PKGFILES_CSWlibtorture0 += $(call baseisadirs,$(libdir),libtorture\.so\.0\.0\.1)
+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 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibsamba-hostconfig0
+RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibtorture0 += CSWlibsamba-util0
+
+# 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 += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWsamba4-python += CSWlibpython2-6-1-0
+
+# winbind daemon, NSS and PAM modules
PACKAGES += CSWsamba4-winbind
SPKG_DESC_CSWsamba4-winbind = Tools to authenticate users from active directory using winbind
+# OBSOLETED_BY_CSWsamba4-windbind += CSWsamba-winbind
+# OBSOLETED_BY_CSWsamba4-windbind += CSWsamba-nss
+# OBSOLETED_BY_CSWsamba4-windbind += CSWsamba-nss-system-links
+# OBSOLETED_BY_CSWsamba4-windbind += CSWsamba-pam-system-links
+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,winbind_krb5_locator.so)
+PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(sbindir),winbindd)
PKGFILES_CSWsamba4-winbind += $(sharedstatedir)/locale/.*/pam_winbind\.mo
PKGFILES_CSWsamba4-winbind += $(mandir)/man5/pam_winbind\.conf\.5
PKGFILES_CSWsamba4-winbind += $(mandir)/man7/winbind_krb5_locator\.7
PKGFILES_CSWsamba4-winbind += $(mandir)/man8/pam_winbind\.8
-PKGFILES_CSWsamba4-winbind += $(call baseisadirs,$(sbindir),winbindd)
+PKGFILES_CSWsamba4-winbind += $(mandir)/man1/wbinfo\.1
PKGFILES_CSWsamba4-winbind += $(mandir)/man8/winbindd\.8
-PKGFILES_CSWsamba4-winbind += /etc/opt/csw/init.d/cswwinbind
+PKGFILES_CSWsamba4-winbind += $(sysconfdir)/init\.d/cswwinbind4
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWsamba4-libs
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibgcc-s1
RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibpopt0
-RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibz1
-RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibintl8
-RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtdb1
-RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibgssapi-krb5-2
-RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibk5crypto3
-RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibwbclient0
-RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibkrb5-3
-RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibcom-err3
-RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibtalloc2
RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWliblber2-4-2
-RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibldap2-4-2
-RUNTIME_DEP_PKGS_CSWsamba4-winbind += CSWlibnss-winbind1
-# Just docs, override for now
-CHECKPKG_OVERRIDES_CSWsamba4-winbind += file-with-bad-content|/usr/local|root/opt/csw/share/man/man8/winbindd.8
-CHECKPKG_OVERRIDES_CSWsamba4-winbind += surplus-dependency|CSWlibnss-winbind1
+PACKAGES += CSWsamba4-nss-system-links
+CATALOGNAME_CSWsamba4-nss-system-links = samba4_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.1
+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.1
+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.1
+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
+ARCHALL_CSWsamba4-nss-system-links = 1
-EXTRA_CFLAGS = -lrt -lintl -lsec
-EXTRA_LDFLAGS = -lrt -lintl -lsec
+PACKAGES += CSWsamba4-pam-system-links
+CATALOGNAME_CSWsamba4-pam-system-links = samba4_pam_system_links
+PKGFILES_CSWsamba4-pam-system-links = /usr/lib/security/pam_smbpass_csw.so
+PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/pam_winbind_csw.so
+PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/amd64/pam_smbpass_csw.so
+PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/amd64/pam_winbind_csw.so
+PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/sparcv9/pam_smbpass_csw.so
+PKGFILES_CSWsamba4-pam-system-links += /usr/lib/security/sparcv9/pam_winbind_csw.so
+SPKG_DESC_CSWsamba4-pam-system-links += Samba 4 pam modules links for the system
+RUNTIME_DEP_PKGS_CSWsamba4-pam-system-links += CSW4samba-winbind
+RUNTIME_DEP_PKGS_CSWsamba4-pam-system-links += CSW4samba
+CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += surplus-dependency|CSWsamba4
+CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += surplus-dependency|CSWsamba4-winbind
+CHECKPKG_OVERRIDES_CSWsamba4-pam-system-links += bad-location-of-file
+ARCHALL_CSWsamba4-pam-system-links = 1
+
+# For checking whether we're missing anything, enable and check when updating.
+# Should only catch SWAT stuff which is EOL upstream so we're not packaging it
+PACKAGES += CSWsamba4-catchall
+SPKG_DESC_CSWsamba4-catchall = Samba 4 catch all
+
+# The build fails to add the right rpath to at least the public libs
+EXTRA_LDFLAGS = -R$(SMBPRIVATELIB) -Wl,-zignore -Wl,-Bdirect
+# EXTRA_LD_OPTIONS = -B direct -z ignore
+
# At the moment there are errors about python headers missing on 64 bit
#BUILD64 = 1
#ISAEXEC = 1
-GARCOMPILER = GNU
-
-SMBLOCKDIR = $(localstatedir)/samba/locks
-SMBLOGDIR = $(localstatedir)/samba/log
-SMBPRIVATEDIR = $(sysconfdir)/samba/private
-SMBCONFIGDIR = $(sysconfdir)/samba
-SMBPRIVATELIB = $(libdir)/samba
-
CONFIGURE_ARGS += $(DIRPATHS)
#Remove exec_prefix from DIRPATHS:
NODIRPATHS += --exec_prefix=/opt/csw
-#CONFIGURE_ARGS += --enable-shared=yes
-#CONFIGURE_ARGS += --enable-static=no
-#CONFIGURE_ARGS += --enable-socket-wrapper
-#CONFIGURE_ARGS += --enable-nss-wrapper
CONFIGURE_ARGS += --with-acl-support
CONFIGURE_ARGS += --with-aio-support
CONFIGURE_ARGS += --with-pam
CONFIGURE_ARGS += --with-winbind
-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-shared-modules=vfs_prealloc,vfs_cacheprime,vfs_commit,idmap_ldap,idmap_tdb2,idmap_rid,idmap_ad,idmap_hash,idmap_adex
-#CONFIGURE_ARGS += --with-readline
+CONFIGURE_ARGS += --with-shared-modules=$(SMB_MODULES)
CONFIGURE_ARGS += --with-ads
CONFIGURE_ARGS += --with-ldap
CONFIGURE_ARGS += --with-automount
-#CONFIGURE_ARGS += --with-dnsupdate=no
-CONFIGURE_ARGS += --with-privatedir=$(SMBPRIVATELIB)
+CONFIGURE_ARGS += --enable-cups
+CONFIGURE_ARGS += --with-privatedir=$(SMBPRIVATEDIR)
CONFIGURE_ARGS += --with-configdir=$(SMBCONFIGDIR)
CONFIGURE_ARGS += --with-lockdir=$(SMBLOCKDIR)
CONFIGURE_ARGS += --with-statedir=$(SMBLOCKDIR)
CONFIGURE_ARGS += --with-cachedir=$(SMBLOCKDIR)
CONFIGURE_ARGS += --with-piddir=$(SMBLOCKDIR)
-# to stay with the one build with samba 3 build this one private
-CONFIGURE_ARGS += --private-libraries=smbclient
CONFIGURE_ARGS += --with-privatelibdir=$(SMBPRIVATELIB)
-
+CONFIGURE_ARGS += --with-modulesdir=$(SMBPRIVATELIB)
CONFIGURE_ARGS += --with-logfilebase=$(SMBLOGDIR)
+# to stay with the one build with samba 3 build these are private
+CONFIGURE_ARGS += --private-libraries=smbclient,smbsharemodes,wbclient
+CONFIGURE_ARGS += --bundled-libraries=heimdal,!zlib,!popt,talloc,pytalloc,pytalloc-util,tevent,pytevent,tdb,pytdb,ldb,pyldb
-CONFIGURE_ARGS += --enable-cups
-
-# Can't use fdatasync atm do to linker problems
-#CONFIGURE_ARGS += ac_cv_lib_rt_fdatasync=no
-#CONFIGURE_ARGS += ac_cv_have_fdatasync_decl=no
-#CONFIGURE_ARGS += ac_cv_lib_ext_rt_fdatasync=no
-
-
-
-
TEST_TARGET = test
# Tests need root
@@ -272,20 +557,58 @@
EXTRA_PAX_ARGS += -s "/=/-/g"
-INITSMF += /etc/opt/csw/init.d/cswsamba
-INITSMF += /etc/opt/csw/init.d/cswwinbind
+INITSMF += /etc/opt/csw/init.d/cswsamba4
+INITSMF += /etc/opt/csw/init.d/cswwinbind4
PRESERVECONF += $(sysconfdir)/samba/smb.conf
+EXTRA_MERGE_DIRS_isa-extra += /usr/lib/64 /usr/lib/security/64
+MERGEBASE_/usr/lib/64 = /usr/lib
+MERGEBASE_/usr/lib/security/64 = /usr/lib/security
+EXTRA_PKGFILES_EXCLUDED += /usr/lib/security
+
include gar/category.mk
+# Set the target dir for modules with the proper arch
+NSS_MODULE_DIR = /usr/lib
+PAM_MODULE_DIR = /usr/lib/security
+
+ifeq ($(MEMORYMODEL),64)
+ NSS_MODULE_DIR = /usr/lib/64
+ PAM_MODULE_DIR = /usr/lib/security/64
+endif
+
+# Define the targets for the links
+NSS_WINBIND_32 = ../..$(libdir)/nss_winbind.so.1
+NSS_WINS_32 = ../..$(libdir)/libnss_wins.so.2
+NSS_WINBIND_64 = ../../..$(libdir)/nss_winbind.so.1
+NSS_WINS_64 = ../../..$(libdir)/libnss_wins.so.2
+
+PAM_WINBIND_32 = ../../..$(libdir)/security/pam_winbind.so
+PAM_SMBPASS_32 = ../../..$(libdir)/security/pam_smbpass.so
+PAM_WINBIND_64 = ../../../..$(libdir)/security/pam_winbind.so
+PAM_SMBPASS_64 = ../../../..$(libdir)/security/pam_smbpass.so
+
post-install-modulated:
ginstall -d $(DESTDIR)/etc/opt/csw/init.d
- ginstall $(WORKDIR)/cswsamba $(DESTDIR)/etc/opt/csw/init.d/cswsamba
- ginstall $(WORKDIR)/cswwinbind $(DESTDIR)/etc/opt/csw/init.d/cswwinbind
+ ginstall $(WORKDIR)/cswsamba $(DESTDIR)/etc/opt/csw/init.d/cswsamba4
+ ginstall $(WORKDIR)/cswwinbind $(DESTDIR)/etc/opt/csw/init.d/cswwinbind4
ginstall -d $(DESTDIR)/etc/opt/csw/samba
ginstall $(WORKDIR)/smb.conf $(DESTDIR)/etc/opt/csw/samba/smb.conf
- #ginstall $(WORKSRC)/nsswitch/libnss_winbind.so $(DESTDIR)/$(libdir)/libnss_winbind.so.1
+ ginstall -d $(DESTDIR)/etc/opt/csw/openldap/schema
+ ginstall $(WORKSRC)/examples/LDAP/samba.schema $(DESTDIR)/etc/opt/csw/openldap/schema
+# ginstall $(WORKSRC)/nsswitch/nss_winbind.so $(DESTDIR)/$(libdir)/nss_winbind.so.1
+# ginstall $(WORKSRC)/nsswitch/nss_wins.so $(DESTDIR)/$(libdir)/nss_wins.so.1
+ # This bit is to install the symlinks to use the NSS modules with the
+ # 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.1
+ # 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)
+ gln -s $(PAM_WINBIND_$(MEMORYMODEL)) $(DESTDIR)$(PAM_MODULE_DIR)/pam_winbind_csw.so
+ gln -s $(PAM_SMBPASS_$(MEMORYMODEL)) $(DESTDIR)$(PAM_MODULE_DIR)/pam_smbpass_csw.so
@$(MAKECOOKIE)
# python buildtools/bin/waf -v build
Added: csw/mgar/pkg/samba/branches/samba4/files/0003-Use-R-linker-flag-instead-of-rpath.patch
===================================================================
--- csw/mgar/pkg/samba/branches/samba4/files/0003-Use-R-linker-flag-instead-of-rpath.patch (rev 0)
+++ csw/mgar/pkg/samba/branches/samba4/files/0003-Use-R-linker-flag-instead-of-rpath.patch 2013-09-24 18:49:34 UTC (rev 21993)
@@ -0,0 +1,41 @@
+From ce4d161af8431fdb1f46a3d749d34afe968c1cee Mon Sep 17 00:00:00 2001
+From: Ralph Boehme <sloowfranklin at gmail.com>
+Date: Fri, 23 Aug 2013 19:43:21 +0200
+Subject: [PATCH] Use -R linker flag instead of -rpath on Solaris
+
+---
+ buildtools/wafadmin/Tools/gcc.py | 5 +++++
+ buildtools/wafadmin/Tools/suncc.py | 1 +
+ 2 files changed, 6 insertions(+)
+
+diff --git a/buildtools/wafadmin/Tools/gcc.py b/buildtools/wafadmin/Tools/gcc.py
+index 420b44f..c3b6b1b 100644
+--- a/buildtools/wafadmin/Tools/gcc.py
++++ b/buildtools/wafadmin/Tools/gcc.py
+@@ -114,6 +114,11 @@ def gcc_modifier_aix(conf):
+ v['SHLIB_MARKER'] = ''
+
+ @conftest
++def gcc_modifier_sunos(conf):
++ v = conf.env
++ v['RPATH_ST']='-Wl,-R%s'
++
++ at conftest
+ def gcc_modifier_platform(conf):
+ # * set configurations specific for a platform.
+ # * the destination platform is detected automatically by looking at the macros the compiler predefines,
+diff --git a/buildtools/wafadmin/Tools/suncc.py b/buildtools/wafadmin/Tools/suncc.py
+index b1a2aad..45d4e69 100644
+--- a/buildtools/wafadmin/Tools/suncc.py
++++ b/buildtools/wafadmin/Tools/suncc.py
+@@ -48,6 +48,7 @@ def scc_common_flags(conf):
+ v['STATICLIB_ST'] = '-l%s'
+ v['STATICLIBPATH_ST'] = '-L%s'
+ v['CCDEFINES_ST'] = '-D%s'
++ v['RPATH_ST'] = '-R%s'
+
+ v['SONAME_ST'] = '-Wl,-h -Wl,%s'
+ v['SHLIB_MARKER'] = '-Bdynamic'
+--
+1.8.3.4
+
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