dbp
/
zarafa
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump 

Package-Manager: portage-2.2.14
RepoMan-Options: --force
This commit is contained in:
Mario Fetka 2015-08-05 11:06:01 +02:00
parent 5827ebf471
commit a86a704809
23 changed files with 1590 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
net-mail/zarafa/ChangeLog
View File

@ -2,6 +2,31 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
*zarafa-7.1.13.51032 (05 Aug 2015)
05 Aug 2015; Mario Fetka <mario.fetka@gmail.com>
+files/7.1.13.51032/Datux-sendas.patch,
+files/7.1.13.51032/Datux-spamhook.patch,
+files/7.1.13.51032/zarafa-01-oss-configure.patch,
+files/7.1.13.51032/zarafa-02-ldapmsplugin.patch,
+files/7.1.13.51032/zarafa-05-libdeps.patch,
+files/7.1.13.51032/zarafa-07-sonames.patch,
+files/7.1.13.51032/zarafa-10-translations.patch,
+files/7.1.13.51032/zarafa-14-shared-libs.patch,
+files/7.1.13.51032/zarafa-22-gcc47.patch,
+files/7.1.13.51032/zarafa-7.1.10-imap-badcharset.patch,
+files/7.1.13.51032/zarafa-7.1.10-imap-fetch-body.patch,
+files/7.1.13.51032/zarafa-7.1.10-kyotocabinet.patch,
+files/7.1.13.51032/zarafa-7.1.11-vacation-headers.patch,
+files/7.1.13.51032/zarafa-7.1.11-vacation-headers2.patch,
+files/7.1.13.51032/zarafa-7.1.11-webaccess-fail2ban.patch,
+files/7.1.13.51032/zarafa-7.1.12-gsoap-sslv3.patch,
+files/7.1.13.51032/zarafa-7.1.12-upgrade-lock.patch,
+files/7.1.13.51032/zarafa-7.1.5-gentoo-swig1.3.patch,
+files/7.1.13.51032/zarafa-7.1.9-sysconfig2confd-1.patch,
+zarafa-7.1.13.51032.ebuild, zarafa-7.1.12.49411.ebuild:
Bump
*zarafa-7.1.12.49411 (27 Jun 2015)
27 Jun 2015; Mario Fetka <mario.fetka@gmail.com>

28
net-mail/zarafa/Manifest
View File

