rpms/openchange/devel libmapi-0.8-ROMULUS-ndr-interface-table.patch, NONE, 1.1 openchange.spec, 1.2, 1.3 libmapi-0.8-ROMULUS-include-signal-h.patch, 1.1, NONE
Matthew Barnes
mbarnes at fedoraproject.org
Mon Mar 9 03:19:46 UTC 2009
Author: mbarnes
Update of /cvs/pkgs/rpms/openchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15866
Modified Files:
openchange.spec
Added Files:
libmapi-0.8-ROMULUS-ndr-interface-table.patch
Removed Files:
libmapi-0.8-ROMULUS-include-signal-h.patch
Log Message:
* Sun Mar 08 2009 Matthew Barnes <mbarnes at redhat.com> - 0.8-6
- Fix build breakage.
- Explicitly require libldb-devel.
- Bump samba4 requirement to alpha7.
libmapi-0.8-ROMULUS-ndr-interface-table.patch:
--- NEW FILE libmapi-0.8-ROMULUS-ndr-interface-table.patch ---
diff -up libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy.c.ndr-interface-table libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy.c
--- libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy.c.ndr-interface-table 2009-01-11 21:14:27.000000000 -0500
+++ libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy.c 2009-03-08 23:12:02.000000000 -0400
@@ -57,7 +57,7 @@ static NTSTATUS mapiproxy_op_bind_proxy(
binding = lp_parm_string(dce_call->conn->dce_ctx->lp_ctx, NULL, "dcerpc_mapiproxy", "binding");
machine_account = lp_parm_bool(dce_call->conn->dce_ctx->lp_ctx, NULL, "dcerpc_mapiproxy", "use_machine_account", false);
- private = dce_call->context->private;
+ private = dce_call->context->private_data;
if (!binding) {
DEBUG(0, ("You must specify a DCE/RPC binding string\n"));
@@ -193,7 +193,7 @@ static NTSTATUS mapiproxy_op_bind(struct
private->c_pipe = NULL;
private->exchname = NULL;
private->server_mode = server_mode;
- dce_call->context->private = private;
+ dce_call->context->private_data = private;
if (server_mode == false) {
return mapiproxy_op_bind_proxy(dce_call, iface);
@@ -213,7 +213,7 @@ static NTSTATUS mapiproxy_op_bind(struct
*/
static void mapiproxy_op_unbind(struct dcesrv_connection_context *context, const struct dcesrv_interface *iface)
{
- struct dcesrv_mapiproxy_private *private = (struct dcesrv_mapiproxy_private *) context->private;
+ struct dcesrv_mapiproxy_private *private = (struct dcesrv_mapiproxy_private *) context->private_data;
DEBUG(5, ("mapiproxy::mapiproxy_op_unbind\n"));
@@ -251,7 +251,7 @@ static NTSTATUS mapiproxy_op_ndr_pull(st
DEBUG(5, ("mapiproxy::mapiproxy_op_ndr_pull\n"));
- table = (const struct ndr_interface_table *)dce_call->context->iface->private;
+ table = (const struct ndr_interface_table *)dce_call->context->iface->private_data;
opnum = dce_call->pkt.u.request.opnum;
dce_call->fault_code = 0;
@@ -308,8 +308,8 @@ static NTSTATUS mapiproxy_op_ndr_push(st
DEBUG(5, ("mapiproxy::mapiproxy_op_ndr_push\n"));
- private = dce_call->context->private;
- table = (const struct ndr_interface_table *)dce_call->context->iface->private;
+ private = dce_call->context->private_data;
+ table = (const struct ndr_interface_table *)dce_call->context->iface->private_data;
opnum = dce_call->pkt.u.request.opnum;
name = table->calls[opnum].name;
@@ -384,8 +384,8 @@ static NTSTATUS mapiproxy_op_dispatch(st
const char *name;
NTSTATUS status;
- private = dce_call->context->private;
- table = dce_call->context->iface->private;
+ private = dce_call->context->private_data;
+ table = dce_call->context->iface->private_data;
opnum = dce_call->pkt.u.request.opnum;
name = table->calls[opnum].name;
@@ -477,7 +477,7 @@ static NTSTATUS mapiproxy_op_dispatch(st
*/
static NTSTATUS mapiproxy_register_one_iface(struct dcesrv_context *dce_ctx, const struct dcesrv_interface *iface)
{
- const struct ndr_interface_table *table = iface->private;
+ const struct ndr_interface_table *table = iface->private_data;
int i;
for (i = 0; i < table->endpoints->count; i++) {
@@ -552,7 +552,7 @@ static bool mapiproxy_fill_interface(str
iface->reply = mapiproxy_op_reply;
iface->ndr_push = mapiproxy_op_ndr_push;
- iface->private = tbl;
+ iface->private_data = tbl;
return true;
}
diff -up libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_module.c.ndr-interface-table libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_module.c
--- libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_module.c.ndr-interface-table 2009-01-02 09:29:00.000000000 -0500
+++ libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_module.c 2009-03-08 23:12:02.000000000 -0400
@@ -44,7 +44,7 @@ NTSTATUS mapiproxy_module_push(struct dc
const struct ndr_interface_table *table;
NTSTATUS status;
- table = (const struct ndr_interface_table *)dce_call->context->iface->private;
+ table = (const struct ndr_interface_table *)dce_call->context->iface->private_data;
for (mpm = mpm_list; mpm; mpm = mpm->next) {
if (mpm->module->endpoint &&
@@ -68,7 +68,7 @@ NTSTATUS mapiproxy_module_ndr_pull(struc
const struct ndr_interface_table *table;
NTSTATUS status;
- table = (const struct ndr_interface_table *)dce_call->context->iface->private;
+ table = (const struct ndr_interface_table *)dce_call->context->iface->private_data;
for (mpm = mpm_list; mpm; mpm = mpm->next) {
if (mpm->module->endpoint &&
@@ -92,7 +92,7 @@ NTSTATUS mapiproxy_module_pull(struct dc
const struct ndr_interface_table *table;
NTSTATUS status;
- table = (const struct ndr_interface_table *)dce_call->context->iface->private;
+ table = (const struct ndr_interface_table *)dce_call->context->iface->private_data;
for (mpm = mpm_list; mpm; mpm = mpm->next) {
if (mpm->module->endpoint &&
@@ -117,7 +117,7 @@ NTSTATUS mapiproxy_module_dispatch(struc
const struct ndr_interface_table *table;
NTSTATUS status;
- table = (const struct ndr_interface_table *)dce_call->context->iface->private;
+ table = (const struct ndr_interface_table *)dce_call->context->iface->private_data;
for (mpm = mpm_list; mpm; mpm = mpm->next) {
if (mpm->module->endpoint &&
diff -up libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_nspi.c.ndr-interface-table libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_nspi.c
--- libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_nspi.c.ndr-interface-table 2008-09-16 21:15:10.000000000 -0400
+++ libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_nspi.c 2009-03-08 23:12:02.000000000 -0400
@@ -130,7 +130,7 @@ bool mapiproxy_NspiQueryRows(struct dces
char *lpszA;
char *exchname;
- private = dce_call->context->private;
+ private = dce_call->context->private_data;
/* Sanity checks */
if (!r->out.ppRows) return false;
@@ -191,7 +191,7 @@ bool mapiproxy_NspiDNToMId(struct dcesrv
const char *proxyname;
uint32_t i;
- private = dce_call->context->private;
+ private = dce_call->context->private_data;
proxyname = lp_netbios_name(dce_call->conn->dce_ctx->lp_ctx);
if (!private->exchname) return false;
diff -up libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_server.c.ndr-interface-table libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_server.c
--- libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_server.c.ndr-interface-table 2009-01-10 14:34:32.000000000 -0500
+++ libmapi-0.8-ROMULUS/mapiproxy/dcesrv_mapiproxy_server.c 2009-03-08 23:12:02.000000000 -0400
@@ -47,7 +47,7 @@ NTSTATUS mapiproxy_server_dispatch(struc
const struct ndr_interface_table *table;
NTSTATUS status;
- table = (const struct ndr_interface_table *)dce_call->context->iface->private;
+ table = (const struct ndr_interface_table *)dce_call->context->iface->private_data;
for (server = server_list; server; server = server->next) {
if (server->module->endpoint && table->name &&
diff -up libmapi-0.8-ROMULUS/mapiproxy/modules/mpm_downgrade.c.ndr-interface-table libmapi-0.8-ROMULUS/mapiproxy/modules/mpm_downgrade.c
--- libmapi-0.8-ROMULUS/mapiproxy/modules/mpm_downgrade.c.ndr-interface-table 2008-11-01 11:53:29.000000000 -0400
+++ libmapi-0.8-ROMULUS/mapiproxy/modules/mpm_downgrade.c 2009-03-08 23:12:02.000000000 -0400
@@ -58,7 +58,7 @@ static NTSTATUS downgrade_push(struct dc
uint16_t opnum;
const char *name;
- table = (const struct ndr_interface_table *)dce_call->context->iface->private;
+ table = (const struct ndr_interface_table *)dce_call->context->iface->private_data;
opnum = dce_call->pkt.u.request.opnum;
name = table->calls[opnum].name;
@@ -103,7 +103,7 @@ static NTSTATUS downgrade_dispatch(struc
const struct ndr_interface_table *table;
uint16_t opnum;
- table = (const struct ndr_interface_table *)dce_call->context->iface->private;
+ table = (const struct ndr_interface_table *)dce_call->context->iface->private_data;
opnum = dce_call->pkt.u.request.opnum;
if ((opnum == 0xA) && (table->name && !strcmp(table->name, "exchange_emsmdb"))) {
diff -up libmapi-0.8-ROMULUS/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.c.ndr-interface-table libmapi-0.8-ROMULUS/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.c
--- libmapi-0.8-ROMULUS/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.c.ndr-interface-table 2009-01-14 20:43:42.000000000 -0500
+++ libmapi-0.8-ROMULUS/mapiproxy/servers/default/emsmdb/dcesrv_exchange_emsmdb.c 2009-03-08 23:12:02.000000000 -0400
@@ -410,7 +410,7 @@ static NTSTATUS dcesrv_exchange_emsmdb_d
const struct ndr_interface_table *table;
uint16_t opnum;
- table = (const struct ndr_interface_table *) dce_call->context->iface->private;
+ table = (const struct ndr_interface_table *) dce_call->context->iface->private_data;
opnum = dce_call->pkt.u.request.opnum;
/* Sanity checks */
diff -up libmapi-0.8-ROMULUS/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c.ndr-interface-table libmapi-0.8-ROMULUS/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c
--- libmapi-0.8-ROMULUS/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c.ndr-interface-table 2009-01-11 17:51:37.000000000 -0500
+++ libmapi-0.8-ROMULUS/mapiproxy/servers/default/nspi/dcesrv_exchange_nsp.c 2009-03-08 23:12:02.000000000 -0400
@@ -797,7 +797,7 @@ static NTSTATUS dcesrv_exchange_nsp_disp
const struct ndr_interface_table *table;
uint16_t opnum;
- table = (const struct ndr_interface_table *) dce_call->context->iface->private;
+ table = (const struct ndr_interface_table *) dce_call->context->iface->private_data;
opnum = dce_call->pkt.u.request.opnum;
/* Sanity checks */
diff -up libmapi-0.8-ROMULUS/mapiproxy/servers/default/rfr/dcesrv_exchange_ds_rfr.c.ndr-interface-table libmapi-0.8-ROMULUS/mapiproxy/servers/default/rfr/dcesrv_exchange_ds_rfr.c
--- libmapi-0.8-ROMULUS/mapiproxy/servers/default/rfr/dcesrv_exchange_ds_rfr.c.ndr-interface-table 2009-03-08 23:14:14.000000000 -0400
+++ libmapi-0.8-ROMULUS/mapiproxy/servers/default/rfr/dcesrv_exchange_ds_rfr.c 2009-03-08 23:14:21.000000000 -0400
@@ -146,7 +146,7 @@ static NTSTATUS dcesrv_exchange_ds_rfr_d
const struct ndr_interface_table *table;
uint16_t opnum;
- table = (const struct ndr_interface_table *) dce_call->context->iface->private;
+ table = (const struct ndr_interface_table *) dce_call->context->iface->private_data;
opnum = dce_call->pkt.u.request.opnum;
/* Sanity checks */
Index: openchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openchange/devel/openchange.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openchange.spec 9 Mar 2009 01:38:59 -0000 1.2
+++ openchange.spec 9 Mar 2009 03:19:16 -0000 1.3
@@ -1,6 +1,6 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%define samba4_version 4.0.0-1.alpha6
+%define samba4_version 4.0.0-1.alpha7
%define talloc_version 1.2.0
%define nickname ROMULUS
@@ -10,7 +10,7 @@
Name: openchange
Version: 0.8
-Release: 6%{?dist}
+Release: 7%{?dist}
Group: Applications/System
Summary: Provides access to Microsoft Exchange servers using native protocols
License: GPLv3+ and Public Domain
@@ -18,6 +18,11 @@
Source0: http://downloads.sourceforge.net/openchange/libmapi-%{version}-%{nickname}.tar.gz
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+### Patches ###
+
+# Samba APIs are still a moving target...
+Patch1: libmapi-0.8-ROMULUS-ndr-interface-table.patch
+
### Build Dependencies ###
BuildRequires: bison
@@ -75,6 +80,7 @@
%prep
%setup -q -n libmapi-%{version}-%{nickname}
+%patch1 -p1 -b .ndr-interface-table
%build
%configure
@@ -147,7 +153,9 @@
%changelog
* Sun Mar 08 2009 Matthew Barnes <mbarnes at redhat.com> - 0.8-6
+- Fix build breakage.
- Explicitly require libldb-devel.
+- Bump samba4 requirement to alpha7.
* Wed Feb 25 2009 Matthew Barnes <mbarnes at redhat.com> - 0.8-5
- Rebuild with correct tarball.
--- libmapi-0.8-ROMULUS-include-signal-h.patch DELETED ---
More information about the fedora-extras-commits
mailing list