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

SECURITY update to zarafa-6.40.6.

Browse Source 
As usual, changelog is available at:
http://download.zarafa.com/community/final/6.40/changelog-6.40.txt
This commit is contained in:
ajacoutot 2011-03-11 08:44:44 +00:00
parent 9ff2f10299
commit bffd785903
32 changed files with 276 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mail/zarafa/zarafa/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.66 2011/03/08 13:37:11 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.67 2011/03/11 08:44:44 ajacoutot Exp $
COMMENT-main= MS Exchange groupware suite replacement
COMMENT-web= zarafa webaccess frontend and MAPI extensions for PHP
@ -7,19 +7,18 @@ PKGNAME= zarafa-${V}
PKGNAME-main= zarafa-${V}
PKGNAME-web= zarafa-webaccess-${V}
REVISION-main= 0
CATEGORIES= mail www productivity
SHARED_LIBS += common_util 1.0 # .1.0
SHARED_LIBS += common_mapi 1.0 # .1.0
SHARED_LIBS += common_ssl 1.0 # .1.0
SHARED_LIBS += freebusy 1.0 # .1.0
SHARED_LIBS += mapi 1.0 # .0.0
SHARED_LIBS += zarafaclient 1.0 # .1.0
SHARED_LIBS += icalmapi 1.0 # .1.0
SHARED_LIBS += inetmapi 1.0 # .1.0
SHARED_LIBS += zarafasync 1.0 # .1.0
SHARED_LIBS += common_util 1.0 # 1.0
SHARED_LIBS += common_mapi 1.0 # 1.0
SHARED_LIBS += common_ssl 1.0 # 1.0
SHARED_LIBS += freebusy 1.0 # 1.0
SHARED_LIBS += zarafasync 1.0 # 1.0
SHARED_LIBS += mapi 1.0 # unknown
SHARED_LIBS += zarafaclient 1.0 # unknown
SHARED_LIBS += icalmapi 1.0 # 1.0
SHARED_LIBS += inetmapi 1.0 # 1.0
SHARED_LIBS += archiver 0.0 # unknown
MULTI_PACKAGES= -main -web
@ -31,8 +30,8 @@ BUILD_DEPENDS= www/php5/core \
WANTLIB-main = ${MODGETTEXT_WANTLIB}
WANTLIB-main += asn1 c com_err crypto gssapi krb5 m ncurses pthread ssl
WANTLIB-main += sasl2 stdc++ z xml2 mysqlclient lber-2.4 ldap-2.4 uuid execinfo
WANTLIB-main += vmime-zarafa ical icalss
WANTLIB-main += sasl2 stdc++ z xml2 mysqlclient uuid execinfo
WANTLIB-main += vmime-zarafa ical icalss lber-2.4 ldap-2.4
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
textproc/libxml \
@ -40,7 +39,7 @@ LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
databases/openldap \
devel/uuid \
devel/libexecinfo \
mail/zarafa/libvmime>=0.7.1p8 \
mail/zarafa/libvmime>=0.7.1p9 \
textproc/libical
WANTLIB-web += ${MODGETTEXT_WANTLIB}
@ -95,7 +94,7 @@ SUB_SCRIPTS= createcompany.d/00createpublic groups_common.sh \
createuser.d/00createstore companies_common.sh \
users_common.sh
WRKDIST= ${WRKDIR}/${DISTNAME}/src
WRKDIST= ${WRKDIR}/zarafa-${V}/
post-patch:
mv ${WRKSRC}/php-webclient-ajax/client/layout/img/login.jpg \

10
mail/zarafa/zarafa/distinfo
View File

@ -1,5 +1,5 @@
MD5 (zarafa/zcp-source-6.40.5-24860.tgz) = QhpZlU6U94eyBIt+hG4+8A==
RMD160 (zarafa/zcp-source-6.40.5-24860.tgz) = HTUMtd0N8ybzyWrOCI+KQHgxk6o=
SHA1 (zarafa/zcp-source-6.40.5-24860.tgz) = t8APrj5Jr45zPLdt+1prpXhnoU8=
SHA256 (zarafa/zcp-source-6.40.5-24860.tgz) = 28adkmG9GUefgQJNBIK2QbS2plCJ5nB20p7sEW7ctUY=
SIZE (zarafa/zcp-source-6.40.5-24860.tgz) = 7075378
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

