Date: Wed, 25 Feb 2015 00:17:52 +0000 (UTC) From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r379856 - in branches/2015Q1/net: samba36 samba4 samba4/files samba41 samba41/files Message-ID: <201502250017.t1P0HqbI028228@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Wed Feb 25 00:17:51 2015 New Revision: 379856 URL: https://svnweb.freebsd.org/changeset/ports/379856 QAT: https://qat.redports.org/buildarchive/r379856/ Log: - Patch CVE-2015-0240 Approved by: ports-secteam With hat: ports-secteam MFH: 2015Q1 Security: 996c219c-bbb1-11e4-88ae-d050992ecde8 Added: branches/2015Q1/net/samba4/files/patch-nsswitch__wscript_build - copied unchanged from r377151, head/net/samba4/files/patch-nsswitch__wscript_build branches/2015Q1/net/samba41/files/patch-nsswitch__wscript_build - copied unchanged from r377151, head/net/samba41/files/patch-nsswitch__wscript_build Modified: branches/2015Q1/net/samba36/Makefile branches/2015Q1/net/samba4/Makefile branches/2015Q1/net/samba4/distinfo branches/2015Q1/net/samba4/files/patch-source3__wscript_build branches/2015Q1/net/samba4/files/samba_server.in branches/2015Q1/net/samba41/Makefile branches/2015Q1/net/samba41/distinfo branches/2015Q1/net/samba41/files/patch-source3__wscript_build branches/2015Q1/net/samba41/files/samba_server.in branches/2015Q1/net/samba41/pkg-plist Directory Properties: branches/2015Q1/ (props changed) Modified: branches/2015Q1/net/samba36/Makefile ============================================================================== --- branches/2015Q1/net/samba36/Makefile Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba36/Makefile Wed Feb 25 00:17:51 2015 (r379856) @@ -9,7 +9,7 @@ MASTER_SITE_SUBDIR= samba samba/stable s DISTNAME= ${SAMBA_BASENAME}-${PORTVERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} MAINTAINER?= timur@FreeBSD.org -COMMENT?= A free SMB and CIFS client and server for UNIX +COMMENT?= Free SMB and CIFS client and server for Unix LICENSE= GPLv3 LICENSE_FILE= ${WRKDIR}/${DISTNAME}/COPYING @@ -32,7 +32,7 @@ AUTOHEADER_ARGS= ${IPATHS} AUTOCONF_ARGS= ${IPATHS} GNU_CONFIGURE= yes -USES= gmake pkgconfig iconv execinfo cpe +USES= cpe execinfo gmake iconv pkgconfig USE_AUTOTOOLS= autoconf autoheader USE_LDCONFIG= ${SAMBA_LIBDIR} # pkg-config is used to find talloc @@ -99,21 +99,35 @@ CONFIGURE_ARGS+= ${ICONV_CONFIGURE_BASE} .if !defined(SAMBA_SUBPORT) OPTIONS_DEFINE= ACL_SUPPORT ADS AIO_SUPPORT AVAHI CUPS DNSUPDATE \ - DOCS EXAMPLES EXP_MODULES FAM_SUPPORT IPV6 LDAP \ + DOCS EXAMPLES EXP_MODULES FAM IPV6 LDAP \ MAX_DEBUG PAM_SMBPASS POPT PTHREADPOOL QUOTAS \ SMBTORTURE SWAT SYSLOG UTMP WINBIND +OPTIONS_RADIO= GSSAPI +OPTIONS_RADIO_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= ACL_SUPPORT AIO_SUPPORT CUPS LDAP POPT PTHREADPOOL \ - WINBIND + WINBIND GSSAPI_NONE ACL_SUPPORT_DESC= ACL support + ADS_DESC= Active Directory support +ADS_CONFIGURE_ON= --with-ads --with-krb5="${GSSAPIBASEDIR}" +ADS_CONFIGURE_OFF= --without-ads --without-krb5 + AIO_SUPPORT_DESC= Asyncronous IO support DNSUPDATE_DESC= Dynamic DNS update(require ADS) EXP_MODULES_DESC= Experimental modules -FAM_SUPPORT_DESC= File Alteration Monitor + +GSSAPI_BASE_DESC= Use Heimdal in base +GSSAPI_BASE_USES= gssapi +GSSAPI_HEIMDAL_DESC= Use Heimdal from ports +GSSAPI_HEIMDAL_USES= gssapi:heimdal,flags +GSSAPI_MIT_DESC= Use MIT Kerberos V5 +GSSAPI_MIT_USES= gssapi:mit,flags +GSSAPI_NONE_DESC= No Kerberos support + MAX_DEBUG_DESC= Maximum debugging -PAM_SMBPASS_DESC= PAM authentication vs passdb backends +PAM_SMBPASS_DESC= PAM authentication via passdb backends POPT_DESC= System-wide POPT library PTHREADPOOL_DESC= Pthread pool QUOTAS_DESC= Disk quota support @@ -237,7 +251,7 @@ WANT_EXP_MODULES+= vfs_cacheprime vfs_ca . endif .endif -.if ${PORT_OPTIONS:MFAM_SUPPORT} +.if ${PORT_OPTIONS:MFAM} USES+= fam WANT_EXP_MODULES+= vfs_notify_fam CONFIGURE_ARGS+= --enable-fam @@ -317,26 +331,11 @@ PLIST_SUB+= SMBTORTURE="@comment " ### .if ${PORT_OPTIONS:MADS} -SAMBA_WANT_LDAP= yes -SAMBA_WANT_KRB5= yes -CONFIGURE_ARGS+= --with-ads -.else -CONFIGURE_ARGS+= --without-ads -.endif +. if ${PORT_OPTIONS:MGSSAPI_NONE} # Kerberos5 is necessary for ADS -.if defined(SAMBA_WANT_KRB5) -.if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.so) -CONFIGURE_ARGS+= --with-krb5="${KRB5_HOME}" -.elif defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.so) -CONFIGURE_ARGS+= --with-krb5="${HEIMDAL_HOME}" -.elif exists(/usr/lib/libkrb5.so) && exists(/usr/bin/krb5-config) -CONFIGURE_ARGS+= --with-krb5="/usr" -.else -LIB_DEPENDS+= libkrb5.so:${PORTSDIR}/security/heimdal -CONFIGURE_ARGS+= --with-krb5="${LOCALBASE}" -.endif -.else -CONFIGURE_ARGS+= --without-krb5 +IGNORE= ADS support requires GSSAPI_BASE, GSSAPI_HEIMDAL, or GSSAPI_MIT +. endif +SAMBA_WANT_LDAP= yes .endif .if defined(SAMBA_WANT_LDAP) @@ -392,7 +391,7 @@ SAMBA_MAN8+= pam_winbind.8 winbindd.8 SAMBA_MAN8+= swat.8 .endif -.if ${PORT_OPTIONS:MFAM_SUPPORT} +.if ${PORT_OPTIONS:MFAM} SAMBA_MAN8+= vfs_notify_fam.8 .endif Modified: branches/2015Q1/net/samba4/Makefile ============================================================================== --- branches/2015Q1/net/samba4/Makefile Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba4/Makefile Wed Feb 25 00:17:51 2015 (r379856) @@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= samba/stable samba/r DISTNAME= ${SAMBA4_DISTNAME} MAINTAINER?= timur@FreeBSD.org -COMMENT?= A free SMB/CIFS and AD/DC server and client for UNIX +COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3 @@ -18,7 +18,7 @@ CONFLICTS?= *samba3[2-6]-3.* samba41-4. SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.0.23 +SAMBA4_VERSION= 4.0.25 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -64,7 +64,8 @@ DESTDIRNAME= --destdir CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LDFLAGS="${PTHREAD_LIBS}" -USES= shebangfix compiler perl5 python:2 pkgconfig iconv readline execinfo cpe +USES= compiler cpe execinfo iconv perl5 pkgconfig \ + python:2 readline shebangfix USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_TOOL= buildtools/bin/waf @@ -72,7 +73,8 @@ 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) +# XXX: Unconditional dependencies which can't be switched off (if present +# in the system) # popt LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt # inotify @@ -108,20 +110,19 @@ SAMBA4_BUNDLED_LIBS+= com_err ############################################################################## # Options OPTIONS_DEFINE= ACL_SUPPORT AD_DC ADS AIO_SUPPORT CUPS DEBUG \ - DNSUPDATE DOCS FAM_SUPPORT LDAP PAM_SMBPASS \ + DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SWAT SYSLOG UTMP -OPTIONS_DEFAULT:= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ - DNSUPDATE DOCS FAM_SUPPORT LDAP PAM_SMBPASS \ +OPTIONS_DEFAULT= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ + DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SWAT SYSLOG UTMP ACL_SUPPORT_DESC= File system ACL support AD_DC_DESC= Active Directory Domain Controller support ADS_DESC= Active Directory client support -AIO_SUPPORT_DESC= Asyncronous IO support -DNSUPDATE_DESC= Dynamic DNS update(require ADS) +AIO_SUPPORT_DESC= Asynchronous IO support +DNSUPDATE_DESC= Dynamic DNS update (requires ADS) EXP_MODULES_DESC= Experimental modules -FAM_SUPPORT_DESC= File Alteration Monitor support DEBUG_DESC= With debug information in the binaries LDAP_DESC= LDAP client support PAM_SMBPASS_DESC= PAM authentication via passdb backends @@ -136,10 +137,11 @@ DEVELOPER_DESC= With development suppor MANPAGES_DESC= Build manpages from DOCBOOK templates OPTIONS_RADIO= DNS ZEROCONF -OPTIONS_RADIO_DNS= NSUPDATE BIND99 +OPTIONS_RADIO_DNS= NSUPDATE BIND99 BIND910 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 NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC .include <bsd.port.options.mk> @@ -161,6 +163,9 @@ CFLAGS+= -fno-omit-frame-pointer .if ${PORT_OPTIONS:MBIND99} RUN_DEPENDS+= bind99>=9.9.0.0:${PORTSDIR}/dns/bind99 SUB_LIST+= NSUPDATE="@comment " +.elif ${PORT_OPTIONS:MBIND910} +RUN_DEPENDS+= bind910>=9.10.0.0:${PORTSDIR}/dns/bind910 +SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MNSUPDATE} RUN_DEPENDS+= samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate SUB_LIST+= NSUPDATE="" @@ -273,7 +278,7 @@ CONFIGURE_ARGS+= --without-dnsupdate .endif # https://bugzilla.samba.org/show_bug.cgi?id=9545 -.if ${PORT_OPTIONS:MFAM_SUPPORT} +.if ${PORT_OPTIONS:MFAM} USES+= fam CONFIGURE_ARGS+= --with-fam WANT_EXP_MODULES+= vfs_notify_fam Modified: branches/2015Q1/net/samba4/distinfo ============================================================================== --- branches/2015Q1/net/samba4/distinfo Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba4/distinfo Wed Feb 25 00:17:51 2015 (r379856) @@ -1,2 +1,2 @@ -SHA256 (samba-4.0.23.tar.gz) = 47d7b9d0caf76ea111794c6181db2fed5c15fd496a5a9eaa8ed4323302c72118 -SIZE (samba-4.0.23.tar.gz) = 22140738 +SHA256 (samba-4.0.25.tar.gz) = e6a07940a658b81d368fc7ed8e5068bd27188996d73dee1cea9755682cb9a485 +SIZE (samba-4.0.25.tar.gz) = 22150978 Copied: branches/2015Q1/net/samba4/files/patch-nsswitch__wscript_build (from r377151, head/net/samba4/files/patch-nsswitch__wscript_build) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/net/samba4/files/patch-nsswitch__wscript_build Wed Feb 25 00:17:51 2015 (r379856, copy of r377151, head/net/samba4/files/patch-nsswitch__wscript_build) @@ -0,0 +1,15 @@ +--- nsswitch/wscript_build.orig 2015-01-15 23:07:01.654902807 +0000 ++++ nsswitch/wscript_build 2015-01-15 23:11:43.587388779 +0000 +@@ -57,6 +57,12 @@ + realname='nss_winbind.so.1', + vnum='1') + ++ bld.SAMBA3_LIBRARY('nss_wins', ++ source='wins.c wins_freebsd.c', ++ deps='''param libsmb LIBTSOCKET''', ++ realname='nss_wins.so.1', ++ vnum='1') ++ + elif (host_os.rfind('netbsd') > -1): + # NetBSD winbind client is implemented as a wrapper + # around the Linux version. It needs getpwent_r() to Modified: branches/2015Q1/net/samba4/files/patch-source3__wscript_build ============================================================================== --- branches/2015Q1/net/samba4/files/patch-source3__wscript_build Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba4/files/patch-source3__wscript_build Wed Feb 25 00:17:51 2015 (r379856) @@ -1,34 +1,20 @@ ---- source3/wscript_build.orig 2013-07-01 09:15:40.000000000 +0200 -+++ source3/wscript_build 2013-11-12 10:13:36.004046408 +0100 -@@ -1,7 +1,8 @@ - #!/usr/bin/env python - - from samba_utils import * --import samba_version, samba3 -+import samba_version, samba3, sys -+host_os = sys.platform - - TDB_LIB_SRC = ''' - lib/dbwrap/dbwrap_open.c -@@ -651,7 +652,16 @@ +--- 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', -+if (host_os.rfind('freebsd') > -1): -+ # FreeBSD winbind client is implemented as a wrapper around -+ # the Linux version. -+ bld.SAMBA3_LIBRARY('nss_wins', -+ source=' '.join([WINBIND_WINS_NSS_SRC, '../nsswitch/wins_freebsd.c']), -+ deps='''param libsmb LIBTSOCKET''', -+ realname='nss_wins.so.1', -+ vnum='1') -+else: -+ bld.SAMBA3_LIBRARY('nss_wins', - source=WINBIND_WINS_NSS_SRC, - deps='''param libsmb LIBTSOCKET''', - realname='libnss_wins.so.2', -@@ -972,10 +982,12 @@ +- 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 @@ LIBAFS_SETTOKEN RPC_SERVER NDR_SMBXSRV @@ -42,7 +28,7 @@ ''' + bld.env['dmapi_lib'], private_library=True, vars=locals()) -@@ -1277,6 +1289,7 @@ +@@ -1284,6 +1279,7 @@ libsmb msrpc3 RPC_NDR_SRVSVC @@ -50,7 +36,7 @@ cli_smb_common''') bld.SAMBA3_BINARY('net', -@@ -1629,7 +1642,7 @@ +@@ -1636,7 +1632,7 @@ bld.SAMBA3_PYTHON('pylibsmb', source='libsmb/pylibsmb.c', Modified: branches/2015Q1/net/samba4/files/samba_server.in ============================================================================== --- branches/2015Q1/net/samba4/files/samba_server.in Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba4/files/samba_server.in Wed Feb 25 00:17:51 2015 (r379856) @@ -27,15 +27,9 @@ name="samba_server" rcvar=${name}_enable - # Defaults samba_server_config_default="%%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%" -samba_server_config=${samba_server_config=${samba_server_config_default}} -samba_server_configfile_arg=${samba_server_config:+--configfile="${samba_server_config}"} #" -#testparm_command="%%PREFIX%%/bin/samba-tool testparm --suppress-prompt --verbose ${samba_server_configfile_arg}" -testparm_command="%%PREFIX%%/bin/testparm --suppress-prompt --verbose ${samba_server_config}" smbcontrol_command="%%PREFIX%%/bin/smbcontrol" - # Custom commands extra_commands="reload status" @@ -48,7 +42,6 @@ status_cmd="samba_server_cmd" reload_cmd="samba_server_reload_cmd" rcvar_cmd="samba_server_rcvar_cmd" - samba_server_checkconfig() { echo -n "Performing sanity check on Samba configuration: " if ${testparm_command} >/dev/null 2>&1; then @@ -144,6 +137,14 @@ samba_server_cmd() { samba_server_config_init() { local name + # Load configuration + load_rc_config "${name}" + # Defaults + samba_server_enable=${samba_server_enable:=NO} + samba_server_config=${samba_server_config=${samba_server_config_default}} + samba_server_configfile_arg=${samba_server_config:+--configfile="${samba_server_config}"} #" + #testparm_command="%%PREFIX%%/bin/samba-tool testparm --suppress-prompt --verbose ${samba_server_configfile_arg}" + testparm_command="%%PREFIX%%/bin/testparm --suppress-prompt --verbose ${samba_server_config}" # Determine what daemons are necessary to run Samba in the current role samba_server_role=$(${testparm_command} --parameter-name='server role' 2>/dev/null) case "${samba_server_role}" in @@ -154,38 +155,34 @@ samba_server_config_init() { samba_daemons="nmbd smbd winbindd" ;; esac - # Load configuration - load_rc_config "${name}" + # Load daemons configuration for name in ${samba_daemons}; do load_rc_config "${name}" - done - # Defaults - samba_server_enable=${samba_server_enable:=NO} - # Setup dependent variables - if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then - for name in ${samba_daemons}; do - # Winbindd - if [ "${name}" = "winbindd" ]; then + # If samba_server_enable is 'YES' + if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then + if [ "${name}" != "winbindd" ]; then + # Set variable to 'YES' only if it is unset + eval ${name}_enable=\${${name}_enable-YES} + else + # Winbindd samba_server_idmap=$(${testparm_command} --parameter-name='idmap uid' 2>/dev/null) if [ -n "${samba_server_idmap}" ]; then winbindd_enable="YES" fi fi - # Set variable to 'YES' only if it is unset - eval ${name}_enable=\${${name}_enable-YES} - # If variable is empty set it to 'NO' - eval ${name}_enable=\${${name}_enable:-NO} - done - fi + fi + # If variable is empty, set it to 'NO' + eval ${name}_enable=\${${name}_enable:-NO} + done + # Fetch parameters from configuration file + samba_server_lockdir="$(${testparm_command} --parameter-name='lock directory' 2>/dev/null)" + 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%%} } # Load configuration variables samba_server_config_init -# Fetch parameters from configuration file -samba_server_lockdir=$(${testparm_command} --parameter-name='lock directory' 2>/dev/null) -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%%} # Common flags command_args=${samba_server_configfile_arg} samba_flags=${samba_flags="--daemon"} Modified: branches/2015Q1/net/samba41/Makefile ============================================================================== --- branches/2015Q1/net/samba41/Makefile Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba41/Makefile Wed Feb 25 00:17:51 2015 (r379856) @@ -10,7 +10,7 @@ MASTER_SITE_SUBDIR= samba/stable samba/r DISTNAME= ${SAMBA4_DISTNAME} MAINTAINER?= timur@FreeBSD.org -COMMENT?= A free SMB/CIFS and AD/DC server and client for UNIX +COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3 @@ -18,7 +18,7 @@ CONFLICTS?= *samba3[2-6]-3.* samba4-4.0 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.1.14 +SAMBA4_VERSION= 4.1.17 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -64,7 +64,8 @@ DESTDIRNAME= --destdir CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LDFLAGS="${PTHREAD_LIBS}" -USES= shebangfix compiler perl5 python:2 pkgconfig iconv readline execinfo cpe +USES= compiler cpe execinfo iconv perl5 pkgconfig \ + python:2 readline shebangfix USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_TOOL= buildtools/bin/waf @@ -72,7 +73,8 @@ 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) +# XXX: Unconditional dependencies which can't be switched off (if present +# in the system) # popt LIB_DEPENDS+= libpopt.so:${PORTSDIR}/devel/popt # inotify @@ -87,6 +89,10 @@ LIB_DEPENDS+= libsunacl.so:${PORTSDIR}/ # 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 @@ -96,8 +102,8 @@ BUILD_DEPENDS+= tevent>=0.9.18:${PORTSD RUN_DEPENDS+= tevent>=0.9.18:${PORTSDIR}/devel/tevent SAMBA4_BUNDLED_LIBS+= !tevent # tdb -BUILD_DEPENDS+= tdb>=1.2.11:${PORTSDIR}/databases/tdb -RUN_DEPENDS+= tdb>=1.2.11:${PORTSDIR}/databases/tdb +BUILD_DEPENDS+= tdb>=1.2.12:${PORTSDIR}/databases/tdb +RUN_DEPENDS+= tdb>=1.2.12:${PORTSDIR}/databases/tdb SAMBA4_BUNDLED_LIBS+= !tdb # ntdb BUILD_DEPENDS+= ntdb>=1.0:${PORTSDIR}/databases/ntdb @@ -112,20 +118,19 @@ SAMBA4_BUNDLED_LIBS+= com_err ############################################################################## # Options OPTIONS_DEFINE= ACL_SUPPORT AD_DC ADS AIO_SUPPORT CUPS DEBUG \ - DNSUPDATE DOCS FAM_SUPPORT LDAP PAM_SMBPASS \ + DNSUPDATE DOCS FAM LDAP PAM_SMBPASS \ PTHREADPOOL QUOTAS SYSLOG UTMP -OPTIONS_DEFAULT:= ACL_SUPPORT AD_DC ADS AIO_SUPPORT DEBUG \ - DNSUPDATE DOCS FAM_SUPPORT LDAP \ +OPTIONS_DEFAULT= ACL_SUPPORT AD_DC ADS AIO_SUPPORT 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 -AIO_SUPPORT_DESC= Asyncronous IO support -DNSUPDATE_DESC= Dynamic DNS update(require ADS) +AIO_SUPPORT_DESC= Asynchronous IO support +DNSUPDATE_DESC= Dynamic DNS update (requires ADS) EXP_MODULES_DESC= Experimental modules -FAM_SUPPORT_DESC= File Alteration Monitor support DEBUG_DESC= With debug information in the binaries LDAP_DESC= LDAP client support PAM_SMBPASS_DESC= PAM authentication via passdb backends @@ -139,10 +144,11 @@ DEVELOPER_DESC= With development suppor MANPAGES_DESC= Build manpages from DOCBOOK templates OPTIONS_RADIO= DNS ZEROCONF -OPTIONS_RADIO_DNS= NSUPDATE BIND99 +OPTIONS_RADIO_DNS= NSUPDATE BIND99 BIND910 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 NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC .include <bsd.port.options.mk> @@ -164,6 +170,9 @@ CFLAGS+= -fno-omit-frame-pointer .if ${PORT_OPTIONS:MBIND99} RUN_DEPENDS+= bind99>=9.9.0.0:${PORTSDIR}/dns/bind99 SUB_LIST+= NSUPDATE="@comment " +.elif ${PORT_OPTIONS:MBIND910} +RUN_DEPENDS+= bind910>=9.10.0.0:${PORTSDIR}/dns/bind910 +SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MNSUPDATE} RUN_DEPENDS+= samba-nsupdate:${PORTSDIR}/dns/samba-nsupdate SUB_LIST+= NSUPDATE="" @@ -276,7 +285,7 @@ CONFIGURE_ARGS+= --without-dnsupdate .endif # https://bugzilla.samba.org/show_bug.cgi?id=9545 -.if ${PORT_OPTIONS:MFAM_SUPPORT} +.if ${PORT_OPTIONS:MFAM} USES+= fam CONFIGURE_ARGS+= --with-fam WANT_EXP_MODULES+= vfs_notify_fam Modified: branches/2015Q1/net/samba41/distinfo ============================================================================== --- branches/2015Q1/net/samba41/distinfo Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba41/distinfo Wed Feb 25 00:17:51 2015 (r379856) @@ -1,2 +1,2 @@ -SHA256 (samba-4.1.14.tar.gz) = 5ea14baaca997292355d368918879e3d639def92b54efef2279cf5abe8db2cba -SIZE (samba-4.1.14.tar.gz) = 19527260 +SHA256 (samba-4.1.17.tar.gz) = 7aeb5d09e9c84bbeeb4b98d33404e9dbc4d99c54e64a447cc9c4d57e9255cb1d +SIZE (samba-4.1.17.tar.gz) = 19536407 Copied: branches/2015Q1/net/samba41/files/patch-nsswitch__wscript_build (from r377151, head/net/samba41/files/patch-nsswitch__wscript_build) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q1/net/samba41/files/patch-nsswitch__wscript_build Wed Feb 25 00:17:51 2015 (r379856, copy of r377151, head/net/samba41/files/patch-nsswitch__wscript_build) @@ -0,0 +1,15 @@ +--- nsswitch/wscript_build.orig 2015-01-15 23:07:01.654902807 +0000 ++++ nsswitch/wscript_build 2015-01-15 23:11:43.587388779 +0000 +@@ -57,6 +57,12 @@ + realname='nss_winbind.so.1', + vnum='1') + ++ bld.SAMBA3_LIBRARY('nss_wins', ++ source='wins.c wins_freebsd.c', ++ deps='''param libsmb LIBTSOCKET''', ++ realname='nss_wins.so.1', ++ vnum='1') ++ + elif (host_os.rfind('netbsd') > -1): + # NetBSD winbind client is implemented as a wrapper + # around the Linux version. It needs getpwent_r() to Modified: branches/2015Q1/net/samba41/files/patch-source3__wscript_build ============================================================================== --- branches/2015Q1/net/samba41/files/patch-source3__wscript_build Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba41/files/patch-source3__wscript_build Wed Feb 25 00:17:51 2015 (r379856) @@ -1,33 +1,5 @@ --- source3/wscript_build.orig 2013-09-06 09:39:57.000000000 +0000 +++ source3/wscript_build 2013-11-20 00:35:51.687173831 +0000 -@@ -1,7 +1,8 @@ - #!/usr/bin/env python - - from samba_utils import * --import samba_version, samba3 -+import samba_version, samba3, sys -+host_os = sys.platform - - TDB_LIB_SRC = ''' - lib/dbwrap/dbwrap_open.c -@@ -654,7 +655,16 @@ - vnum='0', - vars=locals()) - --bld.SAMBA3_LIBRARY('nss_wins', -+if (host_os.rfind('freebsd') > -1): -+ # FreeBSD winbind client is implemented as a wrapper around -+ # the Linux version. -+ bld.SAMBA3_LIBRARY('nss_wins', -+ source=' '.join([WINBIND_WINS_NSS_SRC, '../nsswitch/wins_freebsd.c']), -+ deps='''param libsmb LIBTSOCKET''', -+ realname='nss_wins.so.1', -+ vnum='1') -+else: -+ bld.SAMBA3_LIBRARY('nss_wins', - source=WINBIND_WINS_NSS_SRC, - deps='''param libsmb LIBTSOCKET''', - realname='libnss_wins.so.2', @@ -976,11 +986,13 @@ LIBAFS_SETTOKEN RPC_SERVER Modified: branches/2015Q1/net/samba41/files/samba_server.in ============================================================================== --- branches/2015Q1/net/samba41/files/samba_server.in Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba41/files/samba_server.in Wed Feb 25 00:17:51 2015 (r379856) @@ -27,15 +27,9 @@ name="samba_server" rcvar=${name}_enable - # Defaults samba_server_config_default="%%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%" -samba_server_config=${samba_server_config=${samba_server_config_default}} -samba_server_configfile_arg=${samba_server_config:+--configfile="${samba_server_config}"} #" -#testparm_command="%%PREFIX%%/bin/samba-tool testparm --suppress-prompt --verbose ${samba_server_configfile_arg}" -testparm_command="%%PREFIX%%/bin/testparm --suppress-prompt --verbose ${samba_server_config}" smbcontrol_command="%%PREFIX%%/bin/smbcontrol" - # Custom commands extra_commands="reload status" @@ -48,7 +42,6 @@ status_cmd="samba_server_cmd" reload_cmd="samba_server_reload_cmd" rcvar_cmd="samba_server_rcvar_cmd" - samba_server_checkconfig() { echo -n "Performing sanity check on Samba configuration: " if ${testparm_command} >/dev/null 2>&1; then @@ -144,6 +137,14 @@ samba_server_cmd() { samba_server_config_init() { local name + # Load configuration + load_rc_config "${name}" + # Defaults + samba_server_enable=${samba_server_enable:=NO} + samba_server_config=${samba_server_config=${samba_server_config_default}} + samba_server_configfile_arg=${samba_server_config:+--configfile="${samba_server_config}"} #" + #testparm_command="%%PREFIX%%/bin/samba-tool testparm --suppress-prompt --verbose ${samba_server_configfile_arg}" + testparm_command="%%PREFIX%%/bin/testparm --suppress-prompt --verbose ${samba_server_config}" # Determine what daemons are necessary to run Samba in the current role samba_server_role=$(${testparm_command} --parameter-name='server role' 2>/dev/null) case "${samba_server_role}" in @@ -154,38 +155,34 @@ samba_server_config_init() { samba_daemons="nmbd smbd winbindd" ;; esac - # Load configuration - load_rc_config "${name}" + # Load daemons configuration for name in ${samba_daemons}; do load_rc_config "${name}" - done - # Defaults - samba_server_enable=${samba_server_enable:=NO} - # Setup dependent variables - if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then - for name in ${samba_daemons}; do - # Winbindd - if [ "${name}" = "winbindd" ]; then + # If samba_server_enable is 'YES' + if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then + if [ "${name}" != "winbindd" ]; then + # Set variable to 'YES' only if it is unset + eval ${name}_enable=\${${name}_enable-YES} + else + # Winbindd samba_server_idmap=$(${testparm_command} --parameter-name='idmap uid' 2>/dev/null) if [ -n "${samba_server_idmap}" ]; then winbindd_enable="YES" fi fi - # Set variable to 'YES' only if it is unset - eval ${name}_enable=\${${name}_enable-YES} - # If variable is empty set it to 'NO' - eval ${name}_enable=\${${name}_enable:-NO} - done - fi + fi + # If variable is empty, set it to 'NO' + eval ${name}_enable=\${${name}_enable:-NO} + done + # Fetch parameters from configuration file + samba_server_lockdir="$(${testparm_command} --parameter-name='lock directory' 2>/dev/null)" + 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%%} } # Load configuration variables samba_server_config_init -# Fetch parameters from configuration file -samba_server_lockdir=$(${testparm_command} --parameter-name='lock directory' 2>/dev/null) -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%%} # Common flags command_args=${samba_server_configfile_arg} samba_flags=${samba_flags="--daemon"} Modified: branches/2015Q1/net/samba41/pkg-plist ============================================================================== --- branches/2015Q1/net/samba41/pkg-plist Wed Feb 25 00:02:51 2015 (r379855) +++ branches/2015Q1/net/samba41/pkg-plist Wed Feb 25 00:17:51 2015 (r379856) @@ -531,86 +531,86 @@ 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 +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/__init__.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/dnssec.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/e164.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/edns.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/entropy.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/exception.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/flags.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/hash.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/inet.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/ipv4.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/ipv6.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/message.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/name.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/namedict.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/node.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/opcode.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/query.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rcode.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdata.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdataclass.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdataset.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdatatype.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/AFSDB.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/CERT.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/CNAME.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DLV.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DNAME.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DNSKEY.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/DS.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/GPOS.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/HINFO.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/HIP.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/ISDN.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/LOC.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/MX.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NS.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC3.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/NSEC3PARAM.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/PTR.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RP.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RRSIG.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/RT.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SOA.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SPF.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/SSHFP.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/TXT.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/X25.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY/__init__.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/A.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/AAAA.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/APL.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/DHCID.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/IPSECKEY.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/KX.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NAPTR.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NSAP.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/NSAP_PTR.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/PX.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/SRV.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/WKS.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN/__init__.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/__init__.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/dsbase.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/mxbase.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/nsbase.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/txtbase.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/renderer.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/resolver.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/reversename.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/rrset.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/set.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/tokenizer.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/tsig.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/tsigkeyring.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/ttl.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/update.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/version.py +%%PY_DNSPYTHON%%%%PYTHON_SITELIBDIR%%/samba/external/dns/wiredata.py +%%PY_DNSPYTHON%%%%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 @@ -820,10 +820,10 @@ 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 +%%PY_DNSPYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/IN +%%PY_DNSPYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes/ANY +%%PY_DNSPYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns/rdtypes +%%PY_DNSPYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/samba/external/dns @dirrm %%PYTHON_SITELIBDIR%%/samba/external @dirrm %%PYTHON_SITELIBDIR%%/samba/dcerpc @dirrm %%PYTHON_SITELIBDIR%%/samba
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502250017.t1P0HqbI028228>