From bff60b04458bb3ce0e0839628b0bf02d5a3af460 Mon Sep 17 00:00:00 2001
From: fritzkink <96341974+fritzkink@users.noreply.github.com>
Date: Sun, 24 Sep 2023 20:21:28 +0200
Subject: [PATCH] samba - update to version 4.19.0
---
components/network/samba/patches/01_solaris.patch | 31 -------
components/network/samba/samba.proto-objects | 71 ++++++++++++++++-
components/network/samba/samba.p5m | 3
components/network/samba/manifests/sample-manifest.p5m | 72 ++++++++++++++++-
components/network/samba/Makefile | 12 +-
5 files changed, 139 insertions(+), 50 deletions(-)
diff --git a/components/network/samba/Makefile b/components/network/samba/Makefile
index 466650b..6a63d0e 100644
--- a/components/network/samba/Makefile
+++ b/components/network/samba/Makefile
@@ -31,12 +31,12 @@
include ../../../make-rules/shared-macros.mk
COMPONENT_NAME = samba
-COMPONENT_VERSION = 4.18.6
+COMPONENT_VERSION = 4.19.0
COMPONENT_SUMMARY = samba - A Windows SMB/CIFS fileserver for UNIX
COMPONENT_SRC = $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL = https://www.samba.org/
COMPONENT_ARCHIVE = $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH = sha256:284c8a994ce989c87cd6808c390fcb9d00c36b21a0dc1a8a75474b67c9e715e7
+COMPONENT_ARCHIVE_HASH = sha256:28f98ceab75a6a59432912fa110fc8c716abcab1ed6d8bdd4393d178acff3d20
COMPONENT_ARCHIVE_URL = https://download.samba.org/pub/samba/stable/$(COMPONENT_ARCHIVE)
#COMPONENT_SIG_URL = https://download.samba.org/pub/samba/stable/$(COMPONENT_SRC).tar.asc
COMPONENT_FMRI = service/network/samba
@@ -93,8 +93,7 @@
CONFIGURE_ENV += CPPFLAGS="$(CPPFLAGS)"
CONFIGURE_ENV += CUPS_CONFIG=$(USRBINDIR)/cups-config
CONFIGURE_ENV += PATH=$(GNUBIN.$(BITS)):$(USRBINDIR.$(BITS)):$(PATH.gnu)
-#CONFIGURE_ENV += PERL=$(PERL)
-CONFIGURE_ENV += PYTHONARCHDIR=$(PYTHON_VENDOR_PACKAGES)/samba
+ONFIGURE_ENV += PYTHONARCHDIR=$(PYTHON_VENDOR_PACKAGES)/samba
# --enable-fhs should not be on
CONFIGURE_OPTIONS += --prefix=$(CONFIGURE_PREFIX)
@@ -116,8 +115,9 @@
CONFIGURE_OPTIONS += --libexecdir=$(CONFIGURE_PREFIX)/libexec/$(MACH64)
CONFIGURE_OPTIONS += --with-bind-dns-dir=$(CONFIGURE_PREFIX)/bind-dns
-CONFIGURE_OPTIONS += --with-static-modules=vfs_solarisacl
-CONFIGURE_OPTIONS += --with-shared-modules=ALL,vfs_zfsacl,vfs_cacheprime
+CONFIGURE_OPTIONS += --with-static-modules=vfs_solarisacl,vfs_zfsacl
+CONFIGURE_OPTIONS += --with-shared-modules=ALL,vfs_cacheprime
+CONFIGURE_OPTIONS += --with-acl-support
CONFIGURE_OPTIONS += --with-ads
CONFIGURE_OPTIONS += --with-winbind
CONFIGURE_OPTIONS += --with-ldap
diff --git a/components/network/samba/manifests/sample-manifest.p5m b/components/network/samba/manifests/sample-manifest.p5m
index 490e931..3c761eb 100644
--- a/components/network/samba/manifests/sample-manifest.p5m
+++ b/components/network/samba/manifests/sample-manifest.p5m
@@ -177,8 +177,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/emulate/traffic.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/emulate/traffic_packets.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/forest_update.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/functional_level.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/gensec.so
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/getopt.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/gp/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/gp/gp_centrify_crontab_ext.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/gp/gp_centrify_sudoers_ext.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/gp/gp_cert_auto_enroll_ext.py
@@ -237,12 +239,49 @@
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/dbcheck.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/delegation.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/dns.py
-file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain.py
-file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain_backup.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/auth/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/auth/policy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/auth/silo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/auth/silo_member.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/backup.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/claim/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/claim/claim_type.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/claim/value_type.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/classicupgrade.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/common.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/dcpromo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/demote.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/functional_prep.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/info.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/join.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/keytab.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/leave.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/level.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/auth_policy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/auth_silo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/claim_type.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/fields.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/model.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/schema.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/site.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/subnet.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/user.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/value_type.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/passwordsettings.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/provision.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/samba3upgrade.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/schemaupgrade.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/tombstones.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/trust.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/drs.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/dsacl.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/encoders.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/forest.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/fsmo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/gpcommon.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/gpo.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/group.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/ldapcmp.py
@@ -258,10 +297,12 @@
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/spn.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/testparm.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/user.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/validators.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/visualize.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/ntacls.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/ntstatus.so
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/param.so
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/policies.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/policy.so
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/posix_eadb.so
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/provision/__init__.py
@@ -391,8 +432,11 @@
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/alias_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/as_canonicalization_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/as_req_tests.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/authn_policy_tests.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/claims_in_pac.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/claims_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/compatability_tests.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/device_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/etype_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/fast_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/group_tests.py
@@ -405,6 +449,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/nt_hash_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/pac_align_tests.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/pkinit_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/protected_users_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/raw_testcase.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/rfc4120_constants.py
@@ -426,6 +471,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/ldap_referrals.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/ldap_spn.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/ldap_upn_sam_account.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/ldap_whoami.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/libsmb-basic.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/libsmb.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/loadparm.py
@@ -473,12 +519,18 @@
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/s3windb.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/safe_tarfile.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba3sam.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_startup_fl_change.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/base.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/computer.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/contact.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/demote.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/dnscmd.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/domain_auth_base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/domain_auth_policy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/domain_auth_silo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/domain_claim.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/domain_models.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/dsacl.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/forest.py
@@ -661,9 +713,9 @@
link path=usr/lib/samba/$(MACH64)/libndr-standard.so.0 \
target=libndr-standard.so.0.0.1
file path=usr/lib/samba/$(MACH64)/libndr-standard.so.0.0.1
-link path=usr/lib/samba/$(MACH64)/libndr.so target=libndr.so.3.0.0
-link path=usr/lib/samba/$(MACH64)/libndr.so.3 target=libndr.so.3.0.0
-file path=usr/lib/samba/$(MACH64)/libndr.so.3.0.0
+link path=usr/lib/samba/$(MACH64)/libndr.so target=libndr.so.3.0.1
+link path=usr/lib/samba/$(MACH64)/libndr.so.3 target=libndr.so.3.0.1
+file path=usr/lib/samba/$(MACH64)/libndr.so.3.0.1
link path=usr/lib/samba/$(MACH64)/libnetapi.so target=libnetapi.so.1.0.0
link path=usr/lib/samba/$(MACH64)/libnetapi.so.1 target=libnetapi.so.1.0.0
file path=usr/lib/samba/$(MACH64)/libnetapi.so.1.0.0
@@ -794,7 +846,6 @@
file path=usr/lib/samba/$(MACH64)/vfs/widelinks.so
file path=usr/lib/samba/$(MACH64)/vfs/worm.so
file path=usr/lib/samba/$(MACH64)/vfs/xattr_tdb.so
-file path=usr/lib/samba/$(MACH64)/vfs/zfsacl.so
file path=usr/lib/samba/bin/$(MACH64)/cifsdd
file path=usr/lib/samba/bin/$(MACH64)/dbwrap_tool
file path=usr/lib/samba/bin/$(MACH64)/gentest
@@ -820,6 +871,7 @@
file path=usr/lib/samba/bin/$(MACH64)/regshell
file path=usr/lib/samba/bin/$(MACH64)/regtree
file path=usr/lib/samba/bin/$(MACH64)/rpcclient
+file path=usr/lib/samba/bin/$(MACH64)/samba-log-parser
file path=usr/lib/samba/bin/$(MACH64)/samba-regedit
file path=usr/lib/samba/bin/$(MACH64)/samba-tool
file path=usr/lib/samba/bin/$(MACH64)/sharesec
@@ -860,6 +912,7 @@
file path=usr/lib/samba/private/$(MACH64)/libREG-FULL-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libRPC-SERVER-LOOP-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libRPC-WORKER-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libad-claims-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libaddns-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libads-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libasn1-samba4.so
@@ -868,6 +921,7 @@
file path=usr/lib/samba/private/$(MACH64)/libauth-unix-token-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libauth4-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libauthkrb5-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libauthn-policy-util-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libcli-cldap-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libcli-ldap-common-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libcli-ldap-samba4.so
@@ -1001,10 +1055,14 @@
file path=usr/lib/samba/sbin/$(MACH64)/winbindd
file path=usr/lib/samba/security/$(MACH64)/pam_winbind.so
file path=usr/lib/samba/security/pam_winbind.so
+file path=usr/lib/samba/setup/ad-schema/AD_DS_Attributes_Windows_Server_v1903.ldf
file path=usr/lib/samba/setup/ad-schema/AD_DS_Attributes__Windows_Server_2012_R2.ldf
file path=usr/lib/samba/setup/ad-schema/AD_DS_Attributes__Windows_Server_2016.ldf
+file path=usr/lib/samba/setup/ad-schema/AD_DS_Attributes__Windows_Server_v1803.ldf
+file path=usr/lib/samba/setup/ad-schema/AD_DS_Classes_Windows_Server_v1903.ldf
file path=usr/lib/samba/setup/ad-schema/AD_DS_Classes__Windows_Server_2012_R2.ldf
file path=usr/lib/samba/setup/ad-schema/AD_DS_Classes__Windows_Server_2016.ldf
+file path=usr/lib/samba/setup/ad-schema/AD_DS_Classes__Windows_Server_v1803.ldf
file path=usr/lib/samba/setup/ad-schema/Attributes_for_AD_DS__Windows_Server_2008_R2.ldf
file path=usr/lib/samba/setup/ad-schema/Attributes_for_AD_DS__Windows_Server_2012.ldf
file path=usr/lib/samba/setup/ad-schema/Classes_for_AD_DS__Windows_Server_2008_R2.ldf
@@ -1102,6 +1160,7 @@
file path=usr/share/man/man1/regshell.1
file path=usr/share/man/man1/regtree.1
file path=usr/share/man/man1/rpcclient.1
+file path=usr/share/man/man1/samba-log-parser.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
@@ -1119,7 +1178,6 @@
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
diff --git a/components/network/samba/patches/01_solaris.patch b/components/network/samba/patches/01_solaris.patch
index 2a59c3a..f8af42d 100644
--- a/components/network/samba/patches/01_solaris.patch
+++ b/components/network/samba/patches/01_solaris.patch
@@ -16,36 +16,7 @@
ret = acl(fsp->fsp_name->base_name, SETACL, count, solaris_acl);
if (ret != 0) {
- DBG_DEBG("settinge file acl failed!\n");
-+ DBG_DEBUG("settinge file acl failed!\n");
++ DBG_DEBUG("setting file acl failed!\n");
}
done:
---- samba-4.18.0/source3/modules/vfs_solarisacl.c 2023-03-24 19:41:11.227232531 +0100
-+++ samba-4.18.0/source3/modules/vfs_solarisacl.c.orig 2023-03-24 19:57:53.020532583 +0100
-@@ -115,7 +115,7 @@
-
- DEBUG(10, ("entering solarisacl_sys_acl_get_fd.\n"));
-
-- if (!solaris_acl_get_fd(fsp_get_io_fd(fsp), &solaris_acl, &count)) {
-+ if (!solaris_acl_get_fd(fsp_get_pathref_fd(fsp), &solaris_acl, &count)) {
- goto done;
- }
-
-@@ -174,7 +174,7 @@
- strerror(errno)));
- goto done;
- }
-- if (!solaris_acl_get_fd(fsp_get_io_fd(fsp), &other_acl, &other_count)) {
-+ if (!solaris_acl_get_fd(fsp_get_pathref_fd(fsp), &other_acl, &other_count)) {
- DEBUG(10, ("error getting (default) acl from fd\n"));
- goto done;
- }
-@@ -195,7 +195,7 @@
- goto done;
- }
-
-- ret = facl(fsp_get_io_fd(fsp), SETACL, count, solaris_acl);
-+ ret = facl(fsp_get_pathref_fd(fsp), SETACL, count, solaris_acl);
- if (ret != 0) {
- DEBUG(10, ("call of facl failed (%s).\n", strerror(errno)));
- }
diff --git a/components/network/samba/samba.p5m b/components/network/samba/samba.p5m
index 69da65c..3323dba 100644
--- a/components/network/samba/samba.p5m
+++ b/components/network/samba/samba.p5m
@@ -62,6 +62,7 @@
<transform file path=.*/samba_upgradedns -> default pkg.depend.bypass-generate .* >
<transform file path=.*/samba_dnsupdate -> default pkg.depend.bypass-generate .* >
<transform file path=.*/samba-gpupdate -> default pkg.depend.bypass-generate .* >
+<transform file path=.*/samba-log-parser -> default pkg.depend.bypass-generate .* >
<transform file path=.*/tests -> default pkg.depend.bypass-generate .* >
# service manifests to install
@@ -133,6 +134,8 @@
link path=usr/bin/regtree target=../lib/samba/bin/$(MACH64)/regtree
file path=usr/lib/samba/bin/$(MACH64)/rpcclient
link path=usr/bin/rpcclient target=../lib/samba/bin/$(MACH64)/rpcclient
+file path=usr/lib/samba/bin/$(MACH64)/samba-log-parser
+ link path=usr/bin/samba-log-parser target=../lib/samba/bin/$(MACH64)/samba-log-parser
file path=usr/lib/samba/bin/$(MACH64)/samba-regedit
link path=usr/bin/samba-regedit target=../lib/samba/bin/$(MACH64)/samba-regedit
file path=usr/lib/samba/bin/$(MACH64)/samba-tool
diff --git a/components/network/samba/samba.proto-objects b/components/network/samba/samba.proto-objects
index a78742c..2fa5266 100644
--- a/components/network/samba/samba.proto-objects
+++ b/components/network/samba/samba.proto-objects
@@ -176,8 +176,10 @@
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/emulate/traffic.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/emulate/traffic_packets.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/forest_update.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/functional_level.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/gensec.so
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/getopt.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/gp/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/gp/gp_centrify_crontab_ext.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/gp/gp_centrify_sudoers_ext.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/gp/gp_cert_auto_enroll_ext.py
@@ -236,12 +238,49 @@
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/dbcheck.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/delegation.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/dns.py
-file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain.py
-file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain_backup.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/auth/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/auth/policy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/auth/silo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/auth/silo_member.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/backup.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/claim/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/claim/claim_type.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/claim/value_type.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/classicupgrade.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/common.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/dcpromo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/demote.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/functional_prep.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/info.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/join.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/keytab.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/leave.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/level.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/auth_policy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/auth_silo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/claim_type.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/fields.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/model.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/schema.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/site.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/subnet.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/user.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/models/value_type.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/passwordsettings.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/provision.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/samba3upgrade.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/schemaupgrade.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/tombstones.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/domain/trust.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/drs.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/dsacl.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/encoders.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/forest.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/fsmo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/gpcommon.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/gpo.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/group.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/ldapcmp.py
@@ -257,10 +296,12 @@
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/spn.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/testparm.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/user.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/validators.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/netcmd/visualize.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/ntacls.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/ntstatus.so
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/param.so
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/policies.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/policy.so
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/posix_eadb.so
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/provision/__init__.py
@@ -390,8 +431,11 @@
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/alias_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/as_canonicalization_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/as_req_tests.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/authn_policy_tests.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/claims_in_pac.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/claims_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/compatability_tests.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/device_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/etype_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/fast_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/group_tests.py
@@ -404,6 +448,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/nt_hash_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/pac_align_tests.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/pkinit_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/protected_users_tests.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/raw_testcase.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/krb5/rfc4120_constants.py
@@ -425,6 +470,7 @@
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/ldap_referrals.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/ldap_spn.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/ldap_upn_sam_account.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/ldap_whoami.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/libsmb-basic.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/libsmb.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/loadparm.py
@@ -472,12 +518,18 @@
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/s3windb.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/safe_tarfile.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba3sam.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_startup_fl_change.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/__init__.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/base.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/computer.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/contact.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/demote.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/dnscmd.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/domain_auth_base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/domain_auth_policy.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/domain_auth_silo.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/domain_claim.py
+file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/domain_models.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/drs_clone_dc_data_lmdb_size.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/dsacl.py
file path=usr/lib/python$(PYVER)/vendor-packages/samba/samba/tests/samba_tool/forest.py
@@ -660,9 +712,9 @@
link path=usr/lib/samba/$(MACH64)/libndr-standard.so.0 \
target=libndr-standard.so.0.0.1
file path=usr/lib/samba/$(MACH64)/libndr-standard.so.0.0.1
-link path=usr/lib/samba/$(MACH64)/libndr.so target=libndr.so.3.0.0
-link path=usr/lib/samba/$(MACH64)/libndr.so.3 target=libndr.so.3.0.0
-file path=usr/lib/samba/$(MACH64)/libndr.so.3.0.0
+link path=usr/lib/samba/$(MACH64)/libndr.so target=libndr.so.3.0.1
+link path=usr/lib/samba/$(MACH64)/libndr.so.3 target=libndr.so.3.0.1
+file path=usr/lib/samba/$(MACH64)/libndr.so.3.0.1
link path=usr/lib/samba/$(MACH64)/libnetapi.so target=libnetapi.so.1.0.0
link path=usr/lib/samba/$(MACH64)/libnetapi.so.1 target=libnetapi.so.1.0.0
file path=usr/lib/samba/$(MACH64)/libnetapi.so.1.0.0
@@ -792,7 +844,6 @@
file path=usr/lib/samba/$(MACH64)/vfs/widelinks.so
file path=usr/lib/samba/$(MACH64)/vfs/worm.so
file path=usr/lib/samba/$(MACH64)/vfs/xattr_tdb.so
-file path=usr/lib/samba/$(MACH64)/vfs/zfsacl.so
file path=usr/lib/samba/libexec/$(MACH64)/samba/rpcd_classic
file path=usr/lib/samba/libexec/$(MACH64)/samba/rpcd_epmapper
file path=usr/lib/samba/libexec/$(MACH64)/samba/rpcd_fsrvp
@@ -812,6 +863,7 @@
file path=usr/lib/samba/private/$(MACH64)/libREG-FULL-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libRPC-SERVER-LOOP-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libRPC-WORKER-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libad-claims-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libaddns-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libads-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libasn1-samba4.so
@@ -820,6 +872,7 @@
file path=usr/lib/samba/private/$(MACH64)/libauth-unix-token-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libauth4-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libauthkrb5-samba4.so
+file path=usr/lib/samba/private/$(MACH64)/libauthn-policy-util-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libcli-cldap-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libcli-ldap-common-samba4.so
file path=usr/lib/samba/private/$(MACH64)/libcli-ldap-samba4.so
@@ -947,10 +1000,14 @@
file path=usr/lib/samba/sbin/$(MACH64)/samba_kcc
file path=usr/lib/samba/sbin/$(MACH64)/samba_spnupdate
file path=usr/lib/samba/sbin/$(MACH64)/samba_upgradedns
+file path=usr/lib/samba/setup/ad-schema/AD_DS_Attributes_Windows_Server_v1903.ldf
file path=usr/lib/samba/setup/ad-schema/AD_DS_Attributes__Windows_Server_2012_R2.ldf
file path=usr/lib/samba/setup/ad-schema/AD_DS_Attributes__Windows_Server_2016.ldf
+file path=usr/lib/samba/setup/ad-schema/AD_DS_Attributes__Windows_Server_v1803.ldf
+file path=usr/lib/samba/setup/ad-schema/AD_DS_Classes_Windows_Server_v1903.ldf
file path=usr/lib/samba/setup/ad-schema/AD_DS_Classes__Windows_Server_2012_R2.ldf
file path=usr/lib/samba/setup/ad-schema/AD_DS_Classes__Windows_Server_2016.ldf
+file path=usr/lib/samba/setup/ad-schema/AD_DS_Classes__Windows_Server_v1803.ldf
file path=usr/lib/samba/setup/ad-schema/Attributes_for_AD_DS__Windows_Server_2008_R2.ldf
file path=usr/lib/samba/setup/ad-schema/Attributes_for_AD_DS__Windows_Server_2012.ldf
file path=usr/lib/samba/setup/ad-schema/Classes_for_AD_DS__Windows_Server_2008_R2.ldf
@@ -1048,6 +1105,7 @@
file path=usr/share/man/man1/regshell.1
file path=usr/share/man/man1/regtree.1
file path=usr/share/man/man1/rpcclient.1
+file path=usr/share/man/man1/samba-log-parser.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
@@ -1065,7 +1123,6 @@
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
--
Gitblit v1.9.3