Mercurial Mercurial > upstream > oracle > userland-gate / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/samba/samba/samba.p5m
changeset 4371 29fdb14099eb
parent 4344 071eb292dd02
child 4377 b861470645e4 
--- a/components/samba/samba/samba.p5m	Thu May 28 09:54:36 2015 -0700
+++ b/components/samba/samba/samba.p5m	Fri Feb 27 10:07:56 2015 -0800
@@ -23,646 +23,324 @@
 
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
+
+# /etc/samba/private should not even be readable fo non-root users.
+<transform dir path=etc/samba/private -> default mode 500>
+
+# smbprofiles man
+<transform file path=usr/share/man/man1/profiles.1 -> drop>
+
+# General dirs generated in sample-manifest but with bad attribs.
+<transform dir path=etc$ -> drop>
+<transform dir file link path=opt.* -> drop>
+<transform dir path=usr$ -> drop>
+<transform dir path=usr/bin$ -> drop>
+<transform dir path=usr/lib$ -> drop>
+<transform dir path=usr/share$ -> drop>
+<transform dir path=usr/share/doc$ -> drop>
+<transform dir path=var$ -> drop>
+<transform dir path=var/lib$ -> drop>
+
+# Samba customized krb5-config
+<transform file path=usr/bin/krb5-config -> drop>
+
+# Remove the named files with strange deps breaking the pkglint
+<transform file path=usr/lib/python2.7/vendor-packages/samba/samba/external/subunit/run.py -> drop>
+<transform file path=usr/lib/python2.7/vendor-packages/samba/samba/external/subunit/run.pyc -> drop>
+<transform file path=usr/lib/python2.7/vendor-packages/samba/samba/external/subunit/tests/sample-script.py -> drop>
+<transform file path=usr/lib/python2.7/vendor-packages/samba/samba/external/subunit/tests/sample-script.pyc -> drop>
+
+# Oracle HSM (SAMFS) is not yet supported on 12.0
+#<transform file path=usr/lib/samba/vfs/samfs.so -> default pkg.depend.bypass-generate .*>
+#<transform file path=usr/lib/samba/vfs/samfs.so -> default pkg.linted.userland.action001.3 true>
+
+# Private API libgssapi_krb5.so.1 is not yet available in lint cache.
+# Drop-In project will fix it
+<transform file path=usr/lib/samba/$(MACH64)/libgensec.so.0 -> default pkg.depend.bypass-generate .*>
+<transform file path=usr/lib/samba/$(MACH64)/libgensec.so.0 -> default pkg.linted.userland.action001.3 true>
+<transform file path=usr/lib/samba/$(MACH64)/libsamba-credentials.so.0 -> default pkg.depend.bypass-generate .*>
+<transform file path=usr/lib/samba/$(MACH64)/libsamba-credentials.so.0 -> default pkg.linted.userland.action001.3 true>
+<transform file path=usr/lib/samba/libgensec.so.0.0.1 -> default pkg.depend.bypass-generate .*>
+<transform file path=usr/lib/samba/libgensec.so.0.0.1 -> default pkg.linted.userland.action001.3 true>
+<transform file path=usr/lib/samba/libsamba-credentials.so.0.0.1 -> default pkg.depend.bypass-generate .*>
+<transform file path=usr/lib/samba/libsamba-credentials.so.0.0.1 -> default pkg.linted.userland.action001.3 true>
+<transform file path=usr/lib/samba/private/libads.so -> default pkg.depend.bypass-generate .*>
+<transform file path=usr/lib/samba/private/libads.so -> default pkg.linted.userland.action001.3 true>
+<transform file path=usr/lib/samba/private/libgse.so -> default pkg.depend.bypass-generate .*>
+<transform file path=usr/lib/samba/private/libgse.so -> default pkg.linted.userland.action001.3 true>
+
+# mediated links macros to switch between Samba 3 and 4
+<transform link target=.*/lib/samba/samba36/(s)?bin/.+ -> default mediator samba >
+<transform link target=.*/lib/samba/samba36/(s)?bin/.+ -> default mediator-implementation 3 >
+<transform link target=.*/lib/samba/samba36/(s)?bin/.+ -> default mediator-priority vendor >
+
+<transform link target=.*/samba/samba36/lib/($(MACH64)/)?nss_.+\.so -> default mediator samba >
+<transform link target=.*/samba/samba36/lib/($(MACH64)/)?nss_.+\.so -> default mediator-implementation 3 >
+<transform link target=.*/samba/samba36/lib/($(MACH64)/)?nss_.+\.so -> default mediator-priority vendor >
+
+<transform link target=.*/samba/samba36/lib/($(MACH64)/)?security/pam_.+\.so -> default mediator samba >
+<transform link target=.*/samba/samba36/lib/($(MACH64)/)?security/pam_.+\.so -> default mediator-implementation 3 >
+<transform link target=.*/samba/samba36/lib/($(MACH64)/)?security/pam_.+\.so -> default mediator-priority vendor >
+
+<transform link target=.*/lib/samba/(s)?bin/.+ -> default mediator samba >
+<transform link target=.*/lib/samba/(s)?bin/.+ -> default mediator-implementation 4 >
+
+<transform link target=.*/samba/($(MACH64)/)?nss_.+\.so.* -> default mediator samba >
+<transform link target=.*/samba/($(MACH64)/)?nss_.+\.so.* -> default mediator-implementation 4 >
+
+<transform link target=.*/samba/$(MACH64)/pam_.+\.so -> default mediator samba >
+<transform link target=.*/samba/security/pam_.+\.so -> default mediator samba >
+<transform link target=.*/samba/$(MACH64)/pam_.+\.so -> default mediator-implementation 4 >
+<transform link target=.*/samba/security/pam_.+\.so -> default mediator-implementation 4 >
+
+# samba36 is not yet in pkg-repo ...can be removed after push
+<transform file path=usr/lib/samba/samba36/.+ -> default pkg.depend.bypass-generate .*>
+<transform file path=usr/lib/samba/samba36/.+ -> default pkg.linted.userland.action001.3 true>
+
+# (motivation) Samba delivers dozens of objects so it is better to hanle it in
+# two stages:
+#  - machine genarated list of pkg objects (built as sample-manifest target)
+#  - human edited part (smaller) which sets the attributes and handles the
+#    exceptions.
+#
+# For the moment We also keep the original Samba 3.6 to provide transition path
+# to Samba4. To separate Samba 3 and 4 files we keep them in two included
+# files.
+#
+# "samba.proto-objects"-file is created using the command:
+#   gmake sample-manifest METADATA_TEMPLATE=
+# as a "sample-manifest"-file (in build/ dir) and is pkgfmt clean
+# (because there is no template header placed on beginning of file)
+# All individual actions and attribute settings on pkg objects should
+# be performed by "<transform ...> (pkgmogrify) actions.
+<include samba.proto-objects>
+# "samba36.proto-objects"-file is created using the commands:
+#   cd samba36/
+#   gmake sample-manifest SAMBA36VER=3.6.25 METADATA_TEMPLATE=
+# ...where sample-manifest"-file is created in ./samba36/build/ dir.
+<include samba36.proto-objects>
+
+# SMF services import (for .xml manifests)
+<transform file path=lib/svc/manifest/.+\.xml -> default restart_fmri svc:/system/manifest-import:default >
+
+# pkg attributes
 set name=pkg.fmri \
     value=pkg:/service/network/samba@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="samba - A Windows SMB/CIFS fileserver for UNIX"
