cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to Zarafa 7.1.1

Browse Source
This commit is contained in:
robert 2012-10-28 21:51:08 +00:00
parent 9ab8ec7d36
commit 74deb833cc
17 changed files with 94 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/zarafa/Makefile.inc
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile.inc,v 1.23 2012/10/08 10:20:32 robert Exp $
# $OpenBSD: Makefile.inc,v 1.24 2012/10/28 21:51:08 robert Exp $
SHARED_ONLY= Yes
V?= 7.1.0
BUILD?= 36420
V?= 7.1.1
BUILD?= 37812
DISTNAME?= zcp-${V}
CATEGORIES+= mail/zarafa

4
mail/zarafa/zarafa/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.141 2012/10/15 20:09:26 robert Exp $
# $OpenBSD: Makefile,v 1.142 2012/10/28 21:51:08 robert Exp $
COMMENT-main= MS Exchange groupware suite replacement
COMMENT-web= zarafa webaccess frontend and MAPI extensions for PHP
@ -7,8 +7,6 @@ PKGNAME= zarafa-${V}
PKGNAME-main= zarafa-${V}
PKGNAME-web= zarafa-webaccess-${V}
REVISION= 3
CATEGORIES= mail www productivity
SHARED_LIBS += common_util 2.0 # .0.0

4
mail/zarafa/zarafa/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (zarafa/zcp-7.1.0.tar.gz) = EIn6/hydBc2F8wKLfuXfsR3JNCJrYchjBk/lDmYSKuA=
SIZE (zarafa/zcp-7.1.0.tar.gz) = 6380302
SHA256 (zarafa/zcp-7.1.1.tar.gz) = FY8AIkV3AtsDCD4nq7riEgDAdqR+P1bheG7A2p8doFw=
SIZE (zarafa/zcp-7.1.1.tar.gz) = 6387204