@ -20,6 +20,25 @@ AUX 7.1.12.49411/zarafa-7.1.12-licensed-archiver.patch 4670 SHA256 2ae3e36be6608
AUX 7.1.12.49411/zarafa-7.1.12-upgrade-lock.patch 2288 SHA256 5d0a72493429b96f19e69dd5ee1ff83e2136ae671d628def60d64e9c50b201e7 SHA512 1f88f197e5700e72791e9f411eb1e900a9959c003d4db463c2a6a9020359e52fe97c41cb20b6b64ce2e2a6ef78aa5c30946f74c0db7e21e62167d0e5ba9f4ae3 WHIRLPOOL bbd445b7484945a67384abb351f08a99c3c643e724fc458a0fc62fd4460aa443dbf6ebb41bc5a7beb1b7904e0c3f3c7e38e9f0a30a98e1675dd1248a634bc4d5
AUX 7.1.12.49411/zarafa-7.1.5-gentoo-swig1.3.patch 621 SHA256 12666f1a041d4dde86577860c96fd7ca67f6e2ce33b981e8f57ac336bba48f19 SHA512 419b4f0b12ab18ec140e2d829a1355236f2fbecfa4c26262c7044142a6c56299e053cff4a21a50e5793b45419431c078080f8ff4dc715ad89725aa9921e320fa WHIRLPOOL 8adbad8396d1151942ea78daf52a11f050d59fabe476159afac86c7178e01733cf9848a163031663fdbf7858994c569318495181a196e710a06d54b621185908
AUX 7.1.12.49411/zarafa-7.1.9-sysconfig2confd-1.patch 4588 SHA256 545613df0455378db89ac4db91ada562dd4b820a3d62f5efb36020863b9e0066 SHA512 0bc8a3ba4aec7afc79ce26505278dff9bb85cd52b95eee984b0da3219b29d4da361893613c5a94488f71cf2f17dfdf2c583c8121446094c7027d6ab148f6b2f5 WHIRLPOOL 66bb72ce368cc620b51f93735181a100f87c1c679b627679e5da270d7a2c57a0f79d7575a55d624784085c56ac38d9d9264922936a4c31c62100bf8eadb24155
AUX 7.1.13.51032/Datux-sendas.patch 2439 SHA256 c2692144549cf5b0aad5aea3199c7655db3d6d8d62c8fc65a0333f7def98f5dc SHA512 64e3f43d703265d8aa9d6e2632fac68d1571409414dd48781593855f7def5f2d034501febf626bd809a748eaa8cff743f5e268a71ecd61dd41505f0157105f3e WHIRLPOOL 32fdb7136ee25d7381d3dbd690ca375e01ae097a521a2a42bdd90434b5c7b815e8eddb86ae7958c7be694107c693a543320e5c5455326fa0df618f3c452de048
AUX 7.1.13.51032/Datux-spamhook.patch 8890 SHA256 e67e6178d27f78530b727ca7cc4e96cd1e9e3173fa20547cd132464f70d207f5 SHA512 5e11dc0940441e208d877a31d74ba077abd388982859e7c3d6c0f42551ad362d0e9991d2a6ea2b62d794ea84564222ef376025a2b50e60293684cdbd5ec566a4 WHIRLPOOL 7751cb4ceec3abf6261917fa518486fc4c534a6b9888e3fa091f9d86832cac229bb6ace87a33b20de7c68d7de7ac947826e3f360d1c185170587ab287b1bcc56
AUX 7.1.13.51032/zarafa-01-oss-configure.patch 2340 SHA256 305b491e40fc860f96b06ff073b75a97470e10a5555759eb078e1876fb4109c3 SHA512 621638be2b55915662b96357f18e72b1879ca8c5d1d5c7bd28f92f5fa55bcad44a5fb6dd956386afa3264d066791ac17bff32d4d4ce946c637226bd31b1ad033 WHIRLPOOL 40987eaa40488369ed6951f2426a3fcd30b364d95e032c99006b581af14bf561a3a48fa997c30424114f420d60ec8fd4d2312890eb22c61ce5ff9d159d59ff53
AUX 7.1.13.51032/zarafa-02-ldapmsplugin.patch 1001 SHA256 2e2c62e598b084cb78657dcbb4464f0ea12761dd442626a25ab1111c22c431b7 SHA512 09f93aaa4fae84dc1b85234301ede199f77b5ae80d10a5bc2de4bf435b723c61203fd7409df648fe8dc9c1bb1772f0695c471a4fc320dba009cd265c52ae8804 WHIRLPOOL 7abef2073d149a5f7a8f96cabbce79a235f2f10f7ea9638b5fa7db3d9d45a5553a626b7db623f1433946528cf0240a30feeaf1a33db7a86b29a0f9621786fadc
AUX 7.1.13.51032/zarafa-05-libdeps.patch 3902 SHA256 a20bad2d970c081e5568f5253d67b56d9139f43db97d5bde871a29dfc84dc63c SHA512 c5497f8f55ef91b3732c9826323bbd32a0c3110c66f18b7a1b274ae99602bf1a04073b438d899146124e065d839223d9eb31b263af9bc5b6a93cc6cc4e22b20c WHIRLPOOL 2faa73dd957324805a08967994246c5ccfa50951b186dbce0805c4214c75e32678091b1c62af16bd7a0fc5916df63566c2f85af5cd417b4b0dc9c4ead23b1013
AUX 7.1.13.51032/zarafa-07-sonames.patch 6435 SHA256 96e559c154b30e0a02a965ccac4fc0ec0fe88c1d2432a7b4ce847c06db8ca99a SHA512 f252c828a9b210cd11173a5c3418d24c3700d1144c45b312fdc948a1ba80ffa217d451aa3d1ddbabbd89458800b99f7f16e48d5cefe2c0c3f4549041bf4650ab WHIRLPOOL 8c7d64513aa2fd3c152722aa7f99bf1ac93c2967a5dd1579c2ed88d2aa0d9ca64da644198c8c864137aa2d50e5104b3cba4483a0127dbd57ac5a1d0113b3c4d3
AUX 7.1.13.51032/zarafa-10-translations.patch 1906 SHA256 2f353d1ad6b87b48a9e09a2610c5e82873fa13c19ffdda2dc42fbea9896342d6 SHA512 fbbfa7d05c130959e5cdfd83087ee66d8d39dc3bdde944738ee1a4fe3f6387064930789d29a8cb19dd13d27f80a562b5bbf56f76e32fc05451d7dffc5332599f WHIRLPOOL ff3eb5292848d1fccdc1fad471e2d112a5ec79d6697ce977b1a41a430e62d201db4fa12bcdfc20971ae5b48c19a78cfd01faf0effaf9da056921ce9e3b3a8328
AUX 7.1.13.51032/zarafa-14-shared-libs.patch 4953 SHA256 3794a3e3b62c3a8c905ea690bb99c908c6bd011cafb5ce555af5f4ef1cdd5b5c SHA512 71fbc08b3b652c30d964181b10f6978508e7fdcb95ac8e1d0a77c2b343a24649cd11c393432ba9a183345b21721d862477d6c9b4ffe6b9bea3f37a716a06f2fd WHIRLPOOL 3b91fb570d37727531dce656e80782f827cdf4b9e70f2cbda1eca2ea83cdaa4838690ef0b8285711684f47b0345526234e60f531ee607c1a6398724a81d649e0
AUX 7.1.13.51032/zarafa-22-gcc47.patch 4291 SHA256 9c1ba4853a55c30f02c81afa2068c19886af26542730b9feb883040830135dfc SHA512 b91299a5e21ec63696b1978e38f9407a4e9d23253ad30beba113da839a03f0772d1b0ddee31206297ac7109bea3f33c2c4b31b5322b0db66352f92c9e2f5a75e WHIRLPOOL c42bf3d3cdbfd61c83ba069db9a5da4a69cb0bc62afaffc414062e78467e2d624cd717cc6186d0f8a0e19221e782df7cde725a1b70da2aabc70520d61530c79e
AUX 7.1.13.51032/zarafa-7.1.10-imap-badcharset.patch 1127 SHA256 01f8ae55b2445c912fc3aa501add6617c8dbfd34323ec97ecfee5f73ab909484 SHA512 149218ae2036f8eaa9ad0f5e7a000179bbeb2adfbb850067803aee65d9c491b3191ea018f87aeadd282d1f116eb984e96f0b8b54507d5bdddddc400d92f5a1a9 WHIRLPOOL 340d78cf6ebdf7e8a6e1503b5313780091b69355110d07714abcf49434b95a1e24db976209b9d83609f66b739dcd578305531d66b13cd24c396fb9e9443a9ae0
AUX 7.1.13.51032/zarafa-7.1.10-imap-fetch-body.patch 3665 SHA256 93226c97a6e4c6dfbe04e81de656f0abe96390581d736bd385d113ce6c76edf4 SHA512 02a846b4498345b0f2c27c988d1bb981d61c8534b9a9f6e55165bf4772ed1d6167d55cea7775c05cd76b9a4b227f0491e8def62df1331bdf0942b0271f4a79b7 WHIRLPOOL a7b4630dbf62b339d5b26be52dbc097fbd8ac7b8bd1f94da4dea407333015cab737921ce17742cc07e27f1c0e74c640ae3a5742c1e205a3279164dd5e88bfbe6
AUX 7.1.13.51032/zarafa-7.1.10-kyotocabinet.patch 1504 SHA256 b70536ddd77a46256017b5b3936717ba58b4f57fe0e2c0bf0fd6c9848b9a5479 SHA512 6d3e3855069f02ed45d5bb20371a2f3971a8be283866f4fdb9a97d25c47cdfb26447988e055ffd407bd4f5b83966ba45f77ac0109de439aab93d1706d7bba687 WHIRLPOOL d25dee5e57371749ede427c66ab87e8d4bf71f84399bcd5d813378c48b754ff38a04e7b402a7002518b49b48be29a8fc26a9138849e5502f83aaee5ac6419c8d
AUX 7.1.13.51032/zarafa-7.1.11-vacation-headers.patch 2226 SHA256 978256aa24c4c0b36f3767373774af7c4abbbf01b3a9665ab678db727531904c SHA512 3f92c33f450df5d0c8be524130d6da48fb7db5ebef80d5efb71a1f7e3ea9ef22e0af7b3abadda5daac0b58c8a70004e479114752afef33fff72ef50e976106af WHIRLPOOL e9f0e48e3638cdd7e5c068ffc4e69cf98a110f01352a079101f1a1f91fac738ae570376f77b22908c06f9751c5cb06c65621399b0c54c4772f3925a7c187c199
AUX 7.1.13.51032/zarafa-7.1.11-vacation-headers2.patch 2131 SHA256 00007d681f449860f2d23a360ebab38c4284a26102063af37a6adfa1a1382c0e SHA512 6a62a7690f0245fe55c008b1a202a0b44e63a9726c42c8063fcbf5e32039636011b2fbd4b8c86daaa2fbaa145b8f94594b51f02109e19060a487a1fa65b3eab1 WHIRLPOOL f23571a657a58de355953b4b7e4563b15da29e6e603dce6cfa1ec4fdd889701e2b99d612888dcdcdccf948fb9df6d14928956d197d0d62c53b45915abae0fbd1
AUX 7.1.13.51032/zarafa-7.1.11-webaccess-fail2ban.patch 1114 SHA256 40458b9ae2dd291fca17f4e9f974d126fa4aefe066cfd6d3da474464bba4de03 SHA512 cc0ea349e2da6e3355612b316d44272971887e7a932b520fd8c05f823db095766435bfc71860bcfa58497313ba9d3aa683c1e9d8ff9649218be8b381b0703ed7 WHIRLPOOL 375ce40a5660491dd214bb6730cfe170fcf6917d3167d4b8ad503be6996e3d7d714added59085e0acd4663444d8a8b9d3af42edd8a239b20bb626e2652e5e381
AUX 7.1.13.51032/zarafa-7.1.12-gsoap-sslv3.patch 1879 SHA256 ccb00bf9f0e8c5e698997c60f344497dd6fc1351cb54f25d5d1ecf13f616cdd4 SHA512 b6cb8a11ea9a03f924917ec41ea7378fb297857a17630bf9035246fe9035d4ce1b2f7c91ee4328a5e27cba4d4ee07970a4ef224d6d9d4b3444f0d8d4549cfd26 WHIRLPOOL 2dea2954c7061b21c41b64738aea198115d3755109fb24b698a51f67fa8be399d8f6aa5e4ca5362b6460f016475382b12bbeb0d72346851ad935b3db15656df7
AUX 7.1.13.51032/zarafa-7.1.12-upgrade-lock.patch 2288 SHA256 5d0a72493429b96f19e69dd5ee1ff83e2136ae671d628def60d64e9c50b201e7 SHA512 1f88f197e5700e72791e9f411eb1e900a9959c003d4db463c2a6a9020359e52fe97c41cb20b6b64ce2e2a6ef78aa5c30946f74c0db7e21e62167d0e5ba9f4ae3 WHIRLPOOL bbd445b7484945a67384abb351f08a99c3c643e724fc458a0fc62fd4460aa443dbf6ebb41bc5a7beb1b7904e0c3f3c7e38e9f0a30a98e1675dd1248a634bc4d5
AUX 7.1.13.51032/zarafa-7.1.5-gentoo-swig1.3.patch 621 SHA256 12666f1a041d4dde86577860c96fd7ca67f6e2ce33b981e8f57ac336bba48f19 SHA512 419b4f0b12ab18ec140e2d829a1355236f2fbecfa4c26262c7044142a6c56299e053cff4a21a50e5793b45419431c078080f8ff4dc715ad89725aa9921e320fa WHIRLPOOL 8adbad8396d1151942ea78daf52a11f050d59fabe476159afac86c7178e01733cf9848a163031663fdbf7858994c569318495181a196e710a06d54b621185908
AUX 7.1.13.51032/zarafa-7.1.9-sysconfig2confd-1.patch 4588 SHA256 545613df0455378db89ac4db91ada562dd4b820a3d62f5efb36020863b9e0066 SHA512 0bc8a3ba4aec7afc79ce26505278dff9bb85cd52b95eee984b0da3219b29d4da361893613c5a94488f71cf2f17dfdf2c583c8121446094c7027d6ab148f6b2f5 WHIRLPOOL 66bb72ce368cc620b51f93735181a100f87c1c679b627679e5da270d7a2c57a0f79d7575a55d624784085c56ac38d9d9264922936a4c31c62100bf8eadb24155
AUX junklearn.dspam 924 SHA256 5060aa1c0fd3e103c0243f5372ec4a393d4aebc7ed7c69a9475adead50d6b37e SHA512 43321b5245a5a6b6032fe8f34382826dbc3630e03ff43eda5c41d5782e0df72a2e784638e3047ba141141e4d3d99ef11e555117fb77fc2555e3ce07c7b28f65c WHIRLPOOL 983c2d5c87145a38bb87044cb6b9050092fa7c05bfa6de5317890103663550a86ccdb5af71966e86062943f5e39b6fbb990617048380aab94920602ed5b9d214
AUX zarafa-bash-completion.sh 9045 SHA256 e3ad01ca797ef1aa428d17184ab16704faed1f1c6878113c0ff570b49cb788d6 SHA512 261dcb9cfdfe84920d666f4719fbf5c19000dd10295852a6121142d3e7fa9fe564a2b09149f93cba5fc1cf4630998b3227269b7c4e7ec245e4346b750b8171eb WHIRLPOOL dfacb2a9f1847f40fd02afe4813d97ec9be8a4fd83466e3d5b2ae32de31bd94a450b4fe9a7e6049cecb593b0ddd80ee37165400b0a43617b76f19170ef74931e
AUX zarafa-dagent.confd 185 SHA256 5e142b9a6310197cf744a83bf8a134472ed6b497a7b477398f25d14e898480bc SHA512 8845cd227737667df9c96f56d92af2819d3ebb1580dc3399beda140992d10d23688fc50fbfd44a8e3e3bfa9e7e2fbdac0339ddc09b5544e6e7bf84b49f5cbdbc WHIRLPOOL cf3a9898babbc3576434bac86ba02da6aa4c1e67fc4fb1d5f473ad602dc9e7671385345f661ce9c86becf728bc9176ad9ca96b0972624901ac1c1a420c972fe9
@ -58,6 +77,11 @@ DIST zcp-7.1.12-49411-spk-arm-free.tar 150978560 SHA256 b8d6b90868752c0fc652f487
DIST zcp-7.1.12-49411-ubuntu-12.04-i386-supported.tar.gz 58183291 SHA256 82c0b14c82afa0de7bffff18c19205daa9615a28b249bb1727a073e04790b642 SHA512 beccaabb92bd8fce69bc0a6c2460c186c0998c9871fe04c47b4d9ebf429f328e79793ff3d0ebb3674c0cd7d2907338421eb83c3bfb717eb29f81bf98db9d4a27 WHIRLPOOL 12a018ad138282a84cdbab0f2082b3f12d3501ade42e12762ea029970b9c2949e8129ac12926541608171f390958b562ff141a028c8327b0fe71110b7ae640c8
DIST zcp-7.1.12-49411-ubuntu-12.04-x86_64-supported.tar.gz 57966908 SHA256 dbcea770d92891789709053aaa918fa57e2656115f7599b0518835237ebcacdb SHA512 9b6e25e309727ea9ea53f018e9423a6464d922681fc8ee857cd9160e5c9b91bdbb3c0906d89992821aa93ec58cf345345046ea6fa31e5cf379392e819a724f45 WHIRLPOOL 1decaf76b09d0d31a608e1fee46573d9e4f2ee34d04e869bab0f9c09fdd9272a15deb2009c2f7697722da068453907cb0c7188e8a58d66d6f199cce76fec9faf
DIST zcp-7.1.12.tar.gz 6946375 SHA256 9906940b1033b45172bc699cc223e1d27b5af717956a41ba040fb0e3c3e0b894 SHA512 6826c0f5cb8ecdd24785766518325c6bc463b18e5c09390b9b341905903c2005487db5416f8b6f511399f78cfb28b731b3a183be22c407121dd2530758c6ab1f WHIRLPOOL fe3f171a830faf5f5a2f94228d9870350293291b4bfc49e36d719d8ce911050c96533e55230264ce1339f1859bbd975a49381a18c2572199fe8cfbe676844fbe
EBUILD zarafa-7.1.12.49411.ebuild 8653 SHA256 3558cacbb67b18f858bcadad6584ad6a72912576710fe7da4ef09b29cb2a9b46 SHA512 4267b011f6bb1bbb1eb83e58e6554fa75dca67397167585ea81acf02aa32ef75d7d7ed01dda3a54925137a6ff136fce7d699a53814e1e7af9e157ec95b0c9cfa WHIRLPOOL 5e6b48f40e54ca615637d5e0aab0422a338c2b089aa1ccfe85cfd6ba92aa1d494e5100c6a9679a71e99d94f48ac0afe2a1dc93bf22b35298106af8da62084bea
MISC ChangeLog 31847 SHA256 a9b82622754e0e4dad2c61762a766a04dcc6cbb8a6b0c95986ae0bc08c016958 SHA512 8ea71e1be30f23e438ec1881e77501fbf642707079a303d51eb38e1c623268ea071c459308db6606a42de44ab97219e4319cc5662ffd1ea12a6438ce7eb2c633 WHIRLPOOL 91ce17be0e5fab392bab6d6c80a00a81c495d00f6e919c0299e0376ee3da69654014246dd5d2f99f09b5dfdcbaeca66e2b0ed19a63cc1649ab1d588e2c348c97
DIST zcp-7.1.13-51032-spk-arm-free.tar 150978560 SHA256 b8d6b90868752c0fc652f4875719081acf639b2ae643d5fd80ccb71a59825206 SHA512 e6bb8c5b63398fce8b14e3bbccde851948e28de90e4667c01d8002819db0653b80de965fa354496f13e401e8d2a9c919d80db4140c6a1c4f674fdd7eddb44261 WHIRLPOOL c801a8ce596ef1467454bb1376d1108f4bd61944ebdbb6e943b48a7afcb76402a750cba295e6ffcae994cfddded8f4640ebbc9e473be253f5438a48559b5db46
DIST zcp-7.1.13-51032-ubuntu-12.04-i386-supported.tar.gz 59232138 SHA256 d5a0ee4b5c53caa3d2857126994cbfb53543d2c29eebb6933252343d4f3d8fa2 SHA512 0a508bdac67832ed4dbe8ad4f9c4f2b2fbb3f20bc581f0c2a6034ce243a61d6db86140c3f433f7bf0db5c17866144a51eae7426bfad52498f916fbf884a57b50 WHIRLPOOL a3856ef770fd53c51d49400e2bc9c0146d0228195b6be7f5b662095f227dbc7f1018c3484405d74621653d61c34e1ac4c6aa34480902502183262a85b348dd33
DIST zcp-7.1.13-51032-ubuntu-12.04-x86_64-supported.tar.gz 59016633 SHA256 69eb281fe05eb1c2ea5555fe26b295d2bb143421a610fa0769b4c34d3ad500be SHA512 24fcd6a26cbc15acd55dda4f8698c5e85e2e676484ab20075e00cbff77aa08f6ba31724baad90baf29aecd4569539f44b02e79904f450a9adb1e9574fe0582ed WHIRLPOOL 5a288b0fdb2e10b2065f5e78af4d52594505360d7f39069e7fb43449b27c9ffe836aa7a95531efcbe814b9c13a7b073fee9886ef242ec584489ecffe903843bd
DIST zcp-7.1.13.tar.gz 6967274 SHA256 6399415713510be4542eae88575f36431e25be5fdeaf1b484613a96c3d299831 SHA512 f6870312a3633cdf62e5caa5a13da5c6956fb22dcc88aee9a0129ac9b3a986828c2c54d6c3e5c1b76cefc2f835ce3dcfe297e252777a52ccf04277e0649be66f WHIRLPOOL 0992257985def01409dfda97d215d4fcdc336b01835d0f26d53688e33b012502687201b939a10476054155d28f21e491425e23563c0afba1482c4797d3472912
EBUILD zarafa-7.1.12.49411.ebuild 8399 SHA256 0bd6efb9f11f60e45d6c2bafa05de96b64ffa23298e7359fd58ae1613c3dcfba SHA512 2be67a3eb757f3614797f755b41507ed03872ff71e7308cdb4dc04d91a265dae2f423e3b7f547d4f20ade07257fcd69a078da1807f6f8147fc23420eda3aa4ef WHIRLPOOL 47d3140581eace5f54a6ed468dde0576445860af889723110935a2b5b2e2a256f6a55f6cfeb5f18fd1ee96e720b28dc104abe32cef7cf23e7cf2d240b4179fc5
EBUILD zarafa-7.1.13.51032.ebuild 8399 SHA256 0bd6efb9f11f60e45d6c2bafa05de96b64ffa23298e7359fd58ae1613c3dcfba SHA512 2be67a3eb757f3614797f755b41507ed03872ff71e7308cdb4dc04d91a265dae2f423e3b7f547d4f20ade07257fcd69a078da1807f6f8147fc23420eda3aa4ef WHIRLPOOL 47d3140581eace5f54a6ed468dde0576445860af889723110935a2b5b2e2a256f6a55f6cfeb5f18fd1ee96e720b28dc104abe32cef7cf23e7cf2d240b4179fc5
MISC ChangeLog 33019 SHA256 4afe036e5cd31cb515d1bbd96b5cb95a219acc0e8db2619ce8d09d7794d96ffd SHA512 a5a305edc041057f0e19dd49d0801977e4520a8cca622cb2513246d01df521790b354c3e00b8597ca50440bf5cc37aaa3e66ce81065d93d34283e32abf29a665 WHIRLPOOL 2b5e82a6c11117df4f1bee04630c7c7d458d800b873139131ad04e903746b3c9263e1d3d2669ac2a02f73410103b0540ec3665109ac5672c31598c8c645ef787
MISC metadata.xml 1238 SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 SHA512 d94394e853ce7bd9109322f37ab5d3526e2bbc4a59ac02d0b66e9d952d221a06ae1c38b6de5cdb142b2b09ac602a57ff03f0525efbbc7b8f33f9662ca42a5dd5 WHIRLPOOL 482453b974eaca6506c4503f49c5c55195790e9b47f19a885d551fa535445104fbb7bc93dc4f30f7faf545f619594fa04d9a8071c21eb55995fef4f7380f55b9

