commit: e10a559f239b6bde6df2ffaba367cdee60cfb657 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Thu May 24 08:11:19 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Thu May 24 08:11:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e10a559f
net-fs/samba: Fixed build with USE="-ldap python". Package-Manager: Portage-2.3.38, Repoman-2.3.9 .../files/samba-4.8-without_ads_build_fix.patch | 49 ++++++++++++++++++++++ net-fs/samba/samba-4.8.2.ebuild | 2 +- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch b/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch new file mode 100644 index 00000000000..a2a4702d007 --- /dev/null +++ b/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch @@ -0,0 +1,49 @@ +From 223d3f1ed782af2b251962ada8cce190933fff7e Mon Sep 17 00:00:00 2001 +From: Volker Lendecke <v...@samba.org> +Date: Sat, 3 Feb 2018 07:07:55 +0100 +Subject: [PATCH] libgpo: Fix the build --without-ads + +Signed-off-by: Volker Lendecke <v...@samba.org> +Reviewed-by: David Disseldorp <dd...@samba.org> + +Autobuild-User(master): David Disseldorp <dd...@samba.org> +Autobuild-Date(master): Tue Feb 6 15:36:01 CET 2018 on sn-devel-144 + +Bug: https://bugzilla.samba.org/show_bug.cgi?id=13331 + +(cherry picked from commit a222b7506b53e689708834237f18877231dca589) +--- + libgpo/pygpo.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libgpo/pygpo.c b/libgpo/pygpo.c +index 7a02a0d..b6b53b7 100644 +--- a/libgpo/pygpo.c ++++ b/libgpo/pygpo.c +@@ -319,6 +319,7 @@ static PyObject *py_gpo_get_sysvol_gpt_version(PyObject * self, + return result; + } + ++#ifdef HAVE_ADS + static ADS_STATUS find_samaccount(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, + const char *samaccountname, + uint32_t *uac_ret, const char **dn_ret) +@@ -468,11 +469,15 @@ out: + return ret; + } + ++#endif ++ + static PyMethodDef ADS_methods[] = { + { "connect", (PyCFunction)py_ads_connect, METH_NOARGS, + "Connect to the LDAP server" }, ++#ifdef HAVE_ADS + { "get_gpo_list", (PyCFunction)py_ads_get_gpo_list, METH_KEYWORDS, + NULL }, ++#endif + { NULL } + }; + +-- +1.9.1 + diff --git a/net-fs/samba/samba-4.8.2.ebuild b/net-fs/samba/samba-4.8.2.ebuild index 3bfb4b1af5b..cd603d27bde 100644 --- a/net-fs/samba/samba-4.8.2.ebuild +++ b/net-fs/samba/samba-4.8.2.ebuild @@ -114,7 +114,6 @@ REQUIRED_USE=" ads? ( acl gnutls ldap winbind ) cluster? ( ads ) gpg? ( addc ) - python? ( ldap ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ${PYTHON_REQUIRED_USE} @@ -131,6 +130,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/${PN}-4.4.0-pam.patch" "${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch" + "${FILESDIR}/${PN}-4.8-without_ads_build_fix.patch" ) #CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
