svn commit: r446474 - in branches/2017Q3/net: samba44 samba45 samba46
Mark Felder
feld at FreeBSD.org
Sun Jul 23 13:46:36 UTC 2017
Author: feld
Date: Sun Jul 23 13:46:35 2017
New Revision: 446474
URL: https://svnweb.freebsd.org/changeset/ports/446474
Log:
MFH: r445650
Samba 4.6.6, 4.5.12 and 4.4.15 Security update for the CVE-2017-11103: Orpheus' Lyre KDC-REP service name validation in Heimdal
Security: CVE-2017-11103
Approved by: ports-secteam (with hat)
Modified:
branches/2017Q3/net/samba44/Makefile
branches/2017Q3/net/samba44/distinfo
branches/2017Q3/net/samba45/Makefile
branches/2017Q3/net/samba45/distinfo
branches/2017Q3/net/samba46/Makefile
branches/2017Q3/net/samba46/distinfo
Directory Properties:
branches/2017Q3/ (props changed)
Modified: branches/2017Q3/net/samba44/Makefile
==============================================================================
--- branches/2017Q3/net/samba44/Makefile Sun Jul 23 13:13:11 2017 (r446473)
+++ branches/2017Q3/net/samba44/Makefile Sun Jul 23 13:46:35 2017 (r446474)
@@ -3,7 +3,7 @@
PORTNAME?= ${SAMBA4_BASENAME}44
PORTVERSION?= ${SAMBA4_VERSION}
-PORTREVISION?= 1
+PORTREVISION?= 0
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -13,13 +13,13 @@ COMMENT?= Free SMB/CIFS and AD/DC server and client f
LICENSE= GPLv3
-CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-356]-4.* p5-Parse-Pidl-4.*
+CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-35-9]-4.* p5-Parse-Pidl-4.*
#EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1
SAMBA4_BASENAME= samba
SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4
-SAMBA4_VERSION= 4.4.14
+SAMBA4_VERSION= 4.4.15
SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
WRKSRC?= ${WRKDIR}/${DISTNAME}
@@ -159,11 +159,6 @@ CONFIGURE_ARGS+= \
--without-gettext \
--with-sendfile-support \
${ICONV_CONFIGURE_BASE}
-# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
-.if ${ARCH} == "amd64"
-CFLAGS+= -fno-omit-frame-pointer
-.endif
-
.if ${PORT_OPTIONS:MBIND99}
RUN_DEPENDS+= bind99>=9.9.0.0:dns/bind99
SUB_LIST+= NSUPDATE="@comment "
@@ -399,10 +394,19 @@ SUB_FILES= pkg-message README.FreeBSD
# Make sure that the right version of Python is used by the tools
# https://bugzilla.samba.org/show_bug.cgi?id=7305
SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/*
+
+# for libexecinfo: (so that __builtin_frame_address() finds the top of the stack)
+.if ${ARCH} == "amd64"
+CFLAGS+= -fno-omit-frame-pointer
+.endif
# No fancy color error messages
.if ${COMPILER_TYPE} == "clang"
CFLAGS+= -fno-color-diagnostics
.endif
+.if ${readline_ARGS} == port
+CFLAGS+= -D_FUNCTION_DEF
+.endif
+
CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
Modified: branches/2017Q3/net/samba44/distinfo
==============================================================================
--- branches/2017Q3/net/samba44/distinfo Sun Jul 23 13:13:11 2017 (r446473)
+++ branches/2017Q3/net/samba44/distinfo Sun Jul 23 13:46:35 2017 (r446474)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495629061
-SHA256 (samba-4.4.14.tar.gz) = b0a564af71536f12f01aae2e1d93a04c588dd53b81a3f3eaf9bb73ba4f6f57dd
-SIZE (samba-4.4.14.tar.gz) = 20766497
+TIMESTAMP = 1499891749
+SHA256 (samba-4.4.15.tar.gz) = 011d1a64afecd9e04f14581a6a2afd1f73c33fa1cdc5bfe3aa11c4752954731c
+SIZE (samba-4.4.15.tar.gz) = 20774186
Modified: branches/2017Q3/net/samba45/Makefile
==============================================================================
--- branches/2017Q3/net/samba45/Makefile Sun Jul 23 13:13:11 2017 (r446473)
+++ branches/2017Q3/net/samba45/Makefile Sun Jul 23 13:46:35 2017 (r446474)
@@ -3,7 +3,7 @@
PORTNAME?= ${SAMBA4_BASENAME}45
PORTVERSION?= ${SAMBA4_VERSION}
-PORTREVISION?= 1
+PORTREVISION?= 0
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -13,13 +13,13 @@ COMMENT?= Free SMB/CIFS and AD/DC server and client
LICENSE= GPLv3
-CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-46]-4.* p5-Parse-Pidl-4.*
+CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-46-9]-4.* p5-Parse-Pidl-4.*
#EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1
SAMBA4_BASENAME= samba
SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4
-SAMBA4_VERSION= 4.5.10
+SAMBA4_VERSION= 4.5.12
SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
WRKSRC?= ${WRKDIR}/${DISTNAME}
@@ -289,6 +289,10 @@ CFLAGS+= -fno-omit-frame-pointer
.if ${CHOSEN_COMPILER_TYPE} == clang
CFLAGS+= -fno-color-diagnostics
.endif
+.if ${readline_ARGS} == port
+CFLAGS+= -D_FUNCTION_DEF
+.endif
+
CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
Modified: branches/2017Q3/net/samba45/distinfo
==============================================================================
--- branches/2017Q3/net/samba45/distinfo Sun Jul 23 13:13:11 2017 (r446473)
+++ branches/2017Q3/net/samba45/distinfo Sun Jul 23 13:46:35 2017 (r446474)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495629026
-SHA256 (samba-4.5.10.tar.gz) = 7cb753f5f6d5527ef40d4c1f47dacafb7c876cb304b4906ccb390c6a18477714
-SIZE (samba-4.5.10.tar.gz) = 20989431
+TIMESTAMP = 1499887054
+SHA256 (samba-4.5.12.tar.gz) = f4c17123e3cc852a5ecc7e38884b00deab57632b9519aebc243e2a94b9b5ace4
+SIZE (samba-4.5.12.tar.gz) = 21011562
Modified: branches/2017Q3/net/samba46/Makefile
==============================================================================
--- branches/2017Q3/net/samba46/Makefile Sun Jul 23 13:13:11 2017 (r446473)
+++ branches/2017Q3/net/samba46/Makefile Sun Jul 23 13:46:35 2017 (r446474)
@@ -3,7 +3,7 @@
PORTNAME?= ${SAMBA4_BASENAME}46
PORTVERSION?= ${SAMBA4_VERSION}
-PORTREVISION?= 1
+PORTREVISION?= 0
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -13,13 +13,13 @@ COMMENT?= Free SMB/CIFS and AD/DC server and client
LICENSE= GPLv3
-CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-5]-4.* p5-Parse-Pidl-4.*
+CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-57-9]-4.* p5-Parse-Pidl-4.*
#EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1
SAMBA4_BASENAME= samba
SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4
-SAMBA4_VERSION= 4.6.4
+SAMBA4_VERSION= 4.6.6
SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
WRKSRC?= ${WRKDIR}/${DISTNAME}
@@ -288,6 +288,9 @@ CFLAGS+= -fno-omit-frame-pointer
.endif
.if ${CHOSEN_COMPILER_TYPE} == clang
CFLAGS+= -fno-color-diagnostics
+.endif
+.if ${readline_ARGS} == port
+CFLAGS+= -D_FUNCTION_DEF
.endif
CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s'
Modified: branches/2017Q3/net/samba46/distinfo
==============================================================================
--- branches/2017Q3/net/samba46/distinfo Sun Jul 23 13:13:11 2017 (r446473)
+++ branches/2017Q3/net/samba46/distinfo Sun Jul 23 13:46:35 2017 (r446474)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1495628999
-SHA256 (samba-4.6.4.tar.gz) = 4ac67329d18e5586dc75db50e23b81c1f6c45a2d5bb9752ea6d90dcca08d9a61
-SIZE (samba-4.6.4.tar.gz) = 21108045
+TIMESTAMP = 1499871845
+SHA256 (samba-4.6.6.tar.gz) = fc31c809f7d85ae30f2b7dcddcb8404201b626047458cb5f2b743d4f6f3f1a8e
+SIZE (samba-4.6.6.tar.gz) = 21120791
More information about the svn-ports-all
mailing list