Import from github

author: Michael Hansen 2015-06-10 22:41:13 -0700
committer: Michael Hansen 2015-06-10 22:43:08 -0700
commit: 127a072f8fda7f1e801abd63b7dea00e01966a2e (patch)
tree: 6d607e44936c97183d792952267a3b89d2e691fb
download: aur-127a072f8fda7f1e801abd63b7dea00e01966a2e.tar.gz
4 files changed, 390 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
new file mode 100644
index 000000000000..9231d97828c0
--- /dev/null
+++ b/.SRCINFO
@@ -0,0 +1,29 @@
+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
+	url = http://www.openchange.org
+	arch = i686
+	arch = x86_64
+	arch = armv6h
+	arch = armv7h
+	license = GPL3
+	makedepends = ccache
+	makedepends = python2
+	makedepends = docbook-xsl
+	makedepends = libxslt
+	depends = samba>=4.2
+	depends = libical
+	depends = sqlite3
+	depends = file
+	depends = boost
+	depends = python2
+	depends = libmariadbclient
+	options = !makeflags
+	source = http://tracker.openchange.org/attachments/download/246/openchange-2.2-NANOPROBE.tar.gz
+	source = openchange-samba42.patch
+	sha256sums = f15eb26d16370e85f01649300dd6722c31f0750437a4b60acd604a79439cf688
+	sha256sums = 8e4c2afede896e16a74be87323412bdcad8173d6943107a0aab38c6b77860887
+
+pkgname = openchange
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..ee58eb017a4a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/src/
+/pkg/
+*.pkg.tar.xz
+*.src.tar.gz
+/openchange-*.tar.gz
diff --git a/PKGBUILD b/PKGBUILD
new file mode 100644
index 000000000000..8016cf3130f0
--- /dev/null
+++ b/PKGBUILD
@@ -0,0 +1,74 @@
+# Maintainer: Michael Hansen <zrax0111 gmail com>
+# Contributor: DJ Lucas <dj@linuxfromscratch.org>
+# Contributor: ngoonee <ngoonee.talk@gmail.com>
+# Contributor: Adam Russell <adamlr6+arch@gmail.com>
+pkgname=openchange
+_codename=NANOPROBE
+_dlid=246
+pkgver=2.2
+pkgrel=4
+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."
+arch=('i686' 'x86_64' 'armv6h' 'armv7h')
+url="http://www.openchange.org"
+license=('GPL3')
+depends=('samba>=4.2' 'libical' 'sqlite3' 'file' 'boost' 'python2' 'libmariadbclient')
+makedepends=('ccache' 'python2' 'docbook-xsl' 'libxslt')
+options=(!makeflags)
+# Releases are mirrored at http://tracker.openchange.org/projects/openchange/files
+source=("http://tracker.openchange.org/attachments/download/${_dlid}/${pkgname}-${pkgver}-${_codename}.tar.gz"
+        "openchange-samba42.patch")
+
+sha256sums=('f15eb26d16370e85f01649300dd6722c31f0750437a4b60acd604a79439cf688'
+            '8e4c2afede896e16a74be87323412bdcad8173d6943107a0aab38c6b77860887')
+
+build() {
+    cd "${srcdir}/${pkgname}-${pkgver}-${_codename}"
+
+    patch -p1 < "${srcdir}/openchange-samba42.patch"
+
+    PYTHON_CALLERS="$(find ${srcdir}/${pkgname}-${pkgver}-${_codename} -name '*.py')
+                    $(find ${srcdir}/${pkgname}-${pkgver}-${_codename} -name 'configure.ac')
+                    setup/openchange_newuser setup/openchange_provision
+                    mapiproxy/services/web/rpcproxy/rpcproxy.wsgi"
+    sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" \
+           -e "s|python-config|python2-config|" \
+           -e "s|bin/python|bin/python2|" \
+        ${PYTHON_CALLERS}
+
+    # Fix linking of boost_thread in autoconf test
+    sed -i -e "s|-lboost_thread\$BOOST_LIB_SUFFIX|-lboost_thread\$BOOST_LIB_SUFFIX -lboost_system\$BOOST_LIB_SUFFIX|" \
+        configure.ac
+
+    export PYTHON=/usr/bin/python2
+
+    ./autogen.sh
+    ./configure \
+        --prefix=/usr \
+        --sbindir=/usr/bin \
+        --datadir=/usr/share/samba \
+        --enable-pyopenchange \
+        --with-modulesdir=/usr/lib/samba/modules
+    make FLEX=/usr/bin/flex BISON=/usr/bin/bison || return 1
+}
+
+package() {
+    _pyver=`python2 -c 'import sys; print(sys.version[:3])'`
+
+    cd "${srcdir}/${pkgname}-${pkgver}-${_codename}"
+    make DESTDIR="$pkgdir/" install
+
+    # NOTE:  Not using `make installman' because that generates a bunch
+    #   of doxygen-based manpages which may have conflicting names with
+    #   other system man pages
+    install -d "${pkgdir}/usr/share/man"
+    cp -r doc/man/man* "${pkgdir}/usr/share/man"
+
+    cd "${pkgdir}/usr/lib"
+    ln -s libmapi.so libmapi.so.0
+    ln -s libocpf.so libocpf.so.0
+
+    find "${pkgdir}/usr/lib/python${_pyver}/site-packages" -name '*.py' | \
+         xargs sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|"
+}
diff --git a/openchange-samba42.patch b/openchange-samba42.patch
new file mode 100644
index 000000000000..cf005004a184
--- /dev/null
+++ b/openchange-samba42.patch
@@ -0,0 +1,282 @@
+diff -Naurp openchange-2.2-NANOPROBE-orig/config.mk.in openchange-2.2-NANOPROBE/config.mk.in
+--- openchange-2.2-NANOPROBE-orig/config.mk.in	2014-08-11 10:51:05.000000000 -0500
++++ openchange-2.2-NANOPROBE/config.mk.in	2015-03-22 23:10:47.208548756 -0500
+@@ -52,6 +52,9 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
+ SAMBA_CFLAGS=@SAMBA_CFLAGS@
+ SAMBA_LIBS=@SAMBA_LIBS@
+ 
++SAMBA_DEBUG_LDFLAGS=@SAMBA_DEBUG_LDFLAGS@
++SAMBA_DEBUG_LIBS=@SAMBA_DEBUG_LIBS@
++
+ LDB_CFLAGS=@LDB_CFLAGS@
+ LDB_LIBS=@LDB_LIBS@
+ 
+diff -Naurp openchange-2.2-NANOPROBE-orig/configure.ac openchange-2.2-NANOPROBE/configure.ac
+--- openchange-2.2-NANOPROBE-orig/configure.ac	2014-08-11 10:51:05.000000000 -0500
++++ openchange-2.2-NANOPROBE/configure.ac	2015-03-22 23:31:08.448303310 -0500
+@@ -412,6 +412,12 @@ PKG_CHECK_MODULES(SAMBASERVER, dcerpc_se
+ PKG_CHECK_MODULES(TDB, tdb)
+ PKG_CHECK_MODULES(LDB, ldb)
+ 
++SAMBA_DEBUG_LIBS="-lsamba-debug-samba4 -lsocket-blocking-samba4"
++AC_SUBST(SAMBA_DEBUG_LIBS)
++
++SAMBA_DEBUG_LDFLAGS="-L`pkg-config --variable=libdir samba-util`/samba -Wl,-rpath,`pkg-config --variable=libdir samba-util`/samba"
++AC_SUBST(SAMBA_DEBUG_LDFLAGS)
++
+ dnl ---------------------------------------------------------------------------
+ dnl Check a particular Samba4 git revision
+ dnl ---------------------------------------------------------------------------
+diff -Naurp openchange-2.2-NANOPROBE-orig/Makefile openchange-2.2-NANOPROBE/Makefile
+--- openchange-2.2-NANOPROBE-orig/Makefile	2014-08-11 10:51:05.000000000 -0500
++++ openchange-2.2-NANOPROBE/Makefile	2015-03-22 23:31:08.451636651 -0500
+@@ -357,7 +357,7 @@ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	libmapi++/src/session.po \
+ 	libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
+ 	@echo "Linking $@"
+-	@$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION) -o $@ $^ $(LIBS) 
++	@$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION) -o $@ $^ $(LIBS)  $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ libmapixx-installpc:
+ 	@echo "[*] install: libmapi++ pc files"
+@@ -438,7 +438,7 @@ bin/libmapixx-test:	libmapi++/tests/test
+ 		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ 		libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking sample application $@"
+-	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) 
++	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)  $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ clean:: libmapixx-test-clean
+ 
+@@ -453,7 +453,7 @@ bin/libmapixx-attach: libmapi++/tests/at
+ 		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ 		libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking sample application $@"
+-	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
++	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ clean:: libmapixx-attach-clean
+ 
+@@ -463,7 +463,7 @@ bin/libmapixx-exception: libmapi++/tests
+ 		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ 		libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking exception test application $@"
+-	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
++	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ libmapixx-exception-clean:
+ 	rm -f bin/libmapixx-exception
+@@ -483,7 +483,7 @@ bin/libmapixx-profiletest: libmapi++/tes
+ 		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ 		libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking profile test application $@"
+-	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
++	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ clean:: libmapixx-profiletest-clean
+ 
+@@ -504,7 +504,7 @@ libmapi++/examples/foldertree: libmapi++
+ 		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ 		libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking foldertree example application $@"
+-	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
++	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ clean:: libmapixx-foldertree-clean
+ 
+@@ -512,7 +512,7 @@ libmapi++/examples/messages: libmapi++/e
+ 		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ 		libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking messages example application $@"
+-	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
++	@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ clean:: libmapixx-messages-clean
+ 
+@@ -579,7 +579,7 @@ libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSI
+ 	libmapiadmin/mapiadmin.po 		\
+ 	libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking $@"
+-	@$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiadmin.$(SHLIBEXT).$(LIBMAPIADMIN_SO_VERSION) -o $@ $^ $(LIBS) $(LIBMAPIADMIN_LIBS) 
++	@$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiadmin.$(SHLIBEXT).$(LIBMAPIADMIN_SO_VERSION) -o $@ $^ $(LIBS) $(LIBMAPIADMIN_LIBS)  $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ 
+ 
+@@ -656,7 +656,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):
+ 	libocpf/ocpf_write.po			\
+ 	libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking $@"
+-	@$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION) -o $@ $^ $(LIBS)
++	@$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION): libocpf.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	ln -fs $< $@
+@@ -728,7 +728,7 @@ mapiproxy/dcesrv_mapiproxy.$(SHLIBEXT):
+ 						gen_ndr/ndr_exchange.po				
+ 
+ 	@echo "Linking $@"
+-	@$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
++	@$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ mapiproxy/dcesrv_mapiproxy.c: gen_ndr/ndr_exchange_s.c gen_ndr/ndr_exchange.c
+ 
+@@ -783,7 +783,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
+ 							mapiproxy/util/mysql.po					\
+ 							libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking $@"
+-	@$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS)
++	@$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION): mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	ln -fs $< $@
+@@ -939,7 +939,7 @@ mapiproxy/libmapistore.$(SHLIBEXT).$(PAC
+ 							mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)		\
+ 							libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking $@"
+-	@$(CC) $(DSOOPT) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION) -o $@ $^ $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS)
++	@$(CC) $(DSOOPT) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION) -o $@ $^ $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ mapiproxy/libmapistore/mapistore_interface.po: mapiproxy/libmapistore/mapistore_nameid.h
+ 
+@@ -960,7 +960,7 @@ bin/mapistore_test: 	mapiproxy/libmapist
+ 			mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION)	\
+ 			mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking $@"
+-	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt -L. libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
++	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt -L. libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ mapistore_clean:
+ 	rm -f mapiproxy/libmapistore/tests/*.o
+@@ -1138,7 +1138,7 @@ bin/openchangeclient: 	utils/openchangec
+ 			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)		\
+ 			libocpf.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking $@"
+-	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
++	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ 
+ ##############
+@@ -1166,7 +1166,7 @@ bin/mapiprofile: 	utils/mapiprofile.o
+ 			utils/openchange-tools.o 		\
+ 			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking $@"
+-	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
++	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ 
+ ###################
+@@ -1195,7 +1195,7 @@ bin/openchangepfadmin:	utils/openchangep
+ 			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) 		\
+ 			libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking $@"
+-	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBMAPIADMIN_LIBS) -lpopt			
++	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBMAPIADMIN_LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ 
+ ###################
+@@ -1226,7 +1226,7 @@ bin/exchange2mbox:	utils/exchange2mbox.o
+ 			utils/openchange-tools.o			\
+ 			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking $@"
+-	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt  $(MAGIC_LIBS)
++	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt $(MAGIC_LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ 
+ ###################
+@@ -1290,7 +1290,7 @@ bin/exchange2ical:	utils/exchange2ical_t
+ 			utils/openchange-tools.o			\
+ 			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking $@"
+-	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt
++	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ ######################
+ # testsuite
+@@ -1321,7 +1321,7 @@ bin/openchange-testsuite: 	testsuite/tes
+ 				mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION)	\
+ 				mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking $@"
+-	@$(CC) $(CFLAGS) $(CHECK_CFLAGS) $(TDB_CFLAGS) -I. -Itestsuite/ -Imapiproxy -o $@ $^ $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(CHECK_LIBS) $(MYSQL_LIBS) libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
++	@$(CC) $(CFLAGS) $(CHECK_CFLAGS) $(TDB_CFLAGS) -I. -Itestsuite/ -Imapiproxy -o $@ $^ $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(CHECK_LIBS) $(MYSQL_LIBS) libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ testsuite-check:	testsuite
+ 	@LD_LIBRARY_PATH=. CK_XML_LOG_FILE_NAME=test_results.xml ./bin/openchange-testsuite
+@@ -1390,7 +1390,7 @@ bin/mapitest:	utils/mapitest/mapitest.o
+ 		utils/mapitest/modules/module_lzxpress.o	\
+ 		libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)		
+ 	@echo "Linking $@"
+-	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SUBUNIT_LIBS)
++	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SUBUNIT_LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ utils/mapitest/proto.h:					\
+ 	utils/mapitest/mapitest_suite.c			\
+@@ -1450,7 +1450,7 @@ bin/openchangemapidump:	utils/backup/ope
+ 			utils/openchange-tools.o			\
+ 			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking $@"
+-	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
++	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ 
+ ###############
+@@ -1503,7 +1503,7 @@ bin/check_fasttransfer:	testprogs/check_
+ 			mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION)	\
+ 			mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking $@"
+-	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt
++	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ ###################
+ # test_asyncnotif test app.
+@@ -1529,7 +1529,7 @@ clean:: test_asyncnotif-clean
+ bin/test_asyncnotif:	testprogs/test_asyncnotif.o			\
+ 			libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking $@"
+-	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt
++	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ ###################
+ # python code
+@@ -1574,7 +1574,7 @@ $(pythonscriptdir)/openchange/mapi.$(SHL
+ 						pyopenchange/pymapi_properties.c		\
+ 						libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ 	@echo "Linking $@"
+-	@$(CC) $(CFLAGS) -fno-strict-aliasing $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_CFLAGS) $(PYTHON_LIBS) $(LIBS) 
++	@$(CC) $(CFLAGS) -fno-strict-aliasing $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_CFLAGS) $(PYTHON_LIBS) $(LIBS)  $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ 
+ # $(pythonscriptdir)/openchange/ocpf.$(SHLIBEXT):	pyopenchange/pyocpf.c				\
+ # 						libocpf.$(SHLIBEXT).$(PACKAGE_VERSION)		\
+diff -Naurp openchange-2.2-NANOPROBE-orig/mapiproxy/dcesrv_mapiproxy.c openchange-2.2-NANOPROBE/mapiproxy/dcesrv_mapiproxy.c
+--- openchange-2.2-NANOPROBE-orig/mapiproxy/dcesrv_mapiproxy.c	2014-08-11 10:51:05.000000000 -0500
++++ openchange-2.2-NANOPROBE/mapiproxy/dcesrv_mapiproxy.c	2015-03-22 23:41:19.793032062 -0500
+@@ -132,10 +132,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;
+@@ -152,7 +152,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,
+@@ -167,7 +167,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;
author	Michael Hansen	2015-06-10 22:41:13 -0700
committer	Michael Hansen	2015-06-10 22:43:08 -0700
commit	127a072f8fda7f1e801abd63b7dea00e01966a2e (patch)
tree	6d607e44936c97183d792952267a3b89d2e691fb
download	aur-127a072f8fda7f1e801abd63b7dea00e01966a2e.tar.gz