Update libmapi to 2.3.

Switch from samba 4.0 and 4.1 choice to only 4.2. Samba 4.0 and 4.1 are
EOL and marked for deletion.

Keep the switch logic around for possible later use, since samba 4.3
is not supported at this time.

A few patches where obtained from archlinux.

5 files changed, 77 insertions, 11 deletions

diff --git a/mail/libmapi/files/patch-Makefile b/mail/libmapi/files/patch-Makefile
index 2492de897140..2baa76c7f2ac 100644
--- a/mail/libmapi/files/patch-Makefile
+++ b/mail/libmapi/files/patch-Makefile
@@ -1,16 +1,16 @@
---- Makefile.orig	2014-05-05 15:10:56.000000000 +0200
-+++ Makefile	2014-05-05 15:11:14.000000000 +0200
-@@ -246,9 +246,6 @@
- 	$(INSTALL) -m 0644 gen_ndr/property.h $(DESTDIR)$(includedir)/gen_ndr/
- 	$(INSTALL) -m 0644 gen_ndr/ndr_exchange.h $(DESTDIR)$(includedir)/gen_ndr/
+--- Makefile.orig	2015-05-16 17:22:04.000000000 +0200
++++ Makefile	2015-12-20 13:01:04.141904000 +0100
+@@ -255,9 +255,6 @@
  	$(INSTALL) -m 0644 gen_ndr/ndr_property.h $(DESTDIR)$(includedir)/gen_ndr/
