Drop old release and Bump 7.0
(Portage version: 2.2.0_alpha123/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)
This commit is contained in:
Mario Fetka
parent
c6998a297f
commit
7409f9eab0
@ -2,6 +2,150 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: $
|
||||
|
||||
20 Oct 2012; Mario Fetka <mario.fetka@gmail.com>
|
||||
-files/6.40.10.28214/Datux-sendas.patch,
|
||||
-files/6.40.15.33766/Datux-sendas.patch,
|
||||
-files/6.40.12.29942/zarafa-6.40.2-libtcmalloc_shared-1.patch,
|
||||
-files/6.40.11.28965/fix-zarafastats-uuid-linkage.patch,
|
||||
-files/6.40.16.34239/fix-pthread.patch,
|
||||
-files/6.40.10.28214/zarafa-6.40.2-sysconfig2confd-1.patch,
|
||||
-files/6.40.17.35943/fix-zarafastats-uuid-linkage.patch,
|
||||
-files/6.40.17.35943/zarafa-6.40.1-no-php-conf.patch,
|
||||
-files/7.0.10.37482/zarafa-6.40.1-no-php-conf.patch,
|
||||
-files/6.40.15.33766/zarafa-6.40.2-libtcmalloc_shared-1.patch,
|
||||
-files/6.40.16.34239/zarafa-6.40.2-libtcmalloc_shared-1.patch,
|
||||
-files/6.40.17.35943/zarafa-6.40.2-libtcmalloc_shared-1.patch,
|
||||
-files/6.40.13.30778/zarafa-6.40.2-sysconfig2confd-1.patch,
|
||||
-files/6.40.10.28214/Datux-spamhook.patch,
|
||||
-files/6.40.10.28214/fix-pthread.patch,
|
||||
-files/6.40.10.28214/fix-zarafaserver-uuid-linkage.patch,
|
||||
-files/6.40.10.28214/fix-zarafastats-uuid-linkage.patch,
|
||||
-files/6.40.11.28965/Datux-sendas.patch,
|
||||
-files/6.40.12.29942/Datux-sendas.patch,
|
||||
-files/6.40.13.30778/Datux-sendas.patch,
|
||||
-files/6.40.10.28214/zarafa-6.40.1-no-php-conf.patch,
|
||||
-files/6.40.13.30778/fix-pthread.patch,
|
||||
-files/6.40.11.28965/zarafa-6.40.1-no-php-conf.patch,
|
||||
-files/6.40.11.28965/fix-pthread.patch,
|
||||
-files/6.40.12.29942/Datux-spamhook.patch,
|
||||
-files/6.40.14.31537/Datux-sendas.patch,
|
||||
-files/6.40.15.33766/Datux-spamhook.patch,
|
||||
-files/6.40.10.28214/zarafa-6.40.2-libtcmalloc_shared-1.patch,
|
||||
-files/6.40.11.28965/zarafa-6.40.2-libtcmalloc_shared-1.patch,
|
||||
-files/6.40.13.30778/zarafa-6.40.2-libtcmalloc_shared-1.patch,
|
||||
-files/6.40.16.34239/zarafa-6.40.2-sysconfig2confd-1.patch,
|
||||
-files/6.40.17.35943/zarafa-6.40.2-sysconfig2confd-1.patch,
|
||||
-files/6.40.10.28214/zarafa-6.40.6-force_latin1.patch,
|
||||
-files/6.40.12.29942/fix-pthread.patch,
|
||||
-files/6.40.14.31537/fix-pthread.patch,
|
||||
-files/6.40.15.33766/fix-pthread.patch,
|
||||
-files/6.40.11.28965/zarafa-6.40.2-sysconfig2confd-1.patch,
|
||||
-files/6.40.12.29942/zarafa-6.40.2-sysconfig2confd-1.patch,
|
||||
-files/6.40.17.35943/zarafa-6.40.6-force_latin1.patch,
|
||||
-files/6.40.10.28214/zarafa-6.40.10-package.patch,
|
||||
-files/6.40.11.28965/Datux-spamhook.patch,
|
||||
-files/6.40.11.28965/fix-zarafaserver-uuid-linkage.patch,
|
||||
-files/6.40.12.29942/fix-zarafaserver-uuid-linkage.patch,
|
||||
-files/6.40.13.30778/Datux-spamhook.patch,
|
||||
-files/6.40.15.33766/fix-zarafaserver-uuid-linkage.patch,
|
||||
-files/6.40.11.28965/zarafa-6.40.6-force_latin1.patch,
|
||||
-zarafa-6.40.8.27223.ebuild,
|
||||
-files/6.40.12.29942/fix-zarafastats-uuid-linkage.patch,
|
||||
-files/6.40.13.30778/fix-zarafaserver-uuid-linkage.patch,
|
||||
-files/6.40.15.33766/fix-zarafastats-uuid-linkage.patch,
|
||||
-files/6.40.12.29942/zarafa-6.40.1-no-php-conf.patch,
|
||||
-zarafa-6.40.9.27553.ebuild,
|
||||
-files/6.40.14.31537/fix-zarafastats-uuid-linkage.patch,
|
||||
-files/6.40.16.34239/Datux-sendas.patch,
|
||||
-files/6.40.14.31537/zarafa-6.40.1-no-php-conf.patch,
|
||||
-files/6.40.14.31537/zarafa-6.40.2-libtcmalloc_shared-1.patch,
|
||||
-files/6.40.14.31537/zarafa-6.40.2-sysconfig2confd-1.patch,
|
||||
-files/6.40.12.29942/zarafa-6.40.6-force_latin1.patch,
|
||||
-files/6.40.13.30778/zarafa-6.40.6-force_latin1.patch,
|
||||
-zarafa-6.40.10.28214.ebuild,
|
||||
-files/6.40.11.28965/zarafa-6.40.10-package.patch,
|
||||
-files/6.40.16.34239/fix-zarafaserver-uuid-linkage.patch,
|
||||
-files/6.40.15.33766/zarafa-6.40.1-no-php-conf.patch,
|
||||
-files/6.40.12.29942/zarafa-6.40.10-package.patch,
|
||||
-files/6.40.13.30778/zarafa-6.40.10-package.patch,
|
||||
-files/6.40.17.35943/zarafa-6.40.10-package.patch,
|
||||
-files/6.40.13.30778/fix-zarafastats-uuid-linkage.patch,
|
||||
-files/6.40.14.31537/Datux-spamhook.patch,
|
||||
-files/6.40.17.35943/Datux-sendas.patch,
|
||||
-files/6.40.13.30778/zarafa-6.40.1-no-php-conf.patch,
|
||||
-files/6.40.15.33766/zarafa-6.40.2-sysconfig2confd-1.patch,
|
||||
-files/6.40.14.31537/zarafa-6.40.6-force_latin1.patch,
|
||||
-files/6.40.16.34239/zarafa-6.40.10-package.patch,
|
||||
-files/6.40.14.31537/fix-zarafaserver-uuid-linkage.patch,
|
||||
-files/6.40.14.31537/zarafa-6.40.10-package.patch,
|
||||
-zarafa-6.40.11.28965.ebuild, -files/6.40.16.34239/Datux-spamhook.patch,
|
||||
-zarafa-6.40.14.31537.ebuild, -files/6.40.8.27223/Datux-sendas.patch,
|
||||
-files/6.40.16.34239/fix-zarafastats-uuid-linkage.patch,
|
||||
-files/6.40.15.33766/zarafa-6.40.6-force_latin1.patch,
|
||||
-zarafa-6.40.12.29942.ebuild, -files/6.40.17.35943/fix-pthread.patch,
|
||||
-files/6.40.16.34239/zarafa-6.40.1-no-php-conf.patch,
|
||||
-files/6.40.16.34239/zarafa-6.40.6-force_latin1.patch,
|
||||
-files/6.40.15.33766/zarafa-6.40.10-package.patch,
|
||||
-zarafa-6.40.15.33766.ebuild, -files/6.40.8.27223/Datux-spamhook.patch,
|
||||
-files/6.40.17.35943/Datux-spamhook.patch,
|
||||
-files/6.40.17.35943/fix-zarafaserver-uuid-linkage.patch,
|
||||
-zarafa-6.40.13.30778.ebuild, -zarafa-6.40.16.34239.ebuild,
|
||||
-files/6.40.8.27223/fix-pthread.patch, -zarafa-6.40.17.35943.ebuild,
|
||||
-files/7.0.10.37482/zarafa-7.0.3-php54.patch, -zarafa-7.0.3.30515.ebuild,
|
||||
-files/6.40.8.27223/fix-zarafaserver-uuid-linkage.patch,
|
||||
-zarafa-7.0.4.31235.ebuild,
|
||||
-files/6.40.8.27223/fix-zarafastats-uuid-linkage.patch,
|
||||
-zarafa-7.0.5.31880.ebuild, -files/7.0.3.30515/Datux-sendas.patch,
|
||||
-files/6.40.8.27223/zarafa-6.40.1-no-php-conf.patch,
|
||||
-zarafa-7.0.6.32752.ebuild, -files/7.0.3.30515/Datux-spamhook.patch,
|
||||
-files/7.0.3.30515/zarafa-6.40.1-no-php-conf.patch,
|
||||
-files/6.40.8.27223/zarafa-6.40.2-libtcmalloc_shared-1.patch,
|
||||
-files/7.0.3.30515/zarafa-6.40.2-libtcmalloc_shared-1.patch,
|
||||
-files/6.40.8.27223/zarafa-6.40.2-sysconfig2confd-1.patch,
|
||||
-files/6.40.8.27223/zarafa-6.40.6-force_latin1.patch,
|
||||
-files/6.40.8.27223/zarafa-6.40.6-package.patch,
|
||||
-files/7.0.3.30515/zarafa-7.0.0-package.patch, -zarafa-7.0.7.34256.ebuild,
|
||||
-files/6.40.9.27553/Datux-sendas.patch,
|
||||
-files/7.0.3.30515/zarafa-7.0.3-sysconfig2confd-1.patch,
|
||||
zarafa-7.0.10.37482.ebuild, -files/6.40.9.27553/Datux-spamhook.patch,
|
||||
-files/6.40.9.27553/fix-pthread.patch,
|
||||
-files/6.40.9.27553/fix-zarafaserver-uuid-linkage.patch,
|
||||
-files/6.40.9.27553/fix-zarafastats-uuid-linkage.patch,
|
||||
-files/7.0.4.31235/Datux-sendas.patch,
|
||||
-files/6.40.9.27553/zarafa-6.40.1-no-php-conf.patch,
|
||||
-files/7.0.4.31235/Datux-spamhook.patch,
|
||||
-files/7.0.4.31235/zarafa-6.40.1-no-php-conf.patch,
|
||||
-files/6.40.9.27553/zarafa-6.40.2-libtcmalloc_shared-1.patch,
|
||||
-files/7.0.4.31235/zarafa-6.40.2-libtcmalloc_shared-1.patch,
|
||||
-files/6.40.9.27553/zarafa-6.40.2-sysconfig2confd-1.patch,
|
||||
-files/6.40.9.27553/zarafa-6.40.6-force_latin1.patch,
|
||||
-files/6.40.9.27553/zarafa-6.40.6-package.patch,
|
||||
-files/7.0.4.31235/zarafa-7.0.0-package.patch,
|
||||
-files/7.0.4.31235/zarafa-7.0.3-php54.patch,
|
||||
-files/7.0.4.31235/zarafa-7.0.3-sysconfig2confd-1.patch,
|
||||
-files/7.0.5.31880/Datux-sendas.patch,
|
||||
-files/7.0.5.31880/Datux-spamhook.patch,
|
||||
-files/7.0.5.31880/zarafa-6.40.1-no-php-conf.patch,
|
||||
-files/7.0.5.31880/zarafa-6.40.2-libtcmalloc_shared-1.patch,
|
||||
-files/7.0.5.31880/zarafa-7.0.0-package.patch,
|
||||
-files/7.0.5.31880/zarafa-7.0.3-php54.patch,
|
||||
-files/7.0.5.31880/zarafa-7.0.3-sysconfig2confd-1.patch,
|
||||
-files/7.0.6.32752/Datux-sendas.patch,
|
||||
-files/7.0.6.32752/Datux-spamhook.patch,
|
||||
-files/7.0.6.32752/zarafa-6.40.1-no-php-conf.patch,
|
||||
-files/7.0.6.32752/zarafa-6.40.2-libtcmalloc_shared-1.patch,
|
||||
-files/7.0.6.32752/zarafa-7.0.0-package.patch,
|
||||
-files/7.0.6.32752/zarafa-7.0.3-php54.patch,
|
||||
-files/7.0.6.32752/zarafa-7.0.3-sysconfig2confd-1.patch,
|
||||
-files/7.0.7.34256/Datux-sendas.patch,
|
||||
-files/7.0.7.34256/Datux-spamhook.patch,
|
||||
-files/7.0.7.34256/zarafa-6.40.1-no-php-conf.patch,
|
||||
-files/7.0.7.34256/zarafa-6.40.2-libtcmalloc_shared-1.patch,
|
||||
-files/7.0.7.34256/zarafa-7.0.0-package.patch,
|
||||
-files/7.0.7.34256/zarafa-7.0.3-php54.patch,
|
||||
-files/7.0.7.34256/zarafa-7.0.3-sysconfig2confd-1.patch:
|
||||
Drop old release and Bump 7.0
|
||||
|
||||
*zarafa-7.0.10.37482 (20 Oct 2012)
|
||||
*zarafa-6.40.17.35943 (20 Oct 2012)
|
||||
|
||||
|
||||
@ -1,146 +1,10 @@
|
||||
AUX 50_zarafa-webaccess-mobile.conf 298 SHA256 7019d90fae91e2efb54c2b002ff3ee40de5a684686a74753385514b6abbe8581 SHA512 e6bf51ba872747d6cdca64e52e6fb0659d3b3e6fffd5f72fe2dda0aa04aa62a8273a1b11f66d7a9f9baf115257a9008367212a2cc1d987a9379494cd810779cb WHIRLPOOL 09948e764b0927b7bfbcaf411ae32ed2d95ca524ca6e8acee854a7cb68d3f2587092d6085c93d876aa2bec9b8eed2337bd3300cbb7c677549804dd4a7d48400a
|
||||
AUX 50_zarafa-webaccess.conf 270 SHA256 ddf11e70107c2d6eaf40ba8253e2118822ee66eddaf471afebca248ba71e85a6 SHA512 b12f5fa4eae45c7b200d379722afb9c2d6d004d9fd7eb3c6f185ce985cb24937cb7a171ea36017306080a90032135b114f5a50b6098d1796244cba88e258576f WHIRLPOOL f4ab0a1f4cbff18866aa0279c2f5daf998b972ff31119b682bfae4eb9e29f9493295770a47ca60932470edc14aea12239f2ec9923040d3f1e286b8adb3f23f22
|
||||
AUX 6.40.10.28214/Datux-sendas.patch 1429 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 SHA512 53b3f465d6b16b947a88acec63b24bc4ee46f5d1ed54edd8a064a877ec6ccb06752d9ebe68216d953e8428cca9a67e7a05fdb609f8daa94049c0961c575aac52 WHIRLPOOL e3d0616c47127a8a9217ad2a4d985ff14aec76c28af49a421283e77d9eb373076c4f9581665b8f7f1fc2340da4414cdd313da95b0983c0c3eaa6e93a914d436b
|
||||
AUX 6.40.10.28214/Datux-spamhook.patch 9895 SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b SHA512 2e048eb053902d9664ec8e3acee15edb1725db282e5f3e13817820d53a4cd788812560125d4fd624df7e69a89dbb2e089295d25f6ae25d5a6b4350e5756554ff WHIRLPOOL 4fd8b192baa7ce24dca903315cef987375b20814aa9da7b23c69ace76eda1a0058b59cd16b84ccb234a3775d1c3b1c4194bb4630c076cc43af0e133a0ca0ffed
|
||||
AUX 6.40.10.28214/fix-pthread.patch 2101 SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c SHA512 adb0bb77cdf0a536430a42e58165bdab962b209e9ea14a45b0e8f4b2a385ec65760cb2d576e7947b06d499c3417438123dafe1133998abe785e83fd2fb2117fd WHIRLPOOL 47482c7ed3db170f275d32f278c3977671ece2e3ea93c4198c7ba8cd36ae1c9375437401a9488408b9101b8176fcbc6b884facad5b7282a96c45ac60bbf80d6f
|
||||
AUX 6.40.10.28214/fix-zarafaserver-uuid-linkage.patch 1394 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 SHA512 a21505aada3a2cff4f2ed9c32a79012bafb64abfcbf06f1a112d00e28143f3820528dc998023becf5de60df50d3d1a112cdc42fcb45c502b8b5b06871d6508bb WHIRLPOOL 633dc3441ee0947ac1c4b2686a5f378a012a0781fdb2db680b29afb893525446c9ba14d3bb6b1e1702d5ea1500a3efb9fcb21225899003a9dddbf36f952872b1
|
||||
AUX 6.40.10.28214/fix-zarafastats-uuid-linkage.patch 1051 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 SHA512 444821736e05166d762dbbfde76df052d7ba56a45e7ddba28986111c8fa918c8741b1efa6ed0d700a990ce87e7419ade93a3a1d4f746b504dd87ebedec1d8194 WHIRLPOOL f83f4946be2146ed5c5b8489e5be840ab5895aaa2f959235c28a378dc2117f0495b6037157f68c864be0520de1dd3c26f6ef95cefdca9646ef7497a63937addf
|
||||
AUX 6.40.10.28214/zarafa-6.40.1-no-php-conf.patch 1634 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f SHA512 cefc1c0494353cfe183e2f8a2010dd2f1eb05638ddef0f5d1029fc3d060e3540329e458595d3321ecc6cdba14f2696f0d37322fc055d5ee8901053e6bacaf5e3 WHIRLPOOL 07ba273f5b5a3b51c159ee020e75becf0faf5da0f22c62ac6d516a91bb1f078f96bc05f0f0015b5e16e16bcf0a67255a93951177f81b761db3ff2be937a7b160
|
||||
AUX 6.40.10.28214/zarafa-6.40.10-package.patch 2221 SHA256 763cf76396090f830fb3f27f69c9e4f787b4792c6db9216d9e0998189bd26843 SHA512 8361372f9471096f162df42f009d8188e4a5ed63a285ae636bb3f72beacde2bf79e2805beecb2cec9ed45e78d8b9e0fdafb0e0e583ea969254879573f3b57515 WHIRLPOOL caabd644f9b1bb1c980dfa1cfa34daddc75f85ba74cde4164726e04b60a9845a57bffcfd3bce5c30ce463e2c25476cad5a6fdc1e246cfb491c8d2a733a749202
|
||||
AUX 6.40.10.28214/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 SHA512 bad27d53e94829658ec8af016a525aa7c3146b84aeb0d65c0917d829f7e6fe4377859e81727dbd039803cbfcfb7f54a14ed126564ef1734674dc140a1c0c9f90 WHIRLPOOL c97b62f4ad31de88a27d3050293d30bb65fc392455ef87a2ee4198cd49db0ddaa87bd32330f75c194f6ffd6979719ab78ef95e356df9d62c6f43d74eb9fc9ffa
|
||||
AUX 6.40.10.28214/zarafa-6.40.2-sysconfig2confd-1.patch 8495 SHA256 591dfe4e220673818fd3548d9b36f8b4e5ea92529eaf3d7bee6c7885808f8988 SHA512 567aab42d71ae632b763d16b4b9af82fb27174bc3ba09c6d15383db9f4e2ccf54633ddc3d708e643cbd0605006bbc793998e2c3b7b26be8a85482c8adaa31000 WHIRLPOOL 749e2fd5612c2f1b4cc2cb2db512e5cd9ec10c4a6224a1c7780008a317216f741ace6354f68531129be1439d90ae56daa826ff5e45ebf72248c0e78fcdebca87
|
||||
AUX 6.40.10.28214/zarafa-6.40.6-force_latin1.patch 618 SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496 SHA512 103ecced3a8a0ec397c0fcaf2b4b5cdfec8aabfcfbd5708c9d79316e911a5d3c2f7b83b24c18902e503466cf3c0e683c7198e017be0d6bcbc05f45a189c18972 WHIRLPOOL 5d60049191af9688b3ad2d5e1c62d0543de573b9212b9396902a0324063b358de7dd32c34c8546b8fad02a84b0c04c5de23cdd555d61ba4375eb548651461fd7
|
||||
AUX 6.40.11.28965/Datux-sendas.patch 1429 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 SHA512 53b3f465d6b16b947a88acec63b24bc4ee46f5d1ed54edd8a064a877ec6ccb06752d9ebe68216d953e8428cca9a67e7a05fdb609f8daa94049c0961c575aac52 WHIRLPOOL e3d0616c47127a8a9217ad2a4d985ff14aec76c28af49a421283e77d9eb373076c4f9581665b8f7f1fc2340da4414cdd313da95b0983c0c3eaa6e93a914d436b
|
||||
AUX 6.40.11.28965/Datux-spamhook.patch 9895 SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b SHA512 2e048eb053902d9664ec8e3acee15edb1725db282e5f3e13817820d53a4cd788812560125d4fd624df7e69a89dbb2e089295d25f6ae25d5a6b4350e5756554ff WHIRLPOOL 4fd8b192baa7ce24dca903315cef987375b20814aa9da7b23c69ace76eda1a0058b59cd16b84ccb234a3775d1c3b1c4194bb4630c076cc43af0e133a0ca0ffed
|
||||
AUX 6.40.11.28965/fix-pthread.patch 2101 SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c SHA512 adb0bb77cdf0a536430a42e58165bdab962b209e9ea14a45b0e8f4b2a385ec65760cb2d576e7947b06d499c3417438123dafe1133998abe785e83fd2fb2117fd WHIRLPOOL 47482c7ed3db170f275d32f278c3977671ece2e3ea93c4198c7ba8cd36ae1c9375437401a9488408b9101b8176fcbc6b884facad5b7282a96c45ac60bbf80d6f
|
||||
AUX 6.40.11.28965/fix-zarafaserver-uuid-linkage.patch 1394 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 SHA512 a21505aada3a2cff4f2ed9c32a79012bafb64abfcbf06f1a112d00e28143f3820528dc998023becf5de60df50d3d1a112cdc42fcb45c502b8b5b06871d6508bb WHIRLPOOL 633dc3441ee0947ac1c4b2686a5f378a012a0781fdb2db680b29afb893525446c9ba14d3bb6b1e1702d5ea1500a3efb9fcb21225899003a9dddbf36f952872b1
|
||||
AUX 6.40.11.28965/fix-zarafastats-uuid-linkage.patch 1051 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 SHA512 444821736e05166d762dbbfde76df052d7ba56a45e7ddba28986111c8fa918c8741b1efa6ed0d700a990ce87e7419ade93a3a1d4f746b504dd87ebedec1d8194 WHIRLPOOL f83f4946be2146ed5c5b8489e5be840ab5895aaa2f959235c28a378dc2117f0495b6037157f68c864be0520de1dd3c26f6ef95cefdca9646ef7497a63937addf
|
||||
AUX 6.40.11.28965/zarafa-6.40.1-no-php-conf.patch 1634 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f SHA512 cefc1c0494353cfe183e2f8a2010dd2f1eb05638ddef0f5d1029fc3d060e3540329e458595d3321ecc6cdba14f2696f0d37322fc055d5ee8901053e6bacaf5e3 WHIRLPOOL 07ba273f5b5a3b51c159ee020e75becf0faf5da0f22c62ac6d516a91bb1f078f96bc05f0f0015b5e16e16bcf0a67255a93951177f81b761db3ff2be937a7b160
|
||||
AUX 6.40.11.28965/zarafa-6.40.10-package.patch 2221 SHA256 763cf76396090f830fb3f27f69c9e4f787b4792c6db9216d9e0998189bd26843 SHA512 8361372f9471096f162df42f009d8188e4a5ed63a285ae636bb3f72beacde2bf79e2805beecb2cec9ed45e78d8b9e0fdafb0e0e583ea969254879573f3b57515 WHIRLPOOL caabd644f9b1bb1c980dfa1cfa34daddc75f85ba74cde4164726e04b60a9845a57bffcfd3bce5c30ce463e2c25476cad5a6fdc1e246cfb491c8d2a733a749202
|
||||
AUX 6.40.11.28965/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 SHA512 bad27d53e94829658ec8af016a525aa7c3146b84aeb0d65c0917d829f7e6fe4377859e81727dbd039803cbfcfb7f54a14ed126564ef1734674dc140a1c0c9f90 WHIRLPOOL c97b62f4ad31de88a27d3050293d30bb65fc392455ef87a2ee4198cd49db0ddaa87bd32330f75c194f6ffd6979719ab78ef95e356df9d62c6f43d74eb9fc9ffa
|
||||
AUX 6.40.11.28965/zarafa-6.40.2-sysconfig2confd-1.patch 8495 SHA256 591dfe4e220673818fd3548d9b36f8b4e5ea92529eaf3d7bee6c7885808f8988 SHA512 567aab42d71ae632b763d16b4b9af82fb27174bc3ba09c6d15383db9f4e2ccf54633ddc3d708e643cbd0605006bbc793998e2c3b7b26be8a85482c8adaa31000 WHIRLPOOL 749e2fd5612c2f1b4cc2cb2db512e5cd9ec10c4a6224a1c7780008a317216f741ace6354f68531129be1439d90ae56daa826ff5e45ebf72248c0e78fcdebca87
|
||||
AUX 6.40.11.28965/zarafa-6.40.6-force_latin1.patch 618 SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496 SHA512 103ecced3a8a0ec397c0fcaf2b4b5cdfec8aabfcfbd5708c9d79316e911a5d3c2f7b83b24c18902e503466cf3c0e683c7198e017be0d6bcbc05f45a189c18972 WHIRLPOOL 5d60049191af9688b3ad2d5e1c62d0543de573b9212b9396902a0324063b358de7dd32c34c8546b8fad02a84b0c04c5de23cdd555d61ba4375eb548651461fd7
|
||||
AUX 6.40.12.29942/Datux-sendas.patch 1429 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 SHA512 53b3f465d6b16b947a88acec63b24bc4ee46f5d1ed54edd8a064a877ec6ccb06752d9ebe68216d953e8428cca9a67e7a05fdb609f8daa94049c0961c575aac52 WHIRLPOOL e3d0616c47127a8a9217ad2a4d985ff14aec76c28af49a421283e77d9eb373076c4f9581665b8f7f1fc2340da4414cdd313da95b0983c0c3eaa6e93a914d436b
|
||||
AUX 6.40.12.29942/Datux-spamhook.patch 9895 SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b SHA512 2e048eb053902d9664ec8e3acee15edb1725db282e5f3e13817820d53a4cd788812560125d4fd624df7e69a89dbb2e089295d25f6ae25d5a6b4350e5756554ff WHIRLPOOL 4fd8b192baa7ce24dca903315cef987375b20814aa9da7b23c69ace76eda1a0058b59cd16b84ccb234a3775d1c3b1c4194bb4630c076cc43af0e133a0ca0ffed
|
||||
AUX 6.40.12.29942/fix-pthread.patch 2101 SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c SHA512 adb0bb77cdf0a536430a42e58165bdab962b209e9ea14a45b0e8f4b2a385ec65760cb2d576e7947b06d499c3417438123dafe1133998abe785e83fd2fb2117fd WHIRLPOOL 47482c7ed3db170f275d32f278c3977671ece2e3ea93c4198c7ba8cd36ae1c9375437401a9488408b9101b8176fcbc6b884facad5b7282a96c45ac60bbf80d6f
|
||||
AUX 6.40.12.29942/fix-zarafaserver-uuid-linkage.patch 1394 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 SHA512 a21505aada3a2cff4f2ed9c32a79012bafb64abfcbf06f1a112d00e28143f3820528dc998023becf5de60df50d3d1a112cdc42fcb45c502b8b5b06871d6508bb WHIRLPOOL 633dc3441ee0947ac1c4b2686a5f378a012a0781fdb2db680b29afb893525446c9ba14d3bb6b1e1702d5ea1500a3efb9fcb21225899003a9dddbf36f952872b1
|
||||
AUX 6.40.12.29942/fix-zarafastats-uuid-linkage.patch 1051 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 SHA512 444821736e05166d762dbbfde76df052d7ba56a45e7ddba28986111c8fa918c8741b1efa6ed0d700a990ce87e7419ade93a3a1d4f746b504dd87ebedec1d8194 WHIRLPOOL f83f4946be2146ed5c5b8489e5be840ab5895aaa2f959235c28a378dc2117f0495b6037157f68c864be0520de1dd3c26f6ef95cefdca9646ef7497a63937addf
|
||||
AUX 6.40.12.29942/zarafa-6.40.1-no-php-conf.patch 1634 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f SHA512 cefc1c0494353cfe183e2f8a2010dd2f1eb05638ddef0f5d1029fc3d060e3540329e458595d3321ecc6cdba14f2696f0d37322fc055d5ee8901053e6bacaf5e3 WHIRLPOOL 07ba273f5b5a3b51c159ee020e75becf0faf5da0f22c62ac6d516a91bb1f078f96bc05f0f0015b5e16e16bcf0a67255a93951177f81b761db3ff2be937a7b160
|
||||
AUX 6.40.12.29942/zarafa-6.40.10-package.patch 2221 SHA256 763cf76396090f830fb3f27f69c9e4f787b4792c6db9216d9e0998189bd26843 SHA512 8361372f9471096f162df42f009d8188e4a5ed63a285ae636bb3f72beacde2bf79e2805beecb2cec9ed45e78d8b9e0fdafb0e0e583ea969254879573f3b57515 WHIRLPOOL caabd644f9b1bb1c980dfa1cfa34daddc75f85ba74cde4164726e04b60a9845a57bffcfd3bce5c30ce463e2c25476cad5a6fdc1e246cfb491c8d2a733a749202
|
||||
AUX 6.40.12.29942/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 SHA512 bad27d53e94829658ec8af016a525aa7c3146b84aeb0d65c0917d829f7e6fe4377859e81727dbd039803cbfcfb7f54a14ed126564ef1734674dc140a1c0c9f90 WHIRLPOOL c97b62f4ad31de88a27d3050293d30bb65fc392455ef87a2ee4198cd49db0ddaa87bd32330f75c194f6ffd6979719ab78ef95e356df9d62c6f43d74eb9fc9ffa
|
||||
AUX 6.40.12.29942/zarafa-6.40.2-sysconfig2confd-1.patch 8495 SHA256 591dfe4e220673818fd3548d9b36f8b4e5ea92529eaf3d7bee6c7885808f8988 SHA512 567aab42d71ae632b763d16b4b9af82fb27174bc3ba09c6d15383db9f4e2ccf54633ddc3d708e643cbd0605006bbc793998e2c3b7b26be8a85482c8adaa31000 WHIRLPOOL 749e2fd5612c2f1b4cc2cb2db512e5cd9ec10c4a6224a1c7780008a317216f741ace6354f68531129be1439d90ae56daa826ff5e45ebf72248c0e78fcdebca87
|
||||
AUX 6.40.12.29942/zarafa-6.40.6-force_latin1.patch 618 SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496 SHA512 103ecced3a8a0ec397c0fcaf2b4b5cdfec8aabfcfbd5708c9d79316e911a5d3c2f7b83b24c18902e503466cf3c0e683c7198e017be0d6bcbc05f45a189c18972 WHIRLPOOL 5d60049191af9688b3ad2d5e1c62d0543de573b9212b9396902a0324063b358de7dd32c34c8546b8fad02a84b0c04c5de23cdd555d61ba4375eb548651461fd7
|
||||
AUX 6.40.13.30778/Datux-sendas.patch 1429 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 SHA512 53b3f465d6b16b947a88acec63b24bc4ee46f5d1ed54edd8a064a877ec6ccb06752d9ebe68216d953e8428cca9a67e7a05fdb609f8daa94049c0961c575aac52 WHIRLPOOL e3d0616c47127a8a9217ad2a4d985ff14aec76c28af49a421283e77d9eb373076c4f9581665b8f7f1fc2340da4414cdd313da95b0983c0c3eaa6e93a914d436b
|
||||
AUX 6.40.13.30778/Datux-spamhook.patch 9895 SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b SHA512 2e048eb053902d9664ec8e3acee15edb1725db282e5f3e13817820d53a4cd788812560125d4fd624df7e69a89dbb2e089295d25f6ae25d5a6b4350e5756554ff WHIRLPOOL 4fd8b192baa7ce24dca903315cef987375b20814aa9da7b23c69ace76eda1a0058b59cd16b84ccb234a3775d1c3b1c4194bb4630c076cc43af0e133a0ca0ffed
|
||||
AUX 6.40.13.30778/fix-pthread.patch 2101 SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c SHA512 adb0bb77cdf0a536430a42e58165bdab962b209e9ea14a45b0e8f4b2a385ec65760cb2d576e7947b06d499c3417438123dafe1133998abe785e83fd2fb2117fd WHIRLPOOL 47482c7ed3db170f275d32f278c3977671ece2e3ea93c4198c7ba8cd36ae1c9375437401a9488408b9101b8176fcbc6b884facad5b7282a96c45ac60bbf80d6f
|
||||
AUX 6.40.13.30778/fix-zarafaserver-uuid-linkage.patch 1394 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 SHA512 a21505aada3a2cff4f2ed9c32a79012bafb64abfcbf06f1a112d00e28143f3820528dc998023becf5de60df50d3d1a112cdc42fcb45c502b8b5b06871d6508bb WHIRLPOOL 633dc3441ee0947ac1c4b2686a5f378a012a0781fdb2db680b29afb893525446c9ba14d3bb6b1e1702d5ea1500a3efb9fcb21225899003a9dddbf36f952872b1
|
||||
AUX 6.40.13.30778/fix-zarafastats-uuid-linkage.patch 1051 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 SHA512 444821736e05166d762dbbfde76df052d7ba56a45e7ddba28986111c8fa918c8741b1efa6ed0d700a990ce87e7419ade93a3a1d4f746b504dd87ebedec1d8194 WHIRLPOOL f83f4946be2146ed5c5b8489e5be840ab5895aaa2f959235c28a378dc2117f0495b6037157f68c864be0520de1dd3c26f6ef95cefdca9646ef7497a63937addf
|
||||
AUX 6.40.13.30778/zarafa-6.40.1-no-php-conf.patch 1634 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f SHA512 cefc1c0494353cfe183e2f8a2010dd2f1eb05638ddef0f5d1029fc3d060e3540329e458595d3321ecc6cdba14f2696f0d37322fc055d5ee8901053e6bacaf5e3 WHIRLPOOL 07ba273f5b5a3b51c159ee020e75becf0faf5da0f22c62ac6d516a91bb1f078f96bc05f0f0015b5e16e16bcf0a67255a93951177f81b761db3ff2be937a7b160
|
||||
AUX 6.40.13.30778/zarafa-6.40.10-package.patch 2221 SHA256 763cf76396090f830fb3f27f69c9e4f787b4792c6db9216d9e0998189bd26843 SHA512 8361372f9471096f162df42f009d8188e4a5ed63a285ae636bb3f72beacde2bf79e2805beecb2cec9ed45e78d8b9e0fdafb0e0e583ea969254879573f3b57515 WHIRLPOOL caabd644f9b1bb1c980dfa1cfa34daddc75f85ba74cde4164726e04b60a9845a57bffcfd3bce5c30ce463e2c25476cad5a6fdc1e246cfb491c8d2a733a749202
|
||||
AUX 6.40.13.30778/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 SHA512 bad27d53e94829658ec8af016a525aa7c3146b84aeb0d65c0917d829f7e6fe4377859e81727dbd039803cbfcfb7f54a14ed126564ef1734674dc140a1c0c9f90 WHIRLPOOL c97b62f4ad31de88a27d3050293d30bb65fc392455ef87a2ee4198cd49db0ddaa87bd32330f75c194f6ffd6979719ab78ef95e356df9d62c6f43d74eb9fc9ffa
|
||||
AUX 6.40.13.30778/zarafa-6.40.2-sysconfig2confd-1.patch 8495 SHA256 591dfe4e220673818fd3548d9b36f8b4e5ea92529eaf3d7bee6c7885808f8988 SHA512 567aab42d71ae632b763d16b4b9af82fb27174bc3ba09c6d15383db9f4e2ccf54633ddc3d708e643cbd0605006bbc793998e2c3b7b26be8a85482c8adaa31000 WHIRLPOOL 749e2fd5612c2f1b4cc2cb2db512e5cd9ec10c4a6224a1c7780008a317216f741ace6354f68531129be1439d90ae56daa826ff5e45ebf72248c0e78fcdebca87
|
||||
AUX 6.40.13.30778/zarafa-6.40.6-force_latin1.patch 618 SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496 SHA512 103ecced3a8a0ec397c0fcaf2b4b5cdfec8aabfcfbd5708c9d79316e911a5d3c2f7b83b24c18902e503466cf3c0e683c7198e017be0d6bcbc05f45a189c18972 WHIRLPOOL 5d60049191af9688b3ad2d5e1c62d0543de573b9212b9396902a0324063b358de7dd32c34c8546b8fad02a84b0c04c5de23cdd555d61ba4375eb548651461fd7
|
||||
AUX 6.40.14.31537/Datux-sendas.patch 1429 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 SHA512 53b3f465d6b16b947a88acec63b24bc4ee46f5d1ed54edd8a064a877ec6ccb06752d9ebe68216d953e8428cca9a67e7a05fdb609f8daa94049c0961c575aac52 WHIRLPOOL e3d0616c47127a8a9217ad2a4d985ff14aec76c28af49a421283e77d9eb373076c4f9581665b8f7f1fc2340da4414cdd313da95b0983c0c3eaa6e93a914d436b
|
||||
AUX 6.40.14.31537/Datux-spamhook.patch 9895 SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b SHA512 2e048eb053902d9664ec8e3acee15edb1725db282e5f3e13817820d53a4cd788812560125d4fd624df7e69a89dbb2e089295d25f6ae25d5a6b4350e5756554ff WHIRLPOOL 4fd8b192baa7ce24dca903315cef987375b20814aa9da7b23c69ace76eda1a0058b59cd16b84ccb234a3775d1c3b1c4194bb4630c076cc43af0e133a0ca0ffed
|
||||
AUX 6.40.14.31537/fix-pthread.patch 2101 SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c SHA512 adb0bb77cdf0a536430a42e58165bdab962b209e9ea14a45b0e8f4b2a385ec65760cb2d576e7947b06d499c3417438123dafe1133998abe785e83fd2fb2117fd WHIRLPOOL 47482c7ed3db170f275d32f278c3977671ece2e3ea93c4198c7ba8cd36ae1c9375437401a9488408b9101b8176fcbc6b884facad5b7282a96c45ac60bbf80d6f
|
||||
AUX 6.40.14.31537/fix-zarafaserver-uuid-linkage.patch 1394 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 SHA512 a21505aada3a2cff4f2ed9c32a79012bafb64abfcbf06f1a112d00e28143f3820528dc998023becf5de60df50d3d1a112cdc42fcb45c502b8b5b06871d6508bb WHIRLPOOL 633dc3441ee0947ac1c4b2686a5f378a012a0781fdb2db680b29afb893525446c9ba14d3bb6b1e1702d5ea1500a3efb9fcb21225899003a9dddbf36f952872b1
|
||||
AUX 6.40.14.31537/fix-zarafastats-uuid-linkage.patch 1051 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 SHA512 444821736e05166d762dbbfde76df052d7ba56a45e7ddba28986111c8fa918c8741b1efa6ed0d700a990ce87e7419ade93a3a1d4f746b504dd87ebedec1d8194 WHIRLPOOL f83f4946be2146ed5c5b8489e5be840ab5895aaa2f959235c28a378dc2117f0495b6037157f68c864be0520de1dd3c26f6ef95cefdca9646ef7497a63937addf
|
||||
AUX 6.40.14.31537/zarafa-6.40.1-no-php-conf.patch 1634 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f SHA512 cefc1c0494353cfe183e2f8a2010dd2f1eb05638ddef0f5d1029fc3d060e3540329e458595d3321ecc6cdba14f2696f0d37322fc055d5ee8901053e6bacaf5e3 WHIRLPOOL 07ba273f5b5a3b51c159ee020e75becf0faf5da0f22c62ac6d516a91bb1f078f96bc05f0f0015b5e16e16bcf0a67255a93951177f81b761db3ff2be937a7b160
|
||||
AUX 6.40.14.31537/zarafa-6.40.10-package.patch 2221 SHA256 763cf76396090f830fb3f27f69c9e4f787b4792c6db9216d9e0998189bd26843 SHA512 8361372f9471096f162df42f009d8188e4a5ed63a285ae636bb3f72beacde2bf79e2805beecb2cec9ed45e78d8b9e0fdafb0e0e583ea969254879573f3b57515 WHIRLPOOL caabd644f9b1bb1c980dfa1cfa34daddc75f85ba74cde4164726e04b60a9845a57bffcfd3bce5c30ce463e2c25476cad5a6fdc1e246cfb491c8d2a733a749202
|
||||
AUX 6.40.14.31537/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 SHA512 bad27d53e94829658ec8af016a525aa7c3146b84aeb0d65c0917d829f7e6fe4377859e81727dbd039803cbfcfb7f54a14ed126564ef1734674dc140a1c0c9f90 WHIRLPOOL c97b62f4ad31de88a27d3050293d30bb65fc392455ef87a2ee4198cd49db0ddaa87bd32330f75c194f6ffd6979719ab78ef95e356df9d62c6f43d74eb9fc9ffa
|
||||
AUX 6.40.14.31537/zarafa-6.40.2-sysconfig2confd-1.patch 8495 SHA256 591dfe4e220673818fd3548d9b36f8b4e5ea92529eaf3d7bee6c7885808f8988 SHA512 567aab42d71ae632b763d16b4b9af82fb27174bc3ba09c6d15383db9f4e2ccf54633ddc3d708e643cbd0605006bbc793998e2c3b7b26be8a85482c8adaa31000 WHIRLPOOL 749e2fd5612c2f1b4cc2cb2db512e5cd9ec10c4a6224a1c7780008a317216f741ace6354f68531129be1439d90ae56daa826ff5e45ebf72248c0e78fcdebca87
|
||||
AUX 6.40.14.31537/zarafa-6.40.6-force_latin1.patch 618 SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496 SHA512 103ecced3a8a0ec397c0fcaf2b4b5cdfec8aabfcfbd5708c9d79316e911a5d3c2f7b83b24c18902e503466cf3c0e683c7198e017be0d6bcbc05f45a189c18972 WHIRLPOOL 5d60049191af9688b3ad2d5e1c62d0543de573b9212b9396902a0324063b358de7dd32c34c8546b8fad02a84b0c04c5de23cdd555d61ba4375eb548651461fd7
|
||||
AUX 6.40.15.33766/Datux-sendas.patch 1429 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 SHA512 53b3f465d6b16b947a88acec63b24bc4ee46f5d1ed54edd8a064a877ec6ccb06752d9ebe68216d953e8428cca9a67e7a05fdb609f8daa94049c0961c575aac52 WHIRLPOOL e3d0616c47127a8a9217ad2a4d985ff14aec76c28af49a421283e77d9eb373076c4f9581665b8f7f1fc2340da4414cdd313da95b0983c0c3eaa6e93a914d436b
|
||||
AUX 6.40.15.33766/Datux-spamhook.patch 9895 SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b SHA512 2e048eb053902d9664ec8e3acee15edb1725db282e5f3e13817820d53a4cd788812560125d4fd624df7e69a89dbb2e089295d25f6ae25d5a6b4350e5756554ff WHIRLPOOL 4fd8b192baa7ce24dca903315cef987375b20814aa9da7b23c69ace76eda1a0058b59cd16b84ccb234a3775d1c3b1c4194bb4630c076cc43af0e133a0ca0ffed
|
||||
AUX 6.40.15.33766/fix-pthread.patch 2101 SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c SHA512 adb0bb77cdf0a536430a42e58165bdab962b209e9ea14a45b0e8f4b2a385ec65760cb2d576e7947b06d499c3417438123dafe1133998abe785e83fd2fb2117fd WHIRLPOOL 47482c7ed3db170f275d32f278c3977671ece2e3ea93c4198c7ba8cd36ae1c9375437401a9488408b9101b8176fcbc6b884facad5b7282a96c45ac60bbf80d6f
|
||||
AUX 6.40.15.33766/fix-zarafaserver-uuid-linkage.patch 1394 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 SHA512 a21505aada3a2cff4f2ed9c32a79012bafb64abfcbf06f1a112d00e28143f3820528dc998023becf5de60df50d3d1a112cdc42fcb45c502b8b5b06871d6508bb WHIRLPOOL 633dc3441ee0947ac1c4b2686a5f378a012a0781fdb2db680b29afb893525446c9ba14d3bb6b1e1702d5ea1500a3efb9fcb21225899003a9dddbf36f952872b1
|
||||
AUX 6.40.15.33766/fix-zarafastats-uuid-linkage.patch 1051 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 SHA512 444821736e05166d762dbbfde76df052d7ba56a45e7ddba28986111c8fa918c8741b1efa6ed0d700a990ce87e7419ade93a3a1d4f746b504dd87ebedec1d8194 WHIRLPOOL f83f4946be2146ed5c5b8489e5be840ab5895aaa2f959235c28a378dc2117f0495b6037157f68c864be0520de1dd3c26f6ef95cefdca9646ef7497a63937addf
|
||||
AUX 6.40.15.33766/zarafa-6.40.1-no-php-conf.patch 1634 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f SHA512 cefc1c0494353cfe183e2f8a2010dd2f1eb05638ddef0f5d1029fc3d060e3540329e458595d3321ecc6cdba14f2696f0d37322fc055d5ee8901053e6bacaf5e3 WHIRLPOOL 07ba273f5b5a3b51c159ee020e75becf0faf5da0f22c62ac6d516a91bb1f078f96bc05f0f0015b5e16e16bcf0a67255a93951177f81b761db3ff2be937a7b160
|
||||
AUX 6.40.15.33766/zarafa-6.40.10-package.patch 2221 SHA256 763cf76396090f830fb3f27f69c9e4f787b4792c6db9216d9e0998189bd26843 SHA512 8361372f9471096f162df42f009d8188e4a5ed63a285ae636bb3f72beacde2bf79e2805beecb2cec9ed45e78d8b9e0fdafb0e0e583ea969254879573f3b57515 WHIRLPOOL caabd644f9b1bb1c980dfa1cfa34daddc75f85ba74cde4164726e04b60a9845a57bffcfd3bce5c30ce463e2c25476cad5a6fdc1e246cfb491c8d2a733a749202
|
||||
AUX 6.40.15.33766/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 SHA512 bad27d53e94829658ec8af016a525aa7c3146b84aeb0d65c0917d829f7e6fe4377859e81727dbd039803cbfcfb7f54a14ed126564ef1734674dc140a1c0c9f90 WHIRLPOOL c97b62f4ad31de88a27d3050293d30bb65fc392455ef87a2ee4198cd49db0ddaa87bd32330f75c194f6ffd6979719ab78ef95e356df9d62c6f43d74eb9fc9ffa
|
||||
AUX 6.40.15.33766/zarafa-6.40.2-sysconfig2confd-1.patch 8495 SHA256 591dfe4e220673818fd3548d9b36f8b4e5ea92529eaf3d7bee6c7885808f8988 SHA512 567aab42d71ae632b763d16b4b9af82fb27174bc3ba09c6d15383db9f4e2ccf54633ddc3d708e643cbd0605006bbc793998e2c3b7b26be8a85482c8adaa31000 WHIRLPOOL 749e2fd5612c2f1b4cc2cb2db512e5cd9ec10c4a6224a1c7780008a317216f741ace6354f68531129be1439d90ae56daa826ff5e45ebf72248c0e78fcdebca87
|
||||
AUX 6.40.15.33766/zarafa-6.40.6-force_latin1.patch 618 SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496 SHA512 103ecced3a8a0ec397c0fcaf2b4b5cdfec8aabfcfbd5708c9d79316e911a5d3c2f7b83b24c18902e503466cf3c0e683c7198e017be0d6bcbc05f45a189c18972 WHIRLPOOL 5d60049191af9688b3ad2d5e1c62d0543de573b9212b9396902a0324063b358de7dd32c34c8546b8fad02a84b0c04c5de23cdd555d61ba4375eb548651461fd7
|
||||
AUX 6.40.16.34239/Datux-sendas.patch 1429 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 SHA512 53b3f465d6b16b947a88acec63b24bc4ee46f5d1ed54edd8a064a877ec6ccb06752d9ebe68216d953e8428cca9a67e7a05fdb609f8daa94049c0961c575aac52 WHIRLPOOL e3d0616c47127a8a9217ad2a4d985ff14aec76c28af49a421283e77d9eb373076c4f9581665b8f7f1fc2340da4414cdd313da95b0983c0c3eaa6e93a914d436b
|
||||
AUX 6.40.16.34239/Datux-spamhook.patch 9895 SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b SHA512 2e048eb053902d9664ec8e3acee15edb1725db282e5f3e13817820d53a4cd788812560125d4fd624df7e69a89dbb2e089295d25f6ae25d5a6b4350e5756554ff WHIRLPOOL 4fd8b192baa7ce24dca903315cef987375b20814aa9da7b23c69ace76eda1a0058b59cd16b84ccb234a3775d1c3b1c4194bb4630c076cc43af0e133a0ca0ffed
|
||||
AUX 6.40.16.34239/fix-pthread.patch 2101 SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c SHA512 adb0bb77cdf0a536430a42e58165bdab962b209e9ea14a45b0e8f4b2a385ec65760cb2d576e7947b06d499c3417438123dafe1133998abe785e83fd2fb2117fd WHIRLPOOL 47482c7ed3db170f275d32f278c3977671ece2e3ea93c4198c7ba8cd36ae1c9375437401a9488408b9101b8176fcbc6b884facad5b7282a96c45ac60bbf80d6f
|
||||
AUX 6.40.16.34239/fix-zarafaserver-uuid-linkage.patch 1394 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 SHA512 a21505aada3a2cff4f2ed9c32a79012bafb64abfcbf06f1a112d00e28143f3820528dc998023becf5de60df50d3d1a112cdc42fcb45c502b8b5b06871d6508bb WHIRLPOOL 633dc3441ee0947ac1c4b2686a5f378a012a0781fdb2db680b29afb893525446c9ba14d3bb6b1e1702d5ea1500a3efb9fcb21225899003a9dddbf36f952872b1
|
||||
AUX 6.40.16.34239/fix-zarafastats-uuid-linkage.patch 1051 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 SHA512 444821736e05166d762dbbfde76df052d7ba56a45e7ddba28986111c8fa918c8741b1efa6ed0d700a990ce87e7419ade93a3a1d4f746b504dd87ebedec1d8194 WHIRLPOOL f83f4946be2146ed5c5b8489e5be840ab5895aaa2f959235c28a378dc2117f0495b6037157f68c864be0520de1dd3c26f6ef95cefdca9646ef7497a63937addf
|
||||
AUX 6.40.16.34239/zarafa-6.40.1-no-php-conf.patch 1634 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f SHA512 cefc1c0494353cfe183e2f8a2010dd2f1eb05638ddef0f5d1029fc3d060e3540329e458595d3321ecc6cdba14f2696f0d37322fc055d5ee8901053e6bacaf5e3 WHIRLPOOL 07ba273f5b5a3b51c159ee020e75becf0faf5da0f22c62ac6d516a91bb1f078f96bc05f0f0015b5e16e16bcf0a67255a93951177f81b761db3ff2be937a7b160
|
||||
AUX 6.40.16.34239/zarafa-6.40.10-package.patch 2221 SHA256 763cf76396090f830fb3f27f69c9e4f787b4792c6db9216d9e0998189bd26843 SHA512 8361372f9471096f162df42f009d8188e4a5ed63a285ae636bb3f72beacde2bf79e2805beecb2cec9ed45e78d8b9e0fdafb0e0e583ea969254879573f3b57515 WHIRLPOOL caabd644f9b1bb1c980dfa1cfa34daddc75f85ba74cde4164726e04b60a9845a57bffcfd3bce5c30ce463e2c25476cad5a6fdc1e246cfb491c8d2a733a749202
|
||||
AUX 6.40.16.34239/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 SHA512 bad27d53e94829658ec8af016a525aa7c3146b84aeb0d65c0917d829f7e6fe4377859e81727dbd039803cbfcfb7f54a14ed126564ef1734674dc140a1c0c9f90 WHIRLPOOL c97b62f4ad31de88a27d3050293d30bb65fc392455ef87a2ee4198cd49db0ddaa87bd32330f75c194f6ffd6979719ab78ef95e356df9d62c6f43d74eb9fc9ffa
|
||||
AUX 6.40.16.34239/zarafa-6.40.2-sysconfig2confd-1.patch 8495 SHA256 591dfe4e220673818fd3548d9b36f8b4e5ea92529eaf3d7bee6c7885808f8988 SHA512 567aab42d71ae632b763d16b4b9af82fb27174bc3ba09c6d15383db9f4e2ccf54633ddc3d708e643cbd0605006bbc793998e2c3b7b26be8a85482c8adaa31000 WHIRLPOOL 749e2fd5612c2f1b4cc2cb2db512e5cd9ec10c4a6224a1c7780008a317216f741ace6354f68531129be1439d90ae56daa826ff5e45ebf72248c0e78fcdebca87
|
||||
AUX 6.40.16.34239/zarafa-6.40.6-force_latin1.patch 618 SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496 SHA512 103ecced3a8a0ec397c0fcaf2b4b5cdfec8aabfcfbd5708c9d79316e911a5d3c2f7b83b24c18902e503466cf3c0e683c7198e017be0d6bcbc05f45a189c18972 WHIRLPOOL 5d60049191af9688b3ad2d5e1c62d0543de573b9212b9396902a0324063b358de7dd32c34c8546b8fad02a84b0c04c5de23cdd555d61ba4375eb548651461fd7
|
||||
AUX 6.40.17.35943/Datux-sendas.patch 1429 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 SHA512 53b3f465d6b16b947a88acec63b24bc4ee46f5d1ed54edd8a064a877ec6ccb06752d9ebe68216d953e8428cca9a67e7a05fdb609f8daa94049c0961c575aac52 WHIRLPOOL e3d0616c47127a8a9217ad2a4d985ff14aec76c28af49a421283e77d9eb373076c4f9581665b8f7f1fc2340da4414cdd313da95b0983c0c3eaa6e93a914d436b
|
||||
AUX 6.40.17.35943/Datux-spamhook.patch 9895 SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b SHA512 2e048eb053902d9664ec8e3acee15edb1725db282e5f3e13817820d53a4cd788812560125d4fd624df7e69a89dbb2e089295d25f6ae25d5a6b4350e5756554ff WHIRLPOOL 4fd8b192baa7ce24dca903315cef987375b20814aa9da7b23c69ace76eda1a0058b59cd16b84ccb234a3775d1c3b1c4194bb4630c076cc43af0e133a0ca0ffed
|
||||
AUX 6.40.17.35943/fix-pthread.patch 2101 SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c SHA512 adb0bb77cdf0a536430a42e58165bdab962b209e9ea14a45b0e8f4b2a385ec65760cb2d576e7947b06d499c3417438123dafe1133998abe785e83fd2fb2117fd WHIRLPOOL 47482c7ed3db170f275d32f278c3977671ece2e3ea93c4198c7ba8cd36ae1c9375437401a9488408b9101b8176fcbc6b884facad5b7282a96c45ac60bbf80d6f
|
||||
AUX 6.40.17.35943/fix-zarafaserver-uuid-linkage.patch 1394 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 SHA512 a21505aada3a2cff4f2ed9c32a79012bafb64abfcbf06f1a112d00e28143f3820528dc998023becf5de60df50d3d1a112cdc42fcb45c502b8b5b06871d6508bb WHIRLPOOL 633dc3441ee0947ac1c4b2686a5f378a012a0781fdb2db680b29afb893525446c9ba14d3bb6b1e1702d5ea1500a3efb9fcb21225899003a9dddbf36f952872b1
|
||||
AUX 6.40.17.35943/fix-zarafastats-uuid-linkage.patch 1051 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 SHA512 444821736e05166d762dbbfde76df052d7ba56a45e7ddba28986111c8fa918c8741b1efa6ed0d700a990ce87e7419ade93a3a1d4f746b504dd87ebedec1d8194 WHIRLPOOL f83f4946be2146ed5c5b8489e5be840ab5895aaa2f959235c28a378dc2117f0495b6037157f68c864be0520de1dd3c26f6ef95cefdca9646ef7497a63937addf
|
||||
AUX 6.40.17.35943/zarafa-6.40.1-no-php-conf.patch 1634 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f SHA512 cefc1c0494353cfe183e2f8a2010dd2f1eb05638ddef0f5d1029fc3d060e3540329e458595d3321ecc6cdba14f2696f0d37322fc055d5ee8901053e6bacaf5e3 WHIRLPOOL 07ba273f5b5a3b51c159ee020e75becf0faf5da0f22c62ac6d516a91bb1f078f96bc05f0f0015b5e16e16bcf0a67255a93951177f81b761db3ff2be937a7b160
|
||||
AUX 6.40.17.35943/zarafa-6.40.10-package.patch 2221 SHA256 763cf76396090f830fb3f27f69c9e4f787b4792c6db9216d9e0998189bd26843 SHA512 8361372f9471096f162df42f009d8188e4a5ed63a285ae636bb3f72beacde2bf79e2805beecb2cec9ed45e78d8b9e0fdafb0e0e583ea969254879573f3b57515 WHIRLPOOL caabd644f9b1bb1c980dfa1cfa34daddc75f85ba74cde4164726e04b60a9845a57bffcfd3bce5c30ce463e2c25476cad5a6fdc1e246cfb491c8d2a733a749202
|
||||
AUX 6.40.17.35943/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 SHA512 bad27d53e94829658ec8af016a525aa7c3146b84aeb0d65c0917d829f7e6fe4377859e81727dbd039803cbfcfb7f54a14ed126564ef1734674dc140a1c0c9f90 WHIRLPOOL c97b62f4ad31de88a27d3050293d30bb65fc392455ef87a2ee4198cd49db0ddaa87bd32330f75c194f6ffd6979719ab78ef95e356df9d62c6f43d74eb9fc9ffa
|
||||
AUX 6.40.17.35943/zarafa-6.40.2-sysconfig2confd-1.patch 8495 SHA256 591dfe4e220673818fd3548d9b36f8b4e5ea92529eaf3d7bee6c7885808f8988 SHA512 567aab42d71ae632b763d16b4b9af82fb27174bc3ba09c6d15383db9f4e2ccf54633ddc3d708e643cbd0605006bbc793998e2c3b7b26be8a85482c8adaa31000 WHIRLPOOL 749e2fd5612c2f1b4cc2cb2db512e5cd9ec10c4a6224a1c7780008a317216f741ace6354f68531129be1439d90ae56daa826ff5e45ebf72248c0e78fcdebca87
|
||||
AUX 6.40.17.35943/zarafa-6.40.6-force_latin1.patch 618 SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496 SHA512 103ecced3a8a0ec397c0fcaf2b4b5cdfec8aabfcfbd5708c9d79316e911a5d3c2f7b83b24c18902e503466cf3c0e683c7198e017be0d6bcbc05f45a189c18972 WHIRLPOOL 5d60049191af9688b3ad2d5e1c62d0543de573b9212b9396902a0324063b358de7dd32c34c8546b8fad02a84b0c04c5de23cdd555d61ba4375eb548651461fd7
|
||||
AUX 6.40.8.27223/Datux-sendas.patch 1429 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 SHA512 53b3f465d6b16b947a88acec63b24bc4ee46f5d1ed54edd8a064a877ec6ccb06752d9ebe68216d953e8428cca9a67e7a05fdb609f8daa94049c0961c575aac52 WHIRLPOOL e3d0616c47127a8a9217ad2a4d985ff14aec76c28af49a421283e77d9eb373076c4f9581665b8f7f1fc2340da4414cdd313da95b0983c0c3eaa6e93a914d436b
|
||||
AUX 6.40.8.27223/Datux-spamhook.patch 9895 SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b SHA512 2e048eb053902d9664ec8e3acee15edb1725db282e5f3e13817820d53a4cd788812560125d4fd624df7e69a89dbb2e089295d25f6ae25d5a6b4350e5756554ff WHIRLPOOL 4fd8b192baa7ce24dca903315cef987375b20814aa9da7b23c69ace76eda1a0058b59cd16b84ccb234a3775d1c3b1c4194bb4630c076cc43af0e133a0ca0ffed
|
||||
AUX 6.40.8.27223/fix-pthread.patch 2101 SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c SHA512 adb0bb77cdf0a536430a42e58165bdab962b209e9ea14a45b0e8f4b2a385ec65760cb2d576e7947b06d499c3417438123dafe1133998abe785e83fd2fb2117fd WHIRLPOOL 47482c7ed3db170f275d32f278c3977671ece2e3ea93c4198c7ba8cd36ae1c9375437401a9488408b9101b8176fcbc6b884facad5b7282a96c45ac60bbf80d6f
|
||||
AUX 6.40.8.27223/fix-zarafaserver-uuid-linkage.patch 1394 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 SHA512 a21505aada3a2cff4f2ed9c32a79012bafb64abfcbf06f1a112d00e28143f3820528dc998023becf5de60df50d3d1a112cdc42fcb45c502b8b5b06871d6508bb WHIRLPOOL 633dc3441ee0947ac1c4b2686a5f378a012a0781fdb2db680b29afb893525446c9ba14d3bb6b1e1702d5ea1500a3efb9fcb21225899003a9dddbf36f952872b1
|
||||
AUX 6.40.8.27223/fix-zarafastats-uuid-linkage.patch 1051 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 SHA512 444821736e05166d762dbbfde76df052d7ba56a45e7ddba28986111c8fa918c8741b1efa6ed0d700a990ce87e7419ade93a3a1d4f746b504dd87ebedec1d8194 WHIRLPOOL f83f4946be2146ed5c5b8489e5be840ab5895aaa2f959235c28a378dc2117f0495b6037157f68c864be0520de1dd3c26f6ef95cefdca9646ef7497a63937addf
|
||||
AUX 6.40.8.27223/zarafa-6.40.1-no-php-conf.patch 1634 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f SHA512 cefc1c0494353cfe183e2f8a2010dd2f1eb05638ddef0f5d1029fc3d060e3540329e458595d3321ecc6cdba14f2696f0d37322fc055d5ee8901053e6bacaf5e3 WHIRLPOOL 07ba273f5b5a3b51c159ee020e75becf0faf5da0f22c62ac6d516a91bb1f078f96bc05f0f0015b5e16e16bcf0a67255a93951177f81b761db3ff2be937a7b160
|
||||
AUX 6.40.8.27223/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 SHA512 bad27d53e94829658ec8af016a525aa7c3146b84aeb0d65c0917d829f7e6fe4377859e81727dbd039803cbfcfb7f54a14ed126564ef1734674dc140a1c0c9f90 WHIRLPOOL c97b62f4ad31de88a27d3050293d30bb65fc392455ef87a2ee4198cd49db0ddaa87bd32330f75c194f6ffd6979719ab78ef95e356df9d62c6f43d74eb9fc9ffa
|
||||
AUX 6.40.8.27223/zarafa-6.40.2-sysconfig2confd-1.patch 8495 SHA256 591dfe4e220673818fd3548d9b36f8b4e5ea92529eaf3d7bee6c7885808f8988 SHA512 567aab42d71ae632b763d16b4b9af82fb27174bc3ba09c6d15383db9f4e2ccf54633ddc3d708e643cbd0605006bbc793998e2c3b7b26be8a85482c8adaa31000 WHIRLPOOL 749e2fd5612c2f1b4cc2cb2db512e5cd9ec10c4a6224a1c7780008a317216f741ace6354f68531129be1439d90ae56daa826ff5e45ebf72248c0e78fcdebca87
|
||||
AUX 6.40.8.27223/zarafa-6.40.6-force_latin1.patch 618 SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496 SHA512 103ecced3a8a0ec397c0fcaf2b4b5cdfec8aabfcfbd5708c9d79316e911a5d3c2f7b83b24c18902e503466cf3c0e683c7198e017be0d6bcbc05f45a189c18972 WHIRLPOOL 5d60049191af9688b3ad2d5e1c62d0543de573b9212b9396902a0324063b358de7dd32c34c8546b8fad02a84b0c04c5de23cdd555d61ba4375eb548651461fd7
|
||||
AUX 6.40.8.27223/zarafa-6.40.6-package.patch 2135 SHA256 e441b08807753388e561653adcb9e3de8def54e3c343105dc25d95c1a1e0997d SHA512 c9018700f4e52a630694bd2510a3d6c3850c129051213532d904ccece77eaafbf812d565e07217fc8c0133aa944a63bf31832535f15da4cf142d4b040decec92 WHIRLPOOL a192a4225f6f587538ab46371ea51a175e86cd8653361908963be6abff05ab3720adf72c38f1843fe5f6a2c96bf65a48b00eb2c5eb23d986ef958e140b57d054
|
||||
AUX 6.40.9.27553/Datux-sendas.patch 1429 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 SHA512 53b3f465d6b16b947a88acec63b24bc4ee46f5d1ed54edd8a064a877ec6ccb06752d9ebe68216d953e8428cca9a67e7a05fdb609f8daa94049c0961c575aac52 WHIRLPOOL e3d0616c47127a8a9217ad2a4d985ff14aec76c28af49a421283e77d9eb373076c4f9581665b8f7f1fc2340da4414cdd313da95b0983c0c3eaa6e93a914d436b
|
||||
AUX 6.40.9.27553/Datux-spamhook.patch 9895 SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b SHA512 2e048eb053902d9664ec8e3acee15edb1725db282e5f3e13817820d53a4cd788812560125d4fd624df7e69a89dbb2e089295d25f6ae25d5a6b4350e5756554ff WHIRLPOOL 4fd8b192baa7ce24dca903315cef987375b20814aa9da7b23c69ace76eda1a0058b59cd16b84ccb234a3775d1c3b1c4194bb4630c076cc43af0e133a0ca0ffed
|
||||
AUX 6.40.9.27553/fix-pthread.patch 2101 SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c SHA512 adb0bb77cdf0a536430a42e58165bdab962b209e9ea14a45b0e8f4b2a385ec65760cb2d576e7947b06d499c3417438123dafe1133998abe785e83fd2fb2117fd WHIRLPOOL 47482c7ed3db170f275d32f278c3977671ece2e3ea93c4198c7ba8cd36ae1c9375437401a9488408b9101b8176fcbc6b884facad5b7282a96c45ac60bbf80d6f
|
||||
AUX 6.40.9.27553/fix-zarafaserver-uuid-linkage.patch 1394 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 SHA512 a21505aada3a2cff4f2ed9c32a79012bafb64abfcbf06f1a112d00e28143f3820528dc998023becf5de60df50d3d1a112cdc42fcb45c502b8b5b06871d6508bb WHIRLPOOL 633dc3441ee0947ac1c4b2686a5f378a012a0781fdb2db680b29afb893525446c9ba14d3bb6b1e1702d5ea1500a3efb9fcb21225899003a9dddbf36f952872b1
|
||||
AUX 6.40.9.27553/fix-zarafastats-uuid-linkage.patch 1051 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 SHA512 444821736e05166d762dbbfde76df052d7ba56a45e7ddba28986111c8fa918c8741b1efa6ed0d700a990ce87e7419ade93a3a1d4f746b504dd87ebedec1d8194 WHIRLPOOL f83f4946be2146ed5c5b8489e5be840ab5895aaa2f959235c28a378dc2117f0495b6037157f68c864be0520de1dd3c26f6ef95cefdca9646ef7497a63937addf
|
||||
AUX 6.40.9.27553/zarafa-6.40.1-no-php-conf.patch 1634 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f SHA512 cefc1c0494353cfe183e2f8a2010dd2f1eb05638ddef0f5d1029fc3d060e3540329e458595d3321ecc6cdba14f2696f0d37322fc055d5ee8901053e6bacaf5e3 WHIRLPOOL 07ba273f5b5a3b51c159ee020e75becf0faf5da0f22c62ac6d516a91bb1f078f96bc05f0f0015b5e16e16bcf0a67255a93951177f81b761db3ff2be937a7b160
|
||||
AUX 6.40.9.27553/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 SHA512 bad27d53e94829658ec8af016a525aa7c3146b84aeb0d65c0917d829f7e6fe4377859e81727dbd039803cbfcfb7f54a14ed126564ef1734674dc140a1c0c9f90 WHIRLPOOL c97b62f4ad31de88a27d3050293d30bb65fc392455ef87a2ee4198cd49db0ddaa87bd32330f75c194f6ffd6979719ab78ef95e356df9d62c6f43d74eb9fc9ffa
|
||||
AUX 6.40.9.27553/zarafa-6.40.2-sysconfig2confd-1.patch 8495 SHA256 591dfe4e220673818fd3548d9b36f8b4e5ea92529eaf3d7bee6c7885808f8988 SHA512 567aab42d71ae632b763d16b4b9af82fb27174bc3ba09c6d15383db9f4e2ccf54633ddc3d708e643cbd0605006bbc793998e2c3b7b26be8a85482c8adaa31000 WHIRLPOOL 749e2fd5612c2f1b4cc2cb2db512e5cd9ec10c4a6224a1c7780008a317216f741ace6354f68531129be1439d90ae56daa826ff5e45ebf72248c0e78fcdebca87
|
||||
AUX 6.40.9.27553/zarafa-6.40.6-force_latin1.patch 618 SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496 SHA512 103ecced3a8a0ec397c0fcaf2b4b5cdfec8aabfcfbd5708c9d79316e911a5d3c2f7b83b24c18902e503466cf3c0e683c7198e017be0d6bcbc05f45a189c18972 WHIRLPOOL 5d60049191af9688b3ad2d5e1c62d0543de573b9212b9396902a0324063b358de7dd32c34c8546b8fad02a84b0c04c5de23cdd555d61ba4375eb548651461fd7
|
||||
AUX 6.40.9.27553/zarafa-6.40.6-package.patch 2135 SHA256 e441b08807753388e561653adcb9e3de8def54e3c343105dc25d95c1a1e0997d SHA512 c9018700f4e52a630694bd2510a3d6c3850c129051213532d904ccece77eaafbf812d565e07217fc8c0133aa944a63bf31832535f15da4cf142d4b040decec92 WHIRLPOOL a192a4225f6f587538ab46371ea51a175e86cd8653361908963be6abff05ab3720adf72c38f1843fe5f6a2c96bf65a48b00eb2c5eb23d986ef958e140b57d054
|
||||
AUX 7.0.10.37482/Datux-sendas.patch 1429 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 SHA512 53b3f465d6b16b947a88acec63b24bc4ee46f5d1ed54edd8a064a877ec6ccb06752d9ebe68216d953e8428cca9a67e7a05fdb609f8daa94049c0961c575aac52 WHIRLPOOL e3d0616c47127a8a9217ad2a4d985ff14aec76c28af49a421283e77d9eb373076c4f9581665b8f7f1fc2340da4414cdd313da95b0983c0c3eaa6e93a914d436b
|
||||
AUX 7.0.10.37482/Datux-spamhook.patch 9895 SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b SHA512 2e048eb053902d9664ec8e3acee15edb1725db282e5f3e13817820d53a4cd788812560125d4fd624df7e69a89dbb2e089295d25f6ae25d5a6b4350e5756554ff WHIRLPOOL 4fd8b192baa7ce24dca903315cef987375b20814aa9da7b23c69ace76eda1a0058b59cd16b84ccb234a3775d1c3b1c4194bb4630c076cc43af0e133a0ca0ffed
|
||||
AUX 7.0.10.37482/zarafa-6.40.1-no-php-conf.patch 1634 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f SHA512 cefc1c0494353cfe183e2f8a2010dd2f1eb05638ddef0f5d1029fc3d060e3540329e458595d3321ecc6cdba14f2696f0d37322fc055d5ee8901053e6bacaf5e3 WHIRLPOOL 07ba273f5b5a3b51c159ee020e75becf0faf5da0f22c62ac6d516a91bb1f078f96bc05f0f0015b5e16e16bcf0a67255a93951177f81b761db3ff2be937a7b160
|
||||
AUX 7.0.10.37482/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 SHA512 bad27d53e94829658ec8af016a525aa7c3146b84aeb0d65c0917d829f7e6fe4377859e81727dbd039803cbfcfb7f54a14ed126564ef1734674dc140a1c0c9f90 WHIRLPOOL c97b62f4ad31de88a27d3050293d30bb65fc392455ef87a2ee4198cd49db0ddaa87bd32330f75c194f6ffd6979719ab78ef95e356df9d62c6f43d74eb9fc9ffa
|
||||
AUX 7.0.10.37482/zarafa-7.0.0-package.patch 2285 SHA256 01a0b3a7acc54273bfdd6d84b67e6fd90d85b63f981f687035897d0516ef86fb SHA512 9470f1729fea31a2b19e1d84e0ec7461104069ce3f3fc7dc68cf5571029f467dcb15dfad1a8478378ef3e6fc842b3de761a60a4faa6a56a6941ac98406537c6e WHIRLPOOL 133160d85a490f8d63f52eabff5411c7c1028a25f8f426e734f086e3322c10e8f31247a9970b0693413c42b3d43029b7f5d7fe22810e5bdeb0b4fd33ce90cabd
|
||||
AUX 7.0.10.37482/zarafa-7.0.3-php54.patch 4019 SHA256 1929e734001df9b8514097c242dd7bb07c54ef7a3423505a7b748532f506a371 SHA512 b7c63e7c4dff693fd3e10283c82ec7605176efc6bfd665eb770c9d9da5e3450e966263ddc96e97b6f0c0a0604b9a800997fc446a9c5beb4930d954987066a2b8 WHIRLPOOL f9c929e7a7ae29e091e4d8734bfd28659731ca10bbdcec36e1bbd759b07f84d5f116798eb07ed0b185052d0c22988121b750f9636fdacaefd4aef48059a207aa
|
||||
AUX 7.0.10.37482/zarafa-7.0.3-sysconfig2confd-1.patch 4759 SHA256 8de14eb05d7ae145583a6e07fded24c3b4e2d272cc75845f6bcd3a4e4a47b967 SHA512 98f0104d064c557daacb64c891fb082494ea99c5bbb3eb79f24f3f15617d631b678e7fe1d87ced027ea86d473f451ba44cbcd99fd67531605b61edb2dc189a81 WHIRLPOOL c6e80d291ab61797fb5de535e6d550ce67e5c960e88ad7d194f6acebed48a2446e1e819a36bf43798e0cf92b99e135dfa1a4437bab0e512183576912869d59ac
|
||||
AUX 7.0.3.30515/Datux-sendas.patch 1429 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 SHA512 53b3f465d6b16b947a88acec63b24bc4ee46f5d1ed54edd8a064a877ec6ccb06752d9ebe68216d953e8428cca9a67e7a05fdb609f8daa94049c0961c575aac52 WHIRLPOOL e3d0616c47127a8a9217ad2a4d985ff14aec76c28af49a421283e77d9eb373076c4f9581665b8f7f1fc2340da4414cdd313da95b0983c0c3eaa6e93a914d436b
|
||||
AUX 7.0.3.30515/Datux-spamhook.patch 9895 SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b SHA512 2e048eb053902d9664ec8e3acee15edb1725db282e5f3e13817820d53a4cd788812560125d4fd624df7e69a89dbb2e089295d25f6ae25d5a6b4350e5756554ff WHIRLPOOL 4fd8b192baa7ce24dca903315cef987375b20814aa9da7b23c69ace76eda1a0058b59cd16b84ccb234a3775d1c3b1c4194bb4630c076cc43af0e133a0ca0ffed
|
||||
AUX 7.0.3.30515/zarafa-6.40.1-no-php-conf.patch 1634 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f SHA512 cefc1c0494353cfe183e2f8a2010dd2f1eb05638ddef0f5d1029fc3d060e3540329e458595d3321ecc6cdba14f2696f0d37322fc055d5ee8901053e6bacaf5e3 WHIRLPOOL 07ba273f5b5a3b51c159ee020e75becf0faf5da0f22c62ac6d516a91bb1f078f96bc05f0f0015b5e16e16bcf0a67255a93951177f81b761db3ff2be937a7b160
|
||||
AUX 7.0.3.30515/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 SHA512 bad27d53e94829658ec8af016a525aa7c3146b84aeb0d65c0917d829f7e6fe4377859e81727dbd039803cbfcfb7f54a14ed126564ef1734674dc140a1c0c9f90 WHIRLPOOL c97b62f4ad31de88a27d3050293d30bb65fc392455ef87a2ee4198cd49db0ddaa87bd32330f75c194f6ffd6979719ab78ef95e356df9d62c6f43d74eb9fc9ffa
|
||||
AUX 7.0.3.30515/zarafa-7.0.0-package.patch 2285 SHA256 01a0b3a7acc54273bfdd6d84b67e6fd90d85b63f981f687035897d0516ef86fb SHA512 9470f1729fea31a2b19e1d84e0ec7461104069ce3f3fc7dc68cf5571029f467dcb15dfad1a8478378ef3e6fc842b3de761a60a4faa6a56a6941ac98406537c6e WHIRLPOOL 133160d85a490f8d63f52eabff5411c7c1028a25f8f426e734f086e3322c10e8f31247a9970b0693413c42b3d43029b7f5d7fe22810e5bdeb0b4fd33ce90cabd
|
||||
AUX 7.0.3.30515/zarafa-7.0.3-sysconfig2confd-1.patch 4759 SHA256 8de14eb05d7ae145583a6e07fded24c3b4e2d272cc75845f6bcd3a4e4a47b967 SHA512 98f0104d064c557daacb64c891fb082494ea99c5bbb3eb79f24f3f15617d631b678e7fe1d87ced027ea86d473f451ba44cbcd99fd67531605b61edb2dc189a81 WHIRLPOOL c6e80d291ab61797fb5de535e6d550ce67e5c960e88ad7d194f6acebed48a2446e1e819a36bf43798e0cf92b99e135dfa1a4437bab0e512183576912869d59ac
|
||||
AUX 7.0.4.31235/Datux-sendas.patch 1429 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 SHA512 53b3f465d6b16b947a88acec63b24bc4ee46f5d1ed54edd8a064a877ec6ccb06752d9ebe68216d953e8428cca9a67e7a05fdb609f8daa94049c0961c575aac52 WHIRLPOOL e3d0616c47127a8a9217ad2a4d985ff14aec76c28af49a421283e77d9eb373076c4f9581665b8f7f1fc2340da4414cdd313da95b0983c0c3eaa6e93a914d436b
|
||||
AUX 7.0.4.31235/Datux-spamhook.patch 9895 SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b SHA512 2e048eb053902d9664ec8e3acee15edb1725db282e5f3e13817820d53a4cd788812560125d4fd624df7e69a89dbb2e089295d25f6ae25d5a6b4350e5756554ff WHIRLPOOL 4fd8b192baa7ce24dca903315cef987375b20814aa9da7b23c69ace76eda1a0058b59cd16b84ccb234a3775d1c3b1c4194bb4630c076cc43af0e133a0ca0ffed
|
||||
AUX 7.0.4.31235/zarafa-6.40.1-no-php-conf.patch 1634 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f SHA512 cefc1c0494353cfe183e2f8a2010dd2f1eb05638ddef0f5d1029fc3d060e3540329e458595d3321ecc6cdba14f2696f0d37322fc055d5ee8901053e6bacaf5e3 WHIRLPOOL 07ba273f5b5a3b51c159ee020e75becf0faf5da0f22c62ac6d516a91bb1f078f96bc05f0f0015b5e16e16bcf0a67255a93951177f81b761db3ff2be937a7b160
|
||||
AUX 7.0.4.31235/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 SHA512 bad27d53e94829658ec8af016a525aa7c3146b84aeb0d65c0917d829f7e6fe4377859e81727dbd039803cbfcfb7f54a14ed126564ef1734674dc140a1c0c9f90 WHIRLPOOL c97b62f4ad31de88a27d3050293d30bb65fc392455ef87a2ee4198cd49db0ddaa87bd32330f75c194f6ffd6979719ab78ef95e356df9d62c6f43d74eb9fc9ffa
|
||||
AUX 7.0.4.31235/zarafa-7.0.0-package.patch 2285 SHA256 01a0b3a7acc54273bfdd6d84b67e6fd90d85b63f981f687035897d0516ef86fb SHA512 9470f1729fea31a2b19e1d84e0ec7461104069ce3f3fc7dc68cf5571029f467dcb15dfad1a8478378ef3e6fc842b3de761a60a4faa6a56a6941ac98406537c6e WHIRLPOOL 133160d85a490f8d63f52eabff5411c7c1028a25f8f426e734f086e3322c10e8f31247a9970b0693413c42b3d43029b7f5d7fe22810e5bdeb0b4fd33ce90cabd
|
||||
AUX 7.0.4.31235/zarafa-7.0.3-php54.patch 4019 SHA256 1929e734001df9b8514097c242dd7bb07c54ef7a3423505a7b748532f506a371 SHA512 b7c63e7c4dff693fd3e10283c82ec7605176efc6bfd665eb770c9d9da5e3450e966263ddc96e97b6f0c0a0604b9a800997fc446a9c5beb4930d954987066a2b8 WHIRLPOOL f9c929e7a7ae29e091e4d8734bfd28659731ca10bbdcec36e1bbd759b07f84d5f116798eb07ed0b185052d0c22988121b750f9636fdacaefd4aef48059a207aa
|
||||
AUX 7.0.4.31235/zarafa-7.0.3-sysconfig2confd-1.patch 4759 SHA256 8de14eb05d7ae145583a6e07fded24c3b4e2d272cc75845f6bcd3a4e4a47b967 SHA512 98f0104d064c557daacb64c891fb082494ea99c5bbb3eb79f24f3f15617d631b678e7fe1d87ced027ea86d473f451ba44cbcd99fd67531605b61edb2dc189a81 WHIRLPOOL c6e80d291ab61797fb5de535e6d550ce67e5c960e88ad7d194f6acebed48a2446e1e819a36bf43798e0cf92b99e135dfa1a4437bab0e512183576912869d59ac
|
||||
AUX 7.0.5.31880/Datux-sendas.patch 1429 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 SHA512 53b3f465d6b16b947a88acec63b24bc4ee46f5d1ed54edd8a064a877ec6ccb06752d9ebe68216d953e8428cca9a67e7a05fdb609f8daa94049c0961c575aac52 WHIRLPOOL e3d0616c47127a8a9217ad2a4d985ff14aec76c28af49a421283e77d9eb373076c4f9581665b8f7f1fc2340da4414cdd313da95b0983c0c3eaa6e93a914d436b
|
||||
AUX 7.0.5.31880/Datux-spamhook.patch 9895 SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b SHA512 2e048eb053902d9664ec8e3acee15edb1725db282e5f3e13817820d53a4cd788812560125d4fd624df7e69a89dbb2e089295d25f6ae25d5a6b4350e5756554ff WHIRLPOOL 4fd8b192baa7ce24dca903315cef987375b20814aa9da7b23c69ace76eda1a0058b59cd16b84ccb234a3775d1c3b1c4194bb4630c076cc43af0e133a0ca0ffed
|
||||
AUX 7.0.5.31880/zarafa-6.40.1-no-php-conf.patch 1634 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f SHA512 cefc1c0494353cfe183e2f8a2010dd2f1eb05638ddef0f5d1029fc3d060e3540329e458595d3321ecc6cdba14f2696f0d37322fc055d5ee8901053e6bacaf5e3 WHIRLPOOL 07ba273f5b5a3b51c159ee020e75becf0faf5da0f22c62ac6d516a91bb1f078f96bc05f0f0015b5e16e16bcf0a67255a93951177f81b761db3ff2be937a7b160
|
||||
AUX 7.0.5.31880/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 SHA512 bad27d53e94829658ec8af016a525aa7c3146b84aeb0d65c0917d829f7e6fe4377859e81727dbd039803cbfcfb7f54a14ed126564ef1734674dc140a1c0c9f90 WHIRLPOOL c97b62f4ad31de88a27d3050293d30bb65fc392455ef87a2ee4198cd49db0ddaa87bd32330f75c194f6ffd6979719ab78ef95e356df9d62c6f43d74eb9fc9ffa
|
||||
AUX 7.0.5.31880/zarafa-7.0.0-package.patch 2285 SHA256 01a0b3a7acc54273bfdd6d84b67e6fd90d85b63f981f687035897d0516ef86fb SHA512 9470f1729fea31a2b19e1d84e0ec7461104069ce3f3fc7dc68cf5571029f467dcb15dfad1a8478378ef3e6fc842b3de761a60a4faa6a56a6941ac98406537c6e WHIRLPOOL 133160d85a490f8d63f52eabff5411c7c1028a25f8f426e734f086e3322c10e8f31247a9970b0693413c42b3d43029b7f5d7fe22810e5bdeb0b4fd33ce90cabd
|
||||
AUX 7.0.5.31880/zarafa-7.0.3-php54.patch 4019 SHA256 1929e734001df9b8514097c242dd7bb07c54ef7a3423505a7b748532f506a371 SHA512 b7c63e7c4dff693fd3e10283c82ec7605176efc6bfd665eb770c9d9da5e3450e966263ddc96e97b6f0c0a0604b9a800997fc446a9c5beb4930d954987066a2b8 WHIRLPOOL f9c929e7a7ae29e091e4d8734bfd28659731ca10bbdcec36e1bbd759b07f84d5f116798eb07ed0b185052d0c22988121b750f9636fdacaefd4aef48059a207aa
|
||||
AUX 7.0.5.31880/zarafa-7.0.3-sysconfig2confd-1.patch 4759 SHA256 8de14eb05d7ae145583a6e07fded24c3b4e2d272cc75845f6bcd3a4e4a47b967 SHA512 98f0104d064c557daacb64c891fb082494ea99c5bbb3eb79f24f3f15617d631b678e7fe1d87ced027ea86d473f451ba44cbcd99fd67531605b61edb2dc189a81 WHIRLPOOL c6e80d291ab61797fb5de535e6d550ce67e5c960e88ad7d194f6acebed48a2446e1e819a36bf43798e0cf92b99e135dfa1a4437bab0e512183576912869d59ac
|
||||
AUX 7.0.6.32752/Datux-sendas.patch 1429 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 SHA512 53b3f465d6b16b947a88acec63b24bc4ee46f5d1ed54edd8a064a877ec6ccb06752d9ebe68216d953e8428cca9a67e7a05fdb609f8daa94049c0961c575aac52 WHIRLPOOL e3d0616c47127a8a9217ad2a4d985ff14aec76c28af49a421283e77d9eb373076c4f9581665b8f7f1fc2340da4414cdd313da95b0983c0c3eaa6e93a914d436b
|
||||
AUX 7.0.6.32752/Datux-spamhook.patch 9895 SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b SHA512 2e048eb053902d9664ec8e3acee15edb1725db282e5f3e13817820d53a4cd788812560125d4fd624df7e69a89dbb2e089295d25f6ae25d5a6b4350e5756554ff WHIRLPOOL 4fd8b192baa7ce24dca903315cef987375b20814aa9da7b23c69ace76eda1a0058b59cd16b84ccb234a3775d1c3b1c4194bb4630c076cc43af0e133a0ca0ffed
|
||||
AUX 7.0.6.32752/zarafa-6.40.1-no-php-conf.patch 1634 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f SHA512 cefc1c0494353cfe183e2f8a2010dd2f1eb05638ddef0f5d1029fc3d060e3540329e458595d3321ecc6cdba14f2696f0d37322fc055d5ee8901053e6bacaf5e3 WHIRLPOOL 07ba273f5b5a3b51c159ee020e75becf0faf5da0f22c62ac6d516a91bb1f078f96bc05f0f0015b5e16e16bcf0a67255a93951177f81b761db3ff2be937a7b160
|
||||
AUX 7.0.6.32752/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 SHA512 bad27d53e94829658ec8af016a525aa7c3146b84aeb0d65c0917d829f7e6fe4377859e81727dbd039803cbfcfb7f54a14ed126564ef1734674dc140a1c0c9f90 WHIRLPOOL c97b62f4ad31de88a27d3050293d30bb65fc392455ef87a2ee4198cd49db0ddaa87bd32330f75c194f6ffd6979719ab78ef95e356df9d62c6f43d74eb9fc9ffa
|
||||
AUX 7.0.6.32752/zarafa-7.0.0-package.patch 2285 SHA256 01a0b3a7acc54273bfdd6d84b67e6fd90d85b63f981f687035897d0516ef86fb SHA512 9470f1729fea31a2b19e1d84e0ec7461104069ce3f3fc7dc68cf5571029f467dcb15dfad1a8478378ef3e6fc842b3de761a60a4faa6a56a6941ac98406537c6e WHIRLPOOL 133160d85a490f8d63f52eabff5411c7c1028a25f8f426e734f086e3322c10e8f31247a9970b0693413c42b3d43029b7f5d7fe22810e5bdeb0b4fd33ce90cabd
|
||||
AUX 7.0.6.32752/zarafa-7.0.3-php54.patch 4019 SHA256 1929e734001df9b8514097c242dd7bb07c54ef7a3423505a7b748532f506a371 SHA512 b7c63e7c4dff693fd3e10283c82ec7605176efc6bfd665eb770c9d9da5e3450e966263ddc96e97b6f0c0a0604b9a800997fc446a9c5beb4930d954987066a2b8 WHIRLPOOL f9c929e7a7ae29e091e4d8734bfd28659731ca10bbdcec36e1bbd759b07f84d5f116798eb07ed0b185052d0c22988121b750f9636fdacaefd4aef48059a207aa
|
||||
AUX 7.0.6.32752/zarafa-7.0.3-sysconfig2confd-1.patch 4759 SHA256 8de14eb05d7ae145583a6e07fded24c3b4e2d272cc75845f6bcd3a4e4a47b967 SHA512 98f0104d064c557daacb64c891fb082494ea99c5bbb3eb79f24f3f15617d631b678e7fe1d87ced027ea86d473f451ba44cbcd99fd67531605b61edb2dc189a81 WHIRLPOOL c6e80d291ab61797fb5de535e6d550ce67e5c960e88ad7d194f6acebed48a2446e1e819a36bf43798e0cf92b99e135dfa1a4437bab0e512183576912869d59ac
|
||||
AUX 7.0.7.34256/Datux-sendas.patch 1429 SHA256 852e7fc30df15fc534ff6697f8735ee02fe013f2fcb2c7dcd0b4b5f79b9b1032 SHA512 53b3f465d6b16b947a88acec63b24bc4ee46f5d1ed54edd8a064a877ec6ccb06752d9ebe68216d953e8428cca9a67e7a05fdb609f8daa94049c0961c575aac52 WHIRLPOOL e3d0616c47127a8a9217ad2a4d985ff14aec76c28af49a421283e77d9eb373076c4f9581665b8f7f1fc2340da4414cdd313da95b0983c0c3eaa6e93a914d436b
|
||||
AUX 7.0.7.34256/Datux-spamhook.patch 9895 SHA256 57d4fe122acc168b508b06a0a99ee9dc093080116918d2043fca02bc7022ed2b SHA512 2e048eb053902d9664ec8e3acee15edb1725db282e5f3e13817820d53a4cd788812560125d4fd624df7e69a89dbb2e089295d25f6ae25d5a6b4350e5756554ff WHIRLPOOL 4fd8b192baa7ce24dca903315cef987375b20814aa9da7b23c69ace76eda1a0058b59cd16b84ccb234a3775d1c3b1c4194bb4630c076cc43af0e133a0ca0ffed
|
||||
AUX 7.0.7.34256/zarafa-6.40.1-no-php-conf.patch 1634 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f SHA512 cefc1c0494353cfe183e2f8a2010dd2f1eb05638ddef0f5d1029fc3d060e3540329e458595d3321ecc6cdba14f2696f0d37322fc055d5ee8901053e6bacaf5e3 WHIRLPOOL 07ba273f5b5a3b51c159ee020e75becf0faf5da0f22c62ac6d516a91bb1f078f96bc05f0f0015b5e16e16bcf0a67255a93951177f81b761db3ff2be937a7b160
|
||||
AUX 7.0.7.34256/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350 SHA512 bad27d53e94829658ec8af016a525aa7c3146b84aeb0d65c0917d829f7e6fe4377859e81727dbd039803cbfcfb7f54a14ed126564ef1734674dc140a1c0c9f90 WHIRLPOOL c97b62f4ad31de88a27d3050293d30bb65fc392455ef87a2ee4198cd49db0ddaa87bd32330f75c194f6ffd6979719ab78ef95e356df9d62c6f43d74eb9fc9ffa
|
||||
AUX 7.0.7.34256/zarafa-7.0.0-package.patch 2285 SHA256 01a0b3a7acc54273bfdd6d84b67e6fd90d85b63f981f687035897d0516ef86fb SHA512 9470f1729fea31a2b19e1d84e0ec7461104069ce3f3fc7dc68cf5571029f467dcb15dfad1a8478378ef3e6fc842b3de761a60a4faa6a56a6941ac98406537c6e WHIRLPOOL 133160d85a490f8d63f52eabff5411c7c1028a25f8f426e734f086e3322c10e8f31247a9970b0693413c42b3d43029b7f5d7fe22810e5bdeb0b4fd33ce90cabd
|
||||
AUX 7.0.7.34256/zarafa-7.0.3-php54.patch 4019 SHA256 1929e734001df9b8514097c242dd7bb07c54ef7a3423505a7b748532f506a371 SHA512 b7c63e7c4dff693fd3e10283c82ec7605176efc6bfd665eb770c9d9da5e3450e966263ddc96e97b6f0c0a0604b9a800997fc446a9c5beb4930d954987066a2b8 WHIRLPOOL f9c929e7a7ae29e091e4d8734bfd28659731ca10bbdcec36e1bbd759b07f84d5f116798eb07ed0b185052d0c22988121b750f9636fdacaefd4aef48059a207aa
|
||||
AUX 7.0.7.34256/zarafa-7.0.3-sysconfig2confd-1.patch 4759 SHA256 8de14eb05d7ae145583a6e07fded24c3b4e2d272cc75845f6bcd3a4e4a47b967 SHA512 98f0104d064c557daacb64c891fb082494ea99c5bbb3eb79f24f3f15617d631b678e7fe1d87ced027ea86d473f451ba44cbcd99fd67531605b61edb2dc189a81 WHIRLPOOL c6e80d291ab61797fb5de535e6d550ce67e5c960e88ad7d194f6acebed48a2446e1e819a36bf43798e0cf92b99e135dfa1a4437bab0e512183576912869d59ac
|
||||
AUX junklearn.dspam 924 SHA256 5060aa1c0fd3e103c0243f5372ec4a393d4aebc7ed7c69a9475adead50d6b37e SHA512 43321b5245a5a6b6032fe8f34382826dbc3630e03ff43eda5c41d5782e0df72a2e784638e3047ba141141e4d3d99ef11e555117fb77fc2555e3ce07c7b28f65c WHIRLPOOL 983c2d5c87145a38bb87044cb6b9050092fa7c05bfa6de5317890103663550a86ccdb5af71966e86062943f5e39b6fbb990617048380aab94920602ed5b9d214
|
||||
AUX zarafa-dagent.rc6 2016 SHA256 696d0f7b0c41814ca15d775b0595eb46b95fc59e1cf2a30935eba2c717ff16d6 SHA512 a79a1ccdf51eeefc5d83b24dbc361bb9bbbced7370609578c26d96268cb51a99159c582f1774371e70f18623bfdf71dec7ad5f1f23a60146b9b7b24fa1c61efb WHIRLPOOL 8422e01d5bff2968ded6118f388046945d684c4aad1f6e1aa3117db2b2cbf522680baade763653a4084cc0a06377d654d369f32e473f9e1cc5e18153da1d5eb5
|
||||
AUX zarafa-gateway.rc6 747 SHA256 d08eb9eb5e548dca24e644aee4196aa135ef79d74d244675eeb9ea47594311b0 SHA512 35d31dc8934f83b785e00513179ff5f8e106a7f44358fecdf3fe9e5d6c5b713f0612b8e413f4c9c03b8feb301442bddf4f9a7570ed9ec3635588374e2a9c66ec WHIRLPOOL ecd8d000cd1ae262458952e48568da17c6fcf81a963a9191a7133565e27583ee39c9daffa66158b0af0699a26ad53c3486fe25ad88760e24f165b47ef16974d4
|
||||
@ -151,189 +15,17 @@ AUX zarafa-monitor.rc6 705 SHA256 6d7cc1b2f0c7049f28dccf0d65530f1075e932898ab9b7
|
||||
AUX zarafa-server.rc6 706 SHA256 5a8553127bc529350cf56ea35b558e1d276ca0d4bde92a32583d62d0d790fa4f SHA512 eed9be1898b5aecf4b0a6a023d568a2237bd731f7cf60fd50aa2e13ca7d10a341c93d552cc84e8ce164373897aefb89a02a7150170fb4f5f6bf6f074168dc6c2 WHIRLPOOL d95a23b126037b6b16cc1f4ab4f03886793dec40145aabd370f43c6b928552b11a9060cd945fa2e95f0d053fadc6852d21778a6b4446399b3508cf87506da1c9
|
||||
AUX zarafa-spooler.rc6 705 SHA256 4cf183daf6d86e2bb39073993af8f244bc28ee90feb4cf1ba34e5302894aa2fe SHA512 6c586973cb0f16a5dcb41189b77713904f2ea3505e25800ceb550a5dc1cd054d61b31dd9db91d121541ea5b2add1365e7f26b9df6ff5906da4aa5b766fa40c54 WHIRLPOOL 4aa99249c8fdee602f09ef9daf9a14892db744bea1ede7a27ef68a46e6856f848a41e465e7fa67c26a28995c18fa91a03f22047f91bb96135d7d2c9a94334b2b
|
||||
AUX zarafa.logrotate 1857 SHA256 44e26d9ad5eff2e159388698a068df72d9626d91e9be478be00b3e3eaa15913f SHA512 5deda12083eb8d3e283f8116d3ad6bba33348b060e6b88d15026644319ca0f870de3b0304a8f1c0edbbf1e8c32a038c865f8d3241c6ea70195ba2b9ae5e4089c WHIRLPOOL 37d0d2f53265f43cdb68de56812bd94be80947db3d868a0f2a1865450324e11cbd235121cefe7ff189df9169cd788397d309667dbc1ac872f27a05ada6a0d9c3
|
||||
DIST zarafa-bash-completion-6.40.10.28214.zip 2156 SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5
|
||||
DIST zarafa-bash-completion-6.40.11.28965.zip 2156 SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5
|
||||
DIST zarafa-bash-completion-6.40.12.29942.zip 2156 SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5
|
||||
DIST zarafa-bash-completion-6.40.13.30778.zip 2156 SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5
|
||||
DIST zarafa-bash-completion-6.40.14.31537.zip 2156 SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5
|
||||
DIST zarafa-bash-completion-6.40.15.33766.zip 2156 SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5
|
||||
DIST zarafa-bash-completion-6.40.16.34239.zip 2156 SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5
|
||||
DIST zarafa-bash-completion-6.40.17.35943.zip 2156 SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5 SHA512 f58af010c88abb61d73ab4f56b72e4354987cbf13a9ed0c224d1ca83a4d084f500bacb4ecb17bed884929b4add6de1efa6fa87dbe077d9929caa04afcddcf627 WHIRLPOOL c83f5e74225f0f08385229f3ae7b301a06db57c36bf4693e8eaa81dc8b2f0e66449830e85c5ce2fd6e9258ec6a249d5a4eec212984ca265570103b14423f9525
|
||||
DIST zarafa-bash-completion-6.40.9.27553.zip 2156 SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5
|
||||
DIST zarafa-bash-completion-7.0.10.37482.zip 2156 SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5 SHA512 f58af010c88abb61d73ab4f56b72e4354987cbf13a9ed0c224d1ca83a4d084f500bacb4ecb17bed884929b4add6de1efa6fa87dbe077d9929caa04afcddcf627 WHIRLPOOL c83f5e74225f0f08385229f3ae7b301a06db57c36bf4693e8eaa81dc8b2f0e66449830e85c5ce2fd6e9258ec6a249d5a4eec212984ca265570103b14423f9525
|
||||
DIST zarafa-bash-completion-7.0.3.30515.zip 2156 SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5
|
||||
DIST zarafa-bash-completion-7.0.4.31235.zip 2156 SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5
|
||||
DIST zarafa-bash-completion-7.0.5.31880.zip 2156 SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5
|
||||
DIST zarafa-bash-completion-7.0.6.32752.zip 2156 SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5
|
||||
DIST zarafa-bash-completion-7.0.7.34256.zip 2156 SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5
|
||||
DIST zarafa-webaccess-plugin-dspam-6.40.10.28214.tar.gz 5308 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99
|
||||
DIST zarafa-webaccess-plugin-dspam-6.40.11.28965.tar.gz 5308 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99
|
||||
DIST zarafa-webaccess-plugin-dspam-6.40.12.29942.tar.gz 5308 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99
|
||||
DIST zarafa-webaccess-plugin-dspam-6.40.13.30778.tar.gz 5308 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99
|
||||
DIST zarafa-webaccess-plugin-dspam-6.40.14.31537.tar.gz 5308 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99
|
||||
DIST zarafa-webaccess-plugin-dspam-6.40.15.33766.tar.gz 5308 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99
|
||||
DIST zarafa-webaccess-plugin-dspam-6.40.16.34239.tar.gz 5308 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99
|
||||
DIST zarafa-webaccess-plugin-dspam-6.40.17.35943.tar.gz 5308 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99 SHA512 198f79e95f7b1dbde3bc24cfd9dcd75b0e7d16eeae1394af44a077e3489148d8162b6435ea8c041237e9f69b4577a40f63903f65b5456d080ccda70c6881b76a WHIRLPOOL e2929ccb611cf92e16fb49e12a8aa204a0144ac5baf977760aa718c30cef36a615b408a0e7b0cc6246883f77ddad3e344a37d636a401e41c4baf11be4cc79922
|
||||
DIST zarafa-webaccess-plugin-dspam-6.40.9.27553.tar.gz 5308 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99
|
||||
DIST zarafa-webaccess-plugin-dspam-7.0.10.37482.tar.gz 5308 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99 SHA512 198f79e95f7b1dbde3bc24cfd9dcd75b0e7d16eeae1394af44a077e3489148d8162b6435ea8c041237e9f69b4577a40f63903f65b5456d080ccda70c6881b76a WHIRLPOOL e2929ccb611cf92e16fb49e12a8aa204a0144ac5baf977760aa718c30cef36a615b408a0e7b0cc6246883f77ddad3e344a37d636a401e41c4baf11be4cc79922
|
||||
DIST zarafa-webaccess-plugin-dspam-7.0.3.30515.tar.gz 5308 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99
|
||||
DIST zarafa-webaccess-plugin-dspam-7.0.4.31235.tar.gz 5308 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99
|
||||
DIST zarafa-webaccess-plugin-dspam-7.0.5.31880.tar.gz 5308 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99
|
||||
DIST zarafa-webaccess-plugin-dspam-7.0.6.32752.tar.gz 5308 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99
|
||||
DIST zarafa-webaccess-plugin-dspam-7.0.7.34256.tar.gz 5308 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99
|
||||
DIST zarafa-webaccess-plugin-google-maps-6.40.10.28214.zip 100943 SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e
|
||||
DIST zarafa-webaccess-plugin-google-maps-6.40.11.28965.zip 100943 SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e
|
||||
DIST zarafa-webaccess-plugin-google-maps-6.40.12.29942.zip 100943 SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e
|
||||
DIST zarafa-webaccess-plugin-google-maps-6.40.13.30778.zip 100943 SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e
|
||||
DIST zarafa-webaccess-plugin-google-maps-6.40.14.31537.zip 100943 SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e
|
||||
DIST zarafa-webaccess-plugin-google-maps-6.40.15.33766.zip 100943 SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e
|
||||
DIST zarafa-webaccess-plugin-google-maps-6.40.16.34239.zip 100943 SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e
|
||||
DIST zarafa-webaccess-plugin-google-maps-6.40.17.35943.zip 100943 SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e SHA512 c9c2ae583ae2f6ec36c957695de92ae00695ce450e5613d05c3b0c1a496846ad6e6bf5fc3e55711da496c73baea645f59083b5ccda374ca3d145e2e06f428824 WHIRLPOOL 07c7406cf3de86a0fe635444525bcd093aceca12c601487cc913db395dc94a85963bea8cad420008bd40b332449bd1b88149de3efb4e63f06c981d7fc98269b1
|
||||
DIST zarafa-webaccess-plugin-google-maps-6.40.9.27553.zip 100943 SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e
|
||||
DIST zarafa-webaccess-plugin-google-maps-7.0.10.37482.zip 100943 SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e SHA512 c9c2ae583ae2f6ec36c957695de92ae00695ce450e5613d05c3b0c1a496846ad6e6bf5fc3e55711da496c73baea645f59083b5ccda374ca3d145e2e06f428824 WHIRLPOOL 07c7406cf3de86a0fe635444525bcd093aceca12c601487cc913db395dc94a85963bea8cad420008bd40b332449bd1b88149de3efb4e63f06c981d7fc98269b1
|
||||
DIST zarafa-webaccess-plugin-google-maps-7.0.3.30515.zip 100943 SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e
|
||||
DIST zarafa-webaccess-plugin-google-maps-7.0.4.31235.zip 100943 SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e
|
||||
DIST zarafa-webaccess-plugin-google-maps-7.0.5.31880.zip 100943 SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e
|
||||
DIST zarafa-webaccess-plugin-google-maps-7.0.6.32752.zip 100943 SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e
|
||||
DIST zarafa-webaccess-plugin-google-maps-7.0.7.34256.zip 100943 SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e
|
||||
DIST zarafa-webaccess-plugin-mobile-device-6.40.10.28214.zip 26916 SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4
|
||||
DIST zarafa-webaccess-plugin-mobile-device-6.40.11.28965.zip 26916 SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4
|
||||
DIST zarafa-webaccess-plugin-mobile-device-6.40.12.29942.zip 26916 SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4
|
||||
DIST zarafa-webaccess-plugin-mobile-device-6.40.13.30778.zip 26916 SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4
|
||||
DIST zarafa-webaccess-plugin-mobile-device-6.40.14.31537.zip 26916 SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4
|
||||
DIST zarafa-webaccess-plugin-mobile-device-6.40.15.33766.zip 26916 SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4
|
||||
DIST zarafa-webaccess-plugin-mobile-device-6.40.16.34239.zip 26916 SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4
|
||||
DIST zarafa-webaccess-plugin-mobile-device-6.40.17.35943.zip 26916 SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4 SHA512 da4b50299dd902a2f276b61f4e0fdca7fc78ad1660ee7e2dd00be714cac9540c8e4e2e35afb86113cf01814499d865cfbef8840e3d27912e1bde60753e332749 WHIRLPOOL 7d83e5ea0f6dd708962a6170c3c3aedf6e780885192cc018e63f4d63964a8d0e2b49feef8d72bac7f78b680b85ab113f462bac9576739ef029084194d4aacc27
|
||||
DIST zarafa-webaccess-plugin-mobile-device-6.40.9.27553.zip 26916 SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4
|
||||
DIST zarafa-webaccess-plugin-mobile-device-7.0.10.37482.zip 26916 SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4 SHA512 da4b50299dd902a2f276b61f4e0fdca7fc78ad1660ee7e2dd00be714cac9540c8e4e2e35afb86113cf01814499d865cfbef8840e3d27912e1bde60753e332749 WHIRLPOOL 7d83e5ea0f6dd708962a6170c3c3aedf6e780885192cc018e63f4d63964a8d0e2b49feef8d72bac7f78b680b85ab113f462bac9576739ef029084194d4aacc27
|
||||
DIST zarafa-webaccess-plugin-mobile-device-7.0.3.30515.zip 26916 SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4
|
||||
DIST zarafa-webaccess-plugin-mobile-device-7.0.4.31235.zip 26916 SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4
|
||||
DIST zarafa-webaccess-plugin-mobile-device-7.0.5.31880.zip 26916 SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4
|
||||
DIST zarafa-webaccess-plugin-mobile-device-7.0.6.32752.zip 26916 SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4
|
||||
DIST zarafa-webaccess-plugin-mobile-device-7.0.7.34256.zip 26916 SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4
|
||||
DIST zarafa-webaccess-plugin-smime-6.40.10.28214.zip 3678929 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a
|
||||
DIST zarafa-webaccess-plugin-smime-6.40.11.28965.zip 3678929 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a
|
||||
DIST zarafa-webaccess-plugin-smime-6.40.12.29942.zip 3678929 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a
|
||||
DIST zarafa-webaccess-plugin-smime-6.40.13.30778.zip 3678929 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a
|
||||
DIST zarafa-webaccess-plugin-smime-6.40.14.31537.zip 3678929 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a
|
||||
DIST zarafa-webaccess-plugin-smime-6.40.15.33766.zip 3678929 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a
|
||||
DIST zarafa-webaccess-plugin-smime-6.40.16.34239.zip 3678929 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a
|
||||
DIST zarafa-webaccess-plugin-smime-6.40.17.35943.zip 3678929 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a SHA512 64cf20ad61cab1c890ce0ff625bfac324cbd910cb0ba2d14f599a4fff1e0242956a28a9afa47d00d918b51a12128d54081d65afe3ae10c8109db7d2f6138ddf0 WHIRLPOOL 82c513f26e3d0fe8f0bd0ecfc0f48c7efd001e2a6391abdd36377ead1bba52614d994c65b0d84a998f732cc2e7b66a9e84832eb320a5387e6d7a52e54ef366b8
|
||||
DIST zarafa-webaccess-plugin-smime-6.40.9.27553.zip 3678929 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a
|
||||
DIST zarafa-webaccess-plugin-smime-7.0.10.37482.zip 3678929 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a SHA512 64cf20ad61cab1c890ce0ff625bfac324cbd910cb0ba2d14f599a4fff1e0242956a28a9afa47d00d918b51a12128d54081d65afe3ae10c8109db7d2f6138ddf0 WHIRLPOOL 82c513f26e3d0fe8f0bd0ecfc0f48c7efd001e2a6391abdd36377ead1bba52614d994c65b0d84a998f732cc2e7b66a9e84832eb320a5387e6d7a52e54ef366b8
|
||||
DIST zarafa-webaccess-plugin-smime-7.0.3.30515.zip 3678929 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a
|
||||
DIST zarafa-webaccess-plugin-smime-7.0.4.31235.zip 3678929 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a
|
||||
DIST zarafa-webaccess-plugin-smime-7.0.5.31880.zip 3678929 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a
|
||||
DIST zarafa-webaccess-plugin-smime-7.0.6.32752.zip 3678929 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a
|
||||
DIST zarafa-webaccess-plugin-smime-7.0.7.34256.zip 3678929 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a
|
||||
DIST zarafa-webaccess-plugin-z-merge-archive-6.40.10.28214.zip 25852 SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a
|
||||
DIST zarafa-webaccess-plugin-z-merge-archive-6.40.11.28965.zip 25852 SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a
|
||||
DIST zarafa-webaccess-plugin-z-merge-archive-6.40.12.29942.zip 25852 SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a
|
||||
DIST zarafa-webaccess-plugin-z-merge-archive-6.40.13.30778.zip 25852 SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a
|
||||
DIST zarafa-webaccess-plugin-z-merge-archive-6.40.14.31537.zip 25852 SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a
|
||||
DIST zarafa-webaccess-plugin-z-merge-archive-6.40.15.33766.zip 25852 SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a
|
||||
DIST zarafa-webaccess-plugin-z-merge-archive-6.40.16.34239.zip 25852 SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a
|
||||
DIST zarafa-webaccess-plugin-z-merge-archive-6.40.17.35943.zip 25852 SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a SHA512 49f95166dd5e37fd17e20aea38a8da224736800b0a6b29d35f7f5e4d8c8a3feaf0b92dea2afdb5d060b56dcd312f18e32e7208c60be25ae2b7649a4d66fe5d69 WHIRLPOOL 464bf4041220886d8d88c08c8e06e582f0466f7cc8ddd4720784bfd551f654a9266c816cae6ded026174ac94c53e2cd9195d97890735e2c02374a665cb63e23f
|
||||
DIST zarafa-webaccess-plugin-z-merge-archive-6.40.9.27553.zip 25852 SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a
|
||||
DIST zarafa-webaccess-plugin-z-merge-archive-7.0.10.37482.zip 25852 SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a SHA512 49f95166dd5e37fd17e20aea38a8da224736800b0a6b29d35f7f5e4d8c8a3feaf0b92dea2afdb5d060b56dcd312f18e32e7208c60be25ae2b7649a4d66fe5d69 WHIRLPOOL 464bf4041220886d8d88c08c8e06e582f0466f7cc8ddd4720784bfd551f654a9266c816cae6ded026174ac94c53e2cd9195d97890735e2c02374a665cb63e23f
|
||||
DIST zarafa-webaccess-plugin-z-merge-archive-7.0.3.30515.zip 25852 SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a
|
||||
DIST zarafa-webaccess-plugin-z-merge-archive-7.0.4.31235.zip 25852 SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a
|
||||
DIST zarafa-webaccess-plugin-z-merge-archive-7.0.5.31880.zip 25852 SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a
|
||||
DIST zarafa-webaccess-plugin-z-merge-archive-7.0.6.32752.zip 25852 SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a
|
||||
DIST zarafa-webaccess-plugin-z-merge-archive-7.0.7.34256.zip 25852 SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a
|
||||
DIST zarafa-webaccess-theme-dark-6.40.10.28214.tar.gz 12902 SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58
|
||||
DIST zarafa-webaccess-theme-dark-6.40.11.28965.tar.gz 12902 SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58
|
||||
DIST zarafa-webaccess-theme-dark-6.40.12.29942.tar.gz 12902 SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58
|
||||
DIST zarafa-webaccess-theme-dark-6.40.13.30778.tar.gz 12902 SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58
|
||||
DIST zarafa-webaccess-theme-dark-6.40.14.31537.tar.gz 12902 SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58
|
||||
DIST zarafa-webaccess-theme-dark-6.40.15.33766.tar.gz 12902 SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58
|
||||
DIST zarafa-webaccess-theme-dark-6.40.16.34239.tar.gz 12902 SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58
|
||||
DIST zarafa-webaccess-theme-dark-6.40.17.35943.tar.gz 12902 SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58 SHA512 fdb6eb7cf9bdbee5eeed17d83a1a7cfa71fd059da696f8392913e4f14133222bbe12998440a675b7abc2275ec5269708d1e634ccfc4b2a34347d4343476e7e60 WHIRLPOOL 266dad02929ccec1702cbb1c4d0db14f9a32b35b2d3995c9de45ef0df9cd198b0d43d2418775d0f86500aab516978a655528072b868abdefa9fa8010d6982df5
|
||||
DIST zarafa-webaccess-theme-dark-6.40.9.27553.tar.gz 12902 SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58
|
||||
DIST zarafa-webaccess-theme-dark-7.0.10.37482.tar.gz 12902 SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58 SHA512 fdb6eb7cf9bdbee5eeed17d83a1a7cfa71fd059da696f8392913e4f14133222bbe12998440a675b7abc2275ec5269708d1e634ccfc4b2a34347d4343476e7e60 WHIRLPOOL 266dad02929ccec1702cbb1c4d0db14f9a32b35b2d3995c9de45ef0df9cd198b0d43d2418775d0f86500aab516978a655528072b868abdefa9fa8010d6982df5
|
||||
DIST zarafa-webaccess-theme-dark-7.0.3.30515.tar.gz 12902 SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58
|
||||
DIST zarafa-webaccess-theme-dark-7.0.4.31235.tar.gz 12902 SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58
|
||||
DIST zarafa-webaccess-theme-dark-7.0.5.31880.tar.gz 12902 SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58
|
||||
DIST zarafa-webaccess-theme-dark-7.0.6.32752.tar.gz 12902 SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58
|
||||
DIST zarafa-webaccess-theme-dark-7.0.7.34256.tar.gz 12902 SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58
|
||||
DIST zarafa-webaccess-theme-orange-6.40.10.28214.tar.gz 12828 SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532
|
||||
DIST zarafa-webaccess-theme-orange-6.40.11.28965.tar.gz 12828 SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532
|
||||
DIST zarafa-webaccess-theme-orange-6.40.12.29942.tar.gz 12828 SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532
|
||||
DIST zarafa-webaccess-theme-orange-6.40.13.30778.tar.gz 12828 SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532
|
||||
DIST zarafa-webaccess-theme-orange-6.40.14.31537.tar.gz 12828 SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532
|
||||
DIST zarafa-webaccess-theme-orange-6.40.15.33766.tar.gz 12828 SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532
|
||||
DIST zarafa-webaccess-theme-orange-6.40.16.34239.tar.gz 12828 SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532
|
||||
DIST zarafa-webaccess-theme-orange-6.40.17.35943.tar.gz 12828 SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532 SHA512 edab6056ac4405d54404495ef6e9d21191913ed76ca81ac46b25aedaa7a091d4b4ac551abed87e177b535af93c64baa0f5ae342429e89e914d748edce5bf2604 WHIRLPOOL 394b853219f8358eb27ac24e01fab82c8265b2c2b827e6955c9decbfc2b2b586846066b933678fa26d19782684978041a7657a45976f3aba3325744d80a7be71
|
||||
DIST zarafa-webaccess-theme-orange-6.40.9.27553.tar.gz 12828 SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532
|
||||
DIST zarafa-webaccess-theme-orange-7.0.10.37482.tar.gz 12828 SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532 SHA512 edab6056ac4405d54404495ef6e9d21191913ed76ca81ac46b25aedaa7a091d4b4ac551abed87e177b535af93c64baa0f5ae342429e89e914d748edce5bf2604 WHIRLPOOL 394b853219f8358eb27ac24e01fab82c8265b2c2b827e6955c9decbfc2b2b586846066b933678fa26d19782684978041a7657a45976f3aba3325744d80a7be71
|
||||
DIST zarafa-webaccess-theme-orange-7.0.3.30515.tar.gz 12828 SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532
|
||||
DIST zarafa-webaccess-theme-orange-7.0.4.31235.tar.gz 12828 SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532
|
||||
DIST zarafa-webaccess-theme-orange-7.0.5.31880.tar.gz 12828 SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532
|
||||
DIST zarafa-webaccess-theme-orange-7.0.6.32752.tar.gz 12828 SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532
|
||||
DIST zarafa-webaccess-theme-orange-7.0.7.34256.tar.gz 12828 SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532
|
||||
DIST zcp-6.40.10-28214-sles-11-i586-free.tar.gz 24512897 SHA256 f8f2813a3ed511fa305cb12c30232e7ede94be67c981f2624ea7517565fe35c6
|
||||
DIST zcp-6.40.10-28214-sles-11-x86_64-free.tar.gz 24445806 SHA256 cba3334b76e82f2555b6209285889799fc0e4593d360c43a35f2dcf2c0e0315e
|
||||
DIST zcp-6.40.10.tar.gz 5452296 SHA256 50eef47cb354b9eca4bd4e2af6e0422aac5db5fdb35486197312f5f96b34abfc
|
||||
DIST zcp-6.40.11-28965-sles-11-i586-free.tar.gz 24609123 SHA256 f68bf94a24ce967d3ac58f656f2bb432d9def5d9ea2616aaff59f7cd0e538d22
|
||||
DIST zcp-6.40.11-28965-sles-11-x86_64-free.tar.gz 24541396 SHA256 89b4853eb68fc7f218791a1c96fa3060763e4dda4d5be225e48700dff925d5c9
|
||||
DIST zcp-6.40.11.tar.gz 5493848 SHA256 d64997301fbe36e1ccadc254d0f892dc45e7250e445f14cf39d638d4274a1e1c
|
||||
DIST zcp-6.40.12-29942-sles-11-i586-free.tar.gz 25127419 SHA256 726b582a36d4e94f6388e5f9e781dc02cf79253e3b36392f49848e52897cecc9
|
||||
DIST zcp-6.40.12-29942-sles-11-x86_64-free.tar.gz 25053364 SHA256 100354f5620d816dfa472437f6e99c91a132116b42229ec23e16b8dd30f4d850
|
||||
DIST zcp-6.40.12.tar.gz 5521416 SHA256 4fcecd4dfaac335b174b6223f5ca0ad30b45bc1ff3839d9044acc0e887db1297
|
||||
DIST zcp-6.40.13-30778-sles-11-i586-free.tar.gz 25246681 SHA256 dc985f5db8b4e1cbc69b908d945d61c4035babb0921fd209d5eacece379938e3
|
||||
DIST zcp-6.40.13-30778-sles-11-x86_64-free.tar.gz 25172259 SHA256 ea3e3f3ab8caf383fbdfa24d10ba41dc6fea0e440c592127b7ca370a57b36cd2
|
||||
DIST zcp-6.40.13.tar.gz 5544429 SHA256 87c0143c92df1bed22a116f28e65d1362251fb3f026875c09bea9e96f7433264
|
||||
DIST zcp-6.40.14-31537-sles-11-i586-free.tar.gz 25371981 SHA256 fb3a0509d47de4d4ec060bf1a38bfa988c70b57ee67b6532125df9b18e346222
|
||||
DIST zcp-6.40.14-31537-sles-11-x86_64-free.tar.gz 25291142 SHA256 96dc0755963ba15abb54cbebce2eb16ec3a99488781ccd14616d32a1f384dab8
|
||||
DIST zcp-6.40.14.tar.gz 5563665 SHA256 871ac04d4f87e1868ff103edddfcfc6f91a1c9e6e0caeeb0f0c20dbc4424521a
|
||||
DIST zcp-6.40.15-33766-sles-11-i586-free.tar.gz 25362067 SHA256 ec9ceaf5caf93337233e3390e2c7e9897cd880b4e403f3ece529022351e0ab88
|
||||
DIST zcp-6.40.15-33766-sles-11-x86_64-free.tar.gz 25283628 SHA256 b57ece5315c10bfa7b406835daac582c350d3d2e186d172895c5a9997ef6945b
|
||||
DIST zcp-6.40.15.tar.gz 5565275 SHA256 dffea016ce5fe663c61991495098995335ea8fb564eeffc8f817535a2e29872d
|
||||
DIST zcp-6.40.16-34239-sles-11-i586-free.tar.gz 25369527 SHA256 665d855c2d4307ec79f357b2a91dcf2bc92a905339e3e321d22bac12b75db74e
|
||||
DIST zcp-6.40.16-34239-sles-11-x86_64-free.tar.gz 25288428 SHA256 7e1b1001cd8877fe5a9e4ea3c7a833640ebf5fec3df998bc7f3b8937dd579692
|
||||
DIST zcp-6.40.16.tar.gz 5563992 SHA256 1745d7cb1fc4f135f54f3e02c30067351d33daff36bb24fb92fe55d6eaa5d654
|
||||
DIST zcp-6.40.17-35943-sles-11-i586-free.tar.gz 25361913 SHA256 da68854001efe809006e0520ccbf61c6caf0e768d6609e989d7dcda38f665ab0 SHA512 4c8874e37bb42974911fd8bda9c9ef785239d5fc16b51838297944ca802ebe06e38f856b983c5d5898e7117953da98408f1a76606ea9affc90eab7af9fe15d3b WHIRLPOOL 7fefbb2e30ff42e23bb60c1d3566da0da0fffd4695c1aff9bb26611384b228b41de89939cd8b9a81cf845605429ba7d1d2056e1bf6ae0dee35f7a2b1485f9757
|
||||
DIST zcp-6.40.17-35943-sles-11-x86_64-free.tar.gz 25284099 SHA256 dc7335ce4b91c247a56bfe6b8659551b32a43c75188388dd19f85c3ecced22bc SHA512 38ec279ddcfff39fd2ed325bffeb870f41743e60a64d0cdb46631333c147b1fca458bb97f462f2972a719fd799cb14dadd1d3f5a8d280029e56cb98c1a0ab57a WHIRLPOOL 6eba029311d03c5c0818e60e286e017d370d3677a7f30b00d30db9451af4e6adaab89f105bc09b60f499f13ebb00378de32c4a0a46b6dea9fe68bce2d963bcd4
|
||||
DIST zcp-6.40.17.tar.gz 5612375 SHA256 cfcd7ab6d9cc8ae1a634f04484bf9181e02024b19cdd4fd4d20eed0a2c5d35fe SHA512 934903940bbe7178e88965a7174a356e54a8eb457ac192354776fea438cd7329fd97053acf74bda22c68555adf052fb8753d14e2f82a646a13b9ec047390b0e5 WHIRLPOOL 4ab7f0ee92c98b094fcd560633d3f41ae1e9bf4c3d399f7775cf7b1ba2d3a85c0fab316370d95de2cf2775dee9d67bbf87c180896653a81897d5533d02054e9c
|
||||
DIST zcp-6.40.8-27223-sles-11-i586-free.tar.gz 24048189 SHA256 99a010e216e7d49d2d6b07fd33f265a08829f01d7ed85f2dd832e8809c1c72a1
|
||||
DIST zcp-6.40.8-27223-sles-11-x86_64-free.tar.gz 24001656 SHA256 ba5fed41d6fee39dc969e711a7edbf76e7640ca5c77e28c9be6d11f026a99b30
|
||||
DIST zcp-6.40.8.tar.gz 5428506 SHA256 206bb736731f5b3c3fdc0d34c495b8c2af9e3245770d8636bc97d06ff7363023
|
||||
DIST zcp-6.40.9-27553-sles-11-i586-free.tar.gz 24074176 SHA256 1f3fd302b6c3f79f14798da21a61ae3e63f836e0545e4a7e6bdecba26a9a6479
|
||||
DIST zcp-6.40.9-27553-sles-11-x86_64-free.tar.gz 24027236 SHA256 ef21788f2864210d801c9d258ec97fad670c8fb00c9200dbb9e0c023e22ce035
|
||||
DIST zcp-6.40.9.tar.gz 5434001 SHA256 23653649497b0b26322b8152c639eec1087727d2370947050c239dc3d7c1f03d
|
||||
DIST zcp-7.0.10-37482-sles-11-i586-free.tar.gz 29704009 SHA256 b21b49c2559889ba1de1fcdbbe9afce0119353daa2c8405fe7a4d5df156d2175 SHA512 246fb1f1a787b3900b60ceab6f7cd5ac8a53c00de47fc9de5cc38463d0e81b1e633b314ab891047099b1b1dac6813905ff93bc0c6146378d2c6947d8412ae09d WHIRLPOOL 7f4826527f91a173423f7fd3112c1f2dfb6d7a11073eee98b3c7a31708bd8edb2e136c84190b947752450b3b3926aed4d8463fc31dbdf64de383ebc74bc00c69
|
||||
DIST zcp-7.0.10-37482-sles-11-x86_64-free.tar.gz 29592160 SHA256 6afa247f40153badf4ebb694bc633e767cdf2e9ecff9bc6f77869a856b1428fc SHA512 1e0b59767f348e5e6c06a45e209c0d6801a2139211dcf42f4d4c3119b3034da09cfb2036d096269ef582b95a33edf687f8264c659de679365fe8a5da1bc031b9 WHIRLPOOL 9fba14659dad6332b4bd8110789ee07f2fcbc5ef539553afe382795d8862d2d094d24273777fb1bc8bb35abc51ea01a290c940ab37f7050ea025b605818fe8ed
|
||||
DIST zcp-7.0.10.tar.gz 6321598 SHA256 c122d13e00a7caa0f3730ffd110841d020e5480a78a5da2fe43dc4206b7aba7c SHA512 841b31f64a383a1d3ca89e829c58b748f8aa8e608b9baafe7ecc77039ac3e75dc69a6b3f6d20f3bd6b358457a911a1d569ec005330edf4f206f0d1e1fb674320 WHIRLPOOL 89bff0e255034b16532593ccd4ad9becbef38290449bf9adb886901344d857e0555303ae2758525a1f32c7cd2b28e12cb855cf4feb497fbfe0821d2741e82da7
|
||||
DIST zcp-7.0.3-30515-sles-11-i586-free.tar.gz 26460349 SHA256 ba081d9dac349e4915be1ac4f4a14dc418445cd3c5d704492bf0aaa6f18c3816
|
||||
DIST zcp-7.0.3-30515-sles-11-x86_64-free.tar.gz 26346323 SHA256 759b65bad8d6098f8ec39169b60f93f6d6997497fb7a85c8f756a9ca5ba8b60b
|
||||
DIST zcp-7.0.3.tar.gz 6137777 SHA256 ee63e43d597404c79712fd65deca13b1633e0a20bb2b4e3fdd31770795706014
|
||||
DIST zcp-7.0.4-31235-sles-11-i586-free.tar.gz 27192843 SHA256 759c1a27bd15339ff7a0df4e2350a27199ad087f03dfc0e00aa3e92729356b23
|
||||
DIST zcp-7.0.4-31235-sles-11-x86_64-free.tar.gz 27076140 SHA256 03d1202a8ddec969f2a123cf6729bed7a5e1ebb837476c6343ae6679307f654b
|
||||
DIST zcp-7.0.4.tar.gz 6116000 SHA256 b4be7f08a027a4ac7daa986fdb2791e069bdf23c155675181c117874dc4302cd
|
||||
DIST zcp-7.0.5-31880-sles-11-i586-free.tar.gz 27407194 SHA256 add1591fa9302cebadd9121331d3d1947f5eb840aa540c8ea158dd5a73263119
|
||||
DIST zcp-7.0.5-31880-sles-11-x86_64-free.tar.gz 27292908 SHA256 039199f629dcc059f30c8de2f7d98fee890f002fd957fe6886b076f763739f65
|
||||
DIST zcp-7.0.5.tar.gz 6165679 SHA256 235a2bfa452f3c013d9b58127cb557690dfcb65bc6510d9d68e4d53f01c21df0
|
||||
DIST zcp-7.0.6-32752-sles-11-i586-free.tar.gz 27305148 SHA256 fae3f6297291d6df6cb4740af1d5b8c6be7b230a3414ea7fd8bb4200af8b5a20
|
||||
DIST zcp-7.0.6-32752-sles-11-x86_64-free.tar.gz 27187378 SHA256 cd6d30f0079572e28629e2207530e10911df350b91a82cc7030179271d507c6c
|
||||
DIST zcp-7.0.6.tar.gz 6248757 SHA256 4bc417d3ede1da7f5ec677f7727404228d1e0663fe1c52c82d6d3e449f4e5c58
|
||||
DIST zcp-7.0.7-34256-sles-11-i586-free.tar.gz 29616167 SHA256 459eb43cbc51141510a01f0e76b62f8ca10d3f32b48c35bc854c746f37c4bef0
|
||||
DIST zcp-7.0.7-34256-sles-11-x86_64-free.tar.gz 29501301 SHA256 fb7b005624879e7b23ba5ed67d892adf3669cf1af8d3bab3ef239e1671b83cde
|
||||
DIST zcp-7.0.7.tar.gz 6253176 SHA256 73c7f8d44d0bad5a4b9ae558cacfc7365309579153bf2e3a25d50ae4f5396ade
|
||||
EBUILD zarafa-6.40.10.28214.ebuild 9054 SHA256 e6addb81a27872cd0242a6c115e4d84be1c8acaf7cb5d947db791b23e7b8f2b0 SHA512 36879d630938dea8fa78facbc5f746da6de4e900064e7a2cd984dfb8e638792a698aceedaa09101f1f1bf80b476f8309e9bfc4e9afc10facfb8a161a827fc36b WHIRLPOOL b9cb0761a6a8a1adb94c87997252a44ab262d2bb132826158dfe2ea8e2c3702f1ac774e265054f5c43ea5a9c2ded2596445d0d56acc3b6f999dfd47a5db89e35
|
||||
EBUILD zarafa-6.40.11.28965.ebuild 9054 SHA256 e6addb81a27872cd0242a6c115e4d84be1c8acaf7cb5d947db791b23e7b8f2b0 SHA512 36879d630938dea8fa78facbc5f746da6de4e900064e7a2cd984dfb8e638792a698aceedaa09101f1f1bf80b476f8309e9bfc4e9afc10facfb8a161a827fc36b WHIRLPOOL b9cb0761a6a8a1adb94c87997252a44ab262d2bb132826158dfe2ea8e2c3702f1ac774e265054f5c43ea5a9c2ded2596445d0d56acc3b6f999dfd47a5db89e35
|
||||
EBUILD zarafa-6.40.12.29942.ebuild 9061 SHA256 66a9aea68004e599f46e3b0b4f9a09e1c238504c1c11db8185af7f97d71229f2 SHA512 60198553343fdbf1973c03de708c63f015327212c3ca972f7747a48140f29f5505deb194fde996c9b02af8fe50efe2df5590e219d587f3053a1b11085eb120a1 WHIRLPOOL 99cbde29200ed6fc8a00add68bb22371ebcbabdd27711058c7257889d9b9db93145667ffe9b180b39ecfbe0bf2828b3e1e946dffacfce2a1ffd4f9042349e628
|
||||
EBUILD zarafa-6.40.13.30778.ebuild 9061 SHA256 66a9aea68004e599f46e3b0b4f9a09e1c238504c1c11db8185af7f97d71229f2 SHA512 60198553343fdbf1973c03de708c63f015327212c3ca972f7747a48140f29f5505deb194fde996c9b02af8fe50efe2df5590e219d587f3053a1b11085eb120a1 WHIRLPOOL 99cbde29200ed6fc8a00add68bb22371ebcbabdd27711058c7257889d9b9db93145667ffe9b180b39ecfbe0bf2828b3e1e946dffacfce2a1ffd4f9042349e628
|
||||
EBUILD zarafa-6.40.14.31537.ebuild 9061 SHA256 66a9aea68004e599f46e3b0b4f9a09e1c238504c1c11db8185af7f97d71229f2 SHA512 60198553343fdbf1973c03de708c63f015327212c3ca972f7747a48140f29f5505deb194fde996c9b02af8fe50efe2df5590e219d587f3053a1b11085eb120a1 WHIRLPOOL 99cbde29200ed6fc8a00add68bb22371ebcbabdd27711058c7257889d9b9db93145667ffe9b180b39ecfbe0bf2828b3e1e946dffacfce2a1ffd4f9042349e628
|
||||
EBUILD zarafa-6.40.15.33766.ebuild 9061 SHA256 66a9aea68004e599f46e3b0b4f9a09e1c238504c1c11db8185af7f97d71229f2 SHA512 60198553343fdbf1973c03de708c63f015327212c3ca972f7747a48140f29f5505deb194fde996c9b02af8fe50efe2df5590e219d587f3053a1b11085eb120a1 WHIRLPOOL 99cbde29200ed6fc8a00add68bb22371ebcbabdd27711058c7257889d9b9db93145667ffe9b180b39ecfbe0bf2828b3e1e946dffacfce2a1ffd4f9042349e628
|
||||
EBUILD zarafa-6.40.16.34239.ebuild 9061 SHA256 66a9aea68004e599f46e3b0b4f9a09e1c238504c1c11db8185af7f97d71229f2 SHA512 60198553343fdbf1973c03de708c63f015327212c3ca972f7747a48140f29f5505deb194fde996c9b02af8fe50efe2df5590e219d587f3053a1b11085eb120a1 WHIRLPOOL 99cbde29200ed6fc8a00add68bb22371ebcbabdd27711058c7257889d9b9db93145667ffe9b180b39ecfbe0bf2828b3e1e946dffacfce2a1ffd4f9042349e628
|
||||
EBUILD zarafa-6.40.17.35943.ebuild 9061 SHA256 66a9aea68004e599f46e3b0b4f9a09e1c238504c1c11db8185af7f97d71229f2 SHA512 60198553343fdbf1973c03de708c63f015327212c3ca972f7747a48140f29f5505deb194fde996c9b02af8fe50efe2df5590e219d587f3053a1b11085eb120a1 WHIRLPOOL 99cbde29200ed6fc8a00add68bb22371ebcbabdd27711058c7257889d9b9db93145667ffe9b180b39ecfbe0bf2828b3e1e946dffacfce2a1ffd4f9042349e628
|
||||
EBUILD zarafa-6.40.8.27223.ebuild 6567 SHA256 74ab1f9061cada56505cd39e861d348f5b9007e85fa94d3dd48c811005dc4f95 SHA512 51d9a93f74915286c35722095712346e869c0c6bbb7ac711454d6722e346a917a1fef4616faa2e525373719268ba1b5a1095bd8627b55cdd0aa11e143c66e879 WHIRLPOOL 3950655e9543ae3cc3f68d85fe5979bbfd6bc8a8747a3a96c811d9b1501cc6c2619a6151a64a476f87363debf71a6e2d95cac3e6102dae35f3aa1fa8dc55169d
|
||||
EBUILD zarafa-6.40.9.27553.ebuild 9033 SHA256 bcf13aaaeb85e536a6aed59ae670bef33c562c5d7efc6a38d79fd04b0bba8716 SHA512 ae77b4eba536a12cb2b4f1c8e3c09792be84e680f818ef7cf46b1e3c784d22a201f09660572f1b9d10856a0de287bcdc752d1aaef1c21e54d6e7ce1b5a2aee8e WHIRLPOOL bf68db171a0056f37586754de3c028bc670b4aa82ba7bb2c6cb44fe14a35557c2e003a16626e4cd73230d472deaa4b7e98f828298eeacf7e1ca51a01f7eb9398
|
||||
EBUILD zarafa-7.0.10.37482.ebuild 9864 SHA256 84d3ceeb8d4ded58a0074037e307af5a593a39f15e686ba8f262e5425e3728aa SHA512 a7a28531febcd19d1d075df2001bab6c35d507b4af436d0b56c953beb939313024e371f9c991fe5a136b27a8050be4350bc3a8c870573cf1fa56389b4c8ebec5 WHIRLPOOL e97fb194cbf2479df9328ead840f9397bf64373de01b78bfae13e5c38443e429f0f27a7b88ad6c3cd058b969841519c7d45e99a2da86eaec6dc6ea2f39bc56ba
|
||||
EBUILD zarafa-7.0.3.30515.ebuild 9864 SHA256 84d3ceeb8d4ded58a0074037e307af5a593a39f15e686ba8f262e5425e3728aa SHA512 a7a28531febcd19d1d075df2001bab6c35d507b4af436d0b56c953beb939313024e371f9c991fe5a136b27a8050be4350bc3a8c870573cf1fa56389b4c8ebec5 WHIRLPOOL e97fb194cbf2479df9328ead840f9397bf64373de01b78bfae13e5c38443e429f0f27a7b88ad6c3cd058b969841519c7d45e99a2da86eaec6dc6ea2f39bc56ba
|
||||
EBUILD zarafa-7.0.4.31235.ebuild 9864 SHA256 84d3ceeb8d4ded58a0074037e307af5a593a39f15e686ba8f262e5425e3728aa SHA512 a7a28531febcd19d1d075df2001bab6c35d507b4af436d0b56c953beb939313024e371f9c991fe5a136b27a8050be4350bc3a8c870573cf1fa56389b4c8ebec5 WHIRLPOOL e97fb194cbf2479df9328ead840f9397bf64373de01b78bfae13e5c38443e429f0f27a7b88ad6c3cd058b969841519c7d45e99a2da86eaec6dc6ea2f39bc56ba
|
||||
EBUILD zarafa-7.0.5.31880.ebuild 9864 SHA256 84d3ceeb8d4ded58a0074037e307af5a593a39f15e686ba8f262e5425e3728aa SHA512 a7a28531febcd19d1d075df2001bab6c35d507b4af436d0b56c953beb939313024e371f9c991fe5a136b27a8050be4350bc3a8c870573cf1fa56389b4c8ebec5 WHIRLPOOL e97fb194cbf2479df9328ead840f9397bf64373de01b78bfae13e5c38443e429f0f27a7b88ad6c3cd058b969841519c7d45e99a2da86eaec6dc6ea2f39bc56ba
|
||||
EBUILD zarafa-7.0.6.32752.ebuild 9864 SHA256 84d3ceeb8d4ded58a0074037e307af5a593a39f15e686ba8f262e5425e3728aa SHA512 a7a28531febcd19d1d075df2001bab6c35d507b4af436d0b56c953beb939313024e371f9c991fe5a136b27a8050be4350bc3a8c870573cf1fa56389b4c8ebec5 WHIRLPOOL e97fb194cbf2479df9328ead840f9397bf64373de01b78bfae13e5c38443e429f0f27a7b88ad6c3cd058b969841519c7d45e99a2da86eaec6dc6ea2f39bc56ba
|
||||
EBUILD zarafa-7.0.7.34256.ebuild 9864 SHA256 84d3ceeb8d4ded58a0074037e307af5a593a39f15e686ba8f262e5425e3728aa SHA512 a7a28531febcd19d1d075df2001bab6c35d507b4af436d0b56c953beb939313024e371f9c991fe5a136b27a8050be4350bc3a8c870573cf1fa56389b4c8ebec5 WHIRLPOOL e97fb194cbf2479df9328ead840f9397bf64373de01b78bfae13e5c38443e429f0f27a7b88ad6c3cd058b969841519c7d45e99a2da86eaec6dc6ea2f39bc56ba
|
||||
MISC ChangeLog 13232 SHA256 22e0ea0dfe26a53e4dca3e94bed85a57205b0827db07d30c34719d20209107c1 SHA512 25d83d098b8e31bb10e2d1ad8b42bea9158d1c001fe41c65fe4c4c60a6f1ac8fae0ebfcf380d4ce4ced4ab3323177599c7ad5fd31ea1ea8f7126f1e1e854d48d WHIRLPOOL e6e191966f96fb1e4fec76293f1274c1931a01099d08103af6850a0922551c7c6d3b434ba0759869ae3d504a507e9f5b21e8245ec9a86f85c7db62899bb8f8bc
|
||||
EBUILD zarafa-7.0.10.37482.ebuild 9880 SHA256 78ac617a0367c3a1972f05ead1ae0afc4fabffcc0d718af837263084b32e616d SHA512 83f49c0692cead27b86c6d786342eb6a9216908ed4e53cc73232e5b15fead97348bc8607cd92859e9c974ea72dd9d9e5aa9c2e3fe461708aaa3d53ff5304cc9e WHIRLPOOL 1fdf7e178a9251601ef741c7c7b06494e807ef09240ce829ec5727c56cc86775254ea49a6955f8dfa30b3693f3c3427e83d105da969833984aa313164362d5f6
|
||||
MISC ChangeLog 21026 SHA256 481dba7b4fe03c2182a4bd7c89fd7439bbafb0004c2af13a95fbfa95cf3915a4 SHA512 3c47102c9940c92749317bad8ecc78fef40f1a6492bc887341d67abf18a4ed2a2d601e1ad4e4584fe8a734c518d18b47808ebfd7f043a1cb67d648095a169272 WHIRLPOOL 837a46e448763271b7393f52a16c0065f12e454952d1ac2568740008a7f720a588a99a28948a094eb5b68d3d9205acd366bb2861f74e018203fbd8efc2dbb909
|
||||
MISC metadata.xml 1238 SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 SHA512 d94394e853ce7bd9109322f37ab5d3526e2bbc4a59ac02d0b66e9d952d221a06ae1c38b6de5cdb142b2b09ac602a57ff03f0525efbbc7b8f33f9662ca42a5dd5 WHIRLPOOL 482453b974eaca6506c4503f49c5c55195790e9b47f19a885d551fa535445104fbb7bc93dc4f30f7faf545f619594fa04d9a8071c21eb55995fef4f7380f55b9
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp
|
||||
--- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000
|
||||
@@ -935,6 +935,7 @@
|
||||
{ "fax_domain", "", CONFIGSETTING_RELOADABLE },
|
||||
{ "fax_international", "+", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_delegates", "no", CONFIGSETTING_RELOADABLE },
|
||||
+ { "always_send_as", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_tnef", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE },
|
||||
diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp
|
||||
--- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000
|
||||
@@ -1949,6 +1949,10 @@
|
||||
HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b)
|
||||
{
|
||||
bAllowSendAs = true;
|
||||
+ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) {
|
||||
+ //use always_send_as to allow everybody to send as someone else.
|
||||
+ //(some users hate the 'on behalf of' text, and dont want to do the extra configuration)
|
||||
+ bAllowSendAs = true;
|
||||
} else {
|
||||
|
||||
hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner);
|
||||
@ -1,199 +0,0 @@
|
||||
diff -rupN zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp
|
||||
--- zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp 2010-07-20 17:22:07.995625072 +0200
|
||||
@@ -7244,6 +7244,166 @@ typedef struct{
|
||||
SOURCEKEY sSourceKey;
|
||||
SOURCEKEY sParentSourceKey;
|
||||
}COPYITEM;
|
||||
+//SPAM HOOK
|
||||
+//This function parses an e-mail to the /etc/zarafa/userscripts/junklearn script. With 2 arguments:
|
||||
+//ham or spam
|
||||
+//message id
|
||||
+//and pipes the mail header to the script.
|
||||
+//This script wil be inhaled by MoveObjects();
|
||||
+/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
+int SpamHook(ECDatabase *lpDatabase,int ulId,int ulDestFolderId)
|
||||
+{
|
||||
+
|
||||
+ ALLOC_DBRESULT();
|
||||
+ ECRESULT er = erSuccess;
|
||||
+ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script");
|
||||
+
|
||||
+ //If shScriptPath doesn't exist skip spam hook.
|
||||
+ if(fopen(shScriptPath.c_str(),"r")) {
|
||||
+
|
||||
+ //Get store object ID via message object id
|
||||
+ unsigned int storeId;
|
||||
+ er = g_lpSessionManager->GetCacheManager()->GetStore(ulId,&storeId,NULL);
|
||||
+ if(er != erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve source folder.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //get deleted items folder entry id
|
||||
+ strQuery="SELECT val_binary FROM properties WHERE hierarchyid="+stringify(storeId)+" AND tag="+stringify(PROP_ID(PR_IPM_WASTEBASKET_ENTRYID));
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'deleted items' entryid to objectid.
|
||||
+ entryId* wasteBucketEntryId = new entryId[0];
|
||||
+ wasteBucketEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ wasteBucketEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int wasteBucketFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(wasteBucketEntryId,&wasteBucketFolderId);
|
||||
+ delete wasteBucketEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get 'junk folder' entryId.
|
||||
+ strQuery="SELECT val_binary FROM receivefolder LEFT JOIN mvproperties ON receivefolder.objid=mvproperties.hierarchyid WHERE receivefolder.storeid="+stringify(storeId)+" AND receivefolder.messageclass='IPC' AND mvproperties.tag="+stringify(PROP_ID(PR_ADDITIONAL_REN_ENTRYIDS))+" AND mvproperties.orderid=4";
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryids from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'junk folder' entryid to objectid.
|
||||
+ entryId* junkFolderEntryId = new entryId[0];
|
||||
+ junkFolderEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ junkFolderEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int junkFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(junkFolderEntryId,&junkFolderId);
|
||||
+ delete junkFolderEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get source folder object ID. (Actually we should check if mail came from subfolders in the 'deleted items folder', which I think never happens.)
|
||||
+ unsigned int srcFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetParent(ulId,&srcFolderId);
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve src folder id.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Check if object is ham or spam
|
||||
+ string shMailStatus;
|
||||
+ //if destination folder is junk, mark as spam
|
||||
+ if(ulDestFolderId==junkFolderId)
|
||||
+ shMailStatus="spam";
|
||||
+ else
|
||||
+ {
|
||||
+ //if destination folder is not TRASH and de source folder is JUNK, mark as ham
|
||||
+ if(ulDestFolderId!=wasteBucketFolderId && srcFolderId==junkFolderId)
|
||||
+ shMailStatus="ham";
|
||||
+ }
|
||||
+
|
||||
+ //Only call hook script if the mail is marked as ham or spam.
|
||||
+ if(!shMailStatus.empty()) {
|
||||
+
|
||||
+ //Get the mail from the DB.
|
||||
+ strQuery="SELECT val_string FROM properties WHERE tag="+stringify(PROP_ID(PR_TRANSPORT_MESSAGE_HEADERS))+" AND hierarchyid= "+stringify(ulId);
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: db error while retrieve mail header.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+
|
||||
+ if(shNumRows>0) {
|
||||
+
|
||||
+ // Execute the hook:
|
||||
+ FILE *shFilePtr;
|
||||
+ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId);
|
||||
+ shFilePtr=popen(shScriptPath.c_str(),"w");
|
||||
+ fputs(lpDBRow[0],shFilePtr);
|
||||
+ int shExitCode=pclose(shFilePtr);
|
||||
+ if(!WIFEXITED(shExitCode)) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: "+shScriptPath+" was terminated abnormally.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ //If script exit with non 0, exit..
|
||||
+ if(WEXITSTATUS(shExitCode)!=0) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(shExitCode));
|
||||
+ er=ZARAFA_E_UNKNOWN;
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed.");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail");
|
||||
+ }
|
||||
+
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+ }
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+exit:
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ return er;
|
||||
+}
|
||||
+
|
||||
|
||||
// Move one or more messages and/or moved a softdeleted message to a normal message
|
||||
ECRESULT MoveObjects(ECSession *lpSession, ECDatabase *lpDatabase, ECListInt* lplObjectIds, unsigned int ulDestFolderId, unsigned int ulSyncId)
|
||||
@@ -8096,6 +8256,17 @@ SOAP_ENTRY_START5(copyObjects, *result,
|
||||
|
||||
// @note The object type checking wille be done in MoveObjects or CopyObject
|
||||
|
||||
+//SPAMHOOK
|
||||
+/////////////////////////////////////
|
||||
+ //Iterate over all mail ids and initiate spamhook.
|
||||
+ for(iObjectId = lObjectIds.begin(); iObjectId != lObjectIds.end(); iObjectId++)
|
||||
+ {
|
||||
+ //Ignore the result
|
||||
+ int shResult=SpamHook(lpDatabase,*iObjectId,ulDestFolderId);
|
||||
+ }
|
||||
+//SPAMHOOK END
|
||||
+////////////////////////////////////
|
||||
+
|
||||
//check copy or a move
|
||||
if(ulFlags & FOLDER_MOVE ) { // A move
|
||||
er = MoveObjects(lpecSession, lpDatabase, &lObjectIds, ulDestFolderId, ulSyncId);
|
||||
diff -rupN zarafa-6.40.0-orig/provider/server/ECServer.cpp zarafa-6.40.0/provider/server/ECServer.cpp
|
||||
--- zarafa-6.40.0-orig/provider/server/ECServer.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/server/ECServer.cpp 2010-07-20 17:26:25.119624516 +0200
|
||||
@@ -670,6 +670,7 @@ int running_server(char *szName, char *s
|
||||
{ "deletegroup_script", "/etc/zarafa/userscripts/deletegroup", CONFIGSETTING_RELOADABLE},
|
||||
{ "createcompany_script", "/etc/zarafa/userscripts/createcompany", CONFIGSETTING_RELOADABLE },
|
||||
{ "deletecompany_script", "/etc/zarafa/userscripts/deletecompany", CONFIGSETTING_RELOADABLE },
|
||||
+ { "junklearn_script", "/etc/zarafa/userscripts/junklearn", CONFIGSETTING_RELOADABLE },
|
||||
{ "user_safe_mode", "no", CONFIGSETTING_RELOADABLE },
|
||||
|
||||
// Storename format
|
||||
@ -1,51 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh
|
||||
--- zarafa-6.40.6.orig//autoconf/ltmain.sh 2011-03-20 08:23:21.000000000 +0100
|
||||
+++ zarafa-6.40.6/autoconf/ltmain.sh 2011-03-20 08:24:23.000000000 +0100
|
||||
@@ -1628,7 +1628,7 @@
|
||||
elif test "X$arg" = "X-lc_r"; then
|
||||
case $host in
|
||||
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
|
||||
- # Do not include libc_r directly, use -pthread flag.
|
||||
+ # Do not include libc_r directly, use -lpthread flag.
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
@@ -1647,7 +1647,7 @@
|
||||
continue
|
||||
;;
|
||||
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
@@ -2150,7 +2150,7 @@
|
||||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac
|
||||
--- zarafa-6.40.6.orig//configure.ac 2011-03-20 08:23:20.000000000 +0100
|
||||
+++ zarafa-6.40.6/configure.ac 2011-03-20 08:23:44.000000000 +0100
|
||||
@@ -407,7 +407,7 @@
|
||||
CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX"
|
||||
fi
|
||||
# force add pthread in lucene test
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then
|
||||
AC_CHECK_LIB(clucene, [open],
|
||||
[ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a"
|
||||
@@ -561,7 +561,7 @@
|
||||
AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([required library libpthread missing or unusable]))
|
||||
LIBS=$libs_keep
|
||||
# because it seems this is better... (gnu c/c++ only?)
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
|
||||
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
|
||||
libs_keep=$LIBS
|
||||
@ -1,26 +0,0 @@
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.in
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.in
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.in
|
||||
@@ -274,7 +274,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.am
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.am
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.am
|
||||
@@ -18,7 +18,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
@ -1,24 +0,0 @@
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:38:31.435806562 +0300
|
||||
@@ -13,7 +13,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:38:22.475687815 +0300
|
||||
@@ -250,7 +250,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
all: all-am
|
||||
@ -1,44 +0,0 @@
|
||||
--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100
|
||||
+++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100
|
||||
@@ -34,7 +34,7 @@
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = php-ext
|
||||
-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \
|
||||
+DIST_COMMON = $(dist_data_DATA) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@@ -86,7 +86,7 @@
|
||||
DIST_SOURCES = $(mapi_la_SOURCES)
|
||||
dist_dataDATA_INSTALL = $(INSTALL_DATA)
|
||||
dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
|
||||
-DATA = $(dist_data_DATA) $(dist_sysconf_DATA)
|
||||
+DATA = $(dist_data_DATA)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@@ -406,23 +406,6 @@
|
||||
echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(datadir)/$$f"; \
|
||||
done
|
||||
-install-dist_sysconfDATA: $(dist_sysconf_DATA)
|
||||
- @$(NORMAL_INSTALL)
|
||||
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
-
|
||||
-uninstall-dist_sysconfDATA:
|
||||
- @$(NORMAL_UNINSTALL)
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
@ -1,69 +0,0 @@
|
||||
Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 6.40.0, which only
|
||||
removes the paths from autoconf/automake related files, that don't exist in the OSS
|
||||
version of Zarafa. Having these paths not removed causes autoreconf to fail, but a
|
||||
re-run of autoreconf is needed in order to get the rpaths completely out of all the
|
||||
libraries and binaries built during the make process.
|
||||
|
||||
forward patch by Mario Fetka <mario.fetka@gmail.com>
|
||||
|
||||
diff -uNr zarafa-6.40.10.orig//ECtools/Makefile.am zarafa-6.40.10/ECtools/Makefile.am
|
||||
--- zarafa-6.40.10.orig//ECtools/Makefile.am 2011-07-25 20:03:46.527000045 +0200
|
||||
+++ zarafa-6.40.10/ECtools/Makefile.am 2011-07-25 20:04:37.900000042 +0200
|
||||
@@ -1,10 +1,3 @@
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = zarafa-backup zarafa-report
|
||||
-if WITH_PYTHON
|
||||
-PROSUBS += za-extra
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
if WITH_TESTTOOLS
|
||||
TESTSUBS = ECTestTools
|
||||
endif
|
||||
diff -uNr zarafa-6.40.10.orig//Makefile.am zarafa-6.40.10/Makefile.am
|
||||
--- zarafa-6.40.10.orig//Makefile.am 2011-07-25 20:03:46.610000045 +0200
|
||||
+++ zarafa-6.40.10/Makefile.am 2011-07-25 20:05:12.960000054 +0200
|
||||
@@ -1,10 +1,6 @@
|
||||
AUTOMAKE_OPTIONS = 1.9 foreign
|
||||
ACLOCAL_AMFLAGS = -Iautoconf
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = liblicense licensed
|
||||
-endif
|
||||
-
|
||||
SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext ECtools spooler gateway caldav installer po doc
|
||||
|
||||
if WITH_SWIG
|
||||
@@ -26,10 +22,6 @@
|
||||
common/ecversion.h: versionheader.sh
|
||||
sh ${top_srcdir}/versionheader.sh > common/ecversion.h
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-CLEANFILES=common/ecversion.h
|
||||
-endif
|
||||
-
|
||||
dist-hook:
|
||||
find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
|
||||
if OSS_ONLY
|
||||
diff -uNr zarafa-6.40.10.orig//configure.ac zarafa-6.40.10/configure.ac
|
||||
--- zarafa-6.40.10.orig//configure.ac 2011-07-25 20:03:46.747000046 +0200
|
||||
+++ zarafa-6.40.10/configure.ac 2011-07-25 20:06:33.002000046 +0200
|
||||
@@ -819,18 +819,6 @@
|
||||
version
|
||||
specialbuild
|
||||
])
|
||||
-dnl non-oss files
|
||||
-if test -d `dirname $0`/licensed; then
|
||||
-AC_CONFIG_FILES([
|
||||
- liblicense/Makefile
|
||||
- licensed/Makefile
|
||||
- ECtools/zarafa-backup/Makefile
|
||||
- ECtools/zarafa-backup/helpers/Makefile
|
||||
- ECtools/zarafa-report/Makefile
|
||||
- debian/zarafa.install
|
||||
- ECtools/za-extra/Makefile
|
||||
-])
|
||||
-fi
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
Submitted By: Mario Fetka ( mario.fetka@gmaail.com)
|
||||
Date: 2010-10-11
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: on gentoo libtcmalloc_minimal is only provided as shared lib
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/configure.ac zarafa-6.40.2/configure.ac
|
||||
--- zarafa-6.40.2.orig/configure.ac 2010-10-11 18:39:35.000000000 +0000
|
||||
+++ zarafa-6.40.2/configure.ac 2010-10-11 18:40:03.000000000 +0000
|
||||
@@ -441,7 +441,7 @@
|
||||
AC_HELP_STRING([--with-tcmalloc-prefix=PATH],[path to tcmalloc lib, e.g. /usr/lib/]),
|
||||
[TCMALLOC_PREFIX=${withval}],[TCMALLOC_PREFIX=/usr/lib])
|
||||
AC_CHECK_LIB(tcmalloc_minimal, [open],
|
||||
- [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.a" ],
|
||||
+ [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" ],
|
||||
[ WITH_TCMALLOC=no ])
|
||||
AC_SUBST(TCMALLOC_LIBS)
|
||||
AC_LANG_POP
|
||||
@ -1,187 +0,0 @@
|
||||
Submitted By: Mario Fetka (mario.fetka@gmail.com)
|
||||
Date: 2010-10-13
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: gentoo specific
|
||||
Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/installer/linux/Makefile.am zarafa-6.40.2/installer/linux/Makefile.am
|
||||
--- zarafa-6.40.2.orig/installer/linux/Makefile.am 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/linux/Makefile.am 2010-10-13 08:28:26.000000000 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
sysconf_initdir=${sysconfdir}/init.d
|
||||
sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files}
|
||||
|
||||
-rhel_sysconfig_path = ${sysconfdir}/sysconfig
|
||||
+rhel_sysconfig_path = ${sysconfdir}/conf.d
|
||||
suse_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sles_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path}
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany zarafa-6.40.2/installer/userscripts/createcompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany 2010-10-13 08:26:53.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany.in zarafa-6.40.2/installer/userscripts/createcompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany.in 2010-10-13 08:27:00.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup zarafa-6.40.2/installer/userscripts/creategroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup 2010-10-13 08:27:04.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup.in zarafa-6.40.2/installer/userscripts/creategroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup.in 2010-10-13 08:27:08.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser zarafa-6.40.2/installer/userscripts/createuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser 2010-10-13 08:27:12.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser.in zarafa-6.40.2/installer/userscripts/createuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser.in 2010-10-13 08:27:17.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany zarafa-6.40.2/installer/userscripts/deletecompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany 2010-10-13 08:27:22.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany.in zarafa-6.40.2/installer/userscripts/deletecompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany.in 2010-10-13 08:27:26.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup zarafa-6.40.2/installer/userscripts/deletegroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup 2010-10-13 08:27:30.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup.in zarafa-6.40.2/installer/userscripts/deletegroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup.in 2010-10-13 08:27:35.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser zarafa-6.40.2/installer/userscripts/deleteuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser 2010-10-13 08:27:39.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/deleteuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser.in zarafa-6.40.2/installer/userscripts/deleteuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser.in 2010-10-13 08:27:43.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d
|
||||
@ -1,14 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp
|
||||
--- zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp 2011-03-20 23:50:06.000000000 +0100
|
||||
+++ zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp 2011-03-21 00:00:45.000000000 +0100
|
||||
@@ -343,6 +343,10 @@
|
||||
// this option was introduced in mysql 5.0, so let's not even try on 4.1 servers
|
||||
strQuery = "SET SESSION sql_mode = 'STRICT_ALL_TABLES'";
|
||||
Query(strQuery); // ignore error
|
||||
+
|
||||
+ // Latin1 is default charset
|
||||
+ strQuery = "SET NAMES 'latin1'";
|
||||
+ Query(strQuery);
|
||||
}
|
||||
|
||||
exit:
|
||||
@ -1,25 +0,0 @@
|
||||
diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp
|
||||
--- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000
|
||||
@@ -935,6 +935,7 @@
|
||||
{ "fax_domain", "", CONFIGSETTING_RELOADABLE },
|
||||
{ "fax_international", "+", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_delegates", "no", CONFIGSETTING_RELOADABLE },
|
||||
+ { "always_send_as", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_tnef", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE },
|
||||
diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp
|
||||
--- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000
|
||||
@@ -1949,6 +1949,10 @@
|
||||
HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b)
|
||||
{
|
||||
bAllowSendAs = true;
|
||||
+ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) {
|
||||
+ //use always_send_as to allow everybody to send as someone else.
|
||||
+ //(some users hate the 'on behalf of' text, and dont want to do the extra configuration)
|
||||
+ bAllowSendAs = true;
|
||||
} else {
|
||||
|
||||
hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner);
|
||||
@ -1,199 +0,0 @@
|
||||
diff -rupN zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp
|
||||
--- zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp 2010-07-20 17:22:07.995625072 +0200
|
||||
@@ -7244,6 +7244,166 @@ typedef struct{
|
||||
SOURCEKEY sSourceKey;
|
||||
SOURCEKEY sParentSourceKey;
|
||||
}COPYITEM;
|
||||
+//SPAM HOOK
|
||||
+//This function parses an e-mail to the /etc/zarafa/userscripts/junklearn script. With 2 arguments:
|
||||
+//ham or spam
|
||||
+//message id
|
||||
+//and pipes the mail header to the script.
|
||||
+//This script wil be inhaled by MoveObjects();
|
||||
+/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
+int SpamHook(ECDatabase *lpDatabase,int ulId,int ulDestFolderId)
|
||||
+{
|
||||
+
|
||||
+ ALLOC_DBRESULT();
|
||||
+ ECRESULT er = erSuccess;
|
||||
+ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script");
|
||||
+
|
||||
+ //If shScriptPath doesn't exist skip spam hook.
|
||||
+ if(fopen(shScriptPath.c_str(),"r")) {
|
||||
+
|
||||
+ //Get store object ID via message object id
|
||||
+ unsigned int storeId;
|
||||
+ er = g_lpSessionManager->GetCacheManager()->GetStore(ulId,&storeId,NULL);
|
||||
+ if(er != erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve source folder.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //get deleted items folder entry id
|
||||
+ strQuery="SELECT val_binary FROM properties WHERE hierarchyid="+stringify(storeId)+" AND tag="+stringify(PROP_ID(PR_IPM_WASTEBASKET_ENTRYID));
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'deleted items' entryid to objectid.
|
||||
+ entryId* wasteBucketEntryId = new entryId[0];
|
||||
+ wasteBucketEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ wasteBucketEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int wasteBucketFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(wasteBucketEntryId,&wasteBucketFolderId);
|
||||
+ delete wasteBucketEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get 'junk folder' entryId.
|
||||
+ strQuery="SELECT val_binary FROM receivefolder LEFT JOIN mvproperties ON receivefolder.objid=mvproperties.hierarchyid WHERE receivefolder.storeid="+stringify(storeId)+" AND receivefolder.messageclass='IPC' AND mvproperties.tag="+stringify(PROP_ID(PR_ADDITIONAL_REN_ENTRYIDS))+" AND mvproperties.orderid=4";
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryids from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'junk folder' entryid to objectid.
|
||||
+ entryId* junkFolderEntryId = new entryId[0];
|
||||
+ junkFolderEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ junkFolderEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int junkFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(junkFolderEntryId,&junkFolderId);
|
||||
+ delete junkFolderEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get source folder object ID. (Actually we should check if mail came from subfolders in the 'deleted items folder', which I think never happens.)
|
||||
+ unsigned int srcFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetParent(ulId,&srcFolderId);
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve src folder id.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Check if object is ham or spam
|
||||
+ string shMailStatus;
|
||||
+ //if destination folder is junk, mark as spam
|
||||
+ if(ulDestFolderId==junkFolderId)
|
||||
+ shMailStatus="spam";
|
||||
+ else
|
||||
+ {
|
||||
+ //if destination folder is not TRASH and de source folder is JUNK, mark as ham
|
||||
+ if(ulDestFolderId!=wasteBucketFolderId && srcFolderId==junkFolderId)
|
||||
+ shMailStatus="ham";
|
||||
+ }
|
||||
+
|
||||
+ //Only call hook script if the mail is marked as ham or spam.
|
||||
+ if(!shMailStatus.empty()) {
|
||||
+
|
||||
+ //Get the mail from the DB.
|
||||
+ strQuery="SELECT val_string FROM properties WHERE tag="+stringify(PROP_ID(PR_TRANSPORT_MESSAGE_HEADERS))+" AND hierarchyid= "+stringify(ulId);
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: db error while retrieve mail header.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+
|
||||
+ if(shNumRows>0) {
|
||||
+
|
||||
+ // Execute the hook:
|
||||
+ FILE *shFilePtr;
|
||||
+ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId);
|
||||
+ shFilePtr=popen(shScriptPath.c_str(),"w");
|
||||
+ fputs(lpDBRow[0],shFilePtr);
|
||||
+ int shExitCode=pclose(shFilePtr);
|
||||
+ if(!WIFEXITED(shExitCode)) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: "+shScriptPath+" was terminated abnormally.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ //If script exit with non 0, exit..
|
||||
+ if(WEXITSTATUS(shExitCode)!=0) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(shExitCode));
|
||||
+ er=ZARAFA_E_UNKNOWN;
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed.");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail");
|
||||
+ }
|
||||
+
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+ }
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+exit:
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ return er;
|
||||
+}
|
||||
+
|
||||
|
||||
// Move one or more messages and/or moved a softdeleted message to a normal message
|
||||
ECRESULT MoveObjects(ECSession *lpSession, ECDatabase *lpDatabase, ECListInt* lplObjectIds, unsigned int ulDestFolderId, unsigned int ulSyncId)
|
||||
@@ -8096,6 +8256,17 @@ SOAP_ENTRY_START5(copyObjects, *result,
|
||||
|
||||
// @note The object type checking wille be done in MoveObjects or CopyObject
|
||||
|
||||
+//SPAMHOOK
|
||||
+/////////////////////////////////////
|
||||
+ //Iterate over all mail ids and initiate spamhook.
|
||||
+ for(iObjectId = lObjectIds.begin(); iObjectId != lObjectIds.end(); iObjectId++)
|
||||
+ {
|
||||
+ //Ignore the result
|
||||
+ int shResult=SpamHook(lpDatabase,*iObjectId,ulDestFolderId);
|
||||
+ }
|
||||
+//SPAMHOOK END
|
||||
+////////////////////////////////////
|
||||
+
|
||||
//check copy or a move
|
||||
if(ulFlags & FOLDER_MOVE ) { // A move
|
||||
er = MoveObjects(lpecSession, lpDatabase, &lObjectIds, ulDestFolderId, ulSyncId);
|
||||
diff -rupN zarafa-6.40.0-orig/provider/server/ECServer.cpp zarafa-6.40.0/provider/server/ECServer.cpp
|
||||
--- zarafa-6.40.0-orig/provider/server/ECServer.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/server/ECServer.cpp 2010-07-20 17:26:25.119624516 +0200
|
||||
@@ -670,6 +670,7 @@ int running_server(char *szName, char *s
|
||||
{ "deletegroup_script", "/etc/zarafa/userscripts/deletegroup", CONFIGSETTING_RELOADABLE},
|
||||
{ "createcompany_script", "/etc/zarafa/userscripts/createcompany", CONFIGSETTING_RELOADABLE },
|
||||
{ "deletecompany_script", "/etc/zarafa/userscripts/deletecompany", CONFIGSETTING_RELOADABLE },
|
||||
+ { "junklearn_script", "/etc/zarafa/userscripts/junklearn", CONFIGSETTING_RELOADABLE },
|
||||
{ "user_safe_mode", "no", CONFIGSETTING_RELOADABLE },
|
||||
|
||||
// Storename format
|
||||
@ -1,51 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh
|
||||
--- zarafa-6.40.6.orig//autoconf/ltmain.sh 2011-03-20 08:23:21.000000000 +0100
|
||||
+++ zarafa-6.40.6/autoconf/ltmain.sh 2011-03-20 08:24:23.000000000 +0100
|
||||
@@ -1628,7 +1628,7 @@
|
||||
elif test "X$arg" = "X-lc_r"; then
|
||||
case $host in
|
||||
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
|
||||
- # Do not include libc_r directly, use -pthread flag.
|
||||
+ # Do not include libc_r directly, use -lpthread flag.
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
@@ -1647,7 +1647,7 @@
|
||||
continue
|
||||
;;
|
||||
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
@@ -2150,7 +2150,7 @@
|
||||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac
|
||||
--- zarafa-6.40.6.orig//configure.ac 2011-03-20 08:23:20.000000000 +0100
|
||||
+++ zarafa-6.40.6/configure.ac 2011-03-20 08:23:44.000000000 +0100
|
||||
@@ -407,7 +407,7 @@
|
||||
CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX"
|
||||
fi
|
||||
# force add pthread in lucene test
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then
|
||||
AC_CHECK_LIB(clucene, [open],
|
||||
[ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a"
|
||||
@@ -561,7 +561,7 @@
|
||||
AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([required library libpthread missing or unusable]))
|
||||
LIBS=$libs_keep
|
||||
# because it seems this is better... (gnu c/c++ only?)
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
|
||||
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
|
||||
libs_keep=$LIBS
|
||||
@ -1,26 +0,0 @@
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.in
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.in
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.in
|
||||
@@ -274,7 +274,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.am
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.am
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.am
|
||||
@@ -18,7 +18,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
@ -1,24 +0,0 @@
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:38:31.435806562 +0300
|
||||
@@ -13,7 +13,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:38:22.475687815 +0300
|
||||
@@ -250,7 +250,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
all: all-am
|
||||
@ -1,44 +0,0 @@
|
||||
--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100
|
||||
+++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100
|
||||
@@ -34,7 +34,7 @@
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = php-ext
|
||||
-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \
|
||||
+DIST_COMMON = $(dist_data_DATA) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@@ -86,7 +86,7 @@
|
||||
DIST_SOURCES = $(mapi_la_SOURCES)
|
||||
dist_dataDATA_INSTALL = $(INSTALL_DATA)
|
||||
dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
|
||||
-DATA = $(dist_data_DATA) $(dist_sysconf_DATA)
|
||||
+DATA = $(dist_data_DATA)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@@ -406,23 +406,6 @@
|
||||
echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(datadir)/$$f"; \
|
||||
done
|
||||
-install-dist_sysconfDATA: $(dist_sysconf_DATA)
|
||||
- @$(NORMAL_INSTALL)
|
||||
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
-
|
||||
-uninstall-dist_sysconfDATA:
|
||||
- @$(NORMAL_UNINSTALL)
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
@ -1,69 +0,0 @@
|
||||
Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 6.40.0, which only
|
||||
removes the paths from autoconf/automake related files, that don't exist in the OSS
|
||||
version of Zarafa. Having these paths not removed causes autoreconf to fail, but a
|
||||
re-run of autoreconf is needed in order to get the rpaths completely out of all the
|
||||
libraries and binaries built during the make process.
|
||||
|
||||
forward patch by Mario Fetka <mario.fetka@gmail.com>
|
||||
|
||||
diff -uNr zarafa-6.40.10.orig//ECtools/Makefile.am zarafa-6.40.10/ECtools/Makefile.am
|
||||
--- zarafa-6.40.10.orig//ECtools/Makefile.am 2011-07-25 20:03:46.527000045 +0200
|
||||
+++ zarafa-6.40.10/ECtools/Makefile.am 2011-07-25 20:04:37.900000042 +0200
|
||||
@@ -1,10 +1,3 @@
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = zarafa-backup zarafa-report
|
||||
-if WITH_PYTHON
|
||||
-PROSUBS += za-extra
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
if WITH_TESTTOOLS
|
||||
TESTSUBS = ECTestTools
|
||||
endif
|
||||
diff -uNr zarafa-6.40.10.orig//Makefile.am zarafa-6.40.10/Makefile.am
|
||||
--- zarafa-6.40.10.orig//Makefile.am 2011-07-25 20:03:46.610000045 +0200
|
||||
+++ zarafa-6.40.10/Makefile.am 2011-07-25 20:05:12.960000054 +0200
|
||||
@@ -1,10 +1,6 @@
|
||||
AUTOMAKE_OPTIONS = 1.9 foreign
|
||||
ACLOCAL_AMFLAGS = -Iautoconf
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = liblicense licensed
|
||||
-endif
|
||||
-
|
||||
SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext ECtools spooler gateway caldav installer po doc
|
||||
|
||||
if WITH_SWIG
|
||||
@@ -26,10 +22,6 @@
|
||||
common/ecversion.h: versionheader.sh
|
||||
sh ${top_srcdir}/versionheader.sh > common/ecversion.h
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-CLEANFILES=common/ecversion.h
|
||||
-endif
|
||||
-
|
||||
dist-hook:
|
||||
find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
|
||||
if OSS_ONLY
|
||||
diff -uNr zarafa-6.40.10.orig//configure.ac zarafa-6.40.10/configure.ac
|
||||
--- zarafa-6.40.10.orig//configure.ac 2011-07-25 20:03:46.747000046 +0200
|
||||
+++ zarafa-6.40.10/configure.ac 2011-07-25 20:06:33.002000046 +0200
|
||||
@@ -819,18 +819,6 @@
|
||||
version
|
||||
specialbuild
|
||||
])
|
||||
-dnl non-oss files
|
||||
-if test -d `dirname $0`/licensed; then
|
||||
-AC_CONFIG_FILES([
|
||||
- liblicense/Makefile
|
||||
- licensed/Makefile
|
||||
- ECtools/zarafa-backup/Makefile
|
||||
- ECtools/zarafa-backup/helpers/Makefile
|
||||
- ECtools/zarafa-report/Makefile
|
||||
- debian/zarafa.install
|
||||
- ECtools/za-extra/Makefile
|
||||
-])
|
||||
-fi
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
Submitted By: Mario Fetka ( mario.fetka@gmaail.com)
|
||||
Date: 2010-10-11
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: on gentoo libtcmalloc_minimal is only provided as shared lib
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/configure.ac zarafa-6.40.2/configure.ac
|
||||
--- zarafa-6.40.2.orig/configure.ac 2010-10-11 18:39:35.000000000 +0000
|
||||
+++ zarafa-6.40.2/configure.ac 2010-10-11 18:40:03.000000000 +0000
|
||||
@@ -441,7 +441,7 @@
|
||||
AC_HELP_STRING([--with-tcmalloc-prefix=PATH],[path to tcmalloc lib, e.g. /usr/lib/]),
|
||||
[TCMALLOC_PREFIX=${withval}],[TCMALLOC_PREFIX=/usr/lib])
|
||||
AC_CHECK_LIB(tcmalloc_minimal, [open],
|
||||
- [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.a" ],
|
||||
+ [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" ],
|
||||
[ WITH_TCMALLOC=no ])
|
||||
AC_SUBST(TCMALLOC_LIBS)
|
||||
AC_LANG_POP
|
||||
@ -1,187 +0,0 @@
|
||||
Submitted By: Mario Fetka (mario.fetka@gmail.com)
|
||||
Date: 2010-10-13
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: gentoo specific
|
||||
Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/installer/linux/Makefile.am zarafa-6.40.2/installer/linux/Makefile.am
|
||||
--- zarafa-6.40.2.orig/installer/linux/Makefile.am 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/linux/Makefile.am 2010-10-13 08:28:26.000000000 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
sysconf_initdir=${sysconfdir}/init.d
|
||||
sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files}
|
||||
|
||||
-rhel_sysconfig_path = ${sysconfdir}/sysconfig
|
||||
+rhel_sysconfig_path = ${sysconfdir}/conf.d
|
||||
suse_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sles_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path}
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany zarafa-6.40.2/installer/userscripts/createcompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany 2010-10-13 08:26:53.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany.in zarafa-6.40.2/installer/userscripts/createcompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany.in 2010-10-13 08:27:00.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup zarafa-6.40.2/installer/userscripts/creategroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup 2010-10-13 08:27:04.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup.in zarafa-6.40.2/installer/userscripts/creategroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup.in 2010-10-13 08:27:08.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser zarafa-6.40.2/installer/userscripts/createuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser 2010-10-13 08:27:12.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser.in zarafa-6.40.2/installer/userscripts/createuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser.in 2010-10-13 08:27:17.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany zarafa-6.40.2/installer/userscripts/deletecompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany 2010-10-13 08:27:22.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany.in zarafa-6.40.2/installer/userscripts/deletecompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany.in 2010-10-13 08:27:26.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup zarafa-6.40.2/installer/userscripts/deletegroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup 2010-10-13 08:27:30.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup.in zarafa-6.40.2/installer/userscripts/deletegroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup.in 2010-10-13 08:27:35.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser zarafa-6.40.2/installer/userscripts/deleteuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser 2010-10-13 08:27:39.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/deleteuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser.in zarafa-6.40.2/installer/userscripts/deleteuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser.in 2010-10-13 08:27:43.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d
|
||||
@ -1,14 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp
|
||||
--- zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp 2011-03-20 23:50:06.000000000 +0100
|
||||
+++ zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp 2011-03-21 00:00:45.000000000 +0100
|
||||
@@ -343,6 +343,10 @@
|
||||
// this option was introduced in mysql 5.0, so let's not even try on 4.1 servers
|
||||
strQuery = "SET SESSION sql_mode = 'STRICT_ALL_TABLES'";
|
||||
Query(strQuery); // ignore error
|
||||
+
|
||||
+ // Latin1 is default charset
|
||||
+ strQuery = "SET NAMES 'latin1'";
|
||||
+ Query(strQuery);
|
||||
}
|
||||
|
||||
exit:
|
||||
@ -1,25 +0,0 @@
|
||||
diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp
|
||||
--- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000
|
||||
@@ -935,6 +935,7 @@
|
||||
{ "fax_domain", "", CONFIGSETTING_RELOADABLE },
|
||||
{ "fax_international", "+", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_delegates", "no", CONFIGSETTING_RELOADABLE },
|
||||
+ { "always_send_as", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_tnef", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE },
|
||||
diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp
|
||||
--- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000
|
||||
@@ -1949,6 +1949,10 @@
|
||||
HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b)
|
||||
{
|
||||
bAllowSendAs = true;
|
||||
+ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) {
|
||||
+ //use always_send_as to allow everybody to send as someone else.
|
||||
+ //(some users hate the 'on behalf of' text, and dont want to do the extra configuration)
|
||||
+ bAllowSendAs = true;
|
||||
} else {
|
||||
|
||||
hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner);
|
||||
@ -1,199 +0,0 @@
|
||||
diff -rupN zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp
|
||||
--- zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp 2010-07-20 17:22:07.995625072 +0200
|
||||
@@ -7244,6 +7244,166 @@ typedef struct{
|
||||
SOURCEKEY sSourceKey;
|
||||
SOURCEKEY sParentSourceKey;
|
||||
}COPYITEM;
|
||||
+//SPAM HOOK
|
||||
+//This function parses an e-mail to the /etc/zarafa/userscripts/junklearn script. With 2 arguments:
|
||||
+//ham or spam
|
||||
+//message id
|
||||
+//and pipes the mail header to the script.
|
||||
+//This script wil be inhaled by MoveObjects();
|
||||
+/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
+int SpamHook(ECDatabase *lpDatabase,int ulId,int ulDestFolderId)
|
||||
+{
|
||||
+
|
||||
+ ALLOC_DBRESULT();
|
||||
+ ECRESULT er = erSuccess;
|
||||
+ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script");
|
||||
+
|
||||
+ //If shScriptPath doesn't exist skip spam hook.
|
||||
+ if(fopen(shScriptPath.c_str(),"r")) {
|
||||
+
|
||||
+ //Get store object ID via message object id
|
||||
+ unsigned int storeId;
|
||||
+ er = g_lpSessionManager->GetCacheManager()->GetStore(ulId,&storeId,NULL);
|
||||
+ if(er != erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve source folder.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //get deleted items folder entry id
|
||||
+ strQuery="SELECT val_binary FROM properties WHERE hierarchyid="+stringify(storeId)+" AND tag="+stringify(PROP_ID(PR_IPM_WASTEBASKET_ENTRYID));
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'deleted items' entryid to objectid.
|
||||
+ entryId* wasteBucketEntryId = new entryId[0];
|
||||
+ wasteBucketEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ wasteBucketEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int wasteBucketFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(wasteBucketEntryId,&wasteBucketFolderId);
|
||||
+ delete wasteBucketEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get 'junk folder' entryId.
|
||||
+ strQuery="SELECT val_binary FROM receivefolder LEFT JOIN mvproperties ON receivefolder.objid=mvproperties.hierarchyid WHERE receivefolder.storeid="+stringify(storeId)+" AND receivefolder.messageclass='IPC' AND mvproperties.tag="+stringify(PROP_ID(PR_ADDITIONAL_REN_ENTRYIDS))+" AND mvproperties.orderid=4";
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryids from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'junk folder' entryid to objectid.
|
||||
+ entryId* junkFolderEntryId = new entryId[0];
|
||||
+ junkFolderEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ junkFolderEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int junkFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(junkFolderEntryId,&junkFolderId);
|
||||
+ delete junkFolderEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get source folder object ID. (Actually we should check if mail came from subfolders in the 'deleted items folder', which I think never happens.)
|
||||
+ unsigned int srcFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetParent(ulId,&srcFolderId);
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve src folder id.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Check if object is ham or spam
|
||||
+ string shMailStatus;
|
||||
+ //if destination folder is junk, mark as spam
|
||||
+ if(ulDestFolderId==junkFolderId)
|
||||
+ shMailStatus="spam";
|
||||
+ else
|
||||
+ {
|
||||
+ //if destination folder is not TRASH and de source folder is JUNK, mark as ham
|
||||
+ if(ulDestFolderId!=wasteBucketFolderId && srcFolderId==junkFolderId)
|
||||
+ shMailStatus="ham";
|
||||
+ }
|
||||
+
|
||||
+ //Only call hook script if the mail is marked as ham or spam.
|
||||
+ if(!shMailStatus.empty()) {
|
||||
+
|
||||
+ //Get the mail from the DB.
|
||||
+ strQuery="SELECT val_string FROM properties WHERE tag="+stringify(PROP_ID(PR_TRANSPORT_MESSAGE_HEADERS))+" AND hierarchyid= "+stringify(ulId);
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: db error while retrieve mail header.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+
|
||||
+ if(shNumRows>0) {
|
||||
+
|
||||
+ // Execute the hook:
|
||||
+ FILE *shFilePtr;
|
||||
+ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId);
|
||||
+ shFilePtr=popen(shScriptPath.c_str(),"w");
|
||||
+ fputs(lpDBRow[0],shFilePtr);
|
||||
+ int shExitCode=pclose(shFilePtr);
|
||||
+ if(!WIFEXITED(shExitCode)) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: "+shScriptPath+" was terminated abnormally.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ //If script exit with non 0, exit..
|
||||
+ if(WEXITSTATUS(shExitCode)!=0) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(shExitCode));
|
||||
+ er=ZARAFA_E_UNKNOWN;
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed.");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail");
|
||||
+ }
|
||||
+
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+ }
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+exit:
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ return er;
|
||||
+}
|
||||
+
|
||||
|
||||
// Move one or more messages and/or moved a softdeleted message to a normal message
|
||||
ECRESULT MoveObjects(ECSession *lpSession, ECDatabase *lpDatabase, ECListInt* lplObjectIds, unsigned int ulDestFolderId, unsigned int ulSyncId)
|
||||
@@ -8096,6 +8256,17 @@ SOAP_ENTRY_START5(copyObjects, *result,
|
||||
|
||||
// @note The object type checking wille be done in MoveObjects or CopyObject
|
||||
|
||||
+//SPAMHOOK
|
||||
+/////////////////////////////////////
|
||||
+ //Iterate over all mail ids and initiate spamhook.
|
||||
+ for(iObjectId = lObjectIds.begin(); iObjectId != lObjectIds.end(); iObjectId++)
|
||||
+ {
|
||||
+ //Ignore the result
|
||||
+ int shResult=SpamHook(lpDatabase,*iObjectId,ulDestFolderId);
|
||||
+ }
|
||||
+//SPAMHOOK END
|
||||
+////////////////////////////////////
|
||||
+
|
||||
//check copy or a move
|
||||
if(ulFlags & FOLDER_MOVE ) { // A move
|
||||
er = MoveObjects(lpecSession, lpDatabase, &lObjectIds, ulDestFolderId, ulSyncId);
|
||||
diff -rupN zarafa-6.40.0-orig/provider/server/ECServer.cpp zarafa-6.40.0/provider/server/ECServer.cpp
|
||||
--- zarafa-6.40.0-orig/provider/server/ECServer.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/server/ECServer.cpp 2010-07-20 17:26:25.119624516 +0200
|
||||
@@ -670,6 +670,7 @@ int running_server(char *szName, char *s
|
||||
{ "deletegroup_script", "/etc/zarafa/userscripts/deletegroup", CONFIGSETTING_RELOADABLE},
|
||||
{ "createcompany_script", "/etc/zarafa/userscripts/createcompany", CONFIGSETTING_RELOADABLE },
|
||||
{ "deletecompany_script", "/etc/zarafa/userscripts/deletecompany", CONFIGSETTING_RELOADABLE },
|
||||
+ { "junklearn_script", "/etc/zarafa/userscripts/junklearn", CONFIGSETTING_RELOADABLE },
|
||||
{ "user_safe_mode", "no", CONFIGSETTING_RELOADABLE },
|
||||
|
||||
// Storename format
|
||||
@ -1,51 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh
|
||||
--- zarafa-6.40.6.orig//autoconf/ltmain.sh 2011-03-20 08:23:21.000000000 +0100
|
||||
+++ zarafa-6.40.6/autoconf/ltmain.sh 2011-03-20 08:24:23.000000000 +0100
|
||||
@@ -1628,7 +1628,7 @@
|
||||
elif test "X$arg" = "X-lc_r"; then
|
||||
case $host in
|
||||
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
|
||||
- # Do not include libc_r directly, use -pthread flag.
|
||||
+ # Do not include libc_r directly, use -lpthread flag.
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
@@ -1647,7 +1647,7 @@
|
||||
continue
|
||||
;;
|
||||
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
@@ -2150,7 +2150,7 @@
|
||||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac
|
||||
--- zarafa-6.40.6.orig//configure.ac 2011-03-20 08:23:20.000000000 +0100
|
||||
+++ zarafa-6.40.6/configure.ac 2011-03-20 08:23:44.000000000 +0100
|
||||
@@ -407,7 +407,7 @@
|
||||
CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX"
|
||||
fi
|
||||
# force add pthread in lucene test
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then
|
||||
AC_CHECK_LIB(clucene, [open],
|
||||
[ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a"
|
||||
@@ -561,7 +561,7 @@
|
||||
AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([required library libpthread missing or unusable]))
|
||||
LIBS=$libs_keep
|
||||
# because it seems this is better... (gnu c/c++ only?)
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
|
||||
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
|
||||
libs_keep=$LIBS
|
||||
@ -1,26 +0,0 @@
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.in
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.in
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.in
|
||||
@@ -274,7 +274,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.am
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.am
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.am
|
||||
@@ -18,7 +18,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
@ -1,24 +0,0 @@
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:38:31.435806562 +0300
|
||||
@@ -13,7 +13,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:38:22.475687815 +0300
|
||||
@@ -250,7 +250,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
all: all-am
|
||||
@ -1,44 +0,0 @@
|
||||
--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100
|
||||
+++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100
|
||||
@@ -34,7 +34,7 @@
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = php-ext
|
||||
-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \
|
||||
+DIST_COMMON = $(dist_data_DATA) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@@ -86,7 +86,7 @@
|
||||
DIST_SOURCES = $(mapi_la_SOURCES)
|
||||
dist_dataDATA_INSTALL = $(INSTALL_DATA)
|
||||
dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
|
||||
-DATA = $(dist_data_DATA) $(dist_sysconf_DATA)
|
||||
+DATA = $(dist_data_DATA)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@@ -406,23 +406,6 @@
|
||||
echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(datadir)/$$f"; \
|
||||
done
|
||||
-install-dist_sysconfDATA: $(dist_sysconf_DATA)
|
||||
- @$(NORMAL_INSTALL)
|
||||
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
-
|
||||
-uninstall-dist_sysconfDATA:
|
||||
- @$(NORMAL_UNINSTALL)
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
@ -1,69 +0,0 @@
|
||||
Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 6.40.0, which only
|
||||
removes the paths from autoconf/automake related files, that don't exist in the OSS
|
||||
version of Zarafa. Having these paths not removed causes autoreconf to fail, but a
|
||||
re-run of autoreconf is needed in order to get the rpaths completely out of all the
|
||||
libraries and binaries built during the make process.
|
||||
|
||||
forward patch by Mario Fetka <mario.fetka@gmail.com>
|
||||
|
||||
diff -uNr zarafa-6.40.10.orig//ECtools/Makefile.am zarafa-6.40.10/ECtools/Makefile.am
|
||||
--- zarafa-6.40.10.orig//ECtools/Makefile.am 2011-07-25 20:03:46.527000045 +0200
|
||||
+++ zarafa-6.40.10/ECtools/Makefile.am 2011-07-25 20:04:37.900000042 +0200
|
||||
@@ -1,10 +1,3 @@
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = zarafa-backup zarafa-report
|
||||
-if WITH_PYTHON
|
||||
-PROSUBS += za-extra
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
if WITH_TESTTOOLS
|
||||
TESTSUBS = ECTestTools
|
||||
endif
|
||||
diff -uNr zarafa-6.40.10.orig//Makefile.am zarafa-6.40.10/Makefile.am
|
||||
--- zarafa-6.40.10.orig//Makefile.am 2011-07-25 20:03:46.610000045 +0200
|
||||
+++ zarafa-6.40.10/Makefile.am 2011-07-25 20:05:12.960000054 +0200
|
||||
@@ -1,10 +1,6 @@
|
||||
AUTOMAKE_OPTIONS = 1.9 foreign
|
||||
ACLOCAL_AMFLAGS = -Iautoconf
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = liblicense licensed
|
||||
-endif
|
||||
-
|
||||
SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext ECtools spooler gateway caldav installer po doc
|
||||
|
||||
if WITH_SWIG
|
||||
@@ -26,10 +22,6 @@
|
||||
common/ecversion.h: versionheader.sh
|
||||
sh ${top_srcdir}/versionheader.sh > common/ecversion.h
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-CLEANFILES=common/ecversion.h
|
||||
-endif
|
||||
-
|
||||
dist-hook:
|
||||
find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
|
||||
if OSS_ONLY
|
||||
diff -uNr zarafa-6.40.10.orig//configure.ac zarafa-6.40.10/configure.ac
|
||||
--- zarafa-6.40.10.orig//configure.ac 2011-07-25 20:03:46.747000046 +0200
|
||||
+++ zarafa-6.40.10/configure.ac 2011-07-25 20:06:33.002000046 +0200
|
||||
@@ -819,18 +819,6 @@
|
||||
version
|
||||
specialbuild
|
||||
])
|
||||
-dnl non-oss files
|
||||
-if test -d `dirname $0`/licensed; then
|
||||
-AC_CONFIG_FILES([
|
||||
- liblicense/Makefile
|
||||
- licensed/Makefile
|
||||
- ECtools/zarafa-backup/Makefile
|
||||
- ECtools/zarafa-backup/helpers/Makefile
|
||||
- ECtools/zarafa-report/Makefile
|
||||
- debian/zarafa.install
|
||||
- ECtools/za-extra/Makefile
|
||||
-])
|
||||
-fi
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
Submitted By: Mario Fetka ( mario.fetka@gmaail.com)
|
||||
Date: 2010-10-11
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: on gentoo libtcmalloc_minimal is only provided as shared lib
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/configure.ac zarafa-6.40.2/configure.ac
|
||||
--- zarafa-6.40.2.orig/configure.ac 2010-10-11 18:39:35.000000000 +0000
|
||||
+++ zarafa-6.40.2/configure.ac 2010-10-11 18:40:03.000000000 +0000
|
||||
@@ -441,7 +441,7 @@
|
||||
AC_HELP_STRING([--with-tcmalloc-prefix=PATH],[path to tcmalloc lib, e.g. /usr/lib/]),
|
||||
[TCMALLOC_PREFIX=${withval}],[TCMALLOC_PREFIX=/usr/lib])
|
||||
AC_CHECK_LIB(tcmalloc_minimal, [open],
|
||||
- [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.a" ],
|
||||
+ [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" ],
|
||||
[ WITH_TCMALLOC=no ])
|
||||
AC_SUBST(TCMALLOC_LIBS)
|
||||
AC_LANG_POP
|
||||
@ -1,187 +0,0 @@
|
||||
Submitted By: Mario Fetka (mario.fetka@gmail.com)
|
||||
Date: 2010-10-13
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: gentoo specific
|
||||
Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/installer/linux/Makefile.am zarafa-6.40.2/installer/linux/Makefile.am
|
||||
--- zarafa-6.40.2.orig/installer/linux/Makefile.am 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/linux/Makefile.am 2010-10-13 08:28:26.000000000 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
sysconf_initdir=${sysconfdir}/init.d
|
||||
sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files}
|
||||
|
||||
-rhel_sysconfig_path = ${sysconfdir}/sysconfig
|
||||
+rhel_sysconfig_path = ${sysconfdir}/conf.d
|
||||
suse_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sles_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path}
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany zarafa-6.40.2/installer/userscripts/createcompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany 2010-10-13 08:26:53.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany.in zarafa-6.40.2/installer/userscripts/createcompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany.in 2010-10-13 08:27:00.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup zarafa-6.40.2/installer/userscripts/creategroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup 2010-10-13 08:27:04.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup.in zarafa-6.40.2/installer/userscripts/creategroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup.in 2010-10-13 08:27:08.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser zarafa-6.40.2/installer/userscripts/createuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser 2010-10-13 08:27:12.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser.in zarafa-6.40.2/installer/userscripts/createuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser.in 2010-10-13 08:27:17.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany zarafa-6.40.2/installer/userscripts/deletecompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany 2010-10-13 08:27:22.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany.in zarafa-6.40.2/installer/userscripts/deletecompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany.in 2010-10-13 08:27:26.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup zarafa-6.40.2/installer/userscripts/deletegroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup 2010-10-13 08:27:30.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup.in zarafa-6.40.2/installer/userscripts/deletegroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup.in 2010-10-13 08:27:35.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser zarafa-6.40.2/installer/userscripts/deleteuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser 2010-10-13 08:27:39.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/deleteuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser.in zarafa-6.40.2/installer/userscripts/deleteuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser.in 2010-10-13 08:27:43.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d
|
||||
@ -1,14 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp
|
||||
--- zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp 2011-03-20 23:50:06.000000000 +0100
|
||||
+++ zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp 2011-03-21 00:00:45.000000000 +0100
|
||||
@@ -343,6 +343,10 @@
|
||||
// this option was introduced in mysql 5.0, so let's not even try on 4.1 servers
|
||||
strQuery = "SET SESSION sql_mode = 'STRICT_ALL_TABLES'";
|
||||
Query(strQuery); // ignore error
|
||||
+
|
||||
+ // Latin1 is default charset
|
||||
+ strQuery = "SET NAMES 'latin1'";
|
||||
+ Query(strQuery);
|
||||
}
|
||||
|
||||
exit:
|
||||
@ -1,25 +0,0 @@
|
||||
diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp
|
||||
--- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000
|
||||
@@ -935,6 +935,7 @@
|
||||
{ "fax_domain", "", CONFIGSETTING_RELOADABLE },
|
||||
{ "fax_international", "+", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_delegates", "no", CONFIGSETTING_RELOADABLE },
|
||||
+ { "always_send_as", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_tnef", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE },
|
||||
diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp
|
||||
--- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000
|
||||
@@ -1949,6 +1949,10 @@
|
||||
HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b)
|
||||
{
|
||||
bAllowSendAs = true;
|
||||
+ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) {
|
||||
+ //use always_send_as to allow everybody to send as someone else.
|
||||
+ //(some users hate the 'on behalf of' text, and dont want to do the extra configuration)
|
||||
+ bAllowSendAs = true;
|
||||
} else {
|
||||
|
||||
hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner);
|
||||
@ -1,199 +0,0 @@
|
||||
diff -rupN zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp
|
||||
--- zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp 2010-07-20 17:22:07.995625072 +0200
|
||||
@@ -7244,6 +7244,166 @@ typedef struct{
|
||||
SOURCEKEY sSourceKey;
|
||||
SOURCEKEY sParentSourceKey;
|
||||
}COPYITEM;
|
||||
+//SPAM HOOK
|
||||
+//This function parses an e-mail to the /etc/zarafa/userscripts/junklearn script. With 2 arguments:
|
||||
+//ham or spam
|
||||
+//message id
|
||||
+//and pipes the mail header to the script.
|
||||
+//This script wil be inhaled by MoveObjects();
|
||||
+/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
+int SpamHook(ECDatabase *lpDatabase,int ulId,int ulDestFolderId)
|
||||
+{
|
||||
+
|
||||
+ ALLOC_DBRESULT();
|
||||
+ ECRESULT er = erSuccess;
|
||||
+ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script");
|
||||
+
|
||||
+ //If shScriptPath doesn't exist skip spam hook.
|
||||
+ if(fopen(shScriptPath.c_str(),"r")) {
|
||||
+
|
||||
+ //Get store object ID via message object id
|
||||
+ unsigned int storeId;
|
||||
+ er = g_lpSessionManager->GetCacheManager()->GetStore(ulId,&storeId,NULL);
|
||||
+ if(er != erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve source folder.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //get deleted items folder entry id
|
||||
+ strQuery="SELECT val_binary FROM properties WHERE hierarchyid="+stringify(storeId)+" AND tag="+stringify(PROP_ID(PR_IPM_WASTEBASKET_ENTRYID));
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'deleted items' entryid to objectid.
|
||||
+ entryId* wasteBucketEntryId = new entryId[0];
|
||||
+ wasteBucketEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ wasteBucketEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int wasteBucketFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(wasteBucketEntryId,&wasteBucketFolderId);
|
||||
+ delete wasteBucketEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get 'junk folder' entryId.
|
||||
+ strQuery="SELECT val_binary FROM receivefolder LEFT JOIN mvproperties ON receivefolder.objid=mvproperties.hierarchyid WHERE receivefolder.storeid="+stringify(storeId)+" AND receivefolder.messageclass='IPC' AND mvproperties.tag="+stringify(PROP_ID(PR_ADDITIONAL_REN_ENTRYIDS))+" AND mvproperties.orderid=4";
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryids from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'junk folder' entryid to objectid.
|
||||
+ entryId* junkFolderEntryId = new entryId[0];
|
||||
+ junkFolderEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ junkFolderEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int junkFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(junkFolderEntryId,&junkFolderId);
|
||||
+ delete junkFolderEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get source folder object ID. (Actually we should check if mail came from subfolders in the 'deleted items folder', which I think never happens.)
|
||||
+ unsigned int srcFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetParent(ulId,&srcFolderId);
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve src folder id.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Check if object is ham or spam
|
||||
+ string shMailStatus;
|
||||
+ //if destination folder is junk, mark as spam
|
||||
+ if(ulDestFolderId==junkFolderId)
|
||||
+ shMailStatus="spam";
|
||||
+ else
|
||||
+ {
|
||||
+ //if destination folder is not TRASH and de source folder is JUNK, mark as ham
|
||||
+ if(ulDestFolderId!=wasteBucketFolderId && srcFolderId==junkFolderId)
|
||||
+ shMailStatus="ham";
|
||||
+ }
|
||||
+
|
||||
+ //Only call hook script if the mail is marked as ham or spam.
|
||||
+ if(!shMailStatus.empty()) {
|
||||
+
|
||||
+ //Get the mail from the DB.
|
||||
+ strQuery="SELECT val_string FROM properties WHERE tag="+stringify(PROP_ID(PR_TRANSPORT_MESSAGE_HEADERS))+" AND hierarchyid= "+stringify(ulId);
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: db error while retrieve mail header.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+
|
||||
+ if(shNumRows>0) {
|
||||
+
|
||||
+ // Execute the hook:
|
||||
+ FILE *shFilePtr;
|
||||
+ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId);
|
||||
+ shFilePtr=popen(shScriptPath.c_str(),"w");
|
||||
+ fputs(lpDBRow[0],shFilePtr);
|
||||
+ int shExitCode=pclose(shFilePtr);
|
||||
+ if(!WIFEXITED(shExitCode)) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: "+shScriptPath+" was terminated abnormally.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ //If script exit with non 0, exit..
|
||||
+ if(WEXITSTATUS(shExitCode)!=0) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(shExitCode));
|
||||
+ er=ZARAFA_E_UNKNOWN;
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed.");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail");
|
||||
+ }
|
||||
+
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+ }
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+exit:
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ return er;
|
||||
+}
|
||||
+
|
||||
|
||||
// Move one or more messages and/or moved a softdeleted message to a normal message
|
||||
ECRESULT MoveObjects(ECSession *lpSession, ECDatabase *lpDatabase, ECListInt* lplObjectIds, unsigned int ulDestFolderId, unsigned int ulSyncId)
|
||||
@@ -8096,6 +8256,17 @@ SOAP_ENTRY_START5(copyObjects, *result,
|
||||
|
||||
// @note The object type checking wille be done in MoveObjects or CopyObject
|
||||
|
||||
+//SPAMHOOK
|
||||
+/////////////////////////////////////
|
||||
+ //Iterate over all mail ids and initiate spamhook.
|
||||
+ for(iObjectId = lObjectIds.begin(); iObjectId != lObjectIds.end(); iObjectId++)
|
||||
+ {
|
||||
+ //Ignore the result
|
||||
+ int shResult=SpamHook(lpDatabase,*iObjectId,ulDestFolderId);
|
||||
+ }
|
||||
+//SPAMHOOK END
|
||||
+////////////////////////////////////
|
||||
+
|
||||
//check copy or a move
|
||||
if(ulFlags & FOLDER_MOVE ) { // A move
|
||||
er = MoveObjects(lpecSession, lpDatabase, &lObjectIds, ulDestFolderId, ulSyncId);
|
||||
diff -rupN zarafa-6.40.0-orig/provider/server/ECServer.cpp zarafa-6.40.0/provider/server/ECServer.cpp
|
||||
--- zarafa-6.40.0-orig/provider/server/ECServer.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/server/ECServer.cpp 2010-07-20 17:26:25.119624516 +0200
|
||||
@@ -670,6 +670,7 @@ int running_server(char *szName, char *s
|
||||
{ "deletegroup_script", "/etc/zarafa/userscripts/deletegroup", CONFIGSETTING_RELOADABLE},
|
||||
{ "createcompany_script", "/etc/zarafa/userscripts/createcompany", CONFIGSETTING_RELOADABLE },
|
||||
{ "deletecompany_script", "/etc/zarafa/userscripts/deletecompany", CONFIGSETTING_RELOADABLE },
|
||||
+ { "junklearn_script", "/etc/zarafa/userscripts/junklearn", CONFIGSETTING_RELOADABLE },
|
||||
{ "user_safe_mode", "no", CONFIGSETTING_RELOADABLE },
|
||||
|
||||
// Storename format
|
||||
@ -1,51 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh
|
||||
--- zarafa-6.40.6.orig//autoconf/ltmain.sh 2011-03-20 08:23:21.000000000 +0100
|
||||
+++ zarafa-6.40.6/autoconf/ltmain.sh 2011-03-20 08:24:23.000000000 +0100
|
||||
@@ -1628,7 +1628,7 @@
|
||||
elif test "X$arg" = "X-lc_r"; then
|
||||
case $host in
|
||||
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
|
||||
- # Do not include libc_r directly, use -pthread flag.
|
||||
+ # Do not include libc_r directly, use -lpthread flag.
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
@@ -1647,7 +1647,7 @@
|
||||
continue
|
||||
;;
|
||||
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
@@ -2150,7 +2150,7 @@
|
||||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac
|
||||
--- zarafa-6.40.6.orig//configure.ac 2011-03-20 08:23:20.000000000 +0100
|
||||
+++ zarafa-6.40.6/configure.ac 2011-03-20 08:23:44.000000000 +0100
|
||||
@@ -407,7 +407,7 @@
|
||||
CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX"
|
||||
fi
|
||||
# force add pthread in lucene test
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then
|
||||
AC_CHECK_LIB(clucene, [open],
|
||||
[ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a"
|
||||
@@ -561,7 +561,7 @@
|
||||
AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([required library libpthread missing or unusable]))
|
||||
LIBS=$libs_keep
|
||||
# because it seems this is better... (gnu c/c++ only?)
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
|
||||
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
|
||||
libs_keep=$LIBS
|
||||
@ -1,26 +0,0 @@
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.in
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.in
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.in
|
||||
@@ -274,7 +274,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.am
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.am
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.am
|
||||
@@ -18,7 +18,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
@ -1,24 +0,0 @@
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:38:31.435806562 +0300
|
||||
@@ -13,7 +13,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:38:22.475687815 +0300
|
||||
@@ -250,7 +250,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
all: all-am
|
||||
@ -1,44 +0,0 @@
|
||||
--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100
|
||||
+++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100
|
||||
@@ -34,7 +34,7 @@
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = php-ext
|
||||
-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \
|
||||
+DIST_COMMON = $(dist_data_DATA) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@@ -86,7 +86,7 @@
|
||||
DIST_SOURCES = $(mapi_la_SOURCES)
|
||||
dist_dataDATA_INSTALL = $(INSTALL_DATA)
|
||||
dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
|
||||
-DATA = $(dist_data_DATA) $(dist_sysconf_DATA)
|
||||
+DATA = $(dist_data_DATA)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@@ -406,23 +406,6 @@
|
||||
echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(datadir)/$$f"; \
|
||||
done
|
||||
-install-dist_sysconfDATA: $(dist_sysconf_DATA)
|
||||
- @$(NORMAL_INSTALL)
|
||||
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
-
|
||||
-uninstall-dist_sysconfDATA:
|
||||
- @$(NORMAL_UNINSTALL)
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
@ -1,69 +0,0 @@
|
||||
Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 6.40.0, which only
|
||||
removes the paths from autoconf/automake related files, that don't exist in the OSS
|
||||
version of Zarafa. Having these paths not removed causes autoreconf to fail, but a
|
||||
re-run of autoreconf is needed in order to get the rpaths completely out of all the
|
||||
libraries and binaries built during the make process.
|
||||
|
||||
forward patch by Mario Fetka <mario.fetka@gmail.com>
|
||||
|
||||
diff -uNr zarafa-6.40.10.orig//ECtools/Makefile.am zarafa-6.40.10/ECtools/Makefile.am
|
||||
--- zarafa-6.40.10.orig//ECtools/Makefile.am 2011-07-25 20:03:46.527000045 +0200
|
||||
+++ zarafa-6.40.10/ECtools/Makefile.am 2011-07-25 20:04:37.900000042 +0200
|
||||
@@ -1,10 +1,3 @@
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = zarafa-backup zarafa-report
|
||||
-if WITH_PYTHON
|
||||
-PROSUBS += za-extra
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
if WITH_TESTTOOLS
|
||||
TESTSUBS = ECTestTools
|
||||
endif
|
||||
diff -uNr zarafa-6.40.10.orig//Makefile.am zarafa-6.40.10/Makefile.am
|
||||
--- zarafa-6.40.10.orig//Makefile.am 2011-07-25 20:03:46.610000045 +0200
|
||||
+++ zarafa-6.40.10/Makefile.am 2011-07-25 20:05:12.960000054 +0200
|
||||
@@ -1,10 +1,6 @@
|
||||
AUTOMAKE_OPTIONS = 1.9 foreign
|
||||
ACLOCAL_AMFLAGS = -Iautoconf
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = liblicense licensed
|
||||
-endif
|
||||
-
|
||||
SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext ECtools spooler gateway caldav installer po doc
|
||||
|
||||
if WITH_SWIG
|
||||
@@ -26,10 +22,6 @@
|
||||
common/ecversion.h: versionheader.sh
|
||||
sh ${top_srcdir}/versionheader.sh > common/ecversion.h
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-CLEANFILES=common/ecversion.h
|
||||
-endif
|
||||
-
|
||||
dist-hook:
|
||||
find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
|
||||
if OSS_ONLY
|
||||
diff -uNr zarafa-6.40.10.orig//configure.ac zarafa-6.40.10/configure.ac
|
||||
--- zarafa-6.40.10.orig//configure.ac 2011-07-25 20:03:46.747000046 +0200
|
||||
+++ zarafa-6.40.10/configure.ac 2011-07-25 20:06:33.002000046 +0200
|
||||
@@ -819,18 +819,6 @@
|
||||
version
|
||||
specialbuild
|
||||
])
|
||||
-dnl non-oss files
|
||||
-if test -d `dirname $0`/licensed; then
|
||||
-AC_CONFIG_FILES([
|
||||
- liblicense/Makefile
|
||||
- licensed/Makefile
|
||||
- ECtools/zarafa-backup/Makefile
|
||||
- ECtools/zarafa-backup/helpers/Makefile
|
||||
- ECtools/zarafa-report/Makefile
|
||||
- debian/zarafa.install
|
||||
- ECtools/za-extra/Makefile
|
||||
-])
|
||||
-fi
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
Submitted By: Mario Fetka ( mario.fetka@gmaail.com)
|
||||
Date: 2010-10-11
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: on gentoo libtcmalloc_minimal is only provided as shared lib
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/configure.ac zarafa-6.40.2/configure.ac
|
||||
--- zarafa-6.40.2.orig/configure.ac 2010-10-11 18:39:35.000000000 +0000
|
||||
+++ zarafa-6.40.2/configure.ac 2010-10-11 18:40:03.000000000 +0000
|
||||
@@ -441,7 +441,7 @@
|
||||
AC_HELP_STRING([--with-tcmalloc-prefix=PATH],[path to tcmalloc lib, e.g. /usr/lib/]),
|
||||
[TCMALLOC_PREFIX=${withval}],[TCMALLOC_PREFIX=/usr/lib])
|
||||
AC_CHECK_LIB(tcmalloc_minimal, [open],
|
||||
- [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.a" ],
|
||||
+ [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" ],
|
||||
[ WITH_TCMALLOC=no ])
|
||||
AC_SUBST(TCMALLOC_LIBS)
|
||||
AC_LANG_POP
|
||||
@ -1,187 +0,0 @@
|
||||
Submitted By: Mario Fetka (mario.fetka@gmail.com)
|
||||
Date: 2010-10-13
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: gentoo specific
|
||||
Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/installer/linux/Makefile.am zarafa-6.40.2/installer/linux/Makefile.am
|
||||
--- zarafa-6.40.2.orig/installer/linux/Makefile.am 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/linux/Makefile.am 2010-10-13 08:28:26.000000000 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
sysconf_initdir=${sysconfdir}/init.d
|
||||
sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files}
|
||||
|
||||
-rhel_sysconfig_path = ${sysconfdir}/sysconfig
|
||||
+rhel_sysconfig_path = ${sysconfdir}/conf.d
|
||||
suse_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sles_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path}
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany zarafa-6.40.2/installer/userscripts/createcompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany 2010-10-13 08:26:53.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany.in zarafa-6.40.2/installer/userscripts/createcompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany.in 2010-10-13 08:27:00.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup zarafa-6.40.2/installer/userscripts/creategroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup 2010-10-13 08:27:04.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup.in zarafa-6.40.2/installer/userscripts/creategroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup.in 2010-10-13 08:27:08.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser zarafa-6.40.2/installer/userscripts/createuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser 2010-10-13 08:27:12.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser.in zarafa-6.40.2/installer/userscripts/createuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser.in 2010-10-13 08:27:17.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany zarafa-6.40.2/installer/userscripts/deletecompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany 2010-10-13 08:27:22.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany.in zarafa-6.40.2/installer/userscripts/deletecompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany.in 2010-10-13 08:27:26.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup zarafa-6.40.2/installer/userscripts/deletegroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup 2010-10-13 08:27:30.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup.in zarafa-6.40.2/installer/userscripts/deletegroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup.in 2010-10-13 08:27:35.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser zarafa-6.40.2/installer/userscripts/deleteuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser 2010-10-13 08:27:39.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/deleteuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser.in zarafa-6.40.2/installer/userscripts/deleteuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser.in 2010-10-13 08:27:43.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d
|
||||
@ -1,14 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp
|
||||
--- zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp 2011-03-20 23:50:06.000000000 +0100
|
||||
+++ zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp 2011-03-21 00:00:45.000000000 +0100
|
||||
@@ -343,6 +343,10 @@
|
||||
// this option was introduced in mysql 5.0, so let's not even try on 4.1 servers
|
||||
strQuery = "SET SESSION sql_mode = 'STRICT_ALL_TABLES'";
|
||||
Query(strQuery); // ignore error
|
||||
+
|
||||
+ // Latin1 is default charset
|
||||
+ strQuery = "SET NAMES 'latin1'";
|
||||
+ Query(strQuery);
|
||||
}
|
||||
|
||||
exit:
|
||||
@ -1,25 +0,0 @@
|
||||
diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp
|
||||
--- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000
|
||||
@@ -935,6 +935,7 @@
|
||||
{ "fax_domain", "", CONFIGSETTING_RELOADABLE },
|
||||
{ "fax_international", "+", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_delegates", "no", CONFIGSETTING_RELOADABLE },
|
||||
+ { "always_send_as", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_tnef", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE },
|
||||
diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp
|
||||
--- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000
|
||||
@@ -1949,6 +1949,10 @@
|
||||
HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b)
|
||||
{
|
||||
bAllowSendAs = true;
|
||||
+ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) {
|
||||
+ //use always_send_as to allow everybody to send as someone else.
|
||||
+ //(some users hate the 'on behalf of' text, and dont want to do the extra configuration)
|
||||
+ bAllowSendAs = true;
|
||||
} else {
|
||||
|
||||
hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner);
|
||||
@ -1,199 +0,0 @@
|
||||
diff -rupN zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp
|
||||
--- zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp 2010-07-20 17:22:07.995625072 +0200
|
||||
@@ -7244,6 +7244,166 @@ typedef struct{
|
||||
SOURCEKEY sSourceKey;
|
||||
SOURCEKEY sParentSourceKey;
|
||||
}COPYITEM;
|
||||
+//SPAM HOOK
|
||||
+//This function parses an e-mail to the /etc/zarafa/userscripts/junklearn script. With 2 arguments:
|
||||
+//ham or spam
|
||||
+//message id
|
||||
+//and pipes the mail header to the script.
|
||||
+//This script wil be inhaled by MoveObjects();
|
||||
+/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
+int SpamHook(ECDatabase *lpDatabase,int ulId,int ulDestFolderId)
|
||||
+{
|
||||
+
|
||||
+ ALLOC_DBRESULT();
|
||||
+ ECRESULT er = erSuccess;
|
||||
+ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script");
|
||||
+
|
||||
+ //If shScriptPath doesn't exist skip spam hook.
|
||||
+ if(fopen(shScriptPath.c_str(),"r")) {
|
||||
+
|
||||
+ //Get store object ID via message object id
|
||||
+ unsigned int storeId;
|
||||
+ er = g_lpSessionManager->GetCacheManager()->GetStore(ulId,&storeId,NULL);
|
||||
+ if(er != erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve source folder.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //get deleted items folder entry id
|
||||
+ strQuery="SELECT val_binary FROM properties WHERE hierarchyid="+stringify(storeId)+" AND tag="+stringify(PROP_ID(PR_IPM_WASTEBASKET_ENTRYID));
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'deleted items' entryid to objectid.
|
||||
+ entryId* wasteBucketEntryId = new entryId[0];
|
||||
+ wasteBucketEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ wasteBucketEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int wasteBucketFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(wasteBucketEntryId,&wasteBucketFolderId);
|
||||
+ delete wasteBucketEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get 'junk folder' entryId.
|
||||
+ strQuery="SELECT val_binary FROM receivefolder LEFT JOIN mvproperties ON receivefolder.objid=mvproperties.hierarchyid WHERE receivefolder.storeid="+stringify(storeId)+" AND receivefolder.messageclass='IPC' AND mvproperties.tag="+stringify(PROP_ID(PR_ADDITIONAL_REN_ENTRYIDS))+" AND mvproperties.orderid=4";
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryids from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'junk folder' entryid to objectid.
|
||||
+ entryId* junkFolderEntryId = new entryId[0];
|
||||
+ junkFolderEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ junkFolderEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int junkFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(junkFolderEntryId,&junkFolderId);
|
||||
+ delete junkFolderEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get source folder object ID. (Actually we should check if mail came from subfolders in the 'deleted items folder', which I think never happens.)
|
||||
+ unsigned int srcFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetParent(ulId,&srcFolderId);
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve src folder id.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Check if object is ham or spam
|
||||
+ string shMailStatus;
|
||||
+ //if destination folder is junk, mark as spam
|
||||
+ if(ulDestFolderId==junkFolderId)
|
||||
+ shMailStatus="spam";
|
||||
+ else
|
||||
+ {
|
||||
+ //if destination folder is not TRASH and de source folder is JUNK, mark as ham
|
||||
+ if(ulDestFolderId!=wasteBucketFolderId && srcFolderId==junkFolderId)
|
||||
+ shMailStatus="ham";
|
||||
+ }
|
||||
+
|
||||
+ //Only call hook script if the mail is marked as ham or spam.
|
||||
+ if(!shMailStatus.empty()) {
|
||||
+
|
||||
+ //Get the mail from the DB.
|
||||
+ strQuery="SELECT val_string FROM properties WHERE tag="+stringify(PROP_ID(PR_TRANSPORT_MESSAGE_HEADERS))+" AND hierarchyid= "+stringify(ulId);
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: db error while retrieve mail header.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+
|
||||
+ if(shNumRows>0) {
|
||||
+
|
||||
+ // Execute the hook:
|
||||
+ FILE *shFilePtr;
|
||||
+ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId);
|
||||
+ shFilePtr=popen(shScriptPath.c_str(),"w");
|
||||
+ fputs(lpDBRow[0],shFilePtr);
|
||||
+ int shExitCode=pclose(shFilePtr);
|
||||
+ if(!WIFEXITED(shExitCode)) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: "+shScriptPath+" was terminated abnormally.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ //If script exit with non 0, exit..
|
||||
+ if(WEXITSTATUS(shExitCode)!=0) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(shExitCode));
|
||||
+ er=ZARAFA_E_UNKNOWN;
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed.");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail");
|
||||
+ }
|
||||
+
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+ }
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+exit:
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ return er;
|
||||
+}
|
||||
+
|
||||
|
||||
// Move one or more messages and/or moved a softdeleted message to a normal message
|
||||
ECRESULT MoveObjects(ECSession *lpSession, ECDatabase *lpDatabase, ECListInt* lplObjectIds, unsigned int ulDestFolderId, unsigned int ulSyncId)
|
||||
@@ -8096,6 +8256,17 @@ SOAP_ENTRY_START5(copyObjects, *result,
|
||||
|
||||
// @note The object type checking wille be done in MoveObjects or CopyObject
|
||||
|
||||
+//SPAMHOOK
|
||||
+/////////////////////////////////////
|
||||
+ //Iterate over all mail ids and initiate spamhook.
|
||||
+ for(iObjectId = lObjectIds.begin(); iObjectId != lObjectIds.end(); iObjectId++)
|
||||
+ {
|
||||
+ //Ignore the result
|
||||
+ int shResult=SpamHook(lpDatabase,*iObjectId,ulDestFolderId);
|
||||
+ }
|
||||
+//SPAMHOOK END
|
||||
+////////////////////////////////////
|
||||
+
|
||||
//check copy or a move
|
||||
if(ulFlags & FOLDER_MOVE ) { // A move
|
||||
er = MoveObjects(lpecSession, lpDatabase, &lObjectIds, ulDestFolderId, ulSyncId);
|
||||
diff -rupN zarafa-6.40.0-orig/provider/server/ECServer.cpp zarafa-6.40.0/provider/server/ECServer.cpp
|
||||
--- zarafa-6.40.0-orig/provider/server/ECServer.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/server/ECServer.cpp 2010-07-20 17:26:25.119624516 +0200
|
||||
@@ -670,6 +670,7 @@ int running_server(char *szName, char *s
|
||||
{ "deletegroup_script", "/etc/zarafa/userscripts/deletegroup", CONFIGSETTING_RELOADABLE},
|
||||
{ "createcompany_script", "/etc/zarafa/userscripts/createcompany", CONFIGSETTING_RELOADABLE },
|
||||
{ "deletecompany_script", "/etc/zarafa/userscripts/deletecompany", CONFIGSETTING_RELOADABLE },
|
||||
+ { "junklearn_script", "/etc/zarafa/userscripts/junklearn", CONFIGSETTING_RELOADABLE },
|
||||
{ "user_safe_mode", "no", CONFIGSETTING_RELOADABLE },
|
||||
|
||||
// Storename format
|
||||
@ -1,51 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh
|
||||
--- zarafa-6.40.6.orig//autoconf/ltmain.sh 2011-03-20 08:23:21.000000000 +0100
|
||||
+++ zarafa-6.40.6/autoconf/ltmain.sh 2011-03-20 08:24:23.000000000 +0100
|
||||
@@ -1628,7 +1628,7 @@
|
||||
elif test "X$arg" = "X-lc_r"; then
|
||||
case $host in
|
||||
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
|
||||
- # Do not include libc_r directly, use -pthread flag.
|
||||
+ # Do not include libc_r directly, use -lpthread flag.
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
@@ -1647,7 +1647,7 @@
|
||||
continue
|
||||
;;
|
||||
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
@@ -2150,7 +2150,7 @@
|
||||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac
|
||||
--- zarafa-6.40.6.orig//configure.ac 2011-03-20 08:23:20.000000000 +0100
|
||||
+++ zarafa-6.40.6/configure.ac 2011-03-20 08:23:44.000000000 +0100
|
||||
@@ -407,7 +407,7 @@
|
||||
CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX"
|
||||
fi
|
||||
# force add pthread in lucene test
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then
|
||||
AC_CHECK_LIB(clucene, [open],
|
||||
[ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a"
|
||||
@@ -561,7 +561,7 @@
|
||||
AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([required library libpthread missing or unusable]))
|
||||
LIBS=$libs_keep
|
||||
# because it seems this is better... (gnu c/c++ only?)
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
|
||||
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
|
||||
libs_keep=$LIBS
|
||||
@ -1,26 +0,0 @@
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.in
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.in
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.in
|
||||
@@ -274,7 +274,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.am
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.am
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.am
|
||||
@@ -18,7 +18,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
@ -1,24 +0,0 @@
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:38:31.435806562 +0300
|
||||
@@ -13,7 +13,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:38:22.475687815 +0300
|
||||
@@ -250,7 +250,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
all: all-am
|
||||
@ -1,44 +0,0 @@
|
||||
--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100
|
||||
+++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100
|
||||
@@ -34,7 +34,7 @@
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = php-ext
|
||||
-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \
|
||||
+DIST_COMMON = $(dist_data_DATA) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@@ -86,7 +86,7 @@
|
||||
DIST_SOURCES = $(mapi_la_SOURCES)
|
||||
dist_dataDATA_INSTALL = $(INSTALL_DATA)
|
||||
dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
|
||||
-DATA = $(dist_data_DATA) $(dist_sysconf_DATA)
|
||||
+DATA = $(dist_data_DATA)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@@ -406,23 +406,6 @@
|
||||
echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(datadir)/$$f"; \
|
||||
done
|
||||
-install-dist_sysconfDATA: $(dist_sysconf_DATA)
|
||||
- @$(NORMAL_INSTALL)
|
||||
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
-
|
||||
-uninstall-dist_sysconfDATA:
|
||||
- @$(NORMAL_UNINSTALL)
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
@ -1,69 +0,0 @@
|
||||
Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 6.40.0, which only
|
||||
removes the paths from autoconf/automake related files, that don't exist in the OSS
|
||||
version of Zarafa. Having these paths not removed causes autoreconf to fail, but a
|
||||
re-run of autoreconf is needed in order to get the rpaths completely out of all the
|
||||
libraries and binaries built during the make process.
|
||||
|
||||
forward patch by Mario Fetka <mario.fetka@gmail.com>
|
||||
|
||||
diff -uNr zarafa-6.40.10.orig//ECtools/Makefile.am zarafa-6.40.10/ECtools/Makefile.am
|
||||
--- zarafa-6.40.10.orig//ECtools/Makefile.am 2011-07-25 20:03:46.527000045 +0200
|
||||
+++ zarafa-6.40.10/ECtools/Makefile.am 2011-07-25 20:04:37.900000042 +0200
|
||||
@@ -1,10 +1,3 @@
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = zarafa-backup zarafa-report
|
||||
-if WITH_PYTHON
|
||||
-PROSUBS += za-extra
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
if WITH_TESTTOOLS
|
||||
TESTSUBS = ECTestTools
|
||||
endif
|
||||
diff -uNr zarafa-6.40.10.orig//Makefile.am zarafa-6.40.10/Makefile.am
|
||||
--- zarafa-6.40.10.orig//Makefile.am 2011-07-25 20:03:46.610000045 +0200
|
||||
+++ zarafa-6.40.10/Makefile.am 2011-07-25 20:05:12.960000054 +0200
|
||||
@@ -1,10 +1,6 @@
|
||||
AUTOMAKE_OPTIONS = 1.9 foreign
|
||||
ACLOCAL_AMFLAGS = -Iautoconf
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = liblicense licensed
|
||||
-endif
|
||||
-
|
||||
SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext ECtools spooler gateway caldav installer po doc
|
||||
|
||||
if WITH_SWIG
|
||||
@@ -26,10 +22,6 @@
|
||||
common/ecversion.h: versionheader.sh
|
||||
sh ${top_srcdir}/versionheader.sh > common/ecversion.h
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-CLEANFILES=common/ecversion.h
|
||||
-endif
|
||||
-
|
||||
dist-hook:
|
||||
find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
|
||||
if OSS_ONLY
|
||||
diff -uNr zarafa-6.40.10.orig//configure.ac zarafa-6.40.10/configure.ac
|
||||
--- zarafa-6.40.10.orig//configure.ac 2011-07-25 20:03:46.747000046 +0200
|
||||
+++ zarafa-6.40.10/configure.ac 2011-07-25 20:06:33.002000046 +0200
|
||||
@@ -819,18 +819,6 @@
|
||||
version
|
||||
specialbuild
|
||||
])
|
||||
-dnl non-oss files
|
||||
-if test -d `dirname $0`/licensed; then
|
||||
-AC_CONFIG_FILES([
|
||||
- liblicense/Makefile
|
||||
- licensed/Makefile
|
||||
- ECtools/zarafa-backup/Makefile
|
||||
- ECtools/zarafa-backup/helpers/Makefile
|
||||
- ECtools/zarafa-report/Makefile
|
||||
- debian/zarafa.install
|
||||
- ECtools/za-extra/Makefile
|
||||
-])
|
||||
-fi
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
Submitted By: Mario Fetka ( mario.fetka@gmaail.com)
|
||||
Date: 2010-10-11
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: on gentoo libtcmalloc_minimal is only provided as shared lib
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/configure.ac zarafa-6.40.2/configure.ac
|
||||
--- zarafa-6.40.2.orig/configure.ac 2010-10-11 18:39:35.000000000 +0000
|
||||
+++ zarafa-6.40.2/configure.ac 2010-10-11 18:40:03.000000000 +0000
|
||||
@@ -441,7 +441,7 @@
|
||||
AC_HELP_STRING([--with-tcmalloc-prefix=PATH],[path to tcmalloc lib, e.g. /usr/lib/]),
|
||||
[TCMALLOC_PREFIX=${withval}],[TCMALLOC_PREFIX=/usr/lib])
|
||||
AC_CHECK_LIB(tcmalloc_minimal, [open],
|
||||
- [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.a" ],
|
||||
+ [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" ],
|
||||
[ WITH_TCMALLOC=no ])
|
||||
AC_SUBST(TCMALLOC_LIBS)
|
||||
AC_LANG_POP
|
||||
@ -1,187 +0,0 @@
|
||||
Submitted By: Mario Fetka (mario.fetka@gmail.com)
|
||||
Date: 2010-10-13
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: gentoo specific
|
||||
Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/installer/linux/Makefile.am zarafa-6.40.2/installer/linux/Makefile.am
|
||||
--- zarafa-6.40.2.orig/installer/linux/Makefile.am 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/linux/Makefile.am 2010-10-13 08:28:26.000000000 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
sysconf_initdir=${sysconfdir}/init.d
|
||||
sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files}
|
||||
|
||||
-rhel_sysconfig_path = ${sysconfdir}/sysconfig
|
||||
+rhel_sysconfig_path = ${sysconfdir}/conf.d
|
||||
suse_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sles_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path}
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany zarafa-6.40.2/installer/userscripts/createcompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany 2010-10-13 08:26:53.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany.in zarafa-6.40.2/installer/userscripts/createcompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany.in 2010-10-13 08:27:00.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup zarafa-6.40.2/installer/userscripts/creategroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup 2010-10-13 08:27:04.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup.in zarafa-6.40.2/installer/userscripts/creategroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup.in 2010-10-13 08:27:08.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser zarafa-6.40.2/installer/userscripts/createuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser 2010-10-13 08:27:12.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser.in zarafa-6.40.2/installer/userscripts/createuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser.in 2010-10-13 08:27:17.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany zarafa-6.40.2/installer/userscripts/deletecompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany 2010-10-13 08:27:22.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany.in zarafa-6.40.2/installer/userscripts/deletecompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany.in 2010-10-13 08:27:26.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup zarafa-6.40.2/installer/userscripts/deletegroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup 2010-10-13 08:27:30.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup.in zarafa-6.40.2/installer/userscripts/deletegroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup.in 2010-10-13 08:27:35.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser zarafa-6.40.2/installer/userscripts/deleteuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser 2010-10-13 08:27:39.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/deleteuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser.in zarafa-6.40.2/installer/userscripts/deleteuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser.in 2010-10-13 08:27:43.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d
|
||||
@ -1,14 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp
|
||||
--- zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp 2011-03-20 23:50:06.000000000 +0100
|
||||
+++ zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp 2011-03-21 00:00:45.000000000 +0100
|
||||
@@ -343,6 +343,10 @@
|
||||
// this option was introduced in mysql 5.0, so let's not even try on 4.1 servers
|
||||
strQuery = "SET SESSION sql_mode = 'STRICT_ALL_TABLES'";
|
||||
Query(strQuery); // ignore error
|
||||
+
|
||||
+ // Latin1 is default charset
|
||||
+ strQuery = "SET NAMES 'latin1'";
|
||||
+ Query(strQuery);
|
||||
}
|
||||
|
||||
exit:
|
||||
@ -1,25 +0,0 @@
|
||||
diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp
|
||||
--- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000
|
||||
@@ -935,6 +935,7 @@
|
||||
{ "fax_domain", "", CONFIGSETTING_RELOADABLE },
|
||||
{ "fax_international", "+", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_delegates", "no", CONFIGSETTING_RELOADABLE },
|
||||
+ { "always_send_as", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_tnef", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE },
|
||||
diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp
|
||||
--- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000
|
||||
@@ -1949,6 +1949,10 @@
|
||||
HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b)
|
||||
{
|
||||
bAllowSendAs = true;
|
||||
+ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) {
|
||||
+ //use always_send_as to allow everybody to send as someone else.
|
||||
+ //(some users hate the 'on behalf of' text, and dont want to do the extra configuration)
|
||||
+ bAllowSendAs = true;
|
||||
} else {
|
||||
|
||||
hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner);
|
||||
@ -1,199 +0,0 @@
|
||||
diff -rupN zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp
|
||||
--- zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp 2010-07-20 17:22:07.995625072 +0200
|
||||
@@ -7244,6 +7244,166 @@ typedef struct{
|
||||
SOURCEKEY sSourceKey;
|
||||
SOURCEKEY sParentSourceKey;
|
||||
}COPYITEM;
|
||||
+//SPAM HOOK
|
||||
+//This function parses an e-mail to the /etc/zarafa/userscripts/junklearn script. With 2 arguments:
|
||||
+//ham or spam
|
||||
+//message id
|
||||
+//and pipes the mail header to the script.
|
||||
+//This script wil be inhaled by MoveObjects();
|
||||
+/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
+int SpamHook(ECDatabase *lpDatabase,int ulId,int ulDestFolderId)
|
||||
+{
|
||||
+
|
||||
+ ALLOC_DBRESULT();
|
||||
+ ECRESULT er = erSuccess;
|
||||
+ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script");
|
||||
+
|
||||
+ //If shScriptPath doesn't exist skip spam hook.
|
||||
+ if(fopen(shScriptPath.c_str(),"r")) {
|
||||
+
|
||||
+ //Get store object ID via message object id
|
||||
+ unsigned int storeId;
|
||||
+ er = g_lpSessionManager->GetCacheManager()->GetStore(ulId,&storeId,NULL);
|
||||
+ if(er != erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve source folder.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //get deleted items folder entry id
|
||||
+ strQuery="SELECT val_binary FROM properties WHERE hierarchyid="+stringify(storeId)+" AND tag="+stringify(PROP_ID(PR_IPM_WASTEBASKET_ENTRYID));
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'deleted items' entryid to objectid.
|
||||
+ entryId* wasteBucketEntryId = new entryId[0];
|
||||
+ wasteBucketEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ wasteBucketEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int wasteBucketFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(wasteBucketEntryId,&wasteBucketFolderId);
|
||||
+ delete wasteBucketEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get 'junk folder' entryId.
|
||||
+ strQuery="SELECT val_binary FROM receivefolder LEFT JOIN mvproperties ON receivefolder.objid=mvproperties.hierarchyid WHERE receivefolder.storeid="+stringify(storeId)+" AND receivefolder.messageclass='IPC' AND mvproperties.tag="+stringify(PROP_ID(PR_ADDITIONAL_REN_ENTRYIDS))+" AND mvproperties.orderid=4";
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryids from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'junk folder' entryid to objectid.
|
||||
+ entryId* junkFolderEntryId = new entryId[0];
|
||||
+ junkFolderEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ junkFolderEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int junkFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(junkFolderEntryId,&junkFolderId);
|
||||
+ delete junkFolderEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get source folder object ID. (Actually we should check if mail came from subfolders in the 'deleted items folder', which I think never happens.)
|
||||
+ unsigned int srcFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetParent(ulId,&srcFolderId);
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve src folder id.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Check if object is ham or spam
|
||||
+ string shMailStatus;
|
||||
+ //if destination folder is junk, mark as spam
|
||||
+ if(ulDestFolderId==junkFolderId)
|
||||
+ shMailStatus="spam";
|
||||
+ else
|
||||
+ {
|
||||
+ //if destination folder is not TRASH and de source folder is JUNK, mark as ham
|
||||
+ if(ulDestFolderId!=wasteBucketFolderId && srcFolderId==junkFolderId)
|
||||
+ shMailStatus="ham";
|
||||
+ }
|
||||
+
|
||||
+ //Only call hook script if the mail is marked as ham or spam.
|
||||
+ if(!shMailStatus.empty()) {
|
||||
+
|
||||
+ //Get the mail from the DB.
|
||||
+ strQuery="SELECT val_string FROM properties WHERE tag="+stringify(PROP_ID(PR_TRANSPORT_MESSAGE_HEADERS))+" AND hierarchyid= "+stringify(ulId);
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: db error while retrieve mail header.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+
|
||||
+ if(shNumRows>0) {
|
||||
+
|
||||
+ // Execute the hook:
|
||||
+ FILE *shFilePtr;
|
||||
+ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId);
|
||||
+ shFilePtr=popen(shScriptPath.c_str(),"w");
|
||||
+ fputs(lpDBRow[0],shFilePtr);
|
||||
+ int shExitCode=pclose(shFilePtr);
|
||||
+ if(!WIFEXITED(shExitCode)) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: "+shScriptPath+" was terminated abnormally.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ //If script exit with non 0, exit..
|
||||
+ if(WEXITSTATUS(shExitCode)!=0) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(shExitCode));
|
||||
+ er=ZARAFA_E_UNKNOWN;
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed.");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail");
|
||||
+ }
|
||||
+
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+ }
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+exit:
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ return er;
|
||||
+}
|
||||
+
|
||||
|
||||
// Move one or more messages and/or moved a softdeleted message to a normal message
|
||||
ECRESULT MoveObjects(ECSession *lpSession, ECDatabase *lpDatabase, ECListInt* lplObjectIds, unsigned int ulDestFolderId, unsigned int ulSyncId)
|
||||
@@ -8096,6 +8256,17 @@ SOAP_ENTRY_START5(copyObjects, *result,
|
||||
|
||||
// @note The object type checking wille be done in MoveObjects or CopyObject
|
||||
|
||||
+//SPAMHOOK
|
||||
+/////////////////////////////////////
|
||||
+ //Iterate over all mail ids and initiate spamhook.
|
||||
+ for(iObjectId = lObjectIds.begin(); iObjectId != lObjectIds.end(); iObjectId++)
|
||||
+ {
|
||||
+ //Ignore the result
|
||||
+ int shResult=SpamHook(lpDatabase,*iObjectId,ulDestFolderId);
|
||||
+ }
|
||||
+//SPAMHOOK END
|
||||
+////////////////////////////////////
|
||||
+
|
||||
//check copy or a move
|
||||
if(ulFlags & FOLDER_MOVE ) { // A move
|
||||
er = MoveObjects(lpecSession, lpDatabase, &lObjectIds, ulDestFolderId, ulSyncId);
|
||||
diff -rupN zarafa-6.40.0-orig/provider/server/ECServer.cpp zarafa-6.40.0/provider/server/ECServer.cpp
|
||||
--- zarafa-6.40.0-orig/provider/server/ECServer.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/server/ECServer.cpp 2010-07-20 17:26:25.119624516 +0200
|
||||
@@ -670,6 +670,7 @@ int running_server(char *szName, char *s
|
||||
{ "deletegroup_script", "/etc/zarafa/userscripts/deletegroup", CONFIGSETTING_RELOADABLE},
|
||||
{ "createcompany_script", "/etc/zarafa/userscripts/createcompany", CONFIGSETTING_RELOADABLE },
|
||||
{ "deletecompany_script", "/etc/zarafa/userscripts/deletecompany", CONFIGSETTING_RELOADABLE },
|
||||
+ { "junklearn_script", "/etc/zarafa/userscripts/junklearn", CONFIGSETTING_RELOADABLE },
|
||||
{ "user_safe_mode", "no", CONFIGSETTING_RELOADABLE },
|
||||
|
||||
// Storename format
|
||||
@ -1,51 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh
|
||||
--- zarafa-6.40.6.orig//autoconf/ltmain.sh 2011-03-20 08:23:21.000000000 +0100
|
||||
+++ zarafa-6.40.6/autoconf/ltmain.sh 2011-03-20 08:24:23.000000000 +0100
|
||||
@@ -1628,7 +1628,7 @@
|
||||
elif test "X$arg" = "X-lc_r"; then
|
||||
case $host in
|
||||
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
|
||||
- # Do not include libc_r directly, use -pthread flag.
|
||||
+ # Do not include libc_r directly, use -lpthread flag.
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
@@ -1647,7 +1647,7 @@
|
||||
continue
|
||||
;;
|
||||
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
@@ -2150,7 +2150,7 @@
|
||||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac
|
||||
--- zarafa-6.40.6.orig//configure.ac 2011-03-20 08:23:20.000000000 +0100
|
||||
+++ zarafa-6.40.6/configure.ac 2011-03-20 08:23:44.000000000 +0100
|
||||
@@ -407,7 +407,7 @@
|
||||
CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX"
|
||||
fi
|
||||
# force add pthread in lucene test
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then
|
||||
AC_CHECK_LIB(clucene, [open],
|
||||
[ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a"
|
||||
@@ -561,7 +561,7 @@
|
||||
AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([required library libpthread missing or unusable]))
|
||||
LIBS=$libs_keep
|
||||
# because it seems this is better... (gnu c/c++ only?)
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
|
||||
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
|
||||
libs_keep=$LIBS
|
||||
@ -1,26 +0,0 @@
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.in
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.in
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.in
|
||||
@@ -274,7 +274,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.am
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.am
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.am
|
||||
@@ -18,7 +18,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
@ -1,24 +0,0 @@
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:38:31.435806562 +0300
|
||||
@@ -13,7 +13,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:38:22.475687815 +0300
|
||||
@@ -250,7 +250,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
all: all-am
|
||||
@ -1,44 +0,0 @@
|
||||
--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100
|
||||
+++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100
|
||||
@@ -34,7 +34,7 @@
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = php-ext
|
||||
-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \
|
||||
+DIST_COMMON = $(dist_data_DATA) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@@ -86,7 +86,7 @@
|
||||
DIST_SOURCES = $(mapi_la_SOURCES)
|
||||
dist_dataDATA_INSTALL = $(INSTALL_DATA)
|
||||
dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
|
||||
-DATA = $(dist_data_DATA) $(dist_sysconf_DATA)
|
||||
+DATA = $(dist_data_DATA)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@@ -406,23 +406,6 @@
|
||||
echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(datadir)/$$f"; \
|
||||
done
|
||||
-install-dist_sysconfDATA: $(dist_sysconf_DATA)
|
||||
- @$(NORMAL_INSTALL)
|
||||
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
-
|
||||
-uninstall-dist_sysconfDATA:
|
||||
- @$(NORMAL_UNINSTALL)
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
@ -1,69 +0,0 @@
|
||||
Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 6.40.0, which only
|
||||
removes the paths from autoconf/automake related files, that don't exist in the OSS
|
||||
version of Zarafa. Having these paths not removed causes autoreconf to fail, but a
|
||||
re-run of autoreconf is needed in order to get the rpaths completely out of all the
|
||||
libraries and binaries built during the make process.
|
||||
|
||||
forward patch by Mario Fetka <mario.fetka@gmail.com>
|
||||
|
||||
diff -uNr zarafa-6.40.10.orig//ECtools/Makefile.am zarafa-6.40.10/ECtools/Makefile.am
|
||||
--- zarafa-6.40.10.orig//ECtools/Makefile.am 2011-07-25 20:03:46.527000045 +0200
|
||||
+++ zarafa-6.40.10/ECtools/Makefile.am 2011-07-25 20:04:37.900000042 +0200
|
||||
@@ -1,10 +1,3 @@
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = zarafa-backup zarafa-report
|
||||
-if WITH_PYTHON
|
||||
-PROSUBS += za-extra
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
if WITH_TESTTOOLS
|
||||
TESTSUBS = ECTestTools
|
||||
endif
|
||||
diff -uNr zarafa-6.40.10.orig//Makefile.am zarafa-6.40.10/Makefile.am
|
||||
--- zarafa-6.40.10.orig//Makefile.am 2011-07-25 20:03:46.610000045 +0200
|
||||
+++ zarafa-6.40.10/Makefile.am 2011-07-25 20:05:12.960000054 +0200
|
||||
@@ -1,10 +1,6 @@
|
||||
AUTOMAKE_OPTIONS = 1.9 foreign
|
||||
ACLOCAL_AMFLAGS = -Iautoconf
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = liblicense licensed
|
||||
-endif
|
||||
-
|
||||
SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext ECtools spooler gateway caldav installer po doc
|
||||
|
||||
if WITH_SWIG
|
||||
@@ -26,10 +22,6 @@
|
||||
common/ecversion.h: versionheader.sh
|
||||
sh ${top_srcdir}/versionheader.sh > common/ecversion.h
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-CLEANFILES=common/ecversion.h
|
||||
-endif
|
||||
-
|
||||
dist-hook:
|
||||
find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
|
||||
if OSS_ONLY
|
||||
diff -uNr zarafa-6.40.10.orig//configure.ac zarafa-6.40.10/configure.ac
|
||||
--- zarafa-6.40.10.orig//configure.ac 2011-07-25 20:03:46.747000046 +0200
|
||||
+++ zarafa-6.40.10/configure.ac 2011-07-25 20:06:33.002000046 +0200
|
||||
@@ -819,18 +819,6 @@
|
||||
version
|
||||
specialbuild
|
||||
])
|
||||
-dnl non-oss files
|
||||
-if test -d `dirname $0`/licensed; then
|
||||
-AC_CONFIG_FILES([
|
||||
- liblicense/Makefile
|
||||
- licensed/Makefile
|
||||
- ECtools/zarafa-backup/Makefile
|
||||
- ECtools/zarafa-backup/helpers/Makefile
|
||||
- ECtools/zarafa-report/Makefile
|
||||
- debian/zarafa.install
|
||||
- ECtools/za-extra/Makefile
|
||||
-])
|
||||
-fi
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
Submitted By: Mario Fetka ( mario.fetka@gmaail.com)
|
||||
Date: 2010-10-11
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: on gentoo libtcmalloc_minimal is only provided as shared lib
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/configure.ac zarafa-6.40.2/configure.ac
|
||||
--- zarafa-6.40.2.orig/configure.ac 2010-10-11 18:39:35.000000000 +0000
|
||||
+++ zarafa-6.40.2/configure.ac 2010-10-11 18:40:03.000000000 +0000
|
||||
@@ -441,7 +441,7 @@
|
||||
AC_HELP_STRING([--with-tcmalloc-prefix=PATH],[path to tcmalloc lib, e.g. /usr/lib/]),
|
||||
[TCMALLOC_PREFIX=${withval}],[TCMALLOC_PREFIX=/usr/lib])
|
||||
AC_CHECK_LIB(tcmalloc_minimal, [open],
|
||||
- [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.a" ],
|
||||
+ [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" ],
|
||||
[ WITH_TCMALLOC=no ])
|
||||
AC_SUBST(TCMALLOC_LIBS)
|
||||
AC_LANG_POP
|
||||
@ -1,187 +0,0 @@
|
||||
Submitted By: Mario Fetka (mario.fetka@gmail.com)
|
||||
Date: 2010-10-13
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: gentoo specific
|
||||
Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/installer/linux/Makefile.am zarafa-6.40.2/installer/linux/Makefile.am
|
||||
--- zarafa-6.40.2.orig/installer/linux/Makefile.am 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/linux/Makefile.am 2010-10-13 08:28:26.000000000 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
sysconf_initdir=${sysconfdir}/init.d
|
||||
sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files}
|
||||
|
||||
-rhel_sysconfig_path = ${sysconfdir}/sysconfig
|
||||
+rhel_sysconfig_path = ${sysconfdir}/conf.d
|
||||
suse_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sles_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path}
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany zarafa-6.40.2/installer/userscripts/createcompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany 2010-10-13 08:26:53.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany.in zarafa-6.40.2/installer/userscripts/createcompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany.in 2010-10-13 08:27:00.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup zarafa-6.40.2/installer/userscripts/creategroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup 2010-10-13 08:27:04.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup.in zarafa-6.40.2/installer/userscripts/creategroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup.in 2010-10-13 08:27:08.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser zarafa-6.40.2/installer/userscripts/createuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser 2010-10-13 08:27:12.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser.in zarafa-6.40.2/installer/userscripts/createuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser.in 2010-10-13 08:27:17.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany zarafa-6.40.2/installer/userscripts/deletecompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany 2010-10-13 08:27:22.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany.in zarafa-6.40.2/installer/userscripts/deletecompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany.in 2010-10-13 08:27:26.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup zarafa-6.40.2/installer/userscripts/deletegroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup 2010-10-13 08:27:30.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup.in zarafa-6.40.2/installer/userscripts/deletegroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup.in 2010-10-13 08:27:35.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser zarafa-6.40.2/installer/userscripts/deleteuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser 2010-10-13 08:27:39.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/deleteuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser.in zarafa-6.40.2/installer/userscripts/deleteuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser.in 2010-10-13 08:27:43.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d
|
||||
@ -1,14 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp
|
||||
--- zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp 2011-03-20 23:50:06.000000000 +0100
|
||||
+++ zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp 2011-03-21 00:00:45.000000000 +0100
|
||||
@@ -343,6 +343,10 @@
|
||||
// this option was introduced in mysql 5.0, so let's not even try on 4.1 servers
|
||||
strQuery = "SET SESSION sql_mode = 'STRICT_ALL_TABLES'";
|
||||
Query(strQuery); // ignore error
|
||||
+
|
||||
+ // Latin1 is default charset
|
||||
+ strQuery = "SET NAMES 'latin1'";
|
||||
+ Query(strQuery);
|
||||
}
|
||||
|
||||
exit:
|
||||
@ -1,25 +0,0 @@
|
||||
diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp
|
||||
--- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000
|
||||
@@ -935,6 +935,7 @@
|
||||
{ "fax_domain", "", CONFIGSETTING_RELOADABLE },
|
||||
{ "fax_international", "+", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_delegates", "no", CONFIGSETTING_RELOADABLE },
|
||||
+ { "always_send_as", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_tnef", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE },
|
||||
diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp
|
||||
--- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000
|
||||
@@ -1949,6 +1949,10 @@
|
||||
HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b)
|
||||
{
|
||||
bAllowSendAs = true;
|
||||
+ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) {
|
||||
+ //use always_send_as to allow everybody to send as someone else.
|
||||
+ //(some users hate the 'on behalf of' text, and dont want to do the extra configuration)
|
||||
+ bAllowSendAs = true;
|
||||
} else {
|
||||
|
||||
hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner);
|
||||
@ -1,199 +0,0 @@
|
||||
diff -rupN zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp
|
||||
--- zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp 2010-07-20 17:22:07.995625072 +0200
|
||||
@@ -7244,6 +7244,166 @@ typedef struct{
|
||||
SOURCEKEY sSourceKey;
|
||||
SOURCEKEY sParentSourceKey;
|
||||
}COPYITEM;
|
||||
+//SPAM HOOK
|
||||
+//This function parses an e-mail to the /etc/zarafa/userscripts/junklearn script. With 2 arguments:
|
||||
+//ham or spam
|
||||
+//message id
|
||||
+//and pipes the mail header to the script.
|
||||
+//This script wil be inhaled by MoveObjects();
|
||||
+/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
+int SpamHook(ECDatabase *lpDatabase,int ulId,int ulDestFolderId)
|
||||
+{
|
||||
+
|
||||
+ ALLOC_DBRESULT();
|
||||
+ ECRESULT er = erSuccess;
|
||||
+ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script");
|
||||
+
|
||||
+ //If shScriptPath doesn't exist skip spam hook.
|
||||
+ if(fopen(shScriptPath.c_str(),"r")) {
|
||||
+
|
||||
+ //Get store object ID via message object id
|
||||
+ unsigned int storeId;
|
||||
+ er = g_lpSessionManager->GetCacheManager()->GetStore(ulId,&storeId,NULL);
|
||||
+ if(er != erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve source folder.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //get deleted items folder entry id
|
||||
+ strQuery="SELECT val_binary FROM properties WHERE hierarchyid="+stringify(storeId)+" AND tag="+stringify(PROP_ID(PR_IPM_WASTEBASKET_ENTRYID));
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'deleted items' entryid to objectid.
|
||||
+ entryId* wasteBucketEntryId = new entryId[0];
|
||||
+ wasteBucketEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ wasteBucketEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int wasteBucketFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(wasteBucketEntryId,&wasteBucketFolderId);
|
||||
+ delete wasteBucketEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get 'junk folder' entryId.
|
||||
+ strQuery="SELECT val_binary FROM receivefolder LEFT JOIN mvproperties ON receivefolder.objid=mvproperties.hierarchyid WHERE receivefolder.storeid="+stringify(storeId)+" AND receivefolder.messageclass='IPC' AND mvproperties.tag="+stringify(PROP_ID(PR_ADDITIONAL_REN_ENTRYIDS))+" AND mvproperties.orderid=4";
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryids from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'junk folder' entryid to objectid.
|
||||
+ entryId* junkFolderEntryId = new entryId[0];
|
||||
+ junkFolderEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ junkFolderEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int junkFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(junkFolderEntryId,&junkFolderId);
|
||||
+ delete junkFolderEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get source folder object ID. (Actually we should check if mail came from subfolders in the 'deleted items folder', which I think never happens.)
|
||||
+ unsigned int srcFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetParent(ulId,&srcFolderId);
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve src folder id.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Check if object is ham or spam
|
||||
+ string shMailStatus;
|
||||
+ //if destination folder is junk, mark as spam
|
||||
+ if(ulDestFolderId==junkFolderId)
|
||||
+ shMailStatus="spam";
|
||||
+ else
|
||||
+ {
|
||||
+ //if destination folder is not TRASH and de source folder is JUNK, mark as ham
|
||||
+ if(ulDestFolderId!=wasteBucketFolderId && srcFolderId==junkFolderId)
|
||||
+ shMailStatus="ham";
|
||||
+ }
|
||||
+
|
||||
+ //Only call hook script if the mail is marked as ham or spam.
|
||||
+ if(!shMailStatus.empty()) {
|
||||
+
|
||||
+ //Get the mail from the DB.
|
||||
+ strQuery="SELECT val_string FROM properties WHERE tag="+stringify(PROP_ID(PR_TRANSPORT_MESSAGE_HEADERS))+" AND hierarchyid= "+stringify(ulId);
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: db error while retrieve mail header.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+
|
||||
+ if(shNumRows>0) {
|
||||
+
|
||||
+ // Execute the hook:
|
||||
+ FILE *shFilePtr;
|
||||
+ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId);
|
||||
+ shFilePtr=popen(shScriptPath.c_str(),"w");
|
||||
+ fputs(lpDBRow[0],shFilePtr);
|
||||
+ int shExitCode=pclose(shFilePtr);
|
||||
+ if(!WIFEXITED(shExitCode)) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: "+shScriptPath+" was terminated abnormally.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ //If script exit with non 0, exit..
|
||||
+ if(WEXITSTATUS(shExitCode)!=0) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(shExitCode));
|
||||
+ er=ZARAFA_E_UNKNOWN;
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed.");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail");
|
||||
+ }
|
||||
+
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+ }
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+exit:
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ return er;
|
||||
+}
|
||||
+
|
||||
|
||||
// Move one or more messages and/or moved a softdeleted message to a normal message
|
||||
ECRESULT MoveObjects(ECSession *lpSession, ECDatabase *lpDatabase, ECListInt* lplObjectIds, unsigned int ulDestFolderId, unsigned int ulSyncId)
|
||||
@@ -8096,6 +8256,17 @@ SOAP_ENTRY_START5(copyObjects, *result,
|
||||
|
||||
// @note The object type checking wille be done in MoveObjects or CopyObject
|
||||
|
||||
+//SPAMHOOK
|
||||
+/////////////////////////////////////
|
||||
+ //Iterate over all mail ids and initiate spamhook.
|
||||
+ for(iObjectId = lObjectIds.begin(); iObjectId != lObjectIds.end(); iObjectId++)
|
||||
+ {
|
||||
+ //Ignore the result
|
||||
+ int shResult=SpamHook(lpDatabase,*iObjectId,ulDestFolderId);
|
||||
+ }
|
||||
+//SPAMHOOK END
|
||||
+////////////////////////////////////
|
||||
+
|
||||
//check copy or a move
|
||||
if(ulFlags & FOLDER_MOVE ) { // A move
|
||||
er = MoveObjects(lpecSession, lpDatabase, &lObjectIds, ulDestFolderId, ulSyncId);
|
||||
diff -rupN zarafa-6.40.0-orig/provider/server/ECServer.cpp zarafa-6.40.0/provider/server/ECServer.cpp
|
||||
--- zarafa-6.40.0-orig/provider/server/ECServer.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/server/ECServer.cpp 2010-07-20 17:26:25.119624516 +0200
|
||||
@@ -670,6 +670,7 @@ int running_server(char *szName, char *s
|
||||
{ "deletegroup_script", "/etc/zarafa/userscripts/deletegroup", CONFIGSETTING_RELOADABLE},
|
||||
{ "createcompany_script", "/etc/zarafa/userscripts/createcompany", CONFIGSETTING_RELOADABLE },
|
||||
{ "deletecompany_script", "/etc/zarafa/userscripts/deletecompany", CONFIGSETTING_RELOADABLE },
|
||||
+ { "junklearn_script", "/etc/zarafa/userscripts/junklearn", CONFIGSETTING_RELOADABLE },
|
||||
{ "user_safe_mode", "no", CONFIGSETTING_RELOADABLE },
|
||||
|
||||
// Storename format
|
||||
@ -1,51 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh
|
||||
--- zarafa-6.40.6.orig//autoconf/ltmain.sh 2011-03-20 08:23:21.000000000 +0100
|
||||
+++ zarafa-6.40.6/autoconf/ltmain.sh 2011-03-20 08:24:23.000000000 +0100
|
||||
@@ -1628,7 +1628,7 @@
|
||||
elif test "X$arg" = "X-lc_r"; then
|
||||
case $host in
|
||||
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
|
||||
- # Do not include libc_r directly, use -pthread flag.
|
||||
+ # Do not include libc_r directly, use -lpthread flag.
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
@@ -1647,7 +1647,7 @@
|
||||
continue
|
||||
;;
|
||||
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
@@ -2150,7 +2150,7 @@
|
||||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac
|
||||
--- zarafa-6.40.6.orig//configure.ac 2011-03-20 08:23:20.000000000 +0100
|
||||
+++ zarafa-6.40.6/configure.ac 2011-03-20 08:23:44.000000000 +0100
|
||||
@@ -407,7 +407,7 @@
|
||||
CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX"
|
||||
fi
|
||||
# force add pthread in lucene test
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then
|
||||
AC_CHECK_LIB(clucene, [open],
|
||||
[ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a"
|
||||
@@ -561,7 +561,7 @@
|
||||
AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([required library libpthread missing or unusable]))
|
||||
LIBS=$libs_keep
|
||||
# because it seems this is better... (gnu c/c++ only?)
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
|
||||
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
|
||||
libs_keep=$LIBS
|
||||
@ -1,26 +0,0 @@
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.in
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.in
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.in
|
||||
@@ -274,7 +274,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.am
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.am
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.am
|
||||
@@ -18,7 +18,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
@ -1,24 +0,0 @@
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:38:31.435806562 +0300
|
||||
@@ -13,7 +13,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:38:22.475687815 +0300
|
||||
@@ -250,7 +250,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
all: all-am
|
||||
@ -1,44 +0,0 @@
|
||||
--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100
|
||||
+++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100
|
||||
@@ -34,7 +34,7 @@
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = php-ext
|
||||
-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \
|
||||
+DIST_COMMON = $(dist_data_DATA) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@@ -86,7 +86,7 @@
|
||||
DIST_SOURCES = $(mapi_la_SOURCES)
|
||||
dist_dataDATA_INSTALL = $(INSTALL_DATA)
|
||||
dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
|
||||
-DATA = $(dist_data_DATA) $(dist_sysconf_DATA)
|
||||
+DATA = $(dist_data_DATA)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@@ -406,23 +406,6 @@
|
||||
echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(datadir)/$$f"; \
|
||||
done
|
||||
-install-dist_sysconfDATA: $(dist_sysconf_DATA)
|
||||
- @$(NORMAL_INSTALL)
|
||||
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
-
|
||||
-uninstall-dist_sysconfDATA:
|
||||
- @$(NORMAL_UNINSTALL)
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
@ -1,69 +0,0 @@
|
||||
Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 6.40.0, which only
|
||||
removes the paths from autoconf/automake related files, that don't exist in the OSS
|
||||
version of Zarafa. Having these paths not removed causes autoreconf to fail, but a
|
||||
re-run of autoreconf is needed in order to get the rpaths completely out of all the
|
||||
libraries and binaries built during the make process.
|
||||
|
||||
forward patch by Mario Fetka <mario.fetka@gmail.com>
|
||||
|
||||
diff -uNr zarafa-6.40.10.orig//ECtools/Makefile.am zarafa-6.40.10/ECtools/Makefile.am
|
||||
--- zarafa-6.40.10.orig//ECtools/Makefile.am 2011-07-25 20:03:46.527000045 +0200
|
||||
+++ zarafa-6.40.10/ECtools/Makefile.am 2011-07-25 20:04:37.900000042 +0200
|
||||
@@ -1,10 +1,3 @@
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = zarafa-backup zarafa-report
|
||||
-if WITH_PYTHON
|
||||
-PROSUBS += za-extra
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
if WITH_TESTTOOLS
|
||||
TESTSUBS = ECTestTools
|
||||
endif
|
||||
diff -uNr zarafa-6.40.10.orig//Makefile.am zarafa-6.40.10/Makefile.am
|
||||
--- zarafa-6.40.10.orig//Makefile.am 2011-07-25 20:03:46.610000045 +0200
|
||||
+++ zarafa-6.40.10/Makefile.am 2011-07-25 20:05:12.960000054 +0200
|
||||
@@ -1,10 +1,6 @@
|
||||
AUTOMAKE_OPTIONS = 1.9 foreign
|
||||
ACLOCAL_AMFLAGS = -Iautoconf
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = liblicense licensed
|
||||
-endif
|
||||
-
|
||||
SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext ECtools spooler gateway caldav installer po doc
|
||||
|
||||
if WITH_SWIG
|
||||
@@ -26,10 +22,6 @@
|
||||
common/ecversion.h: versionheader.sh
|
||||
sh ${top_srcdir}/versionheader.sh > common/ecversion.h
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-CLEANFILES=common/ecversion.h
|
||||
-endif
|
||||
-
|
||||
dist-hook:
|
||||
find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
|
||||
if OSS_ONLY
|
||||
diff -uNr zarafa-6.40.10.orig//configure.ac zarafa-6.40.10/configure.ac
|
||||
--- zarafa-6.40.10.orig//configure.ac 2011-07-25 20:03:46.747000046 +0200
|
||||
+++ zarafa-6.40.10/configure.ac 2011-07-25 20:06:33.002000046 +0200
|
||||
@@ -819,18 +819,6 @@
|
||||
version
|
||||
specialbuild
|
||||
])
|
||||
-dnl non-oss files
|
||||
-if test -d `dirname $0`/licensed; then
|
||||
-AC_CONFIG_FILES([
|
||||
- liblicense/Makefile
|
||||
- licensed/Makefile
|
||||
- ECtools/zarafa-backup/Makefile
|
||||
- ECtools/zarafa-backup/helpers/Makefile
|
||||
- ECtools/zarafa-report/Makefile
|
||||
- debian/zarafa.install
|
||||
- ECtools/za-extra/Makefile
|
||||
-])
|
||||
-fi
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
Submitted By: Mario Fetka ( mario.fetka@gmaail.com)
|
||||
Date: 2010-10-11
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: on gentoo libtcmalloc_minimal is only provided as shared lib
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/configure.ac zarafa-6.40.2/configure.ac
|
||||
--- zarafa-6.40.2.orig/configure.ac 2010-10-11 18:39:35.000000000 +0000
|
||||
+++ zarafa-6.40.2/configure.ac 2010-10-11 18:40:03.000000000 +0000
|
||||
@@ -441,7 +441,7 @@
|
||||
AC_HELP_STRING([--with-tcmalloc-prefix=PATH],[path to tcmalloc lib, e.g. /usr/lib/]),
|
||||
[TCMALLOC_PREFIX=${withval}],[TCMALLOC_PREFIX=/usr/lib])
|
||||
AC_CHECK_LIB(tcmalloc_minimal, [open],
|
||||
- [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.a" ],
|
||||
+ [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" ],
|
||||
[ WITH_TCMALLOC=no ])
|
||||
AC_SUBST(TCMALLOC_LIBS)
|
||||
AC_LANG_POP
|
||||
@ -1,187 +0,0 @@
|
||||
Submitted By: Mario Fetka (mario.fetka@gmail.com)
|
||||
Date: 2010-10-13
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: gentoo specific
|
||||
Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/installer/linux/Makefile.am zarafa-6.40.2/installer/linux/Makefile.am
|
||||
--- zarafa-6.40.2.orig/installer/linux/Makefile.am 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/linux/Makefile.am 2010-10-13 08:28:26.000000000 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
sysconf_initdir=${sysconfdir}/init.d
|
||||
sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files}
|
||||
|
||||
-rhel_sysconfig_path = ${sysconfdir}/sysconfig
|
||||
+rhel_sysconfig_path = ${sysconfdir}/conf.d
|
||||
suse_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sles_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path}
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany zarafa-6.40.2/installer/userscripts/createcompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany 2010-10-13 08:26:53.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany.in zarafa-6.40.2/installer/userscripts/createcompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany.in 2010-10-13 08:27:00.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup zarafa-6.40.2/installer/userscripts/creategroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup 2010-10-13 08:27:04.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup.in zarafa-6.40.2/installer/userscripts/creategroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup.in 2010-10-13 08:27:08.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser zarafa-6.40.2/installer/userscripts/createuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser 2010-10-13 08:27:12.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser.in zarafa-6.40.2/installer/userscripts/createuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser.in 2010-10-13 08:27:17.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany zarafa-6.40.2/installer/userscripts/deletecompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany 2010-10-13 08:27:22.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany.in zarafa-6.40.2/installer/userscripts/deletecompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany.in 2010-10-13 08:27:26.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup zarafa-6.40.2/installer/userscripts/deletegroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup 2010-10-13 08:27:30.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup.in zarafa-6.40.2/installer/userscripts/deletegroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup.in 2010-10-13 08:27:35.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser zarafa-6.40.2/installer/userscripts/deleteuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser 2010-10-13 08:27:39.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/deleteuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser.in zarafa-6.40.2/installer/userscripts/deleteuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser.in 2010-10-13 08:27:43.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d
|
||||
@ -1,14 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp
|
||||
--- zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp 2011-03-20 23:50:06.000000000 +0100
|
||||
+++ zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp 2011-03-21 00:00:45.000000000 +0100
|
||||
@@ -343,6 +343,10 @@
|
||||
// this option was introduced in mysql 5.0, so let's not even try on 4.1 servers
|
||||
strQuery = "SET SESSION sql_mode = 'STRICT_ALL_TABLES'";
|
||||
Query(strQuery); // ignore error
|
||||
+
|
||||
+ // Latin1 is default charset
|
||||
+ strQuery = "SET NAMES 'latin1'";
|
||||
+ Query(strQuery);
|
||||
}
|
||||
|
||||
exit:
|
||||
@ -1,25 +0,0 @@
|
||||
diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp
|
||||
--- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000
|
||||
@@ -935,6 +935,7 @@
|
||||
{ "fax_domain", "", CONFIGSETTING_RELOADABLE },
|
||||
{ "fax_international", "+", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_delegates", "no", CONFIGSETTING_RELOADABLE },
|
||||
+ { "always_send_as", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_tnef", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE },
|
||||
diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp
|
||||
--- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000
|
||||
@@ -1949,6 +1949,10 @@
|
||||
HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b)
|
||||
{
|
||||
bAllowSendAs = true;
|
||||
+ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) {
|
||||
+ //use always_send_as to allow everybody to send as someone else.
|
||||
+ //(some users hate the 'on behalf of' text, and dont want to do the extra configuration)
|
||||
+ bAllowSendAs = true;
|
||||
} else {
|
||||
|
||||
hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner);
|
||||
@ -1,199 +0,0 @@
|
||||
diff -rupN zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp
|
||||
--- zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp 2010-07-20 17:22:07.995625072 +0200
|
||||
@@ -7244,6 +7244,166 @@ typedef struct{
|
||||
SOURCEKEY sSourceKey;
|
||||
SOURCEKEY sParentSourceKey;
|
||||
}COPYITEM;
|
||||
+//SPAM HOOK
|
||||
+//This function parses an e-mail to the /etc/zarafa/userscripts/junklearn script. With 2 arguments:
|
||||
+//ham or spam
|
||||
+//message id
|
||||
+//and pipes the mail header to the script.
|
||||
+//This script wil be inhaled by MoveObjects();
|
||||
+/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
+int SpamHook(ECDatabase *lpDatabase,int ulId,int ulDestFolderId)
|
||||
+{
|
||||
+
|
||||
+ ALLOC_DBRESULT();
|
||||
+ ECRESULT er = erSuccess;
|
||||
+ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script");
|
||||
+
|
||||
+ //If shScriptPath doesn't exist skip spam hook.
|
||||
+ if(fopen(shScriptPath.c_str(),"r")) {
|
||||
+
|
||||
+ //Get store object ID via message object id
|
||||
+ unsigned int storeId;
|
||||
+ er = g_lpSessionManager->GetCacheManager()->GetStore(ulId,&storeId,NULL);
|
||||
+ if(er != erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve source folder.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //get deleted items folder entry id
|
||||
+ strQuery="SELECT val_binary FROM properties WHERE hierarchyid="+stringify(storeId)+" AND tag="+stringify(PROP_ID(PR_IPM_WASTEBASKET_ENTRYID));
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'deleted items' entryid to objectid.
|
||||
+ entryId* wasteBucketEntryId = new entryId[0];
|
||||
+ wasteBucketEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ wasteBucketEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int wasteBucketFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(wasteBucketEntryId,&wasteBucketFolderId);
|
||||
+ delete wasteBucketEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get 'junk folder' entryId.
|
||||
+ strQuery="SELECT val_binary FROM receivefolder LEFT JOIN mvproperties ON receivefolder.objid=mvproperties.hierarchyid WHERE receivefolder.storeid="+stringify(storeId)+" AND receivefolder.messageclass='IPC' AND mvproperties.tag="+stringify(PROP_ID(PR_ADDITIONAL_REN_ENTRYIDS))+" AND mvproperties.orderid=4";
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryids from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'junk folder' entryid to objectid.
|
||||
+ entryId* junkFolderEntryId = new entryId[0];
|
||||
+ junkFolderEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ junkFolderEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int junkFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(junkFolderEntryId,&junkFolderId);
|
||||
+ delete junkFolderEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get source folder object ID. (Actually we should check if mail came from subfolders in the 'deleted items folder', which I think never happens.)
|
||||
+ unsigned int srcFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetParent(ulId,&srcFolderId);
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve src folder id.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Check if object is ham or spam
|
||||
+ string shMailStatus;
|
||||
+ //if destination folder is junk, mark as spam
|
||||
+ if(ulDestFolderId==junkFolderId)
|
||||
+ shMailStatus="spam";
|
||||
+ else
|
||||
+ {
|
||||
+ //if destination folder is not TRASH and de source folder is JUNK, mark as ham
|
||||
+ if(ulDestFolderId!=wasteBucketFolderId && srcFolderId==junkFolderId)
|
||||
+ shMailStatus="ham";
|
||||
+ }
|
||||
+
|
||||
+ //Only call hook script if the mail is marked as ham or spam.
|
||||
+ if(!shMailStatus.empty()) {
|
||||
+
|
||||
+ //Get the mail from the DB.
|
||||
+ strQuery="SELECT val_string FROM properties WHERE tag="+stringify(PROP_ID(PR_TRANSPORT_MESSAGE_HEADERS))+" AND hierarchyid= "+stringify(ulId);
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: db error while retrieve mail header.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+
|
||||
+ if(shNumRows>0) {
|
||||
+
|
||||
+ // Execute the hook:
|
||||
+ FILE *shFilePtr;
|
||||
+ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId);
|
||||
+ shFilePtr=popen(shScriptPath.c_str(),"w");
|
||||
+ fputs(lpDBRow[0],shFilePtr);
|
||||
+ int shExitCode=pclose(shFilePtr);
|
||||
+ if(!WIFEXITED(shExitCode)) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: "+shScriptPath+" was terminated abnormally.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ //If script exit with non 0, exit..
|
||||
+ if(WEXITSTATUS(shExitCode)!=0) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(shExitCode));
|
||||
+ er=ZARAFA_E_UNKNOWN;
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed.");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail");
|
||||
+ }
|
||||
+
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+ }
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+exit:
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ return er;
|
||||
+}
|
||||
+
|
||||
|
||||
// Move one or more messages and/or moved a softdeleted message to a normal message
|
||||
ECRESULT MoveObjects(ECSession *lpSession, ECDatabase *lpDatabase, ECListInt* lplObjectIds, unsigned int ulDestFolderId, unsigned int ulSyncId)
|
||||
@@ -8096,6 +8256,17 @@ SOAP_ENTRY_START5(copyObjects, *result,
|
||||
|
||||
// @note The object type checking wille be done in MoveObjects or CopyObject
|
||||
|
||||
+//SPAMHOOK
|
||||
+/////////////////////////////////////
|
||||
+ //Iterate over all mail ids and initiate spamhook.
|
||||
+ for(iObjectId = lObjectIds.begin(); iObjectId != lObjectIds.end(); iObjectId++)
|
||||
+ {
|
||||
+ //Ignore the result
|
||||
+ int shResult=SpamHook(lpDatabase,*iObjectId,ulDestFolderId);
|
||||
+ }
|
||||
+//SPAMHOOK END
|
||||
+////////////////////////////////////
|
||||
+
|
||||
//check copy or a move
|
||||
if(ulFlags & FOLDER_MOVE ) { // A move
|
||||
er = MoveObjects(lpecSession, lpDatabase, &lObjectIds, ulDestFolderId, ulSyncId);
|
||||
diff -rupN zarafa-6.40.0-orig/provider/server/ECServer.cpp zarafa-6.40.0/provider/server/ECServer.cpp
|
||||
--- zarafa-6.40.0-orig/provider/server/ECServer.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/server/ECServer.cpp 2010-07-20 17:26:25.119624516 +0200
|
||||
@@ -670,6 +670,7 @@ int running_server(char *szName, char *s
|
||||
{ "deletegroup_script", "/etc/zarafa/userscripts/deletegroup", CONFIGSETTING_RELOADABLE},
|
||||
{ "createcompany_script", "/etc/zarafa/userscripts/createcompany", CONFIGSETTING_RELOADABLE },
|
||||
{ "deletecompany_script", "/etc/zarafa/userscripts/deletecompany", CONFIGSETTING_RELOADABLE },
|
||||
+ { "junklearn_script", "/etc/zarafa/userscripts/junklearn", CONFIGSETTING_RELOADABLE },
|
||||
{ "user_safe_mode", "no", CONFIGSETTING_RELOADABLE },
|
||||
|
||||
// Storename format
|
||||
@ -1,51 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh
|
||||
--- zarafa-6.40.6.orig//autoconf/ltmain.sh 2011-03-20 08:23:21.000000000 +0100
|
||||
+++ zarafa-6.40.6/autoconf/ltmain.sh 2011-03-20 08:24:23.000000000 +0100
|
||||
@@ -1628,7 +1628,7 @@
|
||||
elif test "X$arg" = "X-lc_r"; then
|
||||
case $host in
|
||||
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
|
||||
- # Do not include libc_r directly, use -pthread flag.
|
||||
+ # Do not include libc_r directly, use -lpthread flag.
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
@@ -1647,7 +1647,7 @@
|
||||
continue
|
||||
;;
|
||||
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
@@ -2150,7 +2150,7 @@
|
||||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac
|
||||
--- zarafa-6.40.6.orig//configure.ac 2011-03-20 08:23:20.000000000 +0100
|
||||
+++ zarafa-6.40.6/configure.ac 2011-03-20 08:23:44.000000000 +0100
|
||||
@@ -407,7 +407,7 @@
|
||||
CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX"
|
||||
fi
|
||||
# force add pthread in lucene test
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then
|
||||
AC_CHECK_LIB(clucene, [open],
|
||||
[ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a"
|
||||
@@ -561,7 +561,7 @@
|
||||
AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([required library libpthread missing or unusable]))
|
||||
LIBS=$libs_keep
|
||||
# because it seems this is better... (gnu c/c++ only?)
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
|
||||
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
|
||||
libs_keep=$LIBS
|
||||
@ -1,26 +0,0 @@
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.in
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.in
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.in
|
||||
@@ -274,7 +274,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.am
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.am
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.am
|
||||
@@ -18,7 +18,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
@ -1,24 +0,0 @@
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:38:31.435806562 +0300
|
||||
@@ -13,7 +13,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:38:22.475687815 +0300
|
||||
@@ -250,7 +250,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
all: all-am
|
||||
@ -1,44 +0,0 @@
|
||||
--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100
|
||||
+++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100
|
||||
@@ -34,7 +34,7 @@
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = php-ext
|
||||
-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \
|
||||
+DIST_COMMON = $(dist_data_DATA) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@@ -86,7 +86,7 @@
|
||||
DIST_SOURCES = $(mapi_la_SOURCES)
|
||||
dist_dataDATA_INSTALL = $(INSTALL_DATA)
|
||||
dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
|
||||
-DATA = $(dist_data_DATA) $(dist_sysconf_DATA)
|
||||
+DATA = $(dist_data_DATA)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@@ -406,23 +406,6 @@
|
||||
echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(datadir)/$$f"; \
|
||||
done
|
||||
-install-dist_sysconfDATA: $(dist_sysconf_DATA)
|
||||
- @$(NORMAL_INSTALL)
|
||||
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
-
|
||||
-uninstall-dist_sysconfDATA:
|
||||
- @$(NORMAL_UNINSTALL)
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
@ -1,69 +0,0 @@
|
||||
Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 6.40.0, which only
|
||||
removes the paths from autoconf/automake related files, that don't exist in the OSS
|
||||
version of Zarafa. Having these paths not removed causes autoreconf to fail, but a
|
||||
re-run of autoreconf is needed in order to get the rpaths completely out of all the
|
||||
libraries and binaries built during the make process.
|
||||
|
||||
forward patch by Mario Fetka <mario.fetka@gmail.com>
|
||||
|
||||
diff -uNr zarafa-6.40.10.orig//ECtools/Makefile.am zarafa-6.40.10/ECtools/Makefile.am
|
||||
--- zarafa-6.40.10.orig//ECtools/Makefile.am 2011-07-25 20:03:46.527000045 +0200
|
||||
+++ zarafa-6.40.10/ECtools/Makefile.am 2011-07-25 20:04:37.900000042 +0200
|
||||
@@ -1,10 +1,3 @@
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = zarafa-backup zarafa-report
|
||||
-if WITH_PYTHON
|
||||
-PROSUBS += za-extra
|
||||
-endif
|
||||
-endif
|
||||
-
|
||||
if WITH_TESTTOOLS
|
||||
TESTSUBS = ECTestTools
|
||||
endif
|
||||
diff -uNr zarafa-6.40.10.orig//Makefile.am zarafa-6.40.10/Makefile.am
|
||||
--- zarafa-6.40.10.orig//Makefile.am 2011-07-25 20:03:46.610000045 +0200
|
||||
+++ zarafa-6.40.10/Makefile.am 2011-07-25 20:05:12.960000054 +0200
|
||||
@@ -1,10 +1,6 @@
|
||||
AUTOMAKE_OPTIONS = 1.9 foreign
|
||||
ACLOCAL_AMFLAGS = -Iautoconf
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = liblicense licensed
|
||||
-endif
|
||||
-
|
||||
SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext ECtools spooler gateway caldav installer po doc
|
||||
|
||||
if WITH_SWIG
|
||||
@@ -26,10 +22,6 @@
|
||||
common/ecversion.h: versionheader.sh
|
||||
sh ${top_srcdir}/versionheader.sh > common/ecversion.h
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-CLEANFILES=common/ecversion.h
|
||||
-endif
|
||||
-
|
||||
dist-hook:
|
||||
find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
|
||||
if OSS_ONLY
|
||||
diff -uNr zarafa-6.40.10.orig//configure.ac zarafa-6.40.10/configure.ac
|
||||
--- zarafa-6.40.10.orig//configure.ac 2011-07-25 20:03:46.747000046 +0200
|
||||
+++ zarafa-6.40.10/configure.ac 2011-07-25 20:06:33.002000046 +0200
|
||||
@@ -819,18 +819,6 @@
|
||||
version
|
||||
specialbuild
|
||||
])
|
||||
-dnl non-oss files
|
||||
-if test -d `dirname $0`/licensed; then
|
||||
-AC_CONFIG_FILES([
|
||||
- liblicense/Makefile
|
||||
- licensed/Makefile
|
||||
- ECtools/zarafa-backup/Makefile
|
||||
- ECtools/zarafa-backup/helpers/Makefile
|
||||
- ECtools/zarafa-report/Makefile
|
||||
- debian/zarafa.install
|
||||
- ECtools/za-extra/Makefile
|
||||
-])
|
||||
-fi
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
Submitted By: Mario Fetka ( mario.fetka@gmaail.com)
|
||||
Date: 2010-10-11
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: on gentoo libtcmalloc_minimal is only provided as shared lib
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/configure.ac zarafa-6.40.2/configure.ac
|
||||
--- zarafa-6.40.2.orig/configure.ac 2010-10-11 18:39:35.000000000 +0000
|
||||
+++ zarafa-6.40.2/configure.ac 2010-10-11 18:40:03.000000000 +0000
|
||||
@@ -441,7 +441,7 @@
|
||||
AC_HELP_STRING([--with-tcmalloc-prefix=PATH],[path to tcmalloc lib, e.g. /usr/lib/]),
|
||||
[TCMALLOC_PREFIX=${withval}],[TCMALLOC_PREFIX=/usr/lib])
|
||||
AC_CHECK_LIB(tcmalloc_minimal, [open],
|
||||
- [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.a" ],
|
||||
+ [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" ],
|
||||
[ WITH_TCMALLOC=no ])
|
||||
AC_SUBST(TCMALLOC_LIBS)
|
||||
AC_LANG_POP
|
||||
@ -1,187 +0,0 @@
|
||||
Submitted By: Mario Fetka (mario.fetka@gmail.com)
|
||||
Date: 2010-10-13
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: gentoo specific
|
||||
Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/installer/linux/Makefile.am zarafa-6.40.2/installer/linux/Makefile.am
|
||||
--- zarafa-6.40.2.orig/installer/linux/Makefile.am 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/linux/Makefile.am 2010-10-13 08:28:26.000000000 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
sysconf_initdir=${sysconfdir}/init.d
|
||||
sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files}
|
||||
|
||||
-rhel_sysconfig_path = ${sysconfdir}/sysconfig
|
||||
+rhel_sysconfig_path = ${sysconfdir}/conf.d
|
||||
suse_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sles_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path}
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany zarafa-6.40.2/installer/userscripts/createcompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany 2010-10-13 08:26:53.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany.in zarafa-6.40.2/installer/userscripts/createcompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany.in 2010-10-13 08:27:00.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup zarafa-6.40.2/installer/userscripts/creategroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup 2010-10-13 08:27:04.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup.in zarafa-6.40.2/installer/userscripts/creategroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup.in 2010-10-13 08:27:08.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser zarafa-6.40.2/installer/userscripts/createuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser 2010-10-13 08:27:12.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser.in zarafa-6.40.2/installer/userscripts/createuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser.in 2010-10-13 08:27:17.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany zarafa-6.40.2/installer/userscripts/deletecompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany 2010-10-13 08:27:22.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany.in zarafa-6.40.2/installer/userscripts/deletecompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany.in 2010-10-13 08:27:26.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup zarafa-6.40.2/installer/userscripts/deletegroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup 2010-10-13 08:27:30.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup.in zarafa-6.40.2/installer/userscripts/deletegroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup.in 2010-10-13 08:27:35.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser zarafa-6.40.2/installer/userscripts/deleteuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser 2010-10-13 08:27:39.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/deleteuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser.in zarafa-6.40.2/installer/userscripts/deleteuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser.in 2010-10-13 08:27:43.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d
|
||||
@ -1,14 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp
|
||||
--- zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp 2011-03-20 23:50:06.000000000 +0100
|
||||
+++ zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp 2011-03-21 00:00:45.000000000 +0100
|
||||
@@ -343,6 +343,10 @@
|
||||
// this option was introduced in mysql 5.0, so let's not even try on 4.1 servers
|
||||
strQuery = "SET SESSION sql_mode = 'STRICT_ALL_TABLES'";
|
||||
Query(strQuery); // ignore error
|
||||
+
|
||||
+ // Latin1 is default charset
|
||||
+ strQuery = "SET NAMES 'latin1'";
|
||||
+ Query(strQuery);
|
||||
}
|
||||
|
||||
exit:
|
||||
@ -1,25 +0,0 @@
|
||||
diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp
|
||||
--- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000
|
||||
@@ -935,6 +935,7 @@
|
||||
{ "fax_domain", "", CONFIGSETTING_RELOADABLE },
|
||||
{ "fax_international", "+", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_delegates", "no", CONFIGSETTING_RELOADABLE },
|
||||
+ { "always_send_as", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_tnef", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE },
|
||||
diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp
|
||||
--- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000
|
||||
@@ -1949,6 +1949,10 @@
|
||||
HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b)
|
||||
{
|
||||
bAllowSendAs = true;
|
||||
+ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) {
|
||||
+ //use always_send_as to allow everybody to send as someone else.
|
||||
+ //(some users hate the 'on behalf of' text, and dont want to do the extra configuration)
|
||||
+ bAllowSendAs = true;
|
||||
} else {
|
||||
|
||||
hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner);
|
||||
@ -1,199 +0,0 @@
|
||||
diff -rupN zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp
|
||||
--- zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp 2010-07-20 17:22:07.995625072 +0200
|
||||
@@ -7244,6 +7244,166 @@ typedef struct{
|
||||
SOURCEKEY sSourceKey;
|
||||
SOURCEKEY sParentSourceKey;
|
||||
}COPYITEM;
|
||||
+//SPAM HOOK
|
||||
+//This function parses an e-mail to the /etc/zarafa/userscripts/junklearn script. With 2 arguments:
|
||||
+//ham or spam
|
||||
+//message id
|
||||
+//and pipes the mail header to the script.
|
||||
+//This script wil be inhaled by MoveObjects();
|
||||
+/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
+int SpamHook(ECDatabase *lpDatabase,int ulId,int ulDestFolderId)
|
||||
+{
|
||||
+
|
||||
+ ALLOC_DBRESULT();
|
||||
+ ECRESULT er = erSuccess;
|
||||
+ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script");
|
||||
+
|
||||
+ //If shScriptPath doesn't exist skip spam hook.
|
||||
+ if(fopen(shScriptPath.c_str(),"r")) {
|
||||
+
|
||||
+ //Get store object ID via message object id
|
||||
+ unsigned int storeId;
|
||||
+ er = g_lpSessionManager->GetCacheManager()->GetStore(ulId,&storeId,NULL);
|
||||
+ if(er != erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve source folder.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //get deleted items folder entry id
|
||||
+ strQuery="SELECT val_binary FROM properties WHERE hierarchyid="+stringify(storeId)+" AND tag="+stringify(PROP_ID(PR_IPM_WASTEBASKET_ENTRYID));
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'deleted items' entryid to objectid.
|
||||
+ entryId* wasteBucketEntryId = new entryId[0];
|
||||
+ wasteBucketEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ wasteBucketEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int wasteBucketFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(wasteBucketEntryId,&wasteBucketFolderId);
|
||||
+ delete wasteBucketEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get 'junk folder' entryId.
|
||||
+ strQuery="SELECT val_binary FROM receivefolder LEFT JOIN mvproperties ON receivefolder.objid=mvproperties.hierarchyid WHERE receivefolder.storeid="+stringify(storeId)+" AND receivefolder.messageclass='IPC' AND mvproperties.tag="+stringify(PROP_ID(PR_ADDITIONAL_REN_ENTRYIDS))+" AND mvproperties.orderid=4";
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryids from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'junk folder' entryid to objectid.
|
||||
+ entryId* junkFolderEntryId = new entryId[0];
|
||||
+ junkFolderEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ junkFolderEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int junkFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(junkFolderEntryId,&junkFolderId);
|
||||
+ delete junkFolderEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get source folder object ID. (Actually we should check if mail came from subfolders in the 'deleted items folder', which I think never happens.)
|
||||
+ unsigned int srcFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetParent(ulId,&srcFolderId);
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve src folder id.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Check if object is ham or spam
|
||||
+ string shMailStatus;
|
||||
+ //if destination folder is junk, mark as spam
|
||||
+ if(ulDestFolderId==junkFolderId)
|
||||
+ shMailStatus="spam";
|
||||
+ else
|
||||
+ {
|
||||
+ //if destination folder is not TRASH and de source folder is JUNK, mark as ham
|
||||
+ if(ulDestFolderId!=wasteBucketFolderId && srcFolderId==junkFolderId)
|
||||
+ shMailStatus="ham";
|
||||
+ }
|
||||
+
|
||||
+ //Only call hook script if the mail is marked as ham or spam.
|
||||
+ if(!shMailStatus.empty()) {
|
||||
+
|
||||
+ //Get the mail from the DB.
|
||||
+ strQuery="SELECT val_string FROM properties WHERE tag="+stringify(PROP_ID(PR_TRANSPORT_MESSAGE_HEADERS))+" AND hierarchyid= "+stringify(ulId);
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: db error while retrieve mail header.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+
|
||||
+ if(shNumRows>0) {
|
||||
+
|
||||
+ // Execute the hook:
|
||||
+ FILE *shFilePtr;
|
||||
+ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId);
|
||||
+ shFilePtr=popen(shScriptPath.c_str(),"w");
|
||||
+ fputs(lpDBRow[0],shFilePtr);
|
||||
+ int shExitCode=pclose(shFilePtr);
|
||||
+ if(!WIFEXITED(shExitCode)) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: "+shScriptPath+" was terminated abnormally.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ //If script exit with non 0, exit..
|
||||
+ if(WEXITSTATUS(shExitCode)!=0) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(shExitCode));
|
||||
+ er=ZARAFA_E_UNKNOWN;
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed.");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail");
|
||||
+ }
|
||||
+
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+ }
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+exit:
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ return er;
|
||||
+}
|
||||
+
|
||||
|
||||
// Move one or more messages and/or moved a softdeleted message to a normal message
|
||||
ECRESULT MoveObjects(ECSession *lpSession, ECDatabase *lpDatabase, ECListInt* lplObjectIds, unsigned int ulDestFolderId, unsigned int ulSyncId)
|
||||
@@ -8096,6 +8256,17 @@ SOAP_ENTRY_START5(copyObjects, *result,
|
||||
|
||||
// @note The object type checking wille be done in MoveObjects or CopyObject
|
||||
|
||||
+//SPAMHOOK
|
||||
+/////////////////////////////////////
|
||||
+ //Iterate over all mail ids and initiate spamhook.
|
||||
+ for(iObjectId = lObjectIds.begin(); iObjectId != lObjectIds.end(); iObjectId++)
|
||||
+ {
|
||||
+ //Ignore the result
|
||||
+ int shResult=SpamHook(lpDatabase,*iObjectId,ulDestFolderId);
|
||||
+ }
|
||||
+//SPAMHOOK END
|
||||
+////////////////////////////////////
|
||||
+
|
||||
//check copy or a move
|
||||
if(ulFlags & FOLDER_MOVE ) { // A move
|
||||
er = MoveObjects(lpecSession, lpDatabase, &lObjectIds, ulDestFolderId, ulSyncId);
|
||||
diff -rupN zarafa-6.40.0-orig/provider/server/ECServer.cpp zarafa-6.40.0/provider/server/ECServer.cpp
|
||||
--- zarafa-6.40.0-orig/provider/server/ECServer.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/server/ECServer.cpp 2010-07-20 17:26:25.119624516 +0200
|
||||
@@ -670,6 +670,7 @@ int running_server(char *szName, char *s
|
||||
{ "deletegroup_script", "/etc/zarafa/userscripts/deletegroup", CONFIGSETTING_RELOADABLE},
|
||||
{ "createcompany_script", "/etc/zarafa/userscripts/createcompany", CONFIGSETTING_RELOADABLE },
|
||||
{ "deletecompany_script", "/etc/zarafa/userscripts/deletecompany", CONFIGSETTING_RELOADABLE },
|
||||
+ { "junklearn_script", "/etc/zarafa/userscripts/junklearn", CONFIGSETTING_RELOADABLE },
|
||||
{ "user_safe_mode", "no", CONFIGSETTING_RELOADABLE },
|
||||
|
||||
// Storename format
|
||||
@ -1,51 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh
|
||||
--- zarafa-6.40.6.orig//autoconf/ltmain.sh 2011-03-20 08:23:21.000000000 +0100
|
||||
+++ zarafa-6.40.6/autoconf/ltmain.sh 2011-03-20 08:24:23.000000000 +0100
|
||||
@@ -1628,7 +1628,7 @@
|
||||
elif test "X$arg" = "X-lc_r"; then
|
||||
case $host in
|
||||
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
|
||||
- # Do not include libc_r directly, use -pthread flag.
|
||||
+ # Do not include libc_r directly, use -lpthread flag.
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
@@ -1647,7 +1647,7 @@
|
||||
continue
|
||||
;;
|
||||
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
@@ -2150,7 +2150,7 @@
|
||||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac
|
||||
--- zarafa-6.40.6.orig//configure.ac 2011-03-20 08:23:20.000000000 +0100
|
||||
+++ zarafa-6.40.6/configure.ac 2011-03-20 08:23:44.000000000 +0100
|
||||
@@ -407,7 +407,7 @@
|
||||
CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX"
|
||||
fi
|
||||
# force add pthread in lucene test
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then
|
||||
AC_CHECK_LIB(clucene, [open],
|
||||
[ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a"
|
||||
@@ -561,7 +561,7 @@
|
||||
AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([required library libpthread missing or unusable]))
|
||||
LIBS=$libs_keep
|
||||
# because it seems this is better... (gnu c/c++ only?)
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
|
||||
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
|
||||
libs_keep=$LIBS
|
||||
@ -1,26 +0,0 @@
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.in
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.in
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.in
|
||||
@@ -274,7 +274,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.am
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.am
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.am
|
||||
@@ -18,7 +18,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
@ -1,24 +0,0 @@
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:38:31.435806562 +0300
|
||||
@@ -13,7 +13,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:38:22.475687815 +0300
|
||||
@@ -250,7 +250,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
all: all-am
|
||||
@ -1,44 +0,0 @@
|
||||
--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100
|
||||
+++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100
|
||||
@@ -34,7 +34,7 @@
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = php-ext
|
||||
-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \
|
||||
+DIST_COMMON = $(dist_data_DATA) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@@ -86,7 +86,7 @@
|
||||
DIST_SOURCES = $(mapi_la_SOURCES)
|
||||
dist_dataDATA_INSTALL = $(INSTALL_DATA)
|
||||
dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
|
||||
-DATA = $(dist_data_DATA) $(dist_sysconf_DATA)
|
||||
+DATA = $(dist_data_DATA)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@@ -406,23 +406,6 @@
|
||||
echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(datadir)/$$f"; \
|
||||
done
|
||||
-install-dist_sysconfDATA: $(dist_sysconf_DATA)
|
||||
- @$(NORMAL_INSTALL)
|
||||
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
-
|
||||
-uninstall-dist_sysconfDATA:
|
||||
- @$(NORMAL_UNINSTALL)
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
@ -1,19 +0,0 @@
|
||||
Submitted By: Mario Fetka ( mario.fetka@gmaail.com)
|
||||
Date: 2010-10-11
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: on gentoo libtcmalloc_minimal is only provided as shared lib
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/configure.ac zarafa-6.40.2/configure.ac
|
||||
--- zarafa-6.40.2.orig/configure.ac 2010-10-11 18:39:35.000000000 +0000
|
||||
+++ zarafa-6.40.2/configure.ac 2010-10-11 18:40:03.000000000 +0000
|
||||
@@ -441,7 +441,7 @@
|
||||
AC_HELP_STRING([--with-tcmalloc-prefix=PATH],[path to tcmalloc lib, e.g. /usr/lib/]),
|
||||
[TCMALLOC_PREFIX=${withval}],[TCMALLOC_PREFIX=/usr/lib])
|
||||
AC_CHECK_LIB(tcmalloc_minimal, [open],
|
||||
- [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.a" ],
|
||||
+ [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" ],
|
||||
[ WITH_TCMALLOC=no ])
|
||||
AC_SUBST(TCMALLOC_LIBS)
|
||||
AC_LANG_POP
|
||||
@ -1,187 +0,0 @@
|
||||
Submitted By: Mario Fetka (mario.fetka@gmail.com)
|
||||
Date: 2010-10-13
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: gentoo specific
|
||||
Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/installer/linux/Makefile.am zarafa-6.40.2/installer/linux/Makefile.am
|
||||
--- zarafa-6.40.2.orig/installer/linux/Makefile.am 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/linux/Makefile.am 2010-10-13 08:28:26.000000000 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
sysconf_initdir=${sysconfdir}/init.d
|
||||
sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files}
|
||||
|
||||
-rhel_sysconfig_path = ${sysconfdir}/sysconfig
|
||||
+rhel_sysconfig_path = ${sysconfdir}/conf.d
|
||||
suse_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sles_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path}
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany zarafa-6.40.2/installer/userscripts/createcompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany 2010-10-13 08:26:53.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany.in zarafa-6.40.2/installer/userscripts/createcompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany.in 2010-10-13 08:27:00.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup zarafa-6.40.2/installer/userscripts/creategroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup 2010-10-13 08:27:04.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup.in zarafa-6.40.2/installer/userscripts/creategroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup.in 2010-10-13 08:27:08.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser zarafa-6.40.2/installer/userscripts/createuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser 2010-10-13 08:27:12.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser.in zarafa-6.40.2/installer/userscripts/createuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser.in 2010-10-13 08:27:17.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany zarafa-6.40.2/installer/userscripts/deletecompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany 2010-10-13 08:27:22.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany.in zarafa-6.40.2/installer/userscripts/deletecompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany.in 2010-10-13 08:27:26.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup zarafa-6.40.2/installer/userscripts/deletegroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup 2010-10-13 08:27:30.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup.in zarafa-6.40.2/installer/userscripts/deletegroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup.in 2010-10-13 08:27:35.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser zarafa-6.40.2/installer/userscripts/deleteuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser 2010-10-13 08:27:39.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/deleteuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser.in zarafa-6.40.2/installer/userscripts/deleteuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser.in 2010-10-13 08:27:43.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d
|
||||
@ -1,14 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp
|
||||
--- zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp 2011-03-20 23:50:06.000000000 +0100
|
||||
+++ zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp 2011-03-21 00:00:45.000000000 +0100
|
||||
@@ -343,6 +343,10 @@
|
||||
// this option was introduced in mysql 5.0, so let's not even try on 4.1 servers
|
||||
strQuery = "SET SESSION sql_mode = 'STRICT_ALL_TABLES'";
|
||||
Query(strQuery); // ignore error
|
||||
+
|
||||
+ // Latin1 is default charset
|
||||
+ strQuery = "SET NAMES 'latin1'";
|
||||
+ Query(strQuery);
|
||||
}
|
||||
|
||||
exit:
|
||||
@ -1,65 +0,0 @@
|
||||
Patch by Robert Scheck <robert@fedoraproject.org> for zarafa >= 6.40.0, which only
|
||||
removes the paths from autoconf/automake related files, that don't exist in the OSS
|
||||
version of Zarafa. Having these paths not removed causes autoreconf to fail, but a
|
||||
re-run of autoreconf is needed in order to get the rpaths completely out of all the
|
||||
libraries and binaries built during the make process.
|
||||
|
||||
forward patch by Mario Fetka <mario.fetka@gmail.com>
|
||||
|
||||
diff -uNr zarafa-6.40.6,orig//ECtools/Makefile.am zarafa-6.40.6/ECtools/Makefile.am
|
||||
--- zarafa-6.40.6,orig//ECtools/Makefile.am 2011-03-20 08:34:03.000000000 +0100
|
||||
+++ zarafa-6.40.6/ECtools/Makefile.am 2011-03-20 08:36:31.000000000 +0100
|
||||
@@ -1,7 +1,3 @@
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = zarafa-backup zarafa-report
|
||||
-endif
|
||||
-
|
||||
if WITH_TESTTOOLS
|
||||
TESTSUBS = ECTestTools
|
||||
endif
|
||||
diff -uNr zarafa-6.40.6,orig//Makefile.am zarafa-6.40.6/Makefile.am
|
||||
--- zarafa-6.40.6,orig//Makefile.am 2011-03-20 08:34:03.000000000 +0100
|
||||
+++ zarafa-6.40.6/Makefile.am 2011-03-20 08:35:57.000000000 +0100
|
||||
@@ -1,10 +1,6 @@
|
||||
AUTOMAKE_OPTIONS = 1.9 foreign
|
||||
ACLOCAL_AMFLAGS = -Iautoconf
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-PROSUBS = liblicense licensed
|
||||
-endif
|
||||
-
|
||||
SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext spooler gateway caldav ECtools installer po doc
|
||||
|
||||
if WITH_SWIG
|
||||
@@ -26,10 +22,6 @@
|
||||
common/ecversion.h: versionheader.sh
|
||||
sh ${top_srcdir}/versionheader.sh > common/ecversion.h
|
||||
|
||||
-if ! OSS_ONLY
|
||||
-CLEANFILES=common/ecversion.h
|
||||
-endif
|
||||
-
|
||||
dist-hook:
|
||||
find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true
|
||||
if OSS_ONLY
|
||||
diff -uNr zarafa-6.40.6,orig//configure.ac zarafa-6.40.6/configure.ac
|
||||
--- zarafa-6.40.6,orig//configure.ac 2011-03-20 08:34:03.000000000 +0100
|
||||
+++ zarafa-6.40.6/configure.ac 2011-03-20 08:35:16.000000000 +0100
|
||||
@@ -808,17 +808,6 @@
|
||||
version
|
||||
specialbuild
|
||||
])
|
||||
-dnl non-oss files
|
||||
-if test -d `dirname $0`/licensed; then
|
||||
-AC_CONFIG_FILES([
|
||||
- liblicense/Makefile
|
||||
- licensed/Makefile
|
||||
- ECtools/zarafa-backup/Makefile
|
||||
- ECtools/zarafa-backup/helpers/Makefile
|
||||
- ECtools/zarafa-report/Makefile
|
||||
- debian/zarafa.install
|
||||
-])
|
||||
-fi
|
||||
|
||||
AC_OUTPUT
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp
|
||||
--- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000
|
||||
@@ -935,6 +935,7 @@
|
||||
{ "fax_domain", "", CONFIGSETTING_RELOADABLE },
|
||||
{ "fax_international", "+", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_delegates", "no", CONFIGSETTING_RELOADABLE },
|
||||
+ { "always_send_as", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "always_send_tnef", "no", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE },
|
||||
{ "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE },
|
||||
diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp
|
||||
--- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000
|
||||
+++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000
|
||||
@@ -1949,6 +1949,10 @@
|
||||
HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b)
|
||||
{
|
||||
bAllowSendAs = true;
|
||||
+ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) {
|
||||
+ //use always_send_as to allow everybody to send as someone else.
|
||||
+ //(some users hate the 'on behalf of' text, and dont want to do the extra configuration)
|
||||
+ bAllowSendAs = true;
|
||||
} else {
|
||||
|
||||
hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner);
|
||||
@ -1,199 +0,0 @@
|
||||
diff -rupN zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp
|
||||
--- zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp 2010-07-20 17:22:07.995625072 +0200
|
||||
@@ -7244,6 +7244,166 @@ typedef struct{
|
||||
SOURCEKEY sSourceKey;
|
||||
SOURCEKEY sParentSourceKey;
|
||||
}COPYITEM;
|
||||
+//SPAM HOOK
|
||||
+//This function parses an e-mail to the /etc/zarafa/userscripts/junklearn script. With 2 arguments:
|
||||
+//ham or spam
|
||||
+//message id
|
||||
+//and pipes the mail header to the script.
|
||||
+//This script wil be inhaled by MoveObjects();
|
||||
+/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
+int SpamHook(ECDatabase *lpDatabase,int ulId,int ulDestFolderId)
|
||||
+{
|
||||
+
|
||||
+ ALLOC_DBRESULT();
|
||||
+ ECRESULT er = erSuccess;
|
||||
+ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script");
|
||||
+
|
||||
+ //If shScriptPath doesn't exist skip spam hook.
|
||||
+ if(fopen(shScriptPath.c_str(),"r")) {
|
||||
+
|
||||
+ //Get store object ID via message object id
|
||||
+ unsigned int storeId;
|
||||
+ er = g_lpSessionManager->GetCacheManager()->GetStore(ulId,&storeId,NULL);
|
||||
+ if(er != erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve source folder.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //get deleted items folder entry id
|
||||
+ strQuery="SELECT val_binary FROM properties WHERE hierarchyid="+stringify(storeId)+" AND tag="+stringify(PROP_ID(PR_IPM_WASTEBASKET_ENTRYID));
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'deleted items' entryid to objectid.
|
||||
+ entryId* wasteBucketEntryId = new entryId[0];
|
||||
+ wasteBucketEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ wasteBucketEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int wasteBucketFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(wasteBucketEntryId,&wasteBucketFolderId);
|
||||
+ delete wasteBucketEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get 'junk folder' entryId.
|
||||
+ strQuery="SELECT val_binary FROM receivefolder LEFT JOIN mvproperties ON receivefolder.objid=mvproperties.hierarchyid WHERE receivefolder.storeid="+stringify(storeId)+" AND receivefolder.messageclass='IPC' AND mvproperties.tag="+stringify(PROP_ID(PR_ADDITIONAL_REN_ENTRYIDS))+" AND mvproperties.orderid=4";
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryids from DB.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult);
|
||||
+ shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+ if(shNumRows<1)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, empty DB result.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Convert 'junk folder' entryid to objectid.
|
||||
+ entryId* junkFolderEntryId = new entryId[0];
|
||||
+ junkFolderEntryId->__ptr=(unsigned char*)lpDBRow[0];
|
||||
+ junkFolderEntryId->__size=lpDBLen[0];
|
||||
+ unsigned int junkFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(junkFolderEntryId,&junkFolderId);
|
||||
+ delete junkFolderEntryId;
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, converting to objectID.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ //Get source folder object ID. (Actually we should check if mail came from subfolders in the 'deleted items folder', which I think never happens.)
|
||||
+ unsigned int srcFolderId;
|
||||
+ er=g_lpSessionManager->GetCacheManager()->GetParent(ulId,&srcFolderId);
|
||||
+ if(er!=erSuccess)
|
||||
+ {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve src folder id.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+ //Check if object is ham or spam
|
||||
+ string shMailStatus;
|
||||
+ //if destination folder is junk, mark as spam
|
||||
+ if(ulDestFolderId==junkFolderId)
|
||||
+ shMailStatus="spam";
|
||||
+ else
|
||||
+ {
|
||||
+ //if destination folder is not TRASH and de source folder is JUNK, mark as ham
|
||||
+ if(ulDestFolderId!=wasteBucketFolderId && srcFolderId==junkFolderId)
|
||||
+ shMailStatus="ham";
|
||||
+ }
|
||||
+
|
||||
+ //Only call hook script if the mail is marked as ham or spam.
|
||||
+ if(!shMailStatus.empty()) {
|
||||
+
|
||||
+ //Get the mail from the DB.
|
||||
+ strQuery="SELECT val_string FROM properties WHERE tag="+stringify(PROP_ID(PR_TRANSPORT_MESSAGE_HEADERS))+" AND hierarchyid= "+stringify(ulId);
|
||||
+ er = lpDatabase->DoSelect(strQuery, &lpDBResult);
|
||||
+ if(er != erSuccess) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: db error while retrieve mail header.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ lpDBRow = lpDatabase->FetchRow(lpDBResult);
|
||||
+ int shNumRows=lpDatabase->GetNumRows(lpDBResult);
|
||||
+
|
||||
+ if(shNumRows>0) {
|
||||
+
|
||||
+ // Execute the hook:
|
||||
+ FILE *shFilePtr;
|
||||
+ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId);
|
||||
+ shFilePtr=popen(shScriptPath.c_str(),"w");
|
||||
+ fputs(lpDBRow[0],shFilePtr);
|
||||
+ int shExitCode=pclose(shFilePtr);
|
||||
+ if(!WIFEXITED(shExitCode)) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: "+shScriptPath+" was terminated abnormally.");
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ //If script exit with non 0, exit..
|
||||
+ if(WEXITSTATUS(shExitCode)!=0) {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(shExitCode));
|
||||
+ er=ZARAFA_E_UNKNOWN;
|
||||
+ goto exit;
|
||||
+ }
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed.");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail");
|
||||
+ }
|
||||
+
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+ }
|
||||
+ }
|
||||
+ else {
|
||||
+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found");
|
||||
+ er=erSuccess;
|
||||
+ }
|
||||
+exit:
|
||||
+ // Free database results
|
||||
+ FREE_DBRESULT();
|
||||
+
|
||||
+ return er;
|
||||
+}
|
||||
+
|
||||
|
||||
// Move one or more messages and/or moved a softdeleted message to a normal message
|
||||
ECRESULT MoveObjects(ECSession *lpSession, ECDatabase *lpDatabase, ECListInt* lplObjectIds, unsigned int ulDestFolderId, unsigned int ulSyncId)
|
||||
@@ -8096,6 +8256,17 @@ SOAP_ENTRY_START5(copyObjects, *result,
|
||||
|
||||
// @note The object type checking wille be done in MoveObjects or CopyObject
|
||||
|
||||
+//SPAMHOOK
|
||||
+/////////////////////////////////////
|
||||
+ //Iterate over all mail ids and initiate spamhook.
|
||||
+ for(iObjectId = lObjectIds.begin(); iObjectId != lObjectIds.end(); iObjectId++)
|
||||
+ {
|
||||
+ //Ignore the result
|
||||
+ int shResult=SpamHook(lpDatabase,*iObjectId,ulDestFolderId);
|
||||
+ }
|
||||
+//SPAMHOOK END
|
||||
+////////////////////////////////////
|
||||
+
|
||||
//check copy or a move
|
||||
if(ulFlags & FOLDER_MOVE ) { // A move
|
||||
er = MoveObjects(lpecSession, lpDatabase, &lObjectIds, ulDestFolderId, ulSyncId);
|
||||
diff -rupN zarafa-6.40.0-orig/provider/server/ECServer.cpp zarafa-6.40.0/provider/server/ECServer.cpp
|
||||
--- zarafa-6.40.0-orig/provider/server/ECServer.cpp 2010-05-31 19:28:59.000000000 +0200
|
||||
+++ zarafa-6.40.0/provider/server/ECServer.cpp 2010-07-20 17:26:25.119624516 +0200
|
||||
@@ -670,6 +670,7 @@ int running_server(char *szName, char *s
|
||||
{ "deletegroup_script", "/etc/zarafa/userscripts/deletegroup", CONFIGSETTING_RELOADABLE},
|
||||
{ "createcompany_script", "/etc/zarafa/userscripts/createcompany", CONFIGSETTING_RELOADABLE },
|
||||
{ "deletecompany_script", "/etc/zarafa/userscripts/deletecompany", CONFIGSETTING_RELOADABLE },
|
||||
+ { "junklearn_script", "/etc/zarafa/userscripts/junklearn", CONFIGSETTING_RELOADABLE },
|
||||
{ "user_safe_mode", "no", CONFIGSETTING_RELOADABLE },
|
||||
|
||||
// Storename format
|
||||
@ -1,51 +0,0 @@
|
||||
diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh
|
||||
--- zarafa-6.40.6.orig//autoconf/ltmain.sh 2011-03-20 08:23:21.000000000 +0100
|
||||
+++ zarafa-6.40.6/autoconf/ltmain.sh 2011-03-20 08:24:23.000000000 +0100
|
||||
@@ -1628,7 +1628,7 @@
|
||||
elif test "X$arg" = "X-lc_r"; then
|
||||
case $host in
|
||||
*-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
|
||||
- # Do not include libc_r directly, use -pthread flag.
|
||||
+ # Do not include libc_r directly, use -lpthread flag.
|
||||
continue
|
||||
;;
|
||||
esac
|
||||
@@ -1647,7 +1647,7 @@
|
||||
continue
|
||||
;;
|
||||
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
@@ -2150,7 +2150,7 @@
|
||||
lib=
|
||||
found=no
|
||||
case $deplib in
|
||||
- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
|
||||
+ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads)
|
||||
if test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac
|
||||
--- zarafa-6.40.6.orig//configure.ac 2011-03-20 08:23:20.000000000 +0100
|
||||
+++ zarafa-6.40.6/configure.ac 2011-03-20 08:23:44.000000000 +0100
|
||||
@@ -407,7 +407,7 @@
|
||||
CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX"
|
||||
fi
|
||||
# force add pthread in lucene test
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then
|
||||
AC_CHECK_LIB(clucene, [open],
|
||||
[ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a"
|
||||
@@ -561,7 +561,7 @@
|
||||
AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([required library libpthread missing or unusable]))
|
||||
LIBS=$libs_keep
|
||||
# because it seems this is better... (gnu c/c++ only?)
|
||||
-CXXFLAGS="$CXXFLAGS -pthread"
|
||||
+CXXFLAGS="$CXXFLAGS -lpthread"
|
||||
|
||||
# Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections
|
||||
libs_keep=$LIBS
|
||||
@ -1,26 +0,0 @@
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.in
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.in
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.in
|
||||
@@ -274,7 +274,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
Index: zarafa-6.40.0/provider/server/Makefile.am
|
||||
===================================================================
|
||||
--- zarafa-6.40.0.orig/provider/server/Makefile.am
|
||||
+++ zarafa-6.40.0/provider/server/Makefile.am
|
||||
@@ -18,7 +18,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_ssl.la \
|
||||
- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
+ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt
|
||||
|
||||
zarafa_server_SOURCES = ECServer.cpp \
|
||||
ECSoapServerConnection.h ECSoapServerConnection.cpp \
|
||||
@ -1,24 +0,0 @@
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:38:31.435806562 +0300
|
||||
@@ -13,7 +13,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
|
||||
diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in
|
||||
--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:37:49.561680215 +0300
|
||||
+++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:38:22.475687815 +0300
|
||||
@@ -250,7 +250,7 @@
|
||||
${top_builddir}/mapi4linux/src/libmapi.la \
|
||||
${top_builddir}/common/libcommon_mapi.la \
|
||||
${top_builddir}/common/libcommon_util.la \
|
||||
- -lncurses
|
||||
+ -lncurses -luuid
|
||||
|
||||
zarafa_stats_SOURCES = zarafa-stats.cpp
|
||||
all: all-am
|
||||
@ -1,44 +0,0 @@
|
||||
--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100
|
||||
+++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100
|
||||
@@ -34,7 +34,7 @@
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
subdir = php-ext
|
||||
-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \
|
||||
+DIST_COMMON = $(dist_data_DATA) \
|
||||
$(srcdir)/Makefile.am $(srcdir)/Makefile.in
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
@@ -86,7 +86,7 @@
|
||||
DIST_SOURCES = $(mapi_la_SOURCES)
|
||||
dist_dataDATA_INSTALL = $(INSTALL_DATA)
|
||||
dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
|
||||
-DATA = $(dist_data_DATA) $(dist_sysconf_DATA)
|
||||
+DATA = $(dist_data_DATA)
|
||||
ETAGS = etags
|
||||
CTAGS = ctags
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
@@ -406,23 +406,6 @@
|
||||
echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \
|
||||
rm -f "$(DESTDIR)$(datadir)/$$f"; \
|
||||
done
|
||||
-install-dist_sysconfDATA: $(dist_sysconf_DATA)
|
||||
- @$(NORMAL_INSTALL)
|
||||
- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
-
|
||||
-uninstall-dist_sysconfDATA:
|
||||
- @$(NORMAL_UNINSTALL)
|
||||
- @list='$(dist_sysconf_DATA)'; for p in $$list; do \
|
||||
- f=$(am__strip_dir) \
|
||||
- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \
|
||||
- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \
|
||||
- done
|
||||
|
||||
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
@ -1,19 +0,0 @@
|
||||
Submitted By: Mario Fetka ( mario.fetka@gmaail.com)
|
||||
Date: 2010-10-11
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: unknown
|
||||
Description: on gentoo libtcmalloc_minimal is only provided as shared lib
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/configure.ac zarafa-6.40.2/configure.ac
|
||||
--- zarafa-6.40.2.orig/configure.ac 2010-10-11 18:39:35.000000000 +0000
|
||||
+++ zarafa-6.40.2/configure.ac 2010-10-11 18:40:03.000000000 +0000
|
||||
@@ -441,7 +441,7 @@
|
||||
AC_HELP_STRING([--with-tcmalloc-prefix=PATH],[path to tcmalloc lib, e.g. /usr/lib/]),
|
||||
[TCMALLOC_PREFIX=${withval}],[TCMALLOC_PREFIX=/usr/lib])
|
||||
AC_CHECK_LIB(tcmalloc_minimal, [open],
|
||||
- [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.a" ],
|
||||
+ [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" ],
|
||||
[ WITH_TCMALLOC=no ])
|
||||
AC_SUBST(TCMALLOC_LIBS)
|
||||
AC_LANG_POP
|
||||
@ -1,187 +0,0 @@
|
||||
Submitted By: Mario Fetka (mario.fetka@gmail.com)
|
||||
Date: 2010-10-13
|
||||
Initial Package Version: 6.40.2
|
||||
Origin: me
|
||||
Upstream Status: gentoo specific
|
||||
Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d
|
||||
|
||||
diff -Naur zarafa-6.40.2.orig/installer/linux/Makefile.am zarafa-6.40.2/installer/linux/Makefile.am
|
||||
--- zarafa-6.40.2.orig/installer/linux/Makefile.am 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/linux/Makefile.am 2010-10-13 08:28:26.000000000 +0000
|
||||
@@ -26,7 +26,7 @@
|
||||
sysconf_initdir=${sysconfdir}/init.d
|
||||
sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files}
|
||||
|
||||
-rhel_sysconfig_path = ${sysconfdir}/sysconfig
|
||||
+rhel_sysconfig_path = ${sysconfdir}/conf.d
|
||||
suse_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sles_sysconfig_path = ${localstatedir}/adm/fillup-templates
|
||||
sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path}
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany zarafa-6.40.2/installer/userscripts/createcompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany 2010-10-13 08:26:53.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany.in zarafa-6.40.2/installer/userscripts/createcompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createcompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createcompany.in 2010-10-13 08:27:00.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/createcompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup zarafa-6.40.2/installer/userscripts/creategroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup 2010-10-13 08:27:04.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup.in zarafa-6.40.2/installer/userscripts/creategroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/creategroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/creategroup.in 2010-10-13 08:27:08.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/creategroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser zarafa-6.40.2/installer/userscripts/createuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser 2010-10-13 08:27:12.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser.in zarafa-6.40.2/installer/userscripts/createuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/createuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/createuser.in 2010-10-13 08:27:17.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/createuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany zarafa-6.40.2/installer/userscripts/deletecompany
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany 2010-10-13 08:27:22.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany.in zarafa-6.40.2/installer/userscripts/deletecompany.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletecompany.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletecompany.in 2010-10-13 08:27:26.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup zarafa-6.40.2/installer/userscripts/deletegroup
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup 2010-10-13 08:27:30.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup.in zarafa-6.40.2/installer/userscripts/deletegroup.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deletegroup.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deletegroup.in 2010-10-13 08:27:35.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# beware that this string can contain any characters, so take heed to
|
||||
# correct quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser zarafa-6.40.2/installer/userscripts/deleteuser
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser 2010-10-13 08:27:39.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then
|
||||
- . ${prefix}/etc/sysconfig/zarafa
|
||||
+if [ -f ${prefix}/etc/conf.d/zarafa ]; then
|
||||
+ . ${prefix}/etc/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/deleteuser.d
|
||||
diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser.in zarafa-6.40.2/installer/userscripts/deleteuser.in
|
||||
--- zarafa-6.40.2.orig/installer/userscripts/deleteuser.in 2010-10-13 08:26:21.000000000 +0000
|
||||
+++ zarafa-6.40.2/installer/userscripts/deleteuser.in 2010-10-13 08:27:43.000000000 +0000
|
||||
@@ -9,8 +9,8 @@
|
||||
# that this string can contain any characters, so take heed to correct
|
||||
# quoting.
|
||||
|
||||
-if [ -f @sysconfdir@/sysconfig/zarafa ]; then
|
||||
- . @sysconfdir@/sysconfig/zarafa
|
||||
+if [ -f @sysconfdir@/conf.d/zarafa ]; then
|
||||
+ . @sysconfdir@/conf.d/zarafa
|
||||
fi
|
||||
|
||||
ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user