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

Major update to zarafa-7.1.0.

Browse Source 
Complete ChangeLog available at:
http://download.zarafa.com/community/final/7.1/final-changelog-7.1.txt
This commit is contained in:
ajacoutot 2012-08-30 14:28:22 +00:00
parent 157354a27b
commit 2999056003
53 changed files with 858 additions and 649 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mail/zarafa/Makefile.inc
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile.inc,v 1.21 2012/07/09 15:27:30 ajacoutot Exp $
# $OpenBSD: Makefile.inc,v 1.22 2012/08/30 14:28:22 ajacoutot Exp $
# there is no point in building/running this on NO_SHARED_LIBS archs
SHARED_ONLY= Yes
V?= 7.0.8
BUILD?= 35178
V?= 7.1.0
BUILD?= 36420
DISTNAME?= zcp-${V}
CATEGORIES+= mail/zarafa
@ -13,7 +12,7 @@ HOMEPAGE?= http://community.zarafa.com/
MAINTAINER?= Antoine Jacoutot <ajacoutot@openbsd.org>
# zarafa: AGPLv3 (GNU Affero Public License)
# AGPLv3 (GNU Affero Public License) with exceptions
PERMIT_PACKAGE_CDROM?= Yes
PERMIT_PACKAGE_FTP?= Yes
PERMIT_DISTFILES_CDROM?=Yes

56
mail/zarafa/zarafa/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.136 2012/08/25 10:17:27 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.137 2012/08/30 14:28:22 ajacoutot Exp $
COMMENT-main= MS Exchange groupware suite replacement
COMMENT-web= zarafa webaccess frontend and MAPI extensions for PHP
@ -7,22 +7,21 @@ PKGNAME= zarafa-${V}
PKGNAME-main= zarafa-${V}
PKGNAME-web= zarafa-webaccess-${V}
REVISION-main= 7
REVISION-web= 2
CATEGORIES= mail www productivity
SHARED_LIBS += mapi 2.0 # 0.0
SHARED_LIBS += zarafaclient 2.0 # 0.0
SHARED_LIBS += icalmapi 2.0 # 1.0
SHARED_LIBS += inetmapi 2.0 # 1.0
SHARED_LIBS += archiver 1.0 # 0.0
SHARED_LIBS += common_util 2.0 # 1.0
SHARED_LIBS += common_mapi 2.0 # 1.0
SHARED_LIBS += common_ssl 2.0 # 1.0
SHARED_LIBS += freebusy 2.0 # 1.0
SHARED_LIBS += zarafasync 2.0 # 1.0
SHARED_LIBS += zarafacontacts 0.0 # 0.0
SHARED_LIBS += common_util 2.0 # .0.0
SHARED_LIBS += common_mapi 2.0 # .0.0
SHARED_LIBS += common_ssl 2.0 # .0.0
SHARED_LIBS += common_service 2.0 # .0.0
SHARED_LIBS += freebusy 2.0 # .0.0
SHARED_LIBS += mapi 2.0 # .0.0
SHARED_LIBS += zarafasync 2.0 # .0.0
SHARED_LIBS += zarafaclient 2.0 # .0.0
SHARED_LIBS += zarafacontacts 0.0 # .0.0
SHARED_LIBS += icalmapi 2.0 # .1.0
SHARED_LIBS += inetmapi 2.0 # .1.0
SHARED_LIBS += archiver 1.0 # .0.0
SHARED_LIBS += archiver-core 0.0 # .0.0
MULTI_PACKAGES= -main -web
@ -46,13 +45,14 @@ WANTLIB += execinfo icudata icui18n icuuc uuid
WANTLIB-main += ${WANTLIB} ${MODPY_WANTLIB}
WANTLIB-main += asn1 boost_filesystem-mt boost_system-mt c com_err
WANTLIB-main += crypto gssapi ical icalss krb5 lber ldap mysqlclient
WANTLIB-main += ncursesw sasl2 ssl util uuid xml2
WANTLIB-main += ncursesw sasl2 ssl util uuid xml2 kyotocabinet
RUN_DEPENDS-main=${MODGETTEXT_RUN_DEPENDS} \
${MODPY_RUN_DEPENDS} \
textproc/catdoc
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
textproc/libxml \
databases/kyotocabinet \
databases/mysql \
databases/openldap \
devel/uuid \
@ -66,7 +66,7 @@ WANTLIB-web += ${WANTLIB}
WANTLIB-web += boost_filesystem-mt boost_system-mt common_mapi common_util
WANTLIB-web += freebusy ical icalmapi icalss inetmapi mapi
LIB_DEPENDS-web= ${BASE_PKGPATH}>=7.0.0
LIB_DEPENDS-web= ${BASE_PKGPATH}>=${V}
RUN_DEPENDS-web= ${MODPHP_RUN_DEPENDS} \
${MODGETTEXT_RUN_DEPENDS}
@ -82,7 +82,10 @@ USE_GMAKE= Yes
USE_GROFF = Yes
MODPY_ADJ_FILES=tools/python-scripts/optimize-imap.py \
installer/linux/zarafa7-upgrade
tools/python-scripts/update-resource-recipients \
installer/linux/zarafa7-upgrade \
ECtools/zarafa-utils/zarafa-mailbox-permissions \
ECtools/zarafa-utils/zarafa-set-oof
WEBROOT= /var/www
@ -101,15 +104,15 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
ac_cv_lib_pam_pam_start=no
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-static \
--disable-perl \
--with-mapi-configdir=${SYSCONFDIR}/mapi \
--with-userscript-prefix=${SYSCONFDIR}/zarafa/userscripts \
--with-quotatemplate-prefix=${SYSCONFDIR}/zarafa/quotamail \
--enable-dependency-tracking \
--with-searchscripts-prefix=${SYSCONFDIR}/zarafa/searchscripts \
--enable-release \
--enable-oss \
--enable-unicode \
--enable-python \
--enable-icu \
--with-distro=openbsd \
--with-vmime-prefix=${LOCALBASE}/include \
--with-ical-prefix=${LOCALBASE}/include \
@ -124,7 +127,7 @@ CONFIGURE_ARGS+= --with-krb5-config=/usr/bin/true
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples \
USERSCRIPTDIR=${PREFIX}/share/examples/zarafa/userscripts \
QUOTATEMPLATEDIR=${PREFIX}/share/examples/zarafa/quotamail \
INDEXERSCRIPTSDIR=${PREFIX}/share/examples/zarafa/indexerscripts \
SEARCHSCRIPTSDIR=${PREFIX}/share/examples/zarafa/searchscripts \
MAPICONFIGDIR=${PREFIX}/share/examples/zarafa/mapi
SUB_SCRIPTS= createcompany.d/00createpublic groups_common.sh \
@ -146,8 +149,7 @@ 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}/installer/linux/zarafa-client-update.cron
${WRKSRC}/spooler/{DAgent,Spooler}.cpp
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;' \
@ -155,7 +157,7 @@ pre-configure:
-e 's,ssl-certificate.sh,ssl-certificates.sh,g' \
${WRKSRC}/doc/manual.xml
perl -pi -e 's,/bin/bash,/bin/sh,g' \
${WRKSRC}/installer/indexerscripts/{attachments_parser,zmktemp}
${WRKSRC}/installer/searchscripts/{attachments_parser,zmktemp}
post-install:
${INSTALL_DATA_DIR} ${WRKINST}${INSTDIR}
@ -194,8 +196,7 @@ post-install:
mv ${PREFIX}/share/examples/zarafa/zarafa.ini \
${PREFIX}/share/examples/php-${MODPHP_VERSION}/${MODPHP_DO_SAMPLE}.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/cron.daily/zarafa-client-update
rm ${PREFIX}/share/examples/zarafa/unix.cfg
rm ${PREFIX}/share/doc/zarafa/ssl-certificates.sh
rmdir ${PREFIX}/share/doc/{zarafa/example-config,zarafa-gateway}
@ -212,9 +213,12 @@ post-install:
man/man1/zarafa-report.1 \
man/man1/za-aclsync.1 \
man/man1/zarafa-msr.1 \
man/man5/zarafa-ldapms.cfg.5 \
man/man5/zarafa-msr.cfg.5 \
man/man5/zarafa-backup.cfg.5
rmdir ${PREFIX}/share/examples/zarafa/report-ca
rmdir ${WRKINST}/var/lib/zarafa/{dagent,spooler}/plugins
rmdir ${WRKINST}/var/lib/zarafa/{dagent,spooler}
rmdir ${WRKINST}/var/lib/zarafa/report
rmdir ${WRKINST}/var/lib/zarafa/
rmdir ${WRKINST}/var/lib/

7
mail/zarafa/zarafa/distinfo
View File

@ -1,5 +1,2 @@
MD5 (zarafa/zcp-7.0.8.tar.gz) = +13LIvB8tNaHQi6k0T1yRg==
RMD160 (zarafa/zcp-7.0.8.tar.gz) = g7+6na5gQ52Pj38lqZHXKTV8aWE=
SHA1 (zarafa/zcp-7.0.8.tar.gz) = v5DygHQ94jJ2SuuScV6kHIxqHF4=
SHA256 (zarafa/zcp-7.0.8.tar.gz) = 7j+3u6Gvy0aw+vJqsQ4p2AvYqoaRLWYA6za8C6sZzLs=
SIZE (zarafa/zcp-7.0.8.tar.gz) = 6259253
SHA256 (zarafa/zcp-7.1.0.tar.gz) = FrpgyFtyHfqw+0r2ZkbvCF6rpdE7y5xythpXDo56gR0=
SIZE (zarafa/zcp-7.1.0.tar.gz) = 6380398

17
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-admin_zarafa-admin_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-ECtools_zarafa-admin_zarafa-admin_cpp,v 1.1 2012/08/30 14:28:22 ajacoutot Exp $
--- ECtools/zarafa-admin/zarafa-admin.cpp.orig Wed Aug 29 15:19:18 2012
+++ ECtools/zarafa-admin/zarafa-admin.cpp Wed Aug 29 14:40:35 2012
@@ -2739,11 +2739,13 @@ int main(int argc, char* argv[])
case OPT_UTF8: {
// set early, so other arguments are parsed in this charset.
std::string locale;
+#ifndef __OpenBSD__
if (!forceUTF8Locale(false, &locale)) {
cerr << "Your system does not have the '" << locale << "' locale installed." << endl;
cerr << "Please install this locale before creating new users." << endl;
return 1;
}
+#endif
break;
}
case OPT_FORCE_RESYNC:

14
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-fsck_zarafa-fsck_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-ECtools_zarafa-fsck_zarafa-fsck_cpp,v 1.1 2012/08/30 14:28:22 ajacoutot Exp $
--- ECtools/zarafa-fsck/zarafa-fsck.cpp.orig Wed Aug 29 15:19:33 2012
+++ ECtools/zarafa-fsck/zarafa-fsck.cpp Wed Aug 29 14:53:31 2012
@@ -537,8 +537,10 @@ int main(int argc, char *argv[])
bool bPublic = false;
setlocale(LC_MESSAGES, "");
+#ifndef __OpenBSD__
if (!forceUTF8Locale(true))
return -1;
+#endif
strHost = GetServerUnixSocket();

12
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-indexer_ECFileIndex_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ECtools_zarafa-indexer_ECFileIndex_cpp,v 1.1 2012/02/16 22:18:36 ajacoutot Exp $
--- ECtools/zarafa-indexer/ECFileIndex.cpp.orig Thu Feb 2 16:11:07 2012
+++ ECtools/zarafa-indexer/ECFileIndex.cpp Thu Feb 2 16:11:21 2012
@@ -64,7 +64,7 @@
#include "ECFileIndex.h"
#include "zarafa-indexer.h"
- #define DEFAULT_BASE_PATH "/var/lib/zarafa/index/"
+ #define DEFAULT_BASE_PATH "/var/db/zarafa/index/"
#define BASE_PREFIX "base: "
#define BASE_PREFIX_LEN strlen("base: ")

