update to 7.2.1

This commit is contained in:
robert 2015-11-02 11:06:34 +00:00
parent 780184cc8a
commit f64193d340
68 changed files with 1253 additions and 850 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.35 2015/04/05 22:25:08 robert Exp $
# $OpenBSD: Makefile.inc,v 1.36 2015/11/02 11:06:34 robert Exp $
SHARED_ONLY= Yes
V?= 7.2.0
BUILD?= 48204
DISTNAME?= zarafa-${V}
V?= 7.2.1
BUILD?= 51838
DISTNAME?= zarafa-${V}-${BUILD}
CATEGORIES+= mail

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.187 2015/09/28 19:05:24 robert Exp $
# $OpenBSD: Makefile,v 1.188 2015/11/02 11:06:34 robert Exp $
COMMENT-main= MS Exchange groupware suite replacement
COMMENT-web= zarafa webaccess frontend and MAPI extensions for PHP
@ -6,26 +6,24 @@ COMMENT-web= zarafa webaccess frontend and MAPI extensions for PHP
PKGNAME= zarafa-${V}
PKGNAME-main= zarafa-${V}
PKGNAME-web= zarafa-webaccess-${V}
REVISION-web= 1
REVISION-main= 3
CATEGORIES= mail www productivity
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
SHARED_LIBS += mapicalendar 0.0 # .0.0
SHARED_LIBS += mapitimezone 0.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 += zarafacontacts 0.0 # .0.0
SHARED_LIBS += icalmapi 2.0 # .1.0
SHARED_LIBS += inetmapi 2.0 # .1.0
SHARED_LIBS += zarafa-archiver-core 0.0 # 0.0
SHARED_LIBS += zarafa-archiver 0.0 # 0.0
SHARED_LIBS += zarafa_server 0.0 # 0.0
SHARED_LIBS += zarafa_soapclient 0.0 # 0.0
SHARED_LIBS += zarafa_soapserver 0.0 # 0.0
SHARED_LIBS += zcp_common_mapi 0.0 # 0.0
SHARED_LIBS += zcp_common_service 0.0 # 0.0
SHARED_LIBS += zcp_common_ssl 0.0 # 0.0
SHARED_LIBS += zcp_common_util 0.0 # 0.0
MULTI_PACKAGES= -main -web
@ -46,18 +44,19 @@ BUILD_DEPENDS=\
BUILD_DEPENDS += net/curl
WANTLIB += ${MODGETTEXT_WANTLIB}
WANTLIB += m pthread stdc++ z vmime execinfo icudata icui18n icuuc
WANTLIB += m pthread z vmime execinfo icudata icui18n icuuc
WANTLIB += boost_filesystem-mt boost_system-mt lzma
WANTLIB += ffi gmp gnutls hogweed nettle p11-kit tasn1
WANTLIB-main += ${WANTLIB} ${MODPY_WANTLIB}
WANTLIB-main += c crypto ical icalss lber-2.4
WANTLIB-main += mysqlclient ncurses sasl2 ssl util xml2
WANTLIB-main += ldap_r-2.4 gsoapssl++
WANTLIB-main += ffi gmp gnutls hogweed nettle p11-kit stdc++ tasn1
RUN_DEPENDS-main=${MODGETTEXT_RUN_DEPENDS} \
${MODPY_RUN_DEPENDS} \
databases/xapian-bindings,-python \
devel/libmagic \
lang/python/2.7,-bsddb \
textproc/catdoc
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
@ -72,8 +71,10 @@ LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
textproc/libxml
WANTLIB-web += ${WANTLIB}
WANTLIB-web += common_util freebusy ical icalmapi icalss inetmapi mapi
WANTLIB-web += common_mapi xml2
WANTLIB-web += freebusy ical icalmapi icalss inetmapi mapi
WANTLIB-web += xml2
WANTLIB-web += ffi gmp gnutls hogweed nettle p11-kit stdc++ tasn1
WANTLIB-web += zcp_common_mapi zcp_common_util
LIB_DEPENDS-web= ${BASE_PKGPATH}>=${V}
RUN_DEPENDS-web= ${MODPHP_RUN_DEPENDS} \
@ -96,7 +97,9 @@ INSTDIR= ${PREFIX-web}/zarafa-webaccess
SUBST_VARS= INSTDIR PREFIX-web
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= autoconf
AUTOCONF_VERSION= 2.69
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${LOCALBASE}/include/zarafa" \
LDFLAGS="-L${LOCALBASE}/lib -lexecinfo \
@ -212,14 +215,14 @@ post-install:
# part of zarafa-licensed, Zarafa Enterprise / Hosted editions
# (i.e. commercial edition, linux bin only)
cd ${PREFIX} && rm \
man/man1/zarafa-licensed.1 \
man/man8/zarafa-licensed.8 \
man/man5/zarafa-licensed.cfg.5 \
man/man1/zarafa-restore.1 \
man/man1/zarafa-backup.1 \
man/man1/zarafa-msr-verify.1 \
man/man1/zarafa-report.1 \
man/man1/za-aclsync.1 \
man/man1/zarafa-msr.1 \
man/man8/zarafa-restore.8 \
man/man8/zarafa-backup.8 \
man/man8/zarafa-msr-verify.8 \
man/man8/zarafa-report.8 \
man/man8/za-aclsync.8 \
man/man8/zarafa-msr.8 \
man/man5/zarafa-ldapms.cfg.5 \
man/man5/zarafa-msr.cfg.5 \
man/man5/zarafa-backup.cfg.5
@ -230,13 +233,12 @@ post-install:
rmdir ${WRKINST}/var/lib/
perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},g' \
${PREFIX}/bin/zarafa-search \
${PREFIX}/bin/zarafa-search-xapian-compact.py \
${PREFIX}/sbin/zarafa-search \
${PREFIX}/sbin/zarafa-search-xapian-compact.py \
${PREFIX}/lib/python${MODPY_VERSION}/site-packages/zarafa_search/__init__.py \
${PREFIX}/lib/python${MODPY_VERSION}/site-packages/zarafa_search/plaintext.py \
${PREFIX}/lib/python${MODPY_VERSION}/site-packages/zarafa/daemon/version/version_info.py
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
${PREFIX}/share/zarafa-dagent/python \
${PREFIX}/share/zarafa-spooler/python \

View File

@ -1,2 +1,2 @@
SHA256 (zarafa/zarafa-7.2.0.tar.gz) = aVk/YZYLm7tTBdCUlvmjfT9UfbFGTcLs9PVFfHiY/0U=
SIZE (zarafa/zarafa-7.2.0.tar.gz) = 6035498
SHA256 (zarafa/zarafa-7.2.1-51838.tar.gz) = LX/4N+pO3cF3AeIZ7Ia+eHKdLDWb/XWHE/4rvZBLmrM=
SIZE (zarafa/zarafa-7.2.1-51838.tar.gz) = 6918062

View File

