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

Update to zarafa 7.0.1.

Browse Source 
See http://download.zarafa.com/community/final/7.0/final-changelog-7.0.txt
for details.
This commit is contained in:
ajacoutot 2011-08-16 15:01:17 +00:00
parent 0bb9f03373
commit 6b0468c4af
15 changed files with 90 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/zarafa/Makefile.inc
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.11 2011/06/27 14:31:36 ajacoutot Exp $
# $OpenBSD: Makefile.inc,v 1.12 2011/08/16 15:01:17 ajacoutot Exp $
# there is no point in building/running this on NO_SHARED_LIBS archs
SHARED_ONLY= Yes
V?= 7.0.0
BUILD?= 27791
V?= 7.0.1
BUILD?= 28479
DISTNAME?= zcp-${V}
CATEGORIES+= mail/zarafa

3
mail/zarafa/libvmime/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.16 2011/06/27 14:31:36 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.17 2011/08/16 15:01:17 ajacoutot Exp $
COMMENT= modified libvmime library for Zarafa
@ -7,7 +7,6 @@ DISTNAME= libvmime-${VMIME_V}
PKGNAME= zarafa-libvmime-${VMIME_V}
EXTRACT_SUFX= .tar.bz2
REVISION= 0
EPOCH= 0
WRKDIST= ${WRKDIR}/libvmime-${VMIME_V}

5
mail/zarafa/zarafa/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.97 2011/07/14 09:45:13 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.98 2011/08/16 15:01:17 ajacoutot Exp $
COMMENT-main= MS Exchange groupware suite replacement
COMMENT-web= zarafa webaccess frontend and MAPI extensions for PHP
@ -7,9 +7,6 @@ PKGNAME= zarafa-${V}
PKGNAME-main= zarafa-${V}
PKGNAME-web= zarafa-webaccess-${V}
REVISION-main= 15
REVISION-web= 4
CATEGORIES= mail www productivity
SHARED_LIBS += mapi 2.0 # 0.0

10
mail/zarafa/zarafa/distinfo
View File

@ -1,5 +1,5 @@
MD5 (zarafa/zcp-7.0.0.tar.gz) = vtcJcJwXWFhBSqiWW0qiDw==
RMD160 (zarafa/zcp-7.0.0.tar.gz) = WEtVk2lvhQroKZgG5EfmGvOJ7EY=
SHA1 (zarafa/zcp-7.0.0.tar.gz) = 50Y1k87ok0OyEpuL1pd/lcx3gnk=
SHA256 (zarafa/zcp-7.0.0.tar.gz) = t8PIXAV461ygxfXSK77zFfL1LiIgjW4Rk/+lBbBelS4=
SIZE (zarafa/zcp-7.0.0.tar.gz) = 6006829
MD5 (zarafa/zcp-7.0.1.tar.gz) = LCaLHly6U4x9hOyadCwzRw==
RMD160 (zarafa/zcp-7.0.1.tar.gz) = geBmN7quCtsQbkDQX3LZA0ovv2c=
SHA1 (zarafa/zcp-7.0.1.tar.gz) = oVvrr9h6+oSOMD5d9LWNdwAQZWk=
SHA256 (zarafa/zcp-7.0.1.tar.gz) = ls/vrWt3WTvFVhuvgIqeri9mKk5qgkr5hCz7Tjb1yC0=
SIZE (zarafa/zcp-7.0.1.tar.gz) = 6023258

