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

Make this work with rthreads.

Browse Source 
Fix store creation.
Add a comment for the procmail sample in the README.
This commit is contained in:
ajacoutot 2012-02-27 19:01:34 +00:00
parent 09c60e699c
commit 4653e0de99
8 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/zarafa/zarafa/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.115 2012/02/16 22:18:36 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.116 2012/02/27 19:01:34 ajacoutot Exp $
COMMENT-main= MS Exchange groupware suite replacement
COMMENT-web= zarafa webaccess frontend and MAPI extensions for PHP
@ -7,6 +7,9 @@ PKGNAME= zarafa-${V}
PKGNAME-main= zarafa-${V}
PKGNAME-web= zarafa-webaccess-${V}
REVISION-main= 0
REVISION-web= 0
CATEGORIES= mail www productivity
SHARED_LIBS += mapi 2.0 # 0.0

4
mail/zarafa/zarafa/patches/patch-common_ECLogger_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-common_ECLogger_cpp,v 1.12 2011/12/22 17:10:04 ajacoutot Exp $
$OpenBSD: patch-common_ECLogger_cpp,v 1.13 2012/02/27 19:01:34 ajacoutot Exp $
Needs newlocale(3).
@ -83,7 +83,7 @@ Needs newlocale(3).
if (strncmp(buffer, "linuxthreads", strlen("linuxthreads")) == 0)
bNPTL = false;
+#elif defined(__OpenBSD__)
+ bNPTL = false;
+ bNPTL = true;
+#endif
m_lpConfig = lpConfig;

9
mail/zarafa/zarafa/patches/patch-installer_userscripts_companies_common_sh
View File

@ -1,11 +1,12 @@
$OpenBSD: patch-installer_userscripts_companies_common_sh,v 1.4 2010/06/30 02:46:48 ajacoutot Exp $
--- installer/userscripts/companies_common.sh.orig Mon May 31 15:44:42 2010
+++ installer/userscripts/companies_common.sh Mon Jun 14 09:23:14 2010
$OpenBSD: patch-installer_userscripts_companies_common_sh,v 1.5 2012/02/27 19:01:34 ajacoutot Exp $
--- installer/userscripts/companies_common.sh.orig Wed Feb 1 15:42:09 2012
+++ installer/userscripts/companies_common.sh Mon Feb 27 19:24:56 2012
@@ -1,7 +1,7 @@
# shell include script
ZARAFA_LANG="${ZARAFA_USERSCRIPT_LOCALE:-${LC_MESSAGES:-en_US}}"
-ZARAFA_LANG="${ZARAFA_USERSCRIPT_LOCALE:-${LC_MESSAGES:-en_US}}"
-PATH=/bin:/usr/local/bin:/usr/bin
+ZARAFA_LANG="${ZARAFA_USERSCRIPT_LOCALE:-${LC_MESSAGES:-C}}"
+PATH=$PATH:${PREFIX}/bin
export ZARAFA_LANG PATH

9
mail/zarafa/zarafa/patches/patch-installer_userscripts_groups_common_sh
View File

@ -1,11 +1,12 @@
$OpenBSD: patch-installer_userscripts_groups_common_sh,v 1.4 2010/06/30 02:46:48 ajacoutot Exp $
--- installer/userscripts/groups_common.sh.orig Mon May 31 15:44:42 2010
+++ installer/userscripts/groups_common.sh Mon Jun 14 09:22:58 2010
$OpenBSD: patch-installer_userscripts_groups_common_sh,v 1.5 2012/02/27 19:01:34 ajacoutot Exp $
--- installer/userscripts/groups_common.sh.orig Wed Feb 1 15:42:09 2012
+++ installer/userscripts/groups_common.sh Mon Feb 27 19:25:39 2012
@@ -1,7 +1,7 @@
# shell include script
ZARAFA_LANG="${ZARAFA_USERSCRIPT_LOCALE:-${LC_MESSAGES:-en_US}}"
-ZARAFA_LANG="${ZARAFA_USERSCRIPT_LOCALE:-${LC_MESSAGES:-en_US}}"
-PATH=/bin:/usr/local/bin:/usr/bin
+ZARAFA_LANG="${ZARAFA_USERSCRIPT_LOCALE:-${LC_MESSAGES:-C}}"
+PATH=$PATH:${PREFIX}/bin
export ZARAFA_LANG PATH

