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

- bleh, imported under wrong dir

Browse Source
This commit is contained in:
ajacoutot 2009-02-16 09:39:21 +00:00
parent 6aa458f6b9
commit c51b5ea9a5
104 changed files with 0 additions and 3829 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mail/zarafa/libical/Makefile
View File

@ -1,8 +0,0 @@
# $OpenBSD: Makefile,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
SUBDIR += libical
SUBDIR += libvmime
SUBDIR += webaccess
SUBDIR += zarafa
.include <bsd.port.subdir.mk>

22
mail/zarafa/libical/Makefile.inc
View File

@ -1,22 +0,0 @@
# $OpenBSD: Makefile.inc,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
# there is no point in building/running this on NO_SHARED_LIBS archs
SHARED_ONLY= Yes
DIST_SUBDIR= zarafa
CATEGORIES+= mail/zarafa
HOMEPAGE?= http://www.zarafa.nl/
MAINTAINER?= Antoine Jacoutot <ajacoutot@openbsd.org>
# zarafa: AGPLv3 (GNU Affero Public License)
# libical: MPL/LGPLv2
# libvmime: GPLv2
PERMIT_PACKAGE_CDROM?= Yes
PERMIT_PACKAGE_FTP?= Yes
PERMIT_DISTFILES_CDROM?=Yes
PERMIT_DISTFILES_FTP?= Yes
MASTER_SITES?= http://download.zarafa.com/mirror/

23
mail/zarafa/libical/libical/Makefile
View File

@ -1,23 +0,0 @@
# $OpenBSD: Makefile,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
COMMENT= modified libical library for Zarafa
DISTNAME= libical-0.23
PKGNAME= zarafa-${DISTNAME}
# We patched the source to rename the libraries so that this package can
# cohabitate with the "official" one (i.e. textproc/libical).
SHARED_LIBS+= ical-zarafa 0.0 # .0.0
SHARED_LIBS+= icalss-zarafa 0.0 # .0.0
SHARED_LIBS+= icalvcal-zarafa 0.0 # .0.0
CATEGORIES= textproc
USE_LIBTOOL= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--includedir=${PREFIX}/include/zarafa \
--enable-python-bindings=no
.include <bsd.port.mk>

5
mail/zarafa/libical/libical/distinfo
View File

@ -1,5 +0,0 @@
MD5 (zarafa/libical-0.23.tar.gz) = rEonOL5OABMSCOAaDEiR6g==
RMD160 (zarafa/libical-0.23.tar.gz) = Mp8ayQqE9yajRyRaujOodGDdG9s=
SHA1 (zarafa/libical-0.23.tar.gz) = g1ICtaR1Heho2r+Ww3ficTkpz28=
SHA256 (zarafa/libical-0.23.tar.gz) = ullxUDuP6+lfVnNwFxerW3YbT+CpexP4nD8V/ruxcBI=
SIZE (zarafa/libical-0.23.tar.gz) = 588498

23
mail/zarafa/libical/libical/patches/patch-examples_Makefile_in
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-examples_Makefile_in,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- examples/Makefile.in.orig Wed Jan 28 21:57:41 2009
+++ examples/Makefile.in Wed Jan 28 21:58:36 2009
@@ -82,7 +82,7 @@ python_val = @python_val@
noinst_PROGRAMS = doesnothing
-LDADD = ../src/libical/libical.la ../src/libicalss/libicalss.la ../src/libicalvcal/libicalvcal.la
+LDADD = ../src/libical/libical-zarafa.la ../src/libicalss/libicalss-zarafa.la ../src/libicalvcal/libicalvcal-zarafa.la
INCLUDES = -I. -I../src/libical -I$(srcdir)/../src/libical -I../src/libicalss -I../src/libicalvcal
@@ -101,8 +101,8 @@ LIBS = @LIBS@
doesnothing_OBJECTS = access_components.o \
access_properties_and_parameters.o errors.o main.o parse_text.o
doesnothing_LDADD = $(LDADD)
-doesnothing_DEPENDENCIES = ../src/libical/libical.la \
-../src/libicalss/libicalss.la ../src/libicalvcal/libicalvcal.la
+doesnothing_DEPENDENCIES = ../src/libical/libical-zarafa.la \
+../src/libicalss/libicalss-zarafa.la ../src/libicalvcal/libicalvcal-zarafa.la
doesnothing_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

21
mail/zarafa/libical/libical/patches/patch-src_libical_Makefile_in
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_libical_Makefile_in,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- src/libical/Makefile.in.orig Wed Jan 28 21:21:11 2009
+++ src/libical/Makefile.in Wed Jan 28 21:22:06 2009
@@ -107,7 +107,7 @@ python_val = @python_val@
DESIGNDATA = $(top_srcdir)/design-data
ICALSCRIPTS = $(top_srcdir)/scripts
-lib_LTLIBRARIES = libical.la
+lib_LTLIBRARIES = libical-zarafa.la
YFLAGS = -d -v -t -pical_yy
LFLAGS = -Pical_yy
@@ -272,7 +272,7 @@ distclean-libtool:
maintainer-clean-libtool:
-libical.la: $(libical_la_OBJECTS) $(libical_la_DEPENDENCIES)
+libical-zarafa.la: $(libical_la_OBJECTS) $(libical_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libical_la_LDFLAGS) $(libical_la_OBJECTS) $(libical_la_LIBADD) $(LIBS)
.l.c:
$(LEX) $(AM_LFLAGS) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@

14
mail/zarafa/libical/libical/patches/patch-src_libical_icalcomponent_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_libical_icalcomponent_c,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
Fixes some implicit declarations.
--- src/libical/icalcomponent.c.orig Mon Feb 2 17:57:31 2009
+++ src/libical/icalcomponent.c Mon Feb 2 17:57:44 2009
@@ -42,6 +42,7 @@
#include <errno.h>
#include <assert.h>
#include <stdio.h> /* for fprintf */
+#include <string.h>
#define MAX_TMP 1024

14
mail/zarafa/libical/libical/patches/patch-src_libical_icalerror_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_libical_icalerror_c,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
Fixes some implicit declarations.
--- src/libical/icalerror.c.orig Mon Feb 2 18:19:54 2009
+++ src/libical/icalerror.c Mon Feb 2 18:20:06 2009
@@ -30,6 +30,7 @@
#endif
#include "icalerror.h"
+#include <string.h>
icalerrorenum icalerrno;

21
mail/zarafa/libical/libical/patches/patch-src_libicalss_Makefile_in
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_libicalss_Makefile_in,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- src/libicalss/Makefile.in.orig Wed Jan 28 21:46:10 2009
+++ src/libicalss/Makefile.in Wed Jan 28 21:47:50 2009
@@ -80,7 +80,7 @@ VERSION = @VERSION@
YACC = @YACC@
python_val = @python_val@
-lib_LTLIBRARIES = libicalss.la
+lib_LTLIBRARIES = libicalss-zarafa.la
YFLAGS = -d -v -p ss
LFLAGS = -Pss
@@ -209,7 +209,7 @@ distclean-libtool:
maintainer-clean-libtool:
-libicalss.la: $(libicalss_la_OBJECTS) $(libicalss_la_DEPENDENCIES)
+libicalss-zarafa.la: $(libicalss_la_OBJECTS) $(libicalss_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libicalss_la_LDFLAGS) $(libicalss_la_OBJECTS) $(libicalss_la_LIBADD) $(LIBS)
.l.c:
$(LEX) $(AM_LFLAGS) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@

14
mail/zarafa/libical/libical/patches/patch-src_libicalss_icalset_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_libicalss_icalset_c,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
Fixes some implicit declarations.
--- src/libicalss/icalset.c.orig Mon Feb 2 17:57:54 2009
+++ src/libicalss/icalset.c Mon Feb 2 17:58:05 2009
@@ -41,6 +41,7 @@
#include "icaldirset.h"
#include "icaldirsetimpl.h"
#include <stdlib.h>
+#include <string.h>
/*#include "icalheapset.h"*/
/*#include "icalmysqlset.h"*/

14
mail/zarafa/libical/libical/patches/patch-src_libicalss_icalspanlist_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_libicalss_icalspanlist_c,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
Fixes some implicit declarations.
--- src/libicalss/icalspanlist.c.orig Mon Feb 2 17:58:18 2009
+++ src/libicalss/icalspanlist.c Mon Feb 2 17:58:26 2009
@@ -30,6 +30,7 @@
#include "icalspanlist.h"
#include "pvl.h"
#include <stdlib.h> /* for free and malloc */
+#include <string.h>
struct icalspanlist_impl {
pvl_list spans;

21
mail/zarafa/libical/libical/patches/patch-src_libicalvcal_Makefile_in
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_libicalvcal_Makefile_in,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- src/libicalvcal/Makefile.in.orig Wed Jan 28 21:48:14 2009
+++ src/libicalvcal/Makefile.in Wed Jan 28 21:48:37 2009
@@ -80,7 +80,7 @@ VERSION = @VERSION@
YACC = @YACC@
python_val = @python_val@
-lib_LTLIBRARIES = libicalvcal.la
+lib_LTLIBRARIES = libicalvcal-zarafa.la
INCLUDES = -I$(top_builddir) -I$(top_srcdir)/src/libical -I$(top_srcdir)/src/libicalss -I$(srcdir)
@@ -200,7 +200,7 @@ distclean-libtool:
maintainer-clean-libtool:
-libicalvcal.la: $(libicalvcal_la_OBJECTS) $(libicalvcal_la_DEPENDENCIES)
+libicalvcal-zarafa.la: $(libicalvcal_la_OBJECTS) $(libicalvcal_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libicalvcal_la_LDFLAGS) $(libicalvcal_la_OBJECTS) $(libicalvcal_la_LIBADD) $(LIBS)
.y.c:
$(YACC) $(AM_YFLAGS) $(YFLAGS) $< && mv y.tab.c $*.c

86
mail/zarafa/libical/libical/patches/patch-src_test_Makefile_in
View File

@ -1,86 +0,0 @@
$OpenBSD: patch-src_test_Makefile_in,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- src/test/Makefile.in.orig Wed Jan 28 21:51:47 2009
+++ src/test/Makefile.in Wed Jan 28 21:54:01 2009
@@ -82,7 +82,7 @@ python_val = @python_val@
noinst_PROGRAMS = copycluster regression parser storage stow recur testmime testvcal process testclassify
-LDADD = ../libicalss/.libs/libicalss.a ../libicalvcal/.libs/libicalvcal.a ../libical/.libs/libical.a
+LDADD = ../libicalss/.libs/libicalss-zarafa.a ../libicalvcal/.libs/libicalvcal-zarafa.a ../libical/.libs/libical-zarafa.a
INCLUDES = -I. -I../libicalvcal -I$(srcdir)/../libicalvcal -I$(srcdir) -I../libical -I$(srcdir)/../libical -I../libicalss -I$(srcdir)/../libicalss
@@ -109,53 +109,53 @@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
copycluster_OBJECTS = copycluster.o
copycluster_LDADD = $(LDADD)
-copycluster_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
-../libicalvcal/.libs/libicalvcal.a ../libical/.libs/libical.a
+copycluster_DEPENDENCIES = ../libicalss/.libs/libicalss-zarafa.a \
+../libicalvcal/.libs/libicalvcal-zarafa.a ../libical/.libs/libical-zarafa.a
copycluster_LDFLAGS =
regression_OBJECTS = regression.o
regression_LDADD = $(LDADD)
-regression_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
-../libicalvcal/.libs/libicalvcal.a ../libical/.libs/libical.a
+regression_DEPENDENCIES = ../libicalss/.libs/libicalss-zarafa.a \
+../libicalvcal/.libs/libicalvcal-zarafa.a ../libical/.libs/libical-zarafa.a
regression_LDFLAGS =
parser_OBJECTS = icaltestparser.o
parser_LDADD = $(LDADD)
-parser_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
-../libicalvcal/.libs/libicalvcal.a ../libical/.libs/libical.a
+parser_DEPENDENCIES = ../libicalss/.libs/libicalss-zarafa.a \
+../libicalvcal/.libs/libicalvcal-zarafa.a ../libical/.libs/libical-zarafa.a
parser_LDFLAGS =
storage_OBJECTS = storage.o
storage_LDADD = $(LDADD)
-storage_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
-../libicalvcal/.libs/libicalvcal.a ../libical/.libs/libical.a
+storage_DEPENDENCIES = ../libicalss/.libs/libicalss-zarafa.a \
+../libicalvcal/.libs/libicalvcal-zarafa.a ../libical/.libs/libical-zarafa.a
storage_LDFLAGS =
stow_OBJECTS = stow.o
stow_LDADD = $(LDADD)
-stow_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
-../libicalvcal/.libs/libicalvcal.a ../libical/.libs/libical.a
+stow_DEPENDENCIES = ../libicalss/.libs/libicalss-zarafa.a \
+../libicalvcal/.libs/libicalvcal-zarafa.a ../libical/.libs/libical-zarafa.a
stow_LDFLAGS =
recur_OBJECTS = recur.o
recur_LDADD = $(LDADD)
-recur_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
-../libicalvcal/.libs/libicalvcal.a ../libical/.libs/libical.a
+recur_DEPENDENCIES = ../libicalss/.libs/libicalss-zarafa.a \
+../libicalvcal/.libs/libicalvcal-zarafa.a ../libical/.libs/libical-zarafa.a
recur_LDFLAGS =
testmime_OBJECTS = testmime.o
testmime_LDADD = $(LDADD)
-testmime_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
-../libicalvcal/.libs/libicalvcal.a ../libical/.libs/libical.a
+testmime_DEPENDENCIES = ../libicalss/.libs/libicalss-zarafa.a \
+../libicalvcal/.libs/libicalvcal-zarafa.a ../libical/.libs/libical-zarafa.a
testmime_LDFLAGS =
testvcal_OBJECTS = testvcal.o
testvcal_LDADD = $(LDADD)
-testvcal_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
-../libicalvcal/.libs/libicalvcal.a ../libical/.libs/libical.a
+testvcal_DEPENDENCIES = ../libicalss/.libs/libicalss-zarafa.a \
+../libicalvcal/.libs/libicalvcal-zarafa.a ../libical/.libs/libical-zarafa.a
testvcal_LDFLAGS =
process_OBJECTS = process.o
process_LDADD = $(LDADD)
-process_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
-../libicalvcal/.libs/libicalvcal.a ../libical/.libs/libical.a
+process_DEPENDENCIES = ../libicalss/.libs/libicalss-zarafa.a \
+../libicalvcal/.libs/libicalvcal-zarafa.a ../libical/.libs/libical-zarafa.a
process_LDFLAGS =
testclassify_OBJECTS = testclassify.o
testclassify_LDADD = $(LDADD)
-testclassify_DEPENDENCIES = ../libicalss/.libs/libicalss.a \
-../libicalvcal/.libs/libicalvcal.a ../libical/.libs/libical.a
+testclassify_DEPENDENCIES = ../libicalss/.libs/libicalss-zarafa.a \
+../libicalvcal/.libs/libicalvcal-zarafa.a ../libical/.libs/libical-zarafa.a
testclassify_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)

3
mail/zarafa/libical/libical/pkg/DESCR
View File