15
mail/zarafa/zarafa/patch-common_mapi_ptr_mapi_memory_ptr_h Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-common_mapi_ptr_mapi_memory_ptr_h,v 1.1 2011/03/11 08:44:44 ajacoutot Exp $
--- common/mapi_ptr/mapi_memory_ptr.h.orig Sun Feb 27 23:06:10 2011
+++ common/mapi_ptr/mapi_memory_ptr.h Thu Mar 10 17:22:03 2011
@@ -56,6 +56,11 @@
#undef free
#endif
+// _U is defined in ctype.h
+#ifdef __OpenBSD__
+#undef _U
+#endif
+
template<typename _T>
class mapi_memory_proxy
{

15
mail/zarafa/zarafa/patch-common_mapi_ptr_mapi_object_ptr_h Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-common_mapi_ptr_mapi_object_ptr_h,v 1.1 2011/03/11 08:44:44 ajacoutot Exp $
--- common/mapi_ptr/mapi_object_ptr.h.orig Mon Jun 28 23:35:15 2010
+++ common/mapi_ptr/mapi_object_ptr.h Mon Jun 28 23:35:26 2010
@@ -56,6 +56,11 @@
#include "ECTags.h"
#include "mapi_memory_ptr.h"
+// _P is defined in ctype.h
+#ifdef __OpenBSD__
+#undef _P
+#endif
+
// http://tinyurl.com/ydb363n
template<typename BaseT, typename DerivedT>
class Conversion

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

@ -1,7 +1,7 @@
$OpenBSD: patch-ECtools_ECTestTools_IMAPTest_Makefile_in,v 1.7 2011/03/03 13:16:05 ajacoutot Exp $
--- ECtools/ECTestTools/IMAPTest/Makefile.in.orig Mon Jan 24 13:06:12 2011
+++ ECtools/ECTestTools/IMAPTest/Makefile.in Tue Jan 25 12:56:17 2011
@@ -237,7 +237,7 @@ target_alias = @target_alias@
$OpenBSD: patch-ECtools_ECTestTools_IMAPTest_Makefile_in,v 1.8 2011/03/11 08:44:44 ajacoutot Exp $
--- ECtools/ECTestTools/IMAPTest/Makefile.in.orig Sun Feb 27 19:34:31 2011
+++ ECtools/ECTestTools/IMAPTest/Makefile.in Thu Mar 10 17:22:03 2011
@@ -240,7 +240,7 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX

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

@ -1,10 +1,10 @@
$OpenBSD: patch-ECtools_ECTestTools_Makefile_in,v 1.3 2011/03/03 13:16:05 ajacoutot Exp $
$OpenBSD: patch-ECtools_ECTestTools_Makefile_in,v 1.4 2011/03/11 08:44:44 ajacoutot Exp $
We have disabled clucene support so don't build the test.
--- ECtools/ECTestTools/Makefile.in.orig Mon Jan 24 13:06:12 2011
+++ ECtools/ECTestTools/Makefile.in Tue Jan 25 12:56:17 2011
@@ -227,7 +227,7 @@ sysconfdir = @sysconfdir@
--- ECtools/ECTestTools/Makefile.in.orig Sun Feb 27 19:34:31 2011
+++ ECtools/ECTestTools/Makefile.in Thu Mar 10 17:22:03 2011
@@ -230,7 +230,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@

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

@ -1,7 +1,7 @@
$OpenBSD: patch-ECtools_zarafa-cfgchecker_Makefile_in,v 1.6 2011/03/03 13:16:05 ajacoutot Exp $
--- ECtools/zarafa-cfgchecker/Makefile.in.orig Mon Jan 24 13:06:14 2011
+++ ECtools/zarafa-cfgchecker/Makefile.in Tue Jan 25 12:56:17 2011
@@ -254,7 +254,9 @@ target_alias = @target_alias@
$OpenBSD: patch-ECtools_zarafa-cfgchecker_Makefile_in,v 1.7 2011/03/11 08:44:44 ajacoutot Exp $
--- ECtools/zarafa-cfgchecker/Makefile.in.orig Sun Feb 27 19:34:33 2011
+++ ECtools/zarafa-cfgchecker/Makefile.in Thu Mar 10 17:22:03 2011
@@ -257,7 +257,9 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX -I${top_srcdir}/common

11
mail/zarafa/zarafa/patches/patch-common_CommonUtil_cpp Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-common_CommonUtil_cpp,v 1.1 2011/03/11 08:44:44 ajacoutot Exp $
--- common/CommonUtil.cpp.orig Thu Mar 10 17:31:10 2011
+++ common/CommonUtil.cpp Thu Mar 10 17:30:52 2011
@@ -77,6 +77,7 @@
#include <sys/types.h>
#include <sys/socket.h>
+#include <netinet/in.h>
#include <netdb.h>
using namespace std;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-common_Makefile_in,v 1.8 2011/03/03 13:16:05 ajacoutot Exp $
--- common/Makefile.in.orig Mon Jan 24 13:06:15 2011
+++ common/Makefile.in Tue Jan 25 12:56:17 2011
@@ -290,7 +290,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
$OpenBSD: patch-common_Makefile_in,v 1.9 2011/03/11 08:44:44 ajacoutot Exp $
--- common/Makefile.in.orig Sun Feb 27 19:34:34 2011
+++ common/Makefile.in Thu Mar 10 17:22:03 2011
@@ -294,7 +294,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
-I${top_srcdir}/libfreebusy
@ -10,7 +10,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.8 2011/03/03 13:16:05 ajacoutot Exp $
libcommon_mapi_la_SOURCES = CommonUtil.cpp \
rtfutil.cpp \
codepage.cpp \
@@ -305,7 +305,7 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \
@@ -309,7 +309,7 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \
ZarafaCode.cpp \
ECABEntryID.cpp
@ -19,9 +19,9 @@ $OpenBSD: patch-common_Makefile_in,v 1.8 2011/03/03 13:16:05 ajacoutot Exp $
libcommon_util_la_SOURCES = platform.cpp \
platform.linux.cpp \
md5.cpp \
@@ -325,7 +325,7 @@ libcommon_util_la_SOURCES = platform.cpp \
TimeUtil.cpp \
RecurrenceState.cpp
@@ -331,7 +331,7 @@ libcommon_util_la_SOURCES = platform.cpp \
threadutil.cpp \
ECRestriction.cpp
-libcommon_ssl_la_LDFLAGS = -static
+libcommon_ssl_la_LDFLAGS = -version-info $(ECCLIENT_LIBRARY_VERSION)

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

@ -1,15 +1,22 @@
$OpenBSD: patch-common_mapi_ptr_mapi_memory_ptr_h,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
--- common/mapi_ptr/mapi_memory_ptr.h.orig Mon Jun 28 23:34:25 2010
+++ common/mapi_ptr/mapi_memory_ptr.h Mon Jun 28 23:35:09 2010
@@ -52,6 +52,11 @@
$OpenBSD: patch-common_mapi_ptr_mapi_memory_ptr_h,v 1.2 2011/03/11 08:44:44 ajacoutot Exp $
On OpenBSD, _U is defined in ctype.h.
--- common/mapi_ptr/mapi_memory_ptr.h.orig Thu Mar 10 18:17:04 2011
+++ common/mapi_ptr/mapi_memory_ptr.h Thu Mar 10 18:17:32 2011
@@ -160,11 +160,11 @@ class mapi_memory_ptr (public)
return proxy(&m_lpMemory);
}
#include <utility>
- template <typename _U>
- _U as() { return (_U)m_lpMemory; }
+ template <typename _ZCPU>
+ _ZCPU as() { return (_ZCPU)m_lpMemory; }
+// _U is defined in ctype.h
+#ifdef __OpenBSD__
+#undef _U
+#endif
+
template<typename _T>
class mapi_memory_proxy
{
- template <typename _U>
- const _U as() const { return (_U)m_lpMemory; }
+ template <typename _ZCPU>
+ const _ZCPU as() const { return (_ZCPU)m_lpMemory; }
operator void**() {
if (m_lpMemory) {

59
mail/zarafa/zarafa/patches/patch-common_mapi_ptr_mapi_object_ptr_h
View File

@ -1,15 +1,46 @@
$OpenBSD: patch-common_mapi_ptr_mapi_object_ptr_h,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
--- common/mapi_ptr/mapi_object_ptr.h.orig Mon Jun 28 23:35:15 2010
+++ common/mapi_ptr/mapi_object_ptr.h Mon Jun 28 23:35:26 2010
@@ -56,6 +56,11 @@
#include "ECTags.h"
#include "mapi_memory_ptr.h"
$OpenBSD: patch-common_mapi_ptr_mapi_object_ptr_h,v 1.2 2011/03/11 08:44:44 ajacoutot Exp $
On OpenBSD, _P and _U are defined in ctype.h.
--- common/mapi_ptr/mapi_object_ptr.h.orig Sun Feb 27 23:06:10 2011
+++ common/mapi_ptr/mapi_object_ptr.h Thu Mar 10 18:28:02 2011
@@ -169,13 +169,13 @@ class mapi_object_ptr (public)
std::swap(m_lpObject, other.m_lpObject);
}
- template<typename _U>
- HRESULT QueryInterface(_U &refResult) {
+ template<typename _ZCPU>
+ HRESULT QueryInterface(_ZCPU &refResult) {
HRESULT hr = MAPI_E_NOT_INITIALIZED;
- typename _U::pointer lpNewObject = NULL;
+ typename _ZCPU::pointer lpNewObject = NULL;
if (m_lpObject) {
- hr = m_lpObject->QueryInterface(_U::iid, (void**)&lpNewObject);
+ hr = m_lpObject->QueryInterface(_ZCPU::iid, (void**)&lpNewObject);
if (hr == hrSuccess)
refResult = lpNewObject;
+// _P is defined in ctype.h
+#ifdef __OpenBSD__
+#undef _P
+#endif
+
// http://tinyurl.com/ydb363n
template<typename BaseT, typename DerivedT>
class Conversion
@@ -197,7 +197,7 @@ class mapi_object_ptr (public)
if (HrGetOneProp(m_lpObject, PR_EC_OBJECT, &ptrPropValue) != hrSuccess)
goto exit; // hr is still MAPI_E_INTERFACE_NOT_SUPPORTED
- hr = ((IECUnknown*)ptrPropValue->Value.lpszA)->QueryInterface(_U::iid, (void**)&lpNewObject);
+ hr = ((IECUnknown*)ptrPropValue->Value.lpszA)->QueryInterface(_ZCPU::iid, (void**)&lpNewObject);
if (hr == hrSuccess)
refResult = lpNewObject;
}
@@ -228,9 +228,9 @@ class mapi_object_ptr (public)
return m_lpObject == NULL;
}
- template<typename _P>
- _P as() {
- _P ptrTmp;
+ template<typename _ZCPP>
+ _ZCPP as() {
+ _ZCPP ptrTmp;
QueryInterface(ptrTmp);
return ptrTmp;
}

20
mail/zarafa/zarafa/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.10 2011/03/03 13:16:05 ajacoutot Exp $
--- configure.orig Mon Jan 24 13:06:11 2011
+++ configure Tue Jan 25 12:56:17 2011
@@ -21794,12 +21794,7 @@ else
$OpenBSD: patch-configure,v 1.11 2011/03/11 08:44:44 ajacoutot Exp $
--- configure.orig Sun Feb 27 19:34:30 2011
+++ configure Thu Mar 10 17:22:03 2011
@@ -21801,12 +21801,7 @@ else
want_release=no
fi
@ -14,7 +14,7 @@ $OpenBSD: patch-configure,v 1.10 2011/03/03 13:16:05 ajacoutot Exp $
# Check whether --enable-tcmalloc was given.
if test "${enable_tcmalloc+set}" = set; then
@@ -21827,7 +21822,7 @@ else
@@ -21834,7 +21829,7 @@ else
with_distro=rhel
fi
@ -23,7 +23,7 @@ $OpenBSD: patch-configure,v 1.10 2011/03/03 13:16:05 ajacoutot Exp $
{ echo "$as_me:$LINENO: result: invalid distro, using rhel instead" >&5
echo "${ECHO_T}invalid distro, using rhel instead" >&6; }
else
@@ -22167,21 +22162,6 @@ echo "$as_me: error: Cannot execute $PHP_CONFIG" >&2;}
@@ -22174,21 +22169,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.10 2011/03/03 13:16:05 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
@@ -22707,7 +22687,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
@@ -22714,7 +22694,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
_ACEOF
VMIME_CFLAGS=-I$VMIME_PREFIX
@ -54,7 +54,7 @@ $OpenBSD: patch-configure,v 1.10 2011/03/03 13:16:05 ajacoutot Exp $
else
@@ -23117,8 +23097,10 @@ fi
@@ -23124,8 +23104,10 @@ fi
done
@ -66,7 +66,7 @@ $OpenBSD: patch-configure,v 1.10 2011/03/03 13:16:05 ajacoutot Exp $
CFLAGS=$cflags_keep
# Check for CLucene availability
@@ -24489,13 +24471,13 @@ LIBS=$libs_keep
@@ -25116,13 +25098,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.10 2011/03/03 13:16:05 ajacoutot Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -24555,7 +24537,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then
@@ -25182,7 +25164,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then
#define HAVE_LIBPTHREAD 1
_ACEOF

18
mail/zarafa/zarafa/patches/patch-doc_Makefile_in
View File

@ -1,20 +1,20 @@
$OpenBSD: patch-doc_Makefile_in,v 1.9 2011/03/03 13:16:05 ajacoutot Exp $
--- doc/Makefile.in.orig Mon Jan 24 13:06:15 2011
+++ doc/Makefile.in Tue Jan 25 12:56:17 2011
@@ -235,9 +235,9 @@ dist_data_DATA =
$OpenBSD: patch-doc_Makefile_in,v 1.10 2011/03/11 08:44:44 ajacoutot Exp $
--- doc/Makefile.in.orig Sun Feb 27 19:34:34 2011
+++ doc/Makefile.in Thu Mar 10 17:23:32 2011
@@ -238,9 +238,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 \
- zarafa-backup.1 zarafa-restore.1 zarafa-ical.1 zarafa-licensed.1 zarafa-stats.1 zarafa-fsck.1 zarafa-indexer.1 zarafa-report.1 \
- zarafa-ical.cfg.5 zarafa-server.cfg.5 zarafa-ldap.cfg.5 zarafa-ldapms.cfg.5 zarafa-unix.cfg.5 zarafa-spooler.cfg.5 zarafa-gateway.cfg.5 \
- zarafa-monitor.cfg.5 zarafa-licensed.cfg.5 zarafa-dagent.cfg.5 zarafa-indexer.cfg.5 zarafa-archiver.1 zarafa-archiver.cfg.5
- zarafa-monitor.cfg.5 zarafa-licensed.cfg.5 zarafa-dagent.cfg.5 zarafa-indexer.cfg.5 zarafa-archiver.1 zarafa-archiver.cfg.5 \
+ zarafa-backup.1 zarafa-restore.1 zarafa-ical.1 zarafa-stats.1 zarafa-fsck.1 zarafa-report.1 \
+ zarafa-ical.cfg.5 zarafa-server.cfg.5 zarafa-ldap.cfg.5 zarafa-spooler.cfg.5 zarafa-gateway.cfg.5 \
+ zarafa-monitor.cfg.5 zarafa-dagent.cfg.5
+ zarafa-monitor.cfg.5 zarafa-dagent.cfg.5 \
zarafa-msr.1 zarafa-msr.cfg.5
man_MANS = $(BUILT_SOURCES) $(allpages)
EXTRA_DIST = $(BUILT_SOURCES) $(allpages) manual.xml
@@ -380,12 +380,12 @@ uninstall-man5:
@@ -384,12 +384,12 @@ uninstall-man5:
done
install-dist_dataDATA: $(dist_data_DATA)
@$(NORMAL_INSTALL)
@ -30,7 +30,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.9 2011/03/03 13:16:05 ajacoutot Exp $
done
uninstall-dist_dataDATA:
@@ -541,7 +541,7 @@ $(BUILT_SOURCES): manual.xml
@@ -545,7 +545,7 @@ $(BUILT_SOURCES): manual.xml
@if [ -z $(PROG_XMLTO) ]; then \
echo Please install xmlto to generate manual pages; \
else \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_manual_xml,v 1.15 2011/03/03 13:16:05 ajacoutot Exp $
--- doc/manual.xml.orig Mon Jan 24 12:03:04 2011
+++ doc/manual.xml Tue Jan 25 12:56:17 2011
@@ -835,9 +835,7 @@
$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
@@ -837,9 +837,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -12,7 +12,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.15 2011/03/03 13:16:05 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-dagent.pid</replaceable>
@@ -1172,11 +1170,6 @@
@@ -1174,11 +1172,6 @@
<replaceable>/path/to/server.cfg</replaceable>
</para>
@ -24,7 +24,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.15 2011/03/03 13:16:05 ajacoutot Exp $
</refsection>
<refsection>
@@ -2859,9 +2852,7 @@
@@ -2861,9 +2854,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -35,7 +35,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.15 2011/03/03 13:16:05 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-server.pid</replaceable>
@@ -5676,13 +5667,8 @@
@@ -5678,13 +5669,8 @@
</para>
<para>The spooler process will keep running and watching the
@ -51,7 +51,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.15 2011/03/03 13:16:05 ajacoutot Exp $
</refsection>
<refsection>
@@ -5854,9 +5840,7 @@
@@ -5856,9 +5842,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -62,7 +62,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.15 2011/03/03 13:16:05 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-spooler.pid</replaceable>
@@ -6242,13 +6226,8 @@
@@ -6244,13 +6228,8 @@
<para><command>zarafa-gateway</command></para>
@ -78,7 +78,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.15 2011/03/03 13:16:05 ajacoutot Exp $
</refsection>
<refsection>
@@ -6468,9 +6447,7 @@
@@ -6489,9 +6468,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -89,7 +89,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.15 2011/03/03 13:16:05 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-gateway.pid</replaceable>
@@ -6851,14 +6828,8 @@
@@ -6872,14 +6849,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.15 2011/03/03 13:16:05 ajacoutot Exp $
</refsection>
<refsection>
@@ -7010,9 +6981,7 @@
@@ -7031,9 +7002,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -116,7 +116,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.15 2011/03/03 13:16:05 ajacoutot Exp $
</para>
<para>Default value: /var/run/zarafa-monitor.pid
</para>
@@ -8265,13 +8234,8 @@
@@ -8286,13 +8255,8 @@
<para><command>zarafa-ical</command></para>
@ -132,7 +132,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.15 2011/03/03 13:16:05 ajacoutot Exp $
</refsection>
<refsection>
@@ -8454,9 +8418,7 @@
@@ -8475,9 +8439,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -143,7 +143,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.15 2011/03/03 13:16:05 ajacoutot Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-ical.pid</replaceable>
@@ -8770,13 +8732,8 @@
@@ -8791,13 +8753,8 @@
<para><command>zarafa-licensed</command></para>
@ -159,7 +159,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.15 2011/03/03 13:16:05 ajacoutot Exp $
</refsection>
<refsection>
@@ -8920,9 +8877,7 @@
@@ -8941,9 +8898,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>

10
mail/zarafa/zarafa/patches/patch-installer_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-installer_Makefile_in,v 1.7 2011/03/03 13:16:05 ajacoutot Exp $
--- installer/Makefile.in.orig Mon Jan 24 13:06:15 2011
+++ installer/Makefile.in Tue Jan 25 12:56:17 2011
@@ -238,7 +238,7 @@ sysconfdir = @sysconfdir@
$OpenBSD: patch-installer_Makefile_in,v 1.8 2011/03/11 08:44:44 ajacoutot Exp $
--- installer/Makefile.in.orig Sun Feb 27 19:34:34 2011
+++ installer/Makefile.in Thu Mar 10 17:22:03 2011
@@ -241,7 +241,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.7 2011/03/03 13:16:05 ajacoutot Exp $
dist_data_DATA = ldap/zarafa.schema licenseagreement/eula.txt licenseagreement/AGPL-3
all: all-recursive
@@ -280,12 +280,12 @@ clean-libtool:
@@ -283,12 +283,12 @@ clean-libtool:
-rm -rf .libs _libs
install-dist_dataDATA: $(dist_data_DATA)
@$(NORMAL_INSTALL)

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_Makefile_in,v 1.13 2011/03/03 13:16:05 ajacoutot Exp $
--- installer/linux/Makefile.in.orig Mon Jan 24 13:06:15 2011
+++ installer/linux/Makefile.in Tue Jan 25 12:56:17 2011
$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
@@ -55,15 +55,15 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGUR
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/common/config.h
@ -46,7 +46,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.13 2011/03/03 13:16:05 ajacoutot
dist_sysconf_configDATA_INSTALL = $(INSTALL_DATA)
am__dist_sysconf_rotate_DATA_DIST = zarafa.logrotate \
zarafa-indexer.logrotate zarafa-licensed.logrotate
@@ -237,6 +235,7 @@ datadir = ${docdir}
@@ -240,6 +238,7 @@ datadir = ${docdir}
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
@ -54,7 +54,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.13 2011/03/03 13:16:05 ajacoutot
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
@@ -266,8 +265,8 @@ sysconfdir = @sysconfdir@
@@ -269,8 +268,8 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
@ -65,7 +65,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.13 2011/03/03 13:16:05 ajacoutot
autorespond $(am__append_2) $(BUILT_SOURCES)
rhel_initscript_files = zarafa-server.init.rhel \
zarafa-spooler.init.rhel zarafa-gateway.init.rhel \
@@ -462,15 +461,7 @@ uninstall-dist_sysconf_configDATA:
@@ -465,15 +464,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.13 2011/03/03 13:16:05 ajacoutot
uninstall-dist_sysconf_rotateDATA:
@$(NORMAL_UNINSTALL)
@@ -534,7 +525,7 @@ check: $(BUILT_SOURCES)
@@ -537,7 +528,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.13 2011/03/03 13:16:05 ajacoutot
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -581,9 +572,9 @@ info: info-am
@@ -584,9 +575,9 @@ info: info-am
info-am:
@ -103,7 +103,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.13 2011/03/03 13:16:05 ajacoutot
install-sysconf_sysconfigDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -663,13 +654,7 @@ ldapms.active-directory.cfg: ldap.m4
@@ -666,13 +657,7 @@ ldapms.active-directory.cfg: ldap.m4
m4 -DTYPE=ADS -DMULTISERVER=1 ${top_srcdir}/installer/linux/ldap.m4 > $@
install-data-hook:
@ -117,10 +117,11 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.13 2011/03/03 13:16:05 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,16 +670,6 @@ install-data-hook:
@@ -687,18 +672,6 @@ install-data-hook:
fi; \
else \
true; \
fi
- fi
- if test `ls -1A ${DESTDIR}${sysconf_initdir}/ | wc -l` -ne 0; then \
- for f in ${DESTDIR}${sysconf_initdir}/*; do \
- newf=`echo "$$f" | sed -e 's/\(zarafa-.*\).init.*/\1/'`; \
@ -129,8 +130,9 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.13 2011/03/03 13:16:05 ajacoutot
- fi
- install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config
- mv ${DESTDIR}/${data_configdir}/indexer.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config
- install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config
- mv ${DESTDIR}/${data_configdir}/archiver.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config
- if [ -f ${DESTDIR}/${data_configdir}/archiver.cfg ]; then \
- install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config; \
- mv ${DESTDIR}/${data_configdir}/archiver.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-archiver/example-config; \
fi
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

12
mail/zarafa/zarafa/patches/patch-installer_linux_gateway_cfg
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-installer_linux_gateway_cfg,v 1.5 2010/10/27 18:26:17 ajacoutot Exp $
--- installer/linux/gateway.cfg.orig Wed Oct 20 12:42:55 2010
+++ installer/linux/gateway.cfg Wed Oct 27 19:18:52 2010
@@ -7,16 +7,16 @@ server_bind = 0.0.0.0
server_socket = http://localhost:236/zarafa
$OpenBSD: patch-installer_linux_gateway_cfg,v 1.6 2011/03/11 08:44:44 ajacoutot Exp $
--- installer/linux/gateway.cfg.orig Sun Feb 27 19:33:57 2011
+++ installer/linux/gateway.cfg Thu Mar 10 17:22:03 2011
@@ -14,16 +14,16 @@ server_hostname =
server_hostname_greeting = no
# drop privileges and run the process as this user
-run_as_user =
@ -22,7 +22,7 @@ $OpenBSD: patch-installer_linux_gateway_cfg,v 1.5 2010/10/27 18:26:17 ajacoutot
# enable/disable POP3, and POP3 listen port
pop3_enable = yes
@@ -51,10 +51,10 @@ imap_always_generate = no
@@ -58,10 +58,10 @@ imap_always_generate = no
imap_max_messagesize = 134217728
# File with RSA key for SSL

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

@ -1,7 +1,7 @@
$OpenBSD: patch-libfreebusy_Makefile_in,v 1.8 2011/03/03 13:16:05 ajacoutot Exp $
--- libfreebusy/Makefile.in.orig Mon Jan 24 13:06:16 2011
+++ libfreebusy/Makefile.in Tue Jan 25 12:56:18 2011
@@ -259,7 +259,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
$OpenBSD: patch-libfreebusy_Makefile_in,v 1.9 2011/03/11 08:44:44 ajacoutot Exp $
--- libfreebusy/Makefile.in.orig Sun Feb 27 19:34:35 2011
+++ libfreebusy/Makefile.in Thu Mar 10 17:22:03 2011
@@ -262,7 +262,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
-I${top_srcdir}/common
libfreebusy_la_includedir = $(includedir)/libfreebusy

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

@ -1,7 +1,7 @@
$OpenBSD: patch-mapi4linux_src_Makefile_in,v 1.8 2011/03/03 13:16:05 ajacoutot Exp $
--- mapi4linux/src/Makefile.in.orig Mon Jan 24 13:06:17 2011
+++ mapi4linux/src/Makefile.in Tue Jan 25 12:56:18 2011
@@ -268,7 +268,7 @@ libmapi_la_LIBADD = \
$OpenBSD: patch-mapi4linux_src_Makefile_in,v 1.9 2011/03/11 08:44:44 ajacoutot Exp $
--- mapi4linux/src/Makefile.in.orig Sun Feb 27 19:34:35 2011
+++ mapi4linux/src/Makefile.in Thu Mar 10 17:22:03 2011
@@ -271,7 +271,7 @@ libmapi_la_LIBADD = \
# required because we're exporting extern "C" functions and want to filter with 'export-symbols'

12
mail/zarafa/zarafa/patches/patch-php-ext_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-php-ext_Makefile_in,v 1.10 2011/03/03 13:16:05 ajacoutot Exp $
--- php-ext/Makefile.in.orig Mon Jan 24 13:06:17 2011
+++ php-ext/Makefile.in Tue Jan 25 12:56:18 2011
@@ -229,7 +229,7 @@ build_cpu = @build_cpu@
$OpenBSD: patch-php-ext_Makefile_in,v 1.11 2011/03/11 08:44:44 ajacoutot Exp $
--- php-ext/Makefile.in.orig Sun Feb 27 19:34:35 2011
+++ php-ext/Makefile.in Thu Mar 10 17:22:03 2011
@@ -232,7 +232,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.10 2011/03/03 13:16:05 ajacoutot Exp $
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
@@ -277,7 +277,7 @@ mapi_la_LDFLAGS = -module -avoid-version \
@@ -280,7 +280,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.10 2011/03/03 13:16:05 ajacoutot Exp $
# it seems linking libraries with -pthread will not contain -lpthread.
@@ -560,7 +560,7 @@ install-data-am: install-dist_dataDATA
@@ -563,7 +563,7 @@ install-data-am: install-dist_dataDATA
install-dvi: install-dvi-am

10
mail/zarafa/zarafa/patches/patch-provider_client_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_client_Makefile_in,v 1.9 2011/03/03 13:16:05 ajacoutot Exp $
--- provider/client/Makefile.in.orig Mon Jan 24 13:06:17 2011
+++ provider/client/Makefile.in Tue Jan 25 12:56:18 2011
@@ -294,7 +294,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
$OpenBSD: patch-provider_client_Makefile_in,v 1.10 2011/03/11 08:44:44 ajacoutot Exp $
--- provider/client/Makefile.in.orig Sun Feb 27 19:34:35 2011
+++ provider/client/Makefile.in Thu Mar 10 17:22:03 2011
@@ -298,7 +298,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.9 2011/03/03 13:16:05 ajacoutot
libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS) \
${top_builddir}/provider/soap/libgsoap.la \
${top_builddir}/provider/soap/libsoapclient.la \
@@ -307,7 +307,7 @@ libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS)
@@ -311,7 +311,7 @@ libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS)
${top_builddir}/zarafa-libsync/libzarafasync.la \
-lstdc++ $(UUID_LIBS)