-set name=com.oracle.info.description value="Samba, a SMB/CIFS fileserver"
-set name=com.oracle.info.tpno value=$(TPNO)
+# In case of Samba 3.6 decomission uncomment com.oracle.info lines here
+# and change the license record on the end of this file
+# set name=com.oracle.info.description value="Samba, a SMB/CIFS fileserver"
+# set name=com.oracle.info.tpno value=$(TPNO)
 set name=info.classification \
     value="org.opensolaris.category.2008:System/File System"
 set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2009/682
+set name=org.opensolaris.arc-caseid value=PSARC/2015/008
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 
+# pam.conf is now modularized using /etc/pam.d/ which is fine for adding of PAM-using services
+# ...but add of new pam_-backend will need further fix.
+# pam.conf-winbind is now obsoleted:
+#file Solaris/pam.conf-winbind     path=etc/pam.d/
+
+# samba confdir
+dir  path=etc/samba/private mode=500
+file examples/smb.conf.default path=etc/samba/smb.conf.default
+
+# service manifests to install
+file Solaris/samba.xml path=lib/svc/manifest/network/samba.xml
+file Solaris/winbind.xml path=lib/svc/manifest/network/winbind.xml
+file Solaris/wins.xml path=lib/svc/manifest/network/wins.xml
+# service method
+file Solaris/samba.sh path=lib/svc/method/samba
+
 #
-file Solaris/pam.conf-winbind path=etc/pam.conf-winbind
-dir  path=etc/samba/private mode=500
-file path=etc/samba/smb.conf-example
-file Solaris/samba.xml path=lib/svc/manifest/network/samba.xml \
-    restart_fmri=svc:/system/manifest-import:default
-file Solaris/swat.xml path=lib/svc/manifest/network/swat.xml \
-    restart_fmri=svc:/system/manifest-import:default
-file Solaris/winbind.xml path=lib/svc/manifest/network/winbind.xml \
-    restart_fmri=svc:/system/manifest-import:default
-file Solaris/wins.xml path=lib/svc/manifest/network/wins.xml \
-    restart_fmri=svc:/system/manifest-import:default
-file Solaris/samba.sh path=lib/svc/method/samba
-file path=usr/bin/eventlogadm
-file path=usr/bin/findsmb
-file path=usr/bin/net
-file path=usr/bin/nmblookup
-file path=usr/bin/ntlm_auth
-file path=usr/bin/pdbedit
-file path=usr/bin/rpcclient
-file path=usr/bin/sharesec
-file path=usr/bin/smbcacls
-file path=usr/bin/smbclient
-file path=usr/bin/smbcontrol
-file path=usr/bin/smbcquotas
-file path=usr/bin/smbget
-file path=usr/bin/smbpasswd
-file usr/bin/profiles path=usr/bin/smbprofiles
-file path=usr/bin/smbspool
-file path=usr/bin/smbstatus
-file path=usr/bin/smbta-util
-file path=usr/bin/smbtar
-file path=usr/bin/smbtree
-file path=usr/bin/tdbbackup
-file path=usr/bin/tdbdump
-file path=usr/bin/tdbrestore
-file path=usr/bin/tdbtool
-file path=usr/bin/testparm
-file path=usr/bin/wbinfo
-# Align Samba includes to usr/include/samba/
-file usr/include/libsmbclient.h path=usr/include/samba/libsmbclient.h
-file usr/include/netapi.h path=usr/include/samba/netapi.h
-file usr/include/smb_share_modes.h path=usr/include/samba/smb_share_modes.h
-file usr/include/talloc.h path=usr/include/samba/talloc.h
-file usr/include/tdb.h path=usr/include/samba/tdb.h
-file usr/include/tevent.h path=usr/include/samba/tevent.h
-file usr/include/tevent_internal.h path=usr/include/samba/tevent_internal.h
-file usr/include/wbclient.h path=usr/include/samba/wbclient.h
-link path=usr/lib/$(MACH64)/nss_winbind.so target=nss_winbind.so.1
-file build/$(MACH64)/nsswitch/libnss_winbind.so \
-    path=usr/lib/$(MACH64)/nss_winbind.so.1
-link path=usr/lib/$(MACH64)/nss_wins.so target=nss_wins.so.1
-file build/$(MACH64)/nsswitch/libnss_wins.so \
-    path=usr/lib/$(MACH64)/nss_wins.so.1
-#
-# NSS - modules
-link path=usr/lib/nss_winbind.so target=nss_winbind.so.1
-# nsswitch modules
-file build/$(MACH32)/nsswitch/libnss_winbind.so path=usr/lib/nss_winbind.so.1
-link path=usr/lib/nss_wins.so target=nss_wins.so.1
-file build/$(MACH32)/nsswitch/libnss_wins.so path=usr/lib/nss_wins.so.1
-link path=usr/lib/samba/$(MACH64)/libtalloc.so target=libtalloc.so.2
-link path=usr/lib/samba/$(MACH64)/libtalloc.so.1 target=libtalloc.so.2
-file build/$(MACH64)/source3/bin/libtalloc.so.2 \
-    path=usr/lib/samba/$(MACH64)/libtalloc.so.2
-link path=usr/lib/samba/$(MACH64)/libtdb.so target=libtdb.so.1
-file build/$(MACH64)/source3/bin/libtdb.so.1 \
-    path=usr/lib/samba/$(MACH64)/libtdb.so.1
-link path=usr/lib/samba/$(MACH64)/libtevent.so target=libtevent.so.0
-link path=usr/lib/samba/$(MACH64)/libtevent.so.0 target=libtevent.so.0.9.11
-file build/$(MACH64)/source3/bin/libtevent.so.0.9.11 \
-    path=usr/lib/samba/$(MACH64)/libtevent.so.0.9.11
-link path=usr/lib/samba/$(MACH64)/libwbclient.so target=libwbclient.so.0
-file build/$(MACH64)/source3/bin/libwbclient.so.0 \
-    path=usr/lib/samba/$(MACH64)/libwbclient.so.0
-# Samba internal modules and libs
-file path=usr/lib/samba/auth/script.so
-file path=usr/lib/samba/charset/CP437.so
-file path=usr/lib/samba/charset/CP850.so
-file path=usr/lib/samba/de.msg
-file path=usr/lib/samba/en.msg
-file path=usr/lib/samba/fi.msg
-file path=usr/lib/samba/fr.msg
-file path=usr/lib/samba/idmap/ad.so
-file path=usr/lib/samba/idmap/adex.so
-file path=usr/lib/samba/idmap/autorid.so
-file path=usr/lib/samba/idmap/hash.so
-file path=usr/lib/samba/idmap/ldap.so
-file path=usr/lib/samba/idmap/rid.so
-file path=usr/lib/samba/idmap/tdb2.so
-file path=usr/lib/samba/it.msg
-file path=usr/lib/samba/ja.msg
+# bin (mediated links)
+# Samba CLI (available on standard path) is now frozen (reduced) to original
+# Samba 3.6 command-set to be able to handle thwse mediated links by a more
+# programmatical way.
+# (note) commented links documents the difference between the Samba 3.6 and
+# Samba4 CLI. If the Samba4 utility is needed it should be called from its
+# /usr/lib/samba/bin ...path.
 #
