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

update to 8.6.80.353 and add a missing build dep

Browse Source
This commit is contained in:
robert 2018-03-29 19:41:46 +00:00
parent d498ca916b
commit d7bc4e574d
17 changed files with 58 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/kopano/Makefile.inc
View File

@ -1,7 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.8 2018/03/16 15:35:02 robert Exp $
# $OpenBSD: Makefile.inc,v 1.9 2018/03/29 19:41:46 robert Exp $
V?= 8.6.80
BUILD?= 142
BUILD?= 353
DISTNAME?= kopanocore-${V}.${BUILD}
EXTRACT_SUFX?= .tar.xz

8
mail/kopano/core/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.14 2018/03/18 11:30:55 robert Exp $
# $OpenBSD: Makefile,v 1.15 2018/03/29 19:41:46 robert Exp $
COMMENT-main= MS Exchange groupware suite replacement
COMMENT-mapi= kopano MAPI extensions for PHP
@ -6,8 +6,6 @@ COMMENT-mapi= kopano MAPI extensions for PHP
PKGNAME-main= kopano-core-${V}.${BUILD}
PKGNAME-mapi= kopano-mapi-${V}.${BUILD}
REVISION-main= 0
CATEGORIES= mail www productivity
EXTRACT_SUFX = .tar.xz
@ -38,6 +36,7 @@ MESSAGE-main= # empty
UNMESSAGE-main= # empty
BUILD_DEPENDS= devel/gettext-tools \
devel/py-setuptools \
devel/swig \
textproc/xmlto \
sysutils/coreutils
@ -58,7 +57,8 @@ RUN_DEPENDS-main= ${MODPY_RUN_DEPENDS} \
devel/py-dateutil \
lang/python/2.7,-bsddb \
mail/p5-Mail-SpamAssassin \
textproc/catdoc
textproc/catdoc \
www/py-jwt
LIB_DEPENDS-main= databases/mariadb \
databases/openldap \
devel/gettext \

4
mail/kopano/core/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (kopano/kopanocore-8.6.80.142.tar.xz) = zPnAdy5nMsKid+ydGrtjDwEHlY5I+HHeBRbTzDL5CCk=
SIZE (kopano/kopanocore-8.6.80.142.tar.xz) = 2052524
SHA256 (kopano/kopanocore-8.6.80.353.tar.xz) = pDWBQpBAXTaLDxT8LFCRKhmIlmrXfJotNBm6y6B9Pjc=
SIZE (kopano/kopanocore-8.6.80.353.tar.xz) = 2055148

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

