[openchange] Update to OpenChange 0.11 Transporter upstream release

Milan Crha mcrha at fedoraproject.org
Thu Aug 11 11:27:43 UTC 2011


commit ec6c7f42d342f55aaf334cb82b868223fa0d4888
Author: Milan Crha <mcrha at redhat.com>
Date:   Thu Aug 11 13:27:22 2011 +0200

    Update to OpenChange 0.11 Transporter upstream release

 .gitignore                                      |    1 +
 libmapi-0.8.2-libmapi-conflict.patch            |   82 +++---
 openchange-0.10.9-TF16S2-fix-fedora-build.patch |   17 --
 openchange-0.11-pt-mv-unicode.patch             |  324 +++++++++++++++++++++++
 openchange-0.11-session-as-memctx.patch         |   24 ++
 openchange.spec                                 |   26 ++-
 samba-util-common-workaround.patch              |   12 -
 sources                                         |    2 +-
 8 files changed, 407 insertions(+), 81 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 790fb21..ec5c906 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 openchange-0.9-COCHRANE.tar.gz
 /openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1.tar.gz
 /openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT2.tar.gz
+/openchange-0.11-TRANSPORTER.tar.gz
diff --git a/libmapi-0.8.2-libmapi-conflict.patch b/libmapi-0.8.2-libmapi-conflict.patch
index 14b5d2c..599befd 100644
--- a/libmapi-0.8.2-libmapi-conflict.patch
+++ b/libmapi-0.8.2-libmapi-conflict.patch
@@ -1,6 +1,6 @@
-diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/libmapi.pc.in openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1.new/libmapi.pc.in
---- openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/libmapi.pc.in	2009-08-05 15:20:11.000000000 -0400
-+++ openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1.new/libmapi.pc.in	2011-03-25 15:26:16.936199625 -0400
+diff -up openchange-0.11-TRANSPORTER/libmapi.pc.in.libmapi-conflict openchange-0.11-TRANSPORTER/libmapi.pc.in
+--- openchange-0.11-TRANSPORTER/libmapi.pc.in.libmapi-conflict	2009-08-05 21:20:11.000000000 +0200
++++ openchange-0.11-TRANSPORTER/libmapi.pc.in	2011-08-05 07:01:18.932122274 +0200
 @@ -8,7 +8,7 @@ datadir=@datadir@
  Name: MAPI
  Description: MAPI Protocol Implementation
@@ -10,10 +10,10 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/libmapi.pc.in openchange-
  Libs.private: @LIBS@
  Cflags: -I${includedir}
  Requires: talloc dcerpc ndr tevent
-diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1.new/Makefile
---- openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile	2011-03-16 06:20:17.000000000 -0400
-+++ openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1.new/Makefile	2011-03-25 15:33:39.134592406 -0400
-@@ -151,7 +151,7 @@ LIBMAPI_SO_VERSION = 0
+diff -up openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict openchange-0.11-TRANSPORTER/Makefile
+--- openchange-0.11-TRANSPORTER/Makefile.libmapi-conflict	2011-05-19 06:52:46.000000000 +0200
++++ openchange-0.11-TRANSPORTER/Makefile	2011-08-05 07:04:08.371001021 +0200
+@@ -158,7 +158,7 @@ LIBMAPI_SO_VERSION = 0
  
  libmapi:	idl					\
  		libmapi/version.h			\
@@ -22,18 +22,18 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  
  libmapi-install:	libmapi			\
  			libmapi-installpc	\