+ 	$(INSTALL) -m 0644 gen_ndr/asyncemsmdb.h $(DESTDIR)$(includedir)/gen_ndr/
+ 	$(INSTALL) -m 0644 gen_ndr/ndr_asyncemsmdb.h $(DESTDIR)$(includedir)/gen_ndr/
 -	@$(SED) $(DESTDIR)$(includedir)/libmapi/*.h
 -	@$(SED) $(DESTDIR)$(includedir)/libmapi/socket/*.h
 -	@$(SED) $(DESTDIR)$(includedir)/gen_ndr/*.h
  
  libmapi-installscript:
  	$(INSTALL) -d $(DESTDIR)$(datadir)/setup/profiles
-@@ -388,7 +385,6 @@
+@@ -401,7 +398,6 @@
  	$(INSTALL) -m 0644 libmapi++/profile.h $(DESTDIR)$(includedir)/libmapi++/
  	$(INSTALL) -m 0644 libmapi++/property_container.h $(DESTDIR)$(includedir)/libmapi++/
  	$(INSTALL) -m 0644 libmapi++/session.h $(DESTDIR)$(includedir)/libmapi++/
@@ -18,7 +18,7 @@
  
  libmapixx-libs-clean:
  	rm -f libmapi++/src/*.po
-@@ -559,7 +555,6 @@
+@@ -572,7 +568,6 @@
  	@echo "[*] install: libmapiadmin headers"
  	$(INSTALL) -d $(DESTDIR)$(includedir)/libmapiadmin 
  	$(INSTALL) -m 0644 libmapiadmin/libmapiadmin.h $(DESTDIR)$(includedir)/libmapiadmin/
@@ -26,7 +26,7 @@
  
  libmapiadmin-uninstallpc:
  	rm -f $(DESTDIR)$(libdir)/pkgconfig/libmapiadmin.pc
-@@ -630,7 +625,6 @@
+@@ -643,7 +638,6 @@
  	@echo "[*] install: libocpf headers"
  	$(INSTALL) -d $(DESTDIR)$(includedir)/libocpf
  	$(INSTALL) -m 0644 libocpf/ocpf.h $(DESTDIR)$(includedir)/libocpf/
@@ -34,7 +34,7 @@
  
  libocpf-uninstallpc:
  	rm -f $(DESTDIR)$(libdir)/pkgconfig/libocpf.pc
-@@ -794,7 +788,6 @@
+@@ -830,7 +824,6 @@
  endif
  	$(INSTALL) -m 0644 mapiproxy/libmapiserver/libmapiserver.h $(DESTDIR)$(includedir)/
  	$(INSTALL) -m 0644 mapiproxy/libmapiserver.pc $(DESTDIR)$(libdir)/pkgconfig
@@ -42,11 +42,11 @@
  
  libmapiserver-clean:
  	rm -f mapiproxy/libmapiserver/*.po mapiproxy/libmapiserver/*.o
-@@ -881,7 +874,6 @@
+@@ -920,7 +913,6 @@
  	$(INSTALL) -m 0644 mapiproxy/libmapiserver.pc $(DESTDIR)$(libdir)/pkgconfig
  	$(INSTALL) -d $(DESTDIR)$(datadir)/setup/mapistore
  	$(INSTALL) -m 0644 setup/mapistore/*.ldif $(DESTDIR)$(datadir)/setup/mapistore/
 -	@$(SED) $(DESTDIR)$(includedir)/mapistore/*.h
  
  libmapistore-clean:	$(OC_MAPISTORE_CLEAN)
- 	rm -f mapiproxy/libmapistore/*.po mapiproxy/libmapistore/*.o
+ 	rm -f libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION)
diff --git a/mail/libmapi/files/patch-libocpf_lex.l b/mail/libmapi/files/patch-libocpf_lex.l
new file mode 100644
index 000000000000..4cb01dc6c69b
--- /dev/null
+++ b/mail/libmapi/files/patch-libocpf_lex.l
@@ -0,0 +1,10 @@
+--- libocpf/lex.l.orig	2016-01-14 11:16:14.988281000 +0100
++++ libocpf/lex.l	2016-01-14 11:16:21.702227000 +0100
+@@ -29,7 +29,6 @@
+ #include "libocpf/lex.h"
+ 
+ #define	YY_EXTRA_TYPE	struct ocpf_context *
+-#define	YY_NO_UNPUT
+ 
+ static void unterminated(struct ocpf_context *, const char *, unsigned int);
+ 
diff --git a/mail/libmapi/files/patch-mapiproxy_dcesrv__mapiproxy.c b/mail/libmapi/files/patch-mapiproxy_dcesrv__mapiproxy.c
new file mode 100644
index 000000000000..882480fa2f4c
--- /dev/null
+++ b/mail/libmapi/files/patch-mapiproxy_dcesrv__mapiproxy.c
@@ -0,0 +1,36 @@
+https://aur.archlinux.org/cgit/aur.git/log/openchange-issue-249.patch?h=openchange
+
+diff -rupN a/mapiproxy/dcesrv_mapiproxy.c b/mapiproxy/dcesrv_mapiproxy.c
+--- mapiproxy/dcesrv_mapiproxy.c	2015-06-16 15:41:56.599106174 -0700
++++ mapiproxy/dcesrv_mapiproxy.c	2015-06-16 15:43:29.597211031 -0700
+@@ -134,10 +134,10 @@ static NTSTATUS mapiproxy_op_connect(str
+ 
+ 		switch (dce_call->pkt.ptype) {
+ 		case DCERPC_PKT_BIND:
+-			b->assoc_group_id = dce_call->pkt.u.bind.assoc_group_id;
++			status = dcerpc_binding_set_assoc_group_id(b, dce_call->pkt.u.bind.assoc_group_id);
+ 			break;
+ 		case DCERPC_PKT_ALTER:
+-			b->assoc_group_id = dce_call->pkt.u.alter.assoc_group_id;
++			status = dcerpc_binding_set_assoc_group_id(b, dce_call->pkt.u.alter.assoc_group_id);
+ 			break;
+ 		default:
+ 			break;
+@@ -154,7 +154,7 @@ static NTSTATUS mapiproxy_op_connect(str
+ 		if (!NT_STATUS_IS_OK(status)) {
+ 			return status;
+ 		}
+-		dce_call->context->assoc_group->id = private->c_pipe->assoc_group_id;
++		dce_call->context->assoc_group->id = dcerpc_binding_get_assoc_group_id(private->c_pipe->binding);
+ 		
+ 	} else {
+ 		status = dcerpc_pipe_connect(dce_call->context,
+@@ -169,7 +169,7 @@ static NTSTATUS mapiproxy_op_connect(str
+ 		if (!NT_STATUS_IS_OK(status)) {
+ 			return status;
+ 		}
+-		dce_call->context->assoc_group->id = private->c_pipe->assoc_group_id;
++		dce_call->context->assoc_group->id = dcerpc_binding_get_assoc_group_id(private->c_pipe->binding);
+ 	}
+ 
+ 	private->connected = true;
diff --git a/mail/libmapi/files/patch-mapiproxy_libmapistore_backends_namedprops__backend.h b/mail/libmapi/files/patch-mapiproxy_libmapistore_backends_namedprops__backend.h
new file mode 100644
index 000000000000..9105a7ff1251
--- /dev/null
+++ b/mail/libmapi/files/patch-mapiproxy_libmapistore_backends_namedprops__backend.h
@@ -0,0 +1,10 @@
+--- mapiproxy/libmapistore/backends/namedprops_backend.h.orig	2016-01-14 11:22:39.236271000 +0100
++++ mapiproxy/libmapistore/backends/namedprops_backend.h	2016-01-14 11:23:03.580475000 +0100
+@@ -25,6 +25,7 @@
+ #include <talloc.h>
+ #include <stdbool.h>
+ #include <stdint.h>
++#include <time.h>
+ #include "mapiproxy/libmapistore/mapistore_errors.h"
+ 
+ #include <param.h>
diff --git a/mail/libmapi/files/patch-utils_ocnotify.c b/mail/libmapi/files/patch-utils_ocnotify.c
new file mode 100644
index 000000000000..fbed515cc99b
--- /dev/null
+++ b/mail/libmapi/files/patch-utils_ocnotify.c
@@ -0,0 +1,10 @@
+--- utils/ocnotify.c.orig	2016-01-14 11:24:28.465644000 +0100
++++ utils/ocnotify.c	2016-01-14 11:24:39.248704000 +0100
+@@ -23,6 +23,7 @@
+ #include <stdint.h>
+ #include <stdbool.h>
+ #include <stdlib.h>
++#include <time.h>
+ 
+ #include <talloc.h>
+ #include <param.h>