diff --git a/mail/zarafa/Makefile.inc b/mail/zarafa/Makefile.inc index 9d0d84afca9..0d8cf42fe6e 100644 --- a/mail/zarafa/Makefile.inc +++ b/mail/zarafa/Makefile.inc @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile.inc,v 1.17 2012/02/16 22:18:36 ajacoutot Exp $ +# $OpenBSD: Makefile.inc,v 1.18 2012/03/15 17:04:30 ajacoutot Exp $ # there is no point in building/running this on NO_SHARED_LIBS archs SHARED_ONLY= Yes -V?= 7.0.5 -BUILD?= 31880 +V?= 7.0.6 +BUILD?= 32752 DISTNAME?= zcp-${V} CATEGORIES+= mail/zarafa diff --git a/mail/zarafa/libvmime/Makefile b/mail/zarafa/libvmime/Makefile index fe8d9f0a298..7dc2a4a6eaa 100644 --- a/mail/zarafa/libvmime/Makefile +++ b/mail/zarafa/libvmime/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2012/02/16 22:18:06 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.24 2012/03/15 17:04:31 ajacoutot Exp $ COMMENT= modified libvmime library for Zarafa @@ -7,6 +7,8 @@ DISTNAME= libvmime-${VMIME_V}+svn603 PKGNAME= zarafa-libvmime-${VMIME_V} EPOCH= 0 +REVISION= 0 + EXTRACT_SUFX= .tar.bz2 WRKDIST= ${WRKDIR}/libvmime-${VMIME_V} @@ -15,6 +17,7 @@ PATCH_DIST_STRIP= -p1 PATCHFILES= \ vmime-0.9.2-header-value-on-next-line.diff:0 \ + vmime-0.9.2-qp-in-buffers.diff:0 \ vmime-mixed-qp-in-parameter.diff:0 MASTER_SITES0= ${MASTER_SITES_ZARAFA:=/vmime-patches/} diff --git a/mail/zarafa/libvmime/distinfo b/mail/zarafa/libvmime/distinfo index 7a19f8696f1..4e54333e3a6 100644 --- a/mail/zarafa/libvmime/distinfo +++ b/mail/zarafa/libvmime/distinfo @@ -1,15 +1,20 @@ MD5 (zarafa/libvmime-0.9.2+svn603.tar.bz2) = C6Za2IlIiy+FHX8Ci/tung== MD5 (zarafa/vmime-0.9.2-header-value-on-next-line.diff) = +dkV9XbVXK8cF1+F/pZXLA== +MD5 (zarafa/vmime-0.9.2-qp-in-buffers.diff) = sLMmDYiJnFrv90qthhhmAg== MD5 (zarafa/vmime-mixed-qp-in-parameter.diff) = KWUfGGMvcfk+LKfRKExxiw== RMD160 (zarafa/libvmime-0.9.2+svn603.tar.bz2) = bgX3NVnvT+r0Hlwot27HgM2wy6U= RMD160 (zarafa/vmime-0.9.2-header-value-on-next-line.diff) = Q2RLvq2lSo605qO7ve2idLN6GEM= +RMD160 (zarafa/vmime-0.9.2-qp-in-buffers.diff) = rpCLdWySRp8984ttmJ9ycecUzyM= RMD160 (zarafa/vmime-mixed-qp-in-parameter.diff) = U2VeOMa4Yqa7rlHCXNFKRcYH09s= SHA1 (zarafa/libvmime-0.9.2+svn603.tar.bz2) = SBBK3j9gAsTIp1I5w3ob8ZQ6FLk= SHA1 (zarafa/vmime-0.9.2-header-value-on-next-line.diff) = UvbUdGbNG1+4sCQ6q5kpYDX2NO4= +SHA1 (zarafa/vmime-0.9.2-qp-in-buffers.diff) = joeS+7EeAtR/yLSch6O5c2B3414= SHA1 (zarafa/vmime-mixed-qp-in-parameter.diff) = W5wMSWLov6Ojl96fFRbUstGcniY= SHA256 (zarafa/libvmime-0.9.2+svn603.tar.bz2) = vU9EmJBM57/YEcfKkyWq77bnOSCYfKCvdP8xwZCPHco= SHA256 (zarafa/vmime-0.9.2-header-value-on-next-line.diff) = UUeWvFzZ8GlMQjXbQJOVfZv6nl3nFF6BiNch81AgY1A= +SHA256 (zarafa/vmime-0.9.2-qp-in-buffers.diff) = 4ph0F0/KoXcwQKVPrMz0AETwy0FWyghhz7JWBZOW8EE= SHA256 (zarafa/vmime-mixed-qp-in-parameter.diff) = Td5wFIVsFOnDTvb3KMAGRtbV1BQ427gbV7AyUitSlfg= SIZE (zarafa/libvmime-0.9.2+svn603.tar.bz2) = 522350 SIZE (zarafa/vmime-0.9.2-header-value-on-next-line.diff) = 1257 +SIZE (zarafa/vmime-0.9.2-qp-in-buffers.diff) = 515 SIZE (zarafa/vmime-mixed-qp-in-parameter.diff) = 882 diff --git a/mail/zarafa/zarafa/Makefile b/mail/zarafa/zarafa/Makefile index 65df850ed7b..de8e4b2dad4 100644 --- a/mail/zarafa/zarafa/Makefile +++ b/mail/zarafa/zarafa/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.116 2012/02/27 19:01:34 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.117 2012/03/15 17:04:31 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= 0 -REVISION-web= 0 - CATEGORIES= mail www productivity SHARED_LIBS += mapi 2.0 # 0.0 @@ -52,7 +49,7 @@ LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \ databases/openldap \ devel/uuid \ devel/libexecinfo \ - mail/zarafa/libvmime>=0.9.2v0 \ + mail/zarafa/libvmime>=0.9.2p0v0 \ textproc/libical \ textproc/icu4c \ devel/boost @@ -198,12 +195,14 @@ post-install: rmdir ${PREFIX}/share/doc/{zarafa/example-config,zarafa-gateway} rm -rf ${PREFIX}/share/examples/{cron.daily,init.d,logrotate.d,sysconfig,zarafa/zarafa-gateway,zarafa/license} - # part of zarafa-licensed (i.e. commercial edition, linux bin only) + # part of zarafa-licensed, Zarafa Enterprise / Hosted editions + # (i.e. commercial edition, linux bin only) cd ${PREFIX} && rm \ man/man1/zarafa-licensed.1 \ man/man5/zarafa-licensed.cfg.5 \ man/man1/zarafa-restore.1 \ man/man1/zarafa-backup.1 \ + man/man1/zarafa-msr-verify.1 \ man/man1/zarafa-report.1 \ man/man1/za-aclsync.1 \ man/man1/zarafa-msr.1 \ diff --git a/mail/zarafa/zarafa/distinfo b/mail/zarafa/zarafa/distinfo index b6ca6427765..e3a9b53c4f2 100644 --- a/mail/zarafa/zarafa/distinfo +++ b/mail/zarafa/zarafa/distinfo @@ -1,5 +1,5 @@ -MD5 (zarafa/zcp-7.0.5.tar.gz) = imCbREjwJqx+48YvUFJFzg== -RMD160 (zarafa/zcp-7.0.5.tar.gz) = baYS2DQT1hlHmLcs+rS9FCMTdfw= -SHA1 (zarafa/zcp-7.0.5.tar.gz) = EQGNP0K/5TENyUxFwkjCkFnE3x0= -SHA256 (zarafa/zcp-7.0.5.tar.gz) = I1or+kUvPAE9m1gSfLVXaQ38tlvGUQ2daOTVPwHCHfA= -SIZE (zarafa/zcp-7.0.5.tar.gz) = 6165679 +MD5 (zarafa/zcp-7.0.6.tar.gz) = nNZEJiZjzyzOe/yWPPuu8g== +RMD160 (zarafa/zcp-7.0.6.tar.gz) = Y666BvjOsd7Zps7mQx/SLoVKygE= +SHA1 (zarafa/zcp-7.0.6.tar.gz) = /+ftVu3FUVzDtRbgJQWVB2Avpfo= +SHA256 (zarafa/zcp-7.0.6.tar.gz) = S8QX0+3h2n9exnf3cnQEIo0eBmP+HFLILW0+RJ9OXFg= +SIZE (zarafa/zcp-7.0.6.tar.gz) = 6248757 diff --git a/mail/zarafa/zarafa/patches/patch-common_Makefile_in b/mail/zarafa/zarafa/patches/patch-common_Makefile_in index b1d8f3cead6..9de7dfdd200 100644 --- a/mail/zarafa/zarafa/patches/patch-common_Makefile_in +++ b/mail/zarafa/zarafa/patches/patch-common_Makefile_in @@ -1,10 +1,10 @@ -$OpenBSD: patch-common_Makefile_in,v 1.14 2012/02/16 22:18:36 ajacoutot Exp $ +$OpenBSD: patch-common_Makefile_in,v 1.15 2012/03/15 17:04:31 ajacoutot Exp $ *** Warning: This system can not link to static lib archive ../../common/libcommon_XXX.la. ---- common/Makefile.in.orig Wed Feb 1 15:48:56 2012 -+++ common/Makefile.in Thu Feb 2 12:28:17 2012 -@@ -353,7 +353,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) $(BOOST_CPPFLAGS) -DLINUX +--- common/Makefile.in.orig Tue Mar 13 11:28:10 2012 ++++ common/Makefile.in Thu Mar 15 16:43:08 2012 +@@ -354,7 +354,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) $(BOOST_CPPFLAGS) -DLINUX -I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \ -I${top_srcdir}/libfreebusy @@ -13,7 +13,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.14 2012/02/16 22:18:36 ajacoutot Exp $ libcommon_mapi_la_SOURCES = CommonUtil.cpp \ rtfutil.cpp \ codepage.cpp \ -@@ -373,7 +373,7 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \ +@@ -374,7 +374,7 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \ ECIterators.cpp \ MAPINotifSink.cpp @@ -22,10 +22,10 @@ $OpenBSD: patch-common_Makefile_in,v 1.14 2012/02/16 22:18:36 ajacoutot Exp $ libcommon_util_la_SOURCES = platform.cpp platform.linux.cpp md5.cpp \ base64.cpp ECLogger.cpp ECConfig.cpp ECConfigImpl.cpp \ ECFifoBuffer.cpp ECSerializer.cpp ECCache.cpp my_getopt.cpp \ -@@ -383,7 +383,7 @@ libcommon_util_la_SOURCES = platform.cpp platform.linu - charset/localeutil.cpp TimeUtil.cpp RecurrenceState.cpp \ +@@ -385,7 +385,7 @@ libcommon_util_la_SOURCES = platform.cpp platform.linu ECGetText.cpp threadutil.cpp ECRestriction.cpp userutil.cpp \ - ECFeatures.cpp ECACL.cpp ECThreadPool.cpp $(am__append_1) + ECFeatures.cpp ECACL.cpp fileutil.cpp ECThreadPool.cpp \ + $(am__append_1) -libcommon_ssl_la_LDFLAGS = -static +libcommon_ssl_la_LDFLAGS = -version-info $(ECCLIENT_LIBRARY_VERSION) libcommon_ssl_la_SOURCES = \ diff --git a/mail/zarafa/zarafa/patches/patch-configure b/mail/zarafa/zarafa/patches/patch-configure index 913c4695eb0..2a70e5c37e9 100644 --- a/mail/zarafa/zarafa/patches/patch-configure +++ b/mail/zarafa/zarafa/patches/patch-configure @@ -1,10 +1,10 @@ -$OpenBSD: patch-configure,v 1.20 2012/02/16 22:18:36 ajacoutot Exp $ +$OpenBSD: patch-configure,v 1.21 2012/03/15 17:04:31 ajacoutot Exp $ OpenBSD does NOT require -lcrypt, DES encryption is part of the standard libc. ---- configure.orig Wed Feb 1 15:48:54 2012 -+++ configure Thu Feb 2 12:28:17 2012 -@@ -21938,13 +21938,13 @@ fi +--- configure.orig Tue Mar 13 11:28:08 2012 ++++ configure Thu Mar 15 16:42:28 2012 +@@ -21937,13 +21937,13 @@ fi # Everything uses pthread # check lib, but do not set in link list, but use -pthread instead (gnu c/c++ only?) @@ -21,7 +21,7 @@ OpenBSD does NOT require -lcrypt, DES encryption is part of the standard libc. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -24474,7 +24474,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then +@@ -24473,7 +24473,7 @@ if test "${ac_cv_lib_intl_strftime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -30,7 +30,7 @@ OpenBSD does NOT require -lcrypt, DES encryption is part of the standard libc. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -24534,7 +24534,7 @@ if test $ac_cv_lib_intl_strftime = yes; then +@@ -24533,7 +24533,7 @@ if test $ac_cv_lib_intl_strftime = yes; then #define HAVE_STRFTIME 1 _ACEOF @@ -39,7 +39,7 @@ OpenBSD does NOT require -lcrypt, DES encryption is part of the standard libc. fi fi -@@ -26050,7 +26050,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then +@@ -26049,7 +26049,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then _ACEOF VMIME_CFLAGS=-I$VMIME_PREFIX @@ -48,7 +48,7 @@ OpenBSD does NOT require -lcrypt, DES encryption is part of the standard libc. else -@@ -27661,84 +27661,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 +@@ -27660,84 +27660,10 @@ sed 's/^/| /' conftest.$ac_ext >&5 { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } @@ -134,7 +134,7 @@ OpenBSD does NOT require -lcrypt, DES encryption is part of the standard libc. CRYPT_LIBS=$LIBS LIBS=$LIBS_system -@@ -27753,7 +27679,7 @@ if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then +@@ -27752,7 +27678,7 @@ if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -143,7 +143,7 @@ OpenBSD does NOT require -lcrypt, DES encryption is part of the standard libc. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28929,7 +28855,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then +@@ -28977,7 +28903,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -152,7 +152,7 @@ OpenBSD does NOT require -lcrypt, DES encryption is part of the standard libc. cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -28985,7 +28911,7 @@ fi +@@ -29033,7 +28959,7 @@ fi { echo "$as_me:$LINENO: result: $ac_cv_lib_intl_gettext" >&5 echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6; } if test $ac_cv_lib_intl_gettext = yes; then diff --git a/mail/zarafa/zarafa/patches/patch-doc_Makefile_in b/mail/zarafa/zarafa/patches/patch-doc_Makefile_in index 2ae874f4760..00d2fe4862a 100644 --- a/mail/zarafa/zarafa/patches/patch-doc_Makefile_in +++ b/mail/zarafa/zarafa/patches/patch-doc_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-doc_Makefile_in,v 1.15 2012/02/16 22:18:36 ajacoutot Exp $ ---- doc/Makefile.in.orig Wed Feb 1 15:48:56 2012 -+++ doc/Makefile.in Thu Feb 2 12:28:17 2012 -@@ -551,7 +551,7 @@ $(BUILT_SOURCES): manual.xml +$OpenBSD: patch-doc_Makefile_in,v 1.16 2012/03/15 17:04:31 ajacoutot Exp $ +--- doc/Makefile.in.orig Tue Mar 13 11:28:10 2012 ++++ doc/Makefile.in Thu Mar 15 16:42:28 2012 +@@ -550,7 +550,7 @@ $(BUILT_SOURCES): manual.xml @if [ -z $(PROG_XMLTO) ]; then \ echo Please install xmlto to generate manual pages; \ else \ diff --git a/mail/zarafa/zarafa/patches/patch-doc_manual_xml b/mail/zarafa/zarafa/patches/patch-doc_manual_xml index 8ffea1c1594..6e718b21312 100644 --- a/mail/zarafa/zarafa/patches/patch-doc_manual_xml +++ b/mail/zarafa/zarafa/patches/patch-doc_manual_xml @@ -1,6 +1,6 @@ -$OpenBSD: patch-doc_manual_xml,v 1.27 2012/02/16 22:18:36 ajacoutot Exp $ ---- doc/manual.xml.orig Wed Feb 1 15:40:39 2012 -+++ doc/manual.xml Thu Feb 2 12:28:17 2012 +$OpenBSD: patch-doc_manual_xml,v 1.28 2012/03/15 17:04:31 ajacoutot Exp $ +--- doc/manual.xml.orig Tue Mar 13 11:25:22 2012 ++++ doc/manual.xml Thu Mar 15 16:42:28 2012 @@ -850,9 +850,7 @@ @@ -52,7 +52,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.27 2012/02/16 22:18:36 ajacoutot Exp $ Default: /var/run/zarafa-server.pid -@@ -6084,13 +6079,8 @@ +@@ -6102,13 +6097,8 @@ The spooler process will keep running and watching the @@ -68,7 +68,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.27 2012/02/16 22:18:36 ajacoutot Exp $ -@@ -6271,9 +6261,7 @@ +@@ -6289,9 +6279,7 @@ @@ -79,7 +79,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.27 2012/02/16 22:18:36 ajacoutot Exp $ Default: /var/run/zarafa-spooler.pid -@@ -6703,13 +6691,8 @@ +@@ -6733,13 +6721,8 @@ zarafa-gateway @@ -95,7 +95,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.27 2012/02/16 22:18:36 ajacoutot Exp $ -@@ -6948,9 +6931,7 @@ +@@ -6978,9 +6961,7 @@ @@ -106,7 +106,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.27 2012/02/16 22:18:36 ajacoutot Exp $ Default: /var/run/zarafa-gateway.pid -@@ -7366,14 +7347,8 @@ +@@ -7396,14 +7377,8 @@ The monitor checks user mailbox sizes. The monitor sends a quota email when the warning quota limit is reached. When @@ -122,7 +122,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.27 2012/02/16 22:18:36 ajacoutot Exp $ -@@ -7525,9 +7500,7 @@ +@@ -7555,9 +7530,7 @@ @@ -133,7 +133,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.27 2012/02/16 22:18:36 ajacoutot Exp $ Default value: /var/run/zarafa-monitor.pid -@@ -8803,13 +8776,8 @@ +@@ -8833,13 +8806,8 @@ zarafa-ical @@ -149,7 +149,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.27 2012/02/16 22:18:36 ajacoutot Exp $ -@@ -8992,9 +8960,7 @@ +@@ -9022,9 +8990,7 @@ @@ -160,7 +160,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.27 2012/02/16 22:18:36 ajacoutot Exp $ Default: /var/run/zarafa-ical.pid -@@ -9322,13 +9288,8 @@ +@@ -9352,13 +9318,8 @@ zarafa-licensed @@ -176,7 +176,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.27 2012/02/16 22:18:36 ajacoutot Exp $ -@@ -9498,9 +9459,7 @@ +@@ -9528,9 +9489,7 @@ @@ -187,7 +187,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.27 2012/02/16 22:18:36 ajacoutot Exp $ Default: /var/run/zarafa-licensed.pid -@@ -10283,13 +10242,6 @@ +@@ -10313,13 +10272,6 @@ /path/to/indexer.cfg diff --git a/mail/zarafa/zarafa/patches/patch-installer_linux_zarafa-client-update_cron b/mail/zarafa/zarafa/patches/patch-installer_linux_zarafa-client-update_cron index 7e81ff5ca3e..0c68eb1833d 100644 --- a/mail/zarafa/zarafa/patches/patch-installer_linux_zarafa-client-update_cron +++ b/mail/zarafa/zarafa/patches/patch-installer_linux_zarafa-client-update_cron @@ -1,7 +1,7 @@ -$OpenBSD: patch-installer_linux_zarafa-client-update_cron,v 1.1 2011/12/22 17:10:04 ajacoutot Exp $ ---- installer/linux/zarafa-client-update.cron.orig Thu Dec 22 14:22:30 2011 -+++ installer/linux/zarafa-client-update.cron Thu Dec 22 14:23:43 2011 -@@ -1,13 +1,13 @@ +$OpenBSD: patch-installer_linux_zarafa-client-update_cron,v 1.2 2012/03/15 17:04:31 ajacoutot Exp $ +--- installer/linux/zarafa-client-update.cron.orig Tue Mar 13 11:27:19 2012 ++++ installer/linux/zarafa-client-update.cron Thu Mar 15 16:44:17 2012 +@@ -1,16 +1,16 @@ #!/bin/sh -CONFIG=/etc/zarafa/server.cfg @@ -13,12 +13,15 @@ $OpenBSD: patch-installer_linux_zarafa-client-update_cron,v 1.1 2011/12/22 17:10 - LOGPATH=/var/lib/zarafa/client + LOGPATH=/var/db/zarafa/client fi + if ! test -r "${LOGPATH}"; then + exit 0 + fi -LOGPATH=$(readlink -e ${LOGPATH}) +LOGPATH=$(readlink -f ${LOGPATH}) if test -z "${LOGPATH}"; then exit 0 fi -@@ -16,5 +16,5 @@ if test -n ${LOGPATH} -a ${PATHDEPTH} -gt 2 -a -d ${LO +@@ -19,5 +19,5 @@ if test -n ${LOGPATH} -a ${PATHDEPTH} -gt 2 -a -d ${LO # remove all files older than 14 days find ${LOGPATH} -maxdepth 2 -type f -ctime +14 -exec rm {} \; # remove all empty directories diff --git a/mail/zarafa/zarafa/patches/patch-libfreebusy_Makefile_in b/mail/zarafa/zarafa/patches/patch-libfreebusy_Makefile_in index a9b22437089..26d13bb3294 100644 --- a/mail/zarafa/zarafa/patches/patch-libfreebusy_Makefile_in +++ b/mail/zarafa/zarafa/patches/patch-libfreebusy_Makefile_in @@ -1,15 +1,15 @@ -$OpenBSD: patch-libfreebusy_Makefile_in,v 1.12 2012/02/16 22:18:36 ajacoutot Exp $ +$OpenBSD: patch-libfreebusy_Makefile_in,v 1.13 2012/03/15 17:04:31 ajacoutot Exp $ *** Warning: This system can not link to static lib archive ../../common/libcommon_XXX.la. ---- libfreebusy/Makefile.in.orig Wed Feb 1 15:48:58 2012 -+++ libfreebusy/Makefile.in Thu Feb 2 12:28:17 2012 -@@ -275,7 +275,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX $(BOOST_CPPFLAGS) +--- libfreebusy/Makefile.in.orig Tue Mar 13 11:28:12 2012 ++++ libfreebusy/Makefile.in Thu Mar 15 16:43:32 2012 +@@ -273,7 +273,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX $(BOOST_CPPFLAGS) -I${top_srcdir}/common libfreebusy_la_includedir = $(includedir)/libfreebusy -libfreebusy_la_LDFLAGS = -static +libfreebusy_la_LDFLAGS = -version-info $(ECCLIENT_LIBRARY_VERSION) - libfreebusy_la_LIBADD = ${top_builddir}/common/libcommon_util.la libfreebusy_la_include_HEADERS = ECEnumFBBlock.h ECFBBlockList.h \ ECFreeBusyData.h ECFreeBusySupport.h ECFreeBusyUpdate.h freebusy.h \ + freebusyguid.h freebusytags.h freebusyutil.h PublishFreeBusy.h recurrence.h diff --git a/mail/zarafa/zarafa/patches/patch-php-webclient-ajax_config_php_dist b/mail/zarafa/zarafa/patches/patch-php-webclient-ajax_config_php_dist index dd39e05b640..a790926ed30 100644 --- a/mail/zarafa/zarafa/patches/patch-php-webclient-ajax_config_php_dist +++ b/mail/zarafa/zarafa/patches/patch-php-webclient-ajax_config_php_dist @@ -1,6 +1,6 @@ -$OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.5 2011/11/17 15:14:37 ajacoutot Exp $ ---- php-webclient-ajax/config.php.dist.orig Wed Nov 16 23:00:09 2011 -+++ php-webclient-ajax/config.php.dist Thu Nov 17 13:59:31 2011 +$OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.6 2012/03/15 17:04:31 ajacoutot Exp $ +--- php-webclient-ajax/config.php.dist.orig Tue Mar 13 11:24:11 2012 ++++ php-webclient-ajax/config.php.dist Thu Mar 15 16:42:28 2012 @@ -11,9 +11,9 @@ define("CONFIG_CHECK", TRUE); @@ -29,7 +29,7 @@ $OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.5 2011/11/17 15:14:37 aja // Define the relative URL for dialogs, this string is appended with HTTP GET arguments define("DIALOG_URL", "index.php?load=dialog&"); -@@ -140,7 +141,7 @@ +@@ -146,7 +147,7 @@ // Spellchecker, change here to enable define('FCKEDITOR_SPELLCHECKER_ENABLED', false); diff --git a/mail/zarafa/zarafa/patches/patch-provider_client_Makefile_in b/mail/zarafa/zarafa/patches/patch-provider_client_Makefile_in index 8c211feae8c..29f2c1a5dcf 100644 --- a/mail/zarafa/zarafa/patches/patch-provider_client_Makefile_in +++ b/mail/zarafa/zarafa/patches/patch-provider_client_Makefile_in @@ -1,10 +1,10 @@ -$OpenBSD: patch-provider_client_Makefile_in,v 1.15 2012/02/16 22:18:36 ajacoutot Exp $ +$OpenBSD: patch-provider_client_Makefile_in,v 1.16 2012/03/15 17:04:31 ajacoutot Exp $ *** Warning: This system can not link to static lib archive ../../common/libcommon_XXX.la. ---- provider/client/Makefile.in.orig Wed Feb 1 15:48:59 2012 -+++ provider/client/Makefile.in Thu Feb 2 12:28:17 2012 -@@ -322,7 +322,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) $(BOOST_CPPFLAGS) -DLINUX +--- provider/client/Makefile.in.orig Tue Mar 13 11:28:13 2012 ++++ provider/client/Makefile.in Thu Mar 15 16:42:28 2012 +@@ -321,7 +321,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) $(BOOST_CPPFLAGS) -DLINUX -I${top_srcdir}/common \ -I${top_srcdir}/zarafa-libsync diff --git a/mail/zarafa/zarafa/patches/patch-provider_contacts_Makefile_in b/mail/zarafa/zarafa/patches/patch-provider_contacts_Makefile_in index 8cb8c863d7d..7f485f20f65 100644 --- a/mail/zarafa/zarafa/patches/patch-provider_contacts_Makefile_in +++ b/mail/zarafa/zarafa/patches/patch-provider_contacts_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-provider_contacts_Makefile_in,v 1.1 2012/02/16 22:18:36 ajacoutot Exp $ ---- provider/contacts/Makefile.in.orig Thu Feb 2 14:21:55 2012 -+++ provider/contacts/Makefile.in Thu Feb 2 14:22:18 2012 -@@ -291,7 +291,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \ +$OpenBSD: patch-provider_contacts_Makefile_in,v 1.2 2012/03/15 17:04:31 ajacoutot Exp $ +--- provider/contacts/Makefile.in.orig Tue Mar 13 11:28:13 2012 ++++ provider/contacts/Makefile.in Thu Mar 15 16:42:28 2012 +@@ -290,7 +290,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \ -I${top_srcdir}/mapi4linux/include \ -I${top_srcdir}/common diff --git a/mail/zarafa/zarafa/patches/patch-provider_libserver_ECSession_cpp b/mail/zarafa/zarafa/patches/patch-provider_libserver_ECSession_cpp index 868ad251af5..42f2e88fe0c 100644 --- a/mail/zarafa/zarafa/patches/patch-provider_libserver_ECSession_cpp +++ b/mail/zarafa/zarafa/patches/patch-provider_libserver_ECSession_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.6 2011/09/29 17:12:11 ajacoutot Exp $ ---- provider/libserver/ECSession.cpp.orig Mon Sep 26 15:56:11 2011 -+++ provider/libserver/ECSession.cpp Thu Sep 29 16:53:37 2011 -@@ -816,11 +816,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket, +$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.7 2012/03/15 17:04:31 ajacoutot Exp $ +--- provider/libserver/ECSession.cpp.orig Tue Mar 13 16:43:38 2012 ++++ provider/libserver/ECSession.cpp Thu Mar 15 16:42:28 2012 +@@ -810,11 +810,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket, uid_t uid; char strbuf[1024]; #ifdef SO_PEERCRED diff --git a/mail/zarafa/zarafa/patches/patch-provider_server_ECServer_cpp b/mail/zarafa/zarafa/patches/patch-provider_server_ECServer_cpp index 3c0bfb9c590..8559fcb2f97 100644 --- a/mail/zarafa/zarafa/patches/patch-provider_server_ECServer_cpp +++ b/mail/zarafa/zarafa/patches/patch-provider_server_ECServer_cpp @@ -1,6 +1,6 @@ -$OpenBSD: patch-provider_server_ECServer_cpp,v 1.20 2012/02/27 19:01:34 ajacoutot Exp $ ---- provider/server/ECServer.cpp.orig Wed Feb 1 22:09:33 2012 -+++ provider/server/ECServer.cpp Thu Feb 2 12:28:17 2012 +$OpenBSD: patch-provider_server_ECServer_cpp,v 1.21 2012/03/15 17:04:31 ajacoutot Exp $ +--- provider/server/ECServer.cpp.orig Tue Mar 13 16:43:37 2012 ++++ provider/server/ECServer.cpp Thu Mar 15 16:42:28 2012 @@ -86,6 +86,10 @@ #include "unicode/uclean.h" #endif @@ -12,7 +12,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.20 2012/02/27 19:01:34 ajacouto #ifdef _DEBUG #define new DEBUG_NEW #undef THIS_FILE -@@ -797,7 +801,7 @@ int running_server(char *szName, const char *szConfig) +@@ -828,7 +832,7 @@ int running_server(char *szName, const char *szConfig) { "mysql_config_file", "/etc/zarafa/my.cnf" }, #endif { "attachment_storage", "database" }, @@ -21,7 +21,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.20 2012/02/27 19:01:34 ajacouto { "attachment_compression", "6" }, // Log options -@@ -869,7 +873,7 @@ int running_server(char *szName, const char *szConfig) +@@ -900,7 +904,7 @@ int running_server(char *szName, const char *szConfig) { "client_update_enabled", "no" }, { "client_update_log_level", "1", CONFIGSETTING_RELOADABLE }, @@ -30,7 +30,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.20 2012/02/27 19:01:34 ajacouto { "client_update_log_path", "/var/log/zarafa/autoupdate", CONFIGSETTING_RELOADABLE }, { "index_services_enabled", "no", CONFIGSETTING_RELOADABLE }, { "index_services_path", "file:///var/run/zarafa-indexer", CONFIGSETTING_RELOADABLE }, -@@ -891,10 +895,14 @@ int running_server(char *szName, const char *szConfig) +@@ -923,10 +927,14 @@ int running_server(char *szName, const char *szConfig) { NULL, NULL }, }; diff --git a/mail/zarafa/zarafa/patches/patch-provider_server_Makefile_in b/mail/zarafa/zarafa/patches/patch-provider_server_Makefile_in index 4eb5130165e..d80f974777d 100644 --- a/mail/zarafa/zarafa/patches/patch-provider_server_Makefile_in +++ b/mail/zarafa/zarafa/patches/patch-provider_server_Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-provider_server_Makefile_in,v 1.12 2012/02/16 22:18:36 ajacoutot Exp $ +$OpenBSD: patch-provider_server_Makefile_in,v 1.13 2012/03/15 17:04:31 ajacoutot Exp $ XXX see USE_LIBTOOL=gnu in the port Makefile ../../common/.libs/libcommon_mapi.so.X.X: undefined reference to `MAPILogonEx' (and more) ---- provider/server/Makefile.in.orig Wed Feb 1 15:48:59 2012 -+++ provider/server/Makefile.in Thu Feb 2 12:28:17 2012 -@@ -295,12 +295,13 @@ zarafa_server_LDADD = \ +--- provider/server/Makefile.in.orig Tue Mar 13 11:28:14 2012 ++++ provider/server/Makefile.in Thu Mar 15 16:42:28 2012 +@@ -294,12 +294,13 @@ zarafa_server_LDADD = \ ${top_builddir}/provider/soap/libgsoap.la \ ${top_builddir}/provider/soap/libsoapserver.la \ ${top_builddir}/provider/common/libzarafacommon.la \ diff --git a/mail/zarafa/zarafa/patches/patch-spooler_DAgent_cpp b/mail/zarafa/zarafa/patches/patch-spooler_DAgent_cpp index 66e07f0617d..944d70912a7 100644 --- a/mail/zarafa/zarafa/patches/patch-spooler_DAgent_cpp +++ b/mail/zarafa/zarafa/patches/patch-spooler_DAgent_cpp @@ -1,7 +1,7 @@ -$OpenBSD: patch-spooler_DAgent_cpp,v 1.19 2011/12/22 17:10:04 ajacoutot Exp $ ---- spooler/DAgent.cpp.orig Thu Dec 22 01:02:35 2011 -+++ spooler/DAgent.cpp Thu Dec 22 12:14:20 2011 -@@ -91,6 +91,11 @@ +$OpenBSD: patch-spooler_DAgent_cpp,v 1.20 2012/03/15 17:04:31 ajacoutot Exp $ +--- spooler/DAgent.cpp.orig Tue Mar 13 16:43:36 2012 ++++ spooler/DAgent.cpp Thu Mar 15 16:42:28 2012 +@@ -92,6 +92,11 @@ #include #include @@ -13,7 +13,7 @@ $OpenBSD: patch-spooler_DAgent_cpp,v 1.19 2011/12/22 17:10:04 ajacoutot Exp $ /* This is actually from sysexits.h but since those windows lamers don't have it .. -@@ -3291,7 +3296,7 @@ int main(int argc, char *argv[]) { +@@ -3302,7 +3307,7 @@ int main(int argc, char *argv[]) { DeliveryArgs sDeliveryArgs; sDeliveryArgs.strPath = ""; diff --git a/mail/zarafa/zarafa/patches/patch-spooler_Makefile_in b/mail/zarafa/zarafa/patches/patch-spooler_Makefile_in index 11c5bad5968..54e3020d7cf 100644 --- a/mail/zarafa/zarafa/patches/patch-spooler_Makefile_in +++ b/mail/zarafa/zarafa/patches/patch-spooler_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-spooler_Makefile_in,v 1.13 2012/02/16 22:18:36 ajacoutot Exp $ ---- spooler/Makefile.in.orig Wed Feb 1 15:48:59 2012 -+++ spooler/Makefile.in Thu Feb 2 12:28:17 2012 -@@ -300,7 +300,7 @@ zarafa_spooler_LDADD = ${top_builddir}/inetmapi/libine +$OpenBSD: patch-spooler_Makefile_in,v 1.14 2012/03/15 17:04:31 ajacoutot Exp $ +--- spooler/Makefile.in.orig Tue Mar 13 11:28:14 2012 ++++ spooler/Makefile.in Thu Mar 15 16:42:28 2012 +@@ -299,7 +299,7 @@ zarafa_spooler_LDADD = ${top_builddir}/inetmapi/libine ${top_builddir}/common/libcommon_util.la \ ${top_builddir}/common/libcommon_ssl.la \ ${top_builddir}/ECtools/zarafa-archiver/libarchiver.la \ diff --git a/mail/zarafa/zarafa/patches/patch-spooler_Spooler_cpp b/mail/zarafa/zarafa/patches/patch-spooler_Spooler_cpp index b72c9fd11e6..750e4a35372 100644 --- a/mail/zarafa/zarafa/patches/patch-spooler_Spooler_cpp +++ b/mail/zarafa/zarafa/patches/patch-spooler_Spooler_cpp @@ -1,10 +1,10 @@ -$OpenBSD: patch-spooler_Spooler_cpp,v 1.10 2012/02/27 19:01:34 ajacoutot Exp $ +$OpenBSD: patch-spooler_Spooler_cpp,v 1.11 2012/03/15 17:04:31 ajacoutot Exp $ XXX to be revisited ---- spooler/Spooler.cpp.orig Thu Nov 17 03:03:22 2011 -+++ spooler/Spooler.cpp Thu Nov 17 14:59:14 2011 -@@ -1217,6 +1217,7 @@ int main(int argc, char *argv[]) { +--- spooler/Spooler.cpp.orig Tue Mar 13 16:43:36 2012 ++++ spooler/Spooler.cpp Thu Mar 15 16:42:28 2012 +@@ -1218,6 +1218,7 @@ int main(int argc, char *argv[]) { // detect linuxthreads, which is too broken to correctly run the spooler if (!bForked) { @@ -12,7 +12,7 @@ XXX to be revisited char buffer[256]; confstr(_CS_GNU_LIBPTHREAD_VERSION, buffer, sizeof(buffer)); if (strncmp(buffer, "linuxthreads", strlen("linuxthreads")) == 0) { -@@ -1225,6 +1226,9 @@ int main(int argc, char *argv[]) { +@@ -1226,6 +1227,9 @@ int main(int argc, char *argv[]) { g_lpLogger->Log(EC_LOGLEVEL_FATAL, "WARNING: your system is running with outdated linuxthreads."); g_lpLogger->Log(EC_LOGLEVEL_FATAL, "WARNING: the zarafa-spooler will only be able to send one message at a time."); } diff --git a/mail/zarafa/zarafa/pkg/PLIST-main b/mail/zarafa/zarafa/pkg/PLIST-main index 788e4de9b05..171a0dd48f5 100644 --- a/mail/zarafa/zarafa/pkg/PLIST-main +++ b/mail/zarafa/zarafa/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.36 2012/02/16 22:18:36 ajacoutot Exp $ +@comment $OpenBSD: PLIST-main,v 1.37 2012/03/15 17:04:31 ajacoutot Exp $ @newgroup _zarafa:627 @newuser _zarafa:627:_zarafa:daemon:Zarafa Account:/var/empty:/sbin/nologin @bin bin/zarafa-admin @@ -147,6 +147,7 @@ include/zarafa/charset/utf8string.h include/zarafa/codepage.h include/zarafa/edkguid.h include/zarafa/favoritesutil.h +include/zarafa/fileutil.h include/zarafa/mapi_ptr/ include/zarafa/mapi_ptr.h include/zarafa/mapi_ptr/mapi_array_ptr.h @@ -284,6 +285,7 @@ share/doc/zarafa/eula.txt share/doc/zarafa/ldap-switch-sendas.pl share/doc/zarafa/optimize-imap.py share/doc/zarafa/zarafa7-upgrade +share/doc/zarafa/zarafa.ldif @mode share/examples/zarafa/ @sample ${SYSCONFDIR}/zarafa/