Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 31 Oct 2020 04:28:26 +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: r553733 - in head/net: samba411 samba412 samba413 samba413/files
Message-ID:  <202010310428.09V4SQcL092412@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: timur
Date: Sat Oct 31 04:28:26 2020
New Revision: 553733
URL: https://svnweb.freebsd.org/changeset/ports/553733

Log:
  Security update for samba411, samba412 and samba413:
  
  CVE-2020-14318 (Missing handle permissions check in SMB1/2/3 ChangeNotify)
  CVE-2020-14323 (Unprivileged user can crash winbind)
  CVE-2020-14383 (An authenticated user can crash the DCE/RPC DNS with easily crafted records)
  
  Security:	CVE-2020-14318
  		CVE-2020-14323
  		CVE-2020-14383

Modified:
  head/net/samba411/Makefile
  head/net/samba411/distinfo
  head/net/samba412/Makefile
  head/net/samba412/distinfo
  head/net/samba413/Makefile
  head/net/samba413/distinfo
  head/net/samba413/files/patch-source3_torture_cmd__vfs.c
  head/net/samba413/files/patch-source3_wscript__build
  head/net/samba413/pkg-plist

Modified: head/net/samba411/Makefile
==============================================================================
--- head/net/samba411/Makefile	Sat Oct 31 04:20:08 2020	(r553732)
+++ head/net/samba411/Makefile	Sat Oct 31 04:28:26 2020	(r553733)
@@ -23,7 +23,7 @@ EXTRA_PATCHES+=			${PATCHDIR}/0001-Zfs-provision-1.pat
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
-SAMBA4_VERSION=			4.11.14
+SAMBA4_VERSION=			4.11.15
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}

Modified: head/net/samba411/distinfo
==============================================================================
--- head/net/samba411/distinfo	Sat Oct 31 04:20:08 2020	(r553732)
+++ head/net/samba411/distinfo	Sat Oct 31 04:28:26 2020	(r553733)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602636402
-SHA256 (samba-4.11.14.tar.gz) = f75c77049970fcf5770a03ca42e3451ba0a8e12eb440ca7633b7ff916236eb70
-SIZE (samba-4.11.14.tar.gz) = 18601142
+TIMESTAMP = 1604112184
+SHA256 (samba-4.11.15.tar.gz) = 922d461bb2e6e490cf7708b297a9312ea6cda1edc7bdfea4ee665f45ff99038a
+SIZE (samba-4.11.15.tar.gz) = 18603109

Modified: head/net/samba412/Makefile
==============================================================================
--- head/net/samba412/Makefile	Sat Oct 31 04:20:08 2020	(r553732)
+++ head/net/samba412/Makefile	Sat Oct 31 04:28:26 2020	(r553733)
@@ -23,7 +23,7 @@ EXTRA_PATCHES+=			${PATCHDIR}/0001-Zfs-provision-1.pat
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
-SAMBA4_VERSION=			4.12.8
+SAMBA4_VERSION=			4.12.9
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}

Modified: head/net/samba412/distinfo
==============================================================================
--- head/net/samba412/distinfo	Sat Oct 31 04:20:08 2020	(r553732)
+++ head/net/samba412/distinfo	Sat Oct 31 04:28:26 2020	(r553733)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1602636428
-SHA256 (samba-4.12.8.tar.gz) = 6b2078c0d451e442b0e3c194f7b14db684fe374651cc2057ce882f0614925f2d
-SIZE (samba-4.12.8.tar.gz) = 18235713
+TIMESTAMP = 1604112111
+SHA256 (samba-4.12.9.tar.gz) = 786edf7b45b68ce637cb16daaa861097fdd71c9bac8428eec161a3a123f65060
+SIZE (samba-4.12.9.tar.gz) = 18236198

Modified: head/net/samba413/Makefile
==============================================================================
--- head/net/samba413/Makefile	Sat Oct 31 04:20:08 2020	(r553732)
+++ head/net/samba413/Makefile	Sat Oct 31 04:28:26 2020	(r553733)
@@ -23,7 +23,7 @@ EXTRA_PATCHES+=			${PATCHDIR}/0001-Zfs-provision-1.pat
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
-SAMBA4_VERSION=			4.13.0
+SAMBA4_VERSION=			4.13.1
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}
@@ -417,7 +417,7 @@ CONFIGURE_ARGS+=		--disable-python
 PLIST_SUB+=			SAMBA4_PYTHON="@comment "
 SUB_LIST+=			SAMBA4_PYTHON="@comment "
 .else
