mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-28 01:06:17 +00:00
Update net/samba4 port to the 4.0.26 version.
This commit is contained in:
parent
3fe47d4c21
commit
89c2215261
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=387084
@ -17,7 +17,7 @@ CONFLICTS?= *samba3[2-6]-3.* samba41-4.1.*
|
||||
|
||||
SAMBA4_BASENAME= samba
|
||||
SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4
|
||||
SAMBA4_VERSION= 4.0.25
|
||||
SAMBA4_VERSION= 4.0.26
|
||||
SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
|
||||
|
||||
WRKSRC?= ${WRKDIR}/${DISTNAME}
|
||||
@ -59,8 +59,8 @@ CONFIGURE_ARGS+= --exec-prefix="${PREFIX}" \
|
||||
# Flags
|
||||
CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread"
|
||||
|
||||
USES= compiler cpe execinfo iconv perl5 pkgconfig \
|
||||
python:2 readline shebangfix waf
|
||||
USES= cpe compiler waf pkgconfig perl5 python:2 \
|
||||
execinfo readline iconv shebangfix
|
||||
USE_PERL5= build
|
||||
USE_LDCONFIG= ${SAMBA4_LIBDIR}
|
||||
WAF_CMD= buildtools/bin/waf
|
||||
@ -84,9 +84,13 @@ LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/sysutils/libsunacl
|
||||
# External Samba dependencies
|
||||
# IDL compiler
|
||||
BUILD_DEPENDS+= p5-Parse-Pidl>=4.0.0:${PORTSDIR}/devel/p5-Parse-Pidl
|
||||
#
|
||||
BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython
|
||||
RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython
|
||||
PLIST_SUB+= PY_DNSPYTHON="@comment "
|
||||
# talloc
|
||||
BUILD_DEPENDS+= talloc>=2.1.0:${PORTSDIR}/devel/talloc
|
||||
RUN_DEPENDS+= talloc>=2.1.0:${PORTSDIR}/devel/talloc
|
||||
BUILD_DEPENDS+= talloc>=2.1.2:${PORTSDIR}/devel/talloc
|
||||
RUN_DEPENDS+= talloc>=2.1.2:${PORTSDIR}/devel/talloc
|
||||
SAMBA4_BUNDLED_LIBS+= !talloc
|
||||
# tevent
|
||||
BUILD_DEPENDS+= tevent>=0.9.18:${PORTSDIR}/devel/tevent
|
||||
@ -169,13 +173,16 @@ SUB_LIST+= NSUPDATE=""
|
||||
.if ${PORT_OPTIONS:MDEBUG}
|
||||
WITH_DEBUG= yes
|
||||
CONFIGURE_ARGS+= --verbose
|
||||
_MAKE_JOBS+= --verbose
|
||||
MAKE_ARGS+= --verbose
|
||||
CONFIGURE_ARGS+= --enable-debug
|
||||
.endif
|
||||
|
||||
# https://bugzilla.samba.org/show_bug.cgi?id=8969
|
||||
.if ${PORT_OPTIONS:MDEVELOPER}
|
||||
GDB_CMD?= gdb78
|
||||
#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}:${PORTSDIR}/devel/gdb
|
||||
RUN_DEPENDS+= ${GDB_CMD}:${PORTSDIR}/devel/gdb
|
||||
SAMBA4_MODULES+= auth_skel perfcount_test pdb_test vfs_shadow_copy_test vfs_skel_opaque vfs_skel_transparent vfs_fake_acls
|
||||
@ -210,7 +217,7 @@ WANT_EXP_MODULES= auth_samba4 auth_script auth_skel auth_unix auth_wbc \
|
||||
|
||||
.if ${PORT_OPTIONS:MEXP_MODULES}
|
||||
. if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES)
|
||||
WANT_EXP_MODULES= idmap_ad vfs_cacheprime gpext_scripts gpext_security gpext_registry
|
||||
WANT_EXP_MODULES= vfs_cacheprime gpext_scripts gpext_security gpext_registry
|
||||
. endif
|
||||
.endif
|
||||
|
||||
@ -233,6 +240,9 @@ PLIST_SUB+= AD_DC=""
|
||||
.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
|
||||
|
||||
.if ${PORT_OPTIONS:MAIO_SUPPORT}
|
||||
@ -354,9 +364,11 @@ CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\
|
||||
|
||||
.if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)
|
||||
SAMBA4_MODULES+= ${WANT_EXP_MODULES}
|
||||
CONFIGURE_ARGS+= --with-shared-modules="${WANT_EXP_MODULES: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}"
|
||||
.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 \
|
||||
@ -500,16 +512,17 @@ post-install:
|
||||
. endfor
|
||||
.endif
|
||||
# Run post-install script
|
||||
.for dir in ${SAMBA4_LOGDIR} ${SAMBA4_RUNDIR} ${SAMBA4_LOCKDIR} ${SAMBA4_MODULEDIR} ${SAMBA4_PRIVATEDIR}
|
||||
@${MKDIR} "${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}"
|
||||
.endfor
|
||||
|
||||
.if ${PORT_OPTIONS:MDEVELOPER}
|
||||
test: build
|
||||
@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} $@)
|
||||
@(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_CMD} ${MAKE_ARGS} $@)
|
||||
.endif
|
||||
|
||||
# !SAMBA4_SUBPORT
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (samba-4.0.25.tar.gz) = e6a07940a658b81d368fc7ed8e5068bd27188996d73dee1cea9755682cb9a485
|
||||
SIZE (samba-4.0.25.tar.gz) = 22150978
|
||||
SHA256 (samba-4.0.26.tar.gz) = ce2441992c6d18950d752edb2d1274b3f7e056b2e2e8516fc42e408e4a25894a
|
||||
SIZE (samba-4.0.26.tar.gz) = 22155521
|
||||
|
@ -1,20 +1,6 @@
|
||||
--- source3/wscript_build.orig 2014-12-08 07:46:38.000000000 +0000
|
||||
+++ source3/wscript_build 2015-01-16 00:11:55.966511894 +0000
|
||||
@@ -653,13 +653,6 @@
|
||||
vnum='0',
|
||||
vars=locals())
|
||||
|
||||
-bld.SAMBA3_LIBRARY('nss_wins',
|
||||
- source=WINBIND_WINS_NSS_SRC,
|
||||
- deps='''param libsmb LIBTSOCKET''',
|
||||
- realname='libnss_wins.so.2',
|
||||
- soname='libnss_wins.so',
|
||||
- vnum='2')
|
||||
-
|
||||
bld.SAMBA3_LIBRARY('gse',
|
||||
source='librpc/crypto/gse_krb5.c librpc/crypto/gse.c',
|
||||
deps='krb5samba gensec param KRBCLIENT secrets3',
|
||||
@@ -975,10 +968,12 @@
|
||||
--- source3/wscript_build.orig 2015-05-06 19:07:37.000000000 +0000
|
||||
+++ source3/wscript_build 2015-05-21 22:03:55.321652920 +0000
|
||||
@@ -968,10 +968,12 @@
|
||||
LIBAFS_SETTOKEN
|
||||
RPC_SERVER
|
||||
NDR_SMBXSRV
|
||||
@ -28,7 +14,7 @@
|
||||
''' + bld.env['dmapi_lib'],
|
||||
private_library=True,
|
||||
vars=locals())
|
||||
@@ -1284,6 +1279,7 @@
|
||||
@@ -1277,6 +1279,7 @@
|
||||
libsmb
|
||||
msrpc3
|
||||
RPC_NDR_SRVSVC
|
||||
@ -36,7 +22,7 @@
|
||||
cli_smb_common''')
|
||||
|
||||
bld.SAMBA3_BINARY('net',
|
||||
@@ -1636,7 +1632,7 @@
|
||||
@@ -1629,7 +1632,7 @@
|
||||
|
||||
bld.SAMBA3_PYTHON('pylibsmb',
|
||||
source='libsmb/pylibsmb.c',
|
||||
|
@ -54,8 +54,12 @@ samba_server_checkconfig() {
|
||||
|
||||
samba_server_prestart() {
|
||||
# Make sure we have our RUNDIR, even if it's on a tmpfs
|
||||
if [ ! -d "${samba_server_piddir}" -a ! -e "${samba_server_piddir}" ]; then
|
||||
install -m 0755 -d "${samba_server_piddir}"
|
||||
if [ -d "${samba_server_piddir}" -o ! -e "${samba_server_piddir}" ]; then
|
||||
install -d -m 0755 "${samba_server_piddir}"
|
||||
fi
|
||||
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=200186
|
||||
if [ -d "${samba_server_privatedir}" -o ! -e "${samba_server_privatedir}" ]; then
|
||||
install -d -m 0700 "${samba_server_privatedir}"
|
||||
fi
|
||||
# # Remove smbd.pid before starting up samba(needed for s3fs)
|
||||
# if [ -e "${samba_server_piddir}/smbd.pid" ] ; then
|
||||
@ -179,6 +183,8 @@ samba_server_config_init() {
|
||||
samba_server_lockdir=${samba_server_lockdir:=%%SAMBA4_LOCKDIR%%}
|
||||
samba_server_piddir="$(${testparm_command} --parameter-name='pid directory' 2>/dev/null)"
|
||||
samba_server_piddir=${samba_server_piddir:=%%SAMBA4_RUNDIR%%}
|
||||
samba_server_privatedir="$(${testparm_command} --parameter-name='private dir' 2>/dev/null)"
|
||||
samba_server_privatedir=${samba_server_privatedir:=%%SAMBA4_PRIVATEDIR%%}
|
||||
}
|
||||
|
||||
# Load configuration variables
|
||||
|
@ -525,86 +525,6 @@ libdata/pkgconfig/wbclient.pc
|
||||
%%PYTHON_SITELIBDIR%%/samba/drs_utils.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/dsdb.so
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/__init__.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/__init__.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/dnssec.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/e164.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/edns.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/entropy.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/exception.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/flags.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/hash.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/inet.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/ipv4.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/ipv6.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/message.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/name.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/namedict.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/node.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/opcode.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/query.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rcode.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdata.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdataclass.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdataset.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdatatype.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/AFSDB.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/CERT.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/CNAME.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DLV.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DNAME.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DNSKEY.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DS.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/GPOS.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/HINFO.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/HIP.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/ISDN.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/LOC.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/MX.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NS.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC3.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC3PARAM.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/PTR.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RP.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RRSIG.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RT.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SOA.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SPF.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SSHFP.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/TXT.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/X25.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/__init__.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/A.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/AAAA.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/APL.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/DHCID.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/IPSECKEY.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/KX.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NAPTR.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NSAP.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NSAP_PTR.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/PX.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/SRV.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/WKS.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/__init__.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/__init__.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/dsbase.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/mxbase.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/nsbase.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/txtbase.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/renderer.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/resolver.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/reversename.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/rrset.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/set.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/tokenizer.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/tsig.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/tsigkeyring.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/ttl.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/update.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/version.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/wiredata.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/dns/zone.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/subunit/__init__.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/subunit/chunked.py
|
||||
%%PYTHON_SITELIBDIR%%/samba/external/subunit/details.py
|
||||
@ -792,10 +712,6 @@ libdata/pkgconfig/wbclient.pc
|
||||
@dirrm %%PYTHON_SITELIBDIR%%/samba/external/testtools
|
||||
@dirrm %%PYTHON_SITELIBDIR%%/samba/external/subunit/tests
|
||||
@dirrm %%PYTHON_SITELIBDIR%%/samba/external/subunit
|
||||
@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN
|
||||
@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY
|
||||
@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes
|
||||
@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns
|
||||
@dirrm %%PYTHON_SITELIBDIR%%/samba/external
|
||||
@dirrm %%PYTHON_SITELIBDIR%%/samba/dcerpc
|
||||
@dirrm %%PYTHON_SITELIBDIR%%/samba
|
||||
|
Loading…
Reference in New Issue
Block a user