Attachment 237394 Details for Bug 267141 – Updated patch file

[patch] Updated patch file

net_samba416.patch (text/plain), 6.27 KB, created by Yasuhiro Kimura on 2022-10-17 09:40:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yasuhiro Kimura

Created: 2022-10-17 09:40:03 UTC

Size: 6.27 KB

patch

obsolete

>From 02fae52b02ea88a698c0a35d49fe2d27b89ab48f Mon Sep 17 00:00:00 2001
>From: Yasuhiro Kimura <yasu@FreeBSD.org>
>Date: Mon, 17 Oct 2022 14:47:25 +0900
>Subject: [PATCH] net/samba416: Miscellaneous fixes and updates
>
>* Fix plist error with following cases.
>  - AD_DC option is off.
>  - ADS option is off
>  - PYTHON3 option is off.
>* Update comment about possible values of SAMBA_DEFAULT in
>  Mk/bsd.default-versions.mk
>* Update Mk/Uses/samba.mk so 4.16 is regarded as valid version of samba.
>---
> Mk/Uses/samba.mk              |  2 +-
> Mk/bsd.default-versions.mk    |  2 +-
> net/samba416/pkg-plist        | 14 ++++++++++++++
> net/samba416/pkg-plist.ad_dc  | 13 -------------
> net/samba416/pkg-plist.python |  1 -
> 5 files changed, 16 insertions(+), 16 deletions(-)
>
>diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk
>index c040d99fb374..5951e63c3dfd 100644
>--- a/Mk/Uses/samba.mk
>+++ b/Mk/Uses/samba.mk
>@@ -21,7 +21,7 @@ IGNORE=		USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun}
> 
> SAMBAPORT=	net/samba${SAMBA_DEFAULT:S/.//}
> SAMBAINCLUDES=	${LOCALBASE}/include/samba4
>-.  if ${SAMBA_DEFAULT} == 4.12 || ${SAMBA_DEFAULT} == 4.13
>+.  if ${SAMBA_DEFAULT} == 4.12 || ${SAMBA_DEFAULT} == 4.13 || ${SAMBA_DEFAULT} == 4.16
> SAMBALIBS=	${LOCALBASE}/lib/samba4
> .  else
> IGNORE=		Invalid version of samba: ${SAMBA_DEFAULT}
>diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
>index c6c620ec8010..09396136da10 100644
>--- a/Mk/bsd.default-versions.mk
>+++ b/Mk/bsd.default-versions.mk
>@@ -130,7 +130,7 @@ PYTHON3_DEFAULT?=	3.9
> RUBY_DEFAULT?=		3.0
> # Possible values: rust, rust-nightly
> RUST_DEFAULT?=		rust
>-# Possible values: 4.12, 4.13
>+# Possible values: 4.12, 4.13, 4.16
> SAMBA_DEFAULT?=		4.12
> # Possible values: base, openssl, libressl, libressl-devel
> .  if !defined(SSL_DEFAULT)
>diff --git a/net/samba416/pkg-plist b/net/samba416/pkg-plist
>index 6f2178c7734d..58ce5a3713b6 100644
>--- a/net/samba416/pkg-plist
>+++ b/net/samba416/pkg-plist
>@@ -19,6 +19,7 @@ bin/regshell
> bin/regtree
> bin/rpcclient
> bin/samba-regedit
>+%%ADS%%bin/samba-tool
> bin/sharesec
> bin/smbcacls
> bin/smbclient
>@@ -181,6 +182,7 @@ libexec/samba/samba-dcerpcd
> %%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
>@@ -198,6 +200,7 @@ libexec/samba/samba-dcerpcd
> %%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
>@@ -212,10 +215,19 @@ libexec/samba/samba-dcerpcd
> %%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
>@@ -241,6 +253,7 @@ libexec/samba/samba-dcerpcd
> %%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
>@@ -270,6 +283,7 @@ libexec/samba/samba-dcerpcd
> %%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%%
>diff --git a/net/samba416/pkg-plist.ad_dc b/net/samba416/pkg-plist.ad_dc
>index 85a2449d76ff..d7e9f6748058 100644
>--- a/net/samba416/pkg-plist.ad_dc
>+++ b/net/samba416/pkg-plist.ad_dc
>@@ -5,19 +5,6 @@ sbin/samba_kcc
> 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
>diff --git a/net/samba416/pkg-plist.python b/net/samba416/pkg-plist.python
>index fb1e5d6343f7..9b475e5d2dc0 100644
>--- a/net/samba416/pkg-plist.python
>+++ b/net/samba416/pkg-plist.python
>@@ -1,4 +1,3 @@
>-bin/samba-tool
> bin/smbtorture
> sbin/samba-gpupdate
> man/man1/smbtorture.1.gz
>-- 
>2.38.0
>

Actions: View | Diff

Attachments on bug 267141: 237392 | 237394 | 237680