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

update to kopano-10.0.7

Browse Source
This commit is contained in:
robert 2021-02-09 10:32:33 +00:00
parent c942b29da6
commit 63a4243f18
31 changed files with 161 additions and 442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/kopano/Makefile.inc
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile.inc,v 1.36 2020/07/29 13:04:05 robert Exp $
# $OpenBSD: Makefile.inc,v 1.37 2021/02/09 10:32:33 robert Exp $
V?= 10.0.6
V?= 10.0.7
DISTNAME?= kopanocore-${V}
CATEGORIES+= mail

15
mail/kopano/core/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.60 2021/01/25 14:01:51 sthen Exp $
# $OpenBSD: Makefile,v 1.61 2021/02/09 10:32:33 robert Exp $
# undefined ref's to libicon*, libintl* with ld.bfd
ONLY_FOR_ARCHS= ${LLD_ARCHS}
@ -10,8 +10,6 @@ COMMENT-mapi= kopano MAPI extensions for PHP
PKGNAME-main= kopano-core-${V}
PKGNAME-mapi= kopano-mapi-${V}
REVISION= 1
CATEGORIES= mail www productivity
SHARED_LIBS += mapi 3.0 # 0.0
@ -53,13 +51,12 @@ WANTLIB += lzma crypto ssl kvm idn2 unistring
WANTLIB-main += c ${WANTLIB} ${MODPY_WANTLIB}
WANTLIB-main += curl nghttp2 ical icalss
WANTLIB-main += mariadb curses ssl xml2
WANTLIB-main += gsoapssl++ tidy
WANTLIB-main += gsoapssl++
WANTLIB-main += ${LIBCXX}
WANTLIB-main += icalvcal ldap_r HX jsoncpp
WANTLIB-main += db_cxx xapian
WANTLIB-main += X11 Xext Xrender expat fontconfig freetype pixman-1
WANTLIB-main += xcb xcb-render xcb-shm
WANTLIB-main += cairo glib-2.0 gobject-2.0 graphite2
WANTLIB-main += cairo glib-2.0 gobject-2.0
WANTLIB-main += harfbuzz pango-1.0 pangocairo-1.0
WANTLIB-main += png rrd
WANTLIB-main += lber sasl2
@ -79,7 +76,6 @@ RUN_DEPENDS-main= ${MODPY_RUN_DEPENDS} \
www/py-jwt${MODPY_FLAVOR}
LIB_DEPENDS-main= databases/mariadb \
databases/openldap \
databases/xapian-core \
devel/gettext,-runtime \
devel/gsoap>=2.8.50 \
devel/jsoncpp \
@ -91,15 +87,14 @@ LIB_DEPENDS-main= databases/mariadb \
net/rrdtool,-main \
textproc/icu4c \
textproc/libical \
textproc/libxml \
www/tidy
textproc/libxml
WANTLIB-mapi += ${WANTLIB}
WANTLIB-mapi += ical icalss mapi
WANTLIB-mapi += xml2
WANTLIB-mapi += ${LIBCXX}
WANTLIB-mapi += icalvcal kcfreebusy kcicalmapi kcinetmapi
WANTLIB-mapi += kcutil tidy
WANTLIB-mapi += kcutil
WANTLIB-mapi += HX curl jsoncpp nghttp2
LIB_DEPENDS-mapi= ${BASE_PKGPATH}>=${V}

4
mail/kopano/core/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (kopano/kopanocore-10.0.6.tar.gz) = Xf5YwmEScVUcJeybnhymm6OpCaQ3TFcuFfzepV2MNW4=
SIZE (kopano/kopanocore-10.0.6.tar.gz) = 2515625
SHA256 (kopano/kopanocore-10.0.7.tar.gz) = SmYcEJl6Pc130mvOaxLpHzrHFmT2j1lPPxLg2Gc0krI=
SIZE (kopano/kopanocore-10.0.7.tar.gz) = 2458459

25
mail/kopano/core/patches/patch-ECtools_idx_handler_cpp
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-ECtools_idx_handler_cpp,v 1.3 2020/07/29 13:04:05 robert Exp $
Index: ECtools/idx_handler.cpp
--- ECtools/idx_handler.cpp.orig
+++ ECtools/idx_handler.cpp
@@ -198,7 +198,7 @@ static constexpr const configsetting_t idx_defaults[]
{"index_attachment_parser_max_memory", "", CONFIGSETTING_UNUSED},
{"index_attachment_parser_max_cputime", "", CONFIGSETTING_UNUSED},
{"index_exclude_properties", "0x007d 0x0064 0x0c1e 0x0075 0x678e 0x678f 0x001a", CONFIGSETTING_RELOADABLE},
- {"index_path", "/var/lib/kopano/search"},
+ {"index_path", "/var/db/kopano/search"},
{"index_processes", "0"},
{"limit_results", "1000"},
{"optimize_age", "", CONFIGSETTING_UNUSED},
@@ -220,8 +220,8 @@ static constexpr const configsetting_t idx_defaults[]
{"log_level", "3"},
{"log_file", "/var/log/kopano/search.log"},
{"log_timestamp", "yes"},
- {"run_as_user", "kopano"},
- {"run_as_group", "kopano"},
+ {"run_as_user", "_kopano"},
+ {"run_as_group", "_kopano"},
{nullptr, nullptr},
};

4
mail/kopano/core/patches/patch-ECtools_mapitime_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-ECtools_mapitime_cpp,v 1.10 2020/07/29 13:04:05 robert Exp $
$OpenBSD: patch-ECtools_mapitime_cpp,v 1.11 2021/02/09 10:32:33 robert Exp $
Index: ECtools/mapitime.cpp
--- ECtools/mapitime.cpp.orig
+++ ECtools/mapitime.cpp
@@ -35,6 +35,17 @@ using namespace KC;
@@ -38,6 +38,17 @@ using namespace KC;
using clk = std::chrono::steady_clock;
using duration = decltype(time_point()-time_point());

6
mail/kopano/core/patches/patch-ECtools_monitor_monitor_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-ECtools_monitor_monitor_cpp,v 1.15 2020/07/29 13:04:05 robert Exp $
$OpenBSD: patch-ECtools_monitor_monitor_cpp,v 1.16 2021/02/09 10:32:33 robert Exp $
Index: ECtools/monitor/monitor.cpp
--- ECtools/monitor/monitor.cpp.orig
+++ ECtools/monitor/monitor.cpp
@@ -123,8 +123,8 @@ static ECRESULT main2(int argc, char **argv)
@@ -122,8 +122,8 @@ static ECRESULT main2(int argc, char **argv)
static const configsetting_t lpDefaults[] = {
{ "smtp_server","localhost" },
{ "server_socket", "default:" },
@ -11,6 +11,6 @@ Index: ECtools/monitor/monitor.cpp
- { "run_as_group", "kopano" },
+ { "run_as_user", "_kopano" },
+ { "run_as_group", "_kopano" },
{ "pid_file", "/var/run/kopano/monitor.pid" },
{"pid_file", "", CONFIGSETTING_OBSOLETE},
{"log_method", "auto", CONFIGSETTING_NONEMPTY},
{"log_file", ""},

4
mail/kopano/core/patches/patch-ECtools_search_kopano_search___init___py
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-ECtools_search_kopano_search___init___py,v 1.6 2020/03/22 11:20:34 robert Exp $
$OpenBSD: patch-ECtools_search_kopano_search___init___py,v 1.7 2021/02/09 10:32:33 robert Exp $
Index: ECtools/search/kopano_search/__init__.py
--- ECtools/search/kopano_search/__init__.py.orig
+++ ECtools/search/kopano_search/__init__.py
@@ -60,11 +60,11 @@ CONFIG = {
@@ -58,11 +58,11 @@ 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]),