12
mail/zarafa/zarafa/patches/patch-provider_common_ECSearchClient_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_common_ECSearchClient_cpp,v 1.2 2011/03/03 13:16:05 ajacoutot Exp $
--- provider/common/ECSearchClient.cpp.orig Mon Jan 24 16:55:05 2011
+++ provider/common/ECSearchClient.cpp Tue Jan 25 12:56:18 2011
@@ -130,7 +130,9 @@ ECRESULT ECSearchClient::Query(std::string &strQuery,
$OpenBSD: patch-provider_common_ECSearchClient_cpp,v 1.3 2011/03/11 08:44:44 ajacoutot Exp $
--- provider/common/ECSearchClient.cpp.orig Sun Feb 27 23:06:14 2011
+++ provider/common/ECSearchClient.cpp Thu Mar 10 17:22:03 2011
@@ -124,7 +124,9 @@ ECRESULT ECSearchClient::Query(std::string &strQuery,
ECRESULT er = erSuccess;
ECSearchResultArray *lpResults = NULL;
std::vector<std::string> lstResponse;
@ -11,7 +11,7 @@ $OpenBSD: patch-provider_common_ECSearchClient_cpp,v 1.2 2011/03/03 13:16:05 aja
if (!lppsResults) {
er = ZARAFA_E_INVALID_PARAMETER;
@@ -178,7 +180,11 @@ ECRESULT ECSearchClient::Query(std::string &strQuery,
@@ -172,7 +174,11 @@ ECRESULT ECSearchClient::Query(std::string &strQuery,
memcpy(lpResults->__ptr[i].sEntryId.__ptr, strEntryId.c_str(), strEntryId.size());
@ -23,7 +23,7 @@ $OpenBSD: patch-provider_common_ECSearchClient_cpp,v 1.2 2011/03/03 13:16:05 aja
lpResults->__size++;
}
@@ -189,7 +195,9 @@ exit:
@@ -183,7 +189,9 @@ exit:
if ((er != erSuccess) && lpResults)
FreeSearchResults(lpResults);

20
mail/zarafa/zarafa/patches/patch-provider_libserver_ECDatabaseUtils_cpp
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
--- provider/libserver/ECDatabaseUtils.cpp.orig Tue Jun 29 01:34:47 2010
+++ provider/libserver/ECDatabaseUtils.cpp Tue Jun 29 00:46:43 2010
@@ -554,7 +554,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
$OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.2 2011/03/11 08:44:44 ajacoutot Exp $
--- provider/libserver/ECDatabaseUtils.cpp.orig Sun Feb 27 23:06:14 2011
+++ provider/libserver/ECDatabaseUtils.cpp Thu Mar 10 17:22:03 2011
@@ -526,7 +526,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
unsigned int ulLastPos;
std::string strData;
unsigned int type = atoi(lpRow[FIELD_NR_TYPE]);
@ -11,7 +11,7 @@ $OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.1 2010/06/30 02:46:48
lpPropVal->ulPropTag = PROP_TAG(atoi(lpRow[FIELD_NR_TYPE]),atoi(lpRow[FIELD_NR_TAG]));
@@ -581,7 +583,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
@@ -553,7 +555,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
goto exit;
}
lpPropVal->__union = SOAP_UNION_propValData_flt;
@ -23,7 +23,7 @@ $OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.1 2010/06/30 02:46:48
break;
case PT_BOOLEAN:
if(lpRow[FIELD_NR_ULONG] == NULL) {
@@ -597,7 +603,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
@@ -569,7 +575,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
goto exit;
}
lpPropVal->__union = SOAP_UNION_propValData_dbl;
@ -35,7 +35,7 @@ $OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.1 2010/06/30 02:46:48
break;
case PT_CURRENCY:
if(lpRow[FIELD_NR_HI] == NULL || lpRow[FIELD_NR_LO] == NULL) {
@@ -615,7 +625,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
@@ -587,7 +597,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
goto exit;
}
lpPropVal->__union = SOAP_UNION_propValData_dbl;
@ -47,7 +47,7 @@ $OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.1 2010/06/30 02:46:48
break;
case PT_SYSTIME:
if(lpRow[FIELD_NR_HI] == NULL || lpRow[FIELD_NR_LO] == NULL) {
@@ -721,7 +735,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
@@ -693,7 +707,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
for(i=0; i < lpPropVal->Value.mvflt.__size; i++)
{
ParseMVProp(lpRow[FIELD_NR_DOUBLE], lpLen[FIELD_NR_DOUBLE], &ulLastPos, &strData);
@ -59,7 +59,7 @@ $OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.1 2010/06/30 02:46:48
}
break;
case PT_MV_DOUBLE:
@@ -738,7 +756,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
@@ -710,7 +728,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
for(i=0; i < lpPropVal->Value.mvdbl.__size; i++)
{
ParseMVProp(lpRow[FIELD_NR_DOUBLE], lpLen[FIELD_NR_DOUBLE], &ulLastPos, &strData);
@ -71,7 +71,7 @@ $OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.1 2010/06/30 02:46:48
}
break;
case PT_MV_CURRENCY:
@@ -821,7 +843,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
@@ -793,7 +815,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap
}
exit:

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

@ -1,8 +0,0 @@
$OpenBSD: patch-provider_libserver_ECIndexer_h,v 1.1 2011/03/03 13:16:05 ajacoutot Exp $
--- provider/libserver/ECIndexer.h.orig Tue Jan 25 13:11:03 2011
+++ provider/libserver/ECIndexer.h Tue Jan 25 13:11:12 2011
@@ -60,3 +60,4 @@ struct ECSearchResultArray;
ECRESULT GetIndexerResults(ECConfig *lpConfig, ECLogger *lpLogger, ECCacheManager *lpCacheManager, GUID *guidServer, unsigned int ulStoreId, ECListInt &lstFolders, struct restrictTable *lpRestrict, ECSearchResultArray **lppIndexerResults);
+#endif // ECINDEXER_H

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

@ -1,10 +1,10 @@
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.16 2011/03/03 13:16:05 ajacoutot Exp $
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.17 2011/03/11 08:44:44 ajacoutot Exp $
OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
--- provider/libserver/ZarafaCmd.cpp.orig Mon Jan 24 16:55:05 2011
+++ provider/libserver/ZarafaCmd.cpp Tue Jan 25 12:56:18 2011
@@ -681,11 +681,11 @@ double GetTimeOfDay();
--- provider/libserver/ZarafaCmd.cpp.orig Sun Feb 27 23:06:14 2011
+++ provider/libserver/ZarafaCmd.cpp Thu Mar 10 17:22:03 2011
@@ -680,11 +680,11 @@ double GetTimeOfDay();
#define SOAP_ENTRY_FUNCTION_HEADER(resultvar, fname) \
ECRESULT er = erSuccess; \
@ -18,7 +18,7 @@ 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); \
} \
@@ -696,11 +696,11 @@ double GetTimeOfDay();
@@ -695,11 +695,11 @@ double GetTimeOfDay();
#define SOAP_ENTRY_FUNCTION_FOOTER \
__soapentry_exit: \
*lpResultVar = er; \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_server_Makefile_in,v 1.8 2011/03/03 13:16:05 ajacoutot Exp $
--- provider/server/Makefile.in.orig Mon Jan 24 13:06:17 2011
+++ provider/server/Makefile.in Tue Jan 25 12:56:18 2011
@@ -277,10 +277,11 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INTL_LIBS) $(ICON
$OpenBSD: patch-provider_server_Makefile_in,v 1.9 2011/03/11 08:44:44 ajacoutot Exp $
--- provider/server/Makefile.in.orig Sun Feb 27 19:34:36 2011
+++ provider/server/Makefile.in Thu Mar 10 17:22:03 2011
@@ -280,10 +280,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 \

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

@ -1,6 +1,6 @@
$OpenBSD: patch-spooler_DAgent_cpp,v 1.11 2010/10/27 18:26:17 ajacoutot Exp $
--- spooler/DAgent.cpp.orig Wed Oct 20 16:16:24 2010
+++ spooler/DAgent.cpp Wed Oct 27 19:18:53 2010
$OpenBSD: patch-spooler_DAgent_cpp,v 1.12 2011/03/11 08:44:44 ajacoutot Exp $
--- spooler/DAgent.cpp.orig Sun Feb 27 23:06:13 2011
+++ spooler/DAgent.cpp Thu Mar 10 17:22:03 2011
@@ -88,6 +88,10 @@
#include <sys/mman.h>
#include <pwd.h>
@ -12,7 +12,7 @@ $OpenBSD: patch-spooler_DAgent_cpp,v 1.11 2010/10/27 18:26:17 ajacoutot Exp $
/*
This is actually from sysexits.h
but since those windows lamers don't have it ..
@@ -2612,7 +2616,7 @@ int main(int argc, char *argv[]) {
@@ -2631,7 +2635,7 @@ int main(int argc, char *argv[]) {
DeliveryArgs sDeliveryArgs;
sDeliveryArgs.strPath = "";

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

@ -1,7 +1,7 @@
$OpenBSD: patch-spooler_Makefile_in,v 1.7 2011/03/03 13:16:05 ajacoutot Exp $
--- spooler/Makefile.in.orig Mon Jan 24 13:06:18 2011
+++ spooler/Makefile.in Tue Jan 25 12:56:18 2011
@@ -277,7 +277,7 @@ zarafa_spooler_LDADD = ${top_builddir}/inetmapi/libine
$OpenBSD: patch-spooler_Makefile_in,v 1.8 2011/03/11 08:44:44 ajacoutot Exp $
--- spooler/Makefile.in.orig Sun Feb 27 19:34:36 2011
+++ spooler/Makefile.in Thu Mar 10 17:22:03 2011
@@ -280,7 +280,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 \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-zarafa-libsync_Makefile_in,v 1.3 2011/03/03 13:16:05 ajacoutot Exp $
--- zarafa-libsync/Makefile.in.orig Mon Jan 24 13:06:18 2011
+++ zarafa-libsync/Makefile.in Tue Jan 25 12:56:18 2011
@@ -258,7 +258,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
$OpenBSD: patch-zarafa-libsync_Makefile_in,v 1.4 2011/03/11 08:44:44 ajacoutot Exp $
--- zarafa-libsync/Makefile.in.orig Sun Feb 27 19:34:37 2011
+++ zarafa-libsync/Makefile.in Thu Mar 10 17:22:03 2011
@@ -261,7 +261,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
-I${top_srcdir}/common
libzarafasync_la_includedir = $(includedir)/libzarafasync

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.21 2011/03/03 13:16:05 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.22 2011/03/11 08:44:44 ajacoutot Exp $
@newgroup _zarafa:627
@newuser _zarafa:627:_zarafa:daemon:Zarafa Account:/var/empty:/sbin/nologin
@bin bin/zarafa-admin
@ -9,6 +9,7 @@ bin/zarafa-autorespond
@bin bin/zarafa-gateway
@bin bin/zarafa-ical
@bin bin/zarafa-monitor
bin/zarafa-msr
@bin bin/zarafa-passwd
@bin bin/zarafa-server
@bin bin/zarafa-spooler
@ -86,6 +87,7 @@ include/zarafa/ECKeyTable.h
include/zarafa/ECLogger.h
include/zarafa/ECMemStream.h
include/zarafa/ECMemTable.h
include/zarafa/ECRestriction.h
include/zarafa/ECScheduler.h
include/zarafa/ECSerializer.h
include/zarafa/ECTags.h
@ -136,6 +138,9 @@ include/zarafa/restrictionutil.h
include/zarafa/rtfutil.h
include/zarafa/str1252.h
include/zarafa/stringutil.h
include/zarafa/threadutil.h
lib/libarchiver.la
@lib lib/libarchiver.so.${LIBarchiver_VERSION}
lib/libcommon_mapi.la
@lib lib/libcommon_mapi.so.${LIBcommon_mapi_VERSION}
lib/libcommon_ssl.la
@ -168,6 +173,7 @@ lib/zarafa/ldapplugin.so
@man man/man1/zarafa-gateway.1
@man man/man1/zarafa-ical.1
@man man/man1/zarafa-monitor.1
@man man/man1/zarafa-msr.1
@man man/man1/zarafa-passwd.1
@man man/man1/zarafa-report.1
@man man/man1/zarafa-restore.1
@ -180,6 +186,7 @@ lib/zarafa/ldapplugin.so
@man man/man5/zarafa-ical.cfg.5
@man man/man5/zarafa-ldap.cfg.5
@man man/man5/zarafa-monitor.cfg.5
@man man/man5/zarafa-msr.cfg.5
@man man/man5/zarafa-server.cfg.5
@man man/man5/zarafa-spooler.cfg.5
share/doc/pkg-readmes/${FULLPKGNAME}
@ -196,7 +203,6 @@ share/doc/zarafa/db-upgrade-objectsid-to-objectguid.pl
share/doc/zarafa/eula.txt
share/doc/zarafa/ldap-switch-sendas.pl
share/doc/zarafa/ssl-certificates.sh
share/doc/zarafa/zarafa-msr
share/examples/zarafa/
@sample ${SYSCONFDIR}/zarafa/
@mode 750

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-web,v 1.8 2011/03/03 13:16:05 ajacoutot Exp $
@comment $OpenBSD: PLIST-web,v 1.9 2011/03/11 08:44:44 ajacoutot Exp $
@conflict php5-mapi-*
@pkgpath mail/zarafa/webaccess
@pkgpath mail/zarafa/zarafa,-php
@ -358,7 +358,6 @@ 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
zarafa-webaccess/client/layout/img/icon_zarafa.png
zarafa-webaccess/client/layout/img/importance.gif
zarafa-webaccess/client/layout/img/importance_high.gif
zarafa-webaccess/client/layout/img/importance_low.gif
@ -942,7 +941,6 @@ zarafa-webaccess/server/core/class.state.php
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/class.zarchiver.php
zarafa-webaccess/server/core/constants.php
zarafa-webaccess/server/core/htmlfilter.php
zarafa-webaccess/server/language/

6
mail/zarafa/zarafa/pkg/README-main
View File

@ -1,4 +1,4 @@
$OpenBSD: README-main,v 1.3 2011/03/03 13:16:05 ajacoutot Exp $
$OpenBSD: README-main,v 1.4 2011/03/11 08:44:44 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.
@ -105,8 +105,8 @@ to
The debugging output will then be available under:
${INSTDIR}/debug.txt
You can enable the PHP mapi module by creating a symbolic
link from ${PREFIX-web}/conf/php5.sample/${MODULE_NAME}.ini to
You need to enable the PHP mapi module by creating a symbolic link from
${PREFIX-web}/conf/php5.sample/${MODULE_NAME}.ini to
${PREFIX-web}/conf/php5/${MODULE_NAME}.ini:
# ln -fs ${PREFIX-web}/conf/php5.sample/${MODULE_NAME}.ini \