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

Update to zarafa-6.40.5.

Browse Source 
Complete changelog available at:
    http://download.zarafa.com/community/final/6.40/changelog-6.40.txt

Several documentation and configuration tweaks.
This commit is contained in:
ajacoutot 2011-03-03 13:16:05 +00:00
parent e26affdd1a
commit 764c8f3f4b
34 changed files with 186 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mail/zarafa/zarafa/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.64 2011/01/15 23:53:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.65 2011/03/03 13:16:05 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= 5
REVISION-web= 1
CATEGORIES= mail www productivity
SHARED_LIBS += common_util 1.0 # .1.0
@ -41,7 +38,7 @@ LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
databases/openldap \
devel/uuid \
devel/libexecinfo \
mail/zarafa/libvmime>=0.7.1p7 \
mail/zarafa/libvmime>=0.7.1p8 \
textproc/libical
WANTLIB-web += ${MODGETTEXT_WANTLIB}

10
mail/zarafa/zarafa/distinfo
View File

@ -1,5 +1,5 @@
MD5 (zarafa/zcp-source-6.40.4-24200.tgz) = X/+m65qW/DBted/a1BNDpQ==
RMD160 (zarafa/zcp-source-6.40.4-24200.tgz) = 2vdw4zvbX5WU5nxfre72pWKr7H4=
SHA1 (zarafa/zcp-source-6.40.4-24200.tgz) = HUwO8rrBEogvpXuzDkRJBNeFZ7Q=
SHA256 (zarafa/zcp-source-6.40.4-24200.tgz) = oFPAaJDJd8LcDMYaXFFi+CX5+Xg6ZDbEiuwGlQomQIE=
SIZE (zarafa/zcp-source-6.40.4-24200.tgz) = 6801734
MD5 (zarafa/zcp-source-6.40.5-24860.tgz) = QhpZlU6U94eyBIt+hG4+8A==
RMD160 (zarafa/zcp-source-6.40.5-24860.tgz) = HTUMtd0N8ybzyWrOCI+KQHgxk6o=
SHA1 (zarafa/zcp-source-6.40.5-24860.tgz) = t8APrj5Jr45zPLdt+1prpXhnoU8=
SHA256 (zarafa/zcp-source-6.40.5-24860.tgz) = 28adkmG9GUefgQJNBIK2QbS2plCJ5nB20p7sEW7ctUY=
SIZE (zarafa/zcp-source-6.40.5-24860.tgz) = 7075378

4
mail/zarafa/zarafa/files/zarafa.conf
View File

@ -1,4 +1,6 @@
# $OpenBSD: zarafa.conf,v 1.1 2011/01/15 23:53:35 ajacoutot Exp $
# $OpenBSD: zarafa.conf,v 1.2 2011/03/03 13:16:05 ajacoutot Exp $
Alias /webaccess ${INSTDIR}
<Directory "${INSTDIR}">
Options -Indexes +FollowSymLinks

