Update zarafa to version 6.40.1.

See http://download.zarafa.com/zarafa/release/docs/changelog.en.txt
for details.
This commit is contained in:
ajacoutot 2010-08-22 10:13:26 +00:00
parent 5145324a3b
commit dbd076c3a2
24 changed files with 182 additions and 159 deletions

View File

@ -1,13 +1,13 @@
# $OpenBSD: Makefile,v 1.42 2010/07/13 07:31:00 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.43 2010/08/22 10:13:26 ajacoutot Exp $
COMMENT-main= MS Exchange groupware suite replacement
COMMENT-web= zarafa webaccess frontend and MAPI extensions for PHP
V= 6.40.0
V= 6.40.1
DISTNAME= zarafa-${V}
PKGNAME-main= ${DISTNAME}p2
PKGNAME-web= zarafa-webaccess-${V}p1
PKGNAME-main= ${DISTNAME}
PKGNAME-web= zarafa-webaccess-${V}
CATEGORIES= mail www productivity
@ -31,20 +31,24 @@ BUILD_DEPENDS= ::www/php5/core \
::textproc/xmlto \
::net/curl
WANTLIB-main= asn1 c com_err crypto gssapi krb5 m ncurses pthread \
sasl2 ssl stdc++ z
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
xml2.>=10::textproc/libxml \
mysqlclient.>=19::databases/mysql \
lber.>=9,ldap::databases/openldap \
uuid.>=13::devel/uuid \
execinfo::devel/libexecinfo \
vmime-zarafa:zarafa-libvmime->=0.7.1p3:mail/zarafa/libvmime \
ical.>=1,icalss::textproc/libical
WANTLIB-main += asn1 c com_err crypto gssapi krb5 m ncurses pthread ssl
WANTLIB-main += sasl2 stdc++ z xml2 mysqlclient lber ldap uuid execinfo
WANTLIB-main += vmime-zarafa ical icalss
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
::textproc/libxml \
::databases/mysql \
::databases/openldap \
::devel/uuid \
::devel/libexecinfo \
:zarafa-libvmime->=0.7.1p3:mail/zarafa/libvmime \
::textproc/libical
WANTLIB-web += execinfo ical icalss uuid vmime-zarafa common_mapi
WANTLIB-web += common_util freebusy icalmapi inetmapi mapi m stdc++ z
WANTLIB-web= execinfo ical icalss uuid vmime-zarafa
LIB_DEPENDS-web= ${MODGETTEXT_LIB_DEPENDS} \
common_mapi,common_util,freebusy,icalmapi,inetmapi,mapi::mail/zarafa/zarafa,-main
::mail/zarafa/zarafa,-main
RUN_DEPENDS-web= ::www/php5/core
USE_LIBTOOL= Yes

View File

@ -1,5 +1,5 @@
MD5 (zarafa/zarafa-6.40.0.tar.gz) = OJ0ZXrdlnM0FdpIIaG5LDQ==
RMD160 (zarafa/zarafa-6.40.0.tar.gz) = HZ+XQ82azoIebkFJR/f7daByTt0=
SHA1 (zarafa/zarafa-6.40.0.tar.gz) = o0gdyJ19CzeqcMEjWmR6jZnRIQk=
SHA256 (zarafa/zarafa-6.40.0.tar.gz) = eZw6BVgBIjbQkG0TJ5Of5fD/3RbbVfX4vaIDn8K38Bo=
SIZE (zarafa/zarafa-6.40.0.tar.gz) = 4469591
MD5 (zarafa/zarafa-6.40.1.tar.gz) = OuogeSPPkoAL8Hkjw24w9Q==
RMD160 (zarafa/zarafa-6.40.1.tar.gz) = u7vqzQ3A0FvM2ix4LmNT//TUGMw=
SHA1 (zarafa/zarafa-6.40.1.tar.gz) = 1wQWmDAjFtM6n9QbVk/b/I9jVcw=
SHA256 (zarafa/zarafa-6.40.1.tar.gz) = fmxcCI21SR5oc/c6O5V0vi7ENMF/vUm6JBSP7C9rdmg=
SIZE (zarafa/zarafa-6.40.1.tar.gz) = 4518286

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ECtools_ECTestTools_IMAPTest_Makefile_in,v 1.5 2010/06/30 02:46:48 ajacoutot Exp $
--- ECtools/ECTestTools/IMAPTest/Makefile.in.orig Mon May 31 16:37:58 2010
+++ ECtools/ECTestTools/IMAPTest/Makefile.in Mon Jun 14 09:16:43 2010
@@ -231,7 +231,7 @@ target_alias = @target_alias@
$OpenBSD: patch-ECtools_ECTestTools_IMAPTest_Makefile_in,v 1.6 2010/08/22 10:13:26 ajacoutot Exp $
--- ECtools/ECTestTools/IMAPTest/Makefile.in.orig Tue Aug 3 11:42:50 2010
+++ ECtools/ECTestTools/IMAPTest/Makefile.in Sun Aug 22 10:22:52 2010
@@ -230,7 +230,7 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-ECtools_ECTestTools_Makefile_in,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
$OpenBSD: patch-ECtools_ECTestTools_Makefile_in,v 1.2 2010/08/22 10:13:27 ajacoutot Exp $
We have disabled clucene support so don't build the test.
--- ECtools/ECTestTools/Makefile.in.orig Tue Jun 29 04:28:30 2010
+++ ECtools/ECTestTools/Makefile.in Tue Jun 29 04:28:39 2010
@@ -221,7 +221,7 @@ sysconfdir = @sysconfdir@
--- ECtools/ECTestTools/Makefile.in.orig Tue Aug 3 11:42:51 2010
+++ ECtools/ECTestTools/Makefile.in Sun Aug 22 10:22:52 2010
@@ -220,7 +220,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ECtools_zarafa-cfgchecker_Makefile_in,v 1.4 2010/06/30 02:46:48 ajacoutot Exp $
--- ECtools/zarafa-cfgchecker/Makefile.in.orig Mon May 31 16:37:59 2010
+++ ECtools/zarafa-cfgchecker/Makefile.in Mon Jun 14 09:16:43 2010
@@ -248,7 +248,9 @@ target_alias = @target_alias@
$OpenBSD: patch-ECtools_zarafa-cfgchecker_Makefile_in,v 1.5 2010/08/22 10:13:27 ajacoutot Exp $
--- ECtools/zarafa-cfgchecker/Makefile.in.orig Tue Aug 3 11:42:53 2010
+++ ECtools/zarafa-cfgchecker/Makefile.in Sun Aug 22 10:22:52 2010
@@ -247,7 +247,9 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX -I${top_srcdir}/common

