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

Update to zarafa-6.30.1.

Browse Source 
ChangeLog:
http://download.zarafa.com/zarafa/release/docs/changelog.en.txt
This commit is contained in:
ajacoutot 2009-08-20 13:33:06 +00:00
parent 5ce53fc712
commit 7c71d4a73f
7 changed files with 43 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mail/zarafa/zarafa/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2009/07/31 09:55:56 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.14 2009/08/20 13:33:06 ajacoutot Exp $
COMMENT-main= MS Exchange groupware suite replacement
COMMENT-php= MAPI extensions for php5
V= 6.30.0
V= 6.30.1
DISTNAME= zarafa-${V}
PKGNAME-main= ${DISTNAME}

10
mail/zarafa/zarafa/distinfo
View File

@ -1,5 +1,5 @@
MD5 (zarafa/zarafa-6.30.0.tar.gz) = drQLKpv6Hj3wMHm/e1kp7Q==
RMD160 (zarafa/zarafa-6.30.0.tar.gz) = cTnF8jxb8G5yJC5zeVhXDxC1U5M=
SHA1 (zarafa/zarafa-6.30.0.tar.gz) = ziRVHh361LDoQZemQ5lc/uyZ/KE=
SHA256 (zarafa/zarafa-6.30.0.tar.gz) = QtQGF14WPfa2QOFHgWmYo8fPXAXmADY/RIopo0AEQdU=
SIZE (zarafa/zarafa-6.30.0.tar.gz) = 2235923
MD5 (zarafa/zarafa-6.30.1.tar.gz) = hO23ujxZ79h/1zeK0iCvsw==
RMD160 (zarafa/zarafa-6.30.1.tar.gz) = /Pen/GdRTDU6DoK+aIai6UF6eK8=
SHA1 (zarafa/zarafa-6.30.1.tar.gz) = 1GOpPC7Q2YCVxGOnFGVj2bZdqzA=
SHA256 (zarafa/zarafa-6.30.1.tar.gz) = oGZe4MRMLy0SLa2jSErsEtn1pv3vxwi9V97kUsWcXRo=
SIZE (zarafa/zarafa-6.30.1.tar.gz) = 2243786

12
mail/zarafa/zarafa/files/README.OpenBSD
View File

@ -1,4 +1,4 @@
$OpenBSD: README.OpenBSD,v 1.4 2009/07/31 09:55:56 ajacoutot Exp $
$OpenBSD: README.OpenBSD,v 1.5 2009/08/20 13:33:06 ajacoutot Exp $
*** Upgrading users: refer to zarafa documentation on the web to check
*** if any particular step is required after upgrading to a new version.
@ -76,16 +76,14 @@ if [ "`pgrep zarafa`" ]; then
pkill zarafa-monitor
pkill zarafa-spooler
pkill zarafa-server
sleep 10
sleep 5
i=0
while [ $i -lt 60 ]
while [ $i -lt 15 ]
do
if [ "`pgrep zarafa\-`" ]; then
pkill zarafa\-
sleep 10
i=`expr $i + 10`
else
i=60
sleep 5
i=`expr $i + 5`
fi
done
pkill -9 zarafa\-

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

@ -1,6 +1,6 @@
$OpenBSD: patch-doc_manual_xml,v 1.3 2009/07/31 09:55:56 ajacoutot Exp $
--- doc/manual.xml.orig Wed Jul 22 15:49:55 2009
+++ doc/manual.xml Wed Jul 22 15:56:45 2009
$OpenBSD: patch-doc_manual_xml,v 1.4 2009/08/20 13:33:06 ajacoutot Exp $
--- doc/manual.xml.orig Wed Aug 12 09:50:40 2009
+++ doc/manual.xml Thu Aug 20 14:51:19 2009
@@ -780,9 +780,7 @@
<varlistentry>
<term><option>pid_file</option></term>
@ -35,7 +35,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.3 2009/07/31 09:55:56 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-server.pid</replaceable>
@@ -4930,13 +4921,8 @@
@@ -5026,13 +5017,8 @@
</para>
<para>The spooler process will keep running and watching the
@ -51,7 +51,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.3 2009/07/31 09:55:56 ajacoutot Exp $
</refsection>
<refsection>
@@ -5108,9 +5094,7 @@
@@ -5204,9 +5190,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -62,7 +62,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.3 2009/07/31 09:55:56 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-spooler.pid</replaceable>
@@ -5453,13 +5437,8 @@
@@ -5561,13 +5545,8 @@
<para><command>zarafa-gateway</command></para>
@ -78,7 +78,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.3 2009/07/31 09:55:56 ajacoutot Exp $
</refsection>
<refsection>
@@ -5671,9 +5650,7 @@
@@ -5779,9 +5758,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -89,7 +89,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.3 2009/07/31 09:55:56 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-gateway.pid</replaceable>
@@ -6019,14 +5996,8 @@
@@ -6127,14 +6104,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.3 2009/07/31 09:55:56 ajacoutot Exp $
</refsection>
<refsection>
@@ -6169,9 +6140,7 @@
@@ -6277,9 +6248,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -116,7 +116,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.3 2009/07/31 09:55:56 ajacoutot Exp $
</para>
<para>Default value: /var/run/zarafa-monitor.pid
</para>
@@ -7420,13 +7389,8 @@
@@ -7528,13 +7497,8 @@
<para><command>zarafa-ical</command></para>
@ -132,7 +132,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.3 2009/07/31 09:55:56 ajacoutot Exp $
</refsection>
<refsection>
@@ -7601,9 +7565,7 @@
@@ -7709,9 +7673,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -143,7 +143,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.3 2009/07/31 09:55:56 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-ical.pid</replaceable>
@@ -7907,13 +7869,8 @@
@@ -8015,13 +7977,8 @@
<para><command>zarafa-licensed</command></para>
@ -159,7 +159,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.3 2009/07/31 09:55:56 ajacoutot Exp $
</refsection>
<refsection>
@@ -8057,9 +8014,7 @@
@@ -8165,9 +8122,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_server_cfg,v 1.2 2009/07/31 09:55:56 ajacoutot Exp $
--- installer/linux/server.cfg.orig Mon Jul 20 18:41:00 2009
+++ installer/linux/server.cfg Fri Jul 24 11:35:45 2009
$OpenBSD: patch-installer_linux_server_cfg,v 1.3 2009/08/20 13:33:06 ajacoutot Exp $
--- installer/linux/server.cfg.orig Wed Aug 12 09:50:50 2009
+++ installer/linux/server.cfg Thu Aug 20 14:51:19 2009
@@ -36,16 +36,16 @@ local_admin_users = root
system_email_address = postmaster@localhost
@ -98,9 +98,12 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.2 2009/07/31 09:55:56 ajacoutot E
##############################################################
# MISC SETTINGS
@@ -250,4 +251,4 @@ client_update_enabled = false
@@ -250,7 +251,7 @@ client_update_enabled = false
# Place the correct Zarafa Outlook Client in this directory for
# Windows clients to download through the Zarafa server
-client_update_path = /var/lib/zarafa/client
+client_update_path = /var/db/zarafa/client
# Everyone is a special internal group, which contains every user and group
# You may want to disable this group from the Global Addressbook by setting

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

