summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-08-23 19:37:24 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-08-23 21:41:35 +0200
commit4793b36437db6e07b359255a11b2d2893bb065a6 (patch)
treead0a5c754c7f80a629fb4d6c03a1bfd8da7555a9
parentc37d1f22602bfbc2693ff0532b5de34681e5ca6d (diff)
downloadnet-4793b36437db6e07b359255a11b2d2893bb065a6.tar.gz
net-4793b36437db6e07b359255a11b2d2893bb065a6.tar.xz
samba: version bump to 4.6.7
Change-Id: I8d4a053a0ba15255faff23f9b5a743a76199224a Reviewed-on: https://galileo.mailstation.de/gerrit/9909 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--packages/net-fs/samba/samba-4.6.7.exheres-0 (renamed from packages/net-fs/samba/samba-4.6.6-r1.exheres-0)0
-rw-r--r--packages/net-fs/samba/samba4.exlib11
2 files changed, 3 insertions, 8 deletions
diff --git a/packages/net-fs/samba/samba-4.6.6-r1.exheres-0 b/packages/net-fs/samba/samba-4.6.7.exheres-0
index 2f546eb..2f546eb 100644
--- a/packages/net-fs/samba/samba-4.6.6-r1.exheres-0
+++ b/packages/net-fs/samba/samba-4.6.7.exheres-0
diff --git a/packages/net-fs/samba/samba4.exlib b/packages/net-fs/samba/samba4.exlib
index 2e2ecd1..e38653d 100644
--- a/packages/net-fs/samba/samba4.exlib
+++ b/packages/net-fs/samba/samba4.exlib
@@ -44,7 +44,7 @@ MYOPTIONS="
ldap
quotas [[ description = [ Enables support for user quotas ] ]]
syslog [[ description = [ Enables support for syslog ] ]]
- system-krb5 [[ description = [ Use krb5 instead of heimdal ] ]]
+ system-krb5 [[ description = [ Use krb5 instead of the bundled heimdal ] ]]
systemd
winbind [[ description = [ Enables support for the winbind auth daemon ] ]]
"
@@ -56,7 +56,7 @@ RESTRICT="test"
DEPENDENCIES="
build+run:
app-arch/libarchive[>=3.1.2]
- dev-db/ldb[>=1.1.29][python_abis:*(-)?]
+ dev-db/ldb[>=1.1.29&<1.1.30][python_abis:*(-)?]
dev-db/tdb[>=1.3.12][python_abis:*(-)?]
dev-lang/perl:=
dev-libs/iniparser
@@ -118,6 +118,7 @@ WAF_SRC_CONFIGURE_PARAMS+=(
--without-automount
--without-dmapi
--without-fam
+ --without-lttng
--without-ntvfs-fileserver
)
@@ -146,12 +147,6 @@ WAF_SRC_COMPILE_PARAMS+=( -j1 )
samba4_src_prepare() {
default
- # use prefixed pkg-config
- # fixed in waf upstream, check if still necessary on new releases
- edo sed \
- -e "s/pkg-config/$(exhost --tool-prefix)&/" \
- -i third_party/waf/wafadmin/Tools/config_c.py
-
# remove files we don't want to end up in ${SYSTEMDSYSTEMUNITDIR}
edo rm packaging/systemd/{README,samba.conf.tmp,samba.sysconfig}