47
net-mail/zarafa/files/7.1.13.51032/Datux-sendas.patch Normal file
View File

@ -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

219
net-mail/zarafa/files/7.1.13.51032/Datux-spamhook.patch Normal file
View File

@ -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

66
net-mail/zarafa/files/7.1.13.51032/zarafa-01-oss-configure.patch Normal file
View File

@ -0,0 +1,66 @@
diff -uNr zarafa-7.1.12.orig/doc/Makefile.am zarafa-7.1.12/doc/Makefile.am
--- zarafa-7.1.12.orig/doc/Makefile.am 2015-06-25 16:32:25.293104280 +0200
+++ zarafa-7.1.12/doc/Makefile.am 2015-06-25 16:33:06.344305789 +0200
@@ -10,10 +10,6 @@
zarafa-msr.1 zarafa-msr.cfg.5 zarafa-msr-verify.1 za-aclsync.1 za-aclset.1 zarafa-backup.cfg.5 za-restore.1 \
zarafa-set-oof.1 zarafa-mailbox-permissions.1 zarafa-autorespond.1
-if ! OSS_ONLY
-allpages += zarafa-ws.1 zarafa-ws.cfg.5
-endif
-
CLEANFILES = zarafa-cfgchecker.1
man_MANS=$(BUILT_SOURCES) $(allpages)
diff -uNr zarafa-7.1.12.orig/ECtools/Makefile.am zarafa-7.1.12/ECtools/Makefile.am
--- zarafa-7.1.12.orig/ECtools/Makefile.am 2015-06-25 16:32:25.282103958 +0200
+++ zarafa-7.1.12/ECtools/Makefile.am 2015-06-25 16:33:06.345305818 +0200
@@ -1,5 +1,4 @@
if ! OSS_ONLY
-PROSUBS = zarafa-backup zarafa-report zarafa-msr za-extra zarafa-ocf zarafa-ws
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.12.orig/Makefile.am zarafa-7.1.12/Makefile.am
--- zarafa-7.1.12.orig/Makefile.am 2015-06-25 16:32:25.170100679 +0200
+++ zarafa-7.1.12/Makefile.am 2015-06-25 16:34:50.198343769 +0200
@@ -1,9 +1,5 @@
ACLOCAL_AMFLAGS = -I autoconf
-if ! OSS_ONLY
-PROSUBS = liblicense licensed libtimezone libcalendar
-endif
-
SUBDIRS = external common libfreebusy mapi4linux zarafa-libsync $(PROSUBS) provider libicalmapi inetmapi
if WITH_PHP
SUBDIRS += php-ext
diff -uNr zarafa-7.1.12.orig/configure.ac zarafa-7.1.12/configure.ac
--- zarafa-7.1.12.orig/configure.ac 2015-06-25 16:32:25.288104133 +0200
+++ zarafa-7.1.12/configure.ac 2015-06-25 16:34:27.790688479 +0200
@@ -832,26 +832,6 @@
version
specialbuild
])
-dnl non-oss files
-if test -d `dirname $0`/licensed; then
-AC_CONFIG_FILES([
- liblicense/Makefile
- licensed/Makefile
- libtimezone/Makefile
- libcalendar/Makefile
- libcalendar/src/Makefile
- libcalendar/include/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
- ECtools/zarafa-ws/Makefile
- ECtools/zarafa-ws/etc/Makefile
- testunit/Makefile
-])
-fi
AC_OUTPUT

29
net-mail/zarafa/files/7.1.13.51032/zarafa-02-ldapmsplugin.patch Normal file
View File

@ -0,0 +1,29 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2013-06-28 07:55:28.103159907 +0200
build: always build ldapmsplugin
The source is already there in the free version, so why not just
compile it.
---
provider/plugins/Makefile.am | 2 --
1 file changed, 2 deletions(-)
Index: zarafa-7.1.5/provider/plugins/Makefile.am
===================================================================
--- zarafa-7.1.5.orig/provider/plugins/Makefile.am
+++ zarafa-7.1.5/provider/plugins/Makefile.am
@@ -21,13 +21,11 @@ ldapplugin_la_SOURCES = LDAPUserPlugin.c
ldapplugin_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version
ldapplugin_la_LIBADD = ${top_builddir}/common/libcommon_util.la $(LDAP_LIBS)
-if ! OSS_ONLY
pkglib_LTLIBRARIES += ldapmsplugin.la
ldapmsplugin_la_CPPFLAGS = ${AM_CPPFLAGS} $(ldapplugin_la_CPPFLAGS) -DWITH_MULTISERVER
ldapmsplugin_la_SOURCES = $(ldapplugin_la_SOURCES)
ldapmsplugin_la_LDFLAGS = $(ldapplugin_la_LDFLAGS)
ldapmsplugin_la_LIBADD = $(ldapplugin_la_LIBADD)
-endif
endif

96
net-mail/zarafa/files/7.1.13.51032/zarafa-05-libdeps.patch Normal file
View File

@ -0,0 +1,96 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2011-07-03 23:49:00 +0200
build: add missing library dependencies
Any dependencies that a .la uses should be mentioned in that .la's
LIBADD spec, *irrespective* of whether it is going to be static or
shared. The benefit is that linking against .la files is like linking
against .so, i.e. all dependencies are remembered, so that e.g.
zarafa_server_LDADD need not list them.
Here are a bunch of dependencies I made out from `nm <whatever.a> |
grep ' U '` reports. They might not be complete.
---
common/Makefile.am | 5 +++++
provider/common/Makefile.am | 2 ++
provider/libserver/Makefile.am | 2 ++
provider/server/Makefile.am | 2 +-
4 files changed, 10 insertions(+), 1 deletion(-)
Index: zarafa-7.1.8/common/Makefile.am
===================================================================
--- zarafa-7.1.8.orig/common/Makefile.am
+++ zarafa-7.1.8/common/Makefile.am
@@ -58,6 +58,7 @@ libcommon_mapi_la_SOURCES = CommonUtil.c
MAPIConsoleTable.cpp \
ECMAPIDebug.cpp \
MAPIErrors.cpp
+libcommon_mapi_la_LIBADD = -lpthread ${ICU_LIBS}
libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -static
libcommon_util_la_SOURCES = platform.cpp \
@@ -92,9 +93,11 @@ libcommon_util_la_SOURCES = platform.cpp
fileutil.cpp \
ECThreadPool.cpp \
ConsoleTable.cpp
+libcommon_util_la_LIBADD = -lpthread ${BOOST_FILESYSTEM_LIBS} ${BOOST_SYSTEM_LIBS}
if HAVE_ICU
libcommon_util_la_SOURCES += ustringutil/utfutil.cpp
+libcommon_util_la_LIBADD += ${ICU_LIBS}
endif
libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -static
@@ -102,9 +105,11 @@ libcommon_ssl_la_SOURCES = \
SSLUtil.cpp \
ECChannelClient.cpp \
ECChannel.cpp
+libcommon_ssl_la_LIBADD = -lpthread ${SSL_LIBS}
libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -static
libcommon_service_la_SOURCES = ECDatabaseMySQL.cpp
+libcommon_service_la_LIBADD = ${MYSQL_LIBS}
# remove double installed headers
install-data-hook:
Index: zarafa-7.1.8/provider/common/Makefile.am
===================================================================
--- zarafa-7.1.8.orig/provider/common/Makefile.am
+++ zarafa-7.1.8/provider/common/Makefile.am
@@ -16,6 +16,8 @@ libzarafacommon_la_SOURCES = SOAPUtils.c
ECOfflineState.h ECOfflineState.cpp \
StreamTypes.h ZarafaVersions.h
+libzarafacommon_la_LIBADD = ../soap/libsoapclient.la
+
check-syntax:
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
-fsyntax-only -fmessage-length=0 ${CHK_SOURCES} -Wall -Wformat=2
Index: zarafa-7.1.8/provider/libserver/Makefile.am
===================================================================
--- zarafa-7.1.8.orig/provider/libserver/Makefile.am
+++ zarafa-7.1.8/provider/libserver/Makefile.am
@@ -61,6 +61,8 @@ libserver_la_SOURCES = \
ZarafaCmdUtil.cpp ZarafaCmdUtil.h \
ECLockManager.cpp ECLockManager.h
+libserver_la_LIBADD = -ldl -lpthread -lz ${SSL_LIBS} ${BOOST_FILESYSTEM_LIBS} ${BOOST_SYSTEM_LIBS} ${ICU_LIBS} ${KRB5_LIBS} ${MYSQL_LIBS} ${PAM_LIBS}
+
check-syntax:
$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \
-fsyntax-only -fmessage-length=0 ${CHK_SOURCES} -Wall -Wformat=2
Index: zarafa-7.1.8/provider/server/Makefile.am
===================================================================
--- zarafa-7.1.8.orig/provider/server/Makefile.am
+++ zarafa-7.1.8/provider/server/Makefile.am
@@ -20,7 +20,7 @@ zarafa_server_LDADD = \
${top_builddir}/common/libcommon_ssl.la \
$(PROG_LIBS) \
$(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) $(ICU_LIBS) $(DL_LIBS) \
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
+ $(SSL_LIBS) $(TCMALLOC_LIBS) -lrt
zarafa_server_SOURCES = ECServer.cpp \
ECSoapServerConnection.h ECSoapServerConnection.cpp \

