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

update to 7.2.3

Browse Source
This commit is contained in:
robert 2016-04-20 18:38:41 +00:00
parent 685c415639
commit c96903acf7
44 changed files with 307 additions and 257 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/zarafa/Makefile.inc
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.38 2016/04/01 18:08:10 robert Exp $
# $OpenBSD: Makefile.inc,v 1.39 2016/04/20 18:38:41 robert Exp $
V?= 7.2.2
BUILD?= 531
V?= 7.2.3
BUILD?= 657
DISTNAME?= zcp-${V}.${BUILD}
CATEGORIES+= mail

4
mail/zarafa/zarafa/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (zarafa/zcp-7.2.2.531.tar.xz) = 1xibZHOZHZmkc6qzxa0JKwzB3mLHaLsZ7ACCpOlmmLg=
SIZE (zarafa/zcp-7.2.2.531.tar.xz) = 3813724
SHA256 (zarafa/zcp-7.2.3.657.tar.xz) = z05GPzN5Z5d928KProD3QE05QOyaf5WhpmvTWLNuWto=
SIZE (zarafa/zcp-7.2.3.657.tar.xz) = 3811984

8
mail/zarafa/zarafa/patches/patch-ECtools_fsck_zarafa-fsck_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ECtools_fsck_zarafa-fsck_cpp,v 1.1 2016/04/01 18:08:10 robert Exp $
--- ECtools/fsck/zarafa-fsck.cpp.orig Wed Mar 23 12:14:33 2016
+++ ECtools/fsck/zarafa-fsck.cpp Fri Apr 1 09:30:17 2016
@@ -557,8 +557,10 @@ int main(int argc, char *argv[])
$OpenBSD: patch-ECtools_fsck_zarafa-fsck_cpp,v 1.2 2016/04/20 18:38:41 robert Exp $
--- ECtools/fsck/zarafa-fsck.cpp.orig Wed Apr 20 13:13:54 2016
+++ ECtools/fsck/zarafa-fsck.cpp Wed Apr 20 19:54:13 2016
@@ -529,8 +529,10 @@ int main(int argc, char *argv[])
bool acceptDisclaimer = false;
setlocale(LC_MESSAGES, "");