-link path=usr/lib/samba/libnetapi.so target=libnetapi.so.0
-file path=usr/lib/samba/libnetapi.so.0
-link path=usr/lib/samba/libsmbclient.so target=libsmbclient.so.0
-file path=usr/lib/samba/libsmbclient.so.0
-link path=usr/lib/samba/libsmbsharemodes.so target=libsmbsharemodes.so.0
-file path=usr/lib/samba/libsmbsharemodes.so.0
-link path=usr/lib/samba/libtalloc.so target=libtalloc.so.2
-link path=usr/lib/samba/libtalloc.so.2 target=libtalloc.so.2.0.5
-file path=usr/lib/samba/libtalloc.so.2.0.5
-link path=usr/lib/samba/libtdb.so target=libtdb.so.1
-link path=usr/lib/samba/libtdb.so.1 target=libtdb.so.1.2.9
-file path=usr/lib/samba/libtdb.so.1.2.9
-link path=usr/lib/samba/libtevent.so target=libtevent.so.0
-link path=usr/lib/samba/libtevent.so.0 target=libtevent.so.0.9.11
-file path=usr/lib/samba/libtevent.so.0.9.11
-link path=usr/lib/samba/libwbclient.so target=libwbclient.so.0
-file path=usr/lib/samba/libwbclient.so.0
-file path=usr/lib/samba/lowcase.dat
-file path=usr/lib/samba/nl.msg
-link path=usr/lib/samba/nss_info/adex.so target=../idmap/adex.so
-link path=usr/lib/samba/nss_info/hash.so target=../idmap/hash.so
-link path=usr/lib/samba/nss_info/rfc2307.so target=../idmap/ad.so
-link path=usr/lib/samba/nss_info/sfu.so target=../idmap/ad.so
-link path=usr/lib/samba/nss_info/sfu20.so target=../idmap/ad.so
-file path=usr/lib/samba/pl.msg
-file path=usr/lib/samba/ru.msg
-file build/$(MACH32)/source3/bin/smbtorture path=usr/lib/samba/smbtorture \
-    mode=0555
-file path=usr/lib/samba/tr.msg
-file path=usr/lib/samba/upcase.dat
-file path=usr/lib/samba/valid.dat
-file path=usr/lib/samba/vfs/acl_tdb.so
-file path=usr/lib/samba/vfs/acl_xattr.so
-file path=usr/lib/samba/vfs/aio_pthread.so
-file path=usr/lib/samba/vfs/audit.so
-file path=usr/lib/samba/vfs/cacheprime.so
-file path=usr/lib/samba/vfs/cap.so
-file path=usr/lib/samba/vfs/catia.so
-file path=usr/lib/samba/vfs/commit.so
-file path=usr/lib/samba/vfs/crossrename.so
-file path=usr/lib/samba/vfs/default_quota.so
-file path=usr/lib/samba/vfs/dirsort.so
-file path=usr/lib/samba/vfs/expand_msdfs.so
-file path=usr/lib/samba/vfs/extd_audit.so
-file path=usr/lib/samba/vfs/fake_perms.so
-file path=usr/lib/samba/vfs/full_audit.so
-file path=usr/lib/samba/vfs/netatalk.so
-file path=usr/lib/samba/vfs/notify_fam.so
-file path=usr/lib/samba/vfs/prealloc.so
-file path=usr/lib/samba/vfs/preopen.so
-file path=usr/lib/samba/vfs/readahead.so
-file path=usr/lib/samba/vfs/readonly.so
-file path=usr/lib/samba/vfs/recycle.so
-file path=usr/lib/samba/vfs/samfs.so pkg.depend.bypass-generate=.* \
-    pkg.linted.userland.action001.3=true
-file path=usr/lib/samba/vfs/scannedonly.so
-file path=usr/lib/samba/vfs/shadow_copy.so
-file path=usr/lib/samba/vfs/shadow_copy2.so
-file path=usr/lib/samba/vfs/smb_traffic_analyzer.so
-file path=usr/lib/samba/vfs/streams_depot.so
-file path=usr/lib/samba/vfs/streams_xattr.so
-file path=usr/lib/samba/vfs/syncops.so
-file path=usr/lib/samba/vfs/time_audit.so
-file path=usr/lib/samba/vfs/worm.so
-file path=usr/lib/samba/vfs/xattr_tdb.so
-file path=usr/lib/samba/vfs/zfsacl.so
-link path=usr/lib/security/$(MACH64)/pam_smbpass.so target=pam_smbpass.so.1
-file usr/lib/samba/$(MACH64)/security/pam_smbpass.so \
-    path=usr/lib/security/$(MACH64)/pam_smbpass.so.1
-link path=usr/lib/security/$(MACH64)/pam_winbind.so target=pam_winbind.so.1
-file usr/lib/samba/$(MACH64)/security/pam_winbind.so \
-    path=usr/lib/security/$(MACH64)/pam_winbind.so.1
-# PAM
-link path=usr/lib/security/pam_smbpass.so target=pam_smbpass.so.1
-# PAM modules
-file usr/lib/samba/security/pam_smbpass.so \
-    path=usr/lib/security/pam_smbpass.so.1
-link path=usr/lib/security/pam_winbind.so target=pam_winbind.so.1
-file usr/lib/samba/security/pam_winbind.so \
-    path=usr/lib/security/pam_winbind.so.1
+#link path=usr/bin/cifsdd target=../lib/samba/bin/cifsdd target
+#link path=usr/bin/dbwrap_tool target=../lib/samba/bin/dbwrap_tool
+link path=usr/bin/eventlogadm target=../lib/samba/bin/eventlogadm
+link path=usr/bin/eventlogadm target=../lib/samba/samba36/bin/eventlogadm
+#link path=usr/bin/gentest target=../lib/samba/bin/gentest
+#link path=usr/bin/ldbadd target=../lib/samba/bin/ldbadd
+#link path=usr/bin/ldbdel target=../lib/samba/bin/ldbdel
+#link path=usr/bin/ldbedit target=../lib/samba/bin/ldbedit
+#link path=usr/bin/ldbmodify target=../lib/samba/bin/ldbmodify
+#link path=usr/bin/ldbrename target=../lib/samba/bin/ldbrename
+#link path=usr/bin/ldbsearch target=../lib/samba/bin/ldbsearch
+#link path=usr/bin/locktest target=../lib/samba/bin/locktest
+#link path=usr/bin/masktest target=../lib/samba/bin/masktest
+#link path=usr/bin/ndrdump target=../lib/samba/bin/ndrdump
+link path=usr/bin/net target=../lib/samba/bin/net
+link path=usr/bin/net target=../lib/samba/samba36/bin/net
+link path=usr/bin/nmblookup target=../lib/samba/bin/nmblookup
+link path=usr/bin/nmblookup target=../lib/samba/samba36/bin/nmblookup
+#link path=usr/bin/nmblookup4 target=../lib/samba/bin/nmblookup4
+#link path=usr/bin/ntdbbackup target=../lib/samba/bin/ntdbbackup
+#link path=usr/bin/ntdbdump target=../lib/samba/bin/ntdbdump
+#link path=usr/bin/ntdbrestore target=../lib/samba/bin/ntdbrestore
+#link path=usr/bin/ntdbtool target=../lib/samba/bin/ntdbtool
+link path=usr/bin/ntlm_auth target=../lib/samba/bin/ntlm_auth
+link path=usr/bin/ntlm_auth target=../lib/samba/samba36/bin/ntlm_auth
+#link path=usr/bin/oLschema2ldif target=../lib/samba/bin/oLschema2ldif
+link path=usr/bin/pdbedit target=../lib/samba/bin/pdbedit
+link path=usr/bin/pdbedit target=../lib/samba/samba36/bin/pdbedit
+#link path=usr/bin/pidl target=../lib/samba/bin/pidl
+#link path=usr/bin/regdiff target=../lib/samba/bin/regdiff
+#link path=usr/bin/regpatch target=../lib/samba/bin/regpatch
+#link path=usr/bin/regshell target=../lib/samba/bin/regshell
+#link path=usr/bin/regtree target=../lib/samba/bin/regtree
+link path=usr/bin/rpcclient target=../lib/samba/bin/rpcclient
+link path=usr/bin/rpcclient target=../lib/samba/samba36/bin/rpcclient
+link path=usr/bin/sharesec target=../lib/samba/bin/sharesec
+link path=usr/bin/sharesec target=../lib/samba/samba36/bin/sharesec
+link path=usr/bin/smbcacls target=../lib/samba/bin/smbcacls
+link path=usr/bin/smbcacls target=../lib/samba/samba36/bin/smbcacls
+link path=usr/bin/smbclient target=../lib/samba/bin/smbclient
+link path=usr/bin/smbclient target=../lib/samba/samba36/bin/smbclient
+link path=usr/bin/smbcontrol target=../lib/samba/bin/smbcontrol
+link path=usr/bin/smbcontrol target=../lib/samba/samba36/bin/smbcontrol
+link path=usr/bin/smbcquotas target=../lib/samba/bin/smbcquotas
+link path=usr/bin/smbcquotas target=../lib/samba/samba36/bin/smbcquotas
+link path=usr/bin/smbget target=../lib/samba/bin/smbget
+link path=usr/bin/smbget target=../lib/samba/samba36/bin/smbget
+link path=usr/bin/smbpasswd target=../lib/samba/bin/smbpasswd
+link path=usr/bin/smbpasswd target=../lib/samba/samba36/bin/smbpasswd
+link path=usr/bin/smbprofiles target=../lib/samba/bin/profiles
+link path=usr/bin/smbprofiles target=../lib/samba/samba36/bin/profiles
+link path=usr/bin/smbspool target=../lib/samba/bin/smbspool
+link path=usr/bin/smbspool target=../lib/samba/samba36/bin/smbspool
+link path=usr/bin/smbstatus target=../lib/samba/bin/smbstatus
+link path=usr/bin/smbstatus target=../lib/samba/samba36/bin/smbstatus
+link path=usr/bin/smbta-util target=../lib/samba/bin/smbta-util
+link path=usr/bin/smbta-util target=../lib/samba/samba36/bin/smbta-util
+link path=usr/bin/smbtar target=../lib/samba/bin/smbtar
+link path=usr/bin/smbtar target=../lib/samba/samba36/bin/smbtar
+link path=usr/bin/smbtorture target=../lib/samba/bin/smbtorture
+link path=usr/bin/smbtree target=../lib/samba/bin/smbtree
+link path=usr/bin/smbtree target=../lib/samba/samba36/bin/smbtree
+link path=usr/bin/tdbbackup target=../lib/samba/bin/tdbbackup
+link path=usr/bin/tdbbackup target=../lib/samba/samba36/bin/tdbbackup
+link path=usr/bin/tdbdump target=../lib/samba/bin/tdbdump
+link path=usr/bin/tdbdump target=../lib/samba/samba36/bin/tdbdump
+link path=usr/bin/tdbrestore target=../lib/samba/bin/tdbrestore
+link path=usr/bin/tdbrestore target=../lib/samba/samba36/bin/tdbrestore
+link path=usr/bin/tdbtool target=../lib/samba/bin/tdbtool
+link path=usr/bin/tdbtool target=../lib/samba/samba36/bin/tdbtool
+link path=usr/bin/testparm target=../lib/samba/bin/testparm
+link path=usr/bin/testparm target=../lib/samba/samba36/bin/testparm
+link path=usr/bin/wbinfo target=../lib/samba/bin/wbinfo
+link path=usr/bin/wbinfo target=../lib/samba/samba36/bin/wbinfo
+
 #
