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

update to 7.1.3

Browse Source
This commit is contained in:
robert 2013-01-27 13:06:20 +00:00
parent 8b029d5dbe
commit f0ecf70ce1
22 changed files with 226 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/zarafa/Makefile.inc
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile.inc,v 1.24 2012/10/28 21:51:08 robert Exp $
# $OpenBSD: Makefile.inc,v 1.25 2013/01/27 13:06:20 robert Exp $
SHARED_ONLY= Yes
V?= 7.1.1
BUILD?= 37812
V?= 7.1.3
BUILD?= 40304
DISTNAME?= zcp-${V}
CATEGORIES+= mail/zarafa

4
mail/zarafa/zarafa/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (zarafa/zcp-7.1.1.tar.gz) = FY8AIkV3AtsDCD4nq7riEgDAdqR+P1bheG7A2p8doFw=
SIZE (zarafa/zcp-7.1.1.tar.gz) = 6387204
SHA256 (zarafa/zcp-7.1.3.tar.gz) = 3CQj2sNQHfK/tViA60c1bBwCsr0M1jx07VinQq4s+RQ=
SIZE (zarafa/zcp-7.1.3.tar.gz) = 6462595

8
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-admin_zarafa-admin_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ECtools_zarafa-admin_zarafa-admin_cpp,v 1.2 2012/10/28 21:51:08 robert Exp $
--- ECtools/zarafa-admin/zarafa-admin.cpp.orig Thu Oct 18 19:06:57 2012
+++ ECtools/zarafa-admin/zarafa-admin.cpp Sun Oct 28 21:08:55 2012
@@ -2741,11 +2741,13 @@ int main(int argc, char* argv[])
$OpenBSD: patch-ECtools_zarafa-admin_zarafa-admin_cpp,v 1.3 2013/01/27 13:06:20 robert Exp $
--- ECtools/zarafa-admin/zarafa-admin.cpp.orig Wed Dec 5 16:06:37 2012
+++ ECtools/zarafa-admin/zarafa-admin.cpp Sun Jan 20 17:18:38 2013
@@ -2742,11 +2742,13 @@ int main(int argc, char* argv[])
case OPT_UTF8: {
// set early, so other arguments are parsed in this charset.
std::string locale;

8
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-search_ECIndexDB_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-ECtools_zarafa-search_ECIndexDB_cpp,v 1.1 2012/08/30 18:42:26 ajacoutot Exp $
$OpenBSD: patch-ECtools_zarafa-search_ECIndexDB_cpp,v 1.2 2013/01/27 13:06:20 robert Exp $
Fix buil with clucene-core >= 2.x
--- ECtools/zarafa-search/ECIndexDB.cpp.orig Wed Aug 8 17:14:58 2012
+++ ECtools/zarafa-search/ECIndexDB.cpp Thu Aug 30 16:38:06 2012
--- ECtools/zarafa-search/ECIndexDB.cpp.orig Wed Dec 5 16:06:37 2012
+++ ECtools/zarafa-search/ECIndexDB.cpp Sun Jan 20 17:18:38 2013
@@ -68,7 +68,7 @@
#include <string>
#include <algorithm>
@ -13,7 +13,7 @@ Fix buil with clucene-core >= 2.x
using namespace kyotocabinet;
@@ -290,7 +290,7 @@ HRESULT ECIndexDB::AddTerm(folderid_t folder, docid_t
@@ -304,7 +304,7 @@ HRESULT ECIndexDB::AddTerm(folderid_t folder, docid_t
unsigned int len;
unsigned int keylen;

8
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-search_ECIndexImporter_cpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-ECtools_zarafa-search_ECIndexImporter_cpp,v 1.1 2012/08/30 18:42:26 ajacoutot Exp $
$OpenBSD: patch-ECtools_zarafa-search_ECIndexImporter_cpp,v 1.2 2013/01/27 13:06:20 robert Exp $
ECIndexImporter.cpp:400:5: error: 'auto_ptr' was not declared in this scope
--- ECtools/zarafa-search/ECIndexImporter.cpp.orig Wed Aug 8 17:14:58 2012
+++ ECtools/zarafa-search/ECIndexImporter.cpp Thu Aug 30 17:16:04 2012
--- ECtools/zarafa-search/ECIndexImporter.cpp.orig Wed Dec 5 16:06:37 2012
+++ ECtools/zarafa-search/ECIndexImporter.cpp Sun Jan 20 17:18:38 2013
@@ -47,6 +47,7 @@
*
*/
@ -12,7 +12,7 @@ ECIndexImporter.cpp:400:5: error: 'auto_ptr' was not declared in this scope
#include "platform.h"
#include "ECIndexImporter.h"
@@ -433,7 +434,7 @@ HRESULT ECIndexImporter::ProcessThread()
@@ -437,7 +438,7 @@ HRESULT ECIndexImporter::ProcessThread()
ECIndexDB *lpIndex = NULL;
ECIndexDB *lpThisIndex = NULL;
ArchiveItem *lpArchiveItem = NULL;

8
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-search_zarafa-search_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ECtools_zarafa-search_zarafa-search_cpp,v 1.1 2012/08/30 14:28:22 ajacoutot Exp $
--- ECtools/zarafa-search/zarafa-search.cpp.orig Mon Aug 27 10:24:55 2012
+++ ECtools/zarafa-search/zarafa-search.cpp Mon Aug 27 10:25:21 2012
@@ -441,7 +441,7 @@ int main(int argc, char *argv[]) {
$OpenBSD: patch-ECtools_zarafa-search_zarafa-search_cpp,v 1.2 2013/01/27 13:06:20 robert Exp $
--- ECtools/zarafa-search/zarafa-search.cpp.orig Wed Dec 5 16:06:37 2012
+++ ECtools/zarafa-search/zarafa-search.cpp Sun Jan 20 17:18:38 2013
@@ -448,7 +448,7 @@ int main(int argc, char *argv[]) {
/* operational settings */
{ "limit_results", "0", CONFIGSETTING_RELOADABLE },
/* Indexer settings */

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

@ -1,7 +1,7 @@
$OpenBSD: patch-common_CommonUtil_cpp,v 1.4 2011/12/22 17:10:04 ajacoutot Exp $
--- common/CommonUtil.cpp.orig Thu Dec 22 01:02:33 2011
+++ common/CommonUtil.cpp Thu Dec 22 12:14:19 2011
@@ -85,6 +85,7 @@
$OpenBSD: patch-common_CommonUtil_cpp,v 1.5 2013/01/27 13:06:20 robert Exp $
--- common/CommonUtil.cpp.orig Wed Jan 23 13:42:30 2013
+++ common/CommonUtil.cpp Sun Jan 27 12:59:52 2013
@@ -87,6 +87,7 @@
#include <sys/types.h>
#include <sys/socket.h>

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

@ -1,6 +1,5 @@
$OpenBSD: patch-common_ECLogger_cpp,v 1.16 2012/10/29 19:07:40 robert Exp $
--- common/ECLogger.cpp.orig Thu Oct 18 19:06:56 2012
+++ common/ECLogger.cpp Mon Oct 29 20:06:21 2012
--- common/ECLogger.cpp.orig Wed Jan 23 13:42:30 2013
+++ common/ECLogger.cpp Sun Jan 27 13:13:59 2013
@@ -56,6 +56,10 @@
#include "stringutil.h"
#include "charset/localeutil.h"
@ -47,7 +46,19 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.16 2012/10/29 19:07:40 robert Exp $
strftime(timestring, _LOG_TSSIZE, "%c", &local);
return timestring;
@@ -230,7 +240,7 @@ void ECLogger_File::DoPrefix() {
@@ -146,7 +156,11 @@ int ECLogger::snprintf(char *str, size_t size, const c
int len = 0;
va_start(va, format);
+#ifndef __OpenBSD__
len = _vsnprintf_l(str, size, format, datalocale, va);
+#else
+ len = _vsnprintf_l(str, size, format, va);
+#endif
va_end(va);
return len;
@@ -242,7 +256,7 @@ void ECLogger_File::DoPrefix() {
if (timestamp)
fnPrintf(log, "%s: ", MakeTimestamp());
if (prefix == LP_TID)
@ -56,7 +67,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.16 2012/10/29 19:07:40 robert Exp $
else if (prefix == LP_PID)
fnPrintf(log, "[%5d] ", getpid());
}
@@ -290,7 +300,11 @@ void ECLogger_File::Log(int loglevel, const char *form
@@ -302,7 +316,11 @@ void ECLogger_File::Log(int loglevel, const char *form
void ECLogger_File::LogVA(int loglevel, const char *format, va_list& va) {
pthread_mutex_lock(&msgbuflock);
@ -68,7 +79,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.16 2012/10/29 19:07:40 robert Exp $
pthread_mutex_lock(&filelock);
@@ -433,7 +447,11 @@ void ECLogger_Tee::LogVA(int loglevel, const char *for
@@ -445,7 +463,11 @@ void ECLogger_Tee::LogVA(int loglevel, const char *for
LoggerList::iterator iLogger;
pthread_mutex_lock(&msgbuflock);
@ -80,7 +91,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.16 2012/10/29 19:07:40 robert Exp $
for (iLogger = m_loggers.begin(); iLogger != m_loggers.end(); ++iLogger)
(*iLogger)->Log(loglevel, std::string(msgbuffer));
@@ -482,7 +500,7 @@ void ECLogger_Pipe::Log(int loglevel, const std::strin
@@ -494,7 +516,7 @@ void ECLogger_Pipe::Log(int loglevel, const std::strin
off += 1;
if (prefix == LP_TID)
@ -89,7 +100,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.16 2012/10/29 19:07:40 robert Exp $
else if (prefix == LP_PID)
len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[%5d] ", getpid());
if (len < 0) len = 0;
@@ -518,14 +536,18 @@ void ECLogger_Pipe::LogVA(int loglevel, const char *fo
@@ -530,14 +552,18 @@ void ECLogger_Pipe::LogVA(int loglevel, const char *fo
off += 1;
if (prefix == LP_TID)
@ -109,7 +120,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.16 2012/10/29 19:07:40 robert Exp $
// -1 can be returned on formatting error (eg. %ls in C locale)
if (len < 0) len = 0;
len = min(len, _LOG_BUFSIZE -off -2); // yes, -2, otherwise we could have 2 \0 at the end of the buffer
@@ -598,9 +620,13 @@ namespace PrivatePipe {
@@ -610,9 +636,13 @@ namespace PrivatePipe {
int l;
bool bNPTL = true;

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

@ -1,10 +1,10 @@
$OpenBSD: patch-common_platform_h,v 1.7 2012/05/05 16:56:17 ajacoutot Exp $
--- common/platform.h.orig Thu May 3 16:37:09 2012
+++ common/platform.h Sat May 5 17:40:42 2012
@@ -55,7 +55,12 @@
$OpenBSD: patch-common_platform_h,v 1.8 2013/01/27 13:06:20 robert Exp $
--- common/platform.h.orig Sun Jan 20 17:29:12 2013
+++ common/platform.h Sun Jan 20 17:29:47 2013
@@ -70,7 +70,12 @@
// We have to include this now in case select.h is included too soon.
// Increase our maximum amount of file descriptors to 8192
// But only if you don't have a glibc that doesn't check for this compiletime limit
#ifndef _FORTIFY_SOURCE
+ #if OPENBSD
+ #include <sys/types.h>
+ #include <sys/select.h>
@ -13,4 +13,4 @@ $OpenBSD: patch-common_platform_h,v 1.7 2012/05/05 16:56:17 ajacoutot Exp $
+ #endif
#undef __FD_SETSIZE
#define __FD_SETSIZE 8192
#endif

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

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_manual_xml,v 1.32 2012/10/28 21:51:08 robert Exp $
--- doc/manual.xml.orig Thu Oct 18 18:15:31 2012
+++ doc/manual.xml Sun Oct 28 21:08:55 2012
$OpenBSD: patch-doc_manual_xml,v 1.33 2013/01/27 13:06:20 robert Exp $
--- doc/manual.xml.orig Wed Jan 23 12:48:32 2013
+++ doc/manual.xml Sun Jan 27 12:59:52 2013
@@ -850,9 +850,7 @@
<varlistentry>
<term><option>pid_file</option></term>
@ -34,7 +34,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.32 2012/10/28 21:51:08 robert Exp $
</para>
<para>
<command>
@@ -3600,9 +3596,7 @@
@@ -3611,9 +3607,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -45,7 +45,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.32 2012/10/28 21:51:08 robert Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-server.pid</replaceable>
@@ -6796,13 +6790,8 @@
@@ -6829,13 +6823,8 @@
</para>
<para>The spooler process will keep running and watching the
@ -61,7 +61,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.32 2012/10/28 21:51:08 robert Exp $
</refsection>
<refsection>
@@ -6983,9 +6972,7 @@
@@ -7016,9 +7005,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -72,7 +72,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.32 2012/10/28 21:51:08 robert Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-spooler.pid</replaceable>
@@ -7487,13 +7474,7 @@
@@ -7524,13 +7511,7 @@
<para><command>zarafa-gateway</command></para>
@ -87,7 +87,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.32 2012/10/28 21:51:08 robert Exp $
</refsection>
<refsection>
@@ -8162,14 +8143,8 @@
@@ -8209,14 +8190,8 @@
<para>The monitor checks user mailbox sizes. The monitor sends
a quota email when the warning quota limit is reached. When
@ -103,7 +103,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.32 2012/10/28 21:51:08 robert Exp $
</refsection>
<refsection>
@@ -8321,9 +8296,7 @@
@@ -8368,9 +8343,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -114,7 +114,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.32 2012/10/28 21:51:08 robert Exp $
</para>
<para>Default value: /var/run/zarafa-monitor.pid
</para>
@@ -9634,13 +9607,7 @@
@@ -9681,13 +9654,7 @@
<para><command>zarafa-ical</command></para>
@ -129,7 +129,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.32 2012/10/28 21:51:08 robert Exp $
</refsection>
<refsection>
@@ -9823,9 +9790,7 @@
@@ -9870,9 +9837,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -140,7 +140,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.32 2012/10/28 21:51:08 robert Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-ical.pid</replaceable>
@@ -10164,13 +10129,7 @@
@@ -10221,13 +10186,7 @@
<para><command>zarafa-licensed</command></para>
@ -155,7 +155,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.32 2012/10/28 21:51:08 robert Exp $
</refsection>
<refsection>
@@ -10340,9 +10299,7 @@
@@ -10397,9 +10356,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -166,7 +166,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.32 2012/10/28 21:51:08 robert Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-licensed.pid</replaceable>
@@ -11140,13 +11097,6 @@
@@ -11197,13 +11154,6 @@
<option>-c</option>
<replaceable>/path/to/search.cfg</replaceable>
</para>
@ -180,7 +180,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.32 2012/10/28 21:51:08 robert Exp $
</refsection>
<refsection>
@@ -11277,9 +11227,7 @@
@@ -11334,9 +11284,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_ldap_openldap_cfg,v 1.6 2012/08/30 14:28:22 ajacoutot Exp $
--- installer/linux/ldap.openldap.cfg.orig Mon Aug 27 10:46:45 2012
+++ installer/linux/ldap.openldap.cfg Mon Aug 27 10:47:02 2012
$OpenBSD: patch-installer_linux_ldap_openldap_cfg,v 1.7 2013/01/27 13:06:20 robert Exp $
--- installer/linux/ldap.openldap.cfg.orig Wed Jan 23 12:49:31 2013
+++ installer/linux/ldap.openldap.cfg Sun Jan 27 12:59:52 2013
@@ -15,7 +15,7 @@ ldap_port = 389
# LDAP protocol
@ -11,7 +11,7 @@ $OpenBSD: patch-installer_linux_ldap_openldap_cfg,v 1.6 2012/08/30 14:28:22 ajac
ldap_protocol = ldap
@@ -197,7 +197,7 @@ ldap_sendas_relation_attribute =
ldap_user_certificate_attribute = userCertificate
ldap_user_certificate_attribute = userCertificate;binary
# Load extra user properties from the propmap file
-!propmap /etc/zarafa/ldap.propmap.cfg

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_search_cfg,v 1.1 2012/08/30 14:28:22 ajacoutot Exp $
--- installer/linux/search.cfg.orig Mon Aug 27 10:21:32 2012
+++ installer/linux/search.cfg Mon Aug 27 10:22:48 2012
$OpenBSD: patch-installer_linux_search_cfg,v 1.2 2013/01/27 13:06:20 robert Exp $
--- installer/linux/search.cfg.orig Wed Dec 5 15:23:27 2012
+++ installer/linux/search.cfg Sun Jan 20 17:18:38 2013
@@ -2,19 +2,19 @@
# INDEXED SEARCH SERVICE SETTINGS
@ -47,7 +47,7 @@ $OpenBSD: patch-installer_linux_search_cfg,v 1.1 2012/08/30 14:28:22 ajacoutot E
##############################################################
# LOG SETTINGS
@@ -83,7 +83,7 @@ index_attachments = no
@@ -96,7 +96,7 @@ index_attachments = no
index_attachment_max_size = 5M
# Scripts to attachment to text parser

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_server_cfg,v 1.16 2012/08/30 14:28:22 ajacoutot Exp $
--- installer/linux/server.cfg.orig Wed Aug 8 16:35:34 2012
+++ installer/linux/server.cfg Mon Aug 27 10:35:52 2012
$OpenBSD: patch-installer_linux_server_cfg,v 1.17 2013/01/27 13:06:20 robert Exp $
--- installer/linux/server.cfg.orig Sun Jan 27 13:00:14 2013
+++ installer/linux/server.cfg Sun Jan 27 13:02:27 2013
@@ -42,16 +42,16 @@ local_admin_users = root
system_email_address = postmaster@localhost
@ -12,17 +12,16 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.16 2012/08/30 14:28:22 ajacoutot
-run_as_group =
+run_as_group = _zarafa
-# create a pid file for stopping the service via the init.d scripts
+# write the process ID number to this file
# create a pid file for stopping the service via the init.d scripts
pid_file = /var/run/zarafa-server.pid
# run server in this path (when not using the -F switch)
-running_path = /
+running_path = /var/empty
# session timeout for clients. Values lower than 300 will be upped to 300
# automatically. If the server hears nothing from a client in session_timeout
@@ -59,7 +59,7 @@ running_path = /
# create memory coredumps upon crash in the running_path directory
coredump_enabled = yes
@@ -62,7 +62,7 @@ coredump_enabled = yes
session_timeout = 300
# Socket to connect to license server
@ -31,7 +30,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.16 2012/08/30 14:28:22 ajacoutot
# Time (in seconds) to wait for a connection to the license server before
# terminating the request.
@@ -124,7 +124,7 @@ mysql_database = zarafa
@@ -127,7 +127,7 @@ mysql_database = zarafa
attachment_storage = files
# When attachment_storage is 'files', use this path to store the files
@ -40,7 +39,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.16 2012/08/30 14:28:22 ajacoutot
# Compression level for attachments when attachment_storage is 'files'.
# Set compression level for attachments disabled=0, max=9
@@ -140,19 +140,19 @@ server_ssl_enabled = no
@@ -143,22 +143,22 @@ server_ssl_enabled = no
server_ssl_port = 237
# Required Server certificate, contains the certificate and the private key parts
@ -56,7 +55,10 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.16 2012/08/30 14:28:22 ajacoutot
# Path with CA certificates, e.g. /etc/ssl/certs
-server_ssl_ca_path =
+server_ssl_ca_path = /etc/ssl/cert.pem
+server_ssl_ca_path = ${SYSCONFDIR}/ssl/cert.pem
# Accept SSLv2 only connections. Normally v3 connections are used.
server_ssl_enable_v2 = no
# Path of SSL Public keys of clients
-sslkeys_path = /etc/zarafa/sslkeys
@ -64,20 +66,19 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.16 2012/08/30 14:28:22 ajacoutot
##############################################################
# THREAD SETTINGS
@@ -281,23 +281,23 @@ companyquota_warn = 0
@@ -287,23 +287,24 @@ companyquota_warn = 0
# Name of the plugin that handles users
# Required, default = ldap
# Values: ldap, unix, db, ldapms (available in enterprise license)
+# note: the unix plugin is not yet supported on OpenBSD
user_plugin = db
-# configuration file of the user plugin, examples can be found in /usr/share/zarafa/example-config
# configuration file of the user plugin, examples can be found in /usr/share/zarafa/example-config
-user_plugin_config = /etc/zarafa/ldap.cfg
+# configuration file of the user plugin, examples can be found in ${PREFIX}/share/examples/zarafa
+user_plugin_config = ${SYSCONFDIR}/zarafa/ldap.cfg
# location of the zarafa plugins
-# if you have a 64bit distribution, this probably should be changed to /usr/lib64/zarafa
# if you have a 64bit distribution, this probably should be changed to /usr/lib64/zarafa
-plugin_path = /usr/lib/zarafa
+plugin_path = ${PREFIX}/lib/zarafa
@ -98,7 +99,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.16 2012/08/30 14:28:22 ajacoutot
# Set this option to 'yes' to skip the creation and deletion of new users
# The action will be logged, so you can see if your changes to the plugin
@@ -354,7 +354,7 @@ client_update_enabled = false
@@ -360,7 +361,7 @@ client_update_enabled = false
# Place the correct Zarafa Outlook Client in this directory for
# Windows clients to download through the Zarafa server

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_spooler_cfg,v 1.6 2012/08/30 14:28:22 ajacoutot Exp $
--- installer/linux/spooler.cfg.orig Wed Aug 8 16:35:33 2012
+++ installer/linux/spooler.cfg Mon Aug 27 10:32:59 2012
$OpenBSD: patch-installer_linux_spooler_cfg,v 1.7 2013/01/27 13:06:20 robert Exp $
--- installer/linux/spooler.cfg.orig Wed Jan 23 12:48:53 2013
+++ installer/linux/spooler.cfg Sun Jan 27 12:59:52 2013
@@ -11,16 +11,16 @@ smtp_port = 25
server_socket = file:///var/run/zarafa
@ -31,7 +31,7 @@ $OpenBSD: patch-installer_linux_spooler_cfg,v 1.6 2012/08/30 14:28:22 ajacoutot
# The password of the SSL Key
sslkey_pass = replace-with-server-cert-password
@@ -138,13 +138,13 @@ archive_on_send = no
@@ -140,13 +140,13 @@ archive_on_send = no
plugin_enabled = yes
# Path to the spooler plugin manager

14
mail/zarafa/zarafa/patches/patch-php-webclient-ajax_config_php_dist
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.7 2012/08/30 14:28:22 ajacoutot Exp $
--- php-webclient-ajax/config.php.dist.orig Mon Aug 27 10:01:07 2012
+++ php-webclient-ajax/config.php.dist Mon Aug 27 10:02:21 2012
@@ -11,9 +11,9 @@
define("CONFIG_CHECK", TRUE);
$OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.8 2013/01/27 13:06:20 robert Exp $
--- php-webclient-ajax/config.php.dist.orig Wed Dec 5 15:22:58 2012
+++ php-webclient-ajax/config.php.dist Sun Jan 20 17:18:38 2013
@@ -17,9 +17,9 @@
define("CONFIG_CHECK_COOKIES_SSL", FALSE);
// Default Zarafa server to connect to.
- define("DEFAULT_SERVER","file:///var/run/zarafa");
@ -13,7 +13,7 @@ $OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.7 2012/08/30 14:28:22 aja
// When using a single-signon system on your webserver, but Zarafa is on another server
// you can use https to access the zarafa server, and authenticate using an SSL certificate.
@@ -46,12 +46,13 @@
@@ -52,12 +52,13 @@
// Defines the temp path (absolute). Here uploaded attachments will be saved.
// The web client doesn't work without this directory.
@ -29,7 +29,7 @@ $OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.7 2012/08/30 14:28:22 aja
// Define the relative URL for dialogs, this string is appended with HTTP GET arguments
define("DIALOG_URL", "index.php?load=dialog&");
@@ -146,7 +147,7 @@
@@ -158,7 +159,7 @@
// Spellchecker, change here to enable
define('FCKEDITOR_SPELLCHECKER_ENABLED', false);

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

@ -1,7 +1,32 @@
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.9 2012/10/28 21:51:08 robert Exp $
--- provider/libserver/ECSession.cpp.orig Thu Oct 18 19:06:58 2012
+++ provider/libserver/ECSession.cpp Sun Oct 28 21:08:55 2012
@@ -820,11 +820,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.10 2013/01/27 13:06:20 robert Exp $
--- provider/libserver/ECSession.cpp.orig Wed Jan 23 13:42:32 2013
+++ provider/libserver/ECSession.cpp Sun Jan 27 12:59:53 2013
@@ -566,14 +566,23 @@ void ECSession::RemoveBusyState(pthread_t threadId)
i = m_mapBusyStates.find(threadId);
if(i != m_mapBusyStates.end()) {
+ // Since the specified thread is done now, record how much work it has done for us
+#if OPENBSD
+ struct tms end;
+
+ if(threadId) {
+ times(&end);
+
+ AddClocks((end.tms_utime / CLOCKS_PER_SEC) - timespec2dbl(i->second.threadstart), 0, GetTimeOfDay() - i->second.start);
+#else
clockid_t clock;
struct timespec end;
- // Since the specified thread is done now, record how much work it has done for us
if(pthread_getcpuclockid(threadId, &clock) == 0) {
clock_gettime(clock, &end);
AddClocks(timespec2dbl(end) - timespec2dbl(i->second.threadstart), 0, GetTimeOfDay() - i->second.start);
+#endif
} else {
ASSERT(FALSE);
}
@@ -867,11 +876,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
uid_t uid;
char strbuf[1024];
#ifdef SO_PEERCRED

33
mail/zarafa/zarafa/patches/patch-provider_libserver_ECStatsTables_cpp Normal file
View File

@ -0,0 +1,33 @@
$OpenBSD: patch-provider_libserver_ECStatsTables_cpp,v 1.1 2013/01/27 13:06:20 robert Exp $
--- provider/libserver/ECStatsTables.cpp.orig Wed Dec 5 16:06:38 2012
+++ provider/libserver/ECStatsTables.cpp Sun Jan 27 12:53:49 2013
@@ -319,15 +319,26 @@ void ECSessionStatsTable::GetSessionData(ECSession *lp
// To get up-to-date CPU stats, check each of the active threads on the session
// for their CPU usage, and add that to the already-logged time on the session
for (iterBS = sd.busystates.begin(); iterBS != sd.busystates.end(); iterBS++) {
+#ifdef OPENBSD
+ struct tms now;
+
+ if(iterBS->threadid == NULL)
+ continue;
+
+ times(&now);
+
+ sd.dblUser += (now.tms_utime / CLOCKS_PER_SEC) - timespec2dbl(iterBS->threadstart);
+#else
clockid_t clock;
struct timespec now;
-
+
if(pthread_getcpuclockid(iterBS->threadid, &clock) != 0)
continue;
-
+
clock_gettime(clock, &now);
-
+
sd.dblUser += timespec2dbl(now) - timespec2dbl(iterBS->threadstart);
+#endif
sd.dblReal += GetTimeOfDay() - iterBS->start;
}

30
mail/zarafa/zarafa/patches/patch-provider_libserver_ZarafaCmd_cpp
View File

@ -1,10 +1,10 @@
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.25 2012/10/28 21:51:08 robert Exp $
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.26 2013/01/27 13:06:20 robert Exp $
OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
--- provider/libserver/ZarafaCmd.cpp.orig Thu Oct 18 19:06:58 2012
+++ provider/libserver/ZarafaCmd.cpp Sun Oct 28 21:08:55 2012
@@ -546,10 +546,10 @@ int ns__logon(struct soap *soap, char *user, char *pas
--- provider/libserver/ZarafaCmd.cpp.orig Sun Jan 20 17:29:55 2013
+++ provider/libserver/ZarafaCmd.cpp Sun Jan 20 17:34:41 2013
@@ -542,10 +542,10 @@ int ns__logon(struct soap *soap, char *user, char *pas
ECLicenseClient *lpLicenseClient = NULL;
unsigned int ulLicenseResponse;
unsigned char *lpLicenseResponse = NULL;
@ -17,7 +17,7 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020llu: S logon", sessionID);
@@ -646,9 +646,9 @@ exit:
@@ -642,9 +642,9 @@ exit:
lpsResponse->er = er;
@ -29,7 +29,7 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
return SOAP_OK;
}
@@ -666,10 +666,10 @@ int ns__ssoLogon(struct soap *soap, ULONG64 ulSessionI
@@ -662,10 +662,10 @@ int ns__ssoLogon(struct soap *soap, ULONG64 ulSessionI
xsd__base64Binary *lpOutput = NULL;
char* lpszEnabled = NULL;
ECLicenseClient*lpLicenseClient = NULL;
@ -42,7 +42,7 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020"PRIu64": S ssoLogon", ulSessionId);
@@ -817,9 +817,9 @@ exit:
@@ -813,9 +813,9 @@ exit:
nosso:
lpsResponse->er = er;
@ -54,7 +54,7 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
return SOAP_OK;
}
@@ -831,10 +831,10 @@ int ns__logoff(struct soap *soap, ULONG64 ulSessionId,
@@ -827,10 +827,10 @@ int ns__logoff(struct soap *soap, ULONG64 ulSessionId,
{
ECRESULT er = erSuccess;
ECSession *lpecSession = NULL;
@ -67,7 +67,7 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020"PRIu64": S logoff", ulSessionId);
@@ -856,20 +856,20 @@ int ns__logoff(struct soap *soap, ULONG64 ulSessionId,
@@ -852,20 +852,20 @@ int ns__logoff(struct soap *soap, ULONG64 ulSessionId,
exit:
*result = er;
@ -92,21 +92,15 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020"PRIu64": S %s", ulSessionId, szFname); \
er = g_lpSessionManager->ValidateSession(soap, ulSessionId, &lpecSession, true);\
const bool bSupportUnicode = (er == erSuccess ? (lpecSession->GetCapabilities() & ZARAFA_CAP_UNICODE) != 0 : false); \
@@ -881,12 +881,12 @@ exit:
@@ -879,9 +879,9 @@ exit:
#define SOAP_ENTRY_FUNCTION_FOOTER \
__soapentry_exit: \
*lpResultVar = er; \
- clock_gettime(CLOCK_THREAD_CPUTIME_ID, &endTimes); \
+ times(&endTimes); \
if(lpecSession) { \
- lpecSession->AddClocks( timespec2dbl(endTimes) - timespec2dbl(startTimes), \
- 0, \
- GetTimeOfDay() - dblStart); \
- LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020"PRIu64": E %s 0x%08x %f %f", ulSessionId, szFname, er, timespec2dbl(endTimes) - timespec2dbl(startTimes), GetTimeOfDay() - dblStart); \
+ lpecSession->AddClocks( (double)(endTimes.tms_utime - startTimes.tms_utime) / CLOCKS_PER_SEC, \
+ (double)(endTimes.tms_stime - startTimes.tms_stime) / CLOCKS_PER_SEC, \
+ GetTimeOfDay() - dblStart); \
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_DEBUG, "%llu: E %s %f %f", ulSessionId, szFname, (double)(endTimes.tms_utime - startTimes.tms_utime) / CLOCKS_PER_SEC, GetTimeOfDay() - dblStart); \
lpecSession->RemoveBusyState(pthread_self()); \
+ LOG_SOAP_DEBUG(g_lpSessionManager->GetLogger(), "%020"PRIu64": E %s 0x%08x %f %f", ulSessionId, szFname, er, (double)(endTimes.tms_stime - startTimes.tms_stime) / CLOCKS_PER_SEC, GetTimeOfDay() - dblStart); \
lpecSession->UpdateBusyState(pthread_self(), SESSION_STATE_SENDING); \
lpecSession->Unlock(); \
} \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.24 2012/10/28 21:51:09 robert Exp $
--- provider/server/ECServer.cpp.orig Thu Oct 18 19:06:57 2012
+++ provider/server/ECServer.cpp Sun Oct 28 21:08:55 2012
@@ -87,6 +87,10 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.25 2013/01/27 13:06:20 robert Exp $
--- provider/server/ECServer.cpp.orig Wed Jan 23 13:42:31 2013
+++ provider/server/ECServer.cpp Sun Jan 27 12:59:53 2013
@@ -90,6 +90,10 @@
#include "unicode/uclean.h"
#endif
@ -12,7 +12,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.24 2012/10/28 21:51:09 robert E
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
@@ -897,7 +901,7 @@ int running_server(char *szName, const char *szConfig,
@@ -911,7 +915,7 @@ int running_server(char *szName, const char *szConfig,
{ "mysql_config_file", "/etc/zarafa/my.cnf" },
#endif
{ "attachment_storage", "database" },
@ -21,7 +21,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.24 2012/10/28 21:51:09 robert E
{ "attachment_compression", "6" },
// Log options
@@ -970,7 +974,7 @@ int running_server(char *szName, const char *szConfig,
@@ -984,7 +988,7 @@ int running_server(char *szName, const char *szConfig,
{ "client_update_enabled", "no" },
{ "client_update_log_level", "1", CONFIGSETTING_RELOADABLE },
@ -30,7 +30,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.24 2012/10/28 21:51:09 robert E
{ "client_update_log_path", "/var/log/zarafa/autoupdate", CONFIGSETTING_RELOADABLE },
{ "index_services_enabled", "", CONFIGSETTING_UNUSED },
{ "index_services_path", "", CONFIGSETTING_UNUSED },
@@ -999,10 +1003,14 @@ int running_server(char *szName, const char *szConfig,
@@ -1013,10 +1017,14 @@ int running_server(char *szName, const char *szConfig,
{ NULL, NULL },
};

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

@ -1,7 +1,11 @@
$OpenBSD: patch-provider_server_ECThreadManager_cpp,v 1.2 2012/05/05 16:56:17 ajacoutot Exp $
--- provider/server/ECThreadManager.cpp.orig Thu May 3 16:37:11 2012
+++ provider/server/ECThreadManager.cpp Sat May 5 17:42:32 2012
@@ -164,7 +164,7 @@ void *ECWorkerThread::Work(void *lpParam)
$OpenBSD: patch-provider_server_ECThreadManager_cpp,v 1.3 2013/01/27 13:06:20 robert Exp $
--- provider/server/ECThreadManager.cpp.orig Wed Dec 5 16:06:37 2012
+++ provider/server/ECThreadManager.cpp Mon Jan 21 20:15:05 2013
@@ -161,10 +161,11 @@ void *ECWorkerThread::Work(void *lpParam)
ECPriorityWorkerThread *lpPrio = dynamic_cast<ECPriorityWorkerThread*>(lpThis);
WORKITEM *lpWorkItem = NULL;
ECRESULT er = erSuccess;
+ struct tms tstart;
bool fStop = false;
int err = 0;
@ -10,7 +14,7 @@ $OpenBSD: patch-provider_server_ECThreadManager_cpp,v 1.2 2012/05/05 16:56:17 aj
while(1) {
// Get the next work item, don't wait for new items
@@ -174,7 +174,7 @@ void *ECWorkerThread::Work(void *lpParam)
@@ -174,7 +175,7 @@ void *ECWorkerThread::Work(void *lpParam)
// We were requested to exit due to idle state
if(fStop) {
@ -19,3 +23,13 @@ $OpenBSD: patch-provider_server_ECThreadManager_cpp,v 1.2 2012/05/05 16:56:17 aj
break;
}
@@ -203,7 +204,8 @@ void *ECWorkerThread::Work(void *lpParam)
((SOAPINFO *)lpWorkItem->soap->user)->ulLastSessionId = 0;
// Pass information on start time of the request into soap->user, so that it can be applied to the correct
// session after XML parsing
- clock_gettime(CLOCK_THREAD_CPUTIME_ID, &((SOAPINFO *)lpWorkItem->soap->user)->threadstart);
+ times(&tstart);
+ ((SOAPINFO *)lpWorkItem->soap->user)->threadstart.tv_sec = tstart.tms_utime / CLOCKS_PER_SEC;
((SOAPINFO *)lpWorkItem->soap->user)->start = GetTimeOfDay();
((SOAPINFO *)lpWorkItem->soap->user)->szFname = NULL;

39
mail/zarafa/zarafa/patches/patch-provider_soap_soapdefs_h
View File

@ -1,26 +1,27 @@
$OpenBSD: patch-provider_soap_soapdefs_h,v 1.6 2012/08/30 14:28:22 ajacoutot Exp $
--- provider/soap/soapdefs.h.orig Wed Aug 8 17:14:56 2012
+++ provider/soap/soapdefs.h Thu Aug 30 15:25:51 2012
@@ -6,7 +6,9 @@
$OpenBSD: patch-provider_soap_soapdefs_h,v 1.7 2013/01/27 13:06:20 robert Exp $
--- provider/soap/soapdefs.h.orig Sun Jan 20 17:35:20 2013
+++ provider/soap/soapdefs.h Sun Jan 20 17:36:35 2013
@@ -6,13 +6,20 @@
* gSoap will not undef HAVE_STRTOD_L and HAVE_SPRINTF_L (if they
* were defined in the first place).
*/
+#ifndef __OpenBSD__
+#ifndef __OpenBSD__
#define WITH_C_LOCALE
+#endif
+#endif
#include <platform.h>
@@ -17,7 +19,12 @@
* this limit.
*/
#ifndef _FORTIFY_SOURCE
+# ifdef __OpenBSD__
+# include <sys/types.h>
+# include <sys/select.h>
+# else
# include <bits/types.h>
+#endif
# undef __FD_SETSIZE
# define __FD_SETSIZE 8192
#endif
-# include <bits/types.h>
-# undef __FD_SETSIZE
-# define __FD_SETSIZE 8192
+#ifdef __OpenBSD__
+#include <sys/types.h>
+#include <sys/select.h>
+#else
+#include <bits/types.h>
+#endif
+#undef __FD_SETSIZE
+#define __FD_SETSIZE 8192
#endif // ndef SOAPDEFS_H_

4
mail/zarafa/zarafa/pkg/PLIST-web
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-web,v 1.19 2012/08/30 14:28:22 ajacoutot Exp $
@comment $OpenBSD: PLIST-web,v 1.20 2013/01/27 13:06:20 robert Exp $
@conflict php5-mapi-*
@pkgpath mail/zarafa/webaccess
@pkgpath mail/zarafa/zarafa,-php
@ -920,6 +920,7 @@ zarafa-webaccess/server/PEAR/XML/Unserializer.php
zarafa-webaccess/server/PEAR/XML/Util.php
zarafa-webaccess/server/class.configcheck.php
zarafa-webaccess/server/core/
zarafa-webaccess/server/core/class.attachmentstate.php
zarafa-webaccess/server/core/class.bus.php
zarafa-webaccess/server/core/class.conversion.php
zarafa-webaccess/server/core/class.createZipArchive.php
@ -1100,6 +1101,7 @@ zarafa-webaccess/server/modules/class.todayappointmentlistmodule.php
zarafa-webaccess/server/modules/class.todayfolderlistmodule.php
zarafa-webaccess/server/modules/class.todaytasklistmodule.php
zarafa-webaccess/server/modules/class.usergroupmodule.php
zarafa-webaccess/server/sys_get_temp_dir.php
zarafa-webaccess/server/upload_attachment.php
zarafa-webaccess/server/util.php
zarafa-webaccess/static.php