137
net-mail/zarafa/files/7.1.13.51032/zarafa-07-sonames.patch Normal file
View File

@ -0,0 +1,137 @@
diff -uNr zarafa-7.1.10.orig/common/Makefile.am zarafa-7.1.10/common/Makefile.am
--- zarafa-7.1.10.orig/common/Makefile.am 2014-06-28 01:45:35.538074530 +0200
+++ zarafa-7.1.10/common/Makefile.am 2014-06-28 01:46:00.990073451 +0200
@@ -34,7 +34,7 @@
-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
-I${top_srcdir}/libfreebusy $(MYSQL_INCLUDES)
-libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -static
+libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
libcommon_mapi_la_SOURCES = CommonUtil.cpp \
rtfutil.cpp \
codepage.cpp \
@@ -60,7 +60,7 @@
MAPIErrors.cpp
libcommon_mapi_la_LIBADD = -lpthread ${ICU_LIBS}
-libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -static
+libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
libcommon_util_la_SOURCES = platform.cpp \
platform.linux.cpp \
md5.cpp \
@@ -101,14 +101,14 @@
libcommon_util_la_LIBADD += ${ICU_LIBS}
endif
-libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -static
+libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
libcommon_ssl_la_SOURCES = \
SSLUtil.cpp \
ECChannelClient.cpp \
ECChannel.cpp
libcommon_ssl_la_LIBADD = -lpthread ${SSL_LIBS}
-libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -static
+libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
libcommon_service_la_SOURCES = ECDatabaseMySQL.cpp
libcommon_service_la_LIBADD = ${MYSQL_LIBS}
diff -uNr zarafa-7.1.10.orig/common/zarafa.pc.in zarafa-7.1.10/common/zarafa.pc.in
--- zarafa-7.1.10.orig/common/zarafa.pc.in 2014-06-28 01:45:35.538074530 +0200
+++ zarafa-7.1.10/common/zarafa.pc.in 2014-06-28 01:46:00.991073451 +0200
@@ -7,5 +7,5 @@
Description: Zarafa custom development
Version: @ZARAFA_VERSION@
Requires:
-Libs: -L${libdir} -lmapi @PROG_LIBS@
+Libs: -L${libdir} -lmapi-@PACKAGE_VERSION@ @PROG_LIBS@
Cflags: -I${includedir}/mapi4linux/ -I${includedir}/zarafa/ -DUNICODE
diff -uNr zarafa-7.1.10.orig/ECtools/zarafa-archiver/Makefile.am zarafa-7.1.10/ECtools/zarafa-archiver/Makefile.am
--- zarafa-7.1.10.orig/ECtools/zarafa-archiver/Makefile.am 2014-06-28 01:45:35.505074531 +0200
+++ zarafa-7.1.10/ECtools/zarafa-archiver/Makefile.am 2014-06-28 01:46:00.990073451 +0200
@@ -16,6 +16,7 @@
+libarchiver_la_LDFLAGS = -release ${PACKAGE_VERSION}
libarchiver_la_LIBADD = ${top_builddir}/mapi4linux/src/libmapi.la \
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_util.la
@@ -53,6 +54,7 @@
ArchiveControlImpl.cpp ArchiveControlImpl.h \
ECDatabase.h ECDatabase.cpp
+libarchiver_core_la_LDFLAGS = -release ${PACKAGE_VERSION}
zarafa_archiver_LDADD = ${top_builddir}/mapi4linux/src/libmapi.la \
diff -uNr zarafa-7.1.10.orig/libfreebusy/Makefile.am zarafa-7.1.10/libfreebusy/Makefile.am
--- zarafa-7.1.10.orig/libfreebusy/Makefile.am 2014-06-28 01:45:35.388074536 +0200
+++ zarafa-7.1.10/libfreebusy/Makefile.am 2014-06-28 01:46:00.991073451 +0200
@@ -6,7 +6,7 @@
libfreebusy_la_includedir = $(includedir)/libfreebusy
-libfreebusy_la_LDFLAGS = ${AM_LDFLAGS} -static
+libfreebusy_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
libfreebusy_la_include_HEADERS = ECEnumFBBlock.h ECFBBlockList.h \
ECFreeBusyData.h ECFreeBusySupport.h ECFreeBusyUpdate.h freebusy.h \
diff -uNr zarafa-7.1.10.orig/mapi4linux/src/Makefile.am zarafa-7.1.10/mapi4linux/src/Makefile.am
--- zarafa-7.1.10.orig/mapi4linux/src/Makefile.am 2014-06-28 01:45:35.424074535 +0200
+++ zarafa-7.1.10/mapi4linux/src/Makefile.am 2014-06-28 01:46:00.991073451 +0200
@@ -4,7 +4,7 @@
-DMAPICONFIGDIR=\"${MAPICONFIGDIR}\" \
-I$(top_srcdir)/mapi4linux/include -I$(top_srcdir)/provider/common -I${top_srcdir}/common -I${top_srcdir}/libfreebusy
-libmapi_la_LDFLAGS = ${AM_LDFLAGS} $(BOOST_FILESYSTEM_LDFLAGS)
+libmapi_la_LDFLAGS = ${AM_LDFLAGS} $(BOOST_FILESYSTEM_LDFLAGS) -release ${PACKAGE_VERSION}
libmapi_la_LIBADD = \
${top_builddir}/common/libcommon_mapi.la \
diff -uNr zarafa-7.1.10.orig/provider/common/Makefile.am zarafa-7.1.10/provider/common/Makefile.am
--- zarafa-7.1.10.orig/provider/common/Makefile.am 2014-06-28 01:45:35.417074535 +0200
+++ zarafa-7.1.10/provider/common/Makefile.am 2014-06-28 01:46:00.991073451 +0200
@@ -9,6 +9,7 @@
AM_CPPFLAGS += -DWITH_SYSTEM_GSOAP
endif
+libzarafacommon_la_LDFLAGS = -release ${PACKAGE_VERSION}
libzarafacommon_la_SOURCES = SOAPUtils.cpp SOAPUtils.h \
SOAPAlloc.h \
SOAPHelpers.cpp SOAPHelpers.h \
diff -uNr zarafa-7.1.10.orig/provider/libserver/Makefile.am zarafa-7.1.10/provider/libserver/Makefile.am
--- zarafa-7.1.10.orig/provider/libserver/Makefile.am 2014-06-28 01:45:35.410074535 +0200
+++ zarafa-7.1.10/provider/libserver/Makefile.am 2014-06-28 01:46:00.992073451 +0200
@@ -13,6 +13,7 @@
AM_CPPFLAGS += -DWITH_SYSTEM_GSOAP
endif
+libserver_la_LDFLAGS = -release ${PACKAGE_VERSION}
libserver_la_SOURCES = \
ZarafaCmd.cpp \
ECABObjectTable.cpp ECABObjectTable.h \
diff -uNr zarafa-7.1.10.orig/provider/soap/Makefile.am zarafa-7.1.10/provider/soap/Makefile.am
--- zarafa-7.1.10.orig/provider/soap/Makefile.am 2014-06-28 01:45:35.405074535 +0200
+++ zarafa-7.1.10/provider/soap/Makefile.am 2014-06-28 01:49:07.358065554 +0200
@@ -7,6 +7,8 @@
libsoapserver_la_CXXFLAGS = ${AM_CXXFLAGS} -Wno-sign-compare $(DEBUGFLAGS) $(GSOAP_CFLAGS) -I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/include ${GSOAP_CFLAGS}
libsoapclient_la_CXXFLAGS = ${AM_CXXFLAGS} -Wno-sign-compare $(DEBUGFLAGS) $(GSOAP_CFLAGS) -I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/include ${GSOAP_CFLAGS}
+libsoapserver_la_LDFLAGS = -release ${PACKAGE_VERSION}
+libsoapclient_la_LDFLAGS = -release ${PACKAGE_VERSION}
nodist_libsoapserver_la_SOURCES = soapC.cpp soapServer.cpp
nodist_libsoapclient_la_SOURCES = soapC.cpp soapClient.cpp
diff -uNr zarafa-7.1.10.orig/zarafa-libsync/Makefile.am zarafa-7.1.10/zarafa-libsync/Makefile.am
--- zarafa-7.1.10.orig/zarafa-libsync/Makefile.am 2014-06-28 01:45:35.521074530 +0200
+++ zarafa-7.1.10/zarafa-libsync/Makefile.am 2014-06-28 01:46:00.992073451 +0200
@@ -11,6 +11,8 @@
libzarafasync_la_includedir = $(includedir)/libzarafasync
+libzarafasync_la_LDFLAGS = -release ${PACKAGE_VERSION}
+
libzarafasync_la_include_HEADERS = ECLibSync.h ECSync.h ECSyncLog.h \
ECSyncUtil.h ECSyncContext.h ECOfflineABImporter.h ECSyncSettings.h ECResyncSet.h

45
net-mail/zarafa/files/7.1.13.51032/zarafa-10-translations.patch Normal file
View File