-file path=usr/sbin/nmbd
-file path=usr/sbin/smbd
-file path=usr/sbin/swat
-file path=usr/sbin/winbindd
+# nss_libs
+link path=usr/lib/$(MACH64)/nss_winbind.so.1 \
+    target=../samba/$(MACH64)/nss_winbind.so.1
+link path=usr/lib/$(MACH64)/nss_winbind.so.1 \
+    target=../samba/samba36/lib/$(MACH64)/nss_winbind.so
+link path=usr/lib/nss_winbind.so.1 target=./samba/nss_winbind.so.1
+link path=usr/lib/nss_winbind.so.1 target=./samba/samba36/lib/nss_winbind.so
+
+# Private API libgssapi_krb5.so.1 is not yet available in lint cache.
+# Drop-In project will fix it
+file path=usr/lib/samba/$(MACH64)/libgssapi_krb5.so
+file path=usr/lib/samba/libgssapi_krb5.so
+
+#
+# nss_libs files Samba 3.x do not deliver it by gmake install
+# note: nss_wins.so is discontinued in Samba4
+file samba36/build/$(MACH64)/nsswitch/libnss_winbind.so \
+    path=usr/lib/samba/samba36/lib/$(MACH64)/nss_winbind.so
+file samba36/build/$(MACH64)/nsswitch/libnss_wins.so \
+    path=usr/lib/samba/samba36/lib/$(MACH64)/nss_wins.so
+file samba36/build/$(MACH32)/nsswitch/libnss_winbind.so \
+    path=usr/lib/samba/samba36/lib/nss_winbind.so
+file samba36/build/$(MACH32)/nsswitch/libnss_wins.so \
+    path=usr/lib/samba/samba36/lib/nss_wins.so
+
 #