8
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-admin_zarafa-admin_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ECtools_zarafa-admin_zarafa-admin_cpp,v 1.1 2012/08/30 14:28:22 ajacoutot Exp $
--- ECtools/zarafa-admin/zarafa-admin.cpp.orig Wed Aug 29 15:19:18 2012
+++ ECtools/zarafa-admin/zarafa-admin.cpp Wed Aug 29 14:40:35 2012
@@ -2739,11 +2739,13 @@ int main(int argc, char* argv[])
$OpenBSD: patch-ECtools_zarafa-admin_zarafa-admin_cpp,v 1.2 2012/10/28 21:51:08 robert Exp $
--- ECtools/zarafa-admin/zarafa-admin.cpp.orig Thu Oct 18 19:06:57 2012
+++ ECtools/zarafa-admin/zarafa-admin.cpp Sun Oct 28 21:08:55 2012
@@ -2741,11 +2741,13 @@ int main(int argc, char* argv[])
case OPT_UTF8: {
// set early, so other arguments are parsed in this charset.
std::string locale;

10
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-fsck_zarafa-fsck_cpp
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-ECtools_zarafa-fsck_zarafa-fsck_cpp,v 1.1 2012/08/30 14:28:22 ajacoutot Exp $
--- ECtools/zarafa-fsck/zarafa-fsck.cpp.orig Wed Aug 29 15:19:33 2012
+++ ECtools/zarafa-fsck/zarafa-fsck.cpp Wed Aug 29 14:53:31 2012
@@ -537,8 +537,10 @@ int main(int argc, char *argv[])
bool bPublic = false;
$OpenBSD: patch-ECtools_zarafa-fsck_zarafa-fsck_cpp,v 1.2 2012/10/28 21:51:08 robert Exp $
--- ECtools/zarafa-fsck/zarafa-fsck.cpp.orig Thu Oct 18 19:06:57 2012
+++ ECtools/zarafa-fsck/zarafa-fsck.cpp Sun Oct 28 21:08:55 2012
@@ -538,8 +538,10 @@ int main(int argc, char *argv[])
bool acceptDisclaimer = false;
setlocale(LC_MESSAGES, "");
+#ifndef __OpenBSD__

8
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-monitor_zarafa-monitor_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ECtools_zarafa-monitor_zarafa-monitor_cpp,v 1.1 2012/08/30 14:28:22 ajacoutot Exp $
--- ECtools/zarafa-monitor/zarafa-monitor.cpp.orig Wed Aug 29 15:19:48 2012
+++ ECtools/zarafa-monitor/zarafa-monitor.cpp Wed Aug 29 14:50:42 2012
$OpenBSD: patch-ECtools_zarafa-monitor_zarafa-monitor_cpp,v 1.2 2012/10/28 21:51:08 robert Exp $
--- ECtools/zarafa-monitor/zarafa-monitor.cpp.orig Thu Oct 18 19:06:57 2012
+++ ECtools/zarafa-monitor/zarafa-monitor.cpp Sun Oct 28 21:08:55 2012
@@ -242,8 +242,10 @@ int main(int argc, char *argv[]) {
{ NULL, 0, NULL, 0 }
};
@ -11,4 +11,4 @@ $OpenBSD: patch-ECtools_zarafa-monitor_zarafa-monitor_cpp,v 1.1 2012/08/30 14:28
+#endif
while(1) {
c = my_getopt_long(argc, argv, "c:h:iuFV", long_options, NULL);
c = my_getopt_long_permissive(argc, argv, "c:h:iuFV", long_options, NULL);

20
mail/zarafa/zarafa/patches/patch-common_ECLogger_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-common_ECLogger_cpp,v 1.14 2012/08/30 14:28:22 ajacoutot Exp $
--- common/ECLogger.cpp.orig Wed Aug 8 17:14:57 2012
+++ common/ECLogger.cpp Wed Aug 29 13:27:02 2012
$OpenBSD: patch-common_ECLogger_cpp,v 1.15 2012/10/28 21:51:08 robert Exp $
--- common/ECLogger.cpp.orig Sun Oct 28 21:09:07 2012
+++ common/ECLogger.cpp Sun Oct 28 21:12:26 2012
@@ -56,6 +56,10 @@
#include "stringutil.h"
#include "charset/localeutil.h"
@ -60,7 +60,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.14 2012/08/30 14:28:22 ajacoutot Exp $
void ECLogger_File::LogVA(int loglevel, const char *format, va_list& va) {
pthread_mutex_lock(&msgbuflock);
+#ifdef __OpenBSD__
+#ifndef __OpenBSD__
+ _vsnprintf_l(msgbuffer, _LOG_BUFSIZE, format, va);
+#else
_vsnprintf_l(msgbuffer, _LOG_BUFSIZE, format, datalocale, va);
@ -72,7 +72,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.14 2012/08/30 14:28:22 ajacoutot Exp $
LoggerList::iterator iLogger;
pthread_mutex_lock(&msgbuflock);
+#ifdef __OpenBSD__
+#ifndef __OpenBSD__
+ _vsnprintf_l(msgbuffer, _LOG_BUFSIZE, format, va);
+#else
_vsnprintf_l(msgbuffer, _LOG_BUFSIZE, format, datalocale, va);
@ -98,7 +98,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.14 2012/08/30 14:28:22 ajacoutot Exp $
else if (prefix == LP_PID)
len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[%5d] ", getpid());
if (len < 0) len = 0;
@@ -598,15 +616,21 @@ namespace PrivatePipe {
@@ -598,9 +616,13 @@ namespace PrivatePipe {
int l;
bool bNPTL = true;
@ -112,11 +112,3 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.14 2012/08/30 14:28:22 ajacoutot Exp $
m_lpConfig = lpConfig;
m_lpFileLogger = lpFileLogger;
+#ifndef __OpenBSD__
// since we forked, set it for the complete process
forceUTF8Locale(false, NULL);
+#endif
if (bNPTL) {
sigemptyset(&signal_mask);

12
mail/zarafa/zarafa/patches/patch-common_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-common_Makefile_in,v 1.17 2012/08/30 14:28:22 ajacoutot Exp $
--- common/Makefile.in.orig Wed Aug 8 16:35:43 2012
+++ common/Makefile.in Thu Aug 30 13:29:55 2012
@@ -408,7 +408,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) $(BOOST_CPPFLAGS) -DLINUX
$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
-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.17 2012/08/30 14:28:22 ajacoutot Exp $
libcommon_mapi_la_SOURCES = CommonUtil.cpp \
rtfutil.cpp \
codepage.cpp \
@@ -431,8 +431,9 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \
@@ -424,8 +424,9 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \
IStreamAdapter.cpp \
MAPIConsoleTable.cpp \
ECMAPIDebug.cpp
@ -21,7 +21,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.17 2012/08/30 14:28:22 ajacoutot 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 \
@@ -443,13 +444,16 @@ libcommon_util_la_SOURCES = platform.cpp platform.linu
@@ -436,13 +437,16 @@ 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)

12
mail/zarafa/zarafa/patches/patch-common_ustringutil_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-common_ustringutil_cpp,v 1.2 2012/08/30 14:28:22 ajacoutot Exp $
--- common/ustringutil.cpp.orig Wed Aug 8 17:14:57 2012
+++ common/ustringutil.cpp Sat Aug 25 17:06:13 2012
@@ -168,12 +168,14 @@ int ECSortKey::compareTo(const ECSortKey &other) const
$OpenBSD: patch-common_ustringutil_cpp,v 1.3 2012/10/28 21:51:08 robert Exp $
--- common/ustringutil.cpp.orig Thu Oct 18 19:06:56 2012
+++ common/ustringutil.cpp Sun Oct 28 21:08:55 2012
@@ -165,12 +165,14 @@ int ECSortKey::compareTo(const ECSortKey &other) const
*/
const char* str_ifind(const char *haystack, const char *needle)
{
@ -17,7 +17,7 @@ $OpenBSD: patch-common_ustringutil_cpp,v 1.2 2012/08/30 14:28:22 ajacoutot Exp $
needlepos++;
if(*needlepos == 0)
@@ -188,7 +190,9 @@ const char* str_ifind(const char *haystack, const char
@@ -185,7 +187,9 @@ const char* str_ifind(const char *haystack, const char
needlestart = NULL;
exit:
@ -27,7 +27,7 @@ $OpenBSD: patch-common_ustringutil_cpp,v 1.2 2012/08/30 14:28:22 ajacoutot Exp $
return needlestart;
}
@@ -1559,8 +1563,10 @@ ECLocale::ECLocale(const ECLocale &other)
@@ -1601,8 +1605,10 @@ ECLocale::ECLocale(const ECLocale &other)
}
ECLocale::~ECLocale() {

34
mail/zarafa/zarafa/patches/patch-doc_manual_xml
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_manual_xml,v 1.31 2012/08/30 14:28:22 ajacoutot Exp $
--- doc/manual.xml.orig Wed Aug 8 16:35:30 2012
+++ doc/manual.xml Thu Aug 30 15:35:46 2012
$OpenBSD: patch-doc_manual_xml,v 1.32 2012/10/28 21:51:08 robert Exp $
--- doc/manual.xml.orig Thu Oct 18 18:15:31 2012
+++ doc/manual.xml Sun Oct 28 21:08:55 2012
@@ -850,9 +850,7 @@
<varlistentry>
<term><option>pid_file</option></term>
@ -12,7 +12,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.31 2012/08/30 14:28:22 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-dagent.pid</replaceable>
@@ -1321,11 +1319,6 @@
@@ -1367,11 +1365,6 @@
<replaceable>/path/to/server.cfg</replaceable>
</para>
@ -24,7 +24,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.31 2012/08/30 14:28:22 ajacoutot Exp $
</refsection>
<refsection>
@@ -1413,6 +1406,9 @@
@@ -1459,6 +1452,9 @@
located in /usr/share/zarafa, called ssl-certificate.sh. Enter
the following commands to create a certificate for the Zarafa
server.
@ -34,7 +34,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.31 2012/08/30 14:28:22 ajacoutot Exp $
</para>
<para>
<command>
@@ -3538,9 +3534,7 @@
@@ -3600,9 +3596,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -45,7 +45,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.31 2012/08/30 14:28:22 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-server.pid</replaceable>
@@ -6678,13 +6672,8 @@
@@ -6796,13 +6790,8 @@
</para>
<para>The spooler process will keep running and watching the
@ -61,7 +61,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.31 2012/08/30 14:28:22 ajacoutot Exp $
</refsection>
<refsection>
@@ -6865,9 +6854,7 @@
@@ -6983,9 +6972,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -72,7 +72,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.31 2012/08/30 14:28:22 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-spooler.pid</replaceable>
@@ -7369,13 +7356,7 @@
@@ -7487,13 +7474,7 @@
<para><command>zarafa-gateway</command></para>
@ -87,7 +87,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.31 2012/08/30 14:28:22 ajacoutot Exp $
</refsection>
<refsection>
@@ -8044,14 +8025,8 @@
@@ -8162,14 +8143,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.31 2012/08/30 14:28:22 ajacoutot Exp $
</refsection>
<refsection>
@@ -8203,9 +8178,7 @@
@@ -8321,9 +8296,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -114,7 +114,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.31 2012/08/30 14:28:22 ajacoutot Exp $
</para>
<para>Default value: /var/run/zarafa-monitor.pid
</para>
@@ -9509,13 +9482,7 @@
@@ -9634,13 +9607,7 @@
<para><command>zarafa-ical</command></para>
@ -129,7 +129,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.31 2012/08/30 14:28:22 ajacoutot Exp $
</refsection>
<refsection>
@@ -9698,9 +9665,7 @@
@@ -9823,9 +9790,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -140,7 +140,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.31 2012/08/30 14:28:22 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-ical.pid</replaceable>
@@ -10039,13 +10004,7 @@
@@ -10164,13 +10129,7 @@
<para><command>zarafa-licensed</command></para>
@ -155,7 +155,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.31 2012/08/30 14:28:22 ajacoutot Exp $
</refsection>
<refsection>
@@ -10215,9 +10174,7 @@
@@ -10340,9 +10299,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -166,7 +166,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.31 2012/08/30 14:28:22 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-licensed.pid</replaceable>
@@ -11015,13 +10972,6 @@
@@ -11140,13 +11097,6 @@
<option>-c</option>
<replaceable>/path/to/search.cfg</replaceable>
</para>
@ -180,7 +180,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.31 2012/08/30 14:28:22 ajacoutot Exp $
</refsection>
<refsection>
@@ -11152,9 +11102,7 @@
@@ -11277,9 +11227,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>

14
mail/zarafa/zarafa/patches/patch-installer_linux_monitor_cfg
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_monitor_cfg,v 1.3 2010/04/22 10:06:18 ajacoutot Exp $
--- installer/linux/monitor.cfg.orig Wed Apr 14 09:14:51 2010
+++ installer/linux/monitor.cfg Thu Apr 22 10:28:51 2010
$OpenBSD: patch-installer_linux_monitor_cfg,v 1.4 2012/10/28 21:51:08 robert Exp $
--- installer/linux/monitor.cfg.orig Sun Oct 28 21:12:53 2012
+++ installer/linux/monitor.cfg Sun Oct 28 21:13:59 2012
@@ -5,16 +5,16 @@
server_socket = file:///var/run/zarafa
@ -31,7 +31,7 @@ $OpenBSD: patch-installer_linux_monitor_cfg,v 1.3 2010/04/22 10:06:18 ajacoutot
# The password of the SSL Key
sslkey_pass = replace-with-monitor-cert-password
@@ -57,12 +57,12 @@ mailquota_resend_interval = 1
@@ -57,10 +57,10 @@ mailquota_resend_interval = 1
# Templates to be used for quota emails which are send to the user
# when the various user quota levels have been exceeded.
@ -43,10 +43,6 @@ $OpenBSD: patch-installer_linux_monitor_cfg,v 1.3 2010/04/22 10:06:18 ajacoutot
+userquota_hard_template = ${SYSCONFDIR}/zarafa/quotamail/userhard.mail
# Templates to be used for quota emails which are send to the company administrators
# when the various company quota levels have been exceeded.
# when the company quota level has been exceeded.
-companyquota_warning_template = /etc/zarafa/quotamail/companywarning.mail
-companyquota_soft_template = /etc/zarafa/quotamail/companysoft.mail
-companyquota_hard_template = /etc/zarafa/quotamail/companyhard.mail
+companyquota_warning_template = ${SYSCONFDIR}/zarafa/quotamail/companywarning.mail
+companyquota_soft_template = ${SYSCONFDIR}/zarafa/quotamail/companysoft.mail
+companyquota_hard_template = ${SYSCONFDIR}/zarafa/quotamail/companyhard.mail

11
mail/zarafa/zarafa/patches/patch-php-ext_main_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-php-ext_main_cpp,v 1.3 2012/08/30 14:28:22 ajacoutot Exp $
--- php-ext/main.cpp.orig Wed Aug 29 15:19:02 2012
+++ php-ext/main.cpp Wed Aug 29 14:37:28 2012
@@ -569,8 +569,10 @@ PHP_MINIT_FUNCTION(mapi)
$OpenBSD: patch-php-ext_main_cpp,v 1.4 2012/10/28 21:51:08 robert Exp $
--- php-ext/main.cpp.orig Sun Oct 28 21:14:05 2012
+++ php-ext/main.cpp Sun Oct 28 21:14:22 2012
@@ -568,8 +568,11 @@ PHP_MINIT_FUNCTION(mapi)
ZEND_INIT_MODULE_GLOBALS(mapi, php_mapi_init_globals, NULL);
@ -9,6 +9,7 @@ $OpenBSD: patch-php-ext_main_cpp,v 1.3 2012/08/30 14:28:22 ajacoutot Exp $
// force this program to use UTF-8, that way, we don't have to use lpszW and do all kinds of conversions from UTF-8 to WCHAR and back
forceUTF8Locale(false);
+#endif
+
return SUCCESS;
}

8
mail/zarafa/zarafa/patches/patch-provider_libserver_ECSession_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.8 2012/08/30 14:28:22 ajacoutot Exp $
--- provider/libserver/ECSession.cpp.orig Wed Aug 8 17:14:58 2012
+++ provider/libserver/ECSession.cpp Sat Aug 25 17:06:13 2012
@@ -819,11 +819,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.9 2012/10/28 21:51:08 robert Exp $
--- provider/libserver/ECSession.cpp.orig Thu Oct 18 19:06:58 2012
+++ provider/libserver/ECSession.cpp Sun Oct 28 21:08:55 2012
@@ -820,11 +820,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
uid_t uid;
char strbuf[1024];
#ifdef SO_PEERCRED

20
mail/zarafa/zarafa/patches/patch-provider_libserver_ZarafaCmd_cpp
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.24 2012/08/30 14:28:22 ajacoutot Exp $
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.25 2012/10/28 21:51:08 robert Exp $
OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
--- provider/libserver/ZarafaCmd.cpp.orig Wed Aug 8 17:14:58 2012
+++ provider/libserver/ZarafaCmd.cpp Wed Aug 29 14:18:22 2012
@@ -545,10 +545,10 @@ int ns__logon(struct soap *soap, char *user, char *pas
--- provider/libserver/ZarafaCmd.cpp.orig Thu Oct 18 19:06:58 2012
+++ provider/libserver/ZarafaCmd.cpp Sun Oct 28 21:08:55 2012
@@ -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);
@@ -645,9 +645,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;
}
@@ -665,10 +665,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);
@@ -816,9 +816,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;
}
@@ -830,10 +830,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);
@@ -855,20 +855,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); \
@@ -880,12 +880,12 @@ exit:
@@ -881,12 +881,12 @@ exit:
#define SOAP_ENTRY_FUNCTION_FOOTER \
__soapentry_exit: \
*lpResultVar = er; \

