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

Update to zarafa-6.40.7.

Browse Source 
Changelog available at
http://download.zarafa.com/community/final/6.40/changelog-6.40.txt
This commit is contained in:
ajacoutot 2011-03-29 18:00:03 +00:00
parent 697fb0300b
commit 22e533a3b9
11 changed files with 70 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/zarafa/Makefile.inc
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.6 2011/03/11 08:43:21 ajacoutot Exp $
# $OpenBSD: Makefile.inc,v 1.7 2011/03/29 18:00:03 ajacoutot Exp $
# there is no point in building/running this on NO_SHARED_LIBS archs
SHARED_ONLY= Yes
V?= 6.40.6
BUILD?= 25584
V?= 6.40.7
BUILD?= 26119
DISTNAME?= zcp-${V}
DIST_SUBDIR?= zarafa

5
mail/zarafa/zarafa/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.71 2011/03/24 06:43:44 landry Exp $
# $OpenBSD: Makefile,v 1.72 2011/03/29 18:00:03 ajacoutot Exp $
COMMENT-main= MS Exchange groupware suite replacement
COMMENT-web= zarafa webaccess frontend and MAPI extensions for PHP
@ -7,9 +7,6 @@ PKGNAME= zarafa-${V}
PKGNAME-main= zarafa-${V}
PKGNAME-web= zarafa-webaccess-${V}
REVISION-main= 1
REVISION-web= 0
CATEGORIES= mail www productivity
SHARED_LIBS += common_util 1.0 # 1.0

10
mail/zarafa/zarafa/distinfo
View File

@ -1,5 +1,5 @@
MD5 (zarafa/zcp-6.40.6.tar.gz) = NOsYjn/lp8oZ8t41gIVbEA==
RMD160 (zarafa/zcp-6.40.6.tar.gz) = MuRgQd9O/MGklDsa95pjR6md2pc=
SHA1 (zarafa/zcp-6.40.6.tar.gz) = TXVT5zsik0+KLd50f8eaIXXPGIU=
SHA256 (zarafa/zcp-6.40.6.tar.gz) = tSl0WO2Y4tB/E4rJnDhpAMLfTWNn/8GSPE/x3k2mh5k=
SIZE (zarafa/zcp-6.40.6.tar.gz) = 5355842
MD5 (zarafa/zcp-6.40.7.tar.gz) = K+YQDXPi1Od1bMp8hxhJrA==
RMD160 (zarafa/zcp-6.40.7.tar.gz) = 1U3u1S1omYAjIcvQtvHKmZtur40=
SHA1 (zarafa/zcp-6.40.7.tar.gz) = R2bwUi4yphSdu9sBXJ1NXGyga4c=
SHA256 (zarafa/zcp-6.40.7.tar.gz) = hp0llwSF4yp+UyO3ujBe8xRtdHRbdGbhOmHZFTMqsq4=
SIZE (zarafa/zcp-6.40.7.tar.gz) = 5362979

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