-# usr/share - is takem from Sample manifest
-file path=usr/share/locale/ar/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/cs/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/da/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/de/LC_MESSAGES/net.mo
-file path=usr/share/locale/de/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/es/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/fi/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/fr/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/hu/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/it/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/ja/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/ko/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/nb/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/nl/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/pl/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/pt_BR/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/ru/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/sv/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/zh_CN/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/locale/zh_TW/LC_MESSAGES/pam_winbind.mo
-file path=usr/share/man/man1/findsmb.1
-file path=usr/share/man/man1/log2pcap.1
-file path=usr/share/man/man1/nmblookup.1
-file path=usr/share/man/man1/ntlm_auth.1
-file path=usr/share/man/man1/rpcclient.1
-file path=usr/share/man/man1/sharesec.1
-file path=usr/share/man/man1/smbcacls.1
-file path=usr/share/man/man1/smbclient.1
-file path=usr/share/man/man1/smbcontrol.1
-file path=usr/share/man/man1/smbcquotas.1
-file path=usr/share/man/man1/smbget.1
+# PAM-libs
+link path=usr/lib/security/$(MACH64)/pam_smbpass.so \
+    target=../../samba/$(MACH64)/pam_smbpass.so
+link path=usr/lib/security/$(MACH64)/pam_smbpass.so \
+    target=../../samba/samba36/lib/$(MACH64)/security/pam_smbpass.so
+link path=usr/lib/security/$(MACH64)/pam_smbpass.so.1 \
+    target=../../samba/$(MACH64)/pam_smbpass.so
+link path=usr/lib/security/$(MACH64)/pam_smbpass.so.1 \
+    target=../../samba/samba36/lib/$(MACH64)/security/pam_smbpass.so
+link path=usr/lib/security/$(MACH64)/pam_winbind.so \
+    target=../../samba/$(MACH64)/pam_winbind.so
+link path=usr/lib/security/$(MACH64)/pam_winbind.so \
+    target=../../samba/samba36/lib/$(MACH64)/security/pam_winbind.so
+link path=usr/lib/security/$(MACH64)/pam_winbind.so.1 \
+    target=../../samba/$(MACH64)/pam_winbind.so
+link path=usr/lib/security/$(MACH64)/pam_winbind.so.1 \
+    target=../../samba/samba36/lib/$(MACH64)/security/pam_winbind.so
+link path=usr/lib/security/pam_smbpass.so \
+    target=../samba/samba36/lib/security/pam_smbpass.so
+link path=usr/lib/security/pam_smbpass.so \
+    target=../samba/security/pam_smbpass.so
+link path=usr/lib/security/pam_smbpass.so.1 \
+    target=../samba/samba36/lib/security/pam_smbpass.so
+link path=usr/lib/security/pam_smbpass.so.1 \
+    target=../samba/security/pam_smbpass.so
+link path=usr/lib/security/pam_winbind.so \
+    target=../samba/samba36/lib/security/pam_winbind.so
+link path=usr/lib/security/pam_winbind.so \
+    target=../samba/security/pam_winbind.so
+link path=usr/lib/security/pam_winbind.so.1 \
+    target=../samba/samba36/lib/security/pam_winbind.so
+link path=usr/lib/security/pam_winbind.so.1 \
+    target=../samba/security/pam_winbind.so
+
+#
+# sbin
+# (note) SWAT is definitivelly gone in Samba4.
+link path=usr/sbin/nmbd target=../lib/samba/samba36/sbin/nmbd
+link path=usr/sbin/nmbd target=../lib/samba/sbin/nmbd
+link path=usr/sbin/smbd target=../lib/samba/samba36/sbin/smbd
+link path=usr/sbin/smbd target=../lib/samba/sbin/smbd
+link path=usr/sbin/winbindd target=../lib/samba/samba36/sbin/winbindd
+link path=usr/sbin/winbindd target=../lib/samba/sbin/winbindd
+
+#
+# smbprofiles
 file usr/share/man/man1/profiles.1 path=usr/share/man/man1/smbprofiles.1