17
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-indexer_ECLuceneIndexerAttachment_cpp
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-ECtools_zarafa-indexer_ECLuceneIndexerAttachment_cpp,v 1.3 2012/05/05 16:56:17 ajacoutot Exp $
OpenBSD does not have RLIMIT_AS.
--- ECtools/zarafa-indexer/ECLuceneIndexerAttachment.cpp.orig Thu May 3 16:37:10 2012
+++ ECtools/zarafa-indexer/ECLuceneIndexerAttachment.cpp Sat May 5 17:39:39 2012
@@ -77,6 +77,10 @@
#define STREAM_BUFFER ( 64*1024 )
+#if defined(__OpenBSD__) && !defined(RLIMIT_AS)
+#define RLIMIT_AS RLIMIT_DATA
+#endif
+
ECLuceneIndexerAttachment::ECLuceneIndexerAttachment(ECThreadData *lpThreadData, ECLuceneIndexer *lpIndexer)
{
NShttpmail_t *lpField;

21
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-indexer_zarafa-indexer_cpp
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-ECtools_zarafa-indexer_zarafa-indexer_cpp,v 1.1 2012/02/16 22:18:36 ajacoutot Exp $
--- ECtools/zarafa-indexer/zarafa-indexer.cpp.orig Thu Feb 2 16:10:43 2012
+++ ECtools/zarafa-indexer/zarafa-indexer.cpp Thu Feb 2 16:10:56 2012
@@ -342,7 +342,7 @@ HRESULT clean_lock_files(bool bRemove)
string fullpath;
int s;
- // find all in /var/lib/zarafa/index/*/*
+ // find all in /var/db/zarafa/index/*/*
path = g_lpThreadData->lpConfig->GetSetting("index_path");
s = strlen(path) -1;
if (path[s] == '/')
@@ -562,7 +562,7 @@ int main(int argc, char *argv[]) {
{ "cleanup_lockfiles", "no" },
{ "limit_results", "0", CONFIGSETTING_RELOADABLE },
/* Indexer settings */
- { "index_path", "/var/lib/zarafa/index/" },
+ { "index_path", "/var/db/zarafa/index/" },
{ "index_sync_stream", "yes", CONFIGSETTING_UNUSED },
{ "index_interval", "5" },
{ "index_threads", "1", CONFIGSETTING_RELOADABLE },

14
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-monitor_zarafa-monitor_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-ECtools_zarafa-monitor_zarafa-monitor_cpp,v 1.1 2012/08/30 14:28:22 ajacoutot Exp $
--- ECtools/zarafa-monitor/zarafa-monitor.cpp.orig Wed Aug 29 15:19:48 2012
+++ ECtools/zarafa-monitor/zarafa-monitor.cpp Wed Aug 29 14:50:42 2012
@@ -242,8 +242,10 @@ int main(int argc, char *argv[]) {
{ NULL, 0, NULL, 0 }
};
+#ifndef __OpenBSD__
if (!forceUTF8Locale(true))
goto exit;
+#endif
while(1) {
c = my_getopt_long(argc, argv, "c:h:iuFV", long_options, NULL);

17
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-search_ECIndexImporterAttachments_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-ECtools_zarafa-search_ECIndexImporterAttachments_cpp,v 1.1 2012/08/30 14:28:22 ajacoutot Exp $
OpenBSD does not have RLIMIT_AS.
--- ECtools/zarafa-search/ECIndexImporterAttachments.cpp.orig Mon Aug 27 10:42:56 2012
+++ ECtools/zarafa-search/ECIndexImporterAttachments.cpp Mon Aug 27 10:43:07 2012
@@ -76,6 +76,10 @@
#define STREAM_BUFFER ( 64*1024 )
+#if defined(__OpenBSD__) && !defined(RLIMIT_AS)
+#define RLIMIT_AS RLIMIT_DATA
+#endif
+
ECIndexImporterAttachment::ECIndexImporterAttachment(ECThreadData *lpThreadData, ECIndexImporter *lpIndexer)
{
m_lpThreadData = lpThreadData;

12
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-search_zarafa-search_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ECtools_zarafa-search_zarafa-search_cpp,v 1.1 2012/08/30 14:28:22 ajacoutot Exp $
--- ECtools/zarafa-search/zarafa-search.cpp.orig Mon Aug 27 10:24:55 2012
+++ ECtools/zarafa-search/zarafa-search.cpp Mon Aug 27 10:25:21 2012
@@ -441,7 +441,7 @@ int main(int argc, char *argv[]) {
/* operational settings */
{ "limit_results", "0", CONFIGSETTING_RELOADABLE },
/* Indexer settings */
- { "index_path", "/var/lib/zarafa/index/" },
+ { "index_path", "/var/db/zarafa/index/" },
{ "index_attachments", "no", CONFIGSETTING_RELOADABLE },
{ "index_attachment_max_size", "5M", CONFIGSETTING_SIZE | CONFIGSETTING_RELOADABLE },
{ "index_attachment_parser", INDEXER_ATTACH_PARSER, CONFIGSETTING_RELOADABLE },

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

@ -1,12 +1,9 @@
$OpenBSD: patch-common_ECLogger_cpp,v 1.13 2012/02/27 19:01:34 ajacoutot Exp $
Needs newlocale(3).
--- 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>
$OpenBSD: patch-common_ECLogger_cpp,v 1.14 2012/08/30 14:28:22 ajacoutot Exp $
--- common/ECLogger.cpp.orig Wed Aug 8 17:14:57 2012
+++ common/ECLogger.cpp Wed Aug 29 13:27:02 2012
@@ -56,6 +56,10 @@
#include "stringutil.h"
#include "charset/localeutil.h"
+#ifdef __OpenBSD__
+#include <signal.h>
@ -15,12 +12,13 @@ Needs newlocale(3).
#include "config.h"
#if HAVE_SYSLOG_H
#include <syslog.h>
@@ -78,15 +82,19 @@ ECLogger::ECLogger(int max_ll) {
@@ -79,18 +83,22 @@ ECLogger::ECLogger(int max_ll) {
max_loglevel = max_ll;
msgbuffer = new char[_LOG_BUFSIZE];
// get system locale for time, NULL is returned if locale was not found.
+#ifndef __OpenBSD__
timelocale = createlocale(LC_TIME, "");
timelocale = createlocale(LC_TIME, "C");
datalocale = createUTF8Locale();
+#endif
prefix = LP_NONE;
m_ulRef = 1;
@ -31,11 +29,13 @@ Needs newlocale(3).
+#ifndef __OpenBSD__
if (timelocale)
freelocale(timelocale);
if (datalocale)
freelocale(datalocale);
+#endif
pthread_mutex_destroy(&msgbuflock);
}
@@ -101,9 +109,11 @@ char* ECLogger::MakeTimestamp() {
@@ -104,9 +112,11 @@ char* ECLogger::MakeTimestamp() {
localtime_r(&now, &local);
@ -47,7 +47,7 @@ Needs newlocale(3).
strftime(timestring, _LOG_TSSIZE, "%c", &local);
return timestring;
@@ -224,7 +234,7 @@ void ECLogger_File::DoPrefix() {
@@ -230,7 +240,7 @@ void ECLogger_File::DoPrefix() {
if (timestamp)
fnPrintf(log, "%s: ", MakeTimestamp());
if (prefix == LP_TID)
@ -56,7 +56,31 @@ Needs newlocale(3).
else if (prefix == LP_PID)
fnPrintf(log, "[%5d] ", getpid());
}
@@ -475,7 +485,7 @@ void ECLogger_Pipe::Log(int loglevel, const std::strin
@@ -290,7 +300,11 @@ void ECLogger_File::Log(int loglevel, const char *form
void ECLogger_File::LogVA(int loglevel, const char *format, va_list& va) {
pthread_mutex_lock(&msgbuflock);
+#ifdef __OpenBSD__
+ _vsnprintf_l(msgbuffer, _LOG_BUFSIZE, format, va);
+#else
_vsnprintf_l(msgbuffer, _LOG_BUFSIZE, format, datalocale, va);
+#endif
pthread_mutex_lock(&filelock);
@@ -433,7 +447,11 @@ void ECLogger_Tee::LogVA(int loglevel, const char *for
LoggerList::iterator iLogger;
pthread_mutex_lock(&msgbuflock);
+#ifdef __OpenBSD__
+ _vsnprintf_l(msgbuffer, _LOG_BUFSIZE, format, va);
+#else
_vsnprintf_l(msgbuffer, _LOG_BUFSIZE, format, datalocale, va);
+#endif
for (iLogger = m_loggers.begin(); iLogger != m_loggers.end(); ++iLogger)
(*iLogger)->Log(loglevel, std::string(msgbuffer));
@@ -482,7 +500,7 @@ void ECLogger_Pipe::Log(int loglevel, const std::strin
off += 1;
if (prefix == LP_TID)
@ -64,8 +88,8 @@ Needs newlocale(3).
+ len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[0x%08x] ", (uintptr_t)pthread_self());
else if (prefix == LP_PID)
len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[%5d] ", getpid());
off += len;
@@ -509,7 +519,7 @@ void ECLogger_Pipe::LogVA(int loglevel, const char *fo
if (len < 0) len = 0;
@@ -518,7 +536,7 @@ void ECLogger_Pipe::LogVA(int loglevel, const char *fo
off += 1;
if (prefix == LP_TID)
@ -73,8 +97,8 @@ Needs newlocale(3).
+ len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[0x%08x] ", (uintptr_t)pthread_self());
else if (prefix == LP_PID)
len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[%5d] ", getpid());
off += len;
@@ -586,9 +596,13 @@ namespace PrivatePipe {
if (len < 0) len = 0;
@@ -598,15 +616,21 @@ namespace PrivatePipe {
int l;
bool bNPTL = true;
@ -88,3 +112,11 @@ Needs newlocale(3).
m_lpConfig = lpConfig;
m_lpFileLogger = lpFileLogger;
+#ifndef __OpenBSD__
// since we forked, set it for the complete process
forceUTF8Locale(false, NULL);
+#endif
if (bNPTL) {
sigemptyset(&signal_mask);

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

@ -1,15 +1,13 @@
$OpenBSD: patch-common_ECLogger_h,v 1.2 2011/09/29 17:12:11 ajacoutot Exp $
Needs newlocale(3).
--- common/ECLogger.h.orig Mon Sep 26 15:56:08 2011
+++ common/ECLogger.h Thu Sep 29 16:53:37 2011
@@ -113,7 +113,9 @@ class ECLogger { (protected)
$OpenBSD: patch-common_ECLogger_h,v 1.3 2012/08/30 14:28:22 ajacoutot Exp $
--- common/ECLogger.h.orig Wed Aug 8 17:14:57 2012
+++ common/ECLogger.h Wed Aug 29 10:22:06 2012
@@ -125,8 +125,10 @@ class ECLogger { (protected)
int max_loglevel;
char *msgbuffer;
pthread_mutex_t msgbuflock;
+#ifndef __OpenBSD__
locale_t timelocale;
locale_t datalocale;
+#endif
char timestring[_LOG_TSSIZE];
logprefix prefix;

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

@ -1,33 +1,42 @@
$OpenBSD: patch-common_Makefile_in,v 1.16 2012/05/05 16:56:17 ajacoutot Exp $
*** Warning: This system can not link to static lib archive ../../common/libcommon_XXX.la.
--- common/Makefile.in.orig Thu May 3 11:28:39 2012
+++ common/Makefile.in Sat May 5 17:39:39 2012
@@ -356,7 +356,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) $(BOOST_CPPFLAGS) -DLINUX
$OpenBSD: patch-common_Makefile_in,v 1.17 2012/08/30 14:28:22 ajacoutot Exp $
--- common/Makefile.in.orig Wed Aug 8 16:35:43 2012
+++ common/Makefile.in Thu Aug 30 13:29:55 2012
@@ -408,7 +408,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) $(BOOST_CPPFLAGS) -DLINUX
-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
-I${top_srcdir}/libfreebusy
-I${top_srcdir}/libfreebusy $(MYSQL_INCLUDES)
-libcommon_mapi_la_LDFLAGS = -static
+libcommon_mapi_la_LDFLAGS = -version-info $(ECCLIENT_LIBRARY_VERSION)
+libcommon_mapi_la_LDFLAGS =
libcommon_mapi_la_SOURCES = CommonUtil.cpp \
rtfutil.cpp \
codepage.cpp \
@@ -376,7 +376,7 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \
ECIterators.cpp \
MAPINotifSink.cpp
@@ -431,8 +431,9 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \
IStreamAdapter.cpp \
MAPIConsoleTable.cpp \
ECMAPIDebug.cpp
+libcommon_mapi_la_LIBADD = -lpthread ${ICU_LIBS}
-libcommon_util_la_LDFLAGS = -static
+libcommon_util_la_LDFLAGS = -version-info $(ECCLIENT_LIBRARY_VERSION)
+libcommon_util_la_LDFLAGS =
libcommon_util_la_SOURCES = platform.cpp platform.linux.cpp md5.cpp \
base64.cpp ECLogger.cpp ECConfig.cpp ECConfigImpl.cpp \
ECFifoBuffer.cpp ECSerializer.cpp ECCache.cpp my_getopt.cpp \
@@ -387,7 +387,7 @@ libcommon_util_la_SOURCES = platform.cpp platform.linu
@@ -443,13 +444,16 @@ libcommon_util_la_SOURCES = platform.cpp platform.linu
ECGetText.cpp threadutil.cpp ECRestriction.cpp userutil.cpp \
ECFeatures.cpp ECACL.cpp fileutil.cpp ECThreadPool.cpp \
$(am__append_1)
ConsoleTable.cpp $(am__append_1)
-libcommon_ssl_la_LDFLAGS = -static
+libcommon_ssl_la_LDFLAGS = -version-info $(ECCLIENT_LIBRARY_VERSION)
+libcommon_util_la_LIBADD = -lpthread ${BOOST_FILESYSTEM_LIBS} ${BOOST_SYSTEM_LIBS} ${ICU_LIBS}
+libcommon_ssl_la_LDFLAGS =
libcommon_ssl_la_SOURCES = \
SSLUtil.cpp \
ECChannel.cpp
+libcommon_ssl_la_LIBADD = -lpthread ${SSL_LIBS}
-libcommon_service_la_LDFLAGS = -static
+libcommon_service_la_LDFLAGS =
libcommon_service_la_SOURCES = ECDatabaseMySQL.cpp
+libcommon_service_la_LIBADD = ${MYSQL_LIBS}
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am

16
mail/zarafa/zarafa/patches/patch-common_charset_localeutil_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-common_charset_localeutil_cpp,v 1.1 2012/08/30 14:28:22 ajacoutot Exp $
--- common/charset/localeutil.cpp.orig Wed Aug 29 13:23:41 2012
+++ common/charset/localeutil.cpp Wed Aug 29 13:23:37 2012
@@ -47,6 +47,7 @@
*
*/
+#ifndef __OpenBSD__
#include "platform.h"
#include <string>
#include <iostream>
@@ -134,3 +135,4 @@ bool forceUTF8Locale(bool bOutput, std::string *lpstrL
}
return true;
}
+#endif /* !OpenBSD */

16
mail/zarafa/zarafa/patches/patch-common_charset_localeutil_h Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-common_charset_localeutil_h,v 1.1 2012/08/30 14:28:22 ajacoutot Exp $
--- common/charset/localeutil.h.orig Wed Aug 29 13:23:49 2012
+++ common/charset/localeutil.h Wed Aug 29 13:24:13 2012
@@ -47,6 +47,7 @@
*
*/
+#ifndef __OpenBSD__
#ifndef __CHARSET_UTIL_H
#define __CHARSET_UTIL_H
@@ -54,3 +55,4 @@ bool forceUTF8Locale(bool bOutput, std::string *lpstrL
locale_t createUTF8Locale();
#endif
+#endif /* !OpenBSD */

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

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-common_platform_linux_h,v 1.13 2012/08/30 14:28:22 ajacoutot Exp $
--- common/platform.linux.h.orig Wed Aug 8 17:14:57 2012
+++ common/platform.linux.h Wed Aug 29 10:16:58 2012
@@ -63,8 +63,16 @@
#include <dlfcn.h>
#include <stddef.h>
@ -16,9 +16,18 @@ $OpenBSD: patch-common_platform_linux_h,v 1.12 2011/12/22 17:10:04 ajacoutot Exp
#include <endian.h>
+#endif
#include <errno.h>
#include <locale.h>
#include <string>
@@ -663,7 +671,11 @@ time_t GetProcessTime();
@@ -99,6 +107,8 @@
#define _snprintf snprintf
#ifdef HAVE_VSNPRINTF_L
#define _vsnprintf_l vsnprintf_l
+#elif defined __OpenBSD__
+#define _vsnprintf_l vsnprintf
#else
inline int _vsnprintf_l(char *str, size_t size, const char *format, locale_t locale, va_list ap) {
locale_t prev = uselocale(locale);
@@ -676,7 +686,11 @@ time_t GetProcessTime();
#ifndef ntohll
#if __BYTE_ORDER == __LITTLE_ENDIAN
@ -30,7 +39,7 @@ $OpenBSD: patch-common_platform_linux_h,v 1.12 2011/12/22 17:10:04 ajacoutot Exp
#else
#define ntohll(x) (x)
#endif
@@ -671,14 +683,18 @@ time_t GetProcessTime();
@@ -684,14 +698,18 @@ time_t GetProcessTime();
#ifndef htonll
#if __BYTE_ORDER == __LITTLE_ENDIAN

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

@ -1,10 +1,7 @@
$OpenBSD: patch-common_ustringutil_cpp,v 1.1 2011/06/02 12:46:37 ajacoutot Exp $
Needs newlocale(3).
--- common/ustringutil.cpp.orig Wed Apr 20 19:51:45 2011
+++ common/ustringutil.cpp Mon May 2 12:47:53 2011
@@ -167,12 +167,14 @@ int ECSortKey::compareTo(const ECSortKey &other) const
$OpenBSD: patch-common_ustringutil_cpp,v 1.2 2012/08/30 14:28:22 ajacoutot Exp $
--- common/ustringutil.cpp.orig Wed Aug 8 17:14:57 2012
+++ common/ustringutil.cpp Sat Aug 25 17:06:13 2012
@@ -168,12 +168,14 @@ int ECSortKey::compareTo(const ECSortKey &other) const
*/
const char* str_ifind(const char *haystack, const char *needle)
{
@ -20,7 +17,7 @@ Needs newlocale(3).
needlepos++;
if(*needlepos == 0)
@@ -187,7 +189,9 @@ const char* str_ifind(const char *haystack, const char
@@ -188,7 +190,9 @@ const char* str_ifind(const char *haystack, const char
needlestart = NULL;
exit:
@ -30,7 +27,7 @@ Needs newlocale(3).
return needlestart;
}
@@ -1497,8 +1501,10 @@ ECLocale::ECLocale(const ECLocale &other)
@@ -1559,8 +1563,10 @@ ECLocale::ECLocale(const ECLocale &other)
}
ECLocale::~ECLocale() {

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

@ -1,43 +1,53 @@
$OpenBSD: patch-configure,v 1.24 2012/08/19 15:50:25 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.25 2012/08/30 14:28:22 ajacoutot Exp $
OpenBSD does NOT require -lcrypt, DES encryption is part of the standard libc.
Our crypt(3) is in libc.
--- configure.orig Thu May 3 11:28:37 2012
+++ configure Sat May 5 17:39:39 2012
@@ -24574,7 +24574,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
--- configure.orig Wed Aug 8 16:35:42 2012
+++ configure Wed Aug 29 10:06:28 2012
@@ -17292,7 +17292,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -24634,7 +24634,7 @@ if test $ac_cv_lib_intl_strftime = yes; then
#define HAVE_STRFTIME 1
_ACEOF
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -17325,7 +17325,7 @@ $as_echo "$ac_cv_lib_intl_strftime" >&6; }
if test "x$ac_cv_lib_intl_strftime" = x""yes; then :
$as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
fi
fi
@@ -27761,84 +27761,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
@@ -18713,74 +18713,12 @@ rm -f core conftest.err conftest.$ac_objext \
-{ echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
-if test "${ac_cv_lib_crypt_crypt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
LIBS=$LIBS_system
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt" >&5
-$as_echo_n "checking for crypt... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
- int main() {
- char crypt(); crypt();
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
-$as_echo_n "checking for crypt in -lcrypt... " >&6; }
-if test "${ac_cv_lib_crypt_crypt+set}" = set; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypt $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
@ -55,83 +65,53 @@ OpenBSD does NOT require -lcrypt, DES encryption is part of the standard libc.
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-if ac_fn_cxx_try_link "$LINENO"; then :
- ac_cv_lib_crypt_crypt=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_crypt_crypt=no
fi
-
+
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
- ac_cv_lib_crypt_crypt=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
-if test $ac_cv_lib_crypt_crypt = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCRYPT 1
-_ACEOF
-
- LIBS="-lcrypt $LIBS"
-
-else
- { { echo "$as_me:$LINENO: error: required library libcrypt missing or unusable" >&5
-echo "$as_me: error: required library libcrypt missing or unusable" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
CRYPT_LIBS=$LIBS
LIBS=$LIBS_system
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
-$as_echo "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBCRYPT 1
_ACEOF
@@ -27853,7 +27779,7 @@ if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
- LIBS="-lcrypt $LIBS"
-else
- as_fn_error $? "required library libcrypt missing or unusable" "$LINENO" 5
-fi
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-CRYPT_LIBS=$LIBS
-LIBS=$LIBS_system
-
-
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
SSL_LIBS=
# TODO: version of ssl check??
@@ -18791,7 +18729,7 @@ if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl $LIBS"
+LIBS="-lssl -lcrypto $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -29078,7 +29004,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -19298,7 +19236,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -29134,7 +29060,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
- INTL_LIBS="-lintl"
+ INTL_LIBS="-lintl -liconv"
else
{ { echo "$as_me:$LINENO: error: required library libintl missing or unusable" >&5
echo "$as_me: error: required library libintl missing or unusable" >&2;}
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

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

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.17 2012/05/05 16:56:17 ajacoutot Exp $
--- doc/Makefile.in.orig Thu May 3 11:28:39 2012
+++ doc/Makefile.in Sat May 5 17:39:39 2012
@@ -552,7 +552,7 @@ $(BUILT_SOURCES): manual.xml
$OpenBSD: patch-doc_Makefile_in,v 1.18 2012/08/30 14:28:22 ajacoutot Exp $
--- doc/Makefile.in.orig Wed Aug 8 16:35:43 2012
+++ doc/Makefile.in Sat Aug 25 17:06:13 2012
@@ -606,7 +606,7 @@ $(BUILT_SOURCES): manual.xml
@if [ -z $(PROG_XMLTO) ]; then \
echo Please install xmlto to generate manual pages; \
else \

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

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_manual_xml,v 1.30 2012/06/19 10:25:05 ajacoutot Exp $
--- doc/manual.xml.orig Mon Jun 18 13:19:51 2012
+++ doc/manual.xml Tue Jun 19 11:24:26 2012
$OpenBSD: patch-doc_manual_xml,v 1.31 2012/08/30 14:28:22 ajacoutot Exp $
--- doc/manual.xml.orig Wed Aug 8 16:35:30 2012
+++ doc/manual.xml Thu Aug 30 15:35:46 2012
@@ -850,9 +850,7 @@
<varlistentry>
<term><option>pid_file</option></term>
@ -8,11 +8,11 @@ $OpenBSD: patch-doc_manual_xml,v 1.30 2012/06/19 10:25:05 ajacoutot Exp $
- <para>Write the process ID number to this file. This is
- used by the init.d script to correctly stop/restart the
- service.
+ <para>Write the process ID number to this file.
+ <para>Write the process ID number to this file.
</para>
<para>Default:
<replaceable>/var/run/zarafa-dagent.pid</replaceable>
@@ -1293,11 +1291,6 @@
@@ -1321,11 +1319,6 @@
<replaceable>/path/to/server.cfg</replaceable>
</para>
@ -24,14 +24,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.30 2012/06/19 10:25:05 ajacoutot Exp $
</refsection>
<refsection>
@@ -1380,11 +1373,15 @@
</para>
<para>Then, you must setup a signed SSL certificate. First,
we'll create a Certificate Authority to be able to sign
- certificate requests. We provide a script which makes it easy
+ certificate requests.
+ We provide a script which makes it easy
to create certificates on any distribution. This script is
@@ -1413,6 +1406,9 @@
located in /usr/share/zarafa, called ssl-certificate.sh. Enter
the following commands to create a certificate for the Zarafa
server.
@ -41,18 +34,18 @@ $OpenBSD: patch-doc_manual_xml,v 1.30 2012/06/19 10:25:05 ajacoutot Exp $
</para>
<para>
<command>
@@ -3087,9 +3084,7 @@
@@ -3538,9 +3534,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
- <para>Write the process ID number to this file. This is
- used by the init.d script to correctly stop/restart the
- service.
+ <para>Write the process ID number to this file.
+ <para>Write the process ID number to this file.
</para>
<para>Default:
<replaceable>/var/run/zarafa-server.pid</replaceable>
@@ -6130,13 +6125,8 @@
@@ -6678,13 +6672,8 @@
</para>
<para>The spooler process will keep running and watching the
@ -63,23 +56,23 @@ $OpenBSD: patch-doc_manual_xml,v 1.30 2012/06/19 10:25:05 ajacoutot Exp $
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
+ outgoing queue for new mail to send.
+ </para>
+ outgoing queue for new mail to send.
+ </para>
</refsection>
<refsection>
@@ -6317,9 +6307,7 @@
@@ -6865,9 +6854,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
- <para>Write the process ID number to this file. This is
- used by the init.d script to correctly stop/restart the
- service.
+ <para>Write the process ID number to this file.
+ <para>Write the process ID number to this file.
</para>
<para>Default:
<replaceable>/var/run/zarafa-spooler.pid</replaceable>
@@ -6761,13 +6749,8 @@
@@ -7369,13 +7356,7 @@
<para><command>zarafa-gateway</command></para>
@ -90,29 +83,17 @@ $OpenBSD: patch-doc_manual_xml,v 1.30 2012/06/19 10:25:05 ajacoutot Exp $
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
+ <para>The gateway process will keep running.
+ </para>
+ <para>The gateway process will keep running.</para>
</refsection>
<refsection>
@@ -7006,9 +6989,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
- <para>Write the process ID number to this file. This is
- used by the init.d script to correctly stop/restart the
- service.
+ <para>Write the process ID number to this file.
</para>
<para>Default:
<replaceable>/var/run/zarafa-gateway.pid</replaceable>
@@ -7424,14 +7405,8 @@
@@ -8044,14 +8025,8 @@
<para>The monitor checks user mailbox sizes. The monitor sends
a quota email when the warning quota limit is reached. When
- started, the program will keep running. You may also use the
- init.d scripts:
+ started, the program will keep running.
+ started, the program will keep running.
</para>
-
- <para><command>/etc/init.d/zarafa-monitor</command>
@ -122,18 +103,18 @@ $OpenBSD: patch-doc_manual_xml,v 1.30 2012/06/19 10:25:05 ajacoutot Exp $
</refsection>
<refsection>
@@ -7583,9 +7558,7 @@
@@ -8203,9 +8178,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
- <para>Write the process ID number to this file. This is
- used by the init.d script to correctly stop/restart the
- service.
+ <para>Write the process ID number to this file.
+ <para>Write the process ID number to this file.
</para>
<para>Default value: /var/run/zarafa-monitor.pid
</para>
@@ -8861,13 +8834,8 @@
@@ -9509,13 +9482,7 @@
<para><command>zarafa-ical</command></para>
@ -144,23 +125,22 @@ $OpenBSD: patch-doc_manual_xml,v 1.30 2012/06/19 10:25:05 ajacoutot Exp $
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
+ <para>The iCal/CalDAV gateway process will keep running.
+ </para>
+ <para>The iCal/CalDAV gateway process will keep running.</para>
</refsection>
<refsection>
@@ -9050,9 +9018,7 @@
@@ -9698,9 +9665,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
- <para>Write the process ID number to this file. This is
- used by the init.d script to correctly stop/restart the
- service.
+ <para>Write the process ID number to this file.
+ <para>Write the process ID number to this file.
</para>
<para>Default:
<replaceable>/var/run/zarafa-ical.pid</replaceable>
@@ -9380,13 +9346,8 @@
@@ -10039,13 +10004,7 @@
<para><command>zarafa-licensed</command></para>
@ -171,29 +151,28 @@ $OpenBSD: patch-doc_manual_xml,v 1.30 2012/06/19 10:25:05 ajacoutot Exp $
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
+ <para>The zarafa-licensed process will keep running.
+ </para>
+ <para>The zarafa-licensed process will keep running.</para>
</refsection>
<refsection>
@@ -9556,9 +9517,7 @@
@@ -10215,9 +10174,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
- <para>Write the process ID number to this file. This is
- used by the init.d script to correctly stop/restart the
- service.
+ <para>Write the process ID number to this file.
+ <para>Write the process ID number to this file.
</para>
<para>Default:
<replaceable>/var/run/zarafa-licensed.pid</replaceable>
@@ -10341,13 +10300,6 @@
@@ -11015,13 +10972,6 @@
<option>-c</option>
<replaceable>/path/to/indexer.cfg</replaceable>
<replaceable>/path/to/search.cfg</replaceable>
</para>
-
- <para>You may also use the init.d scripts:</para>
- <para><command>/etc/init.d/zarafa-indexer</command>
- <para><command>/etc/init.d/zarafa-search</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>|
@ -201,3 +180,14 @@ $OpenBSD: patch-doc_manual_xml,v 1.30 2012/06/19 10:25:05 ajacoutot Exp $
</refsection>
<refsection>
@@ -11152,9 +11102,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
- <para>Write the process ID number to this file. This is
- used by the init.d script to correctly stop/restart the
- service.
+ <para>Write the process ID number to this file.
</para>
<para>Default:
<replaceable>/var/run/zarafa-search.pid</replaceable>

27
mail/zarafa/zarafa/patches/patch-installer_linux_dagent_cfg
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_dagent_cfg,v 1.2 2010/04/22 10:06:18 ajacoutot Exp $
--- installer/linux/dagent.cfg.orig Wed Apr 14 09:14:51 2010
+++ installer/linux/dagent.cfg Thu Apr 22 10:28:51 2010
$OpenBSD: patch-installer_linux_dagent_cfg,v 1.3 2012/08/30 14:28:22 ajacoutot Exp $
--- installer/linux/dagent.cfg.orig Wed Aug 8 16:35:34 2012
+++ installer/linux/dagent.cfg Mon Aug 27 10:33:30 2012
@@ -11,7 +11,7 @@ server_socket = file:///var/run/zarafa
# to use this type of login method
@ -10,3 +10,24 @@ $OpenBSD: patch-installer_linux_dagent_cfg,v 1.2 2010/04/22 10:06:18 ajacoutot E
# The password of the SSL Key
sslkey_pass = replace-with-dagent-cert-password
@@ -92,16 +92,16 @@ archive_on_delivery = no
plugin_enabled = yes
# Path to the dagent plugin manager
-plugin_manager_path = /usr/share/zarafa-dagent/python
+plugin_manager_path = ${PREFIX}/share/zarafa-dagent/python
# Path to the activated dagent plugins.
# This folder contains symlinks to the zarafa plugins and custom scripts. The plugins are
-# installed in '/usr/share/zarafa-dagent/python/plugins/'. To activate a plugin create a symbolic
+# installed in '${PREFIX}/share/zarafa-dagent/python/plugins/'. To activate a plugin create a symbolic
# link in the 'plugin_path' directory.
#
# Example:
-# $ ln -s /usr/share/zarafa-dagent/python/plugins/BMP2PNG.py /var/lib/zarafa/dagent/plugins/BMP2PNG.py
-plugin_path = /var/lib/zarafa/dagent/plugins
+# $ ln -s ${PREFIX}/share/zarafa-dagent/python/plugins/BMP2PNG.py /var/db/zarafa/dagent/plugins/BMP2PNG.py
+plugin_path = /var/db/zarafa/dagent/plugins
##############################################################
# DAGENT RULE SETTINGS

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

@ -1,58 +0,0 @@
$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
# Location of the index files
-index_path = /var/lib/zarafa/index/
+index_path = /var/db/zarafa/index/
# run as specific user
-run_as_user =
+run_as_user = _zarafa
# run as specific group
-run_as_group =
+run_as_group = _zarafa
# control pid file
pid_file = /var/run/zarafa-indexer.pid
# run server in this path (when not using the -F switch)
-running_path = /
+running_path = /var/empty
# Force remove lockfiles on startup. Leaves possibly corrupt indexes on disk.
# See log for info of removed locks.
@@ -32,7 +32,7 @@ limit_results = 0
server_socket = file:///var/run/zarafa
# Login to the Zarafa server using this SSL Key
-sslkey_file = /etc/zarafa/ssl/indexer.pem
+sslkey_file = ${SYSCONFDIR}/zarafa/ssl/indexer.pem
# The password of the SSL Key
sslkey_pass = replace-with-server-cert-password
@@ -46,10 +46,10 @@ sslkey_pass = replace-with-server-cert-passwor
server_bind_name = file:///var/run/zarafa-indexer
# File with RSA key for SSL, used then server_bind_name uses https
-ssl_private_key_file= /etc/zarafa/indexer/privkey.pem
+ssl_private_key_file= ${SYSCONFDIR}/zarafa/indexer/privkey.pem
# File with certificate for SSL, used then server_bind_name uses https
-ssl_certificate_file= /etc/zarafa/indexer/cert.pem
+ssl_certificate_file= ${SYSCONFDIR}/zarafa/indexer/cert.pem
##############################################################
# LOG SETTINGS
@@ -106,7 +106,7 @@ index_attachments = no
index_attachment_max_size = 5120
# Scripts to attachment to text parser
-index_attachment_parser = /etc/zarafa/indexerscripts/attachments_parser
+index_attachment_parser = ${SYSCONFDIR}/zarafa/indexerscripts/attachments_parser
# Maximum amount of memory which a parser may use in bytes (set to 0 for unlimited)
# If this maximum is exceeded the parser will be killed

38
mail/zarafa/zarafa/patches/patch-installer_linux_ldap_openldap_cfg
View File

@ -1,21 +1,21 @@
$OpenBSD: patch-installer_linux_ldap_openldap_cfg,v 1.5 2012/02/16 22:18:36 ajacoutot Exp $
--- installer/linux/ldap.openldap.cfg.orig Wed Feb 1 15:50:49 2012
+++ installer/linux/ldap.openldap.cfg Thu Feb 2 12:28:17 2012
@@ -29,7 +29,7 @@ ldap_server_charset = utf-8
# Optional, default = empty (anonymous bind)
# The userPassword attribute must be readable for this user if the
# ldap_authentication_method option is set to password.
-ldap_bind_user = cn=admin,cn=users,dc=zarafa,dc=com
+ldap_bind_user =
$OpenBSD: patch-installer_linux_ldap_openldap_cfg,v 1.6 2012/08/30 14:28:22 ajacoutot Exp $
--- installer/linux/ldap.openldap.cfg.orig Mon Aug 27 10:46:45 2012
+++ installer/linux/ldap.openldap.cfg Mon Aug 27 10:47:02 2012
@@ -15,7 +15,7 @@ ldap_port = 389
# LDAP bind password
# Optional, default = empty (no password)
@@ -128,7 +128,7 @@ ldap_password_attribute = userPassword
# Choices: bind, password
# Active directory: bind
# LDAP: password
-ldap_authentication_method = password
+ldap_authentication_method = bind
# LDAP protocol
# Optional, default = ldap
-# use 'ldaps' for SSL encryption. Make sure /etc/ldap/ldap.conf is
+# use 'ldaps' for SSL encryption. Make sure ${SYSCONFDIR}/ldap/ldap.conf is
# configured correctly with TLS_CACERT
ldap_protocol = ldap
# Optional, default = mail
# Active directory: mail
@@ -197,7 +197,7 @@ ldap_sendas_relation_attribute =
ldap_user_certificate_attribute = userCertificate
# Load extra user properties from the propmap file
-!propmap /etc/zarafa/ldap.propmap.cfg
+!propmap ${SYSCONFDIR}/zarafa/ldap.propmap.cfg
##########
# Group settings

58
mail/zarafa/zarafa/patches/patch-installer_linux_search_cfg Normal file
View File

@ -0,0 +1,58 @@
$OpenBSD: patch-installer_linux_search_cfg,v 1.1 2012/08/30 14:28:22 ajacoutot Exp $
--- installer/linux/search.cfg.orig Mon Aug 27 10:21:32 2012
+++ installer/linux/search.cfg Mon Aug 27 10:22:48 2012
@@ -2,19 +2,19 @@
# INDEXED SEARCH SERVICE SETTINGS
# Location of the index files
-index_path = /var/lib/zarafa/index/
+index_path = /var/db/zarafa/index/
# run as specific user
-run_as_user =
+run_as_user = _zarafa
# run as specific group
-run_as_group =
+run_as_group = _zarafa
# control pid file
pid_file = /var/run/zarafa-search.pid
# run server in this path (when not using the -F switch)
-running_path = /
+running_path = /var/empty
# Limit the number of results returned (0 = don't limit)
limit_results = 0
@@ -28,7 +28,7 @@ limit_results = 0
server_socket = file:///var/run/zarafa
# Login to the Zarafa server using this SSL Key
-sslkey_file = /etc/zarafa/ssl/search.pem
+sslkey_file = ${SYSCONFDIR}/zarafa/ssl/search.pem
# The password of the SSL Key
sslkey_pass = replace-with-server-cert-password
@@ -42,10 +42,10 @@ sslkey_pass = replace-with-server-cert-passwor
server_bind_name = file:///var/run/zarafa-search
# File with RSA key for SSL, used then server_bind_name uses https
-ssl_private_key_file= /etc/zarafa/search/privkey.pem
+ssl_private_key_file= ${SYSCONFDIR}/zarafa/search/privkey.pem
# File with certificate for SSL, used then server_bind_name uses https
-ssl_certificate_file= /etc/zarafa/search/cert.pem
+ssl_certificate_file= ${SYSCONFDIR}/zarafa/search/cert.pem
##############################################################
# LOG SETTINGS
@@ -83,7 +83,7 @@ index_attachments = no
index_attachment_max_size = 5M
# Scripts to attachment to text parser
-index_attachment_parser = /etc/zarafa/searchscripts/attachments_parser
+index_attachment_parser = ${SYSCONFDIR}/zarafa/searchscripts/attachments_parser
# Maximum amount of memory which a parser may use in bytes (set to 0 for unlimited)
# If this maximum is exceeded the parser will be killed

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_server_cfg,v 1.15 2012/05/05 16:56:17 ajacoutot Exp $
--- installer/linux/server.cfg.orig Thu May 3 11:27:51 2012
+++ installer/linux/server.cfg Sat May 5 17:39:39 2012
$OpenBSD: patch-installer_linux_server_cfg,v 1.16 2012/08/30 14:28:22 ajacoutot Exp $
--- installer/linux/server.cfg.orig Wed Aug 8 16:35:34 2012
+++ installer/linux/server.cfg Mon Aug 27 10:35:52 2012
@@ -42,16 +42,16 @@ local_admin_users = root
system_email_address = postmaster@localhost
@ -35,8 +35,8 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.15 2012/05/05 16:56:17 ajacoutot
attachment_storage = files
# When attachment_storage is 'files', use this path to store the files
-attachment_path = /var/lib/zarafa
+attachment_path = /var/db/zarafa
-attachment_path = /var/lib/zarafa/attachments
+attachment_path = /var/db/zarafa/attachments
# Compression level for attachments when attachment_storage is 'files'.
# Set compression level for attachments disabled=0, max=9
@ -64,19 +64,20 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.15 2012/05/05 16:56:17 ajacoutot
##############################################################
# THREAD SETTINGS
@@ -281,23 +281,24 @@ companyquota_warn = 0
@@ -281,23 +281,23 @@ companyquota_warn = 0
# Name of the plugin that handles users
# Required, default = ldap
# Values: ldap, unix, db, ldapms (available in enterprise license)
+# note: the unix plugin is not supported under OpenBSD
+# note: the unix plugin is not yet supported on OpenBSD
user_plugin = db
# configuration file of the user plugin, examples can be found in /usr/share/zarafa/example-config
-# configuration file of the user plugin, examples can be found in /usr/share/zarafa/example-config
-user_plugin_config = /etc/zarafa/ldap.cfg
+# configuration file of the user plugin, examples can be found in ${PREFIX}/share/examples/zarafa
+user_plugin_config = ${SYSCONFDIR}/zarafa/ldap.cfg
# location of the zarafa plugins
# if you have a 64bit distribution, this probably should be changed to /usr/lib64/zarafa
-# if you have a 64bit distribution, this probably should be changed to /usr/lib64/zarafa
-plugin_path = /usr/lib/zarafa
+plugin_path = ${PREFIX}/lib/zarafa
@ -97,7 +98,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.15 2012/05/05 16:56:17 ajacoutot
# 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
@@ -354,7 +355,7 @@ client_update_enabled = false
@@ -354,7 +354,7 @@ client_update_enabled = false
# Place the correct Zarafa Outlook Client in this directory for
# Windows clients to download through the Zarafa server

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_spooler_cfg,v 1.5 2011/06/10 15:55:00 ajacoutot Exp $
--- installer/linux/spooler.cfg.orig Thu Jun 9 22:20:40 2011
+++ installer/linux/spooler.cfg Fri Jun 10 13:33:16 2011
$OpenBSD: patch-installer_linux_spooler_cfg,v 1.6 2012/08/30 14:28:22 ajacoutot Exp $
--- installer/linux/spooler.cfg.orig Wed Aug 8 16:35:33 2012
+++ installer/linux/spooler.cfg Mon Aug 27 10:32:59 2012
@@ -11,16 +11,16 @@ smtp_port = 25
server_socket = file:///var/run/zarafa
@ -31,3 +31,21 @@ $OpenBSD: patch-installer_linux_spooler_cfg,v 1.5 2011/06/10 15:55:00 ajacoutot
# The password of the SSL Key
sslkey_pass = replace-with-server-cert-password
@@ -138,13 +138,13 @@ archive_on_send = no
plugin_enabled = yes
# Path to the spooler plugin manager
-plugin_manager_path = /usr/share/zarafa-spooler/python
+plugin_manager_path = ${PREFIX}/share/zarafa-spooler/python
# Path to the activated spooler plugins.
# This folder contains symlinks to the zarafa plugins and custom scripts. The plugins are
-# installed in '/usr/share/zarafa-spooler/python/plugins/'. To activate a plugin create a symbolic
+# installed in '${PREFIX}/share/zarafa-spooler/python/plugins/'. To activate a plugin create a symbolic
# link in the 'plugin_path' directory.
#
# Example:
-# $ ln -s /usr/share/zarafa-spooler/python/plugins/disclaimer.py /var/lib/zarafa/spooler/plugins/disclaimer.py
-plugin_path = /var/lib/zarafa/spooler/plugins
+# $ ln -s ${PREFIX}/share/zarafa-spooler/python/plugins/disclaimer.py /var/db/zarafa/spooler/plugins/disclaimer.py
+plugin_path = /var/db/zarafa/spooler/plugins

30
mail/zarafa/zarafa/patches/patch-installer_linux_zarafa-client-update_cron
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-installer_linux_zarafa-client-update_cron,v 1.4 2012/06/19 10:25:05 ajacoutot Exp $
--- installer/linux/zarafa-client-update.cron.orig Mon Jun 18 13:21:31 2012
+++ installer/linux/zarafa-client-update.cron Tue Jun 19 11:24:27 2012
@@ -1,16 +1,16 @@
#!/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
if ! test -r "${LOGPATH}"; then
exit 0
fi
-LOGPATH=$(readlink -e ${LOGPATH})
+LOGPATH=$(readlink -f ${LOGPATH})
if test -z "${LOGPATH}"; then
exit 0
fi
@@ -19,5 +19,5 @@ if test -n ${LOGPATH} -a ${PATHDEPTH} -gt 2 -a -d ${LO
# remove all files older than 14 days
find ${LOGPATH} -mindepth 2 -maxdepth 2 -type f -ctime +14 -exec rm {} \;
# remove all empty directories
- find ${LOGPATH} -mindepth 1 -maxdepth 1 -type d -exec rmdir --ignore-fail-on-non-empty {} \;
+ find ${LOGPATH} -maxdepth 1 -type d -exec rmdir {} 2>/dev/null \;
fi

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

@ -1,15 +1,12 @@
$OpenBSD: patch-libfreebusy_Makefile_in,v 1.14 2012/05/05 16:56:17 ajacoutot Exp $
*** Warning: This system can not link to static lib archive ../../common/libcommon_XXX.la.
--- libfreebusy/Makefile.in.orig Thu May 3 11:28:40 2012
+++ libfreebusy/Makefile.in Sat May 5 17:39:39 2012
@@ -275,7 +275,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX $(BOOST_CPPFLAGS)
$OpenBSD: patch-libfreebusy_Makefile_in,v 1.15 2012/08/30 14:28:22 ajacoutot Exp $
--- libfreebusy/Makefile.in.orig Wed Aug 8 16:35:44 2012
+++ libfreebusy/Makefile.in Sat Aug 25 17:06:13 2012
@@ -319,7 +319,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX $(BOOST_CPPFLAGS)
-I${top_srcdir}/common
libfreebusy_la_includedir = $(includedir)/libfreebusy
-libfreebusy_la_LDFLAGS = -static
+libfreebusy_la_LDFLAGS = -version-info $(ECCLIENT_LIBRARY_VERSION)
+libfreebusy_la_LDFLAGS =
libfreebusy_la_include_HEADERS = ECEnumFBBlock.h ECFBBlockList.h \
ECFreeBusyData.h ECFreeBusySupport.h ECFreeBusyUpdate.h freebusy.h \
freebusyguid.h freebusytags.h freebusyutil.h PublishFreeBusy.h recurrence.h

14
mail/zarafa/zarafa/patches/patch-php-ext_main_cpp Normal file
View File

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

70
mail/zarafa/zarafa/patches/patch-php-webclient-ajax_config_php_dist
View File

@ -1,40 +1,40 @@
$OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.6 2012/03/15 17:04:31 ajacoutot Exp $
--- php-webclient-ajax/config.php.dist.orig Tue Mar 13 11:24:11 2012
+++ php-webclient-ajax/config.php.dist Thu Mar 15 16:42:28 2012
$OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.7 2012/08/30 14:28:22 ajacoutot Exp $
--- php-webclient-ajax/config.php.dist.orig Mon Aug 27 10:01:07 2012
+++ php-webclient-ajax/config.php.dist Mon Aug 27 10:02:21 2012
@@ -11,9 +11,9 @@
define("CONFIG_CHECK", TRUE);
// Default Zarafa server to connect to.
- define("DEFAULT_SERVER","file:///var/run/zarafa");
+ #define("DEFAULT_SERVER","file:///var/run/zarafa");
#define("DEFAULT_SERVER","file://\\\\.\\pipe\\zarafa");
- #define("DEFAULT_SERVER","http://localhost:236/zarafa");
+ define("DEFAULT_SERVER","http://localhost:236/zarafa");
// When using a single-signon system on your webserver, but Zarafa is on another server
// you can use https to access the zarafa server, and authenticate using an SSL certificate.
define("CONFIG_CHECK", TRUE);
// Default Zarafa server to connect to.
- define("DEFAULT_SERVER","file:///var/run/zarafa");
+ #define("DEFAULT_SERVER","file:///var/run/zarafa");
#define("DEFAULT_SERVER","file://\\\\.\\pipe\\zarafa");
- #define("DEFAULT_SERVER","http://localhost:236/zarafa");
+ define("DEFAULT_SERVER","http://localhost:236/zarafa");
// When using a single-signon system on your webserver, but Zarafa is on another server
// you can use https to access the zarafa server, and authenticate using an SSL certificate.
@@ -46,12 +46,13 @@
// Defines the temp path (absolute). Here uploaded attachments will be saved.
// The web client doesn't work without this directory.
- define("TMP_PATH", "/var/lib/zarafa-webaccess/tmp");
+ define("TMP_PATH", "/tmp");
// Define the server paths
set_include_path(BASE_PATH. PATH_SEPARATOR .
BASE_PATH."server/PEAR/" . PATH_SEPARATOR .
- "/usr/share/php/");
// Defines the temp path (absolute). Here uploaded attachments will be saved.
// The web client doesn't work without this directory.
- define("TMP_PATH", "/var/lib/zarafa-webaccess/tmp");
+ define("TMP_PATH", "/tmp");
// Define the server paths
set_include_path(BASE_PATH. PATH_SEPARATOR .
BASE_PATH."server/PEAR/" . PATH_SEPARATOR .
- "/usr/share/php/");
+ "/include/php/" . PATH_SEPARATOR .
+ "/var/www/include/php/");
// Define the relative URL for dialogs, this string is appended with HTTP GET arguments
define("DIALOG_URL", "index.php?load=dialog&");
// Define the relative URL for dialogs, this string is appended with HTTP GET arguments
define("DIALOG_URL", "index.php?load=dialog&");
@@ -146,7 +147,7 @@
// Spellchecker, change here to enable
define('FCKEDITOR_SPELLCHECKER_ENABLED', false);
- define('FCKEDITOR_SPELLCHECKER_PATH', '/usr/bin/aspell');
+ define('FCKEDITOR_SPELLCHECKER_PATH', '${LOCALBASE}/bin/aspell');
define('FCKEDITOR_SPELLCHECKER_LANGUAGE', FALSE); // set FALSE to use the language chosen by the user, but make sure that these languages are installed with aspell!
/**************************************\
// Spellchecker, change here to enable
define('FCKEDITOR_SPELLCHECKER_ENABLED', false);
- define('FCKEDITOR_SPELLCHECKER_PATH', '/usr/bin/aspell');
+ define('FCKEDITOR_SPELLCHECKER_PATH', '${LOCALBASE}/bin/aspell');
define('FCKEDITOR_SPELLCHECKER_LANGUAGE', FALSE); // set FALSE to use the language chosen by the user, but make sure that these languages are installed with aspell!
/**************************************\

13
mail/zarafa/zarafa/patches/patch-provider_client_ECChangeAdvisor_cpp Normal file
View File

@ -0,0 +1,13 @@
$OpenBSD: patch-provider_client_ECChangeAdvisor_cpp,v 1.1 2012/08/30 14:28:22 ajacoutot Exp $
--- provider/client/ECChangeAdvisor.cpp.orig Wed Aug 29 15:18:22 2012
+++ provider/client/ECChangeAdvisor.cpp Wed Aug 29 14:30:19 2012
@@ -57,6 +57,9 @@
#include "ECChangeAdvisor.h"
#include "ECMsgStore.h"
+#ifdef __OpenBSD__
+#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+#endif
#ifdef _DEBUG
#define new DEBUG_NEW

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

@ -1,10 +1,7 @@
$OpenBSD: patch-provider_client_Makefile_in,v 1.17 2012/05/05 16:56:17 ajacoutot Exp $
*** Warning: This system can not link to static lib archive ../../common/libcommon_XXX.la.
--- provider/client/Makefile.in.orig Thu May 3 11:28:41 2012
+++ provider/client/Makefile.in Sat May 5 17:39:39 2012
@@ -323,7 +323,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) $(BOOST_CPPFLAGS) -DLINUX
$OpenBSD: patch-provider_client_Makefile_in,v 1.18 2012/08/30 14:28:22 ajacoutot Exp $
--- provider/client/Makefile.in.orig Wed Aug 8 16:35:44 2012
+++ provider/client/Makefile.in Sat Aug 25 17:06:13 2012
@@ -374,7 +374,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) $(BOOST_CPPFLAGS) -DLINUX
-I${top_srcdir}/common \
-I${top_srcdir}/zarafa-libsync

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

@ -1,38 +0,0 @@
$OpenBSD: patch-provider_common_ECSearchClient_cpp,v 1.4 2011/06/02 12:46:37 ajacoutot Exp $
Needs newlocale(3).
--- provider/common/ECSearchClient.cpp.orig Sun Feb 27 23:06:14 2011
+++ provider/common/ECSearchClient.cpp Thu Mar 10 17:22:03 2011
@@ -124,7 +124,9 @@ ECRESULT ECSearchClient::Query(std::string &strQuery,
ECRESULT er = erSuccess;
ECSearchResultArray *lpResults = NULL;
std::vector<std::string> lstResponse;
+#ifndef __OpenBSD__
locale_t loc = createlocale(LC_NUMERIC, "C");
+#endif
if (!lppsResults) {
er = ZARAFA_E_INVALID_PARAMETER;
@@ -172,7 +174,11 @@ ECRESULT ECSearchClient::Query(std::string &strQuery,
memcpy(lpResults->__ptr[i].sEntryId.__ptr, strEntryId.c_str(), strEntryId.size());
+#ifndef __OpenBSD__
lpResults->__ptr[i].fScore = strtod_l(tmp[1].c_str(), NULL, loc);
+#else
+ lpResults->__ptr[i].fScore = strtod(tmp[1].c_str(), NULL);
+#endif
lpResults->__size++;
}
@@ -183,7 +189,9 @@ exit:
if ((er != erSuccess) && lpResults)
FreeSearchResults(lpResults);
+#ifndef __OpenBSD__
freelocale(loc);
+#endif
return er;
}

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_contacts_Makefile_in,v 1.3 2012/05/05 16:56:17 ajacoutot Exp $
--- provider/contacts/Makefile.in.orig Thu May 3 11:28:41 2012
+++ provider/contacts/Makefile.in Sat May 5 17:39:39 2012
@@ -292,7 +292,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
$OpenBSD: patch-provider_contacts_Makefile_in,v 1.4 2012/08/30 14:28:22 ajacoutot Exp $
--- provider/contacts/Makefile.in.orig Wed Aug 8 16:35:44 2012
+++ provider/contacts/Makefile.in Sat Aug 25 17:06:13 2012
@@ -343,7 +343,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
-I${top_srcdir}/mapi4linux/include \
-I${top_srcdir}/common

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

@ -1,7 +1,4 @@
$OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.6 2012/02/16 22:18:36 ajacoutot Exp $
Needs newlocale(3).
$OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.7 2012/08/30 14:28:22 ajacoutot Exp $
--- provider/libserver/ECDatabaseUtils.cpp.orig Wed Feb 1 22:09:34 2012
+++ provider/libserver/ECDatabaseUtils.cpp Thu Feb 2 12:28:17 2012
@@ -547,7 +547,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap

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

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-provider_libserver_ECSessionGroup_cpp,v 1.6 2012/08/30 14:28:22 ajacoutot Exp $
--- provider/libserver/ECSessionGroup.cpp.orig Wed Aug 8 17:14:58 2012
+++ provider/libserver/ECSessionGroup.cpp Sat Aug 25 17:06:13 2012
@@ -54,6 +54,10 @@
#include <algorithm>
@ -12,7 +12,7 @@ $OpenBSD: patch-provider_libserver_ECSessionGroup_cpp,v 1.5 2011/03/03 13:16:05
#include "ECSession.h"
#include "ECSessionGroup.h"
#include "ECSessionManager.h"
@@ -64,6 +68,11 @@
@@ -63,6 +67,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.7 2012/03/15 17:04:31 ajacoutot Exp $
--- provider/libserver/ECSession.cpp.orig Tue Mar 13 16:43:38 2012
+++ provider/libserver/ECSession.cpp Thu Mar 15 16:42:28 2012
@@ -810,11 +810,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.8 2012/08/30 14:28:22 ajacoutot Exp $
--- provider/libserver/ECSession.cpp.orig Wed Aug 8 17:14:58 2012
+++ provider/libserver/ECSession.cpp Sat Aug 25 17:06:13 2012
@@ -819,11 +819,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
uid_t uid;
char strbuf[1024];
#ifdef SO_PEERCRED

12
mail/zarafa/zarafa/patches/patch-provider_libserver_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-provider_libserver_Makefile_in,v 1.1 2012/08/30 14:28:22 ajacoutot Exp $
--- provider/libserver/Makefile.in.orig Thu Aug 30 13:30:11 2012
+++ provider/libserver/Makefile.in Thu Aug 30 13:30:28 2012
@@ -376,6 +376,8 @@ libserver_la_SOURCES = \
ZarafaCmdUtil.cpp ZarafaCmdUtil.h \
ECLockManager.cpp ECLockManager.h
+libserver_la_LIBADD = -lpthread -lz ${SSL_LIBS} ${BOOST_FILESYSTEM_LIBS} ${BOOST_SYSTEM_LIBS} ${ICU_LIBS} ${KRB5_LIBS} ${MYSQL_LIBS} ${PAM_LIBS}
+
all: all-am
.SUFFIXES:

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

@ -1,10 +1,7 @@
$OpenBSD: patch-provider_libserver_StreamUtil_cpp,v 1.4 2011/11/17 15:14:37 ajacoutot Exp $
Needs newlocale(3).
--- provider/libserver/StreamUtil.cpp.orig Thu Nov 17 03:03:23 2011
+++ provider/libserver/StreamUtil.cpp Thu Nov 17 13:59:31 2011
@@ -281,7 +281,9 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
$OpenBSD: patch-provider_libserver_StreamUtil_cpp,v 1.5 2012/08/30 14:28:22 ajacoutot Exp $
--- provider/libserver/StreamUtil.cpp.orig Mon Aug 27 10:04:10 2012
+++ provider/libserver/StreamUtil.cpp Mon Aug 27 10:06:17 2012
@@ -286,7 +286,9 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
unsigned int ulKind;
unsigned int ulNameId;
std::string strNameString;
@ -14,7 +11,7 @@ Needs newlocale(3).
convert_context converter;
short i;
@@ -326,7 +328,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
@@ -331,7 +333,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
er = ZARAFA_E_NOT_FOUND;
goto exit;
}
@ -26,7 +23,7 @@ Needs newlocale(3).
er = lpSink->Write(&flt, sizeof(flt), 1);
break;
case PT_BOOLEAN:
@@ -343,7 +349,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
@@ -348,7 +354,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
er = ZARAFA_E_NOT_FOUND;
goto exit;
}
@ -38,7 +35,7 @@ Needs newlocale(3).
er = lpSink->Write(&dbl, sizeof(dbl), 1);
break;
case PT_CURRENCY:
@@ -440,7 +450,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
@@ -445,7 +455,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 +47,7 @@ Needs newlocale(3).
er = lpSink->Write(&flt, sizeof(flt), 1);
}
break;
@@ -457,7 +471,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
@@ -462,7 +476,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);
@ -59,10 +56,10 @@ Needs newlocale(3).
+#else
+ dbl = strtod(strData.c_str(), NULL);
+#endif
er = lpSink->Write(&dbl, sizeof(flt), 1);
er = lpSink->Write(&dbl, sizeof(dbl), 1);
}
break;
@@ -575,7 +593,9 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
@@ -580,7 +598,9 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
}
exit:

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

@ -1,10 +1,83 @@
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.23 2012/05/05 16:56:17 ajacoutot Exp $
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.24 2012/08/30 14:28:22 ajacoutot Exp $
OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
--- provider/libserver/ZarafaCmd.cpp.orig Thu May 3 16:37:13 2012
+++ provider/libserver/ZarafaCmd.cpp Sat May 5 18:28:41 2012
@@ -799,12 +799,12 @@ double GetTimeOfDay();
--- provider/libserver/ZarafaCmd.cpp.orig Wed Aug 8 17:14:58 2012
+++ provider/libserver/ZarafaCmd.cpp Wed Aug 29 14:18:22 2012
@@ -545,10 +545,10 @@ int ns__logon(struct soap *soap, char *user, char *pas
ECLicenseClient *lpLicenseClient = NULL;
unsigned int ulLicenseResponse;
unsigned char *lpLicenseResponse = NULL;
- struct timespec startTimes = {0}, endTimes = {0};
+ struct tms startTimes, endTimes;
double dblStart = GetTimeOfDay();
- clock_gettime(CLOCK_THREAD_CPUTIME_ID, &startTimes);
+ times(&startTimes);
LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020llu: S logon", sessionID);
@@ -645,9 +645,9 @@ exit:
lpsResponse->er = er;
- clock_gettime(CLOCK_THREAD_CPUTIME_ID, &endTimes);
+ times(&endTimes);
- LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020llu: E logon 0x%08x %f %f", sessionID, er, timespec2dbl(endTimes) - timespec2dbl(startTimes), GetTimeOfDay() - dblStart);
+ LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020llu: E logon 0x%08x %f %f", sessionID, er, (double)(endTimes.tms_utime - startTimes.tms_utime) / CLOCKS_PER_SEC, GetTimeOfDay() - dblStart);
return SOAP_OK;
}
@@ -665,10 +665,10 @@ int ns__ssoLogon(struct soap *soap, ULONG64 ulSessionI
xsd__base64Binary *lpOutput = NULL;
char* lpszEnabled = NULL;
ECLicenseClient*lpLicenseClient = NULL;
- struct timespec startTimes = {0}, endTimes = {0};
+ struct tms startTimes, endTimes;
double dblStart = GetTimeOfDay();
- clock_gettime(CLOCK_THREAD_CPUTIME_ID, &startTimes);
+ times(&startTimes);
LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020"PRIu64": S ssoLogon", ulSessionId);
@@ -816,9 +816,9 @@ exit:
nosso:
lpsResponse->er = er;
- clock_gettime(CLOCK_THREAD_CPUTIME_ID, &endTimes);
+ times(&endTimes);
- LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020"PRIu64": E ssoLogon 0x%08x %f %f", ulSessionId, er, timespec2dbl(endTimes) - timespec2dbl(startTimes), GetTimeOfDay() - dblStart);
+ LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020"PRIu64": E ssoLogon 0x%08x %f %f", ulSessionId, er, (double)(endTimes.tms_utime - startTimes.tms_utime) / CLOCKS_PER_SEC, GetTimeOfDay() - dblStart);
return SOAP_OK;
}
@@ -830,10 +830,10 @@ int ns__logoff(struct soap *soap, ULONG64 ulSessionId,
{
ECRESULT er = erSuccess;
ECSession *lpecSession = NULL;
- struct timespec startTimes = {0}, endTimes = {0};
+ struct tms startTimes, endTimes;
double dblStart = GetTimeOfDay();
- clock_gettime(CLOCK_THREAD_CPUTIME_ID, &startTimes);
+ times(&startTimes);
LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020"PRIu64": S logoff", ulSessionId);
@@ -855,20 +855,20 @@ int ns__logoff(struct soap *soap, ULONG64 ulSessionId,
exit:
*result = er;
- clock_gettime(CLOCK_THREAD_CPUTIME_ID, &endTimes);
- LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020"PRIu64": E logoff 0x%08x %f %f", ulSessionId, 0, timespec2dbl(endTimes) - timespec2dbl(startTimes), GetTimeOfDay() - dblStart);
+ times(&endTimes);
+ LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020"PRIu64": E logoff 0x%08x %f %f", ulSessionId, 0, (double)(endTimes.tms_utime - startTimes.tms_utime) / CLOCKS_PER_SEC, GetTimeOfDay() - dblStart);
return SOAP_OK;
}
#define SOAP_ENTRY_FUNCTION_HEADER(resultvar, fname) \
ECRESULT er = erSuccess; \
@ -13,13 +86,13 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
double dblStart = GetTimeOfDay(); \
ECSession *lpecSession = NULL; \
unsigned int *lpResultVar = &resultvar; \
char *szFname = #fname; \
char *szFname = #fname; \
- clock_gettime(CLOCK_THREAD_CPUTIME_ID, &startTimes); \
+ times(&startTimes); \
SOAP_CALLBACK(soap, pthread_self(), (std::string) "[" + PrettyIP(soap->ip) + "] " + #fname); \
g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_DEBUG, "%llu: S %s", ulSessionId, szFname); \
LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020"PRIu64": S %s", ulSessionId, szFname); \
er = g_lpSessionManager->ValidateSession(soap, ulSessionId, &lpecSession, true);\
@@ -816,12 +816,12 @@ double GetTimeOfDay();
const bool bSupportUnicode = (er == erSuccess ? (lpecSession->GetCapabilities() & ZARAFA_CAP_UNICODE) != 0 : false); \
@@ -880,12 +880,12 @@ exit:
#define SOAP_ENTRY_FUNCTION_FOOTER \
__soapentry_exit: \
*lpResultVar = er; \
@ -29,11 +102,11 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
- lpecSession->AddClocks( timespec2dbl(endTimes) - timespec2dbl(startTimes), \
- 0, \
- GetTimeOfDay() - dblStart); \
- g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_DEBUG, "%llu: E %s %f %f", ulSessionId, szFname, timespec2dbl(endTimes) - timespec2dbl(startTimes), GetTimeOfDay() - dblStart); \
- LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020"PRIu64": E %s 0x%08x %f %f", ulSessionId, szFname, er, timespec2dbl(endTimes) - timespec2dbl(startTimes), GetTimeOfDay() - dblStart); \
+ lpecSession->AddClocks( (double)(endTimes.tms_utime - startTimes.tms_utime) / CLOCKS_PER_SEC, \
+ (double)(endTimes.tms_stime - startTimes.tms_stime) / CLOCKS_PER_SEC, \
+ GetTimeOfDay() - dblStart); \
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_DEBUG, "%llu: E %s %f %f", ulSessionId, szFname, (double)(endTimes.tms_utime - startTimes.tms_utime) / CLOCKS_PER_SEC, GetTimeOfDay() - dblStart); \
lpecSession->RemoveBusyState(pthread_self()); \
lpecSession->RemoveBusyState(pthread_self()); \
lpecSession->Unlock(); \
} \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.22 2012/05/05 16:56:17 ajacoutot Exp $
--- provider/server/ECServer.cpp.orig Thu May 3 16:37:11 2012
+++ provider/server/ECServer.cpp Sat May 5 17:39:39 2012
@@ -86,6 +86,10 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.23 2012/08/30 14:28:22 ajacoutot Exp $
--- provider/server/ECServer.cpp.orig Mon Aug 27 09:41:44 2012
+++ provider/server/ECServer.cpp Mon Aug 27 09:42:43 2012
@@ -87,6 +87,10 @@
#include "unicode/uclean.h"
#endif
@ -12,25 +12,25 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.22 2012/05/05 16:56:17 ajacouto
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
@@ -830,7 +834,7 @@ int running_server(char *szName, const char *szConfig)
@@ -897,7 +901,7 @@ int running_server(char *szName, const char *szConfig)
{ "mysql_config_file", "/etc/zarafa/my.cnf" },
#endif
{ "attachment_storage", "database" },
- { "attachment_path", "/var/lib/zarafa" },
+ { "attachment_path", "/var/db/zarafa" },
- { "attachment_path", "/var/lib/zarafa/attachments" },
+ { "attachment_path", "/var/db/zarafa/attachments" },
{ "attachment_compression", "6" },
// Log options
@@ -902,7 +906,7 @@ int running_server(char *szName, const char *szConfig)
@@ -970,7 +974,7 @@ int running_server(char *szName, const char *szConfig)
{ "client_update_enabled", "no" },
{ "client_update_log_level", "1", CONFIGSETTING_RELOADABLE },
- { "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 },
@@ -925,10 +929,14 @@ int running_server(char *szName, const char *szConfig)
{ "index_services_enabled", "", CONFIGSETTING_UNUSED },
{ "index_services_path", "", CONFIGSETTING_UNUSED },
@@ -999,10 +1003,14 @@ int running_server(char *szName, const char *szConfig)
{ NULL, NULL },
};

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

@ -1,24 +1,15 @@
$OpenBSD: patch-provider_server_Makefile_in,v 1.14 2012/05/05 16:56:17 ajacoutot Exp $
XXX see USE_LIBTOOL=gnu in the port Makefile
../../common/.libs/libcommon_mapi.so.X.X:
undefined reference to `MAPILogonEx' (and more)
--- provider/server/Makefile.in.orig Thu May 3 11:28:42 2012
+++ provider/server/Makefile.in Sat May 5 17:39:39 2012
@@ -296,12 +296,13 @@ zarafa_server_LDADD = \
${top_builddir}/provider/soap/libgsoap.la \
${top_builddir}/provider/soap/libsoapserver.la \
${top_builddir}/provider/common/libzarafacommon.la \
- ${top_builddir}/common/libcommon_util.la \
+ ${top_builddir}/mapi4linux/src/libmapi.la \
$OpenBSD: patch-provider_server_Makefile_in,v 1.15 2012/08/30 14:28:22 ajacoutot Exp $
--- provider/server/Makefile.in.orig Wed Aug 8 16:35:44 2012
+++ provider/server/Makefile.in Thu Aug 30 13:45:04 2012
@@ -336,9 +336,10 @@ zarafa_server_LDADD = \
${top_builddir}/common/libcommon_util.la \
${top_builddir}/common/libcommon_mapi.la \
+ ${top_builddir}/common/libcommon_util.la \
${top_builddir}/common/libcommon_ssl.la \
+ ${top_builddir}/mapi4linux/src/libmapi.la \
$(PROG_LIBS) \
$(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) $(ICU_LIBS) $(DL_LIBS) \
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
+ $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS)
+ $(SSL_LIBS) $(TCMALLOC_LIBS)
zarafa_server_SOURCES = ECServer.cpp \
ECSoapServerConnection.h ECSoapServerConnection.cpp \

28
mail/zarafa/zarafa/patches/patch-provider_soap_soapdefs_h
View File

@ -1,30 +1,26 @@
$OpenBSD: patch-provider_soap_soapdefs_h,v 1.5 2012/05/05 16:56:17 ajacoutot Exp $
Needs newlocale(3) and xlocale.h.
--- provider/soap/soapdefs.h.orig Thu May 3 16:37:07 2012
+++ provider/soap/soapdefs.h Sat May 5 17:41:56 2012
@@ -2,7 +2,9 @@
#define SOAPDEFS_H_
/* we want soap to use strtod_l */
$OpenBSD: patch-provider_soap_soapdefs_h,v 1.6 2012/08/30 14:28:22 ajacoutot Exp $
--- provider/soap/soapdefs.h.orig Wed Aug 8 17:14:56 2012
+++ provider/soap/soapdefs.h Thu Aug 30 15:25:51 2012
@@ -6,7 +6,9 @@
* gSoap will not undef HAVE_STRTOD_L and HAVE_SPRINTF_L (if they
* were defined in the first place).
*/
+#ifndef __OpenBSD__
#define WITH_C_LOCALE
+#endif
#include <platform.h>
@@ -12,7 +14,12 @@
#include <platform.h>
@@ -17,7 +19,12 @@
* this limit.
*/
#ifndef _FORTIFY_SOURCE
-# include <bits/types.h>
+# ifdef __OpenBSD__
+# ifdef __OpenBSD__
+# include <sys/types.h>
+# include <sys/select.h>
+# else
+# include <bits/types.h>
+# endif
# include <bits/types.h>
+#endif
# undef __FD_SETSIZE
# define __FD_SETSIZE 8192
#endif

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

@ -1,7 +1,7 @@
$OpenBSD: patch-spooler_DAgent_cpp,v 1.20 2012/03/15 17:04:31 ajacoutot Exp $
--- spooler/DAgent.cpp.orig Tue Mar 13 16:43:36 2012
+++ spooler/DAgent.cpp Thu Mar 15 16:42:28 2012
@@ -92,6 +92,11 @@
$OpenBSD: patch-spooler_DAgent_cpp,v 1.21 2012/08/30 14:28:22 ajacoutot Exp $
--- spooler/DAgent.cpp.orig Wed Aug 8 17:14:59 2012
+++ spooler/DAgent.cpp Mon Aug 27 10:27:05 2012
@@ -97,6 +97,11 @@
#include <sys/mman.h>
#include <pwd.h>
@ -13,7 +13,7 @@ $OpenBSD: patch-spooler_DAgent_cpp,v 1.20 2012/03/15 17:04:31 ajacoutot Exp $
/*
This is actually from sysexits.h
but since those windows lamers don't have it ..
@@ -3302,7 +3307,7 @@ int main(int argc, char *argv[]) {
@@ -3375,7 +3380,7 @@ int main(int argc, char *argv[]) {
DeliveryArgs sDeliveryArgs;
sDeliveryArgs.strPath = "";
@ -22,3 +22,17 @@ $OpenBSD: patch-spooler_DAgent_cpp,v 1.20 2012/03/15 17:04:31 ajacoutot Exp $
sDeliveryArgs.bCreateFolder = false;
sDeliveryArgs.strDeliveryFolder.clear();
sDeliveryArgs.szPathSeperator = '\\';
@@ -3437,10 +3442,10 @@ int main(int argc, char *argv[]) {
{ "log_raw_message", "no", CONFIGSETTING_RELOADABLE },
{ "log_raw_message_path", "/tmp", CONFIGSETTING_RELOADABLE },
{ "archive_on_delivery", "no", CONFIGSETTING_RELOADABLE },
- { "mr_autoaccepter", "/usr/bin/zarafa-mr-accept", CONFIGSETTING_RELOADABLE },
+ { "mr_autoaccepter", "${PREFIX}/bin/zarafa-mr-accept", CONFIGSETTING_RELOADABLE },
{ "plugin_enabled", "yes" },
- { "plugin_path", "/var/lib/zarafa/dagent/plugins" },
- { "plugin_manager_path", "/usr/share/zarafa-dagent/python" },
+ { "plugin_path", "/var/db/zarafa/dagent/plugins" },
+ { "plugin_manager_path", "${PREFIX}/share/zarafa-dagent/python" },
{ "set_rule_headers", "yes", CONFIGSETTING_RELOADABLE },
{ NULL, NULL },
};

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

@ -1,12 +0,0 @@
$OpenBSD: patch-spooler_Makefile_in,v 1.15 2012/05/05 16:56:17 ajacoutot Exp $
--- spooler/Makefile.in.orig Thu May 3 11:28:42 2012
+++ spooler/Makefile.in Sat May 5 17:39:39 2012
@@ -301,7 +301,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 archive.cpp archive.h
zarafa_spooler_SOURCES = Spooler.cpp mailer.cpp mailer.h archive.cpp archive.h

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

@ -1,7 +1,18 @@
$OpenBSD: patch-spooler_Spooler_cpp,v 1.13 2012/05/05 16:56:17 ajacoutot Exp $
--- spooler/Spooler.cpp.orig Thu May 3 16:37:10 2012
+++ spooler/Spooler.cpp Sat May 5 17:39:39 2012
@@ -1223,6 +1223,7 @@ int main(int argc, char *argv[]) {
$OpenBSD: patch-spooler_Spooler_cpp,v 1.14 2012/08/30 14:28:22 ajacoutot Exp $
--- spooler/Spooler.cpp.orig Wed Aug 8 17:14:58 2012
+++ spooler/Spooler.cpp Mon Aug 27 10:26:16 2012
@@ -1139,8 +1139,8 @@ int main(int argc, char *argv[]) {
{ "archive_on_send", "no", CONFIGSETTING_RELOADABLE },
{ "enable_dsn", "yes", CONFIGSETTING_RELOADABLE },
{ "plugin_enabled", "yes" },
- { "plugin_path", "/var/lib/zarafa/spooler/plugins" },
- { "plugin_manager_path", "/usr/share/zarafa-spooler/python" },
+ { "plugin_path", "/var/db/zarafa/spooler/plugins" },
+ { "plugin_manager_path", "${PREFIX}/share/zarafa-spooler/python" },
{ NULL, NULL },
};
// SIGSEGV backtrace support
@@ -1245,6 +1245,7 @@ int main(int argc, char *argv[]) {
// detect linuxthreads, which is too broken to correctly run the spooler
if (!bForked) {
@ -9,7 +20,7 @@ $OpenBSD: patch-spooler_Spooler_cpp,v 1.13 2012/05/05 16:56:17 ajacoutot Exp $
char buffer[256];
confstr(_CS_GNU_LIBPTHREAD_VERSION, buffer, sizeof(buffer));
if (strncmp(buffer, "linuxthreads", strlen("linuxthreads")) == 0) {
@@ -1231,6 +1232,9 @@ int main(int argc, char *argv[]) {
@@ -1253,6 +1254,9 @@ int main(int argc, char *argv[]) {
g_lpLogger->Log(EC_LOGLEVEL_FATAL, "WARNING: your system is running with outdated linuxthreads.");
g_lpLogger->Log(EC_LOGLEVEL_FATAL, "WARNING: the zarafa-spooler will only be able to send one message at a time.");
}

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

@ -1,6 +1,14 @@
@comment $OpenBSD: PLIST-main,v 1.39 2012/05/22 07:51:08 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.40 2012/08/30 14:28:22 ajacoutot Exp $
@comment chdir(2) to running_path which is set to /var/empty in the cfg files
@newgroup _zarafa:627
@newuser _zarafa:627:_zarafa:daemon:Zarafa Account:/var/empty:/sbin/nologin
@extraunexec rm -rf /var/db/zarafa/{0,1,2,3,4,5,6,7,8,9}
@extraunexec rm -rf /var/db/zarafa/attachments
@extraunexec rm -rf /var/db/zarafa/dagent/plugins/*
@extraunexec rm -rf /var/db/zarafa/spooler/plugins/*
@extraunexec rm -rf /var/db/zarafa/client/*
@extraunexec rm -rf /var/db/zarafa/index/*
@extraunexec rm -rf /var/log/zarafa/*.log
@bin bin/zarafa-admin
@bin bin/zarafa-archiver
bin/zarafa-autorespond
@ -8,11 +16,13 @@ bin/zarafa-autorespond
@bin bin/zarafa-fsck
@bin bin/zarafa-gateway
@bin bin/zarafa-ical
@bin bin/zarafa-indexer
bin/zarafa-mailbox-permissions
@bin bin/zarafa-monitor
bin/zarafa-mr-accept
@bin bin/zarafa-passwd
@bin bin/zarafa-search
@bin bin/zarafa-server
bin/zarafa-set-oof
@bin bin/zarafa-spooler
@bin bin/zarafa-stats
include/icalmapi/
@ -76,19 +86,23 @@ include/mapi4linux/mapispi.h
include/mapi4linux/mapitags.h
include/mapi4linux/mapiutil.h
include/mapi4linux/mapix.h
include/zarafa/
include/zarafa/CommonUtil.h
include/zarafa/ConsoleTable.h
include/zarafa/ECABEntryID.h
include/zarafa/ECACL.h
include/zarafa/ECCache.h
include/zarafa/ECChannel.h
include/zarafa/ECConfig.h
include/zarafa/ECConfigImpl.h
include/zarafa/ECDatabaseMySQL.h
include/zarafa/ECDebug.h
include/zarafa/ECDebugPrint.h
include/zarafa/ECDefs.h
include/zarafa/ECFeatureList.h
include/zarafa/ECFeatures.h
include/zarafa/ECFifoBuffer.h
include/zarafa/ECFifoStream.h
include/zarafa/ECGetText.h
include/zarafa/ECGuid.h
include/zarafa/ECIConv.h
@ -97,6 +111,7 @@ include/zarafa/ECInvariantChecker.h
include/zarafa/ECIterators.h
include/zarafa/ECKeyTable.h
include/zarafa/ECLogger.h
include/zarafa/ECMAPIDebug.h
include/zarafa/ECMemStream.h
include/zarafa/ECMemTable.h
include/zarafa/ECRestriction.h
@ -111,6 +126,7 @@ include/zarafa/HtmlEntity.h
include/zarafa/HtmlToTextParser.h
include/zarafa/IECChangeAdviseSink.h
include/zarafa/IECChangeAdvisor.h
include/zarafa/IECExchangeModifyTable.h
include/zarafa/IECExportAddressbookChanges.h
include/zarafa/IECExportChanges.h
include/zarafa/IECImportAddressbookChanges.h
@ -125,6 +141,8 @@ include/zarafa/IECStatsCollector.h
include/zarafa/IECTestProtocol.h
include/zarafa/IECUnknown.h
include/zarafa/IMAPIOffline.h
include/zarafa/IStreamAdapter.h
include/zarafa/MAPIConsoleTable.h
include/zarafa/MAPINotifSink.h
include/zarafa/RecurrenceState.h
include/zarafa/SSLUtil.h
@ -180,10 +198,14 @@ include/zarafa/utf8.h
include/zarafa/utf8/checked.h
include/zarafa/utf8/core.h
include/zarafa/utf8/unchecked.h
lib/libarchiver-core.la
@lib lib/libarchiver-core.so.${LIBarchiver-core_VERSION}
lib/libarchiver.la
@lib lib/libarchiver.so.${LIBarchiver_VERSION}
@comment lib/libcommon_mapi.la
@lib lib/libcommon_mapi.so.${LIBcommon_mapi_VERSION}
lib/libcommon_service.la
@lib lib/libcommon_service.so.${LIBcommon_service_VERSION}
@comment lib/libcommon_ssl.la
@lib lib/libcommon_ssl.so.${LIBcommon_ssl_VERSION}
@comment lib/libcommon_util.la
@ -241,16 +263,19 @@ lib/zarafa/
lib/zarafa/dbplugin.so
@comment lib/zarafa/ldapplugin.la
lib/zarafa/ldapplugin.so
@man man/man1/za-restore.1
@man man/man1/zarafa-admin.1
@man man/man1/zarafa-archiver.1
@man man/man1/zarafa-dagent.1
@man man/man1/zarafa-fsck.1
@man man/man1/zarafa-gateway.1
@man man/man1/zarafa-ical.1
@man man/man1/zarafa-indexer.1
@man man/man1/zarafa-mailbox-permissions.1
@man man/man1/zarafa-monitor.1
@man man/man1/zarafa-passwd.1
@man man/man1/zarafa-search.1
@man man/man1/zarafa-server.1
@man man/man1/zarafa-set-oof.1
@man man/man1/zarafa-spooler.1
@man man/man1/zarafa-stats.1
@man man/man1/zarafa.1
@ -258,10 +283,9 @@ lib/zarafa/ldapplugin.so
@man man/man5/zarafa-dagent.cfg.5
@man man/man5/zarafa-gateway.cfg.5
@man man/man5/zarafa-ical.cfg.5
@man man/man5/zarafa-indexer.cfg.5
@man man/man5/zarafa-ldap.cfg.5
@man man/man5/zarafa-ldapms.cfg.5
@man man/man5/zarafa-monitor.cfg.5
@man man/man5/zarafa-search.cfg.5
@man man/man5/zarafa-server.cfg.5
@man man/man5/zarafa-spooler.cfg.5
@man man/man5/zarafa-unix.cfg.5
@ -284,7 +308,10 @@ share/doc/zarafa/eula.txt
@mode 0555
share/doc/zarafa/ldap-switch-sendas.pl
share/doc/zarafa/optimize-imap.py
share/doc/zarafa/update-resource-recipients
@mode
share/doc/zarafa/zarafa.ldif
@mode 0555
share/doc/zarafa/zarafa7-upgrade
@mode
share/examples/zarafa/
@ -305,22 +332,6 @@ share/examples/zarafa/gateway.cfg
@sample ${SYSCONFDIR}/zarafa/gateway.cfg
share/examples/zarafa/ical.cfg
@sample ${SYSCONFDIR}/zarafa/ical.cfg
share/examples/zarafa/indexer.cfg
@sample ${SYSCONFDIR}/zarafa/indexer.cfg
share/examples/zarafa/indexerscripts/
@sample ${SYSCONFDIR}/zarafa/indexerscripts/
share/examples/zarafa/indexerscripts/attachments_parser
@mode 555
@sample ${SYSCONFDIR}/zarafa/indexerscripts/attachments_parser
@mode
share/examples/zarafa/indexerscripts/attachments_parser.db
@sample ${SYSCONFDIR}/zarafa/indexerscripts/attachments_parser.db
share/examples/zarafa/indexerscripts/xmltotext.xslt
@sample ${SYSCONFDIR}/zarafa/indexerscripts/xmltotext.xslt
share/examples/zarafa/indexerscripts/zmktemp
@mode 555
@sample ${SYSCONFDIR}/zarafa/indexerscripts/zmktemp
@mode
share/examples/zarafa/ldap.active-directory.cfg
@mode 640
@group _zarafa
@ -361,6 +372,22 @@ share/examples/zarafa/quotamail/usersoft.mail
@sample ${SYSCONFDIR}/zarafa/quotamail/usersoft.mail
share/examples/zarafa/quotamail/userwarning.mail
@sample ${SYSCONFDIR}/zarafa/quotamail/userwarning.mail
share/examples/zarafa/search.cfg
@sample ${SYSCONFDIR}/zarafa/search.cfg
share/examples/zarafa/searchscripts/
@sample ${SYSCONFDIR}/zarafa/searchscripts/
share/examples/zarafa/searchscripts/attachments_parser
@mode 555
@sample ${SYSCONFDIR}/zarafa/searchscripts/attachments_parser
@mode
share/examples/zarafa/searchscripts/attachments_parser.db
@sample ${SYSCONFDIR}/zarafa/searchscripts/attachments_parser.db
share/examples/zarafa/searchscripts/xmltotext.xslt
@sample ${SYSCONFDIR}/zarafa/searchscripts/xmltotext.xslt
share/examples/zarafa/searchscripts/zmktemp
@mode 555
@sample ${SYSCONFDIR}/zarafa/searchscripts/zmktemp
@mode
share/examples/zarafa/server.cfg
@mode 640
@group _zarafa
@ -409,8 +436,6 @@ share/examples/zarafa/userscripts/groups_common.sh
@sample ${SYSCONFDIR}/zarafa/userscripts/groups_common.sh
share/examples/zarafa/userscripts/users_common.sh
@sample ${SYSCONFDIR}/zarafa/userscripts/users_common.sh
@mode 555
share/examples/zarafa/zarafa-client-update
@mode
share/examples/zarafa/zarafa.m4
@mode 0444
@ -425,14 +450,45 @@ share/locale/fr/LC_MESSAGES/zarafa.mo
share/locale/it/LC_MESSAGES/zarafa.mo
share/locale/nl/LC_MESSAGES/zarafa.mo
share/locale/pt/LC_MESSAGES/zarafa.mo
share/locale/ru/LC_MESSAGES/zarafa.mo
share/locale/sv/LC_MESSAGES/zarafa.mo
share/zarafa-dagent/
share/zarafa-dagent/python/
share/zarafa-dagent/python/mapiplugin.py
share/zarafa-dagent/python/pluginmanager.py
share/zarafa-dagent/python/plugins/
share/zarafa-dagent/python/plugins/BMP2PNG.py
share/zarafa-dagent/python/plugins/examplerules.py
share/zarafa-dagent/python/plugins/movetopublic.cfg
@sample ${SYSCONFDIR}/zarafa/movetopublic.cfg
share/zarafa-dagent/python/plugins/movetopublic.py
share/zarafa-dagent/python/plugintemplates.py
share/zarafa-dagent/python/wraplogger.py
share/zarafa-dagent/python/zconfig.py
share/zarafa-dagent/python/zinterval.py
share/zarafa-dagent/python/zunit.py
share/zarafa-spooler/
share/zarafa-spooler/python/
share/zarafa-spooler/python/mapiplugin.py
share/zarafa-spooler/python/pluginmanager.py
share/zarafa-spooler/python/plugins/
share/zarafa-spooler/python/plugins/disclaimer.py
share/zarafa-spooler/python/plugintemplates.py
share/zarafa-spooler/python/wraplogger.py
share/zarafa-spooler/python/zconfig.py
share/zarafa-spooler/python/zinterval.py
share/zarafa-spooler/python/zunit.py
@rcscript ${RCDIR}/zarafa
@rcscript ${RCDIR}/zarafa_gateway
@rcscript ${RCDIR}/zarafa_ical
@rcscript ${RCDIR}/zarafa_indexer
@rcscript ${RCDIR}/zarafa_monitor
@rcscript ${RCDIR}/zarafa_search
@rcscript ${RCDIR}/zarafa_server
@rcscript ${RCDIR}/zarafa_spooler
@sample /var/db/zarafa/dagent/
@sample /var/db/zarafa/dagent/plugins/
@sample /var/db/zarafa/spooler/
@sample /var/db/zarafa/spooler/plugins/
@mode 0750
@owner _zarafa
@group _zarafa
@ -440,4 +496,3 @@ 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/

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

@ -1,8 +1,10 @@
@comment $OpenBSD: PLIST-web,v 1.18 2012/06/14 07:34:25 ajacoutot Exp $
@comment $OpenBSD: PLIST-web,v 1.19 2012/08/30 14:28:22 ajacoutot Exp $
@conflict php5-mapi-*
@pkgpath mail/zarafa/webaccess
@pkgpath mail/zarafa/zarafa,-php
@extraunexec rm -f %D/zarafa-webaccess/debug.php
@extraunexec rm -rf /var/db/zarafa-webaccess/plugins/*
@extraunexec rm -f /var/db/zarafa-webaccess/plugins
include/
include/php/
include/php/mapi/
@ -922,6 +924,7 @@ zarafa-webaccess/server/core/class.bus.php
zarafa-webaccess/server/core/class.conversion.php
zarafa-webaccess/server/core/class.createZipArchive.php
zarafa-webaccess/server/core/class.dispatcher.php
zarafa-webaccess/server/core/class.entryid.php
zarafa-webaccess/server/core/class.filter.php
zarafa-webaccess/server/core/class.language.php
zarafa-webaccess/server/core/class.mapisession.php
@ -938,6 +941,9 @@ zarafa-webaccess/server/core/class.xmlparser.php
zarafa-webaccess/server/core/constants.php
zarafa-webaccess/server/core/htmlfilter.php
zarafa-webaccess/server/language/
zarafa-webaccess/server/language/ca_ES.UTF-8/
zarafa-webaccess/server/language/ca_ES.UTF-8/LC_MESSAGES/
zarafa-webaccess/server/language/ca_ES.UTF-8/LC_MESSAGES/zarafa_webaccess.mo
zarafa-webaccess/server/language/cs_CZ.UTF-8/
zarafa-webaccess/server/language/cs_CZ.UTF-8/LC_MESSAGES/
zarafa-webaccess/server/language/cs_CZ.UTF-8/LC_MESSAGES/zarafa_webaccess.mo
@ -990,6 +996,9 @@ zarafa-webaccess/server/language/ja_JP.UTF-8/
zarafa-webaccess/server/language/ja_JP.UTF-8/LC_MESSAGES/
zarafa-webaccess/server/language/ja_JP.UTF-8/LC_MESSAGES/zarafa_webaccess.mo
zarafa-webaccess/server/language/ja_JP.UTF-8/language.txt
zarafa-webaccess/server/language/ko_KR.UTF-8/
zarafa-webaccess/server/language/ko_KR.UTF-8/LC_MESSAGES/
zarafa-webaccess/server/language/ko_KR.UTF-8/LC_MESSAGES/zarafa_webaccess.mo
zarafa-webaccess/server/language/lt_LT.UTF-8/
zarafa-webaccess/server/language/lt_LT.UTF-8/LC_MESSAGES/
zarafa-webaccess/server/language/lt_LT.UTF-8/LC_MESSAGES/zarafa_webaccess.mo
@ -1026,6 +1035,9 @@ zarafa-webaccess/server/language/ru_RU.UTF-8/
zarafa-webaccess/server/language/ru_RU.UTF-8/LC_MESSAGES/
zarafa-webaccess/server/language/ru_RU.UTF-8/LC_MESSAGES/zarafa_webaccess.mo
zarafa-webaccess/server/language/ru_RU.UTF-8/language.txt
zarafa-webaccess/server/language/sl_SI.UTF-8/
zarafa-webaccess/server/language/sl_SI.UTF-8/LC_MESSAGES/
zarafa-webaccess/server/language/sl_SI.UTF-8/LC_MESSAGES/zarafa_webaccess.mo
zarafa-webaccess/server/language/sv_SE.UTF-8/
zarafa-webaccess/server/language/sv_SE.UTF-8/LC_MESSAGES/
zarafa-webaccess/server/language/sv_SE.UTF-8/LC_MESSAGES/zarafa_webaccess.mo
@ -1038,6 +1050,9 @@ zarafa-webaccess/server/language/zh_CN.UTF-8/
zarafa-webaccess/server/language/zh_CN.UTF-8/LC_MESSAGES/
zarafa-webaccess/server/language/zh_CN.UTF-8/LC_MESSAGES/zarafa_webaccess.mo
zarafa-webaccess/server/language/zh_CN.UTF-8/language.txt
zarafa-webaccess/server/language/zh_TW.UTF-8/
zarafa-webaccess/server/language/zh_TW.UTF-8/LC_MESSAGES/
zarafa-webaccess/server/language/zh_TW.UTF-8/LC_MESSAGES/zarafa_webaccess.mo
zarafa-webaccess/server/mimetypes.dat
zarafa-webaccess/server/modules/
zarafa-webaccess/server/modules/class.addressbookitemmodule.php
@ -1092,6 +1107,8 @@ zarafa-webaccess/static.php
zarafa-webaccess/zarafa.conf.dist
@sample /var/www/conf/modules.sample/zarafa.conf
zarafa-webaccess/zarafa.php
@sample /var/db/zarafa-webaccess/
@exec ln -sf ${PREFIX}/zarafa-webaccess/plugins /var/db/zarafa-webaccess/plugins
@cwd ${LOCALBASE}
@comment lib/php-${MODPHP_VERSION}/modules/mapi.la
lib/php-${MODPHP_VERSION}/modules/mapi.so

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

@ -1,4 +1,4 @@
$OpenBSD: README-main,v 1.21 2012/08/24 08:29:27 ajacoutot Exp $
$OpenBSD: README-main,v 1.22 2012/08/30 14:28:22 ajacoutot Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -122,14 +122,6 @@ httpd:\
:setenv=LANG=en_US.UTF-8:\
: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.

4
mail/zarafa/zarafa/pkg/zarafa.rc
View File

@ -1,11 +1,11 @@
#!/bin/sh
#
# $OpenBSD: zarafa.rc,v 1.11 2012/08/25 10:17:27 ajacoutot Exp $
# $OpenBSD: zarafa.rc,v 1.12 2012/08/30 14:28:22 ajacoutot Exp $
# "meta" script running the following rc.d(8) scripts with the given argument;
# note that daemon_flags, daemon_user and daemon_class are not passed to
# the child scripts.
_pkg_scripts="zarafa_server zarafa_spooler zarafa_monitor zarafa_gateway zarafa_ical"
_pkg_scripts="zarafa_server zarafa_spooler zarafa_monitor zarafa_gateway zarafa_ical zarafa_search"
if [ "$1" = stop ]; then
for _i in ${_pkg_scripts}; do _l="${_i} ${_l}"; done

9
mail/zarafa/zarafa/pkg/zarafa_indexer.rc
View File

@ -1,9 +0,0 @@
#!/bin/sh
#
# $OpenBSD: zarafa_indexer.rc,v 1.1 2011/04/04 08:01:04 ajacoutot Exp $
daemon="${TRUEPREFIX}/bin/zarafa-indexer"
. /etc/rc.d/rc.subr
rc_cmd $1

11
mail/zarafa/zarafa/pkg/zarafa_search.rc Executable file
View File

@ -0,0 +1,11 @@
#!/bin/sh
#
# $OpenBSD: zarafa_search.rc,v 1.1 2012/08/30 14:28:22 ajacoutot Exp $
daemon="${TRUEPREFIX}/bin/zarafa-search"
. /etc/rc.d/rc.subr
rc_reload=NO
rc_cmd $1