From de2b458fc4388e0a92db99509ae7449916c4501f Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Apr 21 2020 04:14:21 +0000
Subject: Add patch to build against samba 4.11.2


---

diff --git a/SOURCES/openchange-2.3-samba-4.11.2.patch b/SOURCES/openchange-2.3-samba-4.11.2.patch
new file mode 100644
index 0000000..d564d94
--- /dev/null
+++ b/SOURCES/openchange-2.3-samba-4.11.2.patch
@@ -0,0 +1,34 @@
+diff -up openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h.samba-4.12 openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h
+--- openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h.samba-4.12	2020-01-27 11:33:02.941846935 +0100
++++ openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h	2020-01-27 11:33:19.170846710 +0100
+@@ -103,7 +103,9 @@ __BEGIN_DECLS
+ struct ldb_dn *samdb_search_dn(struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, const char *, ...) _PRINTF_ATTRIBUTE(4,5);
+ struct dom_sid *dom_sid_add_rid(TALLOC_CTX *, const struct dom_sid *, uint32_t);
+ bool encode_pw_buffer(uint8_t buffer[516], const char *, int);
++#if 0 /* removed in samba 4.12 */
+ void arcfour_crypt_blob(uint8_t *, int, const DATA_BLOB *);
++#endif
+ 
+ /* The following public definitions come from libmapiadmin/mapiadmin.c */
+ struct mapiadmin_ctx *mapiadmin_init(struct mapi_session *);
+diff -up openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c.samba-4.12 openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c
+--- openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c.samba-4.12	2020-01-27 11:25:31.398853179 +0100
++++ openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c	2020-01-27 11:31:27.490848255 +0100
+@@ -592,6 +592,9 @@ _PUBLIC_ enum MAPISTATUS mapiadmin_user_
+  */
+ _PUBLIC_ enum MAPISTATUS mapiadmin_user_add(struct mapiadmin_ctx *mapiadmin_ctx)
+ {
++	OC_DEBUG(3, "mapiadmin_user_add(): is disabled");
++	return MAPI_E_UNABLE_TO_COMPLETE;
++#if 0 /* disable it, use samba function directly, if needed (no 'arcfour_crypt_blob' in samba 4.12) */
+ 	TALLOC_CTX			*mem_ctx;
+ 	NTSTATUS			status;
+ 	enum MAPISTATUS			retval;
+@@ -732,6 +735,7 @@ again:
+ 
+ 	talloc_free(mem_ctx);
+ 	return MAPI_E_SUCCESS;
++#endif
+ }
+ 
+ /**
diff --git a/SPECS/openchange.spec b/SPECS/openchange.spec
index 9ef7020..96f8b8e 100644
--- a/SPECS/openchange.spec
+++ b/SPECS/openchange.spec
@@ -23,7 +23,7 @@
 
 Name: openchange
 Version: 2.3
-Release: 24%{?dist}.0.1
+Release: 24%{?dist}.0.2
 Group: Applications/System
 Summary: Provides access to Microsoft Exchange servers using native protocols
 License: GPLv3+ and Public Domain
@@ -92,6 +92,7 @@ Patch13: openchange-2.3-disable-python3.patch
 Patch14: openchange-2.3-covscan.patch
 Patch15: openchange-2.3-samba-4.10-macros.patch
 Patch16: openchange-2.3-samba-4.11.patch
+Patch17: openchange-2.3-samba-4.11.2.patch
 
 %description
 OpenChange provides libraries to access Microsoft Exchange servers
@@ -170,6 +171,7 @@ This package provides the server elements for OpenChange.
 %patch14 -p1 -b .covscan
 %patch15 -p1 -b .samba-4.10-macros
 %patch16 -p1 -b .samba-4.11
+%patch17 -p1 -b .samba-4.11.2
 
 %build
 ./autogen.sh
@@ -312,6 +314,9 @@ cp -r apidocs/html/libmapi++/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchan
 %endif
 
 %changelog
+* Tue Apr 21 2020 Carl George <carl@redhat.com> - 2.3-24.0.2
+- Add patch to build against samba 4.11.2
+
 * Mon Dec 02 2019 Milan Crha <mcrha@redhat.com> - 2.3-24
 - Rebuild for newer samba and libldb