Bump
Package-Manager: portage-2.2.0_alpha188 RepoMan-Options: --force
This commit is contained in:
Mario Fetka
parent
c984a0593e
commit
d0164d71f8
|
|
@ -2,6 +2,16 @@
|
|||
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: $
|
||||
|
||||
*zarafa-7.1.5.42059 (30 Jul 2013)
|
||||
|
||||
30 Jul 2013; Mario Fetka <mario.fetka@gmail.com>
|
||||
+files/7.1.5.42059/Datux-sendas.patch,
|
||||
+files/7.1.5.42059/Datux-spamhook.patch,
|
||||
+files/7.1.5.42059/zarafa-7.0.3-sysconfig2confd-1.patch,
|
||||
+files/7.1.5.42059/zarafa-7.1.3-package.patch,
|
||||
+files/7.1.5.42059/zarafa-7.1.4-tcmalloc.patch, +zarafa-7.1.5.42059.ebuild:
|
||||
Bump
|
||||
|
||||
23 Apr 2013; Mario Fetka <mario.fetka@gmail.com> zarafa-7.1.4.41394.ebuild:
|
||||
force the right clucene and swig version
|
||||
|
||||
|
|
|
|||
|
|
@ -5,6 +5,11 @@ AUX 7.1.4.41394/Datux-spamhook.patch 8890 SHA256 e67e6178d27f78530b727ca7cc4e96c
|
|||
AUX 7.1.4.41394/zarafa-7.0.3-sysconfig2confd-1.patch 4843 SHA256 c9196a886f8435dcb2f82b92c6ee4769daf1eeb76b2fdfad4980a88cff461359 SHA512 6b683018a834ca666b0c96226a63280f3a3cde5e1e392e1e9f5681fa870669bbff27ebd719390aeebf670bcf3ba7b05ef0c27a77a039c0099fdc97dec4f0f36d WHIRLPOOL dd8e19057dc40785bee25846b399fec8ec5b61fd43586361a5131ef2a9f3e1dcd36db8290e7a0695b6a0a2fa01dca42581dc8e517bafe9290008f3ec38c3a372
|
||||
AUX 7.1.4.41394/zarafa-7.1.3-package.patch 2008 SHA256 1348391d8a6a708c9359454e7e280e88d928f48aa05170a55dba8f00b6a126c4 SHA512 01d328333e9f04262fa5dba9fd879b6527c809ec920a503e3efe7f95fbd61c2104cdc68d41c55c5baf17c9b5fa7c98cca5fb52c9e71a280da3b6897f26be21fe WHIRLPOOL ce2e13c823695bd3d28c0bc1d0690173ebd254a1eb86e6209d12cc000bc2f744b7e6188473e00825e534c0aec0c78e620de974c112734b2458f264ddfe46b723
|
||||
AUX 7.1.4.41394/zarafa-7.1.4-tcmalloc.patch 679 SHA256 3f982a2a37a42092a4878c7d7af0b235ae8327f26c0f5fe0ea253cbfcc236018 SHA512 086cbabb7d87ee3218de76f3f42cf3fcd9e1abdc289c6a9280556e3ef8812142da68dadb2e0d4da3355382fea27f3f3f3a37d943ef926f064d4bc9f0884c78de WHIRLPOOL 8e1d57b82d896127b384159ebb4b19457a3431250af1029d5cf214f5492f8f78b3c3baa8cf12baa39b2dbeddfa5672c4d5ce97b6a44bf230469d6074a02c829b
|
||||
AUX 7.1.5.42059/Datux-sendas.patch 2439 SHA256 c2692144549cf5b0aad5aea3199c7655db3d6d8d62c8fc65a0333f7def98f5dc SHA512 64e3f43d703265d8aa9d6e2632fac68d1571409414dd48781593855f7def5f2d034501febf626bd809a748eaa8cff743f5e268a71ecd61dd41505f0157105f3e WHIRLPOOL 32fdb7136ee25d7381d3dbd690ca375e01ae097a521a2a42bdd90434b5c7b815e8eddb86ae7958c7be694107c693a543320e5c5455326fa0df618f3c452de048
|
||||
AUX 7.1.5.42059/Datux-spamhook.patch 8890 SHA256 e67e6178d27f78530b727ca7cc4e96cd1e9e3173fa20547cd132464f70d207f5 SHA512 5e11dc0940441e208d877a31d74ba077abd388982859e7c3d6c0f42551ad362d0e9991d2a6ea2b62d794ea84564222ef376025a2b50e60293684cdbd5ec566a4 WHIRLPOOL 7751cb4ceec3abf6261917fa518486fc4c534a6b9888e3fa091f9d86832cac229bb6ace87a33b20de7c68d7de7ac947826e3f360d1c185170587ab287b1bcc56
|
||||
AUX 7.1.5.42059/zarafa-7.0.3-sysconfig2confd-1.patch 4843 SHA256 c9196a886f8435dcb2f82b92c6ee4769daf1eeb76b2fdfad4980a88cff461359 SHA512 6b683018a834ca666b0c96226a63280f3a3cde5e1e392e1e9f5681fa870669bbff27ebd719390aeebf670bcf3ba7b05ef0c27a77a039c0099fdc97dec4f0f36d WHIRLPOOL dd8e19057dc40785bee25846b399fec8ec5b61fd43586361a5131ef2a9f3e1dcd36db8290e7a0695b6a0a2fa01dca42581dc8e517bafe9290008f3ec38c3a372
|
||||
AUX 7.1.5.42059/zarafa-7.1.3-package.patch 2008 SHA256 1348391d8a6a708c9359454e7e280e88d928f48aa05170a55dba8f00b6a126c4 SHA512 01d328333e9f04262fa5dba9fd879b6527c809ec920a503e3efe7f95fbd61c2104cdc68d41c55c5baf17c9b5fa7c98cca5fb52c9e71a280da3b6897f26be21fe WHIRLPOOL ce2e13c823695bd3d28c0bc1d0690173ebd254a1eb86e6209d12cc000bc2f744b7e6188473e00825e534c0aec0c78e620de974c112734b2458f264ddfe46b723
|
||||
AUX 7.1.5.42059/zarafa-7.1.4-tcmalloc.patch 679 SHA256 3f982a2a37a42092a4878c7d7af0b235ae8327f26c0f5fe0ea253cbfcc236018 SHA512 086cbabb7d87ee3218de76f3f42cf3fcd9e1abdc289c6a9280556e3ef8812142da68dadb2e0d4da3355382fea27f3f3f3a37d943ef926f064d4bc9f0884c78de WHIRLPOOL 8e1d57b82d896127b384159ebb4b19457a3431250af1029d5cf214f5492f8f78b3c3baa8cf12baa39b2dbeddfa5672c4d5ce97b6a44bf230469d6074a02c829b
|
||||
AUX junklearn.dspam 924 SHA256 5060aa1c0fd3e103c0243f5372ec4a393d4aebc7ed7c69a9475adead50d6b37e SHA512 43321b5245a5a6b6032fe8f34382826dbc3630e03ff43eda5c41d5782e0df72a2e784638e3047ba141141e4d3d99ef11e555117fb77fc2555e3ce07c7b28f65c WHIRLPOOL 983c2d5c87145a38bb87044cb6b9050092fa7c05bfa6de5317890103663550a86ccdb5af71966e86062943f5e39b6fbb990617048380aab94920602ed5b9d214
|
||||
AUX zarafa-dagent.confd 185 SHA256 5e142b9a6310197cf744a83bf8a134472ed6b497a7b477398f25d14e898480bc SHA512 8845cd227737667df9c96f56d92af2819d3ebb1580dc3399beda140992d10d23688fc50fbfd44a8e3e3bfa9e7e2fbdac0339ddc09b5544e6e7bf84b49f5cbdbc WHIRLPOOL cf3a9898babbc3576434bac86ba02da6aa4c1e67fc4fb1d5f473ad602dc9e7671385345f661ce9c86becf728bc9176ad9ca96b0972624901ac1c1a420c972fe9
|
||||
AUX zarafa-dagent.initd 761 SHA256 c1cbd3beaf8a1abb88bfa49d3acde47a210b9ec7b57da74ed2a83a67d1a59300 SHA512 95a245e95efb34fed6d3e709def711a2d346e4508e8ea2c7af8b1acabf56fa0613afbdd394b1c586738833ee047845a47c85cc9ee3886eba24d14ad32250ff99 WHIRLPOOL ebf4847ee228593d20ec70ff5cb07acb0a35c8292f8eb188cb8d1cc44277ccc7ba5f6799ec1d53e3bc951f5c184d46b620e3f62d5675d2008cacb3b312b9c6bd
|
||||
|
|
@ -29,11 +34,17 @@ DIST libboost-system1.46.1_1.46.1-7ubuntu3_amd64.deb 14550 SHA256 684e5010e378b9
|
|||
DIST libboost-system1.46.1_1.46.1-7ubuntu3_i386.deb 14642 SHA256 cda71933b1fd9c5b6031721585eaf8b14edeb5e5440c14aff9cfbf2e741295d3 SHA512 fac874ac51d8ce2c33d92569d3c1663b41219c1c8cfb644cf27d0a2c208bb9d8dc6869e6bf05dad2e637aa67925ab0c0ccaf5e8a3baed2bf1b8fa53a19479be0 WHIRLPOOL 2659c231efb9b90f32a157410279fa5b07cb43e1ea27830bceb14bf1dd766366ad8e408061f04579fd87669f9cb4bd7cc91320403d86aaa6313db2c5997554c7
|
||||
DIST libicu48_4.8.1.1-3_amd64.deb 8102778 SHA256 a2cbfbc062d20f9494e0d862f942dfe412525cc06f5031950c18c11b437e4173 SHA512 27ce4f82abfb7a5e2e0fddd5ba20bd1d84c45f8aae5cbced82060b9b899cceb8c78cf463fbc06ff62c70458441a1306284afe4860e7c8ae22f8c0a42ad5287d3 WHIRLPOOL c8f4859faacc3cca232be36e52d1e09ab2f56a01221bcd317685e0f3edf3aba15bd221054fc56b92b6a9abdbdaa04019b0c68df95d7aeabcdea5bc4a3bedd089
|
||||
DIST libicu48_4.8.1.1-3_i386.deb 8179546 SHA256 28c03392506f31aa598c40bd9806f17d2d0c65b1aa38309fc99ec7152120158a SHA512 1ac725073b144ed4dab7c056821c47c33f77d206d325d6f212f79aded23a1bb9731141a829a96d3ee43546466870b5bac12109c69c75366aac3f545dde0d71f1 WHIRLPOOL 7e2d13eb8e0c0576944f2ee7d2bd4b8a7843d31d260bced7af6f9f022ecbb42b16eeadd215db261878cee759c54fcd9adcfaacf5fb869cf84ae873a2ee867630
|
||||
DIST libssl1.0.0_1.0.1-4ubuntu5.10_amd64.deb 1048422 SHA256 9f8b0df37301fae9d70f9c9e8df73c7177bf3e27c7ef0995b26f7671e8a9c15c SHA512 b6aff2ae216ebc7ae60a0233bc61b356ed976cd99a5cb42c7c8683c5ec7552a28d0f6d2cf69b487b81bb9491b182c88782c9179817f1f213048b729f17374097 WHIRLPOOL d126d1db1fe555833c8d191b6a10e58b615dc7499640f86392f6a1a171fcc7e7e5463a46cfdeacb3bb989d787d226be6f47c4a7ec6ea5e2095253d826b2c1d16
|
||||
DIST libssl1.0.0_1.0.1-4ubuntu5.10_i386.deb 1008434 SHA256 bef5216ecf59bd36317a20fcae0e81eef65b478dd5cb1dc6329dd7301244ccae SHA512 90c6d37470bd83842455edd82f26c99aa7ccb238f214c68ef39cad18c6ee5a25ce6a1728a9456b862ea4905d0506ae793feef1c62512d2909aeb0a77458db1a5 WHIRLPOOL a60bc700fe4150af52025d8592157156012ad554d27c30fab41e533ce13288903aede665840f5239ad08e16b4b07e164ef535ccd53efb7dafa5495f0310475a3
|
||||
DIST libssl1.0.0_1.0.1-4ubuntu5.9_amd64.deb 1048238 SHA256 6f7a5281452cc053d1d152d18973765840076705dc7085248ff38233897db936 SHA512 0dd021dd6cbc35eef956c0cd42d001a8465533eea3ad3a5eb1371a4a257eb06a7ef1ad90cee33e850acd2db910408fb20e76e5971c1bf1ebc759919e8ec96e4d WHIRLPOOL cd79773fcabd5ad032da8c91abccdac2af82fa1c89bead3c3f443c7169e76b73b1b34fba1cae2fbcf0da97670a1ae3138aea1ef692f9edca6799c2c6536adeb4
|
||||
DIST libssl1.0.0_1.0.1-4ubuntu5.9_i386.deb 1004680 SHA256 f63ed458f5254e7c6fc64ebdf2d324d7d52e4eabdd56511f7515151b955f23d4 SHA512 01071333f33860a8345df020bd247cf86f182931ef07c718003b2957b5fe91ac978d253255c43f5d45f997dcd3c7be3a0901e1e565bf454d0560d4974078b856 WHIRLPOOL eb296f14560c32920e9b4112739626d8c42b4813a7f6d6d34522043cfdae25a65f86f3c4ddabf5012accf36cc69813dd539fb3948e056185d2e9f3dc2f0395c9
|
||||
DIST zcp-7.1.4-41394-ubuntu-12.04-i386-free.tar.gz 44509122 SHA256 96ce4ef641f79df32671e4bb3695be8adeb212414834f090ebd62b583ec0553e SHA512 e19c054d0e23778e9b2b3c963ab77e675e973317678e2e7a7b5670dd4316cbe82ac2152650016988accc66da013b59aa47f1851a09ed4580531669defb30a410 WHIRLPOOL 3c1d2ef0251685eab8c3e4549f2d7fc77693bf03fcd8783a89951832270182de4b386458c3f9a9a9488c4791ba14170e62464949204a811859e8b6eb2616b3a4
|
||||
DIST zcp-7.1.4-41394-ubuntu-12.04-x86_64-free.tar.gz 44292855 SHA256 bf3fb59ef6c8adaf067ee5321e284e5ff1732e087d0d272a271e8cdb4971c52d SHA512 201b6cd9017e55a0ba4769d62c6c67a2deadc655f4b7c55485027300d42dffdb50c84877345a4c4db04f4b0d2605fe4f8a04dc3077fbf647aa12b398aace93a4 WHIRLPOOL 90210e4a98f06e7da4b01003b811ed0c9ca6bd992d5beaebbdacdef6c7418d29c8dcecd5a94b1961bd0e2ca2aca68a154679f9f418b1cae730682aba2f8dd3fc
|
||||
DIST zcp-7.1.4.tar.gz 6469725 SHA256 66b8fad8a452553db520999bde2f765538b27d90db30fa37cee65dfda7701c9a SHA512 ae2e9a1097e64193e82619f6868f1d9952fe7a11bb33b2c6fbb63f31b5366d69dde30eadc30409286044b36373c99b526d1eb5bfa4d079c4d5861a4c1dd445ea WHIRLPOOL 89684c66adf76e5f166544e5e9e999d0c72296b40521ee5a68dccfdd83a28686a5e05c4dbb045c63f48cfb7ef06274407e7fd1a4473f3a011019f3c45d6f00f7
|
||||
DIST zcp-7.1.5-42059-ubuntu-12.04-i386-free.tar.gz 44539714 SHA256 cbe701272843c739614a2d30b4de728295694425ffd92bbbaf807cb5f4705c4a SHA512 75ee8f5c74cab5eaa86faf192dc4028c0461925d4e26ab2be6f6ed8a697b9a6fac2282e952b4f265107c19f00383471fa8db837b0a566e2d12ebcebc3a176c74 WHIRLPOOL 46e8dfc3f745d35e259b3fead70c640131be1482f1613023a55a76a008de82adcba54c0bf046dbc4bb5b108537ddcd3897e437b061416c60fe92ab749d22ae76
|
||||
DIST zcp-7.1.5-42059-ubuntu-12.04-x86_64-free.tar.gz 44326614 SHA256 82ea3366b23fe74efbd92be2c282fba764c0690af4cce9306a4ea2ed57c8c491 SHA512 564650dd90e5b7f0509a339a934088b93dbcdc32cb2e13ead2cb13b580d7f244ba2bccd44c265ff1bf3ff0ae691a12fe27978d19784da723a90485d5f10542c9 WHIRLPOOL 6252231620d69a83a7ad9a75dc123f78d8e37be09e2a85c729af839894ef70f2b6703221b408db3395fba594152d45fb8a49fc69bfcc699a1593ace9da2214f9
|
||||
DIST zcp-7.1.5.tar.gz 6473028 SHA256 d7a28e73672d3ef8da971a486536231b91b4d55b88544d519c19a440ff1ef3e8 SHA512 2220e2c4c52b2ab4d9409a696617a235866ecd099b108411497d075c551293f5526ad0a914e2804236357ac31d67c59cc725ac661c219cd44c30d0656e8cfbcc WHIRLPOOL f65c589404ca6ea625658bb157482256d30abb35844a6d3a7781e16de868ba4dc0a9cec0cf95da82db16cbee8b92d98e08966c2d2ae14eddcc597a839bdc82b6
|
||||
EBUILD zarafa-7.1.4.41394.ebuild 7341 SHA256 600b48eeb359748b1cc9231888123a4bfa2db1f0d0f2352ffc21c8171827c570 SHA512 517c56519177c4ebc8f4661efc8bd65d6257beba9059bf8148f06a6677f27fdf82820439198519a8fdf2fe9f292a55841e6f04bb955edfa02d2b40ac95157782 WHIRLPOOL 911eea87f16101f66b364b87d3621262d8fc90f0051a21555b7a0e6451bd51d5316332010b155c06c6f90495d1fb7f368fcd0bd04c651d30a1f6f4d4a1777313
|
||||
MISC ChangeLog 22801 SHA256 b0996c5599f825bc16aad41d35d200ce0d766df7b9f768a523eee5edd53c2764 SHA512 6d1db31abf93e8900856ef3aa77cae0393dd208f32441fdf7bb4342acf5093e125f3cc94ed051cde1c758f9693dd2a26fd3b4900a5faa23aad5f211f856dbae5 WHIRLPOOL 6ea81026e526d8b761f34e2bf68721cf624651e42131346e5d4758936440f215c7cf9005ab3c8f448e7c78099c954d8aa9a503c9509f03d33928a54eb821149a
|
||||
EBUILD zarafa-7.1.5.42059.ebuild 7343 SHA256 ae616de797c880e74496176902eac026f8785f81bfb333dac4171dce3c5bdd7c SHA512 2d80f979aa77bace680c8cac22e25840b46d1717223f6328b22413ae96c0ed0b40d23c249aca4e45371e42c5bb0d669eca6a56b26c87efff438b1d5769083487 WHIRLPOOL 5d43e3cfab9d11769a5dfafbb1ba18881d88936201a2af1d4b1ecabe4447bb7434be2a09da3273b215386f9e1abd1dd2d2345d553ca63ba7b4d86672b5dd2842
|
||||
MISC ChangeLog 23165 SHA256 970a1bd8964eac195afc2e80edf1783a8b5009ed1d0ad3a746f82518095ef663 SHA512 af9ffa17735b03ff160af817fe24260001c6f1b94dabbd6dd4f9770987667aa971236aeb87248dde6b3614da3f22969bacaada7b6d77a5146602eb43204e2bd1 WHIRLPOOL aea891e0c1d08f30e2a39ea10d43f7d69b12ec97ca4ead5c0687460befe5ca5eb95af847c20e6588b0635b7a27befbd025ee28e9ee257f0fd55f3377f7f75bd3
|
||||
MISC metadata.xml 1238 SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 SHA512 d94394e853ce7bd9109322f37ab5d3526e2bbc4a59ac02d0b66e9d952d221a06ae1c38b6de5cdb142b2b09ac602a57ff03f0525efbbc7b8f33f9662ca42a5dd5 WHIRLPOOL 482453b974eaca6506c4503f49c5c55195790e9b47f19a885d551fa535445104fbb7bc93dc4f30f7faf545f619594fa04d9a8071c21eb55995fef4f7380f55b9
|
||||
|
|
|
|||
|
|
@ -0,0 +1,47 @@
|
|||
--- spooler/mailer.cpp.ori 2011-07-03 15:38:10.162737725 +0200
|
||||
+++ spooler/mailer.cpp 2011-07-03 15:39:14.362790762 +0200
|
||||
@@ -2172,6 +2172,8 @@
|
||||
HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b)
|
||||
{
|
||||
bAllowSendAs = true;
|
||||
+ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) {
|
||||
+ bAllowSendAs = true;
|
||||
} else {
|
||||
|
||||
hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner);
|
||||
--- spooler/Spooler.cpp.ori 2011-07-03 15:46:25.366770639 +0200
|
||||
+++ spooler/Spooler.cpp 2011-07-03 15:46:45.716172033 +0200
|
||||
@@ -1118,6 +1118,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 },
|
||||
{ "always_send_utf8", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE },
|
||||
--- php-webclient-ajax/client/modules/readmailitemmodule.js.ori 2011-06-22 00:02:22.000000000 +0200
|
||||
+++ php-webclient-ajax/client/modules/readmailitemmodule.js 2011-07-24 01:19:03.454049593 +0200
|
||||
@@ -479,7 +479,7 @@
|
||||
dhtml.addEvent(this, recipientItemSenderRepresentation, "click", eventReadmailClickEmail);
|
||||
dhtml.addEvent(this, recipientItemSenderRepresentation, "contextmenu", eventReadmailAddressContextMenu);
|
||||
|
||||
- dhtml.addElement(fromElement,"span","emailaddress","", NBSP+_("on behalf of")+NBSP);
|
||||
+ //dhtml.addElement(fromElement,"span","emailaddress","", NBSP+_("on behalf of")+NBSP);
|
||||
}
|
||||
|
||||
var recipientItemSenderRepresentation = dhtml.addElement(fromElement,"a","emailaddress","senderrepresentatation_label",sender_representation);
|
||||
--- installer/linux/spooler.ori 2011-07-03 14:41:32.934761391 +0200
|
||||
+++ installer/linux/spooler.cfg 2011-07-02 18:29:54.958164996 +0200
|
||||
@@ -76,7 +76,11 @@
|
||||
# delegates (other user than yourself in the From: header)
|
||||
# In installations before 6.20, this value was always 'yes'.
|
||||
# IMPORTANT: This feature overrides "send-as" functionality.
|
||||
-always_send_delegates = no
|
||||
+always_send_delegates = yes
|
||||
+
|
||||
+# Set this value to 'yes' to let the spooler always send emails even
|
||||
+# if the from emailadres someone elses
|
||||
+always_send_as = yes
|
||||
|
||||
# Set this value to 'no' if you do NOT want to allow redirected e-mails
|
||||
# being sent with their original 'FROM' header
|
||||
|
|
@ -0,0 +1,219 @@
|
|||
diff -ru zarafa-7.1.4/provider/libserver/ZarafaCmd.cpp zarafa-7.1.4.spamhook/provider/libserver/ZarafaCmd.cpp
|
||||
--- zarafa-7.1.4/provider/libserver/ZarafaCmd.cpp 2013-02-28 17:13:17.000000000 +0100
|
||||
+++ zarafa-7.1.4.spamhook/provider/libserver/ZarafaCmd.cpp 2013-04-15 11:34:45.018632455 +0200
|
||||
@@ -84,6 +84,7 @@
|
||||
#include "StreamUtil.h"
|
||||
#include "CommonUtil.h"
|
||||
#include "StorageUtil.h"
|
||||
+#include "UnixUtil.h"
|
||||
|
||||
#include "ZarafaICS.h"
|
||||
|
||||
@@ -7655,6 +7656,179 @@
|
||||
bool bMoved;
|
||||
}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, unsigned int ulDestFolderId)
|
||||
+{
|
||||
+
|
||||
+ ALLOC_DBRESULT();
|
||||
+ ECRESULT er = erSuccess;
|
||||
+ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script");
|
||||
+ string shMailStatus;
|
||||
+ entryId* junkFolderEntryId;
|
||||
+ entryId* wasteBucketEntryId;
|
||||
+ int shNumRows;
|
||||
+
|
||||
+ //dont do anything if the junklearn script doesnt exist:
|
||||
+ int fCheck=open(shScriptPath.c_str(), O_RDONLY);
|
||||
+ if (fCheck==0) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found");
|
||||
+ er=erSuccess;
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ close(fCheck);
|
||||
+
|
||||
+ //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);
|
||||
+ 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.
|
||||
+ 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;
|
||||
+ }
|
||||
+
|
||||
+ //Get 'junk folder' entryId.
|
||||
+ FREE_DBRESULT();
|
||||
+ 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.
|
||||
+ 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;
|
||||
+ }
|
||||
+
|
||||
+ //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;
|
||||
+ }
|
||||
+
|
||||
+ //now we can determine if object being moved from or to the junkfolder
|
||||
+ //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";
|
||||
+ else
|
||||
+ //its just a normal movement, so do nothing.
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Get the mail from the DB.
|
||||
+ FREE_DBRESULT();
|
||||
+ 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);
|
||||
+ shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+
|
||||
+ if(shNumRows<=0) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ {
|
||||
+ //now its time to open the spamhook script and pass the mail to it:
|
||||
+ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId);
|
||||
+ int ulFpWrite = -1;
|
||||
+ int ulFpRead = -1;
|
||||
+ int ulCommandRetval;
|
||||
+
|
||||
+ //we asume failure, unless we make it all the way though the script
|
||||
+ er=ZARAFA_E_UNKNOWN;
|
||||
+
|
||||
+ pid_t ulCommandPid = unix_popen_rw(g_lpSessionManager->GetLogger(), shScriptPath.c_str(), &ulFpWrite, &ulFpRead, NULL, NULL, true, false);
|
||||
+ if (ulCommandPid <= 0) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error opening subprocess.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //pass the data to the subprocess:
|
||||
+ write(ulFpWrite, lpDBRow[0], strlen(lpDBRow[0]));
|
||||
+ ulCommandRetval=unix_pclose(ulFpRead, ulFpWrite, ulCommandPid);
|
||||
+
|
||||
+ //subprocess is done, check results
|
||||
+ if (ulCommandRetval<0) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(WEXITSTATUS(ulCommandRetval)));
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed.");
|
||||
+ 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)
|
||||
{
|
||||
@@ -8641,6 +8815,16 @@
|
||||
|
||||
// @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++)
|
||||
+ {
|
||||
+ 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 -ru zarafa-7.1.4/provider/server/ECServer.cpp zarafa-7.1.4.spamhook/provider/server/ECServer.cpp
|
||||
--- zarafa-7.1.4/provider/server/ECServer.cpp 2013-02-28 17:13:17.000000000 +0100
|
||||
+++ zarafa-7.1.4.spamhook/provider/server/ECServer.cpp 2013-04-15 11:14:40.000000000 +0200
|
||||
@@ -963,6 +963,7 @@
|
||||
{ "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,103 @@
|
|||
Submitted By: Mario Fetka (mario.fetka@gmail.com)
|
||||
Date: 2010-10-13
|
||||
Initial Package Version: 6.40.2 (7.0.3)
|
||||
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 -uNr zarafa-7.0.3.orig/installer/linux/Makefile.am zarafa-7.0.3/installer/linux/Makefile.am
|
||||
--- zarafa-7.0.3.orig/installer/linux/Makefile.am 2011-11-20 18:45:15.661461795 +0100
|
||||
+++ zarafa-7.0.3/installer/linux/Makefile.am 2011-11-20 18:48:10.780508507 +0100
|
||||
@@ -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 -uNr zarafa-7.0.3.orig/installer/userscripts/createcompany.in zarafa-7.0.3/installer/userscripts/createcompany.in
|
||||
--- zarafa-7.0.3.orig/installer/userscripts/createcompany.in 2011-11-20 18:45:15.640628342 +0100
|
||||
+++ zarafa-7.0.3/installer/userscripts/createcompany.in 2011-11-20 18:47:09.706088759 +0100
|
||||
@@ -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-server ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa-server
|
||||
elif [ -f @sysconfdir@/default/zarafa ]; then
|
||||
. @sysconfdir@/default/zarafa
|
||||
fi
|
||||
diff -uNr zarafa-7.0.3.orig/installer/userscripts/creategroup.in zarafa-7.0.3/installer/userscripts/creategroup.in
|
||||
--- zarafa-7.0.3.orig/installer/userscripts/creategroup.in 2011-11-20 18:45:15.640628342 +0100
|
||||
+++ zarafa-7.0.3/installer/userscripts/creategroup.in 2011-11-20 18:46:48.060132907 +0100
|
||||
@@ -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-server ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa-server
|
||||
elif [ -f @sysconfdir@/default/zarafa ]; then
|
||||
. @sysconfdir@/default/zarafa
|
||||
fi
|
||||
diff -uNr zarafa-7.0.3.orig/installer/userscripts/createuser.in zarafa-7.0.3/installer/userscripts/createuser.in
|
||||
--- zarafa-7.0.3.orig/installer/userscripts/createuser.in 2011-11-20 18:45:15.640628342 +0100
|
||||
+++ zarafa-7.0.3/installer/userscripts/createuser.in 2011-11-20 18:47:04.215316936 +0100
|
||||
@@ -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-server ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa-server
|
||||
elif [ -f @sysconfdir@/default/zarafa ]; then
|
||||
. @sysconfdir@/default/zarafa
|
||||
fi
|
||||
diff -uNr zarafa-7.0.3.orig/installer/userscripts/deletecompany.in zarafa-7.0.3/installer/userscripts/deletecompany.in
|
||||
--- zarafa-7.0.3.orig/installer/userscripts/deletecompany.in 2011-11-20 18:45:15.638313511 +0100
|
||||
+++ zarafa-7.0.3/installer/userscripts/deletecompany.in 2011-11-20 18:46:16.113192833 +0100
|
||||
@@ -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-server ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa-server
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d
|
||||
diff -uNr zarafa-7.0.3.orig/installer/userscripts/deletegroup.in zarafa-7.0.3/installer/userscripts/deletegroup.in
|
||||
--- zarafa-7.0.3.orig/installer/userscripts/deletegroup.in 2011-11-20 18:45:15.638313511 +0100
|
||||
+++ zarafa-7.0.3/installer/userscripts/deletegroup.in 2011-11-20 18:46:26.173434957 +0100
|
||||
@@ -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-server ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa-server
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d
|
||||
diff -uNr zarafa-7.0.3.orig/installer/userscripts/deleteuser.in zarafa-7.0.3/installer/userscripts/deleteuser.in
|
||||
--- zarafa-7.0.3.orig/installer/userscripts/deleteuser.in 2011-11-20 18:45:15.659146961 +0100
|
||||
+++ zarafa-7.0.3/installer/userscripts/deleteuser.in 2011-11-20 18:47:14.958433297 +0100
|
||||
@@ -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-server ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa-server
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
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-7.1.3.orig/configure.ac zarafa-7.1.3/configure.ac
|
||||
--- zarafa-7.1.3.orig/configure.ac 2013-02-28 16:46:43.297471480 +0100
|
||||
+++ zarafa-7.1.3/configure.ac 2013-02-28 16:51:10.269133875 +0100
|
||||
@@ -786,19 +786,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
|
||||
- ECtools/zarafa-msr/Makefile
|
||||
- ECtools/zarafa-ocf/Makefile
|
||||
- ECtools/za-extra/Makefile
|
||||
-])
|
||||
-fi
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
diff -uNr zarafa-7.1.3.orig/ECtools/Makefile.am zarafa-7.1.3/ECtools/Makefile.am
|
||||
--- zarafa-7.1.3.orig/ECtools/Makefile.am 2013-02-28 16:46:43.114473768 +0100
|
||||
+++ zarafa-7.1.3/ECtools/Makefile.am 2013-02-28 16:49:37.728290795 +0100
|
||||
@@ -1,5 +1 @@
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = zarafa-backup zarafa-report zarafa-msr za-extra zarafa-ocf
|
||||
-endif
|
||||
-
|
||||
SUBDIRS = $(PROSUBS) zarafa-archiver zarafa-admin zarafa-monitor zarafa-passwd zarafa-fsck zarafa-cfgchecker zarafa-stats zarafa-search zarafa-utils
|
||||
diff -uNr zarafa-7.1.3.orig/Makefile.am zarafa-7.1.3/Makefile.am
|
||||
--- zarafa-7.1.3.orig/Makefile.am 2013-02-28 16:46:43.051474555 +0100
|
||||
+++ zarafa-7.1.3/Makefile.am 2013-02-28 16:50:06.153935425 +0100
|
||||
@@ -1,9 +1,5 @@
|
||||
ACLOCAL_AMFLAGS = -I autoconf
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = liblicense licensed
|
||||
-endif
|
||||
-
|
||||
SUBDIRS = common libfreebusy mapi4linux zarafa-libsync $(PROSUBS) provider libicalmapi inetmapi php-ext ECtools spooler gateway caldav installer po doc
|
||||
|
||||
if WITH_SWIG
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- zarafa-7.1.4/configure.ac.orig 2013-04-15 21:53:32.183138074 +0200
|
||||
+++ zarafa-7.1.4/configure.ac 2013-04-15 21:55:33.742618371 +0200
|
||||
@@ -493,7 +493,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" AC_DEFINE(HAVE_TCMALLOC, [1], [Google TCMalloc available]) ],
|
||||
+ [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" AC_DEFINE(HAVE_TCMALLOC, [1], [Google TCMalloc available]) ],
|
||||
[ WITH_TCMALLOC=no ])
|
||||
AC_SUBST(TCMALLOC_LIBS)
|
||||
else
|
||||
|
|
@ -0,0 +1,197 @@
|
|||
# Copyright 1999-2013 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 php5-4"
|
||||
|
||||
PYTHON_DEPEND="python? 2"
|
||||
|
||||
inherit eutils flag-o-matic php-ext-base-r1 python unpacker autotools versionator
|
||||
|
||||
DESCRIPTION="Open Source Groupware Solution"
|
||||
HOMEPAGE="http://zarafa.com/"
|
||||
|
||||
ZARAFA_RELEASE="final"
|
||||
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 )
|
||||
|
||||
SRC_URI="http://download.zarafa.com/community/${ZARAFA_RELEASE}/${MY_PVM}/${MY_PV}/sourcecode/zcp-${MY_PVR}.tar.gz
|
||||
amd64? ( licensed? ( http://download.zarafa.com/community/${ZARAFA_RELEASE}/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-ubuntu-12.04-x86_64-free.tar.gz
|
||||
https://launchpad.net/ubuntu/+archive/primary/+files/libboost-system1.46.1_1.46.1-7ubuntu3_amd64.deb
|
||||
https://launchpad.net/ubuntu/+archive/primary/+files/libboost-filesystem1.46.1_1.46.1-7ubuntu3_amd64.deb
|
||||
https://launchpad.net/ubuntu/+archive/primary/+files/libssl1.0.0_1.0.1-4ubuntu5.10_amd64.deb
|
||||
https://launchpad.net/ubuntu/+archive/primary/+files/libicu48_4.8.1.1-3_amd64.deb ) )
|
||||
x86? ( licensed? ( http://download.zarafa.com/community/${ZARAFA_RELEASE}/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-ubuntu-12.04-i386-free.tar.gz
|
||||
https://launchpad.net/ubuntu/+archive/primary/+files/libboost-system1.46.1_1.46.1-7ubuntu3_i386.deb
|
||||
https://launchpad.net/ubuntu/+archive/primary/+files/libboost-filesystem1.46.1_1.46.1-7ubuntu3_i386.deb
|
||||
https://launchpad.net/ubuntu/+archive/primary/+files/libssl1.0.0_1.0.1-4ubuntu5.10_i386.deb
|
||||
https://launchpad.net/ubuntu/+archive/primary/+files/libicu48_4.8.1.1-3_i386.deb ) )"
|
||||
S="${WORKDIR}"/zarafa-${MY_PVR}
|
||||
|
||||
ZARAFA_SERVICES="dagent gateway ical monitor search server spooler"
|
||||
|
||||
LICENSE="AGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~x86 ~amd64 ~arm"
|
||||
RESTRICT="mirror"
|
||||
IUSE="debug kerberos icu ldap logrotate perl +python static +swig tcmalloc licensed sparsehash profiling pic"
|
||||
|
||||
RDEPEND=">=dev-libs/libical-0.44
|
||||
>=dev-cpp/libvmime-0.9.2_pre512
|
||||
virtual/httpd-php
|
||||
virtual/mysql
|
||||
=dev-cpp/clucene-0.9.21b*
|
||||
dev-db/kyotocabinet
|
||||
dev-libs/boost
|
||||
dev-libs/libxml2
|
||||
dev-libs/openssl
|
||||
net-misc/curl
|
||||
sys-libs/e2fsprogs-libs
|
||||
sys-libs/zlib
|
||||
icu? ( dev-libs/icu )
|
||||
kerberos? ( virtual/krb5 )
|
||||
ldap? ( net-nds/openldap )
|
||||
logrotate? ( app-admin/logrotate )
|
||||
perl? ( dev-lang/perl )
|
||||
python? ( dev-lang/python )
|
||||
tcmalloc? ( dev-util/google-perftools )
|
||||
swig? ( <dev-lang/swig-2 )"
|
||||
DEPEND="${RDEPEND}
|
||||
sparsehash? ( dev-cpp/sparsehash )
|
||||
dev-util/pkgconfig
|
||||
sys-devel/gettext"
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \
|
||||
EPATCH_FORCE="yes" epatch
|
||||
edos2unix php-webclient-ajax/config.php.dist
|
||||
AT_M4DIR="autoconf" eautoreconf
|
||||
if use licensed; then
|
||||
# not a hack just correct a script
|
||||
sed -i "s!/etc/default/zarafa-ssm!/etc/conf.d/zarafa-ssm!g" "${WORKDIR}"/licensed/usr/bin/zarafa-ssm || die "sed failed"
|
||||
fi
|
||||
append-flags "-fPIC"
|
||||
}
|
||||
|
||||
|
||||
src_unpack() {
|
||||
unpack zcp-${MY_PVR}.tar.gz
|
||||
if use licensed; then
|
||||
if [[ "${ARCH}" == "amd64" ]]; then
|
||||
unpack zcp-${MY_PV}-ubuntu-12.04-x86_64-free.tar.gz
|
||||
fi
|
||||
|
||||
if [[ "${ARCH}" == "x86" ]]; then
|
||||
unpack zcp-${MY_PV}-ubuntu-12.04-i386-free.tar.gz
|
||||
fi
|
||||
pushd "${WORKDIR}"
|
||||
mkdir licensed
|
||||
cd licensed
|
||||
unpack_deb $(find ./../ -name "zarafa-licensed*.deb")
|
||||
unpack_deb $(find ./../ -name "zarafa-client*.deb")
|
||||
unpack_deb $(find ./../../ -name "libboost-system1.46.1*.deb")
|
||||
unpack_deb $(find ./../../ -name "libboost-filesystem1.46.1*.deb")
|
||||
unpack_deb $(find ./../../ -name "libssl1.0.0*.deb")
|
||||
unpack_deb $(find ./../../ -name "libicu48*.deb")
|
||||
popd
|
||||
fi
|
||||
cd "${S}"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
append-flags -fpermissive
|
||||
econf \
|
||||
--enable-oss \
|
||||
--disable-testtools \
|
||||
--enable-release \
|
||||
--enable-unicode \
|
||||
--enable-epoll \
|
||||
--with-userscript-prefix=/etc/zarafa/userscripts \
|
||||
--with-quotatemplate-prefix=/etc/zarafa/quotamails \
|
||||
--with-searchscripts-prefix=/etc/zarafa/searchscripts \
|
||||
$(use_with pic) \
|
||||
$(use_enable icu) \
|
||||
$(use_enable static) \
|
||||
$(use_enable perl) \
|
||||
$(use_enable python) \
|
||||
$(use_enable swig) \
|
||||
$(use_enable tcmalloc)
|
||||
$(use_enable profiling) \
|
||||
$(use_enable sparsehash) \
|
||||
$(use_enable debug)
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
find swig -type f | xargs touch
|
||||
emake || die "emake failed"
|
||||
}
|
||||
|
||||
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"
|
||||
|
||||
php-ext-base-r1_src_install
|
||||
|
||||
if [[ "${ARCH}" == "x86" || "${ARCH}" == "amd64" ]]; then
|
||||
dobin "${WORKDIR}"/licensed/usr/bin/zarafa-ssm || die "Failed to install licensed binaries"
|
||||
make_wrapper zarafa-licensed "/opt/zarafa/bin/zarafa-licensed" /opt/zarafa/bin /opt/zarafa/$(get_libdir)
|
||||
make_wrapper zarafa-report "/opt/zarafa/bin/zarafa-report" /opt/zarafa/bin /opt/zarafa/$(get_libdir)
|
||||
if use licensed; then
|
||||
ZARAFA_SERVICES="${ZARAFA_SERVICES} licensed"
|
||||
into /opt/zarafa
|
||||
dobin "${WORKDIR}"/licensed/usr/bin/zarafa-{licensed,report} || die "Failed to install licensed binaries"
|
||||
dolib.so $(find ${WORKDIR}/licensed -name "*.so*")
|
||||
doman "${WORKDIR}"/licensed/usr/share/man/*/zarafa-*.gz || die "Failed to install man files"
|
||||
dodoc "${WORKDIR}"/licensed/usr/share/doc/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"
|
||||
doconfd "${WORKDIR}"/licensed/etc/default/zarafa-ssm || die "Failed to install sysconfig files"
|
||||
fi
|
||||
fi
|
||||
|
||||
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"
|
||||
rm "${D}"/etc/conf.d/zarafa || die "Failed to remove wrong file files"
|
||||
|
||||
exeinto /etc/zarafa/userscripts/
|
||||
newexe "${FILESDIR}"/junklearn.dspam junklearn
|
||||
|
||||
if use logrotate; then
|
||||
insinto /etc/logrotate.d
|
||||
newins "${FILESDIR}"/zarafa.logrotate zarafa || die "Failed to install logrotate"
|
||||
fi
|
||||
if use ldap; then
|
||||
insinto /etc/openldap/schema
|
||||
doins installer/ldap/zarafa.* || die "Failed to install ldap schema files"
|
||||
fi
|
||||
|
||||
insinto /etc/zarafa
|
||||
doins "${S}"/installer/linux/*.cfg || die "Failed to install config files"
|
||||
|
||||
dodir /var/log/zarafa
|
||||
keepdir /var/log/zarafa
|
||||
|
||||
for service in ${ZARAFA_SERVICES}; do
|
||||
newconfd "${FILESDIR}/zarafa-${service}.confd" "zarafa-${service}"
|
||||
newinitd "${FILESDIR}/zarafa-${service}.initd" "zarafa-${service}"
|
||||
done
|
||||
}
|
||||
Loading…
Reference in New Issue