Compare commits

...

No commits in common. "c8" and "c9s" have entirely different histories.
c8 ... c9s

29 changed files with 589 additions and 76 deletions

10
.gitignore vendored
View File

@ -1 +1,9 @@
SOURCES/openchange-2.3-VULCAN.tar.gz
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
/openchange-1.0-BORG.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

View File

@ -1 +1 @@
901e6d8fa4f9f4a1d41c3ad97d967da316d0ad17 SOURCES/openchange-2.3-VULCAN.tar.gz
901e6d8fa4f9f4a1d41c3ad97d967da316d0ad17 openchange-2.3-VULCAN.tar.gz

View File

@ -1,34 +0,0 @@
diff -up openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h.samba-4.12 openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h
--- openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h.samba-4.12 2020-01-27 11:33:02.941846935 +0100
+++ openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h 2020-01-27 11:33:19.170846710 +0100
@@ -103,7 +103,9 @@ __BEGIN_DECLS
struct ldb_dn *samdb_search_dn(struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, const char *, ...) _PRINTF_ATTRIBUTE(4,5);
struct dom_sid *dom_sid_add_rid(TALLOC_CTX *, const struct dom_sid *, uint32_t);
bool encode_pw_buffer(uint8_t buffer[516], const char *, int);
+#if 0 /* removed in samba 4.12 */
void arcfour_crypt_blob(uint8_t *, int, const DATA_BLOB *);
+#endif
/* The following public definitions come from libmapiadmin/mapiadmin.c */
struct mapiadmin_ctx *mapiadmin_init(struct mapi_session *);
diff -up openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c.samba-4.12 openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c
--- openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c.samba-4.12 2020-01-27 11:25:31.398853179 +0100
+++ openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c 2020-01-27 11:31:27.490848255 +0100
@@ -592,6 +592,9 @@ _PUBLIC_ enum MAPISTATUS mapiadmin_user_
*/
_PUBLIC_ enum MAPISTATUS mapiadmin_user_add(struct mapiadmin_ctx *mapiadmin_ctx)
{
+ OC_DEBUG(3, "mapiadmin_user_add(): is disabled");
+ return MAPI_E_UNABLE_TO_COMPLETE;
+#if 0 /* disable it, use samba function directly, if needed (no 'arcfour_crypt_blob' in samba 4.12) */
TALLOC_CTX *mem_ctx;
NTSTATUS status;
enum MAPISTATUS retval;
@@ -732,6 +735,7 @@ again:
talloc_free(mem_ctx);
return MAPI_E_SUCCESS;
+#endif
}
/**

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -0,0 +1,12 @@
diff -up openchange-openchange-2.3-VULCAN/configure.ac.disable-server-reqs openchange-openchange-2.3-VULCAN/configure.ac
--- openchange-openchange-2.3-VULCAN/configure.ac.disable-server-reqs 2021-06-17 21:40:49.938611315 +0200
+++ openchange-openchange-2.3-VULCAN/configure.ac 2021-06-17 21:41:18.616614841 +0200
@@ -436,7 +436,7 @@ dnl AC_SUBST(MYSQL_LIBS)
dnl ----------------------------------------------------------------------------
dnl Check for memcached
dnl ----------------------------------------------------------------------------
-PKG_CHECK_MODULES([MEMCACHED], [libmemcached >= 1.0.18], [], [AC_MSG_ERROR(memcached >= 1.0.18 required to build mapistore library)])
+dnl PKG_CHECK_MODULES([MEMCACHED], [libmemcached >= 1.0.18], [], [AC_MSG_ERROR(memcached >= 1.0.18 required to build mapistore library)])
dnl ----------------------------------------------------------------------------
dnl Check for Flex

View File

@ -1,3 +1,37 @@
diff -up openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h.samba-4.12 openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h
--- openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h.samba-4.12 2020-01-27 11:33:02.941846935 +0100
+++ openchange-openchange-2.3-VULCAN/libmapiadmin/libmapiadmin.h 2020-01-27 11:33:19.170846710 +0100
@@ -103,7 +103,9 @@ __BEGIN_DECLS
struct ldb_dn *samdb_search_dn(struct ldb_context *, TALLOC_CTX *, struct ldb_dn *, const char *, ...) _PRINTF_ATTRIBUTE(4,5);
struct dom_sid *dom_sid_add_rid(TALLOC_CTX *, const struct dom_sid *, uint32_t);
bool encode_pw_buffer(uint8_t buffer[516], const char *, int);
+#if 0 /* removed in samba 4.12 */
void arcfour_crypt_blob(uint8_t *, int, const DATA_BLOB *);
+#endif
/* The following public definitions come from libmapiadmin/mapiadmin.c */
struct mapiadmin_ctx *mapiadmin_init(struct mapi_session *);
diff -up openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c.samba-4.12 openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c
--- openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c.samba-4.12 2020-01-27 11:25:31.398853179 +0100
+++ openchange-openchange-2.3-VULCAN/libmapiadmin/mapiadmin_user.c 2020-01-27 11:31:27.490848255 +0100
@@ -592,6 +592,9 @@ _PUBLIC_ enum MAPISTATUS mapiadmin_user_
*/
_PUBLIC_ enum MAPISTATUS mapiadmin_user_add(struct mapiadmin_ctx *mapiadmin_ctx)
{
+ OC_DEBUG(3, "mapiadmin_user_add(): is disabled");
+ return MAPI_E_UNABLE_TO_COMPLETE;
+#if 0 /* disable it, use samba function directly, if needed (no 'arcfour_crypt_blob' in samba 4.12) */
TALLOC_CTX *mem_ctx;
NTSTATUS status;
enum MAPISTATUS retval;
@@ -732,6 +735,7 @@ again:
talloc_free(mem_ctx);
return MAPI_E_SUCCESS;
+#endif
}
/**
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

View File

@ -0,0 +1,445 @@
--- openchange-openchange-2.3-VULCAN/ndr_mapi.c.samba-4.20 2024-01-30 19:27:32.262456435 +0100
+++ openchange-openchange-2.3-VULCAN/ndr_mapi.c 2024-01-30 20:13:00.051399237 +0100
@@ -207,7 +207,7 @@
}
-_PUBLIC_ enum ndr_err_code ndr_pull_mapi2k7_request(struct ndr_pull *ndr, int ndr_flags, struct mapi2k7_request *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_mapi2k7_request(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct mapi2k7_request *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_align(ndr, 4));
@@ -258,7 +258,7 @@
}
-_PUBLIC_ enum ndr_err_code ndr_pull_mapi2k7_response(struct ndr_pull *ndr, int ndr_flags, struct mapi2k7_response *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_mapi2k7_response(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct mapi2k7_response *r)
{
if (ndr_flags & NDR_SCALARS) {
NDR_CHECK(ndr_pull_RPC_HEADER_EXT(ndr, NDR_SCALARS, &r->header));
@@ -323,7 +323,7 @@
}
-_PUBLIC_ enum ndr_err_code ndr_pull_AUX_HEADER(struct ndr_pull *ndr, int ndr_flags, struct AUX_HEADER *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_AUX_HEADER(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct AUX_HEADER *r)
{
struct ndr_pull *_ndr_buffer;
uint32_t _flags_save_STRUCT = ndr->flags;
@@ -358,7 +358,7 @@
}
-_PUBLIC_ enum ndr_err_code ndr_push_AUX_HEADER(struct ndr_push *ndr, int ndr_flags, const struct AUX_HEADER *r)
+_PUBLIC_ enum ndr_err_code ndr_push_AUX_HEADER(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct AUX_HEADER *r)
{
uint32_t _flags_save_STRUCT = ndr->flags;
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
@@ -404,7 +404,7 @@
}
-_PUBLIC_ enum ndr_err_code ndr_pull_mapi2k7_AuxInfo(struct ndr_pull *ndr, int ndr_flags, struct mapi2k7_AuxInfo *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_mapi2k7_AuxInfo(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct mapi2k7_AuxInfo *r)
{
if (ndr_flags & NDR_SCALARS) {
@@ -477,7 +477,7 @@
}
-_PUBLIC_ enum ndr_err_code ndr_push_mapi2k7_AuxInfo(struct ndr_push *ndr, int ndr_flags, const struct mapi2k7_AuxInfo *r)
+_PUBLIC_ enum ndr_err_code ndr_push_mapi2k7_AuxInfo(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct mapi2k7_AuxInfo *r)
{
uint32_t i;
@@ -594,7 +594,7 @@
(uint16_t) and next subtract when pushing the content blob
*/
-enum ndr_err_code ndr_push_mapi_request(struct ndr_push *ndr, int ndr_flags, const struct mapi_request *r)
+enum ndr_err_code ndr_push_mapi_request(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct mapi_request *r)
{
uint32_t cntr_mapi_req_0;
uint32_t count;
@@ -614,7 +614,7 @@
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_push_mapi_response(struct ndr_push *ndr, int ndr_flags, const struct mapi_response *r)
+enum ndr_err_code ndr_push_mapi_response(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct mapi_response *r)
{
uint32_t cntr_mapi_repl_0;
uint32_t count;
@@ -640,7 +640,7 @@
pull mapi_request / mapi_response from the wire
*/
-enum ndr_err_code ndr_pull_mapi_request(struct ndr_pull *ndr, int ndr_flags, struct mapi_request *r)
+enum ndr_err_code ndr_pull_mapi_request(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct mapi_request *r)
{
uint32_t length,count;
uint32_t cntr_mapi_req_0;
@@ -687,7 +687,7 @@
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_pull_mapi_response(struct ndr_pull *ndr, int ndr_flags, struct mapi_response *r)
+enum ndr_err_code ndr_pull_mapi_response(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct mapi_response *r)
{
uint32_t length,count;
uint32_t cntr_mapi_repl_0;
@@ -736,7 +736,7 @@
We stop processing the IDL if MAPISTATUS is different from MAPI_E_SUCCESS
*/
-_PUBLIC_ enum ndr_err_code ndr_push_EcDoRpc_MAPI_REPL(struct ndr_push *ndr, int ndr_flags, const struct EcDoRpc_MAPI_REPL *r)
+_PUBLIC_ enum ndr_err_code ndr_push_EcDoRpc_MAPI_REPL(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct EcDoRpc_MAPI_REPL *r)
{
if (r->opnum != op_MAPI_Release)
{
@@ -790,7 +790,7 @@
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_pull_EcDoRpc_MAPI_REPL(struct ndr_pull *ndr, int ndr_flags, struct EcDoRpc_MAPI_REPL *r)
+enum ndr_err_code ndr_pull_EcDoRpc_MAPI_REPL(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct EcDoRpc_MAPI_REPL *r)
{
{
uint32_t _flags_save_STRUCT = ndr->flags;
@@ -913,7 +913,7 @@
}
-_PUBLIC_ enum ndr_err_code ndr_pull_EcDoRpc(struct ndr_pull *ndr, int flags, struct EcDoRpc *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_EcDoRpc(struct ndr_pull *ndr, ndr_flags_type flags, struct EcDoRpc *r)
{
TALLOC_CTX *_mem_save_handle_0;
TALLOC_CTX *_mem_save_mapi_request_0;
@@ -1006,7 +1006,7 @@
}
-_PUBLIC_ enum ndr_err_code ndr_push_EcDoRpc(struct ndr_push *ndr, int flags, const struct EcDoRpc *r)
+_PUBLIC_ enum ndr_err_code ndr_push_EcDoRpc(struct ndr_push *ndr, ndr_flags_type flags, const struct EcDoRpc *r)
{
if (flags & NDR_IN) {
if (r->in.handle == NULL) {
@@ -1068,7 +1068,7 @@
}
-_PUBLIC_ enum ndr_err_code ndr_push_EcDoConnectEx(struct ndr_push *ndr, int flags, const struct EcDoConnectEx *r)
+_PUBLIC_ enum ndr_err_code ndr_push_EcDoConnectEx(struct ndr_push *ndr, ndr_flags_type flags, const struct EcDoConnectEx *r)
{
uint32_t cntr_rgwClientVersion_0;
uint32_t cntr_rgwServerVersion_0;
@@ -1213,7 +1213,7 @@
return NDR_ERR_SUCCESS;
}
-_PUBLIC_ enum ndr_err_code ndr_pull_EcDoConnectEx(struct ndr_pull *ndr, int flags, struct EcDoConnectEx *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_EcDoConnectEx(struct ndr_pull *ndr, ndr_flags_type flags, struct EcDoConnectEx *r)
{
uint32_t _ptr_szDNPrefix;
uint32_t _ptr_szDisplayName;
@@ -1453,7 +1453,7 @@
return NDR_ERR_SUCCESS;
}
-_PUBLIC_ void ndr_print_EcDoConnectEx(struct ndr_print *ndr, const char *name, int flags, const struct EcDoConnectEx *r)
+_PUBLIC_ void ndr_print_EcDoConnectEx(struct ndr_print *ndr, const char *name, ndr_flags_type flags, const struct EcDoConnectEx *r)
{
uint32_t cntr_rgwClientVersion_0;
uint32_t cntr_rgwServerVersion_0;
@@ -1588,7 +1588,7 @@
ndr->depth--;
}
-_PUBLIC_ void ndr_print_EcDoRpcExt(struct ndr_print *ndr, const char *name, int flags, const struct EcDoRpcExt *r)
+_PUBLIC_ void ndr_print_EcDoRpcExt(struct ndr_print *ndr, const char *name, ndr_flags_type flags, const struct EcDoRpcExt *r)
{
DATA_BLOB rgbIn;
DATA_BLOB rgbOut;
@@ -1706,7 +1706,7 @@
talloc_free(mem_ctx);
}
-_PUBLIC_ void ndr_print_EcDoRpcExt2(struct ndr_print *ndr, const char *name, int flags, const struct EcDoRpcExt2 *r)
+_PUBLIC_ void ndr_print_EcDoRpcExt2(struct ndr_print *ndr, const char *name, ndr_flags_type flags, const struct EcDoRpcExt2 *r)
{
uint32_t cntr_rgbAuxOut_0;
DATA_BLOB rgbIn;
@@ -1853,7 +1853,7 @@
If we have no results, do not push/pull the DATA_BLOB
*/
-enum ndr_err_code ndr_push_QueryRows_repl(struct ndr_push *ndr, int ndr_flags, const struct QueryRows_repl *r)
+enum ndr_err_code ndr_push_QueryRows_repl(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct QueryRows_repl *r)
{
{
uint32_t _flags_save_STRUCT = ndr->flags;
@@ -1877,7 +1877,7 @@
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_pull_QueryRows_repl(struct ndr_pull *ndr, int ndr_flags, struct QueryRows_repl *r)
+enum ndr_err_code ndr_pull_QueryRows_repl(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct QueryRows_repl *r)
{
{
uint32_t _flags_save_STRUCT = ndr->flags;
@@ -1907,7 +1907,7 @@
}
-enum ndr_err_code ndr_push_Logon_req(struct ndr_push *ndr, int ndr_flags, const struct Logon_req *r)
+enum ndr_err_code ndr_push_Logon_req(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct Logon_req *r)
{
{
uint32_t _flags_save_STRUCT = ndr->flags;
@@ -1934,7 +1934,7 @@
}
/* MoveFolder */
-enum ndr_err_code ndr_push_MoveFolder_repl(struct ndr_push *ndr, int ndr_flags, const struct MoveFolder_repl *r)
+enum ndr_err_code ndr_push_MoveFolder_repl(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct MoveFolder_repl *r)
{
{
uint32_t _flags_save_STRUCT = ndr->flags;
@@ -1953,7 +1953,7 @@
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_pull_MoveFolder_repl(struct ndr_pull *ndr, int ndr_flags, struct MoveFolder_repl *r)
+enum ndr_err_code ndr_pull_MoveFolder_repl(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct MoveFolder_repl *r)
{
{
uint32_t _flags_save_STRUCT = ndr->flags;
@@ -1991,7 +1991,7 @@
/* /MoveFolder */
/* CopyFolder */
-enum ndr_err_code ndr_push_CopyFolder_repl(struct ndr_push *ndr, int ndr_flags, const struct CopyFolder_repl *r)
+enum ndr_err_code ndr_push_CopyFolder_repl(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct CopyFolder_repl *r)
{
{
uint32_t _flags_save_STRUCT = ndr->flags;
@@ -2010,7 +2010,7 @@
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_pull_CopyFolder_repl(struct ndr_pull *ndr, int ndr_flags, struct CopyFolder_repl *r)
+enum ndr_err_code ndr_pull_CopyFolder_repl(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct CopyFolder_repl *r)
{
{
uint32_t _flags_save_STRUCT = ndr->flags;
@@ -2099,12 +2099,12 @@
* Fake wrapper over mapi_SRestriction. Workaround the no-pointer deep
* recursion problem in pidl
*/
-enum ndr_err_code ndr_push_mapi_SRestriction_wrap(struct ndr_push *ndr, int ndr_flags, const struct mapi_SRestriction_wrap *r)
+enum ndr_err_code ndr_push_mapi_SRestriction_wrap(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct mapi_SRestriction_wrap *r)
{
return ndr_push_mapi_SRestriction(ndr, ndr_flags, (struct mapi_SRestriction *)r);
}
-enum ndr_err_code ndr_pull_mapi_SRestriction_wrap(struct ndr_pull *ndr, int ndr_flags, struct mapi_SRestriction_wrap *r)
+enum ndr_err_code ndr_pull_mapi_SRestriction_wrap(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct mapi_SRestriction_wrap *r)
{
return ndr_pull_mapi_SRestriction(ndr, ndr_flags, (struct mapi_SRestriction *)r);
}
@@ -2118,13 +2118,13 @@
* Fake wrapper over mapi_SPropValue. Workaround the no-pointer deep
* recursion problem in pidl
*/
-enum ndr_err_code ndr_push_mapi_SPropValue_wrap(struct ndr_push *ndr, int ndr_flags, const struct mapi_SPropValue_wrap *r)
+enum ndr_err_code ndr_push_mapi_SPropValue_wrap(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct mapi_SPropValue_wrap *r)
{
NDR_CHECK(ndr_push_align(ndr, 8));
return ndr_push_mapi_SPropValue(ndr, NDR_SCALARS, (const struct mapi_SPropValue *)r);
}
-enum ndr_err_code ndr_pull_mapi_SPropValue_wrap(struct ndr_pull *ndr, int ndr_flags, struct mapi_SPropValue_wrap *r)
+enum ndr_err_code ndr_pull_mapi_SPropValue_wrap(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct mapi_SPropValue_wrap *r)
{
return ndr_pull_mapi_SPropValue(ndr, NDR_SCALARS, (struct mapi_SPropValue *)r);
}
@@ -2139,13 +2139,13 @@
* Fake wrapper over mapi_SPropValue_array. Workaround the no-pointer deep
* recursion problem in pidl
*/
-enum ndr_err_code ndr_push_mapi_SPropValue_array_wrap(struct ndr_push *ndr, int ndr_flags, const struct mapi_SPropValue_array_wrap *r)
+enum ndr_err_code ndr_push_mapi_SPropValue_array_wrap(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct mapi_SPropValue_array_wrap *r)
{
NDR_CHECK(ndr_push_align(ndr, 8));
return ndr_push_mapi_SPropValue_array(ndr, NDR_SCALARS, (const struct mapi_SPropValue_array *)r);
}
-enum ndr_err_code ndr_pull_mapi_SPropValue_array_wrap(struct ndr_pull *ndr, int ndr_flags, struct mapi_SPropValue_array_wrap *r)
+enum ndr_err_code ndr_pull_mapi_SPropValue_array_wrap(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct mapi_SPropValue_array_wrap *r)
{
return ndr_pull_mapi_SPropValue_array(ndr, NDR_SCALARS, (struct mapi_SPropValue_array *)r);
}
@@ -2155,7 +2155,7 @@
ndr_print_mapi_SPropValue_array(ndr, name, (const struct mapi_SPropValue_array *)r);
}
-enum ndr_err_code ndr_push_RestrictionVariable(struct ndr_push *ndr, int ndr_flags, const union RestrictionVariable *r)
+enum ndr_err_code ndr_push_RestrictionVariable(struct ndr_push *ndr, ndr_flags_type ndr_flags, const union RestrictionVariable *r)
{
{
uint32_t _flags_save_STRUCT = ndr->flags;
@@ -2201,7 +2201,7 @@
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_pull_RestrictionVariable(struct ndr_pull *ndr, int ndr_flags, union RestrictionVariable *r)
+enum ndr_err_code ndr_pull_RestrictionVariable(struct ndr_pull *ndr, ndr_flags_type ndr_flags, union RestrictionVariable *r)
{
uint32_t level;
TALLOC_CTX *_mem_save_res_0;
@@ -2273,28 +2273,28 @@
}
}
-enum ndr_err_code ndr_push_Release_req(struct ndr_push *ndr, int ndr_flags, const struct Release_req *r)
+enum ndr_err_code ndr_push_Release_req(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct Release_req *r)
{
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_pull_Release_req(struct ndr_pull *ndr, int ndr_flags, struct Release_req *r)
+enum ndr_err_code ndr_pull_Release_req(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct Release_req *r)
{
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_push_Release_repl(struct ndr_push *ndr, int ndr_flags, const struct Release_repl *r)
+enum ndr_err_code ndr_push_Release_repl(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct Release_repl *r)
{
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_pull_Release_repl(struct ndr_pull *ndr, int ndr_flags, struct Release_repl *r)
+enum ndr_err_code ndr_pull_Release_repl(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct Release_repl *r)
{
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_push_GetSearchCriteria_repl(struct ndr_push *ndr, int ndr_flags, const struct GetSearchCriteria_repl *r)
+enum ndr_err_code ndr_push_GetSearchCriteria_repl(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct GetSearchCriteria_repl *r)
{
uint32_t cntr_FolderIds_0;
{
@@ -2325,7 +2325,7 @@
}
-enum ndr_err_code ndr_pull_GetSearchCriteria_repl(struct ndr_pull *ndr, int ndr_flags, struct GetSearchCriteria_repl *r)
+enum ndr_err_code ndr_pull_GetSearchCriteria_repl(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct GetSearchCriteria_repl *r)
{
uint32_t cntr_FolderIds_0;
TALLOC_CTX *_mem_save_FolderIds_0;
@@ -2393,42 +2393,42 @@
}
}
-enum ndr_err_code ndr_push_Backoff_req(struct ndr_push *ndr, int ndr_flags, const struct Backoff_req *r)
+enum ndr_err_code ndr_push_Backoff_req(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct Backoff_req *r)
{
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_pull_Backoff_req(struct ndr_pull *ndr, int ndr_flags, struct Backoff_req *r)
+enum ndr_err_code ndr_pull_Backoff_req(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct Backoff_req *r)
{
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_push_Backoff_repl(struct ndr_push *ndr, int ndr_flags, const struct Backoff_repl *r)
+enum ndr_err_code ndr_push_Backoff_repl(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct Backoff_repl *r)
{
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_pull_Backoff_repl(struct ndr_pull *ndr, int ndr_flags, struct Backoff_repl *r)
+enum ndr_err_code ndr_pull_Backoff_repl(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct Backoff_repl *r)
{
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_push_BufferTooSmall_req(struct ndr_push *ndr, int ndr_flags, const struct BufferTooSmall_req *r)
+enum ndr_err_code ndr_push_BufferTooSmall_req(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct BufferTooSmall_req *r)
{
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_pull_BufferTooSmall_req(struct ndr_pull *ndr, int ndr_flags, struct BufferTooSmall_req *r)
+enum ndr_err_code ndr_pull_BufferTooSmall_req(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct BufferTooSmall_req *r)
{
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_push_BufferTooSmall_repl(struct ndr_push *ndr, int ndr_flags, const struct BufferTooSmall_repl *r)
+enum ndr_err_code ndr_push_BufferTooSmall_repl(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct BufferTooSmall_repl *r)
{
return NDR_ERR_SUCCESS;
}
-enum ndr_err_code ndr_pull_BufferTooSmall_repl(struct ndr_pull *ndr, int ndr_flags, struct BufferTooSmall_repl *r)
+enum ndr_err_code ndr_pull_BufferTooSmall_repl(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct BufferTooSmall_repl *r)
{
return NDR_ERR_SUCCESS;
}
@@ -2731,7 +2731,7 @@
return NDR_ERR_SUCCESS;
}
-_PUBLIC_ enum ndr_err_code ndr_push_PersistElementArray(struct ndr_push *ndr, int ndr_flags, const struct PersistElementArray *r)
+_PUBLIC_ enum ndr_err_code ndr_push_PersistElementArray(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct PersistElementArray *r)
{
uint32_t cntr_lpPersistElement_1;
{
@@ -2749,7 +2749,7 @@
return NDR_ERR_SUCCESS;
}
-_PUBLIC_ enum ndr_err_code ndr_pull_PersistElementArray(struct ndr_pull *ndr, int ndr_flags, struct PersistElementArray *r)
+_PUBLIC_ enum ndr_err_code ndr_pull_PersistElementArray(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct PersistElementArray *r)
{
uint32_t cntr_lpPersistElement_0;
TALLOC_CTX *_mem_save_lpPersistElement_0;
--- openchange-openchange-2.3-VULCAN/libmapi/libmapi_private.h.samba-4.20 2024-01-30 19:27:32.252456452 +0100
+++ openchange-openchange-2.3-VULCAN/libmapi/libmapi_private.h 2024-01-30 20:12:40.287437830 +0100
@@ -71,8 +71,8 @@
enum ndr_err_code ndr_pull_AppointmentRecurrencePattern(struct ndr_pull *, int, struct AppointmentRecurrencePattern *);
enum ndr_err_code ndr_push_PersistDataArray(struct ndr_push *ndr, int ndr_flags, const struct PersistDataArray *r);
enum ndr_err_code ndr_pull_PersistDataArray(struct ndr_pull *ndr, int ndr_flags, struct PersistDataArray *r);
-enum ndr_err_code ndr_push_PersistElementArray(struct ndr_push *ndr, int ndr_flags, const struct PersistElementArray *r);
-enum ndr_err_code ndr_pull_PersistElementArray(struct ndr_pull *ndr, int ndr_flags, struct PersistElementArray *r);
+enum ndr_err_code ndr_push_PersistElementArray(struct ndr_push *ndr, ndr_flags_type ndr_flags, const struct PersistElementArray *r);
+enum ndr_err_code ndr_pull_PersistElementArray(struct ndr_pull *ndr, ndr_flags_type ndr_flags, struct PersistElementArray *r);
/* The following private definitions come from libmapi/nspi.c */
int nspi_disconnect_dtor(void *);
--- openchange-openchange-2.3-VULCAN/exchange.idl-samba-4.20 2024-01-30 20:21:33.597396489 +0100
+++ openchange-openchange-2.3-VULCAN/exchange.idl 2024-01-30 20:19:29.179639441 +0100
@@ -1,6 +1,7 @@
#include "idl_types.h"
cpp_quote("#include <util/debug.h>")
+cpp_quote("#include <inttypes.h>")
cpp_quote("#include <gen_ndr/ndr_misc.h>")
/*
--- openchange-openchange-2.3-VULCAN/asyncemsmdb.idl-samba-4.20 2024-01-30 20:21:46.397371492 +0100
+++ openchange-openchange-2.3-VULCAN/asyncemsmdb.idl 2024-01-30 20:20:40.449500270 +0100
@@ -1,5 +1,6 @@
#include "idl_types.h"
+cpp_quote("#include <inttypes.h>")
cpp_quote("#include <gen_ndr/ndr_misc.h>")
[

View File

@ -1,4 +1,4 @@
%global samba_version 4.2.0-2
%global samba_version 4.13
%global talloc_version 2.0.5
%global nickname VULCAN
@ -23,8 +23,7 @@
Name: openchange
Version: 2.3
Release: 31%{?dist}
Group: Applications/System
Release: 42%{?dist}
Summary: Provides access to Microsoft Exchange servers using native protocols
License: GPLv3+ and Public Domain
URL: http://www.openchange.org/
@ -33,6 +32,7 @@ Source1: doxygen_to_devhelp.xsl
### Build Dependencies ###
BuildRequires: make
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bison
@ -43,7 +43,6 @@ BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libical-devel
BuildRequires: libldb-devel
BuildRequires: libmemcached-devel
BuildRequires: libtalloc-devel >= %{talloc_version}
BuildRequires: libtdb-devel
BuildRequires: pkgconfig
@ -56,9 +55,13 @@ BuildRequires: samba-common >= %{samba_version}
BuildRequires: samba-devel >= %{samba_version}
BuildRequires: samba-libs >= %{samba_version}
BuildRequires: samba-pidl >= %{samba_version}
BuildRequires: sqlite-devel
BuildRequires: zlib-devel
%if %{build_server_package}
BuildRequires: libmemcached-devel
BuildRequires: sqlite-devel
%endif
# Certain versions of libtevent have incorrect
# internal ABI versions
Conflicts: libtevent < 0.9.13
@ -92,10 +95,13 @@ Patch13: openchange-2.3-disable-python3.patch
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
Patch19: openchange-2.3-samba-4.13.patch
Patch17: openchange-2.3-samba-4.12.patch
Patch18: openchange-2.3-samba-4.13.patch
%if !%{build_server_package}
Patch19: openchange-2.3-disable-server-reqs.patch
%endif
Patch20: openchange-2.3-samba-4.15.patch
Patch21: openchange-2.3-samba-4.20.patch
%description
OpenChange provides libraries to access Microsoft Exchange servers
@ -103,7 +109,6 @@ using native protocols.
%package devel
Summary: Developer tools for OpenChange libraries
Group: Development/Libraries
Requires: openchange = %{version}-%{release}
%if %{build_server_package}
Requires: openchange-server = %{version}-%{release}
@ -116,7 +121,6 @@ using native protocols.
%package devel-docs
Summary: Developer documentation for OpenChange libraries
Group: Development/Libraries
Requires: devhelp
Requires: openchange = %{version}-%{release}
BuildArch: noarch
@ -126,7 +130,6 @@ This package contains developer documentation for Openchange.
%package client
Summary: User tools for OpenChange libraries
Group: Applications/System
Requires: openchange = %{version}-%{release}
%description client
@ -136,7 +139,6 @@ Microsoft Exchange servers using native protocols.
%if %{build_python_package}
%package python
Summary: Python bindings for OpenChange libraries
Group: Development/Libraries
Requires: openchange = %{version}-%{release}
%description python
@ -146,7 +148,6 @@ This module contains a wrapper that allows the use of OpenChange via Python.
%if %{build_server_package}
%package server
Summary: Server-side modules for OpenChange
Group: Applications/System
Requires: openchange = %{version}-%{release}
Requires: sqlite
@ -174,10 +175,13 @@ This package provides the server elements for OpenChange.
%patch14 -p1 -b .covscan
%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
%patch19 -p1 -b .samba-4.13
%patch17 -p1 -b .samba-4.12
%patch18 -p1 -b .samba-4.13
%if !%{build_server_package}
%patch19 -p1 -b .disable-server-reqs
%endif
%patch20 -p1 -b .samba-4.15
%patch21 -p1 -b .samba-4.20
%build
./autogen.sh
@ -206,7 +210,7 @@ xsltproc -o openchange-libmapi++.devhelp --stringparam "booktitle" "C++ bindings
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%make_install
# This makes the right links, as rpmlint requires that the
# ldconfig-created links be recorded in the RPM.
@ -262,14 +266,10 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapi++
cp openchange-libmapi++.devhelp $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapi++
cp -r apidocs/html/libmapi++/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchange-libmapi++
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%ldconfig_scriptlets
%if %{build_server_package}
%post server -p /sbin/ldconfig
%postun server -p /sbin/ldconfig
%ldconfig_scriptlets server
%endif
%files
@ -326,36 +326,74 @@ cp -r apidocs/html/libmapi++/* $RPM_BUILD_ROOT%{_datadir}/devhelp/books/openchan
%endif
%changelog
* Thu Oct 27 2022 Milan Crha <mcrha@redhat.com> - 2.3-31
- Related: #2132051 - Rebuild for samba rebase to 4.17.x
* Mon Apr 29 2024 Milan Crha <mcrha@redhat.com> - 2.3-42
- Related: RHEL-33645 (Rebuild against samba 4.20)
* Wed May 04 2022 Milan Crha <mcrha@redhat.com> - 2.3-30
- Related: #2081620 - Rebuild for samba rebase to 4.16.x
* Wed May 31 2023 Milan Crha <mcrha@redhat.com> - 2.3-41
- Related: #2190415 (Rebuild against samba 4.18)
* Thu Nov 25 2021 Milan Crha <mcrha@redhat.com> - 2.3-29
- Related: #2013596 - Rebuild for samba rebase to 4.15.x
* Thu Oct 27 2022 Milan Crha <mcrha@redhat.com> - 2.3-40
- Related: #2131993 (Rebuild against samba 4.17)
* Wed May 12 2021 Milan Crha <mcrha@redhat.com> - 2.3-28
- Related: #1944657 - Rebuild for samba rebase to 4.14.4
* Wed May 04 2022 Milan Crha <mcrha@redhat.com> - 2.3-39
- Related: #2081618 (Rebuild against samba 4.16)
* Fri Nov 13 2020 Milan Crha <mcrha@redhat.com> - 2.3-27
- Rebuild for newer samba
* Wed Dec 01 2021 Milan Crha <mcrha@redhat.com> - 2.3-38
- Related: #2013578 (Add patch to build against samba 4.15)
- Avoid build time dependencies related to server, when it's not built
* Mon Jun 08 2020 Milan Crha <mcrha@redhat.com> - 2.3-26
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.3-37
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.3-36
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Nov 30 2020 Milan Crha <mcrha@redhat.com> - 2.3-34
- Add patch to build against samba 4.13
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 2.3-32
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 27 2020 Milan Crha <mcrha@redhat.com> - 2.3-30
- Add patch to build against samba 4.12
* Mon Apr 20 2020 Milan Crha <mcrha@redhat.com> - 2.3-25
- Add patch to build against samba 4.11.2
* Fri Aug 30 2019 Milan Crha <mcrha@redhat.com> - 2.3-29
- Rebuild for newer libldb
- Add patch to build against samba 4.11
* Mon Dec 02 2019 Milan Crha <mcrha@redhat.com> - 2.3-24
- Rebuild for newer samba and libldb
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jul 19 2018 Milan Crha <mcrha@redhat.com> - 2.3-23
* Thu Feb 14 2019 Milan Crha <mcrha@redhat.com> - 2.3-27
- Add patch to build against samba 4.10 semi-public macro changes
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-26
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 19 2018 Milan Crha <mcrha@redhat.com> - 2.3-25
- Address some of the Coverity Scan and clang issues
* Tue Apr 17 2018 Milan Crha <mcrha@redhat.com> - 2.3-22
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.3-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Apr 17 2018 Milan Crha <mcrha@redhat.com> - 2.3-23
- Switch to python3 (partly) and disable python3 build dependency by default
* Mon Mar 19 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.3-22
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Wed Mar 07 2018 Milan Crha <mcrha@redhat.com> - 2.3-21
- Do not copy content of libmapi++/ into includedir (RH bug #1548719)

3
rpminspect.yaml Normal file
View File

@ -0,0 +1,3 @@
---
inspections:
badfuncs: off

1
sources Normal file
View File

@ -0,0 +1 @@
96c13c78c2bcbd7040f7848746284b9f openchange-2.3-VULCAN.tar.gz