6
mail/kopano/core/patches/patch-ECtools_statsd_cpp
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-ECtools_statsd_cpp,v 1.4 2020/07/29 13:04:05 robert Exp $
$OpenBSD: patch-ECtools_statsd_cpp,v 1.5 2021/02/09 10:32:33 robert Exp $
Index: ECtools/statsd.cpp
--- ECtools/statsd.cpp.orig
+++ ECtools/statsd.cpp
@@ -52,9 +52,9 @@ static constexpr const struct HXoption sd_options[] =
@@ -53,9 +53,9 @@ static constexpr struct HXoption sd_options[] = {
static constexpr const configsetting_t sd_config_defaults[] = {
static constexpr configsetting_t sd_config_defaults[] = {
{"statsd_listen", "unix:/var/run/kopano/statsd.sock"},
- {"statsd_rrd", "/var/lib/kopano/rrd"},
- {"run_as_user", "kopano"},

34
mail/kopano/core/patches/patch-Makefile_am
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-Makefile_am,v 1.8 2020/08/06 06:03:52 robert Exp $
$OpenBSD: patch-Makefile_am,v 1.9 2021/02/09 10:32:33 robert Exp $
Index: Makefile.am
--- Makefile.am.orig
+++ Makefile.am
@@ -214,7 +214,7 @@ kopano_dagent_LDADD = \
@@ -221,7 +221,7 @@ kopano_dagent_LDADD = \
#
kopano_dbadm_SOURCES = ECtools/dbadm.cpp
kopano_dbadm_CPPFLAGS = ${AM_CPPFLAGS}
@ -12,7 +12,7 @@ Index: Makefile.am
#
@@ -324,7 +324,7 @@ kopano_server_SOURCES = \
@@ -328,7 +328,7 @@ kopano_server_SOURCES = \
provider/server/ECSoapServerConnection.cpp provider/server/ECSoapServerConnection.h \
provider/server/ECThreadManager.cpp provider/server/ECThreadManager.h
kopano_server_LDADD = \
@ -20,43 +20,43 @@ Index: Makefile.am
+ libkcutil.la libkcserver.la libkcsoap.la ${GSOAP_LIBS} ${PROG_LIBS} \
${clock_LIBS} ${CRYPTO_LIBS} ${DL_LIBS} ${libHX_LIBS} ${icu_uc_LIBS} \
${icu_i18n_LIBS} \
${MYSQL_LIBS} ${SSL_LIBS} ${PAM_LIBS} ${KRB5_LIBS} ${kcoidc_LIBS} -lpthread
@@ -674,6 +674,7 @@ libkcutil_la_LIBADD = \
-lpthread -lz ${CRYPTO_LIBS} ${curl_LIBS} ${GZ_LIBS} ${iconv_LIBS} \
${idn_LIBS} ${icu_i18n_LIBS} ${icu_uc_LIBS} ${jsoncpp_LIBS} ${libHX_LIBS} \
${MYSQL_LIBS} ${SSL_LIBS} ${PAM_LIBS} ${KRB5_LIBS} ${kcoidc_LIBS} ${kustomer_LIBS} \
@@ -659,6 +659,7 @@ libkcutil_la_LIBADD = \
${idn_LIBS} ${icu_i18n_LIBS} ${icu_uc_LIBS} ${INTL_LIBS} \
${jsoncpp_LIBS} ${libHX_LIBS} \
${SSL_LIBS} ${UUID_LIBS}
+libkcutil_la_LIBADD += -lkvm
libkcutil_la_SYFLAGS = -Wl,--version-script=common/libkcutil.sym
libkcutil_la_LDFLAGS = ${AM_LDFLAGS} -no-undefined \
${libkcutil_la_SYFLAGS${NO_VSYM}}
@@ -777,11 +778,11 @@ mapitime_LDADD = ${clock_LIBS} libmapi.la libkcutil.la
@@ -765,11 +766,11 @@ mapitime_LDADD = ${clock_LIBS} libmapi.la libkcutil.la
tests_ablookup_SOURCES = tests/ablookup.cpp
tests_ablookup_LDADD = libmapi.la libkcutil.la
tests_htmltext_SOURCES = tests/htmltext.cpp
-tests_htmltext_LDADD = libkcutil.la
+tests_htmltext_LDADD = libkcutil.la $(INTL_LIBS)
+tests_htmltext_LDADD = libkcutil.la ${INTL_LIBS}
tests_chtmltotextparsertest_SOURCES = tests/chtmltotextparsertest.cpp
-tests_chtmltotextparsertest_LDADD = libkcutil.la
+tests_chtmltotextparsertest_LDADD = libkcutil.la $(INTL_LIBS)
+tests_chtmltotextparsertest_LDADD = libkcutil.la ${INTL_LIBS}
tests_rtfhtmltest_SOURCES = tests/rtfhtmltest.cpp
-tests_rtfhtmltest_LDADD = libkcutil.la
+tests_rtfhtmltest_LDADD = libkcutil.la $(INTL_LIBS)
tests_imtomapi_SOURCES = tests/imtomapi.cpp tests/tbi.hpp
tests_imtomapi_LDADD = libkcinetmapi.la libmapi.la libkcutil.la
+tests_rtfhtmltest_LDADD = libkcutil.la ${INTL_LIBS}
tests_kc_335_SOURCES = tests/kc-335.cpp tests/tbi.hpp
@@ -793,9 +794,9 @@ tests_mapialloctime_LDADD = libmapi.la ${clock_LIBS}
tests_kc_335_LDADD = libmapi.la libkcutil.la
tests_kc_1759_SOURCES = tests/kc-1759.cpp
@@ -781,9 +782,9 @@ tests_mapisuite_LDADD = libmapi.la ${cppunit_LIBS}
tests_readflag_SOURCES = tests/readflag.cpp tests/tbi.hpp
tests_readflag_LDADD = libmapi.la libkcutil.la
tests_ustring_SOURCES = tests/ustring.cpp
-tests_ustring_LDADD = libkcutil.la ${icu_uc_LIBS}
+tests_ustring_LDADD = libkcutil.la ${icu_uc_LIBS} $(INTL_LIBS)
+tests_ustring_LDADD = libkcutil.la ${icu_uc_LIBS} ${INTL_LIBS}
tests_zcpmd5_SOURCES = tests/zcpmd5.cpp
-tests_zcpmd5_LDADD = ${CRYPTO_LIBS} libkcutil.la
+tests_zcpmd5_LDADD = ${CRYPTO_LIBS} ${PROG_LIBS} libkcutil.la $(INTL_LIBS)
+tests_zcpmd5_LDADD = ${CRYPTO_LIBS} libkcutil.la ${INTL_LIBS}
#
@@ -952,7 +953,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --with-dcprefix='$${pre
@@ -936,7 +937,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --with-dcprefix='$${pre
.PHONY: source-moved-check
source-moved-check:

10
mail/kopano/core/patches/patch-common_ECChannel_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-common_ECChannel_cpp,v 1.8 2020/07/29 13:04:05 robert Exp $
$OpenBSD: patch-common_ECChannel_cpp,v 1.9 2021/02/09 10:32:33 robert Exp $
Index: common/ECChannel.cpp
--- common/ECChannel.cpp.orig
+++ common/ECChannel.cpp
@@ -51,6 +51,8 @@
@@ -54,6 +54,8 @@
#define hrSuccess 0
#endif
@ -12,7 +12,7 @@ Index: common/ECChannel.cpp
using namespace std::string_literals;
namespace KC {
@@ -764,9 +766,11 @@ static int ec_listen_generic(const struct ec_socket &s
@@ -769,9 +771,11 @@ static int ec_listen_generic(const struct ec_socket &s
}
}
int y = 1;
@ -24,7 +24,7 @@ Index: common/ECChannel.cpp
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<const char *>(&y), sizeof(y)) < 0)
ec_log_warn("K-1557: Unable to set reuseaddr socket option: %s", strerror(errno));
#ifdef LINUX
@@ -981,6 +985,7 @@ static int ec_fdtable_socket_ai(const ec_socket &sk)
@@ -993,6 +997,7 @@ static int ec_fdtable_socket_ai(const ec_socket &sk)
if (ret < 0)
continue;
char ifnam[24];
@ -32,7 +32,7 @@ Index: common/ECChannel.cpp
arglen = sizeof(ifnam);
ret = getsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, ifnam, &arglen);
if (ret != 0)
@@ -989,6 +994,9 @@ static int ec_fdtable_socket_ai(const ec_socket &sk)
@@ -1001,6 +1006,9 @@ static int ec_fdtable_socket_ai(const ec_socket &sk)
ifnam[arglen] = '\0';
else
ifnam[sizeof(ifnam)-1] = '\0';

53
mail/kopano/core/patches/patch-common_ECConfigImpl_cpp Normal file
View File

@ -0,0 +1,53 @@
$OpenBSD: patch-common_ECConfigImpl_cpp,v 1.1 2021/02/09 10:32:33 robert Exp $
Index: common/ECConfigImpl.cpp
--- common/ECConfigImpl.cpp.orig
+++ common/ECConfigImpl.cpp
@@ -43,7 +43,7 @@ enum {
namespace KC {
-class ConfigImpl;
+class ECConfigImpl;
struct settingkey_t {
char s[256];
@@ -53,16 +53,16 @@ struct settingkey_t {
struct directive_t {
const char *lpszDirective;
- bool (ConfigImpl::*fExecute)(const char *, unsigned int);
+ bool (ECConfigImpl::*fExecute)(const char *, unsigned int);
};
/* Note: char* in map is allocated ONCE to 1024, and GetSetting will always return the same pointer to this buffer */
typedef std::map<settingkey_t, char *> settingmap_t;
-class ConfigImpl KC_FINAL : public Config {
+class ECConfigImpl KC_FINAL : public Config {
public:
- ConfigImpl(const configsetting_t *defaults, const char *const *directives);
- ~ConfigImpl();
+ ECConfigImpl(const configsetting_t *defaults, const char *const *directives);
+ ~ECConfigImpl();
virtual bool LoadSettings(const char *file, bool ignore_missing = false) override;
virtual int ParseParams(int argc, char **argv) override;
const char *GetSettingsPath() const override { return m_szConfigFile; }
@@ -107,8 +107,6 @@ class ConfigImpl KC_FINAL : public Config {
static const directive_t s_sDirectives[];
};
-using ECConfigImpl = ConfigImpl;
-
const directive_t ECConfigImpl::s_sDirectives[] = {
{ "include", &ECConfigImpl::HandleInclude },
{ "propmap", &ECConfigImpl::HandlePropMap },
@@ -162,7 +160,7 @@ const char *ECConfig::GetDefaultPath(const char *base)
// Configuration file parser
-ConfigImpl::ConfigImpl(const configsetting_t *lpDefaults,
+ECConfigImpl::ECConfigImpl(const configsetting_t *lpDefaults,
const char *const *lpszDirectives) :
m_lpDefaults(lpDefaults)
{

12
mail/kopano/core/patches/patch-common_UnixUtil_cpp
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-common_UnixUtil_cpp,v 1.4 2020/03/08 08:17:57 robert Exp $
$OpenBSD: patch-common_UnixUtil_cpp,v 1.5 2021/02/09 10:32:33 robert Exp $
Index: common/UnixUtil.cpp
--- common/UnixUtil.cpp.orig
+++ common/UnixUtil.cpp
@@ -26,8 +26,85 @@
#include <string>
#include <libHX/string.h>
@@ -28,8 +28,85 @@
using namespace std::string_literals;
+#if defined(__OpenBSD__)
+#include <sys/types.h>
@ -89,7 +89,7 @@ Index: common/UnixUtil.cpp
static int unix_runpath()
{
auto ret = chdir("/");
@@ -530,6 +607,15 @@ int ec_reexec(const char *const *argv)
@@ -481,6 +558,15 @@ int ec_reexec(const char *const *argv)
/* Resolve "exe" symlink before exec to please the sysadmin */
std::vector<char> linkbuf(16); /* mutable std::string::data is C++17 only */
@ -105,7 +105,7 @@ Index: common/UnixUtil.cpp
ssize_t linklen;
while (true) {
linklen = readlink("/proc/self/exe", &linkbuf[0], linkbuf.size());
@@ -545,6 +631,7 @@ int ec_reexec(const char *const *argv)
@@ -496,6 +582,7 @@ int ec_reexec(const char *const *argv)
linkbuf[linklen] = '\0';
ec_log_debug("Reexecing %s", &linkbuf[0]);
execv(&linkbuf[0], const_cast<char **>(argv));

22
mail/kopano/core/patches/patch-common_include_kopano_ECUnknown_h
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-common_include_kopano_ECUnknown_h,v 1.1 2020/07/29 13:04:05 robert Exp $
commit 964361fa563df86563ddaa432aba1d2b441b5f7b
Author: Jan Engelhardt <jengelh@inai.de>
Date: Fri Jun 26 00:49:23 2020 +0200
Index: common/include/kopano/ECUnknown.h
--- common/include/kopano/ECUnknown.h.orig
+++ common/include/kopano/ECUnknown.h
@@ -67,11 +67,7 @@ class KC_EXPORT ECUnknown : public virtual IUnknown {
std::atomic<unsigned int> m_cRef{0};
const char *szClassName;
- /*
- * In general, parents should not hold references to (grand)children
- * because children hold references to parents. A manual loop breaker
- * is needed otherwise.
- */
+ /* This is another reference count that goes on top of m_cRef */
std::list<ECUnknown *> lstChildren;
std::mutex mutex;
};

8
mail/kopano/core/patches/patch-common_include_kopano_platform_linux_h
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-common_include_kopano_platform_linux_h,v 1.7 2020/07/29 13:04:05 robert Exp $
$OpenBSD: patch-common_include_kopano_platform_linux_h,v 1.8 2021/02/09 10:32:33 robert Exp $
Index: common/include/kopano/platform.linux.h
--- common/include/kopano/platform.linux.h.orig
+++ common/include/kopano/platform.linux.h
@@ -21,7 +21,11 @@
@@ -22,7 +22,11 @@
#include <dlfcn.h>
#include <cstddef>
#include <libgen.h>
@ -15,7 +15,7 @@ Index: common/include/kopano/platform.linux.h
#include <clocale>
#define __STDC_FORMAT_MACROS
@@ -35,6 +39,10 @@
@@ -36,6 +40,10 @@
#define UNUSED_VAR __attribute__((unused))
#endif
@ -26,7 +26,7 @@ Index: common/include/kopano/platform.linux.h
#include <cassert>
#define _vsnprintf vsnprintf
#ifdef HAVE_VSNPRINTF_L
@@ -388,6 +396,8 @@ extern KC_EXPORT void Sleep(unsigned int usec);
@@ -382,6 +390,8 @@ extern KC_EXPORT void Sleep(unsigned int usec);
/* because the flags are not used linux, they do not match the windows flags! */
#define GPTR 0
extern KC_EXPORT void *GlobalAlloc(unsigned int flags, unsigned int size);

50
mail/kopano/core/patches/patch-configure_ac
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-configure_ac,v 1.19 2020/03/08 08:17:57 robert Exp $
$OpenBSD: patch-configure_ac,v 1.20 2021/02/09 10:32:33 robert Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -110,11 +110,13 @@ AS_CASE([$host_os],
@@ -107,11 +107,13 @@ AS_CASE([$host_os],
BUILDOS="openbsd"
ZCPPFLAGS="$ZCPPFLAGS -DOPENBSD"
LN_TFSV="ln -fs"
@ -17,7 +17,7 @@ Index: configure.ac
],
[*], [
LN_TFSV="ln -fs"
@@ -263,7 +265,7 @@ AC_DEFUN([LIBNCURSES_WITH_CONFIG],[
@@ -261,7 +263,7 @@ AC_DEFUN([LIBNCURSES_WITH_CONFIG],[
[
dnl just pick the lowest common denominator
NCURSES_FLAGS=""
@ -26,16 +26,7 @@ Index: configure.ac
]
)
AC_CHECK_HEADERS([ncurses.h])
@@ -304,7 +306,7 @@ PKG_CHECK_MODULES([idn], [libidn2], [AC_DEFINE([HAVE_I
PKG_CHECK_MODULES([xapian], [xapian-core])
PKG_CHECK_MODULES([XML2], [libxml-2.0])
-dbcxx_CPPFLAGS=""
+dbcxx_CPPFLAGS="-I/usr/local/include/db4"
dbcxx_LIBS="-ldb_cxx"
CPPFLAGS="$CPPFLAGS_system $dbcxx_CPPFLAGS"
AC_CHECK_HEADERS([db_cxx.h], [], [AC_MSG_ERROR([Berkeley DB C++ interface required])])
@@ -437,7 +439,7 @@ LDAP_FLAGS=""
@@ -427,7 +429,7 @@ LDAP_FLAGS=""
LDAP_LIBS=""
AC_CHECK_HEADERS([ldap.h], [
LDAP_FLAGS="-DLDAP_DEPRECATED=1"
@ -44,7 +35,7 @@ Index: configure.ac
want_ldap=yes
])
AC_SUBST(LDAP_LIBS)
@@ -462,7 +464,7 @@ iconv_t i; i = iconv_open("", "");
@@ -452,7 +454,7 @@ iconv_t i; i = iconv_open("", "");
[ AC_MSG_RESULT([yes]) ],
[ AC_MSG_RESULT([no])
AC_MSG_CHECKING([for iconv in -liconv])
@ -53,7 +44,7 @@ Index: configure.ac
AC_LINK_IFELSE([ AC_LANG_SOURCE([
#include <stdlib.h>
#include <iconv.h>
@@ -481,7 +483,7 @@ AC_SEARCH_LIBS([crypt_r], [crypt], [
@@ -471,7 +473,7 @@ AC_SEARCH_LIBS([crypt_r], [crypt], [
])
LIBS="$LIBS_system"
AC_SEARCH_LIBS([clock_gettime], [rt], [
@ -62,20 +53,15 @@ Index: configure.ac
])
LIBS="$LIBS_system"
AC_SUBST([CRYPT_LIBS])
@@ -594,12 +596,14 @@ AC_CHECK_LIB([z], [gzopen], GZ_LIBS="-lz",
)
AC_SUBST(GZ_LIBS)
-AC_CHECK_FUNCS([gettext], INTL_LIBS="", dnl gettext in libc
- AC_CHECK_LIB([intl], [gettext], INTL_LIBS="-lintl", dnl in -lintl
+LIBS="$LIBS -L/usr/local/lib"
+AC_CHECK_FUNCS([gettext], INTL_LIBS="-L/usr/local/lib -lintl", dnl gettext in libc
+ AC_CHECK_LIB([intl], [gettext], INTL_LIBS="-L/usr/local/lib -lintl", dnl in -lintl
AC_MSG_ERROR([required library libintl missing or unusable])
)
)
AC_SUBST(INTL_LIBS)
+LIBS=$LIBS_system
# check epoll support
AC_ARG_ENABLE([epoll], AS_HELP_STRING([--disable-epoll], [disable epoll and fallback to select]), [want_epoll=${enableval}], [want_epoll=yes])
@@ -589,9 +591,9 @@ AC_LINK_IFELSE([LIBINTLTEST], [
], [
AC_MSG_RESULT([no])
AC_MSG_CHECKING([dcgettext in -lintl])
- LIBS="-lintl"
+ LIBS="-L/usr/local/lib -lintl"
AC_LINK_IFELSE([LIBINTLTEST], [
- INTL_LIBS="-lintl"
+ INTL_LIBS="-L/usr/local/lib -lintl"
AC_MSG_RESULT([yes])
], [
AC_MSG_RESULT([no])

4
mail/kopano/core/patches/patch-gateway_Gateway_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-gateway_Gateway_cpp,v 1.12 2020/07/29 13:04:05 robert Exp $
$OpenBSD: patch-gateway_Gateway_cpp,v 1.13 2021/02/09 10:32:33 robert Exp $
Index: gateway/Gateway.cpp
--- gateway/Gateway.cpp.orig
@ -22,6 +22,6 @@ Index: gateway/Gateway.cpp
- { "run_as_group", "kopano" },
+ { "run_as_user", "_kopano" },
+ { "run_as_group", "_kopano" },
{ "pid_file", "/var/run/kopano/gateway.pid" },
{"pid_file", "", CONFIGSETTING_OBSOLETE},
{ "process_model", "thread" },
{"coredump_enabled", "systemdefault"},

21
mail/kopano/core/patches/patch-installer_linux_server_cfg
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-installer_linux_server_cfg,v 1.12 2020/03/08 08:17:57 robert Exp $
$OpenBSD: patch-installer_linux_server_cfg,v 1.13 2021/02/09 10:32:33 robert Exp $
Index: installer/linux/server.cfg
--- installer/linux/server.cfg.orig
@ -21,22 +21,3 @@ Index: installer/linux/server.cfg
#attachment_s3_hostname = s3-eu-west-1.amazonaws.com
# The region where the bucket is located, e.g. "eu-west-1"
@@ -68,12 +68,12 @@ local_admin_users = root kopano
#server_hostname =
# scripts which create stores for users from an external source
-#createuser_script = /usr/lib/kopano/userscripts/createuser
-#deleteuser_script = /usr/lib/kopano/userscripts/deleteuser
-#creategroup_script = /usr/lib/kopano/userscripts/creategroup
-#deletegroup_script = /usr/lib/kopano/userscripts/deletegroup
-#createcompany_script = /usr/lib/kopano/userscripts/createcompany
-#deletecompany_script = /usr/lib/kopano/userscripts/deletecompany
+#createuser_script = /usr/local/lib/kopano/userscripts/createuser
+#deleteuser_script = /usr/local/lib/kopano/userscripts/deleteuser
+#creategroup_script = /usr/local/lib/kopano/userscripts/creategroup
+#deletegroup_script = /usr/local/lib/kopano/userscripts/deletegroup
+#createcompany_script = /usr/local/lib/kopano/userscripts/createcompany
+#deletecompany_script = /usr/local/lib/kopano/userscripts/deletecompany
# Skip creation/deletion of users for testing purposes, instead log it.
#user_safe_mode = no

34
mail/kopano/core/patches/patch-mapi4linux_src_m4l_mapix_h
View File

@ -1,34 +0,0 @@
$OpenBSD: patch-mapi4linux_src_m4l_mapix_h,v 1.1 2020/07/29 13:04:05 robert Exp $
commit 964361fa563df86563ddaa432aba1d2b441b5f7b
Author: Jan Engelhardt <jengelh@inai.de>
Date: Fri Jun 26 00:49:23 2020 +0200
Index: mapi4linux/src/m4l.mapix.h
--- mapi4linux/src/m4l.mapix.h.orig
+++ mapi4linux/src/m4l.mapix.h
@@ -11,7 +11,6 @@
#include <mapispi.h>
#include <string>
#include <list>
-#include <map>
#include <kopano/ECConfig.h>
#include <kopano/ECUnknown.h>
#include <kopano/memory.hpp>
@@ -107,7 +106,6 @@ class M4LMAPISession KC_FINAL_OPG : public KC::ECUnkno
public:
M4LMAPISession(const TCHAR *profname, M4LMsgServiceAdmin *);
- virtual ULONG Release() override;
virtual HRESULT GetLastError(HRESULT, unsigned int flags, MAPIERROR **) override;
virtual HRESULT GetMsgStoresTable(unsigned int flags, IMAPITable **) override;
virtual HRESULT OpenMsgStore(ULONG_PTR ui_param, ULONG eid_size, const ENTRYID *, const IID *intf, ULONG flags, IMsgStore **) override;
@@ -123,8 +121,6 @@ class M4LMAPISession KC_FINAL_OPG : public KC::ECUnkno
virtual HRESULT QueryInterface(const IID &, void **) override;
private:
- std::mutex m_storemap_mtx;
- std::map<GUID, KC::object_ptr<IMsgStore>> mapStores;
/* @todo need a status row per provider */
ULONG m_cValuesStatus = 0;
KC::memory_ptr<SPropValue> m_lpPropsStatus;

72
mail/kopano/core/patches/patch-mapi4linux_src_mapix_cpp
View File

@ -1,72 +0,0 @@
$OpenBSD: patch-mapi4linux_src_mapix_cpp,v 1.1 2020/07/29 13:04:05 robert Exp $
commit 964361fa563df86563ddaa432aba1d2b441b5f7b
Author: Jan Engelhardt <jengelh@inai.de>
Date: Fri Jun 26 00:49:23 2020 +0200
Index: mapi4linux/src/mapix.cpp
--- mapi4linux/src/mapix.cpp.orig
+++ mapi4linux/src/mapix.cpp
@@ -691,21 +691,6 @@ M4LMAPISession::M4LMAPISession(const TCHAR *pn, M4LMsg
{
}
-ULONG M4LMAPISession::Release()
-{
- auto r = ECUnknown::Release();
- if (m_cRef == 0)
- return r;
- /*
- * Move map away, because there will be recursion into
- * M4LMAPISession::Release, which invokes mapStores.~map, which
- * would trash the first clear call's state.
- */
- auto m = std::move(mapStores);
- m.clear();
- return r;
-}
-
HRESULT M4LMAPISession::GetLastError(HRESULT hResult, ULONG ulFlags, LPMAPIERROR* lppMAPIError) {
*lppMAPIError = NULL;
return hrSuccess;
@@ -1001,12 +986,15 @@ HRESULT M4LMAPISession::OpenEntry(ULONG cbEntryID, con
// See if we already have the store open
object_ptr<IMsgStore> lpMDB;
- ulock_normal storemap_lock(m_storemap_mtx);
- decltype(mapStores)::const_iterator iterStores = mapStores.find(guidProvider);
- if (iterStores != mapStores.cend())
- lpMDB = iterStores->second;
- storemap_lock.unlock();
- if (lpMDB != nullptr) {
+ for (const auto &ecunk : lstChildren) {
+ hr = ecunk->QueryInterface(IID_IMsgStore, &~lpMDB);
+ if (hr != hrSuccess)
+ continue;
+ memory_ptr<SPropValue> spv;
+ hr = HrGetOneProp(lpMDB, PR_PROVIDER_UID, &~spv);
+ if (hr != hrSuccess || spv->Value.bin.cb != sizeof(guidProvider) ||
+ memcmp(spv->Value.bin.lpb, &guidProvider, sizeof(guidProvider)) != 0)
+ continue;
if (bStoreEntryID) {
hr = lpMDB->QueryInterface(IID_IMsgStore, reinterpret_cast<void **>(lppUnk));
if (hr == hrSuccess && lpulObjType != nullptr)
@@ -1072,18 +1060,6 @@ HRESULT M4LMAPISession::OpenEntry(ULONG cbEntryID, con
if (hr != hrSuccess)
return kc_perrorf("OpenMsgStore failed", hr);
- // Keep the store open in case somebody else needs it later (only via this function)
- /*
- * IMsgStores are children of M4LMAPISession so that the
- * session data does not go away while stores are in use. But
- * because M4LMAPISession is keeping object_ptr references to
- * some stores to make them persistent during a session, a
- * reference loop ensues that must be manually broken in
- * M4LMAPISession::Release.
- */
- storemap_lock.lock();
- mapStores.emplace(guidProvider, lpMDB);
- storemap_lock.unlock();
if (bStoreEntryID) {
hr = lpMDB->QueryInterface(IID_IMsgStore, reinterpret_cast<void **>(lppUnk));
if (hr == hrSuccess && lpulObjType != nullptr)

16
mail/kopano/core/patches/patch-php-ext_ECImportContentsChangesProxy_cpp
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-php-ext_ECImportContentsChangesProxy_cpp,v 1.2 2020/03/08 08:17:57 robert Exp $
Index: php-ext/ECImportContentsChangesProxy.cpp
--- php-ext/ECImportContentsChangesProxy.cpp.orig
+++ php-ext/ECImportContentsChangesProxy.cpp
@@ -8,10 +8,6 @@
#include <cstdio>
#include <ctime>
#include <cmath>
-#if __GNUC_PREREQ(5, 0) && !__GNUC_PREREQ(6, 0)
-using std::isfinite;
-using std::isnan;
-#endif
extern "C" {
// Remove these defines to remove warnings

16
mail/kopano/core/patches/patch-php-ext_ECImportHierarchyChangesProxy_cpp
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-php-ext_ECImportHierarchyChangesProxy_cpp,v 1.2 2020/03/08 08:17:57 robert Exp $
Index: php-ext/ECImportHierarchyChangesProxy.cpp
--- php-ext/ECImportHierarchyChangesProxy.cpp.orig
+++ php-ext/ECImportHierarchyChangesProxy.cpp
@@ -8,10 +8,6 @@
#include <cstdio>
#include <ctime>
#include <cmath>
-#if __GNUC_PREREQ(5, 0) && !__GNUC_PREREQ(6, 0)
-using std::isfinite;
-using std::isnan;
-#endif
extern "C" {
// Remove these defines to remove warnings

21
mail/kopano/core/patches/patch-php-ext_main_cpp
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-php-ext_main_cpp,v 1.2 2020/07/29 13:04:05 robert Exp $
Index: php-ext/main.cpp
--- php-ext/main.cpp.orig
+++ php-ext/main.cpp
@@ -50,15 +50,6 @@
// 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>
-#if __GNUC_PREREQ(5, 0) && !__GNUC_PREREQ(6, 0)
-/*
- * Bug/missing feature in preliminary C++ support in GNU libstdc++-v3 5.x;
- * there is also no macro to distinguish between GNU libstdc++ and clang libc++,
- * so that is what you get for clang defining __GNU*.
- */
-using std::isfinite;
-using std::isnan;
-#endif
extern "C" {
// Remove these defines to remove warnings

16
mail/kopano/core/patches/patch-php-ext_typeconversion_cpp
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-php-ext_typeconversion_cpp,v 1.2 2020/07/29 13:04:05 robert Exp $
Index: php-ext/typeconversion.cpp
--- php-ext/typeconversion.cpp.orig
+++ php-ext/typeconversion.cpp
@@ -10,10 +10,6 @@
#include <mapiutil.h>
#include <kopano/timeutil.hpp>
#include "php-ext/phpconfig.h"
-#if __GNUC_PREREQ(5, 0) && !__GNUC_PREREQ(6, 0)
-using std::isfinite;
-using std::isnan;
-#endif
extern "C" {
// Remove these defines to remove warnings

4
mail/kopano/core/patches/patch-provider_libserver_ECAttachmentStorage_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-provider_libserver_ECAttachmentStorage_cpp,v 1.10 2020/05/29 20:00:22 robert Exp $
$OpenBSD: patch-provider_libserver_ECAttachmentStorage_cpp,v 1.11 2021/02/09 10:32:33 robert Exp $
Index: provider/libserver/ECAttachmentStorage.cpp
--- provider/libserver/ECAttachmentStorage.cpp.orig
+++ provider/libserver/ECAttachmentStorage.cpp
@@ -1137,7 +1137,7 @@ ECFileAttachment::ECFileAttachment(ECDatabase *lpDatab
@@ -1138,7 +1138,7 @@ ECFileAttachment::ECFileAttachment(ECDatabase *lpDatab
m_basepath(basepath), m_l1(l1), m_l2(l2)
{
if (m_basepath.empty())

17
mail/kopano/core/patches/patch-provider_libserver_ECDatabaseFactory_cpp
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-provider_libserver_ECDatabaseFactory_cpp,v 1.1 2020/07/29 13:04:05 robert Exp $
Index: provider/libserver/ECDatabaseFactory.cpp
--- provider/libserver/ECDatabaseFactory.cpp.orig
+++ provider/libserver/ECDatabaseFactory.cpp
@@ -25,9 +25,11 @@ ECDatabaseFactory::ECDatabaseFactory(std::shared_ptr<E
pthread_key_create(&m_thread_key, [](void *arg) {
if (arg == nullptr)
return;
+#if !defined(__OpenBSD__)
char name[32];
pthread_getname_np(pthread_self(), name, sizeof(name));
ec_log_debug("db_conn %p was not released on T%lu (%s)", arg, kc_threadid(), name);
+#endif
});
}

27
mail/kopano/core/patches/patch-provider_server_ECServer_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.20 2020/07/29 13:04:05 robert Exp $
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.21 2021/02/09 10:32:33 robert Exp $
Index: provider/server/ECServer.cpp
--- provider/server/ECServer.cpp.orig
+++ provider/server/ECServer.cpp
@@ -856,8 +856,8 @@ static int running_server(char *szName, const char *sz
@@ -1025,8 +1025,8 @@ static int running_server(char *szName, const char *sz
{ "server_send_timeout", "60", CONFIGSETTING_RELOADABLE },
{ "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
@ -11,10 +11,10 @@ Index: provider/server/ECServer.cpp
- { "run_as_group", "kopano" },
+ { "run_as_user", "_kopano" }, // drop root privileges, and run as this user/group
+ { "run_as_group", "_kopano" },
{ "pid_file", "/var/run/kopano/server.pid" },
{"pid_file", "", CONFIGSETTING_OBSOLETE},
{"allocator_library", "libtcmalloc_minimal.so.4"},
{ "coredump_enabled", "yes" },
@@ -895,7 +895,7 @@ static int running_server(char *szName, const char *sz
@@ -1064,7 +1064,7 @@ static int running_server(char *szName, const char *sz
{"attachment_s3_bucketname", ""},
{"attachment_s3_region", ""},
#endif
@ -23,22 +23,3 @@ Index: provider/server/ECServer.cpp
{ "attachment_compression", "6" },
// Log options
@@ -916,12 +916,12 @@ static int running_server(char *szName, const char *sz
// user plugin
{ "user_plugin", "db" },
{ "user_plugin_config", "/etc/kopano/ldap.cfg" },
- {"createuser_script", "/usr/lib/kopano/userscripts/createuser", CONFIGSETTING_RELOADABLE},
- {"deleteuser_script", "/usr/lib/kopano/userscripts/deleteuser", CONFIGSETTING_RELOADABLE},
- {"creategroup_script", "/usr/lib/kopano/userscripts/creategroup", CONFIGSETTING_RELOADABLE},
- {"deletegroup_script", "/usr/lib/kopano/userscripts/deletegroup", CONFIGSETTING_RELOADABLE},
- {"createcompany_script", "/usr/lib/kopano/userscripts/createcompany", CONFIGSETTING_RELOADABLE},
- {"deletecompany_script", "/usr/lib/kopano/userscripts/deletecompany", CONFIGSETTING_RELOADABLE},
+ {"createuser_script", "/usr/local/lib/kopano/userscripts/createuser", CONFIGSETTING_RELOADABLE},
+ {"deleteuser_script", "/usr/local/lib/kopano/userscripts/deleteuser", CONFIGSETTING_RELOADABLE},
+ {"creategroup_script", "/usr/local/lib/kopano/userscripts/creategroup", CONFIGSETTING_RELOADABLE},
+ {"deletegroup_script", "/usr/local/lib/kopano/userscripts/deletegroup", CONFIGSETTING_RELOADABLE},
+ {"createcompany_script", "/usr/local/lib/kopano/userscripts/createcompany", CONFIGSETTING_RELOADABLE},
+ {"deletecompany_script", "/usr/local/lib/kopano/userscripts/deletecompany", CONFIGSETTING_RELOADABLE},
{ "user_safe_mode", "no", CONFIGSETTING_RELOADABLE },
// Storename format

10
mail/kopano/core/patches/patch-spooler_DAgent_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-spooler_DAgent_cpp,v 1.20 2020/07/29 13:04:05 robert Exp $
$OpenBSD: patch-spooler_DAgent_cpp,v 1.21 2021/02/09 10:32:33 robert Exp $
Index: spooler/DAgent.cpp
--- spooler/DAgent.cpp.orig
+++ spooler/DAgent.cpp
@@ -69,6 +69,10 @@
@@ -72,6 +72,10 @@
#include <sys/mman.h>
#include <pwd.h>
@ -14,7 +14,7 @@ Index: spooler/DAgent.cpp
/*
This is actually from sysexits.h
but since those windows lamers don't have it ..
@@ -3240,8 +3244,8 @@ int main(int argc, char **argv)
@@ -3218,8 +3222,8 @@ int main(int argc, char **argv)
// Default settings
static const configsetting_t lpDefaults[] = {
{"server_bind_intf", "", CONFIGSETTING_OBSOLETE},
@ -22,10 +22,10 @@ Index: spooler/DAgent.cpp
- { "run_as_group", "kopano" },
+ { "run_as_user", "_kopano" },
+ { "run_as_group", "_kopano" },
{ "pid_file", "/var/run/kopano/dagent.pid" },
{"pid_file", "", CONFIGSETTING_OBSOLETE},
{"coredump_enabled", "systemdefault"},
{"lmtp_listen", "*%lo:2003"},
@@ -3258,14 +3262,14 @@ int main(int argc, char **argv)
@@ -3236,14 +3240,14 @@ int main(int argc, char **argv)
{ "spam_header_name", "X-Spam-Status" },
{ "spam_header_value", "Yes," },
{ "log_raw_message", "error", CONFIGSETTING_RELOADABLE },

4
mail/kopano/core/patches/patch-spooler_Spooler_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-spooler_Spooler_cpp,v 1.16 2020/07/29 13:04:05 robert Exp $
$OpenBSD: patch-spooler_Spooler_cpp,v 1.17 2021/02/09 10:32:33 robert Exp $
Index: spooler/Spooler.cpp
--- spooler/Spooler.cpp.orig
@ -11,7 +11,7 @@ Index: spooler/Spooler.cpp
- { "run_as_group", "kopano" },
+ { "run_as_user", "_kopano" },
+ { "run_as_group", "_kopano" },
{ "pid_file", "/var/run/kopano/spooler.pid" },
{"pid_file", "", CONFIGSETTING_OBSOLETE},
{"coredump_enabled", "systemdefault"},
{"log_method", "auto", CONFIGSETTING_NONEMPTY},
@@ -944,13 +944,13 @@ static int main2(int argc, char **argv)

7
mail/kopano/core/patches/patch-spooler_python_Makefile_am
View File

@ -1,11 +1,14 @@
$OpenBSD: patch-spooler_python_Makefile_am,v 1.1 2019/11/16 20:01:20 robert Exp $
$OpenBSD: patch-spooler_python_Makefile_am,v 1.2 2021/02/09 10:32:33 robert Exp $
Index: spooler/python/Makefile.am
--- spooler/python/Makefile.am.orig
+++ spooler/python/Makefile.am
@@ -7,5 +7,3 @@ kopano_spoolerdir = ${datadir}/kopano-spooler/python
@@ -12,8 +12,6 @@ kopano_spoolerdir = ${datadir}/kopano-spooler/python
kopano_spooler_DATA = mapiplugin.py pluginmanager.py plugintemplates.py wraplogger.py zconfig.py
install-data-hook:
- mkdir -p ${DESTDIR}/${localstatedir}/lib/kopano/dagent/plugins/
- mkdir -p ${DESTDIR}/${localstatedir}/lib/kopano/spooler/plugins/
.PHONY: test
test:

14
mail/kopano/core/patches/patch-tests_setupenv_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-tests_setupenv_cpp,v 1.1 2021/02/09 10:32:33 robert Exp $
Index: tests/setupenv.cpp
--- tests/setupenv.cpp.orig
+++ tests/setupenv.cpp
@@ -20,6 +20,8 @@
#include <kopano/UnixUtil.h>
#include <kopano/scope.hpp>
+#include <netinet/in.h>
+
using namespace std::string_literals;
static std::set<pid_t> se_term_pids, se_wait_pids;

63
mail/kopano/core/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.32 2020/03/08 08:17:58 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.33 2021/02/09 10:32:33 robert Exp $
@conflict zarafa-*
@pkgpath mail/zarafa/zarafa,-main
@newgroup _kopano:793
@ -75,7 +75,6 @@ include/kopano/automapi.hpp
include/kopano/buildconfig.h
include/kopano/charset/
include/kopano/charset/convert.h
include/kopano/charset/convstring.h
include/kopano/charset/traits.h
include/kopano/charset/utf8string.h
include/kopano/codepage.h
@ -83,7 +82,6 @@ include/kopano/ecversion.h
include/kopano/fileutil.hpp
include/kopano/hl.hpp
include/kopano/kcodes.h
include/kopano/mapi_ptr.h
include/kopano/mapiext.h
include/kopano/mapiguidext.h
include/kopano/memory.hpp
@ -132,34 +130,20 @@ lib/kopano/
@so lib/kopano/libkcserver-ldap.so
lib/kopano/userscripts/
@sample ${SYSCONFDIR}/kopano/userscripts/
lib/kopano/userscripts/createcompany
lib/kopano/userscripts/createcompany.d/
@sample ${SYSCONFDIR}/kopano/userscripts/createcompany.d/
lib/kopano/userscripts/createcompany.d/00createpublic
lib/kopano/userscripts/creategroup
lib/kopano/userscripts/creategroup.d/
@sample ${SYSCONFDIR}/kopano/userscripts/creategroup.d/
lib/kopano/userscripts/createuser
@sample ${SYSCONFDIR}/kopano/userscripts/createcompany.d/00createpublic
lib/kopano/userscripts/createuser.d/
@sample ${SYSCONFDIR}/kopano/userscripts/createuser.d/
lib/kopano/userscripts/createuser.d/00createstore
lib/kopano/userscripts/deletecompany
lib/kopano/userscripts/deletecompany.d/
@sample ${SYSCONFDIR}/kopano/userscripts/deletecompany.d/
lib/kopano/userscripts/deletegroup
lib/kopano/userscripts/deletegroup.d/
@sample ${SYSCONFDIR}/kopano/userscripts/deletegroup.d/
lib/kopano/userscripts/deleteuser
lib/kopano/userscripts/deleteuser.d/
@sample ${SYSCONFDIR}/kopano/userscripts/deleteuser.d/
@sample ${SYSCONFDIR}/kopano/userscripts/createuser.d/00createstore
@static-lib lib/libkcarchiver.a
@lib lib/libkcarchiver.so.${LIBkcarchiver_VERSION}
@static-lib lib/libkcfreebusy.a
@lib lib/libkcfreebusy.so.${LIBkcfreebusy_VERSION}
@static-lib lib/libkcicalmapi.a
@lib lib/libkcicalmapi.so.${LIBkcicalmapi_VERSION}
@static-lib lib/libkcindex.a
@lib lib/libkcindex.so.${LIBkcindex_VERSION}
@static-lib lib/libkcinetmapi.a
@lib lib/libkcinetmapi.so.${LIBkcinetmapi_VERSION}
@so lib/libkcpyconv-${MODPY_VERSION}.so
@ -330,30 +314,6 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/kopano_backup/${MODPY_P
lib/python${MODPY_VERSION}/site-packages/kopano_backup/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/kopano_backup/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/kopano_backup/version.py
lib/python${MODPY_VERSION}/site-packages/kopano_cli/
lib/python${MODPY_VERSION}/site-packages/kopano_cli-${V}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_cli-${V}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano_cli-${V}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano_cli-${V}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano_cli-${V}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano_cli/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/kopano_cli/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/kopano_cli/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/kopano_cli/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/kopano_cli/version.py
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst/
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst-${V}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst-${V}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst-${V}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst-${V}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst-${V}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst/${MODPY_PYCACHE}pst.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst/pst.py
lib/python${MODPY_VERSION}/site-packages/kopano_migration_pst/version.py
lib/python${MODPY_VERSION}/site-packages/kopano_search/
lib/python${MODPY_VERSION}/site-packages/kopano_search-${V}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/kopano_search-${V}-py${MODPY_VERSION}.egg-info/PKG-INFO
@ -418,10 +378,10 @@ lib/tmpfiles.d/
lib/tmpfiles.d/kopano-tmpfiles.conf
libexec/kopano/
@bin libexec/kopano/eidprint
@bin libexec/kopano/kopano-indexd
@bin libexec/kopano/kopano-statsd
@bin libexec/kopano/kscriptrun
@bin libexec/kopano/mapitime
@bin libexec/kopano/setupenv
@man man/man1/kopano-fsck.1
@man man/man1/kopano-ibrule.1
@man man/man1/kopano-oof.1
@ -436,7 +396,6 @@ libexec/kopano/
@man man/man5/kopano-gateway.cfg.5
@man man/man5/kopano-ical.cfg.5
@man man/man5/kopano-ldap.cfg.5
@man man/man5/kopano-migration-pst.cfg.5
@man man/man5/kopano-monitor.cfg.5
@man man/man5/kopano-search.cfg.5
@man man/man5/kopano-server.cfg.5
@ -454,14 +413,11 @@ libexec/kopano/
@man man/man8/kopano-backup.8
@man man/man8/kopano-cachestat.8
@man man/man8/kopano-cfgchecker.8
@man man/man8/kopano-cli.8
@man man/man8/kopano-dagent.8
@man man/man8/kopano-dbadm.8
@man man/man8/kopano-gateway.8
@man man/man8/kopano-ical.8
@man man/man8/kopano-indexd.8
@man man/man8/kopano-mailbox-permissions.8
@man man/man8/kopano-migration-pst.8
@man man/man8/kopano-monitor.8
@man man/man8/kopano-mr-accept.8
@man man/man8/kopano-mr-process.8
@ -480,14 +436,12 @@ sbin/kopano-archiver-restore
sbin/kopano-autorespond
sbin/kopano-backup
sbin/kopano-cachestat
sbin/kopano-cli
@bin sbin/kopano-dagent
@bin sbin/kopano-dbadm
sbin/kopano-fix-ipm-subtree
@bin sbin/kopano-gateway
@bin sbin/kopano-ical
sbin/kopano-mailbox-permissions
sbin/kopano-migration-pst
@bin sbin/kopano-monitor
sbin/kopano-mr-accept
sbin/kopano-mr-process
@ -559,8 +513,6 @@ share/examples/kopano/license/
@sample ${SYSCONFDIR}/kopano/license/
share/examples/kopano/local_kopano.m4
@sample ${SYSCONFDIR}/kopano/local_kopano.m4
share/examples/kopano/migration-pst.cfg
@sample ${SYSCONFDIR}/kopano/migration-pst.cfg
share/examples/kopano/monitor.cfg
@sample ${SYSCONFDIR}/kopano/monitor.cfg
share/examples/kopano/quotamail/
@ -601,13 +553,6 @@ share/examples/kopano/spooler.cfg
@sample ${SYSCONFDIR}/kopano/spooler.cfg
share/examples/kopano/statsd.cfg
share/examples/kopano/unix.cfg
share/examples/kopano/userscripts/
share/examples/kopano/userscripts/createcompany.d/
share/examples/kopano/userscripts/creategroup.d/
share/examples/kopano/userscripts/createuser.d/
share/examples/kopano/userscripts/deletecompany.d/
share/examples/kopano/userscripts/deletegroup.d/
share/examples/kopano/userscripts/deleteuser.d/
share/examples/logrotate.d/
share/examples/logrotate.d/kopano
share/gdb/auto-load/usr/local/lib/libmapi.so.1.0.0-gdb.py