ports/opt (3.3): [notify] samba: update to 4.6.6

crux at crux.nu crux at crux.nu
Wed Aug 2 14:43:24 UTC 2017


commit d48a7ee35a0473fdf924721a834defb0c1d3ee40
Author: Juergen Daubert <jue at jue.li>
Date:   Wed Aug 2 16:35:28 2017 +0200

    [notify] samba: update to 4.6.6
    
    - Security fix for CVE-11103, see
      https://www.samba.org/samba/history/samba-4.6.6.html
    - fix building with multiple jobs, FS#1446
    - reduced dependencies

diff --git a/samba/.footprint b/samba/.footprint
index 02e381477..28083e884 100644
--- a/samba/.footprint
+++ b/samba/.footprint
@@ -1,9 +1,6 @@
 drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/rc.d/
--rwxr-xr-x	root/root	etc/rc.d/nmbd
 -rwxr-xr-x	root/root	etc/rc.d/samba
--rwxr-xr-x	root/root	etc/rc.d/smbd
--rwxr-xr-x	root/root	etc/rc.d/winbindd
 drwxr-xr-x	root/root	etc/revdep.d/
 -rw-r--r--	root/root	etc/revdep.d/samba
 drwxr-xr-x	root/root	etc/samba/
@@ -16,6 +13,12 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/eventlogadm
 -rwxr-xr-x	root/root	usr/bin/findsmb
 -rwxr-xr-x	root/root	usr/bin/gentest
+-rwxr-xr-x	root/root	usr/bin/ldbadd
+-rwxr-xr-x	root/root	usr/bin/ldbdel
+-rwxr-xr-x	root/root	usr/bin/ldbedit
+-rwxr-xr-x	root/root	usr/bin/ldbmodify
+-rwxr-xr-x	root/root	usr/bin/ldbrename
+-rwxr-xr-x	root/root	usr/bin/ldbsearch
 -rwxr-xr-x	root/root	usr/bin/locktest
 -rwxr-xr-x	root/root	usr/bin/masktest
 -rwxr-xr-x	root/root	usr/bin/mvxattr
@@ -25,7 +28,6 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ntlm_auth
 -rwxr-xr-x	root/root	usr/bin/oLschema2ldif
 -rwxr-xr-x	root/root	usr/bin/pdbedit
--rwxr-xr-x	root/root	usr/bin/pidl
 -rwxr-xr-x	root/root	usr/bin/profiles
 -rwxr-xr-x	root/root	usr/bin/regdiff
 -rwxr-xr-x	root/root	usr/bin/regpatch
@@ -33,7 +35,6 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/regtree
 -rwxr-xr-x	root/root	usr/bin/rpcclient
 -rwxr-xr-x	root/root	usr/bin/samba-regedit
--rwxr-xr-x	root/root	usr/bin/samba-tool
 -rwxr-xr-x	root/root	usr/bin/sharesec
 -rwxr-xr-x	root/root	usr/bin/smbcacls
 -rwxr-xr-x	root/root	usr/bin/smbclient
@@ -59,7 +60,6 @@ drwxr-xr-x	root/root	usr/include/samba-4.0/core/
 -rw-r--r--	root/root	usr/include/samba-4.0/core/werror.h
 -rw-r--r--	root/root	usr/include/samba-4.0/credentials.h
 -rw-r--r--	root/root	usr/include/samba-4.0/dcerpc.h
--rw-r--r--	root/root	usr/include/samba-4.0/dcerpc_server.h
 -rw-r--r--	root/root	usr/include/samba-4.0/domain_credentials.h
 drwxr-xr-x	root/root	usr/include/samba-4.0/gen_ndr/
 -rw-r--r--	root/root	usr/include/samba-4.0/gen_ndr/atsvc.h
@@ -109,9 +109,7 @@ drwxr-xr-x	root/root	usr/include/samba-4.0/samba/
 -rw-r--r--	root/root	usr/include/samba-4.0/samba/version.h
 -rw-r--r--	root/root	usr/include/samba-4.0/share.h
 -rw-r--r--	root/root	usr/include/samba-4.0/smb2_lease_struct.h
--rw-r--r--	root/root	usr/include/samba-4.0/smb_ldap.h
 -rw-r--r--	root/root	usr/include/samba-4.0/smbconf.h
--rw-r--r--	root/root	usr/include/samba-4.0/smbldap.h
 -rw-r--r--	root/root	usr/include/samba-4.0/tdr.h
 -rw-r--r--	root/root	usr/include/samba-4.0/tsocket.h
 -rw-r--r--	root/root	usr/include/samba-4.0/tsocket_internal.h
@@ -144,9 +142,6 @@ lrwxrwxrwx	root/root	usr/lib/libdcerpc-binding.so.0 -> libdcerpc-binding.so.0.0.
 lrwxrwxrwx	root/root	usr/lib/libdcerpc-samr.so -> libdcerpc-samr.so.0.0.1
 lrwxrwxrwx	root/root	usr/lib/libdcerpc-samr.so.0 -> libdcerpc-samr.so.0.0.1
 -rwxr-xr-x	root/root	usr/lib/libdcerpc-samr.so.0.0.1
