svn commit: r486043 - in head/net: samba47 samba48 samba48/files

[Timur I. Bakeyev]

Author: timur
Date: Tue Nov 27 17:25:53 2018
New Revision: 486043
URL: https://svnweb.freebsd.org/changeset/ports/486043

Log:
  Upgrade Samba ports to address November security vulnerabilities
  
  Security:	CVE-2018-14629
  		CVE-2018-16841
  		CVE-2018-16851
  		CVE-2018-16852
  		CVE-2018-16853
  		CVE-2018-16857

Deleted:
  head/net/samba48/files/0001-bug-13441-extra.patch
Modified:
  head/net/samba47/Makefile
  head/net/samba47/distinfo
  head/net/samba48/Makefile
  head/net/samba48/distinfo

Modified: head/net/samba47/Makefile
==============================================================================
--- head/net/samba47/Makefile	Tue Nov 27 17:21:37 2018	(r486042)
+++ head/net/samba47/Makefile	Tue Nov 27 17:25:53 2018	(r486043)
@@ -3,7 +3,7 @@
 
 PORTNAME=			${SAMBA4_BASENAME}47
 PORTVERSION=			${SAMBA4_VERSION}
-PORTREVISION=			1
+PORTREVISION=			0
 CATEGORIES?=			net
 MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=			${SAMBA4_DISTNAME}
@@ -20,12 +20,11 @@ CONFLICTS_INSTALL?=		samba4-4.0.* samba4[1-689]-4.* p5
 EXTRA_PATCHES+=			${PATCHDIR}/0001-Zfs-provision-1.patch:-p1
 EXTRA_PATCHES+=			${PATCHDIR}/0001-Freenas-master-mdns-fixes-22.patch:-p1
 EXTRA_PATCHES+=			${PATCHDIR}/0001-audit.patch:-p1
-#EXTRA_PATCHES+=			${PATCHDIR}/0001-bug-13351.patch:-p1
 EXTRA_PATCHES+=			${PATCHDIR}/0001-bug-228462.patch:-p1
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
-SAMBA4_VERSION=			4.7.10
+SAMBA4_VERSION=			4.7.12
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}
@@ -365,7 +364,7 @@ SAMBA4_MODULES+=		idmap_ad idmap_rfc2307 nss-info_temp
 .if ${PORT_OPTIONS:MDEVELOPER}
 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 vfs_error_inject
+				vfs_nfs4acl_xattr vfs_error_inject vfs_delay_inject
 .endif
 
 .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)

Modified: head/net/samba47/distinfo
==============================================================================
--- head/net/samba47/distinfo	Tue Nov 27 17:21:37 2018	(r486042)
+++ head/net/samba47/distinfo	Tue Nov 27 17:25:53 2018	(r486043)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1536019045
-SHA256 (samba-4.7.10.tar.gz) = 34596814e9b8daaec3e7a07d4d3b355d4976e6a7cf13d4e0b9aaf0388f32be70
-SIZE (samba-4.7.10.tar.gz) = 16911799
+TIMESTAMP = 1543313407
+SHA256 (samba-4.7.12.tar.gz) = 0e9c386bc32983452c5dcafdee561f37e43a411ac1919c864404e6177b1aaf4a
+SIZE (samba-4.7.12.tar.gz) = 16923189

Modified: head/net/samba48/Makefile
==============================================================================
--- head/net/samba48/Makefile	Tue Nov 27 17:21:37 2018	(r486042)
+++ head/net/samba48/Makefile	Tue Nov 27 17:25:53 2018	(r486043)
@@ -3,7 +3,7 @@
 
 PORTNAME=			${SAMBA4_BASENAME}48
 PORTVERSION=			${SAMBA4_VERSION}
-PORTREVISION=			1
+PORTREVISION=			0
 CATEGORIES?=			net
 MASTER_SITES=			SAMBA/samba/stable SAMBA/samba/rc
 DISTNAME=			${SAMBA4_DISTNAME}
@@ -22,12 +22,11 @@ EXTRA_PATCHES+=			${PATCHDIR}/0001-Zfs-provision-1.pat
 EXTRA_PATCHES+=			${PATCHDIR}/0001-Freenas-master-mdns-fixes-22.patch:-p1
 EXTRA_PATCHES+=			${PATCHDIR}/0001-audit.patch:-p1
 EXTRA_PATCHES+=			${PATCHDIR}/0001-bug-13175.patch:-p1
-EXTRA_PATCHES+=			${PATCHDIR}/0001-bug-13441-extra.patch:-p1
 EXTRA_PATCHES+=			${PATCHDIR}/0001-bug-228462.patch:-p1
 
 SAMBA4_BASENAME=		samba
 SAMBA4_PORTNAME=		${SAMBA4_BASENAME}4
-SAMBA4_VERSION=			4.8.5
+SAMBA4_VERSION=			4.8.7
 SAMBA4_DISTNAME=		${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=			${WRKDIR}/${DISTNAME}
@@ -383,7 +382,7 @@ SAMBA4_MODULES+=		idmap_ad idmap_rfc2307 nss-info_temp
 .if ${PORT_OPTIONS:MDEVELOPER}
 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 vfs_error_inject
+				vfs_nfs4acl_xattr vfs_error_inject vfs_delay_inject
 .endif
 
 .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES)

Modified: head/net/samba48/distinfo
==============================================================================
--- head/net/samba48/distinfo	Tue Nov 27 17:21:37 2018	(r486042)
+++ head/net/samba48/distinfo	Tue Nov 27 17:25:53 2018	(r486043)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535201844
-SHA256 (samba-4.8.5.tar.gz) = e58ee6b1262d4128b8932ceee59d5f0b0a9bbe00547eb3cc4c41552de1a65155
-SIZE (samba-4.8.5.tar.gz) = 17715401
+TIMESTAMP = 1543311377
+SHA256 (samba-4.8.7.tar.gz) = 0f6f67932e8bb23ab83b43070037ac452f9fc5f20763857d2b67e209ee7cd362
+SIZE (samba-4.8.7.tar.gz) = 17724232