gentoo resync : 21.07.2018

2 files changed, 1 insertions, 50 deletions

diff --git a/net-fs/samba/files/4.4/samba4.confd b/net-fs/samba/files/4.4/samba4.confd
index 2604981f2141..629a605021a2 100644
--- a/net-fs/samba/files/4.4/samba4.confd
+++ b/net-fs/samba/files/4.4/samba4.confd
@@ -32,7 +32,7 @@ nmbd_reload="killall -HUP nmbd"
 
 samba4_start_options=""
 samba4_command="/usr/sbin/samba"
-samba4_pidfile="${piddir}/samba4.pid"
+samba4_pidfile="${piddir}/samba.pid"
 samba4_start="start-stop-daemon --start --exec ${samba4_command} --pidfile ${samba4_pidfile} -- ${samba4_start_options}"
 samba4_stop="start-stop-daemon --stop --exec ${samba4_command} --pidfile ${samba4_pidfile}"
 samba4_reload="killall -HUP samba"
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
deleted file mode 100644
index a2a4702d0075..000000000000
--- a/net-fs/samba/files/samba-4.8-without_ads_build_fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 223d3f1ed782af2b251962ada8cce190933fff7e Mon Sep 17 00:00:00 2001
-From: Volker Lendecke <vl@samba.org>
-Date: Sat, 3 Feb 2018 07:07:55 +0100
-Subject: [PATCH] libgpo: Fix the build --without-ads
-
-Signed-off-by: Volker Lendecke <vl@samba.org>
-Reviewed-by: David Disseldorp <ddiss@samba.org>
-
-Autobuild-User(master): David Disseldorp <ddiss@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
-