-lrwxrwxrwx	root/root	usr/lib/libdcerpc-server.so -> libdcerpc-server.so.0.0.1
-lrwxrwxrwx	root/root	usr/lib/libdcerpc-server.so.0 -> libdcerpc-server.so.0.0.1
--rwxr-xr-x	root/root	usr/lib/libdcerpc-server.so.0.0.1
 lrwxrwxrwx	root/root	usr/lib/libdcerpc.so -> libdcerpc.so.0.0.1
 lrwxrwxrwx	root/root	usr/lib/libdcerpc.so.0 -> libdcerpc.so.0.0.1
 -rwxr-xr-x	root/root	usr/lib/libdcerpc.so.0.0.1
@@ -193,53 +188,15 @@ lrwxrwxrwx	root/root	usr/lib/libsmbclient.so.0 -> libsmbclient.so.0.2.3
 -rwxr-xr-x	root/root	usr/lib/libsmbclient.so.0.2.3
 lrwxrwxrwx	root/root	usr/lib/libsmbconf.so -> libsmbconf.so.0
 -rwxr-xr-x	root/root	usr/lib/libsmbconf.so.0
-lrwxrwxrwx	root/root	usr/lib/libsmbldap.so -> libsmbldap.so.0
--rwxr-xr-x	root/root	usr/lib/libsmbldap.so.0
 lrwxrwxrwx	root/root	usr/lib/libtevent-util.so -> libtevent-util.so.0.0.1
 lrwxrwxrwx	root/root	usr/lib/libtevent-util.so.0 -> libtevent-util.so.0.0.1
 -rwxr-xr-x	root/root	usr/lib/libtevent-util.so.0.0.1
 lrwxrwxrwx	root/root	usr/lib/libwbclient.so -> libwbclient.so.0.13
 lrwxrwxrwx	root/root	usr/lib/libwbclient.so.0 -> libwbclient.so.0.13
 -rwxr-xr-x	root/root	usr/lib/libwbclient.so.0.13
-drwxr-xr-x	root/root	usr/lib/perl5/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/Parse/
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl.pm
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/CUtil.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Compat.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Dump.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Expr.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/IDL.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/NDR.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/ODL.pm
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba3/
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba3/ClientNDR.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba3/ServerNDR.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba4.pm
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba4/
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba4/COM/
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba4/COM/Header.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba4/COM/Proxy.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba4/COM/Stub.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba4/Header.pm
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba4/NDR/
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba4/NDR/Client.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba4/NDR/Parser.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba4/NDR/Server.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba4/Python.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba4/TDR.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Samba4/Template.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Typelist.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Util.pm
-drwxr-xr-x	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Wireshark/
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Wireshark/Conformance.pm
--rw-r--r--	root/root	usr/lib/perl5/site_perl/5.24/Parse/Pidl/Wireshark/NDR.pm
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/dcerpc.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/dcerpc_samr.pc
--rw-r--r--	root/root	usr/lib/pkgconfig/dcerpc_server.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/ndr.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/ndr_krb5pac.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/ndr_nbt.pc
@@ -254,6 +211,8 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/wbclient.pc
 drwxr-xr-x	root/root	usr/lib/python2.7/
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/
+-rw-r--r--	root/root	usr/lib/python2.7/site-packages/_ldb_text.py
+-rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/ldb.so
 drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/samba/
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/samba/__init__.py
 -rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/samba/_glue.so
@@ -298,7 +257,6 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/samba/dcerpc/
 -rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/samba/dcerpc/winreg.so
 -rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/samba/dcerpc/wkssvc.so
 -rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/samba/dcerpc/xattr.so
--rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/samba/dckeytab.so
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/samba/descriptor.py
 -rw-r--r--	root/root	usr/lib/python2.7/site-packages/samba/drs_utils.py
 -rwxr-xr-x	root/root	usr/lib/python2.7/site-packages/samba/dsdb.so
@@ -550,68 +508,24 @@ drwxr-xr-x	root/root	usr/lib/python2.7/site-packages/samba/web_server/
 drwxr-xr-x	root/root	usr/lib/samba/
 drwxr-xr-x	root/root	usr/lib/samba/auth/
 -rwxr-xr-x	root/root	usr/lib/samba/auth/script.so
-drwxr-xr-x	root/root	usr/lib/samba/bind9/
--rwxr-xr-x	root/root	usr/lib/samba/bind9/dlz_bind9.so
--rwxr-xr-x	root/root	usr/lib/samba/bind9/dlz_bind9_10.so
--rwxr-xr-x	root/root	usr/lib/samba/bind9/dlz_bind9_11.so
--rwxr-xr-x	root/root	usr/lib/samba/bind9/dlz_bind9_9.so
-drwxr-xr-x	root/root	usr/lib/samba/gensec/
--rwxr-xr-x	root/root	usr/lib/samba/gensec/krb5.so
 drwxr-xr-x	root/root	usr/lib/samba/idmap/
--rwxr-xr-x	root/root	usr/lib/samba/idmap/ad.so
 -rwxr-xr-x	root/root	usr/lib/samba/idmap/autorid.so
 -rwxr-xr-x	root/root	usr/lib/samba/idmap/hash.so
--rwxr-xr-x	root/root	usr/lib/samba/idmap/rfc2307.so
 -rwxr-xr-x	root/root	usr/lib/samba/idmap/rid.so
 -rwxr-xr-x	root/root	usr/lib/samba/idmap/script.so
 -rwxr-xr-x	root/root	usr/lib/samba/idmap/tdb2.so
 drwxr-xr-x	root/root	usr/lib/samba/ldb/
