mcrha pushed to openchange (master). "Update to 2.3"
notifications at fedoraproject.org
notifications at fedoraproject.org
Mon May 18 16:58:51 UTC 2015
From 5a707a29983e5c6c778b662d4e7204d9d43a11fb Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha at redhat.com>
Date: Mon, 18 May 2015 18:58:40 +0200
Subject: Update to 2.3
diff --git a/.gitignore b/.gitignore
index f49c181..03de740 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ openchange-0.9-COCHRANE.tar.gz
/openchange-2.0-QUADRANT.tar.gz
/openchange-2.1-QUADRANT.tar.gz
/openchange-2.2-NANOPROBE.tar.gz
+/openchange-2.3-VULCAN.tar.gz
diff --git a/libmapi-0.8.2-libmapi-conflict.patch b/libmapi-0.8.2-libmapi-conflict.patch
index 511474f..2ccd77f 100644
--- a/libmapi-0.8.2-libmapi-conflict.patch
+++ b/libmapi-0.8.2-libmapi-conflict.patch
@@ -1,6 +1,6 @@
-diff -up openchange-2.2-NANOPROBE/libmapi.pc.in.libmapi-conflict openchange-2.2-NANOPROBE/libmapi.pc.in
---- openchange-2.2-NANOPROBE/libmapi.pc.in.libmapi-conflict 2014-08-11 11:51:05.000000000 -0400
-+++ openchange-2.2-NANOPROBE/libmapi.pc.in 2014-08-21 06:24:07.870168897 -0400
+diff -up openchange-openchange-2.3-VULCAN/libmapi.pc.in.libmapi-conflict openchange-openchange-2.3-VULCAN/libmapi.pc.in
+--- openchange-openchange-2.3-VULCAN/libmapi.pc.in.libmapi-conflict 2015-05-16 17:22:04.000000000 +0200
++++ openchange-openchange-2.3-VULCAN/libmapi.pc.in 2015-05-18 07:00:01.718355270 +0200
@@ -8,7 +8,7 @@ datadir=@datadir@
Name: MAPI
Description: MAPI Protocol Implementation
@@ -10,9 +10,9 @@ diff -up openchange-2.2-NANOPROBE/libmapi.pc.in.libmapi-conflict openchange-2.2-
Libs.private: @LIBS@
Cflags: -I${includedir}
Requires: talloc dcerpc ndr tevent
-diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOPROBE/Makefile
---- openchange-2.2-NANOPROBE/Makefile.libmapi-conflict 2014-08-11 11:51:05.000000000 -0400
-+++ openchange-2.2-NANOPROBE/Makefile 2014-08-21 06:28:00.875407210 -0400
+diff -up openchange-openchange-2.3-VULCAN/Makefile.libmapi-conflict openchange-openchange-2.3-VULCAN/Makefile
+--- openchange-openchange-2.3-VULCAN/Makefile.libmapi-conflict 2015-05-16 17:22:04.000000000 +0200
++++ openchange-openchange-2.3-VULCAN/Makefile 2015-05-18 07:01:57.737350354 +0200
@@ -166,7 +166,7 @@ LIBMAPI_SO_VERSION = 0
libmapi: idl \
@@ -22,7 +22,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
libmapi-install: libmapi \
libmapi-installpc \
-@@ -199,8 +199,8 @@ endif
+@@ -201,8 +201,8 @@ endif
rm -f *~
rm -f */*~
rm -f */*/*~
@@ -33,7 +33,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
clean:: libmapi-clean
-@@ -217,10 +217,10 @@ libmapi-installpc:
+@@ -219,10 +219,10 @@ libmapi-installpc:
libmapi-installlib:
@echo "[*] install: libmapi library"
$(INSTALL) -d $(DESTDIR)$(libdir)
@@ -47,7 +47,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
endif
libmapi-installheader:
-@@ -262,7 +262,7 @@ libmapi-uninstallpc:
+@@ -267,7 +267,7 @@ libmapi-uninstallpc:
rm -f $(DESTDIR)$(libdir)/pkgconfig/libmapi.pc
libmapi-uninstalllib:
@@ -56,7 +56,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
libmapi-uninstallheader:
rm -rf $(DESTDIR)$(includedir)/libmapi
-@@ -273,7 +273,7 @@ libmapi-uninstallscript:
+@@ -279,7 +279,7 @@ libmapi-uninstallscript:
rm -f $(DESTDIR)$(datadir)/setup/profiles/oc_profiles*
rm -rf $(DESTDIR)$(datadir)/setup/profiles
@@ -65,7 +65,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
libmapi/emsmdb.po \
libmapi/async_emsmdb.po \
libmapi/IABContainer.po \
-@@ -317,10 +317,10 @@ libmapi.$(SHLIBEXT).$(PACKAGE_VERSION):
+@@ -326,10 +326,10 @@ libmapi.$(SHLIBEXT).$(PACKAGE_VERSION):
libmapi/socket/interface.po \
libmapi/socket/netif.po
@echo "Linking $@"
@@ -78,7 +78,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
ln -fs $< $@
libmapi/version.h: VERSION
-@@ -355,7 +355,7 @@ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION)
+@@ -364,7 +364,7 @@ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION)
libmapi++/src/object.po \
libmapi++/src/profile.po \
libmapi++/src/session.po \
@@ -87,7 +87,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
@echo "Linking $@"
@$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION) -o $@ $^ $(LIBS)
-@@ -436,7 +436,7 @@ clean:: libmapixx-tests-clean
+@@ -445,7 +445,7 @@ clean:: libmapixx-tests-clean
bin/libmapixx-test: libmapi++/tests/test.cpp \
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -96,7 +96,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
@echo "Linking sample application $@"
@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
-@@ -451,7 +451,7 @@ libmapixx-attach-clean:
+@@ -460,7 +460,7 @@ libmapixx-attach-clean:
bin/libmapixx-attach: libmapi++/tests/attach_test.po \
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -105,7 +105,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
@echo "Linking sample application $@"
@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
-@@ -461,7 +461,7 @@ libmapixx-exception: bin/libmapixx-excep
+@@ -470,7 +470,7 @@ libmapixx-exception: bin/libmapixx-excep
bin/libmapixx-exception: libmapi++/tests/exception_test.cpp \
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -114,7 +114,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
@echo "Linking exception test application $@"
@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
-@@ -481,7 +481,7 @@ libmapixx-profiletest-clean:
+@@ -490,7 +490,7 @@ libmapixx-profiletest-clean:
bin/libmapixx-profiletest: libmapi++/tests/profile_test.po \
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -123,7 +123,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
@echo "Linking profile test application $@"
@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
-@@ -502,7 +502,7 @@ libmapixx-messages-clean:
+@@ -511,7 +511,7 @@ libmapixx-messages-clean:
libmapi++/examples/foldertree: libmapi++/examples/foldertree.cpp \
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -132,7 +132,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
@echo "Linking foldertree example application $@"
@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
-@@ -510,7 +510,7 @@ clean:: libmapixx-foldertree-clean
+@@ -519,7 +519,7 @@ clean:: libmapixx-foldertree-clean
libmapi++/examples/messages: libmapi++/examples/messages.cpp \
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -141,7 +141,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
@echo "Linking messages example application $@"
@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
-@@ -577,7 +577,7 @@ libmapiadmin-uninstallheader:
+@@ -586,7 +586,7 @@ libmapiadmin-uninstallheader:
libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION): \
libmapiadmin/mapiadmin_user.po \
libmapiadmin/mapiadmin.po \
@@ -150,7 +150,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
@echo "Linking $@"
@$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiadmin.$(SHLIBEXT).$(LIBMAPIADMIN_SO_VERSION) -o $@ $^ $(LIBS) $(LIBMAPIADMIN_LIBS)
-@@ -654,7 +654,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):
+@@ -663,7 +663,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):
libocpf/ocpf_dump.po \
libocpf/ocpf_api.po \
libocpf/ocpf_write.po \
@@ -159,7 +159,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
@echo "Linking $@"
@$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION) -o $@ $^ $(LIBS)
-@@ -728,7 +728,7 @@ mapiproxy/dcesrv_mapiproxy.$(SHLIBEXT):
+@@ -740,7 +740,7 @@ mapiproxy/dcesrv_mapiproxy.$(SHLIBEXT):
gen_ndr/ndr_exchange.po
@echo "Linking $@"
@@ -168,34 +168,43 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
mapiproxy/dcesrv_mapiproxy.c: gen_ndr/ndr_exchange_s.c gen_ndr/ndr_exchange.c
-@@ -781,7 +781,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
- mapiproxy/libmapiproxy/modules.po \
- mapiproxy/libmapiproxy/fault_util.po \
+@@ -748,7 +748,7 @@ mapiproxy/dcesrv_mapiproxy.c: gen_ndr/nd
+ mapiproxy/dcesrv_asyncemsmdb.$(SHLIBEXT): mapiproxy/servers/default/asyncemsmdb/dcesrv_asyncemsmdb.po \
+ gen_ndr/ndr_asyncemsmdb.po
+ @echo "Linking $@"
+- @$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) $(NANOMSG_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) mapiproxy/libmapiserver.$(SHLIBEXT).$(PACKAGE_VERSION) \
++ @$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) $(NANOMSG_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) mapiproxy/libmapiserver.$(SHLIBEXT).$(PACKAGE_VERSION) \
+
+
+ mapiproxy/servers/default/asyncemsmdb/dcesrv_asyncemsmdb.c: gen_ndr/ndr_asyncemsmdb_s.c gen_ndr/ndr_asyncemsmdb.c
+@@ -808,7 +808,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
mapiproxy/util/mysql.po \
+ mapiproxy/util/schema_migration.po \
+ mapiproxy/util/ccan/htable/htable.po \
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ libmapi-openchange.$(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) $(PYTHON_LIBS)
-@@ -937,7 +937,7 @@ mapiproxy/libmapistore.$(SHLIBEXT).$(PAC
- mapiproxy/libmapistore/backends/indexing_mysql.po \
- mapiproxy/util/mysql.po \
+@@ -962,7 +962,7 @@ mapiproxy/libmapistore.$(SHLIBEXT).$(PAC
+ mapiproxy/util/ccan/htable/htable.po \
+ mapiproxy/util/ccan/hash/hash.po \
mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) \
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ libmapi-openchange.$(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) $(MEMCACHED_CFLAGS) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION) -o $@ $^ $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS) $(MEMCACHED_LIBS)
-@@ -960,7 +960,7 @@ bin/mapistore_test: mapiproxy/libmapist
+@@ -984,7 +984,7 @@ mapistore_test: bin/mapistore_test
+ bin/mapistore_test: mapiproxy/libmapistore/tests/mapistore_test.o \
mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) \
- mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
+ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) \
+- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
++ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
-- @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt -L. libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
-+ @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt -L. libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
- mapistore_clean:
- rm -f mapiproxy/libmapistore/tests/*.o
-@@ -1135,7 +1135,7 @@ clean:: openchangeclient-clean
+@@ -1178,7 +1178,7 @@ clean:: openchangeclient-clean
bin/openchangeclient: utils/openchangeclient.o \
utils/openchange-tools.o \
@@ -204,7 +213,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
libocpf.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
-@@ -1164,7 +1164,7 @@ clean:: mapiprofile-clean
+@@ -1207,7 +1207,7 @@ clean:: mapiprofile-clean
bin/mapiprofile: utils/mapiprofile.o \
utils/openchange-tools.o \
@@ -213,7 +222,34 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
@echo "Linking $@"
@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
-@@ -1192,7 +1192,7 @@ clean:: openchangepfadmin-clean
+@@ -1233,7 +1233,7 @@ clean:: ocnotify-clean
+ bin/ocnotify: utils/ocnotify.o \
+ mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) \
+- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
++ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+ @$(CC) $(CFLAGS) $(NANOMSG_CFLAGS) -o $@ $^ $(LDFLAGS) $(NANOMSG_LIBS) $(LIBS) -lpopt
+
+@@ -1257,7 +1257,7 @@ rpcextract-clean::
+ clean:: rpcextract-clean
+
+ bin/rpcextract: utils/rpcextract.o \
+- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
++ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+ @$(CC) $(CFLAGS) $(PCAP_CFLAGS) -o $@ $^ $(LDFLAGS) $(PCAP_LIBS) $(LIBS) -lpopt -lndr
+
+@@ -1282,7 +1282,7 @@ mapipropsdump-clean::
+ clean:: mapipropsdump-clean
+
+ bin/mapipropsdump: utils/mapipropsdump.o \
+- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
++ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+ @$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(SAMBA_LIBS) $(LIBS) $(DL_LIBS) -lpopt -lndr
+
+@@ -1309,7 +1309,7 @@ clean:: openchangepfadmin-clean
bin/openchangepfadmin: utils/openchangepfadmin.o \
utils/openchange-tools.o \
@@ -222,7 +258,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBMAPIADMIN_LIBS) -lpopt
-@@ -1224,7 +1224,7 @@ clean:: exchange2mbox-clean
+@@ -1341,7 +1341,7 @@ clean:: exchange2mbox-clean
bin/exchange2mbox: utils/exchange2mbox.o \
utils/openchange-tools.o \
@@ -231,7 +267,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
@echo "Linking $@"
@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt $(MAGIC_LIBS)
-@@ -1288,7 +1288,7 @@ bin/exchange2ical: utils/exchange2ical_t
+@@ -1405,7 +1405,7 @@ bin/exchange2ical: utils/exchange2ical_t
libexchange2ical/ical2exchange.o \
libexchange2ical/ical2exchange_property.o \
utils/openchange-tools.o \
@@ -240,16 +276,16 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
@echo "Linking $@"
@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt
-@@ -1321,7 +1321,7 @@ bin/openchange-testsuite: testsuite/tes
+@@ -1445,7 +1445,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-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+- @$(CC) $(CFLAGS) $(CHECK_CFLAGS) $(TDB_CFLAGS) $(PYTHON_CFLAGS) -I. -Itestsuite/ -Imapiproxy -o $@ $^ $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(CHECK_LIBS) $(MYSQL_LIBS) $(PYTHON_LIBS) -lpopt libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(MEMCACHED_LIBS)
++ @$(CC) $(CFLAGS) $(CHECK_CFLAGS) $(TDB_CFLAGS) $(PYTHON_CFLAGS) -I. -Itestsuite/ -Imapiproxy -o $@ $^ $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(CHECK_LIBS) $(MYSQL_LIBS) $(PYTHON_LIBS) -lpopt libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(MEMCACHED_LIBS)
testsuite-check: testsuite
- @LD_LIBRARY_PATH=. CK_XML_LOG_FILE_NAME=test_results.xml ./bin/openchange-testsuite
-@@ -1388,7 +1388,7 @@ bin/mapitest: utils/mapitest/mapitest.o
+ @LD_LIBRARY_PATH=. PYTHONPATH=./python CK_XML_LOG_FILE_NAME=test_results.xml ./bin/openchange-testsuite
+@@ -1513,7 +1513,7 @@ bin/mapitest: utils/mapitest/mapitest.o
utils/mapitest/modules/module_lcid.o \
utils/mapitest/modules/module_mapidump.o \
utils/mapitest/modules/module_lzxpress.o \
@@ -258,7 +294,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
@echo "Linking $@"
@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SUBUNIT_LIBS)
-@@ -1448,7 +1448,7 @@ clean:: openchangemapidump-clean
+@@ -1574,7 +1574,7 @@ clean:: openchangemapidump-clean
bin/openchangemapidump: utils/backup/openchangemapidump.o \
utils/backup/openchangebackup.o \
utils/openchange-tools.o \
@@ -267,7 +303,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
@echo "Linking $@"
@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
-@@ -1499,7 +1499,7 @@ check_fasttransfer-clean::
+@@ -1625,7 +1625,7 @@ check_fasttransfer-clean::
clean:: check_fasttransfer-clean
bin/check_fasttransfer: testprogs/check_fasttransfer.o \
@@ -276,7 +312,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) \
mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
-@@ -1527,7 +1527,7 @@ test_asyncnotif-clean::
+@@ -1653,7 +1653,7 @@ test_asyncnotif-clean::
clean:: test_asyncnotif-clean
bin/test_asyncnotif: testprogs/test_asyncnotif.o \
@@ -285,23 +321,23 @@ diff -up openchange-2.2-NANOPROBE/Makefile.libmapi-conflict openchange-2.2-NANOP
@echo "Linking $@"
@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt
-@@ -1572,13 +1572,13 @@ pyopenchange: $(pythonscriptdir)/opench
+@@ -1701,13 +1701,13 @@ pyopenchange: $(pythonscriptdir)/opench
$(pythonscriptdir)/openchange/mapi.$(SHLIBEXT): pyopenchange/pymapi.c \
pyopenchange/pymapi_properties.c \
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
- @$(CC) $(CFLAGS) -fno-strict-aliasing $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_CFLAGS) $(PYTHON_LIBS) $(LIBS)
+ @$(CC) $(PYTHON_CFLAGS) $(CFLAGS) -fno-strict-aliasing $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_LIBS) $(LIBS)
# $(pythonscriptdir)/openchange/ocpf.$(SHLIBEXT): pyopenchange/pyocpf.c \
# libocpf.$(SHLIBEXT).$(PACKAGE_VERSION) \
-# libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+# libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
# @echo "Linking $@"
- # @$(CC) $(CFLAGS) $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_CFLAGS) $(PYTHON_LIBS) $(LIBS)
+ # @$(CC) $(PYTHON_CFLAGS) $(CFLAGS) $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_LIBS) $(LIBS)
-@@ -1766,7 +1766,7 @@ libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+@@ -1894,7 +1894,7 @@ libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
qt/demo/demoapp: qt/demo/demoapp.o \
qt/demo/main.o \
diff --git a/openchange-2.0-multilib-issue-libmapi-version-h.patch b/openchange-2.0-multilib-issue-libmapi-version-h.patch
deleted file mode 100644
index f8bdb1a..0000000
--- a/openchange-2.0-multilib-issue-libmapi-version-h.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up openchange-2.1-QUADRANT/script/mkversion.sh.multilib-issue-libmapi-version-h openchange-2.1-QUADRANT/script/mkversion.sh
---- openchange-2.1-QUADRANT/script/mkversion.sh.multilib-issue-libmapi-version-h 2014-04-23 21:43:06.000000000 +0200
-+++ openchange-2.1-QUADRANT/script/mkversion.sh 2014-04-28 11:57:41.457934443 +0200
-@@ -83,9 +83,14 @@ OPENCHANGE_SYS_KERNEL_NAME=`uname -s`
- OPENCHANGE_SYS_KERNEL_RELEASE=`uname -r`
- OPENCHANGE_SYS_PROCESSOR=`uname -p`
-
--echo "#define OPENCHANGE_SYS_KERNEL_NAME \"${OPENCHANGE_SYS_KERNEL_NAME}\"" >> $TMPFILE
--echo "#define OPENCHANGE_SYS_KERNEL_RELEASE \"${OPENCHANGE_SYS_KERNEL_RELEASE}\"" >> $TMPFILE
--echo "#define OPENCHANGE_SYS_PROCESSOR \"${OPENCHANGE_SYS_PROCESSOR}\"" >> $TMPFILE
-+# skip for a multilib issues
-+# echo "#define OPENCHANGE_SYS_KERNEL_NAME \"${OPENCHANGE_SYS_KERNEL_NAME}\"" >> $TMPFILE
-+# echo "#define OPENCHANGE_SYS_KERNEL_RELEASE \"${OPENCHANGE_SYS_KERNEL_RELEASE}\"" >> $TMPFILE
-+# echo "#define OPENCHANGE_SYS_PROCESSOR \"${OPENCHANGE_SYS_PROCESSOR}\"" >> $TMPFILE
-+echo "/* 'Unset' to avoid multilib issues */" >> $TMPFILE
-+echo "#define OPENCHANGE_SYS_KERNEL_NAME \"Unset\"" >> $TMPFILE
-+echo "#define OPENCHANGE_SYS_KERNEL_RELEASE \"Unset\"" >> $TMPFILE
-+echo "#define OPENCHANGE_SYS_PROCESSOR \"Unset\"" >> $TMPFILE
-
- mv "$TMPFILE" "$OUTPUT_FILE"
-
diff --git a/openchange-2.2-samba-4.2.0-rc2.patch b/openchange-2.2-samba-4.2.0-rc2.patch
index d9c9f76..25a76d9 100644
--- a/openchange-2.2-samba-4.2.0-rc2.patch
+++ b/openchange-2.2-samba-4.2.0-rc2.patch
@@ -1,7 +1,7 @@
-diff -up openchange-2.2-NANOPROBE/config.mk.in.test openchange-2.2-NANOPROBE/config.mk.in
---- openchange-2.2-NANOPROBE/config.mk.in.test 2014-08-11 17:51:05.000000000 +0200
-+++ openchange-2.2-NANOPROBE/config.mk.in 2014-11-24 19:39:04.954542514 +0100
-@@ -52,6 +52,9 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
+diff -up openchange-openchange-2.3-VULCAN/config.mk.in.samba-4.2.0-rc2 openchange-openchange-2.3-VULCAN/config.mk.in
+--- openchange-openchange-2.3-VULCAN/config.mk.in.samba-4.2.0-rc2 2015-05-16 17:22:04.000000000 +0200
++++ openchange-openchange-2.3-VULCAN/config.mk.in 2015-05-18 18:10:56.756649553 +0200
+@@ -58,6 +58,9 @@ PACKAGE_VERSION=@PACKAGE_VERSION@
SAMBA_CFLAGS=@SAMBA_CFLAGS@
SAMBA_LIBS=@SAMBA_LIBS@
@@ -11,24 +11,24 @@ diff -up openchange-2.2-NANOPROBE/config.mk.in.test openchange-2.2-NANOPROBE/con
LDB_CFLAGS=@LDB_CFLAGS@
LDB_LIBS=@LDB_LIBS@
-diff -up openchange-2.2-NANOPROBE/configure.ac.test openchange-2.2-NANOPROBE/configure.ac
---- openchange-2.2-NANOPROBE/configure.ac.test 2014-11-24 19:39:04.877543200 +0100
-+++ openchange-2.2-NANOPROBE/configure.ac 2014-11-24 19:44:52.196447833 +0100
-@@ -412,6 +412,12 @@ PKG_CHECK_MODULES(SAMBASERVER, dcerpc_se
+diff -up openchange-openchange-2.3-VULCAN/configure.ac.samba-4.2.0-rc2 openchange-openchange-2.3-VULCAN/configure.ac
+--- openchange-openchange-2.3-VULCAN/configure.ac.samba-4.2.0-rc2 2015-05-18 18:10:56.753649553 +0200
++++ openchange-openchange-2.3-VULCAN/configure.ac 2015-05-18 18:10:56.757649553 +0200
+@@ -455,6 +455,12 @@ PKG_CHECK_MODULES(SAMBASERVER, dcerpc_se
PKG_CHECK_MODULES(TDB, tdb)
PKG_CHECK_MODULES(LDB, ldb)
+SAMBA_DEBUG_LIBS="-lsamba-debug-samba4"
+AC_SUBST(SAMBA_DEBUG_LIBS)
+
-+SAMBA_DEBUG_LDFLAGS="-L`pkg-config --variable=libdir samba-util`/samba"
++SAMBA_DEBUG_LDFLAGS="-L`pkg-config --variable=libdir samba-util`/samba -Wl,-rpath -Wl,`pkg-config --variable=libdir samba-util`/samba"
+AC_SUBST(SAMBA_DEBUG_LDFLAGS)
+
dnl ---------------------------------------------------------------------------
dnl Check a particular Samba4 git revision
dnl ---------------------------------------------------------------------------
-@@ -605,12 +611,14 @@ if test x"$enable_libpopt" = x"yes"; the
- exchange2ical=1
+@@ -675,7 +681,11 @@ if test x"$enable_libpopt" = x"yes"; the
+ rpcextract=1
fi
- MAPISTORE_TEST=mapistore_test
@@ -38,17 +38,33 @@ diff -up openchange-2.2-NANOPROBE/configure.ac.test openchange-2.2-NANOPROBE/con
+ test_asyncnotif=1
+ fi
mapiprofile=1
- openchangemapidump=1
- schemaIDGUID=1
-- check_fasttransfer=1
-- test_asyncnotif=1
- fi
- AC_SUBST(MAPISTORE_TEST)
- OC_RULE_ADD(openchangeclient, TOOLS)
-diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefile
---- openchange-2.2-NANOPROBE/Makefile.test 2014-11-24 19:39:04.808543815 +0100
-+++ openchange-2.2-NANOPROBE/Makefile 2014-11-24 19:39:04.956542496 +0100
-@@ -357,7 +357,7 @@ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION)
+ mapipropsdump=1
+ ocnotify=1
+diff -up openchange-openchange-2.3-VULCAN/libmapi.pc.in.samba-4.2.0-rc2 openchange-openchange-2.3-VULCAN/libmapi.pc.in
+--- openchange-openchange-2.3-VULCAN/libmapi.pc.in.samba-4.2.0-rc2 2015-05-18 18:10:58.667649472 +0200
++++ openchange-openchange-2.3-VULCAN/libmapi.pc.in 2015-05-18 18:11:10.121648986 +0200
+@@ -8,7 +8,7 @@ datadir=@datadir@
+ Name: MAPI
+ Description: MAPI Protocol Implementation
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -lmapi-openchange
++Libs: -L${libdir} -lmapi-openchange @SAMBA_DEBUG_LDFLAGS@ @SAMBA_DEBUG_LIBS@
+ Libs.private: @LIBS@
+ Cflags: -I${includedir}
+ Requires: talloc dcerpc ndr tevent
+diff -up openchange-openchange-2.3-VULCAN/Makefile.samba-4.2.0-rc2 openchange-openchange-2.3-VULCAN/Makefile
+--- openchange-openchange-2.3-VULCAN/Makefile.samba-4.2.0-rc2 2015-05-18 18:10:56.749649553 +0200
++++ openchange-openchange-2.3-VULCAN/Makefile 2015-05-18 18:10:56.757649553 +0200
+@@ -326,7 +326,7 @@ libmapi-openchange.$(SHLIBEXT).$(PACKAGE
+ libmapi/socket/interface.po \
+ libmapi/socket/netif.po
+ @echo "Linking $@"
+- @$(CC) $(DSOOPT) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) -o $@ $^ $(LIBS)
++ @$(CC) $(DSOOPT) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+
+ libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION): libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+@@ -366,7 +366,7 @@ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION)
libmapi++/src/session.po \
libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
@echo "Linking $@"
@@ -57,7 +73,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
libmapixx-installpc:
@echo "[*] install: libmapi++ pc files"
-@@ -438,7 +438,7 @@ bin/libmapixx-test: libmapi++/tests/test
+@@ -447,7 +447,7 @@ bin/libmapixx-test: libmapi++/tests/test
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking sample application $@"
@@ -66,7 +82,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
clean:: libmapixx-test-clean
-@@ -453,7 +453,7 @@ bin/libmapixx-attach: libmapi++/tests/at
+@@ -462,7 +462,7 @@ bin/libmapixx-attach: libmapi++/tests/at
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking sample application $@"
@@ -75,7 +91,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
clean:: libmapixx-attach-clean
-@@ -463,7 +463,7 @@ bin/libmapixx-exception: libmapi++/tests
+@@ -472,7 +472,7 @@ bin/libmapixx-exception: libmapi++/tests
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking exception test application $@"
@@ -84,7 +100,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
libmapixx-exception-clean:
rm -f bin/libmapixx-exception
-@@ -483,7 +483,7 @@ bin/libmapixx-profiletest: libmapi++/tes
+@@ -492,7 +492,7 @@ bin/libmapixx-profiletest: libmapi++/tes
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking profile test application $@"
@@ -93,7 +109,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
clean:: libmapixx-profiletest-clean
-@@ -504,7 +504,7 @@ libmapi++/examples/foldertree: libmapi++
+@@ -513,7 +513,7 @@ libmapi++/examples/foldertree: libmapi++
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking foldertree example application $@"
@@ -102,7 +118,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
clean:: libmapixx-foldertree-clean
-@@ -512,7 +512,7 @@ libmapi++/examples/messages: libmapi++/e
+@@ -521,7 +521,7 @@ libmapi++/examples/messages: libmapi++/e
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking messages example application $@"
@@ -111,7 +127,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
clean:: libmapixx-messages-clean
-@@ -579,7 +579,7 @@ libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSI
+@@ -588,7 +588,7 @@ libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSI
libmapiadmin/mapiadmin.po \
libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
@@ -120,7 +136,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
-@@ -656,7 +656,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):
+@@ -665,7 +665,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):
libocpf/ocpf_write.po \
libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
@@ -129,7 +145,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION): libocpf.$(SHLIBEXT).$(PACKAGE_VERSION)
ln -fs $< $@
-@@ -728,7 +728,7 @@ mapiproxy/dcesrv_mapiproxy.$(SHLIBEXT):
+@@ -740,7 +740,7 @@ mapiproxy/dcesrv_mapiproxy.$(SHLIBEXT):
gen_ndr/ndr_exchange.po
@echo "Linking $@"
@@ -138,34 +154,114 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
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 \
+@@ -748,7 +748,7 @@ mapiproxy/dcesrv_mapiproxy.c: gen_ndr/nd
+ mapiproxy/dcesrv_asyncemsmdb.$(SHLIBEXT): mapiproxy/servers/default/asyncemsmdb/dcesrv_asyncemsmdb.po \
+ gen_ndr/ndr_asyncemsmdb.po
+ @echo "Linking $@"
+- @$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) $(NANOMSG_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) mapiproxy/libmapiserver.$(SHLIBEXT).$(PACKAGE_VERSION) \
++ @$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) $(NANOMSG_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) mapiproxy/libmapiserver.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+
+ mapiproxy/servers/default/asyncemsmdb/dcesrv_asyncemsmdb.c: gen_ndr/ndr_asyncemsmdb_s.c gen_ndr/ndr_asyncemsmdb.c
+@@ -810,7 +810,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
+ mapiproxy/util/ccan/htable/htable.po \
libmapi-openchange.$(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)
+- @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS) $(PYTHON_LIBS)
++ @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS) $(PYTHON_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
+@@ -861,7 +861,7 @@ mapiproxy/libmapiserver.$(SHLIBEXT).$(PA
+ ndr_mapi.po \
+ gen_ndr/ndr_exchange.po
+ @echo "Linking $@"
+- @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiserver.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ $(LIBS)
++ @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiserver.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ mapiproxy/libmapiserver.$(SHLIBEXT).$(LIBMAPISERVER_SO_VERSION): libmapiserver.$(SHLIBEXT).$(PACKAGE_VERSION)
+ ln -fs $< $@
+@@ -964,7 +964,7 @@ mapiproxy/libmapistore.$(SHLIBEXT).$(PAC
mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) \
libmapi-openchange.$(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)
+- @$(CC) $(DSOOPT) $(MEMCACHED_CFLAGS) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION) -o $@ $^ $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS) $(MEMCACHED_LIBS)
++ @$(CC) $(DSOOPT) $(MEMCACHED_CFLAGS) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION) -o $@ $^ $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS) $(MEMCACHED_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
+@@ -986,7 +986,7 @@ bin/mapistore_test: mapiproxy/libmapist
+ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
++ @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ mapistore_tool: bin/mapistore_tool
+
+@@ -994,7 +994,7 @@ bin/mapistore_tool: testprogs/mapistore
mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) \
mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
-- @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt -L. libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
-+ @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt -L. libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+- @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
++ @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
mapistore_clean:
rm -f mapiproxy/libmapistore/tests/*.o
-@@ -1138,7 +1138,7 @@ bin/openchangeclient: utils/openchangec
+@@ -1036,13 +1036,13 @@ clean:: mapiproxy-modules-clean
+
+ mapiproxy/modules/mpm_downgrade.$(SHLIBEXT): mapiproxy/modules/mpm_downgrade.po
+ @echo "Linking $@"
+- @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) $^ -L. $(LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
++ @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) $^ -L. $(LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ mapiproxy/modules/mpm_pack.$(SHLIBEXT): mapiproxy/modules/mpm_pack.po \
+ ndr_mapi.po \
+ gen_ndr/ndr_exchange.po
+ @echo "Linking $@"
+- @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) $^ -L. $(LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
++ @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) $^ -L. $(LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ mapiproxy/modules/mpm_cache.$(SHLIBEXT): mapiproxy/modules/mpm_cache.po \
+ mapiproxy/modules/mpm_cache_ldb.po \
+@@ -1050,11 +1050,11 @@ mapiproxy/modules/mpm_cache.$(SHLIBEXT):
+ ndr_mapi.po \
+ gen_ndr/ndr_exchange.po
+ @echo "Linking $@"
+- @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) $^ -L. $(LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
++ @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) $^ -L. $(LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ mapiproxy/modules/mpm_dummy.$(SHLIBEXT): mapiproxy/modules/mpm_dummy.po
+ @echo "Linking $@"
+- @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) $^ -L. $(LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
++ @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) $^ -L. $(LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+
+ samba_setupdir = $(shell $(PYTHON) -c 'import samba; print samba.param.setup_dir();')
+@@ -1121,7 +1121,7 @@ mapiproxy/servers/exchange_nsp.$(SHLIBEX
+ mapiproxy/servers/default/nspi/emsabp_tdb.po \
+ mapiproxy/servers/default/nspi/emsabp_property.po
+ @echo "Linking $@"
+- @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) $^ -L. $(LIBS) $(TDB_LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
++ @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) $^ -L. $(LIBS) $(TDB_LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ mapiproxy/servers/exchange_emsmdb.$(SHLIBEXT): mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.po \
+ mapiproxy/servers/default/emsmdb/emsmdbp.po \
+@@ -1142,11 +1142,11 @@ mapiproxy/servers/exchange_emsmdb.$(SHLI
+ @echo "Linking $@"
+ @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) $^ -L. $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ mapiproxy/libmapiserver.$(SHLIBEXT).$(PACKAGE_VERSION) \
+- mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION)
++ mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ mapiproxy/servers/exchange_ds_rfr.$(SHLIBEXT): mapiproxy/servers/default/rfr/dcesrv_exchange_ds_rfr.po
+ @echo "Linking $@"
+- @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) $^ -L. $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
++ @$(CC) -o $@ $(DSOOPT) $(LDFLAGS) $^ -L. $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ #################################################################
+ # Tools compilation rules
+@@ -1181,7 +1181,7 @@ bin/openchangeclient: utils/openchangec
libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) \
libocpf.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
@@ -174,16 +270,43 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
##############
-@@ -1166,7 +1166,7 @@ bin/mapiprofile: utils/mapiprofile.o
+@@ -1209,7 +1209,7 @@ bin/mapiprofile: utils/mapiprofile.o
utils/openchange-tools.o \
libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
- @$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
+ @$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ ###################
+ # rpcextract
+@@ -1235,7 +1235,7 @@ bin/ocnotify: utils/ocnotify.o \
+ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) $(CFLAGS) $(NANOMSG_CFLAGS) -o $@ $^ $(LDFLAGS) $(NANOMSG_LIBS) $(LIBS) -lpopt
++ @$(CC) $(CFLAGS) $(NANOMSG_CFLAGS) -o $@ $^ $(LDFLAGS) $(NANOMSG_LIBS) $(LIBS) -lpopt $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ ###################
+ # rpcextract
+@@ -1259,7 +1259,7 @@ clean:: rpcextract-clean
+ bin/rpcextract: utils/rpcextract.o \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) $(CFLAGS) $(PCAP_CFLAGS) -o $@ $^ $(LDFLAGS) $(PCAP_LIBS) $(LIBS) -lpopt -lndr
++ @$(CC) $(CFLAGS) $(PCAP_CFLAGS) -o $@ $^ $(LDFLAGS) $(PCAP_LIBS) $(LIBS) -lpopt -lndr $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
###################
-@@ -1195,7 +1195,7 @@ bin/openchangepfadmin: utils/openchangep
+@@ -1284,7 +1284,7 @@ clean:: mapipropsdump-clean
+ bin/mapipropsdump: utils/mapipropsdump.o \
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(SAMBA_LIBS) $(LIBS) $(DL_LIBS) -lpopt -lndr
++ @$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(SAMBA_LIBS) $(LIBS) $(DL_LIBS) -lpopt -lndr $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ ###################
+ #openchangepfadmin
+@@ -1312,7 +1312,7 @@ bin/openchangepfadmin: utils/openchangep
libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) \
libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
@@ -192,7 +315,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
###################
-@@ -1226,7 +1226,7 @@ bin/exchange2mbox: utils/exchange2mbox.o
+@@ -1343,7 +1343,7 @@ bin/exchange2mbox: utils/exchange2mbox.o
utils/openchange-tools.o \
libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
@@ -201,7 +324,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
###################
-@@ -1290,7 +1290,7 @@ bin/exchange2ical: utils/exchange2ical_t
+@@ -1407,7 +1407,7 @@ bin/exchange2ical: utils/exchange2ical_t
utils/openchange-tools.o \
libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
@@ -210,16 +333,16 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
######################
# testsuite
-@@ -1321,7 +1321,7 @@ bin/openchange-testsuite: testsuite/tes
+@@ -1445,7 +1445,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-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
-+ @$(CC) $(CFLAGS) $(CHECK_CFLAGS) $(TDB_CFLAGS) -I. -Itestsuite/ -Imapiproxy -o $@ $^ $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(CHECK_LIBS) $(MYSQL_LIBS) libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+- @$(CC) $(CFLAGS) $(CHECK_CFLAGS) $(TDB_CFLAGS) $(PYTHON_CFLAGS) -I. -Itestsuite/ -Imapiproxy -o $@ $^ $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(CHECK_LIBS) $(MYSQL_LIBS) $(PYTHON_LIBS) -lpopt libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(MEMCACHED_LIBS)
++ @$(CC) $(CFLAGS) $(CHECK_CFLAGS) $(TDB_CFLAGS) $(PYTHON_CFLAGS) -I. -Itestsuite/ -Imapiproxy -o $@ $^ $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(CHECK_LIBS) $(MYSQL_LIBS) $(PYTHON_LIBS) -lpopt libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(MEMCACHED_LIBS) $(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
+ @LD_LIBRARY_PATH=. PYTHONPATH=./python CK_XML_LOG_FILE_NAME=test_results.xml ./bin/openchange-testsuite
+@@ -1515,7 +1515,7 @@ bin/mapitest: utils/mapitest/mapitest.o
utils/mapitest/modules/module_lzxpress.o \
libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
@@ -228,7 +351,7 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
utils/mapitest/proto.h: \
utils/mapitest/mapitest_suite.c \
-@@ -1450,7 +1450,7 @@ bin/openchangemapidump: utils/backup/ope
+@@ -1576,7 +1576,7 @@ bin/openchangemapidump: utils/backup/ope
utils/openchange-tools.o \
libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
@@ -237,16 +360,25 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
###############
-@@ -1503,7 +1503,7 @@ bin/check_fasttransfer: testprogs/check_
+@@ -1601,7 +1601,7 @@ clean:: schemaIDGUID-clean
+
+ bin/schemaIDGUID: utils/schemaIDGUID.o
+ @echo "Linking $@"
+- @$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS)
++ @$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ ###################
+ # check_fasttransfer test app.
+@@ -1629,7 +1629,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)
+- @$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt $(MEMCACHED_LIBS)
++ @$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt $(MEMCACHED_LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
###################
# test_asyncnotif test app.
-@@ -1529,7 +1529,7 @@ clean:: test_asyncnotif-clean
+@@ -1655,7 +1655,7 @@ clean:: test_asyncnotif-clean
bin/test_asyncnotif: testprogs/test_asyncnotif.o \
libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
@echo "Linking $@"
@@ -255,12 +387,37 @@ diff -up openchange-2.2-NANOPROBE/Makefile.test openchange-2.2-NANOPROBE/Makefil
###################
# python code
-@@ -1574,7 +1574,7 @@ $(pythonscriptdir)/openchange/mapi.$(SHL
+@@ -1703,13 +1703,13 @@ $(pythonscriptdir)/openchange/mapi.$(SHL
pyopenchange/pymapi_properties.c \
libmapi-openchange.$(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)
+- @$(CC) $(PYTHON_CFLAGS) $(CFLAGS) -fno-strict-aliasing $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_LIBS) $(LIBS)
++ @$(CC) $(PYTHON_CFLAGS) $(CFLAGS) -fno-strict-aliasing $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_LIBS) $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
# $(pythonscriptdir)/openchange/ocpf.$(SHLIBEXT): pyopenchange/pyocpf.c \
# libocpf.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ # libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+ # @echo "Linking $@"
+-# @$(CC) $(PYTHON_CFLAGS) $(CFLAGS) $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_LIBS) $(LIBS)
++# @$(CC) $(PYTHON_CFLAGS) $(CFLAGS) $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_LIBS) $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+ $(pythonscriptdir)/openchange/mapistore.$(SHLIBEXT): pyopenchange/mapistore/pymapistore.c \
+ pyopenchange/mapistore/context.c \
+@@ -1889,7 +1889,7 @@ libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ qt/lib/foldermodel.o \
+ qt/lib/messagesmodel.o
+ @echo "Linking $@"
+- @$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libqtmapi.$(SHLIBEXT).$(LIBQTMAPI_SO_VERSION) -o $@ $^ $(LIBS)
++ @$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libqtmapi.$(SHLIBEXT).$(LIBQTMAPI_SO_VERSION) -o $@ $^ $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+
+
+ qt/demo/demoapp: qt/demo/demoapp.o \
+@@ -1898,7 +1898,7 @@ qt/demo/demoapp: qt/demo/demoapp.o \
+ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
+ libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+ @echo "Linking $@"
+- @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(QT4_LIBS) $(LDFLAGS) $(LIBS)
++ @$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(QT4_LIBS) $(LDFLAGS) $(LIBS) $(SAMBA_DEBUG_LDFLAGS) $(SAMBA_DEBUG_LIBS)
+ # we don't yet install this...
+ ln -sf libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION) libqtmapi.$(SHLIBEXT)
+ ln -sf libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION) libqtmapi.$(SHLIBEXT).$(LIBQTMAPI_SO_VERSION)
diff --git a/openchange-2.3-disable-server-tools-build.patch b/openchange-2.3-disable-server-tools-build.patch
new file mode 100644
index 0000000..db3ac9a
--- /dev/null
+++ b/openchange-2.3-disable-server-tools-build.patch
@@ -0,0 +1,32 @@
+diff -up openchange-openchange-2.3-VULCAN/configure.ac.test-remove openchange-openchange-2.3-VULCAN/configure.ac
+--- openchange-openchange-2.3-VULCAN/configure.ac.test-remove 2015-05-18 08:56:24.235059401 +0200
++++ openchange-openchange-2.3-VULCAN/configure.ac 2015-05-18 11:44:14.091632714 +0200
+@@ -292,7 +292,7 @@ OC_RULE_ADD(testsuite, TESTSUITE)
+ dnl ---------------------------------------------------------------------------
+ dnl Check for nanomsg library (server notification)
+ dnl ---------------------------------------------------------------------------
+-PKG_CHECK_MODULES(NANOMSG, libnanomsg, [], [AC_MSG_ERROR(Install nanomsg library >= 0.5)])
++#PKG_CHECK_MODULES(NANOMSG, libnanomsg, [], [AC_MSG_ERROR(Install nanomsg library >= 0.5)])
+ AC_SUBST(NANOMSG_CFLAGS)
+ AC_SUBST(NANO_LIBS)
+
+@@ -698,16 +698,16 @@ AC_SUBST(MAPISTORE_TEST)
+ OC_RULE_ADD(openchangeclient, TOOLS)
+ #OC_RULE_ADD(mapistore_fsocpf, MAPISTORE)
+ OC_RULE_ADD(mapipropsdump, TOOLS)
+-OC_RULE_ADD(ocnotify, TOOLS)
++#OC_RULE_ADD(ocnotify, TOOLS)
+ OC_RULE_ADD(exchange2ical, TOOLS)
+-OC_RULE_ADD(rpcextract, TOOLS)
++#OC_RULE_ADD(rpcextract, TOOLS)
+ OC_RULE_ADD(openchangepfadmin, TOOLS)
+ OC_RULE_ADD(mapitest, TOOLS)
+ OC_RULE_ADD(mapiprofile, TOOLS)
+ OC_RULE_ADD(openchangemapidump, TOOLS)
+ OC_RULE_ADD(schemaIDGUID, TOOLS)
+
+-OC_RULE_ADD(check_fasttransfer, TOOLS)
++#OC_RULE_ADD(check_fasttransfer, TOOLS)
+ OC_RULE_ADD(test_asyncnotif, TOOLS)
+
+
diff --git a/openchange.spec b/openchange.spec
index 0c266b3..e7c0a71 100644
--- a/openchange.spec
+++ b/openchange.spec
@@ -2,7 +2,7 @@
%global samba_version 4.2.0-2
%global talloc_version 2.0.5
-%global nickname NANOPROBE
+%global nickname VULCAN
%global build_python_package 0
@@ -18,13 +18,13 @@
# Licensing Note: The code is GPLv3+ and the IDL files are public domain.
Name: openchange
-Version: 2.2
-Release: 6%{?dist}
+Version: 2.3
+Release: 1%{?dist}
Group: Applications/System
Summary: Provides access to Microsoft Exchange servers using native protocols
License: GPLv3+ and Public Domain
URL: http://www.openchange.org/
-Source0: http://tracker.openchange.org/attachments/download/244/openchange-%{version}-%{nickname}.tar.gz
+Source0: https://github.com/openchange/openchange/archive/openchange-%{version}-%{nickname}.tar.gz
Source1: doxygen_to_devhelp.xsl
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -41,6 +41,7 @@ BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libical-devel
BuildRequires: libldb-devel
+BuildRequires: libmemcached-devel
BuildRequires: libtalloc-devel >= %{talloc_version}
BuildRequires: libtdb-devel
BuildRequires: pkgconfig
@@ -70,13 +71,11 @@ Patch1: openchange-0.9-generate-xml-doc.patch
# Do not build server and python parts
Patch2: openchange-1.0-OC_RULE_ADD-fix.patch
-# Avoid multilib issue in libmapi/version.h
-Patch3: openchange-2.0-multilib-issue-libmapi-version-h.patch
-
# RH-bug #1028698
Patch4: openchange-1.0-symbol-clash.patch
Patch5: openchange-2.2-samba-4.2.0-rc2.patch
+Patch6: openchange-2.3-disable-server-tools-build.patch
%description
OpenChange provides libraries to access Microsoft Exchange servers
@@ -136,13 +135,13 @@ This package provides the server elements for OpenChange.
%endif
%prep
-%setup -q -n %{name}-%{version}-%{nickname}
+%setup -q -n openchange-%{name}-%{version}-%{nickname}
%patch0 -p1 -b .libmapi-conflict
%patch1 -p1 -b .generate-xml-doc
%patch2 -p1 -b .OC_RULE_ADD-fix
-%patch3 -p1 -b .multilib-issue-libmapi-version-h
%patch4 -p1 -b .symbol-clash
%patch5 -p1 -b .samba-4.2.0-rc2
+%patch6 -p1 -b .disable-server-tools-build
%build
./autogen.sh
@@ -168,6 +167,7 @@ xsltproc -o openchange-libmapi++.devhelp --stringparam "booktitle" "C++ bindings
%install
rm -rf $RPM_BUILD_ROOT
+
make install DESTDIR=$RPM_BUILD_ROOT
cp -r libmapi++ $RPM_BUILD_ROOT%{_includedir}
@@ -289,6 +289,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon May 18 2015 Milan Crha <mcrha at redhat.com> - 2.3-1
+- Update to 2.3
+
* Thu Apr 23 2015 Milan Crha <mcrha at redhat.com> - 2.2-6
- Rebuild against newer samba
diff --git a/sources b/sources
index f051aaa..2697624 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4ddd7fac0adec20512ee673c01eb1255 openchange-2.2-NANOPROBE.tar.gz
+96c13c78c2bcbd7040f7848746284b9f openchange-2.3-VULCAN.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/openchange.git/commit/?h=master&id=5a707a29983e5c6c778b662d4e7204d9d43a11fb
More information about the scm-commits
mailing list