From 4c67457a533dbc510939639961450cf578ac32c4 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 11 Dec 2010 08:20:21 +0000 Subject: [PATCH] Update to version 6.40.4. Changelog available at: http://download.zarafa.com/community/final/6.40/changelog-6.40.txt --- mail/zarafa/zarafa/Makefile | 12 ++--- mail/zarafa/zarafa/distinfo | 10 ++-- .../patches/patch-common_platform_linux_h | 10 ++-- .../zarafa/patches/patch-doc_Makefile_in | 8 +-- .../zarafa/patches/patch-doc_manual_xml | 28 +++++------ .../patches/patch-installer_linux_Makefile_in | 50 ++++++++++++------- .../patch-php-webclient-ajax_config_php_dist | 8 +-- .../patch-provider_server_ECServer_cpp | 8 +-- mail/zarafa/zarafa/pkg/PLIST-web | 21 +++++++- 9 files changed, 91 insertions(+), 64 deletions(-) diff --git a/mail/zarafa/zarafa/Makefile b/mail/zarafa/zarafa/Makefile index 831e1854118..34161e00ca3 100644 --- a/mail/zarafa/zarafa/Makefile +++ b/mail/zarafa/zarafa/Makefile @@ -1,13 +1,12 @@ -# $OpenBSD: Makefile,v 1.55 2010/11/19 07:23:10 espie Exp $ +# $OpenBSD: Makefile,v 1.56 2010/12/11 08:20:21 ajacoutot Exp $ COMMENT-main= MS Exchange groupware suite replacement COMMENT-web= zarafa webaccess frontend and MAPI extensions for PHP +PKGNAME= zarafa-${V} PKGNAME-main= zarafa-${V} PKGNAME-web= zarafa-webaccess-${V} -REVISION-main= 6 - CATEGORIES= mail www productivity MASTER_SITES= http://www.bsdfrog.org/OpenBSD/distfiles/zarafa/ @@ -41,7 +40,7 @@ LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \ databases/openldap \ devel/uuid \ devel/libexecinfo \ - mail/zarafa/libvmime>=0.7.1p6 \ + mail/zarafa/libvmime>=0.7.1p7 \ textproc/libical WANTLIB-web += ${MODGETTEXT_WANTLIB} @@ -96,10 +95,7 @@ SUB_SCRIPTS= createcompany.d/00createpublic groups_common.sh \ createuser.d/00createstore companies_common.sh \ users_common.sh -WRKDIST= ${WRKDIR}/zarafa-${V} - -post-extract: - ${GZIP_CMD} -dc ${WRKDIR}/${DISTNAME}/zcp-${V}.tar.gz | ${TAR} xf - -C ${WRKDIR} +WRKDIST= ${WRKDIR}/${DISTNAME}/src post-patch: mv ${WRKSRC}/php-webclient-ajax/client/layout/img/login.jpg \ diff --git a/mail/zarafa/zarafa/distinfo b/mail/zarafa/zarafa/distinfo index 07e9f97523b..3f6c2655374 100644 --- a/mail/zarafa/zarafa/distinfo +++ b/mail/zarafa/zarafa/distinfo @@ -1,5 +1,5 @@ -MD5 (zarafa/zcp-source-6.40.3-23410.tgz) = Gl5b1oBquMsGZR8Baso43g== -RMD160 (zarafa/zcp-source-6.40.3-23410.tgz) = FNLoLLAevpBKgm9MyDUBuEGKfvQ= -SHA1 (zarafa/zcp-source-6.40.3-23410.tgz) = 5raUhHb6ojqwna1jtaPY29oKKNc= -SHA256 (zarafa/zcp-source-6.40.3-23410.tgz) = YwHZuNDqlBMV38CTyiyFHl8PDgHzlbiZ/WMfrp6Vgoo= -SIZE (zarafa/zcp-source-6.40.3-23410.tgz) = 6133118 +MD5 (zarafa/zcp-source-6.40.4-24200.tgz) = X/+m65qW/DBted/a1BNDpQ== +RMD160 (zarafa/zcp-source-6.40.4-24200.tgz) = 2vdw4zvbX5WU5nxfre72pWKr7H4= +SHA1 (zarafa/zcp-source-6.40.4-24200.tgz) = HUwO8rrBEogvpXuzDkRJBNeFZ7Q= +SHA256 (zarafa/zcp-source-6.40.4-24200.tgz) = oFPAaJDJd8LcDMYaXFFi+CX5+Xg6ZDbEiuwGlQomQIE= +SIZE (zarafa/zcp-source-6.40.4-24200.tgz) = 6801734 diff --git a/mail/zarafa/zarafa/patches/patch-common_platform_linux_h b/mail/zarafa/zarafa/patches/patch-common_platform_linux_h index c6b68b2e264..c2fbddd6478 100644 --- a/mail/zarafa/zarafa/patches/patch-common_platform_linux_h +++ b/mail/zarafa/zarafa/patches/patch-common_platform_linux_h @@ -1,6 +1,6 @@ -$OpenBSD: patch-common_platform_linux_h,v 1.8 2010/11/17 08:34:06 ajacoutot Exp $ ---- common/platform.linux.h.orig Wed Oct 20 16:16:23 2010 -+++ common/platform.linux.h Tue Nov 16 19:15:54 2010 +$OpenBSD: patch-common_platform_linux_h,v 1.9 2010/12/11 08:20:21 ajacoutot Exp $ +--- common/platform.linux.h.orig Thu Dec 2 14:45:38 2010 ++++ common/platform.linux.h Fri Dec 3 18:09:32 2010 @@ -63,8 +63,16 @@ #include #include @@ -18,7 +18,7 @@ $OpenBSD: patch-common_platform_linux_h,v 1.8 2010/11/17 08:34:06 ajacoutot Exp #include #include -@@ -659,7 +667,11 @@ time_t GetProcessTime(); +@@ -661,7 +669,11 @@ time_t GetProcessTime(); #ifndef ntohll #if __BYTE_ORDER == __LITTLE_ENDIAN @@ -30,7 +30,7 @@ $OpenBSD: patch-common_platform_linux_h,v 1.8 2010/11/17 08:34:06 ajacoutot Exp #else #define ntohll(x) (x) #endif -@@ -667,14 +679,18 @@ time_t GetProcessTime(); +@@ -669,14 +681,18 @@ time_t GetProcessTime(); #ifndef htonll #if __BYTE_ORDER == __LITTLE_ENDIAN diff --git a/mail/zarafa/zarafa/patches/patch-doc_Makefile_in b/mail/zarafa/zarafa/patches/patch-doc_Makefile_in index edb90cb8bae..4908b8d869d 100644 --- a/mail/zarafa/zarafa/patches/patch-doc_Makefile_in +++ b/mail/zarafa/zarafa/patches/patch-doc_Makefile_in @@ -1,13 +1,13 @@ -$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 +$OpenBSD: patch-doc_Makefile_in,v 1.8 2010/12/11 08:20:21 ajacoutot Exp $ +--- doc/Makefile.in.orig Thu Dec 2 11:37:21 2010 ++++ doc/Makefile.in Fri Dec 3 18:48:05 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 \ - 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-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 diff --git a/mail/zarafa/zarafa/patches/patch-doc_manual_xml b/mail/zarafa/zarafa/patches/patch-doc_manual_xml index 64c35fb927e..db3c5a376b6 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.13 2010/10/27 18:26:17 ajacoutot Exp $ ---- doc/manual.xml.orig Wed Oct 20 12:42:29 2010 -+++ doc/manual.xml Wed Oct 27 19:18:52 2010 +$OpenBSD: patch-doc_manual_xml,v 1.14 2010/12/11 08:20:21 ajacoutot Exp $ +--- doc/manual.xml.orig Thu Dec 2 10:48:48 2010 ++++ doc/manual.xml Fri Dec 3 18:09:32 2010 @@ -835,9 +835,7 @@ @@ -24,7 +24,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.13 2010/10/27 18:26:17 ajacoutot Exp $ -@@ -2881,9 +2874,7 @@ +@@ -2884,9 +2877,7 @@ @@ -35,7 +35,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.13 2010/10/27 18:26:17 ajacoutot Exp $ Default: /var/run/zarafa-server.pid -@@ -5641,13 +5632,8 @@ +@@ -5644,13 +5635,8 @@ The spooler process will keep running and watching the @@ -51,7 +51,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.13 2010/10/27 18:26:17 ajacoutot Exp $ -@@ -5819,9 +5805,7 @@ +@@ -5822,9 +5808,7 @@ @@ -62,7 +62,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.13 2010/10/27 18:26:17 ajacoutot Exp $ Default: /var/run/zarafa-spooler.pid -@@ -6207,13 +6191,8 @@ +@@ -6210,13 +6194,8 @@ zarafa-gateway @@ -78,7 +78,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.13 2010/10/27 18:26:17 ajacoutot Exp $ -@@ -6433,9 +6412,7 @@ +@@ -6436,9 +6415,7 @@ @@ -89,7 +89,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.13 2010/10/27 18:26:17 ajacoutot Exp $ Default: /var/run/zarafa-gateway.pid -@@ -6816,14 +6793,8 @@ +@@ -6819,14 +6796,8 @@ 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.13 2010/10/27 18:26:17 ajacoutot Exp $ -@@ -6975,9 +6946,7 @@ +@@ -6978,9 +6949,7 @@ @@ -116,7 +116,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.13 2010/10/27 18:26:17 ajacoutot Exp $ Default value: /var/run/zarafa-monitor.pid -@@ -8230,13 +8199,8 @@ +@@ -8233,13 +8202,8 @@ zarafa-ical @@ -132,7 +132,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.13 2010/10/27 18:26:17 ajacoutot Exp $ -@@ -8419,9 +8383,7 @@ +@@ -8422,9 +8386,7 @@ @@ -143,7 +143,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.13 2010/10/27 18:26:17 ajacoutot Exp $ Default: /var/run/zarafa-ical.pid -@@ -8735,13 +8697,8 @@ +@@ -8738,13 +8700,8 @@ zarafa-licensed @@ -159,7 +159,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.13 2010/10/27 18:26:17 ajacoutot Exp $ -@@ -8885,9 +8842,7 @@ +@@ -8888,9 +8845,7 @@ diff --git a/mail/zarafa/zarafa/patches/patch-installer_linux_Makefile_in b/mail/zarafa/zarafa/patches/patch-installer_linux_Makefile_in index 71fc47f674e..73e2503e603 100644 --- a/mail/zarafa/zarafa/patches/patch-installer_linux_Makefile_in +++ b/mail/zarafa/zarafa/patches/patch-installer_linux_Makefile_in @@ -1,6 +1,6 @@ -$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 +$OpenBSD: patch-installer_linux_Makefile_in,v 1.12 2010/12/11 08:20:21 ajacoutot Exp $ +--- installer/linux/Makefile.in.orig Thu Dec 2 11:37:21 2010 ++++ installer/linux/Makefile.in Fri Dec 3 18:47:44 2010 @@ -54,15 +54,15 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGUR mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/common/config.h @@ -20,17 +20,18 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.11 2010/08/22 10:13:27 ajacoutot SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -@@ -72,17 +72,17 @@ am__vpath_adj = case $$p in \ +@@ -72,19 +72,17 @@ am__vpath_adj = case $$p in \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; dist_dataDATA_INSTALL = $(INSTALL_DATA) -am__dist_data_config_DATA_DIST = server.cfg unix.cfg ldap.propmap.cfg \ +am__dist_data_config_DATA_DIST = server.cfg ldap.propmap.cfg \ spooler.cfg gateway.cfg monitor.cfg dagent.cfg ical.cfg \ -- indexer.cfg autorespond licensed.cfg ldap.openldap.cfg \ -+ autorespond ldap.openldap.cfg \ - ldap.active-directory.cfg ldapms.openldap.cfg \ - ldapms.active-directory.cfg +- indexer.cfg autorespond licensed.cfg archiver.cfg \ +- ldap.openldap.cfg ldap.active-directory.cfg \ +- ldapms.openldap.cfg ldapms.active-directory.cfg ++ autorespond \ ++ ldap.openldap.cfg ldap.active-directory.cfg dist_data_configDATA_INSTALL = $(INSTALL_DATA) am__dist_sysconf_cert_DATA_DIST = addtrust.crt dist_sysconf_certDATA_INSTALL = $(INSTALL_DATA) @@ -38,11 +39,14 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.11 2010/08/22 10:13:27 ajacoutot +am__dist_sysconf_config_DATA_DIST = server.cfg \ ldap.propmap.cfg spooler.cfg gateway.cfg monitor.cfg \ - dagent.cfg ical.cfg indexer.cfg autorespond licensed.cfg \ +- archiver.cfg ldap.openldap.cfg ldap.active-directory.cfg \ +- ldapms.openldap.cfg ldapms.active-directory.cfg + dagent.cfg ical.cfg autorespond \ - ldap.openldap.cfg ldap.active-directory.cfg \ - ldapms.openldap.cfg ldapms.active-directory.cfg ++ ldap.openldap.cfg ldap.active-directory.cfg dist_sysconf_configDATA_INSTALL = $(INSTALL_DATA) -@@ -231,6 +231,7 @@ datadir = ${docdir} + am__dist_sysconf_rotate_DATA_DIST = zarafa.logrotate \ + zarafa-indexer.logrotate zarafa-licensed.logrotate +@@ -231,6 +229,7 @@ datadir = ${docdir} datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ @@ -50,7 +54,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.11 2010/08/22 10:13:27 ajacoutot exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ -@@ -259,8 +260,8 @@ sysconfdir = @sysconfdir@ +@@ -259,8 +258,8 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -61,7 +65,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.11 2010/08/22 10:13:27 ajacoutot autorespond $(am__append_2) $(BUILT_SOURCES) rhel_initscript_files = zarafa-server.init.rhel \ zarafa-spooler.init.rhel zarafa-gateway.init.rhel \ -@@ -455,15 +456,7 @@ uninstall-dist_sysconf_configDATA: +@@ -455,15 +454,7 @@ uninstall-dist_sysconf_configDATA: echo " rm -f '$(DESTDIR)$(sysconf_configdir)/$$f'"; \ rm -f "$(DESTDIR)$(sysconf_configdir)/$$f"; \ done @@ -78,7 +82,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.11 2010/08/22 10:13:27 ajacoutot uninstall-dist_sysconf_rotateDATA: @$(NORMAL_UNINSTALL) -@@ -527,7 +520,7 @@ check: $(BUILT_SOURCES) +@@ -527,7 +518,7 @@ check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(SCRIPTS) $(DATA) installdirs: @@ -87,7 +91,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.11 2010/08/22 10:13:27 ajacoutot test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) -@@ -574,9 +567,9 @@ info: info-am +@@ -574,9 +565,9 @@ info: info-am info-am: @@ -99,7 +103,7 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.11 2010/08/22 10:13:27 ajacoutot install-sysconf_sysconfigDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook -@@ -656,13 +649,7 @@ ldapms.active-directory.cfg: ldap.m4 +@@ -656,13 +647,7 @@ ldapms.active-directory.cfg: ldap.m4 m4 -DTYPE=ADS -DMULTISERVER=1 ${top_srcdir}/installer/linux/ldap.m4 > $@ install-data-hook: @@ -113,12 +117,20 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.11 2010/08/22 10:13:27 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; \ -@@ -684,8 +671,6 @@ install-data-hook: - mv "$$f" "$$newf"; \ - done \ +@@ -678,16 +663,6 @@ install-data-hook: + else \ + true; \ 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/'`; \ +- mv "$$f" "$$newf"; \ +- done \ +- 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 # 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: 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 bda52924478..ffcb0a78f82 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.1 2010/06/30 02:46:48 ajacoutot Exp $ ---- php-webclient-ajax/config.php.dist.orig Mon May 31 15:43:05 2010 -+++ php-webclient-ajax/config.php.dist Mon Jun 14 09:45:07 2010 +$OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.2 2010/12/11 08:20:21 ajacoutot Exp $ +--- php-webclient-ajax/config.php.dist.orig Thu Dec 2 10:48:11 2010 ++++ php-webclient-ajax/config.php.dist Fri Dec 3 18:09:32 2010 @@ -11,9 +11,9 @@ define("CONFIG_CHECK", TRUE); @@ -29,7 +29,7 @@ $OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.1 2010/06/30 02:46:48 aja // Define the relative URL for dialogs, this string is appended with HTTP GET arguments define("DIALOG_URL", "index.php?load=dialog&"); -@@ -117,7 +118,7 @@ +@@ -134,7 +135,7 @@ // Spellchecker, change here to enable define('FCKEDITOR_SPELLCHECKER_ENABLED', false); diff --git a/mail/zarafa/zarafa/patches/patch-provider_server_ECServer_cpp b/mail/zarafa/zarafa/patches/patch-provider_server_ECServer_cpp index be4b2b054ee..6db6e08d6a1 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.7 2010/08/31 17:57:21 ajacoutot Exp $ ---- provider/server/ECServer.cpp.orig Mon Aug 30 13:01:46 2010 -+++ provider/server/ECServer.cpp Tue Aug 31 15:14:05 2010 +$OpenBSD: patch-provider_server_ECServer_cpp,v 1.8 2010/12/11 08:20:21 ajacoutot Exp $ +--- provider/server/ECServer.cpp.orig Thu Dec 2 14:45:40 2010 ++++ provider/server/ECServer.cpp Fri Dec 3 18:09:33 2010 @@ -82,6 +82,10 @@ #include #include @@ -12,7 +12,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.7 2010/08/31 17:57:21 ajacoutot #ifdef _DEBUG #define new DEBUG_NEW #undef THIS_FILE -@@ -722,7 +726,7 @@ int running_server(char *szName, char *szConfig) +@@ -726,7 +730,7 @@ int running_server(char *szName, char *szConfig) { "mysql_config_file", "/etc/zarafa/my.cnf" }, #endif { "attachment_storage", "database" }, diff --git a/mail/zarafa/zarafa/pkg/PLIST-web b/mail/zarafa/zarafa/pkg/PLIST-web index 8299d0cdad7..fc52d5a1b29 100644 --- a/mail/zarafa/zarafa/pkg/PLIST-web +++ b/mail/zarafa/zarafa/pkg/PLIST-web @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-web,v 1.4 2010/08/31 17:57:21 ajacoutot Exp $ +@comment $OpenBSD: PLIST-web,v 1.5 2010/12/11 08:20:21 ajacoutot Exp $ @conflict php5-mapi-* @pkgpath mail/zarafa/webaccess @pkgpath mail/zarafa/zarafa,-php @@ -8,9 +8,12 @@ conf/php5.sample/mapi.ini.dist include/ include/php/ include/php/mapi/ +include/php/mapi/class.baserecurrence.php include/php/mapi/class.freebusypublish.php include/php/mapi/class.meetingrequest.php include/php/mapi/class.recurrence.php +include/php/mapi/class.taskrecurrence.php +include/php/mapi/class.taskrequest.php include/php/mapi/mapi.util.php include/php/mapi/mapicode.php include/php/mapi/mapidefs.php @@ -98,6 +101,7 @@ zarafa-webaccess/client/layout/dialogs/modal/customizetoday.php zarafa-webaccess/client/layout/dialogs/modal/delegates.php zarafa-webaccess/client/layout/dialogs/modal/delegatespermission.php zarafa-webaccess/client/layout/dialogs/modal/deleteoccurrence.php +zarafa-webaccess/client/layout/dialogs/modal/deletetaskoccurrence.php zarafa-webaccess/client/layout/dialogs/modal/emailaddress.php zarafa-webaccess/client/layout/dialogs/modal/fieldchooser.php zarafa-webaccess/client/layout/dialogs/modal/flag.php @@ -166,6 +170,7 @@ zarafa-webaccess/client/layout/img/calendar_arrowup.gif zarafa-webaccess/client/layout/img/copy.gif zarafa-webaccess/client/layout/img/default_contact_image.gif zarafa-webaccess/client/layout/img/delete.gif +zarafa-webaccess/client/layout/img/downloadzip.gif zarafa-webaccess/client/layout/img/dropdownarrow.gif zarafa-webaccess/client/layout/img/favicon.ico zarafa-webaccess/client/layout/img/fill_folder_off.gif @@ -338,12 +343,17 @@ zarafa-webaccess/client/layout/img/icon_stickynote_yellow_large.gif zarafa-webaccess/client/layout/img/icon_store.gif zarafa-webaccess/client/layout/img/icon_task.gif zarafa-webaccess/client/layout/img/icon_task_complete.gif +zarafa-webaccess/client/layout/img/icon_task_recurring.gif +zarafa-webaccess/client/layout/img/icon_taskrequest.gif +zarafa-webaccess/client/layout/img/icon_taskrequest_accepted.gif +zarafa-webaccess/client/layout/img/icon_taskrequest_assignee.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 +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 @@ -408,6 +418,7 @@ zarafa-webaccess/client/layout/js/advancedfind.js zarafa-webaccess/client/layout/js/advprompt.js zarafa-webaccess/client/layout/js/appointment.js zarafa-webaccess/client/layout/js/attachitem.js +zarafa-webaccess/client/layout/js/attachments.js zarafa-webaccess/client/layout/js/categories.js zarafa-webaccess/client/layout/js/contact.js zarafa-webaccess/client/layout/js/createmail.js @@ -871,6 +882,12 @@ zarafa-webaccess/client/widgets/recipientinput.js zarafa-webaccess/client/widgets/recipientinputblock.js zarafa-webaccess/client/widgets/searchcriteria.js zarafa-webaccess/client/widgets/suggestionlist.js +zarafa-webaccess/client/widgets/swfupload/ +zarafa-webaccess/client/widgets/swfupload/swfupload.cookies.js +zarafa-webaccess/client/widgets/swfupload/swfupload.js +zarafa-webaccess/client/widgets/swfupload/swfupload.queue.js +zarafa-webaccess/client/widgets/swfupload/swfupload.swf +zarafa-webaccess/client/widgets/swfupload/swfupload.swfobject.js zarafa-webaccess/client/widgets/tablewidget.js zarafa-webaccess/client/widgets/tabswidget.js zarafa-webaccess/client/widgets/timepicker.js @@ -904,6 +921,7 @@ zarafa-webaccess/server/class.configcheck.php zarafa-webaccess/server/core/ zarafa-webaccess/server/core/class.bus.php zarafa-webaccess/server/core/class.conversion.php +zarafa-webaccess/server/core/class.createZipArchive.php zarafa-webaccess/server/core/class.dispatcher.php zarafa-webaccess/server/core/class.filter.php zarafa-webaccess/server/core/class.language.php @@ -918,6 +936,7 @@ 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/