--rwxr-xr-x	root/root	usr/lib/samba/ldb/acl.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/aclread.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/anr.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/descriptor.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/dirsync.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/dns_notify.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/dsdb_notification.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/extended_dn_in.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/extended_dn_out.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/extended_dn_store.so
+-rwxr-xr-x	root/root	usr/lib/samba/ldb/asq.so
 -rwxr-xr-x	root/root	usr/lib/samba/ldb/ildap.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/instancetype.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/lazy_commit.so
 -rwxr-xr-x	root/root	usr/lib/samba/ldb/ldbsamba_extensions.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/linked_attributes.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/local_password.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/new_partition.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/objectclass.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/objectclass_attrs.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/objectguid.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/operational.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/partition.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/password_hash.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/ranged_results.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/repl_meta_data.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/resolve_oids.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/rootdse.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/samba3sam.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/samba3sid.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/samba_dsdb.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/samba_secrets.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/samldb.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/schema_data.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/schema_load.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/secrets_tdb_sync.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/show_deleted.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/simple_dn.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/simple_ldap_map.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/subtree_delete.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/subtree_rename.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/tombstone_reanimate.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/update_keytab.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/vlv.so
--rwxr-xr-x	root/root	usr/lib/samba/ldb/wins_ldb.so
+-rwxr-xr-x	root/root	usr/lib/samba/ldb/paged_results.so
+-rwxr-xr-x	root/root	usr/lib/samba/ldb/paged_searches.so
+-rwxr-xr-x	root/root	usr/lib/samba/ldb/rdn_name.so
+-rwxr-xr-x	root/root	usr/lib/samba/ldb/sample.so
+-rwxr-xr-x	root/root	usr/lib/samba/ldb/server_sort.so
+-rwxr-xr-x	root/root	usr/lib/samba/ldb/skel.so
+-rwxr-xr-x	root/root	usr/lib/samba/ldb/tdb.so
 -rwxr-xr-x	root/root	usr/lib/samba/libCHARSET3-samba4.so
--rwxr-xr-x	root/root	usr/lib/samba/libHDB-SAMBA4-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libLIBWBCLIENT-OLD-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libMESSAGING-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libaddns-samba4.so
@@ -635,13 +549,9 @@ lrwxrwxrwx	root/root	usr/lib/samba/libasn1-samba4.so.8 -> libasn1-samba4.so.8.0.
 -rwxr-xr-x	root/root	usr/lib/samba/libcmdline-credentials-samba4.so
 lrwxrwxrwx	root/root	usr/lib/samba/libcom_err-samba4.so.0 -> libcom_err-samba4.so.0.25
 -rwxr-xr-x	root/root	usr/lib/samba/libcom_err-samba4.so.0.25
--rwxr-xr-x	root/root	usr/lib/samba/libdb-glue-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libdbwrap-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libdcerpc-samba-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libdcerpc-samba4.so
--rwxr-xr-x	root/root	usr/lib/samba/libdfs-server-ad-samba4.so
--rwxr-xr-x	root/root	usr/lib/samba/libdlz-bind9-for-torture-samba4.so
--rwxr-xr-x	root/root	usr/lib/samba/libdnsserver-common-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libdsdb-garbage-collect-tombstones-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libdsdb-module-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libevents-samba4.so
@@ -671,6 +581,9 @@ lrwxrwxrwx	root/root	usr/lib/samba/libkdc-samba4.so.2 -> libkdc-samba4.so.2.0.0
 lrwxrwxrwx	root/root	usr/lib/samba/libkrb5-samba4.so.26 -> libkrb5-samba4.so.26.0.0
 -rwxr-xr-x	root/root	usr/lib/samba/libkrb5-samba4.so.26.0.0
 -rwxr-xr-x	root/root	usr/lib/samba/libkrb5samba-samba4.so
+-rwxr-xr-x	root/root	usr/lib/samba/libldb-cmdline-samba4.so
+lrwxrwxrwx	root/root	usr/lib/samba/libldb.so.1 -> libldb.so.1.1.29
+-rwxr-xr-x	root/root	usr/lib/samba/libldb.so.1.1.29
 -rwxr-xr-x	root/root	usr/lib/samba/libldbsamba-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/liblibcli-lsa3-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/liblibcli-netlogon3-samba4.so
@@ -686,11 +599,11 @@ lrwxrwxrwx	root/root	usr/lib/samba/libkrb5-samba4.so.26 -> libkrb5-samba4.so.26.
 -rwxr-xr-x	root/root	usr/lib/samba/libnon-posix-acls-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libnpa-tstream-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libnss-info-samba4.so
--rwxr-xr-x	root/root	usr/lib/samba/libpac-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libpopt-samba3-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libposix-eadb-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libprinting-migrate-samba4.so
--rwxr-xr-x	root/root	usr/lib/samba/libprocess-model-samba4.so
+lrwxrwxrwx	root/root	usr/lib/samba/libpyldb-util.so.1 -> libpyldb-util.so.1.1.29
+-rwxr-xr-x	root/root	usr/lib/samba/libpyldb-util.so.1.1.29
 -rwxr-xr-x	root/root	usr/lib/samba/libregistry-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libreplace-samba4.so
 lrwxrwxrwx	root/root	usr/lib/samba/libroken-samba4.so.19 -> libroken-samba4.so.19.0.1
