Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 30 May 2017 13:18:37 +0000 (UTC)
From:      Mark Felder <feld@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r442060 - in branches/2017Q2/net: samba44 samba45 samba46 samba46/files
Message-ID:  <201705301318.v4UDIb02008744@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: feld
Date: Tue May 30 13:18:37 2017
New Revision: 442060
URL: https://svnweb.freebsd.org/changeset/ports/442060

Log:
  MFH: r441602
  
  Urgent upgrade of the Samba 4.[4-6] ports to address RCE in the Samba code(CVE-2017-7494). All versions starting from 3.5+ are affected.
  
  Security:	CVE-2017-7494
  
  Approved by:	ports-secteam (with hat)
  PR:	219514

Added:
  branches/2017Q2/net/samba46/files/patch-source3__librpc__crypto__gse.c
     - copied unchanged from r441602, head/net/samba46/files/patch-source3__librpc__crypto__gse.c
Modified:
  branches/2017Q2/net/samba44/Makefile
  branches/2017Q2/net/samba44/distinfo
  branches/2017Q2/net/samba45/Makefile
  branches/2017Q2/net/samba45/distinfo
  branches/2017Q2/net/samba46/Makefile
  branches/2017Q2/net/samba46/distinfo
  branches/2017Q2/net/samba46/pkg-plist
Directory Properties:
  branches/2017Q2/   (props changed)

Modified: branches/2017Q2/net/samba44/Makefile
==============================================================================
--- branches/2017Q2/net/samba44/Makefile	Tue May 30 11:20:53 2017	(r442059)
+++ branches/2017Q2/net/samba44/Makefile	Tue May 30 13:18:37 2017	(r442060)
@@ -19,7 +19,7 @@ CONFLICTS?=		*samba3[2-6]-3.* samba4-4.0.* samba4[1-35
 
 SAMBA4_BASENAME=	samba
 SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
-SAMBA4_VERSION=		4.4.13
+SAMBA4_VERSION=		4.4.14
 SAMBA4_DISTNAME=	${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=		${WRKDIR}/${DISTNAME}

Modified: branches/2017Q2/net/samba44/distinfo
==============================================================================
--- branches/2017Q2/net/samba44/distinfo	Tue May 30 11:20:53 2017	(r442059)
+++ branches/2017Q2/net/samba44/distinfo	Tue May 30 13:18:37 2017	(r442060)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490980593
-SHA256 (samba-4.4.13.tar.gz) = 61558009408e4f37d79c2b5f9c49cf7633908e12a14141e1c075c67011fa0d2d
-SIZE (samba-4.4.13.tar.gz) = 20766658
+TIMESTAMP = 1495629061
+SHA256 (samba-4.4.14.tar.gz) = b0a564af71536f12f01aae2e1d93a04c588dd53b81a3f3eaf9bb73ba4f6f57dd
+SIZE (samba-4.4.14.tar.gz) = 20766497

Modified: branches/2017Q2/net/samba45/Makefile
==============================================================================
--- branches/2017Q2/net/samba45/Makefile	Tue May 30 11:20:53 2017	(r442059)
+++ branches/2017Q2/net/samba45/Makefile	Tue May 30 13:18:37 2017	(r442060)
@@ -19,7 +19,7 @@ CONFLICTS?=			*samba3[2-6]-3.* samba4-4.0.* samba4[1-4
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
-SAMBA4_VERSION=			4.5.8
+SAMBA4_VERSION=			4.5.10
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}

Modified: branches/2017Q2/net/samba45/distinfo
==============================================================================
--- branches/2017Q2/net/samba45/distinfo	Tue May 30 11:20:53 2017	(r442059)
+++ branches/2017Q2/net/samba45/distinfo	Tue May 30 13:18:37 2017	(r442060)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490981258
-SHA256 (samba-4.5.8.tar.gz) = f63b656d8823a280c50c9dbd6b692816cd7a88adfe9b47997ce697fd75bf81f0
-SIZE (samba-4.5.8.tar.gz) = 20979104
+TIMESTAMP = 1495629026
+SHA256 (samba-4.5.10.tar.gz) = 7cb753f5f6d5527ef40d4c1f47dacafb7c876cb304b4906ccb390c6a18477714
+SIZE (samba-4.5.10.tar.gz) = 20989431

Modified: branches/2017Q2/net/samba46/Makefile
==============================================================================
--- branches/2017Q2/net/samba46/Makefile	Tue May 30 11:20:53 2017	(r442059)
+++ branches/2017Q2/net/samba46/Makefile	Tue May 30 13:18:37 2017	(r442060)
@@ -19,7 +19,7 @@ CONFLICTS?=			*samba3[2-6]-3.* samba4-4.0.* samba4[1-5
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
-SAMBA4_VERSION=			4.6.2
+SAMBA4_VERSION=			4.6.4
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}

Modified: branches/2017Q2/net/samba46/distinfo
==============================================================================
--- branches/2017Q2/net/samba46/distinfo	Tue May 30 11:20:53 2017	(r442059)
+++ branches/2017Q2/net/samba46/distinfo	Tue May 30 13:18:37 2017	(r442060)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490962372
-SHA256 (samba-4.6.2.tar.gz) = 927afcc16e444718985e3952de92d34e7b776b9ca0238179d866da18a6441c35
-SIZE (samba-4.6.2.tar.gz) = 21097045
+TIMESTAMP = 1495628999
+SHA256 (samba-4.6.4.tar.gz) = 4ac67329d18e5586dc75db50e23b81c1f6c45a2d5bb9752ea6d90dcca08d9a61
+SIZE (samba-4.6.4.tar.gz) = 21108045

Copied: branches/2017Q2/net/samba46/files/patch-source3__librpc__crypto__gse.c (from r441602, head/net/samba46/files/patch-source3__librpc__crypto__gse.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/net/samba46/files/patch-source3__librpc__crypto__gse.c	Tue May 30 13:18:37 2017	(r442060, copy of r441602, head/net/samba46/files/patch-source3__librpc__crypto__gse.c)
@@ -0,0 +1,16 @@
+--- 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 @@
+ 	struct gse_context *gse_ctx =
+ 		talloc_get_type_abort(gensec_security->private_data,
+ 				      struct gse_context);
+-	OM_uint32 gss_maj, gss_min;
++	OM_uint32 gss_min;
+ 	gss_buffer_desc in_data;
+ 	gss_buffer_desc out_data;
+ 	DATA_BLOB blob = data_blob_null;
+ 	NTSTATUS status;
++	OM_uint32 gss_maj = -1;
+ 	OM_uint32 time_rec = 0;
+ 	struct timeval tv;
+ 	struct cli_credentials *cli_creds = gensec_get_credentials(gensec_security);

Modified: branches/2017Q2/net/samba46/pkg-plist
==============================================================================
--- branches/2017Q2/net/samba46/pkg-plist	Tue May 30 11:20:53 2017	(r442059)
+++ branches/2017Q2/net/samba46/pkg-plist	Tue May 30 13:18:37 2017	(r442060)
@@ -434,6 +434,7 @@ lib/shared-modules/vfs/zfsacl.so
 %%PYTHON_SITELIBDIR%%/samba/com.so
 %%PYTHON_SITELIBDIR%%/samba/common.py
 %%PYTHON_SITELIBDIR%%/samba/credentials.so
+%%PYTHON_SITELIBDIR%%/samba/crypto.so
 %%PYTHON_SITELIBDIR%%/samba/dbchecker.py
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/__init__.py
 %%PYTHON_SITELIBDIR%%/samba/dcerpc/atsvc.so



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