@ -0,0 +1,45 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2011-07-02 21:33:00 +0200
translations: avoid xlat of common abbreviations
Note that e-mail clients, when replying, may not recognize anything
but "Re" when deciding whether or not to add a "Re:" in front of the
subject. This means that a conversation between two participants can
build up convoluted subject lines like "Re: AW: Re: AW: ..". To avoid
this, translation of "Re" should be avoided, but also because the
translation might not be understood by other parties whereas "Re" is
universally recognized.
---
php-webclient-ajax/client/modules/createmailitemmodule.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: zarafa-7.1.7/php-webclient-ajax/client/modules/createmailitemmodule.js
===================================================================
--- zarafa-7.1.7.orig/php-webclient-ajax/client/modules/createmailitemmodule.js
+++ zarafa-7.1.7/php-webclient-ajax/client/modules/createmailitemmodule.js
@@ -258,7 +258,7 @@ createmailitemmodule.prototype.item = fu
{
case "reply":
this.setSender(message);
- this.setSubjectBody(message, _("RE"));
+ this.setSubjectBody(message, "Re");
this.setInlineAttachmentData(this.attachments); //message contains inline attachments
/**
* NOTE: We do not want to send attachments of original mail
@@ -270,12 +270,12 @@ createmailitemmodule.prototype.item = fu
case "replyall":
this.setSender(message);
this.setRecipients(message, "replyall");
- this.setSubjectBody(message, _("RE"));
+ this.setSubjectBody(message, "Re");
this.setInlineAttachmentData(this.attachments); //message contains inline attachments
this.attachments = new Array();
break;
case "forward":
- this.setSubjectBody(message, _("FW"));
+ this.setSubjectBody(message, "Fwd");
this.setAttachments(message);
break;
case "edit":

102
net-mail/zarafa/files/7.1.13.51032/zarafa-14-shared-libs.patch Normal file
View File

@ -0,0 +1,102 @@
diff -uNr zarafa-7.1.10.orig/common/Makefile.am zarafa-7.1.10/common/Makefile.am
--- zarafa-7.1.10.orig/common/Makefile.am 2014-06-28 03:18:12.316839074 +0200
+++ zarafa-7.1.10/common/Makefile.am 2014-06-28 03:18:21.703838676 +0200
@@ -34,7 +34,7 @@
-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
-I${top_srcdir}/libfreebusy $(MYSQL_INCLUDES)
-libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
+libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -release ${PACKAGE_VERSION}
libcommon_mapi_la_SOURCES = CommonUtil.cpp \
rtfutil.cpp \
codepage.cpp \
@@ -60,7 +60,7 @@
MAPIErrors.cpp
libcommon_mapi_la_LIBADD = -lpthread ${ICU_LIBS}
-libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
+libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -release ${PACKAGE_VERSION}
libcommon_util_la_SOURCES = platform.cpp \
platform.linux.cpp \
md5.cpp \
@@ -101,14 +101,14 @@
libcommon_util_la_LIBADD += ${ICU_LIBS}
endif
-libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
+libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -release ${PACKAGE_VERSION}
libcommon_ssl_la_SOURCES = \
SSLUtil.cpp \
ECChannelClient.cpp \
ECChannel.cpp
libcommon_ssl_la_LIBADD = -lpthread ${SSL_LIBS}
-libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
+libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -release ${PACKAGE_VERSION}
libcommon_service_la_SOURCES = ECDatabaseMySQL.cpp
libcommon_service_la_LIBADD = ${MYSQL_LIBS}
diff -uNr zarafa-7.1.10.orig/ECtools/zarafa-search/Makefile.am zarafa-7.1.10/ECtools/zarafa-search/Makefile.am
--- zarafa-7.1.10.orig/ECtools/zarafa-search/Makefile.am 2014-06-28 03:18:12.288839075 +0200
+++ zarafa-7.1.10/ECtools/zarafa-search/Makefile.am 2014-06-28 03:19:03.032836925 +0200
@@ -12,8 +12,8 @@
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_util.la \
${top_builddir}/common/libcommon_ssl.la \
- ${top_builddir}/common/libcommon_service.la \
- ${top_builddir}/ECtools/zarafa-archiver/libarchiver.la \
+ ${top_builddir}/common/libcommon_service.la \
+ ${top_builddir}/ECtools/zarafa-archiver/libarchiver.la \
$(PROG_LIBS) $(SSL_LIBS) $(KYOTOCABINET_LIBS) $(CLUCENE_LIBS) \
$(BOOST_SYSTEM_LIBS) $(BOOST_FILESYSTEM_LIBS)
diff -uNr zarafa-7.1.10.orig/libfreebusy/Makefile.am zarafa-7.1.10/libfreebusy/Makefile.am
--- zarafa-7.1.10.orig/libfreebusy/Makefile.am 2014-06-28 03:18:12.207839078 +0200
+++ zarafa-7.1.10/libfreebusy/Makefile.am 2014-06-28 03:18:21.704838676 +0200
@@ -6,7 +6,7 @@
libfreebusy_la_includedir = $(includedir)/libfreebusy
-libfreebusy_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION}
+libfreebusy_la_LDFLAGS = ${AM_LDFLAGS} -release ${PACKAGE_VERSION}
libfreebusy_la_include_HEADERS = ECEnumFBBlock.h ECFBBlockList.h \
ECFreeBusyData.h ECFreeBusySupport.h ECFreeBusyUpdate.h freebusy.h \
diff -uNr zarafa-7.1.10.orig/provider/common/Makefile.am zarafa-7.1.10/provider/common/Makefile.am
--- zarafa-7.1.10.orig/provider/common/Makefile.am 2014-06-28 03:18:12.229839077 +0200
+++ zarafa-7.1.10/provider/common/Makefile.am 2014-06-28 03:18:21.704838676 +0200
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libzarafacommon.la
+pkglib_LTLIBRARIES = libzarafacommon.la
AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(GSOAP_CFLAGS) \
$(BOOST_CPPFLAGS) \
diff -uNr zarafa-7.1.10.orig/provider/libserver/Makefile.am zarafa-7.1.10/provider/libserver/Makefile.am
--- zarafa-7.1.10.orig/provider/libserver/Makefile.am 2014-06-28 03:18:12.223839078 +0200
+++ zarafa-7.1.10/provider/libserver/Makefile.am 2014-06-28 03:18:21.704838676 +0200
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libserver.la
+pkglib_LTLIBRARIES = libserver.la
AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(BOOST_CPPFLAGS) \
-I${top_srcdir}/mapi4linux/include \
diff -uNr zarafa-7.1.10.orig/provider/server/Makefile.am zarafa-7.1.10/provider/server/Makefile.am
--- zarafa-7.1.10.orig/provider/server/Makefile.am 2014-06-28 03:18:12.219839078 +0200
+++ zarafa-7.1.10/provider/server/Makefile.am 2014-06-28 03:18:21.704838676 +0200
@@ -18,6 +18,7 @@
${top_builddir}/common/libcommon_util.la \
${top_builddir}/common/libcommon_mapi.la \
${top_builddir}/common/libcommon_ssl.la \
+ ${top_builddir}/mapi4linux/src/libmapi.la \
$(PROG_LIBS) \
$(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) $(ICU_LIBS) $(DL_LIBS) \
$(SSL_LIBS) $(TCMALLOC_LIBS) -lrt
diff -uNr zarafa-7.1.10.orig/provider/soap/Makefile.am zarafa-7.1.10/provider/soap/Makefile.am
--- zarafa-7.1.10.orig/provider/soap/Makefile.am 2014-06-28 03:18:12.219839078 +0200
+++ zarafa-7.1.10/provider/soap/Makefile.am 2014-06-28 03:19:39.184835393 +0200
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libsoapserver.la libsoapclient.la
+pkglib_LTLIBRARIES = libsoapserver.la libsoapclient.la
AM_CPPFLAGS = ${ZCPPFLAGS}

102
net-mail/zarafa/files/7.1.13.51032/zarafa-22-gcc47.patch Normal file
View File

@ -0,0 +1,102 @@
diff -uNr zarafa-7.1.10.orig/ECtools/zarafa-search/ECIndexImporterAttachments.cpp zarafa-7.1.10/ECtools/zarafa-search/ECIndexImporterAttachments.cpp
--- zarafa-7.1.10.orig/ECtools/zarafa-search/ECIndexImporterAttachments.cpp 2014-06-28 01:27:40.776120070 +0200
+++ zarafa-7.1.10/ECtools/zarafa-search/ECIndexImporterAttachments.cpp 2014-06-28 01:27:54.903119472 +0200
@@ -47,6 +47,10 @@
*
*/
+#include <algorithm>
+#include <set>
+#include <string>
+
#include <platform.h>
#include <mapi.h>
@@ -248,7 +252,7 @@
ULONG ulWriteData;
fd_set rset, wset;
int res;
- int fd = max(ulFpWrite, ulFpRead);
+ int fd = std::max(ulFpWrite, ulFpRead);
struct timeval timeout;
@@ -269,7 +273,7 @@
FD_ZERO(&wset);
if (ulTotalWriteData) {
FD_SET(ulFpWrite, &wset);
- fd = max(ulFpWrite, ulFpRead);
+ fd = std::max(ulFpWrite, ulFpRead);
} else {
fd = ulFpRead;
}
@@ -439,10 +443,10 @@
command.assign(m_strCommand + " ");
if (!strMimeTag.empty() && strMimeTag.compare(_T("application/octet-stream")) != 0) {
- string tmp = trim(convert_to<string>(strMimeTag), "\r\n ");
+ std::string tmp = trim(convert_to<std::string>(strMimeTag), "\r\n ");
size_t pos = tmp.find_first_of('/');
if (pos != std::string::npos) {
- set<string, stricmp_comparison>::iterator i = m_lpThreadData->m_setMimeFilter.find(string(tmp,0,pos));
+ std::set<std::string, stricmp_comparison>::iterator i = m_lpThreadData->m_setMimeFilter.find(std::string(tmp,0,pos));
if (i != m_lpThreadData->m_setMimeFilter.end()) {
m_lpThreadData->lpLogger->Log(EC_LOGLEVEL_DEBUG, "Skipping filtered attachment mimetype: %s for %ls", tmp.c_str(), strFilename.c_str());
hr = MAPI_E_INVALID_OBJECT;
@@ -454,8 +458,8 @@
command.append("'");
} else if (!strExtension.empty()) {
// this string mostly does not exist
- string tmp = trim(convert_to<string>(strExtension), "\r\n ");
- set<string, stricmp_comparison>::iterator i = m_lpThreadData->m_setExtFilter.find(string(tmp,1)); // skip dot in extension find
+ std::string tmp = trim(convert_to<std::string>(strExtension), "\r\n ");
+ std::set<std::string, stricmp_comparison>::iterator i = m_lpThreadData->m_setExtFilter.find(std::string(tmp,1)); // skip dot in extension find
if (i != m_lpThreadData->m_setExtFilter.end()) {
m_lpThreadData->lpLogger->Log(EC_LOGLEVEL_DEBUG, "Skipping filtered attachment extension: %s for %ls", tmp.c_str(), strFilename.c_str());
hr = MAPI_E_INVALID_OBJECT;
@@ -465,14 +469,14 @@
command.append(forcealnum(tmp, "."));
command.append("'");
} else if (!strFilename.empty()) {
- std::string tmp = trim(convert_to<string>(strFilename), "\r\n ");
+ std::string tmp = trim(convert_to<std::string>(strFilename), "\r\n ");
size_t pos = tmp.find_last_of('.');
if (pos == std::string::npos)
goto exit;
// skip dot in find
- set<string, stricmp_comparison>::iterator i = m_lpThreadData->m_setExtFilter.find(string(tmp, pos+1));
+ std::set<std::string, stricmp_comparison>::iterator i = m_lpThreadData->m_setExtFilter.find(std::string(tmp, pos+1));
if (i != m_lpThreadData->m_setExtFilter.end()) {
m_lpThreadData->lpLogger->Log(EC_LOGLEVEL_DEBUG, "Skipping filtered attachment extension: %ls", strFilename.c_str());
hr = MAPI_E_INVALID_OBJECT;
@@ -480,7 +484,7 @@
}
command.append("ext '");
- command.append(forcealnum(string(tmp, pos), "."));
+ command.append(forcealnum(std::string(tmp, pos), "."));
command.append("'");
} else {
m_lpThreadData->lpLogger->Log(EC_LOGLEVEL_DEBUG, "Invalid attachment, no mimetag, extension or filename");
@@ -601,7 +605,7 @@
if (ulAttachSize) {
/* Copy attachment data into stream */
while (TRUE) {
- ULONG ulRead = min(m_ulCache, ulAttachSize);
+ ULONG ulRead = std::min(m_ulCache, ulAttachSize);
ULONG ulCopy = ulRead;
ULONG ulWritten = 0;
diff -uNr zarafa-7.1.10.orig/ECtools/zarafa-search/ECIndexImporter.cpp zarafa-7.1.10/ECtools/zarafa-search/ECIndexImporter.cpp
--- zarafa-7.1.10.orig/ECtools/zarafa-search/ECIndexImporter.cpp 2014-06-28 01:27:40.777120070 +0200
+++ zarafa-7.1.10/ECtools/zarafa-search/ECIndexImporter.cpp 2014-06-28 01:27:54.902119472 +0200
@@ -47,6 +47,7 @@
*
*/
+#include <memory>
#include "platform.h"
#include "ECIndexImporter.h"

19
net-mail/zarafa/files/7.1.13.51032/zarafa-7.1.10-imap-badcharset.patch Normal file
View File

@ -0,0 +1,19 @@
Patch by Robert Scheck <robert@fedoraproject.org> for Zarafa <= 7.1.10 which fixes the RFC-
violating reply of the Zarafa IMAP gateway in response to a failed SEARCH CHARSET request.
This is documented at http://tools.ietf.org/html/rfc3501#page-64: "BADCHARSET: Optionally
followed by a parenthesized list of charsets. [...]". This patch adds missing parenthesis.
Proposed to upstream via e-mail on Sun, 27 Jul 2014 23:58:01 +0200, patch was put into the
upstream ticket https://jira.zarafa.com/browse/ZCP-12504.
--- zarafa-7.1.10/gateway/IMAP.cpp 2014-05-23 15:56:37.000000000 +0200
+++ zarafa-7.1.10/gateway/IMAP.cpp.imap-badcharset 2014-07-27 23:42:30.000000000 +0200
@@ -2409,7 +2409,7 @@
if (lstSearchCriteria[1] != "WINDOWS-1252") {
iconv = new ECIConv("windows-1252", lstSearchCriteria[1]);
if (!iconv->canConvert()) {
- hr2 = HrResponse(RESP_TAGGED_NO, strTag, "[BADCHARSET WINDOWS-1252] "+strMode+"SEARCH charset not supported");
+ hr2 = HrResponse(RESP_TAGGED_NO, strTag, "[BADCHARSET (WINDOWS-1252)] "+strMode+"SEARCH charset not supported");
hr = MAPI_E_CALL_FAILED;
goto exit;
}

93
net-mail/zarafa/files/7.1.13.51032/zarafa-7.1.10-imap-fetch-body.patch Normal file
View File

@ -0,0 +1,93 @@
Patch by Robert Scheck <robert@fedoraproject.org> for Zarafa <= 7.1.10 which fixes the RFC-
violating reply of the Zarafa IMAP gateway in response to a body fetch request. This is
documented at http://tools.ietf.org/html/rfc3501#page-55. Additionally this has been also
compared with the Dovecot IMAP server as a nearly (or even de facto) IMAP server reference
implementation. Please note that this is NOT a duplicate of ZCP-11590/ZCP-11739/ZCP-12365!
Wrong behaviour of Zarafa <= 7.1.10rc1-44973 (without this patch):
> A4 FETCH 1 (BODY.PEEK[HEADER.FIELDS (FROM FROM)])
< * 1 FETCH (BODY[HEADER.FIELDS (FROM FROM)] {66}
From: User1 <user1@domain.org>
From: User1 <user1@domain.org>
)
< A4 OK FETCH completed
Comparison with IMAP server Dovecot 2.2.13:
> A4 FETCH 1 (BODY.PEEK[HEADER.FIELDS (FROM FROM)])
< * 1 FETCH (BODY[HEADER.FIELDS (FROM FROM)] {34}
From: User1 <user1@domain.org>
)
< A4 OK Fetch completed.
Correct behaviour of Zarafa (after having this patch applied):
> A4 FETCH 1 (BODY.PEEK[HEADER.FIELDS (FROM FROM)])
< * 1 FETCH (BODY[HEADER.FIELDS (FROM FROM)] {34}
From: User1 <user1@domain.org>
)
< A4 OK FETCH completed
Testing: Full IMAP dialog example from the client perspective (after this patch applied):
< * OK [CAPABILITY IMAP4rev1 LITERAL+ AUTH=PLAIN] Zarafa IMAP gateway ready
> A0 LOGIN robert robert
< A0 OK [CAPABILITY IMAP4rev1 LITERAL+ CHILDREN XAOL-OPTION NAMESPACE QUOTA IDLE] LOGIN completed
> A1 LIST "" INBOX
< * LIST (\HasNoChildren) "/" "INBOX"
< A1 OK LIST completed
> A2 SELECT INBOX
< * 2 EXISTS
< * 0 RECENT
< * FLAGS (\Seen \Draft \Deleted \Flagged \Answered $Forwarded)
< * OK [PERMANENTFLAGS (\Seen \Draft \Deleted \Flagged \Answered $Forwarded)] Permanent flags
< * OK [UIDNEXT 4343] Predicted next UID
< * OK [UNSEEN 1] First unseen message
< * OK [UIDVALIDITY 9313] UIDVALIDITY value
< A2 OK [READ-WRITE] SELECT completed
> A3 SEARCH UNSEEN ALL
< * SEARCH 1 2
< A3 OK SEARCH completed
> A4 FETCH 1 (BODY.PEEK[HEADER.FIELDS (FROM FROM)])
< * 1 FETCH (BODY[HEADER.FIELDS (FROM FROM)] {34}
From: User1 <user1@domain.org>
)
< A4 OK FETCH completed
> A5 CLOSE
< A5 OK CLOSE completed
> A6 LOGOUT
< * BYE Zarafa server logging out
< A6 OK LOGOUT completed
IMPORTANT: This patch has been very carefully and extensively tested but it might not be
perfect nevertheless as I am not really a C/C++ developer. There should be a code review
by an experienced C/C++ developer before merging into Zarafa core.
Proposed to upstream via e-mail on Thu, 29 May 2014 01:55:35 +0200, patch was put into the
upstream ticket https://jira.zarafa.com/browse/ZCP-12398.
--- zarafa-7.1.10/gateway/IMAP.cpp 2014-05-12 12:06:03.000000000 +0200
+++ zarafa-7.1.10/gateway/IMAP.cpp.imap-fetch-body 2014-05-29 00:49:29.000000000 +0200
@@ -5253,10 +5253,21 @@
} else {
vector<string> lstReqFields;
vector<string>::iterator iterReqField;
+ vector<string>::iterator r, w;
+ set<string> tmpset;
// Get fields as vector
lstReqFields = tokenize(strFields, " ");
+ // Make elements of vector unique
+ for(r = lstReqFields.begin(), w = lstReqFields.begin(); r != lstReqFields.end(); ++r) {
+ if(tmpset.insert(*r).second) {
+ *w++ = *r;
+ }
+ }
+
+ lstReqFields.erase(w, lstReqFields.end());
+
// Output headers specified, in order of field set
for(iterReqField = lstReqFields.begin(); iterReqField != lstReqFields.end(); iterReqField++) {
for(iterField = lstFields.begin(); iterField != lstFields.end(); iterField++) {

31
net-mail/zarafa/files/7.1.13.51032/zarafa-7.1.10-kyotocabinet.patch Normal file
View File

@ -0,0 +1,31 @@
Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 7.1.10 which re-adds the ability to disable
zarafa-search during build-time. This is e.g. required if CLucene and/or Kyotocabinet is unavailable or
broken on the given system and/or architecture. Interestingly that patch is not new, I wrote these lines
in 2012 the first time, proposed them as a patch to Zarafa and got merged. With a recent Zarafa release it
seems they silently removed it again...
Proposed to upstream via e-mail on Fri, 11 Jul 2014 01:03:43 +0200, patch was put into the upstream ticket
https://jira.zarafa.com/browse/ZCP-12463.
--- zarafa-7.1.10/ECtools/zarafa-search/Makefile.am 2014-05-23 15:03:49.000000000 +0200
+++ zarafa-7.1.10/ECtools/zarafa-search/Makefile.am.kyotocabinet 2014-07-10 21:48:42.000000000 +0200
@@ -1,4 +1,8 @@
+if WITH_CLUCENE
+if WITH_KYOTOCABINET
bin_PROGRAMS = zarafa-search
+endif
+endif
AM_CPPFLAGS = ${ZCPPFLAGS} \
-I${top_srcdir}/mapi4linux/include \
--- zarafa-7.1.10/ECtools/zarafa-search/Makefile.in 2014-05-23 15:04:02.000000000 +0200
+++ zarafa-7.1.10/ECtools/zarafa-search/Makefile.in.kyotocabinet 2014-07-10 21:49:16.000000000 +0200
@@ -34,7 +34,7 @@
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-bin_PROGRAMS = zarafa-search$(EXEEXT)
+@WITH_CLUCENE_TRUE@@WITH_KYOTOCABINET_TRUE@bin_PROGRAMS = zarafa-search$(EXEEXT)
subdir = ECtools/zarafa-search
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

32
net-mail/zarafa/files/7.1.13.51032/zarafa-7.1.11-vacation-headers.patch Normal file
View File

@ -0,0 +1,32 @@
Patch by Robert Scheck <robert@fedoraproject.org> for Zarafa >= 7.1.11 which restricts replies by
zarafa-autorespond to automated processes and mailing lists according to RFC 5230, section 4.6. For
further details please have a look to http://tools.ietf.org/html/rfc5230#page-8 as well.
Proposed to upstream via e-mail on Wed, 27 Aug 2014 23:30:31 +0200, patch was put into the upstream
ticket https://jira.zarafa.com/browse/ZCP-12590.
--- zarafa-7.1.11/spooler/DAgent.cpp 2014-08-24 12:27:06.000000000 +0200
+++ zarafa-7.1.11/spooler/DAgent.cpp.vacation-headers 2014-08-27 23:20:18.000000000 +0200
@@ -1422,11 +1422,19 @@
// See if we're looping
if (lpMessageProps[0].ulPropTag == PR_TRANSPORT_MESSAGE_HEADERS_A) {
- if ( (strstr(lpMessageProps[0].Value.lpszA, "X-Zarafa-Vacation:") != NULL) ||
- (strstr(lpMessageProps[0].Value.lpszA, "Auto-Submitted:") != NULL) ||
- (strstr(lpMessageProps[0].Value.lpszA, "Precedence:") != NULL) )
+ if ( (strstr(lpMessageProps[0].Value.lpszA, "X-Zarafa-Vacation:") != NULL) || // Zarafa
+ (strstr(lpMessageProps[0].Value.lpszA, "Auto-Submitted:") != NULL) || // RFC 3834
+ (strstr(lpMessageProps[0].Value.lpszA, "List-Id:") != NULL) || // RFC 2919
+ (strstr(lpMessageProps[0].Value.lpszA, "List-Help:") != NULL) || // RFC 2369
+ (strstr(lpMessageProps[0].Value.lpszA, "List-Subscribe:") != NULL) || // RFC 2369
+ (strstr(lpMessageProps[0].Value.lpszA, "List-Unsubscribe:") != NULL) || // RFC 2369
+ (strstr(lpMessageProps[0].Value.lpszA, "List-Post:") != NULL) || // RFC 2369
+ (strstr(lpMessageProps[0].Value.lpszA, "List-Owner:") != NULL) || // RFC 2369
+ (strstr(lpMessageProps[0].Value.lpszA, "List-Archive:") != NULL) || // RFC 2369
+ (strstr(lpMessageProps[0].Value.lpszA, "Precedence:") != NULL) ) // RFC 3834
// Vacation header already present, do not send vacation reply
// Precedence: list/bulk/junk, do not reply to these mails
+ // See also http://tools.ietf.org/html/rfc5230#page-8 for details
goto exit;
// save headers to a file so they can also be tested from the script we're runing
snprintf(szTemp, PATH_MAX, "%s/autorespond-headers.XXXXXX", getenv("TEMP") == NULL ? "/tmp" : getenv("TEMP"));

44
net-mail/zarafa/files/7.1.13.51032/zarafa-7.1.11-vacation-headers2.patch Normal file
View File

@ -0,0 +1,44 @@
Patch by Robert Scheck <robert@fedoraproject.org> for Zarafa >= 7.1.11 which adds anti-loop headers
for automatic responses by zarafa-autorespond for Microsoft Exchange and all vacation(1) compatible
implementations.
For the Microsoft Exchange related part useful links are:
- http://msdn.microsoft.com/en-us/library/ee219609(v=exchg.80).aspx
- https://www.jitbit.com/maxblog/18-detecting-outlook-autoreplyout-of-office-emails-and-x-auto-response-suppress-header/
For vacation(1) compatible implementations useful links are:
- http://www.daemon-systems.org/man/vacation.1.html
- Book "sendmail" (written by Bryan Costales, Claus Assmann, George Jansen, Gregory Neil Shapiro), ISBN 0596555342
Proposed to upstream via e-mail on Wed, 27 Aug 2014 23:59:58 +0200, patch was put into the upstream
ticket https://jira.zarafa.com/browse/ZCP-12591.
--- zarafa-7.1.11/spooler/DAgent.cpp 2014-08-24 12:27:06.000000000 +0200
+++ zarafa-7.1.11/spooler/DAgent.cpp.vacation-headers2 2014-08-27 23:52:42.000000000 +0200
@@ -1469,12 +1469,25 @@
if (hr != hrSuccess)
goto exit;
- // add anti-loop header
+ // add anti-loop header for Zarafa
snprintf(szHeader, PATH_MAX, "\nX-Zarafa-Vacation: autorespond");
hr = WriteOrLogError(fd, szHeader, strlen(szHeader));
if (hr != hrSuccess)
goto exit;
+ // add anti-loop header for Exchange, see http://msdn.microsoft.com/en-us/library/ee219609(v=exchg.80).aspx
+ snprintf(szHeader, PATH_MAX, "\nX-Auto-Response-Suppress: All");
+ hr = WriteOrLogError(fd, szHeader, strlen(szHeader));
+ if (hr != hrSuccess)
+ goto exit;
+
+ // add anti-loop header for vacation(1) compatible implementations, see section 10.9 of book "sendmail" (written
+ // by Bryan Costales, Claus Assmann, George Jansen, Gregory Neil Shapiro), ISBN 0596555342
+ snprintf(szHeader, PATH_MAX, "\nPrecedence: bulk");
+ hr = WriteOrLogError(fd, szHeader, strlen(szHeader));
+ if (hr != hrSuccess)
+ goto exit;
+
if (lpMessageProps[3].ulPropTag == PR_SUBJECT_W) {
// convert as one string because of [] characters
swprintf(szwHeader, PATH_MAX, L"%ls [%ls]", szSubject, lpMessageProps[3].Value.lpszW);

21
net-mail/zarafa/files/7.1.13.51032/zarafa-7.1.11-webaccess-fail2ban.patch Normal file
View File

@ -0,0 +1,21 @@
Patch by Robert Scheck <robert@fedoraproject.org> for Zarafa <= 7.1.11 which logs authentication
failures of Zarafa WebAccess into the error log of the webserver. This is basically a backport of
https://jira.zarafa.com/browse/WA-6908 from WebApp to WebAccess. In difference to original patch
there is no inappropriate space before a punctuation mark also known as "plenken".
Proposed to upstream via e-mail on Wed, 13 Aug 2014 22:56:09 +0200, initial patch was put into the
upstream ticket https://jira.zarafa.com/browse/ZCP-12543.
--- zarafa-7.1.11/php-webclient-ajax/client/login.php 2014-09-03 10:45:06.000000000 +0200
+++ zarafa-7.1.11/php-webclient-ajax/client/login.php 2015-02-18 01:08:13.000000000 +0100
@@ -86,6 +86,10 @@
switch($_SESSION["hresult"]){
case MAPI_E_LOGON_FAILED:
case MAPI_E_UNCONFIGURED:
+ // Print error message to error_log of webserver
+ if (!empty($_POST["username"])) {
+ error_log('user '.$_POST["username"].': authentication failure at MAPI');
+ }
echo _("Logon failed, please check your name/password.");
break;
case MAPI_E_NETWORK_ERROR:

38
net-mail/zarafa/files/7.1.13.51032/zarafa-7.1.12-gsoap-sslv3.patch Normal file
View File

@ -0,0 +1,38 @@
Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 7.1.12 which disables weak SSLv2
and SSLv3 protocols for encrypted SOAP connections between the Zarafa services. Until (including)
the Zarafa 7.1.11 release the upstream default was to replace the SSLv23_method() that a pristine
gSOAP library ships with the "safer" SSLv3_method(). With Zarafa 7.1.12 the SSLv3_method() was
changed to SSLv23_method(). However this enables SSLv2 again (and still does not disable SSLv3).
Thus this patch disables SSLv2 and SSLv3 as well as TLS compression explicitly; similar like the
Zarafa Outlook Client which meanwhile only allows TLSv1.0 (and better).
Proposed to upstream via e-mail on Wed, 2 Apr 2014 11:35:40 +0200, initial patch was put into the
upstream ticket Ticket#2014040210000266.
--- zarafa-7.1.12/provider/common/SOAPSock.cpp 2015-04-07 13:10:13.000000000 +0200
+++ zarafa-7.1.12/provider/common/SOAPSock.cpp.gsoap-sslv3 2015-04-07 16:32:20.000000000 +0200
@@ -157,9 +157,6 @@
lpCmd->endpoint = strdup(strServerPath.c_str());
- // default allow SSLv3, TLSv1, TLSv1.1 and TLSv1.2
- lpCmd->soap->ctx = SSL_CTX_new(SSLv23_method());
-
#ifdef WITH_OPENSSL
if (strncmp("https:", lpCmd->endpoint, 6) == 0) {
// no need to add certificates to call, since soap also calls SSL_CTX_set_default_verify_paths()
@@ -183,6 +180,14 @@
lpCmd->soap->fsslverify = ssl_verify_callback_zarafa_silent;
SSL_CTX_set_verify(lpCmd->soap->ctx, SSL_VERIFY_PEER, lpCmd->soap->fsslverify);
+
+ // disable SSLv2 (according to RFC 6176) and SSLv3, leaving just TLSv1.0 (and better)
+ SSL_CTX_set_options(lpCmd->soap->ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
+
+#ifdef SSL_OP_NO_COMPRESSION
+ // disable TLS compression to close the CRIME attack vector (also known as CVE-2012-4929)
+ SSL_CTX_set_options(lpCmd->soap->ctx, SSL_OP_NO_COMPRESSION);
+#endif
}
#endif

56
net-mail/zarafa/files/7.1.13.51032/zarafa-7.1.12-upgrade-lock.patch Normal file
View File

@ -0,0 +1,56 @@
Patch by Robert Scheck <robert@fedoraproject.org> for Zarafa 7.1.12 which backports the fix for
CVE-2015-3436. Guido Günther detected and reported that replacing "/tmp/zarafa-upgrade-lock" by
a symlink makes the zarafa-server process following that symlink and thus allows to overwrite
arbitrary files in the filesystem (assuming zarafa-server runs as root which is not the case by
default at Fedora, but it is the upstream default). One just needs write permissions in /tmp and
wait until the zarafa-server is restarted. https://bugzilla.redhat.com/show_bug.cgi?id=1222151
contains further information. The difference between this backport and the original diff is that
the log levels were reworked from Zarafa 7.1.x to 7.2.x (which this backport takes care of).
--- zarafa-7.1.12/provider/server/ECServer.cpp 2015-05-08 15:09:05.000000000 +0200
+++ zarafa-7.1.12/provider/server/ECServer.cpp.upgrade-lock 2015-05-18 23:05:00.000000000 +0200
@@ -101,6 +101,8 @@
// have to go with the safe value which is for 64bit.
#define MYSQL_MIN_THREAD_STACK (256*1024)
+const char upgrade_lock_file[] = "/tmp/zarafa-upgrade-lock";
+
extern ECSessionManager* g_lpSessionManager;
// scheduled functions
@@ -832,7 +834,7 @@
// SIGSEGV backtrace support
stack_t st = {0};
struct sigaction act = {{0}};
- FILE *tmplock = NULL;
+ int tmplock = -1;
struct stat dir = {0};
struct passwd *runasUser = NULL;
@@ -1288,8 +1290,9 @@
m_bDatabaseUpdateIgnoreSignals = true;
// add a lock file to disable the /etc/init.d scripts
- tmplock = fopen("/tmp/zarafa-upgrade-lock","w");
- if (!tmplock)
+ tmplock = open(upgrade_lock_file, O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
+
+ if (tmplock == -1)
g_lpLogger->Log(EC_LOGLEVEL_FATAL, "WARNING: Unable to place upgrade lockfile: %s", strerror(errno));
#ifdef EMBEDDED_MYSQL
@@ -1314,9 +1317,11 @@
er = lpDatabaseFactory->UpdateDatabase(m_bForceDatabaseUpdate, dbError);
// remove lock file
- if (tmplock) {
- fclose(tmplock);
- unlink("/tmp/zarafa-upgrade-lock");
+ if (tmplock != -1) {
+ if (unlink(upgrade_lock_file) == -1)
+ g_lpLogger->Log(EC_LOGLEVEL_FATAL, "WARNING: Unable to delete upgrade lockfile (%s): %s", upgrade_lock_file, strerror(errno));
+
+ close(tmplock);
}
if(er == ZARAFA_E_INVALID_VERSION) {

15
net-mail/zarafa/files/7.1.13.51032/zarafa-7.1.5-gentoo-swig1.3.patch Normal file
View File

@ -0,0 +1,15 @@
diff -uNr zarafa-7.1.5.orig/autoconf/swig.m4 zarafa-7.1.5/autoconf/swig.m4
--- zarafa-7.1.5.orig/autoconf/swig.m4 2013-08-15 17:10:38.483748612 +0200
+++ zarafa-7.1.5/autoconf/swig.m4 2013-08-15 17:11:28.996117121 +0200
@@ -12,9 +12,9 @@
need_swig=no
fi
-AC_PATH_PROG(SWIG_EXEC, [swig])
+AC_PATH_PROG(SWIG_EXEC, [swig1.3])
if test "$need_swig" = "yes" -a "x$SWIG_EXEC" = "x"; then
- AC_MSG_ERROR([Current options require swig, but swig binary is not found])
+ AC_MSG_ERROR([Current options require swig 1.3, but swig 1.3 binary is not found])
fi
AM_CONDITIONAL([WITH_SWIG], [test "$want_swig" = "yes"])
])

96
net-mail/zarafa/files/7.1.13.51032/zarafa-7.1.9-sysconfig2confd-1.patch Normal file
View File

@ -0,0 +1,96 @@
diff -uNr zarafa-7.1.9.orig/installer/linux/Makefile.am zarafa-7.1.9/installer/linux/Makefile.am
--- zarafa-7.1.9.orig/installer/linux/Makefile.am 2014-06-26 14:42:22.479211315 +0200
+++ zarafa-7.1.9/installer/linux/Makefile.am 2014-06-26 14:43:27.764208414 +0200
@@ -29,7 +29,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.1.9.orig/installer/userscripts/createcompany.in zarafa-7.1.9/installer/userscripts/createcompany.in
--- zarafa-7.1.9.orig/installer/userscripts/createcompany.in 2014-06-26 14:42:22.477211315 +0200
+++ zarafa-7.1.9/installer/userscripts/createcompany.in 2014-06-26 14:43:27.764208414 +0200
@@ -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.1.9.orig/installer/userscripts/creategroup.in zarafa-7.1.9/installer/userscripts/creategroup.in
--- zarafa-7.1.9.orig/installer/userscripts/creategroup.in 2014-06-26 14:42:22.478211315 +0200
+++ zarafa-7.1.9/installer/userscripts/creategroup.in 2014-06-26 14:43:27.764208414 +0200
@@ -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.1.9.orig/installer/userscripts/createuser.in zarafa-7.1.9/installer/userscripts/createuser.in
--- zarafa-7.1.9.orig/installer/userscripts/createuser.in 2014-06-26 14:42:22.478211315 +0200
+++ zarafa-7.1.9/installer/userscripts/createuser.in 2014-06-26 14:43:27.765208414 +0200
@@ -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.1.9.orig/installer/userscripts/deletecompany.in zarafa-7.1.9/installer/userscripts/deletecompany.in
--- zarafa-7.1.9.orig/installer/userscripts/deletecompany.in 2014-06-26 14:42:22.478211315 +0200
+++ zarafa-7.1.9/installer/userscripts/deletecompany.in 2014-06-26 14:44:16.158206264 +0200
@@ -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
elif [ -f @sysconfdir@/default/zarafa ]; then
. @sysconfdir@/default/zarafa
fi
diff -uNr zarafa-7.1.9.orig/installer/userscripts/deletegroup.in zarafa-7.1.9/installer/userscripts/deletegroup.in
--- zarafa-7.1.9.orig/installer/userscripts/deletegroup.in 2014-06-26 14:42:22.478211315 +0200
+++ zarafa-7.1.9/installer/userscripts/deletegroup.in 2014-06-26 14:44:26.328205812 +0200
@@ -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
elif [ -f @sysconfdir@/default/zarafa ]; then
. @sysconfdir@/default/zarafa
fi
diff -uNr zarafa-7.1.9.orig/installer/userscripts/deleteuser.in zarafa-7.1.9/installer/userscripts/deleteuser.in
--- zarafa-7.1.9.orig/installer/userscripts/deleteuser.in 2014-06-26 14:42:22.478211315 +0200
+++ zarafa-7.1.9/installer/userscripts/deleteuser.in 2014-06-26 14:44:34.925205430 +0200
@@ -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
elif [ -f @sysconfdir@/default/zarafa ]; then
. @sysconfdir@/default/zarafa
fi

6
net-mail/zarafa/zarafa-7.1.12.49411.ebuild
View File

@ -23,14 +23,12 @@ 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-supported.tar.gz
http://download.zarafa.com/zarafa/drupal/download_platform.php?platform=${ZARAFA_RELEASE}/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-ubuntu-12.04-x86_64-supported.tar.gz
amd64? ( licensed? ( http://download.zarafa.com/zarafa/drupal/download_platform.php?platform=${ZARAFA_RELEASE}/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-ubuntu-12.04-x86_64-supported.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.20_amd64.deb
https://launchpad.net/ubuntu/+archive/primary/+files/libicu48_4.8.1.1-3ubuntu0.1_amd64.deb ) )
x86? ( licensed? ( http://download.zarafa.com/community/${ZARAFA_RELEASE}/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-ubuntu-12.04-i386-supported.tar.gz
http://download.zarafa.com/zarafa/drupal/download_platform.php?platform=${ZARAFA_RELEASE}/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-ubuntu-12.04-i386-supported.tar.gz
x86? ( licensed? ( http://download.zarafa.com/zarafa/drupal/download_platform.php?platform=${ZARAFA_RELEASE}/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-ubuntu-12.04-i386-supported.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.20_i386.deb

249
net-mail/zarafa/zarafa-7.1.13.51032.ebuild Normal file
View File

@ -0,0 +1,249 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="4"
PHP_EXT_NAME="mapi"
USE_PHP="php5-3 php5-4 php5-5"
PYTHON_DEPEND="python? 2"
inherit eutils bash-completion flag-o-matic depend.php php-ext-source-r2 python unpacker autotools versionator systemd
DESCRIPTION="Open Source Groupware Solution"
HOMEPAGE="http://zarafa.com/"
ZARAFA_RELEASE="final"
ZARAFA_ARM="0.6.0"
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/zarafa/drupal/download_platform.php?platform=${ZARAFA_RELEASE}/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-ubuntu-12.04-x86_64-supported.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.20_amd64.deb
https://launchpad.net/ubuntu/+archive/primary/+files/libicu48_4.8.1.1-3ubuntu0.1_amd64.deb ) )
x86? ( licensed? ( http://download.zarafa.com/zarafa/drupal/download_platform.php?platform=${ZARAFA_RELEASE}/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-ubuntu-12.04-i386-supported.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.20_i386.deb
https://launchpad.net/ubuntu/+archive/primary/+files/libicu48_4.8.1.1-3ubuntu0.1_i386.deb ) )
arm? ( licensed? ( http://www.jdo.it/Zarafa_${ZARAFA_ARM}_arm.spk -> zcp-${MY_PV}-spk-arm-free.tar ) )"
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 +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-2.3.3.4-r5
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 )
python? ( dev-lang/python )
swig? ( =dev-lang/swig-1.3* )
tcmalloc? ( dev-util/google-perftools[static-libs] )"
DEPEND="${RDEPEND}
sparsehash? ( dev-cpp/sparsehash )
dev-util/pkgconfig
sys-devel/gettext"
need_php_httpd
pkg_setup() {
python_set_active_version 2
python_pkg_setup
}
src_prepare() {
local slot orig_s="$S"
for slot in $(php_get_slots); do
php_init_slot_env ${slot}
EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" epatch
edos2unix php-webclient-ajax/config.php.dist
AT_M4DIR="autoconf" eautoreconf
done
append-flags "-fPIC"
}
src_unpack() {
unpack zcp-${MY_PVR}.tar.gz
local slot orig_s="$S"
for slot in $(php_get_slots); do
cp -r "${orig_s}" "${WORKDIR}/${slot}"
done
if use licensed; then
if [[ "${ARCH}" == "amd64" ]]; then
unpack zcp-${MY_PV}-ubuntu-12.04-x86_64-supported.tar.gz
fi
if [[ "${ARCH}" == "x86" ]]; then
unpack zcp-${MY_PV}-ubuntu-12.04-i386-supported.tar.gz
fi
if [[ "${ARCH}" == "arm" ]]; then
unpack zcp-${MY_PV}-spk-arm-free.tar
unpack $(find ./ -name "package.tgz")
mkdir arm
pushd arm
unpack $(find ./../ -name "zarafa.tgz")
popd
fi
pushd "${WORKDIR}"
mkdir licensed
cd licensed
if [[ "${ARCH}" == "amd64" || "${ARCH}" == "x86" ]]; then
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")
fi
if [[ "${ARCH}" == "arm" ]]; then
mv ../arm/zarafa-licensed usr
mv usr/bin/zarafa-licensed-arm usr/bin/zarafa-licensed
echo "#/bin/sh" > usr/bin/zarafa-report
echo "echo \"zarafa-report not ported to arm\"" >> usr/bin/zarafa-report
echo "echo \"Please contact zarafa for arm\"" >> usr/bin/zarafa-report
echo "echo \"support.\"" >> usr/bin/zarafa-report
echo "exit 0" >> usr/bin/zarafa-report
mkdir -p etc/zarafa/license
mv ../arm/etc/zarafa/licensed.cfg etc/zarafa/
mkdir -p usr/share/doc/zarafa-licensed
mv ../arm/share/doc/zarafa/eula.txt usr/share/doc/zarafa-licensed/
mkdir -p usr/share/man/man{1,5}
mv ../arm/share/man/man1/zarafa-{licensed,report}.* usr/share/man/man1/
mv ../arm/share/man/man5/zarafa-licensed.cfg.* usr/share/man/man5/
fi
popd
fi
cd "${S}"
}
src_configure() {
append-flags -fpermissive
local slot
for slot in $(php_get_slots); do
php_init_slot_env ${slot}
econf \
--enable-oss \
--enable-release \
--enable-unicode \
--enable-epoll \
--with-userscript-prefix=/etc/zarafa/userscripts \
--with-quotatemplate-prefix=/etc/zarafa/quotamails \
--with-searchscripts-prefix=/etc/zarafa/searchscripts \
--with-php-config=${PHPCONFIG} \
$(use_with pic) \
$(use_enable icu) \
$(use_enable static) \
$(use_enable python) \
$(use_enable swig) \
$(use_enable tcmalloc tcmalloc-full) \
$(use_enable profiling) \
$(use_enable sparsehash) \
$(use_enable debug) || die "Unable to configure code to compile"
done
}
src_compile() {
local slot
for slot in $(php_get_slots); do
php_init_slot_env ${slot}
find swig -type f | xargs touch
emake || die "emake failed"
done
}
src_install() {
local slot
for slot in $(php_get_slots); do
php_init_slot_env ${slot}
emake DESTDIR="${D}" install || die "make install failed"
done
emake DESTDIR="${D}" install-ajax-webaccess || die "make install-ajax-webaccess failed"
rm -rf "${D}"/etc/php
php-ext-source-r2_createinifiles
php-ext-source-r2_addtoinifiles "mapi.debug" "0"
if [[ "${ARCH}" == "x86" || "${ARCH}" == "amd64" || "${ARCH}" == "arm" ]]; then
if use licensed; then
ZARAFA_SERVICES="${ZARAFA_SERVICES} licensed"
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)
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-* || die "Failed to install man files"
dodoc -r "${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"
fi
fi
insinto /etc/apache2/modules.d
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}"/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 installer/linux/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 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}"
systemd_newunit "${FILESDIR}/zarafa-${service}.service" "zarafa-${service}.service"
done
dobashcompletion "${FILESDIR}/zarafa-bash-completion.sh" ${PN}
}