17
mail/zarafa/zarafa/patches/patch-ECtools_ECTestTools_ICalTests_mapi2ical_cpp
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-ECtools_ECTestTools_ICalTests_mapi2ical_cpp,v 1.1 2010/08/31 17:57:21 ajacoutot Exp $
mapi2ical.cpp: In function 'int main(int, char**)':
mapi2ical.cpp:173: error: no matching function for call to 'MapiToICal::AddMessage(IMessage*&, int)'
../../../libicalmapi/MAPIToICal.h:70: note: candidates are: virtual HRESULT MapiToICal::AddMessage(IMessage*, std::string, ULONG)
--- ECtools/ECTestTools/ICalTests/mapi2ical.cpp.orig Tue Aug 31 16:36:02 2010
+++ ECtools/ECTestTools/ICalTests/mapi2ical.cpp Tue Aug 31 16:36:17 2010
@@ -170,7 +170,7 @@ int main(int argc, char *argv[]) {
goto next;
- hr = lpMapiToICal->AddMessage(lpMessage, 0);
+ hr = lpMapiToICal->AddMessage(lpMessage, 0, 0);
if (hr != hrSuccess) {
cerr << "-- broken message!" << stringify(hr, 1) << endl;
goto next;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-ECtools_ECTestTools_IMAPTest_Makefile_in,v 1.6 2010/08/22 10:13:26 ajacoutot Exp $
--- ECtools/ECTestTools/IMAPTest/Makefile.in.orig Tue Aug 3 11:42:50 2010
+++ ECtools/ECTestTools/IMAPTest/Makefile.in Sun Aug 22 10:22:52 2010
@@ -230,7 +230,7 @@ target_alias = @target_alias@
$OpenBSD: patch-ECtools_ECTestTools_IMAPTest_Makefile_in,v 1.7 2011/03/03 13:16:05 ajacoutot Exp $
--- ECtools/ECTestTools/IMAPTest/Makefile.in.orig Mon Jan 24 13:06:12 2011
+++ ECtools/ECTestTools/IMAPTest/Makefile.in Tue Jan 25 12:56:17 2011
@@ -237,7 +237,7 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX

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

@ -1,10 +1,10 @@
$OpenBSD: patch-ECtools_ECTestTools_Makefile_in,v 1.2 2010/08/22 10:13:27 ajacoutot Exp $
$OpenBSD: patch-ECtools_ECTestTools_Makefile_in,v 1.3 2011/03/03 13:16:05 ajacoutot Exp $
We have disabled clucene support so don't build the test.
--- ECtools/ECTestTools/Makefile.in.orig Tue Aug 3 11:42:51 2010
+++ ECtools/ECTestTools/Makefile.in Sun Aug 22 10:22:52 2010
@@ -220,7 +220,7 @@ sysconfdir = @sysconfdir@
--- ECtools/ECTestTools/Makefile.in.orig Mon Jan 24 13:06:12 2011
+++ ECtools/ECTestTools/Makefile.in Tue Jan 25 12:56:17 2011
@@ -227,7 +227,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@

17
mail/zarafa/zarafa/patches/patch-ECtools_ECTestTools_RecurrenceTest_rectest_cpp
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-ECtools_ECTestTools_RecurrenceTest_rectest_cpp,v 1.1 2010/08/31 17:57:21 ajacoutot Exp $
rectest.cpp: In function 'int main(int, char**)':
rectest.cpp:82: error: no matching function for call to 'RecurrenceState::ParseBlob(char*, size_t)'
../../../common/RecurrenceState.h:64: note: candidates are: HRESULT RecurrenceState::ParseBlob(char*, unsigned int, ULONG)
--- ECtools/ECTestTools/RecurrenceTest/rectest.cpp.orig Tue Aug 31 16:06:54 2010
+++ ECtools/ECTestTools/RecurrenceTest/rectest.cpp Tue Aug 31 16:07:02 2010
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
RecurrenceState r;
- hr = r.ParseBlob((char *)strBin.c_str(), strBin.size());
+ hr = r.ParseBlob((char *)strBin.c_str(), strBin.size(), 0);
if(hr == hrSuccess) {
cerr << "Recurrence OK" << std::endl;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-ECtools_zarafa-cfgchecker_Makefile_in,v 1.5 2010/08/22 10:13:27 ajacoutot Exp $
--- ECtools/zarafa-cfgchecker/Makefile.in.orig Tue Aug 3 11:42:53 2010
+++ ECtools/zarafa-cfgchecker/Makefile.in Sun Aug 22 10:22:52 2010
@@ -247,7 +247,9 @@ target_alias = @target_alias@
$OpenBSD: patch-ECtools_zarafa-cfgchecker_Makefile_in,v 1.6 2011/03/03 13:16:05 ajacoutot Exp $
--- ECtools/zarafa-cfgchecker/Makefile.in.orig Mon Jan 24 13:06:14 2011
+++ ECtools/zarafa-cfgchecker/Makefile.in Tue Jan 25 12:56:17 2011
@@ -254,7 +254,9 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX -I${top_srcdir}/common

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

@ -1,7 +1,7 @@
$OpenBSD: patch-common_Makefile_in,v 1.7 2010/08/31 17:57:21 ajacoutot Exp $
--- common/Makefile.in.orig Mon Aug 30 09:31:50 2010
+++ common/Makefile.in Tue Aug 31 15:14:03 2010
@@ -283,7 +283,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
$OpenBSD: patch-common_Makefile_in,v 1.8 2011/03/03 13:16:05 ajacoutot Exp $
--- common/Makefile.in.orig Mon Jan 24 13:06:15 2011
+++ common/Makefile.in Tue Jan 25 12:56:17 2011
@@ -290,7 +290,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
-I${top_srcdir}/libfreebusy
@ -10,7 +10,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.7 2010/08/31 17:57:21 ajacoutot Exp $
libcommon_mapi_la_SOURCES = CommonUtil.cpp \
rtfutil.cpp \
codepage.cpp \
@@ -298,7 +298,7 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \
@@ -305,7 +305,7 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \
ZarafaCode.cpp \
ECABEntryID.cpp
@ -19,7 +19,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.7 2010/08/31 17:57:21 ajacoutot Exp $
libcommon_util_la_SOURCES = platform.cpp \
platform.linux.cpp \
md5.cpp \
@@ -318,7 +318,7 @@ libcommon_util_la_SOURCES = platform.cpp \
@@ -325,7 +325,7 @@ libcommon_util_la_SOURCES = platform.cpp \
TimeUtil.cpp \
RecurrenceState.cpp

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

@ -1,6 +1,6 @@
$OpenBSD: patch-common_platform_linux_h,v 1.9 2010/12/11 08:20:21 ajacoutot Exp $
--- common/platform.linux.h.orig Thu Dec 2 14:45:38 2010
+++ common/platform.linux.h Fri Dec 3 18:09:32 2010
$OpenBSD: patch-common_platform_linux_h,v 1.10 2011/03/03 13:16:05 ajacoutot Exp $
--- common/platform.linux.h.orig Mon Jan 24 16:55:03 2011
+++ common/platform.linux.h Tue Jan 25 12:56:17 2011
@@ -63,8 +63,16 @@
#include <dlfcn.h>
#include <stddef.h>
@ -18,7 +18,7 @@ $OpenBSD: patch-common_platform_linux_h,v 1.9 2010/12/11 08:20:21 ajacoutot Exp
#include <errno.h>
#include <string>
@@ -661,7 +669,11 @@ time_t GetProcessTime();
@@ -662,7 +670,11 @@ time_t GetProcessTime();
#ifndef ntohll
#if __BYTE_ORDER == __LITTLE_ENDIAN
@ -30,7 +30,7 @@ $OpenBSD: patch-common_platform_linux_h,v 1.9 2010/12/11 08:20:21 ajacoutot Exp
#else
#define ntohll(x) (x)
#endif
@@ -669,14 +681,18 @@ time_t GetProcessTime();
@@ -670,14 +682,18 @@ time_t GetProcessTime();
#ifndef htonll
#if __BYTE_ORDER == __LITTLE_ENDIAN

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.9 2010/08/31 17:57:21 ajacoutot Exp $
--- configure.orig Mon Aug 30 09:31:47 2010
+++ configure Tue Aug 31 15:14:03 2010
@@ -21780,12 +21780,7 @@ else
$OpenBSD: patch-configure,v 1.10 2011/03/03 13:16:05 ajacoutot Exp $
--- configure.orig Mon Jan 24 13:06:11 2011
+++ configure Tue Jan 25 12:56:17 2011
@@ -21794,12 +21794,7 @@ else
want_release=no
fi
@ -14,7 +14,7 @@ $OpenBSD: patch-configure,v 1.9 2010/08/31 17:57:21 ajacoutot Exp $
# Check whether --enable-tcmalloc was given.
if test "${enable_tcmalloc+set}" = set; then
@@ -21813,7 +21808,7 @@ else
@@ -21827,7 +21822,7 @@ else
with_distro=rhel
fi
@ -23,7 +23,7 @@ $OpenBSD: patch-configure,v 1.9 2010/08/31 17:57:21 ajacoutot Exp $
{ echo "$as_me:$LINENO: result: invalid distro, using rhel instead" >&5
echo "${ECHO_T}invalid distro, using rhel instead" >&6; }
else
@@ -22153,21 +22148,6 @@ echo "$as_me: error: Cannot execute $PHP_CONFIG" >&2;}
@@ -22167,21 +22162,6 @@ echo "$as_me: error: Cannot execute $PHP_CONFIG" >&2;}
PHP_LDFLAGS=`$PHP_CONFIG --ldflags`
PHP_EXTENSION_DIR=`$PHP_CONFIG --extension-dir`
PHP_VERSION=`$PHP_CONFIG --version`
@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.9 2010/08/31 17:57:21 ajacoutot Exp $
if test -z "$PHP_EXTENSION_DIR"; then
{ { echo "$as_me:$LINENO: error: Cannot find php-config. Please use --with-php-config=PATH" >&5
@@ -22693,7 +22673,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -22707,7 +22687,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.9 2010/08/31 17:57:21 ajacoutot Exp $
else
@@ -23103,8 +23083,10 @@ fi
@@ -23117,8 +23097,10 @@ fi
done
@ -66,7 +66,7 @@ $OpenBSD: patch-configure,v 1.9 2010/08/31 17:57:21 ajacoutot Exp $
CFLAGS=$cflags_keep
# Check for CLucene availability
@@ -24475,13 +24457,13 @@ LIBS=$libs_keep
@@ -24489,13 +24471,13 @@ LIBS=$libs_keep
libs_keep=$LIBS
# check lib, but do not set in link list
@ -83,7 +83,7 @@ $OpenBSD: patch-configure,v 1.9 2010/08/31 17:57:21 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -24541,7 +24523,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then
@@ -24555,7 +24537,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then
#define HAVE_LIBPTHREAD 1
_ACEOF

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

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.8 2010/12/11 08:20:21 ajacoutot Exp $
--- doc/Makefile.in.orig Thu Dec 2 11:37:21 2010
+++ doc/Makefile.in Fri Dec 3 18:48:05 2010
@@ -228,9 +228,9 @@ dist_data_DATA =
$OpenBSD: patch-doc_Makefile_in,v 1.9 2011/03/03 13:16:05 ajacoutot Exp $
--- doc/Makefile.in.orig Mon Jan 24 13:06:15 2011
+++ doc/Makefile.in Tue Jan 25 12:56:17 2011
@@ -235,9 +235,9 @@ dist_data_DATA =
BUILT_SOURCES = zarafa.1
allpages = \
zarafa-dagent.1 zarafa-passwd.1 zarafa-spooler.1 zarafa-admin.1 zarafa-server.1 zarafa-gateway.1 zarafa-monitor.1 zarafa-cfgchecker.1 \
@ -14,7 +14,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.8 2010/12/11 08:20:21 ajacoutot Exp $
man_MANS = $(BUILT_SOURCES) $(allpages)
EXTRA_DIST = $(BUILT_SOURCES) $(allpages) manual.xml
@@ -373,12 +373,12 @@ uninstall-man5:
@@ -380,12 +380,12 @@ uninstall-man5:
done
install-dist_dataDATA: $(dist_data_DATA)
@$(NORMAL_INSTALL)
@ -30,7 +30,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.8 2010/12/11 08:20:21 ajacoutot Exp $
done
uninstall-dist_dataDATA:
@@ -534,7 +534,7 @@ $(BUILT_SOURCES): manual.xml
@@ -541,7 +541,7 @@ $(BUILT_SOURCES): manual.xml
@if [ -z $(PROG_XMLTO) ]; then \
echo Please install xmlto to generate manual pages; \
else \

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

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_manual_xml,v 1.14 2010/12/11 08:20:21 ajacoutot Exp $
--- doc/manual.xml.orig Thu Dec 2 10:48:48 2010
+++ doc/manual.xml Fri Dec 3 18:09:32 2010
$OpenBSD: patch-doc_manual_xml,v 1.15 2011/03/03 13:16:05 ajacoutot Exp $
--- doc/manual.xml.orig Mon Jan 24 12:03:04 2011
+++ doc/manual.xml Tue Jan 25 12:56:17 2011
@@ -835,9 +835,7 @@
<varlistentry>
<term><option>pid_file</option></term>
@ -12,7 +12,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.14 2010/12/11 08:20:21 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-dagent.pid</replaceable>
@@ -1197,11 +1195,6 @@
@@ -1172,11 +1170,6 @@
<replaceable>/path/to/server.cfg</replaceable>
</para>
@ -24,7 +24,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.14 2010/12/11 08:20:21 ajacoutot Exp $
</refsection>
<refsection>
@@ -2884,9 +2877,7 @@
@@ -2859,9 +2852,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -35,7 +35,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.14 2010/12/11 08:20:21 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-server.pid</replaceable>
@@ -5644,13 +5635,8 @@
@@ -5676,13 +5667,8 @@
</para>
<para>The spooler process will keep running and watching the
@ -51,7 +51,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.14 2010/12/11 08:20:21 ajacoutot Exp $
</refsection>
<refsection>
@@ -5822,9 +5808,7 @@
@@ -5854,9 +5840,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -62,7 +62,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.14 2010/12/11 08:20:21 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-spooler.pid</replaceable>
@@ -6210,13 +6194,8 @@
@@ -6242,13 +6226,8 @@
<para><command>zarafa-gateway</command></para>
@ -78,7 +78,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.14 2010/12/11 08:20:21 ajacoutot Exp $
</refsection>
<refsection>
@@ -6436,9 +6415,7 @@
@@ -6468,9 +6447,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -89,7 +89,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.14 2010/12/11 08:20:21 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-gateway.pid</replaceable>
@@ -6819,14 +6796,8 @@
@@ -6851,14 +6828,8 @@
<para>The monitor checks user mailbox sizes. The monitor sends
a quota email when the warning quota limit is reached. When
@ -105,7 +105,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.14 2010/12/11 08:20:21 ajacoutot Exp $
</refsection>
<refsection>
@@ -6978,9 +6949,7 @@
@@ -7010,9 +6981,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -116,7 +116,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.14 2010/12/11 08:20:21 ajacoutot Exp $
</para>
<para>Default value: /var/run/zarafa-monitor.pid
</para>
@@ -8233,13 +8202,8 @@
@@ -8265,13 +8234,8 @@
<para><command>zarafa-ical</command></para>
@ -132,7 +132,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.14 2010/12/11 08:20:21 ajacoutot Exp $
</refsection>
<refsection>
@@ -8422,9 +8386,7 @@
@@ -8454,9 +8418,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -143,7 +143,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.14 2010/12/11 08:20:21 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-ical.pid</replaceable>
@@ -8738,13 +8700,8 @@
@@ -8770,13 +8732,8 @@
<para><command>zarafa-licensed</command></para>
@ -159,7 +159,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.14 2010/12/11 08:20:21 ajacoutot Exp $
</refsection>
<refsection>
@@ -8888,9 +8845,7 @@
@@ -8920,9 +8877,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>

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

@ -1,7 +1,7 @@
$OpenBSD: patch-installer_Makefile_in,v 1.6 2010/08/22 10:13:27 ajacoutot Exp $
--- installer/Makefile.in.orig Tue Aug 3 11:42:56 2010
+++ installer/Makefile.in Sun Aug 22 10:22:53 2010
@@ -231,7 +231,7 @@ sysconfdir = @sysconfdir@
$OpenBSD: patch-installer_Makefile_in,v 1.7 2011/03/03 13:16:05 ajacoutot Exp $
--- installer/Makefile.in.orig Mon Jan 24 13:06:15 2011
+++ installer/Makefile.in Tue Jan 25 12:56:17 2011
@@ -238,7 +238,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@ -10,7 +10,7 @@ $OpenBSD: patch-installer_Makefile_in,v 1.6 2010/08/22 10:13:27 ajacoutot Exp $
dist_data_DATA = ldap/zarafa.schema licenseagreement/eula.txt licenseagreement/AGPL-3
all: all-recursive
@@ -273,12 +273,12 @@ clean-libtool:
@@ -280,12 +280,12 @@ clean-libtool:
-rm -rf .libs _libs
install-dist_dataDATA: $(dist_data_DATA)
@$(NORMAL_INSTALL)

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

@ -1,7 +1,7 @@
$OpenBSD: patch-installer_linux_Makefile_in,v 1.12 2010/12/11 08:20:21 ajacoutot Exp $
--- installer/linux/Makefile.in.orig Thu Dec 2 11:37:21 2010
+++ installer/linux/Makefile.in Fri Dec 3 18:47:44 2010
@@ -54,15 +54,15 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGUR
$OpenBSD: patch-installer_linux_Makefile_in,v 1.13 2011/03/03 13:16:05 ajacoutot Exp $
--- installer/linux/Makefile.in.orig Mon Jan 24 13:06:15 2011
+++ installer/linux/Makefile.in Tue Jan 25 12:56:17 2011
@@ -55,15 +55,15 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGUR
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/common/config.h
CONFIG_CLEAN_FILES =
@ -20,7 +20,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.12 2010/12/11 08:20:21 ajacoutot
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -72,19 +72,17 @@ am__vpath_adj = case $$p in \
@@ -73,19 +73,17 @@ am__vpath_adj = case $$p in \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
dist_dataDATA_INSTALL = $(INSTALL_DATA)
@ -46,7 +46,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.12 2010/12/11 08:20:21 ajacoutot
dist_sysconf_configDATA_INSTALL = $(INSTALL_DATA)
am__dist_sysconf_rotate_DATA_DIST = zarafa.logrotate \
zarafa-indexer.logrotate zarafa-licensed.logrotate
@@ -231,6 +229,7 @@ datadir = ${docdir}
@@ -237,6 +235,7 @@ datadir = ${docdir}
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
@ -54,7 +54,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.12 2010/12/11 08:20:21 ajacoutot
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
@@ -259,8 +258,8 @@ sysconfdir = @sysconfdir@
@@ -266,8 +265,8 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@ -65,7 +65,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.12 2010/12/11 08:20:21 ajacoutot
autorespond $(am__append_2) $(BUILT_SOURCES)
rhel_initscript_files = zarafa-server.init.rhel \
zarafa-spooler.init.rhel zarafa-gateway.init.rhel \
@@ -455,15 +454,7 @@ uninstall-dist_sysconf_configDATA:
@@ -462,15 +461,7 @@ uninstall-dist_sysconf_configDATA:
echo " rm -f '$(DESTDIR)$(sysconf_configdir)/$$f'"; \
rm -f "$(DESTDIR)$(sysconf_configdir)/$$f"; \
done
@ -82,7 +82,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.12 2010/12/11 08:20:21 ajacoutot
uninstall-dist_sysconf_rotateDATA:
@$(NORMAL_UNINSTALL)
@@ -527,7 +518,7 @@ check: $(BUILT_SOURCES)
@@ -534,7 +525,7 @@ check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
@ -91,7 +91,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.12 2010/12/11 08:20:21 ajacoutot
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -574,9 +565,9 @@ info: info-am
@@ -581,9 +572,9 @@ info: info-am
info-am:
@ -103,7 +103,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.12 2010/12/11 08:20:21 ajacoutot
install-sysconf_sysconfigDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -656,13 +647,7 @@ ldapms.active-directory.cfg: ldap.m4
@@ -663,13 +654,7 @@ ldapms.active-directory.cfg: ldap.m4
m4 -DTYPE=ADS -DMULTISERVER=1 ${top_srcdir}/installer/linux/ldap.m4 > $@
install-data-hook:
@ -117,7 +117,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.12 2010/12/11 08:20:21 ajacoutot
if test ${DISTRO} = "sles" -o ${DISTRO} = "suse"; then \
mv ${DESTDIR}${sysconf_sysconfigdir}/sysconfig.suse ${DESTDIR}${sysconf_sysconfigdir}/sysconfig.zarafa || true; \
mv ${DESTDIR}${sysconf_sysconfigdir}/sysconfig-indexer.suse ${DESTDIR}${sysconf_sysconfigdir}/sysconfig.zarafa-indexer || true; \
@@ -678,16 +663,6 @@ install-data-hook:
@@ -685,16 +670,6 @@ install-data-hook:
else \
true; \
fi

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_server_cfg,v 1.7 2010/08/31 17:57:21 ajacoutot Exp $
--- installer/linux/server.cfg.orig Mon Aug 30 09:29:30 2010
+++ installer/linux/server.cfg Tue Aug 31 15:14:04 2010
$OpenBSD: patch-installer_linux_server_cfg,v 1.8 2011/03/03 13:16:05 ajacoutot Exp $
--- installer/linux/server.cfg.orig Mon Jan 24 12:03:45 2011
+++ installer/linux/server.cfg Tue Jan 25 12:57:48 2011
@@ -39,16 +39,16 @@ local_admin_users = root
system_email_address = postmaster@localhost
@ -25,13 +25,13 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.7 2010/08/31 17:57:21 ajacoutot E
@@ -56,7 +56,7 @@ running_path = /
session_timeout = 300
# Socket to connect to for license server
# Socket to connect to license server
-license_socket = /var/run/zarafa-licensed
+#license_socket = /var/run/zarafa-licensed
##############################################################
# LOG SETTINGS
@@ -92,10 +92,10 @@ mysql_password =
# Time (in seconds) to wait for a connection to the license server before
# terminating the request.
@@ -96,10 +96,10 @@ mysql_password =
mysql_database = zarafa
# Where to place attachments. Value can be 'database' or 'files'
@ -44,7 +44,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.7 2010/08/31 17:57:21 ajacoutot E
# Compression level for attachments when attachment_storage is 'files'.
# Set compression level for attachments disabled=0, max=9
@@ -111,19 +111,19 @@ server_ssl_enabled = no
@@ -115,19 +115,19 @@ server_ssl_enabled = no
server_ssl_port = 237
# Required Server certificate, contains the certificate and the private key parts
@ -68,7 +68,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.7 2010/08/31 17:57:21 ajacoutot E
##############################################################
# THREAD SETTINGS
@@ -249,23 +249,24 @@ companyquota_warn = 0
@@ -253,23 +253,24 @@ companyquota_warn = 0
# Name of the plugin that handles users
# Required, default = ldap
# Values: ldap, unix, db
@ -102,7 +102,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.7 2010/08/31 17:57:21 ajacoutot E
# Set this option to 'yes' to skip the creation and deletion of new users
# The action will be logged, so you can see if your changes to the plugin
@@ -322,7 +323,7 @@ client_update_enabled = false
@@ -326,7 +327,7 @@ client_update_enabled = false
# Place the correct Zarafa Outlook Client in this directory for
# Windows clients to download through the Zarafa server

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

@ -1,7 +1,7 @@
$OpenBSD: patch-libfreebusy_Makefile_in,v 1.7 2010/08/31 17:57:21 ajacoutot Exp $
--- libfreebusy/Makefile.in.orig Mon Aug 30 09:31:51 2010
+++ libfreebusy/Makefile.in Tue Aug 31 15:15:32 2010
@@ -252,7 +252,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
$OpenBSD: patch-libfreebusy_Makefile_in,v 1.8 2011/03/03 13:16:05 ajacoutot Exp $
--- libfreebusy/Makefile.in.orig Mon Jan 24 13:06:16 2011
+++ libfreebusy/Makefile.in Tue Jan 25 12:56:18 2011
@@ -259,7 +259,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
-I${top_srcdir}/common
libfreebusy_la_includedir = $(includedir)/libfreebusy

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

@ -1,7 +1,7 @@
$OpenBSD: patch-mapi4linux_src_Makefile_in,v 1.7 2010/08/31 17:57:21 ajacoutot Exp $
--- mapi4linux/src/Makefile.in.orig Mon Aug 30 09:31:52 2010
+++ mapi4linux/src/Makefile.in Tue Aug 31 15:14:57 2010
@@ -261,7 +261,7 @@ libmapi_la_LIBADD = \
$OpenBSD: patch-mapi4linux_src_Makefile_in,v 1.8 2011/03/03 13:16:05 ajacoutot Exp $
--- mapi4linux/src/Makefile.in.orig Mon Jan 24 13:06:17 2011
+++ mapi4linux/src/Makefile.in Tue Jan 25 12:56:18 2011
@@ -268,7 +268,7 @@ libmapi_la_LIBADD = \
# required because we're exporting extern "C" functions and want to filter with 'export-symbols'

12
mail/zarafa/zarafa/patches/patch-php-ext_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-php-ext_Makefile_in,v 1.9 2010/08/22 10:13:27 ajacoutot Exp $
--- php-ext/Makefile.in.orig Tue Aug 3 11:42:58 2010
+++ php-ext/Makefile.in Sun Aug 22 10:22:53 2010
@@ -223,7 +223,7 @@ build_cpu = @build_cpu@
$OpenBSD: patch-php-ext_Makefile_in,v 1.10 2011/03/03 13:16:05 ajacoutot Exp $
--- php-ext/Makefile.in.orig Mon Jan 24 13:06:17 2011
+++ php-ext/Makefile.in Tue Jan 25 12:56:18 2011
@@ -229,7 +229,7 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
@ -10,7 +10,7 @@ $OpenBSD: patch-php-ext_Makefile_in,v 1.9 2010/08/22 10:13:27 ajacoutot Exp $
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
@@ -270,7 +270,7 @@ mapi_la_LDFLAGS = -module -avoid-version \
@@ -277,7 +277,7 @@ mapi_la_LDFLAGS = -module -avoid-version \
${top_builddir}/common/libcommon_util.la \
${top_builddir}/libfreebusy/libfreebusy.la \
${top_builddir}/inetmapi/libinetmapi.la \
@ -19,7 +19,7 @@ $OpenBSD: patch-php-ext_Makefile_in,v 1.9 2010/08/22 10:13:27 ajacoutot Exp $
# it seems linking libraries with -pthread will not contain -lpthread.
@@ -553,7 +553,7 @@ install-data-am: install-dist_dataDATA
@@ -560,7 +560,7 @@ install-data-am: install-dist_dataDATA
install-dvi: install-dvi-am

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_client_Makefile_in,v 1.8 2010/08/22 10:13:27 ajacoutot Exp $
--- provider/client/Makefile.in.orig Tue Aug 3 11:42:59 2010
+++ provider/client/Makefile.in Sun Aug 22 10:22:53 2010
@@ -287,7 +287,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
$OpenBSD: patch-provider_client_Makefile_in,v 1.9 2011/03/03 13:16:05 ajacoutot Exp $
--- provider/client/Makefile.in.orig Mon Jan 24 13:06:17 2011
+++ provider/client/Makefile.in Tue Jan 25 12:56:18 2011
@@ -294,7 +294,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
-I${top_srcdir}/common \
-I${top_srcdir}/zarafa-libsync
@ -10,7 +10,7 @@ $OpenBSD: patch-provider_client_Makefile_in,v 1.8 2010/08/22 10:13:27 ajacoutot
libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS) \
${top_builddir}/provider/soap/libgsoap.la \
${top_builddir}/provider/soap/libsoapclient.la \
@@ -300,7 +300,7 @@ libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS)
@@ -307,7 +307,7 @@ libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS)
${top_builddir}/zarafa-libsync/libzarafasync.la \
-lstdc++ $(UUID_LIBS)

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_common_ECSearchClient_cpp,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
--- provider/common/ECSearchClient.cpp.orig Tue Jun 29 00:34:25 2010
+++ provider/common/ECSearchClient.cpp Tue Jun 29 00:35:13 2010
@@ -123,7 +123,9 @@ ECRESULT ECSearchClient::Query(std::string &strQuery,
$OpenBSD: patch-provider_common_ECSearchClient_cpp,v 1.2 2011/03/03 13:16:05 ajacoutot Exp $
--- provider/common/ECSearchClient.cpp.orig Mon Jan 24 16:55:05 2011
+++ provider/common/ECSearchClient.cpp Tue Jan 25 12:56:18 2011
@@ -130,7 +130,9 @@ ECRESULT ECSearchClient::Query(std::string &strQuery,
ECRESULT er = erSuccess;
ECSearchResultArray *lpResults = NULL;
std::vector<std::string> lstResponse;
@ -11,7 +11,7 @@ $OpenBSD: patch-provider_common_ECSearchClient_cpp,v 1.1 2010/06/30 02:46:48 aja
if (!lppsResults) {
er = ZARAFA_E_INVALID_PARAMETER;
@@ -171,7 +173,11 @@ ECRESULT ECSearchClient::Query(std::string &strQuery,
@@ -178,7 +180,11 @@ ECRESULT ECSearchClient::Query(std::string &strQuery,
memcpy(lpResults->__ptr[i].sEntryId.__ptr, strEntryId.c_str(), strEntryId.size());
@ -23,7 +23,7 @@ $OpenBSD: patch-provider_common_ECSearchClient_cpp,v 1.1 2010/06/30 02:46:48 aja
lpResults->__size++;
}
@@ -182,7 +188,9 @@ exit:
@@ -189,7 +195,9 @@ exit:
if ((er != erSuccess) && lpResults)
FreeSearchResults(lpResults);

8
mail/zarafa/zarafa/patches/patch-provider_libserver_ECIndexer_h Normal file
View File

@ -0,0 +1,8 @@
$OpenBSD: patch-provider_libserver_ECIndexer_h,v 1.1 2011/03/03 13:16:05 ajacoutot Exp $
--- provider/libserver/ECIndexer.h.orig Tue Jan 25 13:11:03 2011
+++ provider/libserver/ECIndexer.h Tue Jan 25 13:11:12 2011
@@ -60,3 +60,4 @@ struct ECSearchResultArray;
ECRESULT GetIndexerResults(ECConfig *lpConfig, ECLogger *lpLogger, ECCacheManager *lpCacheManager, GUID *guidServer, unsigned int ulStoreId, ECListInt &lstFolders, struct restrictTable *lpRestrict, ECSearchResultArray **lppIndexerResults);
+#endif // ECINDEXER_H

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

@ -1,6 +1,6 @@
$OpenBSD: patch-provider_libserver_ECSessionGroup_cpp,v 1.4 2010/06/30 02:46:48 ajacoutot Exp $
--- provider/libserver/ECSessionGroup.cpp.orig Mon May 31 19:28:59 2010
+++ provider/libserver/ECSessionGroup.cpp Mon Jun 14 09:16:44 2010
$OpenBSD: patch-provider_libserver_ECSessionGroup_cpp,v 1.5 2011/03/03 13:16:05 ajacoutot Exp $
--- provider/libserver/ECSessionGroup.cpp.orig Mon Jan 24 16:55:05 2011
+++ provider/libserver/ECSessionGroup.cpp Tue Jan 25 12:56:18 2011
@@ -54,6 +54,10 @@
#include <algorithm>
@ -12,7 +12,7 @@ $OpenBSD: patch-provider_libserver_ECSessionGroup_cpp,v 1.4 2010/06/30 02:46:48
#include "ECSession.h"
#include "ECSessionGroup.h"
#include "ECSessionManager.h"
@@ -63,6 +67,11 @@
@@ -64,6 +68,11 @@
#define new DEBUG_NEW
#undef THIS_FILE
static char THIS_FILE[] = __FILE__;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.3 2010/08/31 17:57:21 ajacoutot Exp $
--- provider/libserver/ECSession.cpp.orig Mon Aug 30 13:01:47 2010
+++ provider/libserver/ECSession.cpp Tue Aug 31 15:14:05 2010
@@ -700,11 +700,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.4 2011/03/03 13:16:05 ajacoutot Exp $
--- provider/libserver/ECSession.cpp.orig Mon Jan 24 16:55:05 2011
+++ provider/libserver/ECSession.cpp Tue Jan 25 12:56:18 2011
@@ -757,11 +757,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
uid_t uid;
char strbuf[1024];
#ifdef SO_PEERCRED

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_libserver_ECStoreObjectTable_cpp,v 1.2 2010/08/31 17:57:21 ajacoutot Exp $
--- provider/libserver/ECStoreObjectTable.cpp.orig Mon Aug 30 13:01:48 2010
+++ provider/libserver/ECStoreObjectTable.cpp Tue Aug 31 15:14:05 2010
@@ -655,7 +655,9 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
$OpenBSD: patch-provider_libserver_ECStoreObjectTable_cpp,v 1.3 2011/03/03 13:16:05 ajacoutot Exp $
--- provider/libserver/ECStoreObjectTable.cpp.orig Mon Jan 24 16:55:05 2011
+++ provider/libserver/ECStoreObjectTable.cpp Tue Jan 25 12:56:18 2011
@@ -657,7 +657,9 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
unsigned int ulLastPos;
unsigned int ulColId = 0;
std::string strData;
@ -11,7 +11,7 @@ $OpenBSD: patch-provider_libserver_ECStoreObjectTable_cpp,v 1.2 2010/08/31 17:57
if(lpSession == NULL || lpsMapKey == NULL)
{
@@ -707,7 +709,11 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
@@ -709,7 +711,11 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
break;
case PT_R4:
lpPropVal->__union = SOAP_UNION_propValData_flt;
@ -23,7 +23,7 @@ $OpenBSD: patch-provider_libserver_ECStoreObjectTable_cpp,v 1.2 2010/08/31 17:57
break;
case PT_BOOLEAN:
lpPropVal->__union = SOAP_UNION_propValData_b;
@@ -715,7 +721,11 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
@@ -717,7 +723,11 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
break;
case PT_DOUBLE:
lpPropVal->__union = SOAP_UNION_propValData_dbl;
@ -35,7 +35,7 @@ $OpenBSD: patch-provider_libserver_ECStoreObjectTable_cpp,v 1.2 2010/08/31 17:57
break;
case PT_CURRENCY:
lpPropVal->Value.hilo = s_alloc<hiloLong>(soap);
@@ -725,7 +735,11 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
@@ -727,7 +737,11 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
break;
case PT_APPTIME:
lpPropVal->__union = SOAP_UNION_propValData_dbl;
@ -47,7 +47,7 @@ $OpenBSD: patch-provider_libserver_ECStoreObjectTable_cpp,v 1.2 2010/08/31 17:57
break;
case PT_SYSTIME:
lpPropVal->Value.hilo = s_alloc<hiloLong>(soap);
@@ -818,7 +832,11 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
@@ -820,7 +834,11 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
{
ParseMVProp(lpDBRow[ulColId], lpDBLen[ulColId], &ulLastPos, &strData);
@ -59,7 +59,7 @@ $OpenBSD: patch-provider_libserver_ECStoreObjectTable_cpp,v 1.2 2010/08/31 17:57
}
break;
case PT_MV_APPTIME:
@@ -838,7 +856,11 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
@@ -840,7 +858,11 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
{
ParseMVProp(lpDBRow[ulColId], lpDBLen[ulColId], &ulLastPos, &strData);
@ -71,7 +71,7 @@ $OpenBSD: patch-provider_libserver_ECStoreObjectTable_cpp,v 1.2 2010/08/31 17:57
}
break;
case PT_MV_CURRENCY:
@@ -946,7 +968,9 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
@@ -948,7 +970,9 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
}
exit:

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

@ -1,10 +1,10 @@
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.15 2010/10/27 18:26:17 ajacoutot Exp $
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.16 2011/03/03 13:16:05 ajacoutot Exp $
OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
--- provider/libserver/ZarafaCmd.cpp.orig Wed Oct 20 16:16:25 2010
+++ provider/libserver/ZarafaCmd.cpp Wed Oct 27 19:18:53 2010
@@ -680,11 +680,11 @@ double GetTimeOfDay();
--- provider/libserver/ZarafaCmd.cpp.orig Mon Jan 24 16:55:05 2011
+++ provider/libserver/ZarafaCmd.cpp Tue Jan 25 12:56:18 2011
@@ -681,11 +681,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.
if(soap->user && ((SOAPINFO *)soap->user)->lpCallBack) { \
((SOAPINFO *)soap->user)->lpCallBack(pthread_self(), (std::string) "[" + PrettyIP(soap->ip) + "] " + #fname, ((SOAPINFO*)soap->user)->ulCallBackParam); \
} \
@@ -695,11 +695,11 @@ double GetTimeOfDay();
@@ -696,11 +696,11 @@ double GetTimeOfDay();
#define SOAP_ENTRY_FUNCTION_FOOTER \
__soapentry_exit: \
*lpResultVar = er; \

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

@ -1,6 +1,6 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.8 2010/12/11 08:20:21 ajacoutot Exp $
--- provider/server/ECServer.cpp.orig Thu Dec 2 14:45:40 2010
+++ provider/server/ECServer.cpp Fri Dec 3 18:09:33 2010
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.9 2011/03/03 13:16:05 ajacoutot Exp $
--- provider/server/ECServer.cpp.orig Mon Jan 24 16:55:05 2011
+++ provider/server/ECServer.cpp Tue Jan 25 12:56:18 2011
@@ -82,6 +82,10 @@
#include <libintl.h>
#include <map>
@ -12,7 +12,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.8 2010/12/11 08:20:21 ajacoutot
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
@@ -726,7 +730,7 @@ int running_server(char *szName, char *szConfig)
@@ -727,7 +731,7 @@ int running_server(char *szName, char *szConfig)
{ "mysql_config_file", "/etc/zarafa/my.cnf" },
#endif
{ "attachment_storage", "database" },

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_server_Makefile_in,v 1.7 2010/08/22 10:13:27 ajacoutot Exp $
--- provider/server/Makefile.in.orig Tue Aug 3 11:42:59 2010
+++ provider/server/Makefile.in Sun Aug 22 10:22:53 2010
@@ -270,10 +270,11 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INTL_LIBS) $(ICON
$OpenBSD: patch-provider_server_Makefile_in,v 1.8 2011/03/03 13:16:05 ajacoutot Exp $
--- provider/server/Makefile.in.orig Mon Jan 24 13:06:17 2011
+++ provider/server/Makefile.in Tue Jan 25 12:56:18 2011
@@ -277,10 +277,11 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INTL_LIBS) $(ICON
${top_builddir}/provider/soap/libgsoap.la \
${top_builddir}/provider/soap/libsoapserver.la \
${top_builddir}/provider/common/libzarafacommon.la \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-spooler_Makefile_in,v 1.6 2010/08/22 10:13:27 ajacoutot Exp $
--- spooler/Makefile.in.orig Tue Aug 3 11:43:00 2010
+++ spooler/Makefile.in Sun Aug 22 10:22:53 2010
@@ -270,7 +270,7 @@ zarafa_spooler_LDADD = ${top_builddir}/inetmapi/libine
$OpenBSD: patch-spooler_Makefile_in,v 1.7 2011/03/03 13:16:05 ajacoutot Exp $
--- spooler/Makefile.in.orig Mon Jan 24 13:06:18 2011
+++ spooler/Makefile.in Tue Jan 25 12:56:18 2011
@@ -277,7 +277,7 @@ zarafa_spooler_LDADD = ${top_builddir}/inetmapi/libine
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_util.la \
${top_builddir}/common/libcommon_ssl.la \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-zarafa-libsync_Makefile_in,v 1.2 2010/08/22 10:13:27 ajacoutot Exp $
--- zarafa-libsync/Makefile.in.orig Tue Aug 3 11:43:00 2010
+++ zarafa-libsync/Makefile.in Sun Aug 22 10:22:53 2010
@@ -251,7 +251,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
$OpenBSD: patch-zarafa-libsync_Makefile_in,v 1.3 2011/03/03 13:16:05 ajacoutot Exp $
--- zarafa-libsync/Makefile.in.orig Mon Jan 24 13:06:18 2011
+++ zarafa-libsync/Makefile.in Tue Jan 25 12:56:18 2011
@@ -258,7 +258,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
-I${top_srcdir}/common
libzarafasync_la_includedir = $(includedir)/libzarafasync

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.20 2010/11/06 08:46:05 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.21 2011/03/03 13:16:05 ajacoutot Exp $
@newgroup _zarafa:627
@newuser _zarafa:627:_zarafa:daemon:Zarafa Account:/var/empty:/sbin/nologin
@bin bin/zarafa-admin
@ -32,6 +32,7 @@ include/inetmapi/ECMapiUtils.h
include/inetmapi/ECVMIMEUtils.h
include/inetmapi/MAPISMTPTransport.h
include/inetmapi/MAPIToVMIME.h
include/inetmapi/SMIMEMessage.h
include/inetmapi/VMIMEToMAPI.h
include/inetmapi/inetmapi.h
include/inetmapi/inputStreamMAPIAdapter.h
@ -195,6 +196,7 @@ share/doc/zarafa/db-upgrade-objectsid-to-objectguid.pl
share/doc/zarafa/eula.txt
share/doc/zarafa/ldap-switch-sendas.pl
share/doc/zarafa/ssl-certificates.sh
share/doc/zarafa/zarafa-msr
share/examples/zarafa/
@sample ${SYSCONFDIR}/zarafa/
@mode 750

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-web,v 1.7 2011/01/15 23:53:35 ajacoutot Exp $
@comment $OpenBSD: PLIST-web,v 1.8 2011/03/03 13:16:05 ajacoutot Exp $
@conflict php5-mapi-*
@pkgpath mail/zarafa/webaccess
@pkgpath mail/zarafa/zarafa,-php
@ -36,6 +36,7 @@ zarafa-webaccess/client/core/contactparsingobject.js
zarafa-webaccess/client/core/date.js
zarafa-webaccess/client/core/dhtml.js
zarafa-webaccess/client/core/dispatcher.js
zarafa-webaccess/client/core/fixedsettings.js
zarafa-webaccess/client/core/inputmanager.js
zarafa-webaccess/client/core/json.js
zarafa-webaccess/client/core/layoutmanager.js
@ -50,8 +51,10 @@ zarafa-webaccess/client/core/xmlbuilder.js
zarafa-webaccess/client/core/xmlrequest.js
zarafa-webaccess/client/dialog.php
zarafa-webaccess/client/download_attachment.php
zarafa-webaccess/client/download_message.php
zarafa-webaccess/client/layout/
zarafa-webaccess/client/layout/css/
zarafa-webaccess/client/layout/css/addressbookitem.css
zarafa-webaccess/client/layout/css/addtofavorite.css
zarafa-webaccess/client/layout/css/advancedfind.css
zarafa-webaccess/client/layout/css/appointment.css
@ -146,6 +149,8 @@ zarafa-webaccess/client/layout/dialogs/standard/contact.php
zarafa-webaccess/client/layout/dialogs/standard/createmail.php
zarafa-webaccess/client/layout/dialogs/standard/distlist.php
zarafa-webaccess/client/layout/dialogs/standard/freebusy.php
zarafa-webaccess/client/layout/dialogs/standard/gab_detail_distlist.php
zarafa-webaccess/client/layout/dialogs/standard/gab_detail_mailuser.php
zarafa-webaccess/client/layout/dialogs/standard/occurrence.php
zarafa-webaccess/client/layout/dialogs/standard/properties.php
zarafa-webaccess/client/layout/dialogs/standard/readmail.php
@ -513,6 +518,7 @@ zarafa-webaccess/client/layout/themes/white/theme.css
zarafa-webaccess/client/loader.php
zarafa-webaccess/client/login.php
zarafa-webaccess/client/modules/
zarafa-webaccess/client/modules/addressbookitemmodule.js
zarafa-webaccess/client/modules/addressbooklistmodule.js
zarafa-webaccess/client/modules/advancedfindlistmodule.js
zarafa-webaccess/client/modules/appointmentitemmodule.js
@ -1002,6 +1008,7 @@ zarafa-webaccess/server/language/sv_SE.UTF-8/LC_MESSAGES/zarafa.mo
zarafa-webaccess/server/language/sv_SE.UTF-8/language.txt
zarafa-webaccess/server/mimetypes.dat
zarafa-webaccess/server/modules/
zarafa-webaccess/server/modules/class.addressbookitemmodule.php
zarafa-webaccess/server/modules/class.addressbooklistmodule.php
zarafa-webaccess/server/modules/class.advancedfindlistmodule.php
zarafa-webaccess/server/modules/class.appointmentitemmodule.php
@ -1050,7 +1057,7 @@ zarafa-webaccess/server/modules/class.usergroupmodule.php
zarafa-webaccess/server/upload_attachment.php
zarafa-webaccess/server/util.php
zarafa-webaccess/static.php
zarafa-webaccess/zarafa-webaccess.conf
@comment zarafa-webaccess/zarafa-webaccess.conf
zarafa-webaccess/zarafa.conf.dist
@sample ${PREFIX-web}/conf/modules.sample/zarafa.conf
@sample /var/www/conf/modules.sample/zarafa.conf
zarafa-webaccess/zarafa.php

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

@ -1,4 +1,4 @@
$OpenBSD: README-main,v 1.2 2011/01/15 23:53:35 ajacoutot Exp $
$OpenBSD: README-main,v 1.3 2011/03/03 13:16:05 ajacoutot Exp $
*** Upgrading users: refer to zarafa documentation on the web to check
*** if any particular step is required after upgrading to a new version.
@ -31,7 +31,8 @@ After zarafa-server was started for the first time
# ${TRUEPREFIX}/bin/zarafa-admin -s
* Adding an admin user -- see zarafa-admin(1).
# ${TRUEPREFIX}/bin/zarafa-admin -c zadmin -p secret -e zarafa.admin@domain.tld -f "John Doe" -a 2
# ${TRUEPREFIX}/bin/zarafa-admin -c zadmin -p secret \
-e zarafa.admin@domain.tld -f "John Doe" -a 2
Mail delivery agent configuration
@ -95,7 +96,7 @@ ${INSTDIR} for regular web client access.
With Apache, AllowOverride settings are required on the ${INSTDIR}
directory. You can configure this as follows:
# ln -s ${PREFIX-web}/conf/modules.sample/zarafa.conf \
${PREFIX-web}/conf/modules
/var/www/conf/modules
If you want to debug the webaccess, copy the following file
${INSTDIR}/debug.php.disabled
@ -109,7 +110,7 @@ link from ${PREFIX-web}/conf/php5.sample/${MODULE_NAME}.ini to
${PREFIX-web}/conf/php5/${MODULE_NAME}.ini:
# ln -fs ${PREFIX-web}/conf/php5.sample/${MODULE_NAME}.ini \
${PREFIX-web}/conf/php5/${MODULE_NAME}.ini
${PREFIX-web}/conf/php5/${MODULE_NAME}.ini
The PHP mapi module and OpenBSD Apache

6
mail/zarafa/zarafa/pkg/UNMESSAGE-web
View File

@ -1,5 +1,9 @@
You can disable the PHP mapi module by removing the
${PREFIX-web}/conf/php5/${MODULE_NAME}.ini symbolic link by
issuing the following command:
# rm -f ${PREFIX-web}/conf/php5/${MODULE_NAME}.ini
rm -f ${PREFIX-web}/conf/php5/${MODULE_NAME}.ini
To completely deinstall zarafa-webaccess you need to perform the
following steps as root:
# rm -f /var/www/conf/modules/zarafa.conf
# rm -f /var/www/htdocs/zarafa