-file path=usr/share/man/man1/smbstatus.1
-file path=usr/share/man/man1/smbtar.1
-file path=usr/share/man/man1/smbtree.1
-file path=usr/share/man/man1/testparm.1
-file path=usr/share/man/man1/vfstest.1
-file path=usr/share/man/man1/wbinfo.1
-file path=usr/share/man/man5/lmhosts.5
-file path=usr/share/man/man5/pam_winbind.conf.5
-file path=usr/share/man/man5/smb.conf.5
-file path=usr/share/man/man5/smbgetrc.5
-file path=usr/share/man/man5/smbpasswd.5
-file path=usr/share/man/man7/libsmbclient.7
-file path=usr/share/man/man7/samba.7
-file path=usr/share/man/man7/winbind_krb5_locator.7
-file path=usr/share/man/man8/eventlogadm.8
-file path=usr/share/man/man8/idmap_ad.8
-file path=usr/share/man/man8/idmap_adex.8
-file path=usr/share/man/man8/idmap_autorid.8
-file path=usr/share/man/man8/idmap_hash.8
-file path=usr/share/man/man8/idmap_ldap.8
-file path=usr/share/man/man8/idmap_nss.8
-file path=usr/share/man/man8/idmap_rid.8
-file path=usr/share/man/man8/idmap_tdb.8
-file path=usr/share/man/man8/idmap_tdb2.8
-file path=usr/share/man/man8/net.8
-file path=usr/share/man/man8/nmbd.8
-file path=usr/share/man/man8/pam_winbind.8
-file path=usr/share/man/man8/pdbedit.8
-file path=usr/share/man/man8/smbd.8
-file path=usr/share/man/man8/smbpasswd.8
-file path=usr/share/man/man8/smbspool.8
-file path=usr/share/man/man8/smbta-util.8
-file path=usr/share/man/man8/swat.8
-file path=usr/share/man/man8/tdbbackup.8
-file path=usr/share/man/man8/tdbdump.8
-file path=usr/share/man/man8/tdbtool.8
-file path=usr/share/man/man8/vfs_acl_tdb.8
-file path=usr/share/man/man8/vfs_acl_xattr.8
-file path=usr/share/man/man8/vfs_audit.8
-file path=usr/share/man/man8/vfs_cacheprime.8
-file path=usr/share/man/man8/vfs_cap.8
-file path=usr/share/man/man8/vfs_catia.8
-file path=usr/share/man/man8/vfs_commit.8
-file path=usr/share/man/man8/vfs_crossrename.8
-file path=usr/share/man/man8/vfs_default_quota.8
-file path=usr/share/man/man8/vfs_dirsort.8
-file path=usr/share/man/man8/vfs_extd_audit.8
-file path=usr/share/man/man8/vfs_fake_perms.8
-file path=usr/share/man/man8/vfs_fileid.8
-file path=usr/share/man/man8/vfs_full_audit.8
-file path=usr/share/man/man8/vfs_gpfs.8
-file path=usr/share/man/man8/vfs_netatalk.8
-file path=usr/share/man/man8/vfs_notify_fam.8
-file path=usr/share/man/man8/vfs_prealloc.8
-file path=usr/share/man/man8/vfs_preopen.8
-file path=usr/share/man/man8/vfs_readahead.8
-file path=usr/share/man/man8/vfs_readonly.8
-file path=usr/share/man/man8/vfs_recycle.8
-file path=usr/share/man/man8/vfs_scannedonly.8
-file path=usr/share/man/man8/vfs_shadow_copy.8
-file path=usr/share/man/man8/vfs_shadow_copy2.8
-file path=usr/share/man/man8/vfs_smb_traffic_analyzer.8
-file path=usr/share/man/man8/vfs_streams_depot.8
-file path=usr/share/man/man8/vfs_streams_xattr.8
-file path=usr/share/man/man8/vfs_time_audit.8
-file path=usr/share/man/man8/vfs_xattr_tdb.8
-file path=usr/share/man/man8/winbindd.8
-file path=usr/share/samba/swat/help/Samba3-ByExample/Big500users.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/DMSMig.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/DomApps.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/ExNetworks.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/HA.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/RefSection.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/apa.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/appendix.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/ch14.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/go01.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/happy.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/AccountingNetwork.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/Charity-Network.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/Domain-WorkgroupAnnouncement.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/HostAnnouncment.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/LocalMasterAnnouncement.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/NullConnect.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/UNIX-Samba-and-LDAP.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/UserConnect.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/UserMgrNT4.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/WINREPRESSME-Capture2.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-ProtocolStats.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/Windows-ME-WINEPRESSME-Startup-30min-TraceStats.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/WindowsXP-NullConnection.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/WindowsXP-UserConnection.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/XP-screen001.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/acct2net.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP-Ok.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/ch7-dual-additive-LDAP.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/ch7-fail-overLDAP.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/ch7-singleLDAP.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/ch8-migration.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap4-net.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap5-net.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap6-net.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-idresol.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net-A.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net-Ar.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net2-B.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net2-Br.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net2.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-net2r.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap7-netr.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap9-ADSDC.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/chap9-SambaDC.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/imc-usermanager2.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/lam-config.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/lam-group-members.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/lam-groups.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/lam-hosts.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/lam-login.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/lam-users.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/openmag.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp001.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp004.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp006.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp007.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp008.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp010.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp011.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp012.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp013.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/images/wxpp015.png
-file path=usr/share/samba/swat/help/Samba3-ByExample/index.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/ix01.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/kerberos.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/net2000users.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/ntmigration.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/nw4migration.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/pr01.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/pr02.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/pr03.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/preface.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/primer.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/secure.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/simple.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/small.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/unixclients.html
-file path=usr/share/samba/swat/help/Samba3-ByExample/upgrades.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/CodingSuggestions.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/Packaging.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/architecture.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/contributing.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/debug.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/devprinting.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/index.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/internals.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/modules.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/ntdomain.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/parsing.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/pr01.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/pt01.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/pt02.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/pt03.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/pt04.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/pt05.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/pwencrypt.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/rpc-plugin.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/tracing.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/unix-smb.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/vfs.html
-file path=usr/share/samba/swat/help/Samba3-Developers-Guide/wins.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/AccessControls.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/AdvancedNetworkManagement.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/Appendix.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/Backup.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/CUPS-printing.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/ChangeNotes.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/ClientConfig.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/DNSDHCP.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/FastStart.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/InterdomainTrusts.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/IntroSMB.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/NT4Migration.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/NetCommand.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/NetworkBrowsing.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/Other-Clients.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/PolicyMgmt.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/Portability.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/ProfileMgmt.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/SWAT.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/SambaHA.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/ServerType.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/StandAloneServer.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/TOSHpreface.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/VFS.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/apa.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/bugreport.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/cfgsmarts.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/ch-ldap-tls.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/ch47.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/classicalprinting.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/compiling.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/diagnosis.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/domain-member.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/go01.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/groupmapping.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/idmapper.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/10small.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/11small.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/12small.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/13small.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/14small.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/1small.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/2small.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/3small.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/4small.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/5small.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/6small.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/7small.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/8small.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/9small.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME001.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME002.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME003.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME004.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME005.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME006.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME007.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME008.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME009.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME010.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME011.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME012.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME013.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WME014.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP002.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP003.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP005.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP009.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/WXPP014.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/a_small.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/access1.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/browsing1.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/cups1.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/cups2.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/domain.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/ethereal1.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/ethereal2.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-gid2sid.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-groups.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2gid.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-sid2uid.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-store-gid2sid.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/idmap-uid2sid.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/idmap.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/idmap_winbind_no_loop.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/pdftoepsonusb.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/pdftosocket.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/trusts1.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp001.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp002.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp003.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp004.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp005.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/w2kp006.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp001.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp004.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp006.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp007.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp008.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp010.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp011.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp012.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp013.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/images/wxpp015.png
-file path=usr/share/samba/swat/help/Samba3-HOWTO/index.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/install.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/integrate-ms-networks.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/introduction.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/ix01.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/largefile.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/locking.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/migration.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/msdfs.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/optional.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/pam.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/passdb.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/pr01.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/pr02.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/pr03.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/problems.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/rights.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/samba-bdc.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/samba-pdc.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/securing-samba.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/speed.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/tdb.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/troubleshooting.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/type.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/unicode.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/upgrading-to-3.0.html
-file path=usr/share/samba/swat/help/Samba3-HOWTO/winbind.html
-file path=usr/share/samba/swat/help/manpages/eventlogadm.8.html
-file path=usr/share/samba/swat/help/manpages/findsmb.1.html
-file path=usr/share/samba/swat/help/manpages/idmap_ad.8.html
-file path=usr/share/samba/swat/help/manpages/idmap_adex.8.html
-file path=usr/share/samba/swat/help/manpages/idmap_autorid.8.html
-file path=usr/share/samba/swat/help/manpages/idmap_hash.8.html
-file path=usr/share/samba/swat/help/manpages/idmap_ldap.8.html
-file path=usr/share/samba/swat/help/manpages/idmap_nss.8.html
-file path=usr/share/samba/swat/help/manpages/idmap_rid.8.html
-file path=usr/share/samba/swat/help/manpages/idmap_tdb.8.html
-file path=usr/share/samba/swat/help/manpages/idmap_tdb2.8.html
-file path=usr/share/samba/swat/help/manpages/index.html
-file path=usr/share/samba/swat/help/manpages/libsmbclient.7.html
-file path=usr/share/samba/swat/help/manpages/lmhosts.5.html
-file path=usr/share/samba/swat/help/manpages/log2pcap.1.html
-file path=usr/share/samba/swat/help/manpages/net.8.html
-file path=usr/share/samba/swat/help/manpages/nmbd.8.html
-file path=usr/share/samba/swat/help/manpages/nmblookup.1.html
-file path=usr/share/samba/swat/help/manpages/ntlm_auth.1.html
-file path=usr/share/samba/swat/help/manpages/pam_winbind.8.html
-file path=usr/share/samba/swat/help/manpages/pam_winbind.conf.5.html
-file path=usr/share/samba/swat/help/manpages/pdbedit.8.html
-file path=usr/share/samba/swat/help/manpages/profiles.1.html
-file path=usr/share/samba/swat/help/manpages/rpcclient.1.html
-file path=usr/share/samba/swat/help/manpages/samba.7.html
-file path=usr/share/samba/swat/help/manpages/sharesec.1.html
-file path=usr/share/samba/swat/help/manpages/smb.conf.5.html
-file path=usr/share/samba/swat/help/manpages/smbcacls.1.html
-file path=usr/share/samba/swat/help/manpages/smbclient.1.html
-file path=usr/share/samba/swat/help/manpages/smbcontrol.1.html
-file path=usr/share/samba/swat/help/manpages/smbcquotas.1.html
-file path=usr/share/samba/swat/help/manpages/smbd.8.html
-file path=usr/share/samba/swat/help/manpages/smbget.1.html
-file path=usr/share/samba/swat/help/manpages/smbgetrc.5.html
-file path=usr/share/samba/swat/help/manpages/smbpasswd.5.html
-file path=usr/share/samba/swat/help/manpages/smbpasswd.8.html
-file path=usr/share/samba/swat/help/manpages/smbspool.8.html
-file path=usr/share/samba/swat/help/manpages/smbstatus.1.html
-file path=usr/share/samba/swat/help/manpages/smbta-util.8.html
-file path=usr/share/samba/swat/help/manpages/smbtar.1.html
-file path=usr/share/samba/swat/help/manpages/smbtree.1.html
-file path=usr/share/samba/swat/help/manpages/swat.8.html
-file path=usr/share/samba/swat/help/manpages/tdbbackup.8.html
-file path=usr/share/samba/swat/help/manpages/tdbdump.8.html
-file path=usr/share/samba/swat/help/manpages/tdbtool.8.html
-file path=usr/share/samba/swat/help/manpages/testparm.1.html
-file path=usr/share/samba/swat/help/manpages/vfs_acl_tdb.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_acl_xattr.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_aio_pthread.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_audit.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_cacheprime.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_cap.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_catia.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_commit.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_crossrename.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_default_quota.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_dirsort.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_extd_audit.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_fake_perms.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_fileid.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_full_audit.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_gpfs.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_netatalk.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_notify_fam.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_prealloc.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_preopen.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_readahead.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_readonly.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_recycle.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_scannedonly.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_shadow_copy.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_shadow_copy2.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_smb_traffic_analyzer.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_streams_depot.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_streams_xattr.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_time_audit.8.html
-file path=usr/share/samba/swat/help/manpages/vfs_xattr_tdb.8.html
-file path=usr/share/samba/swat/help/manpages/vfstest.1.html
-file path=usr/share/samba/swat/help/manpages/wbinfo.1.html
-file path=usr/share/samba/swat/help/manpages/winbind_krb5_locator.7.html
-file path=usr/share/samba/swat/help/manpages/winbindd.8.html
-file path=usr/share/samba/swat/help/welcome-no-samba-doc.html
-file path=usr/share/samba/swat/help/welcome.html
-file path=usr/share/samba/swat/images/globals.gif
-file path=usr/share/samba/swat/images/home.gif
-file path=usr/share/samba/swat/images/passwd.gif
-file path=usr/share/samba/swat/images/printers.gif
-file path=usr/share/samba/swat/images/samba.gif
-file path=usr/share/samba/swat/images/shares.gif
-file path=usr/share/samba/swat/images/status.gif
-file path=usr/share/samba/swat/images/viewconfig.gif
-file path=usr/share/samba/swat/images/wizard.gif
-file path=usr/share/samba/swat/include/footer.html
-file path=usr/share/samba/swat/include/header.html
-file path=usr/share/samba/swat/lang/ja/help/welcome.html
-file path=usr/share/samba/swat/lang/tr/help/welcome.html
-file path=usr/share/samba/swat/lang/tr/images/globals.gif
-file path=usr/share/samba/swat/lang/tr/images/home.gif
-file path=usr/share/samba/swat/lang/tr/images/passwd.gif
-file path=usr/share/samba/swat/lang/tr/images/printers.gif
-file path=usr/share/samba/swat/lang/tr/images/samba.gif
-file path=usr/share/samba/swat/lang/tr/images/shares.gif
-file path=usr/share/samba/swat/lang/tr/images/status.gif
-file path=usr/share/samba/swat/lang/tr/images/viewconfig.gif
+
+#
+# dirs not created by install
+dir  path=var/samba/com
 dir  path=var/samba/locks
 dir  path=var/samba/log
 dir  path=var/spool/samba mode=1777