-USES+=				python:3.4+
+USES+=				python:3.6+
 PLIST_SUB+=			SAMBA4_PYTHON=""
 SUB_LIST+=			SAMBA4_PYTHON=""
 # Don't cache Python modules

Modified: head/net/samba413/distinfo
==============================================================================
--- head/net/samba413/distinfo	Sat Oct 31 04:20:08 2020	(r553732)
+++ head/net/samba413/distinfo	Sat Oct 31 04:28:26 2020	(r553733)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601163828
-SHA256 (samba-4.13.0.tar.gz) = f11d52aee8db0aa50ac614143f2ccefead29e8f8ff585358792221557cade7f6
-SIZE (samba-4.13.0.tar.gz) = 18406380
+TIMESTAMP = 1604112152
+SHA256 (samba-4.13.1.tar.gz) = 2458213b5e9abd5060228909bbe7f28fbb3ab344a7bdf34c9d0fd1566501285f
+SIZE (samba-4.13.1.tar.gz) = 18413369

Modified: head/net/samba413/files/patch-source3_torture_cmd__vfs.c
==============================================================================
--- head/net/samba413/files/patch-source3_torture_cmd__vfs.c	Sat Oct 31 04:20:08 2020	(r553732)
+++ head/net/samba413/files/patch-source3_torture_cmd__vfs.c	Sat Oct 31 04:28:26 2020	(r553733)
@@ -1,6 +1,6 @@
 --- source3/torture/cmd_vfs.c.orig	2019-01-15 10:07:00 UTC
 +++ source3/torture/cmd_vfs.c