9
mail/zarafa/zarafa/patches/patch-installer_userscripts_users_common_sh
View File

@ -1,11 +1,12 @@
$OpenBSD: patch-installer_userscripts_users_common_sh,v 1.5 2011/11/17 15:14:37 ajacoutot Exp $
--- installer/userscripts/users_common.sh.orig Wed Nov 16 23:01:36 2011
+++ installer/userscripts/users_common.sh Thu Nov 17 13:59:31 2011
$OpenBSD: patch-installer_userscripts_users_common_sh,v 1.6 2012/02/27 19:01:34 ajacoutot Exp $
--- installer/userscripts/users_common.sh.orig Wed Feb 1 15:42:09 2012
+++ installer/userscripts/users_common.sh Mon Feb 27 19:26:00 2012
@@ -1,7 +1,7 @@
# shell include script
ZARAFA_LANG="${ZARAFA_USERSCRIPT_LOCALE:-${LC_MESSAGES:-en_US}}"
-ZARAFA_LANG="${ZARAFA_USERSCRIPT_LOCALE:-${LC_MESSAGES:-en_US}}"
-PATH=/bin:/usr/local/bin:/usr/bin
+ZARAFA_LANG="${ZARAFA_USERSCRIPT_LOCALE:-${LC_MESSAGES:-C}}"
+PATH=$PATH:${PREFIX}/bin
export ZARAFA_LANG PATH

4
mail/zarafa/zarafa/patches/patch-provider_server_ECServer_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.19 2012/02/16 22:18:36 ajacoutot Exp $
$OpenBSD: patch-provider_server_ECServer_cpp,v 1.20 2012/02/27 19:01:34 ajacoutot Exp $
--- provider/server/ECServer.cpp.orig Wed Feb 1 22:09:33 2012
+++ provider/server/ECServer.cpp Thu Feb 2 12:28:17 2012
@@ -86,6 +86,10 @@
@ -40,7 +40,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.19 2012/02/16 22:18:36 ajacouto
if (strncmp(buffer, "linuxthreads", strlen("linuxthreads")) == 0)
m_bNPTL = false;
+#elif defined(__OpenBSD__)
+ m_bNPTL = false;
+ m_bNPTL = true;
+#endif
// Init random generator

17
mail/zarafa/zarafa/patches/patch-spooler_Spooler_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-spooler_Spooler_cpp,v 1.9 2011/11/17 15:14:37 ajacoutot Exp $
$OpenBSD: patch-spooler_Spooler_cpp,v 1.10 2012/02/27 19:01:34 ajacoutot Exp $
XXX to be revisited
@ -17,21 +17,8 @@ XXX to be revisited
g_lpLogger->Log(EC_LOGLEVEL_FATAL, "WARNING: the zarafa-spooler will only be able to send one message at a time.");
}
+#elif defined(__OpenBSD__)
+ bNPTL = false;
+ bNPTL = true;
+#endif
}
// set socket filename
@@ -1323,11 +1327,8 @@ int main(int argc, char *argv[]) {
if (bNPTL) {
g_lpLogger->Log(EC_LOGLEVEL_DEBUG, "Joining signal thread");
pthread_join(signal_thread, NULL);
- g_lpLogger->Log(EC_LOGLEVEL_FATAL, "Spooler shutdown complete");
- } else {
- // ignore the death of the pipe logger
- signal(SIGCHLD, SIG_IGN);
}
+ g_lpLogger->Log(EC_LOGLEVEL_FATAL, "Spooler shutdown complete");
}
MAPIUninitialize();

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

@ -1,4 +1,4 @@
$OpenBSD: README-main,v 1.15 2011/12/22 17:10:04 ajacoutot Exp $
$OpenBSD: README-main,v 1.16 2012/02/27 19:01:34 ajacoutot Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -55,6 +55,7 @@ Anyway, here are the 3 ways of integrating Zarafa with sendmail(8).
First, install the procmail package and configure ${SYSCONFDIR}/procmailrc
the following way:
# optional: deliver mail tagged as SPAM into the Junk mail folder
:0w
* ^X-Spam-Status: Yes
| ${TRUEPREFIX}/bin/zarafa-dagent -j $LOGNAME