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

Security:	CVE-2013-4475
This commit is contained in:
Timur I. Bakeyev 2013-11-16 23:54:36 +00:00
parent 3e7ce55fac
commit c61fffc004
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=334038
3 changed files with 9 additions and 10 deletions

View File

@ -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}/source3/m4 -I${WRKDIR}/${DISTNAME}/m4 -I${WRKD
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

View File

@ -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

View File

@ -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