From bf511ab81e7e320788f54386b973df9ee49334c8 Mon Sep 17 00:00:00 2001
From: jca <jca@openbsd.org>
Date: Wed, 15 Jul 2015 21:50:31 +0000
Subject: [PATCH] The correct group name used by net/isc-bind is "_bind"

Needed for the bind DLZ backend, which works pretty fine.
---
 net/samba4/Makefile                               |  3 ++-
 .../patch-python_samba_provision___init___py      | 15 +++++++++++++++
 .../patch-source4_scripting_bin_samba_upgradedns  | 15 +++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 net/samba4/patches/patch-python_samba_provision___init___py
 create mode 100644 net/samba4/patches/patch-source4_scripting_bin_samba_upgradedns

diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 8a275c9aa6c..d7b814537ea 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2015/06/27 22:14:48 jca Exp $
+# $OpenBSD: Makefile,v 1.19 2015/07/15 21:50:31 jca Exp $
 
 SHARED_ONLY =		Yes
 VERSION =		4.1.19
@@ -21,6 +21,7 @@ PKGNAME-tevent =	tevent-${TEVENT_V}
 PKGNAME-util =		samba-util-${TALLOC_V}
 PKGNAME-docs =		samba-docs-${VERSION}
 
+REVISION-main =		0
 REVISION-ldb =		0
 REVISION-tdb =		0
 REVISION-tevent =	0
diff --git a/net/samba4/patches/patch-python_samba_provision___init___py b/net/samba4/patches/patch-python_samba_provision___init___py
new file mode 100644
index 00000000000..f9185252ad1
--- /dev/null
+++ b/net/samba4/patches/patch-python_samba_provision___init___py
@@ -0,0 +1,15 @@
+$OpenBSD: patch-python_samba_provision___init___py,v 1.1 2015/07/15 21:50:31 jca Exp $
+
+- net/isc-bind group name
+
+--- python/samba/provision/__init__.py.orig	Wed Jul 15 15:25:50 2015
++++ python/samba/provision/__init__.py	Wed Jul 15 15:26:06 2015
+@@ -1960,7 +1960,7 @@ def provision(logger, session_info, credentials, smbco
+     root_gid = pwd.getpwuid(root_uid).pw_gid
+ 
+     try:
+-        bind_gid = findnss_gid(["bind", "named"])
++        bind_gid = findnss_gid(["_bind"])
+     except KeyError:
+         bind_gid = None
+ 
diff --git a/net/samba4/patches/patch-source4_scripting_bin_samba_upgradedns b/net/samba4/patches/patch-source4_scripting_bin_samba_upgradedns
new file mode 100644
index 00000000000..d76d725883e
--- /dev/null
+++ b/net/samba4/patches/patch-source4_scripting_bin_samba_upgradedns
@@ -0,0 +1,15 @@
+$OpenBSD: patch-source4_scripting_bin_samba_upgradedns,v 1.1 2015/07/15 21:50:31 jca Exp $
+
+- net/isc-bind group name
+
+--- source4/scripting/bin/samba_upgradedns.orig	Wed Jul 15 15:24:50 2015
++++ source4/scripting/bin/samba_upgradedns	Wed Jul 15 15:25:05 2015
+@@ -75,7 +75,7 @@ __docformat__ = 'restructuredText'
+ def find_bind_gid():
+     """Find system group id for bind9
+     """
+-    for name in ["bind", "named"]:
++    for name in ["_bind"]:
+         try:
+             return grp.getgrnam(name)[2]
+         except KeyError: