cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Security update for Samba 3.6, 4.0 and 4.1.

Browse Source 
PR:		190166
Security:	CVE-2014-0244
		CVE-2014-3493
		CVE-2014-0239
		CVE-2014-0178
This commit is contained in:
Timur I. Bakeyev 2014-06-23 18:47:48 +00:00
parent 9b2b8a9c91
commit e4d54f8cb7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=358993
10 changed files with 12 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/samba36/Makefile
View File

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

4
net/samba36/distinfo
View File

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

4
net/samba4/Makefile
View File

@ -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.1.*
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}

4
net/samba4/distinfo
View File

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

22
net/samba4/files/patch-buildtools__wafadmin__Tools__config_c.py
View File

@ -1,22 +0,0 @@
--- buildtools/wafadmin/Tools/config_c.py.orig 2013-06-13 09:21:02.000000000 +0000
+++ buildtools/wafadmin/Tools/config_c.py 2014-03-27 11:46:02.381178536 +0000
@@ -73,6 +73,19 @@
app('CCFLAGS_' + uselib, x)
app('CXXFLAGS_' + uselib, x)
app('LINKFLAGS_' + uselib, x)
+ #
+ # NOTE on special treatment of -Wl,-R and -Wl,-rpath:
+ #
+ # It is important to not put a library provided RPATH
+ # into the LINKFLAGS but in the RPATH instead, since
+ # the provided LINKFLAGS get prepended to our own internal
+ # RPATH later, and hence can potentially lead to linking
+ # in too old versions of our internal libs.
+ #
+ elif x.startswith('-Wl,-R'):
+ app('RPATH_' + uselib, x[6:])
+ elif x.startswith('-Wl,-rpath,'):
+ app('RPATH_' + uselib, x[11:])
elif x.startswith('-Wl'):
app('LINKFLAGS_' + uselib, x)
elif x.startswith('-m') or x.startswith('-f'):

2
net/samba4/files/samba_server.in
View File

@ -33,7 +33,7 @@ samba_server_config_default="%%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%"
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

2
net/samba41/Makefile
View File

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

4
net/samba41/distinfo
View File

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

22
net/samba41/files/patch-buildtools__wafadmin__Tools__config_c.py
View File

@ -1,22 +0,0 @@
--- buildtools/wafadmin/Tools/config_c.py.orig 2013-06-13 09:21:02.000000000 +0000
+++ buildtools/wafadmin/Tools/config_c.py 2014-03-27 11:46:02.381178536 +0000
@@ -73,6 +73,19 @@
app('CCFLAGS_' + uselib, x)
app('CXXFLAGS_' + uselib, x)
app('LINKFLAGS_' + uselib, x)
+ #
+ # NOTE on special treatment of -Wl,-R and -Wl,-rpath:
+ #
+ # It is important to not put a library provided RPATH
+ # into the LINKFLAGS but in the RPATH instead, since
+ # the provided LINKFLAGS get prepended to our own internal
+ # RPATH later, and hence can potentially lead to linking
+ # in too old versions of our internal libs.
+ #
+ elif x.startswith('-Wl,-R'):
+ app('RPATH_' + uselib, x[6:])
+ elif x.startswith('-Wl,-rpath,'):
+ app('RPATH_' + uselib, x[11:])
elif x.startswith('-Wl'):
app('LINKFLAGS_' + uselib, x)
elif x.startswith('-m') or x.startswith('-f'):

2
net/samba41/files/samba_server.in
View File

@ -33,7 +33,7 @@ samba_server_config_default="%%SAMBA4_CONFDIR%%/%%SAMBA4_CONFIG%%"
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