update to 7.1.4
This commit is contained in:
parent
791d0f24bc
commit
a9fc0b57a8
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile.inc,v 1.26 2013/03/11 11:23:54 espie Exp $
|
||||
# $OpenBSD: Makefile.inc,v 1.27 2013/03/31 13:01:19 robert Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
V?= 7.1.3
|
||||
BUILD?= 40304
|
||||
V?= 7.1.4
|
||||
BUILD?= 41394
|
||||
DISTNAME?= zcp-${V}
|
||||
|
||||
CATEGORIES+= mail/zarafa
|
||||
|
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.146 2013/03/21 08:46:32 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.147 2013/03/31 13:01:19 robert Exp $
|
||||
|
||||
COMMENT-main= MS Exchange groupware suite replacement
|
||||
COMMENT-web= zarafa webaccess frontend and MAPI extensions for PHP
|
||||
@ -6,7 +6,6 @@ COMMENT-web= zarafa webaccess frontend and MAPI extensions for PHP
|
||||
PKGNAME= zarafa-${V}
|
||||
PKGNAME-main= zarafa-${V}
|
||||
PKGNAME-web= zarafa-webaccess-${V}
|
||||
REVISION-main= 1
|
||||
|
||||
CATEGORIES= mail www productivity
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (zarafa/zcp-7.1.3.tar.gz) = 3CQj2sNQHfK/tViA60c1bBwCsr0M1jx07VinQq4s+RQ=
|
||||
SIZE (zarafa/zcp-7.1.3.tar.gz) = 6462595
|
||||
SHA256 (zarafa/zcp-7.1.4.tar.gz) = Zrj62KRSVT21IJmb3i92VTiyfZDbMPo3zuZd/adwHJo=
|
||||
SIZE (zarafa/zcp-7.1.4.tar.gz) = 6469725
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-ECtools_zarafa-admin_zarafa-admin_cpp,v 1.3 2013/01/27 13:06:20 robert Exp $
|
||||
--- ECtools/zarafa-admin/zarafa-admin.cpp.orig Wed Dec 5 16:06:37 2012
|
||||
+++ ECtools/zarafa-admin/zarafa-admin.cpp Sun Jan 20 17:18:38 2013
|
||||
@@ -2742,11 +2742,13 @@ int main(int argc, char* argv[])
|
||||
$OpenBSD: patch-ECtools_zarafa-admin_zarafa-admin_cpp,v 1.4 2013/03/31 13:01:19 robert Exp $
|
||||
--- ECtools/zarafa-admin/zarafa-admin.cpp.orig Thu Feb 28 17:13:17 2013
|
||||
+++ ECtools/zarafa-admin/zarafa-admin.cpp Sun Mar 31 14:29:43 2013
|
||||
@@ -2745,11 +2745,13 @@ int main(int argc, char* argv[])
|
||||
case OPT_UTF8: {
|
||||
// set early, so other arguments are parsed in this charset.
|
||||
std::string locale;
|
||||
|
@ -1,9 +1,9 @@
|
||||
$OpenBSD: patch-ECtools_zarafa-search_ECIndexDB_cpp,v 1.2 2013/01/27 13:06:20 robert Exp $
|
||||
$OpenBSD: patch-ECtools_zarafa-search_ECIndexDB_cpp,v 1.3 2013/03/31 13:01:19 robert Exp $
|
||||
|
||||
Fix buil with clucene-core >= 2.x
|
||||
|
||||
--- ECtools/zarafa-search/ECIndexDB.cpp.orig Wed Dec 5 16:06:37 2012
|
||||
+++ ECtools/zarafa-search/ECIndexDB.cpp Sun Jan 20 17:18:38 2013
|
||||
--- ECtools/zarafa-search/ECIndexDB.cpp.orig Thu Feb 28 17:13:17 2013
|
||||
+++ ECtools/zarafa-search/ECIndexDB.cpp Sun Mar 31 14:29:43 2013
|
||||
@@ -68,7 +68,7 @@
|
||||
#include <string>
|
||||
#include <algorithm>
|
||||
@ -13,7 +13,7 @@ Fix buil with clucene-core >= 2.x
|
||||
|
||||
using namespace kyotocabinet;
|
||||
|
||||
@@ -304,7 +304,7 @@ HRESULT ECIndexDB::AddTerm(folderid_t folder, docid_t
|
||||
@@ -305,7 +305,7 @@ HRESULT ECIndexDB::AddTerm(folderid_t folder, docid_t
|
||||
unsigned int len;
|
||||
unsigned int keylen;
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-ECtools_zarafa-search_zarafa-search_cpp,v 1.2 2013/01/27 13:06:20 robert Exp $
|
||||
--- ECtools/zarafa-search/zarafa-search.cpp.orig Wed Dec 5 16:06:37 2012
|
||||
+++ ECtools/zarafa-search/zarafa-search.cpp Sun Jan 20 17:18:38 2013
|
||||
@@ -448,7 +448,7 @@ int main(int argc, char *argv[]) {
|
||||
$OpenBSD: patch-ECtools_zarafa-search_zarafa-search_cpp,v 1.3 2013/03/31 13:01:19 robert Exp $
|
||||
--- ECtools/zarafa-search/zarafa-search.cpp.orig Thu Feb 28 17:13:17 2013
|
||||
+++ ECtools/zarafa-search/zarafa-search.cpp Sun Mar 31 14:29:43 2013
|
||||
@@ -516,7 +516,7 @@ int main(int argc, char *argv[]) {
|
||||
/* operational settings */
|
||||
{ "limit_results", "0", CONFIGSETTING_RELOADABLE },
|
||||
/* Indexer settings */
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-common_Makefile_in,v 1.18 2012/10/28 21:51:08 robert Exp $
|
||||
--- common/Makefile.in.orig Thu Oct 18 18:15:56 2012
|
||||
+++ common/Makefile.in Sun Oct 28 21:08:55 2012
|
||||
@@ -401,7 +401,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) $(BOOST_CPPFLAGS) -DLINUX
|
||||
$OpenBSD: patch-common_Makefile_in,v 1.19 2013/03/31 13:01:19 robert Exp $
|
||||
--- common/Makefile.in.orig Sun Mar 31 14:30:07 2013
|
||||
+++ common/Makefile.in Sun Mar 31 14:31:14 2013
|
||||
@@ -402,7 +402,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) $(BOOST_CPPFLAGS) -DLINUX
|
||||
-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
|
||||
-I${top_srcdir}/libfreebusy $(MYSQL_INCLUDES)
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.18 2012/10/28 21:51:08 robert Exp $
|
||||
libcommon_mapi_la_SOURCES = CommonUtil.cpp \
|
||||
rtfutil.cpp \
|
||||
codepage.cpp \
|
||||
@@ -424,8 +424,9 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \
|
||||
@@ -425,8 +425,9 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \
|
||||
IStreamAdapter.cpp \
|
||||
MAPIConsoleTable.cpp \
|
||||
ECMAPIDebug.cpp
|
||||
@ -21,7 +21,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.18 2012/10/28 21:51:08 robert Exp $
|
||||
libcommon_util_la_SOURCES = platform.cpp platform.linux.cpp md5.cpp \
|
||||
base64.cpp ECLogger.cpp ECConfig.cpp ECConfigImpl.cpp \
|
||||
ECFifoBuffer.cpp ECSerializer.cpp ECCache.cpp my_getopt.cpp \
|
||||
@@ -436,13 +437,16 @@ libcommon_util_la_SOURCES = platform.cpp platform.linu
|
||||
@@ -437,14 +438,17 @@ libcommon_util_la_SOURCES = platform.cpp platform.linu
|
||||
ECGetText.cpp threadutil.cpp ECRestriction.cpp userutil.cpp \
|
||||
ECFeatures.cpp ECACL.cpp fileutil.cpp ECThreadPool.cpp \
|
||||
ConsoleTable.cpp $(am__append_1)
|
||||
@ -30,6 +30,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.18 2012/10/28 21:51:08 robert Exp $
|
||||
+libcommon_ssl_la_LDFLAGS =
|
||||
libcommon_ssl_la_SOURCES = \
|
||||
SSLUtil.cpp \
|
||||
ECChannelClient.cpp \
|
||||
ECChannel.cpp
|
||||
+libcommon_ssl_la_LIBADD = -lpthread ${SSL_LIBS}
|
||||
|
||||
|
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-configure,v 1.25 2012/08/30 14:28:22 ajacoutot Exp $
|
||||
$OpenBSD: patch-configure,v 1.26 2013/03/31 13:01:19 robert Exp $
|
||||
|
||||
Our crypt(3) is in libc.
|
||||
|
||||
--- configure.orig Wed Aug 8 16:35:42 2012
|
||||
+++ configure Wed Aug 29 10:06:28 2012
|
||||
@@ -17292,7 +17292,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then :
|
||||
--- configure.orig Thu Feb 28 16:13:46 2013
|
||||
+++ configure Sun Mar 31 14:29:43 2013
|
||||
@@ -17302,7 +17302,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
@ -13,7 +13,7 @@ Our crypt(3) is in libc.
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -17325,7 +17325,7 @@ $as_echo "$ac_cv_lib_intl_strftime" >&6; }
|
||||
@@ -17335,7 +17335,7 @@ $as_echo "$ac_cv_lib_intl_strftime" >&6; }
|
||||
if test "x$ac_cv_lib_intl_strftime" = x""yes; then :
|
||||
$as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
|
||||
|
||||
@ -22,7 +22,7 @@ Our crypt(3) is in libc.
|
||||
fi
|
||||
|
||||
fi
|
||||
@@ -18713,74 +18713,12 @@ rm -f core conftest.err conftest.$ac_objext \
|
||||
@@ -18780,74 +18780,12 @@ rm -f core conftest.err conftest.$ac_objext \
|
||||
|
||||
LIBS=$LIBS_system
|
||||
|
||||
@ -97,7 +97,7 @@ Our crypt(3) is in libc.
|
||||
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
|
||||
SSL_LIBS=
|
||||
# TODO: version of ssl check??
|
||||
@@ -18791,7 +18729,7 @@ if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then
|
||||
@@ -18858,7 +18796,7 @@ if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
@ -106,7 +106,7 @@ Our crypt(3) is in libc.
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
/* end confdefs.h. */
|
||||
|
||||
@@ -19298,7 +19236,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then :
|
||||
@@ -19365,7 +19303,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-doc_manual_xml,v 1.33 2013/01/27 13:06:20 robert Exp $
|
||||
--- doc/manual.xml.orig Wed Jan 23 12:48:32 2013
|
||||
+++ doc/manual.xml Sun Jan 27 12:59:52 2013
|
||||
$OpenBSD: patch-doc_manual_xml,v 1.34 2013/03/31 13:01:19 robert Exp $
|
||||
--- doc/manual.xml.orig Thu Feb 28 16:12:21 2013
|
||||
+++ doc/manual.xml Sun Mar 31 14:29:43 2013
|
||||
@@ -850,9 +850,7 @@
|
||||
<varlistentry>
|
||||
<term><option>pid_file</option></term>
|
||||
@ -34,7 +34,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.33 2013/01/27 13:06:20 robert Exp $
|
||||
</para>
|
||||
<para>
|
||||
<command>
|
||||
@@ -3611,9 +3607,7 @@
|
||||
@@ -3630,9 +3626,7 @@
|
||||
<varlistentry>
|
||||
<term><option>pid_file</option></term>
|
||||
<listitem>
|
||||
@ -45,7 +45,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.33 2013/01/27 13:06:20 robert Exp $
|
||||
</para>
|
||||
<para>Default:
|
||||
<replaceable>/var/run/zarafa-server.pid</replaceable>
|
||||
@@ -6829,13 +6823,8 @@
|
||||
@@ -6848,13 +6842,8 @@
|
||||
</para>
|
||||
|
||||
<para>The spooler process will keep running and watching the
|
||||
@ -61,7 +61,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.33 2013/01/27 13:06:20 robert Exp $
|
||||
</refsection>
|
||||
|
||||
<refsection>
|
||||
@@ -7016,9 +7005,7 @@
|
||||
@@ -7035,9 +7024,7 @@
|
||||
<varlistentry>
|
||||
<term><option>pid_file</option></term>
|
||||
<listitem>
|
||||
@ -72,7 +72,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.33 2013/01/27 13:06:20 robert Exp $
|
||||
</para>
|
||||
<para>Default:
|
||||
<replaceable>/var/run/zarafa-spooler.pid</replaceable>
|
||||
@@ -7524,13 +7511,7 @@
|
||||
@@ -7543,13 +7530,7 @@
|
||||
|
||||
<para><command>zarafa-gateway</command></para>
|
||||
|
||||
@ -87,7 +87,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.33 2013/01/27 13:06:20 robert Exp $
|
||||
</refsection>
|
||||
|
||||
<refsection>
|
||||
@@ -8209,14 +8190,8 @@
|
||||
@@ -8228,14 +8209,8 @@
|
||||
|
||||
<para>The monitor checks user mailbox sizes. The monitor sends
|
||||
a quota email when the warning quota limit is reached. When
|
||||
@ -103,7 +103,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.33 2013/01/27 13:06:20 robert Exp $
|
||||
</refsection>
|
||||
|
||||
<refsection>
|
||||
@@ -8368,9 +8343,7 @@
|
||||
@@ -8387,9 +8362,7 @@
|
||||
<varlistentry>
|
||||
<term><option>pid_file</option></term>
|
||||
<listitem>
|
||||
@ -114,7 +114,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.33 2013/01/27 13:06:20 robert Exp $
|
||||
</para>
|
||||
<para>Default value: /var/run/zarafa-monitor.pid
|
||||
</para>
|
||||
@@ -9681,13 +9654,7 @@
|
||||
@@ -9700,13 +9673,7 @@
|
||||
|
||||
<para><command>zarafa-ical</command></para>
|
||||
|
||||
@ -129,7 +129,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.33 2013/01/27 13:06:20 robert Exp $
|
||||
</refsection>
|
||||
|
||||
<refsection>
|
||||
@@ -9870,9 +9837,7 @@
|
||||
@@ -9889,9 +9856,7 @@
|
||||
<varlistentry>
|
||||
<term><option>pid_file</option></term>
|
||||
<listitem>
|
||||
@ -140,7 +140,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.33 2013/01/27 13:06:20 robert Exp $
|
||||
</para>
|
||||
<para>Default:
|
||||
<replaceable>/var/run/zarafa-ical.pid</replaceable>
|
||||
@@ -10221,13 +10186,7 @@
|
||||
@@ -10240,13 +10205,7 @@
|
||||
|
||||
<para><command>zarafa-licensed</command></para>
|
||||
|
||||
@ -155,7 +155,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.33 2013/01/27 13:06:20 robert Exp $
|
||||
</refsection>
|
||||
|
||||
<refsection>
|
||||
@@ -10397,9 +10356,7 @@
|
||||
@@ -10416,9 +10375,7 @@
|
||||
<varlistentry>
|
||||
<term><option>pid_file</option></term>
|
||||
<listitem>
|
||||
@ -166,7 +166,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.33 2013/01/27 13:06:20 robert Exp $
|
||||
</para>
|
||||
<para>Default:
|
||||
<replaceable>/var/run/zarafa-licensed.pid</replaceable>
|
||||
@@ -11197,13 +11154,6 @@
|
||||
@@ -11229,13 +11186,6 @@
|
||||
<option>-c</option>
|
||||
<replaceable>/path/to/search.cfg</replaceable>
|
||||
</para>
|
||||
@ -180,7 +180,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.33 2013/01/27 13:06:20 robert Exp $
|
||||
</refsection>
|
||||
|
||||
<refsection>
|
||||
@@ -11334,9 +11284,7 @@
|
||||
@@ -11366,9 +11316,7 @@
|
||||
<varlistentry>
|
||||
<term><option>pid_file</option></term>
|
||||
<listitem>
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.10 2013/01/27 13:06:20 robert Exp $
|
||||
--- provider/libserver/ECSession.cpp.orig Wed Jan 23 13:42:32 2013
|
||||
+++ provider/libserver/ECSession.cpp Sun Jan 27 12:59:53 2013
|
||||
@@ -566,14 +566,23 @@ void ECSession::RemoveBusyState(pthread_t threadId)
|
||||
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.11 2013/03/31 13:01:19 robert Exp $
|
||||
--- provider/libserver/ECSession.cpp.orig Thu Feb 28 17:13:18 2013
|
||||
+++ provider/libserver/ECSession.cpp Sun Mar 31 14:29:44 2013
|
||||
@@ -599,14 +599,23 @@ void ECSession::RemoveBusyState(pthread_t threadId)
|
||||
i = m_mapBusyStates.find(threadId);
|
||||
|
||||
if(i != m_mapBusyStates.end()) {
|
||||
@ -26,7 +26,7 @@ $OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.10 2013/01/27 13:06:20 robe
|
||||
} else {
|
||||
ASSERT(FALSE);
|
||||
}
|
||||
@@ -867,11 +876,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
|
||||
@@ -912,11 +921,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
|
||||
uid_t uid;
|
||||
char strbuf[1024];
|
||||
#ifdef SO_PEERCRED
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-provider_libserver_ECStatsTables_cpp,v 1.1 2013/01/27 13:06:20 robert Exp $
|
||||
--- provider/libserver/ECStatsTables.cpp.orig Wed Dec 5 16:06:38 2012
|
||||
+++ provider/libserver/ECStatsTables.cpp Sun Jan 27 12:53:49 2013
|
||||
@@ -319,15 +319,26 @@ void ECSessionStatsTable::GetSessionData(ECSession *lp
|
||||
$OpenBSD: patch-provider_libserver_ECStatsTables_cpp,v 1.2 2013/03/31 13:01:19 robert Exp $
|
||||
--- provider/libserver/ECStatsTables.cpp.orig Thu Feb 28 17:13:17 2013
|
||||
+++ provider/libserver/ECStatsTables.cpp Sun Mar 31 14:29:44 2013
|
||||
@@ -356,15 +356,26 @@ void ECSessionStatsTable::GetSessionData(ECSession *lp
|
||||
// To get up-to-date CPU stats, check each of the active threads on the session
|
||||
// for their CPU usage, and add that to the already-logged time on the session
|
||||
for (iterBS = sd.busystates.begin(); iterBS != sd.busystates.end(); iterBS++) {
|
||||
|
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.26 2013/01/27 13:06:20 robert Exp $
|
||||
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.27 2013/03/31 13:01:19 robert Exp $
|
||||
|
||||
OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
|
||||
|
||||
--- provider/libserver/ZarafaCmd.cpp.orig Sun Jan 20 17:29:55 2013
|
||||
+++ provider/libserver/ZarafaCmd.cpp Sun Jan 20 17:34:41 2013
|
||||
@@ -542,10 +542,10 @@ int ns__logon(struct soap *soap, char *user, char *pas
|
||||
--- provider/libserver/ZarafaCmd.cpp.orig Thu Feb 28 17:13:17 2013
|
||||
+++ provider/libserver/ZarafaCmd.cpp Sun Mar 31 14:29:44 2013
|
||||
@@ -546,10 +546,10 @@ int ns__logon(struct soap *soap, char *user, char *pas
|
||||
ECLicenseClient *lpLicenseClient = NULL;
|
||||
unsigned int ulLicenseResponse;
|
||||
unsigned char *lpLicenseResponse = NULL;
|
||||
@ -17,7 +17,7 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
|
||||
|
||||
LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020llu: S logon", sessionID);
|
||||
|
||||
@@ -642,9 +642,9 @@ exit:
|
||||
@@ -646,9 +646,9 @@ exit:
|
||||
|
||||
lpsResponse->er = er;
|
||||
|
||||
@ -29,7 +29,7 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
|
||||
|
||||
return SOAP_OK;
|
||||
}
|
||||
@@ -662,10 +662,10 @@ int ns__ssoLogon(struct soap *soap, ULONG64 ulSessionI
|
||||
@@ -666,10 +666,10 @@ int ns__ssoLogon(struct soap *soap, ULONG64 ulSessionI
|
||||
xsd__base64Binary *lpOutput = NULL;
|
||||
char* lpszEnabled = NULL;
|
||||
ECLicenseClient*lpLicenseClient = NULL;
|
||||
@ -42,7 +42,7 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
|
||||
|
||||
LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020"PRIu64": S ssoLogon", ulSessionId);
|
||||
|
||||
@@ -813,9 +813,9 @@ exit:
|
||||
@@ -817,9 +817,9 @@ exit:
|
||||
nosso:
|
||||
lpsResponse->er = er;
|
||||
|
||||
@ -54,7 +54,7 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
|
||||
|
||||
return SOAP_OK;
|
||||
}
|
||||
@@ -827,10 +827,10 @@ int ns__logoff(struct soap *soap, ULONG64 ulSessionId,
|
||||
@@ -831,10 +831,10 @@ int ns__logoff(struct soap *soap, ULONG64 ulSessionId,
|
||||
{
|
||||
ECRESULT er = erSuccess;
|
||||
ECSession *lpecSession = NULL;
|
||||
@ -67,7 +67,7 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
|
||||
|
||||
LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020"PRIu64": S logoff", ulSessionId);
|
||||
|
||||
@@ -852,20 +852,20 @@ int ns__logoff(struct soap *soap, ULONG64 ulSessionId,
|
||||
@@ -856,20 +856,20 @@ int ns__logoff(struct soap *soap, ULONG64 ulSessionId,
|
||||
exit:
|
||||
*result = er;
|
||||
|
||||
@ -92,7 +92,7 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
|
||||
LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020"PRIu64": S %s", ulSessionId, szFname); \
|
||||
er = g_lpSessionManager->ValidateSession(soap, ulSessionId, &lpecSession, true);\
|
||||
const bool bSupportUnicode = (er == erSuccess ? (lpecSession->GetCapabilities() & ZARAFA_CAP_UNICODE) != 0 : false); \
|
||||
@@ -879,9 +879,9 @@ exit:
|
||||
@@ -883,9 +883,9 @@ exit:
|
||||
#define SOAP_ENTRY_FUNCTION_FOOTER \
|
||||
__soapentry_exit: \
|
||||
*lpResultVar = er; \
|
||||
|
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.25 2013/01/27 13:06:20 robert Exp $
|
||||
--- provider/server/ECServer.cpp.orig Wed Jan 23 13:42:31 2013
|
||||
+++ provider/server/ECServer.cpp Sun Jan 27 12:59:53 2013
|
||||
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.26 2013/03/31 13:01:20 robert Exp $
|
||||
--- provider/server/ECServer.cpp.orig Thu Feb 28 17:13:17 2013
|
||||
+++ provider/server/ECServer.cpp Sun Mar 31 14:29:44 2013
|
||||
@@ -90,6 +90,10 @@
|
||||
#include "unicode/uclean.h"
|
||||
#endif
|
||||
@ -12,7 +12,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.25 2013/01/27 13:06:20 robert E
|
||||
#ifdef _DEBUG
|
||||
#define new DEBUG_NEW
|
||||
#undef THIS_FILE
|
||||
@@ -911,7 +915,7 @@ int running_server(char *szName, const char *szConfig,
|
||||
@@ -938,7 +942,7 @@ int running_server(char *szName, const char *szConfig,
|
||||
{ "mysql_config_file", "/etc/zarafa/my.cnf" },
|
||||
#endif
|
||||
{ "attachment_storage", "database" },
|
||||
@ -21,7 +21,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.25 2013/01/27 13:06:20 robert E
|
||||
{ "attachment_compression", "6" },
|
||||
|
||||
// Log options
|
||||
@@ -984,7 +988,7 @@ int running_server(char *szName, const char *szConfig,
|
||||
@@ -1011,7 +1015,7 @@ int running_server(char *szName, const char *szConfig,
|
||||
|
||||
{ "client_update_enabled", "no" },
|
||||
{ "client_update_log_level", "1", CONFIGSETTING_RELOADABLE },
|
||||
@ -30,7 +30,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.25 2013/01/27 13:06:20 robert E
|
||||
{ "client_update_log_path", "/var/log/zarafa/autoupdate", CONFIGSETTING_RELOADABLE },
|
||||
{ "index_services_enabled", "", CONFIGSETTING_UNUSED },
|
||||
{ "index_services_path", "", CONFIGSETTING_UNUSED },
|
||||
@@ -1013,10 +1017,14 @@ int running_server(char *szName, const char *szConfig,
|
||||
@@ -1040,10 +1044,14 @@ int running_server(char *szName, const char *szConfig,
|
||||
{ NULL, NULL },
|
||||
};
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.42 2012/10/28 21:51:09 robert Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.43 2013/03/31 13:01:20 robert Exp $
|
||||
@comment chdir(2) to running_path which is set to /var/empty in the cfg files
|
||||
@newgroup _zarafa:627
|
||||
@newuser _zarafa:627:_zarafa:daemon:Zarafa Account:/var/empty:/sbin/nologin
|
||||
@ -93,6 +93,7 @@ include/zarafa/ECABEntryID.h
|
||||
include/zarafa/ECACL.h
|
||||
include/zarafa/ECCache.h
|
||||
include/zarafa/ECChannel.h
|
||||
include/zarafa/ECChannelClient.h
|
||||
include/zarafa/ECConfig.h
|
||||
include/zarafa/ECConfigImpl.h
|
||||
include/zarafa/ECDatabaseMySQL.h
|
||||
|
Loading…
x
Reference in New Issue
Block a user