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

update to 7.1.10

Browse Source
This commit is contained in:
robert 2014-07-03 06:14:40 +00:00
parent ff14f8a1fe
commit a4d6bbdc7a
27 changed files with 124 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mail/zarafa/Makefile.inc
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile.inc,v 1.30 2014/04/07 13:46:06 robert Exp $
# $OpenBSD: Makefile.inc,v 1.31 2014/07/03 06:14:40 robert Exp $
SHARED_ONLY= Yes
V?= 7.1.9
BUILD?= 44333
V?= 7.1.10
BUILD?= 44973
DISTNAME?= zcp-${V}
CATEGORIES+= mail

5
mail/zarafa/zarafa/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.165 2014/05/30 13:20:13 sthen Exp $
# $OpenBSD: Makefile,v 1.166 2014/07/03 06:14:40 robert Exp $
COMMENT-main= MS Exchange groupware suite replacement
COMMENT-web= zarafa webaccess frontend and MAPI extensions for PHP
@ -7,9 +7,6 @@ PKGNAME= zarafa-${V}
PKGNAME-main= zarafa-${V}
PKGNAME-web= zarafa-webaccess-${V}
REVISION-main= 1
REVISION-web= 1
CATEGORIES= mail www productivity
SHARED_LIBS += common_util 2.0 # .0.0

4
mail/zarafa/zarafa/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (zarafa/zcp-7.1.9.tar.gz) = HvYgDVwtRrLUQcMZOtyrGxl0khXj3A0OiG5DFp4o2JU=
SIZE (zarafa/zcp-7.1.9.tar.gz) = 7017599
SHA256 (zarafa/zcp-7.1.10.tar.gz) = cBvEcpp1XDMUk8QTG0JfNN4PGOt+AvZ12UdNnWLZxzk=
SIZE (zarafa/zcp-7.1.10.tar.gz) = 7024296

63
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-search_ECAnalyzers_cpp
View File

