Date: Fri, 24 Mar 2017 23:44:02 +0000 (UTC) From: "Timur I. Bakeyev" <timur@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436862 - in head/net: . samba45 samba45/files samba45/files/man Message-ID: <201703242344.v2ONi2Du065049@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Fri Mar 24 23:44:02 2017 New Revision: 436862 URL: https://svnweb.freebsd.org/changeset/ports/436862 Log: Add net/samba45 port version 4.5.7 to address CVE-2017-2619 Security: CVE-2017-2619 Added: head/net/samba45/ - copied from r436823, head/net/samba44/ head/net/samba45/files/man/idmap_script.8 (contents, props changed) Deleted: head/net/samba45/files/patch-source3__smbd__close.c head/net/samba45/files/patch-source3__smbd__open.c Modified: head/net/Makefile head/net/samba45/Makefile head/net/samba45/distinfo head/net/samba45/files/man/gentest.1 head/net/samba45/files/man/locktest.1 head/net/samba45/files/man/masktest.1 head/net/samba45/files/man/ndrdump.1 head/net/samba45/files/man/nmblookup4.1 head/net/samba45/files/man/ntlm_auth4.1 head/net/samba45/files/man/oLschema2ldif.1 head/net/samba45/files/man/regdiff.1 head/net/samba45/files/man/regpatch.1 head/net/samba45/files/man/regshell.1 head/net/samba45/files/man/regtree.1 head/net/samba45/files/man/smbtorture.1 head/net/samba45/files/patch-buildtools__scripts__abi_gen.sh head/net/samba45/files/patch-buildtools__wafsamba__samba_install.py head/net/samba45/files/patch-docs-xml__wscript_build head/net/samba45/files/patch-dynconfig__wscript head/net/samba45/files/patch-lib__crypto__wscript_configure head/net/samba45/files/patch-nsswitch__wscript_build head/net/samba45/files/patch-source3__client__dnsbrowse.c head/net/samba45/files/patch-source3__modules__vfs_fruit.c head/net/samba45/files/patch-source3__smbd__quotas.c head/net/samba45/files/patch-source3__utils__net.c head/net/samba45/files/patch-source3__utils__net_time.c head/net/samba45/files/patch-source3__wscript head/net/samba45/files/patch-source3__wscript_build head/net/samba45/files/patch-source4__lib__http__http.c head/net/samba45/files/patch-third_party__waf__wafadmin__Logs.py head/net/samba45/files/patch-wscript head/net/samba45/pkg-plist Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Fri Mar 24 23:20:53 2017 (r436861) +++ head/net/Makefile Fri Mar 24 23:44:02 2017 (r436862) @@ -1234,6 +1234,7 @@ SUBDIR += samba42 SUBDIR += samba43 SUBDIR += samba44 + SUBDIR += samba45 SUBDIR += samplicator SUBDIR += sbd SUBDIR += sbm Modified: head/net/samba45/Makefile ============================================================================== --- head/net/samba44/Makefile Fri Mar 24 16:22:45 2017 (r436823) +++ head/net/samba45/Makefile Fri Mar 24 23:44:02 2017 (r436862) @@ -1,512 +1,395 @@ # Created by: timur@FreeBSD.org # $FreeBSD$ -PORTNAME?= ${SAMBA4_BASENAME}44 -PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 0 -CATEGORIES?= net -MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc -DISTNAME= ${SAMBA4_DISTNAME} +PORTNAME?= ${SAMBA4_BASENAME}45 +PORTVERSION?= ${SAMBA4_VERSION} +PORTREVISION?= 0 +CATEGORIES?= net +MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc +DISTNAME= ${SAMBA4_DISTNAME} -MAINTAINER?= timur@FreeBSD.org -COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix +MAINTAINER?= timur@FreeBSD.org +COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix -LICENSE= GPLv3 +LICENSE= GPLv3 -CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba41-4.1.* samba42-4.2.* samba43-4.3.* +CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-46]-4.* #EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1 -SAMBA4_BASENAME= samba -SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.4.12 -SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} +SAMBA4_BASENAME= samba +SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 +SAMBA4_VERSION= 4.5.7 +SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} -WRKSRC?= ${WRKDIR}/${DISTNAME} +WRKSRC?= ${WRKDIR}/${DISTNAME} .if !defined(SAMBA4_SUBPORT) -CPE_VENDOR= samba -CPE_PRODUCT= samba +CPE_VENDOR= samba +CPE_PRODUCT= samba # Directories -VARDIR= ${DESTDIR}/var -SAMBA4_RUNDIR= ${VARDIR}/run/${SAMBA4_PORTNAME} -SAMBA4_LOGDIR= ${VARDIR}/log/${SAMBA4_PORTNAME} -SAMBA4_LOCKDIR= ${VARDIR}/db/${SAMBA4_PORTNAME} -SAMBA4_PRIVATEDIR= ${SAMBA4_LOCKDIR}/private -SAMBA4_PAMDIR= ${PREFIX}/lib -SAMBA4_LIBDIR= ${PREFIX}/lib/${SAMBA4_PORTNAME} -SAMBA4_MODULEDIR= ${PREFIX}/lib/shared-modules -SAMBA4_INCLUDEDIR= ${PREFIX}/include/${SAMBA4_PORTNAME} -SAMBA4_CONFDIR= ${PREFIX}/etc -SAMBA4_CONFIG= smb4.conf - -CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man" \ - --sysconfdir="${SAMBA4_CONFDIR}" \ - --includedir="${SAMBA4_INCLUDEDIR}" \ - --datadir="${DATADIR}" \ - --libdir="${SAMBA4_LIBDIR}" \ - --with-privatelibdir="${SAMBA4_LIBDIR}/private" \ - --with-pammodulesdir="${SAMBA4_PAMDIR}" \ - --with-modulesdir="${SAMBA4_MODULEDIR}" \ - --with-pkgconfigdir="${PKGCONFIGDIR}" \ - --localstatedir="${VARDIR}" \ - --with-piddir="${SAMBA4_RUNDIR}" \ - --with-sockets-dir="${SAMBA4_RUNDIR}" \ - --with-privileged-socket-dir="${SAMBA4_RUNDIR}" \ - --with-lockdir="${SAMBA4_LOCKDIR}" \ - --with-statedir="${SAMBA4_LOCKDIR}" \ - --with-cachedir="${SAMBA4_LOCKDIR}" \ - --with-privatedir="${SAMBA4_PRIVATEDIR}" \ - --with-logfilebase="${SAMBA4_LOGDIR}" +VARDIR= ${DESTDIR}/var +SAMBA4_RUNDIR= ${VARDIR}/run/${SAMBA4_PORTNAME} +SAMBA4_LOGDIR= ${VARDIR}/log/${SAMBA4_PORTNAME} +SAMBA4_LOCKDIR= ${VARDIR}/db/${SAMBA4_PORTNAME} +SAMBA4_PRIVATEDIR= ${SAMBA4_LOCKDIR}/private +SAMBA4_PAMDIR= ${PREFIX}/lib +SAMBA4_LIBDIR= ${PREFIX}/lib/${SAMBA4_PORTNAME} +SAMBA4_MODULEDIR= ${PREFIX}/lib/shared-modules +SAMBA4_INCLUDEDIR= ${PREFIX}/include/${SAMBA4_PORTNAME} +SAMBA4_CONFDIR= ${PREFIX}/etc +SAMBA4_CONFIG= smb4.conf + +CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man" \ + --sysconfdir="${SAMBA4_CONFDIR}" \ + --includedir="${SAMBA4_INCLUDEDIR}" \ + --datadir="${DATADIR}" \ + --libdir="${SAMBA4_LIBDIR}" \ + --with-privatelibdir="${SAMBA4_LIBDIR}/private" \ + --with-pammodulesdir="${SAMBA4_PAMDIR}" \ + --with-modulesdir="${SAMBA4_MODULEDIR}" \ + --with-pkgconfigdir="${PKGCONFIGDIR}" \ + --localstatedir="${VARDIR}" \ + --with-piddir="${SAMBA4_RUNDIR}" \ + --with-sockets-dir="${SAMBA4_RUNDIR}" \ + --with-privileged-socket-dir="${SAMBA4_RUNDIR}" \ + --with-lockdir="${SAMBA4_LOCKDIR}" \ + --with-statedir="${SAMBA4_LOCKDIR}" \ + --with-cachedir="${SAMBA4_LOCKDIR}" \ + --with-privatedir="${SAMBA4_PRIVATEDIR}" \ + --with-logfilebase="${SAMBA4_LOGDIR}" # Flags -CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" +CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" -USES= cpe compiler waf pkgconfig perl5 python:2 \ - readline iconv shebangfix -USE_PERL5= build -USE_LDCONFIG= ${SAMBA4_LIBDIR} -WAF_CMD= buildtools/bin/waf -CONFIGURE_LOG= bin/config.log - -PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig -PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} -# XXX: Unconditional dependencies which can't be switched off(if present -# in the system) +USES= cpe compiler waf pkgconfig perl5 python:2 \ + readline iconv shebangfix +USE_PERL5= build +USE_LDCONFIG= ${SAMBA4_LIBDIR} +WAF_CMD= buildtools/bin/waf +CONFIGURE_LOG= bin/config.log + +PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig +PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S,^${PREFIX}/,,} +PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR_REL} +############################################################################## +# Options +OPTIONS_DEFINE= ADS AD_DC CUPS DEBUG \ + DOCS FAM LDAP \ + QUOTAS SYSLOG UTMP + +OPTIONS_DEFAULT:= ADS AD_DC DEBUG \ + DOCS FAM LDAP \ + QUOTAS SYSLOG UTMP + +OPTIONS_SUB= yes + +AD_DC_DESC= Active Directory Domain Controller support +ADS_DESC= Active Directory client support(implies LDAP) +EXP_MODULES_DESC= Experimental modules(WANT_EXP_MODULES) +FAM_DESC= File Alteration Monitor support +LDAP_DESC= LDAP client support +PAM_SMBPASS_DESC= PAM authentication via passdb backends +QUOTAS_DESC= Disk quota support +UTMP_DESC= UTMP accounting support +############################################################################## +OPTIONS_DEFINE+= DEVELOPER MANPAGES EXP_MODULES NTVFS + +DEVELOPER_DESC= With development support(implies NTVFS) +MANPAGES_DESC= Build manpages from DOCBOOK templates +NTVFS_DESC= Build *DEPRECATED* NTVFS file server + +OPTIONS_RADIO= DNS ZEROCONF +OPTIONS_RADIO_DNS= NSUPDATE BIND99 BIND910 BIND911 +OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER + +BIND99_DESC= Use Bind 9.9 as AD DC DNS server frontend +BIND910_DESC= Use Bind 9.10 as AD DC DNS server frontend +BIND911_DESC= Use Bind 9.11 as AD DC DNS server frontend +NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC +# XXX: Unconditional dependencies which can't be switched off(if present in the system) # popt -LIB_DEPENDS+= libpopt.so:devel/popt +LIB_DEPENDS+= libpopt.so:devel/popt # inotify -LIB_DEPENDS+= libinotify.so:devel/libinotify +LIB_DEPENDS+= libinotify.so:devel/libinotify # GNUTLS -LIB_DEPENDS+= libgnutls.so:security/gnutls +LIB_DEPENDS+= libgnutls.so:security/gnutls # NFS4 ACL glue -LIB_DEPENDS+= libsunacl.so:sysutils/libsunacl +LIB_DEPENDS+= libsunacl.so:sysutils/libsunacl # Libarchive -BUILD_DEPENDS+= libarchive>=3.1.2:archivers/libarchive -RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive +BUILD_DEPENDS+= libarchive>=3.1.2:archivers/libarchive +RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive # External Samba dependencies # IDL compiler -BUILD_DEPENDS+= p5-Parse-Pidl>=4.3.1:devel/p5-Parse-Pidl +BUILD_DEPENDS+= p5-Parse-Pidl>=4.5.0:devel/p5-Parse-Pidl +PLIST_SUB+= PIDL="@comment " # External Python modules -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython -PLIST_SUB+= PY_DNSPYTHON="@comment " +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython +PLIST_SUB+= PY_DNSPYTHON="@comment " # -BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 -PLIST_SUB+= PY_ISO8601="@comment " +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 +PLIST_SUB+= PY_ISO8601="@comment " # talloc -BUILD_DEPENDS+= talloc>=2.1.6:devel/talloc -RUN_DEPENDS+= talloc>=2.1.6:devel/talloc -SAMBA4_BUNDLED_LIBS+= !talloc +BUILD_DEPENDS+= talloc>=2.1.8:devel/talloc +RUN_DEPENDS+= talloc>=2.1.8:devel/talloc +SAMBA4_BUNDLED_LIBS+= !talloc # tevent -BUILD_DEPENDS+= tevent>=0.9.28:devel/tevent -RUN_DEPENDS+= tevent>=0.9.28:devel/tevent -SAMBA4_BUNDLED_LIBS+= !tevent +BUILD_DEPENDS+= tevent>=0.9.29:devel/tevent +RUN_DEPENDS+= tevent>=0.9.29:devel/tevent +SAMBA4_BUNDLED_LIBS+= !tevent # tdb -BUILD_DEPENDS+= tdb>=1.3.8:databases/tdb -RUN_DEPENDS+= tdb>=1.3.8:databases/tdb -SAMBA4_BUNDLED_LIBS+= !tdb +BUILD_DEPENDS+= tdb>=1.3.10:databases/tdb +RUN_DEPENDS+= tdb>=1.3.10:databases/tdb +SAMBA4_BUNDLED_LIBS+= !tdb # ldb -BUILD_DEPENDS+= ldb>=1.1.26:databases/ldb -RUN_DEPENDS+= ldb>=1.1.26:databases/ldb -SAMBA4_BUNDLED_LIBS+= !ldb +BUILD_DEPENDS+= ldb>=1.1.27:databases/ldb +RUN_DEPENDS+= ldb>=1.1.27:databases/ldb +SAMBA4_BUNDLED_LIBS+= !ldb # Don't use external libcom_err -SAMBA4_BUNDLED_LIBS+= com_err -############################################################################## -# Options -OPTIONS_DEFINE= ACL_SUPPORT AD_DC ADS CUPS DEBUG \ - DNSUPDATE DOCS FAM LDAP \ - PTHREADPOOL QUOTAS SYSLOG UTMP - -OPTIONS_DEFAULT:= ACL_SUPPORT AD_DC ADS DEBUG \ - DNSUPDATE DOCS FAM LDAP \ - PTHREADPOOL QUOTAS SYSLOG UTMP - -ACL_SUPPORT_DESC= File system ACL support -AD_DC_DESC= Active Directory Domain Controller support -ADS_DESC= Active Directory client support -DNSUPDATE_DESC= Dynamic DNS update (require ADS) -EXP_MODULES_DESC= Experimental modules -FAM_DESC= File Alteration Monitor support -LDAP_DESC= LDAP client support -PAM_SMBPASS_DESC= PAM authentication via passdb backends -PTHREADPOOL_DESC= Pthread pool -QUOTAS_DESC= Disk quota support -UTMP_DESC= UTMP accounting support -############################################################################## -OPTIONS_DEFINE+= DEVELOPER MANPAGES EXP_MODULES +SAMBA4_BUNDLED_LIBS+= com_err -DEVELOPER_DESC= With development support -MANPAGES_DESC= Build manpages from DOCBOOK templates +CONFIGURE_ARGS+= \ + --with-pam \ + --with-iconv \ + --with-winbind \ + --disable-rpath \ + --without-gettext \ + --enable-pthreadpool \ + --with-acl-support \ + --with-sendfile-support \ + ${ICONV_CONFIGURE_BASE} + +BIND99_RUN_DEPENDS= bind99>=9.9.0.0:dns/bind99 +BIND910_RUN_DEPENDS= bind910>=9.10.0.0:dns/bind910 +BIND911_RUN_DEPENDS= bind911>=9.11.0.0:dns/bind911 +NSUPDATE_RUN_DEPENDS= samba-nsupdate:dns/samba-nsupdate + +DEBUG_CONFIGURE_ENABLE= debug +DEBUG_CONFIGURE_ON= --verbose +DEBUG_MAKE_ARGS= --verbose +DEBUG_VARS= WITH_DEBUG=yes -OPTIONS_RADIO= DNS ZEROCONF -OPTIONS_RADIO_DNS= NSUPDATE BIND99 BIND910 BIND911 -OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER - -BIND99_DESC= Use bind99 as AD DC DNS server frontend -BIND910_DESC= Use bind910 as AD DC DNS server frontend -BIND911_DESC= Use bind911 as AD DC DNS server frontend -NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046 +GDB_CMD?= ${LOCALBASE}/bin/gdb +# https://bugzilla.samba.org/show_bug.cgi?id=8969 +DEVELOPER_IMPLIES= NTVFS +DEVELOPER_BUILD_DEPENDS= ${GDB_CMD}:devel/gdb +DEVELOPER_RUN_DEPENDS= ${GDB_CMD}:devel/gdb +#DEVELOPER_CONFIGURE_ENABLE= developer selftest +DEVELOPER_CONFIGURE_ON= --enable-developer --enable-selftest --abi-check-disable +DEVELOPER_VARS_OFF= GDB_CMD=true +# XXX: Mostly used in conjuction with DEVELOPER option, don't enable it if you don't know what you are doing +NTVFS_CONFIGURE_WITH= ntvfs-fileserver +############################################################################## +AVAHI_CONFIGURE_ENABLE= avahi +AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app -.include <bsd.port.options.mk> +MDNSRESPONDER_CONFIGURE_ENABLE= dnssd +MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder -CONFIGURE_ARGS+= \ - --with-pam \ - --with-iconv \ - --with-winbind \ - --disable-rpath \ - --without-gettext \ - --with-sendfile-support \ - ${ICONV_CONFIGURE_BASE} -# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack) -.if ${ARCH} == "amd64" -CFLAGS+= -fno-omit-frame-pointer -.endif +CUPS_CONFIGURE_ENABLE= cups iprint +CUPS_LIB_DEPENDS= libcups.so:print/cups -.if ${PORT_OPTIONS:MBIND99} -RUN_DEPENDS+= bind99>=9.9.0.0:dns/bind99 -SUB_LIST+= NSUPDATE="@comment " -.elif ${PORT_OPTIONS:MBIND910} -RUN_DEPENDS+= bind910>=9.10.0.0:dns/bind910 -SUB_LIST+= NSUPDATE="@comment " -.elif ${PORT_OPTIONS:MBIND911} -RUN_DEPENDS+= bind911>=9.11.0.0:dns/bind911 -SUB_LIST+= NSUPDATE="@comment " -.elif ${PORT_OPTIONS:MNSUPDATE} -RUN_DEPENDS+= samba-nsupdate:dns/samba-nsupdate -SUB_LIST+= NSUPDATE="" -.else -SUB_LIST+= NSUPDATE="@comment " -.endif - -.if ${PORT_OPTIONS:MDEBUG} -WITH_DEBUG= yes -CONFIGURE_ARGS+= --verbose -MAKE_ARGS+= --verbose -CONFIGURE_ARGS+= --enable-debug -.endif +# https://bugzilla.samba.org/show_bug.cgi?id=9545 +FAM_USES= fam +FAM_CONFIGURE_WITH= fam -# https://bugzilla.samba.org/show_bug.cgi?id=8969 -.if ${PORT_OPTIONS:MDEVELOPER} -#GDB_CMD?= gdb79 -# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046 -# XXX: Still may break, if the link isn't installed - blame devel/gdb maintainer then. -GDB_CMD?= ${LOCALBASE}/bin/gdb -BUILD_DEPENDS+= ${GDB_CMD}:devel/gdb -RUN_DEPENDS+= ${GDB_CMD}:devel/gdb -SAMBA4_MODULES+= auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls -CONFIGURE_ARGS+= --enable-developer --enable-selftest --with-ntvfs-fileserver --abi-check-disable -PLIST_SUB+= DEVELOPER="" NTVFS="" -.else -GDB_CMD= true -CONFIGURE_ARGS+= --without-ntvfs-fileserver -PLIST_SUB+= DEVELOPER="@comment " NTVFS="@comment " -.endif -############################################################################## -# XXX: That will blow up your installation -# https://bugzilla.samba.org/show_bug.cgi?id=9302 -.if defined(CRAZY) -WANT_EXP_MODULES= auth_samba4 auth_script auth_skel auth_unix auth_wbc \ - gpext_registry gpext_scripts gpext_security idmap_ad \ - idmap_autorid idmap_hash idmap_ldap idmap_passdb \ - idmap_rid idmap_tdb idmap_tdb2 idmap_nss nss_info_template \ - pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \ - pdb_test pdb_wbc_sam perfcount_test vfs_acl_tdb \ - vfs_acl_xattr vfs_aio_fork \ - vfs_aio_pthread vfs_audit vfs_cacheprime vfs_cap \ - vfs_catia vfs_commit vfs_crossrename vfs_default_quota \ - vfs_dfs_samba4 vfs_dirsort vfs_expand_msdfs vfs_extd_audit \ - vfs_fake_acls vfs_fake_perms vfs_full_audit vfs_media_harmony \ - vfs_netatalk vfs_posix_eadb vfs_preopen vfs_readahead \ - vfs_readonly vfs_recycle vfs_scannedonly vfs_shadow_copy \ - vfs_shadow_copy2 vfs_shadow_copy_test vfs_skel_opaque \ - vfs_skel_transparent vfs_smb_traffic_analyzer vfs_streams_depot \ - vfs_streams_xattr vfs_syncops vfs_time_audit \ - vfs_xattr_tdb vfs_zfsacl -.endif +QUOTAS_CONFIGURE_WITH= quotas -.if ${PORT_OPTIONS:MEXP_MODULES} -. if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES) -WANT_EXP_MODULES= vfs_cacheprime gpext_scripts gpext_security gpext_registry -. endif -.endif +SYSLOG_CONFIGURE_WITH= syslog -.if ${PORT_OPTIONS:MACL_SUPPORT} -LIB_DEPENDS+= libsunacl.so:sysutils/libsunacl -WANT_EXP_MODULES+= vfs_zfsacl -SAMBA4_MODULES+= vfs_zfsacl -CONFIGURE_ARGS+= --with-acl-support -.else -CONFIGURE_ARGS+= --without-acl-support -.endif - -.if ! ${PORT_OPTIONS:MAD_DC} -CONFIGURE_ARGS+= --without-ad-dc -PLIST_SUB+= AD_DC="@comment " -SUB_LIST+= AD_DC="@comment " -.else -PLIST_SUB+= AD_DC="" -SUB_LIST+= AD_DC="" -.endif +UTMP_CONFIGURE_WITH= utmp -.if ${PORT_OPTIONS:MADS} -SAMBA4_WANT_ADS= yes -SAMBA4_WANT_LDAP= yes -# List of extra modules taken from RHEL build -# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320 -SAMBA4_MODULES+= idmap_rid idmap_ad idmap_hash idmap_adex idmap_tdb2 -.endif +AD_DC_CONFIGURE_OFF= --without-ad-dc -.if ${PORT_OPTIONS:MAVAHI} -LIB_DEPENDS+= libavahi-client.so:net/avahi-app -CONFIGURE_ARGS+= --enable-avahi -.else -CONFIGURE_ARGS+= --disable-avahi -.endif - -.if ${PORT_OPTIONS:MMDNSRESPONDER} -LIB_DEPENDS+= libdns_sd.so:net/mDNSResponder -CONFIGURE_ARGS+= --enable-dnssd -.else -CONFIGURE_ARGS+= --disable-dnssd -.endif - -.if ${PORT_OPTIONS:MCUPS} -LIB_DEPENDS+= libcups.so:print/cups -CONFIGURE_ARGS+= --enable-cups --enable-iprint -PLIST_SUB+= CUPS="" -.else -CONFIGURE_ARGS+= --disable-cups --disable-iprint -PLIST_SUB+= CUPS="@comment " -.endif - -.if ${PORT_OPTIONS:MDNSUPDATE} -SAMBA_WANT_ADS= yes -CONFIGURE_ARGS+= --with-dnsupdate -PLIST_SUB+= DNSUPDATE="" -.else -CONFIGURE_ARGS+= --without-dnsupdate -PLIST_SUB+= DNSUPDATE="@comment " -.endif +#NTVFS_PREVENTS= AD_DC +#NTVFS_PREVENTS_MSG= NTVFS needs AD_DC -# https://bugzilla.samba.org/show_bug.cgi?id=9545 -.if ${PORT_OPTIONS:MFAM} -USES+= fam -CONFIGURE_ARGS+= --with-fam -.else -CONFIGURE_ARGS+= --without-fam -.endif +ADS_IMPLIES= LDAP +ADS_CONFIGURE_WITH= ads dnsupdate -.if ${PORT_OPTIONS:MLDAP} -SAMBA4_WANT_LDAP= yes -.endif +LDAP_USE= OPENLDAP=yes +LDAP_CONFIGURE_WITH= ldap -.if ${PORT_OPTIONS:MPTHREADPOOL} -CONFIGURE_ARGS+= --enable-pthreadpool -SAMBA4_MODULES+= vfs_aio_pthread -.else -CONFIGURE_ARGS+= --disable-pthreadpool -.endif +MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \ + xsltproc:textproc/libxslt +MANPAGES_CONFIGURE_ENV_OFF= XSLTPROC="true" -.if ${PORT_OPTIONS:MQUOTAS} -CONFIGURE_ARGS+= --with-quotas -.else -CONFIGURE_ARGS+= --without-quotas +# !SAMBA4_SUBPORT .endif -.if ${PORT_OPTIONS:MSYSLOG} -CONFIGURE_ARGS+= --with-syslog -.else -CONFIGURE_ARGS+= --without-syslog -.endif +############################################################################## +.include <bsd.port.options.mk> +############################################################################## -.if ${PORT_OPTIONS:MUTMP} -CONFIGURE_ARGS+= --with-utmp -.else -CONFIGURE_ARGS+= --without-utmp +.if ${PORT_OPTIONS:MEXP_MODULES} +. if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES) +WANT_EXP_MODULES= vfs_cacheprime gpext_scripts gpext_security gpext_registry +. endif .endif -.if defined(SAMBA4_WANT_ADS) -CONFIGURE_ARGS+= --with-ads -PLIST_SUB+= ADS="" -.else -CONFIGURE_ARGS+= --without-ads -PLIST_SUB+= ADS="@comment " +SAMBA4_MODULES+= idmap_autorid idmap_rid idmap_hash idmap_tdb2 idmap_script +# List of extra modules taken from RHEL build +# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320 +.if ${PORT_OPTIONS:MADS} +SAMBA4_MODULES+= idmap_ad idmap_rfc2307 nss-info_rfc2307 nss-info_sfu nss-info_sfu20 .endif -.if defined(SAMBA4_WANT_LDAP) -USE_OPENLDAP= yes -CONFIGURE_ARGS+= --with-ldap -PLIST_SUB+= LDAP="" -.else -CONFIGURE_ARGS+= --without-ldap -PLIST_SUB+= LDAP="@comment " +.if ${PORT_OPTIONS:MDEVELOPER} +SAMBA4_MODULES+= auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls .endif -.if ! ${PORT_OPTIONS:MMANPAGES} -CONFIGURE_ENV+= XSLTPROC="true" -.else -BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \ - xsltproc:textproc/libxslt +.if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) +SAMBA4_MODULES+= ${WANT_EXP_MODULES} .endif .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS) -CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" -.endif - -.if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) -SAMBA4_MODULES+= ${WANT_EXP_MODULES} +CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif .if defined(SAMBA4_MODULES) && !empty(SAMBA4_MODULES) -CONFIGURE_ARGS+= --with-shared-modules="${SAMBA4_MODULES:Q:C|(\\\\ )+|,|g:S|\\||g}" +CONFIGURE_ARGS+= --with-shared-modules="${SAMBA4_MODULES:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif -# XXX: Dirty -.for module in auth_samba4 auth_skel auth_unix auth_wbc gpext_registry gpext_scripts \ - gpext_security idmap_ad idmap_ldap idmap_nss idmap_passdb idmap_tdb \ - nss_info_template pdb_ldap pdb_samba_dsdb pdb_smbpasswd pdb_tdbsam \ - pdb_test pdb_wbc_sam perfcount_test vfs_aio_pthread \ - vfs_cacheprime vfs_dfs_samba4 vfs_fake_acls \ - vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent -. if !empty(SAMBA4_MODULES) && ${SAMBA4_MODULES:M${module}} -PLIST_SUB+= MODULE_${module:tu}="" -. else -PLIST_SUB+= MODULE_${module:tu}="@comment " -. endif + +.for module in ${SAMBA4_MODULES} +PLIST_FILES+= lib/shared-modules/${module:C,_,/,:C,-,_,}.so .endfor -############################################################################## -# !SAMBA4_SUBPORT -.endif +############################################################################## .include <bsd.port.pre.mk> +############################################################################## .if !defined(SAMBA4_SUBPORT) +SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \ + SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \ + SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \ + SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \ + SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \ + SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \ + SAMBA4_CONFIG="${SAMBA4_CONFIG}" -SAMBA4_SUB= SAMBA4_LOGDIR="${SAMBA4_LOGDIR}" \ - SAMBA4_RUNDIR="${SAMBA4_RUNDIR}" \ - SAMBA4_LOCKDIR="${SAMBA4_LOCKDIR}" \ - SAMBA4_MODULEDIR="${SAMBA4_MODULEDIR}" \ - SAMBA4_PRIVATEDIR="${SAMBA4_PRIVATEDIR}" \ - SAMBA4_CONFDIR="${SAMBA4_CONFDIR}" \ - SAMBA4_CONFIG="${SAMBA4_CONFIG}" - -PLIST_SUB+= ${SAMBA4_SUB} -SUB_LIST+= ${SAMBA4_SUB} +PLIST_SUB+= ${SAMBA4_SUB} +SUB_LIST+= ${SAMBA4_SUB} -USE_RC_SUBR= samba_server -SUB_FILES= pkg-message README.FreeBSD +USE_RC_SUBR= samba_server +SUB_FILES= pkg-message README.FreeBSD # Make sure that the right version of Python is used by the tools # https://bugzilla.samba.org/show_bug.cgi?id=7305 -SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* +SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* # No fancy color error messages -.if ${COMPILER_TYPE} == "clang" -CFLAGS+= -fno-color-diagnostics + +# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack) +.if ${ARCH} == "amd64" +CFLAGS+= -fno-omit-frame-pointer +.endif +.if ${CHOSEN_COMPILER_TYPE} == clang +CFLAGS+= -fno-color-diagnostics .endif -CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' -MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' +CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' +MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' -SAMBA_MAN1+= dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \ - log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \ - nmblookup4.1 ntlm_auth.1 oLschema2ldif.1 \ - profiles.1 regdiff.1 regpatch.1 regshell.1 \ - regtree.1 rpcclient.1 sharesec.1 smbcacls.1 \ - smbclient.1 smbcontrol.1 smbcquotas.1 smbget.1 \ - smbstatus.1 smbtar.1 smbtorture.1 smbtree.1 \ - testparm.1 vfstest.1 wbinfo.1 - -SAMBA_MAN5+= lmhosts.5 smbgetrc.5 smbpasswd.5 pam_winbind.conf.5 \ - smb.conf.5 - -SAMBA_MAN7+= samba.7 winbind_krb5_locator.7 - -SAMBA_MAN8+= cifsdd.8 eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \ - idmap_ldap.8 idmap_nss.8 idmap_rfc2307.8 idmap_rid.8 \ - idmap_tdb.8 idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 \ - samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.8 \ - smbspool_krb5_wrapper.8 smbspool.8 smbta-util.8 vfs_acl_tdb.8 vfs_acl_xattr.8 \ - vfs_aio_fork.8 vfs_aio_linux.8 vfs_aio_pthread.8 \ - vfs_audit.8 vfs_cacheprime.8 vfs_cap.8 vfs_catia.8 vfs_ceph.8 \ - vfs_commit.8 vfs_crossrename.8 vfs_default_quota.8 \ - vfs_dirsort.8 vfs_extd_audit.8 vfs_fake_perms.8 vfs_fileid.8 \ - vfs_fruit.8 vfs_full_audit.8 vfs_glusterfs.8 vfs_gpfs.8 vfs_media_harmony.8 \ - vfs_netatalk.8 vfs_offline.8 vfs_prealloc.8 \ - vfs_preopen.8 vfs_readahead.8 vfs_readonly.8 \ - vfs_recycle.8 vfs_scannedonly.8 vfs_shadow_copy.8 \ - vfs_shadow_copy2.8 vfs_snapper.8 vfs_smb_traffic_analyzer.8 \ - vfs_streams_depot.8 vfs_streams_xattr.8 vfs_syncops.8 vfs_time_audit.8 \ - vfs_tsmsm.8 vfs_worm.8 vfs_xattr_tdb.8 winbindd.8 \ - vfs_linux_xfs_sgid.8 vfs_btrfs.8 vfs_shell_snap.8 vfs_unityed_media.8 +SAMBA_MAN1+= dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \ + log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \ + nmblookup4.1 ntlm_auth.1 oLschema2ldif.1 \ + profiles.1 regdiff.1 regpatch.1 regshell.1 \ + regtree.1 rpcclient.1 sharesec.1 smbcacls.1 \ + smbclient.1 smbcontrol.1 smbcquotas.1 smbget.1 \ + smbstatus.1 smbtar.1 smbtorture.1 smbtree.1 \ + testparm.1 vfstest.1 wbinfo.1 + +SAMBA_MAN5+= lmhosts.5 smbgetrc.5 smbpasswd.5 pam_winbind.conf.5 \ + smb.conf.5 + +SAMBA_MAN7+= samba.7 winbind_krb5_locator.7 + +SAMBA_MAN8+= cifsdd.8 eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \ + idmap_ldap.8 idmap_nss.8 idmap_rfc2307.8 idmap_rid.8 \ + idmap_tdb.8 idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 \ + samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.8 \ + smbspool_krb5_wrapper.8 smbspool.8 smbta-util.8 vfs_acl_tdb.8 vfs_acl_xattr.8 \ + vfs_aio_fork.8 vfs_aio_linux.8 vfs_aio_pthread.8 \ + vfs_audit.8 vfs_cacheprime.8 vfs_cap.8 vfs_catia.8 vfs_ceph.8 \ + vfs_commit.8 vfs_crossrename.8 vfs_default_quota.8 \ + vfs_dirsort.8 vfs_extd_audit.8 vfs_fake_perms.8 vfs_fileid.8 \ + vfs_fruit.8 vfs_full_audit.8 vfs_glusterfs.8 vfs_gpfs.8 vfs_media_harmony.8 \ + vfs_netatalk.8 vfs_offline.8 vfs_prealloc.8 \ + vfs_preopen.8 vfs_readahead.8 vfs_readonly.8 \ + vfs_recycle.8 vfs_scannedonly.8 vfs_shadow_copy.8 \ + vfs_shadow_copy2.8 vfs_snapper.8 vfs_smb_traffic_analyzer.8 \ + vfs_streams_depot.8 vfs_streams_xattr.8 vfs_syncops.8 vfs_time_audit.8 \ + vfs_tsmsm.8 vfs_worm.8 vfs_xattr_tdb.8 winbindd.8 \ + vfs_linux_xfs_sgid.8 vfs_btrfs.8 vfs_shell_snap.8 vfs_unityed_media.8 -PORTDOCS= README.FreeBSD +PORTDOCS= README.FreeBSD -IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support +IGNORE_NONTHREAD_PYTHON= needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-extract: - @${RM} -r ${WRKSRC}/pidl + @${RM} -r ${WRKSRC}/pidl post-patch: - @${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \ - ${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py - @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${PATCH_WRKSRC}/buildtools/wafsamba/samba_pidl.py \ - ${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py - @${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \ - ${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh - @${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \ - ${PATCH_WRKSRC}/dynconfig/wscript + @${REINPLACE_CMD} -e 's|$${PKGCONFIGDIR}|${PKGCONFIGDIR}|g' \ + ${PATCH_WRKSRC}/buildtools/wafsamba/pkgconfig.py + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${PATCH_WRKSRC}/buildtools/wafsamba/samba_pidl.py \ + ${PATCH_WRKSRC}/buildtools/wafsamba/wafsamba.py + @${REINPLACE_CMD} -e 's|%%GDB_CMD%%|${GDB_CMD}|g' \ + ${PATCH_WRKSRC}/buildtools/scripts/abi_gen.sh + @${REINPLACE_CMD} -e 's|%%SAMBA4_CONFIG%%|${SAMBA4_CONFIG}|g' \ + ${PATCH_WRKSRC}/dynconfig/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: - @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ - ${ECHO_CMD}; \ - ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ - ${ECHO_CMD}; \ - ${FALSE}; \ - fi - -pre-build: -.if ! ${PORT_OPTIONS:MMANPAGES} -. for man in libcli/nbt/man/nmblookup4.1 \ - librpc/tools/ndrdump.1 \ - source4/lib/registry/man/regdiff.1 \ - source4/lib/registry/man/regpatch.1 \ - source4/lib/registry/man/regshell.1 \ - source4/lib/registry/man/regtree.1 \ - source4/torture/man/gentest.1 \ - source4/torture/man/locktest.1 \ - source4/torture/man/masktest.1 \ - source4/torture/man/smbtorture.1 \ - source4/utils/man/ntlm_auth4.1 \ - source4/utils/man/oLschema2ldif.1 - -@${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}` - ${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man} -. endfor - -@${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages -. for man in ${SAMBA_MAN1} ${SAMBA_MAN5} ${SAMBA_MAN7} ${SAMBA_MAN8} - -${INSTALL_MAN} ${BUILD_WRKSRC}/docs/manpages/${man} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages -. endfor -.endif + @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ + ${ECHO_CMD}; \ + ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ + ${ECHO_CMD}; \ + ${FALSE}; \ + fi + +pre-build-MANPAGES-off: +.for man in libcli/nbt/man/nmblookup4.1 \ + librpc/tools/ndrdump.1 \ + source4/lib/registry/man/regdiff.1 \ + source4/lib/registry/man/regpatch.1 \ + source4/lib/registry/man/regshell.1 \ + source4/lib/registry/man/regtree.1 \ + source4/torture/man/gentest.1 \ + source4/torture/man/locktest.1 \ + source4/torture/man/masktest.1 \ + source4/torture/man/smbtorture.1 \ + source4/utils/man/ntlm_auth4.1 \ + source4/utils/man/oLschema2ldif.1 \ + docs-xml/manpages/idmap_script.8 + -@${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}` + ${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man} +.endfor + -@${MKDIR} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages +.for man in ${SAMBA_MAN1} ${SAMBA_MAN5} ${SAMBA_MAN7} ${SAMBA_MAN8} + -${INSTALL_MAN} ${BUILD_WRKSRC}/docs/manpages/${man} ${BUILD_WRKSRC}/bin/default/docs-xml/manpages +.endfor post-install: - @${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR} -. for doc in ${PORTDOCS} - ${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR} -. endfor -.endif + ${LN} -sf smb.conf.5.gz ${STAGEDIR}${PREFIX}/man/man5/smb4.conf.5.gz # Run post-install script -.for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR} - @${INSTALL} -d -m 0755 "${STAGEDIR}${dir}" +.for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR} + ${INSTALL} -d -m 0755 "${STAGEDIR}${dir}" .endfor - @${INSTALL} -d -m 0700 "${STAGEDIR}${SAMBA4_PRIVATEDIR}" -.for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs - @${MKDIR} "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}" + ${INSTALL} -d -m 0700 "${STAGEDIR}${SAMBA4_PRIVATEDIR}" +.for dir in auth bind9 gensec gpext idmap ldb nss_info pdb perfcount process_model service vfs + ${INSTALL} -d -m 0755 "${STAGEDIR}${SAMBA4_MODULEDIR}/${dir}" +.endfor + +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} +.for doc in ${PORTDOCS} + ${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR} .endfor .if ${PORT_OPTIONS:MDEVELOPER} test: build - @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_CMD} ${MAKE_ARGS} $@) + @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_CMD} ${MAKE_ARGS} $@) .endif # !SAMBA4_SUBPORT Modified: head/net/samba45/distinfo ============================================================================== --- head/net/samba44/distinfo Fri Mar 24 16:22:45 2017 (r436823) +++ head/net/samba45/distinfo Fri Mar 24 23:44:02 2017 (r436862) @@ -1,3 +1,3 @@ -TIMESTAMP = 1490313767 -SHA256 (samba-4.4.12.tar.gz) = 9dd0e12b5f49c1e11f44447853ed59aa9394f8cb322bc04aa747602d1366c131 -SIZE (samba-4.4.12.tar.gz) = 20768303 +TIMESTAMP = 1490375600 +SHA256 (samba-4.5.7.tar.gz) = ac70f09af80639d8189e1b9bc0a554841ee44df2b1ef58e7e682ad5400fd9400 +SIZE (samba-4.5.7.tar.gz) = 20981612 Modified: head/net/samba45/files/man/gentest.1 ============================================================================== --- head/net/samba44/files/man/gentest.1 Fri Mar 24 16:22:45 2017 (r436823) +++ head/net/samba45/files/man/gentest.1 Fri Mar 24 23:44:02 2017 (r436862) @@ -2,12 +2,12 @@ .\" Title: gentest .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>; -.\" Date: 03/26/2015 +.\" Date: 03/21/2017 .\" Manual: Test Suite .\" Source: Samba 4.0 .\" Language: English .\" -.TH "GENTEST" "1" "03/26/2015" "Samba 4\&.0" "Test Suite" +.TH "GENTEST" "1" "03/21/2017" "Samba 4\&.0" "Test Suite" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- Added: head/net/samba45/files/man/idmap_script.8 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/samba45/files/man/idmap_script.8 Fri Mar 24 23:44:02 2017 (r436862) @@ -0,0 +1,153 @@ +'\" t +.\" Title: idmap_script +.\" Author: [see the "AUTHOR" section] +.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>; +.\" Date: 03/21/2017 +.\" Manual: System Administration tools +.\" Source: Samba 4.5 +.\" Language: English +.\" +.TH "IDMAP_SCRIPT" "8" "03/21/2017" "Samba 4\&.5" "System Administration tools" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +idmap_script \- Samba\*(Aqs idmap_script Backend for Winbind +.SH "DESCRIPTION" +.PP +The idmap_script plugin is a substitute for the idmap_tdb2 backend used by winbindd for storing SID/uid/gid mapping tables in clustered environments with Samba and CTDB\&. It is a read only backend that uses a script to perform mapping\&. +.PP +It was developed out of the idmap_tdb2 back end and does not store SID/uid/gid mappings in a TDB, since the winbind_cache tdb will store the mappings once they are provided\&. +.SH "IDMAP OPTIONS" +.PP +range = low \- high +.RS 4 +Defines the available matching uid and gid range for which the backend is authoritative\&. +.RE +.PP +script +.RS 4 +This option can be used to configure an external program for performing id mappings\&. +.RE +.SH "IDMAP SCRIPT" +.PP +The tdb2 idmap backend supports an external program for performing id mappings through the smb\&.conf option +\fIidmap config * : script\fR +or its deprecated legacy form +\fIidmap : script\fR\&. +.PP +The mappings obtained by the script are then stored in the idmap tdb2 database instead of mappings created by the incrementing id counters\&. It is therefore important that the script covers the complete range of SIDs that can be passed in for SID to Unix ID mapping, since otherwise SIDs unmapped by the script might get mapped to IDs that had previously been mapped by the script\&. +.PP +The script should accept the following command line options\&. +.sp +.if n \{\ +.RS 4 +.\} +.nf + SIDTOID S\-1\-xxxx + IDTOSID UID xxxx + IDTOSID GID xxxx + IDTOSID XID xxxx + +.fi +.if n \{\ +.RE +.\} +.PP +And it should return one of the following responses as a single line of text\&. +.sp +.if n \{\ +.RS 4 +.\} +.nf + UID:yyyy + GID:yyyy + XID:yyyy + SID:ssss + ERR:yyyy + +.fi +.if n \{\ +.RE +.\} +.PP +XID indicates that the ID returned should be both a UID and a GID\&. That is, it requests an ID_TYPE_BOTH, but it is ultimately up to the script whether or not it can honor that request\&. It can choose to return a UID or a GID mapping only\&. +.SH "EXAMPLES" +.PP +This example shows how script is used as a the default idmap backend using an external program via the script parameter: +.sp +.if n \{\ +.RS 4 +.\} +.nf + [global] + idmap config * : backend = script + idmap config * : range = 1000000\-2000000 + idmap config * : script = /usr/local/samba/bin/idmap_script\&.sh + +.fi +.if n \{\ +.RE +.\} +.PP +This shows a simple script to partially perform the task: +.sp +.if n \{\ +.RS 4 +.\} +.nf + #!/bin/sh + # + # Uncomment this if you want some logging + #echo $@ >> /tmp/idmap\&.sh\&.log + if [ "$1" == "SIDTOID" ] + then + # Note\&. The number returned has to be within the range defined + #echo "Sending UID:1000005" >> /tmp/idmap\&.sh\&.log + echo "UID:1000005" + exit 0 + else + #echo "Sending ERR: No idea what to do" >> /tmp/idmap\&.sh\&.log + echo "ERR: No idea what to do" + exit 1 + fi + +.fi +.if n \{\ +.RE +.\} +.PP +Clearly, this script is not enough, as it should probably use wbinfo to determine if an incoming SID is a user or group SID and then look up the mapping in a table or use some other mechanism for mapping SIDs to UIDs and etc\&. +.PP +Please be aware that the script is called with the _NO_WINBINDD environment variable set to 1\&. This prevents recursive calls into winbind from the script both via explicit calls to wbinfo and via implicit calls via nss_winbind\&. For example a call to +ls \-l +could trigger such an infinite recursion\&. +.PP +It is safe to call *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703242344.v2ONi2Du065049>