+
+#
 legacy pkg=SUNWsmbar \
     desc="samba - A Windows SMB/CIFS fileserver for UNIX (Root)" \
     name="samba - A Windows SMB/CIFS fileserver for UNIX (Root)"
 legacy pkg=SUNWsmbau \
     desc="samba - A Windows SMB/CIFS fileserver for UNIX (Usr)" \
     name="samba - A Windows SMB/CIFS fileserver for UNIX (Usr)"
-license samba-license license=GPLv3
+
+# in case of Samba 3.6 decomission remove all the lines following the next line
+#  ...and uncomment the TPNO section in pkg-head (above)
+license samba.license license=GPLv3 \
+    com.oracle.info.description="Samba, a SMB/CIFS fileserver" \
+    com.oracle.info.name=samba com.oracle.info.tpno=$(TPNO_SAMBA4) \
+    com.oracle.info.version=$(COMPONENT_VERSION)
+license samba36.license license=GPLv3 \
+    com.oracle.info.description="Samba, a SMB/CIFS fileserver (deprecated)" \
+    com.oracle.info.name=samba36 com.oracle.info.tpno=$(TPNO_SAMBA36) \
+    com.oracle.info.version=$(SAMBA36VERSION)
+
+# dependency can be removed later (after initial push)
+depend type=require fmri=library/samba/libsmbclient
 
 # Samba can be used in Asian multibyte language envs. so we need this
 depend type=require fmri=pkg:/system/library/iconv
upstream/oracle/userland-gate