-@@ -141,6 +141,82 @@ static NTSTATUS cmd_disk_free(struct vfs
+@@ -145,7 +145,84 @@ static NTSTATUS cmd_disk_free(struct vfs_state *vfs, T
  	return NT_STATUS_OK;
  }
  
@@ -12,7 +12,7 @@
 +	SMB_DISK_QUOTA D;
 +	unid_t id;
 +	int r;
-+
+ 
 +	if (argc != 4) {
 +		printf("Usage: get_quota <path> [user|group] id\n");
 +		return NT_STATUS_OK;
@@ -22,6 +22,7 @@
 +					argv[1],
 +					NULL,
 +					NULL,
++					0,
 +					ssf_flags());
 +	if (smb_fname == NULL) {
 +		return NT_STATUS_NO_MEMORY;
@@ -80,10 +81,11 @@
 +	return NT_STATUS_OK;
 +}
 +
- 
++
  static NTSTATUS cmd_opendir(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, const char **argv)
  {
-@@ -1947,6 +2023,7 @@ struct cmd_set vfs_commands[] = {
+ 	struct smb_filename *smb_fname = NULL;
+@@ -2028,6 +2105,7 @@ struct cmd_set vfs_commands[] = {
  	{ "connect",   cmd_connect,   "VFS connect()",    "connect" },
  	{ "disconnect",   cmd_disconnect,   "VFS disconnect()",    "disconnect" },
  	{ "disk_free",   cmd_disk_free,   "VFS disk_free()",    "disk_free <path>" },
@@ -91,7 +93,7 @@
  	{ "opendir",   cmd_opendir,   "VFS opendir()",    "opendir <fname>" },
  	{ "readdir",   cmd_readdir,   "VFS readdir()",    "readdir" },
  	{ "mkdir",   cmd_mkdir,   "VFS mkdir()",    "mkdir <path>" },
-@@ -1977,33 +2054,22 @@ struct cmd_set vfs_commands[] = {
+@@ -2057,33 +2135,22 @@ struct cmd_set vfs_commands[] = {
  	{ "link",   cmd_link,   "VFS link()",    "link <oldpath> <newpath>" },
  	{ "mknod",   cmd_mknod,   "VFS mknod()",    "mknod <path> <mode> <dev>" },
  	{ "realpath",   cmd_realpath,   "VFS realpath()",    "realpath <path>" },
@@ -134,5 +136,5 @@
 -	  "test_chain" },
 +	{ "test_chain", cmd_test_chain, "test chain code", "test_chain" },
  	{ "translate_name", cmd_translate_name, "VFS translate_name()", "translate_name unix_filename" },
- 	{ NULL }
+ 	{0}
  };

Modified: head/net/samba413/files/patch-source3_wscript__build
==============================================================================
--- head/net/samba413/files/patch-source3_wscript__build	Sat Oct 31 04:20:08 2020	(r553732)
+++ head/net/samba413/files/patch-source3_wscript__build	Sat Oct 31 04:28:26 2020	(r553733)
@@ -1,6 +1,6 @@
---- source3/wscript_build.orig	2019-05-07 08:38:21 UTC
+--- source3/wscript_build.orig	2020-07-09 13:33:56 UTC
 +++ source3/wscript_build
-@@ -236,11 +236,9 @@ bld.SAMBA3_SUBSYSTEM('SMBREGISTRY',
+@@ -233,11 +233,9 @@ bld.SAMBA3_SUBSYSTEM('SMBREGISTRY',
                          talloc
                          replace
                          util_reg
@@ -13,7 +13,7 @@
                          ''')
  
  # Do not link against this use 'smbconf'
-@@ -514,7 +512,7 @@ bld.SAMBA3_LIBRARY('secrets3',
+@@ -495,7 +493,7 @@ bld.SAMBA3_LIBRARY('secrets3',
  
  bld.SAMBA3_LIBRARY('smbldap',
                      source='lib/smbldap.c',
@@ -22,7 +22,7 @@
                      enabled=bld.CONFIG_SET("HAVE_LDAP"),
                      private_library=False,
                      abi_directory='lib/ABI',
-@@ -739,6 +737,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
+@@ -721,6 +719,7 @@ bld.SAMBA3_LIBRARY('smbd_base',
                          smbd_conn
                          param_service
                          AVAHI
@@ -30,7 +30,7 @@
                          PRINTBASE
                          PROFILE
                          LOCKING
-@@ -1116,6 +1115,7 @@ bld.SAMBA3_BINARY('client/smbclient',
+@@ -1129,6 +1128,7 @@ bld.SAMBA3_BINARY('client/smbclient',
                        msrpc3
                        RPC_NDR_SRVSVC
                        cli_smb_common
@@ -38,3 +38,23 @@
                        archive
                        ''')
  
+@@ -1153,8 +1153,8 @@ bld.SAMBA3_BINARY('smbspool_krb5_wrapper',
+                  enabled=bld.CONFIG_SET('HAVE_CUPS'))
+ 
+ bld.SAMBA3_BINARY('smbspool_argv_wrapper',
+-		  source='script/tests/smbspool_argv_wrapper.c',
+-		  for_selftest=True)
++                  source='script/tests/smbspool_argv_wrapper.c',
++                  for_selftest=True)
+ 
+ bld.SAMBA3_BINARY('locktest2',
+                  source='torture/locktest2.c',
+@@ -1303,7 +1303,7 @@ bld.SAMBA3_BINARY('vfstest',
+                       smbconf
+                       SMBREADLINE
+                       ''',
+-                 for_selftest=True)
++                 install=True)
+ 
+ bld.SAMBA3_BINARY('versiontest',
+                  source='lib/version_test.c',

Modified: head/net/samba413/pkg-plist
==============================================================================
--- head/net/samba413/pkg-plist	Sat Oct 31 04:20:08 2020	(r553732)
+++ head/net/samba413/pkg-plist	Sat Oct 31 04:28:26 2020	(r553733)
@@ -34,6 +34,7 @@ bin/smbtar
 %%SAMBA4_PYTHON%%bin/smbtorture
 bin/smbtree
 bin/testparm
+bin/vfstest
 bin/wbinfo
 sbin/eventlogadm
 sbin/nmbd
@@ -463,7 +464,6 @@ lib/samba4/private/libxattr-tdb-samba4.so
 %%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Sch59.ldf.diff
 %%AD_DC%%%%DATADIR%%/setup/adprep/WindowsServerDocs/Schema-Updates.md
 %%AD_DC%%%%DATADIR%%/setup/aggregate_schema.ldif
-
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k0.txt
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3.txt
 %%AD_DC%%%%DATADIR%%/setup/display-specifiers/DisplaySpecifiers-Win2k3R2.txt



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202010310428.09V4SQcL092412>