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

Update to zarafa-7.0.4.

Browse Source 
Details changelog available at:
http://download.zarafa.com/community/final/7.0/final-changelog-7.0.txt
This commit is contained in:
ajacoutot 2011-12-22 17:10:03 +00:00
parent 0f7a0ec1f7
commit 1713e4fc39
24 changed files with 150 additions and 136 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.15 2011/11/23 13:23:33 ajacoutot Exp $
# $OpenBSD: Makefile.inc,v 1.16 2011/12/22 17:10:03 ajacoutot Exp $
# there is no point in building/running this on NO_SHARED_LIBS archs
SHARED_ONLY= Yes
V?= 7.0.3
BUILD?= 30515
V?= 7.0.4
BUILD?= 31235
DISTNAME?= zcp-${V}
CATEGORIES+= mail/zarafa

4
mail/zarafa/libvmime/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2011/11/23 13:23:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.22 2011/12/22 17:10:04 ajacoutot Exp $
COMMENT= modified libvmime library for Zarafa
@ -6,7 +6,7 @@ VMIME_V= 0.9.1
DISTNAME= libvmime-${VMIME_V}
PKGNAME= zarafa-libvmime-${VMIME_V}
EPOCH= 0
REVISION= 4
REVISION= 5
EXTRACT_SUFX= .tar.bz2

12
mail/zarafa/zarafa/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.111 2011/11/23 13:23:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.112 2011/12/22 17:10:04 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= 0
REVISION-web= 0
CATEGORIES= mail www productivity
SHARED_LIBS += mapi 2.0 # 0.0
@ -140,7 +137,8 @@ pre-configure:
for i in ${SUB_SCRIPTS}; do \
${SUBST_CMD} ${WRKSRC}/installer/userscripts/$$i; done
${SUBST_CMD} ${WRKSRC}/php-ext/Makefile.in \
${WRKSRC}/spooler/DAgent.cpp
${WRKSRC}/spooler/DAgent.cpp \
${WRKSRC}/installer/linux/zarafa-client-update.cron
perl -pi -e 's,/usr/share/zarafa,${PREFIX}/share/examples/zarafa,g;' \
-e 's,/etc/zarafa,${SYSCONFDIR}/zarafa,g;' \
-e 's,/usr/bin,${PREFIX}/bin,g;' \
@ -187,10 +185,12 @@ post-install:
mv ${PREFIX}/share/examples/zarafa/zarafa.ini \
${PREFIX}/share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
mv ${PREFIX}/share/php ${WRKINST}${PREFIX-web}/include/php
mv ${PREFIX}/share/examples/cron.daily/zarafa-client-update \
${PREFIX}/share/examples/zarafa/
rm ${PREFIX}/share/examples/zarafa/unix.cfg
rm ${PREFIX}/share/doc/zarafa/ssl-certificates.sh
rmdir ${PREFIX}/share/doc/{zarafa/example-config,zarafa-gateway}
rm -rf ${PREFIX}/share/examples/{init.d,logrotate.d,zarafa/zarafa-gateway,zarafa/license}
rm -rf ${PREFIX}/share/examples/{cron.daily,init.d,logrotate.d,sysconfig,zarafa/zarafa-gateway,zarafa/license}
# part of zarafa-licensed (i.e. commercial edition, linux bin only)
cd ${PREFIX} && rm \

10
mail/zarafa/zarafa/distinfo
View File

@ -1,5 +1,5 @@
MD5 (zarafa/zcp-7.0.3.tar.gz) = yplQLokIkoY1fnJJN5F+qg==
RMD160 (zarafa/zcp-7.0.3.tar.gz) = vwiFRwSIzO1Wf2yaUZzepRxXsxc=
SHA1 (zarafa/zcp-7.0.3.tar.gz) = CDZSFCVCmTgs9X/eLC4UNMbVjIE=
SHA256 (zarafa/zcp-7.0.3.tar.gz) = 7mPkPVl0BMeXEv1l3soTsWM+CiC7K04/3TF3B5VwYBQ=
SIZE (zarafa/zcp-7.0.3.tar.gz) = 6137777
MD5 (zarafa/zcp-7.0.4.tar.gz) = TJd0x/B+jq64/WLMHdfA/Q==
RMD160 (zarafa/zcp-7.0.4.tar.gz) = EP4uBw9q6SeKj+YPP9cSFnkPrac=
SHA1 (zarafa/zcp-7.0.4.tar.gz) = 6/x9vwnLv/7JgvTpeWvpuM/uJl8=
SHA256 (zarafa/zcp-7.0.4.tar.gz) = tL5/CKAnpKx9qphv2yeR4Gm98jwVVnUYHBF4dNxDAs0=
SIZE (zarafa/zcp-7.0.4.tar.gz) = 6116000

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

