Attachment 208605 Details for Bug 241499 – v1 for samba48

v1 for samba48

a-bit-of-more-options-samba48.patch (text/plain), 10.74 KB, created by lytboris on 2019-10-26 11:05:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lytboris

Created: 2019-10-26 11:05:55 UTC

Size: 10.74 KB

patch

obsolete

>===================================================================
>--- Makefile	(revision 514892)
>+++ Makefile	(working copy)
>@@ -86,7 +86,9 @@
> OPTIONS_SUB=			yes
> 
> OPTIONS_DEFINE=			AD_DC ADS DEBUG DOCS FAM LDAP \
>-				QUOTAS SYSLOG UTMP PROFILE
>+				QUOTAS SYSLOG UTMP PROFILE \
>+				PYTHON WINBIND LIBINOTIFY JANSSON \
>+				REGEDIT LIBARCHIVE GNUTLS ACL
> # Make those default options
> OPTIONS_DEFAULT:=		${OPTIONS_DEFINE} GSSAPI_BUILTIN
> # This shouldn't be default in the release
>@@ -124,6 +126,14 @@
> PROFILE_DESC=			Profiling data
> QUOTAS_DESC=			Disk quota
> UTMP_DESC=			UTMP accounting
>+PYTHON_DESC=			Build Python modules and support
>+WINBIND_DESC=			Build winbind
>+LIBINOTIFY_DESC=		inotify support
>+JANSSON_DESC=			Add support for JSON-formatted logs
>+REGEDIT_DESC=			Build regedit
>+LIBARCHIVE_DESC=		libarchive support
>+GNUTLS_DESC=			GnuTLS support
>+ACL_DESC=			NFS/ZFS ACL support
> 
> GSSAPI_BUILTIN_DESC=		GSSAPI support via bundled Heimdal
> 
>@@ -137,26 +147,13 @@
> # Readline(sponsored by Python)
> # XXX: USES=readline pollutes CPPFLAGS, so we explicitly put dependency
> LIB_DEPENDS+=			libreadline.so.8:devel/readline
>-# popt
>-LIB_DEPENDS+=			libpopt.so:devel/popt
>-# inotify
>-LIB_DEPENDS+=			libinotify.so:devel/libinotify
>-# GNUTLS
>-LIB_DEPENDS+=			libgnutls.so:security/gnutls
>-# NFS4 ACL glue
>-LIB_DEPENDS+=			libsunacl.so:sysutils/libsunacl
>-# Jansson
>-BUILD_DEPENDS+=			jansson>=2.10:devel/jansson
>-RUN_DEPENDS+=			jansson>=2.10:devel/jansson
> # External Samba dependencies
> # Needed for IDL compiler
> BUILD_DEPENDS+=			p5-Parse-Yapp>=0:devel/p5-Parse-Yapp
>-# Libarchive
>-SAMBA4_BUNDLED_LIBS+=		!libarchive
>-BUILD_DEPENDS+=			libarchive>=3.1.2:archivers/libarchive
>-RUN_DEPENDS+=			libarchive>=3.1.2:archivers/libarchive
>+SAMBA4_BUNDLED_LIBS+=		!parse_yapp_driver
> ### Bundled libraries
> SAMBA4_BUNDLED_CMOCKA?=		no
>+SAMBA4_BUNDLED_POPT?=		no
> SAMBA4_BUNDLED_TALLOC?=		yes
> SAMBA4_BUNDLED_TEVENT?=		yes
> SAMBA4_BUNDLED_TDB?=		yes
>@@ -175,6 +172,18 @@
> PLIST_SUB+=			SAMBA4_BUNDLED_CMOCKA="@comment "
> SUB_LIST+=			SAMBA4_BUNDLED_CMOCKA="@comment "
> .endif
>+# popt
>+.if defined(SAMBA4_BUNDLED_POPT) && ${SAMBA4_BUNDLED_POPT} == yes
>+SAMBA4_BUNDLED_LIBS+=		popt
>+PLIST_SUB+=			SAMBA4_BUNDLED_POPT=""
>+SUB_LIST+=			SAMBA4_BUNDLED_POPT=""
>+.else
>+SAMBA4_BUNDLED_LIBS+=		!popt
>+BUILD_DEPENDS+=			popt>=1.16:devel/popt
>+RUN_DEPENDS+=			popt>=1.16:devel/popt
>+PLIST_SUB+=			SAMBA4_BUNDLED_POPT="@comment "
>+SUB_LIST+=			SAMBA4_BUNDLED_POPT="@comment "
>+.endif
> # talloc
> .if defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes
> SAMBA4_BUNDLED_LIBS+=		talloc
>@@ -254,8 +263,6 @@
> CONFIGURE_ARGS+=		\
> 				--with-pam \
> 				--with-iconv \
>-				--with-winbind \
>-				--with-regedit \
> 				--disable-rpath \
> 				--without-lttng \
> 				--without-gettext \
>@@ -262,9 +269,6 @@
> 				--enable-pthreadpool \
> 				--without-fake-kaserver \
> 				--without-systemd \
>-				--enable-gnutls \
>-				--with-libarchive \
>-				--with-acl-support \
> 				--with-sendfile-support \
> 				--disable-ctdb-tests \
> 				${ICONV_CONFIGURE_BASE}
>@@ -356,6 +360,20 @@
> MANDOC_BUILD_DEPENDS=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
> 				xsltproc:textproc/libxslt
> MANDOC_CONFIGURE_ENV_OFF=	XSLTPROC="true"
>+
>+WINBIND_CONFIGURE_WITH=		winbind
>+REGEDIT_CONFIGURE_WITH=		regedit
>+
>+LIBARCHIVE_CONFIGURE_WITH=	libarchive
>+LIBARCHIVE_BUILD_DEPENDS=	libarchive>=3.1.2:archivers/libarchive
>+LIBARCHIVE_RUN_DEPENDS=		libarchive>=3.1.2:archivers/libarchive
>+
>+GNUTLS_CONFIGURE_ENABLE=	gnutls
>+GNUTLS_LIB_DEPENDS=		libgnutls.so:security/gnutls
>+
>+ACL_CONFIGURE_WITH=		acl-support
>+ACL_LIB_DEPENDS=		libsunacl.so:sysutils/libsunacl
>+
> # !SAMBA4_SUBPORT
> .endif
> 
>@@ -390,7 +408,10 @@
> 				vfs_nfs4acl_xattr vfs_error_inject vfs_delay_inject
> .endif
> # Python bindings
>-.if defined(NO_PYTHON)
>+.if defined(NO_PYTHON) || !${PORT_OPTIONS:MPYTHON}
>+SAMBA_NO_PYTHON=	YES
>+.endif
>+.if defined(SAMBA_NO_PYTHON)
> USES+=				python:2.7,build,test
> CONFIGURE_ARGS+=		--disable-python
> PLIST_SUB+=			SAMBA4_PYTHON2="@comment "
>@@ -431,6 +452,19 @@
> RUN_DEPENDS+=			${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601@${PY_FLAVOR}
> .endif
> 
>+.if ${PORT_OPTIONS:MLIBINOTIFY}
>+LIB_DEPENDS=		libinotify.so:devel/libinotify
>+.else
>+EXTRA_PATCHES+=		${PATCHDIR}/detach-inotify-detection
>+.endif
>+
>+.if ${PORT_OPTIONS:MJANSSON}
>+BUILD_DEPENDS=		jansson>=2.10:devel/jansson
>+RUN_DEPENDS=		jansson>=2.10:devel/jansson
>+.else
>+EXTRA_PATCHES+=		${PATCHDIR}/detach-jansson-detection
>+.endif
>+
> .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
> SAMBA4_MODULES+=		${WANT_EXP_MODULES}
> .endif
>@@ -506,9 +540,6 @@
> 
> PORTDOCS=			README.FreeBSD
> 
>-post-extract:
>-				@${RM} -r ${WRKSRC}/pidl/lib/Parse/Yapp
>-
> post-patch:
> 				@${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \
> 					${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py
>===================================================================
>--- files/detach-inotify-detection	(nonexistent)
>+++ files/detach-inotify-detection	(working copy)
>@@ -0,0 +1,16 @@
>+--- source4/ntvfs/sysdep/wscript_configure~	2018-01-14 23:41:58.000000000 +0300
>++++ source4/ntvfs/sysdep/wscript_configure	2019-01-19 23:20:35.221507000 +0300
>+@@ -2,13 +2,5 @@
>+ 
>+ import sys
>+ 
>+-# Check for inotify support (Skip if we are SunOS)
>+-#NOTE: illumos provides sys/inotify.h but is not an exact match for linux
>+-host_os = sys.platform
>+-if host_os.rfind('sunos') == -1:
>+-    conf.CHECK_HEADERS('sys/inotify.h', add_headers=False)
>+-    if (conf.CONFIG_SET('HAVE_SYS_INOTIFY_H')):
>+-        conf.DEFINE('HAVE_LINUX_INOTIFY', 1)
>+-
>+ conf.CHECK_DECLS('F_SETLEASE', headers='linux/fcntl.h', reverse=True)
>+ conf.CHECK_DECLS('SA_SIGINFO', headers='signal.h', reverse=True)
>
>===================================================================
>--- files/detach-jansson-detection	(nonexistent)
>+++ files/detach-jansson-detection	(working copy)
>@@ -0,0 +1,9 @@
>+--- auth/wscript_configure~	2018-01-14 23:41:58.000000000 +0300
>++++ auth/wscript_configure	2019-01-19 23:22:11.642478000 +0300
>+@@ -2,6 +2,3 @@
>+ 
>+ conf.SET_TARGET_TYPE('jansson', 'EMPTY')
>+ 
>+-if conf.CHECK_CFG(package='jansson', args='--cflags --libs',
>+-		  msg='Checking for jansson'):
>+-    conf.CHECK_FUNCS_IN('json_object', 'jansson')
>
>===================================================================
>--- pkg-plist	(revision 514892)
>+++ pkg-plist	(working copy)
>@@ -19,7 +19,7 @@
> bin/regshell
> bin/regtree
> bin/rpcclient
>-bin/samba-regedit
>+%%REGEDIT%%bin/samba-regedit
> %%AD_DC%%bin/samba-tool
> bin/sharesec
> bin/smbcacls
>@@ -38,7 +38,7 @@
> bin/wbinfo
> sbin/nmbd
> sbin/smbd
>-sbin/winbindd
>+%%WINBIND%%sbin/winbindd
> %%AD_DC%%sbin/samba
> %%AD_DC%%sbin/samba_dnsupdate
> %%AD_DC%%sbin/samba_gpoupdate
>@@ -178,9 +178,9 @@
> lib/samba4/libtevent-util.so.0
> lib/samba4/libwbclient.so
> lib/samba4/libwbclient.so.0
>-lib/nss_winbind.so.1
>+%%WINBIND%%lib/nss_winbind.so.1
> lib/nss_wins.so.1
>-lib/pam_winbind.so
>+%%WINBIND%%lib/pam_winbind.so
> %%CUPS%%libexec/samba/smbspool_krb5_wrapper
> %%AD_DC%%lib/samba4/private/libdlz-bind9-for-torture-samba4.so
> %%AD_DC%%lib/samba4/private/libposix-eadb-samba4.so
>@@ -290,7 +290,7 @@
> lib/samba4/private/libutil-reg-samba4.so
> lib/samba4/private/libutil-setid-samba4.so
> lib/samba4/private/libutil-tdb-samba4.so
>-lib/samba4/private/libwinbind-client-samba4.so
>+%%WINBIND%%lib/samba4/private/libwinbind-client-samba4.so
> %%GSSAPI_BUILTIN%%lib/samba4/private/libwind-samba4.so.0
> lib/samba4/private/libxattr-tdb-samba4.so
> %%AD_DC%%lib/shared-modules/bind9/dlz_bind9_10.so
>@@ -402,7 +402,7 @@
> lib/shared-modules/vfs/virusfilter.so
> lib/shared-modules/vfs/worm.so
> lib/shared-modules/vfs/xattr_tdb.so
>-lib/shared-modules/vfs/zfsacl.so
>+%%ACL%%lib/shared-modules/vfs/zfsacl.so
> @dir lib/shared-modules/vfs
> %%AD_DC%%@dir lib/shared-modules/service
> %%AD_DC%%@dir lib/shared-modules/process_model
>@@ -479,7 +479,7 @@
> %%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/srvsvc.so
> %%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/svcctl.so
> %%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/unixinfo.so
>-%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/winbind.so
>+%%WINBIND%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/winbind.so
> %%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/winreg.so
> %%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/wkssvc.so
> %%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/dcerpc/xattr.so
>@@ -636,8 +636,8 @@
> %%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/netlogonsvc.py
> %%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/ntacls.py
> %%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/ntlmdisabled.py
>-%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind_warn_pwd_expire.py
>-%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind.py
>+%%WINBIND%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind_warn_pwd_expire.py
>+%%WINBIND%%%%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/pam_winbind.py
> %%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/param.py
> %%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_fl2003.py
> %%SAMBA4_PYTHON2%%%%PYTHON_SITELIBDIR%%/samba/tests/password_hash_fl2008.py
>@@ -881,7 +881,7 @@
> man/man3/Parse::Pidl::Wireshark::Conformance.3.gz
> man/man3/Parse::Pidl::Wireshark::NDR.3.gz
> man/man5/lmhosts.5.gz
>-man/man5/pam_winbind.conf.5.gz
>+%%WINBIND%%man/man5/pam_winbind.conf.5.gz
> man/man5/smb.conf.5.gz
> man/man5/smb4.conf.5.gz
> man/man5/smbgetrc.5.gz
>@@ -904,10 +904,10 @@
> man/man8/idmap_tdb2.8.gz
> man/man8/net.8.gz
> man/man8/nmbd.8.gz
>-man/man8/pam_winbind.8.gz
>+%%WINBIND%%man/man8/pam_winbind.8.gz
> man/man8/pdbedit.8.gz
> man/man8/samba_gpoupdate.8.gz
>-man/man8/samba-regedit.8.gz
>+%%REGEDIT%%man/man8/samba-regedit.8.gz
> man/man8/samba-tool.8.gz
> man/man8/samba.8.gz
> man/man8/smbd.8.gz
>@@ -956,9 +956,9 @@
> man/man8/vfs_virusfilter.8.gz
> man/man8/vfs_worm.8.gz
> man/man8/vfs_xattr_tdb.8.gz
>-man/man8/vfs_zfsacl.8.gz
>-man/man8/winbind_krb5_locator.8.gz
>-man/man8/winbindd.8.gz
>+%%ACL%%man/man8/vfs_zfsacl.8.gz
>+%%WINBIND%%man/man8/winbind_krb5_locator.8.gz
>+%%WINBIND%%man/man8/winbindd.8.gz
> @dir %%SAMBA4_RUNDIR%%
> @dir %%SAMBA4_LOGDIR%%
> @dir %%SAMBA4_LOCKDIR%%
>@@ -988,7 +988,7 @@
> %%CLUSTER%%etc/ctdb/events.d/31.clamd
> %%CLUSTER%%etc/ctdb/events.d/40.vsftpd
> %%CLUSTER%%etc/ctdb/events.d/41.httpd
>-%%CLUSTER%%etc/ctdb/events.d/49.winbind
>+%%WINBIND%%%%CLUSTER%%etc/ctdb/events.d/49.winbind
> %%CLUSTER%%etc/ctdb/events.d/50.samba
> %%CLUSTER%%etc/ctdb/events.d/60.nfs
> %%CLUSTER%%etc/ctdb/events.d/70.iscsi
>@@ -1054,6 +1054,7 @@
> %%SAMBA4_BUNDLED_LDB%%%%SAMBA4_PYTHON2%%lib/samba4/private/libpyldb-util.so.1
> %%SAMBA4_BUNDLED_TALLOC%%%%SAMBA4_PYTHON2%%lib/samba4/private/libpytalloc-util.so.2
> %%SAMBA4_BUNDLED_CMOCKA%%lib/samba4/private/libcmocka-samba4.so
>+%%SAMBA4_BUNDLED_POPT%%lib/samba4/private/libpopt-samba4.so
> %%SAMBA4_BUNDLED_LDB%%lib/samba4/private/libldb-cmdline-samba4.so
> %%SAMBA4_BUNDLED_LDB%%lib/shared-modules/ldb/asq.so
> %%SAMBA4_BUNDLED_LDB%%lib/shared-modules/ldb/paged_results.so

Actions: View

Attachments on bug 241499: 208605