svn commit: r358993 - in head/net: samba36 samba4 samba4/files samba41 samba41/files

[Timur I. Bakeyev]

Author: timur
Date: Mon Jun 23 18:47:48 2014
New Revision: 358993
URL: http://svnweb.freebsd.org/changeset/ports/358993
QAT: https://qat.redports.org/buildarchive/r358993/

Log:
  Security update for Samba 3.6, 4.0 and 4.1.
  
  PR:		190166
  Security:	CVE-2014-0244
  		CVE-2014-3493
  		CVE-2014-0239
  		CVE-2014-0178

Deleted:
  head/net/samba4/files/patch-buildtools__wafadmin__Tools__config_c.py
  head/net/samba41/files/patch-buildtools__wafadmin__Tools__config_c.py
Modified:
  head/net/samba36/Makefile
  head/net/samba36/distinfo
  head/net/samba4/Makefile
  head/net/samba4/distinfo
  head/net/samba4/files/samba_server.in
  head/net/samba41/Makefile
  head/net/samba41/distinfo
  head/net/samba41/files/samba_server.in

Modified: head/net/samba36/Makefile
==============================================================================
--- head/net/samba36/Makefile	Mon Jun 23 18:41:51 2014	(r358992)
+++ head/net/samba36/Makefile	Mon Jun 23 18:47:48 2014	(r358993)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=		${SAMBA_BASENAME}36
-PORTVERSION=		3.6.23
+PORTVERSION=		3.6.24
 PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}

Modified: head/net/samba36/distinfo
==============================================================================
--- head/net/samba36/distinfo	Mon Jun 23 18:41:51 2014	(r358992)
+++ head/net/samba36/distinfo	Mon Jun 23 18:47:48 2014	(r358993)
@@ -1,2 +1,2 @@
-SHA256 (samba-3.6.23.tar.gz) = 25bbfa81b9a26609a0be744240b63e1f5030bbcfab684cf7aea3b86ed0db2dd0
-SIZE (samba-3.6.23.tar.gz) = 34122387
+SHA256 (samba-3.6.24.tar.gz) = 11d0bd04b734731970259efc6692b8e749ff671a9b56d8cc5fa98c192ab234a7
+SIZE (samba-3.6.24.tar.gz) = 34122116

Modified: head/net/samba4/Makefile
==============================================================================
--- head/net/samba4/Makefile	Mon Jun 23 18:41:51 2014	(r358992)
+++ head/net/samba4/Makefile	Mon Jun 23 18:47:48 2014	(r358993)
@@ -3,7 +3,7 @@
 
 PORTNAME?=		${SAMBA4_BASENAME}4
 PORTVERSION?=		${SAMBA4_VERSION}
-PORTREVISION?=		1
+PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
 MASTER_SITE_SUBDIR=	samba/stable samba/rc
@@ -18,7 +18,7 @@ CONFLICTS?=		*samba3[2-6]-3.* samba41-4.
 
 SAMBA4_BASENAME=	samba
 SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
-SAMBA4_VERSION=		4.0.17
+SAMBA4_VERSION=		4.0.19
 SAMBA4_DISTNAME=	${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
 
 WRKSRC?=		${WRKDIR}/${DISTNAME}

Modified: head/net/samba4/distinfo
==============================================================================
--- head/net/samba4/distinfo	Mon Jun 23 18:41:51 2014	(r358992)
+++ head/net/samba4/distinfo	Mon Jun 23 18:47:48 2014	(r358993)
@@ -1,2 +1,2 @@
-SHA256 (samba-4.0.17.tar.gz) = 6775cc093dc1f5b4feec3b47b458b78ad44f14de11f4bc8838b69e86d1ddf6ed
-SIZE (samba-4.0.17.tar.gz) = 22126553
+SHA256 (samba-4.0.19.tar.gz) = 966ba09c99ba5ff679e444e56b1282c974630bade4a289a71f3327865bbedf85
+SIZE (samba-4.0.19.tar.gz) = 22131987

Modified: head/net/samba4/files/samba_server.in
==============================================================================
--- head/net/samba4/files/samba_server.in	Mon Jun 23 18:41:51 2014	(r358992)
+++ head/net/samba4/files/samba_server.in	Mon Jun 23 18:47:48 2014	(r358993)
@@ -33,7 +33,7 @@ samba_server_config_default="%%SAMBA4_CO
 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_configfile_arg}"
+testparm_command="%%PREFIX%%/bin/testparm --suppress-prompt --verbose ${samba_server_config}"
 smbcontrol_command="%%PREFIX%%/bin/smbcontrol"
 
 # Custom commands

Modified: head/net/samba41/Makefile
==============================================================================
--- head/net/samba41/Makefile	Mon Jun 23 18:41:51 2014	(r358992)
+++ head/net/samba41/Makefile	Mon Jun 23 18:47:48 2014	(r358993)
@@ -18,7 +18,7 @@ CONFLICTS?=		*samba3[2-6]-3.* samba4-4.0
 
 SAMBA4_BASENAME=	samba
 SAMBA4_PORTNAME=	${SAMBA4_BASENAME}4
-SAMBA4_VERSION=		4.1.7
+SAMBA4_VERSION=		4.1.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/samba41/distinfo
==============================================================================
--- head/net/samba41/distinfo	Mon Jun 23 18:41:51 2014	(r358992)
+++ head/net/samba41/distinfo	Mon Jun 23 18:47:48 2014	(r358993)
@@ -1,2 +1,2 @@
-SHA256 (samba-4.1.7.tar.gz) = 15a0ccc2fd90166c4231574f4f1a1229769be2cc4da7af9c16304e8659529d89
-SIZE (samba-4.1.7.tar.gz) = 23187644
+SHA256 (samba-4.1.9.tar.gz) = 1484542db4b462bc562541412a061ad03a0e8af7199a916d74b063dd1881c6bd
+SIZE (samba-4.1.9.tar.gz) = 23192788

Modified: head/net/samba41/files/samba_server.in
==============================================================================
--- head/net/samba41/files/samba_server.in	Mon Jun 23 18:41:51 2014	(r358992)
+++ head/net/samba41/files/samba_server.in	Mon Jun 23 18:47:48 2014	(r358993)
@@ -33,7 +33,7 @@ samba_server_config_default="%%SAMBA4_CO
 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_configfile_arg}"
+testparm_command="%%PREFIX%%/bin/testparm --suppress-prompt --verbose ${samba_server_config}"
 smbcontrol_command="%%PREFIX%%/bin/smbcontrol"
 
 # Custom commands