@ -1,7 +1,7 @@
$OpenBSD: patch-common_CommonUtil_cpp,v 1.3 2011/09/29 17:12:11 ajacoutot Exp $
--- common/CommonUtil.cpp.orig Mon Sep 26 15:56:08 2011
+++ common/CommonUtil.cpp Thu Sep 29 16:53:37 2011
@@ -84,6 +84,7 @@
$OpenBSD: patch-common_CommonUtil_cpp,v 1.4 2011/12/22 17:10:04 ajacoutot Exp $
--- common/CommonUtil.cpp.orig Thu Dec 22 01:02:33 2011
+++ common/CommonUtil.cpp Thu Dec 22 12:14:19 2011
@@ -85,6 +85,7 @@
#include <sys/types.h>
#include <sys/socket.h>

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

@ -1,9 +1,9 @@
$OpenBSD: patch-common_ECLogger_cpp,v 1.11 2011/11/17 15:14:37 ajacoutot Exp $
$OpenBSD: patch-common_ECLogger_cpp,v 1.12 2011/12/22 17:10:04 ajacoutot Exp $
Needs newlocale(3).
--- common/ECLogger.cpp.orig Thu Nov 17 03:03:21 2011
+++ common/ECLogger.cpp Thu Nov 17 14:58:59 2011
--- common/ECLogger.cpp.orig Thu Dec 22 01:02:33 2011
+++ common/ECLogger.cpp Thu Dec 22 12:14:19 2011
@@ -55,6 +55,10 @@
#include <assert.h>
#include "stringutil.h"
@ -47,7 +47,7 @@ Needs newlocale(3).
strftime(timestring, _LOG_TSSIZE, "%c", &local);
return timestring;
@@ -222,7 +232,7 @@ void ECLogger_File::DoPrefix() {
@@ -224,7 +234,7 @@ void ECLogger_File::DoPrefix() {
if (timestamp)
fnPrintf(log, "%s: ", MakeTimestamp());
if (prefix == LP_TID)
@ -74,7 +74,7 @@ Needs newlocale(3).
else if (prefix == LP_PID)
len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[%5d] ", getpid());
off += len;
@@ -580,9 +590,13 @@ namespace PrivatePipe {
@@ -586,9 +596,13 @@ namespace PrivatePipe {
int l;
bool bNPTL = true;

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

@ -1,10 +1,10 @@
$OpenBSD: patch-common_mapi_ptr_mapi_memory_ptr_h,v 1.2 2011/03/11 08:44:44 ajacoutot Exp $
$OpenBSD: patch-common_mapi_ptr_mapi_memory_ptr_h,v 1.3 2011/12/22 17:10:04 ajacoutot Exp $
On OpenBSD, _U is defined in ctype.h.
--- common/mapi_ptr/mapi_memory_ptr.h.orig Thu Mar 10 18:17:04 2011
+++ common/mapi_ptr/mapi_memory_ptr.h Thu Mar 10 18:17:32 2011
@@ -160,11 +160,11 @@ class mapi_memory_ptr (public)
--- common/mapi_ptr/mapi_memory_ptr.h.orig Thu Dec 22 01:02:34 2011
+++ common/mapi_ptr/mapi_memory_ptr.h Thu Dec 22 12:14:19 2011
@@ -165,11 +165,11 @@ class mapi_memory_ptr (public)
return proxy(&m_lpMemory);
}

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.5 2011/09/29 17:12:11 ajacoutot Exp $
$OpenBSD: patch-common_mapi_ptr_mapi_object_ptr_h,v 1.6 2011/12/22 17:10:04 ajacoutot Exp $
On OpenBSD, _P and _U are defined in ctype.h.
--- common/mapi_ptr/mapi_object_ptr.h.orig Mon Sep 26 15:56:08 2011
+++ common/mapi_ptr/mapi_object_ptr.h Thu Sep 29 16:53:37 2011
@@ -146,13 +146,13 @@ class mapi_object_ptr (public)
--- common/mapi_ptr/mapi_object_ptr.h.orig Thu Dec 22 01:02:34 2011
+++ common/mapi_ptr/mapi_object_ptr.h Thu Dec 22 12:14:19 2011
@@ -142,13 +142,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;
@@ -174,7 +174,7 @@ class mapi_object_ptr (public)
@@ -170,7 +170,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;
}
@@ -204,9 +204,9 @@ class mapi_object_ptr (public)
@@ -196,9 +196,9 @@ class mapi_object_ptr (public)
return m_lpObject;
}

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

@ -1,6 +1,6 @@
$OpenBSD: patch-common_platform_linux_h,v 1.11 2011/06/02 12:46:37 ajacoutot Exp $
--- common/platform.linux.h.orig Wed Apr 20 19:51:45 2011
+++ common/platform.linux.h Thu Jun 2 10:41:55 2011
$OpenBSD: patch-common_platform_linux_h,v 1.12 2011/12/22 17:10:04 ajacoutot Exp $
--- common/platform.linux.h.orig Thu Dec 22 01:02:34 2011
+++ common/platform.linux.h Thu Dec 22 12:14:19 2011
@@ -63,8 +63,16 @@
#include <dlfcn.h>
#include <stddef.h>
@ -18,7 +18,7 @@ $OpenBSD: patch-common_platform_linux_h,v 1.11 2011/06/02 12:46:37 ajacoutot Exp
#include <errno.h>
#include <string>
@@ -662,7 +670,11 @@ time_t GetProcessTime();
@@ -663,7 +671,11 @@ time_t GetProcessTime();
#ifndef ntohll
#if __BYTE_ORDER == __LITTLE_ENDIAN
@ -30,7 +30,7 @@ $OpenBSD: patch-common_platform_linux_h,v 1.11 2011/06/02 12:46:37 ajacoutot Exp
#else
#define ntohll(x) (x)
#endif
@@ -670,14 +682,18 @@ time_t GetProcessTime();
@@ -671,14 +683,18 @@ time_t GetProcessTime();
#ifndef htonll
#if __BYTE_ORDER == __LITTLE_ENDIAN

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

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.17 2011/11/17 15:14:37 ajacoutot Exp $
--- configure.orig Wed Nov 16 23:02:01 2011
+++ configure Thu Nov 17 13:59:31 2011
$OpenBSD: patch-configure,v 1.18 2011/12/22 17:10:04 ajacoutot Exp $
--- configure.orig Wed Dec 21 20:17:32 2011
+++ configure Thu Dec 22 12:14:19 2011
@@ -21934,13 +21934,13 @@ fi
# Everything uses pthread
@ -18,15 +18,6 @@ $OpenBSD: patch-configure,v 1.17 2011/11/17 15:14:37 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -22059,7 +22059,7 @@ else
with_distro=rhel
fi
-if test "$with_distro" != "rhel" -a "$with_distro" != "suse" -a "$with_distro" != "sles" -a "$with_distro" != "cbs4"; then
+if test "$with_distro" != "rhel" -a "$with_distro" != "suse" -a "$with_distro" != "sles" -a "$with_distro" != "cbs4" -a "$with_distro" != "openbsd"; then
{ echo "$as_me:$LINENO: result: unknown distro, using rhel instead" >&5
echo "${ECHO_T}unknown distro, using rhel instead" >&6; }
with_distro=rhel
@@ -24459,7 +24459,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else

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

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_manual_xml,v 1.25 2011/11/17 15:14:37 ajacoutot Exp $
--- doc/manual.xml.orig Wed Nov 16 23:00:32 2011
+++ doc/manual.xml Thu Nov 17 13:59:31 2011
$OpenBSD: patch-doc_manual_xml,v 1.26 2011/12/22 17:10:04 ajacoutot Exp $
--- doc/manual.xml.orig Wed Dec 21 20:16:19 2011
+++ doc/manual.xml Thu Dec 22 12:14:19 2011
@@ -850,9 +850,7 @@
<varlistentry>
<term><option>pid_file</option></term>
@ -41,7 +41,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.25 2011/11/17 15:14:37 ajacoutot Exp $
</para>
<para>
<command>
@@ -3042,9 +3039,7 @@
@@ -3054,9 +3051,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -52,7 +52,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.25 2011/11/17 15:14:37 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-server.pid</replaceable>
@@ -6026,13 +6021,8 @@
@@ -6057,13 +6052,8 @@
</para>
<para>The spooler process will keep running and watching the
@ -68,7 +68,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.25 2011/11/17 15:14:37 ajacoutot Exp $
</refsection>
<refsection>
@@ -6213,9 +6203,7 @@
@@ -6244,9 +6234,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -79,7 +79,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.25 2011/11/17 15:14:37 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-spooler.pid</replaceable>
@@ -6645,13 +6633,8 @@
@@ -6676,13 +6664,8 @@
<para><command>zarafa-gateway</command></para>
@ -95,7 +95,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.25 2011/11/17 15:14:37 ajacoutot Exp $
</refsection>
<refsection>
@@ -6890,9 +6873,7 @@
@@ -6921,9 +6904,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -106,7 +106,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.25 2011/11/17 15:14:37 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-gateway.pid</replaceable>
@@ -7308,14 +7289,8 @@
@@ -7339,14 +7320,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.25 2011/11/17 15:14:37 ajacoutot Exp $
</refsection>
<refsection>
@@ -7467,9 +7442,7 @@
@@ -7498,9 +7473,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -133,7 +133,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.25 2011/11/17 15:14:37 ajacoutot Exp $
</para>
<para>Default value: /var/run/zarafa-monitor.pid
</para>
@@ -8745,13 +8718,8 @@
@@ -8776,13 +8749,8 @@
<para><command>zarafa-ical</command></para>
@ -149,7 +149,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.25 2011/11/17 15:14:37 ajacoutot Exp $
</refsection>
<refsection>
@@ -8934,9 +8902,7 @@
@@ -8965,9 +8933,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -160,7 +160,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.25 2011/11/17 15:14:37 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-ical.pid</replaceable>
@@ -9264,13 +9230,8 @@
@@ -9295,13 +9261,8 @@
<para><command>zarafa-licensed</command></para>
@ -176,7 +176,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.25 2011/11/17 15:14:37 ajacoutot Exp $
</refsection>
<refsection>
@@ -9440,9 +9401,7 @@
@@ -9471,9 +9432,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -187,7 +187,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.25 2011/11/17 15:14:37 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-licensed.pid</replaceable>
@@ -10225,13 +10184,6 @@
@@ -10256,13 +10215,6 @@
<option>-c</option>
<replaceable>/path/to/indexer.cfg</replaceable>
</para>

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_indexer_cfg,v 1.3 2011/11/17 15:14:37 ajacoutot Exp $
--- installer/linux/indexer.cfg.orig Wed Nov 16 23:01:36 2011
+++ installer/linux/indexer.cfg Thu Nov 17 13:59:31 2011
$OpenBSD: patch-installer_linux_indexer_cfg,v 1.4 2011/12/22 17:10:04 ajacoutot Exp $
--- installer/linux/indexer.cfg.orig Wed Dec 21 20:17:06 2011
+++ installer/linux/indexer.cfg Thu Dec 22 12:14:19 2011
@@ -2,19 +2,19 @@
# INDEXER SERVICE SETTINGS
@ -47,7 +47,7 @@ $OpenBSD: patch-installer_linux_indexer_cfg,v 1.3 2011/11/17 15:14:37 ajacoutot
##############################################################
# LOG SETTINGS
@@ -106,7 +106,7 @@ index_attachments = yes
@@ -106,7 +106,7 @@ index_attachments = no
index_attachment_max_size = 5120
# Scripts to attachment to text parser

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_server_cfg,v 1.13 2011/11/17 15:14:37 ajacoutot Exp $
--- installer/linux/server.cfg.orig Wed Nov 16 23:01:36 2011
+++ installer/linux/server.cfg Thu Nov 17 13:59:31 2011
$OpenBSD: patch-installer_linux_server_cfg,v 1.14 2011/12/22 17:10:04 ajacoutot Exp $
--- installer/linux/server.cfg.orig Wed Dec 21 20:17:06 2011
+++ installer/linux/server.cfg Thu Dec 22 12:15:41 2011
@@ -39,16 +39,16 @@ local_admin_users = root
system_email_address = postmaster@localhost
@ -31,12 +31,8 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.13 2011/11/17 15:14:37 ajacoutot
# Time (in seconds) to wait for a connection to the license server before
# terminating the request.
@@ -118,10 +118,10 @@ mysql_socket =
mysql_database = zarafa
# Where to place attachments. Value can be 'database' or 'files'
-attachment_storage = database
+attachment_storage = files
@@ -121,7 +121,7 @@ mysql_database = zarafa
attachment_storage = files
# When attachment_storage is 'files', use this path to store the files
-attachment_path = /var/lib/zarafa
@ -108,5 +104,5 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.13 2011/11/17 15:14:37 ajacoutot
-client_update_path = /var/lib/zarafa/client
+client_update_path = /var/db/zarafa/client
# 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
# Recieve update information from the client (0 = disabled, 1 = only on error, 2 = log always)
client_update_log_level = 1

27
mail/zarafa/zarafa/patches/patch-installer_linux_zarafa-client-update_cron Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-installer_linux_zarafa-client-update_cron,v 1.1 2011/12/22 17:10:04 ajacoutot Exp $
--- installer/linux/zarafa-client-update.cron.orig Thu Dec 22 14:22:30 2011
+++ installer/linux/zarafa-client-update.cron Thu Dec 22 14:23:43 2011
@@ -1,13 +1,13 @@
#!/bin/sh
-CONFIG=/etc/zarafa/server.cfg
+CONFIG=${SYSCONFDIR}/zarafa/server.cfg
test -f ${CONFIG} || exit 0
LOGPATH=$(grep -w client_update_log_path ${CONFIG} | grep -v \# | cut -d= -f2 | sed -e 's/[[:blank:]\r]//g')
if test -z "${LOGPATH}"; then
- LOGPATH=/var/lib/zarafa/client
+ LOGPATH=/var/db/zarafa/client
fi
-LOGPATH=$(readlink -e ${LOGPATH})
+LOGPATH=$(readlink -f ${LOGPATH})
if test -z "${LOGPATH}"; then
exit 0
fi
@@ -16,5 +16,5 @@ if test -n ${LOGPATH} -a ${PATHDEPTH} -gt 2 -a -d ${LO
# remove all files older than 14 days
find ${LOGPATH} -maxdepth 2 -type f -ctime +14 -exec rm {} \;
# remove all empty directories
- find ${LOGPATH} -maxdepth 1 -type d -exec rmdir --ignore-fail-on-non-empty {} \;
+ find ${LOGPATH} -maxdepth 1 -type d -exec rmdir {} 2>/dev/null \;
fi

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

@ -1,10 +1,10 @@
$OpenBSD: patch-provider_client_Makefile_in,v 1.13 2011/06/02 12:46:37 ajacoutot Exp $
$OpenBSD: patch-provider_client_Makefile_in,v 1.14 2011/12/22 17:10:04 ajacoutot Exp $
*** Warning: This system can not link to static lib archive ../../common/libcommon_XXX.la.
--- provider/client/Makefile.in.orig Wed Apr 20 16:39:43 2011
+++ provider/client/Makefile.in Sun May 29 07:23:39 2011
@@ -311,7 +311,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) $(BOOST_CPPFLAGS) -DLINUX
--- provider/client/Makefile.in.orig Wed Dec 21 20:17:36 2011
+++ provider/client/Makefile.in Thu Dec 22 12:14:19 2011
@@ -314,7 +314,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) $(BOOST_CPPFLAGS) -DLINUX
-I${top_srcdir}/common \
-I${top_srcdir}/zarafa-libsync

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

@ -1,6 +1,6 @@
$OpenBSD: patch-provider_client_WSTransport_cpp,v 1.7 2011/06/02 12:46:37 ajacoutot Exp $
--- provider/client/WSTransport.cpp.orig Wed Apr 20 19:51:47 2011
+++ provider/client/WSTransport.cpp Mon May 2 12:47:53 2011
$OpenBSD: patch-provider_client_WSTransport_cpp,v 1.8 2011/12/22 17:10:04 ajacoutot Exp $
--- provider/client/WSTransport.cpp.orig Thu Dec 22 01:02:35 2011
+++ provider/client/WSTransport.cpp Thu Dec 22 12:14:19 2011
@@ -56,6 +56,10 @@
#include <fstream>
@ -20,7 +20,7 @@ $OpenBSD: patch-provider_client_WSTransport_cpp,v 1.7 2011/06/02 12:46:37 ajacou
// The header files we use for communication with the server
#include "ZarafaCode.h"
#include "soapZarafaCmdProxy.h"
@@ -96,6 +99,10 @@ static char THIS_FILE[] = __FILE__;
@@ -101,6 +104,10 @@ static char THIS_FILE[] = __FILE__;
#endif
#define pbMUIDECSABGuid "\xac\x21\xa9\x50\x40\xd3\xee\x48\xb3\x19\xfb\xa7\x53\x30\x44\x25"

24
mail/zarafa/zarafa/patches/patch-provider_libserver_ECDatabaseUtils_cpp
View File

@ -1,20 +1,20 @@
$OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.4 2011/09/29 17:12:11 ajacoutot Exp $
$OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.5 2011/12/22 17:10:04 ajacoutot Exp $
Needs newlocale(3).
--- provider/libserver/ECDatabaseUtils.cpp.orig Mon Sep 26 15:56:11 2011
+++ provider/libserver/ECDatabaseUtils.cpp Thu Sep 29 16:53:37 2011
@@ -618,7 +618,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
unsigned int ulLastPos;
--- provider/libserver/ECDatabaseUtils.cpp.orig Thu Dec 22 01:02:37 2011
+++ provider/libserver/ECDatabaseUtils.cpp Thu Dec 22 12:16:30 2011
@@ -619,7 +619,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
std::string strData;
unsigned int type = atoi(lpRow[FIELD_NR_TYPE]);
unsigned int ulPropTag;
+#ifndef __OpenBSD__
locale_t loc = createlocale(LC_NUMERIC, "C");
+#endif
if((type & MVI_FLAG) == MVI_FLAG) {
// Treat MVI as normal property
@@ -650,7 +652,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
@@ -651,7 +653,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
goto exit;
}
lpPropVal->__union = SOAP_UNION_propValData_flt;
@ -26,7 +26,7 @@ Needs newlocale(3).
break;
case PT_BOOLEAN:
if(lpRow[FIELD_NR_ULONG] == NULL) {
@@ -666,7 +672,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
@@ -667,7 +673,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
goto exit;
}
lpPropVal->__union = SOAP_UNION_propValData_dbl;
@ -38,7 +38,7 @@ Needs newlocale(3).
break;
case PT_CURRENCY:
if(lpRow[FIELD_NR_HI] == NULL || lpRow[FIELD_NR_LO] == NULL) {
@@ -684,7 +694,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
@@ -685,7 +695,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
goto exit;
}
lpPropVal->__union = SOAP_UNION_propValData_dbl;
@ -50,7 +50,7 @@ Needs newlocale(3).
break;
case PT_SYSTIME:
if(lpRow[FIELD_NR_HI] == NULL || lpRow[FIELD_NR_LO] == NULL) {
@@ -783,7 +797,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
@@ -784,7 +798,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
for(i=0; i < lpPropVal->Value.mvflt.__size; i++)
{
ParseMVProp(lpRow[FIELD_NR_DOUBLE], lpLen[FIELD_NR_DOUBLE], &ulLastPos, &strData);
@ -62,7 +62,7 @@ Needs newlocale(3).
}
break;
case PT_MV_DOUBLE:
@@ -800,7 +818,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
@@ -801,7 +819,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
for(i=0; i < lpPropVal->Value.mvdbl.__size; i++)
{
ParseMVProp(lpRow[FIELD_NR_DOUBLE], lpLen[FIELD_NR_DOUBLE], &ulLastPos, &strData);
@ -74,8 +74,8 @@ Needs newlocale(3).
}
break;
case PT_MV_CURRENCY:
@@ -884,7 +906,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
}
@@ -888,7 +910,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
lpPropVal->ulPropTag = ulPropTag;
exit:
+#ifndef __OpenBSD__

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

@ -1,10 +1,10 @@
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.20 2011/11/17 15:14:37 ajacoutot Exp $
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.21 2011/12/22 17:10:04 ajacoutot Exp $
OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
--- provider/libserver/ZarafaCmd.cpp.orig Thu Nov 17 03:03:24 2011
+++ provider/libserver/ZarafaCmd.cpp Thu Nov 17 13:59:31 2011
@@ -739,11 +739,11 @@ double GetTimeOfDay();
--- provider/libserver/ZarafaCmd.cpp.orig Thu Dec 22 01:02:36 2011
+++ provider/libserver/ZarafaCmd.cpp Thu Dec 22 12:14:20 2011
@@ -796,11 +796,11 @@ double GetTimeOfDay();
#define SOAP_ENTRY_FUNCTION_HEADER(resultvar, fname) \
ECRESULT er = erSuccess; \
@ -18,7 +18,7 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
SOAP_CALLBACK(soap, pthread_self(), (std::string) "[" + PrettyIP(soap->ip) + "] " + #fname); \
er = g_lpSessionManager->ValidateSession(soap, ulSessionId, &lpecSession, true);\
const bool UNUSED_VAR bSupportUnicode = (er == erSuccess ? (lpecSession->GetCapabilities() & ZARAFA_CAP_UNICODE) != 0 : false); \
@@ -754,11 +754,11 @@ double GetTimeOfDay();
@@ -811,11 +811,11 @@ double GetTimeOfDay();
#define SOAP_ENTRY_FUNCTION_FOOTER \
__soapentry_exit: \
*lpResultVar = er; \

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

@ -1,6 +1,6 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.17 2011/11/17 15:14:37 ajacoutot Exp $
--- provider/server/ECServer.cpp.orig Thu Nov 17 03:03:23 2011
+++ provider/server/ECServer.cpp Thu Nov 17 15:02:57 2011
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.18 2011/12/22 17:10:04 ajacoutot Exp $
--- provider/server/ECServer.cpp.orig Thu Dec 22 01:02:36 2011
+++ provider/server/ECServer.cpp Thu Dec 22 12:16:04 2011
@@ -86,6 +86,10 @@
#include "unicode/uclean.h"
#endif
@ -21,16 +21,16 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.17 2011/11/17 15:14:37 ajacouto
{ "attachment_compression", "6" },
// Log options
@@ -793,7 +797,7 @@ int running_server(char *szName, const char *szConfig)
{ "cache_sortkey_size", "0", CONFIGSETTING_UNUSED }, // Option not support, only for backward compatibility of all configurations under the 6.20
@@ -794,7 +798,7 @@ int running_server(char *szName, const char *szConfig)
{ "client_update_enabled", "no" },
{ "client_update_log_level", "1", CONFIGSETTING_RELOADABLE },
- { "client_update_path", "/var/lib/zarafa/client", CONFIGSETTING_RELOADABLE },
+ { "client_update_path", "/var/db/zarafa/client", CONFIGSETTING_RELOADABLE },
{ "client_update_log_path", "/var/log/zarafa/autoupdate", CONFIGSETTING_RELOADABLE },
{ "index_services_enabled", "no", CONFIGSETTING_RELOADABLE },
{ "index_services_path", "file:///var/run/zarafa-indexer", CONFIGSETTING_RELOADABLE },
{ "index_services_search_timeout", "10", CONFIGSETTING_RELOADABLE },
@@ -814,10 +818,14 @@ int running_server(char *szName, const char *szConfig)
@@ -816,10 +820,14 @@ int running_server(char *szName, const char *szConfig)
{ NULL, NULL },
};

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

@ -1,6 +1,6 @@
$OpenBSD: patch-spooler_DAgent_cpp,v 1.18 2011/11/17 15:14:37 ajacoutot Exp $
--- spooler/DAgent.cpp.orig Thu Nov 17 03:03:22 2011
+++ spooler/DAgent.cpp Thu Nov 17 14:52:18 2011
$OpenBSD: patch-spooler_DAgent_cpp,v 1.19 2011/12/22 17:10:04 ajacoutot Exp $
--- spooler/DAgent.cpp.orig Thu Dec 22 01:02:35 2011
+++ spooler/DAgent.cpp Thu Dec 22 12:14:20 2011
@@ -91,6 +91,11 @@
#include <sys/mman.h>
#include <pwd.h>
@ -13,7 +13,7 @@ $OpenBSD: patch-spooler_DAgent_cpp,v 1.18 2011/11/17 15:14:37 ajacoutot Exp $
/*
This is actually from sysexits.h
but since those windows lamers don't have it ..
@@ -3283,7 +3288,7 @@ int main(int argc, char *argv[]) {
@@ -3291,7 +3296,7 @@ int main(int argc, char *argv[]) {
DeliveryArgs sDeliveryArgs;
sDeliveryArgs.strPath = "";

15
mail/zarafa/zarafa/patches/patch-zarafa-libsync_Makefile_in
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-zarafa-libsync_Makefile_in,v 1.6 2011/06/02 12:46:37 ajacoutot Exp $
*** Warning: This system can not link to static lib archive ../../common/libcommon_XXX.la.
--- zarafa-libsync/Makefile.in.orig Tue May 31 19:08:46 2011
+++ zarafa-libsync/Makefile.in Tue May 31 19:09:05 2011
@@ -274,7 +274,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX $(BOOST_CPPFLAGS)
-I${top_srcdir}/common
libzarafasync_la_includedir = $(includedir)/libzarafasync
-libzarafasync_la_LDFLAGS = -static
+libzarafasync_la_LDFLAGS = -version-info $(ECCLIENT_LIBRARY_VERSION)
libzarafasync_la_include_HEADERS = ECLibSync.h ECSync.h ECSyncLog.h \
ECSyncUtil.h ECSyncContext.h ECOfflineABImporter.h ECSyncSettings.h ECResyncSet.h

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.34 2011/11/17 15:14:37 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.35 2011/12/22 17:10:04 ajacoutot Exp $
@newgroup _zarafa:627
@newuser _zarafa:627:_zarafa:daemon:Zarafa Account:/var/empty:/sbin/nologin
@bin bin/zarafa-admin
@ -228,6 +228,8 @@ lib/python${MODPY_VERSION}/site-packages/MAPI/Tags.pyc
lib/python${MODPY_VERSION}/site-packages/MAPI/Time.py
lib/python${MODPY_VERSION}/site-packages/MAPI/Time.pyc
lib/python${MODPY_VERSION}/site-packages/MAPI/Util/
lib/python${MODPY_VERSION}/site-packages/MAPI/Util/AddressBook.py
lib/python${MODPY_VERSION}/site-packages/MAPI/Util/AddressBook.pyc
lib/python${MODPY_VERSION}/site-packages/MAPI/Util/Generators.py
lib/python${MODPY_VERSION}/site-packages/MAPI/Util/Generators.pyc
lib/python${MODPY_VERSION}/site-packages/MAPI/Util/Iterators.py
@ -414,6 +416,9 @@ share/examples/zarafa/userscripts/groups_common.sh
share/examples/zarafa/userscripts/users_common.sh
@sample ${SYSCONFDIR}/zarafa/userscripts/users_common.sh
@mode
@mode 555
share/examples/zarafa/zarafa-client-update
@mode
share/examples/zarafa/zarafa.m4
@mode 0444
@sample /usr/share/sendmail/mailer/zarafa.m4
@ -442,3 +447,4 @@ share/locale/sv/LC_MESSAGES/zarafa.mo
@sample /var/db/zarafa/client/
@sample /var/db/zarafa/index/
@sample /var/log/zarafa/
@sample /var/log/zarafa/autoupdate/

3
mail/zarafa/zarafa/pkg/PLIST-web
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-web,v 1.15 2011/09/30 05:33:33 ajacoutot Exp $
@comment $OpenBSD: PLIST-web,v 1.16 2011/12/22 17:10:04 ajacoutot Exp $
@conflict php5-mapi-*
@pkgpath mail/zarafa/webaccess
@pkgpath mail/zarafa/zarafa,-php
@ -79,6 +79,7 @@ zarafa-webaccess/client/layout/css/sharedfolder.css
zarafa-webaccess/client/layout/css/signatures.css
zarafa-webaccess/client/layout/css/style.css
zarafa-webaccess/client/layout/css/style.ie.css
zarafa-webaccess/client/layout/css/style.ipad.css
zarafa-webaccess/client/layout/css/suggestionlayer.css
zarafa-webaccess/client/layout/css/tabbar.css
zarafa-webaccess/client/layout/css/today.css

10
mail/zarafa/zarafa/pkg/README-main
View File

@ -1,4 +1,4 @@
$OpenBSD: README-main,v 1.14 2011/09/11 06:47:52 ajacoutot Exp $
$OpenBSD: README-main,v 1.15 2011/12/22 17:10:04 ajacoutot Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -130,6 +130,14 @@ httpd:\
,LD_PRELOAD=/usr/lib/libpthread.so:\
:tc=daemon:
Clients (Outlook) auto-update
=============================
When using the auto-update feature for Microsoft Outlook (TM) clients,
it is advised to clean-up old update logs by running the following
script from cron(8) once per day:
${TRUEPREFIX}/share/examples/zarafa/zarafa-client-update
Documentation and help
======================
Each zarafa-* command has its corresponding manpage.