Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/files/
Date: Mon, 16 Jul 2018 09:50:37
Message-Id: 1531734485.f47ec0be5b32d48afae4804cd0eff1ca3abe0f6d.polynomial-c@gentoo
1 commit: f47ec0be5b32d48afae4804cd0eff1ca3abe0f6d
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat Jul 14 12:30:27 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 16 09:48:05 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f47ec0be
7
8 net-fs/samba: remove unused patch
9
10 Closes: https://github.com/gentoo/gentoo/pull/9225
11
12 .../files/samba-4.8-without_ads_build_fix.patch | 49 ----------------------
13 1 file changed, 49 deletions(-)
14
15 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
16 deleted file mode 100644
17 index a2a4702d007..00000000000
18 --- a/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch
19 +++ /dev/null
20 @@ -1,49 +0,0 @@
21 -From 223d3f1ed782af2b251962ada8cce190933fff7e Mon Sep 17 00:00:00 2001
22 -From: Volker Lendecke <vl@×××××.org>
23 -Date: Sat, 3 Feb 2018 07:07:55 +0100
24 -Subject: [PATCH] libgpo: Fix the build --without-ads
25 -
26 -Signed-off-by: Volker Lendecke <vl@×××××.org>
27 -Reviewed-by: David Disseldorp <ddiss@×××××.org>
28 -
29 -Autobuild-User(master): David Disseldorp <ddiss@×××××.org>
30 -Autobuild-Date(master): Tue Feb 6 15:36:01 CET 2018 on sn-devel-144
31 -
32 -Bug: https://bugzilla.samba.org/show_bug.cgi?id=13331
33 -
34 -(cherry picked from commit a222b7506b53e689708834237f18877231dca589)
35 ----
36 - libgpo/pygpo.c | 5 +++++
37 - 1 file changed, 5 insertions(+)
38 -
39 -diff --git a/libgpo/pygpo.c b/libgpo/pygpo.c
40 -index 7a02a0d..b6b53b7 100644
41 ---- a/libgpo/pygpo.c
42 -+++ b/libgpo/pygpo.c
43 -@@ -319,6 +319,7 @@ static PyObject *py_gpo_get_sysvol_gpt_version(PyObject * self,
44 - return result;
45 - }
46 -
47 -+#ifdef HAVE_ADS
48 - static ADS_STATUS find_samaccount(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx,
49 - const char *samaccountname,
50 - uint32_t *uac_ret, const char **dn_ret)
51 -@@ -468,11 +469,15 @@ out:
52 - return ret;
53 - }
54 -
55 -+#endif
56 -+
57 - static PyMethodDef ADS_methods[] = {
58 - { "connect", (PyCFunction)py_ads_connect, METH_NOARGS,
59 - "Connect to the LDAP server" },
60 -+#ifdef HAVE_ADS
61 - { "get_gpo_list", (PyCFunction)py_ads_get_gpo_list, METH_KEYWORDS,
62 - NULL },
63 -+#endif
64 - { NULL }
65 - };
66 -
67 ---
68 -1.9.1
69 -