aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortimur <timur@FreeBSD.org>2014-06-24 02:47:48 +0800
committertimur <timur@FreeBSD.org>2014-06-24 02:47:48 +0800
commitd6745b06806eb1adcd05d6a22c1542afb9eaf77b (patch)
tree63fba5a4b326259551e8e69b56ef90bc4ca0a425
parentd16a15db0ab61055228f1edb8768547b0a6ff23a (diff)
downloadfreebsd-ports-gnome-d6745b06806eb1adcd05d6a22c1542afb9eaf77b.tar.gz
freebsd-ports-gnome-d6745b06806eb1adcd05d6a22c1542afb9eaf77b.tar.zst
freebsd-ports-gnome-d6745b06806eb1adcd05d6a22c1542afb9eaf77b.zip
Security update for Samba 3.6, 4.0 and 4.1.
PR: 190166 Security: CVE-2014-0244 CVE-2014-3493 CVE-2014-0239 CVE-2014-0178
Diffstat
-rw-r--r--net/samba36/Makefile2
-rw-r--r--net/samba36/distinfo4
-rw-r--r--net/samba4/Makefile4
-rw-r--r--net/samba4/distinfo4
-rw-r--r--net/samba4/files/patch-buildtools__wafadmin__Tools__config_c.py22
-rw-r--r--net/samba4/files/samba_server.in2
-rw-r--r--net/samba41/Makefile2
-rw-r--r--net/samba41/distinfo4
-rw-r--r--net/samba41/files/patch-buildtools__wafadmin__Tools__config_c.py22
-rw-r--r--net/samba41/files/samba_server.in2
10 files changed, 12 insertions, 56 deletions
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index c4d71e70fa0d..c662f80c9a5c 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -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}
diff --git a/net/samba36/distinfo b/net/samba36/distinfo
index eb2fce0b38b0..53014bd37065 100644
--- a/net/samba36/distinfo
+++ b/net/samba36/distinfo
@@ -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
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 2b014ee4a880..5f31db5c8018 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -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}
diff --git a/net/samba4/distinfo b/net/samba4/distinfo
index 0dbf2d9af096..e9fa1a90f7bf 100644
--- a/net/samba4/distinfo
+++ b/net/samba4/distinfo
@@ -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
diff --git a/net/samba4/files/patch-buildtools__wafadmin__Tools__config_c.py b/net/samba4/files/patch-buildtools__wafadmin__Tools__config_c.py
deleted file mode 100644
index 3015402eace6..000000000000
--- a/net/samba4/files/patch-buildtools__wafadmin__Tools__config_c.py
+++ /dev/null
@@ -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'):
diff --git a/net/samba4/files/samba_server.in b/net/samba4/files/samba_server.in
index b1556370bef6..3993ceeb6406 100644
--- a/net/samba4/files/samba_server.in
+++ b/net/samba4/files/samba_server.in
@@ -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
diff --git a/net/samba41/Makefile b/net/samba41/Makefile
index 8f63b129e40c..dec78e10f993 100644
--- a/net/samba41/Makefile
+++ b/net/samba41/Makefile
@@ -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}
diff --git a/net/samba41/distinfo b/net/samba41/distinfo
index ac2ffec13cb4..fabec6f8e501 100644
--- a/net/samba41/distinfo
+++ b/net/samba41/distinfo
@@ -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
diff --git a/net/samba41/files/patch-buildtools__wafadmin__Tools__config_c.py b/net/samba41/files/patch-buildtools__wafadmin__Tools__config_c.py
deleted file mode 100644
index 3015402eace6..000000000000
--- a/net/samba41/files/patch-buildtools__wafadmin__Tools__config_c.py
+++ /dev/null
@@ -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'):
diff --git a/net/samba41/files/samba_server.in b/net/samba41/files/samba_server.in
index b1556370bef6..3993ceeb6406 100644
--- a/net/samba41/files/samba_server.in
+++ b/net/samba41/files/samba_server.in
@@ -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
generated by cgit (git 2.34.1) at 2024-11-27 12:54:57 +0800