update to 8.6.81.171

This commit is contained in:
robert 2018-08-29 16:58:29 +00:00
parent de7a063049
commit 14d2ae9bbc
37 changed files with 183 additions and 171 deletions

View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.16 2018/07/12 13:13:40 robert Exp $
# $OpenBSD: Makefile.inc,v 1.17 2018/08/29 16:58:29 robert Exp $
V?= 8.6.80
BUILD?= 1248
V?= 8.6.81
BUILD?= 171
DISTNAME?= kopanocore-${V}.${BUILD}
EXTRACT_SUFX?= .tar.xz

View File

@ -1,2 +1,2 @@
SHA256 (kopano/kopanocore-8.6.80.1248.tar.xz) = /uAQ5uoS4IL36T8RJx5067a0QmzWrqMKNhC24+ilCfE=
SIZE (kopano/kopanocore-8.6.80.1248.tar.xz) = 2064364
SHA256 (kopano/kopanocore-8.6.81.171.tar.xz) = 22BXPrX0DNfA3z1fnAY/nSVAa55d8aRy75hM6ngLFQ0=
SIZE (kopano/kopanocore-8.6.81.171.tar.xz) = 2092808

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-ECtools_mapitime_cpp,v 1.4 2018/03/16 15:35:02 robert Exp $
$OpenBSD: patch-ECtools_mapitime_cpp,v 1.5 2018/08/29 16:58:30 robert Exp $
Index: ECtools/mapitime.cpp
--- ECtools/mapitime.cpp.orig
+++ ECtools/mapitime.cpp
@@ -42,6 +42,17 @@
@@ -30,6 +30,17 @@
using namespace KC;
using clk = std::chrono::steady_clock;

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-ECtools_monitor_monitor_cpp,v 1.7 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-ECtools_monitor_monitor_cpp,v 1.8 2018/08/29 16:58:30 robert Exp $
Index: ECtools/monitor/monitor.cpp
--- ECtools/monitor/monitor.cpp.orig
+++ ECtools/monitor/monitor.cpp
@@ -147,10 +147,10 @@ static ECRESULT main2(int argc, char **argv)
@@ -131,10 +131,10 @@ static ECRESULT main2(int argc, char **argv)
static const configsetting_t lpDefaults[] = {
{ "smtp_server","localhost" },
{ "server_socket", "default:" },
@ -12,8 +12,8 @@ Index: ECtools/monitor/monitor.cpp
+ { "run_as_user", "_kopano" },
+ { "run_as_group", "_kopano" },
{ "pid_file", "/var/run/kopano/monitor.pid" },
- {"running_path", "/var/lib/kopano/empty"},
+ {"running_path", "/var/empty"},
- {"running_path", "/var/lib/kopano/empty", CONFIGSETTING_OBSOLETE},
+ {"running_path", "/var/empty", CONFIGSETTING_OBSOLETE},
{"log_method", "auto", CONFIGSETTING_NONEMPTY},
{"log_file", ""},
{"log_level", "3", CONFIGSETTING_NONEMPTY | CONFIGSETTING_RELOADABLE},

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-ECtools_presence_kopano_presence___init___py,v 1.2 2018/03/29 19:41:46 robert Exp $
$OpenBSD: patch-ECtools_presence_kopano_presence___init___py,v 1.3 2018/08/29 16:58:30 robert Exp $
Index: ECtools/presence/kopano_presence/__init__.py
--- ECtools/presence/kopano_presence/__init__.py.orig
+++ ECtools/presence/kopano_presence/__init__.py
@@ -18,11 +18,11 @@ from kopano import log_exc, Config
@@ -19,11 +19,11 @@ from kopano import log_exc, Config
from flask import Flask, request, abort
CONFIG = {

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-ECtools_search_Makefile_in,v 1.7 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-ECtools_search_Makefile_in,v 1.8 2018/08/29 16:58:30 robert Exp $
Index: ECtools/search/Makefile.in
--- ECtools/search/Makefile.in.orig
+++ ECtools/search/Makefile.in
@@ -602,7 +602,6 @@ install-exec-local:
@@ -617,7 +617,6 @@ install-exec-local:
rm -Rf build
install-data-local:

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-ECtools_search_kopano_search___init___py,v 1.2 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-ECtools_search_kopano_search___init___py,v 1.3 2018/08/29 16:58:30 robert Exp $
Index: ECtools/search/kopano_search/__init__.py
--- ECtools/search/kopano_search/__init__.py.orig
+++ ECtools/search/kopano_search/__init__.py
@@ -64,19 +64,19 @@ CONFIG = {
@@ -65,19 +65,19 @@ CONFIG = {
# 0x678F: PR_EC_IMAP_BODYSTRUCTURE
# 0x001A: PR_MESSAGE_CLASS # XXX add to cfg
'index_exclude_properties': Config.integer(multiple=True, base=16, default=[0x007D, 0x0064, 0x0C1E, 0x0075, 0x678E, 0x678F, 0x001A]),

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-ECtools_search_kopano_search_plaintext_py,v 1.1 2018/07/09 20:28:10 robert Exp $
$OpenBSD: patch-ECtools_search_kopano_search_plaintext_py,v 1.2 2018/08/29 16:58:30 robert Exp $
Index: ECtools/search/kopano_search/plaintext.py
--- ECtools/search/kopano_search/plaintext.py.orig
+++ ECtools/search/kopano_search/plaintext.py
@@ -44,7 +44,7 @@ for (X, C) in DB:
@@ -45,7 +45,7 @@ for (X, C) in DB:
CMD[Y] = C
def setlimits():

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-ECtools_spamd_kopano_spamd___init___py,v 1.4 2018/04/24 20:52:13 robert Exp $
$OpenBSD: patch-ECtools_spamd_kopano_spamd___init___py,v 1.5 2018/08/29 16:58:30 robert Exp $
Index: ECtools/spamd/kopano_spamd/__init__.py
--- ECtools/spamd/kopano_spamd/__init__.py.orig
+++ ECtools/spamd/kopano_spamd/__init__.py
@@ -19,12 +19,12 @@ kopano-spamd - ICS driven spam learning daemon for Kop
@@ -20,12 +20,12 @@ kopano-spamd - ICS driven spam learning daemon for Kop
"""
CONFIG = {

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-ECtools_utils_kopano_utils_autorespond_py,v 1.2 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-ECtools_utils_kopano_utils_autorespond_py,v 1.3 2018/08/29 16:58:30 robert Exp $
Index: ECtools/utils/kopano_utils/autorespond.py
--- ECtools/utils/kopano_utils/autorespond.py.orig
+++ ECtools/utils/kopano_utils/autorespond.py
@@ -19,7 +19,7 @@ CONFIG = {
@@ -20,7 +20,7 @@ CONFIG = {
"autorespond_bcc": kopano.Config.boolean(default=False),
"autorespond_norecip": kopano.Config.boolean(default=False),
"timelimit": kopano.Config.integer(default=24 * 3600),

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Makefile_in,v 1.10 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-Makefile_in,v 1.11 2018/08/29 16:58:30 robert Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -1240,7 +1240,7 @@ kopano_dbadm_SOURCES = ECtools/dbadm.cpp \
@@ -1278,7 +1278,7 @@ kopano_dbadm_SOURCES = ECtools/dbadm.cpp \
common/database.cpp common/include/kopano/database.hpp
kopano_dbadm_CPPFLAGS = ${AM_CPPFLAGS}
@ -12,7 +12,16 @@ Index: Makefile.in
#
# kopano-fsck
@@ -4742,7 +4742,7 @@ default.sym provider/plugin.sym provider/provider.sym
@@ -1852,7 +1852,7 @@ tests_mapialloctime_LDADD = libmapi.la ${clock_LIBS}
tests_readflag_SOURCES = tests/readflag.cpp tests/tbi.hpp
tests_readflag_LDADD = libmapi.la libkcutil.la
tests_zcpmd5_SOURCES = tests/zcpmd5.cpp
-tests_zcpmd5_LDADD = ${CRYPTO_LIBS} libkcutil.la
+tests_zcpmd5_LDADD = ${CRYPTO_LIBS} ${PROG_LIBS} libkcutil.la
#
# soap generators
@@ -4838,7 +4838,7 @@ default.sym provider/plugin.sym provider/provider.sym
.PHONY: source-moved-check
source-moved-check:

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-caldav_CalDAV_cpp,v 1.7 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-caldav_CalDAV_cpp,v 1.8 2018/08/29 16:58:30 robert Exp $
Index: caldav/CalDAV.cpp
--- caldav/CalDAV.cpp.orig
+++ caldav/CalDAV.cpp
@@ -146,10 +146,10 @@ int main(int argc, char **argv) {
@@ -204,10 +204,10 @@ int main(int argc, char **argv) {
const char *lpszCfg = ECConfig::GetDefaultPath("ical.cfg");
bool exp_config = false;
static const configsetting_t lpDefaults[] = {
@ -12,8 +12,8 @@ Index: caldav/CalDAV.cpp
+ { "run_as_user", "_kopano" },
+ { "run_as_group", "_kopano" },
{ "pid_file", "/var/run/kopano/ical.pid" },
- {"running_path", "/var/lib/kopano/empty"},
+ {"running_path", "/var/empty"},
- {"running_path", "/var/lib/kopano/empty", CONFIGSETTING_OBSOLETE},
+ {"running_path", "/var/empty", CONFIGSETTING_OBSOLETE},
{ "process_model", "thread" },
{ "server_bind", "" },
{"ical_listen", ""}, /* default in ical_listen() */
{"coredump_enabled", "systemdefault"},

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-common_SSLUtil_cpp,v 1.2 2018/03/29 19:41:46 robert Exp $
$OpenBSD: patch-common_SSLUtil_cpp,v 1.3 2018/08/29 16:58:30 robert Exp $
Index: common/SSLUtil.cpp
--- common/SSLUtil.cpp.orig
+++ common/SSLUtil.cpp
@@ -28,7 +28,7 @@ namespace KC {
@@ -16,7 +16,7 @@ namespace KC {
static std::recursive_mutex *ssl_locks;
@ -12,9 +12,9 @@ Index: common/SSLUtil.cpp
static void ssl_lock(int mode, int n, const char *file, int line)
{
if (mode & CRYPTO_LOCK)
@@ -77,7 +77,7 @@ void SSL_library_cleanup()
@@ -64,7 +64,7 @@ void SSL_library_cleanup()
ENGINE_cleanup();
#endif
ERR_free_strings();
- #if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-common_include_kopano_platform_linux_h,v 1.2 2018/01/10 15:46:11 robert Exp $
$OpenBSD: patch-common_include_kopano_platform_linux_h,v 1.3 2018/08/29 16:58:30 robert Exp $
Index: common/include/kopano/platform.linux.h
--- common/include/kopano/platform.linux.h.orig
+++ common/include/kopano/platform.linux.h
@@ -37,7 +37,11 @@
@@ -23,7 +23,11 @@
#include <dlfcn.h>
#include <cstddef>
#include <libgen.h>
@ -15,7 +15,7 @@ Index: common/include/kopano/platform.linux.h
#include <cerrno>
#include <clocale>
@@ -55,6 +59,10 @@
@@ -40,6 +44,10 @@
#ifndef UNUSED_VAR
#define UNUSED_VAR __attribute__((unused))

View File

@ -1,14 +1,15 @@
$OpenBSD: patch-common_libkcutil_sym_in,v 1.1 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-common_libkcutil_sym_in,v 1.2 2018/08/29 16:58:30 robert Exp $
Index: common/libkcutil.sym.in
--- common/libkcutil.sym.in.orig
+++ common/libkcutil.sym.in
@@ -34,6 +34,8 @@ global:
@@ -33,6 +33,9 @@ global:
VTT*;
std::*::_S_*;
};
+ _ZN2KC10ECKeyTable*;
+ _ZN2KC10ECTableRow*;
+ _ZN2KC18StartLoggerProcess*;
local:
*;
};

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-common_platform_linux_cpp,v 1.2 2017/12/26 19:17:11 robert Exp $
$OpenBSD: patch-common_platform_linux_cpp,v 1.3 2018/08/29 16:58:30 robert Exp $
Index: common/platform.linux.cpp
--- common/platform.linux.cpp.orig
+++ common/platform.linux.cpp
@@ -44,7 +44,7 @@
@@ -29,7 +29,7 @@
#else
# include <uuid.h>
#endif
@ -12,7 +12,7 @@ Index: common/platform.linux.cpp
# include <cxxabi.h>
# include <execinfo.h>
#endif
@@ -53,9 +53,6 @@
@@ -38,9 +38,6 @@
#ifdef __APPLE__
// bsd
#define ICONV_CONST const
@ -22,7 +22,7 @@ Index: common/platform.linux.cpp
#else
// linux
#define ICONV_CONST
@@ -78,22 +75,10 @@ HRESULT CoCreateGuid(LPGUID pNewGUID) {
@@ -63,22 +60,10 @@ HRESULT CoCreateGuid(LPGUID pNewGUID) {
return MAPI_E_INVALID_PARAMETER;
#if HAVE_UUID_CREATE
@ -45,24 +45,24 @@ Index: common/platform.linux.cpp
#else
uuid_t g;
uuid_generate(g);
@@ -139,6 +124,12 @@ void Sleep(unsigned int msec) {
@@ -106,6 +91,12 @@ void Sleep(unsigned int msec) {
namespace KC {
+#ifdef HAVE_ARC4RANDOM_BUF
+void rand_get(char *p, int n)
+{
+ arc4random_buf(p, n);
+ arc4random_buf(p, n);
+}
+#else
static void rand_fail(void)
{
fprintf(stderr, "Cannot access/use /dev/urandom, this is fatal (%s)\n", strerror(errno));
@@ -175,6 +166,7 @@ void rand_get(char *p, int n)
@@ -136,6 +127,7 @@ void rand_get(char *p, int n)
}
close(fd);
}
+#endif
void rand_init() {
if (rand_init_done)

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_ac,v 1.8 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-configure_ac,v 1.9 2018/08/29 16:58:30 robert Exp $
Index: configure.ac
--- configure.ac.orig
@ -29,8 +29,8 @@ Index: configure.ac
AC_MSG_CHECKING([available C++ standard])
cxxmode=""
-for i in "c++17" "c++14" "c++11" "c++0x"; do
+for i in "c++14" "c++11" "c++0x"; do
-for i in "c++17" "c++14"; do
+for i in "c++14"; do
CXXFLAGS="$CXXFLAGS_system -std=$i"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([])], [cxxmode="$i"])
AS_IF([test -n "$cxxmode"], [break])

View File

@ -1,20 +1,20 @@
$OpenBSD: patch-gateway_Gateway_cpp,v 1.5 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-gateway_Gateway_cpp,v 1.6 2018/08/29 16:58:30 robert Exp $
Index: gateway/Gateway.cpp
--- gateway/Gateway.cpp.orig
+++ gateway/Gateway.cpp
@@ -62,6 +62,10 @@
@@ -46,6 +46,10 @@
#include <openssl/ssl.h>
#include <kopano/hl.hpp>
+#ifdef __OpenBSD__
+#include <sys/resource.h>
+#include <sys/resource.h>
+#endif
+
/**
* @defgroup gateway Gateway for IMAP and POP3
* @defgroup gateway Gateway for IMAP and POP3
* @{
@@ -329,10 +333,10 @@ int main(int argc, char *argv[]) {
@@ -305,10 +309,10 @@ int main(int argc, char *argv[]) {
bool exp_config = false;
static const configsetting_t lpDefaults[] = {
{ "server_bind", "" },
@ -23,8 +23,8 @@ Index: gateway/Gateway.cpp
+ { "run_as_user", "_kopano" },
+ { "run_as_group", "_kopano" },
{ "pid_file", "/var/run/kopano/gateway.pid" },
- {"running_path", "/var/lib/kopano/empty"},
+ {"running_path", "/var/empty"},
- {"running_path", "/var/lib/kopano/empty", CONFIGSETTING_OBSOLETE},
+ {"running_path", "/var/empty", CONFIGSETTING_OBSOLETE},
{ "process_model", "thread" },
{"coredump_enabled", "systemdefault"},
{"pop3_listen", ""}, /* default in gw_listen() */

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-installer_linux_Makefile_in,v 1.6 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-installer_linux_Makefile_in,v 1.7 2018/08/29 16:58:30 robert Exp $
Index: installer/linux/Makefile.in
--- installer/linux/Makefile.in.orig
+++ installer/linux/Makefile.in
@@ -374,7 +374,7 @@ dist_sysusers_DATA = kopano-sysusers.conf
@@ -387,7 +387,7 @@ dist_sysusers_DATA = kopano-sysusers.conf
dist_tmpfiles_DATA = kopano-tmpfiles.conf
dist_pkgdata_DATA = ldap.active-directory.cfg ldap.openldap.cfg ldap.propmap.cfg
config_files = \

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-installer_linux_dagent_cfg,v 1.6 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-installer_linux_dagent_cfg,v 1.7 2018/08/29 16:58:30 robert Exp $
Index: installer/linux/dagent.cfg
--- installer/linux/dagent.cfg.orig
+++ installer/linux/dagent.cfg
@@ -126,16 +126,16 @@
@@ -122,16 +122,16 @@
#plugin_enabled = yes
# Path to the dagent plugin manager

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-installer_linux_server_cfg,v 1.6 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-installer_linux_server_cfg,v 1.7 2018/08/29 16:58:30 robert Exp $
Index: installer/linux/server.cfg
--- installer/linux/server.cfg.orig
@ -10,9 +10,9 @@ Index: installer/linux/server.cfg
-local_admin_users = root kopano
+local_admin_users = root _kopano
# The user has full rights on a folder by default, uncomment the following line to disable this.
#owner_auto_full_access = true
@@ -52,16 +52,16 @@ local_admin_users = root kopano
# With owner_auto_full_access=true, the owner of an object is, in addition to
# any ACLs, implicitly granted "read", "create-in" and "is-visible" rights,
@@ -56,16 +56,16 @@ local_admin_users = root kopano
#system_email_address = postmaster@localhost
# drop privileges and run the process as this user
@ -32,7 +32,7 @@ Index: installer/linux/server.cfg
# Use given allocator library. Values like libtcmalloc.so.4,
# libtcmalloc_minimal.so.4 and libjemalloc.so.2 would work.
@@ -156,7 +156,7 @@ local_admin_users = root kopano
@@ -158,7 +158,7 @@ local_admin_users = root kopano
# When attachment_storage is 'files', use this path to store the files
# When attachment_storage is 's3', use this path to set a prefix to all
# attachment data of a certain cluster, for example 'attach'
@ -41,7 +41,7 @@ Index: installer/linux/server.cfg
# Compression level for attachments when attachment_storage is 'files'.
# Set compression level for attachments disabled=0, max=9
@@ -347,12 +347,12 @@ local_admin_users = root kopano
@@ -349,12 +349,12 @@ local_admin_users = root kopano
# scripts which create stores for users from an external source
# used for ldap and unix plugins only

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-installer_linux_spooler_cfg,v 1.5 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-installer_linux_spooler_cfg,v 1.6 2018/08/29 16:58:30 robert Exp $
Index: installer/linux/spooler.cfg
--- installer/linux/spooler.cfg.orig
@ -24,7 +24,7 @@ Index: installer/linux/spooler.cfg
# create memory coredumps upon crash [no, systemdefault, yes]
#coredump_enabled = systemdefault
@@ -149,13 +149,13 @@
@@ -147,13 +147,13 @@
#plugin_enabled = yes
# Path to the spooler plugin manager

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-php7-ext_ECImportContentsChangesProxy_cpp,v 1.1 2018/05/22 08:17:45 sthen Exp $
$OpenBSD: patch-php7-ext_ECImportContentsChangesProxy_cpp,v 1.2 2018/08/29 16:58:30 robert Exp $
Index: php7-ext/ECImportContentsChangesProxy.cpp
--- php7-ext/ECImportContentsChangesProxy.cpp.orig
+++ php7-ext/ECImportContentsChangesProxy.cpp
@@ -22,10 +22,8 @@
@@ -8,10 +8,8 @@
#include <cstdio>
#include <ctime>
#include <cmath>

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-php7-ext_ECImportHierarchyChangesProxy_cpp,v 1.1 2018/05/22 08:17:45 sthen Exp $
$OpenBSD: patch-php7-ext_ECImportHierarchyChangesProxy_cpp,v 1.2 2018/08/29 16:58:30 robert Exp $
Index: php7-ext/ECImportHierarchyChangesProxy.cpp
--- php7-ext/ECImportHierarchyChangesProxy.cpp.orig
+++ php7-ext/ECImportHierarchyChangesProxy.cpp
@@ -22,10 +22,8 @@
@@ -8,10 +8,8 @@
#include <cstdio>
#include <ctime>
#include <cmath>

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-php7-ext_main_cpp,v 1.1 2018/05/22 08:17:45 sthen Exp $
$OpenBSD: patch-php7-ext_main_cpp,v 1.2 2018/08/29 16:58:30 robert Exp $
Index: php7-ext/main.cpp
--- php7-ext/main.cpp.orig
+++ php7-ext/main.cpp
@@ -110,10 +110,8 @@
@@ -92,10 +92,8 @@
// we need to include this in c++ space because php.h also includes it in
// 'extern "C"'-space which doesn't work in win32
#include <cmath>

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-php7-ext_typeconversion_cpp,v 1.1 2018/05/22 08:17:45 sthen Exp $
$OpenBSD: patch-php7-ext_typeconversion_cpp,v 1.2 2018/08/29 16:58:30 robert Exp $
Index: php7-ext/typeconversion.cpp
--- php7-ext/typeconversion.cpp.orig
+++ php7-ext/typeconversion.cpp
@@ -20,10 +20,8 @@
@@ -6,10 +6,8 @@
#include <cmath>
#include <mapiutil.h>
#include "php-ext/phpconfig.h"

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-provider_libserver_ECAttachmentStorage_cpp,v 1.4 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-provider_libserver_ECAttachmentStorage_cpp,v 1.5 2018/08/29 16:58:30 robert Exp $
Index: provider/libserver/ECAttachmentStorage.cpp
--- provider/libserver/ECAttachmentStorage.cpp.orig
+++ provider/libserver/ECAttachmentStorage.cpp
@@ -966,7 +966,7 @@ ECFileAttachment::ECFileAttachment(ECDatabase *lpDatab
@@ -1015,7 +1015,7 @@ ECFileAttachment::ECFileAttachment(ECDatabase *lpDatab
m_basepath(basepath)
{
if (m_basepath.empty())

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.6 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.7 2018/08/29 16:58:30 robert Exp $
Index: provider/libserver/ECSession.cpp
--- provider/libserver/ECSession.cpp.orig
+++ provider/libserver/ECSession.cpp
@@ -729,11 +729,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
@@ -701,11 +701,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
uid_t uid;
char strbuf[1024];
#ifdef SO_PEERCRED

View File

@ -1,20 +1,9 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.9 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.10 2018/08/29 16:58:30 robert Exp $
Index: provider/server/ECServer.cpp
--- provider/server/ECServer.cpp.orig
+++ provider/server/ECServer.cpp
@@ -69,6 +69,10 @@
#include <kcoidc.h>
#endif
+#ifdef __OpenBSD__
+#include <sys/resource.h>
+#endif
+
// The following value is based on:
// http://dev.mysql.com/doc/refman/5.0/en/server-system-variables.html#sysvar_thread_stack
// Since the remote MySQL server can be 32 or 64 bit we'll just go with the value specified
@@ -887,10 +891,10 @@ static int running_server(char *szName, const char *sz
@@ -801,10 +801,10 @@ static int running_server(char *szName, const char *sz
{"thread_stacksize", "512", CONFIGSETTING_UNUSED},
{ "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
@ -23,12 +12,12 @@ Index: provider/server/ECServer.cpp
+ { "run_as_user", "_kopano" }, // drop root privileges, and run as this user/group
+ { "run_as_group", "_kopano" },
{ "pid_file", "/var/run/kopano/server.pid" },
- {"running_path", "/var/lib/kopano/empty"},
+ {"running_path", "/var/empty"},
- {"running_path", "/var/lib/kopano/empty", CONFIGSETTING_OBSOLETE},
+ {"running_path", "/var/empty", CONFIGSETTING_OBSOLETE},
{"allocator_library", "libtcmalloc_minimal.so.4"},
{ "coredump_enabled", "yes" },
@@ -934,7 +938,7 @@ static int running_server(char *szName, const char *sz
@@ -845,7 +845,7 @@ static int running_server(char *szName, const char *sz
{"attachment_s3_bucketname", ""},
{"attachment_s3_region", ""},
#endif
@ -37,7 +26,7 @@ Index: provider/server/ECServer.cpp
{ "attachment_compression", "6" },
// Log options
@@ -954,12 +958,12 @@ static int running_server(char *szName, const char *sz
@@ -865,12 +865,12 @@ static int running_server(char *szName, const char *sz
{"plugin_path", "(ignored)", CONFIGSETTING_UNUSED},
{ "user_plugin", "db" },
{ "user_plugin_config", "/etc/kopano/ldap.cfg" },

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-spooler_DAgent_cpp,v 1.8 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-spooler_DAgent_cpp,v 1.9 2018/08/29 16:58:30 robert Exp $
Index: spooler/DAgent.cpp
--- spooler/DAgent.cpp.orig
+++ spooler/DAgent.cpp
@@ -73,6 +73,11 @@
@@ -60,6 +60,11 @@
#include <sys/mman.h>
#include <pwd.h>
@ -15,7 +15,7 @@ Index: spooler/DAgent.cpp
/*
This is actually from sysexits.h
but since those windows lamers don't have it ..
@@ -3413,8 +3418,8 @@ int main(int argc, char *argv[]) {
@@ -3368,8 +3373,8 @@ int main(int argc, char *argv[]) {
static const configsetting_t lpDefaults[] = {
{"server_bind", "", CONFIGSETTING_OBSOLETE},
{ "server_bind_intf", "" },
@ -25,10 +25,10 @@ Index: spooler/DAgent.cpp
+ { "run_as_group", "_kopano" },
{ "pid_file", "/var/run/kopano/dagent.pid" },
{"coredump_enabled", "systemdefault"},
{"lmtp_listen", "*:2003", CONFIGSETTING_NONEMPTY},
@@ -3434,12 +3439,12 @@ int main(int argc, char *argv[]) {
{"lmtp_listen", ""}, /* default in dagent_listen */
@@ -3389,12 +3394,12 @@ int main(int argc, char *argv[]) {
{ "log_raw_message", "error", CONFIGSETTING_RELOADABLE },
{ "log_raw_message_path", "/tmp", CONFIGSETTING_RELOADABLE },
{"log_raw_message_path", "/var/lib/kopano", CONFIGSETTING_RELOADABLE},
{ "archive_on_delivery", "no", CONFIGSETTING_RELOADABLE },
- { "mr_autoaccepter", "/usr/sbin/kopano-mr-accept", CONFIGSETTING_RELOADABLE },
- { "mr_autoprocessor", "/usr/sbin/kopano-mr-process", CONFIGSETTING_RELOADABLE },

View File

@ -1,9 +1,18 @@
$OpenBSD: patch-spooler_Spooler_cpp,v 1.8 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-spooler_Spooler_cpp,v 1.9 2018/08/29 16:58:30 robert Exp $
Index: spooler/Spooler.cpp
--- spooler/Spooler.cpp.orig
+++ spooler/Spooler.cpp
@@ -897,10 +897,10 @@ int main(int argc, char *argv[]) {
@@ -221,7 +221,7 @@ static HRESULT StartSpoolerThread(SendData &&sd, const
return MAPI_E_CALL_FAILED;
}
th_arg.release();
- ec_log_info("Worker thread 0x%lx started", static_cast<unsigned long>(tid));
+ ec_log_info("Worker thread 0x%lx started", reinterpret_cast<unsigned long>(tid));
return hrSuccess;
}
@@ -929,10 +929,10 @@ int main(int argc, char *argv[]) {
{ "smtp_server","localhost", CONFIGSETTING_RELOADABLE },
{ "smtp_port","25", CONFIGSETTING_RELOADABLE },
{ "server_socket", "default:" },
@ -12,12 +21,12 @@ Index: spooler/Spooler.cpp
+ { "run_as_user", "_kopano" },
+ { "run_as_group", "_kopano" },
{ "pid_file", "/var/run/kopano/spooler.pid" },
- {"running_path", "/var/lib/kopano/empty"},
+ {"running_path", "/var/empty"},
- {"running_path", "/var/lib/kopano/empty", CONFIGSETTING_OBSOLETE},
+ {"running_path", "/var/empty", CONFIGSETTING_OBSOLETE},
{"coredump_enabled", "systemdefault"},
{"log_method", "auto", CONFIGSETTING_NONEMPTY},
{"log_file", ""},
@@ -924,8 +924,8 @@ int main(int argc, char *argv[]) {
@@ -956,8 +956,8 @@ int main(int argc, char *argv[]) {
{ "archive_on_send", "no", CONFIGSETTING_RELOADABLE },
{ "enable_dsn", "yes", CONFIGSETTING_RELOADABLE },
{ "plugin_enabled", "yes" },
@ -27,4 +36,4 @@ Index: spooler/Spooler.cpp
+ { "plugin_manager_path", "/usr/local/share/kopano-spooler/python" },
{ "z_statsd_stats", "/var/run/kopano/statsd.sock" },
{ "tmp_path", "/tmp" },
{"log_raw_message_path", "/tmp", CONFIGSETTING_RELOADABLE},
{"log_raw_message_path", "/var/lib/kopano", CONFIGSETTING_RELOADABLE},

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-spooler_python_Makefile_in,v 1.6 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-spooler_python_Makefile_in,v 1.7 2018/08/29 16:58:30 robert Exp $
Index: spooler/python/Makefile.in
--- spooler/python/Makefile.in.orig
+++ spooler/python/Makefile.in
@@ -775,8 +775,6 @@ uninstall-am: uninstall-kopano_dagentDATA uninstall-ko
@@ -789,8 +789,6 @@ uninstall-am: uninstall-kopano_dagentDATA uninstall-ko
install-data-hook:

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-swig_python_kopano_kopano_config_py,v 1.3 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-swig_python_kopano_kopano_config_py,v 1.4 2018/08/29 16:58:30 robert Exp $
Index: swig/python/kopano/kopano/config.py
--- swig/python/kopano/kopano/config.py.orig
+++ swig/python/kopano/kopano/config.py
@@ -175,7 +175,7 @@ CONFIG = {
@@ -176,7 +176,7 @@ CONFIG = {
'pid_file': Config.string(default=None),
'run_as_user': Config.string(default=None),
'run_as_group': Config.string(default=None),

View File

@ -1,9 +1,9 @@
$OpenBSD: patch-swig_python_kopano_kopano_item_py,v 1.3 2018/07/09 16:29:20 robert Exp $
$OpenBSD: patch-swig_python_kopano_kopano_item_py,v 1.4 2018/08/29 16:58:30 robert Exp $
Index: swig/python/kopano/kopano/item.py
--- swig/python/kopano/kopano/item.py.orig
+++ swig/python/kopano/kopano/item.py
@@ -13,6 +13,7 @@ import os
@@ -15,6 +15,7 @@ import os
import sys
import traceback
import warnings

View File

@ -1,10 +1,11 @@
$OpenBSD: patch-tools_python-scripts_kopano-cachestat,v 1.1.1.1 2017/09/13 10:38:42 robert Exp $
$OpenBSD: patch-tools_python-scripts_kopano-cachestat,v 1.2 2018/08/29 16:58:30 robert Exp $
Index: tools/python-scripts/kopano-cachestat
--- tools/python-scripts/kopano-cachestat.orig
+++ tools/python-scripts/kopano-cachestat
@@ -1,4 +1,4 @@
-#!/usr/bin/python -u
@@ -1,5 +1,5 @@
#!/usr/bin/python -u
-# SPDX-License-Identifier: AGPL-3.0-only
+#!/usr/local/bin/python2.7 -u
from collections import defaultdict

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.15 2018/08/23 08:36:07 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.16 2018/08/29 16:58:30 robert Exp $
@conflict zarafa-*
@pkgpath mail/zarafa/zarafa,-main
@newgroup _kopano:793
@ -188,11 +188,11 @@ lib/mapi.d/zcontacts.inf
lib/php-7.0/
lib/pkgconfig/kopano.pc
lib/python${MODPY_VERSION}/site-packages/MAPI/
lib/python${MODPY_VERSION}/site-packages/MAPI-8.6.80-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/MAPI-8.6.80-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/MAPI-8.6.80-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/MAPI-8.6.80-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/MAPI-8.6.80-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/MAPI-8.6.81-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/MAPI-8.6.81-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/MAPI-8.6.81-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/MAPI-8.6.81-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/MAPI-8.6.81-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/MAPI/Defs.py
lib/python${MODPY_VERSION}/site-packages/MAPI/Defs.pyc
lib/python${MODPY_VERSION}/site-packages/MAPI/Struct.py
@ -231,11 +231,11 @@ lib/python${MODPY_VERSION}/site-packages/icalmapi.pyc
lib/python${MODPY_VERSION}/site-packages/inetmapi.py
lib/python${MODPY_VERSION}/site-packages/inetmapi.pyc
lib/python${MODPY_VERSION}/site-packages/kopano/
lib/python${MODPY_VERSION}/site-packages/kopano-8.6.80-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano-8.6.80-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano-8.6.80-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano-8.6.80-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano-8.6.80-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano-8.6.81-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano-8.6.81-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano-8.6.81-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano-8.6.81-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano-8.6.81-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano/__init__.py
lib/python${MODPY_VERSION}/site-packages/kopano/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/kopano/address.py
@ -341,31 +341,31 @@ lib/python${MODPY_VERSION}/site-packages/kopano/utils.pyc
lib/python${MODPY_VERSION}/site-packages/kopano/version.py
lib/python${MODPY_VERSION}/site-packages/kopano/version.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_backup/
lib/python${MODPY_VERSION}/site-packages/kopano_backup-8.6.80-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_backup-8.6.80-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano_backup-8.6.80-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano_backup-8.6.80-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano_backup-8.6.80-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano_backup-8.6.81-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_backup-8.6.81-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano_backup-8.6.81-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano_backup-8.6.81-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano_backup-8.6.81-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano_backup/__init__.py
lib/python${MODPY_VERSION}/site-packages/kopano_backup/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_backup/version.py
lib/python${MODPY_VERSION}/site-packages/kopano_backup/version.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_cli/
lib/python${MODPY_VERSION}/site-packages/kopano_cli-8.6.80-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_cli-8.6.80-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano_cli-8.6.80-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano_cli-8.6.80-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano_cli-8.6.80-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano_cli-8.6.81-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_cli-8.6.81-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano_cli-8.6.81-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano_cli-8.6.81-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano_cli-8.6.81-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano_cli/__init__.py
lib/python${MODPY_VERSION}/site-packages/kopano_cli/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_cli/version.py
lib/python${MODPY_VERSION}/site-packages/kopano_cli/version.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst/
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst-8.6.80-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst-8.6.80-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst-8.6.80-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst-8.6.80-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst-8.6.80-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst-8.6.81-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst-8.6.81-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst-8.6.81-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst-8.6.81-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst-8.6.81-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst/__init__.py
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst/pst.py
@ -373,11 +373,11 @@ lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst/pst.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst/version.py
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst/version.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_presence/
lib/python${MODPY_VERSION}/site-packages/kopano_presence-8.6.80-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_presence-8.6.80-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano_presence-8.6.80-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano_presence-8.6.80-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano_presence-8.6.80-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano_presence-8.6.81-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_presence-8.6.81-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano_presence-8.6.81-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano_presence-8.6.81-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano_presence-8.6.81-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano_presence/__init__.py
lib/python${MODPY_VERSION}/site-packages/kopano_presence/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_presence/plugin_spreed.py
@ -387,11 +387,11 @@ lib/python${MODPY_VERSION}/site-packages/kopano_presence/plugin_xmpp.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_presence/version.py
lib/python${MODPY_VERSION}/site-packages/kopano_presence/version.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_search/
lib/python${MODPY_VERSION}/site-packages/kopano_search-8.6.80-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_search-8.6.80-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano_search-8.6.80-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano_search-8.6.80-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano_search-8.6.80-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano_search-8.6.81-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_search-8.6.81-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano_search-8.6.81-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano_search-8.6.81-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano_search-8.6.81-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano_search/__init__.py
lib/python${MODPY_VERSION}/site-packages/kopano_search/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_search/magic.py
@ -405,21 +405,21 @@ lib/python${MODPY_VERSION}/site-packages/kopano_search/plugin_xapian.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_search/version.py
lib/python${MODPY_VERSION}/site-packages/kopano_search/version.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_spamd/
lib/python${MODPY_VERSION}/site-packages/kopano_spamd-8.6.80-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_spamd-8.6.80-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano_spamd-8.6.80-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano_spamd-8.6.80-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano_spamd-8.6.80-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano_spamd-8.6.81-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_spamd-8.6.81-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano_spamd-8.6.81-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano_spamd-8.6.81-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano_spamd-8.6.81-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano_spamd/__init__.py
lib/python${MODPY_VERSION}/site-packages/kopano_spamd/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_spamd/version.py
lib/python${MODPY_VERSION}/site-packages/kopano_spamd/version.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_utils/
lib/python${MODPY_VERSION}/site-packages/kopano_utils-8.6.80-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_utils-8.6.80-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano_utils-8.6.80-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano_utils-8.6.80-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano_utils-8.6.80-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano_utils-8.6.81-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_utils-8.6.81-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano_utils-8.6.81-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano_utils-8.6.81-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano_utils-8.6.81-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano_utils/__init__.py
lib/python${MODPY_VERSION}/site-packages/kopano_utils/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_utils/autorespond.py
@ -649,9 +649,9 @@ share/examples/php-7.0/
share/gdb/
share/gdb/auto-load/
share/gdb/auto-load/usr/
share/gdb/auto-load/${PREFIX}/
share/gdb/auto-load/${PREFIX}/lib/
share/gdb/auto-load/${PREFIX}/lib/libmapi.so.1.0.0-gdb.py
share/gdb/auto-load/usr/local/
share/gdb/auto-load/usr/local/lib/
share/gdb/auto-load/usr/local/lib/libmapi.so.1.0.0-gdb.py
share/kopano/
share/kopano-dagent/
share/kopano-dagent/python/

View File

@ -1,9 +1,12 @@
@comment $OpenBSD: PLIST-mapi,v 1.3 2018/07/09 16:29:20 robert Exp $
@comment $OpenBSD: PLIST-mapi,v 1.4 2018/08/29 16:58:30 robert Exp $
@conflict zarafa-mapi-*
@pkgpath mail/zarafa/zarafa,-mapi
lib/php-${MODPHP_VERSION}/
lib/php-${MODPHP_VERSION}/modules/
lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.a
lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
@man man/man7/mapi.7
share/examples/php-${MODPHP_VERSION}/
share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
@sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/${MODULE_NAME}.ini
share/kopano/php/