Control: retitle -1 jessie-pu: package openchange/1:2.2-5+deb8u1 Control: release.debian.org@packages.debian.org Control: usertags -1 - rm + pu On Wed, 18 Jan 2017 07:21:49 +0800 Paul Wise wrote: > This looks like the API issue in openchangeproxy mentioned in the > samba changelog from the build log messages you posted. > > This is the openchange bug and patch for this specific FTBFS: > > https://github.com/openchange/openchange/issues/249 > https://github.com/openchange/openchange/commit/73a49af50bf0a496cfe62f49e60a662f1d04d685.patch I've tested that this fixes the FTBFS in openchange. I'm unable to test that openchangeproxy still works but the patch looks like a fairly straight forward update to the newer samba APIs. The rest of the binary packages still work fine in my tests. I've attached a patch for a pu to the openchange package in jessie. -- bye, pabs https://wiki.debian.org/PaulWise
diff -Nru openchange-2.2/debian/changelog openchange-2.2/debian/changelog
--- openchange-2.2/debian/changelog 2014-09-22 07:00:28.000000000 +0800
+++ openchange-2.2/debian/changelog 2017-01-21 15:23:28.000000000 +0800
@@ -1,3 +1,9 @@
+openchange (1:2.2-5+deb8u1) jessie; urgency=medium
+
+ * Include upstream patch to fix FTBFS with samba 4.2
+
+ -- Paul Wise <pabs@debian.org> Sat, 21 Jan 2017 15:23:28 +0800
+
openchange (1:2.2-5) unstable; urgency=medium
* Disable mysql tests. Closes: #761559
diff -Nru openchange-2.2/debian/patches/73a49af50bf0a496cfe62f49e60a662f1d04d685.patch openchange-2.2/debian/patches/73a49af50bf0a496cfe62f49e60a662f1d04d685.patch
--- openchange-2.2/debian/patches/73a49af50bf0a496cfe62f49e60a662f1d04d685.patch 1970-01-01 08:00:00.000000000 +0800
+++ openchange-2.2/debian/patches/73a49af50bf0a496cfe62f49e60a662f1d04d685.patch 2017-01-21 15:20:31.000000000 +0800
@@ -0,0 +1,45 @@
+From 73a49af50bf0a496cfe62f49e60a662f1d04d685 Mon Sep 17 00:00:00 2001
+From: Julien Kerihuel <j.kerihuel@openchange.org>
+Date: Thu, 20 Mar 2014 02:19:53 +0100
+Subject: [PATCH] Fix compilation with samba release > 4.1.4 - use new API
+ functions introduced to access opaque assoc_group_id
+
+---
+ mapiproxy/dcesrv_mapiproxy.c | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/mapiproxy/dcesrv_mapiproxy.c b/mapiproxy/dcesrv_mapiproxy.c
+index b4d39e7..33a69a6 100644
+--- a/mapiproxy/dcesrv_mapiproxy.c
++++ b/mapiproxy/dcesrv_mapiproxy.c
+@@ -132,10 +132,10 @@ static NTSTATUS mapiproxy_op_connect(struct dcesrv_call_state *dce_call,
+
+ 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;
+@@ -152,7 +152,7 @@ static NTSTATUS mapiproxy_op_connect(struct dcesrv_call_state *dce_call,
+ 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,
+@@ -167,7 +167,7 @@ static NTSTATUS mapiproxy_op_connect(struct dcesrv_call_state *dce_call,
+ 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 -Nru openchange-2.2/debian/patches/series openchange-2.2/debian/patches/series
--- openchange-2.2/debian/patches/series 2014-09-22 07:00:17.000000000 +0800
+++ openchange-2.2/debian/patches/series 2017-01-21 15:23:28.000000000 +0800
@@ -1 +1,2 @@
01_disable_mysql_tests
+73a49af50bf0a496cfe62f49e60a662f1d04d685.patch
Attachment:
signature.asc
Description: This is a digitally signed message part