Date: Wed, 22 Nov 2017 00:44:48 +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: r454660 - in head/net/samba46: . files Message-ID: <201711220044.vAM0imuM071245@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Wed Nov 22 00:44:48 2017 New Revision: 454660 URL: https://svnweb.freebsd.org/changeset/ports/454660 Log: Cummulative update that covers security issues(CVE-2017-15275 and CVE-2017-14746) and potential file corruption under high threaded load. Security: CVE-2017-14746 CVE-2017-15275 Sponsored by: iXsystems Inc. Added: head/net/samba46/files/patch-source3__modules__vfs_zfsacl.c (contents, props changed) Deleted: head/net/samba46/files/patch-docs-xml__wscript_build Modified: head/net/samba46/Makefile head/net/samba46/distinfo head/net/samba46/files/patch-buildtools__scripts__abi_gen.sh head/net/samba46/files/patch-buildtools__wafsamba__samba_install.py head/net/samba46/files/patch-dynconfig__wscript head/net/samba46/files/patch-lib__crypto__wscript_configure head/net/samba46/files/patch-lib__param__wscript_build head/net/samba46/files/patch-lib__socket__wscript_build head/net/samba46/files/patch-lib__util__wscript_build head/net/samba46/files/patch-nsswitch__wscript_build head/net/samba46/files/patch-source3__client__dnsbrowse.c head/net/samba46/files/patch-source3__librpc__crypto__gse.c head/net/samba46/files/patch-source3__smbd__quotas.c head/net/samba46/files/patch-source3__utils__net.c head/net/samba46/files/patch-source3__utils__net_time.c head/net/samba46/files/patch-source3__wscript head/net/samba46/files/patch-source3__wscript_build head/net/samba46/files/patch-source4__lib__http__http.c head/net/samba46/files/patch-third_party__waf__wafadmin__Logs.py head/net/samba46/files/patch-third_party__waf__wafadmin__Tools__cc.py head/net/samba46/pkg-plist Modified: head/net/samba46/Makefile ============================================================================== --- head/net/samba46/Makefile Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/Makefile Wed Nov 22 00:44:48 2017 (r454660) @@ -13,13 +13,15 @@ COMMENT?= Free SMB/CIFS and AD/DC server and client LICENSE= GPLv3 -CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-57-9]-4.* p5-Parse-Pidl-4.* +IGNORE_NONTHREAD_PYTHON= needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support +CONFLICTS_INSTALL?= samba4-4.0.* samba4[1-57-9]-4.* p5-Parse-Pidl-4.* + #EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.6.8 +SAMBA4_VERSION= 4.6.11 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -61,7 +63,7 @@ CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man" \ # Flags CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" -USES= cpe compiler waf pkgconfig perl5 python:2 \ +USES= cpe compiler waf pkgconfig perl5 python:2.7 \ readline iconv shebangfix USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} @@ -73,15 +75,13 @@ 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_SUB= yes -OPTIONS_DEFAULT:= ADS AD_DC DEBUG \ +OPTIONS_DEFINE= ADS AD_DC CUPS \ DOCS FAM LDAP \ QUOTAS SYSLOG UTMP -OPTIONS_SUB= yes +OPTIONS_DEFAULT:= ${OPTIONS_DEFINE} AD_DC_DESC= Active Directory Domain Controller support ADS_DESC= Active Directory client support(implies LDAP) @@ -92,7 +92,7 @@ PAM_SMBPASS_DESC= PAM authentication via passdb backe QUOTAS_DESC= Disk quota support UTMP_DESC= UTMP accounting support ############################################################################## -OPTIONS_DEFINE+= DEVELOPER MANPAGES EXP_MODULES NTVFS +OPTIONS_DEFINE+= CUPS DEBUG DEVELOPER MANPAGES EXP_MODULES NTVFS DEVELOPER_DESC= With development support(implies NTVFS) MANPAGES_DESC= Build manpages from DOCBOOK templates @@ -121,7 +121,6 @@ RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive # External Samba dependencies # Needed for IDL compiler BUILD_DEPENDS+= p5-Parse-Yapp>=0:devel/p5-Parse-Yapp -PLIST_SUB+= PIDL="" # 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 @@ -135,8 +134,8 @@ BUILD_DEPENDS+= talloc>=2.1.9:devel/talloc RUN_DEPENDS+= talloc>=2.1.9:devel/talloc SAMBA4_BUNDLED_LIBS+= !talloc # tevent -BUILD_DEPENDS+= tevent>=0.9.31:devel/tevent -RUN_DEPENDS+= tevent>=0.9.31:devel/tevent +BUILD_DEPENDS+= tevent>=0.9.34:devel/tevent +RUN_DEPENDS+= tevent>=0.9.34:devel/tevent SAMBA4_BUNDLED_LIBS+= !tevent # tdb BUILD_DEPENDS+= tdb>=1.3.12:databases/tdb @@ -175,7 +174,6 @@ GDB_CMD?= ${LOCALBASE}/bin/gdb 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 @@ -208,8 +206,9 @@ AD_DC_CONFIGURE_OFF= --without-ad-dc ADS_IMPLIES= LDAP ADS_CONFIGURE_WITH= ads dnsupdate -LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_WITH= ldap +LDAP_USE= OPENLDAP=yes +LDAP_VARS= SAMBA4_MODULES+=idmap_ldap MANPAGES_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \ xsltproc:textproc/libxslt @@ -226,19 +225,21 @@ MANPAGES_CONFIGURE_ENV_OFF= XSLTPROC="true" .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 +WANT_EXP_MODULES= vfs_cacheprime . endif .endif -SAMBA4_MODULES+= idmap_autorid idmap_rid idmap_hash idmap_tdb2 idmap_script +SAMBA4_MODULES+= idmap_nss idmap_autorid idmap_rid idmap_hash idmap_tdb idmap_tdb2 idmap_script nss-info_hash # 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 +SAMBA4_MODULES+= idmap_ad idmap_rfc2307 nss-info_template nss-info_rfc2307 nss-info_sfu nss-info_sfu20 .endif .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 +SAMBA4_MODULES+= auth_skel pdb_test gpext_security gpext_registry gpext_scripts perfcount_test \ + vfs_fake_dfq vfs_skel_opaque vfs_skel_transparent vfs_shadow_copy_test vfs_fake_acls \ + vfs_nfs4acl_xattr .endif .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) @@ -250,11 +251,12 @@ CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLE .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:C|-|_|:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif - +# XXX: Hack for nss-info_* -> nss_info/* modules +# Add selected modules to the plist .for module in ${SAMBA4_MODULES} -PLIST_FILES+= lib/shared-modules/${module:C,_,/,:C,-,_,}.so +PLIST_FILES+= lib/shared-modules/${module:C|_|/|:C|-|_|}.so .endfor # !SAMBA4_SUBPORT .endif @@ -307,7 +309,7 @@ SAMBA_MAN1+= dbwrap_tool.1 findsmb.1 gentest.1 lockt SAMBA_MAN5+= lmhosts.5 smbgetrc.5 smbpasswd.5 pam_winbind.conf.5 \ smb.conf.5 -SAMBA_MAN7+= samba.7 winbind_krb5_locator.7 +SAMBA_MAN7+= libsmbclient.7 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_script.8 \ @@ -329,8 +331,6 @@ SAMBA_MAN8+= cifsdd.8 eventlogadm.8 idmap_ad.8 idmap PORTDOCS= README.FreeBSD -IGNORE_NONTHREAD_PYTHON= needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support - post-extract: @${RM} -r ${WRKSRC}/pidl/lib/Parse/Yapp @@ -388,7 +388,7 @@ post-install: post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${PORTDOCS} - ${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${doc} ${STAGEDIR}${DOCSDIR} .endfor .if ${PORT_OPTIONS:MDEVELOPER} Modified: head/net/samba46/distinfo ============================================================================== --- head/net/samba46/distinfo Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/distinfo Wed Nov 22 00:44:48 2017 (r454660) @@ -1,3 +1,3 @@ -TIMESTAMP = 1505942026 -SHA256 (samba-4.6.8.tar.gz) = 581deeb2543f5cedcb556cb950d0e82690d9f0cd33811d76624502ca0c32575d -SIZE (samba-4.6.8.tar.gz) = 21139872 +TIMESTAMP = 1511283638 +SHA256 (samba-4.6.11.tar.gz) = 051b7ab0fa088d77dc0df039ff5d6b8fd998372f0c29ecb455b149457c20ed1d +SIZE (samba-4.6.11.tar.gz) = 21157318 Modified: head/net/samba46/files/patch-buildtools__scripts__abi_gen.sh ============================================================================== --- head/net/samba46/files/patch-buildtools__scripts__abi_gen.sh Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-buildtools__scripts__abi_gen.sh Wed Nov 22 00:44:48 2017 (r454660) @@ -1,4 +1,4 @@ ---- buildtools/scripts/abi_gen.sh.orig 2016-01-26 11:45:46 UTC +--- buildtools/scripts/abi_gen.sh.orig 2017-01-11 07:55:14 UTC +++ buildtools/scripts/abi_gen.sh @@ -9,6 +9,7 @@ GDBSCRIPT="gdb_syms.$$" cat <<EOF Modified: head/net/samba46/files/patch-buildtools__wafsamba__samba_install.py ============================================================================== --- head/net/samba46/files/patch-buildtools__wafsamba__samba_install.py Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-buildtools__wafsamba__samba_install.py Wed Nov 22 00:44:48 2017 (r454660) @@ -1,4 +1,4 @@ ---- buildtools/wafsamba/samba_install.py.orig 2016-01-26 11:45:46 UTC +--- buildtools/wafsamba/samba_install.py.orig 2017-01-11 07:55:14 UTC +++ buildtools/wafsamba/samba_install.py @@ -118,7 +118,7 @@ def install_library(self): inst_name = bld.make_libname(t.target) Modified: head/net/samba46/files/patch-dynconfig__wscript ============================================================================== --- head/net/samba46/files/patch-dynconfig__wscript Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-dynconfig__wscript Wed Nov 22 00:44:48 2017 (r454660) @@ -1,4 +1,4 @@ ---- dynconfig/wscript.orig 2016-01-26 11:45:46 UTC +--- dynconfig/wscript.orig 2017-01-11 07:55:14 UTC +++ dynconfig/wscript @@ -137,6 +137,8 @@ dynconfig = { 'PKGCONFIGDIR' : { @@ -15,12 +15,12 @@ 'CONFIGFILE' : { - 'STD-PATH': '${CONFIGDIR}/smb.conf', - 'FHS-PATH': '${CONFIGDIR}/smb.conf', -+ 'STD-PATH': '${CONFIGDIR}/%%SAMBA4_CONFIG%%', -+ 'FHS-PATH': '${CONFIGDIR}/%%SAMBA4_CONFIG%%', ++ 'STD-PATH': '${CONFIGDIR}/smb4.conf', ++ 'FHS-PATH': '${CONFIGDIR}/smb4.conf', 'DELAY': True, }, 'LMHOSTSFILE' : { -@@ -300,9 +302,6 @@ def configure(conf): +@@ -302,9 +304,6 @@ def configure(conf): flavor = 'FHS-PATH' else: flavor = 'STD-PATH' Modified: head/net/samba46/files/patch-lib__crypto__wscript_configure ============================================================================== --- head/net/samba46/files/patch-lib__crypto__wscript_configure Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-lib__crypto__wscript_configure Wed Nov 22 00:44:48 2017 (r454660) @@ -1,4 +1,4 @@ ---- lib/crypto/wscript_configure.orig 2016-01-26 11:45:46 UTC +--- lib/crypto/wscript_configure.orig 2017-01-11 07:55:14 UTC +++ lib/crypto/wscript_configure @@ -1,9 +1,9 @@ if not conf.CHECK_FUNCS_IN('MD5Init', 'bsd', headers='bsd/md5.h', Modified: head/net/samba46/files/patch-lib__param__wscript_build ============================================================================== --- head/net/samba46/files/patch-lib__param__wscript_build Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-lib__param__wscript_build Wed Nov 22 00:44:48 2017 (r454660) @@ -1,6 +1,6 @@ ---- lib/param/wscript_build.orig 2017-03-27 02:33:25.086257000 +0000 -+++ lib/param/wscript_build 2017-03-27 02:33:50.126334000 +0000 -@@ -32,7 +32,7 @@ +--- lib/param/wscript_build.orig 2017-01-11 07:55:14 UTC ++++ lib/param/wscript_build +@@ -32,7 +32,7 @@ bld.SAMBA_GENERATOR('param_table_gen.c', bld.SAMBA_LIBRARY('server-role', source='loadparm_server_role.c', Modified: head/net/samba46/files/patch-lib__socket__wscript_build ============================================================================== --- head/net/samba46/files/patch-lib__socket__wscript_build Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-lib__socket__wscript_build Wed Nov 22 00:44:48 2017 (r454660) @@ -1,5 +1,5 @@ ---- lib/socket/wscript_build.orig 2017-03-27 02:15:03.351855000 +0000 -+++ lib/socket/wscript_build 2017-03-27 02:15:48.856130000 +0000 +--- lib/socket/wscript_build.orig 2017-01-11 07:55:14 UTC ++++ lib/socket/wscript_build @@ -2,6 +2,6 @@ bld.SAMBA_LIBRARY('interfaces', Modified: head/net/samba46/files/patch-lib__util__wscript_build ============================================================================== --- head/net/samba46/files/patch-lib__util__wscript_build Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-lib__util__wscript_build Wed Nov 22 00:44:48 2017 (r454660) @@ -1,6 +1,6 @@ ---- lib/util/wscript_build.orig 2017-03-27 02:23:54.176730000 +0000 -+++ lib/util/wscript_build 2017-03-27 02:29:10.940173000 +0000 -@@ -132,7 +132,7 @@ +--- lib/util/wscript_build.orig 2017-01-11 07:55:14 UTC ++++ lib/util/wscript_build +@@ -132,7 +132,7 @@ else: bld.SAMBA_LIBRARY('samba-modules', source='modules.c', Modified: head/net/samba46/files/patch-nsswitch__wscript_build ============================================================================== --- head/net/samba46/files/patch-nsswitch__wscript_build Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-nsswitch__wscript_build Wed Nov 22 00:44:48 2017 (r454660) @@ -1,4 +1,4 @@ ---- nsswitch/wscript_build.orig 2016-01-26 11:45:46 UTC +--- nsswitch/wscript_build.orig 2017-01-11 07:55:14 UTC +++ nsswitch/wscript_build @@ -54,12 +54,14 @@ elif (host_os.rfind('freebsd') > -1): source='winbind_nss_linux.c winbind_nss_freebsd.c', Modified: head/net/samba46/files/patch-source3__client__dnsbrowse.c ============================================================================== --- head/net/samba46/files/patch-source3__client__dnsbrowse.c Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-source3__client__dnsbrowse.c Wed Nov 22 00:44:48 2017 (r454660) @@ -1,4 +1,4 @@ ---- source3/client/dnsbrowse.c.orig 2016-01-26 11:45:46 UTC +--- source3/client/dnsbrowse.c.orig 2017-01-11 07:55:15 UTC +++ source3/client/dnsbrowse.c @@ -91,7 +91,7 @@ static void do_smb_resolve(struct mdns_s } Modified: head/net/samba46/files/patch-source3__librpc__crypto__gse.c ============================================================================== --- head/net/samba46/files/patch-source3__librpc__crypto__gse.c Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-source3__librpc__crypto__gse.c Wed Nov 22 00:44:48 2017 (r454660) @@ -1,6 +1,6 @@ ---- source3/librpc/crypto/gse.c.orig 2017-05-24 13:22:06.188197000 +0000 -+++ source3/librpc/crypto/gse.c 2017-05-24 13:31:22.933150000 +0000 -@@ -334,11 +334,12 @@ +--- source3/librpc/crypto/gse.c.orig 2017-05-23 08:19:23 UTC ++++ source3/librpc/crypto/gse.c +@@ -334,11 +334,12 @@ static NTSTATUS gse_get_client_auth_toke struct gse_context *gse_ctx = talloc_get_type_abort(gensec_security->private_data, struct gse_context); Added: head/net/samba46/files/patch-source3__modules__vfs_zfsacl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/samba46/files/patch-source3__modules__vfs_zfsacl.c Wed Nov 22 00:44:48 2017 (r454660) @@ -0,0 +1,39 @@ +From 6a95f51f5ea1c60b5c11e8dd7e4a03ca5ef8049f Mon Sep 17 00:00:00 2001 +From: Ralph Boehme <slow@samba.org> +Date: Sat, 28 Oct 2017 16:13:16 +0200 +Subject: [PATCH] WIP: vfs_zfsacl: fix compilation error + +Bug: https://bugzilla.samba.org/show_bug.cgi?id=6133 +--- source3/modules/vfs_zfsacl.c.orig 2017-10-25 10:55:08 UTC ++++ source3/modules/vfs_zfsacl.c +@@ -51,6 +51,7 @@ static NTSTATUS zfs_get_nt_acl_common(st + SMB_STRUCT_STAT sbuf; + const SMB_STRUCT_STAT *psbuf = NULL; + int ret; ++ bool is_dir; + + if (VALID_STAT(smb_fname->st)) { + psbuf = &smb_fname->st; +@@ -65,10 +66,7 @@ static NTSTATUS zfs_get_nt_acl_common(st + } + psbuf = &sbuf; + } +- +- if (S_ISDIR(psbuf->st_ex_mode) && (ace->aceMask & SMB_ACE4_ADD_FILE)) { +- ace->aceMask |= SMB_ACE4_DELETE_CHILD; +- } ++ is_dir = S_ISDIR(psbuf->st_ex_mode); + + /* read the number of file aces */ + if((naces = acl(smb_fname->base_name, ACE_GETACLCNT, 0, NULL)) == -1) { +@@ -115,6 +113,10 @@ static NTSTATUS zfs_get_nt_acl_common(st + aceprop.aceMask |= SMB_ACE4_SYNCHRONIZE; + } + ++ if (is_dir && (aceprop.aceMask & SMB_ACE4_ADD_FILE)) { ++ aceprop.aceMask |= SMB_ACE4_DELETE_CHILD; ++ } ++ + if(aceprop.aceFlags & ACE_OWNER) { + aceprop.flags = SMB_ACE4_ID_SPECIAL; + aceprop.who.special_id = SMB_ACE4_WHO_OWNER; Modified: head/net/samba46/files/patch-source3__smbd__quotas.c ============================================================================== --- head/net/samba46/files/patch-source3__smbd__quotas.c Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-source3__smbd__quotas.c Wed Nov 22 00:44:48 2017 (r454660) @@ -1,6 +1,6 @@ ---- source3/smbd/quotas.c.orig 2016-09-22 06:42:48 UTC +--- source3/smbd/quotas.c.orig 2017-01-11 07:55:15 UTC +++ source3/smbd/quotas.c -@@ -144,6 +144,7 @@ static bool nfs_quotas(char *nfspath, ui +@@ -125,6 +125,7 @@ static bool nfs_quotas(char *nfspath, ui if (!cutstr) return False; @@ -8,7 +8,7 @@ memset(cutstr, '\0', len+1); host = strncat(cutstr,mnttype, sizeof(char) * len ); DEBUG(5,("nfs_quotas: looking for mount on \"%s\"\n", cutstr)); -@@ -152,7 +153,7 @@ static bool nfs_quotas(char *nfspath, ui +@@ -133,7 +134,7 @@ static bool nfs_quotas(char *nfspath, ui args.gqa_pathp = testpath+1; args.gqa_uid = uid; Modified: head/net/samba46/files/patch-source3__utils__net.c ============================================================================== --- head/net/samba46/files/patch-source3__utils__net.c Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-source3__utils__net.c Wed Nov 22 00:44:48 2017 (r454660) @@ -1,6 +1,6 @@ ---- source3/utils/net.c.orig 2016-01-26 11:45:46 UTC +--- source3/utils/net.c.orig 2017-08-08 06:56:05 UTC +++ source3/utils/net.c -@@ -945,8 +945,13 @@ static struct functable net_func[] = { +@@ -1079,8 +1079,13 @@ static struct functable net_func[] = { lp_set_cmdline("netbios name", c->opt_requester_name); } Modified: head/net/samba46/files/patch-source3__utils__net_time.c ============================================================================== --- head/net/samba46/files/patch-source3__utils__net_time.c Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-source3__utils__net_time.c Wed Nov 22 00:44:48 2017 (r454660) @@ -1,4 +1,4 @@ ---- source3/utils/net_time.c.orig 2016-01-26 11:45:46 UTC +--- source3/utils/net_time.c.orig 2017-01-11 07:55:15 UTC +++ source3/utils/net_time.c @@ -75,10 +75,15 @@ static const char *systime(time_t t) if (!tm) { Modified: head/net/samba46/files/patch-source3__wscript ============================================================================== --- head/net/samba46/files/patch-source3__wscript Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-source3__wscript Wed Nov 22 00:44:48 2017 (r454660) @@ -1,4 +1,4 @@ ---- source3/wscript.orig 2016-06-06 07:40:23 UTC +--- source3/wscript.orig 2017-05-23 08:19:23 UTC +++ source3/wscript @@ -47,6 +47,7 @@ def set_options(opt): opt.SAMBA3_ADD_OPTION('utmp') @@ -8,7 +8,7 @@ opt.SAMBA3_ADD_OPTION('iconv') opt.SAMBA3_ADD_OPTION('acl-support') opt.SAMBA3_ADD_OPTION('dnsupdate') -@@ -866,6 +867,17 @@ msg.msg_accrightslen = sizeof(fd); +@@ -868,6 +869,17 @@ msg.msg_accrightslen = sizeof(fd); conf.SET_TARGET_TYPE('avahi-common', 'EMPTY') conf.SET_TARGET_TYPE('avahi-client', 'EMPTY') @@ -26,7 +26,7 @@ if Options.options.with_iconv: conf.env.with_iconv = True if not conf.CHECK_FUNCS_IN('iconv_open', 'iconv', headers='iconv.h'): -@@ -1663,9 +1675,6 @@ main() { +@@ -1738,9 +1750,6 @@ main() { if conf.CONFIG_SET('HAVE_VXFS'): default_shared_modules.extend(TO_LIST('vfs_vxfs')) Modified: head/net/samba46/files/patch-source3__wscript_build ============================================================================== --- head/net/samba46/files/patch-source3__wscript_build Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-source3__wscript_build Wed Nov 22 00:44:48 2017 (r454660) @@ -1,6 +1,6 @@ ---- source3/wscript_build.orig 2017-02-28 20:04:57.000000000 +0000 -+++ source3/wscript_build 2017-03-25 03:35:14.392623000 +0000 -@@ -741,6 +741,7 @@ +--- source3/wscript_build.orig 2017-05-23 08:19:23 UTC ++++ source3/wscript_build +@@ -741,6 +741,7 @@ bld.SAMBA3_LIBRARY('smbd_base', smbd_conn param_service AVAHI @@ -8,7 +8,7 @@ PRINTBASE PROFILE LOCKING -@@ -1123,6 +1124,7 @@ +@@ -1129,6 +1130,7 @@ bld.SAMBA3_BINARY('client/smbclient', msrpc3 RPC_NDR_SRVSVC cli_smb_common Modified: head/net/samba46/files/patch-source4__lib__http__http.c ============================================================================== --- head/net/samba46/files/patch-source4__lib__http__http.c Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-source4__lib__http__http.c Wed Nov 22 00:44:48 2017 (r454660) @@ -1,4 +1,4 @@ ---- source4/lib/http/http.c.orig 2016-03-08 11:07:45 UTC +--- source4/lib/http/http.c.orig 2017-01-11 07:55:15 UTC +++ source4/lib/http/http.c @@ -112,7 +112,19 @@ static enum http_read_status http_parse_ return HTTP_ALL_DATA_READ; Modified: head/net/samba46/files/patch-third_party__waf__wafadmin__Logs.py ============================================================================== --- head/net/samba46/files/patch-third_party__waf__wafadmin__Logs.py Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-third_party__waf__wafadmin__Logs.py Wed Nov 22 00:44:48 2017 (r454660) @@ -1,4 +1,4 @@ ---- third_party/waf/wafadmin/Logs.py.orig 2016-01-26 11:45:47 UTC +--- third_party/waf/wafadmin/Logs.py.orig 2017-01-11 07:55:16 UTC +++ third_party/waf/wafadmin/Logs.py @@ -23,6 +23,9 @@ colors_lst = { 'cursor_off' :'\x1b[?25l', Modified: head/net/samba46/files/patch-third_party__waf__wafadmin__Tools__cc.py ============================================================================== --- head/net/samba46/files/patch-third_party__waf__wafadmin__Tools__cc.py Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/files/patch-third_party__waf__wafadmin__Tools__cc.py Wed Nov 22 00:44:48 2017 (r454660) @@ -1,4 +1,4 @@ ---- third_party/waf/wafadmin/Tools/cc.py.orig 2016-01-26 11:45:47 UTC +--- third_party/waf/wafadmin/Tools/cc.py.orig 2017-01-11 07:55:16 UTC +++ third_party/waf/wafadmin/Tools/cc.py @@ -88,7 +88,7 @@ def c_hook(self, node): raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self)) Modified: head/net/samba46/pkg-plist ============================================================================== --- head/net/samba46/pkg-plist Wed Nov 22 00:07:30 2017 (r454659) +++ head/net/samba46/pkg-plist Wed Nov 22 00:44:48 2017 (r454660) @@ -13,7 +13,7 @@ bin/ntlm_auth bin/oLschema2ldif bin/pdbedit bin/profiles -%%PIDL%%bin/pidl +bin/pidl bin/regdiff bin/regpatch bin/regshell @@ -350,14 +350,11 @@ lib/samba4/private/libxattr-tdb-samba4.so %%AD_DC%%lib/shared-modules/service/winbindd.so %%AD_DC%%lib/shared-modules/service/wrepl.so %%AD_DC%%lib/shared-modules/vfs/posix_eadb.so -%%DEVELOPER%%lib/shared-modules/vfs/nfs4acl_xattr.so -%%DEVELOPER%%lib/shared-modules/vfs/fake_dfq.so lib/shared-modules/auth/script.so %%AD_DC%%lib/shared-modules/ldb/dns_notify.so lib/shared-modules/ldb/ildap.so lib/shared-modules/ldb/ldbsamba_extensions.so %%AD_DC%%lib/shared-modules/ldb/tombstone_reanimate.so -lib/shared-modules/nss_info/hash.so lib/shared-modules/vfs/acl_tdb.so lib/shared-modules/vfs/acl_xattr.so lib/shared-modules/vfs/aio_fork.so @@ -627,39 +624,39 @@ lib/shared-modules/vfs/zfsacl.so @dir %%PYTHON_SITELIBDIR%%/samba/netcmd @dir %%PYTHON_SITELIBDIR%%/samba/dcerpc @dir %%PYTHON_SITELIBDIR%%/samba -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/CUtil.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Compat.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Dump.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Expr.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/IDL.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/NDR.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/ODL.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba3/ClientNDR.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba3/ServerNDR.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Header.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Proxy.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Stub.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/Header.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Client.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Parser.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Server.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/Python.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/TDR.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Samba4/Template.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Typelist.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Util.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Wireshark/Conformance.pm -%%PIDL%%%%DATADIR%%/perl5/Parse/Pidl/Wireshark/NDR.pm -%%PIDL%%@dir %%DATADIR%%/perl5/Parse/Pidl/Wireshark -%%PIDL%%@dir %%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR -%%PIDL%%@dir %%DATADIR%%/perl5/Parse/Pidl/Samba4/COM -%%PIDL%%@dir %%DATADIR%%/perl5/Parse/Pidl/Samba4 -%%PIDL%%@dir %%DATADIR%%/perl5/Parse/Pidl/Samba3 -%%PIDL%%@dir %%DATADIR%%/perl5/Parse/Pidl -%%PIDL%%@dir %%DATADIR%%/perl5/Parse -%%PIDL%%@dir %%DATADIR%%/perl5 +%%DATADIR%%/perl5/Parse/Pidl.pm +%%DATADIR%%/perl5/Parse/Pidl/CUtil.pm +%%DATADIR%%/perl5/Parse/Pidl/Compat.pm +%%DATADIR%%/perl5/Parse/Pidl/Dump.pm +%%DATADIR%%/perl5/Parse/Pidl/Expr.pm +%%DATADIR%%/perl5/Parse/Pidl/IDL.pm +%%DATADIR%%/perl5/Parse/Pidl/NDR.pm +%%DATADIR%%/perl5/Parse/Pidl/ODL.pm +%%DATADIR%%/perl5/Parse/Pidl/Samba3/ClientNDR.pm +%%DATADIR%%/perl5/Parse/Pidl/Samba3/ServerNDR.pm +%%DATADIR%%/perl5/Parse/Pidl/Samba4.pm +%%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Header.pm +%%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Proxy.pm +%%DATADIR%%/perl5/Parse/Pidl/Samba4/COM/Stub.pm +%%DATADIR%%/perl5/Parse/Pidl/Samba4/Header.pm +%%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Client.pm +%%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Parser.pm +%%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR/Server.pm +%%DATADIR%%/perl5/Parse/Pidl/Samba4/Python.pm +%%DATADIR%%/perl5/Parse/Pidl/Samba4/TDR.pm +%%DATADIR%%/perl5/Parse/Pidl/Samba4/Template.pm +%%DATADIR%%/perl5/Parse/Pidl/Typelist.pm +%%DATADIR%%/perl5/Parse/Pidl/Util.pm +%%DATADIR%%/perl5/Parse/Pidl/Wireshark/Conformance.pm +%%DATADIR%%/perl5/Parse/Pidl/Wireshark/NDR.pm +@dir %%DATADIR%%/perl5/Parse/Pidl/Wireshark +@dir %%DATADIR%%/perl5/Parse/Pidl/Samba4/NDR +@dir %%DATADIR%%/perl5/Parse/Pidl/Samba4/COM +@dir %%DATADIR%%/perl5/Parse/Pidl/Samba4 +@dir %%DATADIR%%/perl5/Parse/Pidl/Samba3 +@dir %%DATADIR%%/perl5/Parse/Pidl +@dir %%DATADIR%%/perl5/Parse +@dir %%DATADIR%%/perl5 %%AD_DC%%%%DATADIR%%/setup/DB_CONFIG %%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Attributes.txt %%AD_DC%%%%DATADIR%%/setup/ad-schema/MS-AD_Schema_2K8_Classes.txt @@ -764,7 +761,7 @@ man/man1/nmblookup.1.gz man/man1/ntlm_auth.1.gz man/man1/oLschema2ldif.1.gz man/man1/profiles.1.gz -%%PIDL%%man/man1/pidl.1.gz +man/man1/pidl.1.gz man/man1/regdiff.1.gz man/man1/regpatch.1.gz man/man1/regshell.1.gz @@ -783,17 +780,18 @@ man/man1/smbtree.1.gz man/man1/testparm.1.gz man/man1/vfstest.1.gz man/man1/wbinfo.1.gz -%%PIDL%%man/man3/Parse::Pidl::Dump.3.gz -%%PIDL%%man/man3/Parse::Pidl::NDR.3.gz -%%PIDL%%man/man3/Parse::Pidl::Util.3.gz -%%PIDL%%man/man3/Parse::Pidl::Wireshark::Conformance.3.gz -%%PIDL%%man/man3/Parse::Pidl::Wireshark::NDR.3.gz +man/man3/Parse::Pidl::Dump.3.gz +man/man3/Parse::Pidl::NDR.3.gz +man/man3/Parse::Pidl::Util.3.gz +man/man3/Parse::Pidl::Wireshark::Conformance.3.gz +man/man3/Parse::Pidl::Wireshark::NDR.3.gz man/man5/lmhosts.5.gz man/man5/pam_winbind.conf.5.gz man/man5/smb.conf.5.gz man/man5/smb4.conf.5.gz man/man5/smbgetrc.5.gz man/man5/smbpasswd.5.gz +man/man7/libsmbclient.7.gz man/man7/samba.7.gz man/man7/winbind_krb5_locator.7.gz man/man8/cifsdd.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201711220044.vAM0imuM071245>