@@ -707,14 +620,12 @@ lrwxrwxrwx	root/root	usr/lib/samba/libroken-samba4.so.19 -> libroken-samba4.so.1
 -rwxr-xr-x	root/root	usr/lib/samba/libsecrets3-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libserver-id-db-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libserver-role-samba4.so
--rwxr-xr-x	root/root	usr/lib/samba/libservice-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libshares-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libsmb-transport-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libsmbclient-raw-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libsmbd-base-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libsmbd-conn-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libsmbd-shim-samba4.so
--rwxr-xr-x	root/root	usr/lib/samba/libsmbldaphelper-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libsmbpasswdparser-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libsocket-blocking-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libsys-rw-samba4.so
@@ -733,26 +644,6 @@ lrwxrwxrwx	root/root	usr/lib/samba/libwind-samba4.so.0 -> libwind-samba4.so.0.0.
 -rwxr-xr-x	root/root	usr/lib/samba/libxattr-tdb-samba4.so
 drwxr-xr-x	root/root	usr/lib/samba/nss_info/
 -rwxr-xr-x	root/root	usr/lib/samba/nss_info/hash.so
--rwxr-xr-x	root/root	usr/lib/samba/nss_info/rfc2307.so
--rwxr-xr-x	root/root	usr/lib/samba/nss_info/sfu.so
--rwxr-xr-x	root/root	usr/lib/samba/nss_info/sfu20.so
-drwxr-xr-x	root/root	usr/lib/samba/process_model/
--rwxr-xr-x	root/root	usr/lib/samba/process_model/standard.so
-drwxr-xr-x	root/root	usr/lib/samba/service/
--rwxr-xr-x	root/root	usr/lib/samba/service/cldap.so
--rwxr-xr-x	root/root	usr/lib/samba/service/dcerpc.so
--rwxr-xr-x	root/root	usr/lib/samba/service/dns.so
--rwxr-xr-x	root/root	usr/lib/samba/service/dns_update.so
--rwxr-xr-x	root/root	usr/lib/samba/service/drepl.so
--rwxr-xr-x	root/root	usr/lib/samba/service/kcc.so
--rwxr-xr-x	root/root	usr/lib/samba/service/kdc.so
--rwxr-xr-x	root/root	usr/lib/samba/service/ldap.so
--rwxr-xr-x	root/root	usr/lib/samba/service/nbtd.so
--rwxr-xr-x	root/root	usr/lib/samba/service/ntp_signd.so
--rwxr-xr-x	root/root	usr/lib/samba/service/s3fs.so
--rwxr-xr-x	root/root	usr/lib/samba/service/web.so
--rwxr-xr-x	root/root	usr/lib/samba/service/winbindd.so
--rwxr-xr-x	root/root	usr/lib/samba/service/wrepl.so
 drwxr-xr-x	root/root	usr/lib/samba/vfs/
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/acl_tdb.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/acl_xattr.so
@@ -777,7 +668,6 @@ drwxr-xr-x	root/root	usr/lib/samba/vfs/
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/media_harmony.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/netatalk.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/offline.so
--rwxr-xr-x	root/root	usr/lib/samba/vfs/posix_eadb.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/preopen.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/readahead.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/readonly.so
@@ -785,7 +675,6 @@ drwxr-xr-x	root/root	usr/lib/samba/vfs/
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/shadow_copy.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/shadow_copy2.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/shell_snap.so
--rwxr-xr-x	root/root	usr/lib/samba/vfs/snapper.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/streams_depot.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/streams_xattr.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/syncops.so
@@ -793,19 +682,9 @@ drwxr-xr-x	root/root	usr/lib/samba/vfs/
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/unityed_media.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/worm.so
 -rwxr-xr-x	root/root	usr/lib/samba/vfs/xattr_tdb.so
-drwxr-xr-x	root/root	usr/lib/security/
--rwxr-xr-x	root/root	usr/lib/security/pam_winbind.so
 -rwxr-xr-x	root/root	usr/lib/winbind_krb5_locator.so
-drwxr-xr-x	root/root	usr/libexec/
-drwxr-xr-x	root/root	usr/libexec/samba/
--rwxr-xr-x	root/root	usr/libexec/samba/smbspool_krb5_wrapper
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/nmbd
--rwxr-xr-x	root/root	usr/sbin/samba
--rwxr-xr-x	root/root	usr/sbin/samba_dnsupdate
--rwxr-xr-x	root/root	usr/sbin/samba_kcc
--rwxr-xr-x	root/root	usr/sbin/samba_spnupdate
--rwxr-xr-x	root/root	usr/sbin/samba_upgradedns
 -rwxr-xr-x	root/root	usr/sbin/smbd
 -rwxr-xr-x	root/root	usr/sbin/winbindd
 drwxr-xr-x	root/root	usr/share/
@@ -813,21 +692,11 @@ drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/dbwrap_tool.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/findsmb.1.gz
--rw-r--r--	root/root	usr/share/man/man1/gentest.1.gz
--rw-r--r--	root/root	usr/share/man/man1/locktest.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/log2pcap.1.gz
--rw-r--r--	root/root	usr/share/man/man1/masktest.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/mvxattr.1.gz
--rw-r--r--	root/root	usr/share/man/man1/ndrdump.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nmblookup.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/ntlm_auth.1.gz
--rw-r--r--	root/root	usr/share/man/man1/oLschema2ldif.1.gz
--rw-r--r--	root/root	usr/share/man/man1/pidl.1pm.gz
 -rw-r--r--	root/root	usr/share/man/man1/profiles.1.gz
