summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-10-05 18:59:26 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-10-05 19:25:26 +0200
commite9b5a3e61cf97ed71ec90bda6babfa61cd7a3f7b (patch)
tree7b1a550cbb811f4ed335d523168ef3fa0d7f31ea
parent05032828afa948b06fc3ed5a1aea378585baad6a (diff)
downloadnet-e9b5a3e61cf97ed71ec90bda6babfa61cd7a3f7b.tar.gz
net-e9b5a3e61cf97ed71ec90bda6babfa61cd7a3f7b.tar.xz
samba: version bump to 4.7.0, fixing CVE-2017-{12150,12151,12163}
First version to be able to serve as an active directory domain controller using (a system installed) krb5. I couldn't test this though. Change-Id: I186f2e095e4f34fe8e6f0b4517f3cabe4bea60a7 Reviewed-on: https://galileo.mailstation.de/gerrit/10204 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--metadata/repository_mask.conf13
-rw-r--r--packages/net-fs/samba/samba-4.7.0.exheres-0 (renamed from packages/net-fs/samba/samba-4.6.7.exheres-0)0
-rw-r--r--packages/net-fs/samba/samba4.exlib12
3 files changed, 9 insertions, 16 deletions
diff --git a/metadata/repository_mask.conf b/metadata/repository_mask.conf
index c2d59fb..105d013 100644
--- a/metadata/repository_mask.conf
+++ b/metadata/repository_mask.conf
@@ -181,11 +181,11 @@ dev-db/mariadb[<10.1.23] [[
description = [ CVE-2017-3{302,313,308,309,453,456,464} ]
]]
-net-fs/samba[<4.6.6] [[
+net-fs/samba[<4.7.0] [[
author = [ Timo Gurr <tgurr@exherbo.org> ]
- date = [ 12 Jul 2017 ]
+ date = [ 05 Oct 2017 ]
token = security
- description = [ CVE-2017-11103 ]
+ description = [ CVE-2017-{12150,12151,12163} ]
]]
net-mail/dovecot[<2.2.29] [[
@@ -222,10 +222,3 @@ media-video/rtmpdump[<2.4_p20151223] [[
token = security
description = [ CVE-2015-827{0,1,2} ]
]]
-
-dev-db/ldb[>=1.2.0] [[
- author = [ Timo Gurr <tgurr@exherbo.org> ]
- date = [ 06 Jul 2017 ]
- token = testing
- description = [ Breaks Samba < 4.7 ]
-]]
diff --git a/packages/net-fs/samba/samba-4.6.7.exheres-0 b/packages/net-fs/samba/samba-4.7.0.exheres-0
index 2f546eb..2f546eb 100644
--- a/packages/net-fs/samba/samba-4.6.7.exheres-0
+++ b/packages/net-fs/samba/samba-4.7.0.exheres-0
diff --git a/packages/net-fs/samba/samba4.exlib b/packages/net-fs/samba/samba4.exlib
index e38653d..2ff65f2 100644
--- a/packages/net-fs/samba/samba4.exlib
+++ b/packages/net-fs/samba/samba4.exlib
@@ -27,7 +27,7 @@ MYOPTIONS="
acl
addc [[
description = [ Allow Samba to act as an Active Directory Domain Controller ]
- requires = [ gnutls -system-krb5 ]
+ requires = [ gnutls ]
]]
ads [[
description = [ Enable Active Directory support ]
@@ -56,8 +56,8 @@ RESTRICT="test"
DEPENDENCIES="
build+run:
app-arch/libarchive[>=3.1.2]
- dev-db/ldb[>=1.1.29&<1.1.30][python_abis:*(-)?]
- dev-db/tdb[>=1.3.12][python_abis:*(-)?]
+ dev-db/ldb[>=1.2.2][python_abis:*(-)?]
+ dev-db/tdb[>=1.3.14][python_abis:*(-)?]
dev-lang/perl:=
dev-libs/iniparser
dev-libs/libaio [[ note = [ vfs/aio_linux.so ] ]]
@@ -66,7 +66,7 @@ DEPENDENCIES="
dev-libs/libgpg-error
dev-libs/popt
dev-libs/talloc[>=2.1.9][python_abis:*(-)?]
- dev-libs/tevent[>=0.9.31][python_abis:*(-)?]
+ dev-libs/tevent[>=0.9.33][python_abis:*(-)?]
dev-perl/Parse-Yapp
dev-util/subunit[python_abis:*(-)?]
net-libs/cyrus-sasl
@@ -90,10 +90,10 @@ DEPENDENCIES="
)
ldap? ( net-directory/openldap )
syslog? ( virtual/syslog )
- system-krb5? ( app-crypt/krb5 )
+ system-krb5? ( app-crypt/krb5[>=1.15.1] )
systemd? ( sys-apps/systemd )
build+test:
- dev-util/cmocka[>=1.0]
+ dev-util/cmocka[>=1.1.1]
"
WAF_SRC_CONFIGURE_PARAMS+=(