12
mail/zarafa/zarafa/patches/patch-provider_server_ECServer_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.23 2012/08/30 14:28:22 ajacoutot Exp $
--- provider/server/ECServer.cpp.orig Mon Aug 27 09:41:44 2012
+++ provider/server/ECServer.cpp Mon Aug 27 09:42:43 2012
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.24 2012/10/28 21:51:09 robert Exp $
--- provider/server/ECServer.cpp.orig Thu Oct 18 19:06:57 2012
+++ provider/server/ECServer.cpp Sun Oct 28 21:08:55 2012
@@ -87,6 +87,10 @@
#include "unicode/uclean.h"
#endif
@ -12,7 +12,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.23 2012/08/30 14:28:22 ajacouto
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
@@ -897,7 +901,7 @@ int running_server(char *szName, const char *szConfig)
@@ -897,7 +901,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.23 2012/08/30 14:28:22 ajacouto
{ "attachment_compression", "6" },
// Log options
@@ -970,7 +974,7 @@ int running_server(char *szName, const char *szConfig)
@@ -970,7 +974,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.23 2012/08/30 14:28:22 ajacouto
{ "client_update_log_path", "/var/log/zarafa/autoupdate", CONFIGSETTING_RELOADABLE },
{ "index_services_enabled", "", CONFIGSETTING_UNUSED },
{ "index_services_path", "", CONFIGSETTING_UNUSED },
@@ -999,10 +1003,14 @@ int running_server(char *szName, const char *szConfig)
@@ -999,10 +1003,14 @@ int running_server(char *szName, const char *szConfig,
{ NULL, NULL },
};