--rw-r--r--	root/root	usr/share/man/man1/regdiff.1.gz
--rw-r--r--	root/root	usr/share/man/man1/regpatch.1.gz
--rw-r--r--	root/root	usr/share/man/man1/regshell.1.gz
--rw-r--r--	root/root	usr/share/man/man1/regtree.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/rpcclient.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/sharesec.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/smbcacls.1.gz
@@ -837,17 +706,11 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/smbget.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/smbstatus.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/smbtar.1.gz
--rw-r--r--	root/root	usr/share/man/man1/smbtorture.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/smbtree.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/testparm.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/vfstest.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/wbinfo.1.gz
 drwxr-xr-x	root/root	usr/share/man/man3/
--rw-r--r--	root/root	usr/share/man/man3/Parse::Pidl::Dump.3pm.gz
--rw-r--r--	root/root	usr/share/man/man3/Parse::Pidl::NDR.3pm.gz
--rw-r--r--	root/root	usr/share/man/man3/Parse::Pidl::Util.3pm.gz
--rw-r--r--	root/root	usr/share/man/man3/Parse::Pidl::Wireshark::Conformance.3pm.gz
--rw-r--r--	root/root	usr/share/man/man3/Parse::Pidl::Wireshark::NDR.3pm.gz
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/lmhosts.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/pam_winbind.conf.5.gz
@@ -927,98 +790,6 @@ drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/vfs_xattr_tdb.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/vfs_zfsacl.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/winbindd.8.gz
-drwxr-xr-x	root/root	usr/share/samba/
-drwxr-xr-x	root/root	usr/share/samba/setup/
--rw-r--r--	root/root	usr/share/samba/setup/DB_CONFIG
-drwxr-xr-x	root/root	usr/share/samba/setup/ad-schema/
--rw-r--r--	root/root	usr/share/samba/setup/ad-schema/MS-AD_Schema_2K8_Attributes.txt
--rw-r--r--	root/root	usr/share/samba/setup/ad-schema/MS-AD_Schema_2K8_Classes.txt
--rw-r--r--	root/root	usr/share/samba/setup/ad-schema/MS-AD_Schema_2K8_R2_Attributes.txt
--rw-r--r--	root/root	usr/share/samba/setup/ad-schema/MS-AD_Schema_2K8_R2_Classes.txt
--rw-r--r--	root/root	usr/share/samba/setup/ad-schema/licence.txt
--rw-r--r--	root/root	usr/share/samba/setup/aggregate_schema.ldif
--rw-r--r--	root/root	usr/share/samba/setup/cn=samba.ldif
-drwxr-xr-x	root/root	usr/share/samba/setup/display-specifiers/
--rw-r--r--	root/root	usr/share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt
--rw-r--r--	root/root	usr/share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt
--rw-r--r--	root/root	usr/share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt
--rw-r--r--	root/root	usr/share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k8.txt
--rw-r--r--	root/root	usr/share/samba/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
--rw-r--r--	root/root	usr/share/samba/setup/dns_update_list
--rw-r--r--	root/root	usr/share/samba/setup/fedora-ds-init.ldif
--rw-r--r--	root/root	usr/share/samba/setup/fedorads-dna.ldif
--rw-r--r--	root/root	usr/share/samba/setup/fedorads-index.ldif
--rw-r--r--	root/root	usr/share/samba/setup/fedorads-linked-attributes.ldif
--rw-r--r--	root/root	usr/share/samba/setup/fedorads-pam.ldif
--rw-r--r--	root/root	usr/share/samba/setup/fedorads-partitions.ldif
--rw-r--r--	root/root	usr/share/samba/setup/fedorads-refint-add.ldif
--rw-r--r--	root/root	usr/share/samba/setup/fedorads-refint-delete.ldif
--rw-r--r--	root/root	usr/share/samba/setup/fedorads-samba.ldif
--rw-r--r--	root/root	usr/share/samba/setup/fedorads-sasl.ldif
--rw-r--r--	root/root	usr/share/samba/setup/fedorads.inf
--rw-r--r--	root/root	usr/share/samba/setup/idmap_init.ldif
--rw-r--r--	root/root	usr/share/samba/setup/krb5.conf
--rw-r--r--	root/root	usr/share/samba/setup/memberof.conf
--rw-r--r--	root/root	usr/share/samba/setup/mmr_serverids.conf
--rw-r--r--	root/root	usr/share/samba/setup/mmr_syncrepl.conf
--rw-r--r--	root/root	usr/share/samba/setup/modules.conf
--rw-r--r--	root/root	usr/share/samba/setup/named.conf
--rw-r--r--	root/root	usr/share/samba/setup/named.conf.dlz
--rw-r--r--	root/root	usr/share/samba/setup/named.conf.update
--rw-r--r--	root/root	usr/share/samba/setup/named.txt
--rw-r--r--	root/root	usr/share/samba/setup/olc_mmr.conf
--rw-r--r--	root/root	usr/share/samba/setup/olc_seed.ldif
--rw-r--r--	root/root	usr/share/samba/setup/olc_serverid.conf
--rw-r--r--	root/root	usr/share/samba/setup/olc_syncrepl.conf
--rw-r--r--	root/root	usr/share/samba/setup/olc_syncrepl_seed.conf
--rw-r--r--	root/root	usr/share/samba/setup/prefixMap.txt
--rw-r--r--	root/root	usr/share/samba/setup/provision.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision.reg
--rw-r--r--	root/root	usr/share/samba/setup/provision.zone
--rw-r--r--	root/root	usr/share/samba/setup/provision_basedn.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_basedn_modify.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_basedn_options.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_basedn_references.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_computers_add.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_computers_modify.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_configuration.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_configuration_basedn.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_configuration_modify.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_configuration_references.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_dns_accounts_add.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_dns_add_samba.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_dnszones_add.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_dnszones_modify.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_dnszones_partitions.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_group_policy.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_init.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_partitions.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_privilege.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_rootdse_add.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_rootdse_modify.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_schema_basedn.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_schema_basedn_modify.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_self_join.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_self_join_config.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_self_join_modify.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_self_join_modify_config.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_users.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_users_add.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_users_modify.ldif
--rw-r--r--	root/root	usr/share/samba/setup/provision_well_known_sec_princ.ldif
--rw-r--r--	root/root	usr/share/samba/setup/refint.conf
--rw-r--r--	root/root	usr/share/samba/setup/schema-map-fedora-ds-1.0
--rw-r--r--	root/root	usr/share/samba/setup/schema-map-openldap-2.3
--rw-r--r--	root/root	usr/share/samba/setup/schema_samba4.ldif
--rw-r--r--	root/root	usr/share/samba/setup/secrets.ldif
--rw-r--r--	root/root	usr/share/samba/setup/secrets_dns.ldif
--rw-r--r--	root/root	usr/share/samba/setup/secrets_init.ldif
--rw-r--r--	root/root	usr/share/samba/setup/secrets_sasl_ldap.ldif
--rw-r--r--	root/root	usr/share/samba/setup/secrets_simple_ldap.ldif
--rw-r--r--	root/root	usr/share/samba/setup/share.ldif
--rw-r--r--	root/root	usr/share/samba/setup/slapd.conf
--rw-r--r--	root/root	usr/share/samba/setup/spn_update_list
--rw-r--r--	root/root	usr/share/samba/setup/ypServ30.ldif
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/cache/
 drwxr-xr-x	root/root	var/cache/samba/
