Date: Sat, 16 Nov 2013 23:54:36 +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: r334038 - in head/net/samba36: . files Message-ID: <201311162354.rAGNsagD026882@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311162354.rAGNsagD026882>