18
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-cfgchecker_Makefile_in
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-ECtools_zarafa-cfgchecker_Makefile_in,v 1.9 2011/06/02 12:46:37 ajacoutot Exp $
XXX see USE_LIBTOOL=gnu in the port Makefile
../../common/.libs/libcommon_mapi.so.X.X:
undefined reference to `MAPILogonEx' (and more)
--- ECtools/zarafa-cfgchecker/Makefile.in.orig Thu Jun 2 11:42:38 2011
+++ ECtools/zarafa-cfgchecker/Makefile.in Thu Jun 2 11:43:26 2011
@@ -268,7 +268,8 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX -I${top_srcdir}/common
-zarafa_cfgchecker_LDADD = ${top_builddir}/common/libcommon_util.la ${top_builddir}/common/libcommon_mapi.la $(PROG_LIBS)
+zarafa_cfgchecker_LDADD = ${top_builddir}/mapi4linux/src/libmapi.la \
+ ${top_builddir}/common/libcommon_util.la ${top_builddir}/common/libcommon_mapi.la $(PROG_LIBS)
zarafa_cfgchecker_SOURCES = \
zarafa-cfg.cpp \
ECConfigCheck.cpp ECConfigCheck.h \

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

@ -1,10 +1,10 @@
$OpenBSD: patch-common_mapi_ptr_mapi_object_ptr_h,v 1.3 2011/05/19 17:18:18 ajacoutot Exp $
$OpenBSD: patch-common_mapi_ptr_mapi_object_ptr_h,v 1.4 2011/08/16 15:01:17 ajacoutot Exp $
On OpenBSD, _P and _U are defined in ctype.h.
--- common/mapi_ptr/mapi_object_ptr.h.orig Thu May 19 17:01:33 2011
+++ common/mapi_ptr/mapi_object_ptr.h Thu May 19 18:30:36 2011
@@ -170,13 +170,13 @@ class mapi_object_ptr (public)
--- common/mapi_ptr/mapi_object_ptr.h.orig Tue Aug 2 15:02:45 2011
+++ common/mapi_ptr/mapi_object_ptr.h Sun Aug 14 04:45:51 2011
@@ -146,13 +146,13 @@ class mapi_object_ptr (public)
std::swap(m_lpObject, other.m_lpObject);
}
@ -22,7 +22,7 @@ On OpenBSD, _P and _U are defined in ctype.h.
if (hr == hrSuccess)
refResult = lpNewObject;
@@ -198,7 +198,7 @@ class mapi_object_ptr (public)
@@ -174,7 +174,7 @@ class mapi_object_ptr (public)
if (HrGetOneProp(m_lpObject, PR_EC_OBJECT, &ptrPropValue) != hrSuccess)
goto exit; // hr is still MAPI_E_INTERFACE_NOT_SUPPORTED
@ -31,7 +31,7 @@ On OpenBSD, _P and _U are defined in ctype.h.
if (hr == hrSuccess)
refResult = lpNewObject;
}
@@ -229,9 +229,9 @@ class mapi_object_ptr (public)
@@ -200,9 +200,9 @@ class mapi_object_ptr (public)
return m_lpObject == NULL;
}

26
mail/zarafa/zarafa/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.15 2011/06/10 15:55:00 ajacoutot Exp $
--- configure.orig Thu Jun 9 22:21:21 2011
+++ configure Fri Jun 10 13:34:10 2011
@@ -21920,13 +21920,13 @@ fi
$OpenBSD: patch-configure,v 1.16 2011/08/16 15:01:17 ajacoutot Exp $
--- configure.orig Tue Aug 2 11:47:36 2011
+++ configure Sun Aug 14 04:45:51 2011
@@ -21934,13 +21934,13 @@ fi
# Everything uses pthread
# check lib, but do not set in link list, but use -pthread instead (gnu c/c++ only?)
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.15 2011/06/10 15:55:00 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -22045,7 +22045,7 @@ else
@@ -22059,7 +22059,7 @@ else
with_distro=rhel
fi
@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.15 2011/06/10 15:55:00 ajacoutot Exp $
{ echo "$as_me:$LINENO: result: unknown distro, using rhel instead" >&5
echo "${ECHO_T}unknown distro, using rhel instead" >&6; }
with_distro=rhel
@@ -24445,7 +24445,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then
@@ -24459,7 +24459,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.15 2011/06/10 15:55:00 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -24505,7 +24505,7 @@ if test $ac_cv_lib_intl_strftime = yes; then
@@ -24519,7 +24519,7 @@ if test $ac_cv_lib_intl_strftime = yes; then
#define HAVE_STRFTIME 1
_ACEOF
@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.15 2011/06/10 15:55:00 ajacoutot Exp $
fi
fi
@@ -26019,7 +26019,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -26035,7 +26035,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
_ACEOF
VMIME_CFLAGS=-I$VMIME_PREFIX
@ -54,7 +54,7 @@ $OpenBSD: patch-configure,v 1.15 2011/06/10 15:55:00 ajacoutot Exp $
else
@@ -27536,13 +27536,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
@@ -27552,13 +27552,13 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
@ -71,7 +71,7 @@ $OpenBSD: patch-configure,v 1.15 2011/06/10 15:55:00 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -27602,7 +27602,7 @@ if test $ac_cv_lib_crypt_crypt = yes; then
@@ -27618,7 +27618,7 @@ if test $ac_cv_lib_crypt_crypt = yes; then
#define HAVE_LIBCRYPT 1
_ACEOF
@ -80,7 +80,7 @@ $OpenBSD: patch-configure,v 1.15 2011/06/10 15:55:00 ajacoutot Exp $
else
{ { echo "$as_me:$LINENO: error: required library libcrypt missing or unusable" >&5
@@ -27696,7 +27696,7 @@ if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then
@@ -27712,7 +27712,7 @@ if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -89,7 +89,7 @@ $OpenBSD: patch-configure,v 1.15 2011/06/10 15:55:00 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -28803,7 +28803,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then
@@ -28819,7 +28819,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -98,7 +98,7 @@ $OpenBSD: patch-configure,v 1.15 2011/06/10 15:55:00 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -28859,7 +28859,7 @@ fi
@@ -28875,7 +28875,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_intl_gettext" >&5
echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6; }
if test $ac_cv_lib_intl_gettext = yes; then

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

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_manual_xml,v 1.22 2011/06/10 15:55:00 ajacoutot Exp $
--- doc/manual.xml.orig Thu Jun 9 22:19:40 2011
+++ doc/manual.xml Fri Jun 10 13:33:16 2011
$OpenBSD: patch-doc_manual_xml,v 1.23 2011/08/16 15:01:17 ajacoutot Exp $
--- doc/manual.xml.orig Tue Aug 2 11:45:54 2011
+++ doc/manual.xml Sun Aug 14 04:45:51 2011
@@ -849,9 +849,7 @@
<varlistentry>
<term><option>pid_file</option></term>
@ -12,7 +12,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.22 2011/06/10 15:55:00 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-dagent.pid</replaceable>
@@ -1205,11 +1203,6 @@
@@ -1256,11 +1254,6 @@
<replaceable>/path/to/server.cfg</replaceable>
</para>
@ -24,7 +24,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.22 2011/06/10 15:55:00 ajacoutot Exp $
</refsection>
<refsection>
@@ -1292,11 +1285,15 @@
@@ -1343,11 +1336,15 @@
</para>
<para>Then, you must setup a signed SSL certificate. First,
we'll create a Certificate Authority to be able to sign
@ -41,7 +41,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.22 2011/06/10 15:55:00 ajacoutot Exp $
</para>
<para>
<command>
@@ -2934,9 +2931,7 @@
@@ -2985,9 +2982,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -52,7 +52,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.22 2011/06/10 15:55:00 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-server.pid</replaceable>
@@ -5879,13 +5874,8 @@
@@ -5930,13 +5925,8 @@
</para>
<para>The spooler process will keep running and watching the
@ -68,7 +68,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.22 2011/06/10 15:55:00 ajacoutot Exp $
</refsection>
<refsection>
@@ -6066,9 +6056,7 @@
@@ -6117,9 +6107,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -79,7 +79,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.22 2011/06/10 15:55:00 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-spooler.pid</replaceable>
@@ -6467,13 +6455,8 @@
@@ -6535,13 +6523,8 @@
<para><command>zarafa-gateway</command></para>
@ -95,7 +95,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.22 2011/06/10 15:55:00 ajacoutot Exp $
</refsection>
<refsection>
@@ -6712,9 +6695,7 @@
@@ -6780,9 +6763,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -106,7 +106,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.22 2011/06/10 15:55:00 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-gateway.pid</replaceable>
@@ -7109,14 +7090,8 @@
@@ -7177,14 +7158,8 @@
<para>The monitor checks user mailbox sizes. The monitor sends
a quota email when the warning quota limit is reached. When
@ -122,7 +122,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.22 2011/06/10 15:55:00 ajacoutot Exp $
</refsection>
<refsection>
@@ -7268,9 +7243,7 @@
@@ -7336,9 +7311,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -133,7 +133,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.22 2011/06/10 15:55:00 ajacoutot Exp $
</para>
<para>Default value: /var/run/zarafa-monitor.pid
</para>
@@ -8540,13 +8513,8 @@
@@ -8608,13 +8581,8 @@
<para><command>zarafa-ical</command></para>
@ -149,7 +149,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.22 2011/06/10 15:55:00 ajacoutot Exp $
</refsection>
<refsection>
@@ -8729,9 +8697,7 @@
@@ -8797,9 +8765,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -160,7 +160,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.22 2011/06/10 15:55:00 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-ical.pid</replaceable>
@@ -9045,13 +9011,8 @@
@@ -9113,13 +9079,8 @@
<para><command>zarafa-licensed</command></para>
@ -176,7 +176,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.22 2011/06/10 15:55:00 ajacoutot Exp $
</refsection>
<refsection>
@@ -9221,9 +9182,7 @@
@@ -9289,9 +9250,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -187,7 +187,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.22 2011/06/10 15:55:00 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-licensed.pid</replaceable>
@@ -9842,13 +9801,6 @@
@@ -9910,13 +9869,6 @@
<option>-c</option>
<replaceable>/path/to/indexer.cfg</replaceable>
</para>

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_server_cfg,v 1.10 2011/06/02 12:46:37 ajacoutot Exp $
--- installer/linux/server.cfg.orig Wed Apr 20 16:39:10 2011
+++ installer/linux/server.cfg Mon May 2 13:17:54 2011
$OpenBSD: patch-installer_linux_server_cfg,v 1.11 2011/08/16 15:01:17 ajacoutot Exp $
--- installer/linux/server.cfg.orig Tue Aug 2 11:47:12 2011
+++ installer/linux/server.cfg Sun Aug 14 04:49:53 2011
@@ -39,16 +39,16 @@ local_admin_users = root
system_email_address = postmaster@localhost
@ -110,3 +110,9 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.10 2011/06/02 12:46:37 ajacoutot
# Everyone is a special internal group, which contains every user and group
# You may want to disable this group from the Global Addressbook by setting
@@ -383,4 +384,4 @@ sync_gab_realtime = yes
# Disable features for users. Default all features are disabled. This
# list is space separated. Currently valid values: imap
-disabled_features = imap pop3
+disabled_features =

16
mail/zarafa/zarafa/patches/patch-provider_libserver_StreamUtil_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-provider_libserver_StreamUtil_cpp,v 1.2 2011/06/02 12:46:37 ajacoutot Exp $
$OpenBSD: patch-provider_libserver_StreamUtil_cpp,v 1.3 2011/08/16 15:01:17 ajacoutot Exp $
Needs newlocale(3).
--- provider/libserver/StreamUtil.cpp.orig Wed Apr 20 19:51:48 2011
+++ provider/libserver/StreamUtil.cpp Mon May 2 12:47:53 2011
--- provider/libserver/StreamUtil.cpp.orig Tue Aug 2 15:02:48 2011
+++ provider/libserver/StreamUtil.cpp Sun Aug 14 04:45:52 2011
@@ -280,7 +280,9 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
unsigned int ulKind;
unsigned int ulNameId;
@ -14,7 +14,7 @@ Needs newlocale(3).
convert_context converter;
short i;
@@ -317,7 +319,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
@@ -325,7 +327,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
er = ZARAFA_E_NOT_FOUND;
goto exit;
}
@ -26,7 +26,7 @@ Needs newlocale(3).
er = lpSink->Write(&flt, sizeof(flt), 1);
break;
case PT_BOOLEAN:
@@ -334,7 +340,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
@@ -342,7 +348,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
er = ZARAFA_E_NOT_FOUND;
goto exit;
}
@ -38,7 +38,7 @@ Needs newlocale(3).
er = lpSink->Write(&dbl, sizeof(dbl), 1);
break;
case PT_CURRENCY:
@@ -431,7 +441,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
@@ -439,7 +449,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
for (unsigned x = 0; er == erSuccess && x < ulCount; x++)
{
ParseMVProp(lpRow[FIELD_NR_DOUBLE], lpLen[FIELD_NR_DOUBLE], &ulLastPos, &strData);
@ -50,7 +50,7 @@ Needs newlocale(3).
er = lpSink->Write(&flt, sizeof(flt), 1);
}
break;
@@ -448,7 +462,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
@@ -456,7 +470,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
for (unsigned x = 0; er == erSuccess && x < ulCount; x++)
{
ParseMVProp(lpRow[FIELD_NR_DOUBLE], lpLen[FIELD_NR_DOUBLE], &ulLastPos, &strData);
@ -62,7 +62,7 @@ Needs newlocale(3).
er = lpSink->Write(&dbl, sizeof(flt), 1);
}
break;
@@ -566,7 +584,9 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
@@ -574,7 +592,9 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
}
exit:

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

@ -1,6 +1,6 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.14 2011/06/10 15:55:00 ajacoutot Exp $
--- provider/server/ECServer.cpp.orig Fri Jun 10 03:37:39 2011
+++ provider/server/ECServer.cpp Fri Jun 10 13:33:17 2011
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.15 2011/08/16 15:01:17 ajacoutot Exp $
--- provider/server/ECServer.cpp.orig Tue Aug 2 15:02:47 2011
+++ provider/server/ECServer.cpp Sun Aug 14 04:45:52 2011
@@ -86,6 +86,10 @@
#include "unicode/uclean.h"
#endif
@ -12,7 +12,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.14 2011/06/10 15:55:00 ajacouto
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
@@ -675,7 +679,7 @@ int running_server(char *szName, char *szConfig)
@@ -676,7 +680,7 @@ int running_server(char *szName, 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.14 2011/06/10 15:55:00 ajacouto
{ "attachment_compression", "6" },
// Log options
@@ -746,7 +750,7 @@ int running_server(char *szName, char *szConfig)
@@ -747,7 +751,7 @@ int running_server(char *szName, char *szConfig)
{ "cache_sortkey_size", "0", CONFIGSETTING_UNUSED }, // Option not support, only for backward compatibility of all configurations under the 6.20
{ "client_update_enabled", "no" },

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

@ -1,7 +1,7 @@
$OpenBSD: patch-spooler_DAgent_cpp,v 1.15 2011/06/10 15:55:00 ajacoutot Exp $
--- spooler/DAgent.cpp.orig Fri Jun 10 03:37:37 2011
+++ spooler/DAgent.cpp Fri Jun 10 13:33:17 2011
@@ -89,6 +89,10 @@
$OpenBSD: patch-spooler_DAgent_cpp,v 1.16 2011/08/16 15:01:17 ajacoutot Exp $
--- spooler/DAgent.cpp.orig Tue Aug 2 15:02:47 2011
+++ spooler/DAgent.cpp Sun Aug 14 04:45:52 2011
@@ -91,6 +91,10 @@
#include <sys/mman.h>
#include <pwd.h>
@ -12,7 +12,7 @@ $OpenBSD: patch-spooler_DAgent_cpp,v 1.15 2011/06/10 15:55:00 ajacoutot Exp $
/*
This is actually from sysexits.h
but since those windows lamers don't have it ..
@@ -3064,7 +3068,7 @@ int main(int argc, char *argv[]) {
@@ -3111,7 +3115,7 @@ int main(int argc, char *argv[]) {
DeliveryArgs sDeliveryArgs;
sDeliveryArgs.strPath = "";

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

@ -1,12 +1,12 @@
$OpenBSD: patch-spooler_Makefile_in,v 1.11 2011/06/10 15:55:00 ajacoutot Exp $
--- spooler/Makefile.in.orig Thu Jun 9 22:21:31 2011
+++ spooler/Makefile.in Fri Jun 10 13:33:17 2011
@@ -292,7 +292,7 @@ zarafa_spooler_LDADD = ${top_builddir}/inetmapi/libine
${top_builddir}/common/libcommon_mapi.la \
$OpenBSD: patch-spooler_Makefile_in,v 1.12 2011/08/16 15:01:17 ajacoutot Exp $
--- spooler/Makefile.in.orig Tue Aug 2 11:47:41 2011
+++ spooler/Makefile.in Sun Aug 14 04:48:09 2011
@@ -299,7 +299,7 @@ zarafa_spooler_LDADD = ${top_builddir}/inetmapi/libine
${top_builddir}/common/libcommon_util.la \
${top_builddir}/common/libcommon_ssl.la \
${top_builddir}/ECtools/zarafa-archiver/libarchiver.la \
- $(PROG_LIBS)
+ $(PROG_LIBS) $(SSL_LIBS)
zarafa_dagent_SOURCES = DAgent.cpp rules.cpp rules.h LMTP.cpp LMTP.h
zarafa_spooler_SOURCES = Spooler.cpp mailer.cpp mailer.h
zarafa_dagent_SOURCES = DAgent.cpp rules.cpp rules.h LMTP.cpp LMTP.h archive.cpp archive.h
zarafa_spooler_SOURCES = Spooler.cpp mailer.cpp mailer.h archive.cpp archive.h

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

@ -1,10 +1,10 @@
$OpenBSD: patch-spooler_Spooler_cpp,v 1.7 2011/07/01 23:23:02 robert Exp $
$OpenBSD: patch-spooler_Spooler_cpp,v 1.8 2011/08/16 15:01:17 ajacoutot Exp $
XXX to be revisited
--- spooler/Spooler.cpp.orig Wed Jun 22 00:02:19 2011
+++ spooler/Spooler.cpp Sat Jul 2 01:07:50 2011
@@ -1213,6 +1213,7 @@ int main(int argc, char *argv[]) {
--- spooler/Spooler.cpp.orig Tue Aug 2 15:02:47 2011
+++ spooler/Spooler.cpp Sun Aug 14 04:45:52 2011
@@ -1214,6 +1214,7 @@ int main(int argc, char *argv[]) {
if (g_lpConfig->HasWarnings())
LogConfigErrors(g_lpConfig, g_lpLogger);
@ -12,7 +12,7 @@ XXX to be revisited
// detect linuxthreads, which is too broken to correctly run the spooler
if (!bForked) {
char buffer[256];
@@ -1224,7 +1225,13 @@ int main(int argc, char *argv[]) {
@@ -1225,7 +1226,13 @@ int main(int argc, char *argv[]) {
g_lpLogger->Log(EC_LOGLEVEL_FATAL, "WARNING: the zarafa-spooler will only be able to send one message at a time.");
}
}
@ -26,7 +26,7 @@ XXX to be revisited
// set socket filename
if (!szPath)
szPath = g_lpConfig->GetSetting("server_socket");
@@ -1321,11 +1328,8 @@ int main(int argc, char *argv[]) {
@@ -1322,11 +1329,8 @@ int main(int argc, char *argv[]) {
if (bNPTL) {
g_lpLogger->Log(EC_LOGLEVEL_DEBUG, "Joining signal thread");
pthread_join(signal_thread, NULL);

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

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST-main,v 1.30 2011/06/10 15:55:00 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.31 2011/08/16 15:01:17 ajacoutot Exp $
@newgroup _zarafa:627
@newuser _zarafa:627:_zarafa:daemon:Zarafa Account:/var/empty:/sbin/nologin
@bin bin/zarafa-admin
@bin bin/zarafa-archiver
bin/zarafa-autorespond
@bin bin/zarafa-dagent
@bin bin/zarafa-fsck
@ -272,6 +273,8 @@ share/examples/zarafa/
@mode
@group
@sample ${SYSCONFDIR}/zarafa/sslkeys/
share/examples/zarafa/archiver.cfg
@sample ${SYSCONFDIR}/zarafa/archiver.cfg
share/examples/zarafa/autorespond
@sample ${SYSCONFDIR}/zarafa/autorespond
share/examples/zarafa/dagent.cfg