View File

@ -1,34 +1,45 @@
$OpenBSD: patch-common_ECLogger_cpp,v 1.6 2010/06/06 20:10:21 espie Exp $
--- common/ECLogger.cpp.orig Tue Apr 27 21:07:02 2010
+++ common/ECLogger.cpp Sun Jun 6 21:23:41 2010
@@ -135,7 +135,7 @@ ECLogger_File::~ECLogger_File() {
$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>
#include <assert.h>
+#ifdef __OpenBSD__
+#include <signal.h>
+#endif
+
#include "config.h"
#if HAVE_SYSLOG_H
#include <syslog.h>
@@ -162,7 +166,7 @@ ECLogger_File::~ECLogger_File() {
if (timestamp)
fprintf(log, "%s: ", MakeTimestamp());
fnPrintf(log, "%s: ", MakeTimestamp());
if (prefix == LP_TID)
- fprintf(log, "[0x%08x] ", (unsigned int)pthread_self());
+ fprintf(log, "[0x%08lx] ", (unsigned long)pthread_self());
- fnPrintf(log, "[0x%08x] ", (unsigned int)pthread_self());
+ fnPrintf(log, "[0x%08lx] ", (unsigned long)pthread_self());
else if (prefix == LP_PID)
fprintf(log, "[%5d] ", getpid());
fprintf(log, "Previous message logged %d times\n", prevcount);
@@ -172,7 +172,7 @@ bool ECLogger_File::DupFilter(const std::string &messa
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
if (timestamp)
fprintf(log, "%s: ", MakeTimestamp());
fnPrintf(log, "%s: ", MakeTimestamp());
if (prefix == LP_TID)
- fprintf(log, "[0x%08x] ", (unsigned int)pthread_self());
+ fprintf(log, "[0x%08lx] ", (unsigned long)pthread_self());
- fnPrintf(log, "[0x%08x] ", (unsigned int)pthread_self());
+ fnPrintf(log, "[0x%08lx] ", (unsigned long)pthread_self());
else if (prefix == LP_PID)
fprintf(log, "[%5d] ", getpid());
fprintf(log, "Previous message logged %d times\n", prevcount);
@@ -216,7 +216,7 @@ void ECLogger_File::Log(int loglevel, const char *form
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
if (timestamp)
fprintf(log, "%s: ", MakeTimestamp());
fnPrintf(log, "%s: ", MakeTimestamp());
if (prefix == LP_TID)
- fprintf(log, "[0x%08x] ", (unsigned int)pthread_self());
+ fprintf(log, "[0x%08lx] ", (unsigned long)pthread_self());
- fnPrintf(log, "[0x%08x] ", (unsigned int)pthread_self());
+ fnPrintf(log, "[0x%08lx] ", (unsigned long)pthread_self());
else if (prefix == LP_PID)
fprintf(log, "[%5d] ", getpid());
fprintf(log, "%s\n", msgbuffer);
@@ -284,7 +284,7 @@ void ECLogger_Pipe::Log(int loglevel, const std::strin
fnPrintf(log, "[%5d] ", getpid());
fnPrintf(log, "%s\n", msgbuffer);
@@ -330,7 +334,7 @@ void ECLogger_Pipe::Log(int loglevel, const std::strin
off += 1;
if (prefix == LP_TID)
@ -37,7 +48,7 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.6 2010/06/06 20:10:21 espie Exp $
else if (prefix == LP_PID)
len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[%5d] ", getpid());
off += len;
@@ -311,7 +311,7 @@ void ECLogger_Pipe::Log(int loglevel, const char *form
@@ -359,7 +363,7 @@ void ECLogger_Pipe::Log(int loglevel, const char *form
off += 1;
if (prefix == LP_TID)
@ -46,8 +57,8 @@ $OpenBSD: patch-common_ECLogger_cpp,v 1.6 2010/06/06 20:10:21 espie Exp $
else if (prefix == LP_PID)
len = snprintf(msgbuffer+off, _LOG_BUFSIZE -off, "[%5d] ", getpid());
off += len;
@@ -523,8 +523,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"));
@@ -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);
// chown file
if (pw || gr) {
- uid_t uid = -1;

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.7 2010/06/30 02:46:48 ajacoutot Exp $
--- configure.orig Mon May 31 16:37:57 2010
+++ configure Tue Jun 29 03:42:19 2010
@@ -21781,12 +21781,7 @@ else
$OpenBSD: patch-configure,v 1.8 2010/08/22 10:13:27 ajacoutot Exp $
--- configure.orig Tue Aug 3 11:42:48 2010
+++ configure Sun Aug 22 10:22:53 2010
@@ -21780,12 +21780,7 @@ else
want_release=no
fi
@ -14,7 +14,7 @@ $OpenBSD: patch-configure,v 1.7 2010/06/30 02:46:48 ajacoutot Exp $
# Check whether --enable-tcmalloc was given.
if test "${enable_tcmalloc+set}" = set; then
@@ -21814,7 +21809,7 @@ else
@@ -21813,7 +21808,7 @@ else
with_distro=rhel
fi
@ -23,7 +23,7 @@ $OpenBSD: patch-configure,v 1.7 2010/06/30 02:46:48 ajacoutot Exp $
{ echo "$as_me:$LINENO: result: invalid distro, using rhel instead" >&5
echo "${ECHO_T}invalid distro, using rhel instead" >&6; }
else
@@ -22154,21 +22149,6 @@ echo "$as_me: error: Cannot execute $PHP_CONFIG" >&2;}
@@ -22153,21 +22148,6 @@ echo "$as_me: error: Cannot execute $PHP_CONFIG" >&2;}
PHP_LDFLAGS=`$PHP_CONFIG --ldflags`
PHP_EXTENSION_DIR=`$PHP_CONFIG --extension-dir`
PHP_VERSION=`$PHP_CONFIG --version`
@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.7 2010/06/30 02:46:48 ajacoutot Exp $
if test -z "$PHP_EXTENSION_DIR"; then
{ { echo "$as_me:$LINENO: error: Cannot find php-config. Please use --with-php-config=PATH" >&5
@@ -22694,7 +22674,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -22693,7 +22673,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
_ACEOF
VMIME_CFLAGS=-I$VMIME_PREFIX
@ -54,9 +54,9 @@ $OpenBSD: patch-configure,v 1.7 2010/06/30 02:46:48 ajacoutot Exp $
else
@@ -23369,8 +23349,10 @@ else
WITH_CLUCENE_FALSE=
fi
@@ -23103,8 +23083,10 @@ fi
done
+# XXX force removing clucene support
+WITH_CLUCENE_TRUE='#'
@ -64,9 +64,9 @@ $OpenBSD: patch-configure,v 1.7 2010/06/30 02:46:48 ajacoutot Exp $
-
CFLAGS=$cflags_keep
CXXFLAGS=$cxxflags_keep
ac_ext=c
@@ -24399,13 +24381,13 @@ LIBS=$libs_keep
# Check for CLucene availability
@@ -24476,13 +24458,13 @@ LIBS=$libs_keep
libs_keep=$LIBS
# check lib, but do not set in link list
@ -83,7 +83,7 @@ $OpenBSD: patch-configure,v 1.7 2010/06/30 02:46:48 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -24465,7 +24447,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then
@@ -24542,7 +24524,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then
#define HAVE_LIBPTHREAD 1
_ACEOF

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.6 2010/06/30 02:46:48 ajacoutot Exp $
--- doc/Makefile.in.orig Mon May 31 16:38:00 2010
+++ doc/Makefile.in Tue Jun 29 17:16:09 2010
@@ -229,9 +229,9 @@ dist_data_DATA =
$OpenBSD: patch-doc_Makefile_in,v 1.7 2010/08/22 10:13:27 ajacoutot Exp $
--- doc/Makefile.in.orig Tue Aug 3 11:42:55 2010
+++ doc/Makefile.in Sun Aug 22 10:22:53 2010
@@ -228,9 +228,9 @@ dist_data_DATA =
BUILT_SOURCES = zarafa.1
allpages = \
zarafa-dagent.1 zarafa-passwd.1 zarafa-spooler.1 zarafa-admin.1 zarafa-server.1 zarafa-gateway.1 zarafa-monitor.1 zarafa-cfgchecker.1 \
@ -14,7 +14,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.6 2010/06/30 02:46:48 ajacoutot Exp $
man_MANS = $(BUILT_SOURCES) $(allpages)
EXTRA_DIST = $(BUILT_SOURCES) $(allpages) manual.xml
@@ -374,12 +374,12 @@ uninstall-man5:
@@ -373,12 +373,12 @@ uninstall-man5:
done
install-dist_dataDATA: $(dist_data_DATA)
@$(NORMAL_INSTALL)
@ -30,7 +30,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.6 2010/06/30 02:46:48 ajacoutot Exp $
done
uninstall-dist_dataDATA:
@@ -535,7 +535,7 @@ $(BUILT_SOURCES): manual.xml
@@ -534,7 +534,7 @@ $(BUILT_SOURCES): manual.xml
@if [ -z $(PROG_XMLTO) ]; then \
echo Please install xmlto to generate manual pages; \
else \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_manual_xml,v 1.10 2010/06/30 02:46:48 ajacoutot Exp $
--- doc/manual.xml.orig Mon May 31 15:44:13 2010
+++ doc/manual.xml Mon Jun 14 09:16:43 2010
@@ -820,9 +820,7 @@
$OpenBSD: patch-doc_manual_xml,v 1.11 2010/08/22 10:13:27 ajacoutot Exp $
--- doc/manual.xml.orig Tue Aug 3 10:57:31 2010
+++ doc/manual.xml Sun Aug 22 10:22:53 2010
@@ -835,9 +835,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -12,7 +12,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.10 2010/06/30 02:46:48 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-dagent.pid</replaceable>
@@ -1182,11 +1180,6 @@
@@ -1197,11 +1195,6 @@
<replaceable>/path/to/server.cfg</replaceable>
</para>
@ -24,7 +24,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.10 2010/06/30 02:46:48 ajacoutot Exp $
</refsection>
<refsection>
@@ -2856,9 +2849,7 @@
@@ -2870,9 +2863,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -35,7 +35,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.10 2010/06/30 02:46:48 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-server.pid</replaceable>
@@ -5601,13 +5592,8 @@
@@ -5615,13 +5606,8 @@
</para>
<para>The spooler process will keep running and watching the
@ -51,7 +51,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.10 2010/06/30 02:46:48 ajacoutot Exp $
</refsection>
<refsection>
@@ -5779,9 +5765,7 @@
@@ -5793,9 +5779,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -62,7 +62,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.10 2010/06/30 02:46:48 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-spooler.pid</replaceable>
@@ -6167,13 +6151,8 @@
@@ -6181,13 +6165,8 @@
<para><command>zarafa-gateway</command></para>
@ -78,7 +78,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.10 2010/06/30 02:46:48 ajacoutot Exp $
</refsection>
<refsection>
@@ -6385,9 +6364,7 @@
@@ -6399,9 +6378,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -89,7 +89,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.10 2010/06/30 02:46:48 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-gateway.pid</replaceable>
@@ -6743,14 +6720,8 @@
@@ -6782,14 +6759,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.10 2010/06/30 02:46:48 ajacoutot Exp $
</refsection>
<refsection>
@@ -6902,9 +6873,7 @@
@@ -6941,9 +6912,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -116,7 +116,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.10 2010/06/30 02:46:48 ajacoutot Exp $
</para>
<para>Default value: /var/run/zarafa-monitor.pid
</para>
@@ -8157,13 +8126,8 @@
@@ -8196,13 +8165,8 @@
<para><command>zarafa-ical</command></para>
@ -132,7 +132,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.10 2010/06/30 02:46:48 ajacoutot Exp $
</refsection>
<refsection>
@@ -8338,9 +8302,7 @@
@@ -8377,9 +8341,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -143,7 +143,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.10 2010/06/30 02:46:48 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-ical.pid</replaceable>
@@ -8654,13 +8616,8 @@
@@ -8693,13 +8655,8 @@
<para><command>zarafa-licensed</command></para>
@ -159,7 +159,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.10 2010/06/30 02:46:48 ajacoutot Exp $
</refsection>
<refsection>
@@ -8804,9 +8761,7 @@
@@ -8843,9 +8800,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gateway_Gateway_cpp,v 1.5 2010/04/22 10:06:18 ajacoutot Exp $
--- gateway/Gateway.cpp.orig Wed Apr 14 13:39:54 2010
+++ gateway/Gateway.cpp Thu Apr 22 10:28:51 2010
@@ -83,6 +83,10 @@
$OpenBSD: patch-gateway_Gateway_cpp,v 1.6 2010/08/22 10:13:27 ajacoutot Exp $
--- gateway/Gateway.cpp.orig Tue Aug 3 14:51:43 2010
+++ gateway/Gateway.cpp Sun Aug 22 10:22:53 2010
@@ -84,6 +84,10 @@
#include "UnixUtil.h"

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-installer_Makefile_in,v 1.5 2010/06/30 02:46:48 ajacoutot Exp $
--- installer/Makefile.in.orig Mon May 31 16:38:00 2010
+++ installer/Makefile.in Tue Jun 29 17:14:47 2010
@@ -232,7 +232,7 @@ sysconfdir = @sysconfdir@
$OpenBSD: patch-installer_Makefile_in,v 1.6 2010/08/22 10:13:27 ajacoutot Exp $
--- installer/Makefile.in.orig Tue Aug 3 11:42:56 2010
+++ installer/Makefile.in Sun Aug 22 10:22:53 2010
@@ -231,7 +231,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@ -10,7 +10,7 @@ $OpenBSD: patch-installer_Makefile_in,v 1.5 2010/06/30 02:46:48 ajacoutot Exp $
dist_data_DATA = ldap/zarafa.schema licenseagreement/eula.txt licenseagreement/AGPL-3
all: all-recursive
@@ -274,12 +274,12 @@ clean-libtool:
@@ -273,12 +273,12 @@ clean-libtool:
-rm -rf .libs _libs
install-dist_dataDATA: $(dist_data_DATA)
@$(NORMAL_INSTALL)

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_Makefile_in,v 1.10 2010/06/30 02:46:48 ajacoutot Exp $
--- installer/linux/Makefile.in.orig Mon May 31 16:38:00 2010
+++ installer/linux/Makefile.in Tue Jun 29 20:14:03 2010
$OpenBSD: patch-installer_linux_Makefile_in,v 1.11 2010/08/22 10:13:27 ajacoutot Exp $
--- installer/linux/Makefile.in.orig Tue Aug 3 11:42:56 2010
+++ installer/linux/Makefile.in Sun Aug 22 10:22:53 2010
@@ -54,15 +54,15 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGUR
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/common/config.h
@ -42,7 +42,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.10 2010/06/30 02:46:48 ajacoutot
ldap.openldap.cfg ldap.active-directory.cfg \
ldapms.openldap.cfg ldapms.active-directory.cfg
dist_sysconf_configDATA_INSTALL = $(INSTALL_DATA)
@@ -232,6 +232,7 @@ datadir = ${docdir}
@@ -231,6 +231,7 @@ datadir = ${docdir}
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
@ -50,7 +50,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.10 2010/06/30 02:46:48 ajacoutot
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
@@ -260,8 +261,8 @@ sysconfdir = @sysconfdir@
@@ -259,8 +260,8 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@ -61,7 +61,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.10 2010/06/30 02:46:48 ajacoutot
autorespond $(am__append_2) $(BUILT_SOURCES)
rhel_initscript_files = zarafa-server.init.rhel \
zarafa-spooler.init.rhel zarafa-gateway.init.rhel \
@@ -456,15 +457,7 @@ uninstall-dist_sysconf_configDATA:
@@ -455,15 +456,7 @@ uninstall-dist_sysconf_configDATA:
echo " rm -f '$(DESTDIR)$(sysconf_configdir)/$$f'"; \
rm -f "$(DESTDIR)$(sysconf_configdir)/$$f"; \
done
@ -78,7 +78,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.10 2010/06/30 02:46:48 ajacoutot
uninstall-dist_sysconf_rotateDATA:
@$(NORMAL_UNINSTALL)
@@ -528,7 +521,7 @@ check: $(BUILT_SOURCES)
@@ -527,7 +520,7 @@ check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(SCRIPTS) $(DATA)
installdirs:
@ -87,7 +87,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.10 2010/06/30 02:46:48 ajacoutot
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -575,9 +568,9 @@ info: info-am
@@ -574,9 +567,9 @@ info: info-am
info-am:
@ -99,7 +99,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.10 2010/06/30 02:46:48 ajacoutot
install-sysconf_sysconfigDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -657,13 +650,7 @@ ldapms.active-directory.cfg: ldap.m4
@@ -656,13 +649,7 @@ ldapms.active-directory.cfg: ldap.m4
m4 -DTYPE=ADS -DMULTISERVER=1 ${top_srcdir}/installer/linux/ldap.m4 > $@
install-data-hook:
@ -113,7 +113,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.10 2010/06/30 02:46:48 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; \
@@ -685,8 +672,6 @@ install-data-hook:
@@ -684,8 +671,6 @@ install-data-hook:
mv "$$f" "$$newf"; \
done \
fi

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_gateway_cfg,v 1.3 2009/06/19 12:47:35 ajacoutot Exp $
--- installer/linux/gateway.cfg.orig Thu May 14 11:20:45 2009
+++ installer/linux/gateway.cfg Wed Jun 10 11:43:42 2009
$OpenBSD: patch-installer_linux_gateway_cfg,v 1.4 2010/08/22 10:13:27 ajacoutot Exp $
--- installer/linux/gateway.cfg.orig Tue Aug 3 10:57:47 2010
+++ installer/linux/gateway.cfg Sun Aug 22 10:22:53 2010
@@ -6,16 +6,16 @@ server_bind = 0.0.0.0
server_socket = http://localhost:236/zarafa
@ -22,8 +22,8 @@ $OpenBSD: patch-installer_linux_gateway_cfg,v 1.3 2009/06/19 12:47:35 ajacoutot
# enable/disable POP3, and POP3 listen port
pop3_enable = yes
@@ -43,10 +43,10 @@ imap_public_folders = yes
imap_capability_idle = yes
@@ -50,10 +50,10 @@ imap_always_generate = no
imap_max_messagesize = 134217728
# File with RSA key for SSL
-ssl_private_key_file = /etc/zarafa/gateway/privkey.pem

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libfreebusy_Makefile_in,v 1.5 2010/06/30 02:46:48 ajacoutot Exp $
--- libfreebusy/Makefile.in.orig Mon May 31 16:38:01 2010
+++ libfreebusy/Makefile.in Mon Jun 14 09:19:14 2010
@@ -252,7 +252,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
$OpenBSD: patch-libfreebusy_Makefile_in,v 1.6 2010/08/22 10:13:27 ajacoutot Exp $
--- libfreebusy/Makefile.in.orig Tue Aug 3 11:42:57 2010
+++ libfreebusy/Makefile.in Sun Aug 22 10:22:53 2010
@@ -251,7 +251,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
-I${top_srcdir}/common
libfreebusy_la_includedir = $(includedir)/libfreebusy

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mapi4linux_src_Makefile_in,v 1.5 2010/06/30 02:46:48 ajacoutot Exp $
--- mapi4linux/src/Makefile.in.orig Mon May 31 16:38:01 2010
+++ mapi4linux/src/Makefile.in Mon Jun 14 09:16:44 2010
@@ -251,7 +251,7 @@ AM_LDFLAGS = $(DL_LIBS) -export-symbols ${top_srcdir}/
$OpenBSD: patch-mapi4linux_src_Makefile_in,v 1.6 2010/08/22 10:13:27 ajacoutot Exp $
--- mapi4linux/src/Makefile.in.orig Tue Aug 3 11:42:58 2010
+++ mapi4linux/src/Makefile.in Sun Aug 22 10:22:53 2010
@@ -250,7 +250,7 @@ AM_LDFLAGS = $(DL_LIBS) -export-symbols ${top_srcdir}/
libmapi_la_LIBADD = ${top_builddir}/common/libcommon_util.la
# required because we're exporting extern "C" functions and want to filter with 'export-symbols'

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-php-ext_Makefile_in,v 1.8 2010/06/30 02:46:48 ajacoutot Exp $
--- php-ext/Makefile.in.orig Mon May 31 16:38:02 2010
+++ php-ext/Makefile.in Tue Jun 29 18:54:36 2010
@@ -224,7 +224,7 @@ build_cpu = @build_cpu@
$OpenBSD: patch-php-ext_Makefile_in,v 1.9 2010/08/22 10:13:27 ajacoutot Exp $
--- php-ext/Makefile.in.orig Tue Aug 3 11:42:58 2010
+++ php-ext/Makefile.in Sun Aug 22 10:22:53 2010
@@ -223,7 +223,7 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
builddir = @builddir@
@ -10,7 +10,7 @@ $OpenBSD: patch-php-ext_Makefile_in,v 1.8 2010/06/30 02:46:48 ajacoutot Exp $
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
@@ -271,7 +271,7 @@ mapi_la_LDFLAGS = -module -avoid-version \
@@ -270,7 +270,7 @@ mapi_la_LDFLAGS = -module -avoid-version \
${top_builddir}/common/libcommon_util.la \
${top_builddir}/libfreebusy/libfreebusy.la \
${top_builddir}/inetmapi/libinetmapi.la \
@ -19,7 +19,7 @@ $OpenBSD: patch-php-ext_Makefile_in,v 1.8 2010/06/30 02:46:48 ajacoutot Exp $
# it seems linking libraries with -pthread will not contain -lpthread.
@@ -554,7 +554,7 @@ install-data-am: install-dist_dataDATA
@@ -553,7 +553,7 @@ install-data-am: install-dist_dataDATA
install-dvi: install-dvi-am

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_client_Makefile_in,v 1.7 2010/06/30 02:46:48 ajacoutot Exp $
--- provider/client/Makefile.in.orig Mon May 31 16:38:02 2010
+++ provider/client/Makefile.in Mon Jun 14 09:16:44 2010
@@ -288,7 +288,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
$OpenBSD: patch-provider_client_Makefile_in,v 1.8 2010/08/22 10:13:27 ajacoutot Exp $
--- provider/client/Makefile.in.orig Tue Aug 3 11:42:59 2010
+++ provider/client/Makefile.in Sun Aug 22 10:22:53 2010
@@ -287,7 +287,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
-I${top_srcdir}/common \
-I${top_srcdir}/zarafa-libsync
@ -10,7 +10,7 @@ $OpenBSD: patch-provider_client_Makefile_in,v 1.7 2010/06/30 02:46:48 ajacoutot
libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS) \
${top_builddir}/provider/soap/libgsoap.la \
${top_builddir}/provider/soap/libsoapclient.la \
@@ -301,7 +301,7 @@ libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS)
@@ -300,7 +300,7 @@ libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS)
${top_builddir}/zarafa-libsync/libzarafasync.la \
-lstdc++ $(UUID_LIBS)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.1 2010/07/06 06:38:32 ajacoutot Exp $
--- provider/libserver/ECSession.cpp.orig Mon May 31 19:28:59 2010
+++ provider/libserver/ECSession.cpp Tue Jul 6 08:13:35 2010
@@ -664,11 +664,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.2 2010/08/22 10:13:27 ajacoutot Exp $
--- provider/libserver/ECSession.cpp.orig Tue Aug 3 14:51:44 2010
+++ provider/libserver/ECSession.cpp Sun Aug 22 10:22:53 2010
@@ -687,11 +687,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
uid_t uid;
char strbuf[1024];
#ifdef SO_PEERCRED

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_server_Makefile_in,v 1.6 2010/06/30 02:46:48 ajacoutot Exp $
--- provider/server/Makefile.in.orig Mon May 31 16:38:02 2010
+++ provider/server/Makefile.in Mon Jun 14 09:16:44 2010
@@ -271,10 +271,11 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INTL_LIBS) $(ICON
$OpenBSD: patch-provider_server_Makefile_in,v 1.7 2010/08/22 10:13:27 ajacoutot Exp $
--- provider/server/Makefile.in.orig Tue Aug 3 11:42:59 2010
+++ provider/server/Makefile.in Sun Aug 22 10:22:53 2010
@@ -270,10 +270,11 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INTL_LIBS) $(ICON
${top_builddir}/provider/soap/libgsoap.la \
${top_builddir}/provider/soap/libsoapserver.la \
${top_builddir}/provider/common/libzarafacommon.la \

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-spooler_DAgent_cpp,v 1.8 2010/06/30 02:46:48 ajacoutot Exp $
--- spooler/DAgent.cpp.orig Mon May 31 19:28:58 2010
+++ spooler/DAgent.cpp Mon Jun 14 09:16:44 2010
$OpenBSD: patch-spooler_DAgent_cpp,v 1.9 2010/08/22 10:13:27 ajacoutot Exp $
--- spooler/DAgent.cpp.orig Tue Aug 3 14:51:43 2010
+++ spooler/DAgent.cpp Sun Aug 22 10:22:53 2010
@@ -88,6 +88,10 @@
#include <sys/mman.h>
#include <pwd.h>
@ -12,7 +12,7 @@ $OpenBSD: patch-spooler_DAgent_cpp,v 1.8 2010/06/30 02:46:48 ajacoutot Exp $
/*
This is actually from sysexits.h
but since those windows lamers don't have it ..
@@ -2639,7 +2643,7 @@ int main(int argc, char *argv[]) {
@@ -2640,7 +2644,7 @@ int main(int argc, char *argv[]) {
DeliveryArgs sDeliveryArgs;
sDeliveryArgs.strPath = "";

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-spooler_Makefile_in,v 1.5 2010/06/30 02:46:48 ajacoutot Exp $
--- spooler/Makefile.in.orig Mon May 31 16:38:03 2010
+++ spooler/Makefile.in Mon Jun 14 09:16:44 2010
@@ -271,7 +271,7 @@ zarafa_spooler_LDADD = ${top_builddir}/inetmapi/libine
$OpenBSD: patch-spooler_Makefile_in,v 1.6 2010/08/22 10:13:27 ajacoutot Exp $
--- spooler/Makefile.in.orig Tue Aug 3 11:43:00 2010
+++ spooler/Makefile.in Sun Aug 22 10:22:53 2010
@@ -270,7 +270,7 @@ zarafa_spooler_LDADD = ${top_builddir}/inetmapi/libine
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_util.la \
${top_builddir}/common/libcommon_ssl.la \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-zarafa-libsync_Makefile_in,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
--- zarafa-libsync/Makefile.in.orig Wed Jun 30 02:22:58 2010
+++ zarafa-libsync/Makefile.in Wed Jun 30 02:23:17 2010
@@ -252,7 +252,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
$OpenBSD: patch-zarafa-libsync_Makefile_in,v 1.2 2010/08/22 10:13:27 ajacoutot Exp $
--- zarafa-libsync/Makefile.in.orig Tue Aug 3 11:43:00 2010
+++ zarafa-libsync/Makefile.in Sun Aug 22 10:22:53 2010
@@ -251,7 +251,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
-I${top_srcdir}/common
libzarafasync_la_includedir = $(includedir)/libzarafasync

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.15 2010/06/30 02:46:48 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.16 2010/08/22 10:13:27 ajacoutot Exp $
@newgroup _zarafa:627
@newuser _zarafa:627:_zarafa:daemon:Zarafa Account:/var/empty:/sbin/nologin
@bin bin/zarafa-admin
@ -110,6 +110,7 @@ include/zarafa/Trace.h
include/zarafa/UnixUtil.h
include/zarafa/Util.h
include/zarafa/ZarafaCode.h
include/zarafa/auto_free.h
include/zarafa/base64.h
include/zarafa/codepage.h
include/zarafa/edkguid.h

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-web,v 1.2 2010/06/30 06:28:25 ajacoutot Exp $
@comment $OpenBSD: PLIST-web,v 1.3 2010/08/22 10:13:27 ajacoutot Exp $
@conflict php5-mapi-*
@pkgpath mail/zarafa/webaccess
@pkgpath mail/zarafa/zarafa,-php
@ -128,6 +128,8 @@ zarafa-webaccess/client/layout/dialogs/settings/tabs/preferences.js
zarafa-webaccess/client/layout/dialogs/settings/tabs/preferences.php
zarafa-webaccess/client/layout/dialogs/settings/tabs/shortcuts.js
zarafa-webaccess/client/layout/dialogs/settings/tabs/shortcuts.php
zarafa-webaccess/client/layout/dialogs/settings/tabs/task.js
zarafa-webaccess/client/layout/dialogs/settings/tabs/task.php
zarafa-webaccess/client/layout/dialogs/settings/tabs/vacation.js
zarafa-webaccess/client/layout/dialogs/settings/tabs/vacation.php
zarafa-webaccess/client/layout/dialogs/standard/
@ -190,6 +192,7 @@ zarafa-webaccess/client/layout/img/hour_header_3.png
zarafa-webaccess/client/layout/img/hour_header_4.png
zarafa-webaccess/client/layout/img/hour_header_6.png
zarafa-webaccess/client/layout/img/hour_header_8.png
zarafa-webaccess/client/layout/img/icon_accept_proposal.gif
zarafa-webaccess/client/layout/img/icon_addsignature.gif
zarafa-webaccess/client/layout/img/icon_advanced_find.gif
zarafa-webaccess/client/layout/img/icon_appointment_recurring.gif
@ -213,6 +216,7 @@ zarafa-webaccess/client/layout/img/icon_delete_user.gif
zarafa-webaccess/client/layout/img/icon_drafts.gif
zarafa-webaccess/client/layout/img/icon_drag_multiple.gif
zarafa-webaccess/client/layout/img/icon_drag_single.gif
zarafa-webaccess/client/layout/img/icon_editmail.gif
zarafa-webaccess/client/layout/img/icon_empty_trash.gif
zarafa-webaccess/client/layout/img/icon_equipment.gif
zarafa-webaccess/client/layout/img/icon_fieldchooser.gif
@ -332,6 +336,7 @@ zarafa-webaccess/client/layout/img/icon_task.gif
zarafa-webaccess/client/layout/img/icon_task_complete.gif
zarafa-webaccess/client/layout/img/icon_today.gif
zarafa-webaccess/client/layout/img/icon_user.gif
zarafa-webaccess/client/layout/img/icon_view_all_proposals.gif
zarafa-webaccess/client/layout/img/icon_wastebasket.gif
zarafa-webaccess/client/layout/img/icon_week.gif
zarafa-webaccess/client/layout/img/icon_workweek.gif
@ -565,6 +570,7 @@ zarafa-webaccess/client/widgets/combobox.js
zarafa-webaccess/client/widgets/datepicker.js
zarafa-webaccess/client/widgets/datetimepicker.js
zarafa-webaccess/client/widgets/dragdrop.js
zarafa-webaccess/client/widgets/elastictextarea.js
zarafa-webaccess/client/widgets/fckeditor/
zarafa-webaccess/client/widgets/fckeditor/editor/
zarafa-webaccess/client/widgets/fckeditor/editor/css/
@ -907,6 +913,7 @@ zarafa-webaccess/server/core/class.tablecolumns.php
zarafa-webaccess/server/core/class.xmlbuilder.php
zarafa-webaccess/server/core/class.xmlparser.php
zarafa-webaccess/server/core/constants.php
zarafa-webaccess/server/core/htmlfilter.php
zarafa-webaccess/server/language/
zarafa-webaccess/server/language/da_DK.UTF-8/
zarafa-webaccess/server/language/da_DK.UTF-8/LC_MESSAGES/