Attachment #237394 for bug #267141

Lines 21-27 IGNORE= USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun} Link Here

(-)b/Mk/Uses/samba.mk (-1 / +1 lines)
21		21
22	SAMBAPORT= net/samba${SAMBA_DEFAULT:S/.//}	22	SAMBAPORT= net/samba${SAMBA_DEFAULT:S/.//}
23	SAMBAINCLUDES= ${LOCALBASE}/include/samba4	23	SAMBAINCLUDES= ${LOCALBASE}/include/samba4
24	. if ${SAMBA_DEFAULT} == 4.12 \|\| ${SAMBA_DEFAULT} == 4.13	24	. if ${SAMBA_DEFAULT} == 4.12 \|\| ${SAMBA_DEFAULT} == 4.13 \|\| ${SAMBA_DEFAULT} == 4.16
25	SAMBALIBS= ${LOCALBASE}/lib/samba4	25	SAMBALIBS= ${LOCALBASE}/lib/samba4
26	. else	26	. else
27	IGNORE= Invalid version of samba: ${SAMBA_DEFAULT}	27	IGNORE= Invalid version of samba: ${SAMBA_DEFAULT}

Lines 130-136 PYTHON3_DEFAULT?= 3.9 Link Here

(-)b/Mk/bsd.default-versions.mk (-1 / +1 lines)
130	RUBY_DEFAULT?= 3.0	130	RUBY_DEFAULT?= 3.0
131	# Possible values: rust, rust-nightly	131	# Possible values: rust, rust-nightly
132	RUST_DEFAULT?= rust	132	RUST_DEFAULT?= rust
133	# Possible values: 4.12, 4.13	133	# Possible values: 4.12, 4.13, 4.16
134	SAMBA_DEFAULT?= 4.12	134	SAMBA_DEFAULT?= 4.12
135	# Possible values: base, openssl, libressl, libressl-devel	135	# Possible values: base, openssl, libressl, libressl-devel
136	. if !defined(SSL_DEFAULT)	136	. if !defined(SSL_DEFAULT)




bin/regtree
bin/rpcclient
bin/samba-regedit
%%ADS%%bin/samba-tool
bin/sharesec
bin/smbcacls
bin/smbclient

%%LDAP%%%%SAMBA4_LIBDIR%%/private/libsmbldaphelper-samba4.so
%%SAMBA4_LIBDIR%%/private/libaddns-samba4.so
%%SAMBA4_LIBDIR%%/private/libads-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libasn1-samba4.so
%%SAMBA4_LIBDIR%%/private/libasn1util-samba4.so
%%SAMBA4_LIBDIR%%/private/libauth-samba4.so
%%SAMBA4_LIBDIR%%/private/libauth-unix-token-samba4.so

%%SAMBA4_LIBDIR%%/private/libcluster-samba4.so
%%SAMBA4_LIBDIR%%/private/libcmdline-contexts-samba4.so
%%SAMBA4_LIBDIR%%/private/libcmdline-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libcom-err-samba4.so
%%SAMBA4_LIBDIR%%/private/libcommon-auth-samba4.so
%%SAMBA4_LIBDIR%%/private/libdbwrap-samba4.so
%%SAMBA4_LIBDIR%%/private/libdcerpc-pkt-auth-samba4.so

%%SAMBA4_LIBDIR%%/private/libgpext-samba4.so
%%SAMBA4_LIBDIR%%/private/libgpo-samba4.so
%%SAMBA4_LIBDIR%%/private/libgse-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libgss-preauth-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libgssapi-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhcrypto-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhdb-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libheimbase-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libheimntlm-samba4.so
%%SAMBA4_LIBDIR%%/private/libhttp-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhx509-samba4.so
%%SAMBA4_LIBDIR%%/private/libidmap-samba4.so
%%SAMBA4_LIBDIR%%/private/libinterfaces-samba4.so
%%SAMBA4_LIBDIR%%/private/libiov-buf-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libkdc-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libkrb5-samba4.so
%%SAMBA4_LIBDIR%%/private/libkrb5samba-samba4.so
%%SAMBA4_LIBDIR%%/private/libldbsamba-samba4.so
%%SAMBA4_LIBDIR%%/private/liblibcli-lsa3-samba4.so

%%SAMBA4_LIBDIR%%/private/libREG-FULL-samba4.so
%%SAMBA4_LIBDIR%%/private/libregistry-samba4.so
%%SAMBA4_LIBDIR%%/private/libreplace-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libroken-samba4.so
%%SAMBA4_LIBDIR%%/private/libRPC-SERVER-LOOP-samba4.so
%%SAMBA4_LIBDIR%%/private/libRPC-WORKER-samba4.so
%%SAMBA4_LIBDIR%%/private/libsamba-cluster-support-samba4.so

%%SAMBA4_LIBDIR%%/private/libutil-reg-samba4.so
%%SAMBA4_LIBDIR%%/private/libutil-setid-samba4.so
%%SAMBA4_LIBDIR%%/private/libutil-tdb-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libwind-samba4.so
%%SAMBA4_LIBDIR%%/private/libxattr-tdb-samba4.so
@dir %%SAMBA4_LIBDIR%%/private
@dir %%SAMBA4_LIBDIR%%




sbin/samba_spnupdate
sbin/samba_upgradedns
include/samba4/dcerpc_server.h
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libasn1-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libcom-err-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libgss-preauth-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libgssapi-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhcrypto-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhdb-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libheimbase-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libheimntlm-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhx509-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libkdc-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libkrb5-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libroken-samba4.so
%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libwind-samba4.so
%%SAMBA4_LIBDIR%%/libdcerpc-server.so
%%SAMBA4_LIBDIR%%/libdcerpc-server.so.0
%%SAMBA4_LIBDIR%%/private/libdlz-bind9-for-torture-samba4.so

Lines 1-4 Link Here

(-)b/net/samba416/pkg-plist.python (-2 lines)
1	bin/samba-tool
2	bin/smbtorture	1	bin/smbtorture
3	sbin/samba-gpupdate	2	sbin/samba-gpupdate
4	man/man1/smbtorture.1.gz	3	man/man1/smbtorture.1.gz
5	-

Return to bug 267141

Lines 19-24 bin/regshell Link Here

(-)b/net/samba416/pkg-plist (+14 lines)
19	bin/regtree	19	bin/regtree
20	bin/rpcclient	20	bin/rpcclient
21	bin/samba-regedit	21	bin/samba-regedit
		22	%%ADS%%bin/samba-tool
22	bin/sharesec	23	bin/sharesec
23	bin/smbcacls	24	bin/smbcacls
24	bin/smbclient	25	bin/smbclient
Lines 181-186 libexec/samba/samba-dcerpcd Link Here
181	%%LDAP%%%%SAMBA4_LIBDIR%%/private/libsmbldaphelper-samba4.so	182	%%LDAP%%%%SAMBA4_LIBDIR%%/private/libsmbldaphelper-samba4.so
182	%%SAMBA4_LIBDIR%%/private/libaddns-samba4.so	183	%%SAMBA4_LIBDIR%%/private/libaddns-samba4.so
183	%%SAMBA4_LIBDIR%%/private/libads-samba4.so	184	%%SAMBA4_LIBDIR%%/private/libads-samba4.so
		185	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libasn1-samba4.so
184	%%SAMBA4_LIBDIR%%/private/libasn1util-samba4.so	186	%%SAMBA4_LIBDIR%%/private/libasn1util-samba4.so
185	%%SAMBA4_LIBDIR%%/private/libauth-samba4.so	187	%%SAMBA4_LIBDIR%%/private/libauth-samba4.so
186	%%SAMBA4_LIBDIR%%/private/libauth-unix-token-samba4.so	188	%%SAMBA4_LIBDIR%%/private/libauth-unix-token-samba4.so
Lines 198-203 libexec/samba/samba-dcerpcd Link Here
198	%%SAMBA4_LIBDIR%%/private/libcluster-samba4.so	200	%%SAMBA4_LIBDIR%%/private/libcluster-samba4.so
199	%%SAMBA4_LIBDIR%%/private/libcmdline-contexts-samba4.so	201	%%SAMBA4_LIBDIR%%/private/libcmdline-contexts-samba4.so
200	%%SAMBA4_LIBDIR%%/private/libcmdline-samba4.so	202	%%SAMBA4_LIBDIR%%/private/libcmdline-samba4.so
		203	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libcom-err-samba4.so
201	%%SAMBA4_LIBDIR%%/private/libcommon-auth-samba4.so	204	%%SAMBA4_LIBDIR%%/private/libcommon-auth-samba4.so
202	%%SAMBA4_LIBDIR%%/private/libdbwrap-samba4.so	205	%%SAMBA4_LIBDIR%%/private/libdbwrap-samba4.so
203	%%SAMBA4_LIBDIR%%/private/libdcerpc-pkt-auth-samba4.so	206	%%SAMBA4_LIBDIR%%/private/libdcerpc-pkt-auth-samba4.so
Lines 212-221 libexec/samba/samba-dcerpcd Link Here
212	%%SAMBA4_LIBDIR%%/private/libgpext-samba4.so	215	%%SAMBA4_LIBDIR%%/private/libgpext-samba4.so
213	%%SAMBA4_LIBDIR%%/private/libgpo-samba4.so	216	%%SAMBA4_LIBDIR%%/private/libgpo-samba4.so
214	%%SAMBA4_LIBDIR%%/private/libgse-samba4.so	217	%%SAMBA4_LIBDIR%%/private/libgse-samba4.so
		218	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libgss-preauth-samba4.so
		219	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libgssapi-samba4.so
		220	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhcrypto-samba4.so
		221	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhdb-samba4.so
		222	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libheimbase-samba4.so
		223	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libheimntlm-samba4.so
215	%%SAMBA4_LIBDIR%%/private/libhttp-samba4.so	224	%%SAMBA4_LIBDIR%%/private/libhttp-samba4.so
		225	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhx509-samba4.so
216	%%SAMBA4_LIBDIR%%/private/libidmap-samba4.so	226	%%SAMBA4_LIBDIR%%/private/libidmap-samba4.so
217	%%SAMBA4_LIBDIR%%/private/libinterfaces-samba4.so	227	%%SAMBA4_LIBDIR%%/private/libinterfaces-samba4.so
218	%%SAMBA4_LIBDIR%%/private/libiov-buf-samba4.so	228	%%SAMBA4_LIBDIR%%/private/libiov-buf-samba4.so
		229	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libkdc-samba4.so
		230	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libkrb5-samba4.so
219	%%SAMBA4_LIBDIR%%/private/libkrb5samba-samba4.so	231	%%SAMBA4_LIBDIR%%/private/libkrb5samba-samba4.so
220	%%SAMBA4_LIBDIR%%/private/libldbsamba-samba4.so	232	%%SAMBA4_LIBDIR%%/private/libldbsamba-samba4.so
221	%%SAMBA4_LIBDIR%%/private/liblibcli-lsa3-samba4.so	233	%%SAMBA4_LIBDIR%%/private/liblibcli-lsa3-samba4.so
Lines 241-246 libexec/samba/samba-dcerpcd Link Here
241	%%SAMBA4_LIBDIR%%/private/libREG-FULL-samba4.so	253	%%SAMBA4_LIBDIR%%/private/libREG-FULL-samba4.so
242	%%SAMBA4_LIBDIR%%/private/libregistry-samba4.so	254	%%SAMBA4_LIBDIR%%/private/libregistry-samba4.so
243	%%SAMBA4_LIBDIR%%/private/libreplace-samba4.so	255	%%SAMBA4_LIBDIR%%/private/libreplace-samba4.so
		256	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libroken-samba4.so
244	%%SAMBA4_LIBDIR%%/private/libRPC-SERVER-LOOP-samba4.so	257	%%SAMBA4_LIBDIR%%/private/libRPC-SERVER-LOOP-samba4.so
245	%%SAMBA4_LIBDIR%%/private/libRPC-WORKER-samba4.so	258	%%SAMBA4_LIBDIR%%/private/libRPC-WORKER-samba4.so
246	%%SAMBA4_LIBDIR%%/private/libsamba-cluster-support-samba4.so	259	%%SAMBA4_LIBDIR%%/private/libsamba-cluster-support-samba4.so
Lines 270-275 libexec/samba/samba-dcerpcd Link Here
270	%%SAMBA4_LIBDIR%%/private/libutil-reg-samba4.so	283	%%SAMBA4_LIBDIR%%/private/libutil-reg-samba4.so
271	%%SAMBA4_LIBDIR%%/private/libutil-setid-samba4.so	284	%%SAMBA4_LIBDIR%%/private/libutil-setid-samba4.so
272	%%SAMBA4_LIBDIR%%/private/libutil-tdb-samba4.so	285	%%SAMBA4_LIBDIR%%/private/libutil-tdb-samba4.so
		286	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libwind-samba4.so
273	%%SAMBA4_LIBDIR%%/private/libxattr-tdb-samba4.so	287	%%SAMBA4_LIBDIR%%/private/libxattr-tdb-samba4.so
274	@dir %%SAMBA4_LIBDIR%%/private	288	@dir %%SAMBA4_LIBDIR%%/private
275	@dir %%SAMBA4_LIBDIR%%	289	@dir %%SAMBA4_LIBDIR%%

Lines 5-23 sbin/samba_kcc Link Here

(-)b/net/samba416/pkg-plist.ad_dc (-13 lines)
5	sbin/samba_spnupdate	5	sbin/samba_spnupdate
6	sbin/samba_upgradedns	6	sbin/samba_upgradedns
7	include/samba4/dcerpc_server.h	7	include/samba4/dcerpc_server.h
8	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libasn1-samba4.so
9	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libcom-err-samba4.so
10	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libgss-preauth-samba4.so
11	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libgssapi-samba4.so
12	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhcrypto-samba4.so
13	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhdb-samba4.so
14	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libheimbase-samba4.so
15	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libheimntlm-samba4.so
16	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libhx509-samba4.so
17	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libkdc-samba4.so
18	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libkrb5-samba4.so
19	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libroken-samba4.so
20	%%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libwind-samba4.so
21	%%SAMBA4_LIBDIR%%/libdcerpc-server.so	8	%%SAMBA4_LIBDIR%%/libdcerpc-server.so
22	%%SAMBA4_LIBDIR%%/libdcerpc-server.so.0	9	%%SAMBA4_LIBDIR%%/libdcerpc-server.so.0
23	%%SAMBA4_LIBDIR%%/private/libdlz-bind9-for-torture-samba4.so	10	%%SAMBA4_LIBDIR%%/private/libdlz-bind9-for-torture-samba4.so