@ -1,3 +0,0 @@
libical implements basic iCAL protocols.
This is a modified libical library for use with the Zarafa Outlook
Sharing service.

19
mail/zarafa/libical/libical/pkg/PLIST
View File

@ -1,19 +0,0 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
include/zarafa/
include/zarafa/ical.h
include/zarafa/icalss.h
include/zarafa/libicalvcal/
include/zarafa/libicalvcal/icalvcal.h
include/zarafa/libicalvcal/port.h
include/zarafa/libicalvcal/vcaltmp.h
include/zarafa/libicalvcal/vcc.h
include/zarafa/libicalvcal/vobject.h
lib/libical-zarafa.a
lib/libical-zarafa.la
@lib lib/libical-zarafa.so.${LIBical-zarafa_VERSION}
lib/libicalss-zarafa.a
lib/libicalss-zarafa.la
@lib lib/libicalss-zarafa.so.${LIBicalss-zarafa_VERSION}
lib/libicalvcal-zarafa.a
lib/libicalvcal-zarafa.la
@lib lib/libicalvcal-zarafa.so.${LIBicalvcal-zarafa_VERSION}

33
mail/zarafa/libical/libvmime/Makefile
View File

@ -1,33 +0,0 @@
# $OpenBSD: Makefile,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
COMMENT= modified libvmime library for Zarafa
DISTNAME= libvmime-0.7.1
PKGNAME= zarafa-${DISTNAME}
CATEGORIES= mail devel
# We patched the source to rename the libraries so that this package can
# cohabitate with the "official" one (i.e. devel/libvmime).
SHARED_LIBS+= vmime-zarafa 0.0 # .7.1
EXTRACT_SUFX= .tar.bz2
USE_LIBTOOL= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
EXTRA_CFLAGS="${CFLAGS}"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--includedir=${PREFIX}/include/zarafa \
--enable-messaging \
--enable-messaging-proto-pop3 \
--enable-messaging-proto-smtp \
--enable-messaging-proto-imap \
--enable-messaging-proto-maildir \
--enable-messaging-proto-sendmail \
--enable-platform-posix
.include <bsd.port.mk>

5
mail/zarafa/libical/libvmime/distinfo
View File

@ -1,5 +0,0 @@
MD5 (zarafa/libvmime-0.7.1.tar.bz2) = gfBqdx0t4B1ZgmNYOOtfag==
RMD160 (zarafa/libvmime-0.7.1.tar.bz2) = JZmDyIRBCMgEC8uuLqU+RTqBESQ=
SHA1 (zarafa/libvmime-0.7.1.tar.bz2) = MP773THC+kaXaYTxjU0hvzwuwgo=
SHA256 (zarafa/libvmime-0.7.1.tar.bz2) = /DR2rsVlNBWUx8TcqYJTlpW2HsuSpDjxmGDpEwygGeM=
SIZE (zarafa/libvmime-0.7.1.tar.bz2) = 418302

12
mail/zarafa/libical/libvmime/patches/patch-Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- Makefile.in.orig Sun Oct 12 10:29:08 2008
+++ Makefile.in Sun Oct 12 10:29:51 2008
@@ -483,7 +483,7 @@ info: info-recursive
info-am:
-install-data-am: install-docDATA install-pkgconfigDATA
+install-data-am:
install-exec-am:

21
mail/zarafa/libical/libvmime/patches/patch-src_Makefile_in
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- src/Makefile.in.orig Wed Jan 28 22:49:26 2009
+++ src/Makefile.in Wed Jan 28 22:49:52 2009
@@ -357,7 +357,7 @@ target_vendor = @target_vendor@
AUTOMAKE_OPTIONS = no-dependencies foreign
INTERNALS =
INCLUDES = -I$(top_srcdir) -I$(srcdir) @PKGCONFIG_CFLAGS@ @EXTRA_CFLAGS@
-lib_LTLIBRARIES = libvmime.la
+lib_LTLIBRARIES = libvmime-zarafa.la
libvmime_la_LDFLAGS = -export-dynamic -version-info @LIBRARY_VERSION@ @PKGCONFIG_LIBS@ @EXTRA_LIBS@
libvmime_la_SOURCES = address.cpp \
addressList.cpp \
@@ -494,7 +494,7 @@ clean-libLTLIBRARIES:
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
-libvmime.la: $(libvmime_la_OBJECTS) $(libvmime_la_DEPENDENCIES)
+libvmime-zarafa.la: $(libvmime_la_OBJECTS) $(libvmime_la_DEPENDENCIES)
$(CXXLINK) -rpath $(libdir) $(libvmime_la_LDFLAGS) $(libvmime_la_OBJECTS) $(libvmime_la_LIBADD) $(LIBS)
mostlyclean-compile:

12
mail/zarafa/libical/libvmime/patches/patch-src_charset_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_charset_cpp,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- src/charset.cpp.orig Wed Jan 7 17:01:29 2009
+++ src/charset.cpp Wed Jan 7 17:01:43 2009
@@ -190,7 +190,7 @@ void charset::iconvert(const STRINGF& in, STRINGT& out
{
out.clear();
- char buffer[65536];
+ char buffer[4096];
const char* inBuffer = static_cast <const char*>(in.data());
size_t inBytesLeft = in.length();

12
mail/zarafa/libical/libvmime/patches/patch-src_encoderB64_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_encoderB64_cpp,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- src/encoderB64.cpp.orig Thu Jan 8 14:37:22 2009
+++ src/encoderB64.cpp Thu Jan 8 14:37:30 2009
@@ -80,7 +80,7 @@ const utility::stream::size_type encoderB64::encode(ut
const int maxLineLength = std::min(propMaxLineLength, 76);
// Process data
- utility::stream::value_type buffer[65536];
+ utility::stream::value_type buffer[4096];
utility::stream::size_type bufferLength = 0;
utility::stream::size_type bufferPos = 0;

12
mail/zarafa/libical/libvmime/patches/patch-src_messaging_imap_IMAPFolder_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_messaging_imap_IMAPFolder_cpp,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- src/messaging/imap/IMAPFolder.cpp.orig Thu Jan 8 14:38:05 2009
+++ src/messaging/imap/IMAPFolder.cpp Thu Jan 8 14:38:12 2009
@@ -1131,7 +1131,7 @@ void IMAPFolder::addMessage(utility::inputStream& is,
if (progress)
progress->start(total);
- char buffer[65536];
+ char buffer[4096];
while (!is.eof())
{

12
mail/zarafa/libical/libvmime/patches/patch-src_messaging_maildir_maildirFolder_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_messaging_maildir_maildirFolder_cpp,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- src/messaging/maildir/maildirFolder.cpp.orig Thu Jan 8 14:38:19 2009
+++ src/messaging/maildir/maildirFolder.cpp Thu Jan 8 14:38:26 2009
@@ -956,7 +956,7 @@ void maildirFolder::copyMessageImpl(const utility::fil
utility::auto_ptr <utility::fileWriter> fw = file->getFileWriter();
utility::auto_ptr <utility::outputStream> os = fw->getOutputStream();
- utility::stream::value_type buffer[65536];
+ utility::stream::value_type buffer[4096];
utility::stream::size_type total = 0;
while (!is.eof())

12
mail/zarafa/libical/libvmime/patches/patch-src_messaging_pop3_POP3Store_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_messaging_pop3_POP3Store_cpp,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- src/messaging/pop3/POP3Store.cpp.orig Thu Jan 8 14:37:49 2009
+++ src/messaging/pop3/POP3Store.cpp Thu Jan 8 14:38:00 2009
@@ -447,7 +447,7 @@ void POP3Store::readResponse(utility::outputStream& os
}
// Receive data from the socket
- utility::stream::value_type buffer[65536];
+ utility::stream::value_type buffer[4096];
const utility::stream::size_type read = is.read(buffer, sizeof(buffer));
if (read == 0) // buffer is empty

12
mail/zarafa/libical/libvmime/patches/patch-src_utility_stream_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_utility_stream_cpp,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- src/utility/stream.cpp.orig Thu Jan 8 14:37:36 2009
+++ src/utility/stream.cpp Thu Jan 8 14:37:44 2009
@@ -57,7 +57,7 @@ const stream::size_type bufferedStreamCopy(inputStream
const stream::size_type bufferedStreamCopy(inputStream& is, outputStream& os,
const stream::size_type length, progressionListener* progress)
{
- stream::value_type buffer[65536];
+ stream::value_type buffer[4096];
stream::size_type total = 0;
if (progress != NULL)

31
mail/zarafa/libical/libvmime/patches/patch-vmime_Makefile_in
View File

@ -1,31 +0,0 @@
$OpenBSD: patch-vmime_Makefile_in,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- vmime/Makefile.in.orig Wed Jun 22 00:11:35 2005
+++ vmime/Makefile.in Sun Oct 12 11:02:05 2008
@@ -186,7 +186,7 @@ target_vendor = @target_vendor@
# File automatically generated by SConstruct ('scons autotools')
# DOT NOT EDIT!
-libvmimeincludedir = $(prefix)/include/@GENERIC_LIBRARY_NAME@
+libvmimeincludedir = $(prefix)/include/zarafa/@GENERIC_LIBRARY_NAME@
nobase_libvmimeinclude_HEADERS = address.hpp \
addressList.hpp \
attachment.hpp \
@@ -305,9 +305,6 @@ nobase_libvmimeinclude_HEADERS = address.hpp \
messaging/maildir/maildirMessage.hpp \
messaging/maildir/maildirUtils.hpp \
messaging/sendmail/sendmailTransport.hpp \
- platforms/windows/windowsFile.hpp \
- platforms/windows/windowsHandler.hpp \
- platforms/windows/windowsSocket.hpp \
platforms/posix/posixChildProcess.hpp \
platforms/posix/posixFile.hpp \
platforms/posix/posixHandler.hpp \
@@ -431,7 +428,7 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/mdn $(distdir)/messaging $(distdir)/messaging/imap $(distdir)/messaging/maildir $(distdir)/messaging/pop3 $(distdir)/messaging/sendmail $(distdir)/messaging/smtp $(distdir)/misc $(distdir)/platforms/posix $(distdir)/platforms/windows $(distdir)/utility
+ $(mkdir_p) $(distdir)/mdn $(distdir)/messaging $(distdir)/messaging/imap $(distdir)/messaging/maildir $(distdir)/messaging/pop3 $(distdir)/messaging/sendmail $(distdir)/messaging/smtp $(distdir)/misc $(distdir)/platforms/posix $(distdir)/utility
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \

14
mail/zarafa/libical/libvmime/patches/patch-vmime_platforms_posix_posixChildProcess_hpp
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-vmime_platforms_posix_posixChildProcess_hpp,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- vmime/platforms/posix/posixChildProcess.hpp.orig Sun Oct 12 10:19:49 2008
+++ vmime/platforms/posix/posixChildProcess.hpp Sun Oct 12 10:20:20 2008
@@ -23,6 +23,10 @@
#include "vmime/utility/childProcess.hpp"
+#ifdef __OpenBSD__
+#include <sys/types.h>
+#include <signal.h>
+#endif
namespace vmime {
namespace platforms {

12
mail/zarafa/libical/libvmime/patches/patch-vmime_platforms_posix_posixSocket_hpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-vmime_platforms_posix_posixSocket_hpp,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- vmime/platforms/posix/posixSocket.hpp.orig Thu Jan 8 14:38:48 2009
+++ vmime/platforms/posix/posixSocket.hpp Thu Jan 8 14:38:55 2009
@@ -51,7 +51,7 @@ class posixSocket : public vmime::messaging::socket (p
private:
- char m_buffer[65536];
+ char m_buffer[4096];
int m_desc;
};

12
mail/zarafa/libical/libvmime/patches/patch-vmime_platforms_windows_windowsSocket_hpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-vmime_platforms_windows_windowsSocket_hpp,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- vmime/platforms/windows/windowsSocket.hpp.orig Thu Jan 8 14:38:34 2009
+++ vmime/platforms/windows/windowsSocket.hpp Thu Jan 8 14:38:41 2009
@@ -51,7 +51,7 @@ class windowsSocket : public vmime::messaging::socket
void sendRaw(const char* buffer, const int count);
private:
- char m_buffer[65536];
+ char m_buffer[4096];
SOCKET m_desc;
};

4
mail/zarafa/libical/libvmime/pkg/DESCR
View File

@ -1,4 +0,0 @@
VMime is a powerful C++ class library for working with MIME messages and
Internet messaging services like IMAP, POP or SMTP.
This is a modified libvmime library for use with the Zarafa Outlook
Sharing service.

140
mail/zarafa/libical/libvmime/pkg/PLIST
View File

@ -1,140 +0,0 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
include/zarafa/
include/zarafa/vmime/
include/zarafa/vmime/address.hpp
include/zarafa/vmime/addressList.hpp
include/zarafa/vmime/attachment.hpp
include/zarafa/vmime/base.hpp
include/zarafa/vmime/body.hpp
include/zarafa/vmime/bodyPart.hpp
include/zarafa/vmime/charset.hpp
include/zarafa/vmime/component.hpp
include/zarafa/vmime/config.hpp
include/zarafa/vmime/constants.hpp
include/zarafa/vmime/contentDisposition.hpp
include/zarafa/vmime/contentDispositionField.hpp
include/zarafa/vmime/contentHandler.hpp
include/zarafa/vmime/contentTypeField.hpp
include/zarafa/vmime/dateTime.hpp
include/zarafa/vmime/defaultAttachment.hpp
include/zarafa/vmime/defaultParameter.hpp
include/zarafa/vmime/disposition.hpp
include/zarafa/vmime/emptyContentHandler.hpp
include/zarafa/vmime/encoder.hpp
include/zarafa/vmime/encoder7bit.hpp
include/zarafa/vmime/encoder8bit.hpp
include/zarafa/vmime/encoderB64.hpp
include/zarafa/vmime/encoderBinary.hpp
include/zarafa/vmime/encoderDefault.hpp
include/zarafa/vmime/encoderFactory.hpp
include/zarafa/vmime/encoderQP.hpp
include/zarafa/vmime/encoderUUE.hpp
include/zarafa/vmime/encoding.hpp
include/zarafa/vmime/exception.hpp
include/zarafa/vmime/fileAttachment.hpp
include/zarafa/vmime/genericField.hpp
include/zarafa/vmime/genericParameter.hpp
include/zarafa/vmime/header.hpp
include/zarafa/vmime/headerField.hpp
include/zarafa/vmime/headerFieldFactory.hpp
include/zarafa/vmime/htmlTextPart.hpp
include/zarafa/vmime/mailbox.hpp
include/zarafa/vmime/mailboxField.hpp
include/zarafa/vmime/mailboxGroup.hpp
include/zarafa/vmime/mailboxList.hpp
include/zarafa/vmime/mdn/
include/zarafa/vmime/mdn/MDNHelper.hpp
include/zarafa/vmime/mdn/MDNInfos.hpp
include/zarafa/vmime/mdn/receivedMDNInfos.hpp
include/zarafa/vmime/mdn/sendableMDNInfos.hpp
include/zarafa/vmime/mediaType.hpp
include/zarafa/vmime/message.hpp
include/zarafa/vmime/messageBuilder.hpp
include/zarafa/vmime/messageId.hpp
include/zarafa/vmime/messageIdSequence.hpp
include/zarafa/vmime/messageParser.hpp
include/zarafa/vmime/messaging/
include/zarafa/vmime/messaging/authHelper.hpp
include/zarafa/vmime/messaging/authenticationInfos.hpp
include/zarafa/vmime/messaging/authenticator.hpp
include/zarafa/vmime/messaging/defaultAuthenticator.hpp
include/zarafa/vmime/messaging/events.hpp
include/zarafa/vmime/messaging/folder.hpp
include/zarafa/vmime/messaging/imap/
include/zarafa/vmime/messaging/imap/IMAPConnection.hpp
include/zarafa/vmime/messaging/imap/IMAPFolder.hpp
include/zarafa/vmime/messaging/imap/IMAPMessage.hpp
include/zarafa/vmime/messaging/imap/IMAPParser.hpp
include/zarafa/vmime/messaging/imap/IMAPStore.hpp
include/zarafa/vmime/messaging/imap/IMAPTag.hpp
include/zarafa/vmime/messaging/imap/IMAPUtils.hpp
include/zarafa/vmime/messaging/maildir/
include/zarafa/vmime/messaging/maildir/maildirFolder.hpp
include/zarafa/vmime/messaging/maildir/maildirMessage.hpp
include/zarafa/vmime/messaging/maildir/maildirStore.hpp
include/zarafa/vmime/messaging/maildir/maildirUtils.hpp
include/zarafa/vmime/messaging/message.hpp
include/zarafa/vmime/messaging/pop3/
include/zarafa/vmime/messaging/pop3/POP3Folder.hpp
include/zarafa/vmime/messaging/pop3/POP3Message.hpp
include/zarafa/vmime/messaging/pop3/POP3Store.hpp
include/zarafa/vmime/messaging/sendmail/
include/zarafa/vmime/messaging/sendmail/sendmailTransport.hpp
include/zarafa/vmime/messaging/service.hpp
include/zarafa/vmime/messaging/serviceFactory.hpp
include/zarafa/vmime/messaging/serviceInfos.hpp
include/zarafa/vmime/messaging/session.hpp
include/zarafa/vmime/messaging/simpleAuthenticator.hpp
include/zarafa/vmime/messaging/smtp/
include/zarafa/vmime/messaging/smtp/SMTPTransport.hpp
include/zarafa/vmime/messaging/socket.hpp
include/zarafa/vmime/messaging/store.hpp
include/zarafa/vmime/messaging/timeoutHandler.hpp
include/zarafa/vmime/messaging/transport.hpp
include/zarafa/vmime/misc/
include/zarafa/vmime/misc/importanceHelper.hpp
include/zarafa/vmime/options.hpp
include/zarafa/vmime/parameter.hpp
include/zarafa/vmime/parameterFactory.hpp
include/zarafa/vmime/parameterizedHeaderField.hpp
include/zarafa/vmime/parserHelpers.hpp
include/zarafa/vmime/path.hpp
include/zarafa/vmime/plainTextPart.hpp
include/zarafa/vmime/platformDependant.hpp
include/zarafa/vmime/platforms/
include/zarafa/vmime/platforms/posix/
include/zarafa/vmime/platforms/posix/posixChildProcess.hpp
include/zarafa/vmime/platforms/posix/posixFile.hpp
include/zarafa/vmime/platforms/posix/posixHandler.hpp
include/zarafa/vmime/platforms/posix/posixSocket.hpp
include/zarafa/vmime/propertySet.hpp
include/zarafa/vmime/relay.hpp
include/zarafa/vmime/standardFields.hpp
include/zarafa/vmime/standardParams.hpp
include/zarafa/vmime/streamContentHandler.hpp
include/zarafa/vmime/stringContentHandler.hpp
include/zarafa/vmime/text.hpp
include/zarafa/vmime/textPart.hpp
include/zarafa/vmime/textPartFactory.hpp
include/zarafa/vmime/typeAdapter.hpp
include/zarafa/vmime/types.hpp
include/zarafa/vmime/utility/
include/zarafa/vmime/utility/childProcess.hpp
include/zarafa/vmime/utility/datetimeUtils.hpp
include/zarafa/vmime/utility/file.hpp
include/zarafa/vmime/utility/filteredStream.hpp
include/zarafa/vmime/utility/md5.hpp
include/zarafa/vmime/utility/path.hpp
include/zarafa/vmime/utility/progressionListener.hpp
include/zarafa/vmime/utility/random.hpp
include/zarafa/vmime/utility/smartPtr.hpp
include/zarafa/vmime/utility/stream.hpp
include/zarafa/vmime/utility/stringProxy.hpp
include/zarafa/vmime/utility/stringUtils.hpp
include/zarafa/vmime/utility/url.hpp
include/zarafa/vmime/utility/urlUtils.hpp
include/zarafa/vmime/vmime.hpp
include/zarafa/vmime/word.hpp
lib/libvmime-zarafa.a
lib/libvmime-zarafa.la
@lib lib/libvmime-zarafa.so.${LIBvmime-zarafa_VERSION}

44
mail/zarafa/libical/webaccess/Makefile
View File

@ -1,44 +0,0 @@
# $OpenBSD: Makefile,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
COMMENT= zarafa webaccess frontend
V= 6.20.1
DISTNAME= zarafa-webaccess-ajax-${V}
PKGNAME= zarafa-webaccess-${V}
CATEGORIES= mail www productivity
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
zarafa-webaccess-mobile-${V}${EXTRACT_SUFX}
MASTER_SITES= http://www.bsdfrog.org/OpenBSD/distfiles/zarafa/
RUN_DEPENDS= ::mail/zarafa/zarafa,-php \
::devel/smarty
NO_BUILD= Yes
NO_REGRESS= Yes
PKG_ARCH= *
PREFIX= /var/www
INSTDIR= ${PREFIX}/zarafa
SUBST_VARS= INSTDIR
WRKDIST= ${WRKDIR}
do-install:
${SUBST_CMD} ${WRKDIR}/php-webclient-ajax/config.php.dist
find ${WRKDIR} -name \*.orig -or -name \*.bak | xargs rm -f
${INSTALL_DATA_DIR} ${PREFIX}/zarafa
mv ${WRKDIR}/php-webclient-ajax ${INSTDIR}/webaccess
mv ${WRKDIR}/php-mobile-webaccess ${INSTDIR}/webaccess-mobile
mv ${INSTDIR}/webaccess-mobile/config.php \
${INSTDIR}/webaccess-mobile/config.php.dist
mv ${INSTDIR}/webaccess/debug.php \
${INSTDIR}/webaccess/debug.php.disabled
mv ${INSTDIR}/webaccess-mobile/debug.php \
${INSTDIR}/webaccess-mobile/debug.php.disabled
${INSTALL_DATA} /dev/null ${INSTDIR}/webaccess/debug.txt
${INSTALL_DATA} /dev/null ${INSTDIR}/webaccess-mobile/debug.txt
chown -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
.include <bsd.port.mk>

10
mail/zarafa/libical/webaccess/distinfo
View File

@ -1,10 +0,0 @@
MD5 (zarafa/zarafa-webaccess-ajax-6.20.1.tar.gz) = bFXa1iohMp7OFvVu14GvyQ==
MD5 (zarafa/zarafa-webaccess-mobile-6.20.1.tar.gz) = wBnFCEPf64/UW3QXw7p4tQ==
RMD160 (zarafa/zarafa-webaccess-ajax-6.20.1.tar.gz) = ulBCo9YsAIC6g7rBA2erj1qQs0Y=
RMD160 (zarafa/zarafa-webaccess-mobile-6.20.1.tar.gz) = Sta0WMsDwlPaOLV46kP4JUkAGYc=
SHA1 (zarafa/zarafa-webaccess-ajax-6.20.1.tar.gz) = HSx2h9rL9o1ELWjow/FTsNYy6ec=
SHA1 (zarafa/zarafa-webaccess-mobile-6.20.1.tar.gz) = YzpwGqNo5QoLznk9hWNDyE66dWI=
SHA256 (zarafa/zarafa-webaccess-ajax-6.20.1.tar.gz) = BxhY9TdtCNwpqvHO3yC4MOJc1KxmDo6KCs7ovgJPLgY=
SHA256 (zarafa/zarafa-webaccess-mobile-6.20.1.tar.gz) = bWa176wfDDbIiXQXwTAQADlmP7/U0+vkeHXZIxm4Vyo=
SIZE (zarafa/zarafa-webaccess-ajax-6.20.1.tar.gz) = 1386032
SIZE (zarafa/zarafa-webaccess-mobile-6.20.1.tar.gz) = 48833

11
mail/zarafa/libical/webaccess/patches/patch-php-mobile-webaccess__htaccess
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-php-mobile-webaccess__htaccess,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- php-mobile-webaccess/.htaccess.orig Wed Jan 7 12:19:41 2009
+++ php-mobile-webaccess/.htaccess Wed Jan 7 12:19:46 2009
@@ -17,5 +17,5 @@ php_flag short_open_tag on
# For debugging only
# make sure apache/php can write this file, or else no errors are logged!
-php_flag log_errors on
-php_value error_log errors.txt
+#php_flag log_errors on
+#php_value error_log errors.txt

26
mail/zarafa/libical/webaccess/patches/patch-php-mobile-webaccess_config_php
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-php-mobile-webaccess_config_php,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- php-mobile-webaccess/config.php.orig Wed Dec 24 15:50:05 2008
+++ php-mobile-webaccess/config.php Thu Jan 8 18:01:01 2009
@@ -9,8 +9,8 @@
define("CONFIG_CHECK", true);
// Default Zarafa server to connect to.
- define("SERVER", "file:///var/run/zarafa");
- #define("SERVER", "http://localhost:236/zarafa");
+ #define("SERVER", "file:///var/run/zarafa");
+ define("SERVER", "http://localhost:236/zarafa");
// Defines the base path on the server, terminated by a slash
define('BASE_PATH', dirname($_SERVER['SCRIPT_FILENAME']) . "/");
@@ -20,7 +20,10 @@
BASE_PATH."include/smarty/" . PATH_SEPARATOR .
BASE_PATH . PATH_SEPARATOR .
"." . PATH_SEPARATOR .
- "/usr/share/php/");
+ "/include/php/" . PATH_SEPARATOR .
+ "/var/www/include/php/" . PATH_SEPARATOR .
+ "/smarty/" . PATH_SEPARATOR .
+ "/var/www/smarty/");
define("COOKIE_EXPIRE", 60*60*24*365); // one year

37
mail/zarafa/libical/webaccess/patches/patch-php-mobile-webaccess_include_class_hierarchy_php
View File

@ -1,37 +0,0 @@
$OpenBSD: patch-php-mobile-webaccess_include_class_hierarchy_php,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- php-mobile-webaccess/include/class.hierarchy.php.orig Thu Jan 8 11:32:00 2009
+++ php-mobile-webaccess/include/class.hierarchy.php Thu Jan 8 11:34:36 2009
@@ -22,11 +22,11 @@ class hierarchy{
$this->store = $store;
$this->folders = array();
$this->properties = array();
- $this->properties["entryid"] =PR_ENTRYID;
- $this->properties["name"]=PR_DISPLAY_NAME;
- $this->properties["unread"]=PR_CONTENT_UNREAD;
- $this->properties["subfolders"] = PR_SUBFOLDERS;
- $this->properties["container_class"] = PR_CONTAINER_CLASS;
+ $this->properties["entryid"] = 'PR_ENTRYID';
+ $this->properties["name"] = 'PR_DISPLAY_NAME';
+ $this->properties["unread"] = 'PR_CONTENT_UNREAD';
+ $this->properties["subfolders"] = 'PR_SUBFOLDERS';
+ $this->properties["container_class"] = 'PR_CONTAINER_CLASS';
}
@@ -63,14 +63,14 @@ class hierarchy{
{
global $smarty;
//de properties van default messagestore
- $msgstore_props = mapi_getprops($this->store, array(PR_ENTRYID, PR_DISPLAY_NAME, PR_IPM_SUBTREE_ENTRYID, PR_IPM_OUTBOX_ENTRYID, PR_IPM_SENTMAIL_ENTRYID, PR_IPM_WASTEBASKET_ENTRYID));
+ $msgstore_props = mapi_getprops($this->store, array('PR_ENTRYID', 'PR_DISPLAY_NAME', 'PR_IPM_SUBTREE_ENTRYID', 'PR_IPM_OUTBOX_ENTRYID', 'PR_IPM_SENTMAIL_ENTRYID', 'PR_IPM_WASTEBASKET_ENTRYID'));
//Open de tree onder de default messagestore
$folder= mapi_msgstore_openentry($this->store, $msgstore_props[PR_IPM_SUBTREE_ENTRYID]);
//haal de table op
$table = mapi_folder_gethierarchytable($folder);
- mapi_table_sort($table, array(PR_DISPLAY_NAME => TABLE_SORT_ASCEND));
+ mapi_table_sort($table, array('PR_DISPLAY_NAME' => 'TABLE_SORT_ASCEND'));
//mapi_folder_sort($folder, $sort);

42
mail/zarafa/libical/webaccess/patches/patch-php-mobile-webaccess_include_smarty_arrays_php
View File

@ -1,42 +0,0 @@
$OpenBSD: patch-php-mobile-webaccess_include_smarty_arrays_php,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- php-mobile-webaccess/include/smarty.arrays.php.orig Thu Jan 8 11:15:59 2009
+++ php-mobile-webaccess/include/smarty.arrays.php Thu Jan 8 11:17:04 2009
@@ -1,26 +1,26 @@
<?php
$sensitivity = array();
-$sensitivity[SENSITIVITY_NONE]=_("Sensitivity none");
-$sensitivity[SENSITIVITY_PERSONAL]=_("Personal");
-$sensitivity[SENSITIVITY_PRIVATE]=_("Private");
-$sensitivity[SENSITIVITY_COMPANY_CONFIDENTIAL]=_("Company Confidential");
+$sensitivity['SENSITIVITY_NONE']=_("Sensitivity none");
+$sensitivity['SENSITIVITY_PERSONAL']=_("Personal");
+$sensitivity['SENSITIVITY_PRIVATE']=_("Private");
+$sensitivity['SENSITIVITY_COMPANY_CONFIDENTIAL']=_("Company Confidential");
$smarty->assign("sensitivitya", $sensitivity);
$status = array();
-$status[olTaskNotStarted]=_("Task Not Started");
-$status[olTaskInProgress]=_("Task In Progress");
-$status[olTaskComplete]=_("Task Complete");
-$status[olTaskWaiting]=_("Task Waiting");
-$status[olTaskDeferred]=_("Task Deffered");
+$status['olTaskNotStarted']=_("Task Not Started");
+$status['olTaskInProgress']=_("Task In Progress");
+$status['olTaskComplete']=_("Task Complete");
+$status['olTaskWaiting']=_("Task Waiting");
+$status['olTaskDeferred']=_("Task Deffered");
$smarty->assign("statusa", $status);
$priority = array();
-$priority[PRIO_NONURGENT] = _("Non urgent");
-$priority[PRIO_NORMAL] = _("Normal");
-$priority[PRIO_URGENT] = _("Urgent");
+$priority['PRIO_NONURGENT'] = _("Non urgent");
+$priority['PRIO_NORMAL'] = _("Normal");
+$priority['PRIO_URGENT'] = _("Urgent");
$smarty->assign("prioritya", $priority);

11
mail/zarafa/libical/webaccess/patches/patch-php-webclient-ajax__htaccess
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-php-webclient-ajax__htaccess,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- php-webclient-ajax/.htaccess.orig Wed Jan 7 12:19:15 2009
+++ php-webclient-ajax/.htaccess Wed Jan 7 12:19:31 2009
@@ -17,5 +17,5 @@ php_flag short_open_tag on
# For debugging only
# make sure apache/php can write this file, or else no errors are logged!
-php_flag log_errors on
-php_value error_log errors.txt
+#php_flag log_errors on
+#php_value error_log errors.txt

12
mail/zarafa/libical/webaccess/patches/patch-php-webclient-ajax_client_core_xmlrequest_js
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-php-webclient-ajax_client_core_xmlrequest_js,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- php-webclient-ajax/client/core/xmlrequest.js.orig Wed Jan 7 10:58:54 2009
+++ php-webclient-ajax/client/core/xmlrequest.js Wed Jan 7 10:59:04 2009
@@ -151,7 +151,7 @@ XMLRequest.prototype.readyStateChange = function()
// we have an error in the XML here, or no XML at all
// all "loading" modules must be informed about this,
// for now, just show the browser error...
- webclient.xmlrequest.showError("Unkown server or connection problem");
+ webclient.xmlrequest.showError("Unknown server or connection problem");
/*
if (e.description){

12
mail/zarafa/libical/webaccess/patches/patch-php-webclient-ajax_client_login_php
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-php-webclient-ajax_client_login_php,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- php-webclient-ajax/client/login.php.orig Wed Jan 7 19:08:23 2009
+++ php-webclient-ajax/client/login.php Wed Jan 7 19:08:37 2009
@@ -68,7 +68,7 @@
<?php
function langsort($a, $b) { return strcasecmp($a, $b); }
$langs = $GLOBALS["language"]->getLanguages();
- uasort($langs, langsort);
+ uasort($langs, 'langsort');
foreach($langs as $lang=>$title){
?> <option value="<?=$lang?>"><?=$title?></option>
<?php } ?>

34
mail/zarafa/libical/webaccess/patches/patch-php-webclient-ajax_config_php_dist
View File

@ -1,34 +0,0 @@
$OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.1.1.1 2009/02/16 09:35:44 ajacoutot Exp $
--- php-webclient-ajax/config.php.dist.orig Wed Dec 24 15:50:05 2008
+++ php-webclient-ajax/config.php.dist Thu Jan 8 11:22:48 2009
@@ -11,9 +11,9 @@
define("CONFIG_CHECK", TRUE);
// Default Zarafa server to connect to.
- define("DEFAULT_SERVER","file:///var/run/zarafa");
+ #define("DEFAULT_SERVER","file:///var/run/zarafa");
#define("DEFAULT_SERVER","file://\\\\.\\pipe\\zarafa");
- #define("DEFAULT_SERVER","http://localhost:236/zarafa");
+ define("DEFAULT_SERVER","http://localhost:236/zarafa");
// Name of the cookie that is used for the session, we can also use an external cookie
if (isset($_REQUEST["external"]) && preg_match("/[a-z][a-z0-9_]+/i",$_REQUEST["external"])){
@@ -43,7 +43,8 @@
// Define the server paths
set_include_path(BASE_PATH. PATH_SEPARATOR .
BASE_PATH."server/PEAR/" . PATH_SEPARATOR .
- "/usr/share/php/");
+ "/include/php/" . PATH_SEPARATOR .
+ "/var/www/include/php/");
// Define the relative URL for dialogs, this string is appended with HTTP GET arguments
define("DIALOG_URL", "index.php?load=dialog&");
@@ -83,7 +84,7 @@
// Spellchecker, change here to enable
define('FCKEDITOR_SPELLCHECKER_ENABLED', false);
- define('FCKEDITOR_SPELLCHECKER_PATH', '/usr/bin/aspell');
+ define('FCKEDITOR_SPELLCHECKER_PATH', '${LOCALBASE}/bin/aspell');
define('FCKEDITOR_SPELLCHECKER_LANGUAGE', FALSE); // set FALSE to use the language chosen by the user, but make sure that these languages are installed with aspell!
/**************************************\

6
mail/zarafa/libical/webaccess/pkg/DESCR
View File

@ -1,6 +0,0 @@
Zarafa provides full functionality webaccess completely in the Outlook
"Look & Feel". It includes access to email, calendars, contacts, tasks,
shared folders and Public Folders. The AJAX implementation with drag &
drop support is used be competitive with desktop email applications.
This package provides both web and mobile clients access to Zarafa.

23
mail/zarafa/libical/webaccess/pkg/MESSAGE
View File

@ -1,23 +0,0 @@
Zarafa webaccess has been installed under
${INSTDIR}
Whether you want to provide access to regular and/or mobile clients, you
should point the followings to the DocumentRoot of your web-server:
# ln -s ../zarafa/webaccess /var/www/htdocs/webaccess
# ln -s ../zarafa/webaccess-mobile /var/www/htdocs/webaccess-mobile
(make sure you use a relative symlink since Apache is chrooted)
You need to edit the config.php file installed under:
${INSTDIR}/webaccess for regular web client access
${INSTDIR}/webaccess-mobile for mobile client access
You may want to edit ${PREFIX}/conf/php.ini according to
${INSTDIR}/webaccess/.htaccess
In any case, short_open_tag must be "On".
If you want to debug the webaccess, copy the following file
${INSTDIR}/webaccess{-mobile}/debug.php.disabled
to
${INSTDIR}/webaccess{-mobile}/debug.php
The debugging output will then be available under:
${INSTDIR}/webaccess{-mobile}/debug.txt

1106
mail/zarafa/libical/webaccess/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff

105
mail/zarafa/libical/zarafa/Makefile
View File

@ -1,105 +0,0 @@
# $OpenBSD: Makefile,v 1.1.1.1 2009/02/16 09:35:45 ajacoutot Exp $
COMMENT-main= MS Exchange groupware suite replacement
COMMENT-php= MAPI extensions for php5
V= 6.20.1
DISTNAME= zarafa-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-php= php5-mapi-${V}
CATEGORIES= mail www productivity
MASTER_SITES= http://www.bsdfrog.org/OpenBSD/distfiles/zarafa/
SHARED_LIBS += common_util 0.0 # .1.0
SHARED_LIBS += common_mapi 0.0 # .1.0
SHARED_LIBS += common_ssl 0.0 # .1.0
SHARED_LIBS += freebusy 0.0 # .1.0
SHARED_LIBS += mapi 0.0 # .0.0
SHARED_LIBS += zarafaclient 0.0 # .1.0
SHARED_LIBS += icalmapi 0.0 # .1.0
SHARED_LIBS += inetmapi 0.0 # .1.0
MULTI_PACKAGES= -main -php
MODULES= devel/gettext
BUILD_DEPENDS= ::www/php5/core \
::textproc/xmlto
WANTLIB-main= asn1 c com_err crypto gssapi krb5 m pthread sasl2 ssl \
stdc++ z
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
mysqlclient.>=19::databases/mysql \
lber.>=9,ldap::databases/openldap \
uuid.>=13::devel/uuid \
execinfo::devel/libexecinfo \
vmime-zarafa::mail/zarafa/libvmime \
ical-zarafa,icalss-zarafa,icalvcal-zarafa::mail/zarafa/libical
WANTLIB-php= execinfo ical-zarafa icalss-zarafa icalvcal-zarafa \
uuid vmime-zarafa
LIB_DEPENDS-php= ${MODGETTEXT_LIB_DEPENDS} \
common_mapi,common_util,freebusy,icalmapi,inetmapi,mapi::mail/zarafa/zarafa,-main
RUN_DEPENDS-php= ::www/php5/core
USE_LIBTOOL= Yes
LIBTOOL_FLAGS= --tag=disable-static
USE_GMAKE= Yes
PREFIX-php= /var/www
MODULE_NAME= mapi
SUBST_VARS= ^MODULE_NAME PREFIX-php
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${LOCALBASE}/include/zarafa" \
LDFLAGS="-L${LOCALBASE}/lib -lexecinfo \
-L${LOCALBASE}/lib/zarafa" \
ZAFARA_LDFLAGS="-L${LOCALBASE}/lib/zarafa"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-dependency-tracking \
--disable-static \
--with-userscript-prefix=${SYSCONFDIR}/zarafa/userscripts \
--with-quotatemplate-prefix=${SYSCONFDIR}/zarafa/quotamail \
--enable-release \
--enable-oss \
--disable-perl \
--with-vmime-prefix=${LOCALBASE}/include/zarafa \
--with-ical-prefix=${LOCALBASE}/include/zarafa
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/zarafa/report-ca \
USERSCRIPTDIR=${PREFIX}/share/examples/zarafa/userscripts \
QUOTATEMPLATEDIR=${PREFIX}/share/examples/zarafa/quotamail
SUB_SCRIPTS= createcompany.d/00createpublic groups_common.sh \
createuser.d/00createstore deleteuser.d/99deletestore \
companies_common.sh users_common.sh
pre-configure:
cd ${WRKSRC}/installer/linux && \
for i in *.cfg createuser.dotforward ; do \
${SUBST_CMD} $$i; \
perl -pi -e 's/\r\n/\n/;' $$i; done
for i in ${SUB_SCRIPTS}; do \
${SUBST_CMD} ${WRKSRC}/installer/userscripts/$$i; done
perl -pi -e 's,/usr/share/zarafa,${PREFIX}/share/examples/zarafa,g;' \
-e 's,/etc/zarafa,${SYSCONFDIR}/zarafa,g;' \
-e 's,/usr/bin,${PREFIX}/bin,g;' \
-e 's,/var/lib/zarafa,/var/db/zarafa,g;' \
-e 's,ssl-certificate.sh,ssl-certificates.sh,g' \
${WRKSRC}/doc/manual.xml
post-install:
${SUBST_CMD} -c ${FILESDIR}/README.OpenBSD ${PREFIX}/share/doc/zarafa/README.OpenBSD
chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/doc/zarafa
${INSTALL_DATA_DIR} ${DESTDIR}/var/www/conf/php5.sample
echo "; Enable Zarafa mapi extension module\nextension=mapi.so" \
> ${WRKINST}/var/www/conf/php5.sample/${MODULE_NAME}.ini
mv ${PREFIX}/share/doc/zarafa/zarafa.schema \
${PREFIX}/share/examples/zarafa/
.include <bsd.port.mk>

5
mail/zarafa/libical/zarafa/distinfo
View File

@ -1,5 +0,0 @@
MD5 (zarafa/zarafa-6.20.1.tar.gz) = o244HSJ80wGwAYtX3znftw==
RMD160 (zarafa/zarafa-6.20.1.tar.gz) = b4o2bXNYn/96MsVGCdb+LfkUrTI=
SHA1 (zarafa/zarafa-6.20.1.tar.gz) = BeAqH84aDVKT3CQdrwZZTV1AsWc=
SHA256 (zarafa/zarafa-6.20.1.tar.gz) = +sA3BJHbbz0rFT82CpOFGXvMglJ5enxBYpj3Lc+XIdY=
SIZE (zarafa/zarafa-6.20.1.tar.gz) = 2104102

122
mail/zarafa/libical/zarafa/files/README.OpenBSD
View File

@ -1,122 +0,0 @@
$OpenBSD: README.OpenBSD,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
Post-install/update instructions for Zarafa
===========================================
By default the server is configured to accept SOAP connections on port
236. If you wish to connect Outlook clients on port 80, please setup
your web server to proxy HTTP requests with URI=/zarafa to
http://localhost:236.
Before Starting zarafa-server for the first time
------------------------------------------------
* a MySQL datatabase access needs to be configured in
${SYSCONFDIR}/zarafa/server.cfg
After zarafa-server was started for the first time
--------------------------------------------------
* Creating the public store.
# ${TRUEPREFIX}/bin/zarafa-admin -s
* Adding an admin user -- see zarafa-admin(1).
# ${TRUEPREFIX}/bin/zarafa-admin -c zadmin -p secret -e zarafa.admin@domain.tld -f "John Doe" -a 2
Starting Zarafa on boot-up
--------------------------
To start all zarafa services on boot-up, add the following lines to
/etc/rc.local:
if [ -x ${TRUEPREFIX}/bin/zarafa-server ]; then
echo -n ' zarafa-server' ; ${TRUEPREFIX}/bin/zarafa-server
fi
if [ -x ${TRUEPREFIX}/bin/zarafa-spooler ]; then
echo -n ' zarafa-spooler' ; ${TRUEPREFIX}/bin/zarafa-spooler
fi
if [ -x ${TRUEPREFIX}/bin/zarafa-monitor ]; then
echo -n ' zarafa-monitor' ; ${TRUEPREFIX}/bin/zarafa-monitor
fi
if [ -x ${TRUEPREFIX}/bin/zarafa-gateway ]; then
echo -n ' zarafa-gateway' ; ${TRUEPREFIX}/bin/zarafa-gateway
fi
if [ -x ${TRUEPREFIX}/bin/zarafa-ical ]; then
echo -n ' zarafa-ical' ; ${TRUEPREFIX}/bin/zarafa-ical
fi
Shutting down Zarafa
--------------------
zarafa-server may need some time to correctly shut down.
It is advised you use something like the following at the end of your
/etc/rc.shutdown file:
echo "Shutting down Zarafa..."
pkill zarafa-ical
pkill zarafa-gateway
pkill zarafa-monitor
pkill zarafa-spooler
pkill zarafa-server
sleep 10
i=0
while [ $i -lt 60 ]
do
if [ "`pgrep zarafa-server`" ]; then
pkill zarafa-server
sleep 10
i=`expr $i + 10`
else
i=60
fi
done
Mail delivery agent configuration
---------------------------------
The easiest way to use zarafa-dagent system-wide under a stock OpenBSD
sendmail installation is to use procmail(1).
See the following URL for other MTA integration:
http://www.zarafa.com/?q=en/faq/61
First, install the procmail package and configure ${SYSCONFDIR}/procmailrc
the following way:
:0 w
| ${TRUEPREFIX}/bin/zarafa-dagent $LOGNAME
EXITCODE=$?
Next, you need to add the following line to your sendmail.mc file then
restart sendmail(8):
FEATURE(`local_procmail')dnl
The PHP mapi module and OpenBSD Apache
--------------------------------------
When using the OpenBSD Apache server, the runtime loader will need to
pre-load the pthread shared library. While the php binary is linked with
-pthread, httpd is not and the PHP mapi module needs
the pthread_mutex_init(3) function.
To do so, we need to start httpd with LD_PRELOAD set in /etc/rc.local
(do not set httpd_flags in rc.conf(8)).
e.g:
rm -f /var/www/logs/{ssl_mutex,httpd.lock,accept.lock}.*
echo -n ' httpd'
LD_PRELOAD=/usr/lib/libpthread.so /usr/sbin/httpd -DSSL
Documentation and help
----------------------
Each zarafa-* command has its corresponding manpage.
Some documentation is also available on the Internet:
http://www.zarafa.com/wiki/index.php/Main_Page
http://www.zarafa.com/content/documentation

15
mail/zarafa/libical/zarafa/patches/patch-ECtools_ECTestTools_ICSBlackBerry_ICSMapXMLMapi_cpp
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-ECtools_ECTestTools_ICSBlackBerry_ICSMapXMLMapi_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- ECtools/ECTestTools/ICSBlackBerry/ICSMapXMLMapi.cpp.orig Tue Oct 14 15:39:27 2008
+++ ECtools/ECTestTools/ICSBlackBerry/ICSMapXMLMapi.cpp Tue Oct 14 15:41:06 2008
@@ -33,7 +33,11 @@
*
*/
+#ifndef __OpenBSD__
#include <asm/errno.h>
+#else
+#include <errno.h>
+#endif
#include <mapicode.h>
#include <mapitags.h>

24
mail/zarafa/libical/zarafa/patches/patch-ECtools_ECTestTools_IMAPTest_IMAPtest_cpp
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-ECtools_ECTestTools_IMAPTest_IMAPtest_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- ECtools/ECTestTools/IMAPTest/IMAPtest.cpp.orig Wed Dec 24 20:17:57 2008
+++ ECtools/ECTestTools/IMAPTest/IMAPtest.cpp Sat Jan 10 16:33:23 2009
@@ -108,7 +108,7 @@ int ReadResponse(std::string &strLine){
bFound=false;
if(strLine.substr(strLine.size()-3,1)=="}"){
c=0;
- while(c < strLine.size()-4 && strLine.substr(strLine.size()-(4+c),1)!="{"){
+ while(c < (int)strLine.size()-4 && strLine.substr(strLine.size()-(4+c),1)!="{"){
c++;
}
if(strLine.substr(strLine.size()-(4+c),1)=="{"){
@@ -167,7 +167,11 @@ void Log(LogLevelEnum loglvl, std::string strLog){
struct tm *tm;
std::string strLvl;
gettimeofday(&tv, &tz);
+#ifndef __OpenBSD__
tm=localtime(&tv.tv_sec);
+#else
+ tm=localtime((time_t *)&tv.tv_sec);
+#endif
snprintf(szTime, 64, "%02d-%02d-%d %02d:%02d:%02d.%06d",tm->tm_mday, tm->tm_mon + 1, tm->tm_year + 1900, tm->tm_hour, tm->tm_min, tm->tm_sec, tv.tv_usec);
switch(loglvl){
case LOG_INFO:

12
mail/zarafa/libical/zarafa/patches/patch-ECtools_ECTestTools_IMAPTest_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-ECtools_ECTestTools_IMAPTest_Makefile_in,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- ECtools/ECTestTools/IMAPTest/Makefile.in.orig Tue Oct 14 15:28:26 2008
+++ ECtools/ECTestTools/IMAPTest/Makefile.in Tue Oct 14 15:28:37 2008
@@ -226,7 +226,7 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX
-IMAPTest_LDADD = -lssl \
+IMAPTest_LDADD = -lssl -lcrypto \
$(PROG_LIBS)
IMAPTest_SOURCES = IMAPtest.cpp

12
mail/zarafa/libical/zarafa/patches/patch-caldav_MAPIFacade_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-caldav_MAPIFacade_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- caldav/MAPIFacade.cpp.orig Fri Jan 9 16:32:36 2009
+++ caldav/MAPIFacade.cpp Fri Jan 9 16:33:10 2009
@@ -218,7 +218,7 @@ HRESULT MAPIFacade::OpenFolder(HTTPRequest *lpRequest)
// We haven't opened the folder itself yet, so we need to find the folder in the hierarchy table.
// Any subfolders are retrieved by searching the hierarchy table of the parent folder.
if (ulCountFNList == 2) {
- for (int ulCountPropTag = 0; ulCountPropTag < sizeof(ulPropTagArray)/sizeof(ULONG); ulCountPropTag++) {
+ for (unsigned int ulCountPropTag = 0; ulCountPropTag < sizeof(ulPropTagArray)/sizeof(ULONG); ulCountPropTag++) {
hr = GetEntryID(ulPropTagArray[ulCountPropTag], (*iterFNList), &cbEntryID, &lpEntryID);
if (hr == hrSuccess) {
ulSucceededEntryID = ulPropTagArray[ulCountPropTag];

30
mail/zarafa/libical/zarafa/patches/patch-common_Makefile_in
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-common_Makefile_in,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- common/Makefile.in.orig Thu Dec 11 22:18:07 2008
+++ common/Makefile.in Tue Dec 30 13:32:42 2008
@@ -278,7 +278,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
-I${top_srcdir}/libfreebusy
-libcommon_mapi_la_LDFLAGS = -static
+libcommon_mapi_la_LDFLAGS = -version-info $(ECCLIENT_LIBRARY_VERSION)
libcommon_mapi_la_SOURCES = CommonUtil.cpp \
rtfutil.cpp \
codepage.cpp \
@@ -293,7 +293,7 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \
ZarafaCode.cpp \
RecurrenceState.cpp
-libcommon_util_la_LDFLAGS = -static
+libcommon_util_la_LDFLAGS = -version-info $(ECCLIENT_LIBRARY_VERSION)
libcommon_util_la_SOURCES = platform.cpp \
platform.linux.cpp \
md5.cpp \
@@ -309,7 +309,7 @@ libcommon_util_la_SOURCES = platform.cpp \
str1252.cpp \
SymmetricCrypt.cpp
-libcommon_ssl_la_LDFLAGS = -static
+libcommon_ssl_la_LDFLAGS = -version-info $(ECCLIENT_LIBRARY_VERSION)
libcommon_ssl_la_SOURCES = \
SSLUtil.cpp \
ECChannel.cpp

19
mail/zarafa/libical/zarafa/patches/patch-common_platform_h
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-common_platform_h,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- common/platform.h.orig Mon Sep 22 22:14:31 2008
+++ common/platform.h Thu Oct 9 17:08:42 2008
@@ -39,9 +39,15 @@
// We have to include this now in case select.h is included too soon.
// Increase our maximum amount of file descriptors to 8192
+#if OPENBSD
+ #include <sys/types.h>
+ #undef FD_SETSIZE
+ #define FD_SETSIZE 1024
+#else
#include <bits/types.h>
#undef __FD_SETSIZE
#define __FD_SETSIZE 8192
+#endif
#include "config.h"
#include "platform.linux.h"

12
mail/zarafa/libical/zarafa/patches/patch-common_platform_linux_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-common_platform_linux_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- common/platform.linux.cpp.orig Thu Oct 9 16:55:21 2008
+++ common/platform.linux.cpp Thu Oct 9 16:55:33 2008
@@ -54,7 +54,7 @@
#define ICONV_CONST const
#elif OPENBSD
// bsd
-#define ICONV_CONST const
+#define ICONV_CONST
#else
// linux
#define ICONV_CONST

19
mail/zarafa/libical/zarafa/patches/patch-common_platform_linux_h
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-common_platform_linux_h,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- common/platform.linux.h.orig Wed Dec 24 20:17:57 2008
+++ common/platform.linux.h Fri Jan 9 15:09:32 2009
@@ -48,8 +48,15 @@
#include <ctype.h> /* 64bit int definition */
#include <dlfcn.h>
#include <stddef.h>
+#if defined(__OpenBSD__)
+#include <sys/endian.h>
+#ifndef MAX_PATH
+ #define MAX_PATH 1024
+#endif
+#else
#include <byteswap.h>
#include <endian.h>
+#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>

12
mail/zarafa/libical/zarafa/patches/patch-common_str1252_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-common_str1252_h,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- common/str1252.h.orig Thu Oct 9 17:01:27 2008
+++ common/str1252.h Thu Oct 9 17:01:42 2008
@@ -36,7 +36,7 @@
#ifndef STR1252_H
#define STR1252_H
-#include <malloc.h>
+#include <stdlib.h>
void memxfrm_str1252(char *str, int len);
void strxfrm_str1252(char *str);

69
mail/zarafa/libical/zarafa/patches/patch-configure
View File

@ -1,69 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- configure.orig Mon Jan 12 20:22:46 2009
+++ configure Wed Jan 28 23:17:58 2009
@@ -20997,7 +20997,7 @@ else
fi
if test "$want_release" = "yes"; then
- CXXFLAGS="$CXXFLAGS -O2 -fno-strict-aliasing"
+ CXXFLAGS="$CXXFLAGS -fno-strict-aliasing"
fi
# Check whether --enable-oss was given.
@@ -21549,9 +21549,9 @@ GSOAP_LIBS="-lz"
# check user given vmime location
-# Check whether --with-vime-prefix was given.
-if test "${with_vime_prefix+set}" = set; then
- withval=$with_vime_prefix; VMIME_PREFIX=${withval}
+# Check whether --with-vmime-prefix was given.
+if test "${with_vmime_prefix+set}" = set; then
+ withval=$with_vmime_prefix; VMIME_PREFIX=${withval}
else
VMIME_PREFIX=
fi
@@ -21832,7 +21832,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
_ACEOF
VMIME_CFLAGS=$VMIME_PREFIX
- VMIME_LIBS="-lvmime"
+ VMIME_LIBS="${ZAFARA_LDFLAGS} -lvmime-zarafa"
else
@@ -22116,7 +22116,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
ICAL_CFLAGS=$ICAL_PREFIX
- ICAL_LIBS="-lical -licalss -licalvcal"
+ ICAL_LIBS="${ZAFARA_LDFLAGS} -lical-zarafa -licalss-zarafa -licalvcal-zarafa"
else
{ { echo "$as_me:$LINENO: error: libical headers are not found" >&5
echo "$as_me: error: libical headers are not found" >&2;}
@@ -22892,13 +22892,13 @@ LIBS=$libs_keep
libs_keep=$LIBS
# check lib, but do not set in link list
-{ echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6; }
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread $LIBS"
+LIBS="-pthread $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -22958,7 +22958,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then
#define HAVE_LIBPTHREAD 1
_ACEOF
- LIBS="-lpthread $LIBS"
+ LIBS="-pthread $LIBS"
else
{ { echo "$as_me:$LINENO: error: required library libpthread missing or unusable" >&5

19
mail/zarafa/libical/zarafa/patches/patch-doc_Makefile_in
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- doc/Makefile.in.orig Sun Oct 19 18:15:49 2008
+++ doc/Makefile.in Sun Oct 19 18:17:59 2008
@@ -364,12 +364,12 @@ uninstall-man5:
done
install-dist_dataDATA: $(dist_data_DATA)
@$(NORMAL_INSTALL)
- test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
+ test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
@list='$(dist_data_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(dist_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
- $(dist_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
+ echo " $(dist_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+ $(dist_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
done
uninstall-dist_dataDATA:

158
mail/zarafa/libical/zarafa/patches/patch-doc_manual_xml
View File

@ -1,158 +0,0 @@
$OpenBSD: patch-doc_manual_xml,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- doc/manual.xml.orig Sun Jan 11 14:51:14 2009
+++ doc/manual.xml Sun Jan 11 14:51:50 2009
@@ -803,12 +803,6 @@
<option>-c</option>
<replaceable>/path/to/server.cfg</replaceable>
</para>
-
- <para>You may also use the init.d scripts:</para>
- <para><command>/etc/init.d/zarafa-server</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
</refsection>
<refsection>
@@ -2294,9 +2288,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
- <para>Write the process ID number to this file. This is
- used by the init.d script to correctly stop/restart the
- service.
+ <para>Write the process ID number to this file.
</para>
<para>Default:
<replaceable>/var/run/zarafa-server.pid</replaceable>
@@ -4113,13 +4105,7 @@
</para>
<para>The spooler process will keep running and watching the
- outgoing queue for new mail to send. You may also use the
- init.d scripts:</para>
-
- <para><command>/etc/init.d/zarafa-spooler</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
+ outgoing queue for new mail to send.</para>
</refsection>
<refsection>
@@ -4277,9 +4263,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
- <para>Write the process ID number to this file. This is
- used by the init.d script to correctly stop/restart the
- service.
+ <para>Write the process ID number to this file.
</para>
<para>Default:
<replaceable>/var/run/zarafa-spooler.pid</replaceable>
@@ -4611,13 +4595,7 @@
<para><command>zarafa-gateway</command></para>
- <para>The gateway process will keep running. You may also use
- the init.d scripts:</para>
-
- <para><command>/etc/init.d/zarafa-gateway</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
+ <para>The gateway process will keep running.</para>
</refsection>
<refsection>
@@ -4819,9 +4797,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
- <para>Write the process ID number to this file. This is
- used by the init.d script to correctly stop/restart the
- service.
+ <para>Write the process ID number to this file.
</para>
<para>Default:
<replaceable>/var/run/zarafa-gateway.pid</replaceable>
@@ -5167,14 +5143,8 @@
<para>The monitor checks user mailbox sizes. The monitor sends
a quota email when the warning quota limit is reached. When
- started, the program will keep running. You may also use the
- init.d scripts:
+ started, the program will keep running.
</para>
-
- <para><command>/etc/init.d/zarafa-monitor</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
</refsection>
<refsection>
@@ -5300,9 +5270,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
- <para>Write the process ID number to this file. This is
- used by the init.d script to correctly stop/restart the
- service.
+ <para>Write the process ID number to this file.
</para>
<para>Default value: /var/run/zarafa-monitor.pid
</para>
@@ -6345,13 +6313,7 @@
<para><command>zarafa-ical</command></para>
- <para>The ical gateway process will keep running. You may also use
- the init.d scripts:</para>
-
- <para><command>/etc/init.d/zarafa-ical</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
+ <para>The ical gateway process will keep running.</para>
</refsection>
<refsection>
@@ -6517,9 +6479,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
- <para>Write the process ID number to this file. This is
- used by the init.d script to correctly stop/restart the
- service.
+ <para>Write the process ID number to this file.
</para>
<para>Default:
<replaceable>/var/run/zarafa-ical.pid</replaceable>
@@ -6823,13 +6783,7 @@
<para><command>zarafa-licensed</command></para>
- <para>The zarafa-licensed process will keep running. You may also use
- the init.d scripts:</para>
-
- <para><command>/etc/init.d/zarafa-licensed</command>
- [<replaceable>start</replaceable>|
- <replaceable>stop</replaceable>|
- <replaceable>restart</replaceable>]</para>
+ <para>The zarafa-licensed process will keep running.</para>
</refsection>
<refsection>
@@ -6973,9 +6927,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
- <para>Write the process ID number to this file. This is
- used by the init.d script to correctly stop/restart the
- service.
+ <para>Write the process ID number to this file.
</para>
<para>Default:
<replaceable>/var/run/zarafa-licensed.pid</replaceable>

14
mail/zarafa/libical/zarafa/patches/patch-gateway_Gateway_cpp
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-gateway_Gateway_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- gateway/Gateway.cpp.orig Sun Oct 12 13:10:55 2008
+++ gateway/Gateway.cpp Sun Oct 12 13:12:37 2008
@@ -73,6 +73,10 @@
#include "SSLUtil.h"
+#ifdef __OpenBSD__
+#include <sys/resource.h>
+#endif
+
#ifdef max
#undef max
#endif

19
mail/zarafa/libical/zarafa/patches/patch-installer_Makefile_in
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-installer_Makefile_in,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/Makefile.in.orig Sun Oct 19 18:18:19 2008
+++ installer/Makefile.in Sun Oct 19 18:19:01 2008
@@ -262,12 +262,12 @@ distclean-libtool:
uninstall-info-am:
install-dist_dataDATA: $(dist_data_DATA)
@$(NORMAL_INSTALL)
- test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
+ test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
@list='$(dist_data_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(dist_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
- $(dist_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
+ echo " $(dist_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
+ $(dist_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
done
uninstall-dist_dataDATA:

41
mail/zarafa/libical/zarafa/patches/patch-installer_linux_Makefile_in
View File

@ -1,41 +0,0 @@
$OpenBSD: patch-installer_linux_Makefile_in,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/linux/Makefile.in.orig Mon Sep 22 21:58:07 2008
+++ installer/linux/Makefile.in Sun Oct 19 18:20:23 2008
@@ -187,6 +187,7 @@ datadir = ${prefix}/share/zarafa
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
+egdir = ${prefix}/share/examples/zarafa
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
@@ -215,12 +216,8 @@ target_alias = @target_alias@
dist_data_DATA = server.cfg unix.cfg ldap.openldap.cfg ldap.active-directory.cfg \
spooler.cfg gateway.cfg monitor.cfg dagent.cfg ical.cfg licensed.cfg \
zarafa.logrotate \
- zarafa-server.init.suse zarafa-spooler.init.suse zarafa-gateway.init.suse zarafa-monitor.init.suse zarafa-ical.init.suse \
- zarafa-server.init.fc zarafa-spooler.init.fc zarafa-gateway.init.fc zarafa-monitor.init.fc zarafa-ical.init.fc \
- zarafa-server.init.cbs4 zarafa-spooler.init.cbs4 zarafa-gateway.init.cbs4 zarafa-monitor.init.cbs4 zarafa-ical.init.cbs4 \
db-convert-4.1-to-4.2 db-convert-4.20-to-4.21 db-convert-4.20-to-innodb.sql db-calc-storesize db-convert-attachments-to-files \
- createuser.dotforward db-convert-4.2x-to-5.00 ssl-certificates.sh \
- zarafa-licensed.init.cbs4 zarafa-licensed.init.suse zarafa-licensed.init.fc
+ createuser.dotforward db-convert-4.2x-to-5.00 ssl-certificates.sh
dist_bin_SCRIPTS = zarafa-autorespond
dist_sysconf_DATA = ipsseg.crt
@@ -287,12 +284,12 @@ distclean-libtool:
uninstall-info-am:
install-dist_dataDATA: $(dist_data_DATA)
@$(NORMAL_INSTALL)
- test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
+ test -z "$(egdir)" || $(mkdir_p) "$(DESTDIR)$(egdir)"
@list='$(dist_data_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(dist_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
- $(dist_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
+ echo " $(dist_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(egdir)/$$f'"; \
+ $(dist_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(egdir)/$$f"; \
done
uninstall-dist_dataDATA:

10
mail/zarafa/libical/zarafa/patches/patch-installer_linux_createuser_dotforward
View File

@ -1,10 +0,0 @@
$OpenBSD: patch-installer_linux_createuser_dotforward,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/linux/createuser.dotforward.orig Mon Dec 29 20:11:02 2008
+++ installer/linux/createuser.dotforward Mon Dec 29 20:11:50 2008
@@ -10,5 +10,5 @@
HOMEDIR=`getent passwd $ZARAFA_USER | cut -d: -f6`
-echo "\"| /usr/bin/zarafa-dagent $ZARAFA_USER\"" > $HOMEDIR/.forward
+echo "\"| ${PREFIX}/bin/zarafa-dagent $ZARAFA_USER\"" > $HOMEDIR/.forward
chown $ZARAFA_USER.$ZARAFA_USER $HOMEDIR/.forward

12
mail/zarafa/libical/zarafa/patches/patch-installer_linux_dagent_cfg
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-installer_linux_dagent_cfg,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/linux/dagent.cfg.orig Sun Oct 19 19:47:21 2008
+++ installer/linux/dagent.cfg Sun Oct 19 19:53:57 2008
@@ -10,7 +10,7 @@ server_socket = file:///var/run/zarafa
# to use this type of login method
# Login to the Zarafa server using this SSL Key
-sslkey_file = /etc/zarafa/ssl/dagent.pem
+sslkey_file = ${SYSCONFDIR}/zarafa/ssl/dagent.pem
# The password of the SSL Key
sslkey_pass = replace-with-dagent-cert-password

37
mail/zarafa/libical/zarafa/patches/patch-installer_linux_gateway_cfg
View File

@ -1,37 +0,0 @@
$OpenBSD: patch-installer_linux_gateway_cfg,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/linux/gateway.cfg.orig Wed Dec 24 15:50:33 2008
+++ installer/linux/gateway.cfg Sun Jan 11 14:46:02 2009
@@ -6,16 +6,16 @@ server_bind = 0.0.0.0
server_socket = http://localhost:236/zarafa
# drop privileges and run the process as this user
-run_as_user =
+run_as_user = _zarafa
# drop privileges and run the process as this group
-run_as_group =
+run_as_group = _zarafa
-# create a pid file for stopping the service via the init.d scripts
+# write the process ID number to this file
pid_file = /var/run/zarafa-gateway.pid
# run server in this path (when not using the -F switch)
-running_path = /
+running_path = /var/empty
# enable/disable POP3, and POP3 listen port
pop3_enable = yes
@@ -43,10 +43,10 @@ imap_public_folders = yes
imap_capability_idle = yes
# File with RSA key for SSL
-ssl_private_key_file = /etc/zarafa/gateway/privkey.pem
+ssl_private_key_file = ${SYSCONFDIR}/zarafa/gateway/privkey.pem
#File with certificate for SSL
-ssl_certificate_file = /etc/zarafa/gateway/cert.pem
+ssl_certificate_file = ${SYSCONFDIR}/zarafa/gateway/cert.pem
# Verify client certificate
ssl_verify_client = no

37
mail/zarafa/libical/zarafa/patches/patch-installer_linux_ical_cfg
View File

@ -1,37 +0,0 @@
$OpenBSD: patch-installer_linux_ical_cfg,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/linux/ical.cfg.orig Wed Dec 24 15:50:33 2008
+++ installer/linux/ical.cfg Sun Jan 11 14:45:36 2009
@@ -2,16 +2,16 @@
# ICAL SETTINGS
# drop privileges and run the process as this user
-run_as_user =
+run_as_user = _zarafa
# drop privileges and run the process as this group
-run_as_group =
+run_as_group = _zarafa
-# create a pid file for stopping the service via the init.d scripts
+# write the process ID number to this file
pid_file = /var/run/zarafa-ical.pid
# run server in this path (when not using the -F switch)
-running_path = /
+running_path = /var/empty
# IP Address to bind to (0.0.0.0 for ANY)
server_bind = 0.0.0.0
@@ -50,10 +50,10 @@ log_timestamp = 1
# ICAL SSL SETTINGS FOR INCOMING CONNECTIONS
# File with RSA key for SSL
-ssl_private_key_file = /etc/zarafa/ical/privkey.pem
+ssl_private_key_file = ${SYSCONFDIR}/zarafa/ical/privkey.pem
# File with certificate for SSL
-ssl_certificate_file = /etc/zarafa/ical/cert.pem
+ssl_certificate_file = ${SYSCONFDIR}/zarafa/ical/cert.pem
# Verify client certificate
ssl_verify_client = no

21
mail/zarafa/libical/zarafa/patches/patch-installer_linux_licensed_cfg
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-installer_linux_licensed_cfg,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/linux/licensed.cfg.orig Wed Dec 24 15:50:33 2008
+++ installer/linux/licensed.cfg Sun Jan 11 14:46:16 2009
@@ -10,7 +10,7 @@ server_pipe_name = /var/run/zarafa-licensed
server_socket = file:///var/run/zarafa
# License path (should contain 'base' and CALs in other files)
-license_path = /etc/zarafa/license
+license_path = ${SYSCONFDIR}/zarafa/license
# drop privileges and run the process as this user
run_as_user =
@@ -18,7 +18,7 @@ run_as_user =
# drop privileges and run the process as this group
run_as_group =
-# create a pid file for stopping the service via the init.d scripts
+# write the process ID number to this file
pid_file = /var/run/zarafa-licensed.pid
# run server in this path (when not using the -F switch)

52
mail/zarafa/libical/zarafa/patches/patch-installer_linux_monitor_cfg
View File

@ -1,52 +0,0 @@
$OpenBSD: patch-installer_linux_monitor_cfg,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/linux/monitor.cfg.orig Wed Dec 24 15:50:33 2008
+++ installer/linux/monitor.cfg Sun Jan 11 14:45:49 2009
@@ -5,16 +5,16 @@
server_socket = file:///var/run/zarafa
# drop privileges and run the process as this user
-run_as_user =
+run_as_user = _zarafa
# drop privileges and run the process as this group
-run_as_group =
+run_as_group = _zarafa
-# create a pid file for stopping the service via the init.d scripts
+# write the process ID number to this file
pid_file = /var/run/zarafa-monitor.pid
# run server in this path (when not using the -F switch)
-running_path = /
+running_path = /var/empty
##############################################################
# ZARAFA MONITOR LOG SETTINGS
@@ -38,7 +38,7 @@ log_timestamp = 1
# to use this type of login method
# Login to the Zarafa server using this SSL Key
-sslkey_file = /etc/zarafa/ssl/monitor.pem
+sslkey_file = ${SYSCONFDIR}/zarafa/ssl/monitor.pem
# The password of the SSL Key
sslkey_pass = replace-with-monitor-cert-password
@@ -51,12 +51,12 @@ mailquota_resend_interval = 1
# Templates to be used for quota emails which are send to the user
# when the various user quota levels have been exceeded.
-userquota_warning_template = /etc/zarafa/quotamail/userwarning.mail
-userquota_soft_template = /etc/zarafa/quotamail/usersoft.mail
-userquota_hard_template = /etc/zarafa/quotamail/userhard.mail
+userquota_warning_template = ${SYSCONFDIR}/zarafa/quotamail/userwarning.mail
+userquota_soft_template = ${SYSCONFDIR}/zarafa/quotamail/usersoft.mail
+userquota_hard_template = ${SYSCONFDIR}/zarafa/quotamail/userhard.mail
# Templates to be used for quota emails which are send to the company administrators
# when the various company quota levels have been exceeded.
-companyquota_warning_template = /etc/zarafa/quotamail/companywarning.mail
-companyquota_soft_template = /etc/zarafa/quotamail/companysoft.mail
-companyquota_hard_template = /etc/zarafa/quotamail/companyhard.mail
+companyquota_warning_template = ${SYSCONFDIR}/zarafa/quotamail/companywarning.mail
+companyquota_soft_template = ${SYSCONFDIR}/zarafa/quotamail/companysoft.mail
+companyquota_hard_template = ${SYSCONFDIR}/zarafa/quotamail/companyhard.mail

97
mail/zarafa/libical/zarafa/patches/patch-installer_linux_server_cfg
View File

@ -1,97 +0,0 @@
$OpenBSD: patch-installer_linux_server_cfg,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/linux/server.cfg.orig Wed Dec 24 15:50:33 2008
+++ installer/linux/server.cfg Sun Jan 11 14:46:32 2009
@@ -33,16 +33,16 @@ local_admin_users = root
system_email_address = postmaster@localhost
# drop privileges and run the process as this user
-run_as_user =
+run_as_user = _zarafa
# drop privileges and run the process as this group
-run_as_group =
+run_as_group = _zarafa
-# create a pid file for stopping the service via the init.d scripts
+# write the process ID number to this file
pid_file = /var/run/zarafa-server.pid
# run server in this path (when not using the -F switch)
-running_path = /
+running_path = /var/empty
# session timeout for clients. Values lower than 300 will be upped to 300
# automatically. If the server hears nothing from a client in session_timeout
@@ -50,7 +50,7 @@ running_path = /
session_timeout = 300
# Socket to connect to for license server
-license_socket = /var/run/zarafa-licensed
+#license_socket = /var/run/zarafa-licensed
##############################################################
# LOG SETTINGS
@@ -89,7 +89,7 @@ mysql_database = zarafa
attachment_storage = database
# When attachment_storage is 'files', use this path to store the files
-attachment_path = /var/lib/zarafa
+attachment_path = /var/db/zarafa
##############################################################
# SSL SETTINGS
@@ -101,19 +101,19 @@ server_ssl_enabled = no
server_ssl_port = 237
# Required Server certificate, contains the certificate and the private key parts
-server_ssl_key_file = /etc/zarafa/ssl/server.pem
+server_ssl_key_file = ${SYSCONFDIR}/zarafa/ssl/server.pem
# Password of Server certificate
server_ssl_key_pass = replace-with-server-cert-password
# Required Certificate Authority of server
-server_ssl_ca_file = /etc/zarafa/ssl/cacert.pem
+server_ssl_ca_file = ${SYSCONFDIR}/zarafa/ssl/cacert.pem
# Path with CA certificates, e.g. /etc/ssl/certs
-server_ssl_ca_path =
+server_ssl_ca_path = /etc/ssl/cert.pem
# Path of SSL Public keys of clients
-sslkeys_path = /etc/zarafa/sslkeys
+sslkeys_path = ${SYSCONFDIR}/zarafa/sslkeys
##############################################################
@@ -178,21 +178,21 @@ companyquota_warn = 0
# Values: ldap, unix, db
user_plugin = db
-# configuration file of the user plugin, examples can be found in /usr/share/zarafa/example-config
-user_plugin_config = /etc/zarafa/ldap.cfg
+# configuration file of the user plugin, examples can be found in ${PREFIX}/share/examples/zarafa
+user_plugin_config = ${SYSCONFDIR}/zarafa/ldap.cfg
# location of the zarafa plugins
# if you have a 64bit distribution, this probably should be changed to /usr/lib64/zarafa
-plugin_path = /usr/lib/zarafa
+plugin_path = ${PREFIX}/lib/zarafa
# scripts which create stores for users from an external source
# used for ldap and unix plugins only
-createuser_script = /etc/zarafa/userscripts/createuser
-deleteuser_script = /etc/zarafa/userscripts/deleteuser
-creategroup_script = /etc/zarafa/userscripts/creategroup
-deletegroup_script = /etc/zarafa/userscripts/deletegroup
-createcompany_script = /etc/zarafa/userscripts/createcompany
-deletecompany_script = /etc/zarafa/userscripts/deletecompany
+createuser_script = ${SYSCONFDIR}/zarafa/userscripts/createuser
+deleteuser_script = ${SYSCONFDIR}/zarafa/userscripts/deleteuser
+creategroup_script = ${SYSCONFDIR}/zarafa/userscripts/creategroup
+deletegroup_script = ${SYSCONFDIR}/zarafa/userscripts/deletegroup
+createcompany_script = ${SYSCONFDIR}/zarafa/userscripts/createcompany
+deletecompany_script = ${SYSCONFDIR}/zarafa/userscripts/deletecompany
##############################################################
# MISC SETTINGS

33
mail/zarafa/libical/zarafa/patches/patch-installer_linux_spooler_cfg
View File

@ -1,33 +0,0 @@
$OpenBSD: patch-installer_linux_spooler_cfg,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/linux/spooler.cfg.orig Wed Dec 24 15:50:33 2008
+++ installer/linux/spooler.cfg Sun Jan 11 14:45:21 2009
@@ -8,16 +8,16 @@ smtp_server = localhost
server_socket = file:///var/run/zarafa
# drop privileges and run the process as this user
-run_as_user =
+run_as_user = _zarafa
# drop privileges and run the process as this group
-run_as_group =
+run_as_group = _zarafa
-# create a pid file for stopping the service via the init.d scripts
+# write the process ID number to this file
pid_file = /var/run/zarafa-spooler.pid
# run server in this path (when not using the -F switch)
-running_path = /
+running_path = /var/empty
##############################################################
# SPOOLER LOG SETTINGS
@@ -42,7 +42,7 @@ log_timestamp = 1
# to use this type of login method
# Login to the Zarafa server using this SSL Key
-sslkey_file = /etc/zarafa/ssl/spooler.pem
+sslkey_file = ${SYSCONFDIR}/zarafa/ssl/spooler.pem
# The password of the SSL Key
sslkey_pass = replace-with-server-cert-password

9
mail/zarafa/libical/zarafa/patches/patch-installer_linux_unix_cfg
View File

@ -1,9 +0,0 @@
$OpenBSD: patch-installer_linux_unix_cfg,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/linux/unix.cfg.orig Sun Oct 19 19:46:32 2008
+++ installer/linux/unix.cfg Sun Oct 19 19:49:30 2008
@@ -31,4 +31,4 @@ min_group_gid = 1000
max_group_gid = 10000
# Create a user as non-active when it has this unix shell
-non_login_shell = /bin/false
+non_login_shell = /sbin/nologin

18
mail/zarafa/libical/zarafa/patches/patch-installer_userscripts_companies_common_sh
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-installer_userscripts_companies_common_sh,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/userscripts/companies_common.sh.orig Wed Dec 24 15:50:33 2008
+++ installer/userscripts/companies_common.sh Sun Jan 4 15:27:38 2009
@@ -1,7 +1,7 @@
#! /bin/sh
ZARAFA_LANG="--lang ${LC_MESSAGES:-en_EN}"
-PATH=/bin:/usr/local/bin:/usr/bin
+PATH=$PATH:${PREFIX}/bin
if [ -z "${ZARAFA_COMPANY_SCRIPTS}" ] ; then
exec >&2
@@ -21,4 +21,4 @@ if [ -z "${ZARAFA_COMPANY}" -a -z "${ZARAFA_COMPANYID}
exit 1
fi
-find ${ZARAFA_COMPANY_SCRIPTS} -maxdepth 1 -type f -perm -u=x -not -name \*~ -not -name \#\* -exec {} \;
+find ${ZARAFA_COMPANY_SCRIPTS} -maxdepth 1 -type f -perm -u=x -and ! -name \*~ -and ! -name \#\* -exec {} \;

11
mail/zarafa/libical/zarafa/patches/patch-installer_userscripts_createcompany_d_00createpublic
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-installer_userscripts_createcompany_d_00createpublic,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/userscripts/createcompany.d/00createpublic.orig Sun Jan 4 15:21:37 2009
+++ installer/userscripts/createcompany.d/00createpublic Sun Jan 4 15:26:28 2009
@@ -2,6 +2,6 @@
# Create a Zarafa Public store for the new company.
-PATH=$PATH:/sbin:/usr/local/sbin:/usr/sbin
+PATH=$PATH:${PREFIX}/bin
zarafa-admin -s -I "${ZARAFA_COMPANY}"

11
mail/zarafa/libical/zarafa/patches/patch-installer_userscripts_createuser_d_00createstore
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-installer_userscripts_createuser_d_00createstore,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/userscripts/createuser.d/00createstore.orig Sun Jan 4 15:21:30 2009
+++ installer/userscripts/createuser.d/00createstore Sun Jan 4 15:27:05 2009
@@ -3,6 +3,6 @@
# Create a Zarafa user for an already existing external user. Create
# and initialize the user's stores.
-PATH=$PATH:/sbin:/usr/local/sbin:/usr/sbin
+PATH=$PATH:${PREFIX}/bin
zarafa-admin --create-store "${ZARAFA_USER}" --lang "${ZARAFA_LANG}"

11
mail/zarafa/libical/zarafa/patches/patch-installer_userscripts_deleteuser_d_99deletestore
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-installer_userscripts_deleteuser_d_99deletestore,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/userscripts/deleteuser.d/99deletestore.orig Sun Jan 4 15:21:22 2009
+++ installer/userscripts/deleteuser.d/99deletestore Sun Jan 4 15:27:24 2009
@@ -5,6 +5,6 @@
# that because the user is deleted, we don't know its username
# anymore (as that is stored externally)
-PATH=$PATH:/sbin:/usr/local/sbin:/usr/sbin
+PATH=$PATH:${PREFIX}/bin
zarafa-admin --delete-store "${ZARAFA_STOREID}"

18
mail/zarafa/libical/zarafa/patches/patch-installer_userscripts_groups_common_sh
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-installer_userscripts_groups_common_sh,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/userscripts/groups_common.sh.orig Wed Dec 24 15:50:33 2008
+++ installer/userscripts/groups_common.sh Sun Jan 4 15:26:38 2009
@@ -1,7 +1,7 @@
#! /bin/sh
ZARAFA_LANG="--lang ${LC_MESSAGES:-en_EN}"
-PATH=/bin:/usr/local/bin:/usr/bin
+PATH=$PATH:${PREFIX}/bin
if [ -z "${ZARAFA_GROUP_SCRIPTS}" ] ; then
exec >&2
@@ -21,4 +21,4 @@ if [ -z "${ZARAFA_GROUP}" -a -z "${ZARAFA_GROUPID}" ]
exit 1
fi
-find ${ZARAFA_GROUP_SCRIPTS} -maxdepth 1 -type f -perm -u=x -not -name \*~ -not -name \#\* -exec {} \;
+find ${ZARAFA_GROUP_SCRIPTS} -maxdepth 1 -type f -perm -u=x -and ! -name \*~ -and ! -name \#\* -exec {} \;

18
mail/zarafa/libical/zarafa/patches/patch-installer_userscripts_users_common_sh
View File

@ -1,18 +0,0 @@
$OpenBSD: patch-installer_userscripts_users_common_sh,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- installer/userscripts/users_common.sh.orig Wed Dec 24 15:50:33 2008
+++ installer/userscripts/users_common.sh Sun Jan 4 15:27:56 2009
@@ -1,7 +1,7 @@
#! /bin/sh
ZARAFA_LANG="${LC_MESSAGES:-en_EN}"
-PATH=/bin:/usr/local/bin:/usr/bin
+PATH=$PATH:${PREFIX}/bin
if [ -z "${ZARAFA_USER_SCRIPTS}" ] ; then
exec >&2
@@ -21,4 +21,4 @@ if [ -z "${ZARAFA_USER}" -a -z "${ZARAFA_STOREID}" ] ;
exit 1
fi
-find ${ZARAFA_USER_SCRIPTS} -maxdepth 1 -type f -perm -u=x -not -name \*~ -not -name \#\* -exec {} \;
+find ${ZARAFA_USER_SCRIPTS} -maxdepth 1 -type f -perm -u=x -and ! -name \*~ -and ! -name \#\* -exec {} \;

12
mail/zarafa/libical/zarafa/patches/patch-libfreebusy_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libfreebusy_Makefile_in,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- libfreebusy/Makefile.in.orig Thu Dec 11 22:18:08 2008
+++ libfreebusy/Makefile.in Tue Dec 30 13:32:03 2008
@@ -245,7 +245,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
-I${top_srcdir}/common
-libfreebusy_la_LDFLAGS = -static
+libfreebusy_la_LDFLAGS = -version-info $(ECCLIENT_LIBRARY_VERSION)
libfreebusy_la_SOURCES = ECEnumFBBlock.cpp ECEnumFBBlock.h \
ECFBBlockList.cpp ECFBBlockList.h \
ECFreeBusyData.cpp ECFreeBusyData.h \

62
mail/zarafa/libical/zarafa/patches/patch-libicalmapi_recurrence_cpp
View File

@ -1,62 +0,0 @@
$OpenBSD: patch-libicalmapi_recurrence_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- libicalmapi/recurrence.cpp.orig Wed Dec 24 20:17:56 2008
+++ libicalmapi/recurrence.cpp Sat Jan 10 15:45:22 2009
@@ -930,7 +930,7 @@ list<time_t> recurrence::getExceptions(){
bool recurrence::isOccurrence(time_t time){
calcEndDate();
- if(this->term != NEVER && time > (this->enddate + this->starttime*60))
+ if(this->term != NEVER && (unsigned int)time > (this->enddate + this->starttime*60))
return false;
if(isDeletedOccurrence(time))
@@ -954,7 +954,7 @@ bool recurrence::isRuleOccurrence(time_t time){
return false;
calcEndDate();
- if(this->term != NEVER && time > (this->enddate + this->starttime*60))
+ if(this->term != NEVER && (unsigned int)time > (this->enddate + this->starttime*60))
return false;
if(this->freq == DAILY){
@@ -1037,9 +1037,9 @@ bool recurrence::isAfter(time_t t){
}
switch(freq){
case YEARLY:
- if(lpT->tm_mon + 1 < this->month)
+ if((unsigned int)lpT->tm_mon + 1 < this->month)
return true;
- if(lpT->tm_mon + 1 > this->month)
+ if((unsigned int)lpT->tm_mon + 1 > this->month)
return false;
case MONTHLY:
if(this->nday == 5){
@@ -1057,9 +1057,9 @@ bool recurrence::isAfter(time_t t){
if(!(this->weekdays & (1 << lpT->tm_wday)))
return true;
}else if(this->nday>0){
- if(this->nday < lpT->tm_mday / 7)
+ if(this->nday < (unsigned int)lpT->tm_mday / 7)
return true;
- if(this->nday < lpT->tm_mday / 7)
+ if(this->nday < (unsigned int)lpT->tm_mday / 7)
return false;
char i = lpT->tm_wday - ((lpT->tm_mday - 1) % 7);
if(i < 0)
@@ -1072,13 +1072,13 @@ bool recurrence::isAfter(time_t t){
if(!(this->weekdays & (1 << lpT->tm_wday)))
return true;
}else{
- if(lpT->tm_mday < this->monthday)
+ if((unsigned int)lpT->tm_mday < this->monthday)
return true;
- if(lpT->tm_mday > this->monthday)
+ if((unsigned int)lpT->tm_mday > this->monthday)
return true;
}
}
- if(lpT->tm_hour * 60 + lpT->tm_min < this->starttime)
+ if((unsigned int)lpT->tm_hour * 60 + lpT->tm_min < this->starttime)
return true;
return false;
}

12
mail/zarafa/libical/zarafa/patches/patch-mapi4linux_src_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mapi4linux_src_Makefile_in,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- mapi4linux/src/Makefile.in.orig Tue Feb 3 16:49:12 2009
+++ mapi4linux/src/Makefile.in Tue Feb 3 16:49:26 2009
@@ -243,7 +243,7 @@ AM_LDFLAGS = $(DL_LIBS) -export-symbols ${top_srcdir}/
libmapi_la_LIBADD = ${top_builddir}/common/libcommon_util.la
# required because we're exporting extern "C" functions and want to filter with 'export-symbols'
-CXXLD = --tag=none gcc
+CXXLD = $(CC)
libmapi_la_SOURCES = common.cpp m4lguids.cpp mapidefs.cpp mapispi.cpp mapiutil.cpp mapix.cpp rtf.cpp imessage.cpp \
m4l.common.h m4l.mapidefs.h m4l.mapispi.h m4l.mapiutil.h m4l.mapix.h mapi4linux.h m4l.debug.h rtf.h mapi-exports.sym

12
mail/zarafa/libical/zarafa/patches/patch-mapi4linux_src_mapix_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-mapi4linux_src_mapix_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- mapi4linux/src/mapix.cpp.orig Wed Jan 28 20:51:38 2009
+++ mapi4linux/src/mapix.cpp Tue Feb 3 16:49:38 2009
@@ -1622,7 +1622,7 @@ HRESULT M4LAddrBook::ResolveName(ULONG ulUIParam, ULON
std::string strAddress;
int pos = strDisplay.find(':');
- if(pos != std::string::npos) {
+ if(pos != (int)std::string::npos) {
strType = strDisplay.substr(1, pos-1); // Everything up to ':'
strAddress = strDisplay.substr(pos+1, strDisplay.length() - pos -2); // Everything after ':'

21
mail/zarafa/libical/zarafa/patches/patch-mapi4linux_src_rtf_cpp
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-mapi4linux_src_rtf_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- mapi4linux/src/rtf.cpp.orig Wed Dec 24 20:17:56 2008
+++ mapi4linux/src/rtf.cpp Sat Jan 10 15:12:36 2009
@@ -238,7 +238,7 @@ void strmatch(const char *lpszBuffer, unsigned int cbB
const char *lpszMatch = NULL;
char cbMatch = 0;
- while (cbMatch < cbPattern && lpszBufCur + cbMatch < lpszBuffer + cbBuffer)
+ while ((unsigned int)cbMatch < cbPattern && lpszBufCur + cbMatch < lpszBuffer + cbBuffer)
{
lpszPatCur = lpszPattern;
ulCount = 0;
@@ -248,7 +248,7 @@ void strmatch(const char *lpszBuffer, unsigned int cbB
lpszBufCur == lpszBuffer + cbBuffer ||
((*lpszPatCur != *lpszBufCur || *lpszPatCur == '\n' || *lpszPatCur == '\r') && ulCount) > 0)
{
- if (ulCount > cbMatch)
+ if (ulCount > (unsigned int)cbMatch)
{
cbMatch = ulCount;
lpszMatch = lpszBufCur - ulCount;

12
mail/zarafa/libical/zarafa/patches/patch-perl_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-perl_Makefile_in,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- perl/Makefile.in.orig Tue Oct 14 15:59:43 2008
+++ perl/Makefile.in Tue Oct 14 16:00:15 2008
@@ -527,7 +527,7 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARI
.xs.cpp: typemap
- xsubpp -noprototypes -nolinenumbers -C++ -typemap /usr/share/perl/$(PVERSION)/ExtUtils/typemap $< > $@; \
+ xsubpp -noprototypes -nolinenumbers -C++ -typemap /usr/libdata/perl5/ExtUtils/typemap $< > $@; \
if [ $$? -ne 0 ]; then rm $@; 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.

28
mail/zarafa/libical/zarafa/patches/patch-php-ext_Makefile_in
View File

@ -1,28 +0,0 @@
$OpenBSD: patch-php-ext_Makefile_in,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- php-ext/Makefile.in.orig Wed Dec 24 20:00:13 2008
+++ php-ext/Makefile.in Thu Jan 8 12:03:08 2009
@@ -215,7 +215,7 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
-datadir = /usr/share/php/mapi
+datadir = /var/www/include/php/mapi
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
@@ -251,13 +251,13 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
$(PHP_INCLUDES) -I${top_srcdir}/common \
-I$(top_srcdir)/inetmapi
-mapi_la_LDFLAGS = -module $(PHP_LDFLAGS) \
+mapi_la_LDFLAGS = -module -avoid-version $(PHP_LDFLAGS) \
${top_builddir}/mapi4linux/src/libmapi.la \
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_util.la \
${top_builddir}/libfreebusy/libfreebusy.la \
${top_builddir}/inetmapi/libinetmapi.la \
- $(PROG_LIBS) -lpthread
+ $(PROG_LIBS) -pthread
dist_data_DATA = include/mapi/mapicode.php include/mapi/mapidefs.php include/mapi/mapitags.php include/mapi/mapi.util.php include/mapi/class.recurrence.php include/mapi/class.meetingrequest.php include/mapi/class.freebusypublish.php include/mapi/mapiguid.php

12
mail/zarafa/libical/zarafa/patches/patch-php-ext_main_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-php-ext_main_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- php-ext/main.cpp.orig Wed Dec 24 20:17:56 2008
+++ php-ext/main.cpp Sat Jan 10 14:58:23 2009
@@ -5607,7 +5607,7 @@ ZEND_FUNCTION(mapi_zarafa_check_license)
if(MAPI_G(hr) != hrSuccess)
goto exit;
- for(int i=0; i < ulCapas; i++) {
+ for(unsigned int i=0; i < ulCapas; i++) {
if(strcasecmp(lpszCapas[i], szFeature) == 0) {
RETVAL_TRUE;
break;

12
mail/zarafa/libical/zarafa/patches/patch-provider_client_ECNotifyMaster_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-provider_client_ECNotifyMaster_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- provider/client/ECNotifyMaster.cpp.orig Fri Jan 9 16:30:05 2009
+++ provider/client/ECNotifyMaster.cpp Fri Jan 9 16:30:25 2009
@@ -349,7 +349,7 @@ void* ECNotifyMaster::NotifyWatch(void *pTmpNotifyMast
notificationArray *pNotifyArray = NULL;
hr = pNotifyMaster->m_lpTransportNotify->HrGetNotify(&pNotifyArray);
- if (hr == ZARAFA_W_CALL_KEEPALIVE) {
+ if (hr == (int)ZARAFA_W_CALL_KEEPALIVE) {
if (bReconnect) {
TRACE_NOTIFY(TRACE_WARNING, "NotifyWatch::Reconnection", "OK connection: %d", pNotifyMaster->m_ulConnection);
bReconnect = false;

12
mail/zarafa/libical/zarafa/patches/patch-provider_client_Makefile_in
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-provider_client_Makefile_in,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- provider/client/Makefile.in.orig Wed Dec 24 20:00:14 2008
+++ provider/client/Makefile.in Wed Jan 7 16:25:42 2009
@@ -333,7 +333,7 @@ libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS)
${top_builddir}/mapi4linux/src/libmapi.la \
-lstdc++ $(UUID_LIBS)
-CXXLD = --tag=none gcc
+CXXLD = $(CXX)
libzarafaclient_la_SOURCES = ECABLogon.cpp ECABProvider.cpp \
ECAttach.cpp ECMAPIContainer.cpp ECMAPIFolder.cpp ECMAPIProp.cpp \
ECMAPITable.cpp ECMessage.cpp ECMsgStore.cpp \

12
mail/zarafa/libical/zarafa/patches/patch-provider_client_WSTransport_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-provider_client_WSTransport_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- provider/client/WSTransport.cpp.orig Fri Jan 9 14:31:54 2009
+++ provider/client/WSTransport.cpp Tue Jan 13 10:26:17 2009
@@ -3329,7 +3329,7 @@ HRESULT WSTransport::HrLicenseCapa(char ***lppszCapas,
if(hr != hrSuccess)
goto exit;
- for(int i=0; i < sResponse.sCapabilities.__size; i++) {
+ for(unsigned int i=0; i < sResponse.sCapabilities.__size; i++) {
MAPIAllocateMore(strlen(sResponse.sCapabilities.__ptr[i])+1, lpszCapas, (void **) &lpszCapas[i]);
strcpy(lpszCapas[i], sResponse.sCapabilities.__ptr[i]);
}

12
mail/zarafa/libical/zarafa/patches/patch-provider_libserver_ECAttachmentStorage_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-provider_libserver_ECAttachmentStorage_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- provider/libserver/ECAttachmentStorage.cpp.orig Fri Dec 26 12:42:44 2008
+++ provider/libserver/ECAttachmentStorage.cpp Fri Dec 26 12:42:55 2008
@@ -254,7 +254,7 @@ ECFileAttachment::ECFileAttachment(std::string basepat
{
m_basepath = basepath;
if (m_basepath.empty())
- m_basepath = "/var/lib/zarafa";
+ m_basepath = "/var/db/zarafa";
}
ECFileAttachment::~ECFileAttachment()

26
mail/zarafa/libical/zarafa/patches/patch-provider_libserver_ECSessionGroup_cpp
View File

@ -1,26 +0,0 @@
$OpenBSD: patch-provider_libserver_ECSessionGroup_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- provider/libserver/ECSessionGroup.cpp.orig Wed Dec 24 20:17:59 2008
+++ provider/libserver/ECSessionGroup.cpp Wed Jan 7 16:02:55 2009
@@ -38,6 +38,10 @@
#include <mapidefs.h>
#include <mapitags.h>
+#ifdef __OpenBSD__
+#include <pthread.h>
+#endif
+
#include "ECSession.h"
#include "ECSessionGroup.h"
#include "SOAPUtils.h"
@@ -46,6 +50,11 @@
#define new DEBUG_NEW
#undef THIS_FILE
static char THIS_FILE[] = __FILE__;
+#endif
+
+#ifdef __OpenBSD__
+#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
+#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP PTHREAD_MUTEX_INITIALIZER
#endif
/*

12
mail/zarafa/libical/zarafa/patches/patch-provider_libserver_ZarafaCmd_cpp
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- provider/libserver/ZarafaCmd.cpp.orig Fri Jan 9 16:29:11 2009
+++ provider/libserver/ZarafaCmd.cpp Fri Jan 9 16:29:40 2009
@@ -9080,7 +9080,7 @@ SOAP_ENTRY_START1(getLicenseCapa, lpsResponse->er, str
lpsResponse->sCapabilities.__size = lstCapabilities.size();
lpsResponse->sCapabilities.__ptr = s_alloc<char *>(soap, lstCapabilities.size());
- for(int i=0; i<lstCapabilities.size(); i++) {
+ for(unsigned int i=0; i<lstCapabilities.size(); i++) {
lpsResponse->sCapabilities.__ptr[i] = s_strcpy(soap, lstCapabilities[i].c_str());
}
exit:

17
mail/zarafa/libical/zarafa/patches/patch-provider_plugins_Makefile_in
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-provider_plugins_Makefile_in,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- provider/plugins/Makefile.in.orig Sun Jan 4 19:25:41 2009
+++ provider/plugins/Makefile.in Sun Jan 4 19:25:59 2009
@@ -280,11 +280,11 @@ pkglib_LTLIBRARIES = $(am__append_1) $(am__append_2) d
@WITH_UNIX_TRUE@unixplugin_la_LIBADD = ${top_builddir}/common/libcommon_util.la $(MYSQL_LIBS) $(CRYPT_LIBS)
@WITH_LDAP_TRUE@ldapplugin_la_CXXFLAGS = $(LDAP_FLAGS) -DLDAP_THREAD_SAFE
@WITH_LDAP_TRUE@ldapplugin_la_SOURCES = LDAPUserPlugin.cpp LDAPUserPlugin.h ldappasswords.cpp ldappasswords.h $(COMMON_PLUGIN_FILES)
-@WITH_LDAP_TRUE@ldapplugin_la_LDFLAGS = -module
+@WITH_LDAP_TRUE@ldapplugin_la_LDFLAGS = -module -avoid-version
@WITH_LDAP_TRUE@ldapplugin_la_LIBADD = ${top_builddir}/common/libcommon_util.la $(LDAP_LIBS)
dbplugin_la_CXXFLAGS = $(MYSQL_INCLUDES)
dbplugin_la_SOURCES = DBUserPlugin.cpp DBUserPlugin.h $(COMMON_PLUGIN_FILES) $(COMMON_DBPLUGIN_FILES)
-dbplugin_la_LDFLAGS = -module
+dbplugin_la_LDFLAGS = -module -avoid-version
dbplugin_la_LIBADD = ${top_builddir}/common/libcommon_util.la $(MYSQL_LIBS)
all: all-am

23
mail/zarafa/libical/zarafa/patches/patch-provider_server_ECServer_cpp
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- provider/server/ECServer.cpp.orig Thu Dec 11 22:35:42 2008
+++ provider/server/ECServer.cpp Tue Dec 30 12:13:38 2008
@@ -66,6 +66,10 @@
#include "ECSoapServerConnection.h"
#include <libintl.h>
+#ifdef __OpenBSD__
+#include <sys/resource.h>
+#endif
+
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
@@ -447,7 +451,7 @@ int running_server(char *szName, char *szConfig)
{ "mysql_config_file", "/etc/zarafa/my.cnf" },
#endif
{ "attachment_storage", "database" },
- { "attachment_path", "/var/lib/zarafa" },
+ { "attachment_path", "/var/db/zarafa" },
// Log options
{ "log_method", "file" },

14
mail/zarafa/libical/zarafa/patches/patch-provider_server_ECSoapServerConnection_cpp
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-provider_server_ECSoapServerConnection_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- provider/server/ECSoapServerConnection.cpp.orig Thu Oct 9 18:39:02 2008
+++ provider/server/ECSoapServerConnection.cpp Thu Oct 9 18:13:03 2008
@@ -41,6 +41,10 @@
#include <sys/un.h>
#endif
+#ifdef __OpenBSD__
+#include <sys/stat.h>
+#endif
+
#include "ECSoapServerConnection.h"
#include "ECServerEntrypoint.h"
#include "ECStatsCollector.h"

15
mail/zarafa/libical/zarafa/patches/patch-provider_server_Makefile_in
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-provider_server_Makefile_in,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- provider/server/Makefile.in.orig Sun Oct 19 16:14:50 2008
+++ provider/server/Makefile.in Sun Oct 19 16:17:25 2008
@@ -261,9 +261,10 @@ 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 \
- ${top_builddir}/common/libcommon_util.la \
+ ${top_builddir}/mapi4linux/src/libmapi.la \
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_ssl.la \
+ ${top_builddir}/common/libcommon_util.la \
$(MYSQL_LIBS) $(SSL_LIBS)
zarafa_server_SOURCES = ECServer.cpp \

50
mail/zarafa/libical/zarafa/patches/patch-provider_soap_stdsoap2_h
View File

@ -1,50 +0,0 @@
$OpenBSD: patch-provider_soap_stdsoap2_h,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- provider/soap/stdsoap2.h.orig Wed Dec 24 20:17:55 2008
+++ provider/soap/stdsoap2.h Thu Jan 8 17:47:24 2009
@@ -49,9 +49,15 @@ A commercial use license is available from Genivia, In
--------------------------------------------------------------------------------
*/
+#if OPENBSD
+#include <sys/types.h>
+#undef FD_SETSIZE
+#define FD_SETSIZE 1024
+#else
#include <bits/types.h>
#undef __FD_SETSIZE
#define __FD_SETSIZE 8192
+#endif
#ifdef WITH_SOAPDEFS_H
# include "soapdefs.h" /* include user-defined stuff */
@@ -372,6 +378,21 @@ A commercial use license is available from Genivia, In
# define HAVE_LOCALTIME_R
# define HAVE_WCTOMB
# define HAVE_MBTOWC
+#elif defined(OPENBSD) || defined(__OpenBSD__)
+# define HAVE_STRRCHR
+# define HAVE_STRTOD
+# define HAVE_SSCANF
+# define HAVE_STRTOL
+# define HAVE_STRTOUL
+# define HAVE_GETTIMEOFDAY
+# define HAVE_SYS_TIMEB_H
+# define HAVE_FTIME
+# define HAVE_RAND_R
+# define HAVE_GMTIME_R
+# define HAVE_LOCALTIME_R
+# define HAVE_WCTOMB
+# define HAVE_MBTOWC
+# define HAVE_ISNAN
# else
/* Default asumptions on supported functions */
# define HAVE_STRRCHR
@@ -543,7 +564,7 @@ extern "C" {
# define SOAP_SOCKLEN_T socklen_t
#elif defined(SOCKLEN_T)
# define SOAP_SOCKLEN_T SOCKLEN_T
-#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX)
+#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(OPENBSD) || defined(__OpenBSD__)
# define SOAP_SOCKLEN_T socklen_t
#elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS)
# define SOAP_SOCKLEN_T int

14
mail/zarafa/libical/zarafa/patches/patch-spooler_DAgent_cpp
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-spooler_DAgent_cpp,v 1.1.1.1 2009/02/16 09:35:46 ajacoutot Exp $
--- spooler/DAgent.cpp.orig Thu Dec 11 22:35:41 2008
+++ spooler/DAgent.cpp Tue Dec 30 12:13:38 2008
@@ -61,6 +61,10 @@
#include <sys/mman.h>
#include <pwd.h>
+#ifdef __OpenBSD__
+#include <sys/resource.h>
+#endif
+
/*
This is actually from sysexits.h
but since those windows lamers don't have it ..

9
mail/zarafa/libical/zarafa/pkg/DESCR-main
View File

@ -1,9 +0,0 @@
Zarafa is a full-featured e-mail and groupware solution, focused
towards clients using the MAPI standard. As an MS Exchange replacement,
the Zarafa suite provides the following features:
* Integration with existing Unix mailserver
* Native mobile phone support
* MS Outlook "Look & Feel" webaccess
* Stable MS Outlook sharing (100% MAPI)
This package provides the Open Source version of Zarafa.

10
mail/zarafa/libical/zarafa/pkg/DESCR-php
View File

@ -1,10 +0,0 @@
Messaging Application Programming Interface (MAPI) is a messaging
architecture and a Component Object Model based API for Microsoft
Windows. MAPI allows client programs to become (e-mail)
messaging-enabled, -aware, or -based by calling MAPI subsystem routines
that interface with certain messaging servers. While MAPI is designed to
be independent of the protocol, it is usually used with MAPI/RPC, the
proprietary protocol that Microsoft Outlook uses to communicate with
Microsoft Exchange.
These functions allow you to access a MAPI compliant email server.

2
mail/zarafa/libical/zarafa/pkg/MESSAGE-main
View File

@ -1,2 +0,0 @@
To complete the installation or update, make sure you read
${PREFIX}/share/doc/zarafa/README.OpenBSD

Some files were not shown because too many files have changed in this diff Show More