10
mail/zarafa/zarafa/patches/patch-spooler_Spooler_cpp
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-spooler_Spooler_cpp,v 1.14 2012/08/30 14:28:22 ajacoutot Exp $
--- spooler/Spooler.cpp.orig Wed Aug 8 17:14:58 2012
+++ spooler/Spooler.cpp Mon Aug 27 10:26:16 2012
$OpenBSD: patch-spooler_Spooler_cpp,v 1.15 2012/10/28 21:51:09 robert Exp $
--- spooler/Spooler.cpp.orig Thu Oct 18 19:06:58 2012
+++ spooler/Spooler.cpp Sun Oct 28 21:08:55 2012
@@ -1139,8 +1139,8 @@ int main(int argc, char *argv[]) {
{ "archive_on_send", "no", CONFIGSETTING_RELOADABLE },
{ "enable_dsn", "yes", CONFIGSETTING_RELOADABLE },
@ -12,7 +12,7 @@ $OpenBSD: patch-spooler_Spooler_cpp,v 1.14 2012/08/30 14:28:22 ajacoutot Exp $
{ NULL, NULL },
};
// SIGSEGV backtrace support
@@ -1245,6 +1245,7 @@ int main(int argc, char *argv[]) {
@@ -1253,6 +1253,7 @@ int main(int argc, char *argv[]) {
// detect linuxthreads, which is too broken to correctly run the spooler
if (!bForked) {
@ -20,7 +20,7 @@ $OpenBSD: patch-spooler_Spooler_cpp,v 1.14 2012/08/30 14:28:22 ajacoutot Exp $
char buffer[256];
confstr(_CS_GNU_LIBPTHREAD_VERSION, buffer, sizeof(buffer));
if (strncmp(buffer, "linuxthreads", strlen("linuxthreads")) == 0) {
@@ -1253,6 +1254,9 @@ int main(int argc, char *argv[]) {
@@ -1261,6 +1262,9 @@ int main(int argc, char *argv[]) {
g_lpLogger->Log(EC_LOGLEVEL_FATAL, "WARNING: your system is running with outdated linuxthreads.");
g_lpLogger->Log(EC_LOGLEVEL_FATAL, "WARNING: the zarafa-spooler will only be able to send one message at a time.");
}

12
mail/zarafa/zarafa/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.41 2012/09/05 08:07:24 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.42 2012/10/28 21:51:09 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
@ -154,6 +154,7 @@ include/zarafa/Util.h
include/zarafa/ZarafaCode.h
include/zarafa/auto_free.h
include/zarafa/base64.h
include/zarafa/boost_compat.h
include/zarafa/charset/
include/zarafa/charset/convert.h
include/zarafa/charset/convstring.h
@ -189,9 +190,6 @@ include/zarafa/tstring.h
include/zarafa/userutil.h
include/zarafa/ustringutil/
include/zarafa/ustringutil.h
include/zarafa/ustringutil/itercomp.h
include/zarafa/ustringutil/utf32iter.h
include/zarafa/ustringutil/utf8iter.h
include/zarafa/ustringutil/utfutil.h
include/zarafa/utf8/
include/zarafa/utf8.h
@ -267,9 +265,11 @@ lib/zarafa/
lib/zarafa/dbplugin.so
@comment lib/zarafa/ldapplugin.la
lib/zarafa/ldapplugin.so
@man man/man1/za-aclset.1
@man man/man1/za-restore.1
@man man/man1/zarafa-admin.1
@man man/man1/zarafa-archiver.1
@man man/man1/zarafa-autorespond.1
@man man/man1/zarafa-dagent.1
@man man/man1/zarafa-fsck.1
@man man/man1/zarafa-gateway.1
@ -364,10 +364,6 @@ share/examples/zarafa/monitor.cfg
@sample ${SYSCONFDIR}/zarafa/monitor.cfg
share/examples/zarafa/quotamail/
@sample ${SYSCONFDIR}/zarafa/quotamail/
share/examples/zarafa/quotamail/companyhard.mail
@sample ${SYSCONFDIR}/zarafa/quotamail/companyhard.mail
share/examples/zarafa/quotamail/companysoft.mail
@sample ${SYSCONFDIR}/zarafa/quotamail/companysoft.mail
share/examples/zarafa/quotamail/companywarning.mail
@sample ${SYSCONFDIR}/zarafa/quotamail/companywarning.mail
share/examples/zarafa/quotamail/userhard.mail