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
parent
2a949cf968
commit
2de0ba3e6d
|
|
@ -2,6 +2,11 @@
|
|||
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: $
|
||||
|
||||
*zarafa-6.40.9.27553 (19 Jun 2011)
|
||||
|
||||
19 Jun 2011; Mario Fetka <mario.fetka@gmail.com> +zarafa-6.40.9.27553.ebuild:
|
||||
Bump
|
||||
|
||||
10 Jun 2011; Mario Fetka <mario.fetka@gmail.com>
|
||||
-files/6.40.5.24860/zarafa-6.40.0-package.patch,
|
||||
-files/6.40.6.25584/zarafa-6.40.1-no-php-conf.patch,
|
||||
|
|
|
|||
|
|
@ -10,6 +10,16 @@ AUX 6.40.8.27223/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 c9b89cad232
|
|||
AUX 6.40.8.27223/zarafa-6.40.2-sysconfig2confd-1.patch 8495 RMD160 f747da766c1777121f04c12f4cb3bee9ec56b7f8 SHA1 44e5a9487497080933de75d55311c97dfc7fc8fc SHA256 591dfe4e220673818fd3548d9b36f8b4e5ea92529eaf3d7bee6c7885808f8988
|
||||
AUX 6.40.8.27223/zarafa-6.40.6-force_latin1.patch 618 RMD160 8fc093050c3368c770d11326cf2402511f8d7c14 SHA1 5a7a6669308166ffb8117090411c3df9827408aa SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496
|
||||
AUX 6.40.8.27223/zarafa-6.40.6-package.patch 2135 RMD160 30804eb455510967a5cfc2f9fe9bd699f906a9df SHA1 725f55210166e3453eae6bb58d1a417c6b0021ad SHA256 e441b08807753388e561653adcb9e3de8def54e3c343105dc25d95c1a1e0997d
|
||||
AUX 6.40.9.27553/Datux-sendas.patch 1429 RMD160 bd2b502775fb84bd6899bb3892d36d19ee3d5b8d SHA1 07a5887d02d0ddbd368c46e50eb4267f73aac9f7 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032
|
||||
AUX 6.40.9.27553/Datux-spamhook.patch 9895 RMD160 b1143f3e2057ee8d1b0a03e757086501769645a6 SHA1 a108a95087ba83f9c1fb0da42ffc5eef1d3755da SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b
|
||||
AUX 6.40.9.27553/fix-pthread.patch 2101 RMD160 aafbca78c32dc5c248ff044b9fd35ae3e5882649 SHA1 44f7ac8d8e36209c811b0e1cde5dbfdcc1cdab0d SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c
|
||||
AUX 6.40.9.27553/fix-zarafaserver-uuid-linkage.patch 1394 RMD160 f88c3d41e5af48713d5ba5a4f9a9add75724bb45 SHA1 59aadb0eb993c7a552018c37e715bee7caaa1a12 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22
|
||||
AUX 6.40.9.27553/fix-zarafastats-uuid-linkage.patch 1051 RMD160 9713fa23bd16cb69111ecb39f840f8b7026d8f21 SHA1 ca04f80dce737ad10821c2e1bb84cd8f4ea5b9c5 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03
|
||||
AUX 6.40.9.27553/zarafa-6.40.1-no-php-conf.patch 1634 RMD160 1bb4d4357aeeec0b005cd090beb96cb73905f58d SHA1 3da975c330bf09eca894db87aa1888536ee1e206 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f
|
||||
AUX 6.40.9.27553/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 c9b89cad232b513db8dad25dba9a7a3b6cdcf007 SHA1 c4d332881ab985f817c8d5c4848f4ec2be91d050 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350
|
||||
AUX 6.40.9.27553/zarafa-6.40.2-sysconfig2confd-1.patch 8495 RMD160 f747da766c1777121f04c12f4cb3bee9ec56b7f8 SHA1 44e5a9487497080933de75d55311c97dfc7fc8fc SHA256 591dfe4e220673818fd3548d9b36f8b4e5ea92529eaf3d7bee6c7885808f8988
|
||||
AUX 6.40.9.27553/zarafa-6.40.6-force_latin1.patch 618 RMD160 8fc093050c3368c770d11326cf2402511f8d7c14 SHA1 5a7a6669308166ffb8117090411c3df9827408aa SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496
|
||||
AUX 6.40.9.27553/zarafa-6.40.6-package.patch 2135 RMD160 30804eb455510967a5cfc2f9fe9bd699f906a9df SHA1 725f55210166e3453eae6bb58d1a417c6b0021ad SHA256 e441b08807753388e561653adcb9e3de8def54e3c343105dc25d95c1a1e0997d
|
||||
AUX 7.0.0.3.25734/fix-pthread.patch 2257 RMD160 742d533a64090b865e62dae0ab170c4a66c11896 SHA1 b9a360f9e822bed5547308e96b3635c69012ec26 SHA256 f2ac2d45a8bc7fd91e3df1a8096f0f779cad34a75a205cc98a8faab814243c7a
|
||||
AUX 7.0.0.3.25734/fix-zarafaserver-uuid-linkage.patch 707 RMD160 18b4c44f603b215e5b01262356c45e30a02dc57b SHA1 a0f6569a25e538f2a8b529fd46bc0e9fe0993590 SHA256 93eb0bfb9e539fe96b6cc936e2096b53e327e7f7c904e91eabedafe6070e18cf
|
||||
AUX 7.0.0.3.25734/fix-zarafastats-uuid-linkage.patch 542 RMD160 bc73d6373502e2fcff435369a34df87c8dbbd8e9 SHA1 5e4634de179ff03e6527e219066ea1be0711f2c7 SHA256 c9e3a60291c4268635064099856baea58c8340cb37fd7302446a225ed0b45141
|
||||
|
|
@ -29,10 +39,14 @@ AUX zarafa.logrotate 1857 RMD160 d295f5307be6577d3f8fdc89edc7995adae2fd47 SHA1 7
|
|||
DIST zcp-6.40.8-27223-sles-11-i586-free.tar.gz 24048189 RMD160 442e433cb7a0da8081a5def4c8c6ac6770a24b10 SHA1 dec7d3e8fa8ad4bf5fd162ebb3b1fd2e2d3d71b4 SHA256 99a010e216e7d49d2d6b07fd33f265a08829f01d7ed85f2dd832e8809c1c72a1
|
||||
DIST zcp-6.40.8-27223-sles-11-x86_64-free.tar.gz 24001656 RMD160 d4f8474b47378b28e8e8374141c03eedff9b3666 SHA1 775f53bb7d5c35cfb596f87e99b5278ef77420eb SHA256 ba5fed41d6fee39dc969e711a7edbf76e7640ca5c77e28c9be6d11f026a99b30
|
||||
DIST zcp-6.40.8.tar.gz 5428506 RMD160 36ce2095a1d0126a43405ac50b289107910feeaf SHA1 6c342a725610fb38dc6a5cef6e0d9bc160252fd4 SHA256 206bb736731f5b3c3fdc0d34c495b8c2af9e3245770d8636bc97d06ff7363023
|
||||
DIST zcp-6.40.9-27553-sles-11-i586-free.tar.gz 24074176 RMD160 f540590d7f371c9b51ca15cd562a77e7fc5d7cbc SHA1 2094481bcbe976d2ed8b63d9e951091033763edb SHA256 1f3fd302b6c3f79f14798da21a61ae3e63f836e0545e4a7e6bdecba26a9a6479
|
||||
DIST zcp-6.40.9-27553-sles-11-x86_64-free.tar.gz 24027236 RMD160 f1612ccf825eed9ea8eaf1fb675460eca9b2ac25 SHA1 5de01cbc7d1d3d2051be9a897de18223abccc3e2 SHA256 ef21788f2864210d801c9d258ec97fad670c8fb00c9200dbb9e0c023e22ce035
|
||||
DIST zcp-6.40.9.tar.gz 5434001 RMD160 6a14d627dfbdf77c17839e1ab8840695af9e3b34 SHA1 7cf5b7d08d521571d00e06c9f97a8498b8fe49eb SHA256 23653649497b0b26322b8152c639eec1087727d2370947050c239dc3d7c1f03d
|
||||
DIST zcp-7.0.0.tar.gz 5898702 RMD160 dfc0958b69ebe4931e07de50f63c236b38f08aaf SHA1 fefc92f21a609bdfcab8de635076476045141c4c SHA256 3f48614df5faf151cd8eb32adce8fd23253a22d3c52b10a4bcb003968da3a900
|
||||
DIST zcp-7.0.0beta3-25734-sles-11-i586-free.tar.gz 25242652 RMD160 8f3710fc09b0b2ca80e80ae4f3c3a041d2808b19 SHA1 d601974e823700623c0d8b3e3496b43f3dbca115 SHA256 1648c3200d9249baa50ed8d43e46f78535a643d9042a3a5d7e8bfff27aa0fc2a
|
||||
DIST zcp-7.0.0beta3-25734-sles-11-x86_64-free.tar.gz 25165278 RMD160 8925b89c1107d4530397275bfd14bf14e7ae55d9 SHA1 f4e5877ab6b47c6e2e57a805d308720842b2e24e SHA256 6d9db4530621cffc40797511fb4757f3c259a48c9f9d4a3515aefd0ec7437e4d
|
||||
EBUILD zarafa-6.40.8.27223.ebuild 6562 RMD160 0d88521a3df488a6a4f6db647650e36b9dcbc5a2 SHA1 39b80abe3e75efc224756c795502d01b6d6b4861 SHA256 f1dced5ca8ce4b69ae4ff5b9c8972dd97619f271bbb679195c440de24f9893be
|
||||
EBUILD zarafa-6.40.9.27553.ebuild 6562 RMD160 0d88521a3df488a6a4f6db647650e36b9dcbc5a2 SHA1 39b80abe3e75efc224756c795502d01b6d6b4861 SHA256 f1dced5ca8ce4b69ae4ff5b9c8972dd97619f271bbb679195c440de24f9893be
|
||||
EBUILD zarafa-7.0.0.3.25734.ebuild 6767 RMD160 7cfdab79030913daa2f8c64114a25db32dbda881 SHA1 b159c7d13e2b7f50a8aa9e5e0f7b730b25b422f8 SHA256 a51e0f2b582e03f2f3d755cbf0ae3aded472edacd614fbfbedb758e34f8e1ec7
|
||||
MISC ChangeLog 6185 RMD160 d6ca343f9ec0204681ec53dc8360c16ab146056f SHA1 94c94887cbaa937c564cdbcefafecdf682aa4c9f SHA256 2002a154067f558f6bd01399a96fd37162386e50f6fa1a597f2b03207f5ee0d6
|
||||
MISC ChangeLog 6309 RMD160 2a5ec7b8aaadf920c8fb55121b3407f5a99005f5 SHA1 890a7dc6d847646f9e9b955d232c2163a2f8fc53 SHA256 5852a02af3efc2da467d5496dae249273c8804a367f853c2bda01e2055f72124
|
||||
MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -0,0 +1,194 @@
|
|||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
PHP_EXT_NAME="mapi"
|
||||
PHP_EXT_INI="yes"
|
||||
PHP_EXT_ZENDEXT="no"
|
||||
USE_PHP="php5-3"
|
||||
|
||||
inherit php-ext-source-r2 eutils autotools rpm5 versionator
|
||||
|
||||
MY_PV=$(replace_version_separator 3 '-' )
|
||||
MY_PVV=$(replace_version_separator 3 'beta' $MY_PV )
|
||||
MY_PVM=$(get_version_component_range 1-2 )
|
||||
MY_PVR=$(get_version_component_range 1-3 )
|
||||
|
||||
DESCRIPTION="Open Source Groupware Solution"
|
||||
HOMEPAGE="http://zarafa.com/"
|
||||
SRC_URI="http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/sourcecode/zcp-${MY_PVR}.tar.gz
|
||||
licensed? (
|
||||
amd64? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-x86_64-free.tar.gz )
|
||||
x86? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-i586-free.tar.gz ) )"
|
||||
|
||||
LICENSE="AGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
RESTRICT=""
|
||||
IUSE="debug epoll ldap logrotate licensed static swig tcmalloc testtools perl pic profiling python kerberos sparsehash"
|
||||
|
||||
RDEPEND=">=dev-libs/libical-0.44
|
||||
dev-cpp/libvmime:0.7
|
||||
app-text/catdoc
|
||||
app-text/poppler
|
||||
dev-cpp/clucene
|
||||
dev-db/mysql
|
||||
dev-libs/libxml2
|
||||
dev-libs/openssl
|
||||
net-misc/curl
|
||||
sys-libs/e2fsprogs-libs
|
||||
sys-libs/zlib
|
||||
sys-libs/ncurses
|
||||
sys-libs/pam
|
||||
dev-libs/boost
|
||||
kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) )
|
||||
ldap? ( net-nds/openldap )
|
||||
logrotate? ( app-admin/logrotate )
|
||||
tcmalloc? ( dev-util/google-perftools )
|
||||
sparsehash? ( dev-cpp/sparsehash )
|
||||
perl? ( dev-lang/perl )
|
||||
python? ( dev-lang/python )
|
||||
swig? ( dev-lang/swig )
|
||||
testtools? ( dev-python/testtools )
|
||||
!arm? ( licensed? (
|
||||
dev-libs/openssl:0.9.8
|
||||
>=sys-libs/zlib-1.2.4
|
||||
) )"
|
||||
|
||||
S="${WORKDIR}"/zarafa-${MY_PVR}/
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
dev-util/pkgconfig
|
||||
sys-devel/gettext
|
||||
dev-lang/php"
|
||||
|
||||
QA_PRESTRIPPED="
|
||||
usr/bin/zarafa-restore
|
||||
usr/bin/zarafa-report
|
||||
usr/bin/zarafa-backup
|
||||
usr/bin/zarafa-licensed
|
||||
usr/lib/zarafa/ldapmsplugin.so
|
||||
usr/lib64/zarafa/ldapmsplugin.so"
|
||||
|
||||
QA_DT_HASH="
|
||||
usr/bin/zarafa-restore
|
||||
usr/bin/zarafa-report
|
||||
usr/bin/zarafa-backup
|
||||
usr/bin/zarafa-licensed
|
||||
usr/lib/zarafa/ldapmsplugin.so
|
||||
usr/lib64/zarafa/ldapmsplugin.so"
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
if use licensed; then
|
||||
cd "${WORKDIR}"
|
||||
mkdir licensed
|
||||
cd licensed
|
||||
rpm5_unpack $(find ./../ -name "zarafa-licensed*.rpm")
|
||||
cd "${S}"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" epatch
|
||||
edos2unix php-webclient-ajax/config.php.dist
|
||||
AT_M4DIR="autoconf" eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--enable-oss \
|
||||
--disable-testtools \
|
||||
--enable-release \
|
||||
--with-userscript-prefix=/etc/zarafa/userscripts \
|
||||
--with-quotatemplate-prefix=/etc/zarafa/quotamails \
|
||||
--with-indexerscripts-prefix=/etc/zarafa/indexerscripts \
|
||||
$(use_with pic) \
|
||||
$(use_enable perl) \
|
||||
$(use_enable python) \
|
||||
$(use_enable profiling) \
|
||||
$(use_enable static) \
|
||||
$(use_enable swig) \
|
||||
$(use_enable sparsehash) \
|
||||
$(use_enable tcmalloc) \
|
||||
$(use_enable testtools) \
|
||||
$(use_enable debug)
|
||||
}
|
||||
|
||||
|
||||
src_install() {
|
||||
make DESTDIR="${D}" install || die "make install failed"
|
||||
make DESTDIR="${D}" install-ajax-webaccess || die "make install-ajax-webaccess failed"
|
||||
make DESTDIR="${D}" install-mobile-webaccess || die "make install-mobile-webaccess failed"
|
||||
|
||||
insinto /etc/apache2/modules.d
|
||||
newins "${FILESDIR}/50_zarafa-webaccess-mobile.conf" 50_zarafa-webaccess-mobile.conf || die "Failed to install apache config files"
|
||||
newins "${FILESDIR}/50_zarafa-webaccess.conf" 50_zarafa-webaccess.conf || die "Failed to install apache config files"
|
||||
|
||||
rm "${D}"/usr/share/zarafa-webaccess/*.conf || die "Failed to remove apache config files"
|
||||
rm "${D}"/usr/share/zarafa-webaccess-mobile/*.conf || die "Failed to remove apache config files"
|
||||
|
||||
# Use only some parts of PHP eclass
|
||||
php-ext-source-r2_buildinilist php${slot}
|
||||
php-ext-source-r2_addextension "${PHP_EXT_NAME}.so"
|
||||
|
||||
# Symlink the <ext>.ini files from ext/ to ext-active/
|
||||
for inifile in ${PHPINIFILELIST} ; do
|
||||
inidir="${inifile/${PHP_EXT_NAME}.ini/}"
|
||||
inidir="${inidir/ext/ext-active}"
|
||||
dodir "/${inidir}"
|
||||
dosym "/${inifile}" "/${inifile/ext/ext-active}"
|
||||
done
|
||||
|
||||
# Install PHP module
|
||||
php-ext-source-r2_addtoinifiles ";mapi.cache_max_sessions" "128"
|
||||
php-ext-source-r2_addtoinifiles ";mapi.cache_lifetime" "300"
|
||||
|
||||
if use logrotate; then
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}"/zarafa.logrotate zarafa || die "Failed to install logrotate"
|
||||
fi
|
||||
|
||||
# install ldap files
|
||||
if use ldap; then
|
||||
insinto /etc/openldap/schema
|
||||
doins installer/ldap/zarafa.* || die "Failed to install ldap schema files"
|
||||
fi
|
||||
|
||||
insinto /etc/zarafa
|
||||
doins installer/linux/*.cfg || die "Failed to install config files"
|
||||
|
||||
exeinto /etc/zarafa/userscripts/
|
||||
newexe "${FILESDIR}"/junklearn.dspam junklearn
|
||||
|
||||
dodir /var/log/zarafa
|
||||
keepdir /var/log/zarafa
|
||||
|
||||
if use licensed; then
|
||||
dobin "${WORKDIR}"/licensed/usr/bin/* || die "Failed to install licensed binaries"
|
||||
exeinto /usr/$(get_libdir)/zarafa/
|
||||
doexe "${WORKDIR}"/licensed/usr/$(get_libdir)/zarafa/*.so || die "Failed to install licensed lib"
|
||||
doman "${WORKDIR}"/licensed/usr/share/man/*/*.gz || die "Failed to install man files"
|
||||
exeinto /usr/share/zarafa/zarafa-backup-helpers/
|
||||
doexe "${WORKDIR}"/licensed/usr/share/zarafa/zarafa-backup-helpers/* || die "Failed to install helper scripts"
|
||||
dodoc "${WORKDIR}"/licensed/usr/share/doc/packages/zarafa-licensed/* || die "Failed to install docs"
|
||||
insinto /etc/zarafa
|
||||
doins -r "${WORKDIR}"/licensed/etc/zarafa/* || die "Failed to install config files"
|
||||
insinto /etc/cron.d
|
||||
doins "${WORKDIR}"/licensed/etc/cron.d/* || die "Failed to install cron files"
|
||||
# insinto /usr/share/zarafa-webaccess/
|
||||
# doins -r "${WORKDIR}"/licensed/usr/share/zarafa-webaccess/* || die "Failed to install webapp files"
|
||||
newinitd "${FILESDIR}"/zarafa-licensed.rc6 zarafa-licensed || die "Failed to install init.d files"
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}"/zarafa-gateway.rc6 zarafa-gateway || die "Failed to install init.d files"
|
||||
newinitd "${FILESDIR}"/zarafa-ical.rc6 zarafa-ical || die "Failed to install init.d files"
|
||||
newinitd "${FILESDIR}"/zarafa-indexer.rc6 zarafa-indexer || die "Failed to install init.d files"
|
||||
newinitd "${FILESDIR}"/zarafa-monitor.rc6 zarafa-monitor || die "Failed to install init.d files"
|
||||
newinitd "${FILESDIR}"/zarafa-server.rc6 zarafa-server || die "Failed to install init.d files"
|
||||
newinitd "${FILESDIR}"/zarafa-spooler.rc6 zarafa-spooler || die "Failed to install init.d files"
|
||||
newinitd "${FILESDIR}"/zarafa-dagent.rc6 zarafa-dagent || die "Failed to install init.d files"
|
||||
}
|
||||
Loading…
Reference in New Issue