@ -1,9 +1,9 @@
$OpenBSD: patch-ECtools_monitor_monitor_cpp,v 1.3 2018/03/16 15:35:02 robert Exp $
$OpenBSD: patch-ECtools_monitor_monitor_cpp,v 1.4 2018/03/29 19:41:46 robert Exp $
Index: ECtools/monitor/monitor.cpp
--- ECtools/monitor/monitor.cpp.orig
+++ ECtools/monitor/monitor.cpp
@@ -147,10 +147,10 @@ int main(int argc, char *argv[]) {
@@ -146,10 +146,10 @@ int main(int argc, char *argv[]) {
static const configsetting_t lpDefaults[] = {
{ "smtp_server","localhost" },
{ "server_socket", "default:" },

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

@ -1,20 +1,20 @@
$OpenBSD: patch-ECtools_presence_kopano_presence___init___py,v 1.1 2018/03/16 15:35:02 robert Exp $
$OpenBSD: patch-ECtools_presence_kopano_presence___init___py,v 1.2 2018/03/29 19:41:46 robert Exp $
Index: ECtools/presence/kopano_presence/__init__.py
--- ECtools/presence/kopano_presence/__init__.py.orig
+++ ECtools/presence/kopano_presence/__init__.py
@@ -16,11 +16,11 @@ from kopano import log_exc, Config
@@ -18,11 +18,11 @@ from kopano import log_exc, Config
from flask import Flask, request, abort
CONFIG = {
- 'data_path': Config.string(default='/var/lib/kopano/presence/'),
+ 'data_path': Config.string(default='/var/db/kopano/presence/'),
'data_save_interval': Config.integer(default=5),
'plugins': Config.string(multiple=True, default=[]),
'plugins': Config.string(multiple=True, default="spreed"),
- 'run_as_user': Config.string(default="kopano"),
- 'run_as_group': Config.string(default="kopano"),
+ 'run_as_user': Config.string(default="_kopano"),
+ 'run_as_group': Config.string(default="_kopano"),
'server_bind': Config.string(),
'server_port': Config.integer(),
'server_auth_user': Config.string(),
'server_bind': Config.string(default="127.0.0.1"),
'server_port': Config.integer(default="1234"),
'server_auth_user': Config.string(default="presence"),

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

@ -1,9 +1,9 @@
$OpenBSD: patch-ECtools_search_Makefile_in,v 1.4 2018/03/16 15:35:02 robert Exp $
$OpenBSD: patch-ECtools_search_Makefile_in,v 1.5 2018/03/29 19:41:46 robert Exp $
Index: ECtools/search/Makefile.in
--- ECtools/search/Makefile.in.orig
+++ ECtools/search/Makefile.in
@@ -601,7 +601,6 @@ install-exec-local:
@@ -602,7 +602,6 @@ install-exec-local:
rm -Rf build
install-data-local:

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

@ -1,9 +1,9 @@
$OpenBSD: patch-Makefile_in,v 1.5 2018/03/16 15:35:02 robert Exp $
$OpenBSD: patch-Makefile_in,v 1.6 2018/03/29 19:41:46 robert Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -4813,7 +4813,7 @@ default.sym provider/plugin.sym provider/provider.sym:
@@ -4802,7 +4802,7 @@ default.sym provider/plugin.sym provider/provider.sym:
.PHONY: source-moved-check
source-moved-check:

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

@ -1,9 +1,9 @@
$OpenBSD: patch-common_SSLUtil_cpp,v 1.1 2018/03/16 15:35:02 robert Exp $
$OpenBSD: patch-common_SSLUtil_cpp,v 1.2 2018/03/29 19:41:46 robert Exp $
Index: common/SSLUtil.cpp
--- common/SSLUtil.cpp.orig
+++ common/SSLUtil.cpp
@@ -29,7 +29,7 @@ namespace KC {
@@ -28,7 +28,7 @@ namespace KC {
static std::recursive_mutex *ssl_locks;
@ -12,7 +12,7 @@ Index: common/SSLUtil.cpp
static void ssl_lock(int mode, int n, const char *file, int line)
{
if (mode & CRYPTO_LOCK)
@@ -78,7 +78,7 @@ void SSL_library_cleanup()
@@ -77,7 +77,7 @@ void SSL_library_cleanup()
#endif
ERR_free_strings();

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

@ -1,4 +1,4 @@
$OpenBSD: patch-configure_ac,v 1.5 2018/03/16 15:35:02 robert Exp $
$OpenBSD: patch-configure_ac,v 1.6 2018/03/29 19:41:46 robert Exp $
Index: configure.ac
--- configure.ac.orig
@ -25,6 +25,15 @@ Index: configure.ac
-I\${top_srcdir}/m4lcommon/include \
-I\${top_srcdir}/mapi4linux/include \
-I\${top_srcdir}/provider/common/include \
@@ -93,7 +96,7 @@ ZCPPFLAGS="$ZCPPFLAGS $LFS_CFLAGS"
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
CXXFLAGS="$CXXFLAGS_system -std=$i"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([])], [cxxmode="$i"])
AS_IF([test -n "$cxxmode"], [break])
@@ -233,7 +236,7 @@ AC_DEFUN([LIBNCURSES_WITH_CONFIG],[
[
dnl just pick the lowest common denominator

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

@ -1,4 +1,4 @@
$OpenBSD: patch-installer_linux_Makefile_in,v 1.3 2018/03/18 11:30:55 robert Exp $
$OpenBSD: patch-installer_linux_Makefile_in,v 1.4 2018/03/29 19:41:46 robert Exp $
Index: installer/linux/Makefile.in
--- installer/linux/Makefile.in.orig
@ -11,4 +11,4 @@ Index: installer/linux/Makefile.in
+ server.cfg unix.cfg presence.cfg spamd.cfg \
spooler.cfg gateway.cfg monitor.cfg dagent.cfg ical.cfg search.cfg \
autorespond archiver.cfg backup.cfg migration-pst.cfg \
autorespond.cfg
autorespond.cfg spamd.cfg

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

@ -1,9 +1,9 @@
$OpenBSD: patch-provider_libserver_ECAttachmentStorage_cpp,v 1.1 2018/03/16 15:35:02 robert Exp $
$OpenBSD: patch-provider_libserver_ECAttachmentStorage_cpp,v 1.2 2018/03/29 19:41:46 robert Exp $
Index: provider/libserver/ECAttachmentStorage.cpp
--- provider/libserver/ECAttachmentStorage.cpp.orig
+++ provider/libserver/ECAttachmentStorage.cpp
@@ -1014,7 +1014,7 @@ ECFileAttachment::ECFileAttachment(ECDatabase *lpDatab
@@ -999,7 +999,7 @@ ECFileAttachment::ECFileAttachment(ECDatabase *lpDatab
m_basepath(basepath)
{
if (m_basepath.empty())

52
mail/kopano/core/patches/patch-provider_libserver_ECCacheManager_cpp
View File

@ -1,52 +0,0 @@
$OpenBSD: patch-provider_libserver_ECCacheManager_cpp,v 1.1 2018/03/16 15:35:02 robert Exp $
Index: provider/libserver/ECCacheManager.cpp
--- provider/libserver/ECCacheManager.cpp.orig
+++ provider/libserver/ECCacheManager.cpp
@@ -104,33 +104,33 @@ ECCacheManager::ECCacheManager(ECConfig *lpConfig,
#else
m_CellCache.AddToSize(256 * 1000 * 1024);
#endif
- ec_log_info("Setting cell cache size: %lu", m_CellCache.Size());
+ ec_log_info("Setting cell cache size: %llu", m_CellCache.Size());
}
auto cell_cache_size = m_CellCache.Size();
if (atoll(lpConfig->GetSetting("cache_object_size")) == 0) {
- m_ObjectsCache.AddToSize(std::min(size_t(16 * 1000 * 1024), cell_cache_size / 16));
- ec_log_info("Setting object cache size: %lu", m_ObjectsCache.Size());
+ m_ObjectsCache.AddToSize(std::min((unsigned long long)(16 * 1000 * 1024), cell_cache_size / 16));
+ ec_log_info("Setting object cache size: %llu", m_ObjectsCache.Size());
}
if (atoll(lpConfig->GetSetting("cache_indexedobject_size")) == 0) {
- m_PropToObjectCache.AddToSize(std::min(size_t(32 * 1000 * 1024), cell_cache_size / 8));
- m_ObjectToPropCache.AddToSize(std::min(size_t(32 * 1000 * 1024), cell_cache_size / 8));
- ec_log_info("Setting indexedobject cache size: %lu", m_PropToObjectCache.Size());
+ m_PropToObjectCache.AddToSize(std::min((unsigned long long)(32 * 1000 * 1024), cell_cache_size / 8));
+ m_ObjectToPropCache.AddToSize(std::min((unsigned long long)(32 * 1000 * 1024), cell_cache_size / 8));
+ ec_log_info("Setting indexedobject cache size: %llu", m_PropToObjectCache.Size());
}
if (atoll(lpConfig->GetSetting("cache_quota_size")) == 0) {
- m_QuotaCache.AddToSize(std::min(size_t(1 * 1000 * 1024), cell_cache_size / 256));
- m_QuotaUserDefaultCache.AddToSize(std::min(size_t(1 * 1000 * 1024), cell_cache_size / 256));
- ec_log_info("Setting quota cache size: %lu", m_QuotaCache.Size());
+ m_QuotaCache.AddToSize(std::min((unsigned long long)(1 * 1000 * 1024), cell_cache_size / 256));
+ m_QuotaUserDefaultCache.AddToSize(std::min((unsigned long long)(1 * 1000 * 1024), cell_cache_size / 256));
+ ec_log_info("Setting quota cache size: %llu", m_QuotaCache.Size());
}
if (atoll(lpConfig->GetSetting("cache_userdetails_size")) == 0) {
- m_UserObjectCache.AddToSize(std::min(size_t(25 * 1000 * 1024), cell_cache_size / 10));
- m_UEIdObjectCache.AddToSize(std::min(size_t(25 * 1000 * 1024), cell_cache_size / 10));
- m_UserObjectDetailsCache.AddToSize(std::min(size_t(25 * 1000 * 1024), cell_cache_size / 10));
- ec_log_info("Setting userdetails cache size: %lu", m_UserObjectCache.Size());
+ m_UserObjectCache.AddToSize(std::min((unsigned long long)(25 * 1000 * 1024), cell_cache_size / 10));
+ m_UEIdObjectCache.AddToSize(std::min((unsigned long long)(25 * 1000 * 1024), cell_cache_size / 10));
+ m_UserObjectDetailsCache.AddToSize(std::min((unsigned long long)(25 * 1000 * 1024), cell_cache_size / 10));
+ ec_log_info("Setting userdetails cache size: %llu", m_UserObjectCache.Size());
}
/* Initial cleaning/initialization of cache */

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

@ -1,9 +1,9 @@
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.4 2018/03/16 15:35:02 robert Exp $
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.5 2018/03/29 19:41:46 robert Exp $
Index: provider/libserver/ECSession.cpp
--- provider/libserver/ECSession.cpp.orig
+++ provider/libserver/ECSession.cpp
@@ -736,11 +736,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
@@ -730,11 +730,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
uid_t uid;
char strbuf[1024];
#ifdef SO_PEERCRED

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

@ -1,9 +1,9 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.4 2018/03/16 15:35:02 robert Exp $
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.5 2018/03/29 19:41:46 robert Exp $
Index: provider/server/ECServer.cpp
--- provider/server/ECServer.cpp.orig
+++ provider/server/ECServer.cpp
@@ -67,6 +67,10 @@
@@ -68,6 +68,10 @@
#include <kcoidc.h>
#endif
@ -14,7 +14,7 @@ Index: provider/server/ECServer.cpp
// 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
@@ -878,10 +882,10 @@ static int running_server(char *szName, const char *sz
@@ -880,10 +884,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
@ -28,7 +28,7 @@ Index: provider/server/ECServer.cpp
{"allocator_library", "libtcmalloc_minimal.so.4"},
{ "coredump_enabled", "yes" },
@@ -925,7 +929,7 @@ static int running_server(char *szName, const char *sz
@@ -927,7 +931,7 @@ static int running_server(char *szName, const char *sz
{"attachment_s3_bucketname", ""},
{"attachment_s3_region", ""},
#endif
@ -37,7 +37,7 @@ Index: provider/server/ECServer.cpp
{ "attachment_compression", "6" },
// Log options
@@ -999,7 +1003,7 @@ static int running_server(char *szName, const char *sz
@@ -1001,7 +1005,7 @@ static int running_server(char *szName, const char *sz
{"client_update_enabled", "no", CONFIGSETTING_UNUSED},
{"client_update_log_level", "1", CONFIGSETTING_UNUSED | CONFIGSETTING_RELOADABLE},

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

@ -1,9 +1,9 @@
$OpenBSD: patch-spooler_Spooler_cpp,v 1.4 2018/03/16 15:35:02 robert Exp $
$OpenBSD: patch-spooler_Spooler_cpp,v 1.5 2018/03/29 19:41:46 robert Exp $
Index: spooler/Spooler.cpp
--- spooler/Spooler.cpp.orig
+++ spooler/Spooler.cpp
@@ -911,10 +911,10 @@ int main(int argc, char *argv[]) {
@@ -912,10 +912,10 @@ int main(int argc, char *argv[]) {
{ "smtp_server","localhost", CONFIGSETTING_RELOADABLE },
{ "smtp_port","25", CONFIGSETTING_RELOADABLE },
{ "server_socket", "default:" },
@ -17,7 +17,7 @@ Index: spooler/Spooler.cpp
{"coredump_enabled", "systemdefault"},
{"log_method", "file", CONFIGSETTING_NONEMPTY},
{"log_file", "-", CONFIGSETTING_NONEMPTY},
@@ -938,8 +938,8 @@ int main(int argc, char *argv[]) {
@@ -939,8 +939,8 @@ int main(int argc, char *argv[]) {
{ "archive_on_send", "no", CONFIGSETTING_RELOADABLE },
{ "enable_dsn", "yes", CONFIGSETTING_RELOADABLE },
{ "plugin_enabled", "yes" },

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

@ -1,9 +1,9 @@
$OpenBSD: patch-swig_python_kopano_kopano_item_py,v 1.1 2018/03/18 11:30:55 robert Exp $
$OpenBSD: patch-swig_python_kopano_kopano_item_py,v 1.2 2018/03/29 19:41:46 robert Exp $
Index: swig/python/kopano/kopano/item.py
--- swig/python/kopano/kopano/item.py.orig
+++ swig/python/kopano/kopano/item.py
@@ -15,6 +15,7 @@ import struct
@@ -16,6 +16,7 @@ import struct
import time
import traceback
import warnings

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.7 2018/03/18 11:30:55 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2018/03/29 19:41:46 robert Exp $
@conflict zarafa-*
@pkgpath mail/zarafa/zarafa,-main
@newgroup _kopano:793
@ -77,7 +77,6 @@ include/kopano/director_util.h
include/kopano/ecversion.h
include/kopano/hl.hpp
include/kopano/kcodes.h
include/kopano/lockhelper.hpp
include/kopano/mapi_ptr.h
include/kopano/mapiext.h
include/kopano/mapiguidext.h
@ -195,6 +194,8 @@ lib/python${MODPY_VERSION}/site-packages/MAPI/Util/codepage.py
lib/python${MODPY_VERSION}/site-packages/MAPI/Util/codepage.pyc
lib/python${MODPY_VERSION}/site-packages/MAPI/__init__.py
lib/python${MODPY_VERSION}/site-packages/MAPI/__init__.pyc
lib/python${MODPY_VERSION}/site-packages/MAPI/version.py
lib/python${MODPY_VERSION}/site-packages/MAPI/version.pyc
lib/python${MODPY_VERSION}/site-packages/MAPICore.py
lib/python${MODPY_VERSION}/site-packages/MAPICore.pyc
lib/python${MODPY_VERSION}/site-packages/_MAPICore.a
@ -341,6 +342,8 @@ 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
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
@ -353,6 +356,8 @@ lib/python${MODPY_VERSION}/site-packages/kopano_presence/plugin_spreed.py
lib/python${MODPY_VERSION}/site-packages/kopano_presence/plugin_spreed.pyc
lib/python${MODPY_VERSION}/site-packages/kopano_presence/plugin_xmpp.py
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
@ -573,8 +578,6 @@ share/examples/kopano/quotamail/userwarning.mail
@sample ${SYSCONFDIR}/kopano/quotamail/userwarning.mail
share/examples/kopano/search.cfg
@sample ${SYSCONFDIR}/kopano/search.cfg
share/examples/kopano/spamd.cfg
@sample ${SYSCONFDIR}/kopano/spamd.cfg
share/examples/kopano/searchscripts/
@sample ${SYSCONFDIR}/kopano/searchscripts/
share/examples/kopano/searchscripts/attachments_parser
@ -595,6 +598,8 @@ share/examples/kopano/server.cfg
@sample ${SYSCONFDIR}/kopano/server.cfg
@mode
@group
share/examples/kopano/spamd.cfg
@sample ${SYSCONFDIR}/kopano/spamd.cfg
share/examples/kopano/spooler.cfg
@sample ${SYSCONFDIR}/kopano/spooler.cfg
share/examples/kopano/unix.cfg