| 1 |
commit: 7ad932cf204b2a7ccf65b6be853f23c4450eb732 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 24 21:00:12 2017 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 24 21:00:36 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ad932cf |
| 7 |
|
| 8 |
net-fs/samba: Always use bundled heimdal if no system-krb was enabled. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
net-fs/samba/samba-4.5.4.ebuild | 3 +-- |
| 13 |
net-fs/samba/samba-4.6.0_rc1.ebuild | 3 +-- |
| 14 |
2 files changed, 2 insertions(+), 4 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-fs/samba/samba-4.5.4.ebuild b/net-fs/samba/samba-4.5.4.ebuild |
| 17 |
index e0a0e03..3a493e2 100644 |
| 18 |
--- a/net-fs/samba/samba-4.5.4.ebuild |
| 19 |
+++ b/net-fs/samba/samba-4.5.4.ebuild |
| 20 |
@@ -132,9 +132,8 @@ multilib_src_configure() { |
| 21 |
# when specifying libs for samba build you must append NONE to the end to |
| 22 |
# stop it automatically including things |
| 23 |
local bundled_libs="NONE" |
| 24 |
- if use addc && ! use system-heimdal ; then |
| 25 |
+ if ! use system-heimdal && ! use system-mitkrb5 ; then |
| 26 |
bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" |
| 27 |
- #bundled_libs="heimdal,NONE" |
| 28 |
fi |
| 29 |
|
| 30 |
local myconf=() |
| 31 |
|
| 32 |
diff --git a/net-fs/samba/samba-4.6.0_rc1.ebuild b/net-fs/samba/samba-4.6.0_rc1.ebuild |
| 33 |
index 093f6f7..56a673c 100644 |
| 34 |
--- a/net-fs/samba/samba-4.6.0_rc1.ebuild |
| 35 |
+++ b/net-fs/samba/samba-4.6.0_rc1.ebuild |
| 36 |
@@ -133,9 +133,8 @@ multilib_src_configure() { |
| 37 |
# when specifying libs for samba build you must append NONE to the end to |
| 38 |
# stop it automatically including things |
| 39 |
local bundled_libs="NONE" |
| 40 |
- if use addc && ! use system-heimdal ; then |
| 41 |
+ if ! use system-heimdal && ! use system-mitkrb5 ; then |
| 42 |
bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE" |
| 43 |
- #bundled_libs="heimdal,NONE" |
| 44 |
fi |
| 45 |
|
| 46 |
local myconf=() |
Archives