@ -1,63 +0,0 @@
$OpenBSD: patch-ECtools_zarafa-search_ECAnalyzers_cpp,v 1.2 2014/04/07 13:46:06 robert Exp $
Fix buil with clucene-core >= 2.x
--- ECtools/zarafa-search/ECAnalyzers.cpp.orig Mon Mar 31 13:45:37 2014
+++ ECtools/zarafa-search/ECAnalyzers.cpp Sun Apr 6 19:53:26 2014
@@ -79,24 +79,24 @@ EmailFilter::~EmailFilter() {
* @param token Output token
* @return false if no more token was available
*/
-bool EmailFilter::next(lucene::analysis::Token *token) {
+lucene::analysis::Token *EmailFilter::next(lucene::analysis::Token *token) {
// See if we had any stored tokens
if(part < parts.size()) {
token->set(parts[part].c_str(), 0, 0, _T("<EMAIL>"));
token->setPositionIncrement(0);
part++;
- return true;
+ return token;
} else {
// No more stored token, get a new one
if(!input->next(token))
- return false;
+ return NULL;
// Split EMAIL tokens into the various parts
if(wcscmp(token->type(), L"<EMAIL>") == 0) {
// Split into user, domain, com
- parts = tokenize((std::wstring)token->_termText, (std::wstring)L".@");
+ parts = tokenize((std::wstring)token->termBuffer(), (std::wstring)L".@");
// Split into user, domain.com
- std::vector<std::wstring> moreparts = tokenize((std::wstring)token->_termText, (std::wstring)L"@");
+ std::vector<std::wstring> moreparts = tokenize((std::wstring)token->termBuffer(), (std::wstring)L"@");
parts.insert(parts.end(), moreparts.begin(), moreparts.end());
// Only add parts once (unique parts)
@@ -111,7 +111,7 @@ bool EmailFilter::next(lucene::analysis::Token *token)
std::vector<std::wstring> hostparts;
// Convert into some-strange.domain.com domain.com com
- hostparts = tokenize((std::wstring)token->_termText, (std::wstring)L".");
+ hostparts = tokenize((std::wstring)token->termBuffer(), (std::wstring)L".");
parts.clear();
while(hostparts.size() > 1 && hostparts.size() < 10) { // 10 as a defensive measure against the following blowing up
@@ -122,7 +122,7 @@ bool EmailFilter::next(lucene::analysis::Token *token)
part = 0;
}
- return true;
+ return token;
}
}
@@ -141,7 +141,7 @@ ECAnalyzer::~ECAnalyzer()
* @param reader Reader to read the bytestream to tokenize
* @return A TokenStream outputting the tokens to be indexed
*/
-lucene::analysis::TokenStream* ECAnalyzer::tokenStream(const TCHAR* fieldName, lucene::util::Reader* reader)
+lucene::analysis::TokenStream *ECAnalyzer::tokenStream(const TCHAR *fieldName, CL_NS(util)::BufferedReader *reader)
{
lucene::analysis::TokenStream* ret = _CLNEW lucene::analysis::standard::StandardTokenizer(reader);
ret = _CLNEW lucene::analysis::standard::StandardFilter(ret,true);

32
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-search_ECAnalyzers_h
View File

@ -1,32 +0,0 @@
$OpenBSD: patch-ECtools_zarafa-search_ECAnalyzers_h,v 1.1 2012/08/30 18:42:26 ajacoutot Exp $
Fix buil with clucene-core >= 2.x
--- ECtools/zarafa-search/ECAnalyzers.h.orig Wed Aug 8 17:14:58 2012
+++ ECtools/zarafa-search/ECAnalyzers.h Thu Aug 30 16:38:06 2012
@@ -50,7 +50,6 @@
#ifndef ANALYZERS_H
#include "CLucene/StdHeader.h"
-#include "CLucene/util/Reader.h"
#include "CLucene/analysis/standard/StandardAnalyzer.h"
#include "CLucene/analysis/AnalysisHeader.h"
@@ -68,7 +67,7 @@ class EmailFilter: public lucene::analysis::TokenFilte
public:
EmailFilter(lucene::analysis::TokenStream* in, bool deleteTokenStream);
virtual ~EmailFilter();
- bool next(lucene::analysis::Token* token);
+ lucene::analysis::Token *next(lucene::analysis::Token *token);
private:
lucene::analysis::Token curtoken;
@@ -86,7 +85,7 @@ class ECAnalyzer : public lucene::analysis::standard::
ECAnalyzer();
virtual ~ECAnalyzer();
- virtual lucene::analysis::TokenStream* tokenStream(const TCHAR* fieldName, CL_NS(util)::Reader* reader);
+ virtual lucene::analysis::TokenStream *tokenStream(const TCHAR *fieldName, CL_NS(util)::BufferedReader *reader);
};
#endif

24
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-search_ECIndexDB_cpp
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-ECtools_zarafa-search_ECIndexDB_cpp,v 1.4 2014/04/07 13:46:06 robert Exp $
Fix buil with clucene-core >= 2.x
--- ECtools/zarafa-search/ECIndexDB.cpp.orig Thu Jan 30 13:41:34 2014
+++ ECtools/zarafa-search/ECIndexDB.cpp Mon Feb 3 11:25:37 2014
@@ -69,7 +69,7 @@
#include <string>
#include <algorithm>
-#include <CLucene/util/Reader.h>
+#include <CLucene/util/CLStreams.h>
using namespace kyotocabinet;
@@ -314,7 +314,7 @@ HRESULT ECIndexDB::AddTerm(folderid_t folder, docid_t
unsigned int len;
unsigned int keylen;
- lucene::util::StringReader reader(wstrTerm.c_str());
+ CL_NS(util)::StringReader reader(wstrTerm.c_str());
stream = m_lpAnalyzer->tokenStream(L"", &reader);

24
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-search_ECIndexImporterAttachments_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-ECtools_zarafa-search_ECIndexImporterAttachments_cpp,v 1.2 2012/08/30 18:42:26 ajacoutot Exp $
$OpenBSD: patch-ECtools_zarafa-search_ECIndexImporterAttachments_cpp,v 1.3 2014/07/03 06:14:40 robert Exp $
OpenBSD does not have RLIMIT_AS.
@ -7,8 +7,8 @@ ECIndexImporterAttachments.cpp:440:3: error: 'string' was not declared in this s
ECIndexImporterAttachments.cpp:443:4: error: 'set' was not declared in this scope
ECIndexImporterAttachments.cpp:602:46: error: 'min' was not declared in this scope
--- ECtools/zarafa-search/ECIndexImporterAttachments.cpp.orig Thu Aug 30 17:15:54 2012
+++ ECtools/zarafa-search/ECIndexImporterAttachments.cpp Thu Aug 30 17:16:04 2012
--- ECtools/zarafa-search/ECIndexImporterAttachments.cpp.orig Fri May 23 15:56:37 2014
+++ ECtools/zarafa-search/ECIndexImporterAttachments.cpp Wed Jul 2 17:28:25 2014
@@ -47,6 +47,10 @@
*
*/
@ -20,9 +20,9 @@ ECIndexImporterAttachments.cpp:602:46: error: 'min' was not declared in this sco
#include <platform.h>
#include <mapi.h>
@@ -76,6 +80,10 @@
@@ -78,6 +82,10 @@
#define STREAM_BUFFER ( 64*1024 )
using namespace std;
+#if defined(__OpenBSD__) && !defined(RLIMIT_AS)
+#define RLIMIT_AS RLIMIT_DATA
@ -31,7 +31,7 @@ ECIndexImporterAttachments.cpp:602:46: error: 'min' was not declared in this sco
ECIndexImporterAttachment::ECIndexImporterAttachment(ECThreadData *lpThreadData, ECIndexImporter *lpIndexer)
{
m_lpThreadData = lpThreadData;
@@ -246,7 +254,7 @@ HRESULT ECIndexImporterAttachment::CopyStreamToParser(
@@ -248,7 +256,7 @@ HRESULT ECIndexImporterAttachment::CopyStreamToParser(
ULONG ulWriteData;
fd_set rset, wset;
int res;
@ -40,7 +40,7 @@ ECIndexImporterAttachments.cpp:602:46: error: 'min' was not declared in this sco
struct timeval timeout;
@@ -267,7 +275,7 @@ HRESULT ECIndexImporterAttachment::CopyStreamToParser(
@@ -269,7 +277,7 @@ HRESULT ECIndexImporterAttachment::CopyStreamToParser(
FD_ZERO(&wset);
if (ulTotalWriteData) {
FD_SET(ulFpWrite, &wset);
@ -49,7 +49,7 @@ ECIndexImporterAttachments.cpp:602:46: error: 'min' was not declared in this sco
} else {
fd = ulFpRead;
}
@@ -437,10 +445,10 @@ HRESULT ECIndexImporterAttachment::ParseValueAttachmen
@@ -439,10 +447,10 @@ HRESULT ECIndexImporterAttachment::ParseValueAttachmen
command.assign(m_strCommand + " ");
if (!strMimeTag.empty() && strMimeTag.compare(_T("application/octet-stream")) != 0) {
@ -62,7 +62,7 @@ ECIndexImporterAttachments.cpp:602:46: error: 'min' was not declared in this sco
if (i != m_lpThreadData->m_setMimeFilter.end()) {
m_lpThreadData->lpLogger->Log(EC_LOGLEVEL_DEBUG, "Skipping filtered attachment mimetype: %s for %ls", tmp.c_str(), strFilename.c_str());
hr = MAPI_E_INVALID_OBJECT;
@@ -452,8 +460,8 @@ HRESULT ECIndexImporterAttachment::ParseValueAttachmen
@@ -454,8 +462,8 @@ HRESULT ECIndexImporterAttachment::ParseValueAttachmen
command.append("'");
} else if (!strExtension.empty()) {
// this string mostly does not exist
@ -73,7 +73,7 @@ ECIndexImporterAttachments.cpp:602:46: error: 'min' was not declared in this sco
if (i != m_lpThreadData->m_setExtFilter.end()) {
m_lpThreadData->lpLogger->Log(EC_LOGLEVEL_DEBUG, "Skipping filtered attachment extension: %s for %ls", tmp.c_str(), strFilename.c_str());
hr = MAPI_E_INVALID_OBJECT;
@@ -463,14 +471,14 @@ HRESULT ECIndexImporterAttachment::ParseValueAttachmen
@@ -465,14 +473,14 @@ HRESULT ECIndexImporterAttachment::ParseValueAttachmen
command.append(forcealnum(tmp, "."));
command.append("'");
} else if (!strFilename.empty()) {
@ -90,7 +90,7 @@ ECIndexImporterAttachments.cpp:602:46: error: 'min' was not declared in this sco
if (i != m_lpThreadData->m_setExtFilter.end()) {
m_lpThreadData->lpLogger->Log(EC_LOGLEVEL_DEBUG, "Skipping filtered attachment extension: %ls", strFilename.c_str());
hr = MAPI_E_INVALID_OBJECT;
@@ -478,7 +486,7 @@ HRESULT ECIndexImporterAttachment::ParseValueAttachmen
@@ -480,7 +488,7 @@ HRESULT ECIndexImporterAttachment::ParseValueAttachmen
}
command.append("ext '");
@ -99,7 +99,7 @@ ECIndexImporterAttachments.cpp:602:46: error: 'min' was not declared in this sco
command.append("'");
} else {
m_lpThreadData->lpLogger->Log(EC_LOGLEVEL_DEBUG, "Invalid attachment, no mimetag, extension or filename");
@@ -599,7 +607,7 @@ HRESULT ECIndexImporterAttachment::ParseAttachment(fol
@@ -601,7 +609,7 @@ HRESULT ECIndexImporterAttachment::ParseAttachment(fol
if (ulAttachSize) {
/* Copy attachment data into stream */
while (TRUE) {

23
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-search_ECIndexImporter_cpp
View File

@ -1,23 +0,0 @@
$OpenBSD: patch-ECtools_zarafa-search_ECIndexImporter_cpp,v 1.2 2013/01/27 13:06:20 robert Exp $
ECIndexImporter.cpp:400:5: error: 'auto_ptr' was not declared in this scope
--- ECtools/zarafa-search/ECIndexImporter.cpp.orig Wed Dec 5 16:06:37 2012
+++ ECtools/zarafa-search/ECIndexImporter.cpp Sun Jan 20 17:18:38 2013
@@ -47,6 +47,7 @@
*
*/
+#include <memory>
#include "platform.h"
#include "ECIndexImporter.h"
@@ -437,7 +438,7 @@ HRESULT ECIndexImporter::ProcessThread()
ECIndexDB *lpIndex = NULL;
ECIndexDB *lpThisIndex = NULL;
ArchiveItem *lpArchiveItem = NULL;
- auto_ptr<ArchiveItem> lpStubTarget;
+ std::auto_ptr<ArchiveItem> lpStubTarget;
m_lpLogger->Log(EC_LOGLEVEL_DEBUG, "Importer thread started");

14
mail/zarafa/zarafa/patches/patch-ECtools_zarafa-search_Makefile_in
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-ECtools_zarafa-search_Makefile_in,v 1.3 2014/04/07 13:46:06 robert Exp $
--- ECtools/zarafa-search/Makefile.in.orig Thu Jan 30 12:44:46 2014
+++ ECtools/zarafa-search/Makefile.in Mon Feb 3 11:25:37 2014
@@ -359,7 +359,10 @@ zarafa_search_SOURCES = \
dump_index_SOURCES = dump-index.cpp
dump_index_LDADD = \
+ ${top_builddir}/mapi4linux/src/libmapi.la \
+ ${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_util.la \
+ $(PROG_LIBS) \
$(KYOTOCABINET_LIBS)
all: all-am

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

@ -1,7 +1,7 @@
$OpenBSD: patch-common_Makefile_in,v 1.21 2014/04/07 13:46:06 robert Exp $
--- common/Makefile.in.orig Mon Feb 3 11:29:34 2014
+++ common/Makefile.in Mon Feb 3 11:31:14 2014
@@ -407,7 +407,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(BOOST_CPPFL
$OpenBSD: patch-common_Makefile_in,v 1.22 2014/07/03 06:14:40 robert Exp $
--- common/Makefile.in.orig Fri May 23 15:04:02 2014
+++ common/Makefile.in Wed Jul 2 17:28:25 2014
@@ -409,7 +409,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(BOOST_CPPFL
-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
-I${top_srcdir}/libfreebusy $(MYSQL_INCLUDES)
@ -10,7 +10,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.21 2014/04/07 13:46:06 robert Exp $
libcommon_mapi_la_SOURCES = CommonUtil.cpp \
rtfutil.cpp \
codepage.cpp \
@@ -431,8 +431,9 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \
@@ -433,8 +433,9 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp \
MAPIConsoleTable.cpp \
ECMAPIDebug.cpp \
MAPIErrors.cpp
@ -21,7 +21,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.21 2014/04/07 13:46:06 robert Exp $
libcommon_util_la_SOURCES = platform.cpp platform.linux.cpp md5.cpp \
base64.cpp ECLogger.cpp ECConfig.cpp ECConfigImpl.cpp \
ECFifoBuffer.cpp ECSerializer.cpp ECCache.cpp my_getopt.cpp \
@@ -443,14 +444,17 @@ libcommon_util_la_SOURCES = platform.cpp platform.linu
@@ -445,14 +446,17 @@ libcommon_util_la_SOURCES = platform.cpp platform.linu
ECGetText.cpp threadutil.cpp ECRestriction.cpp userutil.cpp \
ECFeatures.cpp ECACL.cpp fileutil.cpp ECThreadPool.cpp \
ConsoleTable.cpp $(am__append_1)

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.30 2014/04/07 13:46:06 robert Exp $
--- configure.orig Thu Jan 30 12:44:44 2014
+++ configure Mon Feb 3 11:25:37 2014
@@ -18850,68 +18850,6 @@ rm -f core conftest.err conftest.$ac_objext \
$OpenBSD: patch-configure,v 1.31 2014/07/03 06:14:40 robert Exp $
--- configure.orig Fri May 23 15:04:01 2014
+++ configure Wed Jul 2 17:28:25 2014
@@ -19062,68 +19062,6 @@ rm -f core conftest.err conftest.$ac_objext \
LIBS=$LIBS_system
@ -70,7 +70,7 @@ $OpenBSD: patch-configure,v 1.30 2014/04/07 13:46:06 robert Exp $
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
SSL_LIBS=
# TODO: version of ssl check??
@@ -18922,7 +18860,7 @@ if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then
@@ -19134,7 +19072,7 @@ if test "${ac_cv_lib_ssl_SSL_accept+set}" = set; then
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS

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

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_Makefile_in,v 1.20 2014/04/07 13:46:06 robert Exp $
--- doc/Makefile.in.orig Thu Jan 30 12:44:46 2014
+++ doc/Makefile.in Mon Feb 3 11:25:37 2014
@@ -611,7 +611,7 @@ $(BUILT_SOURCES): manual.xml
$OpenBSD: patch-doc_Makefile_in,v 1.21 2014/07/03 06:14:40 robert Exp $
--- doc/Makefile.in.orig Fri May 23 15:04:02 2014
+++ doc/Makefile.in Wed Jul 2 17:28:25 2014
@@ -619,7 +619,7 @@ $(BUILT_SOURCES): manual.xml
@if [ -z $(PROG_XMLTO) ]; then \
echo Please install xmlto to generate manual pages; \
else \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-doc_manual_xml,v 1.36 2014/04/07 13:46:06 robert Exp $
--- doc/manual.xml.orig Thu Jan 30 12:39:33 2014
+++ doc/manual.xml Mon Feb 3 11:25:37 2014
@@ -863,9 +863,7 @@
$OpenBSD: patch-doc_manual_xml,v 1.37 2014/07/03 06:14:40 robert Exp $
--- doc/manual.xml.orig Fri May 23 15:01:13 2014
+++ doc/manual.xml Wed Jul 2 17:28:25 2014
@@ -888,9 +888,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -12,7 +12,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.36 2014/04/07 13:46:06 robert Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-dagent.pid</replaceable>
@@ -1390,11 +1388,6 @@
@@ -1415,11 +1413,6 @@
<replaceable>/path/to/server.cfg</replaceable>
</para>
@ -24,7 +24,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.36 2014/04/07 13:46:06 robert Exp $
</refsection>
<refsection>
@@ -1503,6 +1496,9 @@
@@ -1528,6 +1521,9 @@
located in /usr/share/zarafa, called ssl-certificate.sh. Enter
the following commands to create a certificate for the Zarafa
server.
@ -34,7 +34,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.36 2014/04/07 13:46:06 robert Exp $
</para>
<para>
<command>
@@ -3688,9 +3684,7 @@
@@ -3713,9 +3709,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -45,7 +45,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.36 2014/04/07 13:46:06 robert Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-server.pid</replaceable>
@@ -6906,13 +6900,8 @@
@@ -6931,13 +6925,8 @@
</para>
<para>The spooler process will keep running and watching the
@ -61,7 +61,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.36 2014/04/07 13:46:06 robert Exp $
</refsection>
<refsection>
@@ -7093,9 +7082,7 @@
@@ -7118,9 +7107,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -72,7 +72,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.36 2014/04/07 13:46:06 robert Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-spooler.pid</replaceable>
@@ -7601,13 +7588,7 @@
@@ -7626,13 +7613,7 @@
<para><command>zarafa-gateway</command></para>
@ -87,7 +87,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.36 2014/04/07 13:46:06 robert Exp $
</refsection>
<refsection>
@@ -8286,14 +8267,8 @@
@@ -8322,14 +8303,8 @@
<para>The monitor checks user mailbox sizes. The monitor sends
a quota email when the warning quota limit is reached. When
@ -103,7 +103,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.36 2014/04/07 13:46:06 robert Exp $
</refsection>
<refsection>
@@ -8445,9 +8420,7 @@
@@ -8481,9 +8456,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -114,7 +114,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.36 2014/04/07 13:46:06 robert Exp $
</para>
<para>Default value: /var/run/zarafa-monitor.pid
</para>
@@ -9758,13 +9731,7 @@
@@ -9794,13 +9767,7 @@
<para><command>zarafa-ical</command></para>
@ -129,7 +129,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.36 2014/04/07 13:46:06 robert Exp $
</refsection>
<refsection>
@@ -9947,9 +9914,7 @@
@@ -9983,9 +9950,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -140,7 +140,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.36 2014/04/07 13:46:06 robert Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-ical.pid</replaceable>
@@ -10298,13 +10263,7 @@
@@ -10334,13 +10299,7 @@
<para><command>zarafa-licensed</command></para>
@ -155,7 +155,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.36 2014/04/07 13:46:06 robert Exp $
</refsection>
<refsection>
@@ -10474,9 +10433,7 @@
@@ -10510,9 +10469,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>
@ -166,7 +166,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.36 2014/04/07 13:46:06 robert Exp $
</para>
<para>Default:
<replaceable>/var/run/zarafa-licensed.pid</replaceable>
@@ -11287,13 +11244,6 @@
@@ -11323,13 +11280,6 @@
<option>-c</option>
<replaceable>/path/to/search.cfg</replaceable>
</para>
@ -180,7 +180,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.36 2014/04/07 13:46:06 robert Exp $
</refsection>
<refsection>
@@ -11424,9 +11374,7 @@
@@ -11460,9 +11410,7 @@
<varlistentry>
<term><option>pid_file</option></term>
<listitem>

9
mail/zarafa/zarafa/patches/patch-provider_soap_soapdefs_h → mail/zarafa/zarafa/patches/patch-external_gsoap_soapdefs_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_soap_soapdefs_h,v 1.7 2013/01/27 13:06:20 robert Exp $
--- provider/soap/soapdefs.h.orig Sun Jan 20 17:35:20 2013
+++ provider/soap/soapdefs.h Sun Jan 20 17:36:35 2013
@@ -6,13 +6,20 @@
$OpenBSD: patch-external_gsoap_soapdefs_h,v 1.1 2014/07/03 06:14:40 robert Exp $
--- external/gsoap/soapdefs.h.orig Wed Jul 2 17:30:56 2014
+++ external/gsoap/soapdefs.h Wed Jul 2 17:31:56 2014
@@ -6,14 +6,20 @@
* gSoap will not undef HAVE_STRTOD_L and HAVE_SPRINTF_L (if they
* were defined in the first place).
*/
@ -15,6 +15,7 @@ $OpenBSD: patch-provider_soap_soapdefs_h,v 1.7 2013/01/27 13:06:20 robert Exp $
-# include <bits/types.h>
-# undef __FD_SETSIZE
-# define __FD_SETSIZE 8192
-
+#ifdef __OpenBSD__
+#include <sys/types.h>
+#include <sys/select.h>

10
mail/zarafa/zarafa/patches/patch-provider_soap_stdsoap2_h → mail/zarafa/zarafa/patches/patch-external_gsoap_stdsoap2_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_soap_stdsoap2_h,v 1.5 2011/06/03 15:52:12 ajacoutot Exp $
--- provider/soap/stdsoap2.h.orig Wed Apr 20 19:51:43 2011
+++ provider/soap/stdsoap2.h Fri Jun 3 16:02:03 2011
@@ -426,6 +426,27 @@ A commercial use license is available from Genivia, In
$OpenBSD: patch-external_gsoap_stdsoap2_h,v 1.1 2014/07/03 06:14:40 robert Exp $
--- external/gsoap/stdsoap2.h.orig Fri May 23 15:56:35 2014
+++ external/gsoap/stdsoap2.h Wed Jul 2 17:32:23 2014
@@ -475,6 +475,27 @@ A commercial use license is available from Genivia, In
# define ULONG64 unsigned LONG64
# define SOAP_LONG_FORMAT "%ld"
# define SOAP_ULONG_FORMAT "%lu"
@ -29,7 +29,7 @@ $OpenBSD: patch-provider_soap_stdsoap2_h,v 1.5 2011/06/03 15:52:12 ajacoutot Exp
# else
/* Default asumptions on supported functions */
# define HAVE_STRRCHR
@@ -628,7 +649,7 @@ extern "C" {
@@ -677,7 +698,7 @@ extern "C" {
# endif
#elif defined(SOCKLEN_T)
# define SOAP_SOCKLEN_T SOCKLEN_T

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

@ -1,7 +1,7 @@
$OpenBSD: patch-inetmapi_Makefile_in,v 1.1 2014/04/07 13:46:06 robert Exp $
--- inetmapi/Makefile.in.orig Sun Apr 6 20:36:45 2014
+++ inetmapi/Makefile.in Sun Apr 6 20:37:10 2014
@@ -329,7 +329,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(BOOST_CPPFL
$OpenBSD: patch-inetmapi_Makefile_in,v 1.2 2014/07/03 06:14:40 robert Exp $
--- inetmapi/Makefile.in.orig Fri May 23 15:04:03 2014
+++ inetmapi/Makefile.in Wed Jul 2 17:28:25 2014
@@ -331,7 +331,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(BOOST_CPPFL
$(VMIME_CFLAGS) \
-I$(top_srcdir)/mapi4linux/include -I$(top_srcdir)/provider/common -I${top_srcdir}/common \
-I${top_srcdir}/libfreebusy -I${top_srcdir}/libicalmapi \

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

@ -1,6 +1,6 @@
$OpenBSD: patch-installer_linux_gateway_cfg,v 1.12 2014/04/07 13:46:06 robert Exp $
--- installer/linux/gateway.cfg.orig Thu Jan 30 12:43:17 2014
+++ installer/linux/gateway.cfg Mon Feb 3 11:25:37 2014
$OpenBSD: patch-installer_linux_gateway_cfg,v 1.13 2014/07/03 06:14:40 robert Exp $
--- installer/linux/gateway.cfg.orig Fri May 23 15:03:19 2014
+++ installer/linux/gateway.cfg Wed Jul 2 17:28:25 2014
@@ -14,16 +14,16 @@ server_hostname =
server_hostname_greeting = no
@ -22,8 +22,8 @@ $OpenBSD: patch-installer_linux_gateway_cfg,v 1.12 2014/04/07 13:46:06 robert Ex
# create memory coredumps upon crash in the running_path directory
coredump_enabled = no
@@ -69,10 +69,10 @@ imap_store_rfc822 = yes
imap_max_fail_commands = 10
@@ -72,10 +72,10 @@ imap_max_fail_commands = 10
disable_plaintext_auth = no
# File with RSA key for SSL
-ssl_private_key_file = /etc/zarafa/gateway/privkey.pem

14
mail/zarafa/zarafa/patches/patch-installer_linux_monitor_cfg
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-installer_linux_monitor_cfg,v 1.4 2012/10/28 21:51:08 robert Exp $
--- installer/linux/monitor.cfg.orig Sun Oct 28 21:12:53 2012
+++ installer/linux/monitor.cfg Sun Oct 28 21:13:59 2012
@@ -5,16 +5,16 @@
server_socket = file:///var/run/zarafa
$OpenBSD: patch-installer_linux_monitor_cfg,v 1.5 2014/07/03 06:14:40 robert Exp $
--- installer/linux/monitor.cfg.orig Fri May 23 15:03:19 2014
+++ installer/linux/monitor.cfg Wed Jul 2 17:28:25 2014
@@ -8,16 +8,16 @@ server_socket = file:///var/run/zarafa
servers =
# drop privileges and run the process as this user
-run_as_user =
@ -22,7 +22,7 @@ $OpenBSD: patch-installer_linux_monitor_cfg,v 1.4 2012/10/28 21:51:08 robert Exp
##############################################################
# ZARAFA MONITOR LOG SETTINGS
@@ -38,7 +38,7 @@ log_timestamp = 1
@@ -41,7 +41,7 @@ log_timestamp = 1
# to use this type of login method
# Login to the Zarafa server using this SSL Key
@ -31,7 +31,7 @@ $OpenBSD: patch-installer_linux_monitor_cfg,v 1.4 2012/10/28 21:51:08 robert Exp
# The password of the SSL Key
sslkey_pass = replace-with-monitor-cert-password
@@ -57,10 +57,10 @@ mailquota_resend_interval = 1
@@ -60,10 +60,10 @@ 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.

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

@ -1,7 +1,7 @@
$OpenBSD: patch-libfreebusy_Makefile_in,v 1.17 2014/04/07 13:46:06 robert Exp $
--- libfreebusy/Makefile.in.orig Thu Jan 30 12:44:47 2014
+++ libfreebusy/Makefile.in Mon Feb 3 11:25:37 2014
@@ -324,7 +324,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(BOOST_CPPFL
$OpenBSD: patch-libfreebusy_Makefile_in,v 1.18 2014/07/03 06:14:40 robert Exp $
--- libfreebusy/Makefile.in.orig Fri May 23 15:04:03 2014
+++ libfreebusy/Makefile.in Wed Jul 2 17:28:25 2014
@@ -326,7 +326,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(BOOST_CPPFL
-I${top_srcdir}/common
libfreebusy_la_includedir = $(includedir)/libfreebusy

8
mail/zarafa/zarafa/patches/patch-php-webclient-ajax_config_php_dist
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.8 2013/01/27 13:06:20 robert Exp $
--- php-webclient-ajax/config.php.dist.orig Wed Dec 5 15:22:58 2012
+++ php-webclient-ajax/config.php.dist Sun Jan 20 17:18:38 2013
$OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.9 2014/07/03 06:14:40 robert Exp $
--- php-webclient-ajax/config.php.dist.orig Fri May 23 15:00:09 2014
+++ php-webclient-ajax/config.php.dist Wed Jul 2 17:28:25 2014
@@ -17,9 +17,9 @@
define("CONFIG_CHECK_COOKIES_SSL", FALSE);
@ -29,7 +29,7 @@ $OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.8 2013/01/27 13:06:20 rob
// Define the relative URL for dialogs, this string is appended with HTTP GET arguments
define("DIALOG_URL", "index.php?load=dialog&");
@@ -158,7 +159,7 @@
@@ -163,7 +164,7 @@
// Spellchecker, change here to enable
define('FCKEDITOR_SPELLCHECKER_ENABLED', false);

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

@ -1,12 +1,12 @@
$OpenBSD: patch-provider_client_Makefile_in,v 1.20 2014/04/07 13:46:06 robert Exp $
--- provider/client/Makefile.in.orig Mon Mar 31 12:59:11 2014
+++ provider/client/Makefile.in Sun Apr 6 19:53:27 2014
@@ -381,7 +381,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(BOOST_CPPFL
-I${top_srcdir}/common \
-I${top_srcdir}/zarafa-libsync
$OpenBSD: patch-provider_client_Makefile_in,v 1.21 2014/07/03 06:14:40 robert Exp $
--- provider/client/Makefile.in.orig Wed Jul 2 17:30:27 2014
+++ provider/client/Makefile.in Wed Jul 2 17:30:39 2014
@@ -379,7 +379,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(BOOST_CPPFL
-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/libfreebusy \
-I${top_srcdir}/common -I${top_srcdir}/zarafa-libsync \
$(am__append_1)
-libzarafaclient_la_LDFLAGS = ${AM_LDFLAGS} -avoid-version -module
+libzarafaclient_la_LDFLAGS = ${AM_LDFLAGS} -module
libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS) \
${top_builddir}/provider/soap/libgsoap.la \
libzarafaclient_la_LIBADD = $(SSL_LIBS) \
${GSOAP_LIBS} \
${top_builddir}/provider/soap/libsoapclient.la \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_contacts_Makefile_in,v 1.6 2014/04/07 13:46:06 robert Exp $
--- provider/contacts/Makefile.in.orig Mon Mar 31 12:59:12 2014
+++ provider/contacts/Makefile.in Sun Apr 6 19:53:27 2014
@@ -350,7 +350,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) \
$OpenBSD: patch-provider_contacts_Makefile_in,v 1.7 2014/07/03 06:14:40 robert Exp $
--- provider/contacts/Makefile.in.orig Fri May 23 15:04:04 2014
+++ provider/contacts/Makefile.in Wed Jul 2 17:28:25 2014
@@ -352,7 +352,7 @@ AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) \
-I${top_srcdir}/mapi4linux/include \
-I${top_srcdir}/common

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.12 2014/04/07 13:46:06 robert Exp $
--- provider/libserver/ECSession.cpp.orig Mon Feb 3 11:34:02 2014
+++ provider/libserver/ECSession.cpp Mon Feb 3 11:35:50 2014
@@ -599,14 +599,22 @@ void ECSession::RemoveBusyState(pthread_t threadId)
$OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.13 2014/07/03 06:14:40 robert Exp $
--- provider/libserver/ECSession.cpp.orig Fri May 23 15:56:38 2014
+++ provider/libserver/ECSession.cpp Wed Jul 2 17:28:25 2014
@@ -603,14 +603,22 @@ void ECSession::RemoveBusyState(pthread_t threadId)
i = m_mapBusyStates.find(threadId);
if(i != m_mapBusyStates.end()) {
@ -25,7 +25,7 @@ $OpenBSD: patch-provider_libserver_ECSession_cpp,v 1.12 2014/04/07 13:46:06 robe
} else {
ASSERT(FALSE);
}
@@ -928,11 +936,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
@@ -939,11 +947,20 @@ ECRESULT ECAuthSession::ValidateUserSocket(int socket,
uid_t uid;
char strbuf[1024];
#ifdef SO_PEERCRED

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_libserver_Makefile_in,v 1.3 2014/04/07 13:46:06 robert Exp $
--- provider/libserver/Makefile.in.orig Thu Jan 30 12:44:47 2014
+++ provider/libserver/Makefile.in Mon Feb 3 11:25:37 2014
@@ -381,6 +381,8 @@ libserver_la_SOURCES = \
$OpenBSD: patch-provider_libserver_Makefile_in,v 1.4 2014/07/03 06:14:40 robert Exp $
--- provider/libserver/Makefile.in.orig Fri May 23 15:04:04 2014
+++ provider/libserver/Makefile.in Wed Jul 2 17:28:25 2014
@@ -386,6 +386,8 @@ libserver_la_SOURCES = \
ZarafaCmdUtil.cpp ZarafaCmdUtil.h \
ECLockManager.cpp ECLockManager.h

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

@ -1,7 +1,7 @@
$OpenBSD: patch-provider_server_Makefile_in,v 1.19 2014/03/23 18:33:04 ajacoutot Exp $
--- provider/server/Makefile.in.orig Sat Sep 28 00:00:06 2013
+++ provider/server/Makefile.in Wed Oct 30 14:32:59 2013
@@ -339,9 +339,10 @@ zarafa_server_LDADD = \
$OpenBSD: patch-provider_server_Makefile_in,v 1.20 2014/07/03 06:14:40 robert Exp $
--- provider/server/Makefile.in.orig Fri May 23 15:04:04 2014
+++ provider/server/Makefile.in Wed Jul 2 17:28:25 2014
@@ -343,9 +343,10 @@ zarafa_server_LDADD = \
${top_builddir}/common/libcommon_util.la \
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_ssl.la \

12
mail/zarafa/zarafa/patches/patch-provider_soap_Makefile_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-provider_soap_Makefile_in,v 1.1 2014/07/03 06:14:40 robert Exp $
--- provider/soap/Makefile.in.orig Wed Jul 2 17:46:19 2014
+++ provider/soap/Makefile.in Wed Jul 2 17:46:24 2014
@@ -648,7 +648,7 @@ uninstall-am:
$(SOAP_CPP_SRC) : ns.xsd
ns.xsd: $(SOAPHEADER)
- $(GSOAP_SOAPCPP2) -x -I$(SOAP_INC) $< >& /dev/null
+ $(GSOAP_SOAPCPP2) -x -I$(SOAP_INC) $< > /dev/null
check-syntax:
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \

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

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.45 2014/04/07 13:46:06 robert Exp $
@comment $OpenBSD: PLIST-main,v 1.46 2014/07/03 06:14:41 robert Exp $
@newgroup _zarafa:627
@newuser _zarafa:627:_zarafa:daemon:Zarafa Account:/var/empty:/sbin/nologin
@comment chdir(2) to running_path which is set to /var/empty in the cfg files
@ -310,7 +310,6 @@ lib/zarafa/ldapplugin.so
@man man/man1/zarafa-set-oof.1
@man man/man1/zarafa-spooler.1
@man man/man1/zarafa-stats.1
@man man/man1/zarafa-ws.1
@man man/man1/zarafa.1
@man man/man5/zarafa-archiver.cfg.5
@man man/man5/zarafa-dagent.cfg.5
@ -322,7 +321,6 @@ lib/zarafa/ldapplugin.so
@man man/man5/zarafa-server.cfg.5
@man man/man5/zarafa-spooler.cfg.5
@man man/man5/zarafa-unix.cfg.5
@man man/man5/zarafa-ws.cfg.5
share/doc/pkg-readmes/${FULLPKGNAME}
share/doc/zarafa/
share/doc/zarafa/AGPL-3