From owner-svn-ports-head@FreeBSD.ORG  Sat Nov 16 23:54:37 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 52A6664D;
 Sat, 16 Nov 2013 23:54:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 26FF02BC8;
 Sat, 16 Nov 2013 23:54:37 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAGNsbKu026885;
 Sat, 16 Nov 2013 23:54:37 GMT (envelope-from timur@svn.freebsd.org)
Received: (from timur@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAGNsagD026882;
 Sat, 16 Nov 2013 23:54:36 GMT (envelope-from timur@svn.freebsd.org)
Message-Id: <201311162354.rAGNsagD026882@svn.freebsd.org>
From: "Timur I. Bakeyev" <timur@FreeBSD.org>
Date: Sat, 16 Nov 2013 23:54:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334038 - in head/net/samba36: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Nov 2013 23:54:37 -0000

Author: timur
Date: Sat Nov 16 23:54:36 2013
New Revision: 334038
URL: http://svnweb.freebsd.org/changeset/ports/334038

Log:
  Update port to the 3.6.20 version, addressing CVE-2013-4475
  
  Security:	CVE-2013-4475

Modified:
  head/net/samba36/Makefile
  head/net/samba36/distinfo
  head/net/samba36/files/samba.in

Modified: head/net/samba36/Makefile
==============================================================================
--- head/net/samba36/Makefile	Sat Nov 16 23:35:39 2013	(r334037)
+++ head/net/samba36/Makefile	Sat Nov 16 23:54:36 2013	(r334038)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=		${SAMBA_BASENAME}36
-PORTVERSION=		3.6.18
+PORTVERSION=		3.6.20
 PORTREVISION?=		0
 CATEGORIES?=		net
 MASTER_SITES=		${MASTER_SITE_SAMBA}
@@ -29,9 +29,8 @@ IPATHS=			-I${WRKDIR}/${DISTNAME}/source
 AUTOHEADER_ARGS=	${IPATHS}
 AUTOCONF_ARGS=		${IPATHS}
 
-USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
-USES=			pkgconfig iconv
+USES=			gmake pkgconfig iconv
 USE_AUTOTOOLS=		autoconf autoheader
 USE_LDCONFIG=		${SAMBA_LIBDIR}
 # pkg-config is used to find talloc

Modified: head/net/samba36/distinfo
==============================================================================
--- head/net/samba36/distinfo	Sat Nov 16 23:35:39 2013	(r334037)
+++ head/net/samba36/distinfo	Sat Nov 16 23:54:36 2013	(r334038)
@@ -1,2 +1,2 @@
-SHA256 (samba-3.6.18.tar.gz) = 6d71a9ba77567eae863b9599e451479b99f6acb6042a1d98e7a22422ce599992
-SIZE (samba-3.6.18.tar.gz) = 34112906
+SHA256 (samba-3.6.20.tar.gz) = 5fb5daa65c06c890cdc938fd30daca40945afe2880e6a4b95b8eea418e003a0f
+SIZE (samba-3.6.20.tar.gz) = 34112208

Modified: head/net/samba36/files/samba.in
==============================================================================
--- head/net/samba36/files/samba.in	Sat Nov 16 23:35:39 2013	(r334037)
+++ head/net/samba36/files/samba.in	Sat Nov 16 23:54:36 2013	(r334038)
@@ -162,11 +162,6 @@ samba_config_init() {
     if [ -n "${samba_config}" -a "${samba_config}" != "${samba_config_default}" ]; then
 	pid_extra="-$(basename "${samba_config}")"
     fi
-    # Setup dependent variables
-    if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
-	nmbd_enable=${nmbd_enable=YES}
-	smbd_enable=${smbd_enable=YES}
-    fi
     # Defaults
     samba_enable=${samba_enable:=NO}
     nmbd_enable=${nmbd_enable:=NO}
@@ -180,6 +175,11 @@ samba_config_init() {
 %%WINBIND%%	fi
 %%WINBIND%%	winbindd_enable=${winbindd_enable:=NO}
 %%WINBIND%%    fi
+    # Setup dependent variables
+    if [ -n "${rcvar}" ] && checkyesno "${rcvar}"; then
+	nmbd_enable=${nmbd_enable=YES}
+	smbd_enable=${smbd_enable=YES}
+    fi
 }
 
 # Load configuration variables