10
mail/zarafa/zarafa/patches/patch-ECtools_monitor_zarafa-monitor_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ECtools_monitor_zarafa-monitor_cpp,v 1.1 2016/04/01 18:08:10 robert Exp $
--- ECtools/monitor/zarafa-monitor.cpp.orig Wed Mar 23 12:14:33 2016
+++ ECtools/monitor/zarafa-monitor.cpp Fri Apr 1 13:30:27 2016
@@ -186,10 +186,10 @@ int main(int argc, char *argv[]) {
$OpenBSD: patch-ECtools_monitor_zarafa-monitor_cpp,v 1.2 2016/04/20 18:38:41 robert Exp $
--- ECtools/monitor/zarafa-monitor.cpp.orig Wed Apr 20 13:13:54 2016
+++ ECtools/monitor/zarafa-monitor.cpp Wed Apr 20 19:54:13 2016
@@ -161,10 +161,10 @@ int main(int argc, char *argv[]) {
{ "smtp_server","localhost" },
{ "server_socket", "default:" },
#ifdef LINUX
@ -15,7 +15,7 @@ $OpenBSD: patch-ECtools_monitor_zarafa-monitor_cpp,v 1.1 2016/04/01 18:08:10 rob
#endif
{ "log_method","file" },
#ifdef LINUX
@@ -230,8 +230,10 @@ int main(int argc, char *argv[]) {
@@ -205,8 +205,10 @@ int main(int argc, char *argv[]) {
{ NULL, 0, NULL, 0 }
};

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_in,v 1.2 2016/04/01 18:08:10 robert Exp $
--- Makefile.in.orig Thu Mar 31 12:54:54 2016
+++ Makefile.in Thu Mar 31 23:23:32 2016
@@ -909,7 +909,7 @@ uninstall-am:
$OpenBSD: patch-Makefile_in,v 1.3 2016/04/20 18:38:41 robert Exp $
--- Makefile.in.orig Wed Apr 20 15:02:27 2016
+++ Makefile.in Wed Apr 20 19:54:15 2016
@@ -979,7 +979,7 @@ uninstall-am: uninstall-sbinSCRIPTS
.PHONY: source-moved-check
source-moved-check:

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

@ -1,7 +1,7 @@
$OpenBSD: patch-caldav_CalDAV_cpp,v 1.1 2016/04/01 18:08:10 robert Exp $
--- caldav/CalDAV.cpp.orig Fri Apr 1 13:29:56 2016
+++ caldav/CalDAV.cpp Fri Apr 1 13:30:11 2016
@@ -190,10 +190,10 @@ int main(int argc, char **argv) {
$OpenBSD: patch-caldav_CalDAV_cpp,v 1.2 2016/04/20 18:38:41 robert Exp $
--- caldav/CalDAV.cpp.orig Wed Apr 20 13:13:54 2016
+++ caldav/CalDAV.cpp Wed Apr 20 19:54:13 2016
@@ -166,10 +166,10 @@ int main(int argc, char **argv) {
#endif
static const configsetting_t lpDefaults[] = {
#ifdef LINUX

37
mail/zarafa/zarafa/patches/patch-common_ECChannel_cpp
View File

@ -1,7 +1,36 @@
$OpenBSD: patch-common_ECChannel_cpp,v 1.1 2016/04/01 18:08:10 robert Exp $
--- common/ECChannel.cpp.orig Wed Mar 23 12:14:33 2016
+++ common/ECChannel.cpp Fri Apr 1 12:41:25 2016
@@ -805,12 +805,18 @@ int zcp_bindtodevice(ECLogger *log, int fd, const char
$OpenBSD: patch-common_ECChannel_cpp,v 1.2 2016/04/20 18:38:41 robert Exp $
--- common/ECChannel.cpp.orig Wed Apr 20 13:13:54 2016
+++ common/ECChannel.cpp Wed Apr 20 20:27:17 2016
@@ -30,8 +30,10 @@
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <arpa/inet.h>
+#ifndef OPENBSD
#include <linux/rtnetlink.h>
#endif
+#endif
#include <cerrno>
#include <mapicode.h>
@@ -677,7 +679,7 @@ const char *ECChannel::peer_addr(void) const
return peer_atxt;
}
-#ifdef LINUX
+#if defined(LINUX) && !defined(__OpenBSD__)
static int peer_is_local2(int rsk, const struct nlmsghdr *nlh)
{
if (send(rsk, nlh, nlh->nlmsg_len, 0) < 0)
@@ -716,7 +718,7 @@ int zcp_peeraddr_is_local(const struct sockaddr *peer_
} else {
return -EPROTONOSUPPORT;
}
-#ifdef LINUX
+#if defined(LINUX) && !defined(__OpenBSD__)
int rsk = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE);
if (rsk < 0) {
fprintf(stderr, "socket AF_NETLINK: %s\n", strerror(errno));
@@ -895,12 +897,18 @@ int zcp_bindtodevice(ECLogger *log, int fd, const char
if (i == NULL || strcmp(i, "any") == 0 || strcmp(i, "all") == 0 ||
strcmp(i, "") == 0)
return 0;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-common_ECLogger_cpp,v 1.21 2016/04/01 18:08:10 robert Exp $
--- common/ECLogger.cpp.orig Wed Mar 23 12:14:33 2016
+++ common/ECLogger.cpp Fri Apr 1 09:32:35 2016
@@ -53,6 +53,10 @@
$OpenBSD: patch-common_ECLogger_cpp,v 1.22 2016/04/20 18:38:41 robert Exp $
--- common/ECLogger.cpp.orig Wed Apr 20 13:13:54 2016
+++ common/ECLogger.cpp Wed Apr 20 20:27:28 2016
@@ -27,6 +27,10 @@
#include <zarafa/stringutil.h>
#include "charset/localeutil.h"
@ -12,19 +12,22 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.21 2016/04/01 18:08:10 robert Exp $
#ifdef LINUX
#include "config.h"
#include <poll.h>
@@ -96,18 +100,22 @@ ECLogger::ECLogger(int max_ll) {
@@ -72,9 +76,11 @@ static ECLogger *ec_log_target = &ec_log_fallback_targ
ECLogger::ECLogger(int max_ll) {
max_loglevel = max_ll;
pthread_mutex_init(&m_mutex, NULL);
// get system locale for time, NULL is returned if locale was not found.
+#ifndef __OpenBSD__
// get system locale for time, NULL is returned if locale was not found.
timelocale = createlocale(LC_TIME, "C");
datalocale = createUTF8Locale();
+#endif
prefix = LP_NONE;
m_ulRef = 1;
}
@@ -83,11 +89,13 @@ ECLogger::~ECLogger() {
if (ec_log_target == this)
ec_log_set(NULL);
ECLogger::~ECLogger() {
+#ifndef __OpenBSD__
if (timelocale)
freelocale(timelocale);
@ -35,7 +38,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.21 2016/04/01 18:08:10 robert Exp $
pthread_mutex_destroy(&m_mutex);
}
@@ -127,9 +135,11 @@ std::string ECLogger::MakeTimestamp() {
@@ -107,9 +115,11 @@ std::string ECLogger::MakeTimestamp() {
char buffer[_LOG_TSSIZE];
@ -47,7 +50,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.21 2016/04/01 18:08:10 robert Exp $
strftime(buffer, sizeof buffer, "%c", &local);
return buffer;
@@ -196,7 +206,11 @@ int ECLogger::snprintf(char *str, size_t size, const c
@@ -176,7 +186,11 @@ int ECLogger::snprintf(char *str, size_t size, const c
int len = 0;
va_start(va, format);
@ -59,7 +62,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.21 2016/04/01 18:08:10 robert Exp $
va_end(va);
return len;
@@ -427,7 +441,11 @@ void ECLogger_File::Log(unsigned int loglevel, const c
@@ -407,7 +421,11 @@ void ECLogger_File::Log(unsigned int loglevel, const c
void ECLogger_File::LogVA(unsigned int loglevel, const char *format, va_list& va) {
char msgbuffer[_LOG_BUFSIZE];
@ -71,7 +74,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.21 2016/04/01 18:08:10 robert Exp $
Log(loglevel, std::string(msgbuffer));
}
@@ -487,7 +505,11 @@ void ECLogger_Syslog::LogVA(unsigned int loglevel, con
@@ -467,7 +485,11 @@ void ECLogger_Syslog::LogVA(unsigned int loglevel, con
vsyslog(levelmap[loglevel & EC_LOGLEVEL_MASK], format, va);
#else
char msgbuffer[_LOG_BUFSIZE];
@ -83,7 +86,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.21 2016/04/01 18:08:10 robert Exp $
syslog(levelmap[loglevel & EC_LOGLEVEL_MASK], "%s", msgbuffer);
#endif
}
@@ -651,7 +673,11 @@ void ECLogger_Tee::LogVA(unsigned int loglevel, const
@@ -631,7 +653,11 @@ void ECLogger_Tee::LogVA(unsigned int loglevel, const
LoggerList::iterator iLogger;
char msgbuffer[_LOG_BUFSIZE];
@ -95,25 +98,25 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.21 2016/04/01 18:08:10 robert Exp $
for (iLogger = m_loggers.begin(); iLogger != m_loggers.end(); ++iLogger)
(*iLogger)->Log(loglevel, std::string(msgbuffer));
@@ -702,7 +728,7 @@ void ECLogger_Pipe::Log(unsigned int loglevel, const s
@@ -682,7 +708,7 @@ void ECLogger_Pipe::Log(unsigned int loglevel, const s
#ifdef WIN32
len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[%p] ", pthread_self());
#else
- 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());
+ len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[0x%016lX] ", (uintptr_t)pthread_self());
#endif
else if (prefix == LP_PID)
len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[%5d] ", getpid());
@@ -750,7 +776,7 @@ void ECLogger_Pipe::LogVA(unsigned int loglevel, const
@@ -730,7 +756,7 @@ void ECLogger_Pipe::LogVA(unsigned int loglevel, const
#ifdef WIN32
len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[%p] ", pthread_self());
#else
- 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());
+ len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[0x%016lX] ", (uintptr_t)pthread_self());
#endif
else if (prefix == LP_PID)
len = snprintf(msgbuffer + off, sizeof msgbuffer - off, "[%5d] ", getpid());
@@ -761,7 +787,11 @@ void ECLogger_Pipe::LogVA(unsigned int loglevel, const
@@ -741,7 +767,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
@ -125,7 +128,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.21 2016/04/01 18:08:10 robert Exp $
// -1 can be returned on formatting error (eg. %ls in C locale)
if (len < 0)
len = 0;
@@ -844,9 +874,13 @@ namespace PrivatePipe {
@@ -824,9 +854,13 @@ namespace PrivatePipe {
fd_set readfds;
#endif
@ -139,3 +142,17 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.21 2016/04/01 18:08:10 robert Exp $
m_lpConfig = lpConfig;
m_lpFileLogger = lpFileLogger;
@@ -1202,8 +1236,12 @@ void generic_sigsegv_handler(ECLogger *lpLogger, const
#endif
ec_log_crit("Signal errno: %s, signal code: %d", strerror(si->si_errno), si->si_code);
ec_log_crit("Sender pid: %d, sender uid: %d, si_satus: %d", si->si_pid, si->si_uid, si->si_status);
- ec_log_crit("User time: %ld, system time: %ld, signal value: %d", si->si_utime, si->si_stime, si->si_value.sival_int);
+ ec_log_crit("User time: %lld, system time: %lld, signal value: %d", si->si_utime, si->si_stime, si->si_value.sival_int);
+#ifndef __OpenBSD__
ec_log_crit("Faulting address: %p, affected fd: %d", si->si_addr, si->si_fd);
+#else
+ ec_log_crit("Faulting address: %p", si->si_addr);
+#endif
lpLogger->Log(EC_LOGLEVEL_FATAL, "When reporting this traceback, please include Linux distribution name (and version), system architecture and Zarafa version.");
#ifndef _WIN32
kill(getpid(), signr);

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

@ -1,7 +1,7 @@
$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 @@
$OpenBSD: patch-common_charset_localeutil_cpp,v 1.4 2016/04/20 18:38:41 robert Exp $
--- common/charset/localeutil.cpp.orig Wed Apr 20 13:13:54 2016
+++ common/charset/localeutil.cpp Wed Apr 20 19:54:13 2016
@@ -21,6 +21,7 @@
#include <cstring>
#include "localeutil.h"
@ -9,7 +9,7 @@ $OpenBSD: patch-common_charset_localeutil_cpp,v 1.3 2015/11/02 11:06:34 robert E
locale_t createUTF8Locale()
{
locale_t loc;
@@ -81,6 +82,7 @@ exit:
@@ -55,6 +56,7 @@ exit:
return loc;
}

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

@ -1,7 +1,7 @@
$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 @@
$OpenBSD: patch-common_charset_localeutil_h,v 1.4 2016/04/20 18:38:41 robert Exp $
--- common/charset/localeutil.h.orig Wed Apr 20 13:13:54 2016
+++ common/charset/localeutil.h Wed Apr 20 19:54:13 2016
@@ -19,6 +19,8 @@
#define __CHARSET_UTIL_H
bool forceUTF8Locale(bool bOutput, std::string *lpstrLastSetLocale = NULL);

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

@ -1,7 +1,7 @@
$OpenBSD: patch-common_include_zarafa_ECLogger_h,v 1.1 2016/04/01 18:08:10 robert Exp $
--- common/include/zarafa/ECLogger.h.orig Fri Apr 1 09:32:58 2016
+++ common/include/zarafa/ECLogger.h Fri Apr 1 09:33:09 2016
@@ -138,8 +138,10 @@ class ECLogger {
$OpenBSD: patch-common_include_zarafa_ECLogger_h,v 1.2 2016/04/20 18:38:41 robert Exp $
--- common/include/zarafa/ECLogger.h.orig Wed Apr 20 13:13:54 2016
+++ common/include/zarafa/ECLogger.h Wed Apr 20 19:54:13 2016
@@ -114,8 +114,10 @@ class ECLogger {
std::string MakeTimestamp();
unsigned int max_loglevel;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-common_include_zarafa_charset_traits_h,v 1.1 2016/04/01 18:08:10 robert Exp $
--- common/include/zarafa/charset/traits.h.orig Fri Apr 1 10:07:57 2016
+++ common/include/zarafa/charset/traits.h Fri Apr 1 10:08:06 2016
@@ -107,31 +107,31 @@ class iconv_charset<const char *> _zcp_final { (public
$OpenBSD: patch-common_include_zarafa_charset_traits_h,v 1.2 2016/04/20 18:38:41 robert Exp $
--- common/include/zarafa/charset/traits.h.orig Wed Apr 20 13:13:54 2016
+++ common/include/zarafa/charset/traits.h Wed Apr 20 19:54:13 2016
@@ -81,31 +81,31 @@ class iconv_charset<const char *> _zcp_final { (public
}
};
@ -43,7 +43,7 @@ $OpenBSD: patch-common_include_zarafa_charset_traits_h,v 1.1 2016/04/01 18:08:10
}
};
@@ -179,31 +179,31 @@ class iconv_charset<const wchar_t *> _zcp_final { (pub
@@ -153,31 +153,31 @@ class iconv_charset<const wchar_t *> _zcp_final { (pub
}
};

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

@ -1,7 +1,7 @@
$OpenBSD: patch-common_include_zarafa_platform_h,v 1.1 2016/04/01 18:08:10 robert Exp $
--- common/include/zarafa/platform.h.orig Fri Apr 1 10:09:02 2016
+++ common/include/zarafa/platform.h Fri Apr 1 10:09:19 2016
@@ -82,7 +82,12 @@
$OpenBSD: patch-common_include_zarafa_platform_h,v 1.2 2016/04/20 18:38:41 robert Exp $
--- common/include/zarafa/platform.h.orig Wed Apr 20 13:13:54 2016
+++ common/include/zarafa/platform.h Wed Apr 20 19:54:13 2016
@@ -56,7 +56,12 @@
// We have to include this now in case select.h is included too soon.
// Increase our maximum amount of file descriptors to 8192

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

@ -1,7 +1,7 @@
$OpenBSD: patch-common_include_zarafa_platform_linux_h,v 1.1 2016/04/01 18:08:10 robert Exp $
--- common/include/zarafa/platform.linux.h.orig Wed Mar 23 12:14:33 2016
+++ common/include/zarafa/platform.linux.h Fri Apr 1 10:09:54 2016
@@ -57,7 +57,14 @@
$OpenBSD: patch-common_include_zarafa_platform_linux_h,v 1.2 2016/04/20 18:38:41 robert Exp $
--- common/include/zarafa/platform.linux.h.orig Wed Apr 20 13:13:54 2016
+++ common/include/zarafa/platform.linux.h Wed Apr 20 19:54:13 2016
@@ -32,7 +32,14 @@
#include <dlfcn.h>
#include <cstddef>
#include <libgen.h>
@ -16,7 +16,7 @@ $OpenBSD: patch-common_include_zarafa_platform_linux_h,v 1.1 2016/04/01 18:08:10
#include <endian.h>
#include <cerrno>
#include <clocale>
@@ -91,6 +98,8 @@
@@ -66,6 +73,8 @@
#define _snprintf snprintf
#ifdef HAVE_VSNPRINTF_L
#define _vsnprintf_l vsnprintf_l
@ -25,7 +25,7 @@ $OpenBSD: patch-common_include_zarafa_platform_linux_h,v 1.1 2016/04/01 18:08:10
#else
inline int _vsnprintf_l(char *str, size_t size, const char *format, locale_t locale, va_list ap) {
locale_t prev = uselocale(locale);
@@ -679,7 +688,11 @@ time_t GetProcessTime();
@@ -654,7 +663,11 @@ time_t GetProcessTime();
#ifndef ntohll
#if __BYTE_ORDER == __LITTLE_ENDIAN
@ -37,7 +37,7 @@ $OpenBSD: patch-common_include_zarafa_platform_linux_h,v 1.1 2016/04/01 18:08:10
#else
#define ntohll(x) (x)
#endif
@@ -687,14 +700,18 @@ time_t GetProcessTime();
@@ -662,14 +675,18 @@ time_t GetProcessTime();
#ifndef htonll
#if __BYTE_ORDER == __LITTLE_ENDIAN

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

@ -1,7 +1,7 @@
$OpenBSD: patch-common_platform_cpp,v 1.2 2016/04/01 18:08:10 robert Exp $
--- common/platform.cpp.orig Fri Apr 1 10:08:18 2016
+++ common/platform.cpp Fri Apr 1 10:08:53 2016
@@ -558,7 +558,7 @@ bool force_buffers_to_disk(const int fd)
$OpenBSD: patch-common_platform_cpp,v 1.3 2016/04/20 18:38:41 robert Exp $
--- common/platform.cpp.orig Wed Apr 20 13:13:54 2016
+++ common/platform.cpp Wed Apr 20 19:54:13 2016
@@ -525,7 +525,7 @@ bool force_buffers_to_disk(const int fd)
void my_readahead(const int fd)
{
@ -10,7 +10,7 @@ $OpenBSD: patch-common_platform_cpp,v 1.2 2016/04/01 18:08:10 robert Exp $
struct stat st;
if (fstat(fd, &st) == 0)
@@ -568,7 +568,7 @@ void my_readahead(const int fd)
@@ -535,7 +535,7 @@ void my_readahead(const int fd)
void give_filesize_hint(const int fd, const off_t len)
{

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

@ -1,7 +1,7 @@
$OpenBSD: patch-common_platform_linux_cpp,v 1.11 2016/04/01 18:08:10 robert Exp $
--- common/platform.linux.cpp.orig Wed Mar 23 12:14:33 2016
+++ common/platform.linux.cpp Thu Mar 31 23:23:31 2016
@@ -59,6 +59,8 @@
$OpenBSD: patch-common_platform_linux_cpp,v 1.12 2016/04/20 18:38:41 robert Exp $
--- common/platform.linux.cpp.orig Wed Apr 20 13:13:54 2016
+++ common/platform.linux.cpp Wed Apr 20 20:27:41 2016
@@ -36,6 +36,8 @@
#include <cerrno>
#include <climits>
@ -9,8 +9,17 @@ $OpenBSD: patch-common_platform_linux_cpp,v 1.11 2016/04/01 18:08:10 robert Exp
+
#include <string>
#include <map>
@@ -74,7 +76,7 @@
#include <vector>
@@ -45,7 +47,7 @@
#else
# include <uuid.h>
#endif
-#if defined(__linux__) && defined(__GLIBC__)
+#if (defined(__linux__) && defined(__GLIBC__)) || defined(__OpenBSD__)
# include <cxxabi.h>
# include <execinfo.h>
#endif
@@ -56,7 +58,7 @@
#define ICONV_CONST const
#elif OPENBSD
// bsd
@ -19,7 +28,7 @@ $OpenBSD: patch-common_platform_linux_cpp,v 1.11 2016/04/01 18:08:10 robert Exp
#else
// linux
#define ICONV_CONST
@@ -97,22 +99,10 @@ HRESULT CoCreateGuid(LPGUID pNewGUID) {
@@ -79,22 +81,10 @@ HRESULT CoCreateGuid(LPGUID pNewGUID) {
return MAPI_E_INVALID_PARAMETER;
#if HAVE_UUID_CREATE
@ -42,7 +51,7 @@ $OpenBSD: patch-common_platform_linux_cpp,v 1.11 2016/04/01 18:08:10 robert Exp
#else
uuid_t g;
uuid_generate(g);
@@ -169,6 +159,12 @@ void Sleep(unsigned int msec) {
@@ -151,6 +141,12 @@ void Sleep(unsigned int msec) {
nanosleep(&ts, NULL);
}
@ -55,7 +64,7 @@ $OpenBSD: patch-common_platform_linux_cpp,v 1.11 2016/04/01 18:08:10 robert Exp
static void rand_fail(void)
{
fprintf(stderr, "Cannot access/use /dev/urandom, this is fatal (%s)\n", strerror(errno));
@@ -205,6 +201,7 @@ void rand_get(char *p, int n)
@@ -187,6 +183,7 @@ void rand_get(char *p, int n)
close(fd);
}

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

@ -1,7 +1,7 @@
$OpenBSD: patch-common_ustringutil_cpp,v 1.6 2016/04/01 18:08:10 robert Exp $
--- common/ustringutil.cpp.orig Wed Mar 23 12:14:33 2016
+++ common/ustringutil.cpp Thu Mar 31 23:23:31 2016
@@ -169,12 +169,18 @@ int ECSortKey::compareTo(const ECSortKey &other) const
$OpenBSD: patch-common_ustringutil_cpp,v 1.7 2016/04/20 18:38:41 robert Exp $
--- common/ustringutil.cpp.orig Wed Apr 20 19:59:24 2016
+++ common/ustringutil.cpp Wed Apr 20 20:00:13 2016
@@ -143,12 +143,18 @@ int ECSortKey::compareTo(const ECSortKey &other) const
*/
const char* str_ifind(const char *haystack, const char *needle)
{
@ -17,10 +17,10 @@ $OpenBSD: patch-common_ustringutil_cpp,v 1.6 2016/04/01 18:08:10 robert Exp $
+#else
+ if (toupper(*haystack) == toupper(*needlepos)) {
+#endif
needlepos++;
++needlepos;
if(*needlepos == 0)
@@ -189,7 +195,9 @@ const char* str_ifind(const char *haystack, const char
@@ -163,7 +169,9 @@ const char* str_ifind(const char *haystack, const char
needlestart = NULL;
exit:
@ -30,7 +30,7 @@ $OpenBSD: patch-common_ustringutil_cpp,v 1.6 2016/04/01 18:08:10 robert Exp $
return needlestart;
}
@@ -1704,8 +1712,10 @@ ECLocale::ECLocale(const ECLocale &other)
@@ -1662,8 +1670,10 @@ ECLocale::ECLocale(const ECLocale &other)
}
ECLocale::~ECLocale() {

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

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_ac,v 1.4 2016/04/01 18:08:10 robert Exp $
--- configure.ac.orig Wed Mar 23 12:14:33 2016
+++ configure.ac Fri Apr 1 19:49:10 2016
$OpenBSD: patch-configure_ac,v 1.5 2016/04/20 18:38:41 robert Exp $
--- configure.ac.orig Wed Apr 20 20:00:21 2016
+++ configure.ac Wed Apr 20 20:02:22 2016
@@ -52,7 +52,7 @@ AC_CANONICAL_HOST
BUILDOS=""
case "$host_os" in
@ -20,16 +20,7 @@ $OpenBSD: patch-configure_ac,v 1.4 2016/04/01 18:08:10 robert Exp $
AC_MSG_ERROR([unknown distro])
else
AC_MSG_RESULT([using $with_distro])
@@ -703,7 +704,7 @@ AS_IF(
],
[test "$want_icu" = "yes"], [
PKG_CHECK_MODULES([icu_uc], [$req_icu_uc])
- PKG_CHECK_MODULES([icu_i18n], [$req_icu])
+ PKG_CHECK_MODULES([icu_i18n], [$req_icu_i18n])
have_icu=1
]
)
@@ -716,6 +717,8 @@ ZCPPFLAGS="$ZCPPFLAGS $icu_uc_CFLAGS $icu_i18n_CFLAGS"
@@ -740,6 +741,8 @@ ZCPPFLAGS="$ZCPPFLAGS $icu_uc_CFLAGS $icu_i18n_CFLAGS"
# all libs for programs, because functions are in static common stuff
PROG_LIBS="$UUID_LIBS $INTL_LIBS $ICONV_LIBS $GZ_LIBS"
AC_SUBST(PROG_LIBS)

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

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.25 2016/04/01 18:08:10 robert Exp $
--- doc/Makefile.in.orig Fri Apr 1 10:11:26 2016
+++ doc/Makefile.in Fri Apr 1 10:11:39 2016
@@ -764,7 +764,7 @@ zarafa.0: manual.xml
$OpenBSD: patch-doc_Makefile_in,v 1.26 2016/04/20 18:38:41 robert Exp $
--- doc/Makefile.in.orig Wed Apr 20 15:02:27 2016
+++ doc/Makefile.in Wed Apr 20 19:54:15 2016
@@ -766,7 +766,7 @@ zarafa.0: manual.xml
@${AM_V_GEN} if [ -z "$(PROG_XMLTO)" ]; then \
echo Please install xmlto to generate manual pages; \
else \

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

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_manual_xml,v 1.41 2016/04/01 18:08:10 robert Exp $
--- doc/manual.xml.orig Fri Apr 1 10:11:46 2016
+++ doc/manual.xml Fri Apr 1 10:17:23 2016
$OpenBSD: patch-doc_manual_xml,v 1.42 2016/04/20 18:38:41 robert Exp $
--- doc/manual.xml.orig Wed Apr 20 13:13:54 2016
+++ doc/manual.xml Wed Apr 20 19:54:13 2016
@@ -876,9 +876,7 @@
<varlistentry>
<term><option>pid_file</option></term>
@ -90,7 +90,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.41 2016/04/01 18:08:10 robert Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafad/gateway.pid</replaceable>
@@ -8307,14 +8283,8 @@
@@ -8309,14 +8285,8 @@
<para>The monitor checks user mailbox sizes. The monitor sends
a quota email when the warning quota limit is reached. When
@ -106,7 +106,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.41 2016/04/01 18:08:10 robert Exp $
</refsection>
<refsection>
@@ -8466,9 +8436,7 @@
@@ -8468,9 +8438,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -117,7 +117,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.41 2016/04/01 18:08:10 robert Exp $
</para>
<para>Default value: /var/run/zarafad/monitor.pid
</para>
@@ -9028,13 +8996,8 @@
@@ -9030,13 +8998,8 @@
<para><command>zarafa-ical</command></para>
@ -133,7 +133,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.41 2016/04/01 18:08:10 robert Exp $
</refsection>
<refsection>
@@ -9217,9 +9180,7 @@
@@ -9219,9 +9182,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -144,7 +144,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.41 2016/04/01 18:08:10 robert Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafad/ical.pid</replaceable>
@@ -9915,8 +9876,8 @@
@@ -9917,8 +9878,8 @@
<replaceable>/path/to/search.cfg</replaceable>
</para>
@ -155,7 +155,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.41 2016/04/01 18:08:10 robert Exp $
[<replaceable>start</replaceable>|
<replaceable>stop</replaceable>|
<replaceable>restart</replaceable>|
@@ -10051,7 +10012,7 @@
@@ -10053,7 +10014,7 @@
<term><option>pid_file</option></term>
<listitem>
<para>Write the process ID number to this file. This is

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

@ -1,7 +1,7 @@
$OpenBSD: patch-gateway_Gateway_cpp,v 1.10 2016/04/01 18:08:10 robert Exp $
--- gateway/Gateway.cpp.orig Wed Mar 23 12:14:33 2016
+++ gateway/Gateway.cpp Fri Apr 1 13:30:49 2016
@@ -90,6 +90,10 @@
$OpenBSD: patch-gateway_Gateway_cpp,v 1.11 2016/04/20 18:38:41 robert Exp $
--- gateway/Gateway.cpp.orig Wed Apr 20 13:13:54 2016
+++ gateway/Gateway.cpp Wed Apr 20 19:54:13 2016
@@ -64,6 +64,10 @@
#include <zarafa/UnixUtil.h>
#endif
@ -12,7 +12,7 @@ $OpenBSD: patch-gateway_Gateway_cpp,v 1.10 2016/04/01 18:08:10 robert Exp $
#ifdef ZCP_USES_ICU
#include <unicode/uclean.h>
#endif
@@ -324,10 +328,10 @@ int main(int argc, char *argv[]) {
@@ -299,10 +303,10 @@ int main(int argc, char *argv[]) {
static const configsetting_t lpDefaults[] = {
{ "server_bind", "" },
#ifdef LINUX

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

@ -1,7 +1,7 @@
$OpenBSD: patch-inetmapi_Makefile_in,v 1.6 2016/04/01 18:08:10 robert Exp $
--- inetmapi/Makefile.in.orig Thu Mar 31 12:54:54 2016
+++ inetmapi/Makefile.in Thu Mar 31 23:23:32 2016
@@ -471,7 +471,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(BOOST_CPPFL
$OpenBSD: patch-inetmapi_Makefile_in,v 1.7 2016/04/20 18:38:41 robert Exp $
--- inetmapi/Makefile.in.orig Wed Apr 20 15:02:27 2016
+++ inetmapi/Makefile.in Wed Apr 20 19:54:15 2016
@@ -472,7 +472,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 \

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_server_cfg,v 1.23 2016/04/01 18:08:10 robert Exp $
--- installer/linux/server.cfg.orig Wed Mar 23 12:14:33 2016
+++ installer/linux/server.cfg Fri Apr 1 16:17:52 2016
$OpenBSD: patch-installer_linux_server_cfg,v 1.24 2016/04/20 18:38:41 robert Exp $
--- installer/linux/server.cfg.orig Wed Apr 20 20:02:28 2016
+++ installer/linux/server.cfg Wed Apr 20 20:04:08 2016
@@ -36,7 +36,7 @@ allow_local_users = yes
# local admin users who can connect to any store (use this for the zarafa-dagent)
# field is SPACE separated
@ -40,16 +40,16 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.23 2016/04/01 18:08:10 robert Exp
# Time (in seconds) to wait for a connection to the license server before
# terminating the request.
@@ -146,7 +146,7 @@ attachment_storage = files
attachment_files_fsync = yes
@@ -148,7 +148,7 @@ attachment_files_fsync = yes
# When attachment_storage is 'files', use this path to store the files
-attachment_path = /var/lib/zarafa/attachments
+attachment_path = /var/db/zarafa/attachments
# When attachment_storage is 's3', use this path to set a prefix to all
# attachment data of a certain cluster, for example 'attach'
-attachment_path = /var/lib/zarafa/attachments
+attachment_path = /var/db/zarafa/attachments
# Compression level for attachments when attachment_storage is 'files'.
# Set compression level for attachments disabled=0, max=9
@@ -162,13 +162,13 @@ server_ssl_enabled = no
@@ -185,13 +185,13 @@ server_ssl_enabled = no
server_ssl_port = 237
# Required Server certificate, contains the certificate and the private key parts
@ -65,7 +65,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.23 2016/04/01 18:08:10 robert Exp
# Path with CA certificates, e.g. /etc/ssl/certs
server_ssl_ca_path =
@@ -183,7 +183,7 @@ server_ssl_ciphers = ALL:!LOW:!SSLv2:!EXP:!aNULL
@@ -206,7 +206,7 @@ server_ssl_ciphers = ALL:!LOW:!SSLv2:!EXP:!aNULL
server_ssl_prefer_server_ciphers = no
# Path of SSL Public keys of clients
@ -74,7 +74,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.23 2016/04/01 18:08:10 robert Exp
##############################################################
# THREAD SETTINGS
@@ -315,20 +315,20 @@ companyquota_warn = 0
@@ -338,20 +338,20 @@ companyquota_warn = 0
user_plugin = db
# configuration file of the user plugin, examples can be found in /usr/share/doc/zarafa/example-config
@ -103,7 +103,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.23 2016/04/01 18:08:10 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
@@ -385,7 +385,7 @@ client_update_enabled = false
@@ -408,7 +408,7 @@ client_update_enabled = false
# Place the correct Zarafa Outlook Client in this directory for
# Windows clients to download through the Zarafa server

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_userscripts_users_common_sh,v 1.6 2012/02/27 19:01:34 ajacoutot Exp $
--- installer/userscripts/users_common.sh.orig Wed Feb 1 15:42:09 2012
+++ installer/userscripts/users_common.sh Mon Feb 27 19:26:00 2012
$OpenBSD: patch-installer_userscripts_users_common_sh,v 1.7 2016/04/20 18:38:41 robert Exp $
--- installer/userscripts/users_common.sh.orig Wed Apr 20 13:13:54 2016
+++ installer/userscripts/users_common.sh Wed Apr 20 19:54:13 2016
@@ -1,7 +1,7 @@
# shell include script
@ -11,9 +11,11 @@ $OpenBSD: patch-installer_userscripts_users_common_sh,v 1.6 2012/02/27 19:01:34
export ZARAFA_LANG PATH
if [ -z "${ZARAFA_USER_SCRIPTS}" ] ; then
@@ -22,4 +22,4 @@ if [ -z "${ZARAFA_USER}" -a -z "${ZARAFA_STOREGUID}" ]
@@ -22,6 +22,6 @@ if [ -z "${ZARAFA_USER}" -a -z "${ZARAFA_STOREGUID}" ]
exit 1
fi
-find ${ZARAFA_USER_SCRIPTS} -maxdepth 1 -type f -perm -u=x -not -name \*~ -not -name \#\* -not -name \*.rpm\* -not -name \*.bak -not -name \*.old -exec {} \;
-# Find cannot cope with unreadable cwd
+find ${ZARAFA_USER_SCRIPTS} -maxdepth 1 -type f -perm -u=x -and ! -name \*~ -and ! -name \#\* -exec {} \;
cd "$ZARAFA_USER_SCRIPTS"
find "${ZARAFA_USER_SCRIPTS}" -maxdepth 1 -type f -perm -u=x -not -name \*~ -not -name \#\* -not -name \*.rpm\* -not -name \*.bak -not -name \*.old -exec {} \;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-m4lcommon_CommonUtil_cpp,v 1.2 2016/04/01 18:08:10 robert Exp $
--- m4lcommon/CommonUtil.cpp.orig Wed Mar 23 12:14:33 2016
+++ m4lcommon/CommonUtil.cpp Thu Mar 31 23:23:31 2016
@@ -86,6 +86,7 @@
$OpenBSD: patch-m4lcommon_CommonUtil_cpp,v 1.3 2016/04/20 18:38:41 robert Exp $
--- m4lcommon/CommonUtil.cpp.orig Wed Apr 20 13:13:54 2016
+++ m4lcommon/CommonUtil.cpp Wed Apr 20 19:54:13 2016
@@ -60,6 +60,7 @@
#include <ws2tcpip.h>
#else
#include <sys/socket.h>

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

@ -1,7 +1,7 @@
$OpenBSD: patch-m4lcommon_include_zarafa_mapi_ptr_mapi_memory_ptr_h,v 1.1 2016/04/01 18:08:10 robert Exp $
--- m4lcommon/include/zarafa/mapi_ptr/mapi_memory_ptr.h.orig Fri Apr 1 10:27:35 2016
+++ m4lcommon/include/zarafa/mapi_ptr/mapi_memory_ptr.h Fri Apr 1 10:27:40 2016
@@ -151,11 +151,11 @@ class mapi_memory_ptr _zcp_final { (public)
$OpenBSD: patch-m4lcommon_include_zarafa_mapi_ptr_mapi_memory_ptr_h,v 1.2 2016/04/20 18:38:41 robert Exp $
--- m4lcommon/include/zarafa/mapi_ptr/mapi_memory_ptr.h.orig Wed Apr 20 13:13:54 2016
+++ m4lcommon/include/zarafa/mapi_ptr/mapi_memory_ptr.h Wed Apr 20 19:54:13 2016
@@ -125,11 +125,11 @@ class mapi_memory_ptr _zcp_final { (public)
return proxy(&m_lpMemory);
}

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

@ -1,6 +1,6 @@
--- m4lcommon/include/zarafa/mapi_ptr/mapi_object_ptr.h.orig Wed Mar 23 12:14:33 2016
+++ m4lcommon/include/zarafa/mapi_ptr/mapi_object_ptr.h Fri Apr 1 11:15:33 2016
@@ -127,13 +127,13 @@ class mapi_object_ptr _zcp_final { (public)
--- m4lcommon/include/zarafa/mapi_ptr/mapi_object_ptr.h.orig Wed Apr 20 13:13:54 2016
+++ m4lcommon/include/zarafa/mapi_ptr/mapi_object_ptr.h Wed Apr 20 19:54:13 2016
@@ -101,13 +101,13 @@ class mapi_object_ptr _zcp_final { (public)
std::swap(m_lpObject, other.m_lpObject);
}
@ -18,7 +18,7 @@
if (hr == hrSuccess)
refResult.reset(lpNewObject, false);
@@ -155,7 +155,7 @@ class mapi_object_ptr _zcp_final { (public)
@@ -129,7 +129,7 @@ class mapi_object_ptr _zcp_final { (public)
if (HrGetOneProp(m_lpObject, PR_EC_OBJECT, &ptrPropValue) != hrSuccess)
goto exit; // hr is still MAPI_E_INTERFACE_NOT_SUPPORTED
@ -27,7 +27,7 @@
if (hr == hrSuccess)
refResult.reset(lpNewObject, false);
}
@@ -181,9 +181,9 @@ class mapi_object_ptr _zcp_final { (public)
@@ -155,9 +155,9 @@ class mapi_object_ptr _zcp_final { (public)
return m_lpObject;
}

8
mail/zarafa/zarafa/patches/patch-php-ext_main_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-php-ext_main_cpp,v 1.7 2016/04/01 18:08:10 robert Exp $
--- php-ext/main.cpp.orig Wed Mar 23 12:14:33 2016
+++ php-ext/main.cpp Thu Mar 31 23:23:31 2016
@@ -646,8 +646,11 @@ PHP_MINIT_FUNCTION(mapi) {
$OpenBSD: patch-php-ext_main_cpp,v 1.8 2016/04/20 18:38:41 robert Exp $
--- php-ext/main.cpp.orig Wed Apr 20 13:13:54 2016
+++ php-ext/main.cpp Wed Apr 20 19:54:13 2016
@@ -620,8 +620,11 @@ PHP_MINIT_FUNCTION(mapi) {
ZEND_INIT_MODULE_GLOBALS(mapi, php_mapi_init_globals, NULL);

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

@ -1,7 +1,7 @@
$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 @@
$OpenBSD: patch-provider_client_ECChangeAdvisor_cpp,v 1.4 2016/04/20 18:38:41 robert Exp $
--- provider/client/ECChangeAdvisor.cpp.orig Wed Apr 20 13:13:54 2016
+++ provider/client/ECChangeAdvisor.cpp Wed Apr 20 19:54:13 2016
@@ -25,6 +25,9 @@
#include "ECChangeAdvisor.h"
#include "ECMsgStore.h"

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_client_ECNotifyMaster_cpp,v 1.8 2016/04/01 18:08:10 robert Exp $
--- provider/client/ECNotifyMaster.cpp.orig Wed Mar 23 12:14:33 2016
+++ provider/client/ECNotifyMaster.cpp Thu Mar 31 23:23:31 2016
@@ -394,7 +394,7 @@ void* ECNotifyMaster::NotifyWatch(void *pTmpNotifyMast
$OpenBSD: patch-provider_client_ECNotifyMaster_cpp,v 1.9 2016/04/20 18:38:41 robert Exp $
--- provider/client/ECNotifyMaster.cpp.orig Wed Apr 20 13:13:54 2016
+++ provider/client/ECNotifyMaster.cpp Wed Apr 20 19:54:13 2016
@@ -370,7 +370,7 @@ void* ECNotifyMaster::NotifyWatch(void *pTmpNotifyMast
notificationArray *pNotifyArray = NULL;
hr = pNotifyMaster->m_lpTransport->HrGetNotify(&pNotifyArray);

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_client_WSTransport_cpp,v 1.11 2016/04/01 18:08:10 robert Exp $
--- provider/client/WSTransport.cpp.orig Wed Mar 23 12:14:33 2016
+++ provider/client/WSTransport.cpp Fri Apr 1 13:26:05 2016
@@ -108,6 +108,10 @@ using namespace std;
$OpenBSD: patch-provider_client_WSTransport_cpp,v 1.12 2016/04/20 18:38:41 robert Exp $
--- provider/client/WSTransport.cpp.orig Wed Apr 20 13:13:54 2016
+++ provider/client/WSTransport.cpp Wed Apr 20 19:54:13 2016
@@ -82,6 +82,10 @@ using namespace std;
static const char THIS_FILE[] = __FILE__;
#endif

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_contacts_Makefile_in,v 1.11 2016/04/01 18:08:10 robert Exp $
--- provider/contacts/Makefile.in.orig Thu Mar 31 12:54:54 2016
+++ provider/contacts/Makefile.in Thu Mar 31 23:23:32 2016
@@ -450,7 +450,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) \
$OpenBSD: patch-provider_contacts_Makefile_in,v 1.12 2016/04/20 18:38:41 robert Exp $
--- provider/contacts/Makefile.in.orig Wed Apr 20 15:02:27 2016
+++ provider/contacts/Makefile.in Wed Apr 20 19:54:15 2016
@@ -451,7 +451,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) \
-I${top_srcdir}/mapi4linux/include \
-I${top_srcdir}/common -I${top_srcdir}/m4lcommon

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.9 2015/04/05 22:25:08 robert Exp $
--- provider/libserver/ECDatabaseUtils.cpp.orig Thu Mar 5 16:54:01 2015
+++ provider/libserver/ECDatabaseUtils.cpp Fri Apr 3 23:11:10 2015
@@ -559,7 +559,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
$OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.10 2016/04/20 18:38:41 robert Exp $
--- provider/libserver/ECDatabaseUtils.cpp.orig Wed Apr 20 13:13:54 2016
+++ provider/libserver/ECDatabaseUtils.cpp Wed Apr 20 19:54:13 2016
@@ -535,7 +535,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
std::string strData;
unsigned int type = atoi(lpRow[FIELD_NR_TYPE]);
unsigned int ulPropTag;
@ -11,7 +11,7 @@ $OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.9 2015/04/05 22:25:08
if((type & MVI_FLAG) == MVI_FLAG) {
// Treat MVI as normal property
@@ -591,7 +593,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
@@ -567,7 +569,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
goto exit;
}
lpPropVal->__union = SOAP_UNION_propValData_flt;
@ -23,7 +23,7 @@ $OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.9 2015/04/05 22:25:08
break;
case PT_BOOLEAN:
if(lpRow[FIELD_NR_ULONG] == NULL) {
@@ -607,7 +613,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
@@ -583,7 +589,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
goto exit;
}
lpPropVal->__union = SOAP_UNION_propValData_dbl;
@ -35,7 +35,7 @@ $OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.9 2015/04/05 22:25:08
break;
case PT_CURRENCY:
if(lpRow[FIELD_NR_HI] == NULL || lpRow[FIELD_NR_LO] == NULL) {
@@ -625,7 +635,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
@@ -601,7 +611,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
goto exit;
}
lpPropVal->__union = SOAP_UNION_propValData_dbl;
@ -47,9 +47,9 @@ $OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.9 2015/04/05 22:25:08
break;
case PT_SYSTIME:
if(lpRow[FIELD_NR_HI] == NULL || lpRow[FIELD_NR_LO] == NULL) {
@@ -724,7 +738,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
for(i=0; i < lpPropVal->Value.mvflt.__size; i++)
{
@@ -697,7 +711,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
ulLastPos = 0;
for (i = 0; i < lpPropVal->Value.mvflt.__size; ++i) {
ParseMVProp(lpRow[FIELD_NR_DOUBLE], lpLen[FIELD_NR_DOUBLE], &ulLastPos, &strData);
+#ifndef __OpenBSD__
lpPropVal->Value.mvflt.__ptr[i] = (float)strtod_l(strData.c_str(), NULL, loc);
@ -59,9 +59,9 @@ $OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.9 2015/04/05 22:25:08
}
break;
case PT_MV_DOUBLE:
@@ -741,7 +759,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
for(i=0; i < lpPropVal->Value.mvdbl.__size; i++)
{
@@ -713,7 +731,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
ulLastPos = 0;
for (i = 0; i < lpPropVal->Value.mvdbl.__size; ++i) {
ParseMVProp(lpRow[FIELD_NR_DOUBLE], lpLen[FIELD_NR_DOUBLE], &ulLastPos, &strData);
+#ifndef __OpenBSD__
lpPropVal->Value.mvdbl.__ptr[i] = strtod_l(strData.c_str(), NULL, loc);
@ -71,7 +71,7 @@ $OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.9 2015/04/05 22:25:08
}
break;
case PT_MV_CURRENCY:
@@ -828,7 +850,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
@@ -795,7 +817,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
lpPropVal->ulPropTag = ulPropTag;
exit:

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

@ -1,7 +1,7 @@
$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 @@
$OpenBSD: patch-provider_libserver_ECSessionGroup_cpp,v 1.9 2016/04/20 18:38:41 robert Exp $
--- provider/libserver/ECSessionGroup.cpp.orig Wed Apr 20 13:13:54 2016
+++ provider/libserver/ECSessionGroup.cpp Wed Apr 20 19:54:13 2016
@@ -22,6 +22,10 @@
#include <algorithm>
@ -12,7 +12,7 @@ $OpenBSD: patch-provider_libserver_ECSessionGroup_cpp,v 1.8 2015/11/02 11:06:34
#include "ECSession.h"
#include "ECSessionGroup.h"
#include "ECSessionManager.h"
@@ -57,6 +61,11 @@
@@ -31,6 +35,11 @@
#define new DEBUG_NEW
#undef THIS_FILE
static const char THIS_FILE[] = __FILE__;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.16 2016/04/01 18:08:10 robert Exp $
--- provider/libserver/ECSession.cpp.orig Fri Apr 1 11:27:38 2016
+++ provider/libserver/ECSession.cpp Fri Apr 1 11:29:06 2016
@@ -986,11 +986,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.17 2016/04/20 18:38:41 robert Exp $
--- provider/libserver/ECSession.cpp.orig Wed Apr 20 13:13:54 2016
+++ provider/libserver/ECSession.cpp Wed Apr 20 19:54:13 2016
@@ -945,11 +945,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
uid_t uid;
char strbuf[1024];
#ifdef SO_PEERCRED

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_libserver_StreamUtil_cpp,v 1.7 2016/04/01 18:08:10 robert Exp $
--- provider/libserver/StreamUtil.cpp.orig Wed Mar 23 12:14:33 2016
+++ provider/libserver/StreamUtil.cpp Thu Mar 31 23:23:31 2016
@@ -287,7 +287,9 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
$OpenBSD: patch-provider_libserver_StreamUtil_cpp,v 1.8 2016/04/20 18:38:41 robert Exp $
--- provider/libserver/StreamUtil.cpp.orig Wed Apr 20 13:13:54 2016
+++ provider/libserver/StreamUtil.cpp Wed Apr 20 19:54:13 2016
@@ -261,7 +261,9 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
unsigned int ulKind;
unsigned int ulNameId;
std::string strNameString;
@ -11,7 +11,7 @@ $OpenBSD: patch-provider_libserver_StreamUtil_cpp,v 1.7 2016/04/01 18:08:10 robe
convert_context converter;
short i;
@@ -334,7 +336,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
@@ -308,7 +310,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
er = ZARAFA_E_NOT_FOUND;
goto exit;
}
@ -23,7 +23,7 @@ $OpenBSD: patch-provider_libserver_StreamUtil_cpp,v 1.7 2016/04/01 18:08:10 robe
er = lpSink->Write(&flt, sizeof(flt), 1);
break;
case PT_BOOLEAN:
@@ -351,7 +357,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
@@ -325,7 +331,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
er = ZARAFA_E_NOT_FOUND;
goto exit;
}
@ -35,9 +35,9 @@ $OpenBSD: patch-provider_libserver_StreamUtil_cpp,v 1.7 2016/04/01 18:08:10 robe
er = lpSink->Write(&dbl, sizeof(dbl), 1);
break;
case PT_CURRENCY:
@@ -448,7 +458,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
for (unsigned x = 0; er == erSuccess && x < ulCount; x++)
{
@@ -419,7 +429,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
ulLastPos = 0;
for (unsigned int x = 0; er == erSuccess && x < ulCount; ++x) {
ParseMVProp(lpRow[FIELD_NR_DOUBLE], lpLen[FIELD_NR_DOUBLE], &ulLastPos, &strData);
+#ifndef __OpenBSD__
flt = (float)strtod_l(strData.c_str(), NULL, loc);
@ -47,9 +47,9 @@ $OpenBSD: patch-provider_libserver_StreamUtil_cpp,v 1.7 2016/04/01 18:08:10 robe
er = lpSink->Write(&flt, sizeof(flt), 1);
}
break;
@@ -465,7 +479,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
for (unsigned x = 0; er == erSuccess && x < ulCount; x++)
{
@@ -435,7 +449,11 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
ulLastPos = 0;
for (unsigned int x = 0; er == erSuccess && x < ulCount; ++x) {
ParseMVProp(lpRow[FIELD_NR_DOUBLE], lpLen[FIELD_NR_DOUBLE], &ulLastPos, &strData);
+#ifndef __OpenBSD__
dbl = strtod_l(strData.c_str(), NULL, loc);
@ -59,7 +59,7 @@ $OpenBSD: patch-provider_libserver_StreamUtil_cpp,v 1.7 2016/04/01 18:08:10 robe
er = lpSink->Write(&dbl, sizeof(dbl), 1);
}
break;
@@ -583,7 +601,9 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
@@ -549,7 +567,9 @@ ECRESULT SerializeDatabasePropVal(LPCSTREAMCAPS lpStre
}
exit:

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

@ -1,7 +1,7 @@
$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 @@
$OpenBSD: patch-provider_plugins_ldappasswords_cpp,v 1.4 2016/04/20 18:38:41 robert Exp $
--- provider/plugins/ldappasswords.cpp.orig Wed Apr 20 13:13:54 2016
+++ provider/plugins/ldappasswords.cpp Wed Apr 20 19:54:13 2016
@@ -30,6 +30,10 @@
#include "ldappasswords.h"

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.31 2016/04/01 18:08:10 robert Exp $
--- provider/server/ECServer.cpp.orig Wed Mar 23 12:14:33 2016
+++ provider/server/ECServer.cpp Fri Apr 1 11:32:16 2016
@@ -102,6 +102,10 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.32 2016/04/20 18:38:41 robert Exp $
--- provider/server/ECServer.cpp.orig Wed Apr 20 13:13:54 2016
+++ provider/server/ECServer.cpp Wed Apr 20 19:54:13 2016
@@ -76,6 +76,10 @@
#include "TmpPath.h"
@ -12,7 +12,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.31 2016/04/01 18:08:10 robert E
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
@@ -994,10 +998,10 @@ int running_server(char *szName, const char *szConfig,
@@ -967,10 +971,10 @@ int running_server(char *szName, const char *szConfig,
{ "thread_stacksize", "512" },
{ "allow_local_users", "yes", CONFIGSETTING_RELOADABLE }, // allow any user connect through the unix socket
{ "local_admin_users", "root", CONFIGSETTING_RELOADABLE }, // this local user is admin
@ -26,7 +26,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.31 2016/04/01 18:08:10 robert E
{ "coredump_enabled", "yes" },
{ "license_path", "/etc/zarafa/license", CONFIGSETTING_UNUSED },
@@ -1040,7 +1044,7 @@ int running_server(char *szName, const char *szConfig,
@@ -1021,7 +1025,7 @@ int running_server(char *szName, const char *szConfig,
#ifdef WIN32
{ "attachment_path", "Zarafa Data" },
#else
@ -35,7 +35,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.31 2016/04/01 18:08:10 robert E
#endif
{ "attachment_compression", "6" },
@@ -1132,7 +1136,7 @@ int running_server(char *szName, const char *szConfig,
@@ -1113,7 +1117,7 @@ int running_server(char *szName, const char *szConfig,
{ "client_update_enabled", "no" },
{ "client_update_log_level", "1", CONFIGSETTING_RELOADABLE },
#ifdef LINUX
@ -44,7 +44,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.31 2016/04/01 18:08:10 robert E
{ "client_update_log_path", "/var/log/zarafa/autoupdate", CONFIGSETTING_RELOADABLE },
#else
{ "client_update_path", "c:\\client_update_path", CONFIGSETTING_RELOADABLE },
@@ -1173,10 +1177,14 @@ int running_server(char *szName, const char *szConfig,
@@ -1154,10 +1158,14 @@ int running_server(char *szName, const char *szConfig,
};
#ifdef LINUX

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

@ -1,7 +1,7 @@
$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 @@
$OpenBSD: patch-provider_server_ECSoapServerConnection_cpp,v 1.7 2016/04/20 18:38:41 robert Exp $
--- provider/server/ECSoapServerConnection.cpp.orig Wed Apr 20 13:13:54 2016
+++ provider/server/ECSoapServerConnection.cpp Wed Apr 20 19:54:13 2016
@@ -26,6 +26,11 @@
#include <sys/un.h>
#endif

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_server_ECThreadManager_cpp,v 1.7 2016/04/01 18:08:10 robert Exp $
--- provider/server/ECThreadManager.cpp.orig Fri Apr 1 10:32:31 2016
+++ provider/server/ECThreadManager.cpp Fri Apr 1 10:32:44 2016
@@ -170,7 +170,7 @@ void *ECWorkerThread::Work(void *lpParam)
$OpenBSD: patch-provider_server_ECThreadManager_cpp,v 1.8 2016/04/20 18:38:41 robert Exp $
--- provider/server/ECThreadManager.cpp.orig Wed Apr 20 13:13:54 2016
+++ provider/server/ECThreadManager.cpp Wed Apr 20 19:54:13 2016
@@ -143,7 +143,7 @@ void *ECWorkerThread::Work(void *lpParam)
// Win32 pthread_t is a struct, which we can't cast to a ULONG.
lpThis->m_lpLogger->Log(EC_LOGLEVEL_DEBUG, "Started%sthread %p", lpPrio ? " priority " : " ", pthread_self().p);
#else
@ -10,7 +10,7 @@ $OpenBSD: patch-provider_server_ECThreadManager_cpp,v 1.7 2016/04/01 18:08:10 ro
#endif
while(1) {
@@ -187,7 +187,7 @@ void *ECWorkerThread::Work(void *lpParam)
@@ -160,7 +160,7 @@ void *ECWorkerThread::Work(void *lpParam)
// Win32 pthread_t is a struct, which we can't cast to a ULONG.
lpThis->m_lpLogger->Log(EC_LOGLEVEL_DEBUG, "Thread %p idle and requested to exit", pthread_self().p);
#else

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_server_Makefile_in,v 1.24 2016/04/01 18:08:10 robert Exp $
--- provider/server/Makefile.in.orig Fri Apr 1 10:32:49 2016
+++ provider/server/Makefile.in Fri Apr 1 10:32:52 2016
@@ -440,7 +440,7 @@ zarafa_server_LDADD = \
$OpenBSD: patch-provider_server_Makefile_in,v 1.25 2016/04/20 18:38:41 robert Exp $
--- provider/server/Makefile.in.orig Wed Apr 20 15:02:27 2016
+++ provider/server/Makefile.in Wed Apr 20 19:54:15 2016
@@ -441,7 +441,7 @@ zarafa_server_LDADD = \
${top_builddir}/common/libzcp_common_ssl.la \
$(PROG_LIBS) ${icu_uc_LIBS} \
$(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) $(ICU_LIBS) $(DL_LIBS) \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-spooler_DAgent_cpp,v 1.28 2016/04/01 18:08:10 robert Exp $
--- spooler/DAgent.cpp.orig Wed Mar 23 12:14:33 2016
+++ spooler/DAgent.cpp Fri Apr 1 13:29:37 2016
@@ -94,6 +94,11 @@
$OpenBSD: patch-spooler_DAgent_cpp,v 1.29 2016/04/20 18:38:41 robert Exp $
--- spooler/DAgent.cpp.orig Wed Apr 20 13:13:54 2016
+++ spooler/DAgent.cpp Wed Apr 20 19:54:13 2016
@@ -69,6 +69,11 @@
#include <pwd.h>
#endif
@ -13,7 +13,7 @@ $OpenBSD: patch-spooler_DAgent_cpp,v 1.28 2016/04/01 18:08:10 robert Exp $
#include "spmain.h"
#include "TmpPath.h"
@@ -1748,12 +1753,18 @@ static HRESULT SendOutOfOffice(LPADRBOOK lpAdrBook, LP
@@ -1727,12 +1732,18 @@ static HRESULT SendOutOfOffice(LPADRBOOK lpAdrBook, LP
}
{
@ -32,7 +32,7 @@ $OpenBSD: patch-spooler_DAgent_cpp,v 1.28 2016/04/01 18:08:10 robert Exp $
}
if (WriteOrLogError(fd, szHeader, strlen(szHeader)) != hrSuccess) {
@@ -3998,7 +4009,7 @@ int main(int argc, char *argv[]) {
@@ -3989,7 +4000,7 @@ int main(int argc, char *argv[]) {
DeliveryArgs sDeliveryArgs;
sDeliveryArgs.strPath = "";
@ -41,7 +41,7 @@ $OpenBSD: patch-spooler_DAgent_cpp,v 1.28 2016/04/01 18:08:10 robert Exp $
sDeliveryArgs.bCreateFolder = false;
sDeliveryArgs.strDeliveryFolder.clear();
sDeliveryArgs.szPathSeperator = '\\';
@@ -4054,8 +4065,8 @@ int main(int argc, char *argv[]) {
@@ -4045,8 +4056,8 @@ int main(int argc, char *argv[]) {
{ "server_bind", "" },
{ "server_bind_intf", "" },
#ifdef LINUX
@ -52,7 +52,7 @@ $OpenBSD: patch-spooler_DAgent_cpp,v 1.28 2016/04/01 18:08:10 robert Exp $
{ "pid_file", "/var/run/zarafad/dagent.pid" },
{ "coredump_enabled", "no" },
#endif
@@ -4075,11 +4086,11 @@ int main(int argc, char *argv[]) {
@@ -4066,11 +4077,11 @@ 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 },

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

@ -1,7 +1,7 @@
$OpenBSD: patch-spooler_Spooler_cpp,v 1.20 2016/04/01 18:08:10 robert Exp $
--- spooler/Spooler.cpp.orig Wed Mar 23 12:14:33 2016
+++ spooler/Spooler.cpp Fri Apr 1 13:25:33 2016
@@ -1166,10 +1166,10 @@ int main(int argc, char *argv[]) {
$OpenBSD: patch-spooler_Spooler_cpp,v 1.21 2016/04/20 18:38:41 robert Exp $
--- spooler/Spooler.cpp.orig Wed Apr 20 13:13:54 2016
+++ spooler/Spooler.cpp Wed Apr 20 19:54:13 2016
@@ -1151,10 +1151,10 @@ int main(int argc, char *argv[]) {
{ "smtp_port","25", CONFIGSETTING_RELOADABLE },
{ "server_socket", "default:" },
#ifdef LINUX
@ -15,7 +15,7 @@ $OpenBSD: patch-spooler_Spooler_cpp,v 1.20 2016/04/01 18:08:10 robert Exp $
{ "coredump_enabled", "no" },
#endif
{ "log_method","file" },
@@ -1194,8 +1194,8 @@ int main(int argc, char *argv[]) {
@@ -1179,8 +1179,8 @@ int main(int argc, char *argv[]) {
{ "archive_on_send", "no", CONFIGSETTING_RELOADABLE },
{ "enable_dsn", "yes", CONFIGSETTING_RELOADABLE },
{ "plugin_enabled", "yes" },
@ -26,7 +26,7 @@ $OpenBSD: patch-spooler_Spooler_cpp,v 1.20 2016/04/01 18:08:10 robert Exp $
{ "z_statsd_stats", "/var/run/zarafad/statsd.sock" },
{ "tmp_path", "/tmp" },
{ "tmp_path", "/tmp" },
@@ -1322,6 +1322,7 @@ int main(int argc, char *argv[]) {
@@ -1311,6 +1311,7 @@ int main(int argc, char *argv[]) {
#ifdef LINUX
// detect linuxthreads, which is too broken to correctly run the spooler
if (!bForked) {
@ -34,7 +34,7 @@ $OpenBSD: patch-spooler_Spooler_cpp,v 1.20 2016/04/01 18:08:10 robert Exp $
char buffer[256] = { 0 };
confstr(_CS_GNU_LIBPTHREAD_VERSION, buffer, sizeof(buffer));
@@ -1331,6 +1332,10 @@ int main(int argc, char *argv[]) {
@@ -1320,6 +1321,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.");
}

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.52 2016/04/01 18:08:10 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.53 2016/04/20 18:38:41 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
@ -321,6 +321,7 @@ lib/zarafa/libzarafacontacts.la
@man man/man8/zarafa-admin.8
@man man/man8/zarafa-archiver.8
@man man/man8/zarafa-autorespond.8
@man man/man8/zarafa-backup-plus.8
@man man/man8/zarafa-dagent.8
@man man/man8/zarafa-gateway.8
@man man/man8/zarafa-ical.8
@ -335,6 +336,7 @@ lib/zarafa/libzarafacontacts.la
@bin sbin/zarafa-archiver
sbin/zarafa-autorespond
sbin/zarafa-backup-plus
sbin/zarafa-cachestat.py
@bin sbin/zarafa-dagent
@bin sbin/zarafa-gateway
@bin sbin/zarafa-ical
@ -349,7 +351,6 @@ sbin/zarafa-search-xapian-compact.py
@bin sbin/zarafa-spooler
share/doc/pkg-readmes/${FULLPKGNAME}
share/doc/zarafa/
share/doc/zarafa/AGPL-3
@mode 0555
share/doc/zarafa/audit-parse.pl
share/doc/zarafa/createuser.dotforward
@ -384,6 +385,7 @@ share/examples/zarafa/archiver.cfg
share/examples/zarafa/autorespond
@sample ${SYSCONFDIR}/zarafa/autorespond
share/examples/zarafa/backup-plus.cfg
@sample ${SYSCONFDIR}/zarafa/backup-plus.cfg
share/examples/zarafa/dagent.cfg
@sample ${SYSCONFDIR}/zarafa/dagent.cfg
share/examples/zarafa/gateway.cfg