@ -1,10 +1,10 @@
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.8 2009/08/06 10:02:21 ajacoutot Exp $
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.9 2009/08/20 13:33:06 ajacoutot Exp $
OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
--- provider/libserver/ZarafaCmd.cpp.orig Mon Jul 20 23:52:30 2009
+++ provider/libserver/ZarafaCmd.cpp Thu Jul 30 14:32:35 2009
@@ -682,11 +682,11 @@ double GetTimeOfDay();
--- provider/libserver/ZarafaCmd.cpp.orig Wed Aug 12 15:03:19 2009
+++ provider/libserver/ZarafaCmd.cpp Thu Aug 20 14:51:20 2009
@@ -688,11 +688,11 @@ double GetTimeOfDay();
#define SOAP_ENTRY_FUNCTION_HEADER(resultvar, fname) \
ECRESULT er = erSuccess; \
@ -18,17 +18,16 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
if(soap->user && ((SOAPINFO *)soap->user)->lpCallBack) { \
((SOAPINFO *)soap->user)->lpCallBack(pthread_self(), (std::string) "[" + PrettyIP(soap->ip) + "] " + #fname, ((SOAPINFO*)soap->user)->ulCallBackParam); \
} \
@@ -698,11 +698,11 @@ double GetTimeOfDay();
@@ -704,11 +704,11 @@ double GetTimeOfDay();
#define SOAP_ENTRY_FUNCTION_FOOTER \
__soapentry_exit: \
*lpResultVar = er; \
- clock_gettime(CLOCK_THREAD_CPUTIME_ID, &endTimes); \
- if(lpecSession) { \
+ times(&endTimes); \
if(lpecSession) { \
- lpecSession->AddClocks( timespec2dbl(endTimes) - timespec2dbl(startTimes), \
- 0, \
- GetTimeOfDay() - dblStart); \
+ times(&endTimes); \
+ if(lpecSession) { \
+ lpecSession->AddClocks( (double)(endTimes.tms_utime - startTimes.tms_utime) / CLOCKS_PER_SEC, \
+ (double)(endTimes.tms_stime - startTimes.tms_stime) / CLOCKS_PER_SEC, \
+ GetTimeOfDay() - dblStart); \

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

@ -1,6 +1,6 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.2 2009/07/31 09:55:56 ajacoutot Exp $
--- provider/server/ECServer.cpp.orig Wed Jul 22 16:21:20 2009
+++ provider/server/ECServer.cpp Wed Jul 22 16:22:03 2009
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.3 2009/08/20 13:33:06 ajacoutot Exp $
--- provider/server/ECServer.cpp.orig Wed Aug 12 15:03:19 2009
+++ provider/server/ECServer.cpp Thu Aug 20 14:51:20 2009
@@ -67,6 +67,10 @@
#include <libintl.h>
#include <map>
@ -12,7 +12,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.2 2009/07/31 09:55:56 ajacoutot
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
@@ -605,7 +609,7 @@ int running_server(char *szName, char *szConfig)
@@ -613,7 +617,7 @@ int running_server(char *szName, char *szConfig)
{ "mysql_config_file", "/etc/zarafa/my.cnf" },
#endif
{ "attachment_storage", "database" },