diff --git a/samba/.md5sum b/samba/.md5sum
index 6f32a0839..737ec8221 100644
--- a/samba/.md5sum
+++ b/samba/.md5sum
@@ -1,5 +1,2 @@
-f3c85f6f57f662f2373001506cd50a8a  nmbd.rc
-08a0bca1f4db06169cdeb442b3598aaf  samba-4.6.4.tar.gz
-84266d28273c12045e18ea34c504c296  samba.rc
-41ae232d0511d3246d4a362296c8115a  smbd.rc
-c6eabe25403afa2500ec47f71eb1bba6  winbindd.rc
+1869ebd29f3e277b405e3e4cd9423ccf  samba
+04493bbe8d71e52393dffdbba301697d  samba-4.6.6.tar.gz
diff --git a/samba/.signature b/samba/.signature
index 5de67e867..ab3d8499f 100644
--- a/samba/.signature
+++ b/samba/.signature
@@ -1,9 +1,6 @@
-untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/dKHCyKUBpb+2nXzsTEz3151yUNAIBXy+PaB2lOoPOhBdMvNmlMZAVI0XQqVaGAI0h/jbipPLwHoOP/nkJE8EwA=
-SHA256 (Pkgfile) = cd30175e5e0fa72b574d88e356af17e8db8b78a4a19c78a8cedc5edf740e98af
-SHA256 (.footprint) = dc22e81726b6947c8ab87e1694821823a35763a13f37ac8fec73c33a8b578712
-SHA256 (samba-4.6.4.tar.gz) = 4ac67329d18e5586dc75db50e23b81c1f6c45a2d5bb9752ea6d90dcca08d9a61
-SHA256 (samba.rc) = da217255ffc51a54c0dd87ac72b1f784e5545e9ab9a010d8a9c46d66bd84f904
-SHA256 (nmbd.rc) = dd3ec130514f708521d53d979d227d61861a7895a44ba1cb517c8d4b0dd12873
-SHA256 (smbd.rc) = 636d384437aa29175f01aa289a95e40bd176d73a57a33f03a9ae5e9c49d075c7
-SHA256 (winbindd.rc) = d70f938e0b8bd10f35bf5aecec1e14f56370ad245c07e14fb3280c0eef7c351c
+untrusted comment: verify with /etc/ports/jue.pub
+RWQJfAOele67BdjCo6UsGWIZ4Toob0pFOU3WspFleYwmg2ILhXxCvaFjItuIVhQA612ap37sgHFT2CP7gThKb00e9ZI3JtoKNAA=
+SHA256 (Pkgfile) = a924023402cf6ae4d10fb42d761f1eaba5d02062972b54b94e91e649bb648593
+SHA256 (.footprint) = 0cf7e73a6310455c7d4386b1b8257ba0f699ba7afd4a63be58ff52f14318bc25
+SHA256 (samba-4.6.6.tar.gz) = fc31c809f7d85ae30f2b7dcddcb8404201b626047458cb5f2b743d4f6f3f1a8e
+SHA256 (samba) = 75bccea892422b5aebe8d2f9ce9b9c42ddc3cbdeccfd16f3161c07c1eb3feff0
diff --git a/samba/Pkgfile b/samba/Pkgfile
index 3e1d661d4..adc99e3a6 100644
--- a/samba/Pkgfile
+++ b/samba/Pkgfile
@@ -1,60 +1,50 @@
-# Description:	SMB server and client for unix
-# URL:		https://www.samba.org
-# Maintainer:	Alan Mizrahi, alan at mizrahi dot com dot ve
-# Packager:	Juergen Daubert, jue at crux dot nu
-# Depends on:	iniparser krb5 ldb libaio libcap ntdb p5-parse-yapp py-subunit subunit nss_wrapper socket_wrapper uid_wrapper cmocka gnutls
-# Optional:	cups
+# Description: SMB server and client for unix
+# URL:         http://www.samba.org
+# Maintainer:  Juergen Daubert, jue at crux dot nu
+# Depends on:  e2fsprogs libarchive tdb talloc tevent libcap libaio popt
 
 name=samba
