net-mail/zarafa: Bump
(Portage version: 2.1.10.3/svn/Linux x86_64, RepoMan options: --force) git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@2931 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
25
net-mail/zarafa/files/6.40.9.27553/Datux-sendas.patch
Normal file
25
net-mail/zarafa/files/6.40.9.27553/Datux-sendas.patch
Normal file
@@ -0,0 +1,25 @@
|
||||
diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp
|
||||
--- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000
|
||||
@@ -935,6 +935,7 @@
|
||||
{ "fax_domain", "", CONFIGSETTING_RELOADABLE },
|
||||
{ "fax_international", "+", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_delegates", "no", CONFIGSETTING_RELOADABLE },
|
||||
+ { "always_send_as", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_tnef", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE },
|
||||
diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp
|
||||
--- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000
|
||||
@@ -1949,6 +1949,10 @@
|
||||
HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b)
|
||||
{
|
||||
bAllowSendAs = true;
|
||||
+ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) {
|
||||
+ //use always_send_as to allow everybody to send as someone else.
|
||||
+ //(some users hate the 'on behalf of' text, and dont want to do the extra configuration)
|
||||
+ bAllowSendAs = true;
|
||||
} else {
|
||||
|
||||
hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner);
|
||||
199
net-mail/zarafa/files/6.40.9.27553/Datux-spamhook.patch
Normal file
199
net-mail/zarafa/files/6.40.9.27553/Datux-spamhook.patch
Normal file
@@ -0,0 +1,199 @@
|
||||
diff -rupN zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp
|
||||
--- zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp 2010-07-20 17:22:07.995625072 +0200
|
||||
@@ -7244,6 +7244,166 @@ typedef struct{
|
||||
SOURCEKEY sSourceKey;
|
||||
SOURCEKEY sParentSourceKey;
|
||||
}COPYITEM;
|
||||
+//SPAM HOOK
|
||||
+//This function parses an e-mail to the /etc/zarafa/userscripts/junklearn script. With 2 arguments:
|
||||
+//ham or spam
|
||||
+//message id
|
||||
+//and pipes the mail header to the script.
|
||||
+//This script wil be inhaled by MoveObjects();
|
||||
+/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
+int SpamHook(ECDatabase *lpDatabase,int ulId,int ulDestFolderId)
|
||||
+{
|
||||
+
|
||||
+ ALLOC_DBRESULT();
|
||||
+ ECRESULT er = erSuccess;
|
||||
+ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script");
|
||||
+
|
||||
+ //If shScriptPath doesn't exist skip spam hook.
|
||||
+ if(fopen(shScriptPath.c_str(),"r")) {
|
||||
+
|
||||
+ //Get store object ID via message object id
|
||||
+ unsigned int storeId;
|
||||
+ er = g_lpSessionManager->GetCacheManager()->GetStore(ulId,&storeId,NULL);
|
||||
+ if(er != erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve source folder.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //get deleted items folder entry id
|
||||
+ strQuery="SELECT val_binary FROM properties WHERE hierarchyid="+stringify(storeId)+" AND tag="+stringify(PROP_ID(PR_IPM_WASTEBASKET_ENTRYID));
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'deleted items' entryid to objectid.
|
||||
+ entryId* wasteBucketEntryId = new entryId[0];
|
||||
+ wasteBucketEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ wasteBucketEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int wasteBucketFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(wasteBucketEntryId,&wasteBucketFolderId);
|
||||
+ delete wasteBucketEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get 'junk folder' entryId.
|
||||
+ strQuery="SELECT val_binary FROM receivefolder LEFT JOIN mvproperties ON receivefolder.objid=mvproperties.hierarchyid WHERE receivefolder.storeid="+stringify(storeId)+" AND receivefolder.messageclass='IPC' AND mvproperties.tag="+stringify(PROP_ID(PR_ADDITIONAL_REN_ENTRYIDS))+" AND mvproperties.orderid=4";
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryids from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'junk folder' entryid to objectid.
|
||||
+ entryId* junkFolderEntryId = new entryId[0];
|
||||
+ junkFolderEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ junkFolderEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int junkFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(junkFolderEntryId,&junkFolderId);
|
||||
+ delete junkFolderEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get source folder object ID. (Actually we should check if mail came from subfolders in the 'deleted items folder', which I think never happens.)
|
||||
+ unsigned int srcFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetParent(ulId,&srcFolderId);
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve src folder id.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Check if object is ham or spam
|
||||
+ string shMailStatus;
|
||||
+ //if destination folder is junk, mark as spam
|
||||
+ if(ulDestFolderId==junkFolderId)
|
||||
+ shMailStatus="spam";
|
||||
+ else
|
||||
+ {
|
||||
+ //if destination folder is not TRASH and de source folder is JUNK, mark as ham
|
||||
+ if(ulDestFolderId!=wasteBucketFolderId && srcFolderId==junkFolderId)
|
||||
+ shMailStatus="ham";
|
||||
+ }
|
||||
+
|
||||
+ //Only call hook script if the mail is marked as ham or spam.
|
||||
+ if(!shMailStatus.empty()) {
|
||||
+
|
||||
+ //Get the mail from the DB.
|
||||
+ strQuery="SELECT val_string FROM properties WHERE tag="+stringify(PROP_ID(PR_TRANSPORT_MESSAGE_HEADERS))+" AND hierarchyid= "+stringify(ulId);
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: db error while retrieve mail header.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+
|
||||
+ if(shNumRows>0) {
|
||||
+
|
||||
+ // Execute the hook:
|
||||
+ FILE *shFilePtr;
|
||||
+ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId);
|
||||
+ shFilePtr=popen(shScriptPath.c_str(),"w");
|
||||
+ fputs(lpDBRow[0],shFilePtr);
|
||||
+ int shExitCode=pclose(shFilePtr);
|
||||
+ if(!WIFEXITED(shExitCode)) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: "+shScriptPath+" was terminated abnormally.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ //If script exit with non 0, exit..
|
||||
+ if(WEXITSTATUS(shExitCode)!=0) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(shExitCode));
|
||||
+ er=ZARAFA_E_UNKNOWN;
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed.");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail");
|
||||
+ }
|
||||
+
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+ }
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+exit:
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ return er;
|
||||
+}
|
||||
+
|
||||
|
||||
// Move one or more messages and/or moved a softdeleted message to a normal message
|
||||
ECRESULT MoveObjects(ECSession *lpSession, ECDatabase *lpDatabase, ECListInt* lplObjectIds, unsigned int ulDestFolderId, unsigned int ulSyncId)
|
||||
@@ -8096,6 +8256,17 @@ SOAP_ENTRY_START5(copyObjects, *result,
|
||||
|
||||
// @note The object type checking wille be done in MoveObjects or CopyObject
|
||||
|
||||
+//SPAMHOOK
|
||||
+/////////////////////////////////////
|
||||
+ //Iterate over all mail ids and initiate spamhook.
|
||||
+ for(iObjectId = lObjectIds.begin(); iObjectId != lObjectIds.end(); iObjectId++)
|
||||
+ {
|
||||
+ //Ignore the result
|
||||
+ int shResult=SpamHook(lpDatabase,*iObjectId,ulDestFolderId);
|
||||
+ }
|
||||
+//SPAMHOOK END
|
||||
+////////////////////////////////////
|
||||
+
|
||||
//check copy or a move
|
||||
if(ulFlags & FOLDER_MOVE ) { // A move
|
||||
er = MoveObjects(lpecSession, lpDatabase, &lObjectIds, ulDestFolderId, ulSyncId);
|
||||
diff -rupN zarafa-6.40.0-orig/provider/server/ECServer.cpp zarafa-6.40.0/provider/server/ECServer.cpp
|
||||
--- zarafa-6.40.0-orig/provider/server/ECServer.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/server/ECServer.cpp 2010-07-20 17:26:25.119624516 +0200
|
||||
@@ -670,6 +670,7 @@ int running_server(char *szName, char *s
|
||||
{ "deletegroup_script", "/etc/zarafa/userscripts/deletegroup", CONFIGSETTING_RELOADABLE},
|
||||
{ "createcompany_script", "/etc/zarafa/userscripts/createcompany", CONFIGSETTING_RELOADABLE },
|
||||
{ "deletecompany_script", "/etc/zarafa/userscripts/deletecompany", CONFIGSETTING_RELOADABLE },
|
||||
+ { "junklearn_script", "/etc/zarafa/userscripts/junklearn", CONFIGSETTING_RELOADABLE },
|
||||
{ "user_safe_mode", "no", CONFIGSETTING_RELOADABLE },
|
||||
|
||||
// Storename format
|
||||
51
net-mail/zarafa/files/6.40.9.27553/fix-pthread.patch
Normal file
51
net-mail/zarafa/files/6.40.9.27553/fix-pthread.patch
Normal file
@@ -0,0 +1,51 @@
|
||||
diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh
|
||||
--- zarafa-6.40.6.orig//autoconf/ltmain.sh 2011-03-20 08:23:21.000000000 +0100
|
||||
+++ zarafa-6.40.6/autoconf/ltmain.sh 2011-03-20 08:24:23.000000000 +0100
|
||||
@@ -1628,7 +1628,7 @@
|
||||
elif test "X$arg" = "X-lc_r"; then
|
||||
case $host in
|
||||
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
|
||||
- # Do not include libc_r directly, use -pthread flag.
|
||||
+ # Do not include libc_r directly, use -lpthread flag.
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
@@ -1647,7 +1647,7 @@
|
||||
continue
|
||||
;;
|
||||
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
@@ -2150,7 +2150,7 @@
|
||||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac
|
||||
--- zarafa-6.40.6.orig//configure.ac 2011-03-20 08:23:20.000000000 +0100
|
||||
+++ zarafa-6.40.6/configure.ac 2011-03-20 08:23:44.000000000 +0100
|
||||
@@ -407,7 +407,7 @@
|
||||
CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX"
|
||||
fi
|
||||
# force add pthread in lucene test
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then
|
||||
AC_CHECK_LIB(clucene, [open],
|
||||
[ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a"
|
||||
@@ -561,7 +561,7 @@
|
||||
AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([required library libpthread missing or unusable]))
|
||||
LIBS=$libs_keep
|
||||
# because it seems this is better... (gnu c/c++ only?)
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
|
||||
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
|
||||
libs_keep=$LIBS
|
||||
@@ -0,0 +1,26 @@
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.in
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.in
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.in
|
||||
@@ -274,7 +274,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.am
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.am
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.am
|
||||
@@ -18,7 +18,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
@@ -0,0 +1,24 @@
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:38:31.435806562 +0300
|
||||
@@ -13,7 +13,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:38:22.475687815 +0300
|
||||
@@ -250,7 +250,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
all: all-am
|
||||
@@ -0,0 +1,44 @@
|
||||
--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100
|
||||
+++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100
|
||||
@@ -34,7 +34,7 @@
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = php-ext
|
||||
-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \
|
||||
+DIST_COMMON = $(dist_data_DATA) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@@ -86,7 +86,7 @@
|
||||
DIST_SOURCES = $(mapi_la_SOURCES)
|
||||
dist_dataDATA_INSTALL = $(INSTALL_DATA)
|
||||
dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
|
||||
-DATA = $(dist_data_DATA) $(dist_sysconf_DATA)
|
||||
+DATA = $(dist_data_DATA)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@@ -406,23 +406,6 @@
|
||||
echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(datadir)/$$f"; \
|
||||
done
|
||||
-install-dist_sysconfDATA: $(dist_sysconf_DATA)
|
||||
- @$(NORMAL_INSTALL)
|
||||
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
-
|
||||
-uninstall-dist_sysconfDATA:
|
||||
- @$(NORMAL_UNINSTALL)
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
@@ -0,0 +1,19 @@
|
||||
Submitted By: Mario Fetka ( mario.fetka@gmaail.com)
|
||||
Date: 2010-10-11
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: on gentoo libtcmalloc_minimal is only provided as shared lib
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/configure.ac zarafa-6.40.2/configure.ac
|
||||
--- zarafa-6.40.2.orig/configure.ac 2010-10-11 18:39:35.000000000 +0000
|
||||
+++ zarafa-6.40.2/configure.ac 2010-10-11 18:40:03.000000000 +0000
|
||||
@@ -441,7 +441,7 @@
|
||||
AC_HELP_STRING([--with-tcmalloc-prefix=PATH],[path to tcmalloc lib, e.g. /usr/lib/]),
|
||||
[TCMALLOC_PREFIX=${withval}],[TCMALLOC_PREFIX=/usr/lib])
|
||||
AC_CHECK_LIB(tcmalloc_minimal, [open],
|
||||
- [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.a" ],
|
||||
+ [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" ],
|
||||
[ WITH_TCMALLOC=no ])
|
||||
AC_SUBST(TCMALLOC_LIBS)
|
||||
AC_LANG_POP
|
||||
@@ -0,0 +1,187 @@
|
||||
Submitted By: Mario Fetka (mario.fetka@gmail.com)
|
||||
Date: 2010-10-13
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: gentoo specific
|
||||
Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/installer/linux/Makefile.am zarafa-6.40.2/installer/linux/Makefile.am
|
||||
--- zarafa-6.40.2.orig/installer/linux/Makefile.am 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/linux/Makefile.am 2010-10-13 08:28:26.000000000 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
sysconf_initdir=${sysconfdir}/init.d
|
||||
sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files}
|
||||
|
||||
-rhel_sysconfig_path = ${sysconfdir}/sysconfig
|
||||
+rhel_sysconfig_path = ${sysconfdir}/conf.d
|
||||
suse_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sles_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path}
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany zarafa-6.40.2/installer/userscripts/createcompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany 2010-10-13 08:26:53.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany.in zarafa-6.40.2/installer/userscripts/createcompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany.in 2010-10-13 08:27:00.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup zarafa-6.40.2/installer/userscripts/creategroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup 2010-10-13 08:27:04.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup.in zarafa-6.40.2/installer/userscripts/creategroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup.in 2010-10-13 08:27:08.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser zarafa-6.40.2/installer/userscripts/createuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser 2010-10-13 08:27:12.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser.in zarafa-6.40.2/installer/userscripts/createuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser.in 2010-10-13 08:27:17.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany zarafa-6.40.2/installer/userscripts/deletecompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany 2010-10-13 08:27:22.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany.in zarafa-6.40.2/installer/userscripts/deletecompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany.in 2010-10-13 08:27:26.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup zarafa-6.40.2/installer/userscripts/deletegroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup 2010-10-13 08:27:30.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup.in zarafa-6.40.2/installer/userscripts/deletegroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup.in 2010-10-13 08:27:35.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser zarafa-6.40.2/installer/userscripts/deleteuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser 2010-10-13 08:27:39.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/deleteuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser.in zarafa-6.40.2/installer/userscripts/deleteuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser.in 2010-10-13 08:27:43.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d
|
||||
@@ -0,0 +1,14 @@
|
||||
diff -uNr zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp
|
||||
--- zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp 2011-03-20 23:50:06.000000000 +0100
|
||||
+++ zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp 2011-03-21 00:00:45.000000000 +0100
|
||||
@@ -343,6 +343,10 @@
|
||||
// this option was introduced in mysql 5.0, so let's not even try on 4.1 servers
|
||||
strQuery = "SET SESSION sql_mode = 'STRICT_ALL_TABLES'";
|
||||
Query(strQuery); // ignore error
|
||||
+
|
||||
+ // Latin1 is default charset
|
||||
+ strQuery = "SET NAMES 'latin1'";
|
||||
+ Query(strQuery);
|
||||
}
|
||||
|
||||
exit:
|
||||
@@ -0,0 +1,65 @@
|
||||
Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 6.40.0, which only
|
||||
removes the paths from autoconf/automake related files, that don't exist in the OSS
|
||||
version of Zarafa. Having these paths not removed causes autoreconf to fail, but a
|
||||
re-run of autoreconf is needed in order to get the rpaths completely out of all the
|
||||
libraries and binaries built during the make process.
|
||||
|
||||
forward patch by Mario Fetka <mario.fetka@gmail.com>
|
||||
|
||||
diff -uNr zarafa-6.40.6,orig//ECtools/Makefile.am zarafa-6.40.6/ECtools/Makefile.am
|
||||
--- zarafa-6.40.6,orig//ECtools/Makefile.am 2011-03-20 08:34:03.000000000 +0100
|
||||
+++ zarafa-6.40.6/ECtools/Makefile.am 2011-03-20 08:36:31.000000000 +0100
|
||||
@@ -1,7 +1,3 @@
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = zarafa-backup zarafa-report
|
||||
-endif
|
||||
-
|
||||
if WITH_TESTTOOLS
|
||||
TESTSUBS = ECTestTools
|
||||
endif
|
||||
diff -uNr zarafa-6.40.6,orig//Makefile.am zarafa-6.40.6/Makefile.am
|
||||
--- zarafa-6.40.6,orig//Makefile.am 2011-03-20 08:34:03.000000000 +0100
|
||||
+++ zarafa-6.40.6/Makefile.am 2011-03-20 08:35:57.000000000 +0100
|
||||
@@ -1,10 +1,6 @@
|
||||
AUTOMAKE_OPTIONS = 1.9 foreign
|
||||
ACLOCAL_AMFLAGS = -Iautoconf
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = liblicense licensed
|
||||
-endif
|
||||
-
|
||||
SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext spooler gateway caldav ECtools installer po doc
|
||||
|
||||
if WITH_SWIG
|
||||
@@ -26,10 +22,6 @@
|
||||
common/ecversion.h: versionheader.sh
|
||||
sh ${top_srcdir}/versionheader.sh > common/ecversion.h
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-CLEANFILES=common/ecversion.h
|
||||
-endif
|
||||
-
|
||||
dist-hook:
|
||||
find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
|
||||
if OSS_ONLY
|
||||
diff -uNr zarafa-6.40.6,orig//configure.ac zarafa-6.40.6/configure.ac
|
||||
--- zarafa-6.40.6,orig//configure.ac 2011-03-20 08:34:03.000000000 +0100
|
||||
+++ zarafa-6.40.6/configure.ac 2011-03-20 08:35:16.000000000 +0100
|
||||
@@ -808,17 +808,6 @@
|
||||
version
|
||||
specialbuild
|
||||
])
|
||||
-dnl non-oss files
|
||||
-if test -d `dirname $0`/licensed; then
|
||||
-AC_CONFIG_FILES([
|
||||
- liblicense/Makefile
|
||||
- licensed/Makefile
|
||||
- ECtools/zarafa-backup/Makefile
|
||||
- ECtools/zarafa-backup/helpers/Makefile
|
||||
- ECtools/zarafa-report/Makefile
|
||||
- debian/zarafa.install
|
||||
-])
|
||||
-fi
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
Reference in New Issue
Block a user