Add some missing dependencies and fix some build issues

3 files changed, 60 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9231d97828c0..187cb737f3c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = openchange
-	pkgdesc = A portable, open source implementation of Microsoft Exchange server and Exchange protocols. This package was originally created to support evolution-mapi and may not work for any other purpose.
-	pkgver = 2.2
-	pkgrel = 4
+	pkgdesc = A portable, open source implementation of Microsoft Exchange server and Exchange protocols.
+	pkgver = 2.3
+	pkgrel = 1
 	url = http://www.openchange.org
 	arch = i686
 	arch = x86_64
@@ -9,21 +9,29 @@ pkgbase = openchange
 	arch = armv7h
 	license = GPL3
 	makedepends = ccache
-	makedepends = python2
 	makedepends = docbook-xsl
 	makedepends = libxslt
-	depends = samba>=4.2
+	makedepends = python2-setuptools
+	makedepends = python2-pylons
+	depends = samba>=4.2.2
 	depends = libical
 	depends = sqlite3
 	depends = file
 	depends = boost
 	depends = python2
 	depends = libmariadbclient
+	depends = nanomsg>=0.5
+	depends = libmemcached>=1.0.18
+	optdepends = python2-pylons: Needed for OCSManager
 	options = !makeflags
-	source = http://tracker.openchange.org/attachments/download/246/openchange-2.2-NANOPROBE.tar.gz
-	source = openchange-samba42.patch
-	sha256sums = f15eb26d16370e85f01649300dd6722c31f0750437a4b60acd604a79439cf688
-	sha256sums = 8e4c2afede896e16a74be87323412bdcad8173d6943107a0aab38c6b77860887
+	source = https://github.com/openchange/openchange/archive/openchange-2.3-VULCAN.tar.gz
+	source = ocsmanager.service
+	source = openchange-provision-type-error.patch
+	source = openchange-issue-249.patch
+	sha256sums = 46ffdc779bb7bf6a823f6d1a78c5ca3f5548b981ad90164214a68279b403a05e
+	sha256sums = 45bd19e2a5725a94692ae606086be6d57423375c9b1c0eb5322c6e09ef2b5fb3
+	sha256sums = 65dc742e95dd1bff1581ea3d76b4dfe8d01ca52ab5e64ffc80efc10417a2ff97
+	sha256sums = e3cfd2455a52d4b68153b3d546c70edbde5cf024ebcec1088a923aedaa938834
 
 pkgname = openchange
 
diff --git a/PKGBUILD b/PKGBUILD
index add94530d160..caffa87806ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,16 +13,20 @@ url="http://www.openchange.org"
 license=('GPL3')
 depends=('samba>=4.2.2' 'libical' 'sqlite3' 'file' 'boost' 'python2'
          'libmariadbclient' 'nanomsg>=0.5' 'libmemcached>=1.0.18')
-makedepends=('ccache' 'docbook-xsl' 'libxslt')
+makedepends=('ccache' 'docbook-xsl' 'libxslt' 'python2-setuptools'
+             'python2-pylons')
+optdepends=('python2-pylons: Needed for OCSManager')
 options=(!makeflags)
 # Releases are mirrored at http://tracker.openchange.org/projects/openchange/files
 source=("https://github.com/openchange/openchange/archive/${pkgname}-${pkgver}-${_codename}.tar.gz"
         "ocsmanager.service"
-        "openchange-provision-type-error.patch")
+        "openchange-provision-type-error.patch"
+        "openchange-issue-249.patch")
 
 sha256sums=('46ffdc779bb7bf6a823f6d1a78c5ca3f5548b981ad90164214a68279b403a05e'
             '45bd19e2a5725a94692ae606086be6d57423375c9b1c0eb5322c6e09ef2b5fb3'
-            '65dc742e95dd1bff1581ea3d76b4dfe8d01ca52ab5e64ffc80efc10417a2ff97')
+            '65dc742e95dd1bff1581ea3d76b4dfe8d01ca52ab5e64ffc80efc10417a2ff97'
+            'e3cfd2455a52d4b68153b3d546c70edbde5cf024ebcec1088a923aedaa938834')
 
 # Used to be pkgname-pkgver-codename, but now we have two openchanges. WAT
 _srcsubdir="${pkgname}-${pkgname}-${pkgver}-${_codename}"
@@ -31,6 +35,7 @@ build() {
     cd "${srcdir}/${_srcsubdir}"
 
     patch -p1 < "${srcdir}/openchange-provision-type-error.patch"
+    patch -p1 < "${srcdir}/openchange-issue-249.patch"
 
     PYTHON_CALLERS="$(find ${srcdir}/${_srcsubdir} -name '*.py')
                     $(find ${srcdir}/${_srcsubdir} -name 'configure.ac')
@@ -87,7 +92,7 @@ package() {
                     "${pkgdir}/etc/httpd/conf/extra/ocsmanager.conf"
 
     # Install RPC Proxy
-    cd "${sourcedir}/mapiproxy/services/web/rpcproxy"
+    cd "${srcdir}/${_srcsubdir}/mapiproxy/services/web/rpcproxy"
     install -vdm755 "${pkgdir}/usr/lib/openchange/web/rpcproxy"
     install -vm644  "${srcdir}/${_srcsubdir}/mapiproxy/services/web/rpcproxy/rpcproxy.conf" \
                     "${pkgdir}/etc/httpd/conf/extra/rpcproxy.conf"
diff --git a/openchange-issue-249.patch b/openchange-issue-249.patch
new file mode 100644
index 000000000000..5f57cebf2f9b
--- /dev/null
+++ b/openchange-issue-249.patch
@@ -0,0 +1,34 @@
+diff -rupN a/mapiproxy/dcesrv_mapiproxy.c b/mapiproxy/dcesrv_mapiproxy.c
+--- a/mapiproxy/dcesrv_mapiproxy.c	2015-06-16 15:41:56.599106174 -0700
++++ b/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;