-version=4.6.4
-release=4
-source=(
-https://www.samba.org/samba/ftp/stable/$name-$version.tar.gz
-samba.rc
-nmbd.rc
-smbd.rc
-winbindd.rc
-)
+version=4.6.6
+release=2
+source=(https://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \
+        samba)
 
 build () {
-	cd $name-$version
-
-	# we should define vendorlib in our perl port
-	sed -ri 's:(vendor)(arch|lib|prefix):site\2:' buildtools/wafsamba/samba_perl.py 
-
-	./configure \
-		--enable-fhs \
-		--prefix=/usr \
-		--localstatedir=/var \
-		--sysconfdir=/etc \
-		--with-privatedir=/etc/samba/private \
-		--bundled-libraries=heimdal
-
-# samba > 4.2 with mit krb5 is broken, heimdal needed for dc
-#		--with-system-mitkrb5 \
-#		--bundled-libraries=NONE
-
-	make
-	make DESTDIR=$PKG install
-
-	# man pages
-	for i in docs/manpages/*; do 
-		install -D -m 644 $i $PKG/usr/share/man/man${i##*.}/${i##*/}
-	done
-    
-	# cleanup
-	chmod 1777 $PKG/var/lock
-    
-	# config-file and start-script
-	install -d $PKG/etc/{samba,rc.d}
-	install -m 0600 packaging/LSB/smb.conf $PKG/etc/samba/smb.conf.default
-
-	# startup scripts
-	for i in samba nmbd smbd winbindd; do
-		install -m 0755 $SRC/$i.rc $PKG/etc/rc.d/$i
-	done
-
-	# revdep
-	mkdir -p $PKG/etc/revdep.d
-	echo /usr/lib/samba > $PKG/etc/revdep.d/$name
+    cd $name-$version
+
+    ./configure --enable-fhs \
+                --prefix=/usr \
+                --libexecdir=/usr/lib \
+                --localstatedir=/var \
+                --sysconfdir=/etc \
+                --with-privatedir=/etc/samba/private \
+                --bundled-libraries=!tdb,!talloc,!tevent,!popt \
+                --without-{ad-dc,ads,ldap,pam}
+
+    local JOBS=
+    [[ $MAKEFLAGS =~ (-j|-j *|--jobs=)([[:digit:]]+) ]] && JOBS="-j ${BASH_REMATCH[2]}"
+    python ./buildtools/bin/waf build $JOBS
+    python ./buildtools/bin/waf install --destdir=$PKG
+
+    # man pages
+    local p
+    for p in docs/manpages/*; do 
+        install -D -m 644 $p $PKG/usr/share/man/man${p##*.}/${p##*/}
+    done
+
+    # cleanup
+    chmod 1777 $PKG/var/lock
+
+    # remove pidl
+    find $PKG -iname '*pidl*' -type f -delete
+    find $PKG -depth -name perl5 -type d -exec rm -r {} \;
+
+    # config-file and start-script
+    install -d $PKG/etc/{samba,rc.d}
+    install -m 0600 packaging/LSB/smb.conf $PKG/etc/samba/smb.conf.default
+    install -m 0755 $SRC/samba $PKG/etc/rc.d
+
+    # revdep
+    install -d $PKG/etc/revdep.d
+    echo '/usr/lib/samba' > $PKG/etc/revdep.d/samba
 }