@ -1,9 +1,9 @@
$OpenBSD: patch-common_ECLogger_cpp,v 1.7 2010/08/22 10:13:27 ajacoutot Exp $
--- common/ECLogger.cpp.orig Tue Aug 3 14:51:42 2010
+++ common/ECLogger.cpp Sun Aug 22 10:32:31 2010
@@ -54,6 +54,10 @@
#include <zlib.h>
$OpenBSD: patch-common_ECLogger_cpp,v 1.8 2011/03/29 18:00:03 ajacoutot Exp $
--- common/ECLogger.cpp.orig Tue Mar 29 00:04:07 2011
+++ common/ECLogger.cpp Tue Mar 29 17:48:35 2011
@@ -55,6 +55,10 @@
#include <assert.h>
#include "stringutil.h"
+#ifdef __OpenBSD__
+#include <signal.h>
@ -12,7 +12,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.7 2010/08/22 10:13:27 ajacoutot Exp $
#include "config.h"
#if HAVE_SYSLOG_H
#include <syslog.h>
@@ -162,7 +166,7 @@ ECLogger_File::~ECLogger_File() {
@@ -164,7 +168,7 @@ ECLogger_File::~ECLogger_File() {
if (timestamp)
fnPrintf(log, "%s: ", MakeTimestamp());
if (prefix == LP_TID)
@ -21,7 +21,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.7 2010/08/22 10:13:27 ajacoutot Exp $
else if (prefix == LP_PID)
fnPrintf(log, "[%5d] ", getpid());
fnPrintf(log, "Previous message logged %d times\n", prevcount);
@@ -204,7 +208,7 @@ bool ECLogger_File::DupFilter(const std::string &messa
@@ -206,7 +210,7 @@ bool ECLogger_File::DupFilter(const std::string &messa
if (timestamp)
fnPrintf(log, "%s: ", MakeTimestamp());
if (prefix == LP_TID)
@ -30,7 +30,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.7 2010/08/22 10:13:27 ajacoutot Exp $
else if (prefix == LP_PID)
fnPrintf(log, "[%5d] ", getpid());
fnPrintf(log, "Previous message logged %d times\n", prevcount);
@@ -251,7 +255,7 @@ void ECLogger_File::Log(int loglevel, const char *form
@@ -257,7 +261,7 @@ void ECLogger_File::LogVA(int loglevel, const char *fo
if (timestamp)
fnPrintf(log, "%s: ", MakeTimestamp());
if (prefix == LP_TID)
@ -39,7 +39,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.7 2010/08/22 10:13:27 ajacoutot Exp $
else if (prefix == LP_PID)
fnPrintf(log, "[%5d] ", getpid());
fnPrintf(log, "%s\n", msgbuffer);
@@ -330,7 +334,7 @@ void ECLogger_Pipe::Log(int loglevel, const std::strin
@@ -343,7 +347,7 @@ void ECLogger_Pipe::Log(int loglevel, const std::strin
off += 1;
if (prefix == LP_TID)
@ -48,7 +48,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.7 2010/08/22 10:13:27 ajacoutot Exp $
else if (prefix == LP_PID)
len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[%5d] ", getpid());
off += len;
@@ -359,7 +363,7 @@ void ECLogger_Pipe::Log(int loglevel, const char *form
@@ -377,7 +381,7 @@ void ECLogger_Pipe::LogVA(int loglevel, const char *fo
off += 1;
if (prefix == LP_TID)
@ -57,8 +57,8 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.7 2010/08/22 10:13:27 ajacoutot Exp $
else if (prefix == LP_PID)
len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[%5d] ", getpid());
off += len;
@@ -572,8 +576,8 @@ ECLogger* CreateLogger(ECConfig *lpConfig, char *argv0
lpLogger = new ECLogger_File(atoi(lpConfig->GetSetting("log_level")), atoi(lpConfig->GetSetting("log_timestamp")), lpConfig->GetSetting("log_file"), false);
@@ -607,8 +611,8 @@ ECLogger* CreateLogger(ECConfig *lpConfig, char *argv0
lpConfig->GetSetting((prepend+"log_file").c_str()), false);
// chown file
if (pw || gr) {
- uid_t uid = -1;

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

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_manual_xml,v 1.16 2011/03/11 08:44:44 ajacoutot Exp $
--- doc/manual.xml.orig Sun Feb 27 19:33:42 2011
+++ doc/manual.xml Thu Mar 10 17:22:03 2011
$OpenBSD: patch-doc_manual_xml,v 1.17 2011/03/29 18:00:03 ajacoutot Exp $
--- doc/manual.xml.orig Mon Mar 28 20:32:05 2011
+++ doc/manual.xml Tue Mar 29 17:48:35 2011
@@ -837,9 +837,7 @@
<varlistentry>
<term><option>pid_file</option></term>
@ -35,7 +35,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.16 2011/03/11 08:44:44 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-server.pid</replaceable>
@@ -5678,13 +5669,8 @@
@@ -5750,13 +5741,8 @@
</para>
<para>The spooler process will keep running and watching the
@ -51,7 +51,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.16 2011/03/11 08:44:44 ajacoutot Exp $
</refsection>
<refsection>
@@ -5856,9 +5842,7 @@
@@ -5928,9 +5914,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -62,7 +62,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.16 2011/03/11 08:44:44 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-spooler.pid</replaceable>
@@ -6244,13 +6228,8 @@
@@ -6316,13 +6300,8 @@
<para><command>zarafa-gateway</command></para>
@ -78,7 +78,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.16 2011/03/11 08:44:44 ajacoutot Exp $
</refsection>
<refsection>
@@ -6489,9 +6468,7 @@
@@ -6561,9 +6540,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -89,7 +89,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.16 2011/03/11 08:44:44 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-gateway.pid</replaceable>
@@ -6872,14 +6849,8 @@
@@ -6944,14 +6921,8 @@
<para>The monitor checks user mailbox sizes. The monitor sends
a quota email when the warning quota limit is reached. When
@ -105,7 +105,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.16 2011/03/11 08:44:44 ajacoutot Exp $
</refsection>
<refsection>
@@ -7031,9 +7002,7 @@
@@ -7103,9 +7074,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -116,7 +116,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.16 2011/03/11 08:44:44 ajacoutot Exp $
</para>
<para>Default value: /var/run/zarafa-monitor.pid
</para>
@@ -8286,13 +8255,8 @@
@@ -8358,13 +8327,8 @@
<para><command>zarafa-ical</command></para>
@ -132,7 +132,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.16 2011/03/11 08:44:44 ajacoutot Exp $
</refsection>
<refsection>
@@ -8475,9 +8439,7 @@
@@ -8547,9 +8511,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -143,7 +143,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.16 2011/03/11 08:44:44 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-ical.pid</replaceable>
@@ -8791,13 +8753,8 @@
@@ -8863,13 +8825,8 @@
<para><command>zarafa-licensed</command></para>
@ -159,7 +159,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.16 2011/03/11 08:44:44 ajacoutot Exp $
</refsection>
<refsection>
@@ -8941,9 +8898,7 @@
@@ -9013,9 +8970,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_Makefile_in,v 1.14 2011/03/11 08:44:44 ajacoutot Exp $
--- installer/linux/Makefile.in.orig Sun Feb 27 19:34:34 2011
+++ installer/linux/Makefile.in Thu Mar 10 17:24:40 2011
$OpenBSD: patch-installer_linux_Makefile_in,v 1.15 2011/03/29 18:00:03 ajacoutot Exp $
--- installer/linux/Makefile.in.orig Mon Mar 28 20:32:51 2011
+++ installer/linux/Makefile.in Tue Mar 29 17:48:35 2011
@@ -55,15 +55,15 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGUR
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/common/config.h
@ -65,7 +65,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.14 2011/03/11 08:44:44 ajacoutot
autorespond $(am__append_2) $(BUILT_SOURCES)
rhel_initscript_files = zarafa-server.init.rhel \
zarafa-spooler.init.rhel zarafa-gateway.init.rhel \
@@ -465,15 +464,7 @@ uninstall-dist_sysconf_configDATA:
@@ -466,15 +465,7 @@ uninstall-dist_sysconf_configDATA:
echo " rm -f '$(DESTDIR)$(sysconf_configdir)/$$f'"; \
rm -f "$(DESTDIR)$(sysconf_configdir)/$$f"; \
done
@ -82,7 +82,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.14 2011/03/11 08:44:44 ajacoutot
uninstall-dist_sysconf_rotateDATA:
@$(NORMAL_UNINSTALL)
@@ -537,7 +528,7 @@ check: $(BUILT_SOURCES)
@@ -538,7 +529,7 @@ check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
@ -91,7 +91,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.14 2011/03/11 08:44:44 ajacoutot
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -584,9 +575,9 @@ info: info-am
@@ -585,9 +576,9 @@ info: info-am
info-am:
@ -103,7 +103,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.14 2011/03/11 08:44:44 ajacoutot
install-sysconf_sysconfigDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -666,13 +657,7 @@ ldapms.active-directory.cfg: ldap.m4
@@ -667,13 +658,7 @@ ldapms.active-directory.cfg: ldap.m4
m4 -DTYPE=ADS -DMULTISERVER=1 ${top_srcdir}/installer/linux/ldap.m4 > $@
install-data-hook:
@ -117,7 +117,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.14 2011/03/11 08:44:44 ajacoutot
if test ${DISTRO} = "sles" -o ${DISTRO} = "suse"; then \
mv ${DESTDIR}${sysconf_sysconfigdir}/sysconfig.suse ${DESTDIR}${sysconf_sysconfigdir}/sysconfig.zarafa || true; \
mv ${DESTDIR}${sysconf_sysconfigdir}/sysconfig-indexer.suse ${DESTDIR}${sysconf_sysconfigdir}/sysconfig.zarafa-indexer || true; \
@@ -687,18 +672,6 @@ install-data-hook:
@@ -688,18 +673,6 @@ install-data-hook:
fi; \
else \
true; \

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_server_cfg,v 1.8 2011/03/03 13:16:05 ajacoutot Exp $
--- installer/linux/server.cfg.orig Mon Jan 24 12:03:45 2011
+++ installer/linux/server.cfg Tue Jan 25 12:57:48 2011
$OpenBSD: patch-installer_linux_server_cfg,v 1.9 2011/03/29 18:00:03 ajacoutot Exp $
--- installer/linux/server.cfg.orig Mon Mar 28 20:32:18 2011
+++ installer/linux/server.cfg Tue Mar 29 17:48:35 2011
@@ -39,16 +39,16 @@ local_admin_users = root
system_email_address = postmaster@localhost
@ -31,7 +31,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.8 2011/03/03 13:16:05 ajacoutot E
# Time (in seconds) to wait for a connection to the license server before
# terminating the request.
@@ -96,10 +96,10 @@ mysql_password =
@@ -114,10 +114,10 @@ mysql_password =
mysql_database = zarafa
# Where to place attachments. Value can be 'database' or 'files'
@ -44,7 +44,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.8 2011/03/03 13:16:05 ajacoutot E
# Compression level for attachments when attachment_storage is 'files'.
# Set compression level for attachments disabled=0, max=9
@@ -115,19 +115,19 @@ server_ssl_enabled = no
@@ -133,19 +133,19 @@ server_ssl_enabled = no
server_ssl_port = 237
# Required Server certificate, contains the certificate and the private key parts
@ -68,7 +68,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.8 2011/03/03 13:16:05 ajacoutot E
##############################################################
# THREAD SETTINGS
@@ -253,23 +253,24 @@ companyquota_warn = 0
@@ -271,23 +271,24 @@ companyquota_warn = 0
# Name of the plugin that handles users
# Required, default = ldap
# Values: ldap, unix, db
@ -102,7 +102,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.8 2011/03/03 13:16:05 ajacoutot E
# 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
@@ -326,7 +327,7 @@ client_update_enabled = false
@@ -344,7 +345,7 @@ client_update_enabled = false
# Place the correct Zarafa Outlook Client in this directory for
# Windows clients to download through the Zarafa server

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_spooler_cfg,v 1.2 2009/07/31 09:55:56 ajacoutot Exp $
--- installer/linux/spooler.cfg.orig Wed Jul 22 16:06:58 2009
+++ installer/linux/spooler.cfg Wed Jul 22 16:07:44 2009
$OpenBSD: patch-installer_linux_spooler_cfg,v 1.3 2011/03/29 18:00:03 ajacoutot Exp $
--- installer/linux/spooler.cfg.orig Mon Mar 28 20:32:18 2011
+++ installer/linux/spooler.cfg Tue Mar 29 19:27:37 2011
@@ -8,16 +8,16 @@ smtp_server = localhost
server_socket = file:///var/run/zarafa
@ -31,3 +31,11 @@ $OpenBSD: patch-installer_linux_spooler_cfg,v 1.2 2009/07/31 09:55:56 ajacoutot
# The password of the SSL Key
sslkey_pass = replace-with-server-cert-password
@@ -52,6 +52,7 @@ sslkey_pass = replace-with-server-cert-password
# Maximum number of threads used to send outgoing messages
# Default: 5
+# OpenBSD will always only use 1 thread whatever value is set
max_threads = 5
##############################################################

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

@ -1,6 +1,6 @@
$OpenBSD: patch-provider_client_WSTransport_cpp,v 1.5 2010/06/30 02:46:48 ajacoutot Exp $
--- provider/client/WSTransport.cpp.orig Mon May 31 19:28:58 2010
+++ provider/client/WSTransport.cpp Mon Jun 14 09:16:44 2010
$OpenBSD: patch-provider_client_WSTransport_cpp,v 1.6 2011/03/29 18:00:03 ajacoutot Exp $
--- provider/client/WSTransport.cpp.orig Tue Mar 29 00:04:09 2011
+++ provider/client/WSTransport.cpp Tue Mar 29 17:48:35 2011
@@ -56,6 +56,10 @@
#include <fstream>
@ -20,7 +20,7 @@ $OpenBSD: patch-provider_client_WSTransport_cpp,v 1.5 2010/06/30 02:46:48 ajacou
// The header files we use for communication with the server
#include "ZarafaCode.h"
#include "soapZarafaCmdProxy.h"
@@ -90,6 +93,10 @@ static char THIS_FILE[] = __FILE__;
@@ -92,6 +95,10 @@ static char THIS_FILE[] = __FILE__;
#endif
#define pbMUIDECSABGuid "\xac\x21\xa9\x50\x40\xd3\xee\x48\xb3\x19\xfb\xa7\x53\x30\x44\x25"

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

@ -1,6 +1,6 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.9 2011/03/03 13:16:05 ajacoutot Exp $
--- provider/server/ECServer.cpp.orig Mon Jan 24 16:55:05 2011
+++ provider/server/ECServer.cpp Tue Jan 25 12:56:18 2011
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.10 2011/03/29 18:00:03 ajacoutot Exp $
--- provider/server/ECServer.cpp.orig Tue Mar 29 00:04:09 2011
+++ provider/server/ECServer.cpp Tue Mar 29 17:48:35 2011
@@ -82,6 +82,10 @@
#include <libintl.h>
#include <map>
@ -12,7 +12,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.9 2011/03/03 13:16:05 ajacoutot
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
@@ -727,7 +731,7 @@ int running_server(char *szName, char *szConfig)
@@ -747,7 +751,7 @@ int running_server(char *szName, char *szConfig)
{ "mysql_config_file", "/etc/zarafa/my.cnf" },
#endif
{ "attachment_storage", "database" },

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.22 2011/03/11 08:44:44 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.23 2011/03/29 18:00:03 ajacoutot Exp $
@newgroup _zarafa:627
@newuser _zarafa:627:_zarafa:daemon:Zarafa Account:/var/empty:/sbin/nologin
@bin bin/zarafa-admin
@ -192,6 +192,7 @@ lib/zarafa/ldapplugin.so
share/doc/pkg-readmes/${FULLPKGNAME}
share/doc/zarafa/
share/doc/zarafa/AGPL-3
share/doc/zarafa/audit-parse.pl
share/doc/zarafa/createuser.dotforward
share/doc/zarafa/db-calc-storesize
share/doc/zarafa/db-convert-4.1-to-4.2