From 2b389eed63bb7edd9a1782e89513ef75228c0c30 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 14 Jul 2020 01:43:16 +0000 Subject: [PATCH] import openchange-2.3-26.el8 --- SOURCES/openchange-2.3-samba-4.12.patch | 51 +++++++++++++++++++++++++ SPECS/openchange.spec | 25 ++++++++---- 2 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 SOURCES/openchange-2.3-samba-4.12.patch diff --git a/SOURCES/openchange-2.3-samba-4.12.patch b/SOURCES/openchange-2.3-samba-4.12.patch new file mode 100644 index 0000000..cbd37d7 --- /dev/null +++ b/SOURCES/openchange-2.3-samba-4.12.patch @@ -0,0 +1,51 @@ +diff -up openchange-openchange-2.3-VULCAN/ndr_mapi.c.samba-4.12 openchange-openchange-2.3-VULCAN/ndr_mapi.c +--- openchange-openchange-2.3-VULCAN/ndr_mapi.c.samba-4.12 2020-01-27 11:04:07.136870938 +0100 ++++ openchange-openchange-2.3-VULCAN/ndr_mapi.c 2020-01-27 11:12:29.978863985 +0100 +@@ -2151,7 +2151,11 @@ enum ndr_err_code ndr_push_RestrictionVa + uint32_t _flags_save_STRUCT = ndr->flags; + ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN); + if (ndr_flags & NDR_SCALARS) { +- int level = ndr_push_get_switch_value(ndr, r); ++ uint32_t level = 0; ++ ++ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_steal_switch_value(ndr, r, &level))) ++ level = 0; ++ + switch (level) { + case 0x0: { + break; } +@@ -2165,7 +2169,9 @@ enum ndr_err_code ndr_push_RestrictionVa + } + } + if (ndr_flags & NDR_BUFFERS) { +- int level = ndr_push_get_switch_value(ndr, r); ++ uint32_t level; ++ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_push_steal_switch_value(ndr, r, &level))) ++ level = 0; + switch (level) { + case 0x0: + break; +@@ -2187,9 +2193,10 @@ enum ndr_err_code ndr_push_RestrictionVa + + enum ndr_err_code ndr_pull_RestrictionVariable(struct ndr_pull *ndr, int ndr_flags, union RestrictionVariable *r) + { +- int level; ++ uint32_t level; + TALLOC_CTX *_mem_save_res_0; +- level = ndr_pull_get_switch_value(ndr, r); ++ if (!NDR_ERR_CODE_IS_SUCCESS(ndr_pull_steal_switch_value(ndr, r, &level))) ++ level = 0; + { + uint32_t _flags_save_STRUCT = ndr->flags; + ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN); +@@ -2237,8 +2244,8 @@ enum ndr_err_code ndr_pull_RestrictionV + + _PUBLIC_ void ndr_print_RestrictionVariable(struct ndr_print *ndr, const char *name, const union RestrictionVariable *r) + { +- int level; +- level = ndr_print_get_switch_value(ndr, r); ++ uint32_t level; ++ level = ndr_print_steal_switch_value(ndr, r); + ndr_print_union(ndr, name, level, "RestrictionVariable"); + switch (level) { + case 0x0: diff --git a/SPECS/openchange.spec b/SPECS/openchange.spec index 2e48a02..0d46c76 100644 --- a/SPECS/openchange.spec +++ b/SPECS/openchange.spec @@ -23,7 +23,7 @@ Name: openchange Version: 2.3 -Release: 25%{?dist} +Release: 26%{?dist} Group: Applications/System Summary: Provides access to Microsoft Exchange servers using native protocols License: GPLv3+ and Public Domain @@ -93,6 +93,7 @@ Patch14: openchange-2.3-covscan.patch Patch15: openchange-2.3-samba-4.10-macros.patch Patch16: openchange-2.3-samba-4.11.patch Patch17: openchange-2.3-samba-4.11.2.patch +Patch18: openchange-2.3-samba-4.12.patch %description OpenChange provides libraries to access Microsoft Exchange servers @@ -172,6 +173,7 @@ This package provides the server elements for OpenChange. %patch15 -p1 -b .samba-4.10-macros %patch16 -p1 -b .samba-4.11 %patch17 -p1 -b .samba-4.11.2 +%patch18 -p1 -b .samba-4.12 %build ./autogen.sh @@ -268,14 +270,20 @@ cp -r apidocs/html/libmapi++/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchan %files %doc COPYING IDL_LICENSE.txt VERSION -%{_libdir}/libmapi-openchange.so.* -%{_libdir}/libmapiadmin.so.* -%{_libdir}/libmapipp.so.* +%{_libdir}/libmapi-openchange.so.0 +%{_libdir}/libmapi-openchange.so.2.3 +%{_libdir}/libmapiadmin.so.0 +%{_libdir}/libmapiadmin.so.2.3 +%{_libdir}/libmapipp.so.0 +%{_libdir}/libmapipp.so.2.3 %if %{build_server_package} -%{_libdir}/libmapiproxy.so.* -%{_libdir}/libmapistore.so.* +%{_libdir}/libmapiproxy.so.0 +%{_libdir}/libmapiproxy.so.2.3 +%{_libdir}/libmapistore.so.0 +%{_libdir}/libmapistore.so.2.3 %endif -%{_libdir}/libocpf.so.* +%{_libdir}/libocpf.so.0 +%{_libdir}/libocpf.so.2.3 %files devel %{_includedir}/* @@ -314,6 +322,9 @@ cp -r apidocs/html/libmapi++/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchan %endif %changelog +* Mon Jun 08 2020 Milan Crha - 2.3-26 +- Add patch to build against samba 4.12 + * Mon Apr 20 2020 Milan Crha - 2.3-25 - Add patch to build against samba 4.11.2