diff --git a/samba/nmbd.rc b/samba/nmbd.rc
deleted file mode 100755
index 85a43e90b..000000000
--- a/samba/nmbd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-PATH="/sbin:/usr/sbin:/bin:/usr/bin"
-
-NAME="nmbd"
-USER="root"
-RUNDIR="/var/run/samba"
-PIDFILE="$RUNDIR/$NAME.pid"
-PROG="/usr/sbin/$NAME"
-
-case $1 in
-start)
-	install -d -m 755 -o $USER $RUNDIR || exit 1
-	start-stop-daemon --start --pidfile $PIDFILE --exec $PROG -- $ARGS
-	;;
-stop)
-	start-stop-daemon --stop --retry 30 --pidfile $PIDFILE
-	;;
-restart)
-	$0 stop
-	$0 start
-	;;
-status)
-	start-stop-daemon --status --pidfile $PIDFILE
-	case $? in
-	0) echo "$PROG running with pid: $(cat $PIDFILE)" ;;
-	1) echo "$PROG not running, stale pidfile: $PIDFILE" ;;
-	3) echo "$PROG not running" ;;
-	4) echo "Unable to determine program status" ;;
-	esac
-	;;
-reload)
-	smbcontrol $NAME reload-config
-	;;
-*)
-	echo "usage: $0 [start|stop|restart|reload|status]"
-	;;
-esac
-
diff --git a/samba/samba b/samba/samba
new file mode 100644
index 000000000..692e1add0
--- /dev/null
+++ b/samba/samba
@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# /etc/rc.d/samba: start/stop samba daemons
+#
+
+SSD=/sbin/start-stop-daemon
+SMB=/usr/sbin/smbd
+NMB=/usr/sbin/nmbd
+SMB_PID=/var/run/samba/smbd.pid
+NMB_PID=/var/run/samba/nmbd.pid
+
+
+print_status() {
+	$SSD --status --pidfile $2
+	case $? in
+	0) echo "$1 is running with pid $(cat $2)" ;;
+	1) echo "$1 is not running but the pid file $2 exists" ;;
+	3) echo "$1 is not running" ;;
+	4) echo "Unable to determine the program status" ;;
+	esac
+}
+
+case $1 in
+start)
+	$SSD --start --pidfile $NMB_PID --exec $NMB -- -D
+	$SSD --start --pidfile $SMB_PID --exec $SMB -- -D
+	;;
+stop)
+	$SSD --stop --retry 10 --pidfile $SMB_PID 
+	$SSD --stop --retry 10 --pidfile $NMB_PID 
+	;;
+restart)
+	$0 stop
+	$0 start
+	;;
+reload)
+	/usr/bin/smbcontrol smbd reload-config
+	/usr/bin/smbcontrol nmbd reload-config
+	;;
+status)
+	print_status $SMB $SMB_PID
+	print_status $NMB $NMB_PID
+	;;
+*)
+	echo "usage: $0 [start|stop|restart|status]"
+	;;
+esac
+
+# End of file
diff --git a/samba/samba.rc b/samba/samba.rc
deleted file mode 100755
index 2786fbb1a..000000000
--- a/samba/samba.rc
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-#
-# /etc/rc.d/samba: start/stop all server samba daemons
-#
-
-declare -a scripts=('smbd' 'nmbd' 'winbindd')
-
-case $1 in
-start|reload|status)
-	for script in ${scripts[@]}; do
-		/etc/rc.d/$script $1
-	done
-	;;
-stop)
-	# stop in reverse order
-	for (( i=${#scripts[@]}-1; i>=0; i-- )); do
-		script=${scripts[i]}
-		/etc/rc.d/$script $1
-	done
-	;;
-restart)
-	$0 stop
-	$0 start
-	;;
-*)
-	echo "usage: $0 [start|stop|restart|reload|status]"
-	;;
-esac
diff --git a/samba/smbd.rc b/samba/smbd.rc
deleted file mode 100755
index f93c6cc1e..000000000
--- a/samba/smbd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-PATH="/sbin:/usr/sbin:/bin:/usr/bin"
-
-NAME="smbd"
-USER="root"
-RUNDIR="/var/run/samba"
-PIDFILE="$RUNDIR/$NAME.pid"
-PROG="/usr/sbin/$NAME"
-
-case $1 in
-start)
-	install -d -m 755 -o $USER $RUNDIR || exit 1
-	start-stop-daemon --start --pidfile $PIDFILE --exec $PROG -- $ARGS
-	;;
-stop)
-	start-stop-daemon --stop --retry 30 --pidfile $PIDFILE
-	;;
-restart)
-	$0 stop
-	$0 start
-	;;
-status)
-	start-stop-daemon --status --pidfile $PIDFILE
-	case $? in
-	0) echo "$PROG running with pid: $(cat $PIDFILE)" ;;
-	1) echo "$PROG not running, stale pidfile: $PIDFILE" ;;
-	3) echo "$PROG not running" ;;
-	4) echo "Unable to determine program status" ;;
-	esac
-	;;
-reload)
-	smbcontrol $NAME reload-config
-	;;
-*)
-	echo "usage: $0 [start|stop|restart|reload|status]"
-	;;
-esac
-
diff --git a/samba/winbindd.rc b/samba/winbindd.rc
deleted file mode 100755
index 1861d679c..000000000
--- a/samba/winbindd.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-PATH="/sbin:/usr/sbin:/bin:/usr/bin"
-
-NAME="winbindd"
-USER="root"
-RUNDIR="/var/run/samba"
-PIDFILE="$RUNDIR/$NAME.pid"
-PROG="/usr/sbin/$NAME"
-
-case $1 in
-start)
-	install -d -m 755 -o $USER $RUNDIR || exit 1
-	start-stop-daemon --start --pidfile $PIDFILE --exec $PROG -- $ARGS
-	;;
-stop)
-	start-stop-daemon --stop --retry 30 --pidfile $PIDFILE
-	;;
-restart)
-	$0 stop
-	$0 start
-	;;
-status)
-	start-stop-daemon --status --pidfile $PIDFILE
-	case $? in
-	0) echo "$PROG running with pid: $(cat $PIDFILE)" ;;
-	1) echo "$PROG not running, stale pidfile: $PIDFILE" ;;
-	3) echo "$PROG not running" ;;
-	4) echo "Unable to determine program status" ;;
-	esac
-	;;
-reload)
-	smbcontrol $NAME reload-config
-	;;
-*)
-	echo "usage: $0 [start|stop|restart|reload|status]"
-	;;
-esac
-


More information about the CRUX mailing list