@ -13,7 +13,7 @@ define(`LOCAL_MAILER_PATH',
ifdef(`ZARAFA_MAILER_PATH',
ZARAFA_MAILER_PATH,
`${TRUEPREFIX}/bin/zarafa-dagent'),
`${TRUEPREFIX}/sbin/zarafa-dagent'),
_ARG_))
define(`LOCAL_MAILER_ARGS',
ifelse(len(X`'_ARG2_), `1', `zarafa-dagent $u', _ARG2_))

View File

@ -6,7 +6,7 @@ PUSHDIVERT(-1)
ifdef(`ZARAFA_MAILER_ARGS',,
`define(`ZARAFA_MAILER_ARGS', zarafa-dagent $u)')
ifdef(`ZARAFA_MAILER_PATH',,
`define(`ZARAFA_MAILER_PATH', ${TRUEPREFIX}/bin/zarafa-dagent)')
`define(`ZARAFA_MAILER_PATH', ${TRUEPREFIX}/sbin/zarafa-dagent)')
POPDIVERT
#######################################
### Zarafa Mailer specification ###

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ECtools_zarafa-fsck_zarafa-fsck_cpp,v 1.4 2015/04/05 22:25:08 robert Exp $
--- ECtools/zarafa-fsck/zarafa-fsck.cpp.orig Thu Mar 5 16:54:04 2015
+++ ECtools/zarafa-fsck/zarafa-fsck.cpp Fri Apr 3 23:11:10 2015
@@ -558,8 +558,10 @@ int main(int argc, char *argv[])
$OpenBSD: patch-ECtools_zarafa-fsck_zarafa-fsck_cpp,v 1.5 2015/11/02 11:06:34 robert Exp $
--- ECtools/zarafa-fsck/zarafa-fsck.cpp.orig Wed Aug 5 17:30:50 2015
+++ ECtools/zarafa-fsck/zarafa-fsck.cpp Thu Aug 20 12:36:50 2015
@@ -565,8 +565,10 @@ int main(int argc, char *argv[])
bool acceptDisclaimer = false;
setlocale(LC_MESSAGES, "");

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ECtools_zarafa-monitor_zarafa-monitor_cpp,v 1.4 2015/04/05 22:25:08 robert Exp $
--- ECtools/zarafa-monitor/zarafa-monitor.cpp.orig Thu Mar 5 16:54:04 2015
+++ ECtools/zarafa-monitor/zarafa-monitor.cpp Fri Apr 3 23:11:10 2015
@@ -238,8 +238,10 @@ int main(int argc, char *argv[]) {
$OpenBSD: patch-ECtools_zarafa-monitor_zarafa-monitor_cpp,v 1.5 2015/11/02 11:06:34 robert Exp $
--- ECtools/zarafa-monitor/zarafa-monitor.cpp.orig Wed Aug 5 17:30:50 2015
+++ ECtools/zarafa-monitor/zarafa-monitor.cpp Thu Aug 20 12:36:50 2015
@@ -204,8 +204,10 @@ int main(int argc, char *argv[]) {
{ NULL, 0, NULL, 0 }
};

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.1 2015/11/02 11:06:34 robert Exp $
--- Makefile.in.orig Thu Aug 20 14:32:45 2015
+++ Makefile.in Thu Aug 20 14:32:59 2015
@@ -876,7 +876,7 @@ uninstall-am:
.PHONY: source-moved-check
source-moved-check:
- @${top_srcdir}/pwdcheck.sh "${abs_top_builddir}"
+ @${top_srcdir}/pwdcheck.sh "${abs_top_builddir}" || true
common/ecversion.h: versionheader.sh
sh ${top_srcdir}/versionheader.sh > common/ecversion.h

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-common_CommonUtil_cpp,v 1.6 2015/04/05 22:25:08 robert Exp $
--- common/CommonUtil.cpp.orig Thu Mar 5 16:54:04 2015
+++ common/CommonUtil.cpp Fri Apr 3 23:11:10 2015
@@ -82,6 +82,7 @@
#include <sys/types.h>
#include <sys/socket.h>
+#include <netinet/in.h>
#include <netdb.h>
using namespace std;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-common_ECLogger_cpp,v 1.19 2015/04/05 22:25:08 robert Exp $
--- common/ECLogger.cpp.orig Thu Mar 5 16:54:04 2015
+++ common/ECLogger.cpp Fri Apr 3 23:11:10 2015
@@ -51,6 +51,10 @@
$OpenBSD: patch-common_ECLogger_cpp,v 1.20 2015/11/02 11:06:34 robert Exp $
--- common/ECLogger.cpp.orig Wed Aug 5 17:30:49 2015
+++ common/ECLogger.cpp Thu Aug 20 13:20:50 2015
@@ -52,6 +52,10 @@
#include "stringutil.h"
#include "charset/localeutil.h"
@ -10,11 +10,11 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.19 2015/04/05 22:25:08 robert Exp $
+#endif
+
#include "config.h"
#include <poll.h>
#if HAVE_SYSLOG_H
#include <syslog.h>
@@ -85,18 +89,22 @@ ECLogger::ECLogger(unsigned int max_ll) {
@@ -88,18 +92,22 @@ static const char *const ll_names[] = {
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, "C");
@ -25,29 +25,29 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.19 2015/04/05 22:25:08 robert Exp $
}
ECLogger::~ECLogger() {
delete [] msgbuffer;
+#ifndef __OpenBSD__
if (timelocale)
freelocale(timelocale);
if (datalocale)
freelocale(datalocale);
+#endif
pthread_mutex_destroy(&msgbuflock);
}
@@ -110,9 +118,11 @@ char* ECLogger::MakeTimestamp() {
void ECLogger::SetLoglevel(unsigned int max_ll) {
@@ -114,9 +122,11 @@ std::string ECLogger::MakeTimestamp() {
localtime_r(&now, &local);
char buffer[_LOG_TSSIZE];
+#ifndef __OpenBSD__
if (timelocale)
strftime_l(timestring, _LOG_TSSIZE, "%c", &local, timelocale);
strftime_l(buffer, sizeof buffer, "%c", &local, timelocale);
else
+#endif
strftime(timestring, _LOG_TSSIZE, "%c", &local);
strftime(buffer, sizeof buffer, "%c", &local);
return timestring;
@@ -154,7 +164,11 @@ int ECLogger::snprintf(char *str, size_t size, const c
return buffer;
@@ -175,7 +185,11 @@ int ECLogger::snprintf(char *str, size_t size, const c
int len = 0;
va_start(va, format);
@ -59,81 +59,73 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.19 2015/04/05 22:25:08 robert Exp $
va_end(va);
return len;
@@ -252,7 +266,7 @@ void ECLogger_File::DoPrefix() {
fnPrintf(log, "%s: ", MakeTimestamp());
if (prefix == LP_TID)
- fnPrintf(log, "[0x%08x] ", (unsigned int)pthread_self());
+ fnPrintf(log, "[0x%08x] ", (uintptr_t)pthread_self());
else if (prefix == LP_PID)
fnPrintf(log, "[%5d] ", getpid());
}
@@ -325,7 +339,11 @@ void ECLogger_File::Log(unsigned int loglevel, const c
@@ -397,7 +411,11 @@ void ECLogger_File::Log(unsigned int loglevel, const c
void ECLogger_File::LogVA(unsigned int loglevel, const char *format, va_list& va) {
pthread_mutex_lock(&msgbuflock);
char msgbuffer[_LOG_BUFSIZE];
+#ifndef __OpenBSD__
_vsnprintf_l(msgbuffer, _LOG_BUFSIZE, format, datalocale, va);
_vsnprintf_l(msgbuffer, sizeof msgbuffer, format, datalocale, va);
+#else
+ _vsnprintf_l(msgbuffer, _LOG_BUFSIZE, format, va);
+ _vsnprintf_l(msgbuffer, sizeof msgbuffer, format, va);
+#endif
pthread_mutex_lock(&filelock);
@@ -388,7 +406,11 @@ void ECLogger_Syslog::LogVA(unsigned int loglevel, con
#if HAVE_VSYSLOG
Log(loglevel, std::string(msgbuffer));
}
@@ -456,7 +474,11 @@ void ECLogger_Syslog::LogVA(unsigned int loglevel, con
vsyslog(levelmap[loglevel & EC_LOGLEVEL_MASK], format, va);
#else
char msgbuffer[_LOG_BUFSIZE];
+#ifndef __OpenBSD__
_vsnprintf_l(msgbuffer, _LOG_BUFSIZE, format, datalocale, va);
+ _vsnprintf_l(msgbuffer, sizeof msgbuffer, format, va);
+#else
+ _vsnprintf_l(msgbuffer, _LOG_BUFSIZE, format, va);
_vsnprintf_l(msgbuffer, sizeof msgbuffer, format, datalocale, va);
+#endif
syslog(levelmap[loglevel & EC_LOGLEVEL_MASK], "%s", msgbuffer);
#endif
pthread_mutex_unlock(&msgbuflock);
@@ -475,7 +497,11 @@ void ECLogger_Tee::LogVA(unsigned int loglevel, const
}
@@ -541,7 +563,11 @@ void ECLogger_Tee::LogVA(unsigned int loglevel, const
LoggerList::iterator iLogger;
pthread_mutex_lock(&msgbuflock);
char msgbuffer[_LOG_BUFSIZE];
+#ifndef __OpenBSD__
_vsnprintf_l(msgbuffer, _LOG_BUFSIZE, format, datalocale, va);
_vsnprintf_l(msgbuffer, sizeof msgbuffer, format, datalocale, va);
+#else
+ _vsnprintf_l(msgbuffer, _LOG_BUFSIZE, format, va);
+ _vsnprintf_l(msgbuffer, sizeof msgbuffer, format, va);
+#endif
for (iLogger = m_loggers.begin(); iLogger != m_loggers.end(); ++iLogger)
(*iLogger)->Log(loglevel, std::string(msgbuffer));
@@ -524,7 +550,7 @@ void ECLogger_Pipe::Log(unsigned int loglevel, const s
@@ -588,7 +614,7 @@ void ECLogger_Pipe::Log(unsigned int loglevel, const s
off += 1;
if (prefix == LP_TID)
- len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[0x%08x] ", (unsigned int)pthread_self());
+ len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[0x%08x] ", (uintptr_t)pthread_self());
- len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[0x%08x] ", (unsigned int)pthread_self());
+ len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[0x%08x] ", (uintptr_t)pthread_self());
else if (prefix == LP_PID)
len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[%5d] ", getpid());
if (len < 0) len = 0;
@@ -560,14 +586,18 @@ void ECLogger_Pipe::LogVA(unsigned int loglevel, const
len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[%5d] ", getpid());
@@ -632,7 +658,7 @@ void ECLogger_Pipe::LogVA(unsigned int loglevel, const
off += 1;
if (prefix == LP_TID)
- len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[0x%08x] ", (unsigned int)pthread_self());
+ len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[0x%08x] ", (uintptr_t)pthread_self());
- len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[0x%08x] ", (unsigned int)pthread_self());
+ len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[0x%08x] ", (uintptr_t)pthread_self());
else if (prefix == LP_PID)
len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[%5d] ", getpid());
if (len < 0) len = 0;
off += len;
len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[%5d] ", getpid());
@@ -642,7 +668,11 @@ void ECLogger_Pipe::LogVA(unsigned int loglevel, const
off += len;
// return value is what WOULD have been written if enough space were available in the buffer
+#ifndef __OpenBSD__
len = _vsnprintf_l(msgbuffer+off, _LOG_BUFSIZE -off -1, format, datalocale, va);
len = _vsnprintf_l(msgbuffer + off, sizeof msgbuffer - off - 1, format, datalocale, va);
+#else
+ len = _vsnprintf_l(msgbuffer+off, _LOG_BUFSIZE -off -1, format, va);
+ len = _vsnprintf_l(msgbuffer + off, sizeof msgbuffer - off - 1, format, va);
+#endif
// -1 can be returned on formatting error (eg. %ls in C locale)
if (len < 0) len = 0;
len = min(len, _LOG_BUFSIZE -off -2); // yes, -2, otherwise we could have 2 \0 at the end of the buffer
@@ -640,9 +670,13 @@ namespace PrivatePipe {
if (len < 0)
len = 0;
@@ -722,9 +752,13 @@ namespace PrivatePipe {
int l;
bool bNPTL = true;

View File

@ -1,14 +1,14 @@
$OpenBSD: patch-common_ECLogger_h,v 1.5 2015/04/05 22:25:08 robert Exp $
--- common/ECLogger.h.orig Thu Mar 5 16:54:04 2015
+++ common/ECLogger.h Fri Apr 3 23:11:10 2015
@@ -121,8 +121,10 @@ class ECLogger { (protected)
unsigned int max_loglevel;
char *msgbuffer;
pthread_mutex_t msgbuflock;
+#ifndef __OpenBSD__
locale_t timelocale;
locale_t datalocale;
+#endif
char timestring[_LOG_TSSIZE];
logprefix prefix;
$OpenBSD: patch-common_ECLogger_h,v 1.6 2015/11/02 11:06:34 robert Exp $
--- common/ECLogger.h.orig Thu Aug 20 12:48:11 2015
+++ common/ECLogger.h Thu Aug 20 12:48:23 2015
@@ -122,8 +122,10 @@ class ECLogger {
std::string MakeTimestamp();
unsigned int max_loglevel;
+#ifndef __OpenBSD__
locale_t timelocale;
locale_t datalocale;
+#endif
logprefix prefix;
protected:

View File

@ -1,43 +0,0 @@
$OpenBSD: patch-common_Makefile_in,v 1.24 2015/04/05 22:25:08 robert Exp $
--- common/Makefile.in.orig Thu Mar 5 16:52:51 2015
+++ common/Makefile.in Fri Apr 3 23:11:10 2015
@@ -432,7 +432,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(BOOST_CPPFL
-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
-I${top_srcdir}/libfreebusy $(MYSQL_INCLUDES)
-libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -static
+libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS}
libcommon_mapi_la_SOURCES = CommonUtil.cpp \
rtfutil.cpp \
codepage.cpp \
@@ -456,8 +456,9 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \
MAPIConsoleTable.cpp \
ECMAPIDebug.cpp \
MAPIErrors.cpp
+libcommon_mapi_la_LIBADD = -lpthread ${ICU_LIBS}
-libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -static
+libcommon_util_la_LDFLAGS = ${AM_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 \
@@ -468,14 +469,17 @@ libcommon_util_la_SOURCES = platform.cpp platform.linu
ECGetText.cpp threadutil.cpp ECRestriction.cpp userutil.cpp \
ECFeatures.cpp ECACL.cpp fileutil.cpp ECThreadPool.cpp \
ConsoleTable.cpp $(am__append_1)
-libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -static
+libcommon_util_la_LIBADD = -lpthread ${BOOST_FILESYSTEM_LIBS} ${BOOST_SYSTEM_LIBS} ${ICU_LIBS}
+libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS}
libcommon_ssl_la_SOURCES = \
SSLUtil.cpp \
ECChannelClient.cpp \
ECChannel.cpp
+libcommon_ssl_la_LIBADD = -lpthread ${SSL_LIBS}
-libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -static
+libcommon_service_la_LDFLAGS = ${AM_LDFLAGS}
libcommon_service_la_SOURCES = ECDatabaseMySQL.cpp
+libcommon_service_la_LIBADD = ${MYSQL_LIBS}
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-am

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-common_charset_localeutil_cpp,v 1.2 2015/04/05 22:25:08 robert Exp $
--- common/charset/localeutil.cpp.orig Thu Mar 5 16:54:04 2015
+++ common/charset/localeutil.cpp Sun Apr 5 16:20:07 2015
$OpenBSD: patch-common_charset_localeutil_cpp,v 1.3 2015/11/02 11:06:34 robert Exp $
--- common/charset/localeutil.cpp.orig Wed Aug 5 17:30:49 2015
+++ common/charset/localeutil.cpp Thu Aug 20 12:36:50 2015
@@ -47,6 +47,7 @@
#include <iostream>
#include <string.h>
#include <cstring>
#include "localeutil.h"
+#ifndef __OpenBSD__
locale_t createUTF8Locale()

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-common_charset_localeutil_h,v 1.2 2015/04/05 22:25:08 robert Exp $
--- common/charset/localeutil.h.orig Thu Mar 5 16:54:04 2015
+++ common/charset/localeutil.h Sun Apr 5 15:13:30 2015
@@ -46,6 +46,8 @@
$OpenBSD: patch-common_charset_localeutil_h,v 1.3 2015/11/02 11:06:34 robert Exp $
--- common/charset/localeutil.h.orig Wed Aug 5 17:30:49 2015
+++ common/charset/localeutil.h Thu Aug 20 12:36:50 2015
@@ -45,6 +45,8 @@
#define __CHARSET_UTIL_H
bool forceUTF8Locale(bool bOutput, std::string *lpstrLastSetLocale = NULL);

View File

@ -1,17 +1,14 @@
$OpenBSD: patch-common_charset_traits_h,v 1.2 2015/04/05 22:25:08 robert Exp $
On OpenBSD, _N is defined in ctype.h
--- common/charset/traits.h.orig Thu Mar 5 16:54:04 2015
+++ common/charset/traits.h Fri Apr 3 23:11:10 2015
@@ -102,31 +102,31 @@ class iconv_charset<const char*> { (public)
$OpenBSD: patch-common_charset_traits_h,v 1.3 2015/11/02 11:06:34 robert Exp $
--- common/charset/traits.h.orig Thu Aug 20 12:49:17 2015
+++ common/charset/traits.h Thu Aug 20 12:49:32 2015
@@ -102,31 +102,31 @@ class iconv_charset<const char *> _final { (public)
}
};
-template <size_t _N>
-class iconv_charset<char [_N]> {
-class iconv_charset<char[_N]> _final {
+template <size_t _ZCPN>
+class iconv_charset<char [_ZCPN]> {
+class iconv_charset<char[_ZCPN]> _final {
public:
static const char *name() {
return CHARSET_CHAR; // Current locale
@ -28,9 +25,9 @@ On OpenBSD, _N is defined in ctype.h
};
-template <size_t _N>
-class iconv_charset<const char [_N]> {
-class iconv_charset<const char[_N]> _final {
+template <size_t _ZCPN>
+class iconv_charset<const char [_ZCPN]> {
+class iconv_charset<const char[_ZCPN]> _final {
public:
static const char *name() {
return CHARSET_CHAR; // Current locale
@ -46,14 +43,14 @@ On OpenBSD, _N is defined in ctype.h
}
};
@@ -174,31 +174,31 @@ class iconv_charset<const wchar_t*> { (public)
@@ -174,31 +174,31 @@ class iconv_charset<const wchar_t *> _final { (public)
}
};
-template <size_t _N>
-class iconv_charset<wchar_t [_N]> {
-class iconv_charset<wchar_t[_N]> _final {
+template <size_t _ZCPN>
+class iconv_charset<wchar_t [_ZCPN]> {
+class iconv_charset<wchar_t[_ZCPN]> _final {
public:
static const char *name() {
return CHARSET_WCHAR; // Current locale
@ -70,9 +67,9 @@ On OpenBSD, _N is defined in ctype.h
};
-template <size_t _N>
-class iconv_charset<const wchar_t [_N]> {
-class iconv_charset<const wchar_t[_N]> _final {
+template <size_t _ZCPN>
+class iconv_charset<const wchar_t [_ZCPN]> {
+class iconv_charset<const wchar_t[_ZCPN]> _final {
public:
static const char *name() {
return CHARSET_WCHAR; // Current locale

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-common_platform_cpp,v 1.1 2015/11/02 11:06:34 robert Exp $
--- common/platform.cpp.orig Thu Aug 20 13:21:01 2015
+++ common/platform.cpp Thu Aug 20 13:23:04 2015
@@ -513,10 +513,12 @@ bool force_buffers_to_disk(const int fd)
void my_readahead(const int fd)
{
+#ifndef __OpenBSD__
struct stat st;
if (fstat(fd, &st) == 0)
(void)readahead(fd, 0, st.st_size);
+#endif
}
void give_filesize_hint(const int fd, const off_t len)
@@ -525,5 +527,7 @@ void give_filesize_hint(const int fd, const off_t len)
// kernel can now look for the best disk allocation
// pattern as it knows how much date is going to be
// inserted
+#ifndef __OpenBSD__
posix_fallocate(fd, 0, len);
+#endif
}

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-common_platform_h,v 1.10 2015/04/05 22:25:08 robert Exp $
--- common/platform.h.orig Thu Mar 5 16:54:04 2015
+++ common/platform.h Fri Apr 3 23:11:10 2015
@@ -65,7 +65,12 @@
$OpenBSD: patch-common_platform_h,v 1.11 2015/11/02 11:06:34 robert Exp $
--- common/platform.h.orig Wed Aug 5 17:30:48 2015
+++ common/platform.h Thu Aug 20 12:36:50 2015
@@ -64,7 +64,12 @@
// We have to include this now in case select.h is included too soon.
// Increase our maximum amount of file descriptors to 8192

View File

@ -1,15 +1,16 @@
$OpenBSD: patch-common_platform_linux_cpp,v 1.6 2015/04/05 22:25:08 robert Exp $
--- common/platform.linux.cpp.orig Thu Mar 5 16:54:04 2015
+++ common/platform.linux.cpp Fri Apr 3 23:13:47 2015
@@ -57,6 +57,7 @@
#include <stdlib.h>
#include <errno.h>
#include <limits.h>
+#include <signal.h>
$OpenBSD: patch-common_platform_linux_cpp,v 1.7 2015/11/02 11:06:34 robert Exp $
--- common/platform.linux.cpp.orig Wed Aug 5 17:30:48 2015
+++ common/platform.linux.cpp Thu Aug 20 13:23:31 2015
@@ -59,6 +59,8 @@
#include <cerrno>
#include <climits>
+#include <signal.h>
+
#include <string>
#include <map>
@@ -66,7 +67,7 @@
@@ -69,7 +71,7 @@
#define ICONV_CONST const
#elif OPENBSD
// bsd
@ -18,7 +19,7 @@ $OpenBSD: patch-common_platform_linux_cpp,v 1.6 2015/04/05 22:25:08 robert Exp $
#else
// linux
#define ICONV_CONST
@@ -92,22 +93,10 @@ HRESULT CoCreateGuid(LPGUID pNewGUID) {
@@ -94,22 +96,10 @@ HRESULT CoCreateGuid(LPGUID pNewGUID) {
return MAPI_E_INVALID_PARAMETER;
#if HAVE_UUID_CREATE

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-common_platform_linux_h,v 1.16 2015/04/05 22:25:08 robert Exp $
--- common/platform.linux.h.orig Thu Mar 5 16:54:04 2015
+++ common/platform.linux.h Fri Apr 3 23:11:10 2015
@@ -58,7 +58,14 @@
$OpenBSD: patch-common_platform_linux_h,v 1.17 2015/11/02 11:06:34 robert Exp $
--- common/platform.linux.h.orig Wed Aug 5 17:30:48 2015
+++ common/platform.linux.h Thu Aug 20 12:36:50 2015
@@ -57,7 +57,14 @@
#include <dlfcn.h>
#include <stddef.h>
#include <cstddef>
#include <libgen.h>
+#if defined(__OpenBSD__)
+#include <sys/param.h>
@ -14,9 +14,9 @@ $OpenBSD: patch-common_platform_linux_h,v 1.16 2015/04/05 22:25:08 robert Exp $
#include <byteswap.h>
+#endif
#include <endian.h>
#include <errno.h>
#include <locale.h>
@@ -94,6 +101,8 @@
#include <cerrno>
#include <clocale>
@@ -97,6 +104,8 @@
#define _snprintf snprintf
#ifdef HAVE_VSNPRINTF_L
#define _vsnprintf_l vsnprintf_l
@ -25,7 +25,7 @@ $OpenBSD: patch-common_platform_linux_h,v 1.16 2015/04/05 22:25:08 robert Exp $
#else
inline int _vsnprintf_l(char *str, size_t size, const char *format, locale_t locale, va_list ap) {
locale_t prev = uselocale(locale);
@@ -680,7 +689,11 @@ time_t GetProcessTime();
@@ -685,7 +694,11 @@ time_t GetProcessTime();
#ifndef ntohll
#if __BYTE_ORDER == __LITTLE_ENDIAN
@ -37,7 +37,7 @@ $OpenBSD: patch-common_platform_linux_h,v 1.16 2015/04/05 22:25:08 robert Exp $
#else
#define ntohll(x) (x)
#endif
@@ -688,14 +701,18 @@ time_t GetProcessTime();
@@ -693,14 +706,18 @@ time_t GetProcessTime();
#ifndef htonll
#if __BYTE_ORDER == __LITTLE_ENDIAN

View File

@ -1,23 +1,26 @@
$OpenBSD: patch-common_ustringutil_cpp,v 1.4 2015/04/05 22:25:08 robert Exp $
--- common/ustringutil.cpp.orig Thu Mar 5 16:54:04 2015
+++ common/ustringutil.cpp Fri Apr 3 23:11:10 2015
@@ -160,12 +160,14 @@ int ECSortKey::compareTo(const ECSortKey &other) const
$OpenBSD: patch-common_ustringutil_cpp,v 1.5 2015/11/02 11:06:34 robert Exp $
--- common/ustringutil.cpp.orig Thu Aug 20 12:51:22 2015
+++ common/ustringutil.cpp Thu Aug 20 12:52:28 2015
@@ -164,12 +164,18 @@ int ECSortKey::compareTo(const ECSortKey &other) const
*/
const char* str_ifind(const char *haystack, const char *needle)
{
+#ifndef __OpenBSD__
locale_t loc = createlocale(LC_CTYPE, "C");
+#endif
char *needlepos = (char*)needle;
char *needlestart = (char*)haystack;
const char *needlepos = needle;
const char *needlestart = haystack;
while(*haystack) {
- if (toupper_l(*haystack, loc) == toupper_l(*needlepos, loc)) {
+#ifndef __OpenBSD__
if (toupper_l(*haystack, loc) == toupper_l(*needlepos, loc)) {
+#else
+ if (toupper(*haystack) == toupper(*needlepos)) {
+#endif
needlepos++;
if(*needlepos == 0)
@@ -180,7 +182,9 @@ const char* str_ifind(const char *haystack, const char
@@ -184,7 +190,9 @@ const char* str_ifind(const char *haystack, const char
needlestart = NULL;
exit:
@ -27,7 +30,7 @@ $OpenBSD: patch-common_ustringutil_cpp,v 1.4 2015/04/05 22:25:08 robert Exp $
return needlestart;
}
@@ -1596,8 +1600,10 @@ ECLocale::ECLocale(const ECLocale &other)
@@ -1601,8 +1609,10 @@ ECLocale::ECLocale(const ECLocale &other)
}
ECLocale::~ECLocale() {

View File

@ -1,93 +0,0 @@
$OpenBSD: patch-configure,v 1.34 2015/04/05 22:25:08 robert Exp $
--- configure.orig Thu Mar 5 16:52:48 2015
+++ configure Fri Apr 3 23:11:10 2015
@@ -16770,11 +16770,6 @@ esac
# disable write-strings: too much complains about "" being 'cast' to char* (since const char* is not in the declarations) on g++-4.2 and higher
ZCPPFLAGS="$ZCPPFLAGS $BUILDOS -DHAVE_CONFIG_H"
ZCXXFLAGS="$ZCXXFLAGS -g -rdynamic -Wall -Wno-write-strings"
-if ! test "$want_release" = "yes"; then
-# when using -pedantic, -Wno-long-long is required
-# only add -pedantic in non-release mode, since a header in php5 contains a , too much in an enum, which triggers a compile error.
- ZCXXFLAGS="$ZCXXFLAGS -pedantic -Wno-long-long"
-fi
# programs that use files >2gb need 64bit file support
LFS_CFLAGS=`getconf LFS_CFLAGS`
@@ -18986,68 +18981,6 @@ rm -f core conftest.err conftest.$ac_objext \
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 ${ac_cv_lib_crypt_crypt+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcrypt $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char crypt ();
-int
-main ()
-{
-return crypt ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- ac_cv_lib_crypt_crypt=yes
-else
- 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
-{ $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" = xyes; then :
- CRYPT_LIBS="-lcrypt"
-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
-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??
@@ -19058,7 +18991,7 @@ if ${ac_cv_lib_ssl_SSL_accept+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lssl $LIBS"
+LIBS="-lssl -lcrypto $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

View File

@ -0,0 +1,32 @@
$OpenBSD: patch-configure_ac,v 1.1 2015/11/02 11:06:34 robert Exp $
--- configure.ac.orig Thu Aug 20 13:06:09 2015
+++ configure.ac Thu Aug 20 13:06:43 2015
@@ -91,11 +91,6 @@ AC_SUBST([ZPHPCXXFLAGS])
# disable write-strings: too much complains about "" being 'cast' to char* (since const char* is not in the declarations) on g++-4.2 and higher
ZCPPFLAGS="$BUILDOS -DHAVE_CONFIG_H"
ZCXXFLAGS="-Wall -Wmissing-declarations -Wno-write-strings"
-if ! test "$want_release" = "yes"; then
-# when using -pedantic, -Wno-long-long is required
-# only add -pedantic in non-release mode, since a header in php5 contains a , too much in an enum, which triggers a compile error.
- ZCXXFLAGS="$ZCXXFLAGS -pedantic -Wno-long-long"
-fi
# programs that use files >2gb need 64bit file support
LFS_CFLAGS=`getconf LFS_CFLAGS`
@@ -590,16 +585,6 @@ iconv_t i; i = iconv_open("", "");
AC_MSG_ERROR([required library libiconv missing or unusable]) ]) ])
AC_SUBST(ICONV_LIBS)
LIBS=$LIBS_system
-
-AC_MSG_CHECKING([for crypt])
-AC_LINK_IFELSE([ AC_LANG_SOURCE([int main() {
- char crypt(); crypt();
-}]) ],
- [ AC_MSG_RESULT([yes]) ],
- [ AC_MSG_RESULT([no])
- AC_CHECK_LIB([crypt], [crypt], [CRYPT_LIBS="-lcrypt"], AC_MSG_ERROR([required library libcrypt missing or unusable])) ])
-LIBS=$LIBS_system
-AC_SUBST(CRYPT_LIBS)
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
SSL_LIBS=

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.23 2015/04/05 22:25:08 robert Exp $
--- doc/Makefile.in.orig Thu Mar 5 16:52:52 2015
+++ doc/Makefile.in Fri Apr 3 23:11:10 2015
@@ -658,7 +658,7 @@ $(BUILT_SOURCES): manual.xml
$OpenBSD: patch-doc_Makefile_in,v 1.24 2015/11/02 11:06:34 robert Exp $
--- doc/Makefile.in.orig Wed Aug 5 17:29:57 2015
+++ doc/Makefile.in Thu Aug 20 12:36:50 2015
@@ -757,7 +757,7 @@ $(BUILT_SOURCES): manual.xml
@if [ -z $(PROG_XMLTO) ]; then \
echo Please install xmlto to generate manual pages; \
else \

View File

@ -1,193 +1,225 @@
$OpenBSD: patch-doc_manual_xml,v 1.39 2015/04/05 22:25:08 robert Exp $
--- doc/manual.xml.orig Thu Mar 5 16:52:33 2015
+++ doc/manual.xml Fri Apr 3 23:11:10 2015
$OpenBSD: patch-doc_manual_xml,v 1.40 2015/11/02 11:06:34 robert Exp $
--- doc/manual.xml.orig Thu Aug 20 12:54:02 2015
+++ doc/manual.xml Thu Aug 20 12:57:20 2015
@@ -876,9 +876,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.
<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-dagent.pid</replaceable>
@@ -1416,11 +1414,6 @@
<replaceable>/path/to/server.cfg</replaceable>
</para>
- <para>You may also use the init.d scripts:</para>
- <para><command>/etc/init.d/zarafa-server</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
</refsection>
<refsection>
@@ -1529,6 +1522,9 @@
located in /usr/share/zarafa, called ssl-certificate.sh. Enter
the following commands to create a certificate for the Zarafa
server.
+
+ !!! WARNING: THE OpenBSD PACKAGE DOES NOT PROVIDE THIS SCRIPT,
+ PLEASE REFER TO openssl(1) FOR MANUALLY CREATING CA/CERTS !!!
</para>
<para>
<command>
@@ -3713,9 +3709,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>
<para>Default:
<replaceable>/var/run/zarafa-dagent.pid</replaceable>
@@ -1510,12 +1508,6 @@
<option>-c</option>
<replaceable>/path/to/server.cfg</replaceable>
</para>
-
- <para>You may also use the init.d scripts:</para>
- <para><command>/etc/init.d/zarafa-server</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
</refsection>
<refsection>
@@ -3844,9 +3836,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-server.pid</replaceable>
@@ -6931,13 +6925,8 @@
</para>
<para>The spooler process will keep running and watching the
- outgoing queue for new mail to send. You may also use the
- init.d scripts:</para>
-
- <para><command>/etc/init.d/zarafa-spooler</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
</para>
<para>Default:
<replaceable>/var/run/zarafa-server.pid</replaceable>
@@ -7084,13 +7074,8 @@
</para>
<para>The spooler process will keep running and watching the
- outgoing queue for new mail to send. You may also use the
- init.d scripts:</para>
-
- <para><command>/etc/init.d/zarafa-spooler</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
+ outgoing queue for new mail to send.
+ </para>
</refsection>
<refsection>
@@ -7118,9 +7107,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.
</refsection>
<refsection>
@@ -7271,9 +7256,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-spooler.pid</replaceable>
@@ -7626,13 +7613,7 @@
<para><command>zarafa-gateway</command></para>
- <para>The gateway process will keep running. You may also use
- the init.d scripts:</para>
-
- <para><command>/etc/init.d/zarafa-gateway</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
+ <para>The gateway process will keep running.</para>
</refsection>
<refsection>
@@ -8342,14 +8323,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:
</para>
<para>Default:
<replaceable>/var/run/zarafa-spooler.pid</replaceable>
@@ -7781,13 +7764,8 @@
<para><command>zarafa-gateway</command></para>
- <para>The gateway process will keep running. You may also use
- the init.d scripts:</para>
-
- <para><command>/etc/init.d/zarafa-gateway</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
+ <para>The gateway process will keep running.
+ </para>
</refsection>
<refsection>
@@ -8026,9 +8004,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>
@@ -8520,14 +8496,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.
</para>
-
- <para><command>/etc/init.d/zarafa-monitor</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
</refsection>
<refsection>
@@ -8501,9 +8476,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>
-
- <para><command>/etc/init.d/zarafa-monitor</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
</refsection>
<refsection>
@@ -8679,9 +8649,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 value: /var/run/zarafa-monitor.pid
</para>
@@ -9810,13 +9783,7 @@
<para><command>zarafa-ical</command></para>
- <para>The iCal/CalDAV gateway process will keep running. You may also use
- the init.d scripts:</para>
-
- <para><command>/etc/init.d/zarafa-ical</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
+ <para>The iCal/CalDAV gateway process will keep running.</para>
</refsection>
<refsection>
@@ -9999,9 +9966,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>
<para>Default value: /var/run/zarafa-monitor.pid
</para>
@@ -9990,13 +9958,8 @@
<para><command>zarafa-ical</command></para>
- <para>The iCal/CalDAV gateway process will keep running. You may also use
- the init.d scripts:</para>
-
- <para><command>/etc/init.d/zarafa-ical</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
+ <para>The iCal/CalDAV gateway process will keep running.
+ </para>
</refsection>
<refsection>
@@ -10179,9 +10142,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-ical.pid</replaceable>
@@ -10350,13 +10315,7 @@
<para><command>zarafa-licensed</command></para>
- <para>The zarafa-licensed process will keep running. You may also use
- the init.d scripts:</para>
-
- <para><command>/etc/init.d/zarafa-licensed</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
+ <para>The zarafa-licensed process will keep running.</para>
</refsection>
<refsection>
@@ -10526,9 +10485,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>
<para>Default:
<replaceable>/var/run/zarafa-ical.pid</replaceable>
@@ -10553,13 +10514,8 @@
<para><command>zarafa-licensed</command></para>
- <para>The zarafa-licensed process will keep running. You may also use
- the init.d scripts:</para>
-
- <para><command>/etc/init.d/zarafa-licensed</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
+ <para>The zarafa-licensed process will keep running.
+ </para>
</refsection>
<refsection>
@@ -10729,9 +10685,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-licensed.pid</replaceable>
@@ -11339,13 +11296,6 @@
<option>-c</option>
<replaceable>/path/to/search.cfg</replaceable>
</para>
-
- <para>You may also use the init.d scripts:</para>
- <para><command>/etc/init.d/zarafa-search</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>|
- <replaceable>reload</replaceable>]</para>
</refsection>
<refsection>
@@ -11476,9 +11426,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>
<para>Default:
<replaceable>/var/run/zarafa-licensed.pid</replaceable>
@@ -11538,13 +11492,6 @@
<option>-c</option>&nbsp;
<replaceable>/path/to/search.cfg</replaceable>
</para>
-
- <para>You may also use the init.d scripts:</para>
- <para><command>/etc/init.d/zarafa-search</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>|
- <replaceable>reload</replaceable>]</para>
</refsection>
<refsection>
@@ -11674,9 +11621,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>
</para>
<para>Default:
<replaceable>/var/run/zarafa-search.pid</replaceable>
@@ -13778,13 +13723,8 @@
<para><command>zarafa-ws</command></para>
- <para>The process will keep running. You may also use
- the init.d scripts:</para>
-
- <para><command>/etc/init.d/zarafa-ws</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
+ <para>The process will keep running.
+ </para>
</refsection>
<refsection>
@@ -13993,9 +13933,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-ws.pid</replaceable>

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gateway_Gateway_cpp,v 1.8 2015/04/05 22:25:08 robert Exp $
--- gateway/Gateway.cpp.orig Thu Mar 5 16:54:01 2015
+++ gateway/Gateway.cpp Fri Apr 3 23:11:10 2015
@@ -79,6 +79,10 @@
$OpenBSD: patch-gateway_Gateway_cpp,v 1.9 2015/11/02 11:06:34 robert Exp $
--- gateway/Gateway.cpp.orig Wed Aug 5 17:30:47 2015
+++ gateway/Gateway.cpp Thu Aug 20 12:36:50 2015
@@ -80,6 +80,10 @@
#include "UnixUtil.h"
@ -10,5 +10,5 @@ $OpenBSD: patch-gateway_Gateway_cpp,v 1.8 2015/04/05 22:25:08 robert Exp $
+#endif
+
#if HAVE_ICU
#include "unicode/uclean.h"
#include <unicode/uclean.h>
#endif

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-inetmapi_Makefile_in,v 1.4 2015/04/05 22:25:08 robert Exp $
--- inetmapi/Makefile.in.orig Thu Mar 5 16:52:52 2015
+++ inetmapi/Makefile.in Fri Apr 3 23:11:10 2015
@@ -354,7 +354,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(BOOST_CPPFL
$(VMIME_CFLAGS) \
-I$(top_srcdir)/mapi4linux/include -I$(top_srcdir)/provider/common -I${top_srcdir}/common \
$OpenBSD: patch-inetmapi_Makefile_in,v 1.5 2015/11/02 11:06:34 robert Exp $
--- inetmapi/Makefile.in.orig Thu Aug 20 12:57:27 2015
+++ inetmapi/Makefile.in Thu Aug 20 12:57:39 2015
@@ -368,7 +368,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(BOOST_CPPFL
-I$(top_srcdir)/mapi4linux/include -I$(top_srcdir)/provider/common \
-I${top_srcdir}/common -I${top_srcdir}/m4lcommon \
-I${top_srcdir}/libfreebusy -I${top_srcdir}/libicalmapi \
- -I$//usr/include/libxml2
- -I/usr/include/libxml2
+ $(XML2_CFLAGS)
# Add '-z now' -> -Wl,-z, -Wl,now to LD flags so that we do early binding of symbols. This fixes
lib_LTLIBRARIES = libinetmapi.la
noinst_DATA = libinetmapi.ldd

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-installer_linux_createuser_dotforward,v 1.1.1.1 2009/02/16 09:44:38 ajacoutot Exp $
--- installer/linux/createuser.dotforward.orig Mon Dec 29 20:11:02 2008
+++ installer/linux/createuser.dotforward Mon Dec 29 20:11:50 2008
$OpenBSD: patch-installer_linux_createuser_dotforward,v 1.2 2015/11/02 11:06:34 robert Exp $
--- installer/linux/createuser.dotforward.orig Wed Aug 5 17:28:49 2015
+++ installer/linux/createuser.dotforward Thu Aug 20 12:36:50 2015
@@ -10,5 +10,5 @@
HOMEDIR=`getent passwd $ZARAFA_USER | cut -d: -f6`
-echo "\"| /usr/bin/zarafa-dagent $ZARAFA_USER\"" > $HOMEDIR/.forward
-echo "\"| /usr/sbin/zarafa-dagent $ZARAFA_USER\"" > $HOMEDIR/.forward
+echo "\"| ${PREFIX}/bin/zarafa-dagent $ZARAFA_USER\"" > $HOMEDIR/.forward
chown $ZARAFA_USER.$ZARAFA_USER $HOMEDIR/.forward

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_dagent_cfg,v 1.5 2015/04/05 22:25:08 robert Exp $
--- installer/linux/dagent.cfg.orig Sun Apr 5 17:40:46 2015
+++ installer/linux/dagent.cfg Sun Apr 5 17:41:34 2015
$OpenBSD: patch-installer_linux_dagent_cfg,v 1.6 2015/11/02 11:06:34 robert Exp $
--- installer/linux/dagent.cfg.orig Wed Aug 5 17:28:49 2015
+++ installer/linux/dagent.cfg Thu Aug 20 12:36:50 2015
@@ -11,7 +11,7 @@ server_socket = file:///var/run/zarafa
# to use this type of login method
@ -10,7 +10,7 @@ $OpenBSD: patch-installer_linux_dagent_cfg,v 1.5 2015/04/05 22:25:08 robert Exp
# The password of the SSL Key
#sslkey_pass = replace-with-dagent-cert-password
@@ -95,16 +95,16 @@ archive_on_delivery = no
@@ -110,16 +110,16 @@ archive_on_delivery = no
plugin_enabled = yes
# Path to the dagent plugin manager

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_gateway_cfg,v 1.14 2015/04/05 22:25:08 robert Exp $
--- installer/linux/gateway.cfg.orig Thu Mar 5 16:52:42 2015
+++ installer/linux/gateway.cfg Sun Apr 5 23:30:25 2015
$OpenBSD: patch-installer_linux_gateway_cfg,v 1.15 2015/11/02 11:06:34 robert Exp $
--- installer/linux/gateway.cfg.orig Thu Aug 20 12:57:44 2015
+++ installer/linux/gateway.cfg Thu Aug 20 12:58:37 2015
@@ -14,16 +14,16 @@ server_hostname =
server_hostname_greeting = no
@ -35,12 +35,12 @@ $OpenBSD: patch-installer_linux_gateway_cfg,v 1.14 2015/04/05 22:25:08 robert Ex
# Verify client certificate
ssl_verify_client = no
@@ -94,7 +94,7 @@ ssl_ciphers = ALL:!LOW:!SSLv2:!EXP:!aNULL
ssl_prefer_server_ciphers = no
@@ -95,7 +95,7 @@ ssl_prefer_server_ciphers = no
# Process model, using pthreads (thread) or processes (fork)
# Processes are potentially safer from a security point of view.
-process_model = fork
+process_model = thread
##############################################################
# GATEWAY LOG SETTINGS
# For temporary files.
# consider mounting a `tmpfs' underneath this path (wherever you

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_ical_cfg,v 1.4 2015/04/05 22:25:08 robert Exp $
--- installer/linux/ical.cfg.orig Thu Mar 5 16:52:42 2015
+++ installer/linux/ical.cfg Sun Apr 5 23:30:17 2015
$OpenBSD: patch-installer_linux_ical_cfg,v 1.5 2015/11/02 11:06:34 robert Exp $
--- installer/linux/ical.cfg.orig Wed Aug 5 17:28:49 2015
+++ installer/linux/ical.cfg Thu Aug 20 12:36:50 2015
@@ -2,16 +2,16 @@
# ICAL SETTINGS
@ -31,7 +31,7 @@ $OpenBSD: patch-installer_linux_ical_cfg,v 1.4 2015/04/05 22:25:08 robert Exp $
##############################################################
# ICAL LOG SETTINGS
@@ -54,10 +54,10 @@ log_timestamp = 1
@@ -62,10 +62,10 @@ log_buffer_size = 4096
# ICAL SSL SETTINGS FOR INCOMING CONNECTIONS
# File with RSA key for SSL

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_monitor_cfg,v 1.6 2015/04/05 22:25:08 robert Exp $
--- installer/linux/monitor.cfg.orig Sun Apr 5 17:42:38 2015
+++ installer/linux/monitor.cfg Sun Apr 5 17:43:45 2015
$OpenBSD: patch-installer_linux_monitor_cfg,v 1.7 2015/11/02 11:06:34 robert Exp $
--- installer/linux/monitor.cfg.orig Wed Aug 5 17:28:49 2015
+++ installer/linux/monitor.cfg Thu Aug 20 12:36:50 2015
@@ -8,16 +8,16 @@ server_socket = file:///var/run/zarafa
servers =
@ -21,7 +21,7 @@ $OpenBSD: patch-installer_linux_monitor_cfg,v 1.6 2015/04/05 22:25:08 robert Exp
##############################################################
# ZARAFA MONITOR LOG SETTINGS
@@ -41,7 +41,7 @@ log_timestamp = 1
@@ -49,7 +49,7 @@ log_buffer_size = 4096
# to use this type of login method
# Login to the Zarafa server using this SSL Key
@ -30,7 +30,7 @@ $OpenBSD: patch-installer_linux_monitor_cfg,v 1.6 2015/04/05 22:25:08 robert Exp
# The password of the SSL Key
#sslkey_pass = replace-with-monitor-cert-password
@@ -60,8 +60,8 @@ mailquota_resend_interval = 1
@@ -68,8 +68,8 @@ mailquota_resend_interval = 1
# Template to be used for quota emails which are send to the user
# when the various user quota levels have been exceeded.

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_search_cfg,v 1.4 2015/04/05 22:25:08 robert Exp $
--- installer/linux/search.cfg.orig Thu Mar 5 16:52:42 2015
+++ installer/linux/search.cfg Mon Apr 6 00:19:28 2015
$OpenBSD: patch-installer_linux_search_cfg,v 1.5 2015/11/02 11:06:34 robert Exp $
--- installer/linux/search.cfg.orig Fri Sep 11 10:46:36 2015
+++ installer/linux/search.cfg Thu Sep 24 16:35:35 2015
@@ -2,19 +2,19 @@
# INDEXED SEARCH SERVICE SETTINGS
@ -26,7 +26,7 @@ $OpenBSD: patch-installer_linux_search_cfg,v 1.4 2015/04/05 22:25:08 robert Exp
# create memory coredumps upon crash in the running_path directory
coredump_enabled = no
@@ -31,7 +31,7 @@ limit_results = 0
@@ -31,7 +31,7 @@ limit_results = 1000
server_socket = file:///var/run/zarafa
# Login to the Zarafa server using this SSL Key

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_server_cfg,v 1.21 2015/04/05 22:25:08 robert Exp $
--- installer/linux/server.cfg.orig Sun Apr 5 17:45:06 2015
+++ installer/linux/server.cfg Sun Apr 5 17:47:09 2015
$OpenBSD: patch-installer_linux_server_cfg,v 1.22 2015/11/02 11:06:34 robert Exp $
--- installer/linux/server.cfg.orig Wed Aug 5 17:28:49 2015
+++ installer/linux/server.cfg Thu Aug 20 12:36:50 2015
@@ -46,16 +46,16 @@ owner_auto_full_access = true
system_email_address = postmaster@localhost
@ -30,8 +30,8 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.21 2015/04/05 22:25:08 robert Exp
# Time (in seconds) to wait for a connection to the license server before
# terminating the request.
@@ -131,7 +131,7 @@ mysql_database = zarafa
attachment_storage = files
@@ -151,7 +151,7 @@ attachment_storage = files
attachment_files_fsync = yes
# When attachment_storage is 'files', use this path to store the files
-attachment_path = /var/lib/zarafa/attachments
@ -39,7 +39,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.21 2015/04/05 22:25:08 robert Exp
# Compression level for attachments when attachment_storage is 'files'.
# Set compression level for attachments disabled=0, max=9
@@ -147,13 +147,13 @@ server_ssl_enabled = no
@@ -167,13 +167,13 @@ server_ssl_enabled = no
server_ssl_port = 237
# Required Server certificate, contains the certificate and the private key parts
@ -55,7 +55,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.21 2015/04/05 22:25:08 robert Exp
# Path with CA certificates, e.g. /etc/ssl/certs
server_ssl_ca_path =
@@ -168,7 +168,7 @@ server_ssl_ciphers = ALL:!LOW:!SSLv2:!EXP:!aNULL
@@ -188,7 +188,7 @@ server_ssl_ciphers = ALL:!LOW:!SSLv2:!EXP:!aNULL
server_ssl_prefer_server_ciphers = no
# Path of SSL Public keys of clients
@ -64,7 +64,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.21 2015/04/05 22:25:08 robert Exp
##############################################################
# THREAD SETTINGS
@@ -300,20 +300,20 @@ companyquota_warn = 0
@@ -320,20 +320,20 @@ companyquota_warn = 0
user_plugin = db
# configuration file of the user plugin, examples can be found in /usr/share/doc/zarafa/example-config
@ -93,7 +93,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.21 2015/04/05 22:25:08 robert Exp
# 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
@@ -370,7 +370,7 @@ client_update_enabled = false
@@ -390,7 +390,7 @@ client_update_enabled = false
# Place the correct Zarafa Outlook Client in this directory for
# Windows clients to download through the Zarafa server

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_spooler_cfg,v 1.9 2015/04/05 22:25:08 robert Exp $
--- installer/linux/spooler.cfg.orig Sun Apr 5 17:47:15 2015
+++ installer/linux/spooler.cfg Sun Apr 5 17:48:05 2015
$OpenBSD: patch-installer_linux_spooler_cfg,v 1.10 2015/11/02 11:06:34 robert Exp $
--- installer/linux/spooler.cfg.orig Wed Aug 5 17:28:49 2015
+++ installer/linux/spooler.cfg Thu Aug 20 12:36:50 2015
@@ -11,16 +11,16 @@ smtp_port = 25
server_socket = file:///var/run/zarafa
@ -21,7 +21,7 @@ $OpenBSD: patch-installer_linux_spooler_cfg,v 1.9 2015/04/05 22:25:08 robert Exp
# create memory coredumps upon crash in the running_path directory
coredump_enabled = no
@@ -48,7 +48,7 @@ log_timestamp = 1
@@ -61,7 +61,7 @@ log_buffer_size = 4096
# to use this type of login method
# Login to the Zarafa server using this SSL Key
@ -30,7 +30,7 @@ $OpenBSD: patch-installer_linux_spooler_cfg,v 1.9 2015/04/05 22:25:08 robert Exp
# The password of the SSL Key
#sslkey_pass = replace-with-server-cert-password
@@ -143,7 +143,7 @@ archive_on_send = no
@@ -156,7 +156,7 @@ archive_on_send = no
plugin_enabled = yes
# Path to the spooler plugin manager
@ -39,7 +39,7 @@ $OpenBSD: patch-installer_linux_spooler_cfg,v 1.9 2015/04/05 22:25:08 robert Exp
# Path to the activated spooler plugins.
# This folder contains symlinks to the zarafa plugins and custom scripts. The plugins are
@@ -152,4 +152,4 @@ plugin_manager_path = /usr/share/zarafa-spooler/python
@@ -165,4 +165,4 @@ plugin_manager_path = /usr/share/zarafa-spooler/python
#
# Example:
# $ ln -s /usr/share/zarafa-spooler/python/plugins/disclaimer.py /var/lib/zarafa/spooler/plugins/disclaimer.py

View File

@ -1,9 +1,4 @@
$OpenBSD: patch-installer_linux_zarafa-autorespond,v 1.2 2015/09/22 07:06:08 jasper Exp $
Security fix for CVE-2015-6566,
https://bugzilla.redhat.com/show_bug.cgi?id=1263006
https://download.zarafa.com/community/beta/7.2/changelog-7.2.txt
$OpenBSD: patch-installer_linux_zarafa-autorespond,v 1.3 2015/11/02 11:06:34 robert Exp $
--- installer/linux/zarafa-autorespond.orig Thu Mar 5 16:52:42 2015
+++ installer/linux/zarafa-autorespond Mon Sep 21 22:12:08 2015
@@ -1,4 +1,4 @@

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-installer_userscripts_createcompany_d_00createpublic,v 1.2 2011/06/02 12:46:37 ajacoutot Exp $
--- installer/userscripts/createcompany.d/00createpublic.orig Wed Apr 20 16:39:09 2011
+++ installer/userscripts/createcompany.d/00createpublic Mon May 2 12:47:53 2011
@@ -2,7 +2,7 @@
# Create a Zarafa Public store for the new company.
-PATH=$PATH:/sbin:/usr/local/sbin:/usr/sbin
+PATH=$PATH:${PREFIX}/bin
# The ZARAFA_COMPANY variable from the server will always be in UTF-8
# format. The --utf8 option must be set before this value is used,

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-installer_userscripts_createuser_d_00createstore,v 1.2 2011/06/02 12:46:37 ajacoutot Exp $
--- installer/userscripts/createuser.d/00createstore.orig Wed Apr 20 16:39:09 2011
+++ installer/userscripts/createuser.d/00createstore Mon May 2 12:47:53 2011
@@ -3,7 +3,7 @@
# Create a Zarafa user for an already existing external user. Create
# and initialize the user's stores.
-PATH=$PATH:/sbin:/usr/local/sbin:/usr/sbin
+PATH=$PATH:${PREFIX}/bin
# The ZARAFA_USER variable from the server will always be in UTF-8
# format. The --utf8 option must be set before this value is used,

View File

@ -0,0 +1,9 @@
$OpenBSD: patch-lddcheck,v 1.1 2015/11/02 11:06:34 robert Exp $
--- lddcheck.orig Thu Aug 20 13:25:14 2015
+++ lddcheck Thu Aug 20 13:25:20 2015
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
if [ -z "$1" ]; then
exit 0

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libfreebusy_Makefile_in,v 1.20 2015/04/05 22:25:08 robert Exp $
--- libfreebusy/Makefile.in.orig Thu Mar 5 16:52:52 2015
+++ libfreebusy/Makefile.in Fri Apr 3 23:11:10 2015
@@ -349,7 +349,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(BOOST_CPPFL
-I${top_srcdir}/common
libfreebusy_la_includedir = $(includedir)/libfreebusy
-libfreebusy_la_LDFLAGS = ${AM_LDFLAGS} -static
+libfreebusy_la_LDFLAGS = ${AM_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

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-m4lcommon_CommonUtil_cpp,v 1.1 2015/11/02 11:06:34 robert Exp $
--- m4lcommon/CommonUtil.cpp.orig Thu Aug 20 12:38:56 2015
+++ m4lcommon/CommonUtil.cpp Thu Aug 20 12:39:05 2015
@@ -83,6 +83,7 @@
#include <sys/types.h>
#include <sys/socket.h>
+#include <netinet/in.h>
#include <netdb.h>
using namespace std;

View File

@ -1,10 +1,7 @@
$OpenBSD: patch-common_mapi_ptr_mapi_memory_ptr_h,v 1.4 2015/04/05 22:25:08 robert Exp $
On OpenBSD, _U is defined in ctype.h.
--- common/mapi_ptr/mapi_memory_ptr.h.orig Thu Mar 5 16:54:04 2015
+++ common/mapi_ptr/mapi_memory_ptr.h Fri Apr 3 23:11:10 2015
@@ -160,11 +160,11 @@ class mapi_memory_ptr (public)
$OpenBSD: patch-m4lcommon_mapi_ptr_mapi_memory_ptr_h,v 1.1 2015/11/02 11:06:34 robert Exp $
--- m4lcommon/mapi_ptr/mapi_memory_ptr.h.orig Thu Aug 20 12:49:50 2015
+++ m4lcommon/mapi_ptr/mapi_memory_ptr.h Thu Aug 20 12:49:56 2015
@@ -158,11 +158,11 @@ class mapi_memory_ptr _final { (public)
return proxy(&m_lpMemory);
}

View File

@ -1,10 +1,7 @@
$OpenBSD: patch-common_mapi_ptr_mapi_object_ptr_h,v 1.8 2015/04/05 22:25:08 robert Exp $
On OpenBSD, _P and _U are defined in ctype.h.
--- common/mapi_ptr/mapi_object_ptr.h.orig Thu Mar 5 16:54:04 2015
+++ common/mapi_ptr/mapi_object_ptr.h Fri Apr 3 23:11:10 2015
@@ -129,13 +129,13 @@ class mapi_object_ptr (public)
$OpenBSD: patch-m4lcommon_mapi_ptr_mapi_object_ptr_h,v 1.1 2015/11/02 11:06:34 robert Exp $
--- m4lcommon/mapi_ptr/mapi_object_ptr.h.orig Wed Aug 5 17:30:49 2015
+++ m4lcommon/mapi_ptr/mapi_object_ptr.h Thu Aug 20 13:24:12 2015
@@ -127,13 +127,13 @@ class mapi_object_ptr _final { (public)
std::swap(m_lpObject, other.m_lpObject);
}
@ -22,7 +19,7 @@ On OpenBSD, _P and _U are defined in ctype.h.
if (hr == hrSuccess)
refResult.reset(lpNewObject, false);
@@ -157,7 +157,7 @@ class mapi_object_ptr (public)
@@ -155,7 +155,7 @@ class mapi_object_ptr _final { (public)
if (HrGetOneProp(m_lpObject, PR_EC_OBJECT, &ptrPropValue) != hrSuccess)
goto exit; // hr is still MAPI_E_INTERFACE_NOT_SUPPORTED
@ -31,7 +28,7 @@ On OpenBSD, _P and _U are defined in ctype.h.
if (hr == hrSuccess)
refResult.reset(lpNewObject, false);
}
@@ -183,9 +183,9 @@ class mapi_object_ptr (public)
@@ -181,9 +181,9 @@ class mapi_object_ptr _final { (public)
return m_lpObject;
}

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-php-ext_main_cpp,v 1.5 2015/04/05 22:25:08 robert Exp $
--- php-ext/main.cpp.orig Thu Mar 5 16:54:01 2015
+++ php-ext/main.cpp Fri Apr 3 23:11:10 2015
@@ -563,8 +563,11 @@ PHP_MINIT_FUNCTION(mapi)
$OpenBSD: patch-php-ext_main_cpp,v 1.6 2015/11/02 11:06:34 robert Exp $
--- php-ext/main.cpp.orig Wed Aug 5 17:30:47 2015
+++ php-ext/main.cpp Thu Aug 20 12:36:50 2015
@@ -578,8 +578,11 @@ PHP_MINIT_FUNCTION(mapi) {
ZEND_INIT_MODULE_GLOBALS(mapi, php_mapi_init_globals, NULL);

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_client_ECChangeAdvisor_cpp,v 1.2 2015/04/05 22:25:08 robert Exp $
--- provider/client/ECChangeAdvisor.cpp.orig Thu Mar 5 16:54:03 2015
+++ provider/client/ECChangeAdvisor.cpp Fri Apr 3 23:11:10 2015
@@ -52,6 +52,9 @@
$OpenBSD: patch-provider_client_ECChangeAdvisor_cpp,v 1.3 2015/11/02 11:06:34 robert Exp $
--- provider/client/ECChangeAdvisor.cpp.orig Wed Aug 5 17:30:47 2015
+++ provider/client/ECChangeAdvisor.cpp Thu Aug 20 12:36:50 2015
@@ -51,6 +51,9 @@
#include "ECChangeAdvisor.h"
#include "ECMsgStore.h"

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_client_ECNotifyMaster_cpp,v 1.6 2015/04/05 22:25:08 robert Exp $
--- provider/client/ECNotifyMaster.cpp.orig Thu Mar 5 16:54:03 2015
+++ provider/client/ECNotifyMaster.cpp Fri Apr 3 23:11:10 2015
@@ -387,7 +387,7 @@ void* ECNotifyMaster::NotifyWatch(void *pTmpNotifyMast
$OpenBSD: patch-provider_client_ECNotifyMaster_cpp,v 1.7 2015/11/02 11:06:34 robert Exp $
--- provider/client/ECNotifyMaster.cpp.orig Wed Aug 5 17:30:48 2015
+++ provider/client/ECNotifyMaster.cpp Thu Aug 20 12:36:50 2015
@@ -388,7 +388,7 @@ void* ECNotifyMaster::NotifyWatch(void *pTmpNotifyMast
notificationArray *pNotifyArray = NULL;
hr = pNotifyMaster->m_lpTransport->HrGetNotify(&pNotifyArray);

View File

@ -1,8 +1,8 @@
$OpenBSD: patch-provider_client_WSTransport_cpp,v 1.9 2015/04/05 22:25:08 robert Exp $
--- provider/client/WSTransport.cpp.orig Sun Apr 5 14:58:01 2015
+++ provider/client/WSTransport.cpp Sun Apr 5 14:58:18 2015
@@ -96,6 +96,10 @@ using namespace std;
static char THIS_FILE[] = __FILE__;
$OpenBSD: patch-provider_client_WSTransport_cpp,v 1.10 2015/11/02 11:06:34 robert Exp $
--- provider/client/WSTransport.cpp.orig Wed Aug 5 17:30:47 2015
+++ provider/client/WSTransport.cpp Thu Aug 20 12:36:50 2015
@@ -95,6 +95,10 @@ using namespace std;
static const char THIS_FILE[] = __FILE__;
#endif
+#ifdef __OpenBSD__

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-provider_contacts_Makefile_in,v 1.9 2015/04/05 22:25:08 robert Exp $
--- provider/contacts/Makefile.in.orig Thu Mar 5 16:52:52 2015
+++ provider/contacts/Makefile.in Fri Apr 3 23:11:10 2015
@@ -375,7 +375,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) \
$OpenBSD: patch-provider_contacts_Makefile_in,v 1.10 2015/11/02 11:06:34 robert Exp $
--- provider/contacts/Makefile.in.orig Wed Aug 5 17:29:57 2015
+++ provider/contacts/Makefile.in Thu Aug 20 12:36:50 2015
@@ -388,7 +388,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) \
-I${top_srcdir}/mapi4linux/include \
-I${top_srcdir}/common
-I${top_srcdir}/common -I${top_srcdir}/m4lcommon
-libzarafacontacts_la_LDFLAGS = ${AM_LDFLAGS} -avoid-version -module
+libzarafacontacts_la_LDFLAGS = ${AM_LDFLAGS} -module
libzarafacontacts_la_LIBADD = \
${top_builddir}/common/libcommon_util.la \
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libzcp_common_util.la \
${top_builddir}/common/libzcp_common_mapi.la \

View File

@ -1,54 +0,0 @@
$OpenBSD: patch-provider_libserver_ECAttachmentStorage_cpp,v 1.8 2015/04/05 22:25:08 robert Exp $
--- provider/libserver/ECAttachmentStorage.cpp.orig Thu Mar 5 16:54:01 2015
+++ provider/libserver/ECAttachmentStorage.cpp Sun Apr 5 14:46:14 2015
@@ -1255,7 +1255,7 @@ ECFileAttachment::ECFileAttachment(ECDatabase *lpDatab
m_lpLogger = lpLogger;
if (m_basepath.empty())
- m_basepath = "/var/lib/zarafa";
+ m_basepath = "/var/db/zarafa";
m_bTransaction = false;
}
@@ -1384,8 +1384,10 @@ ECRESULT ECFileAttachment::LoadAttachmentInstance(stru
exit:
/* ignore the result: it is odd if this call fails but it is not fatal if the kernel buffers the file */
+#ifndef __OpenBSD__
if (fd != -1)
(void)posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED);
+#endif
if (gzfp)
gzclose(gzfp);
@@ -1491,8 +1493,10 @@ ECRESULT ECFileAttachment::LoadAttachmentInstance(ULON
*lpiSize = ulSize;
exit:
+#ifndef __OpenBSD__
if (fd != -1)
(void)posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED);
+#endif
if (gzfp)
gzclose(gzfp);
@@ -1540,7 +1544,9 @@ ECRESULT ECFileAttachment::SaveAttachmentInstance(ULON
// kernel can now look for the best disk allocation
// pattern as it knows how much date is going to be
// inserted
+#ifndef __OpenBSD__
posix_fallocate(fileno(f), 0, iSize);
+#endif
iWritten = fwrite(lpData, 1, iSize, f);
fclose(f);
@@ -1621,7 +1627,9 @@ ECRESULT ECFileAttachment::SaveAttachmentInstance(ULON
// kernel can now look for the best disk allocation
// pattern as it knows how much date is going to be
// inserted
+#ifndef __OpenBSD__
posix_fallocate(fileno(f), 0, iSize);
+#endif
// file created on disk, now in transaction
if (m_bTransaction)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_libserver_ECSessionGroup_cpp,v 1.7 2015/04/05 22:25:08 robert Exp $
--- provider/libserver/ECSessionGroup.cpp.orig Thu Mar 5 16:54:01 2015
+++ provider/libserver/ECSessionGroup.cpp Fri Apr 3 23:11:10 2015
@@ -49,6 +49,10 @@
$OpenBSD: patch-provider_libserver_ECSessionGroup_cpp,v 1.8 2015/11/02 11:06:34 robert Exp $
--- provider/libserver/ECSessionGroup.cpp.orig Thu Aug 20 12:59:26 2015
+++ provider/libserver/ECSessionGroup.cpp Thu Aug 20 12:59:55 2015
@@ -48,6 +48,10 @@
#include <algorithm>
@ -12,10 +12,10 @@ $OpenBSD: patch-provider_libserver_ECSessionGroup_cpp,v 1.7 2015/04/05 22:25:08
#include "ECSession.h"
#include "ECSessionGroup.h"
#include "ECSessionManager.h"
@@ -58,6 +62,11 @@
@@ -57,6 +61,11 @@
#define new DEBUG_NEW
#undef THIS_FILE
static char THIS_FILE[] = __FILE__;
static const char THIS_FILE[] = __FILE__;
+#endif
+
+#ifdef __OpenBSD__

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.14 2015/04/05 22:25:08 robert Exp $
--- provider/libserver/ECSession.cpp.orig Thu Mar 5 16:54:01 2015
+++ provider/libserver/ECSession.cpp Fri Apr 3 23:11:10 2015
@@ -617,14 +617,22 @@ void ECSession::RemoveBusyState(pthread_t threadId)
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.15 2015/11/02 11:06:34 robert Exp $
--- provider/libserver/ECSession.cpp.orig Wed Aug 5 17:30:47 2015
+++ provider/libserver/ECSession.cpp Thu Aug 20 12:36:50 2015
@@ -616,14 +616,22 @@ void ECSession::RemoveBusyState(pthread_t threadId)
i = m_mapBusyStates.find(threadId);
if(i != m_mapBusyStates.end()) {
@ -25,7 +25,7 @@ $OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.14 2015/04/05 22:25:08 robe
} else {
ASSERT(FALSE);
}
@@ -952,11 +960,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
@@ -951,11 +959,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
uid_t uid;
char strbuf[1024];
#ifdef SO_PEERCRED

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_libserver_ECStatsTables_cpp,v 1.3 2015/04/05 22:25:08 robert Exp $
--- provider/libserver/ECStatsTables.cpp.orig Thu Mar 5 16:54:01 2015
+++ provider/libserver/ECStatsTables.cpp Fri Apr 3 23:11:10 2015
@@ -353,15 +353,26 @@ void ECSessionStatsTable::GetSessionData(ECSession *lp
$OpenBSD: patch-provider_libserver_ECStatsTables_cpp,v 1.4 2015/11/02 11:06:34 robert Exp $
--- provider/libserver/ECStatsTables.cpp.orig Wed Aug 5 17:30:47 2015
+++ provider/libserver/ECStatsTables.cpp Thu Aug 20 12:36:50 2015
@@ -350,15 +350,26 @@ void ECSessionStatsTable::GetSessionData(ECSession *lp
// To get up-to-date CPU stats, check each of the active threads on the session
// for their CPU usage, and add that to the already-logged time on the session
for (iterBS = sd.busystates.begin(); iterBS != sd.busystates.end(); iterBS++) {

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-provider_libserver_Makefile_in,v 1.6 2015/04/05 22:25:08 robert Exp $
--- provider/libserver/Makefile.in.orig Thu Mar 5 16:52:52 2015
+++ provider/libserver/Makefile.in Fri Apr 3 23:11:10 2015
@@ -400,6 +400,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:

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_plugins_ldappasswords_cpp,v 1.2 2015/04/05 22:25:08 robert Exp $
--- provider/plugins/ldappasswords.cpp.orig Sun Apr 5 15:00:04 2015
+++ provider/plugins/ldappasswords.cpp Sun Apr 5 15:05:45 2015
@@ -57,6 +57,10 @@
$OpenBSD: patch-provider_plugins_ldappasswords_cpp,v 1.3 2015/11/02 11:06:34 robert Exp $
--- provider/plugins/ldappasswords.cpp.orig Wed Aug 5 17:30:47 2015
+++ provider/plugins/ldappasswords.cpp Thu Aug 20 12:36:50 2015
@@ -56,6 +56,10 @@
#include "ldappasswords.h"

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.29 2015/04/05 22:25:08 robert Exp $
--- provider/server/ECServer.cpp.orig Thu Mar 5 16:54:03 2015
+++ provider/server/ECServer.cpp Fri Apr 3 23:11:10 2015
@@ -85,6 +85,10 @@
#include "unicode/uclean.h"
#endif
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.30 2015/11/02 11:06:34 robert Exp $
--- provider/server/ECServer.cpp.orig Wed Aug 5 17:30:48 2015
+++ provider/server/ECServer.cpp Thu Aug 20 12:36:50 2015
@@ -89,6 +89,10 @@
#include "TmpPath.h"
+#ifdef __OpenBSD__
+#include <sys/resource.h>
@ -12,7 +12,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.29 2015/04/05 22:25:08 robert E
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
@@ -930,7 +934,7 @@ int running_server(char *szName, const char *szConfig,
@@ -904,7 +908,7 @@ int running_server(char *szName, const char *szConfig,
{ "mysql_config_file", "/etc/zarafa/my.cnf" },
#endif
{ "attachment_storage", "database" },
@ -21,7 +21,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.29 2015/04/05 22:25:08 robert E
{ "attachment_compression", "6" },
// Log options
@@ -1003,7 +1007,7 @@ int running_server(char *szName, const char *szConfig,
@@ -978,7 +982,7 @@ int running_server(char *szName, const char *szConfig,
{ "client_update_enabled", "no" },
{ "client_update_log_level", "1", CONFIGSETTING_RELOADABLE },
@ -30,7 +30,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.29 2015/04/05 22:25:08 robert E
{ "client_update_log_path", "/var/log/zarafa/autoupdate", CONFIGSETTING_RELOADABLE },
{ "index_services_enabled", "", CONFIGSETTING_UNUSED },
{ "index_services_path", "", CONFIGSETTING_UNUSED },
@@ -1033,10 +1037,14 @@ int running_server(char *szName, const char *szConfig,
@@ -1010,10 +1014,14 @@ int running_server(char *szName, const char *szConfig,
{ NULL, NULL },
};

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_server_ECSoapServerConnection_cpp,v 1.5 2015/04/05 22:25:08 robert Exp $
--- provider/server/ECSoapServerConnection.cpp.orig Thu Mar 5 16:54:03 2015
+++ provider/server/ECSoapServerConnection.cpp Sun Apr 5 14:47:42 2015
@@ -53,6 +53,11 @@
$OpenBSD: patch-provider_server_ECSoapServerConnection_cpp,v 1.6 2015/11/02 11:06:34 robert Exp $
--- provider/server/ECSoapServerConnection.cpp.orig Wed Aug 5 17:30:48 2015
+++ provider/server/ECSoapServerConnection.cpp Thu Aug 20 12:36:50 2015
@@ -52,6 +52,11 @@
#include <sys/un.h>
#endif

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_server_ECThreadManager_cpp,v 1.5 2015/04/05 22:25:08 robert Exp $
--- provider/server/ECThreadManager.cpp.orig Thu Mar 5 16:54:03 2015
+++ provider/server/ECThreadManager.cpp Fri Apr 3 23:11:10 2015
@@ -159,7 +159,7 @@ void *ECWorkerThread::Work(void *lpParam)
$OpenBSD: patch-provider_server_ECThreadManager_cpp,v 1.6 2015/11/02 11:06:34 robert Exp $
--- provider/server/ECThreadManager.cpp.orig Wed Aug 5 17:30:48 2015
+++ provider/server/ECThreadManager.cpp Thu Aug 20 12:36:50 2015
@@ -164,7 +164,7 @@ void *ECWorkerThread::Work(void *lpParam)
bool fStop = false;
int err = 0;
@ -9,8 +9,8 @@ $OpenBSD: patch-provider_server_ECThreadManager_cpp,v 1.5 2015/04/05 22:25:08 ro
+ lpThis->m_lpLogger->Log(EC_LOGLEVEL_DEBUG, "Started%sthread %08x", lpPrio ? " priority " : " ", (uintptr_t)pthread_self());
while(1) {
// Get the next work item, don't wait for new items
@@ -169,7 +169,7 @@ void *ECWorkerThread::Work(void *lpParam)
set_thread_name(pthread_self(), "z-s: idle thread");
@@ -176,7 +176,7 @@ void *ECWorkerThread::Work(void *lpParam)
// We were requested to exit due to idle state
if(fStop) {

View File

@ -1,11 +1,8 @@
$OpenBSD: patch-provider_server_Makefile_in,v 1.22 2015/04/05 22:25:08 robert Exp $
--- provider/server/Makefile.in.orig Thu Mar 5 16:52:52 2015
+++ provider/server/Makefile.in Fri Apr 3 23:11:10 2015
@@ -360,9 +360,10 @@ zarafa_server_LDADD = \
${top_builddir}/common/libcommon_util.la \
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_ssl.la \
+ ${top_builddir}/mapi4linux/src/libmapi.la \
$OpenBSD: patch-provider_server_Makefile_in,v 1.23 2015/11/02 11:06:34 robert Exp $
--- provider/server/Makefile.in.orig Thu Aug 20 13:59:44 2015
+++ provider/server/Makefile.in Thu Aug 20 13:59:49 2015
@@ -379,7 +379,7 @@ zarafa_server_LDADD = \
${top_builddir}/common/libzcp_common_ssl.la \
$(PROG_LIBS) \
$(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) $(ICU_LIBS) $(DL_LIBS) \
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-provider_soap_Makefile_in,v 1.3 2015/04/05 22:25:08 robert Exp $
--- provider/soap/Makefile.in.orig Thu Mar 5 16:52:53 2015
+++ provider/soap/Makefile.in Fri Apr 3 23:11:10 2015
@@ -663,7 +663,7 @@ uninstall-am:
$(SOAP_CPP_SRC) : ns.xsd
ns.xsd: $(SOAPHEADER)
- $(GSOAP_SOAPCPP2) -x -I$(SOAP_INC) $< >& /dev/null
+ $(GSOAP_SOAPCPP2) -x -I$(SOAP_INC) $< > /dev/null
check-syntax:
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
$OpenBSD: patch-provider_soap_Makefile_in,v 1.4 2015/11/02 11:06:34 robert Exp $
--- provider/soap/Makefile.in.orig Thu Sep 24 16:36:00 2015
+++ provider/soap/Makefile.in Thu Sep 24 16:36:06 2015
@@ -156,7 +156,7 @@ CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
-AM_CXXFLAGS = ${ZCXXFLAGS} -Wno-vla -Wno-sign-compare ${DEBUGCFLAGS}
+AM_CXXFLAGS = ${ZCXXFLAGS} -Wno-sign-compare ${DEBUGCFLAGS}
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AM_LDFLAGS = @AM_LDFLAGS@
AR = @AR@

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-spooler_DAgent_cpp,v 1.26 2015/04/05 22:25:08 robert Exp $
--- spooler/DAgent.cpp.orig Thu Mar 5 16:54:04 2015
+++ spooler/DAgent.cpp Fri Apr 3 23:11:10 2015
@@ -92,6 +92,11 @@
$OpenBSD: patch-spooler_DAgent_cpp,v 1.27 2015/11/02 11:06:34 robert Exp $
--- spooler/DAgent.cpp.orig Thu Aug 20 13:00:51 2015
+++ spooler/DAgent.cpp Thu Aug 20 13:02:20 2015
@@ -91,6 +91,11 @@
#include <sys/mman.h>
#include <pwd.h>
@ -10,10 +10,10 @@ $OpenBSD: patch-spooler_DAgent_cpp,v 1.26 2015/04/05 22:25:08 robert Exp $
+extern char **environ;
+#endif
+
/*
This is actually from sysexits.h
but since those windows lamers don't have it ..
@@ -1664,12 +1669,18 @@ HRESULT SendOutOfOffice(LPADRBOOK lpAdrBook, LPMDB lpM
#include "spmain.h"
#include "TmpPath.h"
@@ -1703,12 +1708,18 @@ static HRESULT SendOutOfOffice(LPADRBOOK lpAdrBook, LP
}
{
@ -32,21 +32,21 @@ $OpenBSD: patch-spooler_DAgent_cpp,v 1.26 2015/04/05 22:25:08 robert Exp $
}
if (WriteOrLogError(fd, szHeader, strlen(szHeader)) != hrSuccess) {
@@ -3763,7 +3774,7 @@ int main(int argc, char *argv[]) {
@@ -3920,7 +3931,7 @@ int main(int argc, char *argv[]) {
DeliveryArgs sDeliveryArgs;
sDeliveryArgs.strPath = "";
- sDeliveryArgs.strAutorespond = "/usr/bin/zarafa-autorespond";
+ sDeliveryArgs.strAutorespond = "/usr/local/bin/zarafa-autorespond";
- sDeliveryArgs.strAutorespond = "/usr/sbin/zarafa-autorespond";
+ sDeliveryArgs.strAutorespond = "/usr/local/sbin/zarafa-autorespond";
sDeliveryArgs.bCreateFolder = false;
sDeliveryArgs.strDeliveryFolder.clear();
sDeliveryArgs.szPathSeperator = '\\';
@@ -3828,10 +3839,10 @@ int main(int argc, char *argv[]) {
@@ -3986,10 +3997,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", "/usr/local/bin/zarafa-mr-accept", CONFIGSETTING_RELOADABLE },
- { "mr_autoaccepter", "/usr/sbin/zarafa-mr-accept", CONFIGSETTING_RELOADABLE },
+ { "mr_autoaccepter", "/usr/local/sbin/zarafa-mr-accept", CONFIGSETTING_RELOADABLE },
{ "plugin_enabled", "yes" },
- { "plugin_path", "/var/lib/zarafa/dagent/plugins" },
- { "plugin_manager_path", "/usr/share/zarafa-dagent/python" },

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-spooler_Spooler_cpp,v 1.18 2015/04/06 09:01:45 robert Exp $
--- spooler/Spooler.cpp.orig Thu Mar 5 16:54:04 2015
+++ spooler/Spooler.cpp Mon Apr 6 11:00:48 2015
@@ -1145,8 +1145,8 @@ int main(int argc, char *argv[]) {
$OpenBSD: patch-spooler_Spooler_cpp,v 1.19 2015/11/02 11:06:34 robert Exp $
--- spooler/Spooler.cpp.orig Fri Sep 11 10:47:40 2015
+++ spooler/Spooler.cpp Thu Sep 24 16:56:51 2015
@@ -1143,8 +1143,8 @@ int main(int argc, char *argv[]) {
{ "archive_on_send", "no", CONFIGSETTING_RELOADABLE },
{ "enable_dsn", "yes", CONFIGSETTING_RELOADABLE },
{ "plugin_enabled", "yes" },
@ -9,18 +9,18 @@ $OpenBSD: patch-spooler_Spooler_cpp,v 1.18 2015/04/06 09:01:45 robert Exp $
- { "plugin_manager_path", "/usr/share/zarafa-spooler/python" },
+ { "plugin_path", "/var/db/zarafa/spooler/plugins" },
+ { "plugin_manager_path", "/usr/local/share/zarafa-spooler/python" },
{ NULL, NULL },
};
// SIGSEGV backtrace support
@@ -1259,6 +1259,7 @@ int main(int argc, char *argv[]) {
{ "z_statsd_stats", "/var/run/zarafa-zstatsd" },
{ "tmp_path", "/tmp" },
{ "tmp_path", "/tmp" },
@@ -1262,6 +1262,7 @@ int main(int argc, char *argv[]) {
// detect linuxthreads, which is too broken to correctly run the spooler
if (!bForked) {
+#if defined(__linux__)
char buffer[256];
char buffer[256] = { 0 };
confstr(_CS_GNU_LIBPTHREAD_VERSION, buffer, sizeof(buffer));
if (strncmp(buffer, "linuxthreads", strlen("linuxthreads")) == 0) {
@@ -1267,6 +1268,10 @@ int main(int argc, char *argv[]) {
@@ -1271,6 +1272,10 @@ int main(int argc, char *argv[]) {
g_lpLogger->Log(EC_LOGLEVEL_WARNING, "WARNING: your system is running with outdated linuxthreads.");
g_lpLogger->Log(EC_LOGLEVEL_WARNING, "WARNING: the zarafa-spooler will only be able to send one message at a time.");
}

View File

@ -1,31 +1,17 @@
@comment $OpenBSD: PLIST-main,v 1.50 2015/09/28 19:05:24 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.51 2015/11/02 11:06:34 robert Exp $
@newgroup _zarafa:627
@newuser _zarafa:627:_zarafa:daemon:Zarafa Account:/var/empty:/sbin/nologin
@comment chdir(2) to running_path which is set to /var/empty in the cfg files
@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/autorespond
@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
@bin bin/zarafa-dagent
@bin bin/zarafa-fsck
@bin bin/zarafa-gateway
@bin bin/zarafa-ical
bin/zarafa-mailbox-permissions
@bin bin/zarafa-monitor
bin/zarafa-mr-accept
@bin bin/zarafa-passwd
bin/zarafa-search
bin/zarafa-search-xapian-compact.py
@bin bin/zarafa-server
bin/zarafa-set-oof
@bin bin/zarafa-spooler
@bin bin/zarafa-stats
include/icalmapi/
include/icalmapi/ICalToMAPI.h
@ -151,8 +137,10 @@ include/zarafa/MAPIErrors.h
include/zarafa/MAPINotifSink.h
include/zarafa/RecurrenceState.h
include/zarafa/SSLUtil.h
include/zarafa/StatsClient.h
include/zarafa/SymmetricCrypt.h
include/zarafa/TimeUtil.h
include/zarafa/TmpPath.h
include/zarafa/Trace.h
include/zarafa/UnixUtil.h
include/zarafa/Util.h
@ -202,17 +190,14 @@ include/zarafa/utf8/checked.h
include/zarafa/utf8/core.h
include/zarafa/utf8/unchecked.h
@comment lib/libarchiver-core.la
@lib lib/libarchiver-core.so.${LIBarchiver-core_VERSION}
@comment lib/libarchiver.la
@lib lib/libarchiver.so.${LIBarchiver_VERSION}
@comment lib/libcommon_mapi.la
@lib lib/libcommon_mapi.so.${LIBcommon_mapi_VERSION}
@comment 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
@lib lib/libcommon_util.so.${LIBcommon_util_VERSION}
@comment lib/libzarafaclient.la
@comment lib/libzarafacontacts.la
include/zarafa/zcdefs.h
@comment lib/libfreebusy.la
@lib lib/libfreebusy.so.${LIBfreebusy_VERSION}
@comment lib/libicalmapi.la
@ -221,12 +206,26 @@ include/zarafa/utf8/unchecked.h
@lib lib/libinetmapi.so.${LIBinetmapi_VERSION}
@comment lib/libmapi.la
@lib lib/libmapi.so.${LIBmapi_VERSION}
@comment lib/libzarafaclient.la
lib/libzarafaclient.so
@comment lib/libzarafacontacts.la
@lib lib/libzarafacontacts.so.${LIBzarafacontacts_VERSION}
lib/libzarafa-archiver-core.la
@lib lib/libzarafa-archiver-core.so.${LIBzarafa-archiver-core_VERSION}
lib/libzarafa-archiver.la
@lib lib/libzarafa-archiver.so.${LIBzarafa-archiver_VERSION}
lib/libzarafa_server.la
@lib lib/libzarafa_server.so.${LIBzarafa_server_VERSION}
lib/libzarafa_soapclient.la
@lib lib/libzarafa_soapclient.so.${LIBzarafa_soapclient_VERSION}
lib/libzarafa_soapserver.la
@lib lib/libzarafa_soapserver.so.${LIBzarafa_soapserver_VERSION}
@comment lib/libzarafasync.la
@lib lib/libzarafasync.so.${LIBzarafasync_VERSION}
lib/libzcp_common_mapi.la
@lib lib/libzcp_common_mapi.so.${LIBzcp_common_mapi_VERSION}
lib/libzcp_common_service.la
@lib lib/libzcp_common_service.so.${LIBzcp_common_service_VERSION}
lib/libzcp_common_ssl.la
@lib lib/libzcp_common_ssl.so.${LIBzcp_common_ssl_VERSION}
lib/libzcp_common_util.la
@lib lib/libzcp_common_util.so.${LIBzcp_common_util_VERSION}
lib/pkgconfig/zarafa.pc
lib/python${MODPY_VERSION}/site-packages/MAPI/
lib/python${MODPY_VERSION}/site-packages/MAPI-1.0-py${MODPY_VERSION}.egg-info
@ -305,24 +304,20 @@ lib/zarafa/
lib/zarafa/dbplugin.so
@comment lib/zarafa/ldapplugin.la
lib/zarafa/ldapplugin.so
@man man/man1/za-aclset.1
@man man/man1/za-restore.1
@man man/man1/zarafa-admin.1
@man man/man1/zarafa-archiver.1
@man man/man1/zarafa-autorespond.1
@man man/man1/zarafa-dagent.1
lib/zarafa/libarchiver-core.so
lib/zarafa/libarchiver.so
lib/zarafa/libcommon_mapi.so
lib/zarafa/libcommon_service.so
lib/zarafa/libcommon_ssl.so
lib/zarafa/libcommon_util.so
lib/zarafa/libzarafaclient.la
lib/zarafa/libzarafaclient.so
lib/zarafa/libzarafacontacts.la
@lib lib/zarafa/libzarafacontacts.so.${LIBzarafacontacts_VERSION}
@man man/man1/zarafa-fsck.1
@man man/man1/zarafa-gateway.1
@man man/man1/zarafa-ical.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
@man man/man5/zarafa-archiver.cfg.5
@man man/man5/zarafa-dagent.cfg.5
@man man/man5/zarafa-gateway.cfg.5
@ -333,6 +328,36 @@ lib/zarafa/ldapplugin.so
@man man/man5/zarafa-server.cfg.5
@man man/man5/zarafa-spooler.cfg.5
@man man/man5/zarafa-unix.cfg.5
@man man/man7/zarafa.7
@man man/man8/za-aclset.8
@man man/man8/za-restore.8
@man man/man8/zarafa-admin.8
@man man/man8/zarafa-archiver.8
@man man/man8/zarafa-autorespond.8
@man man/man8/zarafa-dagent.8
@man man/man8/zarafa-gateway.8
@man man/man8/zarafa-ical.8
@man man/man8/zarafa-mailbox-permissions.8
@man man/man8/zarafa-monitor.8
@man man/man8/zarafa-mr-accept.8
@man man/man8/zarafa-mr-process.8
@man man/man8/zarafa-search.8
@man man/man8/zarafa-server.8
@man man/man8/zarafa-spooler.8
@bin sbin/zarafa-admin
@bin sbin/zarafa-archiver
sbin/zarafa-autorespond
@bin sbin/zarafa-dagent
@bin sbin/zarafa-gateway
@bin sbin/zarafa-ical
sbin/zarafa-mailbox-permissions
@bin sbin/zarafa-monitor
sbin/zarafa-mr-accept
sbin/zarafa-mr-process
sbin/zarafa-search
sbin/zarafa-search-xapian-compact.py
@bin sbin/zarafa-server
@bin sbin/zarafa-spooler
share/doc/pkg-readmes/${FULLPKGNAME}
share/doc/zarafa/
share/doc/zarafa/AGPL-3

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-web,v 1.23 2015/04/05 22:25:08 robert Exp $
@comment $OpenBSD: PLIST-web,v 1.24 2015/11/02 11:06:34 robert Exp $
@conflict php5-mapi-*
@pkgpath mail/zarafa/webaccess
@pkgpath mail/zarafa/zarafa,-php
@ -590,6 +590,532 @@ zarafa-webaccess/client/widgets/datetimepicker.js
zarafa-webaccess/client/widgets/dragdrop.js
zarafa-webaccess/client/widgets/elastictextarea.js
zarafa-webaccess/client/widgets/fckeditor/
zarafa-webaccess/client/widgets/fckeditor/editor/
zarafa-webaccess/client/widgets/fckeditor/editor/_source/
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckcontextmenu.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckdataprocessor.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckdocumentfragment_gecko.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckdocumentfragment_ie.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckdomrange.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckdomrange_gecko.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckdomrange_ie.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckdomrangeiterator.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckeditingarea.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckelementpath.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckenterkey.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckevents.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckhtmliterator.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckicon.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckiecleanup.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckimagepreloader.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckkeystrokehandler.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckmenublock.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckmenublockpanel.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckmenuitem.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckpanel.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckplugin.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckspecialcombo.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckstyle.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fcktoolbar.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fcktoolbarbreak_gecko.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fcktoolbarbreak_ie.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fcktoolbarbutton.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fcktoolbarbuttonui.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fcktoolbarfontformatcombo.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fcktoolbarfontscombo.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fcktoolbarfontsizecombo.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fcktoolbarpanelbutton.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fcktoolbarspecialcombo.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fcktoolbarstylecombo.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckw3crange.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckxml.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckxml_gecko.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/classes/fckxml_ie.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fck_othercommands.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fckblockquotecommand.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fckcorestylecommand.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fckfitwindow.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fckindentcommands.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fckjustifycommands.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fcklistcommands.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fcknamedcommand.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fckpasteplaintextcommand.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fckpastewordcommand.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fckremoveformatcommand.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fckshowblocks.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_gecko.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fckspellcheckcommand_ie.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fckstylecommand.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fcktablecommand.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/commandclasses/fcktextcolorcommand.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/fckconstants.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/fckeditorapi.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/fckjscoreextensions.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/fckscriptloader.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fck.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fck_contextmenu.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fck_gecko.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fck_ie.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckbrowserinfo.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckcodeformatter.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckcommands.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckconfig.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckdebug.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckdebug_empty.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckdialog.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckdocumentprocessor.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckdomtools.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fcklanguagemanager.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fcklisthandler.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fcklistslib.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckplugins.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckregexlib.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckscayt.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckselection.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckselection_gecko.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckselection_ie.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckstyles.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fcktablehandler.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fcktablehandler_gecko.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fcktablehandler_ie.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fcktoolbaritems.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fcktoolbarset.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fcktools.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fcktools_gecko.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fcktools_ie.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckundo.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckurlparams.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckxhtml.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckxhtml_gecko.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckxhtml_ie.js
zarafa-webaccess/client/widgets/fckeditor/editor/_source/internals/fckxhtmlentities.js
zarafa-webaccess/client/widgets/fckeditor/editor/css/
zarafa-webaccess/client/widgets/fckeditor/editor/css/behaviors/
zarafa-webaccess/client/widgets/fckeditor/editor/css/behaviors/disablehandles.htc
zarafa-webaccess/client/widgets/fckeditor/editor/css/behaviors/showtableborders.htc
zarafa-webaccess/client/widgets/fckeditor/editor/css/fck_editorarea.css
zarafa-webaccess/client/widgets/fckeditor/editor/css/fck_internal.css
zarafa-webaccess/client/widgets/fckeditor/editor/css/fck_showtableborders_gecko.css
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/block_address.png
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/block_blockquote.png
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/block_div.png
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/block_h1.png
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/block_h2.png
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/block_h3.png
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/block_h4.png
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/block_h5.png
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/block_h6.png
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/block_p.png
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/block_pre.png
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/fck_anchor.gif
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/fck_flashlogo.gif
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/fck_hiddenfield.gif
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/fck_pagebreak.gif
zarafa-webaccess/client/widgets/fckeditor/editor/css/images/fck_plugin.gif
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/common/
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/common/fck_dialog_common.css
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/common/fck_dialog_common.js
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/common/images/
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/common/images/locked.gif
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/common/images/reset.gif
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/common/images/unlocked.gif
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_about/
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_about.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_about/logo_fckeditor.gif
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_about/logo_fredck.gif
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_about/sponsors/
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_about/sponsors/spellchecker_net.gif
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_anchor.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_button.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_checkbox.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_colorselector.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_div.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_docprops/
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_docprops.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_docprops/fck_document_preview.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_flash/
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_flash.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_flash/fck_flash.js
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_flash/fck_flash_preview.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_form.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_hiddenfield.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_image/
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_image.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_image/fck_image.js
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_image/fck_image_preview.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_link/
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_link.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_link/fck_link.js
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_listprop.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_paste.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_radiobutton.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_replace.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_scayt/
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_scayt.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_scayt/scayt_dialog.css
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_select/
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_select.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_select/fck_select.js
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_smiley.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_source.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_specialchar.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_spellerpages/
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_spellerpages.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_spellerpages/spellerpages/
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_spellerpages/spellerpages/blank.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controlWindow.js
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_spellerpages/spellerpages/controls.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellChecker.js
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellchecker.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_spellerpages/spellerpages/spellerStyle.css
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_spellerpages/spellerpages/wordWindow.js
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_table.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_tablecell.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_template/
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_template.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_template/images/
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_template/images/template1.gif
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_template/images/template2.gif
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_template/images/template3.gif
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_textarea.html
zarafa-webaccess/client/widgets/fckeditor/editor/dialog/fck_textfield.html
zarafa-webaccess/client/widgets/fckeditor/editor/dtd/
zarafa-webaccess/client/widgets/fckeditor/editor/dtd/fck_dtd_test.html
zarafa-webaccess/client/widgets/fckeditor/editor/dtd/fck_xhtml10strict.js
zarafa-webaccess/client/widgets/fckeditor/editor/dtd/fck_xhtml10transitional.js
zarafa-webaccess/client/widgets/fckeditor/editor/fckdebug.html
zarafa-webaccess/client/widgets/fckeditor/editor/fckdialog.html
zarafa-webaccess/client/widgets/fckeditor/editor/fckeditor.html
zarafa-webaccess/client/widgets/fckeditor/editor/fckeditor.original.html
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/browser.css
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/browser.html
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/frmactualfolder.html
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/frmfolders.html
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/frmresourceslist.html
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/frmresourcetype.html
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/frmupload.html
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/ButtonArrow.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/Folder.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/Folder32.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/FolderOpened.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/FolderOpened32.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/FolderUp.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/ai.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/avi.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/bmp.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/cs.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/default.icon.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/dll.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/doc.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/exe.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/fla.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/gif.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/htm.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/html.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/jpg.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/js.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/mdb.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/mp3.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/pdf.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/png.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/ppt.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/rdp.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/swf.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/swt.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/txt.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/vsd.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/xls.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/xml.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/zip.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/ai.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/avi.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/bmp.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/cs.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/default.icon.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/dll.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/doc.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/exe.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/fla.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/gif.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/htm.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/html.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/jpg.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/js.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/mdb.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/mp3.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/pdf.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/png.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/ppt.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/rdp.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/swf.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/swt.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/txt.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/vsd.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/xls.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/xml.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/zip.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/spacer.gif
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/js/
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/js/common.js
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/js/fckxml.js
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/basexml.asp
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/class_upload.asp
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/commands.asp
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/config.asp
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/connector.asp
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/io.asp
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/upload.asp
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/util.asp
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/aspx/
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/aspx/config.ascx
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/aspx/connector.aspx
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/aspx/upload.aspx
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/ImageObject.cfc
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/cf5_connector.cfm
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/cf5_upload.cfm
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/cf_basexml.cfm
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/cf_commands.cfm
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/cf_connector.cfm
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/cf_io.cfm
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/cf_upload.cfm
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/cf_util.cfm
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/config.cfm
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/connector.cfm
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/image.cfc
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/upload.cfm
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/lasso/
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/lasso/config.lasso
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/lasso/connector.lasso
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/lasso/upload.lasso
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/basexml.pl
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/commands.pl
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/config.pl
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/connector.cgi
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/io.pl
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/upload.cgi
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/upload_fck.pl
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/util.pl
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/basexml.php
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/commands.php
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/config.php
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/connector.php
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/io.php
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/phpcompat.php
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/upload.php
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/util.php
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/config.py
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/connector.py
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/fckcommands.py
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/fckconnector.py
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/fckoutput.py
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/fckutil.py
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/htaccess.txt
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/upload.py
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/wsgi.py
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/zope.py
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/test.html
zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/uploadtest.html
zarafa-webaccess/client/widgets/fckeditor/editor/images/
zarafa-webaccess/client/widgets/fckeditor/editor/images/anchor.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/arrow_ltr.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/arrow_rtl.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/angel_smile.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/angry_smile.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/broken_heart.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/cake.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/confused_smile.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/cry_smile.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/devil_smile.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/embaressed_smile.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/envelope.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/heart.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/kiss.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/lightbulb.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/omg_smile.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/regular_smile.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/sad_smile.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/shades_smile.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/teeth_smile.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/thumbs_down.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/thumbs_up.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/tounge_smile.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/whatchutalkingabout_smile.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/smiley/msn/wink_smile.gif
zarafa-webaccess/client/widgets/fckeditor/editor/images/spacer.gif
zarafa-webaccess/client/widgets/fckeditor/editor/js/
zarafa-webaccess/client/widgets/fckeditor/editor/js/fckadobeair.js
zarafa-webaccess/client/widgets/fckeditor/editor/js/fckeditorcode_gecko.js
zarafa-webaccess/client/widgets/fckeditor/editor/js/fckeditorcode_ie.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/
zarafa-webaccess/client/widgets/fckeditor/editor/lang/_translationstatus.txt
zarafa-webaccess/client/widgets/fckeditor/editor/lang/af.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/ar.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/bg.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/bn.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/bs.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/ca.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/cs.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/da.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/de.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/el.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/en-au.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/en-ca.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/en-uk.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/en.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/eo.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/es.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/et.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/eu.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/fa.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/fi.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/fo.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/fr-ca.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/fr.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/gl.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/gu.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/he.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/hi.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/hr.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/hu.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/is.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/it.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/ja.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/km.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/ko.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/lt.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/lv.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/mn.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/ms.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/nb.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/nl.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/no.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/pl.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/pt-br.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/pt.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/ro.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/ru.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/sk.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/sl.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/sr-latn.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/sr.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/sv.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/th.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/tr.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/uk.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/vi.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/zh-cn.js
zarafa-webaccess/client/widgets/fckeditor/editor/lang/zh.js
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/autogrow/
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/autogrow/fckplugin.js
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/bbcode/
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/bbcode/_sample/
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/bbcode/_sample/sample.config.js
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/bbcode/_sample/sample.html
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/bbcode/fckplugin.js
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/dragresizetable/
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/dragresizetable/fckplugin.js
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/placeholder/
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/placeholder/fck_placeholder.html
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/placeholder/fckplugin.js
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/placeholder/lang/
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/placeholder/lang/de.js
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/placeholder/lang/en.js
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/placeholder/lang/es.js
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/placeholder/lang/fr.js
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/placeholder/lang/it.js
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/placeholder/lang/pl.js
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/placeholder/placeholder.gif
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/simplecommands/
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/simplecommands/fckplugin.js
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/tablecommands/
zarafa-webaccess/client/widgets/fckeditor/editor/plugins/tablecommands/fckplugin.js
zarafa-webaccess/client/widgets/fckeditor/editor/skins/
zarafa-webaccess/client/widgets/fckeditor/editor/skins/_fckviewstrips.html
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/fck_dialog.css
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/fck_dialog_ie6.js
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/fck_editor.css
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/fck_strip.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/images/
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/images/dialog.sides.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/images/dialog.sides.png
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/images/dialog.sides.rtl.png
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/images/sprites.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/images/sprites.png
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/images/toolbar.arrowright.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/images/toolbar.buttonarrow.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/images/toolbar.collapse.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/images/toolbar.end.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/images/toolbar.expand.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/images/toolbar.separator.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/default/images/toolbar.start.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/fck_dialog.css
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/fck_dialog_ie6.js
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/fck_editor.css
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/fck_strip.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/images/
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/images/dialog.sides.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/images/dialog.sides.png
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/images/dialog.sides.rtl.png
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/images/sprites.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/images/sprites.png
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/images/toolbar.arrowright.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/images/toolbar.bg.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/images/toolbar.buttonarrow.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/images/toolbar.collapse.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/images/toolbar.end.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/images/toolbar.expand.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/images/toolbar.separator.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/office2003/images/toolbar.start.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/fck_dialog.css
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/fck_dialog_ie6.js
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/fck_editor.css
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/fck_strip.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/images/
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/images/dialog.sides.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/images/dialog.sides.png
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/images/dialog.sides.rtl.png
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/images/sprites.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/images/sprites.png
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/images/toolbar.arrowright.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/images/toolbar.buttonarrow.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/images/toolbar.buttonbg.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/images/toolbar.collapse.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/images/toolbar.end.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/images/toolbar.expand.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/images/toolbar.separator.gif
zarafa-webaccess/client/widgets/fckeditor/editor/skins/silver/images/toolbar.start.gif
zarafa-webaccess/client/widgets/fckeditor/editor/wsc/
zarafa-webaccess/client/widgets/fckeditor/editor/wsc/ciframe.html
zarafa-webaccess/client/widgets/fckeditor/editor/wsc/tmpFrameset.html
zarafa-webaccess/client/widgets/fckeditor/editor/wsc/w.html
zarafa-webaccess/client/widgets/fckeditor/fck_editorarea.css
zarafa-webaccess/client/widgets/fckeditor/fckconfig.js
zarafa-webaccess/client/widgets/fckeditor/fckeditor.js

View File

@ -1,4 +1,4 @@
$OpenBSD: README-main,v 1.23 2015/01/31 10:01:54 ajacoutot Exp $
$OpenBSD: README-main,v 1.24 2015/11/02 11:06:34 robert Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -37,10 +37,10 @@ A MySQL datatabase access needs to be configured in
After zarafa-server was started for the first time
--------------------------------------------------
Creating the public store.
# ${TRUEPREFIX}/bin/zarafa-admin -s
# ${TRUEPREFIX}/sbin/zarafa-admin -s
Adding an admin user -- see zarafa-admin(1).
# ${TRUEPREFIX}/bin/zarafa-admin -c zadmin -p secret \
# ${TRUEPREFIX}/sbin/zarafa-admin -c zadmin -p secret \
-e zarafa.admin@domain.tld -f "John Doe" -a 2
Mail delivery agent configuration
@ -51,7 +51,7 @@ See the following URL for other MTA integration:
Alternatively add the following .forward file under the user(s) home
directory that will use Zarafa:
"|${TRUEPREFIX}/bin/zarafa-dagent <username>"
"|${TRUEPREFIX}/sbin/zarafa-dagent <username>"
You can automate this step by copying
${TRUEPREFIX}/share/examples/zarafa/createuser.dotforward

View File

@ -1,8 +1,8 @@
#!/bin/sh
#
# $OpenBSD: zarafa_gateway.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $
# $OpenBSD: zarafa_gateway.rc,v 1.5 2015/11/02 11:06:34 robert Exp $
daemon="${TRUEPREFIX}/bin/zarafa-gateway"
daemon="${TRUEPREFIX}/sbin/zarafa-gateway"
. /etc/rc.d/rc.subr

View File

@ -1,8 +1,8 @@
#!/bin/sh
#
# $OpenBSD: zarafa_ical.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $
# $OpenBSD: zarafa_ical.rc,v 1.5 2015/11/02 11:06:34 robert Exp $
daemon="${TRUEPREFIX}/bin/zarafa-ical"
daemon="${TRUEPREFIX}/sbin/zarafa-ical"
. /etc/rc.d/rc.subr

View File

@ -1,8 +1,8 @@
#!/bin/sh
#
# $OpenBSD: zarafa_monitor.rc,v 1.4 2010/12/27 14:50:23 ajacoutot Exp $
# $OpenBSD: zarafa_monitor.rc,v 1.5 2015/11/02 11:06:34 robert Exp $
daemon="${TRUEPREFIX}/bin/zarafa-monitor"
daemon="${TRUEPREFIX}/sbin/zarafa-monitor"
. /etc/rc.d/rc.subr

View File

@ -1,8 +1,8 @@
#!/bin/sh
#
# $OpenBSD: zarafa_server.rc,v 1.5 2011/03/08 13:37:11 ajacoutot Exp $
# $OpenBSD: zarafa_server.rc,v 1.6 2015/11/02 11:06:34 robert Exp $
daemon="${TRUEPREFIX}/bin/zarafa-server"
daemon="${TRUEPREFIX}/sbin/zarafa-server"
. /etc/rc.d/rc.subr

View File

@ -1,8 +1,8 @@
#!/bin/sh
#
# $OpenBSD: zarafa_spooler.rc,v 1.6 2011/07/01 23:23:02 robert Exp $
# $OpenBSD: zarafa_spooler.rc,v 1.7 2015/11/02 11:06:34 robert Exp $
daemon="${TRUEPREFIX}/bin/zarafa-spooler"
daemon="${TRUEPREFIX}/sbin/zarafa-spooler"
. /etc/rc.d/rc.subr