-@@ -184,8 +184,8 @@ endif
+@@ -191,8 +191,8 @@ endif
  	rm -f *~
  	rm -f */*~
  	rm -f */*/*~
--	rm -f libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) \
+-	rm -f libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi.$(SHLIBEXT).* \
 -		  libmapi.$(SHLIBEXT)
-+	rm -f libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) \
++	rm -f libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi-openchange.$(SHLIBEXT).* \
 +		  libmapi-openchange.$(SHLIBEXT)
  
  clean:: libmapi-clean
  
-@@ -202,10 +202,10 @@ libmapi-installpc:
+@@ -209,10 +209,10 @@ libmapi-installpc:
  libmapi-installlib:
  	@echo "[*] install: libmapi library"
  	$(INSTALL) -d $(DESTDIR)$(libdir)
@@ -47,7 +47,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  endif
  
  libmapi-installheader:
-@@ -243,7 +243,7 @@ libmapi-uninstallpc:
+@@ -250,7 +250,7 @@ libmapi-uninstallpc:
  	rm -f $(DESTDIR)$(libdir)/pkgconfig/libmapi.pc
  
  libmapi-uninstalllib:
@@ -56,7 +56,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  
  libmapi-uninstallheader:
  	rm -rf $(DESTDIR)$(includedir)/libmapi
-@@ -254,7 +254,7 @@ libmapi-uninstallscript:
+@@ -261,7 +261,7 @@ libmapi-uninstallscript:
  	rm -f $(DESTDIR)$(datadir)/setup/profiles/oc_profiles*
  	rm -rf $(DESTDIR)$(datadir)/setup/profiles
  
@@ -65,7 +65,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	libmapi/emsmdb.po				\
  	libmapi/async_emsmdb.po				\
  	libmapi/IABContainer.po				\
-@@ -296,10 +296,10 @@ libmapi.$(SHLIBEXT).$(PACKAGE_VERSION): 
+@@ -304,10 +304,10 @@ libmapi.$(SHLIBEXT).$(PACKAGE_VERSION): 
  	libmapi/socket/interface.po			\
  	libmapi/socket/netif.po				
  	@echo "Linking $@"
@@ -78,7 +78,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	ln -fs $< $@
  
  libmapi/version.h: VERSION
-@@ -416,7 +416,7 @@ clean:: libmapixx-tests-clean
+@@ -424,7 +424,7 @@ clean:: libmapixx-tests-clean
  
  bin/libmapixx-test:	libmapi++/tests/test.cpp	\
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -87,7 +87,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking sample application $@"
  	@$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) 
  
-@@ -431,7 +431,7 @@ libmapixx-attach-clean:
+@@ -439,7 +439,7 @@ libmapixx-attach-clean:
  
  bin/libmapixx-attach: libmapi++/tests/attach_test.po	\
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -96,7 +96,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking sample application $@"
  	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -441,7 +441,7 @@ libmapixx-exception: bin/libmapixx-excep
+@@ -449,7 +449,7 @@ libmapixx-exception: bin/libmapixx-excep
   
  bin/libmapixx-exception: libmapi++/tests/exception_test.cpp \
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -105,7 +105,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking exception test application $@"
  	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -461,7 +461,7 @@ libmapixx-profiletest-clean:
+@@ -469,7 +469,7 @@ libmapixx-profiletest-clean:
  
  bin/libmapixx-profiletest: libmapi++/tests/profile_test.po	\
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -114,7 +114,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking profile test application $@"
  	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -482,7 +482,7 @@ libmapixx-messages-clean:
+@@ -490,7 +490,7 @@ libmapixx-messages-clean:
  
  libmapi++/examples/foldertree: libmapi++/examples/foldertree.cpp	\
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -123,7 +123,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking foldertree example application $@"
  	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -490,7 +490,7 @@ clean:: libmapixx-foldertree-clean
+@@ -498,7 +498,7 @@ clean:: libmapixx-foldertree-clean
  
  libmapi++/examples/messages: libmapi++/examples/messages.cpp	\
  		libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
@@ -132,7 +132,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking messages example application $@"
  	@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
  
-@@ -557,7 +557,7 @@ libmapiadmin-uninstallheader:
+@@ -565,7 +565,7 @@ libmapiadmin-uninstallheader:
  libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION):	\
  	libmapiadmin/mapiadmin_user.po		\
  	libmapiadmin/mapiadmin.po 		\
@@ -141,7 +141,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking $@"
  	@$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiadmin.$(SHLIBEXT).$(LIBMAPIADMIN_SO_VERSION) -o $@ $^ $(LIBS) $(LIBMAPIADMIN_LIBS) 
  
-@@ -634,7 +634,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):	
+@@ -642,7 +642,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):	
  	libocpf/ocpf_dump.po			\
  	libocpf/ocpf_api.po			\
  	libocpf/ocpf_write.po			\
@@ -150,16 +150,16 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking $@"
  	@$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION) -o $@ $^ $(LIBS)
  
-@@ -708,7 +708,7 @@ mapiproxy/dcesrv_mapiproxy.$(SHLIBEXT): 
+@@ -716,7 +716,7 @@ mapiproxy/dcesrv_mapiproxy.$(SHLIBEXT): 
  						gen_ndr/ndr_exchange.po				
  
  	@echo "Linking $@"
--	@$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) -ldcerpc-server -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
-+	@$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) -ldcerpc-server -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
+-	@$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(SAMBASERVER_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
++	@$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(SAMBASERVER_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
  
  mapiproxy/dcesrv_mapiproxy.c: gen_ndr/ndr_exchange_s.c gen_ndr/ndr_exchange.c
  
-@@ -748,7 +748,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
+@@ -755,7 +755,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
  							mapiproxy/libmapiproxy/openchangedb_property.po		\
  							mapiproxy/libmapiproxy/mapi_handles.po			\
  							mapiproxy/libmapiproxy/entryid.po			\
@@ -168,7 +168,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking $@"
  	@$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS) $(TDB_LIBS)
  
-@@ -883,7 +883,7 @@ mapiproxy/libmapistore.$(SHLIBEXT).$(PAC
+@@ -888,7 +888,7 @@ mapiproxy/libmapistore.$(SHLIBEXT).$(PAC
  							mapiproxy/libmapistore/database/mapistoredb.po				\
  							mapiproxy/libmapistore/database/mapistoredb_conf.po			\
  							mapiproxy/libmapistore/database/mapistoredb_namedprops.po		\
@@ -177,7 +177,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking $@"
  	@$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(DL_LIBS) -Wl,-soname,libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION)
  
-@@ -962,7 +962,7 @@ mapistore_test: bin/mapistore_test
+@@ -967,7 +967,7 @@ mapistore_test: bin/mapistore_test
  bin/mapistore_test: 	mapiproxy/libmapistore/tests/mapistore_test.o		\
  			mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
@@ -186,7 +186,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  
  mapistore_clean:
  	rm -f mapiproxy/libmapistore/tests/*.o
-@@ -1123,7 +1123,7 @@ clean:: openchangeclient-clean
+@@ -1128,7 +1128,7 @@ clean:: openchangeclient-clean
  
  bin/openchangeclient: 	utils/openchangeclient.o			\
  			utils/openchange-tools.o			\
@@ -195,7 +195,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  			libocpf.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
  	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
-@@ -1152,7 +1152,7 @@ clean:: mapiprofile-clean
+@@ -1157,7 +1157,7 @@ clean:: mapiprofile-clean
  
  bin/mapiprofile: 	utils/mapiprofile.o 			\
  			utils/openchange-tools.o 		\
@@ -204,7 +204,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking $@"
  	@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
  
-@@ -1180,7 +1180,7 @@ clean:: openchangepfadmin-clean
+@@ -1185,7 +1185,7 @@ clean:: openchangepfadmin-clean
  
  bin/openchangepfadmin:	utils/openchangepfadmin.o			\
  			utils/openchange-tools.o			\
@@ -213,7 +213,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  			libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBMAPIADMIN_LIBS) -lpopt			
-@@ -1212,7 +1212,7 @@ clean:: exchange2mbox-clean
+@@ -1217,7 +1217,7 @@ clean:: exchange2mbox-clean
  
  bin/exchange2mbox:	utils/exchange2mbox.o				\
  			utils/openchange-tools.o			\
@@ -222,7 +222,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt  $(MAGIC_LIBS)
  
-@@ -1276,7 +1276,7 @@ bin/exchange2ical:	utils/exchange2ical_t
+@@ -1281,7 +1281,7 @@ bin/exchange2ical:	utils/exchange2ical_t
  			libexchange2ical/ical2exchange.o	\
  			libexchange2ical/ical2exchange_property.o	\
  			utils/openchange-tools.o			\
@@ -231,7 +231,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking $@"
  	@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt
  
-@@ -1339,7 +1339,7 @@ bin/mapitest:	utils/mapitest/mapitest.o	
+@@ -1344,7 +1344,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	\
@@ -240,7 +240,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SUBUNIT_LIBS)
  
-@@ -1396,7 +1396,7 @@ clean:: openchangemapidump-clean
+@@ -1401,7 +1401,7 @@ clean:: openchangemapidump-clean
  bin/openchangemapidump:	utils/backup/openchangemapidump.o		\
  			utils/backup/openchangebackup.o			\
  			utils/openchange-tools.o			\
@@ -249,7 +249,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
  
-@@ -1447,7 +1447,7 @@ check_fasttransfer-clean::
+@@ -1452,7 +1452,7 @@ check_fasttransfer-clean::
  clean:: check_fasttransfer-clean
  
  bin/check_fasttransfer:	testprogs/check_fasttransfer.o			\
@@ -258,7 +258,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  			mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION)
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt
-@@ -1474,7 +1474,7 @@ test_asyncnotif-clean::
+@@ -1479,7 +1479,7 @@ test_asyncnotif-clean::
  clean:: test_asyncnotif-clean
  
  bin/test_asyncnotif:	testprogs/test_asyncnotif.o			\
@@ -267,7 +267,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking $@"
  	@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt
  
-@@ -1488,7 +1488,7 @@ pythonscriptdir = python
+@@ -1493,7 +1493,7 @@ pythonscriptdir = python
  
  #pymapi/%: CFLAGS+=`$(PYTHON_CONFIG) --cflags` -fPIC
  
@@ -276,7 +276,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  #	$(CC) -o $@ $^ `$(PYTHON_CONFIG) --libs` $(DSOOPT)
  
  #pymapi-install::
-@@ -1534,13 +1534,13 @@ pyopenchange: 	$(pythonscriptdir)/opench
+@@ -1539,13 +1539,13 @@ pyopenchange: 	$(pythonscriptdir)/opench
  
  $(pythonscriptdir)/openchange/mapi.$(SHLIBEXT):	pyopenchange/pymapi.c				\
  						pyopenchange/pymapi_properties.c		\
@@ -292,7 +292,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	@echo "Linking $@"
  	@$(CC) $(CFLAGS) $(DSOOPT) $(LDFLAGS) -o $@ $^ `$(PYTHON_CONFIG) --cflags --libs` $(LIBS) 
  
-@@ -1662,7 +1662,7 @@ ctags:
+@@ -1667,7 +1667,7 @@ ctags:
  
  test:: check
  
@@ -301,7 +301,7 @@ diff -uPpr openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT1/Makefile openchange-0.10.
  	# FIXME: Set up server
  	./bin/mapitest --mapi-calls 
  
-@@ -1735,7 +1735,7 @@ libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
+@@ -1740,7 +1740,7 @@ libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
  
  qt/demo/demoapp: qt/demo/demoapp.o 				\
  	qt/demo/main.o 					\
diff --git a/openchange-0.11-pt-mv-unicode.patch b/openchange-0.11-pt-mv-unicode.patch
new file mode 100644
index 0000000..ca74ee6
--- /dev/null
+++ b/openchange-0.11-pt-mv-unicode.patch
@@ -0,0 +1,324 @@
+diff -up openchange-0.11-TRANSPORTER/exchange.idl.pt-mv-unicode openchange-0.11-TRANSPORTER/exchange.idl
+--- openchange-0.11-TRANSPORTER/exchange.idl.pt-mv-unicode	2011-06-06 01:11:36.000000000 +0200
++++ openchange-0.11-TRANSPORTER/exchange.idl	2011-08-11 12:12:13.328593914 +0200
+@@ -275,12 +275,12 @@ System Attendant Private Interface
+ 	typedef struct {
+ 		[range(0,100000)] uint32			cValues;
+ 		[string,size_is(cValues),charset(UTF16)] uint16	**lppszW;
+-	} WStringArray_r;
++	} StringArrayW_r;
+ 
+ 	typedef struct {
+ 		[range(0,100000)] uint32		       	Count;
+ 		[string,size_is(Count),charset(UTF16)] uint16  	*Strings[];
+-	} WStringsArray_r;
++	} StringsArrayW_r;
+ 
+ 	typedef struct {
+ 		[range(0,100001)] uint32       				cValues;
+@@ -340,7 +340,7 @@ System Attendant Private Interface
+ 		[case(PT_MV_STRING8)]		StringArray_r		MVszA;
+ 		[case(PT_MV_BINARY)]		BinaryArray_r		MVbin;
+ 		[case(PT_MV_CLSID)]		FlatUIDArray_r		MVguid;
+-		[case(PT_MV_UNICODE)]		WStringArray_r		MVszW;
++		[case(PT_MV_UNICODE)]		StringArrayW_r		MVszW;
+ 		[case(PT_MV_SYSTIME)]		DateTimeArray_r		MVft;
+ 		[case(PT_NULL)]			uint32			null;
+ 		[case(PT_OBJECT)]		uint32			object;
+@@ -694,7 +694,7 @@ System Attendant Private Interface
+ 		[in] uint32			Reserved,
+ 		[in] STAT			*pStat,
+ 		[in,unique] SPropTagArray      	*pPropTags,
+-		[in] WStringsArray_r       	*paWStr,
++		[in] StringsArrayW_r       	*paWStr,
+ 		[out] PropertyTagArray_r	**ppMIds,
+ 		[out] SRowSet			**ppRows
+ 		);
+@@ -936,7 +936,7 @@ System Attendant Private Interface
+ 		uint32 lpl[cValues]; 
+ 	} mapi_MV_LONG_STRUCT;
+ 
+-	typedef [public] struct {
++	typedef struct {
+ 		raw8string lppszA;
+ 	} mapi_LPSTR;
+ 
+@@ -949,10 +949,10 @@ System Attendant Private Interface
+ 		[flag(STR_NULLTERM)] string lppszW;
+ 	} mapi_LPWSTR;
+ 
+-	typedef struct {
++	typedef [public] struct {
+ 		uint32 cValues;
+ 		mapi_LPWSTR strings[cValues];
+-	} mapi_SPLSTRArrayW;
++	} mapi_SLPSTRArrayW;
+ 	
+ 	typedef [public] struct {
+ 		uint32		cValues;
+@@ -1068,7 +1068,7 @@ System Attendant Private Interface
+ 		[case(PT_SVREID)]      	SBinary_short		bin;
+ 		[case(PT_MV_LONG)]	mapi_MV_LONG_STRUCT	MVl;	
+ 		[case(PT_MV_STRING8)]	mapi_SLPSTRArray	MVszA;
+-		[case(PT_MV_UNICODE)]	mapi_SPLSTRArrayW	MVszW;
++		[case(PT_MV_UNICODE)]	mapi_SLPSTRArrayW	MVszW;
+ 		[case(PT_MV_CLSID)]	mapi_SGuidArray		MVguid;
+ 		[case(PT_MV_BINARY)]	mapi_SBinaryArray      	MVbin;
+ 	} mapi_SPropValue_CTR;
+diff -up openchange-0.11-TRANSPORTER/libmapi/emsmdb.c.pt-mv-unicode openchange-0.11-TRANSPORTER/libmapi/emsmdb.c
+--- openchange-0.11-TRANSPORTER/libmapi/emsmdb.c.pt-mv-unicode	2011-06-06 01:11:36.000000000 +0200
++++ openchange-0.11-TRANSPORTER/libmapi/emsmdb.c	2011-08-11 12:12:13.316593772 +0200
+@@ -814,6 +814,8 @@ const void *pull_emsmdb_property(TALLOC_
+ 	struct Binary_r			*sbin = NULL;
+ 	struct mapi_SLPSTRArray		pt_slpstr;
+ 	struct StringArray_r		*slpstr = NULL;
++	struct mapi_SLPSTRArrayW	pt_slpstrw;
++	struct StringArrayW_r		*slpstrw = NULL;
+ 	struct mapi_MV_LONG_STRUCT	pt_MVl;
+ 	struct LongArray_r		*MVl = NULL;
+ 	struct mapi_SBinaryArray	pt_MVbin;
+@@ -913,6 +915,17 @@ const void *pull_emsmdb_property(TALLOC_
+ 		}
+ 		talloc_free(ndr);
+ 		return (const void *) slpstr;
++	case PT_MV_UNICODE:
++		ndr_pull_mapi_SLPSTRArrayW(ndr, NDR_SCALARS, &pt_slpstrw);
++		*offset = ndr->offset;
++		slpstrw = talloc_zero(mem_ctx, struct StringArrayW_r);
++		slpstrw->cValues = pt_slpstrw.cValues;
++		slpstrw->lppszW = talloc_array(mem_ctx, const char *, pt_slpstrw.cValues);
++		for (i = 0; i < slpstrw->cValues; i++) {
++			slpstrw->lppszW[i] = talloc_strdup(mem_ctx, pt_slpstrw.strings[i].lppszW);
++		}
++		talloc_free(ndr);
++		return (const void *) slpstrw;
+ 	case PT_MV_BINARY:
+ 		ndr_pull_mapi_SBinaryArray(ndr, NDR_SCALARS, &pt_MVbin);
+ 		*offset = ndr->offset;
+diff -up openchange-0.11-TRANSPORTER/libmapi/mapidump.c.pt-mv-unicode openchange-0.11-TRANSPORTER/libmapi/mapidump.c
+--- openchange-0.11-TRANSPORTER/libmapi/mapidump.c.pt-mv-unicode	2011-06-19 02:47:21.000000000 +0200
++++ openchange-0.11-TRANSPORTER/libmapi/mapidump.c	2011-08-11 12:12:13.319593808 +0200
+@@ -47,7 +47,7 @@ _PUBLIC_ void mapidump_SPropValue(struct
+ 	const void			*data;
+ 	TALLOC_CTX			*mem_ctx = NULL;
+ 	const struct StringArray_r	*StringArray_r = NULL;
+-	const struct WStringArray_r	*WStringArray_r = NULL;
++	const struct StringArrayW_r	*StringArrayW_r = NULL;
+ 	const struct BinaryArray_r	*BinaryArray_r = NULL;
+ 	const struct LongArray_r	*LongArray_r = NULL;
+ 	uint32_t			i;
+@@ -140,12 +140,12 @@ _PUBLIC_ void mapidump_SPropValue(struct
+ 		printf("%s\n", StringArray_r->lppszA[i]);
+ 		break;
+ 	case PT_MV_UNICODE:
+-		WStringArray_r = (const struct WStringArray_r *) get_SPropValue_data(&lpProp);
++		StringArrayW_r = (const struct StringArrayW_r *) get_SPropValue_data(&lpProp);
+ 		printf("%s%s: ", sep?sep:"", proptag);
+-		for (i = 0; i < WStringArray_r->cValues - 1; i++) {
+-			printf("%s, ", WStringArray_r->lppszW[i]);
++		for (i = 0; i < StringArrayW_r->cValues - 1; i++) {
++			printf("%s, ", StringArrayW_r->lppszW[i]);
+ 		}
+-		printf("%s\n", WStringArray_r->lppszW[i]);
++		printf("%s\n", StringArrayW_r->lppszW[i]);
+ 		break;
+ 	case PT_MV_BINARY:
+ 		BinaryArray_r = (const struct BinaryArray_r *) get_SPropValue_data(&lpProp);
+diff -up openchange-0.11-TRANSPORTER/libmapi/nspi.c.pt-mv-unicode openchange-0.11-TRANSPORTER/libmapi/nspi.c
+--- openchange-0.11-TRANSPORTER/libmapi/nspi.c.pt-mv-unicode	2011-06-19 02:47:21.000000000 +0200
++++ openchange-0.11-TRANSPORTER/libmapi/nspi.c	2011-08-11 12:12:13.317593784 +0200
+@@ -1140,7 +1140,7 @@ _PUBLIC_ enum MAPISTATUS nspi_ResolveNam
+ 					    struct PropertyTagArray_r ***pppMIds)
+ {
+ 	struct NspiResolveNamesW	r;
+-	struct WStringsArray_r		*paWStr;
++	struct StringsArrayW_r		*paWStr;
+ 	NTSTATUS			status;
+ 	enum MAPISTATUS			retval;
+ 	uint32_t			count;
+@@ -1160,7 +1160,7 @@ _PUBLIC_ enum MAPISTATUS nspi_ResolveNam
+ 	r.in.Reserved = 0;
+ 	r.in.pPropTags = pPropTags;
+ 
+-	paWStr = talloc(mem_ctx, struct WStringsArray_r);
++	paWStr = talloc(mem_ctx, struct StringsArrayW_r);
+ 	paWStr->Count = count;
+ 	paWStr->Strings = usernames;
+ 	r.in.paWStr = paWStr;
+diff -up openchange-0.11-TRANSPORTER/libmapi/property.c.pt-mv-unicode openchange-0.11-TRANSPORTER/libmapi/property.c
+--- openchange-0.11-TRANSPORTER/libmapi/property.c.pt-mv-unicode	2011-01-23 01:02:36.000000000 +0100
++++ openchange-0.11-TRANSPORTER/libmapi/property.c	2011-08-11 12:12:13.318593796 +0200
+@@ -298,6 +298,8 @@ _PUBLIC_ const void *get_mapi_SPropValue
+ 		return (const void *)(struct mapi_MV_LONG_STRUCT *)&lpProp->value.MVl;
+ 	case PT_MV_STRING8:
+ 		return (const void *)(struct mapi_SLPSTRArray *)&lpProp->value.MVszA;
++	case PT_MV_UNICODE:
++		return (const void *)(struct mapi_SLPSTRArrayW *)&lpProp->value.MVszW;
+ 	case PT_MV_BINARY:
+ 		return (const void *)(struct mapi_SBinaryArray *)&lpProp->value.MVbin;
+ 	default:
+@@ -343,7 +345,7 @@ _PUBLIC_ const void *get_SPropValue_data
+ 	case PT_MV_STRING8:
+ 		return (const void *)(struct StringArray_r *)&lpProps->value.MVszA;
+ 	case PT_MV_UNICODE:
+-		return (const void *)(struct WStringArray_r *)&lpProps->value.MVszW;
++		return (const void *)(struct StringArrayW_r *)&lpProps->value.MVszW;
+ 	case PT_MV_BINARY:
+ 		return (const void *)(struct BinaryArray_r *)&lpProps->value.MVbin;
+ 	case PT_MV_SYSTIME:
+@@ -435,7 +437,7 @@ _PUBLIC_ bool set_SPropValue(struct SPro
+ 		lpProps->value.MVguid = *((const struct FlatUIDArray_r *)data);
+ 		break;
+ 	case PT_MV_UNICODE:
+-		lpProps->value.MVszW = *((const struct WStringArray_r *)data);
++		lpProps->value.MVszW = *((const struct StringArrayW_r *)data);
+ 		break;
+ 	case PT_MV_SYSTIME:
+ 		lpProps->value.MVft = *((const struct DateTimeArray_r *)data);
+@@ -574,7 +576,7 @@ _PUBLIC_ uint32_t cast_mapi_SPropValue(T
+ 							       mapi_sprop->value.MVszW.cValues);
+ 		for (i = 0; i < mapi_sprop->value.MVszW.cValues; i++) {
+ 			mapi_sprop->value.MVszW.strings[i].lppszW = sprop->value.MVszW.lppszW[i];
+-			size += strlen(mapi_sprop->value.MVszW.strings[i].lppszW) + 1;
++			size += get_utf8_utf16_conv_length(mapi_sprop->value.MVszW.strings[i].lppszW);
+ 		}
+ 		return size;
+ 	}
+@@ -721,7 +723,7 @@ _PUBLIC_ uint32_t cast_SPropValue(TALLOC
+ 		sprop->value.MVszW.lppszW = talloc_array(mem_ctx, const char*, sprop->value.MVszW.cValues);
+ 		for (i = 0; i < sprop->value.MVszW.cValues; i++) {
+ 			sprop->value.MVszW.lppszW[i] = mapi_sprop->value.MVszW.strings[i].lppszW;
+-			size += 2 * (strlen(sprop->value.MVszW.lppszW[i]) + 1);
++			size += get_utf8_utf16_conv_length(sprop->value.MVszW.lppszW[i]);
+ 		}
+ 		return size;
+ 	}
+diff -up openchange-0.11-TRANSPORTER/libocpf/ocpf_api.c.pt-mv-unicode openchange-0.11-TRANSPORTER/libocpf/ocpf_api.c
+--- openchange-0.11-TRANSPORTER/libocpf/ocpf_api.c.pt-mv-unicode	2011-02-28 19:02:34.000000000 +0100
++++ openchange-0.11-TRANSPORTER/libocpf/ocpf_api.c	2011-08-11 12:12:13.324593868 +0200
+@@ -235,9 +235,9 @@ int ocpf_set_propvalue(TALLOC_CTX *mem_c
+ 		}
+ 		return OCPF_SUCCESS;
+ 	case PT_MV_UNICODE:
+-		*value = (const void *)talloc_zero(ctx, struct WStringArray_r);
+-		((struct WStringArray_r *)*value)->cValues = lpProp.MVszW.cValues;
+-		((struct WStringArray_r *)*value)->lppszW = talloc_array(ctx, const char *, lpProp.MVszW.cValues);
++		*value = (const void *)talloc_zero(ctx, struct StringArrayW_r);
++		((struct StringArrayW_r *)*value)->cValues = lpProp.MVszW.cValues;
++		((struct StringArrayW_r *)*value)->lppszW = talloc_array(ctx, const char *, lpProp.MVszW.cValues);
+ 		{
+ 			uint32_t	i;
+ 
+@@ -247,7 +247,7 @@ int ocpf_set_propvalue(TALLOC_CTX *mem_c
+ 				} else {
+ 					str = (char *)lpProp.MVszW.lppszW[i];
+ 				}
+-				((struct WStringArray_r *)*value)->lppszW[i] = talloc_strdup(ctx, str);
++				((struct StringArrayW_r *)*value)->lppszW[i] = talloc_strdup(ctx, str);
+ 				talloc_free(str);
+ 			}
+ 		}
+diff -up openchange-0.11-TRANSPORTER/libocpf/ocpf.tab.c.pt-mv-unicode openchange-0.11-TRANSPORTER/libocpf/ocpf.tab.c
+--- openchange-0.11-TRANSPORTER/libocpf/ocpf.tab.c.pt-mv-unicode	2011-07-07 11:42:50.000000000 +0200
++++ openchange-0.11-TRANSPORTER/libocpf/ocpf.tab.c	2011-08-11 12:15:43.021072359 +0200
+@@ -185,7 +185,7 @@ typedef union YYSTYPE
+ 	char				*var;
+ 	struct LongArray_r		MVl;
+ 	struct StringArray_r		MVszA;
+-	struct WStringArray_r		MVszW;
++	struct StringArrayW_r		MVszW;
+ 	struct BinaryArray_r		MVbin;
+ 
+ 
+diff -up openchange-0.11-TRANSPORTER/libocpf/ocpf.tab.h.pt-mv-unicode openchange-0.11-TRANSPORTER/libocpf/ocpf.tab.h
+--- openchange-0.11-TRANSPORTER/libocpf/ocpf.tab.h.pt-mv-unicode	2011-07-07 11:42:50.000000000 +0200
++++ openchange-0.11-TRANSPORTER/libocpf/ocpf.tab.h	2011-08-11 12:15:35.900988313 +0200
+@@ -108,7 +108,7 @@ typedef union YYSTYPE
+ 	char				*var;
+ 	struct LongArray_r		MVl;
+ 	struct StringArray_r		MVszA;
+-	struct WStringArray_r		MVszW;
++	struct StringArrayW_r		MVszW;
+ 	struct BinaryArray_r		MVbin;
+ 
+ 
+diff -up openchange-0.11-TRANSPORTER/libocpf/ocpf_write.c.pt-mv-unicode openchange-0.11-TRANSPORTER/libocpf/ocpf_write.c
+--- openchange-0.11-TRANSPORTER/libocpf/ocpf_write.c.pt-mv-unicode	2011-03-01 18:10:55.000000000 +0100
++++ openchange-0.11-TRANSPORTER/libocpf/ocpf_write.c	2011-08-11 12:12:13.321593832 +0200
+@@ -323,7 +323,7 @@ static char *ocpf_write_mv_string8(struc
+ }
+ 
+ 
+-static char *ocpf_write_mv_unicode(struct ocpf_context *ctx, const struct WStringArray_r *value)
++static char *ocpf_write_mv_unicode(struct ocpf_context *ctx, const struct StringArrayW_r *value)
+ {
+ 	char		*str = NULL;
+ 	char		*tmp = NULL;
+@@ -398,7 +398,7 @@ static char *ocpf_write_property(struct 
+ 		*found = true;
+ 		break;
+ 	case PT_MV_UNICODE:
+-		line = ocpf_write_mv_unicode(ctx, (const struct WStringArray_r *)value);
++		line = ocpf_write_mv_unicode(ctx, (const struct StringArrayW_r *)value);
+ 		*found = true;
+ 		break;
+ 	case PT_MV_BINARY:
+diff -up openchange-0.11-TRANSPORTER/libocpf/ocpf.y.pt-mv-unicode openchange-0.11-TRANSPORTER/libocpf/ocpf.y
+--- openchange-0.11-TRANSPORTER/libocpf/ocpf.y.pt-mv-unicode	2011-02-28 19:02:34.000000000 +0100
++++ openchange-0.11-TRANSPORTER/libocpf/ocpf.y	2011-08-11 12:12:13.323593856 +0200
+@@ -47,7 +47,7 @@ void yyerror(struct ocpf_context *, void
+ 	char				*var;
+ 	struct LongArray_r		MVl;
+ 	struct StringArray_r		MVszA;
+-	struct WStringArray_r		MVszW;
++	struct StringArrayW_r		MVszW;
+ 	struct BinaryArray_r		MVbin;
+ }
+ 
+diff -up openchange-0.11-TRANSPORTER/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c.pt-mv-unicode openchange-0.11-TRANSPORTER/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c
+--- openchange-0.11-TRANSPORTER/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c.pt-mv-unicode	2011-03-17 03:02:22.000000000 +0100
++++ openchange-0.11-TRANSPORTER/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c	2011-08-11 12:12:13.326593892 +0200
+@@ -884,7 +884,7 @@ static enum MAPISTATUS dcesrv_NspiResolv
+ 	const char			*purportedSearch;
+ 	struct PropertyTagArray_r	*pMIds = NULL;
+ 	struct SRowSet			*pRows = NULL;
+-	struct WStringsArray_r		*paWStr;
++	struct StringsArrayW_r		*paWStr;
+ 	uint32_t			i;
+ 	int				ret;
+ 	bool				found = false;
+diff -up openchange-0.11-TRANSPORTER/utils/mapitest/modules/module_mapidump.c.pt-mv-unicode openchange-0.11-TRANSPORTER/utils/mapitest/modules/module_mapidump.c
+--- openchange-0.11-TRANSPORTER/utils/mapitest/modules/module_mapidump.c.pt-mv-unicode	2011-02-13 10:31:45.000000000 +0100
++++ openchange-0.11-TRANSPORTER/utils/mapitest/modules/module_mapidump.c	2011-08-11 12:12:13.333593974 +0200
+@@ -118,7 +118,7 @@ _PUBLIC_ bool mapitest_mapidump_spropval
+ 	// struct LongArray_r MVl;/* [case(0x1003)] */
+ 	// struct BinaryArray_r MVbin;/* [case(0x1102)] */
+ 	// struct FlatUIDArray_r MVguid;/* [case(0x1048)] */
+-	// struct WStringArray_r MVszW;/* [case(0x101f)] */
++	// struct StringArrayW_r MVszW;/* [case(0x101f)] */
+ 	// struct DateTimeArray_r MVft;/* [case(0x1040)] */
+ 	// uint32_t object;/* [case(0x000d)] */
+ #endif
+diff -up openchange-0.11-TRANSPORTER/utils/mapitest/modules/module_noserver.c.pt-mv-unicode openchange-0.11-TRANSPORTER/utils/mapitest/modules/module_noserver.c
+--- openchange-0.11-TRANSPORTER/utils/mapitest/modules/module_noserver.c.pt-mv-unicode	2011-02-01 11:28:22.000000000 +0100
++++ openchange-0.11-TRANSPORTER/utils/mapitest/modules/module_noserver.c	2011-08-11 12:12:13.332593962 +0200
+@@ -913,8 +913,8 @@ static bool mapitest_no_server_props_mv_
+ {
+ 	bool res;
+ 	struct SPropValue propvalue;
+-	struct WStringArray_r unicodearray;
+-	const struct WStringArray_r *unicodearrayget;
++	struct StringArrayW_r unicodearray;
++	const struct StringArrayW_r *unicodearrayget;
+ 
+ 	// create and initialise unicodearray
+ 	unicodearray.cValues = 4;
+@@ -930,7 +930,7 @@ static bool mapitest_no_server_props_mv_
+ 		mapitest_print(mt, "* %-40s: [FAILURE]\n", "SPropValue set with PT_MV_UNICODE");
+ 		return false;
+ 	}
+-	unicodearrayget = (const struct WStringArray_r *)get_SPropValue_data(&propvalue);
++	unicodearrayget = (const struct StringArrayW_r *)get_SPropValue_data(&propvalue);
+ 	if (!unicodearrayget || (unicodearray.cValues != unicodearrayget->cValues) || (unicodearray.lppszW != unicodearrayget->lppszW)) {
+ 		/* failure */
+ 		mapitest_print(mt, "* %-40s: [FAILURE]\n", "SPropValue get/set with PT_MV_UNICODE");
diff --git a/openchange-0.11-session-as-memctx.patch b/openchange-0.11-session-as-memctx.patch
new file mode 100644
index 0000000..9cf33d3
--- /dev/null
+++ b/openchange-0.11-session-as-memctx.patch
@@ -0,0 +1,24 @@
+diff -up ./libmapi/cdo_mapi.c.mem_ctx ./libmapi/cdo_mapi.c
+--- ./libmapi/cdo_mapi.c.mem_ctx	2011-08-05 18:26:05.070128887 +0200
++++ ./libmapi/cdo_mapi.c	2011-08-05 18:26:25.964381868 +0200
+@@ -131,7 +131,7 @@ _PUBLIC_ enum MAPISTATUS MapiLogonProvid
+ 	
+ 	/* If the session doesn't exist, create a new one */
+ 	if (!*session) {
+-		el = talloc_zero((TALLOC_CTX *)mapi_ctx->session, struct mapi_session);
++		el = talloc_zero(mapi_ctx->mem_ctx, struct mapi_session);
+ 		memset(el->logon_ids, 0, 255);
+ 		el->mapi_ctx = mapi_ctx;
+ 		OPENCHANGE_RETVAL_IF(!el, MAPI_E_NOT_ENOUGH_RESOURCES, NULL);
+diff -up ./libmapi/IProfAdmin.c.mem_ctx ./libmapi/IProfAdmin.c
+--- ./libmapi/IProfAdmin.c.mem_ctx	2011-08-05 18:26:22.452339353 +0200
++++ ./libmapi/IProfAdmin.c	2011-08-05 18:26:28.813416329 +0200
+@@ -748,7 +748,7 @@ _PUBLIC_ enum MAPISTATUS LoadProfile(str
+ 	OPENCHANGE_RETVAL_IF(!mapi_ctx->session, MAPI_E_NOT_INITIALIZED, NULL);
+ 	OPENCHANGE_RETVAL_IF(!profile, MAPI_E_INVALID_PARAMETER, NULL);
+ 
+-	mem_ctx = (TALLOC_CTX *) mapi_ctx->session;
++	mem_ctx = mapi_ctx->mem_ctx;
+ 
+ 	profile->credentials = cli_credentials_init(mem_ctx);
+ 	OPENCHANGE_RETVAL_IF(!profile->credentials, MAPI_E_NOT_ENOUGH_RESOURCES, NULL);
diff --git a/openchange.spec b/openchange.spec
index 50e64fc..84d38df 100644
--- a/openchange.spec
+++ b/openchange.spec
@@ -1,8 +1,8 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%global samba4_version 4.0.0-34.alpha15GITa6a722b
+%global samba4_version 4.0.0-36.alpha16
 %global talloc_version 2.0.5
-%global nickname TRANSPORTER-F16-SNAPSHOT2
+%global nickname TRANSPORTER
 
 %global build_python_package 0
 %global build_server_package 0
@@ -12,8 +12,8 @@
 # Licensing Note: The code is GPLv3+ and the IDL files are public domain.
 
 Name: openchange
-Version: 0.10.9
-Release: 4%{?dist}
+Version: 0.11
+Release: 1%{?dist}
 Group: Applications/System
 Summary: Provides access to Microsoft Exchange servers using native protocols
 License: GPLv3+ and Public Domain
@@ -49,11 +49,11 @@ Patch0: libmapi-0.8.2-libmapi-conflict.patch
 # RH bug #552984
 Patch1: openchange-0.9-generate-xml-doc.patch
 
-# Needed to workaround a samba4 library chain bug
-Patch2: openchange-0.10.9-TF16S2-fix-fedora-build.patch
+# http://tracker.openchange.org/issues/366
+Patch2: openchange-0.11-session-as-memctx.patch
 
-# Extra linker flags for samba/libsamba-util-common.so
-Patch3: samba-util-common-workaround.patch
+# http://tracker.openchange.org/issues/367
+Patch3: openchange-0.11-pt-mv-unicode.patch
 
 %description
 OpenChange provides libraries to access Microsoft Exchange servers
@@ -112,8 +112,8 @@ This package provides the server elements for OpenChange.
 %setup -q -n %{name}-%{version}-%{nickname}
 %patch0 -p1 -b .libmapi-conflict
 %patch1 -p1 -b .generate-xml-doc
-%patch2 -p0 -b .fix-build
-%patch3 -p1 -b .samba-util-common-workaround
+%patch2 -p1 -b .session-as-memctx
+%patch3 -p1 -b .pt-mv-unicode
 
 %build
 %configure
@@ -244,6 +244,12 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Aug 11 2011 Milan Crha <mcrha at redhat.com> - 0.11-1
+- Update to OpenChange 0.11 Transporter upstream release
+- Remove unnecessary build modification patches.
+- Add patch to not use mapi_ctx->session as a TALLOC_CTX (OpenChange issue #366)
+- Add patch to read/write PidNameKeywords (OpenChange issue #367)
+
 * Wed Apr 6 2011 Matthew Barnes <mbarnes at redhat.com> - 0.10.9-4
 - OpenChange relies on a private Samba 4 library (libsamba-util-common).
   Add extra linker flags to libmapi.pc to compensate.
diff --git a/sources b/sources
index c0f1017..4d7915f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-98bd22750d5a2abbb1b07e60978df29f  openchange-0.10.9-TRANSPORTER-F16-SNAPSHOT2.tar.gz
+7e5d2de7399f429048390a04aa8c5e79  openchange-0.11-TRANSPORTER.tar.gz


More information about the scm-commits mailing list