From 636b57211955b90fd1fe7b615e72aed038235256 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sat, 28 Jun 2014 02:42:26 +0200 Subject: [PATCH] Bump Package-Manager: portage-2.2.8-r1 RepoMan-Options: --force --- net-mail/zarafa/ChangeLog | 45 +- net-mail/zarafa/Manifest | 60 +-- .../Datux-sendas.patch | 0 .../Datux-spamhook.patch | 0 .../zarafa-01-oss-configure.patch | 61 +++ .../7.1.10.44973/zarafa-02-ldapmsplugin.patch | 29 ++ .../7.1.10.44973/zarafa-05-libdeps.patch | 96 +++++ .../7.1.10.44973/zarafa-07-sonames.patch | 137 ++++++ .../7.1.10.44973/zarafa-10-translations.patch | 45 ++ .../7.1.10.44973/zarafa-14-shared-libs.patch | 140 +++++++ .../zarafa-22-gcc47.patch | 82 +--- .../7.1.10.44973/zarafa-40-mariadb.patch | 35 ++ .../zarafa-7.1.4-tcmalloc.patch | 0 .../zarafa-7.1.5-gentoo-swig1.3.patch | 0 .../zarafa-7.1.9-sysconfig2confd-1.patch | 96 +++++ .../7.1.5.42059/zarafa-01-oss-configure.patch | 61 --- .../7.1.5.42059/zarafa-06-sizeof-char.patch | 391 ------------------ .../files/7.1.5.42059/zarafa-22-gcc47.patch | 142 ------- .../7.1.5.42059/zarafa-23-newclucene.patch | 175 -------- .../zarafa-24-undefined-behavior.patch | 33 -- .../7.1.5.42059/zarafa-25-imap-maxfail.patch | 43 -- .../7.1.5.42059/zarafa-30-ac-typos.patch | 37 -- .../zarafa-35-embedded-mysql.patch | 54 --- .../zarafa-7.0.3-sysconfig2confd-1.patch | 103 ----- .../files/7.1.7.42779/Datux-sendas.patch | 47 --- .../files/7.1.7.42779/Datux-spamhook.patch | 219 ---------- .../7.1.7.42779/zarafa-01-oss-configure.patch | 61 --- .../7.1.7.42779/zarafa-06-sizeof-char.patch | 391 ------------------ .../7.1.7.42779/zarafa-23-newclucene.patch | 175 -------- .../zarafa-24-undefined-behavior.patch | 33 -- .../zarafa-7.0.3-sysconfig2confd-1.patch | 103 ----- .../7.1.7.42779/zarafa-7.0.8-va_list.patch | 44 -- .../7.1.7.42779/zarafa-7.1.4-tcmalloc.patch | 11 - .../zarafa-7.1.5-gentoo-swig1.3.patch | 15 - net-mail/zarafa/files/zarafa.logrotate | 114 ----- ...2779.ebuild => zarafa-7.1.10.44973.ebuild} | 31 +- net-mail/zarafa/zarafa-7.1.5.42059.ebuild | 201 --------- 37 files changed, 737 insertions(+), 2573 deletions(-) rename net-mail/zarafa/files/{7.1.5.42059 => 7.1.10.44973}/Datux-sendas.patch (100%) rename net-mail/zarafa/files/{7.1.5.42059 => 7.1.10.44973}/Datux-spamhook.patch (100%) create mode 100644 net-mail/zarafa/files/7.1.10.44973/zarafa-01-oss-configure.patch create mode 100644 net-mail/zarafa/files/7.1.10.44973/zarafa-02-ldapmsplugin.patch create mode 100644 net-mail/zarafa/files/7.1.10.44973/zarafa-05-libdeps.patch create mode 100644 net-mail/zarafa/files/7.1.10.44973/zarafa-07-sonames.patch create mode 100644 net-mail/zarafa/files/7.1.10.44973/zarafa-10-translations.patch create mode 100644 net-mail/zarafa/files/7.1.10.44973/zarafa-14-shared-libs.patch rename net-mail/zarafa/files/{7.1.7.42779 => 7.1.10.44973}/zarafa-22-gcc47.patch (50%) create mode 100644 net-mail/zarafa/files/7.1.10.44973/zarafa-40-mariadb.patch rename net-mail/zarafa/files/{7.1.5.42059 => 7.1.10.44973}/zarafa-7.1.4-tcmalloc.patch (100%) rename net-mail/zarafa/files/{7.1.5.42059 => 7.1.10.44973}/zarafa-7.1.5-gentoo-swig1.3.patch (100%) create mode 100644 net-mail/zarafa/files/7.1.10.44973/zarafa-7.1.9-sysconfig2confd-1.patch delete mode 100644 net-mail/zarafa/files/7.1.5.42059/zarafa-01-oss-configure.patch delete mode 100644 net-mail/zarafa/files/7.1.5.42059/zarafa-06-sizeof-char.patch delete mode 100644 net-mail/zarafa/files/7.1.5.42059/zarafa-22-gcc47.patch delete mode 100644 net-mail/zarafa/files/7.1.5.42059/zarafa-23-newclucene.patch delete mode 100644 net-mail/zarafa/files/7.1.5.42059/zarafa-24-undefined-behavior.patch delete mode 100644 net-mail/zarafa/files/7.1.5.42059/zarafa-25-imap-maxfail.patch delete mode 100644 net-mail/zarafa/files/7.1.5.42059/zarafa-30-ac-typos.patch delete mode 100644 net-mail/zarafa/files/7.1.5.42059/zarafa-35-embedded-mysql.patch delete mode 100644 net-mail/zarafa/files/7.1.5.42059/zarafa-7.0.3-sysconfig2confd-1.patch delete mode 100644 net-mail/zarafa/files/7.1.7.42779/Datux-sendas.patch delete mode 100644 net-mail/zarafa/files/7.1.7.42779/Datux-spamhook.patch delete mode 100644 net-mail/zarafa/files/7.1.7.42779/zarafa-01-oss-configure.patch delete mode 100644 net-mail/zarafa/files/7.1.7.42779/zarafa-06-sizeof-char.patch delete mode 100644 net-mail/zarafa/files/7.1.7.42779/zarafa-23-newclucene.patch delete mode 100644 net-mail/zarafa/files/7.1.7.42779/zarafa-24-undefined-behavior.patch delete mode 100644 net-mail/zarafa/files/7.1.7.42779/zarafa-7.0.3-sysconfig2confd-1.patch delete mode 100644 net-mail/zarafa/files/7.1.7.42779/zarafa-7.0.8-va_list.patch delete mode 100644 net-mail/zarafa/files/7.1.7.42779/zarafa-7.1.4-tcmalloc.patch delete mode 100644 net-mail/zarafa/files/7.1.7.42779/zarafa-7.1.5-gentoo-swig1.3.patch delete mode 100644 net-mail/zarafa/files/zarafa.logrotate rename net-mail/zarafa/{zarafa-7.1.7.42779.ebuild => zarafa-7.1.10.44973.ebuild} (85%) delete mode 100644 net-mail/zarafa/zarafa-7.1.5.42059.ebuild diff --git a/net-mail/zarafa/ChangeLog b/net-mail/zarafa/ChangeLog index c528fb1..a28748c 100644 --- a/net-mail/zarafa/ChangeLog +++ b/net-mail/zarafa/ChangeLog @@ -1,7 +1,50 @@ # ChangeLog for net-mail/zarafa -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*zarafa-7.1.10.44973 (28 Jun 2014) + + 28 Jun 2014; Mario Fetka + +files/7.1.10.44973/Datux-sendas.patch, + +files/7.1.10.44973/Datux-spamhook.patch, + +files/7.1.10.44973/zarafa-01-oss-configure.patch, + +files/7.1.10.44973/zarafa-02-ldapmsplugin.patch, + +files/7.1.10.44973/zarafa-05-libdeps.patch, + +files/7.1.10.44973/zarafa-07-sonames.patch, + +files/7.1.10.44973/zarafa-10-translations.patch, + +files/7.1.10.44973/zarafa-14-shared-libs.patch, + +files/7.1.10.44973/zarafa-22-gcc47.patch, + +files/7.1.10.44973/zarafa-40-mariadb.patch, + +files/7.1.10.44973/zarafa-7.1.4-tcmalloc.patch, + +files/7.1.10.44973/zarafa-7.1.5-gentoo-swig1.3.patch, + +files/7.1.10.44973/zarafa-7.1.9-sysconfig2confd-1.patch, + +zarafa-7.1.10.44973.ebuild, -files/7.1.5.42059/Datux-sendas.patch, + -files/7.1.5.42059/Datux-spamhook.patch, + -files/7.1.5.42059/zarafa-01-oss-configure.patch, + -files/7.1.5.42059/zarafa-06-sizeof-char.patch, + -files/7.1.5.42059/zarafa-22-gcc47.patch, + -files/7.1.5.42059/zarafa-23-newclucene.patch, + -files/7.1.5.42059/zarafa-24-undefined-behavior.patch, + -files/7.1.5.42059/zarafa-25-imap-maxfail.patch, + -files/7.1.5.42059/zarafa-30-ac-typos.patch, + -files/7.1.5.42059/zarafa-35-embedded-mysql.patch, + -files/7.1.5.42059/zarafa-7.0.3-sysconfig2confd-1.patch, + -files/7.1.5.42059/zarafa-7.1.4-tcmalloc.patch, + -files/7.1.5.42059/zarafa-7.1.5-gentoo-swig1.3.patch, + -files/7.1.7.42779/Datux-sendas.patch, + -files/7.1.7.42779/Datux-spamhook.patch, + -files/7.1.7.42779/zarafa-01-oss-configure.patch, + -files/7.1.7.42779/zarafa-06-sizeof-char.patch, + -files/7.1.7.42779/zarafa-22-gcc47.patch, + -files/7.1.7.42779/zarafa-23-newclucene.patch, + -files/7.1.7.42779/zarafa-24-undefined-behavior.patch, + -files/7.1.7.42779/zarafa-7.0.3-sysconfig2confd-1.patch, + -files/7.1.7.42779/zarafa-7.0.8-va_list.patch, + -files/7.1.7.42779/zarafa-7.1.4-tcmalloc.patch, + -files/7.1.7.42779/zarafa-7.1.5-gentoo-swig1.3.patch, -files/zarafa.logrotate, + -zarafa-7.1.5.42059.ebuild, -zarafa-7.1.7.42779.ebuild: + Bump + 23 Nov 2013; Mario Fetka zarafa-7.1.7.42779.ebuild: force php less then diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest index 7747829..3e76a47 100644 --- a/net-mail/zarafa/Manifest +++ b/net-mail/zarafa/Manifest @@ -1,29 +1,18 @@ 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 7.1.5.42059/Datux-sendas.patch 2439 SHA256 c2692144549cf5b0aad5aea3199c7655db3d6d8d62c8fc65a0333f7def98f5dc SHA512 64e3f43d703265d8aa9d6e2632fac68d1571409414dd48781593855f7def5f2d034501febf626bd809a748eaa8cff743f5e268a71ecd61dd41505f0157105f3e WHIRLPOOL 32fdb7136ee25d7381d3dbd690ca375e01ae097a521a2a42bdd90434b5c7b815e8eddb86ae7958c7be694107c693a543320e5c5455326fa0df618f3c452de048 -AUX 7.1.5.42059/Datux-spamhook.patch 8890 SHA256 e67e6178d27f78530b727ca7cc4e96cd1e9e3173fa20547cd132464f70d207f5 SHA512 5e11dc0940441e208d877a31d74ba077abd388982859e7c3d6c0f42551ad362d0e9991d2a6ea2b62d794ea84564222ef376025a2b50e60293684cdbd5ec566a4 WHIRLPOOL 7751cb4ceec3abf6261917fa518486fc4c534a6b9888e3fa091f9d86832cac229bb6ace87a33b20de7c68d7de7ac947826e3f360d1c185170587ab287b1bcc56 -AUX 7.1.5.42059/zarafa-01-oss-configure.patch 1759 SHA256 8933fd463506d703358e9829177afd71c15f34f8d424113c60a414ed406bcd24 SHA512 18d3cb4fb68df966372a7f7670c9f12627395387364adc66947ad04b5b086d057ace980d6bd064683a5a6d851d19e9f2b216ec4c54300491dbaf8bca684fedd3 WHIRLPOOL a46eb5370e53780800735be46dfc257d4612d0429145154dc2792b3556ae6dc4478c4c35db2c01a53925f1c990665cd9704f926b885b8f16b2279a77129fc566 -AUX 7.1.5.42059/zarafa-06-sizeof-char.patch 17312 SHA256 1d9b50aacc13e88ae650ffbdbf5470d1d9fc747c920afe082b2dd4108491443b SHA512 c92c81dd0a6cb241611af7247d01af508ce2c72238c0fab00a3d042c2002d941542137acf080015e3acb820e6f2998efde16da7b53823f43d13f55d8189b25cc WHIRLPOOL 5577193f7c9f3160cb6da385b4ca7f856f75e3336e3b42e3a0748b7c95fcf214bc3d6c60e32c36598d501745253311920fb9dbc70f4e16bec5b0ce61c888e3d0 -AUX 7.1.5.42059/zarafa-22-gcc47.patch 6805 SHA256 00a70d2e2b73ff81081302247e7a2af59573058ade9e3b9508fc6d997d5e585f SHA512 33e7279e2f451df7dfee9ffcb4dcbbc74349cf9ab1a85f3f4f9b033bf54d3a9fb7b893f6738c6bad573983cce955699ec1320f4fd8f061fe5a9d96d48b168761 WHIRLPOOL f5311a55639094cd5986a514c4892c23fedb31845f7660b1ab3421f00c77f8a4b96ba052f6918b84032c2ec6fdfa5df7f0f7e34f91be6db539350bb041b8db3c -AUX 7.1.5.42059/zarafa-23-newclucene.patch 6766 SHA256 794e0b8db4d8775a34d04a758aeb19ae6c50255955d78a2e0ecbadee8a7add50 SHA512 96d399ee72347d35f5b580f7760a729955d746937a0f56347d1558405064642a84803e39322816faa865ce0bf80aa5a6d576f3efc88bb81c8292e2f7c411608c WHIRLPOOL 781ee12b336f5410049b6454f2c671c9ec7e83f30684f4263814663bb4ae840e4cd24f89126cb06742ef184d1225497b37451305711c70157084415e624bd044 -AUX 7.1.5.42059/zarafa-24-undefined-behavior.patch 1002 SHA256 f3156cd7f17a7c3feaa66cbb52f8d4d1a3d22135054d6131cb76784b2f2dcb0b SHA512 3b67835052cfffa071e0f5a06de9b12c5018ced84a4bc48ada54d5eb1da2fa63fa7274882e70b43fcc3780c74bd6b216fdf26fa38a4633238a8dae0ca53e39bc WHIRLPOOL 6530d5caef06c007eb7b0941c4c6274cfd1dc1860f88a8037f540b7626dca90147ffd9595fad8c74015283a7b466c9450e8f7eb621673b1743eafa9502a23edd -AUX 7.1.5.42059/zarafa-25-imap-maxfail.patch 2103 SHA256 23719ad5b4e0225254ff78e1a5f45e26ff2e3d085881d74f821caadc37f6ca92 SHA512 6f982388a851af276e8458f1c2ac47d96f0b772ce2590afd9e92221224fc09883506e8ffa824ee55fb9094fedbfbd5d6241b0ffe4738993260daf6b305f96efa WHIRLPOOL f70660d05d5642497185720d0384510530835289b1ffce0478df980d6801d2e661c3fb862ed7137c36883d365d372aa7a0b35df5625f8c78b5aed7d43e46ea6a -AUX 7.1.5.42059/zarafa-30-ac-typos.patch 979 SHA256 b2dbd3ca51e35ff75753854f6fc376659d1b7fbe778806689f5ac7887831f447 SHA512 d18c6ddba8f539cced3db63751a80312f160fcc963074a6313256a78c91637140e7ccb7a76c53c8bd126cde3a0ba8f89de3f5da3fe291ae6b760ae0c1d8c6bce WHIRLPOOL ff5cc0b6c1cb661338cab09b7dcdfc362d29a4b9362acb78500f5dd9d67d8513f64aace48591e2d86816b916dba8a66bda763c1124313212fc5a02683c88643b -AUX 7.1.5.42059/zarafa-35-embedded-mysql.patch 1867 SHA256 df3abb11aae67901251b065f0ae8db27a6283162f89a95af6164f8caea68b772 SHA512 16d47dcfb0a68faa9217701c1e0fe50b484438b7e4a46c59ea59e50e0149027a4724ceffc4e8a9f4f36e41fae7128aaa3ea71ed6e98f761c55fdb089fd296e54 WHIRLPOOL 0d8b6ef3546786b648f41e03e7c0fbc8c0942aa6ec9e901ce66deecceab9aae91e188264529453ff3111f325d2808fb71990d427282f420b4d1e4e4b5e4351e1 -AUX 7.1.5.42059/zarafa-7.0.3-sysconfig2confd-1.patch 4843 SHA256 c9196a886f8435dcb2f82b92c6ee4769daf1eeb76b2fdfad4980a88cff461359 SHA512 6b683018a834ca666b0c96226a63280f3a3cde5e1e392e1e9f5681fa870669bbff27ebd719390aeebf670bcf3ba7b05ef0c27a77a039c0099fdc97dec4f0f36d WHIRLPOOL dd8e19057dc40785bee25846b399fec8ec5b61fd43586361a5131ef2a9f3e1dcd36db8290e7a0695b6a0a2fa01dca42581dc8e517bafe9290008f3ec38c3a372 -AUX 7.1.5.42059/zarafa-7.1.4-tcmalloc.patch 679 SHA256 3f982a2a37a42092a4878c7d7af0b235ae8327f26c0f5fe0ea253cbfcc236018 SHA512 086cbabb7d87ee3218de76f3f42cf3fcd9e1abdc289c6a9280556e3ef8812142da68dadb2e0d4da3355382fea27f3f3f3a37d943ef926f064d4bc9f0884c78de WHIRLPOOL 8e1d57b82d896127b384159ebb4b19457a3431250af1029d5cf214f5492f8f78b3c3baa8cf12baa39b2dbeddfa5672c4d5ce97b6a44bf230469d6074a02c829b -AUX 7.1.5.42059/zarafa-7.1.5-gentoo-swig1.3.patch 621 SHA256 12666f1a041d4dde86577860c96fd7ca67f6e2ce33b981e8f57ac336bba48f19 SHA512 419b4f0b12ab18ec140e2d829a1355236f2fbecfa4c26262c7044142a6c56299e053cff4a21a50e5793b45419431c078080f8ff4dc715ad89725aa9921e320fa WHIRLPOOL 8adbad8396d1151942ea78daf52a11f050d59fabe476159afac86c7178e01733cf9848a163031663fdbf7858994c569318495181a196e710a06d54b621185908 -AUX 7.1.7.42779/Datux-sendas.patch 2439 SHA256 c2692144549cf5b0aad5aea3199c7655db3d6d8d62c8fc65a0333f7def98f5dc SHA512 64e3f43d703265d8aa9d6e2632fac68d1571409414dd48781593855f7def5f2d034501febf626bd809a748eaa8cff743f5e268a71ecd61dd41505f0157105f3e WHIRLPOOL 32fdb7136ee25d7381d3dbd690ca375e01ae097a521a2a42bdd90434b5c7b815e8eddb86ae7958c7be694107c693a543320e5c5455326fa0df618f3c452de048 -AUX 7.1.7.42779/Datux-spamhook.patch 8890 SHA256 e67e6178d27f78530b727ca7cc4e96cd1e9e3173fa20547cd132464f70d207f5 SHA512 5e11dc0940441e208d877a31d74ba077abd388982859e7c3d6c0f42551ad362d0e9991d2a6ea2b62d794ea84564222ef376025a2b50e60293684cdbd5ec566a4 WHIRLPOOL 7751cb4ceec3abf6261917fa518486fc4c534a6b9888e3fa091f9d86832cac229bb6ace87a33b20de7c68d7de7ac947826e3f360d1c185170587ab287b1bcc56 -AUX 7.1.7.42779/zarafa-01-oss-configure.patch 1759 SHA256 8933fd463506d703358e9829177afd71c15f34f8d424113c60a414ed406bcd24 SHA512 18d3cb4fb68df966372a7f7670c9f12627395387364adc66947ad04b5b086d057ace980d6bd064683a5a6d851d19e9f2b216ec4c54300491dbaf8bca684fedd3 WHIRLPOOL a46eb5370e53780800735be46dfc257d4612d0429145154dc2792b3556ae6dc4478c4c35db2c01a53925f1c990665cd9704f926b885b8f16b2279a77129fc566 -AUX 7.1.7.42779/zarafa-06-sizeof-char.patch 17312 SHA256 1d9b50aacc13e88ae650ffbdbf5470d1d9fc747c920afe082b2dd4108491443b SHA512 c92c81dd0a6cb241611af7247d01af508ce2c72238c0fab00a3d042c2002d941542137acf080015e3acb820e6f2998efde16da7b53823f43d13f55d8189b25cc WHIRLPOOL 5577193f7c9f3160cb6da385b4ca7f856f75e3336e3b42e3a0748b7c95fcf214bc3d6c60e32c36598d501745253311920fb9dbc70f4e16bec5b0ce61c888e3d0 -AUX 7.1.7.42779/zarafa-22-gcc47.patch 6805 SHA256 00a70d2e2b73ff81081302247e7a2af59573058ade9e3b9508fc6d997d5e585f SHA512 33e7279e2f451df7dfee9ffcb4dcbbc74349cf9ab1a85f3f4f9b033bf54d3a9fb7b893f6738c6bad573983cce955699ec1320f4fd8f061fe5a9d96d48b168761 WHIRLPOOL f5311a55639094cd5986a514c4892c23fedb31845f7660b1ab3421f00c77f8a4b96ba052f6918b84032c2ec6fdfa5df7f0f7e34f91be6db539350bb041b8db3c -AUX 7.1.7.42779/zarafa-23-newclucene.patch 6766 SHA256 794e0b8db4d8775a34d04a758aeb19ae6c50255955d78a2e0ecbadee8a7add50 SHA512 96d399ee72347d35f5b580f7760a729955d746937a0f56347d1558405064642a84803e39322816faa865ce0bf80aa5a6d576f3efc88bb81c8292e2f7c411608c WHIRLPOOL 781ee12b336f5410049b6454f2c671c9ec7e83f30684f4263814663bb4ae840e4cd24f89126cb06742ef184d1225497b37451305711c70157084415e624bd044 -AUX 7.1.7.42779/zarafa-24-undefined-behavior.patch 1002 SHA256 f3156cd7f17a7c3feaa66cbb52f8d4d1a3d22135054d6131cb76784b2f2dcb0b SHA512 3b67835052cfffa071e0f5a06de9b12c5018ced84a4bc48ada54d5eb1da2fa63fa7274882e70b43fcc3780c74bd6b216fdf26fa38a4633238a8dae0ca53e39bc WHIRLPOOL 6530d5caef06c007eb7b0941c4c6274cfd1dc1860f88a8037f540b7626dca90147ffd9595fad8c74015283a7b466c9450e8f7eb621673b1743eafa9502a23edd -AUX 7.1.7.42779/zarafa-7.0.3-sysconfig2confd-1.patch 4843 SHA256 c9196a886f8435dcb2f82b92c6ee4769daf1eeb76b2fdfad4980a88cff461359 SHA512 6b683018a834ca666b0c96226a63280f3a3cde5e1e392e1e9f5681fa870669bbff27ebd719390aeebf670bcf3ba7b05ef0c27a77a039c0099fdc97dec4f0f36d WHIRLPOOL dd8e19057dc40785bee25846b399fec8ec5b61fd43586361a5131ef2a9f3e1dcd36db8290e7a0695b6a0a2fa01dca42581dc8e517bafe9290008f3ec38c3a372 -AUX 7.1.7.42779/zarafa-7.0.8-va_list.patch 1550 SHA256 cb2ebbd61a1eb304f3d674b0d463cc3b0d8f325e3926c7f16308868ac420ad1d SHA512 6f77181ec0a5f9d6774ebd928cb47c73c35923d158266827d9b23c55b9d70dfc45247d944dc78e5e5d915670e9d8df0d2d19c0b1509139533cc371e92582bf8a WHIRLPOOL d0400e15358caae2e7a627f83d1ae4c72353b16995ec1b07db4327fca08e0dd873df19bbe1f0f2346c7e3f5554d3cb838dee1bf4e17b9f10060fce834aa29eb9 -AUX 7.1.7.42779/zarafa-7.1.4-tcmalloc.patch 679 SHA256 3f982a2a37a42092a4878c7d7af0b235ae8327f26c0f5fe0ea253cbfcc236018 SHA512 086cbabb7d87ee3218de76f3f42cf3fcd9e1abdc289c6a9280556e3ef8812142da68dadb2e0d4da3355382fea27f3f3f3a37d943ef926f064d4bc9f0884c78de WHIRLPOOL 8e1d57b82d896127b384159ebb4b19457a3431250af1029d5cf214f5492f8f78b3c3baa8cf12baa39b2dbeddfa5672c4d5ce97b6a44bf230469d6074a02c829b -AUX 7.1.7.42779/zarafa-7.1.5-gentoo-swig1.3.patch 621 SHA256 12666f1a041d4dde86577860c96fd7ca67f6e2ce33b981e8f57ac336bba48f19 SHA512 419b4f0b12ab18ec140e2d829a1355236f2fbecfa4c26262c7044142a6c56299e053cff4a21a50e5793b45419431c078080f8ff4dc715ad89725aa9921e320fa WHIRLPOOL 8adbad8396d1151942ea78daf52a11f050d59fabe476159afac86c7178e01733cf9848a163031663fdbf7858994c569318495181a196e710a06d54b621185908 +AUX 7.1.10.44973/Datux-sendas.patch 2439 SHA256 c2692144549cf5b0aad5aea3199c7655db3d6d8d62c8fc65a0333f7def98f5dc SHA512 64e3f43d703265d8aa9d6e2632fac68d1571409414dd48781593855f7def5f2d034501febf626bd809a748eaa8cff743f5e268a71ecd61dd41505f0157105f3e WHIRLPOOL 32fdb7136ee25d7381d3dbd690ca375e01ae097a521a2a42bdd90434b5c7b815e8eddb86ae7958c7be694107c693a543320e5c5455326fa0df618f3c452de048 +AUX 7.1.10.44973/Datux-spamhook.patch 8890 SHA256 e67e6178d27f78530b727ca7cc4e96cd1e9e3173fa20547cd132464f70d207f5 SHA512 5e11dc0940441e208d877a31d74ba077abd388982859e7c3d6c0f42551ad362d0e9991d2a6ea2b62d794ea84564222ef376025a2b50e60293684cdbd5ec566a4 WHIRLPOOL 7751cb4ceec3abf6261917fa518486fc4c534a6b9888e3fa091f9d86832cac229bb6ace87a33b20de7c68d7de7ac947826e3f360d1c185170587ab287b1bcc56 +AUX 7.1.10.44973/zarafa-01-oss-configure.patch 2186 SHA256 11d50456b9328f9e826fdacc79f4d699714d9c28974b1a561fb1de5ec7e1c570 SHA512 031df7ce1374eb052d621b0cfcee7a045257ff9680d10f282c8f70cf22deb363c88f7f1cd24d00ef40fdf9d4f4b940b42d46e19a45ea9654de6746983c7e5ce5 WHIRLPOOL f1711723353e3218991671f8aeb9a6ad4f7f333fba09441b6995c68e55a36b4ece2731b83179372180b6380b7af22f3b645f5b3a054d41003648963c059dfdb1 +AUX 7.1.10.44973/zarafa-02-ldapmsplugin.patch 1001 SHA256 2e2c62e598b084cb78657dcbb4464f0ea12761dd442626a25ab1111c22c431b7 SHA512 09f93aaa4fae84dc1b85234301ede199f77b5ae80d10a5bc2de4bf435b723c61203fd7409df648fe8dc9c1bb1772f0695c471a4fc320dba009cd265c52ae8804 WHIRLPOOL 7abef2073d149a5f7a8f96cabbce79a235f2f10f7ea9638b5fa7db3d9d45a5553a626b7db623f1433946528cf0240a30feeaf1a33db7a86b29a0f9621786fadc +AUX 7.1.10.44973/zarafa-05-libdeps.patch 3902 SHA256 a20bad2d970c081e5568f5253d67b56d9139f43db97d5bde871a29dfc84dc63c SHA512 c5497f8f55ef91b3732c9826323bbd32a0c3110c66f18b7a1b274ae99602bf1a04073b438d899146124e065d839223d9eb31b263af9bc5b6a93cc6cc4e22b20c WHIRLPOOL 2faa73dd957324805a08967994246c5ccfa50951b186dbce0805c4214c75e32678091b1c62af16bd7a0fc5916df63566c2f85af5cd417b4b0dc9c4ead23b1013 +AUX 7.1.10.44973/zarafa-07-sonames.patch 6435 SHA256 96e559c154b30e0a02a965ccac4fc0ec0fe88c1d2432a7b4ce847c06db8ca99a SHA512 f252c828a9b210cd11173a5c3418d24c3700d1144c45b312fdc948a1ba80ffa217d451aa3d1ddbabbd89458800b99f7f16e48d5cefe2c0c3f4549041bf4650ab WHIRLPOOL 8c7d64513aa2fd3c152722aa7f99bf1ac93c2967a5dd1579c2ed88d2aa0d9ca64da644198c8c864137aa2d50e5104b3cba4483a0127dbd57ac5a1d0113b3c4d3 +AUX 7.1.10.44973/zarafa-10-translations.patch 1906 SHA256 2f353d1ad6b87b48a9e09a2610c5e82873fa13c19ffdda2dc42fbea9896342d6 SHA512 fbbfa7d05c130959e5cdfd83087ee66d8d39dc3bdde944738ee1a4fe3f6387064930789d29a8cb19dd13d27f80a562b5bbf56f76e32fc05451d7dffc5332599f WHIRLPOOL ff3eb5292848d1fccdc1fad471e2d112a5ec79d6697ce977b1a41a430e62d201db4fa12bcdfc20971ae5b48c19a78cfd01faf0effaf9da056921ce9e3b3a8328 +AUX 7.1.10.44973/zarafa-14-shared-libs.patch 6484 SHA256 f8b46952e7bfd053c4e0ee032fd0d39bf2f97e23f3456ae755211439207aa308 SHA512 7cbb7d2c5a8fc5fc854e3873d40e9d3a6d7d205e21c7f38700857784888da0b2275ce6410888375996c95c3d849417a0d63fc8aee519551510d749cd2ae50ddb WHIRLPOOL 30df2682fd2e89073589b8d0b5c4769f3943d6f56cc3b773838f95feaea8a8b9c007c37778ee2d3232e28a89c57abed3a3b4f5096a066323b91be34958609166 +AUX 7.1.10.44973/zarafa-22-gcc47.patch 4291 SHA256 9c1ba4853a55c30f02c81afa2068c19886af26542730b9feb883040830135dfc SHA512 b91299a5e21ec63696b1978e38f9407a4e9d23253ad30beba113da839a03f0772d1b0ddee31206297ac7109bea3f33c2c4b31b5322b0db66352f92c9e2f5a75e WHIRLPOOL c42bf3d3cdbfd61c83ba069db9a5da4a69cb0bc62afaffc414062e78467e2d624cd717cc6186d0f8a0e19221e782df7cde725a1b70da2aabc70520d61530c79e +AUX 7.1.10.44973/zarafa-40-mariadb.patch 2009 SHA256 30388aeeba82e174e3cb3afdf72d4eacfff25681872e873a3881874bf7b33124 SHA512 f4542a233b4a9ade3fcfdd563fa5522903ff494e218de57f6b710fc86fa3074fa9763a44ea8c00ecc7122d78f113c56c60f0b0bd0e2d39361ba1ad420f834f83 WHIRLPOOL 9f1d7ef78312d971c9fecb3a5567b9ee22d01b547be4aaceba3fdd3e7a1e3954108c35200e64ba224106143ba61abeece09f766f85239e53af3bce0d5706549b +AUX 7.1.10.44973/zarafa-7.1.4-tcmalloc.patch 679 SHA256 3f982a2a37a42092a4878c7d7af0b235ae8327f26c0f5fe0ea253cbfcc236018 SHA512 086cbabb7d87ee3218de76f3f42cf3fcd9e1abdc289c6a9280556e3ef8812142da68dadb2e0d4da3355382fea27f3f3f3a37d943ef926f064d4bc9f0884c78de WHIRLPOOL 8e1d57b82d896127b384159ebb4b19457a3431250af1029d5cf214f5492f8f78b3c3baa8cf12baa39b2dbeddfa5672c4d5ce97b6a44bf230469d6074a02c829b +AUX 7.1.10.44973/zarafa-7.1.5-gentoo-swig1.3.patch 621 SHA256 12666f1a041d4dde86577860c96fd7ca67f6e2ce33b981e8f57ac336bba48f19 SHA512 419b4f0b12ab18ec140e2d829a1355236f2fbecfa4c26262c7044142a6c56299e053cff4a21a50e5793b45419431c078080f8ff4dc715ad89725aa9921e320fa WHIRLPOOL 8adbad8396d1151942ea78daf52a11f050d59fabe476159afac86c7178e01733cf9848a163031663fdbf7858994c569318495181a196e710a06d54b621185908 +AUX 7.1.10.44973/zarafa-7.1.9-sysconfig2confd-1.patch 4588 SHA256 545613df0455378db89ac4db91ada562dd4b820a3d62f5efb36020863b9e0066 SHA512 0bc8a3ba4aec7afc79ce26505278dff9bb85cd52b95eee984b0da3219b29d4da361893613c5a94488f71cf2f17dfdf2c583c8121446094c7027d6ab148f6b2f5 WHIRLPOOL 66bb72ce368cc620b51f93735181a100f87c1c679b627679e5da270d7a2c57a0f79d7575a55d624784085c56ac38d9d9264922936a4c31c62100bf8eadb24155 AUX junklearn.dspam 924 SHA256 5060aa1c0fd3e103c0243f5372ec4a393d4aebc7ed7c69a9475adead50d6b37e SHA512 43321b5245a5a6b6032fe8f34382826dbc3630e03ff43eda5c41d5782e0df72a2e784638e3047ba141141e4d3d99ef11e555117fb77fc2555e3ce07c7b28f65c WHIRLPOOL 983c2d5c87145a38bb87044cb6b9050092fa7c05bfa6de5317890103663550a86ccdb5af71966e86062943f5e39b6fbb990617048380aab94920602ed5b9d214 AUX zarafa-bash-completion.sh 9045 SHA256 e3ad01ca797ef1aa428d17184ab16704faed1f1c6878113c0ff570b49cb788d6 SHA512 261dcb9cfdfe84920d666f4719fbf5c19000dd10295852a6121142d3e7fa9fe564a2b09149f93cba5fc1cf4630998b3227269b7c4e7ec245e4346b750b8171eb WHIRLPOOL dfacb2a9f1847f40fd02afe4813d97ec9be8a4fd83466e3d5b2ae32de31bd94a450b4fe9a7e6049cecb593b0ddd80ee37165400b0a43617b76f19170ef74931e AUX zarafa-dagent.confd 185 SHA256 5e142b9a6310197cf744a83bf8a134472ed6b497a7b477398f25d14e898480bc SHA512 8845cd227737667df9c96f56d92af2819d3ebb1580dc3399beda140992d10d23688fc50fbfd44a8e3e3bfa9e7e2fbdac0339ddc09b5544e6e7bf84b49f5cbdbc WHIRLPOOL cf3a9898babbc3576434bac86ba02da6aa4c1e67fc4fb1d5f473ad602dc9e7671385345f661ce9c86becf728bc9176ad9ca96b0972624901ac1c1a420c972fe9 @@ -50,22 +39,17 @@ AUX zarafa-server.service 382 SHA256 6a8dd7417fd856498d4a03c823217967b6e2e3448ea AUX zarafa-spooler.confd 190 SHA256 e2017fb37f3a1b467501e322cb5bd26510954dece5a89b6ac00a52af427eaccc SHA512 c540876552efef189800cd28dd925ad84747b2fa791f3bafc148107e442c5658309f6cb1e1ead722aa509bbc0242eed610d20563d9930f2fc8fd27210c8256a5 WHIRLPOOL 134896767db14d835489e19deeed0f7afb991f1708599401c28bd506f2a235d15b8d44fad0f4a63a9b5dc16350950bf331d4323db4844136999198c137780cc3 AUX zarafa-spooler.initd 758 SHA256 4901ea13c2c1ac174067e08d8c184705e8a4ac2a50b3e2f6e5d1a213c42e7a06 SHA512 6996123abe5bd9c35f64daa056ea613b5f9f403819e64ebfe2c9ee58ac952fb95ced8ef9c936dd10fad377ed36cad41dcafb74c661d01f22bd16c0299ccbe3dc WHIRLPOOL 2acfa7812f2dd1489ad9af1b5c0ac21a300140280769abd2c7266ba8b0b54eaf6e37f802f1b15398e0ecbee445977a8cba7754239377eace64c85714219dfbb1 AUX zarafa-spooler.service 359 SHA256 f01ad27ca9e1861aef31ae66145dfecf0472a6557eca550193abcde14af55274 SHA512 9ea47645382f4eee87092b33ecad0b1ca0f0eef3a2288f8ba5299fe065f6b8e841725958823643e011ba49fa04863bf792006ef8fca504682ac48378937d6e4e WHIRLPOOL 0df49c43839b156d5bdfb4c9dea6251bb09aeb0da645520bbabb6dedc98df27b85a607c8f1263737fdff62008562ab6c11f6ae1a57b14d64b6f7fa3659d92428 -AUX zarafa.logrotate 2066 SHA256 30fb1a0daf2b68084f473c2cd21524273ca78ebd06fc790f89150103395a1462 SHA512 06e4a287ea7debdeec5bb822f14dcc9d631762512d63ddeb2f9ab19e2fcc2addbfb57073199b9727faf86ccd83bf4c6756399bf2fd62c0ad630d2716481e9276 WHIRLPOOL cdaee97042a03f9a36fc51388fec0438e3419299226a599d48035a1ccdef1ffed05fdc64f367ba339565913d964f759cbb8e4ba53998b87fabcfb083e6b9734f DIST libboost-filesystem1.46.1_1.46.1-7ubuntu3_amd64.deb 50670 SHA256 4eecc887ee9a3ce511acd830c21a9e92babaae35d44cb6d8bfc8a7eb073ae8ef SHA512 3863dd4fe66f80ea37ad1b4a21927fa5feae3f1e22186cab1a0571c59b8fbb1546e685ca0918619a4454372bb031a97cf2b67aadb867dbe852c11970a62b460c WHIRLPOOL 8b11aa0a4440b4c96bc3b140fd728806cd4bcf99aa374105662af75fa70b14b7b6b1ece7705fe6beb9699fd85e4e26f616aa045807eda1754ac4bc80d922f3b8 DIST libboost-filesystem1.46.1_1.46.1-7ubuntu3_i386.deb 51330 SHA256 bf4d582aadea54545b9a6653a6b1ef8b2b66a382e0365bfbd4d0ba33730bd601 SHA512 06993a60923a2df503b6f07d6da468a172c6c0f088d948e2d102b89b94e140c569631391b9c360c2a06ba7c0dfc91c20565b14cfb89b74fc70afcba5a76d8ad7 WHIRLPOOL 406f9f82c35eef5fd07dd2f1348aeb574af00790ece6144d922c6f2c5e46d5bc66efbb48c2b5fb4411e9478cad959cf17fd7d097d437fee4ce99ebfe6f625635 DIST libboost-system1.46.1_1.46.1-7ubuntu3_amd64.deb 14550 SHA256 684e5010e378b98da0eeba04f1848575a4c14aac158a4047b9ae386e9fc5b7a1 SHA512 54815bc9838baf92cb86c326a7a2d9667f78ea4f16cc08915aec2ee5f4d8de825c34b86f27c812c64e7d7549b22acd9a202b60c59b8f5e57dfaedd893717c3bb WHIRLPOOL 975721928d92145db7dd47a5fc771907f38902f4a0a0dcf4c7f2cdd42ec6f989f2740f8cb41182b817ff0022329ec3bd8343da6f548232a7ee76344dedc53766 DIST libboost-system1.46.1_1.46.1-7ubuntu3_i386.deb 14642 SHA256 cda71933b1fd9c5b6031721585eaf8b14edeb5e5440c14aff9cfbf2e741295d3 SHA512 fac874ac51d8ce2c33d92569d3c1663b41219c1c8cfb644cf27d0a2c208bb9d8dc6869e6bf05dad2e637aa67925ab0c0ccaf5e8a3baed2bf1b8fa53a19479be0 WHIRLPOOL 2659c231efb9b90f32a157410279fa5b07cb43e1ea27830bceb14bf1dd766366ad8e408061f04579fd87669f9cb4bd7cc91320403d86aaa6313db2c5997554c7 -DIST libicu48_4.8.1.1-3_amd64.deb 8102778 SHA256 a2cbfbc062d20f9494e0d862f942dfe412525cc06f5031950c18c11b437e4173 SHA512 27ce4f82abfb7a5e2e0fddd5ba20bd1d84c45f8aae5cbced82060b9b899cceb8c78cf463fbc06ff62c70458441a1306284afe4860e7c8ae22f8c0a42ad5287d3 WHIRLPOOL c8f4859faacc3cca232be36e52d1e09ab2f56a01221bcd317685e0f3edf3aba15bd221054fc56b92b6a9abdbdaa04019b0c68df95d7aeabcdea5bc4a3bedd089 -DIST libicu48_4.8.1.1-3_i386.deb 8179546 SHA256 28c03392506f31aa598c40bd9806f17d2d0c65b1aa38309fc99ec7152120158a SHA512 1ac725073b144ed4dab7c056821c47c33f77d206d325d6f212f79aded23a1bb9731141a829a96d3ee43546466870b5bac12109c69c75366aac3f545dde0d71f1 WHIRLPOOL 7e2d13eb8e0c0576944f2ee7d2bd4b8a7843d31d260bced7af6f9f022ecbb42b16eeadd215db261878cee759c54fcd9adcfaacf5fb869cf84ae873a2ee867630 -DIST libssl1.0.0_1.0.1-4ubuntu5.10_amd64.deb 1048422 SHA256 9f8b0df37301fae9d70f9c9e8df73c7177bf3e27c7ef0995b26f7671e8a9c15c SHA512 b6aff2ae216ebc7ae60a0233bc61b356ed976cd99a5cb42c7c8683c5ec7552a28d0f6d2cf69b487b81bb9491b182c88782c9179817f1f213048b729f17374097 WHIRLPOOL d126d1db1fe555833c8d191b6a10e58b615dc7499640f86392f6a1a171fcc7e7e5463a46cfdeacb3bb989d787d226be6f47c4a7ec6ea5e2095253d826b2c1d16 -DIST libssl1.0.0_1.0.1-4ubuntu5.10_i386.deb 1008434 SHA256 bef5216ecf59bd36317a20fcae0e81eef65b478dd5cb1dc6329dd7301244ccae SHA512 90c6d37470bd83842455edd82f26c99aa7ccb238f214c68ef39cad18c6ee5a25ce6a1728a9456b862ea4905d0506ae793feef1c62512d2909aeb0a77458db1a5 WHIRLPOOL a60bc700fe4150af52025d8592157156012ad554d27c30fab41e533ce13288903aede665840f5239ad08e16b4b07e164ef535ccd53efb7dafa5495f0310475a3 -DIST zcp-7.1.5-42059-ubuntu-12.04-i386-free.tar.gz 44539714 SHA256 cbe701272843c739614a2d30b4de728295694425ffd92bbbaf807cb5f4705c4a SHA512 75ee8f5c74cab5eaa86faf192dc4028c0461925d4e26ab2be6f6ed8a697b9a6fac2282e952b4f265107c19f00383471fa8db837b0a566e2d12ebcebc3a176c74 WHIRLPOOL 46e8dfc3f745d35e259b3fead70c640131be1482f1613023a55a76a008de82adcba54c0bf046dbc4bb5b108537ddcd3897e437b061416c60fe92ab749d22ae76 -DIST zcp-7.1.5-42059-ubuntu-12.04-x86_64-free.tar.gz 44326614 SHA256 82ea3366b23fe74efbd92be2c282fba764c0690af4cce9306a4ea2ed57c8c491 SHA512 564650dd90e5b7f0509a339a934088b93dbcdc32cb2e13ead2cb13b580d7f244ba2bccd44c265ff1bf3ff0ae691a12fe27978d19784da723a90485d5f10542c9 WHIRLPOOL 6252231620d69a83a7ad9a75dc123f78d8e37be09e2a85c729af839894ef70f2b6703221b408db3395fba594152d45fb8a49fc69bfcc699a1593ace9da2214f9 -DIST zcp-7.1.5.tar.gz 6473028 SHA256 d7a28e73672d3ef8da971a486536231b91b4d55b88544d519c19a440ff1ef3e8 SHA512 2220e2c4c52b2ab4d9409a696617a235866ecd099b108411497d075c551293f5526ad0a914e2804236357ac31d67c59cc725ac661c219cd44c30d0656e8cfbcc WHIRLPOOL f65c589404ca6ea625658bb157482256d30abb35844a6d3a7781e16de868ba4dc0a9cec0cf95da82db16cbee8b92d98e08966c2d2ae14eddcc597a839bdc82b6 -DIST zcp-7.1.7-42779-ubuntu-12.04-i386-free.tar.gz 44672059 SHA256 2fe8019ab36661e59840e24fae28689fcd1567771747df74ca607d98d4e28750 SHA512 869eb77c43ab421d012efaf77e5e6de1c5eee645423a966152473ca78864e4be60a825d6e6988a455da2aeabc1e34baffec2be9afeaf381430b6fab1e0b87337 WHIRLPOOL e9f202377c82eb46bf20b1dd0035f8361bc2d2af672c47a23b1e6414ba076737aff40a22aac5466d01824d316ac4383fa2e838bee440e4c4dc0002cc334a3e34 -DIST zcp-7.1.7-42779-ubuntu-12.04-x86_64-free.tar.gz 44458878 SHA256 fec8a131a4b431b2d261ca0cf4bc28e7891805621b579beff828d22e947833ce SHA512 8b452f0b6b3d0c4ce393875de2b536b01f052efafccd978832fbac99d41100813f8aea45445b450d1924d43dc2d8824e1f4033f9a4c996b7eb3df2c049888372 WHIRLPOOL af17ca0fd7f96d41bb451ed7b754f89c29fec1ff039ad8a61ceb69188a4e8f0f97ee39192e4720d2e4a29fced42d0dd2aaa711b102706f82bc337bd165976dc3 -DIST zcp-7.1.7.tar.gz 6458814 SHA256 61aa2fb1180e061afc733e1b911ae08aa7c923be8759af4e3b5bcdc851be108e SHA512 cd631d87b58f7131ad3865e8dd89f92c236d48651375d9443a67208768954bae43f3a1a332b587a601948b19ec38c4317df6164110c9cb64e911d7388ffb2d1b WHIRLPOOL 3ffb588d016a8e41e642e7619fe77bfdb1128bf8385f8ab809534b89617a941f70af529fc7573c7efebba60aac65b7e6131d910ddf8d632736a5b40e72a3dbbe -EBUILD zarafa-7.1.5.42059.ebuild 7515 SHA256 adaf2c5273e36ade2f8fdbf1ff482dd86dee4f7c065a2381a7f6427cff24db9a SHA512 ceece57ed8df3cf3bf4a539da0f69f1f796de8501cb1a600b0cfb9f2ee613c8b427433f51f62244c39820fff9320d7a0d2a719eca4506774986dec9c2973cd36 WHIRLPOOL bdd33cad7e3d2601d40a8e24be46933a60893c8b8630bbbcb10451728fccb7e5ed505c2a6bfa09960741616a2362b2537a467526906ddb8d12b85b7ddefed54c -EBUILD zarafa-7.1.7.42779.ebuild 7587 SHA256 c92390cc9383c9c5d5206aa620a7f544a0a7c960099486dbe1e37c6f51566fd0 SHA512 3616803e8cb9170d94e5f156b5ffc7c87c477d9a307f5210f4289712f34991613bb7b4163ccf74ac698a5f4787ffcccb6719c405d820d5d89290d1ffb7fe29fe WHIRLPOOL 6e0234022af121f36de3bc5ec73121b87b4f58808395b8b00e17b68e059654649f7f152223cf230e7f03b0dee60742345d6fa5dca21c07235a164c135ea4a391 -MISC ChangeLog 25375 SHA256 1b6af5dc3bc528d9bd1c322fd13d261aabfc234ee70aab39105fa8c41d781622 SHA512 54abef486a8d946de1ec5f1dd31380c95b390bd4138816ae9bd7bc6aad81e4ab0826b267d1963a9ca7fba58a35c59a15fe980b0945caac8ebc6d7ff145d3c500 WHIRLPOOL 562e626dd39b43e39c60799c310de677de93fec3795404b45e304fb0d7ba4fcbac7098fd400e019642e19c3c57531561e0002d92614380b60c58625f8cbe4d81 +DIST libicu48_4.8.1.1-3ubuntu0.1_amd64.deb 8105454 SHA256 f73b045259331468961df22cea45a68c522b365fefea0cf7b3d6125cd0bf875c SHA512 96a37cacc3620baa2f02527ddafb09a4cf3fe89dcffb1ad5ed92f635d1dbfe829b42a124ab994ebc39c66ac2b92ee71b60b5a53d5c50e6a9f179a5b62dc6130f WHIRLPOOL 31c701272394cb767b4a809fbdbb36197414a6accae6e93a44fcc40905abd3dbf60b1fafd5771acf3ee54087f24ac44b3801832f26bdff5657b521fab36e0846 +DIST libicu48_4.8.1.1-3ubuntu0.1_i386.deb 8183078 SHA256 9d1f3d680c1081fb1de639f098e853f180b29711028f0917fb540a2f13efc816 SHA512 ba73918bbcd0de4896c783e073eb49189a631fccc70374a81a95c9ecfbfb077a2902f6d523e602fde25b63f345036e0ff672d44f7431ace478eb0c08d1b2da7f WHIRLPOOL c9b2f3e799980dabe1a99c8e6ee8d0c592dc6693a971afd359f38799febb56777a7cdf0b457a5ead9db8f0f298547cd315cb7243e4c2383845b5ac011b612378 +DIST libssl1.0.0_1.0.1-4ubuntu5.16_amd64.deb 1051050 SHA256 9a7b8841c633e5ac3b84a94c3b176b3d1ceefbf10b6d80d397b518cef33f45b1 SHA512 87b77246dd4fd0e41914bb4451f381098e9789f9069f965fab1ab99ab60b819d3640cf008fe0adb6070640fe0a6bc6838d2e7e2bbc624ef8d8f94d57df0fa556 WHIRLPOOL a7c2496858459354add95beb89180da385b992765d459642330c558cca25530b6a51c0b0ba6085ce54f5ff47077aaa354ee5958a3c2b0fc046ff18b78fb30356 +DIST libssl1.0.0_1.0.1-4ubuntu5.16_i386.deb 1006970 SHA256 dc3698c369a0afc95c0198e891aafcd78d6ba844e0c718f4c98817d239413146 SHA512 e74d849bf8aaa6c3065c97d54e083014a92fee67af5c107d548165560d1b534d6437cf89e7d71d47130d4c31e1acf8c43c849160e61a038b3c723abafde52c13 WHIRLPOOL b8b3ba46304774ec450247faa3380bc5aed00bef27ba25151a84d3fc15a277e4d8cf129abdf1165b04c65599d5702e3935d31c6de8fb45c4666cf337fbae7095 +DIST zcp-7.1.10-44973-ubuntu-12.04-i386-free.tar.gz 46283549 SHA256 03ab6f199b287968c457102f0f89898c512b8dfb69c43acc6b7210d2ab5fc031 SHA512 b66f137f49bf3f0f3c6078a66e25584b3d772f7caa6e8c5d4b2a0888524dcba817c8c474035ed1348f194c1fd767561134c46de37e6e93901c2376cd666cf942 WHIRLPOOL bf3516a3d5819d581f723e4c0c0ad61cdc8410c6aa16ca1f7f973c5ed36af896147c282b90bfa81aba3cb96c950a49853262165112507ef0441f86e19ce377d8 +DIST zcp-7.1.10-44973-ubuntu-12.04-x86_64-free.tar.gz 46072953 SHA256 1b415f173be08109002743da511b1aeb338ad7d0485928b38509b669b740e887 SHA512 0122804e51cc76b6a6f101279a8c7b16afd1a112d4e47caa814dde98f6fe63714536d59c6cb0d916d6dad8a06294302fdf4647fb05fc4bdc913508c329f08525 WHIRLPOOL 4c3f7b8d6bd42640d12a2a975b31bccb07d4c018ea61502f9a8ad5d9df7a8a9cf99f583207e9f9bbdb22c4c05d4896b95a23ff65eed04e93b8a19b6eb56c0160 +DIST zcp-7.1.10.tar.gz 7024296 SHA256 701bc4729a755c331493c4131b425f34de0f18eb7e02f675d9474d9d62d9c739 SHA512 a13b1ca7c8163f70601e88d8cacb5be47124bd791dcd4a98995590af739781823c5227402e6992d577640d933b67e27dbb14d2dede6054fc4d588a2a85c5e723 WHIRLPOOL 9c9c2f1fb6cd611cbfcce39582ada939cab333f55d48388eb0ee539eedf445736330e7c64013712cbdf27c0614e1808b8bd01adc7bf7506e59d03a0c0017c955 +EBUILD zarafa-7.1.10.44973.ebuild 7061 SHA256 7b9d3e6bd199dd91789cbff2fd2f321a9bbed9ade6fcbb3336571cc8c96f1a5e SHA512 9a6c5ce74b85316521ba7a0f62f09fcf0141cbac2c563b866fc9a6bc4cce354684d5aaf2cc80a6d6286dfd179e2f6cb5b573bdf1d43b68b5b57273cff03d9434 WHIRLPOOL a291f9d6504db10ee026329d7140165a31aa4f5aa833342d935433f3c01bef19cf20f29f877b62e2ffb117df7e00bb9f6a36a40044b1becda0312651629dfb03 +MISC ChangeLog 27432 SHA256 9a72c967ba0a0d5b26ea7f0f80328ad26f255b8b579a241c476de1a141c81904 SHA512 a35c625b8237ac5c9e12949fd98002d5d7d1c11a9232fd46afbde05bd7a50a2bec6ee650536bc4ec2ba9b31f2f35e12620b071f7d4618cf8ac99b24b0b780251 WHIRLPOOL 5345a2d0213ac0a936036e3b4e6efcde250aedca3c13ff47dcbe2638b02ae0e93ac48a1407b67773e879edb3a5c0ff8681fe29c454d1589e670411e84424ce5c MISC metadata.xml 1238 SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 SHA512 d94394e853ce7bd9109322f37ab5d3526e2bbc4a59ac02d0b66e9d952d221a06ae1c38b6de5cdb142b2b09ac602a57ff03f0525efbbc7b8f33f9662ca42a5dd5 WHIRLPOOL 482453b974eaca6506c4503f49c5c55195790e9b47f19a885d551fa535445104fbb7bc93dc4f30f7faf545f619594fa04d9a8071c21eb55995fef4f7380f55b9 diff --git a/net-mail/zarafa/files/7.1.5.42059/Datux-sendas.patch b/net-mail/zarafa/files/7.1.10.44973/Datux-sendas.patch similarity index 100% rename from net-mail/zarafa/files/7.1.5.42059/Datux-sendas.patch rename to net-mail/zarafa/files/7.1.10.44973/Datux-sendas.patch diff --git a/net-mail/zarafa/files/7.1.5.42059/Datux-spamhook.patch b/net-mail/zarafa/files/7.1.10.44973/Datux-spamhook.patch similarity index 100% rename from net-mail/zarafa/files/7.1.5.42059/Datux-spamhook.patch rename to net-mail/zarafa/files/7.1.10.44973/Datux-spamhook.patch diff --git a/net-mail/zarafa/files/7.1.10.44973/zarafa-01-oss-configure.patch b/net-mail/zarafa/files/7.1.10.44973/zarafa-01-oss-configure.patch new file mode 100644 index 0000000..0fd8d51 --- /dev/null +++ b/net-mail/zarafa/files/7.1.10.44973/zarafa-01-oss-configure.patch @@ -0,0 +1,61 @@ +diff -uNr zarafa-7.1.10.orig/configure.ac zarafa-7.1.10/configure.ac +--- zarafa-7.1.10.orig/configure.ac 2014-06-28 01:19:25.726141047 +0200 ++++ zarafa-7.1.10/configure.ac 2014-06-28 01:21:39.443135381 +0200 +@@ -839,21 +839,6 @@ + version + specialbuild + ]) +-dnl non-oss files +-if test -d `dirname $0`/licensed; then +-AC_CONFIG_FILES([ +- liblicense/Makefile +- licensed/Makefile +- ECtools/zarafa-backup/Makefile +- ECtools/zarafa-backup/helpers/Makefile +- ECtools/zarafa-report/Makefile +- ECtools/zarafa-msr/Makefile +- ECtools/zarafa-ocf/Makefile +- ECtools/za-extra/Makefile +- ECtools/zarafa-ws/Makefile +- ECtools/zarafa-ws/etc/Makefile +-]) +-fi + + AC_OUTPUT + +diff -uNr zarafa-7.1.10.orig/doc/Makefile.am zarafa-7.1.10/doc/Makefile.am +--- zarafa-7.1.10.orig/doc/Makefile.am 2014-06-28 01:19:25.734141047 +0200 ++++ zarafa-7.1.10/doc/Makefile.am 2014-06-28 01:22:43.785132655 +0200 +@@ -10,10 +10,6 @@ + zarafa-msr.1 zarafa-msr.cfg.5 zarafa-msr-verify.1 za-aclsync.1 za-aclset.1 zarafa-backup.cfg.5 za-restore.1 \ + zarafa-set-oof.1 zarafa-mailbox-permissions.1 zarafa-autorespond.1 + +-if ! OSS_ONLY +-allpages += zarafa-ws.1 zarafa-ws.cfg.5 +-endif +- + CLEANFILES = zarafa-cfgchecker.1 + + man_MANS=$(BUILT_SOURCES) $(allpages) +diff -uNr zarafa-7.1.10.orig/ECtools/Makefile.am zarafa-7.1.10/ECtools/Makefile.am +--- zarafa-7.1.10.orig/ECtools/Makefile.am 2014-06-28 01:19:25.719141047 +0200 ++++ zarafa-7.1.10/ECtools/Makefile.am 2014-06-28 01:20:35.937138072 +0200 +@@ -1,5 +1,4 @@ + if ! OSS_ONLY +-PROSUBS = zarafa-backup zarafa-report zarafa-msr za-extra zarafa-ocf zarafa-ws + endif + + SUBDIRS = $(PROSUBS) zarafa-archiver zarafa-admin zarafa-monitor zarafa-passwd zarafa-fsck zarafa-cfgchecker zarafa-stats zarafa-search zarafa-utils +diff -uNr zarafa-7.1.10.orig/Makefile.am zarafa-7.1.10/Makefile.am +--- zarafa-7.1.10.orig/Makefile.am 2014-06-28 01:19:25.653141050 +0200 ++++ zarafa-7.1.10/Makefile.am 2014-06-28 01:20:53.202137340 +0200 +@@ -1,9 +1,5 @@ + ACLOCAL_AMFLAGS = -I autoconf + +-if ! OSS_ONLY +-PROSUBS = liblicense licensed +-endif +- + SUBDIRS = external common libfreebusy mapi4linux zarafa-libsync $(PROSUBS) provider libicalmapi inetmapi + if WITH_PHP + SUBDIRS += php-ext diff --git a/net-mail/zarafa/files/7.1.10.44973/zarafa-02-ldapmsplugin.patch b/net-mail/zarafa/files/7.1.10.44973/zarafa-02-ldapmsplugin.patch new file mode 100644 index 0000000..d444a8f --- /dev/null +++ b/net-mail/zarafa/files/7.1.10.44973/zarafa-02-ldapmsplugin.patch @@ -0,0 +1,29 @@ +From: Jan Engelhardt +Date: 2013-06-28 07:55:28.103159907 +0200 + +build: always build ldapmsplugin + +The source is already there in the free version, so why not just +compile it. +--- + provider/plugins/Makefile.am | 2 -- + 1 file changed, 2 deletions(-) + +Index: zarafa-7.1.5/provider/plugins/Makefile.am +=================================================================== +--- zarafa-7.1.5.orig/provider/plugins/Makefile.am ++++ zarafa-7.1.5/provider/plugins/Makefile.am +@@ -21,13 +21,11 @@ ldapplugin_la_SOURCES = LDAPUserPlugin.c + ldapplugin_la_LDFLAGS = ${AM_LDFLAGS} -module -avoid-version + ldapplugin_la_LIBADD = ${top_builddir}/common/libcommon_util.la $(LDAP_LIBS) + +-if ! OSS_ONLY + pkglib_LTLIBRARIES += ldapmsplugin.la + ldapmsplugin_la_CPPFLAGS = ${AM_CPPFLAGS} $(ldapplugin_la_CPPFLAGS) -DWITH_MULTISERVER + ldapmsplugin_la_SOURCES = $(ldapplugin_la_SOURCES) + ldapmsplugin_la_LDFLAGS = $(ldapplugin_la_LDFLAGS) + ldapmsplugin_la_LIBADD = $(ldapplugin_la_LIBADD) +-endif + + endif + diff --git a/net-mail/zarafa/files/7.1.10.44973/zarafa-05-libdeps.patch b/net-mail/zarafa/files/7.1.10.44973/zarafa-05-libdeps.patch new file mode 100644 index 0000000..b07d480 --- /dev/null +++ b/net-mail/zarafa/files/7.1.10.44973/zarafa-05-libdeps.patch @@ -0,0 +1,96 @@ +From: Jan Engelhardt +Date: 2011-07-03 23:49:00 +0200 + +build: add missing library dependencies + +Any dependencies that a .la uses should be mentioned in that .la's +LIBADD spec, *irrespective* of whether it is going to be static or +shared. The benefit is that linking against .la files is like linking +against .so, i.e. all dependencies are remembered, so that e.g. +zarafa_server_LDADD need not list them. + +Here are a bunch of dependencies I made out from `nm | +grep ' U '` reports. They might not be complete. + +--- + common/Makefile.am | 5 +++++ + provider/common/Makefile.am | 2 ++ + provider/libserver/Makefile.am | 2 ++ + provider/server/Makefile.am | 2 +- + 4 files changed, 10 insertions(+), 1 deletion(-) + +Index: zarafa-7.1.8/common/Makefile.am +=================================================================== +--- zarafa-7.1.8.orig/common/Makefile.am ++++ zarafa-7.1.8/common/Makefile.am +@@ -58,6 +58,7 @@ libcommon_mapi_la_SOURCES = CommonUtil.c + MAPIConsoleTable.cpp \ + ECMAPIDebug.cpp \ + MAPIErrors.cpp ++libcommon_mapi_la_LIBADD = -lpthread ${ICU_LIBS} + + libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -static + libcommon_util_la_SOURCES = platform.cpp \ +@@ -92,9 +93,11 @@ libcommon_util_la_SOURCES = platform.cpp + fileutil.cpp \ + ECThreadPool.cpp \ + ConsoleTable.cpp ++libcommon_util_la_LIBADD = -lpthread ${BOOST_FILESYSTEM_LIBS} ${BOOST_SYSTEM_LIBS} + + if HAVE_ICU + libcommon_util_la_SOURCES += ustringutil/utfutil.cpp ++libcommon_util_la_LIBADD += ${ICU_LIBS} + endif + + libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -static +@@ -102,9 +105,11 @@ libcommon_ssl_la_SOURCES = \ + SSLUtil.cpp \ + ECChannelClient.cpp \ + ECChannel.cpp ++libcommon_ssl_la_LIBADD = -lpthread ${SSL_LIBS} + + libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -static + libcommon_service_la_SOURCES = ECDatabaseMySQL.cpp ++libcommon_service_la_LIBADD = ${MYSQL_LIBS} + + # remove double installed headers + install-data-hook: +Index: zarafa-7.1.8/provider/common/Makefile.am +=================================================================== +--- zarafa-7.1.8.orig/provider/common/Makefile.am ++++ zarafa-7.1.8/provider/common/Makefile.am +@@ -16,6 +16,8 @@ libzarafacommon_la_SOURCES = SOAPUtils.c + ECOfflineState.h ECOfflineState.cpp \ + StreamTypes.h ZarafaVersions.h + ++libzarafacommon_la_LIBADD = ../soap/libsoapclient.la ++ + check-syntax: + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \ + -fsyntax-only -fmessage-length=0 ${CHK_SOURCES} -Wall -Wformat=2 +Index: zarafa-7.1.8/provider/libserver/Makefile.am +=================================================================== +--- zarafa-7.1.8.orig/provider/libserver/Makefile.am ++++ zarafa-7.1.8/provider/libserver/Makefile.am +@@ -61,6 +61,8 @@ libserver_la_SOURCES = \ + ZarafaCmdUtil.cpp ZarafaCmdUtil.h \ + ECLockManager.cpp ECLockManager.h + ++libserver_la_LIBADD = -ldl -lpthread -lz ${SSL_LIBS} ${BOOST_FILESYSTEM_LIBS} ${BOOST_SYSTEM_LIBS} ${ICU_LIBS} ${KRB5_LIBS} ${MYSQL_LIBS} ${PAM_LIBS} ++ + check-syntax: + $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) \ + -fsyntax-only -fmessage-length=0 ${CHK_SOURCES} -Wall -Wformat=2 +Index: zarafa-7.1.8/provider/server/Makefile.am +=================================================================== +--- zarafa-7.1.8.orig/provider/server/Makefile.am ++++ zarafa-7.1.8/provider/server/Makefile.am +@@ -20,7 +20,7 @@ zarafa_server_LDADD = \ + ${top_builddir}/common/libcommon_ssl.la \ + $(PROG_LIBS) \ + $(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) $(ICU_LIBS) $(DL_LIBS) \ +- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt ++ $(SSL_LIBS) $(TCMALLOC_LIBS) -lrt + + zarafa_server_SOURCES = ECServer.cpp \ + ECSoapServerConnection.h ECSoapServerConnection.cpp \ diff --git a/net-mail/zarafa/files/7.1.10.44973/zarafa-07-sonames.patch b/net-mail/zarafa/files/7.1.10.44973/zarafa-07-sonames.patch new file mode 100644 index 0000000..d6081fe --- /dev/null +++ b/net-mail/zarafa/files/7.1.10.44973/zarafa-07-sonames.patch @@ -0,0 +1,137 @@ +diff -uNr zarafa-7.1.10.orig/common/Makefile.am zarafa-7.1.10/common/Makefile.am +--- zarafa-7.1.10.orig/common/Makefile.am 2014-06-28 01:45:35.538074530 +0200 ++++ zarafa-7.1.10/common/Makefile.am 2014-06-28 01:46:00.990073451 +0200 +@@ -34,7 +34,7 @@ + -I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \ + -I${top_srcdir}/libfreebusy $(MYSQL_INCLUDES) + +-libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -static ++libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION} + libcommon_mapi_la_SOURCES = CommonUtil.cpp \ + rtfutil.cpp \ + codepage.cpp \ +@@ -60,7 +60,7 @@ + MAPIErrors.cpp + libcommon_mapi_la_LIBADD = -lpthread ${ICU_LIBS} + +-libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -static ++libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION} + libcommon_util_la_SOURCES = platform.cpp \ + platform.linux.cpp \ + md5.cpp \ +@@ -101,14 +101,14 @@ + libcommon_util_la_LIBADD += ${ICU_LIBS} + endif + +-libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -static ++libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION} + libcommon_ssl_la_SOURCES = \ + SSLUtil.cpp \ + ECChannelClient.cpp \ + ECChannel.cpp + libcommon_ssl_la_LIBADD = -lpthread ${SSL_LIBS} + +-libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -static ++libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION} + libcommon_service_la_SOURCES = ECDatabaseMySQL.cpp + libcommon_service_la_LIBADD = ${MYSQL_LIBS} + +diff -uNr zarafa-7.1.10.orig/common/zarafa.pc.in zarafa-7.1.10/common/zarafa.pc.in +--- zarafa-7.1.10.orig/common/zarafa.pc.in 2014-06-28 01:45:35.538074530 +0200 ++++ zarafa-7.1.10/common/zarafa.pc.in 2014-06-28 01:46:00.991073451 +0200 +@@ -7,5 +7,5 @@ + Description: Zarafa custom development + Version: @ZARAFA_VERSION@ + Requires: +-Libs: -L${libdir} -lmapi @PROG_LIBS@ ++Libs: -L${libdir} -lmapi-@PACKAGE_VERSION@ @PROG_LIBS@ + Cflags: -I${includedir}/mapi4linux/ -I${includedir}/zarafa/ -DUNICODE +diff -uNr zarafa-7.1.10.orig/ECtools/zarafa-archiver/Makefile.am zarafa-7.1.10/ECtools/zarafa-archiver/Makefile.am +--- zarafa-7.1.10.orig/ECtools/zarafa-archiver/Makefile.am 2014-06-28 01:45:35.505074531 +0200 ++++ zarafa-7.1.10/ECtools/zarafa-archiver/Makefile.am 2014-06-28 01:46:00.990073451 +0200 +@@ -16,6 +16,7 @@ + + + ++libarchiver_la_LDFLAGS = -release ${PACKAGE_VERSION} + libarchiver_la_LIBADD = ${top_builddir}/mapi4linux/src/libmapi.la \ + ${top_builddir}/common/libcommon_mapi.la \ + ${top_builddir}/common/libcommon_util.la +@@ -53,6 +54,7 @@ + ArchiveControlImpl.cpp ArchiveControlImpl.h \ + ECDatabase.h ECDatabase.cpp + ++libarchiver_core_la_LDFLAGS = -release ${PACKAGE_VERSION} + + + zarafa_archiver_LDADD = ${top_builddir}/mapi4linux/src/libmapi.la \ +diff -uNr zarafa-7.1.10.orig/libfreebusy/Makefile.am zarafa-7.1.10/libfreebusy/Makefile.am +--- zarafa-7.1.10.orig/libfreebusy/Makefile.am 2014-06-28 01:45:35.388074536 +0200 ++++ zarafa-7.1.10/libfreebusy/Makefile.am 2014-06-28 01:46:00.991073451 +0200 +@@ -6,7 +6,7 @@ + + libfreebusy_la_includedir = $(includedir)/libfreebusy + +-libfreebusy_la_LDFLAGS = ${AM_LDFLAGS} -static ++libfreebusy_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION} + + libfreebusy_la_include_HEADERS = ECEnumFBBlock.h ECFBBlockList.h \ + ECFreeBusyData.h ECFreeBusySupport.h ECFreeBusyUpdate.h freebusy.h \ +diff -uNr zarafa-7.1.10.orig/mapi4linux/src/Makefile.am zarafa-7.1.10/mapi4linux/src/Makefile.am +--- zarafa-7.1.10.orig/mapi4linux/src/Makefile.am 2014-06-28 01:45:35.424074535 +0200 ++++ zarafa-7.1.10/mapi4linux/src/Makefile.am 2014-06-28 01:46:00.991073451 +0200 +@@ -4,7 +4,7 @@ + -DMAPICONFIGDIR=\"${MAPICONFIGDIR}\" \ + -I$(top_srcdir)/mapi4linux/include -I$(top_srcdir)/provider/common -I${top_srcdir}/common -I${top_srcdir}/libfreebusy + +-libmapi_la_LDFLAGS = ${AM_LDFLAGS} $(BOOST_FILESYSTEM_LDFLAGS) ++libmapi_la_LDFLAGS = ${AM_LDFLAGS} $(BOOST_FILESYSTEM_LDFLAGS) -release ${PACKAGE_VERSION} + + libmapi_la_LIBADD = \ + ${top_builddir}/common/libcommon_mapi.la \ +diff -uNr zarafa-7.1.10.orig/provider/common/Makefile.am zarafa-7.1.10/provider/common/Makefile.am +--- zarafa-7.1.10.orig/provider/common/Makefile.am 2014-06-28 01:45:35.417074535 +0200 ++++ zarafa-7.1.10/provider/common/Makefile.am 2014-06-28 01:46:00.991073451 +0200 +@@ -9,6 +9,7 @@ + AM_CPPFLAGS += -DWITH_SYSTEM_GSOAP + endif + ++libzarafacommon_la_LDFLAGS = -release ${PACKAGE_VERSION} + libzarafacommon_la_SOURCES = SOAPUtils.cpp SOAPUtils.h \ + SOAPAlloc.h \ + SOAPHelpers.cpp SOAPHelpers.h \ +diff -uNr zarafa-7.1.10.orig/provider/libserver/Makefile.am zarafa-7.1.10/provider/libserver/Makefile.am +--- zarafa-7.1.10.orig/provider/libserver/Makefile.am 2014-06-28 01:45:35.410074535 +0200 ++++ zarafa-7.1.10/provider/libserver/Makefile.am 2014-06-28 01:46:00.992073451 +0200 +@@ -13,6 +13,7 @@ + AM_CPPFLAGS += -DWITH_SYSTEM_GSOAP + endif + ++libserver_la_LDFLAGS = -release ${PACKAGE_VERSION} + libserver_la_SOURCES = \ + ZarafaCmd.cpp \ + ECABObjectTable.cpp ECABObjectTable.h \ +diff -uNr zarafa-7.1.10.orig/provider/soap/Makefile.am zarafa-7.1.10/provider/soap/Makefile.am +--- zarafa-7.1.10.orig/provider/soap/Makefile.am 2014-06-28 01:45:35.405074535 +0200 ++++ zarafa-7.1.10/provider/soap/Makefile.am 2014-06-28 01:49:07.358065554 +0200 +@@ -7,6 +7,8 @@ + + libsoapserver_la_CXXFLAGS = ${AM_CXXFLAGS} -Wno-sign-compare $(DEBUGFLAGS) $(GSOAP_CFLAGS) -I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/include ${GSOAP_CFLAGS} + libsoapclient_la_CXXFLAGS = ${AM_CXXFLAGS} -Wno-sign-compare $(DEBUGFLAGS) $(GSOAP_CFLAGS) -I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/include ${GSOAP_CFLAGS} ++libsoapserver_la_LDFLAGS = -release ${PACKAGE_VERSION} ++libsoapclient_la_LDFLAGS = -release ${PACKAGE_VERSION} + + nodist_libsoapserver_la_SOURCES = soapC.cpp soapServer.cpp + nodist_libsoapclient_la_SOURCES = soapC.cpp soapClient.cpp +diff -uNr zarafa-7.1.10.orig/zarafa-libsync/Makefile.am zarafa-7.1.10/zarafa-libsync/Makefile.am +--- zarafa-7.1.10.orig/zarafa-libsync/Makefile.am 2014-06-28 01:45:35.521074530 +0200 ++++ zarafa-7.1.10/zarafa-libsync/Makefile.am 2014-06-28 01:46:00.992073451 +0200 +@@ -11,6 +11,8 @@ + + libzarafasync_la_includedir = $(includedir)/libzarafasync + ++libzarafasync_la_LDFLAGS = -release ${PACKAGE_VERSION} ++ + libzarafasync_la_include_HEADERS = ECLibSync.h ECSync.h ECSyncLog.h \ + ECSyncUtil.h ECSyncContext.h ECOfflineABImporter.h ECSyncSettings.h ECResyncSet.h + diff --git a/net-mail/zarafa/files/7.1.10.44973/zarafa-10-translations.patch b/net-mail/zarafa/files/7.1.10.44973/zarafa-10-translations.patch new file mode 100644 index 0000000..47fa3fd --- /dev/null +++ b/net-mail/zarafa/files/7.1.10.44973/zarafa-10-translations.patch @@ -0,0 +1,45 @@ +From: Jan Engelhardt +Date: 2011-07-02 21:33:00 +0200 + +translations: avoid xlat of common abbreviations + +Note that e-mail clients, when replying, may not recognize anything +but "Re" when deciding whether or not to add a "Re:" in front of the +subject. This means that a conversation between two participants can +build up convoluted subject lines like "Re: AW: Re: AW: ..". To avoid +this, translation of "Re" should be avoided, but also because the +translation might not be understood by other parties whereas "Re" is +universally recognized. + +--- + php-webclient-ajax/client/modules/createmailitemmodule.js | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +Index: zarafa-7.1.7/php-webclient-ajax/client/modules/createmailitemmodule.js +=================================================================== +--- zarafa-7.1.7.orig/php-webclient-ajax/client/modules/createmailitemmodule.js ++++ zarafa-7.1.7/php-webclient-ajax/client/modules/createmailitemmodule.js +@@ -258,7 +258,7 @@ createmailitemmodule.prototype.item = fu + { + case "reply": + this.setSender(message); +- this.setSubjectBody(message, _("RE")); ++ this.setSubjectBody(message, "Re"); + this.setInlineAttachmentData(this.attachments); //message contains inline attachments + /** + * NOTE: We do not want to send attachments of original mail +@@ -270,12 +270,12 @@ createmailitemmodule.prototype.item = fu + case "replyall": + this.setSender(message); + this.setRecipients(message, "replyall"); +- this.setSubjectBody(message, _("RE")); ++ this.setSubjectBody(message, "Re"); + this.setInlineAttachmentData(this.attachments); //message contains inline attachments + this.attachments = new Array(); + break; + case "forward": +- this.setSubjectBody(message, _("FW")); ++ this.setSubjectBody(message, "Fwd"); + this.setAttachments(message); + break; + case "edit": diff --git a/net-mail/zarafa/files/7.1.10.44973/zarafa-14-shared-libs.patch b/net-mail/zarafa/files/7.1.10.44973/zarafa-14-shared-libs.patch new file mode 100644 index 0000000..ed7e26a --- /dev/null +++ b/net-mail/zarafa/files/7.1.10.44973/zarafa-14-shared-libs.patch @@ -0,0 +1,140 @@ +diff -uNr zarafa-7.1.10.orig/common/Makefile.am zarafa-7.1.10/common/Makefile.am +--- zarafa-7.1.10.orig/common/Makefile.am 2014-06-28 01:53:41.181053952 +0200 ++++ zarafa-7.1.10/common/Makefile.am 2014-06-28 01:54:02.667053041 +0200 +@@ -34,7 +34,7 @@ + -I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \ + -I${top_srcdir}/libfreebusy $(MYSQL_INCLUDES) + +-libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION} ++libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -release ${PACKAGE_VERSION} + libcommon_mapi_la_SOURCES = CommonUtil.cpp \ + rtfutil.cpp \ + codepage.cpp \ +@@ -60,7 +60,7 @@ + MAPIErrors.cpp + libcommon_mapi_la_LIBADD = -lpthread ${ICU_LIBS} + +-libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION} ++libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -release ${PACKAGE_VERSION} + libcommon_util_la_SOURCES = platform.cpp \ + platform.linux.cpp \ + md5.cpp \ +@@ -101,14 +101,14 @@ + libcommon_util_la_LIBADD += ${ICU_LIBS} + endif + +-libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION} ++libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -release ${PACKAGE_VERSION} + libcommon_ssl_la_SOURCES = \ + SSLUtil.cpp \ + ECChannelClient.cpp \ + ECChannel.cpp + libcommon_ssl_la_LIBADD = -lpthread ${SSL_LIBS} + +-libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION} ++libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -release ${PACKAGE_VERSION} + libcommon_service_la_SOURCES = ECDatabaseMySQL.cpp + libcommon_service_la_LIBADD = ${MYSQL_LIBS} + +diff -uNr zarafa-7.1.10.orig/common/Makefile.am.orig zarafa-7.1.10/common/Makefile.am.orig +--- zarafa-7.1.10.orig/common/Makefile.am.orig 2014-06-28 01:53:41.183053952 +0200 ++++ zarafa-7.1.10/common/Makefile.am.orig 2014-06-28 01:53:15.710055031 +0200 +@@ -34,7 +34,7 @@ + -I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \ + -I${top_srcdir}/libfreebusy $(MYSQL_INCLUDES) + +-libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -static ++libcommon_mapi_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION} + libcommon_mapi_la_SOURCES = CommonUtil.cpp \ + rtfutil.cpp \ + codepage.cpp \ +@@ -60,7 +60,7 @@ + MAPIErrors.cpp + libcommon_mapi_la_LIBADD = -lpthread ${ICU_LIBS} + +-libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -static ++libcommon_util_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION} + libcommon_util_la_SOURCES = platform.cpp \ + platform.linux.cpp \ + md5.cpp \ +@@ -101,14 +101,14 @@ + libcommon_util_la_LIBADD += ${ICU_LIBS} + endif + +-libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -static ++libcommon_ssl_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION} + libcommon_ssl_la_SOURCES = \ + SSLUtil.cpp \ + ECChannelClient.cpp \ + ECChannel.cpp + libcommon_ssl_la_LIBADD = -lpthread ${SSL_LIBS} + +-libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -static ++libcommon_service_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION} + libcommon_service_la_SOURCES = ECDatabaseMySQL.cpp + libcommon_service_la_LIBADD = ${MYSQL_LIBS} + +diff -uNr zarafa-7.1.10.orig/ECtools/zarafa-search/Makefile.am zarafa-7.1.10/ECtools/zarafa-search/Makefile.am +--- zarafa-7.1.10.orig/ECtools/zarafa-search/Makefile.am 2014-06-28 01:53:41.152053953 +0200 ++++ zarafa-7.1.10/ECtools/zarafa-search/Makefile.am 2014-06-28 01:55:18.292049837 +0200 +@@ -12,8 +12,8 @@ + ${top_builddir}/common/libcommon_mapi.la \ + ${top_builddir}/common/libcommon_util.la \ + ${top_builddir}/common/libcommon_ssl.la \ +- ${top_builddir}/common/libcommon_service.la \ +- ${top_builddir}/ECtools/zarafa-archiver/libarchiver.la \ ++ ${top_builddir}/common/libcommon_service.la \ ++ ${top_builddir}/ECtools/zarafa-archiver/libarchiver.la \ + $(PROG_LIBS) $(SSL_LIBS) $(KYOTOCABINET_LIBS) $(CLUCENE_LIBS) \ + $(BOOST_SYSTEM_LIBS) $(BOOST_FILESYSTEM_LIBS) + +diff -uNr zarafa-7.1.10.orig/libfreebusy/Makefile.am zarafa-7.1.10/libfreebusy/Makefile.am +--- zarafa-7.1.10.orig/libfreebusy/Makefile.am 2014-06-28 01:53:41.067053957 +0200 ++++ zarafa-7.1.10/libfreebusy/Makefile.am 2014-06-28 01:54:02.667053041 +0200 +@@ -6,7 +6,7 @@ + + libfreebusy_la_includedir = $(includedir)/libfreebusy + +-libfreebusy_la_LDFLAGS = ${AM_LDFLAGS} -static -release ${PACKAGE_VERSION} ++libfreebusy_la_LDFLAGS = ${AM_LDFLAGS} -release ${PACKAGE_VERSION} + + libfreebusy_la_include_HEADERS = ECEnumFBBlock.h ECFBBlockList.h \ + ECFreeBusyData.h ECFreeBusySupport.h ECFreeBusyUpdate.h freebusy.h \ +diff -uNr zarafa-7.1.10.orig/provider/common/Makefile.am zarafa-7.1.10/provider/common/Makefile.am +--- zarafa-7.1.10.orig/provider/common/Makefile.am 2014-06-28 01:53:41.090053956 +0200 ++++ zarafa-7.1.10/provider/common/Makefile.am 2014-06-28 01:54:02.667053041 +0200 +@@ -1,4 +1,4 @@ +-noinst_LTLIBRARIES = libzarafacommon.la ++pkglib_LTLIBRARIES = libzarafacommon.la + + AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(GSOAP_CFLAGS) \ + $(BOOST_CPPFLAGS) \ +diff -uNr zarafa-7.1.10.orig/provider/libserver/Makefile.am zarafa-7.1.10/provider/libserver/Makefile.am +--- zarafa-7.1.10.orig/provider/libserver/Makefile.am 2014-06-28 01:53:41.084053956 +0200 ++++ zarafa-7.1.10/provider/libserver/Makefile.am 2014-06-28 01:54:02.668053041 +0200 +@@ -1,4 +1,4 @@ +-noinst_LTLIBRARIES = libserver.la ++pkglib_LTLIBRARIES = libserver.la + + AM_CPPFLAGS = ${ZCPPFLAGS} $(DEBUGFLAGS) $(BOOST_CPPFLAGS) \ + -I${top_srcdir}/mapi4linux/include \ +diff -uNr zarafa-7.1.10.orig/provider/server/Makefile.am zarafa-7.1.10/provider/server/Makefile.am +--- zarafa-7.1.10.orig/provider/server/Makefile.am 2014-06-28 01:53:41.080053956 +0200 ++++ zarafa-7.1.10/provider/server/Makefile.am 2014-06-28 01:54:02.668053041 +0200 +@@ -18,6 +18,7 @@ + ${top_builddir}/common/libcommon_util.la \ + ${top_builddir}/common/libcommon_mapi.la \ + ${top_builddir}/common/libcommon_ssl.la \ ++ ${top_builddir}/mapi4linux/src/libmapi.la \ + $(PROG_LIBS) \ + $(BOOST_FILESYSTEM_LIBS) $(BOOST_SYSTEM_LIBS) $(ICU_LIBS) $(DL_LIBS) \ + $(SSL_LIBS) $(TCMALLOC_LIBS) -lrt +diff -uNr zarafa-7.1.10.orig/provider/soap/Makefile.am zarafa-7.1.10/provider/soap/Makefile.am +--- zarafa-7.1.10.orig/provider/soap/Makefile.am 2014-06-28 01:53:41.079053956 +0200 ++++ zarafa-7.1.10/provider/soap/Makefile.am 2014-06-28 01:56:47.235046068 +0200 +@@ -1,4 +1,4 @@ +-noinst_LTLIBRARIES = libsoapserver.la libsoapclient.la ++pkglib_LTLIBRARIES = libsoapserver.la libsoapclient.la + + AM_CPPFLAGS = ${ZCPPFLAGS} + diff --git a/net-mail/zarafa/files/7.1.7.42779/zarafa-22-gcc47.patch b/net-mail/zarafa/files/7.1.10.44973/zarafa-22-gcc47.patch similarity index 50% rename from net-mail/zarafa/files/7.1.7.42779/zarafa-22-gcc47.patch rename to net-mail/zarafa/files/7.1.10.44973/zarafa-22-gcc47.patch index b5a7be1..dcef8ac 100644 --- a/net-mail/zarafa/files/7.1.7.42779/zarafa-22-gcc47.patch +++ b/net-mail/zarafa/files/7.1.10.44973/zarafa-22-gcc47.patch @@ -1,57 +1,6 @@ -From: Jan Engelhardt -Date: 2012-06-22 00:34:08.177803888 +0200 - -g++ -DHAVE_CONFIG_H -I. -I../../common -I../../mapi4linux/include -I../../common -I../../provider/include -I../../ECtools/zarafa-archiver -I/usr/include/CLucene/ext -I/usr/lib64 -DBOOST_FILESYSTEM_VERSION=2 -DLINUX -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -g -rdynamic -Wall -Wno-write-strings -DHAVE_CONFIG_H -pedantic -Wno-long-long -Wno-variadic-macros -pthread -O2 -fno-strict-aliasing -DNDEBUG -DFORCE_CHARSET_CONVERSION -DUNICODE -c -o ECIndexImporterAttachments.o ECIndexImporterAttachments.cpp -ECIndexImporterAttachments.cpp: In member function 'HRESULT ECIndexImporterAttachment::CopyStreamToParser(IStream*, int, int, std::wstring*)': -ECIndexImporterAttachments.cpp:249:34: error: 'max' was not declared in this scope -ECIndexImporterAttachments.cpp:249:34: note: suggested alternative: -/usr/include/c++/4.7/bits/stl_algobase.h:254:5: note: 'std::max' - -ECIndexImporterAttachments.cpp:440:3: error: 'string' was not declared in this scope -ECIndexImporterAttachments.cpp:440:3: note: suggested alternative: -/usr/include/c++/4.7/bits/stringfwd.h:65:33: note: 'std::string' - -ECIndexImporterAttachments.cpp:443:4: error: 'set' was not declared in this scope -ECIndexImporterAttachments.cpp:443:4: note: suggested alternative: -/usr/include/c++/4.7/bits/stl_set.h:91:11: note: 'std::set' - -ECIndexImporterAttachments.cpp:602:46: error: 'min' was not declared in this scope -ECIndexImporterAttachments.cpp:602:46: note: suggested alternative: -/usr/include/c++/4.7/bits/stl_algobase.h:233:5: note: 'std::min' - -ECIndexImporter.cpp: In member function 'HRESULT ECIndexImporter::ProcessThread()': -ECIndexImporter.cpp:400:5: error: 'auto_ptr' was not declared in this scope - ---- - ECtools/zarafa-search/ECIndexImporter.cpp | 3 +- - ECtools/zarafa-search/ECIndexImporterAttachments.cpp | 24 +++++++++++-------- - 2 files changed, 16 insertions(+), 11 deletions(-) - -Index: zarafa-7.1.0/ECtools/zarafa-search/ECIndexImporter.cpp -=================================================================== ---- zarafa-7.1.0.orig/ECtools/zarafa-search/ECIndexImporter.cpp -+++ zarafa-7.1.0/ECtools/zarafa-search/ECIndexImporter.cpp -@@ -47,6 +47,7 @@ - * - */ - -+#include - #include "platform.h" - - #include "ECIndexImporter.h" -@@ -433,7 +434,7 @@ HRESULT ECIndexImporter::ProcessThread() - ECIndexDB *lpIndex = NULL; - ECIndexDB *lpThisIndex = NULL; - ArchiveItem *lpArchiveItem = NULL; -- auto_ptr lpStubTarget; -+ std::auto_ptr lpStubTarget; - - m_lpLogger->Log(EC_LOGLEVEL_DEBUG, "Importer thread started"); - -Index: zarafa-7.1.0/ECtools/zarafa-search/ECIndexImporterAttachments.cpp -=================================================================== ---- zarafa-7.1.0.orig/ECtools/zarafa-search/ECIndexImporterAttachments.cpp -+++ zarafa-7.1.0/ECtools/zarafa-search/ECIndexImporterAttachments.cpp +diff -uNr zarafa-7.1.10.orig/ECtools/zarafa-search/ECIndexImporterAttachments.cpp zarafa-7.1.10/ECtools/zarafa-search/ECIndexImporterAttachments.cpp +--- zarafa-7.1.10.orig/ECtools/zarafa-search/ECIndexImporterAttachments.cpp 2014-06-28 01:27:40.776120070 +0200 ++++ zarafa-7.1.10/ECtools/zarafa-search/ECIndexImporterAttachments.cpp 2014-06-28 01:27:54.903119472 +0200 @@ -47,6 +47,10 @@ * */ @@ -63,7 +12,7 @@ Index: zarafa-7.1.0/ECtools/zarafa-search/ECIndexImporterAttachments.cpp #include #include -@@ -246,7 +250,7 @@ HRESULT ECIndexImporterAttachment::CopyS +@@ -248,7 +252,7 @@ ULONG ulWriteData; fd_set rset, wset; int res; @@ -72,7 +21,7 @@ Index: zarafa-7.1.0/ECtools/zarafa-search/ECIndexImporterAttachments.cpp struct timeval timeout; -@@ -267,7 +271,7 @@ HRESULT ECIndexImporterAttachment::CopyS +@@ -269,7 +273,7 @@ FD_ZERO(&wset); if (ulTotalWriteData) { FD_SET(ulFpWrite, &wset); @@ -81,7 +30,7 @@ Index: zarafa-7.1.0/ECtools/zarafa-search/ECIndexImporterAttachments.cpp } else { fd = ulFpRead; } -@@ -437,10 +441,10 @@ HRESULT ECIndexImporterAttachment::Parse +@@ -439,10 +443,10 @@ command.assign(m_strCommand + " "); if (!strMimeTag.empty() && strMimeTag.compare(_T("application/octet-stream")) != 0) { @@ -94,7 +43,7 @@ Index: zarafa-7.1.0/ECtools/zarafa-search/ECIndexImporterAttachments.cpp if (i != m_lpThreadData->m_setMimeFilter.end()) { m_lpThreadData->lpLogger->Log(EC_LOGLEVEL_DEBUG, "Skipping filtered attachment mimetype: %s for %ls", tmp.c_str(), strFilename.c_str()); hr = MAPI_E_INVALID_OBJECT; -@@ -452,8 +456,8 @@ HRESULT ECIndexImporterAttachment::Parse +@@ -454,8 +458,8 @@ command.append("'"); } else if (!strExtension.empty()) { // this string mostly does not exist @@ -105,7 +54,7 @@ Index: zarafa-7.1.0/ECtools/zarafa-search/ECIndexImporterAttachments.cpp if (i != m_lpThreadData->m_setExtFilter.end()) { m_lpThreadData->lpLogger->Log(EC_LOGLEVEL_DEBUG, "Skipping filtered attachment extension: %s for %ls", tmp.c_str(), strFilename.c_str()); hr = MAPI_E_INVALID_OBJECT; -@@ -463,14 +467,14 @@ HRESULT ECIndexImporterAttachment::Parse +@@ -465,14 +469,14 @@ command.append(forcealnum(tmp, ".")); command.append("'"); } else if (!strFilename.empty()) { @@ -122,7 +71,7 @@ Index: zarafa-7.1.0/ECtools/zarafa-search/ECIndexImporterAttachments.cpp if (i != m_lpThreadData->m_setExtFilter.end()) { m_lpThreadData->lpLogger->Log(EC_LOGLEVEL_DEBUG, "Skipping filtered attachment extension: %ls", strFilename.c_str()); hr = MAPI_E_INVALID_OBJECT; -@@ -478,7 +482,7 @@ HRESULT ECIndexImporterAttachment::Parse +@@ -480,7 +484,7 @@ } command.append("ext '"); @@ -131,7 +80,7 @@ Index: zarafa-7.1.0/ECtools/zarafa-search/ECIndexImporterAttachments.cpp command.append("'"); } else { m_lpThreadData->lpLogger->Log(EC_LOGLEVEL_DEBUG, "Invalid attachment, no mimetag, extension or filename"); -@@ -599,7 +603,7 @@ HRESULT ECIndexImporterAttachment::Parse +@@ -601,7 +605,7 @@ if (ulAttachSize) { /* Copy attachment data into stream */ while (TRUE) { @@ -140,3 +89,14 @@ Index: zarafa-7.1.0/ECtools/zarafa-search/ECIndexImporterAttachments.cpp ULONG ulCopy = ulRead; ULONG ulWritten = 0; +diff -uNr zarafa-7.1.10.orig/ECtools/zarafa-search/ECIndexImporter.cpp zarafa-7.1.10/ECtools/zarafa-search/ECIndexImporter.cpp +--- zarafa-7.1.10.orig/ECtools/zarafa-search/ECIndexImporter.cpp 2014-06-28 01:27:40.777120070 +0200 ++++ zarafa-7.1.10/ECtools/zarafa-search/ECIndexImporter.cpp 2014-06-28 01:27:54.902119472 +0200 +@@ -47,6 +47,7 @@ + * + */ + ++#include + #include "platform.h" + + #include "ECIndexImporter.h" diff --git a/net-mail/zarafa/files/7.1.10.44973/zarafa-40-mariadb.patch b/net-mail/zarafa/files/7.1.10.44973/zarafa-40-mariadb.patch new file mode 100644 index 0000000..6467bda --- /dev/null +++ b/net-mail/zarafa/files/7.1.10.44973/zarafa-40-mariadb.patch @@ -0,0 +1,35 @@ +References: https://jira.zarafa.com/browse/ZCP-11934 +References: https://jira.zarafa.com/browse/ZCP-12219 +References: https://jira.zarafa.com/browse/ZCP-12381 +References: https://forums.zarafa.com/showthread.php?7980-SQL-error-on-Zarafa-7-1-with-MariaDB-5-5-25/page3.There +References: https://bugzilla.novell.com/show_bug.cgi?id=880272 +--- + provider/libserver/ECDatabaseMySQL.cpp | 15 +++++++++++---- + 1 file changed, 11 insertions(+), 4 deletions(-) + +Index: zarafa-7.1.9/provider/libserver/ECDatabaseMySQL.cpp +=================================================================== +--- zarafa-7.1.9.orig/provider/libserver/ECDatabaseMySQL.cpp ++++ zarafa-7.1.9/provider/libserver/ECDatabaseMySQL.cpp +@@ -626,10 +626,17 @@ ECRESULT ECDatabaseMySQL::Connect() + if (m_ulMaxAllowedPacket < MAX_ALLOWED_PACKET) + m_lpLogger->Log(EC_LOGLEVEL_WARNING, "max_allowed_packet is smaller than 16M (%d). You are advised to increase this value by adding max_allowed_packet=16M in the [mysqld] section of my.cnf.", m_ulMaxAllowedPacket); + +- if (m_lpMySQL.server_version && m_lpMySQL.server_version[0] >= '5') { +- // 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 ++ if (m_lpMySQL.server_version) { ++ // m_lpMySQL.server_version is a C type string (char*) containing something like "5.5.37-0+wheezy1" (MySQL), ++ // "5.5.37-MariaDB-1~wheezy-log" or "10.0.11-MariaDB=1~wheezy-log" (MariaDB) ++ // The following code may look funny, but it is correct, see http://www.cplusplus.com/reference/cstdlib/strtol/ ++ long int majorversion = strtol(m_lpMySQL.server_version, NULL, 10); ++ // Check for over/underflow and version. ++ if ((errno != ERANGE) && (majorversion >= 5)) { ++ // 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,NO_UNSIGNED_SUBTRACTION'"; ++ Query(strQuery); // ignore error ++ } + } + + exit: diff --git a/net-mail/zarafa/files/7.1.5.42059/zarafa-7.1.4-tcmalloc.patch b/net-mail/zarafa/files/7.1.10.44973/zarafa-7.1.4-tcmalloc.patch similarity index 100% rename from net-mail/zarafa/files/7.1.5.42059/zarafa-7.1.4-tcmalloc.patch rename to net-mail/zarafa/files/7.1.10.44973/zarafa-7.1.4-tcmalloc.patch diff --git a/net-mail/zarafa/files/7.1.5.42059/zarafa-7.1.5-gentoo-swig1.3.patch b/net-mail/zarafa/files/7.1.10.44973/zarafa-7.1.5-gentoo-swig1.3.patch similarity index 100% rename from net-mail/zarafa/files/7.1.5.42059/zarafa-7.1.5-gentoo-swig1.3.patch rename to net-mail/zarafa/files/7.1.10.44973/zarafa-7.1.5-gentoo-swig1.3.patch diff --git a/net-mail/zarafa/files/7.1.10.44973/zarafa-7.1.9-sysconfig2confd-1.patch b/net-mail/zarafa/files/7.1.10.44973/zarafa-7.1.9-sysconfig2confd-1.patch new file mode 100644 index 0000000..eab8add --- /dev/null +++ b/net-mail/zarafa/files/7.1.10.44973/zarafa-7.1.9-sysconfig2confd-1.patch @@ -0,0 +1,96 @@ +diff -uNr zarafa-7.1.9.orig/installer/linux/Makefile.am zarafa-7.1.9/installer/linux/Makefile.am +--- zarafa-7.1.9.orig/installer/linux/Makefile.am 2014-06-26 14:42:22.479211315 +0200 ++++ zarafa-7.1.9/installer/linux/Makefile.am 2014-06-26 14:43:27.764208414 +0200 +@@ -29,7 +29,7 @@ + sysconf_initdir=${sysconfdir}/init.d + sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files} + +-rhel_sysconfig_path = ${sysconfdir}/sysconfig ++rhel_sysconfig_path = ${sysconfdir}/conf.d + suse_sysconfig_path = ${localstatedir}/adm/fillup-templates + sles_sysconfig_path = ${localstatedir}/adm/fillup-templates + sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path} +diff -uNr zarafa-7.1.9.orig/installer/userscripts/createcompany.in zarafa-7.1.9/installer/userscripts/createcompany.in +--- zarafa-7.1.9.orig/installer/userscripts/createcompany.in 2014-06-26 14:42:22.477211315 +0200 ++++ zarafa-7.1.9/installer/userscripts/createcompany.in 2014-06-26 14:43:27.764208414 +0200 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa-server ]; then ++ . @sysconfdir@/conf.d/zarafa-server + elif [ -f @sysconfdir@/default/zarafa ]; then + . @sysconfdir@/default/zarafa + fi +diff -uNr zarafa-7.1.9.orig/installer/userscripts/creategroup.in zarafa-7.1.9/installer/userscripts/creategroup.in +--- zarafa-7.1.9.orig/installer/userscripts/creategroup.in 2014-06-26 14:42:22.478211315 +0200 ++++ zarafa-7.1.9/installer/userscripts/creategroup.in 2014-06-26 14:43:27.764208414 +0200 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa-server ]; then ++ . @sysconfdir@/conf.d/zarafa-server + elif [ -f @sysconfdir@/default/zarafa ]; then + . @sysconfdir@/default/zarafa + fi +diff -uNr zarafa-7.1.9.orig/installer/userscripts/createuser.in zarafa-7.1.9/installer/userscripts/createuser.in +--- zarafa-7.1.9.orig/installer/userscripts/createuser.in 2014-06-26 14:42:22.478211315 +0200 ++++ zarafa-7.1.9/installer/userscripts/createuser.in 2014-06-26 14:43:27.765208414 +0200 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa-server ]; then ++ . @sysconfdir@/conf.d/zarafa-server + elif [ -f @sysconfdir@/default/zarafa ]; then + . @sysconfdir@/default/zarafa + fi +diff -uNr zarafa-7.1.9.orig/installer/userscripts/deletecompany.in zarafa-7.1.9/installer/userscripts/deletecompany.in +--- zarafa-7.1.9.orig/installer/userscripts/deletecompany.in 2014-06-26 14:42:22.478211315 +0200 ++++ zarafa-7.1.9/installer/userscripts/deletecompany.in 2014-06-26 14:44:16.158206264 +0200 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa ]; then ++ . @sysconfdir@/conf.d/zarafa + elif [ -f @sysconfdir@/default/zarafa ]; then + . @sysconfdir@/default/zarafa + fi +diff -uNr zarafa-7.1.9.orig/installer/userscripts/deletegroup.in zarafa-7.1.9/installer/userscripts/deletegroup.in +--- zarafa-7.1.9.orig/installer/userscripts/deletegroup.in 2014-06-26 14:42:22.478211315 +0200 ++++ zarafa-7.1.9/installer/userscripts/deletegroup.in 2014-06-26 14:44:26.328205812 +0200 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa ]; then ++ . @sysconfdir@/conf.d/zarafa + elif [ -f @sysconfdir@/default/zarafa ]; then + . @sysconfdir@/default/zarafa + fi +diff -uNr zarafa-7.1.9.orig/installer/userscripts/deleteuser.in zarafa-7.1.9/installer/userscripts/deleteuser.in +--- zarafa-7.1.9.orig/installer/userscripts/deleteuser.in 2014-06-26 14:42:22.478211315 +0200 ++++ zarafa-7.1.9/installer/userscripts/deleteuser.in 2014-06-26 14:44:34.925205430 +0200 +@@ -9,8 +9,8 @@ + # that this string can contain any characters, so take heed to correct + # quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa ]; then ++ . @sysconfdir@/conf.d/zarafa + elif [ -f @sysconfdir@/default/zarafa ]; then + . @sysconfdir@/default/zarafa + fi diff --git a/net-mail/zarafa/files/7.1.5.42059/zarafa-01-oss-configure.patch b/net-mail/zarafa/files/7.1.5.42059/zarafa-01-oss-configure.patch deleted file mode 100644 index 0fa8227..0000000 --- a/net-mail/zarafa/files/7.1.5.42059/zarafa-01-oss-configure.patch +++ /dev/null @@ -1,61 +0,0 @@ -From: Jan Engelhardt -Upstream: never? - -build: make autoreconf functional - -Make autoreconf functional with the OSS edition. - ---- - ECtools/Makefile.am | 1 - - Makefile.am | 4 ---- - configure.ac | 13 ------------- - 3 files changed, 18 deletions(-) - -Index: zarafa-7.1.1/ECtools/Makefile.am -=================================================================== ---- zarafa-7.1.1.orig/ECtools/Makefile.am -+++ zarafa-7.1.1/ECtools/Makefile.am -@@ -1,5 +1,4 @@ - if ! OSS_ONLY --PROSUBS = zarafa-backup zarafa-report zarafa-msr za-extra zarafa-ocf - endif - - SUBDIRS = $(PROSUBS) zarafa-archiver zarafa-admin zarafa-monitor zarafa-passwd zarafa-fsck zarafa-cfgchecker zarafa-stats zarafa-search zarafa-utils -Index: zarafa-7.1.1/Makefile.am -=================================================================== ---- zarafa-7.1.1.orig/Makefile.am -+++ zarafa-7.1.1/Makefile.am -@@ -1,9 +1,5 @@ - ACLOCAL_AMFLAGS = -I autoconf - --if ! OSS_ONLY --PROSUBS = liblicense licensed --endif -- - SUBDIRS = common libfreebusy mapi4linux zarafa-libsync $(PROSUBS) provider libicalmapi inetmapi php-ext ECtools spooler gateway caldav installer po doc - - if WITH_SWIG -Index: zarafa-7.1.1/configure.ac -=================================================================== ---- zarafa-7.1.1.orig/configure.ac -+++ zarafa-7.1.1/configure.ac -@@ -786,19 +786,6 @@ AC_CONFIG_FILES([Makefile - version - specialbuild - ]) --dnl non-oss files --if test -d `dirname $0`/licensed; then --AC_CONFIG_FILES([ -- liblicense/Makefile -- licensed/Makefile -- ECtools/zarafa-backup/Makefile -- ECtools/zarafa-backup/helpers/Makefile -- ECtools/zarafa-report/Makefile -- ECtools/zarafa-msr/Makefile -- ECtools/zarafa-ocf/Makefile -- ECtools/za-extra/Makefile --]) --fi - - AC_OUTPUT - diff --git a/net-mail/zarafa/files/7.1.5.42059/zarafa-06-sizeof-char.patch b/net-mail/zarafa/files/7.1.5.42059/zarafa-06-sizeof-char.patch deleted file mode 100644 index 57cf8e9..0000000 --- a/net-mail/zarafa/files/7.1.5.42059/zarafa-06-sizeof-char.patch +++ /dev/null @@ -1,391 +0,0 @@ -From: Jan Engelhardt - -src: remove useless sizeof(char) - -sizeof(char) is defined by the standard to be always equal to 1. -It is thus useless in e.g. multiplications. - ---- - common/CommonUtil.cpp | 14 +++++++------- - common/Trace.cpp | 2 +- - common/Util.cpp | 2 +- - common/fileutil.cpp | 12 ++++++------ - gateway/IMAP.cpp | 8 ++++---- - inetmapi/tnef.cpp | 4 ++-- - mapi4linux/src/m4l.mapisvc.cpp | 2 +- - mapi4linux/src/mapidefs.cpp | 2 +- - provider/contacts/ZCMAPIProp.cpp | 2 +- - provider/libserver/ECDatabaseUtils.cpp | 2 +- - swig/python/RecurrenceState_wrap.cxx | 2 +- - swig/python/archiver_wrap.cxx | 2 +- - swig/python/icalmapi_wrap.cxx | 2 +- - swig/python/inetmapi_wrap.cxx | 6 +++--- - swig/python/libcommon_wrap.cxx | 2 +- - swig/python/libfreebusy_wrap.cxx | 2 +- - swig/python/licenseclient_wrap.cxx | 2 +- - swig/python/mapi_wrap.cxx | 2 +- - 18 files changed, 35 insertions(+), 35 deletions(-) - -Index: zarafa-7.1.0/common/CommonUtil.cpp -=================================================================== ---- zarafa-7.1.0.orig/common/CommonUtil.cpp -+++ zarafa-7.1.0/common/CommonUtil.cpp -@@ -1041,11 +1041,11 @@ HRESULT ECCreateOneOff(LPTSTR lpszName, - strOneOff.append((char*)strUnicode.c_str(), (strUnicode.length()+1)*sizeof(unsigned short)); - } else { - if (lpszName) -- strOneOff.append((char *)lpszName, (strlen((char *)lpszName) + 1) * sizeof(char)); -+ strOneOff.append((char *)lpszName, strlen((char *)lpszName) + 1); - else -- strOneOff.append(sizeof(char), '\0'); -- strOneOff.append((char *)lpszAdrType, (strlen((char *)lpszAdrType) + 1) * sizeof(char)); -- strOneOff.append((char *)lpszAddress, (strlen((char *)lpszAddress) + 1) * sizeof(char)); -+ strOneOff.append(1, '\0'); -+ strOneOff.append((char *)lpszAdrType, strlen((char *)lpszAdrType) + 1); -+ strOneOff.append((char *)lpszAddress, strlen((char *)lpszAddress) + 1); - } - - hr = MAPIAllocateBuffer(strOneOff.size(), (void **)lppEntryID); -@@ -1148,7 +1148,7 @@ HRESULT ECParseOneOff(LPENTRYID lpEntryI - hr = TryConvert(lpBuffer, rawsize(lpBuffer), "windows-1252", name); - if (hr != hrSuccess) - goto exit; -- lpBuffer += (str.length() + 1) * sizeof(char); -+ lpBuffer += str.length() + 1; - - str = (char*)lpBuffer; - if (str.length() == 0) { -@@ -1156,7 +1156,7 @@ HRESULT ECParseOneOff(LPENTRYID lpEntryI - goto exit; - } - type = convert_to(str); -- lpBuffer += (str.length() + 1) * sizeof(char); -+ lpBuffer += str.length() + 1; - - str = (char*)lpBuffer; - if (str.length() == 0) { -@@ -1164,7 +1164,7 @@ HRESULT ECParseOneOff(LPENTRYID lpEntryI - goto exit; - } - addr = convert_to(str); -- lpBuffer += (str.length() + 1) * sizeof(char); -+ lpBuffer += str.length() + 1; - } - - strWName = name; -Index: zarafa-7.1.0/common/Trace.cpp -=================================================================== ---- zarafa-7.1.0.orig/common/Trace.cpp -+++ zarafa-7.1.0/common/Trace.cpp -@@ -135,7 +135,7 @@ void TraceMsg(char* lpMsg, int time, cha - if (BUFFER_LIMIT != 0 && pos+3 < BUFFER_LIMIT && len > BUFFER_LIMIT) - len = BUFFER_LIMIT; - -- buffer = (char*)malloc( len * sizeof(char) ); -+ buffer = static_cast(malloc(len)); - - memcpy(buffer, debug, pos); - -Index: zarafa-7.1.0/common/Util.cpp -=================================================================== ---- zarafa-7.1.0.orig/common/Util.cpp -+++ zarafa-7.1.0/common/Util.cpp -@@ -470,7 +470,7 @@ HRESULT Util::HrCopyProperty(LPSPropValu - goto exit; - } - -- hr = lpfAllocMore(strlen(lpSrc->Value.lpszA)*sizeof(char)+sizeof(char), lpBase, (void**)&lpDest->Value.lpszA); -+ hr = lpfAllocMore(strlen(lpSrc->Value.lpszA) + 1, lpBase, (void**)&lpDest->Value.lpszA); - if (hr != hrSuccess) - goto exit; - strcpy(lpDest->Value.lpszA, lpSrc->Value.lpszA); -Index: zarafa-7.1.0/common/fileutil.cpp -=================================================================== ---- zarafa-7.1.0.orig/common/fileutil.cpp -+++ zarafa-7.1.0/common/fileutil.cpp -@@ -104,7 +104,7 @@ HRESULT HrFileLFtoCRLF(FILE *fin, FILE** - } - - while (!feof(fin)) { -- readsize = fread(bufferin, sizeof(char), BLOCKSIZE / 2, fin); -+ readsize = fread(bufferin, 1, BLOCKSIZE / 2, fin); - if (ferror(fin)) { - perror("Read error");//FIXME: What an error?, what now? - hr = MAPI_E_CORRUPT_DATA; -@@ -113,7 +113,7 @@ HRESULT HrFileLFtoCRLF(FILE *fin, FILE** - - BufferLFtoCRLF(readsize, bufferin, bufferout, &sizebufferout); - -- if (fwrite(bufferout, sizeof(char), sizebufferout, fTmp) != sizebufferout) { -+ if (fwrite(bufferout, 1, sizebufferout, fTmp) != sizebufferout) { - perror("Write error");//FIXME: What an error?, what now? - hr = MAPI_E_CORRUPT_DATA; - break; -@@ -180,7 +180,7 @@ HRESULT HrMapFileToBuffer(FILE *f, char - /* mmap failed (probably reading from STDIN as a stream), just read the file into memory, and return that */ - lpBuffer = (char*)malloc(BLOCKSIZE); // will be deleted as soon as possible - while (!feof(f)) { -- ulReadsize = fread(lpBuffer+offset, sizeof(char), BLOCKSIZE, f); -+ ulReadsize = fread(lpBuffer+offset, 1, BLOCKSIZE, f); - if (ferror(f)) { - perror("Read error"); - break; -@@ -309,7 +309,7 @@ bool DuplicateFile(ECLogger *lpLogger, F - } - - while (!feof(lpFile)) { -- ulReadsize = fread(lpBuffer, sizeof(char), BLOCKSIZE, lpFile); -+ ulReadsize = fread(lpBuffer, 1, BLOCKSIZE, lpFile); - if (ferror(lpFile)) { - if (lpLogger) - lpLogger->Log(EC_LOGLEVEL_FATAL, "Read error, error %d", errno); -@@ -321,7 +321,7 @@ bool DuplicateFile(ECLogger *lpLogger, F - } - - -- if (fwrite(lpBuffer, sizeof(char), ulReadsize , pfNew) != ulReadsize) { -+ if (fwrite(lpBuffer, 1, ulReadsize , pfNew) != ulReadsize) { - if (lpLogger) - lpLogger->Log(EC_LOGLEVEL_FATAL, "Write error, error %d", errno); - else -@@ -389,7 +389,7 @@ bool ConvertFileFromUCS2ToUTF8(ECLogger - goto exit; - } - -- if (fwrite(strConverted.c_str(), sizeof(char), strConverted.size(), pfDst) != strConverted.size()) { -+ if (fwrite(strConverted.c_str(), 1, strConverted.size(), pfDst) != strConverted.size()) { - if (lpLogger) - lpLogger->Log(EC_LOGLEVEL_FATAL, "Unable to write to file '%s', error %d", strDstFileName.c_str(), errno); - else -Index: zarafa-7.1.0/gateway/IMAP.cpp -=================================================================== ---- zarafa-7.1.0.orig/gateway/IMAP.cpp -+++ zarafa-7.1.0/gateway/IMAP.cpp -@@ -5973,7 +5973,7 @@ HRESULT IMAP::HrSearch(vector &l - if (iconv) - iconv->convert(lstSearchCriteria[ulStartCriteria+1]); - -- hr = MAPIAllocateMore(sizeof(char) * (lstSearchCriteria[ulStartCriteria + 1].size() + 1), lpRootRestrict, -+ hr = MAPIAllocateMore(lstSearchCriteria[ulStartCriteria + 1].size() + 1, lpRootRestrict, - (LPVOID *) &szBuffer); - if (hr != hrSuccess) - goto exit; -@@ -6063,7 +6063,7 @@ HRESULT IMAP::HrSearch(vector &l - if (iconv) - iconv->convert(lstSearchCriteria[ulStartCriteria+1]); - -- hr = MAPIAllocateMore(sizeof(char) * (lstSearchCriteria[ulStartCriteria + 1].size() + 1), lpRootRestrict, -+ hr = MAPIAllocateMore(lstSearchCriteria[ulStartCriteria + 1].size() + 1, lpRootRestrict, - (LPVOID *) &szBuffer); - if (hr != hrSuccess) - goto exit; -@@ -6509,7 +6509,7 @@ HRESULT IMAP::HrSearch(vector &l - if (iconv) - iconv->convert(lstSearchCriteria[ulStartCriteria+1]); - -- hr = MAPIAllocateMore(sizeof(char) * (lstSearchCriteria[ulStartCriteria + 1].size() + 1), lpRootRestrict, -+ hr = MAPIAllocateMore(lstSearchCriteria[ulStartCriteria + 1].size() + 1, lpRootRestrict, - (LPVOID *) &szBuffer); - if (hr != hrSuccess) - goto exit; -@@ -6542,7 +6542,7 @@ HRESULT IMAP::HrSearch(vector &l - if (iconv) - iconv->convert(lstSearchCriteria[ulStartCriteria+1]); - -- hr = MAPIAllocateMore(sizeof(char) * (lstSearchCriteria[ulStartCriteria + 1].size() + 1), lpRootRestrict, -+ hr = MAPIAllocateMore(lstSearchCriteria[ulStartCriteria + 1].size() + 1, lpRootRestrict, - (LPVOID *) &szBuffer); - if (hr != hrSuccess) - goto exit; -Index: zarafa-7.1.0/inetmapi/tnef.cpp -=================================================================== ---- zarafa-7.1.0.orig/inetmapi/tnef.cpp -+++ zarafa-7.1.0/inetmapi/tnef.cpp -@@ -1896,11 +1896,11 @@ HRESULT ECTNEF::HrReadByte(IStream *lpSt - HRESULT hr = hrSuccess; - ULONG ulRead = 0; - -- hr = lpStream->Read(ulData, sizeof(char), &ulRead); -+ hr = lpStream->Read(ulData, 1, &ulRead); - if(hr != hrSuccess) - goto exit; - -- if(ulRead != sizeof(char)) { -+ if(ulRead != 1) { - hr = MAPI_E_NOT_FOUND; - goto exit; - } -Index: zarafa-7.1.0/mapi4linux/src/m4l.mapisvc.cpp -=================================================================== ---- zarafa-7.1.0.orig/mapi4linux/src/m4l.mapisvc.cpp -+++ zarafa-7.1.0/mapi4linux/src/m4l.mapisvc.cpp -@@ -280,7 +280,7 @@ HRESULT INFLoader::MakeProperty(const st - sProp.ulPropTag = CHANGE_PROP_TYPE(sProp.ulPropTag, PT_STRING8); - case PT_STRING8: - { -- hr = MAPIAllocateMore((strData.length() +1) * sizeof(char), base, (void**)&sProp.Value.lpszA); -+ hr = MAPIAllocateMore(strData.length() + 1, base, (void**)&sProp.Value.lpszA); - if (hr != hrSuccess) - goto exit; - strcpy(sProp.Value.lpszA, strData.c_str()); -Index: zarafa-7.1.0/mapi4linux/src/mapidefs.cpp -=================================================================== ---- zarafa-7.1.0.orig/mapi4linux/src/mapidefs.cpp -+++ zarafa-7.1.0/mapi4linux/src/mapidefs.cpp -@@ -200,7 +200,7 @@ HRESULT M4LMAPIProp::GetProps(LPSPropTag - goto exit; - for (ULONG c = 0; c < (*i)->Value.MVszW.cValues; c++) { - ansi = converter.convert_to((*i)->Value.MVszW.lppszW[c]); -- hr = MAPIAllocateMore(ansi.length() * sizeof(char) + sizeof(char), props, (void**)&sConvert.Value.MVszA.lppszA[c]); -+ hr = MAPIAllocateMore(ansi.length() + 1, props, (void**)&sConvert.Value.MVszA.lppszA[c]); - if (hr != hrSuccess) - goto exit; - strcpy(sConvert.Value.MVszA.lppszA[c], ansi.c_str()); -Index: zarafa-7.1.0/provider/contacts/ZCMAPIProp.cpp -=================================================================== ---- zarafa-7.1.0.orig/provider/contacts/ZCMAPIProp.cpp -+++ zarafa-7.1.0/provider/contacts/ZCMAPIProp.cpp -@@ -379,7 +379,7 @@ HRESULT ZCMAPIProp::CopyOneProp(convert_ - // copy from unicode to string8 - lpProp->ulPropTag = CHANGE_PROP_TYPE(i->second.ulPropTag, PT_STRING8); - strAnsi = converter.convert_to(i->second.Value.lpszW); -- hr = MAPIAllocateMore(strAnsi.size() + sizeof(char), lpBase, (void**)&lpProp->Value.lpszA); -+ hr = MAPIAllocateMore(strAnsi.size() + 1, lpBase, (void**)&lpProp->Value.lpszA); - if (hr != hrSuccess) - goto exit; - strcpy(lpProp->Value.lpszA, strAnsi.c_str()); -Index: zarafa-7.1.0/provider/libserver/ECDatabaseUtils.cpp -=================================================================== ---- zarafa-7.1.0.orig/provider/libserver/ECDatabaseUtils.cpp -+++ zarafa-7.1.0/provider/libserver/ECDatabaseUtils.cpp -@@ -788,7 +788,7 @@ ECRESULT CopyDatabasePropValToSOAPPropVa - { - ParseMVProp(lpRow[FIELD_NR_STRING], lpLen[FIELD_NR_STRING], &ulLastPos, &strData); - lpPropVal->Value.mvszA.__ptr[i] = s_alloc(soap, strData.size() + 1); -- memcpy(lpPropVal->Value.mvszA.__ptr[i], strData.c_str(), sizeof(char) * (strData.size() + 1)); -+ memcpy(lpPropVal->Value.mvszA.__ptr[i], strData.c_str(), strData.size() + 1); - } - ulPropTag = CHANGE_PROP_TYPE(ulPropTag, PT_MV_UNICODE); // return unicode strings to client, because database contains UTF-8 - break; -Index: zarafa-7.1.0/swig/python/RecurrenceState_wrap.cxx -=================================================================== ---- zarafa-7.1.0.orig/swig/python/RecurrenceState_wrap.cxx -+++ zarafa-7.1.0/swig/python/RecurrenceState_wrap.cxx -@@ -3278,7 +3278,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, cha - if (*alloc == SWIG_NEWOBJ) - #endif - { -- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); -+ *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, len + 1)); - *alloc = SWIG_NEWOBJ; - } - else { -Index: zarafa-7.1.0/swig/python/archiver_wrap.cxx -=================================================================== ---- zarafa-7.1.0.orig/swig/python/archiver_wrap.cxx -+++ zarafa-7.1.0/swig/python/archiver_wrap.cxx -@@ -3075,7 +3075,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, cha - if (*alloc == SWIG_NEWOBJ) - #endif - { -- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); -+ *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, len + 1)); - *alloc = SWIG_NEWOBJ; - } - else { -Index: zarafa-7.1.0/swig/python/icalmapi_wrap.cxx -=================================================================== ---- zarafa-7.1.0.orig/swig/python/icalmapi_wrap.cxx -+++ zarafa-7.1.0/swig/python/icalmapi_wrap.cxx -@@ -2879,7 +2879,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, cha - if (*alloc == SWIG_NEWOBJ) - #endif - { -- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); -+ *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, len + 1)); - *alloc = SWIG_NEWOBJ; - } - else { -Index: zarafa-7.1.0/swig/python/inetmapi_wrap.cxx -=================================================================== ---- zarafa-7.1.0.orig/swig/python/inetmapi_wrap.cxx -+++ zarafa-7.1.0/swig/python/inetmapi_wrap.cxx -@@ -2865,7 +2865,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, cha - if (*alloc == SWIG_NEWOBJ) - #endif - { -- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); -+ *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, len + 1)); - *alloc = SWIG_NEWOBJ; - } - else { -@@ -3140,7 +3140,7 @@ SWIGINTERN PyObject *_wrap_sending_optio - if (arg1->alternate_boundary) delete[] arg1->alternate_boundary; - if (arg2) { - size_t size = strlen(reinterpret_cast< const char * >(arg2)) + 1; -- arg1->alternate_boundary = (char *)reinterpret_cast< char* >(memcpy((new char[size]), reinterpret_cast< const char * >(arg2), sizeof(char)*(size))); -+ arg1->alternate_boundary = (char *)reinterpret_cast< char* >(memcpy((new char[size]), reinterpret_cast< const char * >(arg2), size)); - } else { - arg1->alternate_boundary = 0; - } -@@ -3569,7 +3569,7 @@ SWIGINTERN PyObject *_wrap_sending_optio - if (arg1->charset_upgrade) delete[] arg1->charset_upgrade; - if (arg2) { - size_t size = strlen(reinterpret_cast< const char * >(arg2)) + 1; -- arg1->charset_upgrade = (char *)reinterpret_cast< char* >(memcpy((new char[size]), reinterpret_cast< const char * >(arg2), sizeof(char)*(size))); -+ arg1->charset_upgrade = (char *)reinterpret_cast< char* >(memcpy((new char[size]), reinterpret_cast< const char * >(arg2), size)); - } else { - arg1->charset_upgrade = 0; - } -Index: zarafa-7.1.0/swig/python/libcommon_wrap.cxx -=================================================================== ---- zarafa-7.1.0.orig/swig/python/libcommon_wrap.cxx -+++ zarafa-7.1.0/swig/python/libcommon_wrap.cxx -@@ -3002,7 +3002,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, cha - if (*alloc == SWIG_NEWOBJ) - #endif - { -- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); -+ *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, len + 1)); - *alloc = SWIG_NEWOBJ; - } - else { -Index: zarafa-7.1.0/swig/python/libfreebusy_wrap.cxx -=================================================================== ---- zarafa-7.1.0.orig/swig/python/libfreebusy_wrap.cxx -+++ zarafa-7.1.0/swig/python/libfreebusy_wrap.cxx -@@ -2894,7 +2894,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, cha - if (*alloc == SWIG_NEWOBJ) - #endif - { -- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); -+ *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, len + 1)); - *alloc = SWIG_NEWOBJ; - } - else { -Index: zarafa-7.1.0/swig/python/licenseclient_wrap.cxx -=================================================================== ---- zarafa-7.1.0.orig/swig/python/licenseclient_wrap.cxx -+++ zarafa-7.1.0/swig/python/licenseclient_wrap.cxx -@@ -2870,7 +2870,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, cha - if (*alloc == SWIG_NEWOBJ) - #endif - { -- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); -+ *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, len + 1)); - *alloc = SWIG_NEWOBJ; - } - else { -Index: zarafa-7.1.0/swig/python/mapi_wrap.cxx -=================================================================== ---- zarafa-7.1.0.orig/swig/python/mapi_wrap.cxx -+++ zarafa-7.1.0/swig/python/mapi_wrap.cxx -@@ -3520,7 +3520,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, cha - if (*alloc == SWIG_NEWOBJ) - #endif - { -- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); -+ *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, len + 1)); - *alloc = SWIG_NEWOBJ; - } - else { diff --git a/net-mail/zarafa/files/7.1.5.42059/zarafa-22-gcc47.patch b/net-mail/zarafa/files/7.1.5.42059/zarafa-22-gcc47.patch deleted file mode 100644 index b5a7be1..0000000 --- a/net-mail/zarafa/files/7.1.5.42059/zarafa-22-gcc47.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Jan Engelhardt -Date: 2012-06-22 00:34:08.177803888 +0200 - -g++ -DHAVE_CONFIG_H -I. -I../../common -I../../mapi4linux/include -I../../common -I../../provider/include -I../../ECtools/zarafa-archiver -I/usr/include/CLucene/ext -I/usr/lib64 -DBOOST_FILESYSTEM_VERSION=2 -DLINUX -fmessage-length=0 -O2 -Wall -D_FORTIFY_SOURCE=2 -fstack-protector -funwind-tables -fasynchronous-unwind-tables -g -g -rdynamic -Wall -Wno-write-strings -DHAVE_CONFIG_H -pedantic -Wno-long-long -Wno-variadic-macros -pthread -O2 -fno-strict-aliasing -DNDEBUG -DFORCE_CHARSET_CONVERSION -DUNICODE -c -o ECIndexImporterAttachments.o ECIndexImporterAttachments.cpp -ECIndexImporterAttachments.cpp: In member function 'HRESULT ECIndexImporterAttachment::CopyStreamToParser(IStream*, int, int, std::wstring*)': -ECIndexImporterAttachments.cpp:249:34: error: 'max' was not declared in this scope -ECIndexImporterAttachments.cpp:249:34: note: suggested alternative: -/usr/include/c++/4.7/bits/stl_algobase.h:254:5: note: 'std::max' - -ECIndexImporterAttachments.cpp:440:3: error: 'string' was not declared in this scope -ECIndexImporterAttachments.cpp:440:3: note: suggested alternative: -/usr/include/c++/4.7/bits/stringfwd.h:65:33: note: 'std::string' - -ECIndexImporterAttachments.cpp:443:4: error: 'set' was not declared in this scope -ECIndexImporterAttachments.cpp:443:4: note: suggested alternative: -/usr/include/c++/4.7/bits/stl_set.h:91:11: note: 'std::set' - -ECIndexImporterAttachments.cpp:602:46: error: 'min' was not declared in this scope -ECIndexImporterAttachments.cpp:602:46: note: suggested alternative: -/usr/include/c++/4.7/bits/stl_algobase.h:233:5: note: 'std::min' - -ECIndexImporter.cpp: In member function 'HRESULT ECIndexImporter::ProcessThread()': -ECIndexImporter.cpp:400:5: error: 'auto_ptr' was not declared in this scope - ---- - ECtools/zarafa-search/ECIndexImporter.cpp | 3 +- - ECtools/zarafa-search/ECIndexImporterAttachments.cpp | 24 +++++++++++-------- - 2 files changed, 16 insertions(+), 11 deletions(-) - -Index: zarafa-7.1.0/ECtools/zarafa-search/ECIndexImporter.cpp -=================================================================== ---- zarafa-7.1.0.orig/ECtools/zarafa-search/ECIndexImporter.cpp -+++ zarafa-7.1.0/ECtools/zarafa-search/ECIndexImporter.cpp -@@ -47,6 +47,7 @@ - * - */ - -+#include - #include "platform.h" - - #include "ECIndexImporter.h" -@@ -433,7 +434,7 @@ HRESULT ECIndexImporter::ProcessThread() - ECIndexDB *lpIndex = NULL; - ECIndexDB *lpThisIndex = NULL; - ArchiveItem *lpArchiveItem = NULL; -- auto_ptr lpStubTarget; -+ std::auto_ptr lpStubTarget; - - m_lpLogger->Log(EC_LOGLEVEL_DEBUG, "Importer thread started"); - -Index: zarafa-7.1.0/ECtools/zarafa-search/ECIndexImporterAttachments.cpp -=================================================================== ---- zarafa-7.1.0.orig/ECtools/zarafa-search/ECIndexImporterAttachments.cpp -+++ zarafa-7.1.0/ECtools/zarafa-search/ECIndexImporterAttachments.cpp -@@ -47,6 +47,10 @@ - * - */ - -+#include -+#include -+#include -+ - #include - - #include -@@ -246,7 +250,7 @@ HRESULT ECIndexImporterAttachment::CopyS - ULONG ulWriteData; - fd_set rset, wset; - int res; -- int fd = max(ulFpWrite, ulFpRead); -+ int fd = std::max(ulFpWrite, ulFpRead); - struct timeval timeout; - - -@@ -267,7 +271,7 @@ HRESULT ECIndexImporterAttachment::CopyS - FD_ZERO(&wset); - if (ulTotalWriteData) { - FD_SET(ulFpWrite, &wset); -- fd = max(ulFpWrite, ulFpRead); -+ fd = std::max(ulFpWrite, ulFpRead); - } else { - fd = ulFpRead; - } -@@ -437,10 +441,10 @@ HRESULT ECIndexImporterAttachment::Parse - command.assign(m_strCommand + " "); - - if (!strMimeTag.empty() && strMimeTag.compare(_T("application/octet-stream")) != 0) { -- string tmp = trim(convert_to(strMimeTag), "\r\n "); -+ std::string tmp = trim(convert_to(strMimeTag), "\r\n "); - size_t pos = tmp.find_first_of('/'); - if (pos != std::string::npos) { -- set::iterator i = m_lpThreadData->m_setMimeFilter.find(string(tmp,0,pos)); -+ std::set::iterator i = m_lpThreadData->m_setMimeFilter.find(std::string(tmp,0,pos)); - if (i != m_lpThreadData->m_setMimeFilter.end()) { - m_lpThreadData->lpLogger->Log(EC_LOGLEVEL_DEBUG, "Skipping filtered attachment mimetype: %s for %ls", tmp.c_str(), strFilename.c_str()); - hr = MAPI_E_INVALID_OBJECT; -@@ -452,8 +456,8 @@ HRESULT ECIndexImporterAttachment::Parse - command.append("'"); - } else if (!strExtension.empty()) { - // this string mostly does not exist -- string tmp = trim(convert_to(strExtension), "\r\n "); -- set::iterator i = m_lpThreadData->m_setExtFilter.find(string(tmp,1)); // skip dot in extension find -+ std::string tmp = trim(convert_to(strExtension), "\r\n "); -+ std::set::iterator i = m_lpThreadData->m_setExtFilter.find(std::string(tmp,1)); // skip dot in extension find - if (i != m_lpThreadData->m_setExtFilter.end()) { - m_lpThreadData->lpLogger->Log(EC_LOGLEVEL_DEBUG, "Skipping filtered attachment extension: %s for %ls", tmp.c_str(), strFilename.c_str()); - hr = MAPI_E_INVALID_OBJECT; -@@ -463,14 +467,14 @@ HRESULT ECIndexImporterAttachment::Parse - command.append(forcealnum(tmp, ".")); - command.append("'"); - } else if (!strFilename.empty()) { -- std::string tmp = trim(convert_to(strFilename), "\r\n "); -+ std::string tmp = trim(convert_to(strFilename), "\r\n "); - size_t pos = tmp.find_last_of('.'); - if (pos == std::string::npos) - goto exit; - - - // skip dot in find -- set::iterator i = m_lpThreadData->m_setExtFilter.find(string(tmp, pos+1)); -+ std::set::iterator i = m_lpThreadData->m_setExtFilter.find(std::string(tmp, pos+1)); - if (i != m_lpThreadData->m_setExtFilter.end()) { - m_lpThreadData->lpLogger->Log(EC_LOGLEVEL_DEBUG, "Skipping filtered attachment extension: %ls", strFilename.c_str()); - hr = MAPI_E_INVALID_OBJECT; -@@ -478,7 +482,7 @@ HRESULT ECIndexImporterAttachment::Parse - } - - command.append("ext '"); -- command.append(forcealnum(string(tmp, pos), ".")); -+ command.append(forcealnum(std::string(tmp, pos), ".")); - command.append("'"); - } else { - m_lpThreadData->lpLogger->Log(EC_LOGLEVEL_DEBUG, "Invalid attachment, no mimetag, extension or filename"); -@@ -599,7 +603,7 @@ HRESULT ECIndexImporterAttachment::Parse - if (ulAttachSize) { - /* Copy attachment data into stream */ - while (TRUE) { -- ULONG ulRead = min(m_ulCache, ulAttachSize); -+ ULONG ulRead = std::min(m_ulCache, ulAttachSize); - ULONG ulCopy = ulRead; - ULONG ulWritten = 0; - diff --git a/net-mail/zarafa/files/7.1.5.42059/zarafa-23-newclucene.patch b/net-mail/zarafa/files/7.1.5.42059/zarafa-23-newclucene.patch deleted file mode 100644 index 1935f52..0000000 --- a/net-mail/zarafa/files/7.1.5.42059/zarafa-23-newclucene.patch +++ /dev/null @@ -1,175 +0,0 @@ -From: Jan Engelhardt -Date: 2012-06-22 01:14:57.789674760 +0200 - -Make ZCP compilation succeed if distribution uses clucene-core 2.x. - ---- - ECtools/zarafa-search/ECAnalyzers.cpp | 14 +++++----- - ECtools/zarafa-search/ECAnalyzers.h | 5 +-- - ECtools/zarafa-search/ECIndexDB.cpp | 4 +-- - configure.ac | 45 +--------------------------------- - 4 files changed, 13 insertions(+), 55 deletions(-) - -Index: zarafa-7.1.4/ECtools/zarafa-search/ECAnalyzers.cpp -=================================================================== ---- zarafa-7.1.4.orig/ECtools/zarafa-search/ECAnalyzers.cpp -+++ zarafa-7.1.4/ECtools/zarafa-search/ECAnalyzers.cpp -@@ -78,24 +78,24 @@ EmailFilter::~EmailFilter() { - * @param token Output token - * @return false if no more token was available - */ --bool EmailFilter::next(lucene::analysis::Token *token) { -+lucene::analysis::Token *EmailFilter::next(lucene::analysis::Token *token) { - // See if we had any stored tokens - if(part < parts.size()) { - token->set(parts[part].c_str(), 0, 0, _T("")); - token->setPositionIncrement(0); - part++; -- return true; -+ return token; - } else { - // No more stored token, get a new one - if(!input->next(token)) -- return false; -+ return NULL; - - // Split EMAIL tokens into the various parts - if(wcscmp(token->type(), L"") == 0) { - // Split into user, domain, com -- parts = tokenize((std::wstring)token->_termText, (std::wstring)L".@"); -+ parts = tokenize((std::wstring)token->termBuffer(), (std::wstring)L".@"); - // Split into user, domain.com -- std::vector moreparts = tokenize((std::wstring)token->_termText, (std::wstring)L"@"); -+ std::vector moreparts = tokenize((std::wstring)token->termBuffer(), (std::wstring)L"@"); - parts.insert(parts.end(), moreparts.begin(), moreparts.end()); - - // Only add parts once (unique parts) -@@ -105,7 +105,7 @@ bool EmailFilter::next(lucene::analysis: - part = 0; - } - -- return true; -+ return token; - } - } - -@@ -124,7 +124,7 @@ ECAnalyzer::~ECAnalyzer() - * @param reader Reader to read the bytestream to tokenize - * @return A TokenStream outputting the tokens to be indexed - */ --lucene::analysis::TokenStream* ECAnalyzer::tokenStream(const TCHAR* fieldName, lucene::util::Reader* reader) -+lucene::analysis::TokenStream *ECAnalyzer::tokenStream(const TCHAR *fieldName, CL_NS(util)::BufferedReader *reader) - { - lucene::analysis::TokenStream* ret = _CLNEW lucene::analysis::standard::StandardTokenizer(reader); - ret = _CLNEW lucene::analysis::standard::StandardFilter(ret,true); -Index: zarafa-7.1.4/ECtools/zarafa-search/ECAnalyzers.h -=================================================================== ---- zarafa-7.1.4.orig/ECtools/zarafa-search/ECAnalyzers.h -+++ zarafa-7.1.4/ECtools/zarafa-search/ECAnalyzers.h -@@ -50,7 +50,6 @@ - #ifndef ANALYZERS_H - - #include "CLucene/StdHeader.h" --#include "CLucene/util/Reader.h" - #include "CLucene/analysis/standard/StandardAnalyzer.h" - #include "CLucene/analysis/AnalysisHeader.h" - -@@ -68,7 +67,7 @@ class EmailFilter: public lucene::analys - public: - EmailFilter(lucene::analysis::TokenStream* in, bool deleteTokenStream); - virtual ~EmailFilter(); -- bool next(lucene::analysis::Token* token); -+ lucene::analysis::Token *next(lucene::analysis::Token *token); - private: - lucene::analysis::Token curtoken; - -@@ -86,7 +85,7 @@ public: - ECAnalyzer(); - virtual ~ECAnalyzer(); - -- virtual lucene::analysis::TokenStream* tokenStream(const TCHAR* fieldName, CL_NS(util)::Reader* reader); -+ virtual lucene::analysis::TokenStream *tokenStream(const TCHAR *fieldName, CL_NS(util)::BufferedReader *reader); - }; - - #endif -Index: zarafa-7.1.4/ECtools/zarafa-search/ECIndexDB.cpp -=================================================================== ---- zarafa-7.1.4.orig/ECtools/zarafa-search/ECIndexDB.cpp -+++ zarafa-7.1.4/ECtools/zarafa-search/ECIndexDB.cpp -@@ -68,7 +68,7 @@ - #include - #include - --#include -+#include - - using namespace kyotocabinet; - -@@ -305,7 +305,7 @@ HRESULT ECIndexDB::AddTerm(folderid_t fo - unsigned int len; - unsigned int keylen; - -- lucene::util::StringReader reader(wstrTerm.c_str()); -+ CL_NS(util)::StringReader reader(wstrTerm.c_str()); - - stream = m_lpAnalyzer->tokenStream(L"", &reader); - -Index: zarafa-7.1.4/configure.ac -=================================================================== ---- zarafa-7.1.4.orig/configure.ac -+++ zarafa-7.1.4/configure.ac -@@ -432,52 +432,11 @@ AC_SUBST(ICAL_LIBS) - CXXFLAGS=$CXXFLAGS_system - - # Check for CLucene availability --AC_ARG_WITH(clucene-lib-prefix, -- AC_HELP_STRING([--with-clucene-lib-prefix=PATH],[path to the clucene config file, e.g. /usr/lib/]), -- [CLUCENE_LIB_PREFIX=${withval}],[CLUCENE_LIB_PREFIX=/usr/lib]) --AC_ARG_WITH(clucene-include-prefix, -- AC_HELP_STRING([--with-clucene-include-prefix=PATH],[path to the clucene include files, e.g. /usr/include/]), -- [CLUCENE_INCLUDE_PREFIX=${withval}],[CLUCENE_INCLUDE_PREFIX=/usr/include]) --have_clucene=no --# preprocessor doesn't check in /usr/lib{,64}/ for include files --if test "x$CLUCENE_LIB_PREFIX" != "x"; then -- CXXFLAGS="$CXXFLAGS -I$CLUCENE_LIB_PREFIX" -- CPPFLAGS="$CPPFLAGS -I$CLUCENE_LIB_PREFIX" --fi --if test "x$CLUCENE_INCLUDE_PREFIX" != "x"; then -- CXXFLAGS="$CXXFLAGS -I$CLUCENE_INCLUDE_PREFIX" -- CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX" --fi --# force add pthread in lucene test --CXXFLAGS="$CXXFLAGS -pthread" --if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then --# lucene::index::IndexReader::open(const char *) in c++ style --AC_CHECK_LIB(clucene, [_ZN6lucene5index11IndexReader4openEPKc], -- [ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a" -- have_clucene=static -- ]) --else --AC_CHECK_LIB(clucene, [_ZN6lucene5index11IndexReader4openEPKc], -- [ CLUCENE_LIBS="-lclucene" -- have_clucene=dynamic -- ]) --fi --AC_MSG_CHECKING([library type for clucene]) --AC_MSG_RESULT([$have_clucene]) --AC_CHECK_HEADERS([CLucene.h], -- [ CLUCENE_CFLAGS="-DLUCENE_DISABLE_MEMTRACKING" ], -- [ have_clucene=no ]) --if test "x$CLUCENE_LIB_PREFIX" != "x"; then -- CLUCENE_CFLAGS="$CLUCENE_CFLAGS -I$CLUCENE_LIB_PREFIX" --fi --if test "x$CLUCENE_INCLUDE_PREFIX" != "x"; then -- CLUCENE_CFLAGS="$CLUCENE_CFLAGS -I$CLUCENE_INCLUDE_PREFIX" --fi -+PKG_CHECK_MODULES([CLUCENE], [libclucene-core >= 2.3.3], -+ [have_clucene=dynamic], [have_clucene=no]) - AM_CONDITIONAL([WITH_CLUCENE], [test "$have_clucene" != "no"]) - AC_SUBST(CLUCENE_CFLAGS) - AC_SUBST(CLUCENE_LIBS) --CXXFLAGS=$CXXFLAGS_system --CPPFLAGS=$CPPFLAGS_system - - # Check for google perftools tcmalloc availability - if test "$want_tcmalloc_full" = "yes"; then diff --git a/net-mail/zarafa/files/7.1.5.42059/zarafa-24-undefined-behavior.patch b/net-mail/zarafa/files/7.1.5.42059/zarafa-24-undefined-behavior.patch deleted file mode 100644 index f591740..0000000 --- a/net-mail/zarafa/files/7.1.5.42059/zarafa-24-undefined-behavior.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Jan Engelhardt -Date: 2013-01-25 03:39:37.985164412 +0100 - -build: flag path that probably should not be taken - -[ 1420s] I: Program returns random data in a function -[ 1420s] E: zarafa no-return-in-nonvoid-function archiver.cpp:373 - ---- - ECtools/zarafa-archiver/archiver.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -Index: zarafa-7.1.3/ECtools/zarafa-archiver/archiver.cpp -=================================================================== ---- zarafa-7.1.3.orig/ECtools/zarafa-archiver/archiver.cpp -+++ zarafa-7.1.3/ECtools/zarafa-archiver/archiver.cpp -@@ -60,6 +60,7 @@ - #include "ECConfig.h" - #include "ECLogger.h" - -+#include - #include - using namespace std; - -@@ -370,6 +371,8 @@ ECLogger* ArchiverImpl::GetLogger(eLogTy - case DefaultLog: return m_lpLogger; - case LogOnly: return m_lpLogLogger; - } -+ abort(); -+ return NULL; - } - - configsetting_t* ArchiverImpl::ConcatSettings(const configsetting_t *lpSettings1, const configsetting_t *lpSettings2) diff --git a/net-mail/zarafa/files/7.1.5.42059/zarafa-25-imap-maxfail.patch b/net-mail/zarafa/files/7.1.5.42059/zarafa-25-imap-maxfail.patch deleted file mode 100644 index f99b208..0000000 --- a/net-mail/zarafa/files/7.1.5.42059/zarafa-25-imap-maxfail.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- - gateway/Gateway.cpp | 1 + - gateway/IMAP.cpp | 10 +++++++--- - 2 files changed, 8 insertions(+), 3 deletions(-) - -Index: zarafa-7.1.5/gateway/Gateway.cpp -=================================================================== ---- zarafa-7.1.5.orig/gateway/Gateway.cpp -+++ zarafa-7.1.5/gateway/Gateway.cpp -@@ -350,6 +350,7 @@ int main(int argc, char *argv[]) { - { "imap_public_folders", "yes", CONFIGSETTING_RELOADABLE }, - { "imap_capability_idle", "yes", CONFIGSETTING_RELOADABLE }, - { "imap_always_generate", "no", CONFIGSETTING_UNUSED }, -+ { "imap_max_fail_commands", "10", CONFIGSETTING_RELOADABLE }, - { "imap_max_messagesize", "128M", CONFIGSETTING_RELOADABLE | CONFIGSETTING_SIZE }, - { "imap_generate_utf8", "no", CONFIGSETTING_RELOADABLE }, - { "imap_expunge_on_delete", "no", CONFIGSETTING_RELOADABLE }, -Index: zarafa-7.1.5/gateway/IMAP.cpp -=================================================================== ---- zarafa-7.1.5.orig/gateway/IMAP.cpp -+++ zarafa-7.1.5/gateway/IMAP.cpp -@@ -3203,14 +3203,18 @@ HRESULT IMAP::HrResponse(const string &s - */ - HRESULT IMAP::HrResponse(const string &strResult, const string &strTag, const string &strResponse) - { -+ unsigned int max_err; -+ -+ max_err = strtoul(lpConfig->GetSetting("imap_max_fail_commands"), NULL, 0); -+ - // Some clients keep looping, so if we keep sending errors, just disconnect the client. - if (strResult.compare(RESP_TAGGED_OK) == 0) - m_ulErrors = 0; - else - m_ulErrors++; -- if (m_ulErrors >= 10) { -- lpLogger->Log(EC_LOGLEVEL_FATAL, "Disconnecting client of user %ls because too many erroneous commands received, last reply:", m_strwUsername.c_str()); -- lpLogger->Log(EC_LOGLEVEL_FATAL, "%s%s%s", strTag.c_str(), strResult.c_str(), strResponse.c_str()); -+ if (m_ulErrors >= max_err) { -+ lpLogger->Log(EC_LOGLEVEL_FATAL, "Disconnecting client of user %ls because too many (%u) erroneous commands received, last reply:", m_strwUsername.c_str(), max_err); -+ lpLogger->Log(EC_LOGLEVEL_FATAL, "%s%s%s", strTag.c_str(), strResult.c_str(), strResponse.c_str()); - return MAPI_E_END_OF_SESSION; - } - diff --git a/net-mail/zarafa/files/7.1.5.42059/zarafa-30-ac-typos.patch b/net-mail/zarafa/files/7.1.5.42059/zarafa-30-ac-typos.patch deleted file mode 100644 index 6def369..0000000 --- a/net-mail/zarafa/files/7.1.5.42059/zarafa-30-ac-typos.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Jan Engelhardt -Date: 2013-08-03 23:52:43.159313521 +0200 - -build: fix incorrect variable name in configure.ac - -Duh - there is no variable called $libs_keep or $cflags_keep. - ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -Index: zarafa-7.1.5/configure.ac -=================================================================== ---- zarafa-7.1.5.orig/configure.ac -+++ zarafa-7.1.5/configure.ac -@@ -259,8 +259,8 @@ AC_DEFUN([LIBNCURSES_WITH_CONFIG],[ - AC_CHECK_FUNCS([cbreak], [AC_DEFINE([HAVE_NCURSES], [1], [ncurses library available])]) - ]) - -- LIBS=$libs_keep -- CFLAGS=$cflags_keep -+ LIBS="$LIBS_system" -+ CFLAGS="$CFLAGS_system" - AC_SUBST(NCURSES_FLAGS) - AC_SUBST(NCURSES_LIBS) - ]) -@@ -612,8 +612,8 @@ AC_DEFUN([LIBKRB5_WITH_KRB5_CONFIG],[ - AC_MSG_RESULT([yes]) - fi - -- LIBS=$libs_keep -- CFLAGS=$cflags_keep -+ LIBS="$LIBS_system" -+ CFLAGS="$CFLAGS_system" - AC_SUBST(KRB5_CFLAGS) - AC_SUBST(KRB5_LIBS) - fi diff --git a/net-mail/zarafa/files/7.1.5.42059/zarafa-35-embedded-mysql.patch b/net-mail/zarafa/files/7.1.5.42059/zarafa-35-embedded-mysql.patch deleted file mode 100644 index d561613..0000000 --- a/net-mail/zarafa/files/7.1.5.42059/zarafa-35-embedded-mysql.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Jan Engelhardt -Date: 2013-08-04 13:24:08.891101130 +0200 - -build: fully honor --enable-embedded-mysql - -"-DEMBEDDED_MYSQL" never appears on the command lines because it has -been assigned to the wrong variable. - -In addition, the definition of ulResult needs to be either moved up, -or put into a block, so as to avoid: - - ECServer.cpp:1496:1: error: jump to label 'exit' [-fpermissive] - ECServer.cpp:1320:11: error: from here [-fpermissive] - ECServer.cpp:1343:15: error: crosses initialization of - 'unsigned int ulResult' - ---- - configure.ac | 2 +- - provider/server/ECServer.cpp | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - -Index: zarafa-7.1.5/configure.ac -=================================================================== ---- zarafa-7.1.5.orig/configure.ac -+++ zarafa-7.1.5/configure.ac -@@ -342,7 +342,7 @@ AC_DEFUN([MYSQL_WITH_MYSQL_CONFIG],[ - AC_ARG_ENABLE(embedded-mysql, AC_HELP_STRING([--enable-embedded-mysql],[Compile zarafa-server with the embedded MySQL server]), - [ - EMBEDDED=1 -- CXXFLAGS="$CXXFLAGS -DEMBEDDED_MYSQL" -+ ZCXXFLAGS="$ZCXXFLAGS -DEMBEDDED_MYSQL" - ],[ - EMBEDDED=0 - ]) -Index: zarafa-7.1.5/provider/server/ECServer.cpp -=================================================================== ---- zarafa-7.1.5.orig/provider/server/ECServer.cpp -+++ zarafa-7.1.5/provider/server/ECServer.cpp -@@ -1340,6 +1340,7 @@ int running_server(char *szName, const c - g_lpLogger->Log(EC_LOGLEVEL_FATAL, "WARNING: Unable to place upgrade lockfile: %s", strerror(errno)); - - #ifdef EMBEDDED_MYSQL -+{ - unsigned int ulResult = 0; - // setting upgrade_tables - // 1 = upgrade from mysql 4.1.23 to 5.22 -@@ -1353,6 +1354,7 @@ int running_server(char *szName, const c - - SetDatabaseSetting(lpDatabase, "upgrade_tables", 1); - } -+} - #endif - - // perform database upgrade .. may take a very long time diff --git a/net-mail/zarafa/files/7.1.5.42059/zarafa-7.0.3-sysconfig2confd-1.patch b/net-mail/zarafa/files/7.1.5.42059/zarafa-7.0.3-sysconfig2confd-1.patch deleted file mode 100644 index 2496e65..0000000 --- a/net-mail/zarafa/files/7.1.5.42059/zarafa-7.0.3-sysconfig2confd-1.patch +++ /dev/null @@ -1,103 +0,0 @@ -Submitted By: Mario Fetka (mario.fetka@gmail.com) -Date: 2010-10-13 -Initial Package Version: 6.40.2 (7.0.3) -Origin: me -Upstream Status: gentoo specific -Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d - -diff -uNr zarafa-7.0.3.orig/installer/linux/Makefile.am zarafa-7.0.3/installer/linux/Makefile.am ---- zarafa-7.0.3.orig/installer/linux/Makefile.am 2011-11-20 18:45:15.661461795 +0100 -+++ zarafa-7.0.3/installer/linux/Makefile.am 2011-11-20 18:48:10.780508507 +0100 -@@ -26,7 +26,7 @@ - sysconf_initdir=${sysconfdir}/init.d - sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files} - --rhel_sysconfig_path = ${sysconfdir}/sysconfig -+rhel_sysconfig_path = ${sysconfdir}/conf.d - suse_sysconfig_path = ${localstatedir}/adm/fillup-templates - sles_sysconfig_path = ${localstatedir}/adm/fillup-templates - sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path} -diff -uNr zarafa-7.0.3.orig/installer/userscripts/createcompany.in zarafa-7.0.3/installer/userscripts/createcompany.in ---- zarafa-7.0.3.orig/installer/userscripts/createcompany.in 2011-11-20 18:45:15.640628342 +0100 -+++ zarafa-7.0.3/installer/userscripts/createcompany.in 2011-11-20 18:47:09.706088759 +0100 -@@ -9,8 +9,8 @@ - # beware that this string can contain any characters, so take heed to - # correct quoting. - --if [ -f @sysconfdir@/sysconfig/zarafa ]; then -- . @sysconfdir@/sysconfig/zarafa -+if [ -f @sysconfdir@/conf.d/zarafa-server ]; then -+ . @sysconfdir@/conf.d/zarafa-server - elif [ -f @sysconfdir@/default/zarafa ]; then - . @sysconfdir@/default/zarafa - fi -diff -uNr zarafa-7.0.3.orig/installer/userscripts/creategroup.in zarafa-7.0.3/installer/userscripts/creategroup.in ---- zarafa-7.0.3.orig/installer/userscripts/creategroup.in 2011-11-20 18:45:15.640628342 +0100 -+++ zarafa-7.0.3/installer/userscripts/creategroup.in 2011-11-20 18:46:48.060132907 +0100 -@@ -9,8 +9,8 @@ - # beware that this string can contain any characters, so take heed to - # correct quoting. - --if [ -f @sysconfdir@/sysconfig/zarafa ]; then -- . @sysconfdir@/sysconfig/zarafa -+if [ -f @sysconfdir@/conf.d/zarafa-server ]; then -+ . @sysconfdir@/conf.d/zarafa-server - elif [ -f @sysconfdir@/default/zarafa ]; then - . @sysconfdir@/default/zarafa - fi -diff -uNr zarafa-7.0.3.orig/installer/userscripts/createuser.in zarafa-7.0.3/installer/userscripts/createuser.in ---- zarafa-7.0.3.orig/installer/userscripts/createuser.in 2011-11-20 18:45:15.640628342 +0100 -+++ zarafa-7.0.3/installer/userscripts/createuser.in 2011-11-20 18:47:04.215316936 +0100 -@@ -9,8 +9,8 @@ - # beware that this string can contain any characters, so take heed to - # correct quoting. - --if [ -f @sysconfdir@/sysconfig/zarafa ]; then -- . @sysconfdir@/sysconfig/zarafa -+if [ -f @sysconfdir@/conf.d/zarafa-server ]; then -+ . @sysconfdir@/conf.d/zarafa-server - elif [ -f @sysconfdir@/default/zarafa ]; then - . @sysconfdir@/default/zarafa - fi -diff -uNr zarafa-7.0.3.orig/installer/userscripts/deletecompany.in zarafa-7.0.3/installer/userscripts/deletecompany.in ---- zarafa-7.0.3.orig/installer/userscripts/deletecompany.in 2011-11-20 18:45:15.638313511 +0100 -+++ zarafa-7.0.3/installer/userscripts/deletecompany.in 2011-11-20 18:46:16.113192833 +0100 -@@ -9,8 +9,8 @@ - # beware that this string can contain any characters, so take heed to - # correct quoting. - --if [ -f @sysconfdir@/sysconfig/zarafa ]; then -- . @sysconfdir@/sysconfig/zarafa -+if [ -f @sysconfdir@/conf.d/zarafa-server ]; then -+ . @sysconfdir@/conf.d/zarafa-server - fi - - ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d -diff -uNr zarafa-7.0.3.orig/installer/userscripts/deletegroup.in zarafa-7.0.3/installer/userscripts/deletegroup.in ---- zarafa-7.0.3.orig/installer/userscripts/deletegroup.in 2011-11-20 18:45:15.638313511 +0100 -+++ zarafa-7.0.3/installer/userscripts/deletegroup.in 2011-11-20 18:46:26.173434957 +0100 -@@ -9,8 +9,8 @@ - # beware that this string can contain any characters, so take heed to - # correct quoting. - --if [ -f @sysconfdir@/sysconfig/zarafa ]; then -- . @sysconfdir@/sysconfig/zarafa -+if [ -f @sysconfdir@/conf.d/zarafa-server ]; then -+ . @sysconfdir@/conf.d/zarafa-server - fi - - ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d -diff -uNr zarafa-7.0.3.orig/installer/userscripts/deleteuser.in zarafa-7.0.3/installer/userscripts/deleteuser.in ---- zarafa-7.0.3.orig/installer/userscripts/deleteuser.in 2011-11-20 18:45:15.659146961 +0100 -+++ zarafa-7.0.3/installer/userscripts/deleteuser.in 2011-11-20 18:47:14.958433297 +0100 -@@ -9,8 +9,8 @@ - # that this string can contain any characters, so take heed to correct - # quoting. - --if [ -f @sysconfdir@/sysconfig/zarafa ]; then -- . @sysconfdir@/sysconfig/zarafa -+if [ -f @sysconfdir@/conf.d/zarafa-server ]; then -+ . @sysconfdir@/conf.d/zarafa-server - fi - - ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d diff --git a/net-mail/zarafa/files/7.1.7.42779/Datux-sendas.patch b/net-mail/zarafa/files/7.1.7.42779/Datux-sendas.patch deleted file mode 100644 index aabe5fc..0000000 --- a/net-mail/zarafa/files/7.1.7.42779/Datux-sendas.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- spooler/mailer.cpp.ori 2011-07-03 15:38:10.162737725 +0200 -+++ spooler/mailer.cpp 2011-07-03 15:39:14.362790762 +0200 -@@ -2172,6 +2172,8 @@ - HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b) - { - bAllowSendAs = true; -+ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) { -+ bAllowSendAs = true; - } else { - - hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner); ---- spooler/Spooler.cpp.ori 2011-07-03 15:46:25.366770639 +0200 -+++ spooler/Spooler.cpp 2011-07-03 15:46:45.716172033 +0200 -@@ -1118,6 +1118,7 @@ - { "fax_domain", "", CONFIGSETTING_RELOADABLE }, - { "fax_international", "+", CONFIGSETTING_RELOADABLE }, - { "always_send_delegates", "no", CONFIGSETTING_RELOADABLE }, -+ { "always_send_as", "no", CONFIGSETTING_RELOADABLE }, - { "always_send_tnef", "no", CONFIGSETTING_RELOADABLE }, - { "always_send_utf8", "no", CONFIGSETTING_RELOADABLE }, - { "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE }, ---- php-webclient-ajax/client/modules/readmailitemmodule.js.ori 2011-06-22 00:02:22.000000000 +0200 -+++ php-webclient-ajax/client/modules/readmailitemmodule.js 2011-07-24 01:19:03.454049593 +0200 -@@ -479,7 +479,7 @@ - dhtml.addEvent(this, recipientItemSenderRepresentation, "click", eventReadmailClickEmail); - dhtml.addEvent(this, recipientItemSenderRepresentation, "contextmenu", eventReadmailAddressContextMenu); - -- dhtml.addElement(fromElement,"span","emailaddress","", NBSP+_("on behalf of")+NBSP); -+ //dhtml.addElement(fromElement,"span","emailaddress","", NBSP+_("on behalf of")+NBSP); - } - - var recipientItemSenderRepresentation = dhtml.addElement(fromElement,"a","emailaddress","senderrepresentatation_label",sender_representation); ---- installer/linux/spooler.ori 2011-07-03 14:41:32.934761391 +0200 -+++ installer/linux/spooler.cfg 2011-07-02 18:29:54.958164996 +0200 -@@ -76,7 +76,11 @@ - # delegates (other user than yourself in the From: header) - # In installations before 6.20, this value was always 'yes'. - # IMPORTANT: This feature overrides "send-as" functionality. --always_send_delegates = no -+always_send_delegates = yes -+ -+# Set this value to 'yes' to let the spooler always send emails even -+# if the from emailadres someone elses -+always_send_as = yes - - # Set this value to 'no' if you do NOT want to allow redirected e-mails - # being sent with their original 'FROM' header \ No newline at end of file diff --git a/net-mail/zarafa/files/7.1.7.42779/Datux-spamhook.patch b/net-mail/zarafa/files/7.1.7.42779/Datux-spamhook.patch deleted file mode 100644 index 383697a..0000000 --- a/net-mail/zarafa/files/7.1.7.42779/Datux-spamhook.patch +++ /dev/null @@ -1,219 +0,0 @@ -diff -ru zarafa-7.1.4/provider/libserver/ZarafaCmd.cpp zarafa-7.1.4.spamhook/provider/libserver/ZarafaCmd.cpp ---- zarafa-7.1.4/provider/libserver/ZarafaCmd.cpp 2013-02-28 17:13:17.000000000 +0100 -+++ zarafa-7.1.4.spamhook/provider/libserver/ZarafaCmd.cpp 2013-04-15 11:34:45.018632455 +0200 -@@ -84,6 +84,7 @@ - #include "StreamUtil.h" - #include "CommonUtil.h" - #include "StorageUtil.h" -+#include "UnixUtil.h" - - #include "ZarafaICS.h" - -@@ -7655,6 +7656,179 @@ - bool bMoved; - }COPYITEM; - -+//SPAM HOOK -+//This function parses an e-mail to the /etc/zarafa/userscripts/junklearn script. With 2 arguments: -+//ham or spam -+//message id -+//and pipes the mail header to the script. -+//This script wil be inhaled by MoveObjects(); -+///////////////////////////////////////////////////////////////////////////////////////////////// -+int SpamHook(ECDatabase *lpDatabase,int ulId, unsigned int ulDestFolderId) -+{ -+ -+ ALLOC_DBRESULT(); -+ ECRESULT er = erSuccess; -+ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script"); -+ string shMailStatus; -+ entryId* junkFolderEntryId; -+ entryId* wasteBucketEntryId; -+ int shNumRows; -+ -+ //dont do anything if the junklearn script doesnt exist: -+ int fCheck=open(shScriptPath.c_str(), O_RDONLY); -+ if (fCheck==0) { -+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found"); -+ er=erSuccess; -+ goto exit; -+ } -+ close(fCheck); -+ -+ //Get store object ID via message object id -+ unsigned int storeId; -+ er = g_lpSessionManager->GetCacheManager()->GetStore(ulId,&storeId,NULL); -+ if(er != erSuccess) -+ { -+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve source folder."); -+ goto exit; -+ } -+ -+ //get deleted items folder entry id -+ strQuery="SELECT val_binary FROM properties WHERE hierarchyid="+stringify(storeId)+" AND tag="+stringify(PROP_ID(PR_IPM_WASTEBASKET_ENTRYID)); -+ er = lpDatabase->DoSelect(strQuery, &lpDBResult); -+ if(er != erSuccess) { -+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid from DB."); -+ goto exit; -+ } -+ lpDBRow = lpDatabase->FetchRow(lpDBResult); -+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult); -+ shNumRows=lpDatabase->GetNumRows(lpDBResult); -+ if(shNumRows<1) -+ { -+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, empty DB result."); -+ goto exit; -+ } -+ -+ //Convert 'deleted items' entryid to objectid. -+ wasteBucketEntryId = new entryId[0]; -+ wasteBucketEntryId->__ptr=(unsigned char*)lpDBRow[0]; -+ wasteBucketEntryId->__size=lpDBLen[0]; -+ unsigned int wasteBucketFolderId; -+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(wasteBucketEntryId,&wasteBucketFolderId); -+ delete wasteBucketEntryId; -+ if(er!=erSuccess) -+ { -+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, converting to objectID."); -+ goto exit; -+ } -+ -+ //Get 'junk folder' entryId. -+ FREE_DBRESULT(); -+ strQuery="SELECT val_binary FROM receivefolder LEFT JOIN mvproperties ON receivefolder.objid=mvproperties.hierarchyid WHERE receivefolder.storeid="+stringify(storeId)+" AND receivefolder.messageclass='IPC' AND mvproperties.tag="+stringify(PROP_ID(PR_ADDITIONAL_REN_ENTRYIDS))+" AND mvproperties.orderid=4"; -+ er = lpDatabase->DoSelect(strQuery, &lpDBResult); -+ if(er != erSuccess) { -+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryids from DB."); -+ goto exit; -+ } -+ lpDBRow = lpDatabase->FetchRow(lpDBResult); -+ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult); -+ shNumRows=lpDatabase->GetNumRows(lpDBResult); -+ if(shNumRows<1) -+ { -+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, empty DB result."); -+ goto exit; -+ } -+ -+ //Convert 'junk folder' entryid to objectid. -+ junkFolderEntryId = new entryId[0]; -+ junkFolderEntryId->__ptr=(unsigned char*)lpDBRow[0]; -+ junkFolderEntryId->__size=lpDBLen[0]; -+ unsigned int junkFolderId; -+ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(junkFolderEntryId,&junkFolderId); -+ delete junkFolderEntryId; -+ if(er!=erSuccess) -+ { -+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, converting to objectID."); -+ goto exit; -+ } -+ -+ //Get source folder object ID. (Actually we should check if mail came from subfolders in the 'deleted items folder', which I think never happens.) -+ unsigned int srcFolderId; -+ er=g_lpSessionManager->GetCacheManager()->GetParent(ulId,&srcFolderId); -+ if(er!=erSuccess) -+ { -+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve src folder id."); -+ goto exit; -+ } -+ -+ //now we can determine if object being moved from or to the junkfolder -+ //if destination folder is junk, mark as spam -+ if(ulDestFolderId==junkFolderId) -+ shMailStatus="spam"; -+ else -+ { -+ //if destination folder is not TRASH and de source folder is JUNK, mark as ham -+ if(ulDestFolderId!=wasteBucketFolderId && srcFolderId==junkFolderId) -+ shMailStatus="ham"; -+ else -+ //its just a normal movement, so do nothing. -+ goto exit; -+ } -+ -+ //Get the mail from the DB. -+ FREE_DBRESULT(); -+ strQuery="SELECT val_string FROM properties WHERE tag="+stringify(PROP_ID(PR_TRANSPORT_MESSAGE_HEADERS))+" AND hierarchyid= "+stringify(ulId); -+ er = lpDatabase->DoSelect(strQuery, &lpDBResult); -+ if(er != erSuccess) { -+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: db error while retrieve mail header."); -+ goto exit; -+ } -+ -+ lpDBRow = lpDatabase->FetchRow(lpDBResult); -+ shNumRows=lpDatabase->GetNumRows(lpDBResult); -+ -+ if(shNumRows<=0) { -+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail"); -+ goto exit; -+ } -+ -+ { -+ //now its time to open the spamhook script and pass the mail to it: -+ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId); -+ int ulFpWrite = -1; -+ int ulFpRead = -1; -+ int ulCommandRetval; -+ -+ //we asume failure, unless we make it all the way though the script -+ er=ZARAFA_E_UNKNOWN; -+ -+ pid_t ulCommandPid = unix_popen_rw(g_lpSessionManager->GetLogger(), shScriptPath.c_str(), &ulFpWrite, &ulFpRead, NULL, NULL, true, false); -+ if (ulCommandPid <= 0) { -+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error opening subprocess."); -+ goto exit; -+ } -+ -+ //pass the data to the subprocess: -+ write(ulFpWrite, lpDBRow[0], strlen(lpDBRow[0])); -+ ulCommandRetval=unix_pclose(ulFpRead, ulFpWrite, ulCommandPid); -+ -+ //subprocess is done, check results -+ if (ulCommandRetval<0) { -+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(WEXITSTATUS(ulCommandRetval))); -+ goto exit; -+ } -+ } -+ -+ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed."); -+ er=erSuccess; -+ -+ exit: -+ // Free database results -+ FREE_DBRESULT(); -+ -+ return er; -+} -+ -+ - // Move one or more messages and/or moved a softdeleted message to a normal message - ECRESULT MoveObjects(ECSession *lpSession, ECDatabase *lpDatabase, ECListInt* lplObjectIds, unsigned int ulDestFolderId, unsigned int ulSyncId) - { -@@ -8641,6 +8815,16 @@ - - // @note The object type checking wille be done in MoveObjects or CopyObject - -+//SPAMHOOK -+///////////////////////////////////// -+ //Iterate over all mail ids and initiate spamhook. -+ for(iObjectId = lObjectIds.begin(); iObjectId != lObjectIds.end(); iObjectId++) -+ { -+ SpamHook(lpDatabase,*iObjectId,ulDestFolderId); -+ } -+//SPAMHOOK END -+//////////////////////////////////// -+ - //check copy or a move - if(ulFlags & FOLDER_MOVE ) { // A move - er = MoveObjects(lpecSession, lpDatabase, &lObjectIds, ulDestFolderId, ulSyncId); -diff -ru zarafa-7.1.4/provider/server/ECServer.cpp zarafa-7.1.4.spamhook/provider/server/ECServer.cpp ---- zarafa-7.1.4/provider/server/ECServer.cpp 2013-02-28 17:13:17.000000000 +0100 -+++ zarafa-7.1.4.spamhook/provider/server/ECServer.cpp 2013-04-15 11:14:40.000000000 +0200 -@@ -963,6 +963,7 @@ - { "deletegroup_script", "/etc/zarafa/userscripts/deletegroup", CONFIGSETTING_RELOADABLE}, - { "createcompany_script", "/etc/zarafa/userscripts/createcompany", CONFIGSETTING_RELOADABLE }, - { "deletecompany_script", "/etc/zarafa/userscripts/deletecompany", CONFIGSETTING_RELOADABLE }, -+ { "junklearn_script", "/etc/zarafa/userscripts/junklearn", CONFIGSETTING_RELOADABLE }, - { "user_safe_mode", "no", CONFIGSETTING_RELOADABLE }, - - // Storename format diff --git a/net-mail/zarafa/files/7.1.7.42779/zarafa-01-oss-configure.patch b/net-mail/zarafa/files/7.1.7.42779/zarafa-01-oss-configure.patch deleted file mode 100644 index 0fa8227..0000000 --- a/net-mail/zarafa/files/7.1.7.42779/zarafa-01-oss-configure.patch +++ /dev/null @@ -1,61 +0,0 @@ -From: Jan Engelhardt -Upstream: never? - -build: make autoreconf functional - -Make autoreconf functional with the OSS edition. - ---- - ECtools/Makefile.am | 1 - - Makefile.am | 4 ---- - configure.ac | 13 ------------- - 3 files changed, 18 deletions(-) - -Index: zarafa-7.1.1/ECtools/Makefile.am -=================================================================== ---- zarafa-7.1.1.orig/ECtools/Makefile.am -+++ zarafa-7.1.1/ECtools/Makefile.am -@@ -1,5 +1,4 @@ - if ! OSS_ONLY --PROSUBS = zarafa-backup zarafa-report zarafa-msr za-extra zarafa-ocf - endif - - SUBDIRS = $(PROSUBS) zarafa-archiver zarafa-admin zarafa-monitor zarafa-passwd zarafa-fsck zarafa-cfgchecker zarafa-stats zarafa-search zarafa-utils -Index: zarafa-7.1.1/Makefile.am -=================================================================== ---- zarafa-7.1.1.orig/Makefile.am -+++ zarafa-7.1.1/Makefile.am -@@ -1,9 +1,5 @@ - ACLOCAL_AMFLAGS = -I autoconf - --if ! OSS_ONLY --PROSUBS = liblicense licensed --endif -- - SUBDIRS = common libfreebusy mapi4linux zarafa-libsync $(PROSUBS) provider libicalmapi inetmapi php-ext ECtools spooler gateway caldav installer po doc - - if WITH_SWIG -Index: zarafa-7.1.1/configure.ac -=================================================================== ---- zarafa-7.1.1.orig/configure.ac -+++ zarafa-7.1.1/configure.ac -@@ -786,19 +786,6 @@ AC_CONFIG_FILES([Makefile - version - specialbuild - ]) --dnl non-oss files --if test -d `dirname $0`/licensed; then --AC_CONFIG_FILES([ -- liblicense/Makefile -- licensed/Makefile -- ECtools/zarafa-backup/Makefile -- ECtools/zarafa-backup/helpers/Makefile -- ECtools/zarafa-report/Makefile -- ECtools/zarafa-msr/Makefile -- ECtools/zarafa-ocf/Makefile -- ECtools/za-extra/Makefile --]) --fi - - AC_OUTPUT - diff --git a/net-mail/zarafa/files/7.1.7.42779/zarafa-06-sizeof-char.patch b/net-mail/zarafa/files/7.1.7.42779/zarafa-06-sizeof-char.patch deleted file mode 100644 index 57cf8e9..0000000 --- a/net-mail/zarafa/files/7.1.7.42779/zarafa-06-sizeof-char.patch +++ /dev/null @@ -1,391 +0,0 @@ -From: Jan Engelhardt - -src: remove useless sizeof(char) - -sizeof(char) is defined by the standard to be always equal to 1. -It is thus useless in e.g. multiplications. - ---- - common/CommonUtil.cpp | 14 +++++++------- - common/Trace.cpp | 2 +- - common/Util.cpp | 2 +- - common/fileutil.cpp | 12 ++++++------ - gateway/IMAP.cpp | 8 ++++---- - inetmapi/tnef.cpp | 4 ++-- - mapi4linux/src/m4l.mapisvc.cpp | 2 +- - mapi4linux/src/mapidefs.cpp | 2 +- - provider/contacts/ZCMAPIProp.cpp | 2 +- - provider/libserver/ECDatabaseUtils.cpp | 2 +- - swig/python/RecurrenceState_wrap.cxx | 2 +- - swig/python/archiver_wrap.cxx | 2 +- - swig/python/icalmapi_wrap.cxx | 2 +- - swig/python/inetmapi_wrap.cxx | 6 +++--- - swig/python/libcommon_wrap.cxx | 2 +- - swig/python/libfreebusy_wrap.cxx | 2 +- - swig/python/licenseclient_wrap.cxx | 2 +- - swig/python/mapi_wrap.cxx | 2 +- - 18 files changed, 35 insertions(+), 35 deletions(-) - -Index: zarafa-7.1.0/common/CommonUtil.cpp -=================================================================== ---- zarafa-7.1.0.orig/common/CommonUtil.cpp -+++ zarafa-7.1.0/common/CommonUtil.cpp -@@ -1041,11 +1041,11 @@ HRESULT ECCreateOneOff(LPTSTR lpszName, - strOneOff.append((char*)strUnicode.c_str(), (strUnicode.length()+1)*sizeof(unsigned short)); - } else { - if (lpszName) -- strOneOff.append((char *)lpszName, (strlen((char *)lpszName) + 1) * sizeof(char)); -+ strOneOff.append((char *)lpszName, strlen((char *)lpszName) + 1); - else -- strOneOff.append(sizeof(char), '\0'); -- strOneOff.append((char *)lpszAdrType, (strlen((char *)lpszAdrType) + 1) * sizeof(char)); -- strOneOff.append((char *)lpszAddress, (strlen((char *)lpszAddress) + 1) * sizeof(char)); -+ strOneOff.append(1, '\0'); -+ strOneOff.append((char *)lpszAdrType, strlen((char *)lpszAdrType) + 1); -+ strOneOff.append((char *)lpszAddress, strlen((char *)lpszAddress) + 1); - } - - hr = MAPIAllocateBuffer(strOneOff.size(), (void **)lppEntryID); -@@ -1148,7 +1148,7 @@ HRESULT ECParseOneOff(LPENTRYID lpEntryI - hr = TryConvert(lpBuffer, rawsize(lpBuffer), "windows-1252", name); - if (hr != hrSuccess) - goto exit; -- lpBuffer += (str.length() + 1) * sizeof(char); -+ lpBuffer += str.length() + 1; - - str = (char*)lpBuffer; - if (str.length() == 0) { -@@ -1156,7 +1156,7 @@ HRESULT ECParseOneOff(LPENTRYID lpEntryI - goto exit; - } - type = convert_to(str); -- lpBuffer += (str.length() + 1) * sizeof(char); -+ lpBuffer += str.length() + 1; - - str = (char*)lpBuffer; - if (str.length() == 0) { -@@ -1164,7 +1164,7 @@ HRESULT ECParseOneOff(LPENTRYID lpEntryI - goto exit; - } - addr = convert_to(str); -- lpBuffer += (str.length() + 1) * sizeof(char); -+ lpBuffer += str.length() + 1; - } - - strWName = name; -Index: zarafa-7.1.0/common/Trace.cpp -=================================================================== ---- zarafa-7.1.0.orig/common/Trace.cpp -+++ zarafa-7.1.0/common/Trace.cpp -@@ -135,7 +135,7 @@ void TraceMsg(char* lpMsg, int time, cha - if (BUFFER_LIMIT != 0 && pos+3 < BUFFER_LIMIT && len > BUFFER_LIMIT) - len = BUFFER_LIMIT; - -- buffer = (char*)malloc( len * sizeof(char) ); -+ buffer = static_cast(malloc(len)); - - memcpy(buffer, debug, pos); - -Index: zarafa-7.1.0/common/Util.cpp -=================================================================== ---- zarafa-7.1.0.orig/common/Util.cpp -+++ zarafa-7.1.0/common/Util.cpp -@@ -470,7 +470,7 @@ HRESULT Util::HrCopyProperty(LPSPropValu - goto exit; - } - -- hr = lpfAllocMore(strlen(lpSrc->Value.lpszA)*sizeof(char)+sizeof(char), lpBase, (void**)&lpDest->Value.lpszA); -+ hr = lpfAllocMore(strlen(lpSrc->Value.lpszA) + 1, lpBase, (void**)&lpDest->Value.lpszA); - if (hr != hrSuccess) - goto exit; - strcpy(lpDest->Value.lpszA, lpSrc->Value.lpszA); -Index: zarafa-7.1.0/common/fileutil.cpp -=================================================================== ---- zarafa-7.1.0.orig/common/fileutil.cpp -+++ zarafa-7.1.0/common/fileutil.cpp -@@ -104,7 +104,7 @@ HRESULT HrFileLFtoCRLF(FILE *fin, FILE** - } - - while (!feof(fin)) { -- readsize = fread(bufferin, sizeof(char), BLOCKSIZE / 2, fin); -+ readsize = fread(bufferin, 1, BLOCKSIZE / 2, fin); - if (ferror(fin)) { - perror("Read error");//FIXME: What an error?, what now? - hr = MAPI_E_CORRUPT_DATA; -@@ -113,7 +113,7 @@ HRESULT HrFileLFtoCRLF(FILE *fin, FILE** - - BufferLFtoCRLF(readsize, bufferin, bufferout, &sizebufferout); - -- if (fwrite(bufferout, sizeof(char), sizebufferout, fTmp) != sizebufferout) { -+ if (fwrite(bufferout, 1, sizebufferout, fTmp) != sizebufferout) { - perror("Write error");//FIXME: What an error?, what now? - hr = MAPI_E_CORRUPT_DATA; - break; -@@ -180,7 +180,7 @@ HRESULT HrMapFileToBuffer(FILE *f, char - /* mmap failed (probably reading from STDIN as a stream), just read the file into memory, and return that */ - lpBuffer = (char*)malloc(BLOCKSIZE); // will be deleted as soon as possible - while (!feof(f)) { -- ulReadsize = fread(lpBuffer+offset, sizeof(char), BLOCKSIZE, f); -+ ulReadsize = fread(lpBuffer+offset, 1, BLOCKSIZE, f); - if (ferror(f)) { - perror("Read error"); - break; -@@ -309,7 +309,7 @@ bool DuplicateFile(ECLogger *lpLogger, F - } - - while (!feof(lpFile)) { -- ulReadsize = fread(lpBuffer, sizeof(char), BLOCKSIZE, lpFile); -+ ulReadsize = fread(lpBuffer, 1, BLOCKSIZE, lpFile); - if (ferror(lpFile)) { - if (lpLogger) - lpLogger->Log(EC_LOGLEVEL_FATAL, "Read error, error %d", errno); -@@ -321,7 +321,7 @@ bool DuplicateFile(ECLogger *lpLogger, F - } - - -- if (fwrite(lpBuffer, sizeof(char), ulReadsize , pfNew) != ulReadsize) { -+ if (fwrite(lpBuffer, 1, ulReadsize , pfNew) != ulReadsize) { - if (lpLogger) - lpLogger->Log(EC_LOGLEVEL_FATAL, "Write error, error %d", errno); - else -@@ -389,7 +389,7 @@ bool ConvertFileFromUCS2ToUTF8(ECLogger - goto exit; - } - -- if (fwrite(strConverted.c_str(), sizeof(char), strConverted.size(), pfDst) != strConverted.size()) { -+ if (fwrite(strConverted.c_str(), 1, strConverted.size(), pfDst) != strConverted.size()) { - if (lpLogger) - lpLogger->Log(EC_LOGLEVEL_FATAL, "Unable to write to file '%s', error %d", strDstFileName.c_str(), errno); - else -Index: zarafa-7.1.0/gateway/IMAP.cpp -=================================================================== ---- zarafa-7.1.0.orig/gateway/IMAP.cpp -+++ zarafa-7.1.0/gateway/IMAP.cpp -@@ -5973,7 +5973,7 @@ HRESULT IMAP::HrSearch(vector &l - if (iconv) - iconv->convert(lstSearchCriteria[ulStartCriteria+1]); - -- hr = MAPIAllocateMore(sizeof(char) * (lstSearchCriteria[ulStartCriteria + 1].size() + 1), lpRootRestrict, -+ hr = MAPIAllocateMore(lstSearchCriteria[ulStartCriteria + 1].size() + 1, lpRootRestrict, - (LPVOID *) &szBuffer); - if (hr != hrSuccess) - goto exit; -@@ -6063,7 +6063,7 @@ HRESULT IMAP::HrSearch(vector &l - if (iconv) - iconv->convert(lstSearchCriteria[ulStartCriteria+1]); - -- hr = MAPIAllocateMore(sizeof(char) * (lstSearchCriteria[ulStartCriteria + 1].size() + 1), lpRootRestrict, -+ hr = MAPIAllocateMore(lstSearchCriteria[ulStartCriteria + 1].size() + 1, lpRootRestrict, - (LPVOID *) &szBuffer); - if (hr != hrSuccess) - goto exit; -@@ -6509,7 +6509,7 @@ HRESULT IMAP::HrSearch(vector &l - if (iconv) - iconv->convert(lstSearchCriteria[ulStartCriteria+1]); - -- hr = MAPIAllocateMore(sizeof(char) * (lstSearchCriteria[ulStartCriteria + 1].size() + 1), lpRootRestrict, -+ hr = MAPIAllocateMore(lstSearchCriteria[ulStartCriteria + 1].size() + 1, lpRootRestrict, - (LPVOID *) &szBuffer); - if (hr != hrSuccess) - goto exit; -@@ -6542,7 +6542,7 @@ HRESULT IMAP::HrSearch(vector &l - if (iconv) - iconv->convert(lstSearchCriteria[ulStartCriteria+1]); - -- hr = MAPIAllocateMore(sizeof(char) * (lstSearchCriteria[ulStartCriteria + 1].size() + 1), lpRootRestrict, -+ hr = MAPIAllocateMore(lstSearchCriteria[ulStartCriteria + 1].size() + 1, lpRootRestrict, - (LPVOID *) &szBuffer); - if (hr != hrSuccess) - goto exit; -Index: zarafa-7.1.0/inetmapi/tnef.cpp -=================================================================== ---- zarafa-7.1.0.orig/inetmapi/tnef.cpp -+++ zarafa-7.1.0/inetmapi/tnef.cpp -@@ -1896,11 +1896,11 @@ HRESULT ECTNEF::HrReadByte(IStream *lpSt - HRESULT hr = hrSuccess; - ULONG ulRead = 0; - -- hr = lpStream->Read(ulData, sizeof(char), &ulRead); -+ hr = lpStream->Read(ulData, 1, &ulRead); - if(hr != hrSuccess) - goto exit; - -- if(ulRead != sizeof(char)) { -+ if(ulRead != 1) { - hr = MAPI_E_NOT_FOUND; - goto exit; - } -Index: zarafa-7.1.0/mapi4linux/src/m4l.mapisvc.cpp -=================================================================== ---- zarafa-7.1.0.orig/mapi4linux/src/m4l.mapisvc.cpp -+++ zarafa-7.1.0/mapi4linux/src/m4l.mapisvc.cpp -@@ -280,7 +280,7 @@ HRESULT INFLoader::MakeProperty(const st - sProp.ulPropTag = CHANGE_PROP_TYPE(sProp.ulPropTag, PT_STRING8); - case PT_STRING8: - { -- hr = MAPIAllocateMore((strData.length() +1) * sizeof(char), base, (void**)&sProp.Value.lpszA); -+ hr = MAPIAllocateMore(strData.length() + 1, base, (void**)&sProp.Value.lpszA); - if (hr != hrSuccess) - goto exit; - strcpy(sProp.Value.lpszA, strData.c_str()); -Index: zarafa-7.1.0/mapi4linux/src/mapidefs.cpp -=================================================================== ---- zarafa-7.1.0.orig/mapi4linux/src/mapidefs.cpp -+++ zarafa-7.1.0/mapi4linux/src/mapidefs.cpp -@@ -200,7 +200,7 @@ HRESULT M4LMAPIProp::GetProps(LPSPropTag - goto exit; - for (ULONG c = 0; c < (*i)->Value.MVszW.cValues; c++) { - ansi = converter.convert_to((*i)->Value.MVszW.lppszW[c]); -- hr = MAPIAllocateMore(ansi.length() * sizeof(char) + sizeof(char), props, (void**)&sConvert.Value.MVszA.lppszA[c]); -+ hr = MAPIAllocateMore(ansi.length() + 1, props, (void**)&sConvert.Value.MVszA.lppszA[c]); - if (hr != hrSuccess) - goto exit; - strcpy(sConvert.Value.MVszA.lppszA[c], ansi.c_str()); -Index: zarafa-7.1.0/provider/contacts/ZCMAPIProp.cpp -=================================================================== ---- zarafa-7.1.0.orig/provider/contacts/ZCMAPIProp.cpp -+++ zarafa-7.1.0/provider/contacts/ZCMAPIProp.cpp -@@ -379,7 +379,7 @@ HRESULT ZCMAPIProp::CopyOneProp(convert_ - // copy from unicode to string8 - lpProp->ulPropTag = CHANGE_PROP_TYPE(i->second.ulPropTag, PT_STRING8); - strAnsi = converter.convert_to(i->second.Value.lpszW); -- hr = MAPIAllocateMore(strAnsi.size() + sizeof(char), lpBase, (void**)&lpProp->Value.lpszA); -+ hr = MAPIAllocateMore(strAnsi.size() + 1, lpBase, (void**)&lpProp->Value.lpszA); - if (hr != hrSuccess) - goto exit; - strcpy(lpProp->Value.lpszA, strAnsi.c_str()); -Index: zarafa-7.1.0/provider/libserver/ECDatabaseUtils.cpp -=================================================================== ---- zarafa-7.1.0.orig/provider/libserver/ECDatabaseUtils.cpp -+++ zarafa-7.1.0/provider/libserver/ECDatabaseUtils.cpp -@@ -788,7 +788,7 @@ ECRESULT CopyDatabasePropValToSOAPPropVa - { - ParseMVProp(lpRow[FIELD_NR_STRING], lpLen[FIELD_NR_STRING], &ulLastPos, &strData); - lpPropVal->Value.mvszA.__ptr[i] = s_alloc(soap, strData.size() + 1); -- memcpy(lpPropVal->Value.mvszA.__ptr[i], strData.c_str(), sizeof(char) * (strData.size() + 1)); -+ memcpy(lpPropVal->Value.mvszA.__ptr[i], strData.c_str(), strData.size() + 1); - } - ulPropTag = CHANGE_PROP_TYPE(ulPropTag, PT_MV_UNICODE); // return unicode strings to client, because database contains UTF-8 - break; -Index: zarafa-7.1.0/swig/python/RecurrenceState_wrap.cxx -=================================================================== ---- zarafa-7.1.0.orig/swig/python/RecurrenceState_wrap.cxx -+++ zarafa-7.1.0/swig/python/RecurrenceState_wrap.cxx -@@ -3278,7 +3278,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, cha - if (*alloc == SWIG_NEWOBJ) - #endif - { -- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); -+ *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, len + 1)); - *alloc = SWIG_NEWOBJ; - } - else { -Index: zarafa-7.1.0/swig/python/archiver_wrap.cxx -=================================================================== ---- zarafa-7.1.0.orig/swig/python/archiver_wrap.cxx -+++ zarafa-7.1.0/swig/python/archiver_wrap.cxx -@@ -3075,7 +3075,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, cha - if (*alloc == SWIG_NEWOBJ) - #endif - { -- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); -+ *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, len + 1)); - *alloc = SWIG_NEWOBJ; - } - else { -Index: zarafa-7.1.0/swig/python/icalmapi_wrap.cxx -=================================================================== ---- zarafa-7.1.0.orig/swig/python/icalmapi_wrap.cxx -+++ zarafa-7.1.0/swig/python/icalmapi_wrap.cxx -@@ -2879,7 +2879,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, cha - if (*alloc == SWIG_NEWOBJ) - #endif - { -- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); -+ *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, len + 1)); - *alloc = SWIG_NEWOBJ; - } - else { -Index: zarafa-7.1.0/swig/python/inetmapi_wrap.cxx -=================================================================== ---- zarafa-7.1.0.orig/swig/python/inetmapi_wrap.cxx -+++ zarafa-7.1.0/swig/python/inetmapi_wrap.cxx -@@ -2865,7 +2865,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, cha - if (*alloc == SWIG_NEWOBJ) - #endif - { -- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); -+ *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, len + 1)); - *alloc = SWIG_NEWOBJ; - } - else { -@@ -3140,7 +3140,7 @@ SWIGINTERN PyObject *_wrap_sending_optio - if (arg1->alternate_boundary) delete[] arg1->alternate_boundary; - if (arg2) { - size_t size = strlen(reinterpret_cast< const char * >(arg2)) + 1; -- arg1->alternate_boundary = (char *)reinterpret_cast< char* >(memcpy((new char[size]), reinterpret_cast< const char * >(arg2), sizeof(char)*(size))); -+ arg1->alternate_boundary = (char *)reinterpret_cast< char* >(memcpy((new char[size]), reinterpret_cast< const char * >(arg2), size)); - } else { - arg1->alternate_boundary = 0; - } -@@ -3569,7 +3569,7 @@ SWIGINTERN PyObject *_wrap_sending_optio - if (arg1->charset_upgrade) delete[] arg1->charset_upgrade; - if (arg2) { - size_t size = strlen(reinterpret_cast< const char * >(arg2)) + 1; -- arg1->charset_upgrade = (char *)reinterpret_cast< char* >(memcpy((new char[size]), reinterpret_cast< const char * >(arg2), sizeof(char)*(size))); -+ arg1->charset_upgrade = (char *)reinterpret_cast< char* >(memcpy((new char[size]), reinterpret_cast< const char * >(arg2), size)); - } else { - arg1->charset_upgrade = 0; - } -Index: zarafa-7.1.0/swig/python/libcommon_wrap.cxx -=================================================================== ---- zarafa-7.1.0.orig/swig/python/libcommon_wrap.cxx -+++ zarafa-7.1.0/swig/python/libcommon_wrap.cxx -@@ -3002,7 +3002,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, cha - if (*alloc == SWIG_NEWOBJ) - #endif - { -- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); -+ *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, len + 1)); - *alloc = SWIG_NEWOBJ; - } - else { -Index: zarafa-7.1.0/swig/python/libfreebusy_wrap.cxx -=================================================================== ---- zarafa-7.1.0.orig/swig/python/libfreebusy_wrap.cxx -+++ zarafa-7.1.0/swig/python/libfreebusy_wrap.cxx -@@ -2894,7 +2894,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, cha - if (*alloc == SWIG_NEWOBJ) - #endif - { -- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); -+ *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, len + 1)); - *alloc = SWIG_NEWOBJ; - } - else { -Index: zarafa-7.1.0/swig/python/licenseclient_wrap.cxx -=================================================================== ---- zarafa-7.1.0.orig/swig/python/licenseclient_wrap.cxx -+++ zarafa-7.1.0/swig/python/licenseclient_wrap.cxx -@@ -2870,7 +2870,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, cha - if (*alloc == SWIG_NEWOBJ) - #endif - { -- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); -+ *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, len + 1)); - *alloc = SWIG_NEWOBJ; - } - else { -Index: zarafa-7.1.0/swig/python/mapi_wrap.cxx -=================================================================== ---- zarafa-7.1.0.orig/swig/python/mapi_wrap.cxx -+++ zarafa-7.1.0/swig/python/mapi_wrap.cxx -@@ -3520,7 +3520,7 @@ SWIG_AsCharPtrAndSize(PyObject *obj, cha - if (*alloc == SWIG_NEWOBJ) - #endif - { -- *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, sizeof(char)*(len + 1))); -+ *cptr = reinterpret_cast< char* >(memcpy((new char[len + 1]), cstr, len + 1)); - *alloc = SWIG_NEWOBJ; - } - else { diff --git a/net-mail/zarafa/files/7.1.7.42779/zarafa-23-newclucene.patch b/net-mail/zarafa/files/7.1.7.42779/zarafa-23-newclucene.patch deleted file mode 100644 index 1935f52..0000000 --- a/net-mail/zarafa/files/7.1.7.42779/zarafa-23-newclucene.patch +++ /dev/null @@ -1,175 +0,0 @@ -From: Jan Engelhardt -Date: 2012-06-22 01:14:57.789674760 +0200 - -Make ZCP compilation succeed if distribution uses clucene-core 2.x. - ---- - ECtools/zarafa-search/ECAnalyzers.cpp | 14 +++++----- - ECtools/zarafa-search/ECAnalyzers.h | 5 +-- - ECtools/zarafa-search/ECIndexDB.cpp | 4 +-- - configure.ac | 45 +--------------------------------- - 4 files changed, 13 insertions(+), 55 deletions(-) - -Index: zarafa-7.1.4/ECtools/zarafa-search/ECAnalyzers.cpp -=================================================================== ---- zarafa-7.1.4.orig/ECtools/zarafa-search/ECAnalyzers.cpp -+++ zarafa-7.1.4/ECtools/zarafa-search/ECAnalyzers.cpp -@@ -78,24 +78,24 @@ EmailFilter::~EmailFilter() { - * @param token Output token - * @return false if no more token was available - */ --bool EmailFilter::next(lucene::analysis::Token *token) { -+lucene::analysis::Token *EmailFilter::next(lucene::analysis::Token *token) { - // See if we had any stored tokens - if(part < parts.size()) { - token->set(parts[part].c_str(), 0, 0, _T("")); - token->setPositionIncrement(0); - part++; -- return true; -+ return token; - } else { - // No more stored token, get a new one - if(!input->next(token)) -- return false; -+ return NULL; - - // Split EMAIL tokens into the various parts - if(wcscmp(token->type(), L"") == 0) { - // Split into user, domain, com -- parts = tokenize((std::wstring)token->_termText, (std::wstring)L".@"); -+ parts = tokenize((std::wstring)token->termBuffer(), (std::wstring)L".@"); - // Split into user, domain.com -- std::vector moreparts = tokenize((std::wstring)token->_termText, (std::wstring)L"@"); -+ std::vector moreparts = tokenize((std::wstring)token->termBuffer(), (std::wstring)L"@"); - parts.insert(parts.end(), moreparts.begin(), moreparts.end()); - - // Only add parts once (unique parts) -@@ -105,7 +105,7 @@ bool EmailFilter::next(lucene::analysis: - part = 0; - } - -- return true; -+ return token; - } - } - -@@ -124,7 +124,7 @@ ECAnalyzer::~ECAnalyzer() - * @param reader Reader to read the bytestream to tokenize - * @return A TokenStream outputting the tokens to be indexed - */ --lucene::analysis::TokenStream* ECAnalyzer::tokenStream(const TCHAR* fieldName, lucene::util::Reader* reader) -+lucene::analysis::TokenStream *ECAnalyzer::tokenStream(const TCHAR *fieldName, CL_NS(util)::BufferedReader *reader) - { - lucene::analysis::TokenStream* ret = _CLNEW lucene::analysis::standard::StandardTokenizer(reader); - ret = _CLNEW lucene::analysis::standard::StandardFilter(ret,true); -Index: zarafa-7.1.4/ECtools/zarafa-search/ECAnalyzers.h -=================================================================== ---- zarafa-7.1.4.orig/ECtools/zarafa-search/ECAnalyzers.h -+++ zarafa-7.1.4/ECtools/zarafa-search/ECAnalyzers.h -@@ -50,7 +50,6 @@ - #ifndef ANALYZERS_H - - #include "CLucene/StdHeader.h" --#include "CLucene/util/Reader.h" - #include "CLucene/analysis/standard/StandardAnalyzer.h" - #include "CLucene/analysis/AnalysisHeader.h" - -@@ -68,7 +67,7 @@ class EmailFilter: public lucene::analys - public: - EmailFilter(lucene::analysis::TokenStream* in, bool deleteTokenStream); - virtual ~EmailFilter(); -- bool next(lucene::analysis::Token* token); -+ lucene::analysis::Token *next(lucene::analysis::Token *token); - private: - lucene::analysis::Token curtoken; - -@@ -86,7 +85,7 @@ public: - ECAnalyzer(); - virtual ~ECAnalyzer(); - -- virtual lucene::analysis::TokenStream* tokenStream(const TCHAR* fieldName, CL_NS(util)::Reader* reader); -+ virtual lucene::analysis::TokenStream *tokenStream(const TCHAR *fieldName, CL_NS(util)::BufferedReader *reader); - }; - - #endif -Index: zarafa-7.1.4/ECtools/zarafa-search/ECIndexDB.cpp -=================================================================== ---- zarafa-7.1.4.orig/ECtools/zarafa-search/ECIndexDB.cpp -+++ zarafa-7.1.4/ECtools/zarafa-search/ECIndexDB.cpp -@@ -68,7 +68,7 @@ - #include - #include - --#include -+#include - - using namespace kyotocabinet; - -@@ -305,7 +305,7 @@ HRESULT ECIndexDB::AddTerm(folderid_t fo - unsigned int len; - unsigned int keylen; - -- lucene::util::StringReader reader(wstrTerm.c_str()); -+ CL_NS(util)::StringReader reader(wstrTerm.c_str()); - - stream = m_lpAnalyzer->tokenStream(L"", &reader); - -Index: zarafa-7.1.4/configure.ac -=================================================================== ---- zarafa-7.1.4.orig/configure.ac -+++ zarafa-7.1.4/configure.ac -@@ -432,52 +432,11 @@ AC_SUBST(ICAL_LIBS) - CXXFLAGS=$CXXFLAGS_system - - # Check for CLucene availability --AC_ARG_WITH(clucene-lib-prefix, -- AC_HELP_STRING([--with-clucene-lib-prefix=PATH],[path to the clucene config file, e.g. /usr/lib/]), -- [CLUCENE_LIB_PREFIX=${withval}],[CLUCENE_LIB_PREFIX=/usr/lib]) --AC_ARG_WITH(clucene-include-prefix, -- AC_HELP_STRING([--with-clucene-include-prefix=PATH],[path to the clucene include files, e.g. /usr/include/]), -- [CLUCENE_INCLUDE_PREFIX=${withval}],[CLUCENE_INCLUDE_PREFIX=/usr/include]) --have_clucene=no --# preprocessor doesn't check in /usr/lib{,64}/ for include files --if test "x$CLUCENE_LIB_PREFIX" != "x"; then -- CXXFLAGS="$CXXFLAGS -I$CLUCENE_LIB_PREFIX" -- CPPFLAGS="$CPPFLAGS -I$CLUCENE_LIB_PREFIX" --fi --if test "x$CLUCENE_INCLUDE_PREFIX" != "x"; then -- CXXFLAGS="$CXXFLAGS -I$CLUCENE_INCLUDE_PREFIX" -- CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX" --fi --# force add pthread in lucene test --CXXFLAGS="$CXXFLAGS -pthread" --if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then --# lucene::index::IndexReader::open(const char *) in c++ style --AC_CHECK_LIB(clucene, [_ZN6lucene5index11IndexReader4openEPKc], -- [ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a" -- have_clucene=static -- ]) --else --AC_CHECK_LIB(clucene, [_ZN6lucene5index11IndexReader4openEPKc], -- [ CLUCENE_LIBS="-lclucene" -- have_clucene=dynamic -- ]) --fi --AC_MSG_CHECKING([library type for clucene]) --AC_MSG_RESULT([$have_clucene]) --AC_CHECK_HEADERS([CLucene.h], -- [ CLUCENE_CFLAGS="-DLUCENE_DISABLE_MEMTRACKING" ], -- [ have_clucene=no ]) --if test "x$CLUCENE_LIB_PREFIX" != "x"; then -- CLUCENE_CFLAGS="$CLUCENE_CFLAGS -I$CLUCENE_LIB_PREFIX" --fi --if test "x$CLUCENE_INCLUDE_PREFIX" != "x"; then -- CLUCENE_CFLAGS="$CLUCENE_CFLAGS -I$CLUCENE_INCLUDE_PREFIX" --fi -+PKG_CHECK_MODULES([CLUCENE], [libclucene-core >= 2.3.3], -+ [have_clucene=dynamic], [have_clucene=no]) - AM_CONDITIONAL([WITH_CLUCENE], [test "$have_clucene" != "no"]) - AC_SUBST(CLUCENE_CFLAGS) - AC_SUBST(CLUCENE_LIBS) --CXXFLAGS=$CXXFLAGS_system --CPPFLAGS=$CPPFLAGS_system - - # Check for google perftools tcmalloc availability - if test "$want_tcmalloc_full" = "yes"; then diff --git a/net-mail/zarafa/files/7.1.7.42779/zarafa-24-undefined-behavior.patch b/net-mail/zarafa/files/7.1.7.42779/zarafa-24-undefined-behavior.patch deleted file mode 100644 index f591740..0000000 --- a/net-mail/zarafa/files/7.1.7.42779/zarafa-24-undefined-behavior.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Jan Engelhardt -Date: 2013-01-25 03:39:37.985164412 +0100 - -build: flag path that probably should not be taken - -[ 1420s] I: Program returns random data in a function -[ 1420s] E: zarafa no-return-in-nonvoid-function archiver.cpp:373 - ---- - ECtools/zarafa-archiver/archiver.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -Index: zarafa-7.1.3/ECtools/zarafa-archiver/archiver.cpp -=================================================================== ---- zarafa-7.1.3.orig/ECtools/zarafa-archiver/archiver.cpp -+++ zarafa-7.1.3/ECtools/zarafa-archiver/archiver.cpp -@@ -60,6 +60,7 @@ - #include "ECConfig.h" - #include "ECLogger.h" - -+#include - #include - using namespace std; - -@@ -370,6 +371,8 @@ ECLogger* ArchiverImpl::GetLogger(eLogTy - case DefaultLog: return m_lpLogger; - case LogOnly: return m_lpLogLogger; - } -+ abort(); -+ return NULL; - } - - configsetting_t* ArchiverImpl::ConcatSettings(const configsetting_t *lpSettings1, const configsetting_t *lpSettings2) diff --git a/net-mail/zarafa/files/7.1.7.42779/zarafa-7.0.3-sysconfig2confd-1.patch b/net-mail/zarafa/files/7.1.7.42779/zarafa-7.0.3-sysconfig2confd-1.patch deleted file mode 100644 index 2496e65..0000000 --- a/net-mail/zarafa/files/7.1.7.42779/zarafa-7.0.3-sysconfig2confd-1.patch +++ /dev/null @@ -1,103 +0,0 @@ -Submitted By: Mario Fetka (mario.fetka@gmail.com) -Date: 2010-10-13 -Initial Package Version: 6.40.2 (7.0.3) -Origin: me -Upstream Status: gentoo specific -Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d - -diff -uNr zarafa-7.0.3.orig/installer/linux/Makefile.am zarafa-7.0.3/installer/linux/Makefile.am ---- zarafa-7.0.3.orig/installer/linux/Makefile.am 2011-11-20 18:45:15.661461795 +0100 -+++ zarafa-7.0.3/installer/linux/Makefile.am 2011-11-20 18:48:10.780508507 +0100 -@@ -26,7 +26,7 @@ - sysconf_initdir=${sysconfdir}/init.d - sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files} - --rhel_sysconfig_path = ${sysconfdir}/sysconfig -+rhel_sysconfig_path = ${sysconfdir}/conf.d - suse_sysconfig_path = ${localstatedir}/adm/fillup-templates - sles_sysconfig_path = ${localstatedir}/adm/fillup-templates - sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path} -diff -uNr zarafa-7.0.3.orig/installer/userscripts/createcompany.in zarafa-7.0.3/installer/userscripts/createcompany.in ---- zarafa-7.0.3.orig/installer/userscripts/createcompany.in 2011-11-20 18:45:15.640628342 +0100 -+++ zarafa-7.0.3/installer/userscripts/createcompany.in 2011-11-20 18:47:09.706088759 +0100 -@@ -9,8 +9,8 @@ - # beware that this string can contain any characters, so take heed to - # correct quoting. - --if [ -f @sysconfdir@/sysconfig/zarafa ]; then -- . @sysconfdir@/sysconfig/zarafa -+if [ -f @sysconfdir@/conf.d/zarafa-server ]; then -+ . @sysconfdir@/conf.d/zarafa-server - elif [ -f @sysconfdir@/default/zarafa ]; then - . @sysconfdir@/default/zarafa - fi -diff -uNr zarafa-7.0.3.orig/installer/userscripts/creategroup.in zarafa-7.0.3/installer/userscripts/creategroup.in ---- zarafa-7.0.3.orig/installer/userscripts/creategroup.in 2011-11-20 18:45:15.640628342 +0100 -+++ zarafa-7.0.3/installer/userscripts/creategroup.in 2011-11-20 18:46:48.060132907 +0100 -@@ -9,8 +9,8 @@ - # beware that this string can contain any characters, so take heed to - # correct quoting. - --if [ -f @sysconfdir@/sysconfig/zarafa ]; then -- . @sysconfdir@/sysconfig/zarafa -+if [ -f @sysconfdir@/conf.d/zarafa-server ]; then -+ . @sysconfdir@/conf.d/zarafa-server - elif [ -f @sysconfdir@/default/zarafa ]; then - . @sysconfdir@/default/zarafa - fi -diff -uNr zarafa-7.0.3.orig/installer/userscripts/createuser.in zarafa-7.0.3/installer/userscripts/createuser.in ---- zarafa-7.0.3.orig/installer/userscripts/createuser.in 2011-11-20 18:45:15.640628342 +0100 -+++ zarafa-7.0.3/installer/userscripts/createuser.in 2011-11-20 18:47:04.215316936 +0100 -@@ -9,8 +9,8 @@ - # beware that this string can contain any characters, so take heed to - # correct quoting. - --if [ -f @sysconfdir@/sysconfig/zarafa ]; then -- . @sysconfdir@/sysconfig/zarafa -+if [ -f @sysconfdir@/conf.d/zarafa-server ]; then -+ . @sysconfdir@/conf.d/zarafa-server - elif [ -f @sysconfdir@/default/zarafa ]; then - . @sysconfdir@/default/zarafa - fi -diff -uNr zarafa-7.0.3.orig/installer/userscripts/deletecompany.in zarafa-7.0.3/installer/userscripts/deletecompany.in ---- zarafa-7.0.3.orig/installer/userscripts/deletecompany.in 2011-11-20 18:45:15.638313511 +0100 -+++ zarafa-7.0.3/installer/userscripts/deletecompany.in 2011-11-20 18:46:16.113192833 +0100 -@@ -9,8 +9,8 @@ - # beware that this string can contain any characters, so take heed to - # correct quoting. - --if [ -f @sysconfdir@/sysconfig/zarafa ]; then -- . @sysconfdir@/sysconfig/zarafa -+if [ -f @sysconfdir@/conf.d/zarafa-server ]; then -+ . @sysconfdir@/conf.d/zarafa-server - fi - - ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d -diff -uNr zarafa-7.0.3.orig/installer/userscripts/deletegroup.in zarafa-7.0.3/installer/userscripts/deletegroup.in ---- zarafa-7.0.3.orig/installer/userscripts/deletegroup.in 2011-11-20 18:45:15.638313511 +0100 -+++ zarafa-7.0.3/installer/userscripts/deletegroup.in 2011-11-20 18:46:26.173434957 +0100 -@@ -9,8 +9,8 @@ - # beware that this string can contain any characters, so take heed to - # correct quoting. - --if [ -f @sysconfdir@/sysconfig/zarafa ]; then -- . @sysconfdir@/sysconfig/zarafa -+if [ -f @sysconfdir@/conf.d/zarafa-server ]; then -+ . @sysconfdir@/conf.d/zarafa-server - fi - - ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d -diff -uNr zarafa-7.0.3.orig/installer/userscripts/deleteuser.in zarafa-7.0.3/installer/userscripts/deleteuser.in ---- zarafa-7.0.3.orig/installer/userscripts/deleteuser.in 2011-11-20 18:45:15.659146961 +0100 -+++ zarafa-7.0.3/installer/userscripts/deleteuser.in 2011-11-20 18:47:14.958433297 +0100 -@@ -9,8 +9,8 @@ - # that this string can contain any characters, so take heed to correct - # quoting. - --if [ -f @sysconfdir@/sysconfig/zarafa ]; then -- . @sysconfdir@/sysconfig/zarafa -+if [ -f @sysconfdir@/conf.d/zarafa-server ]; then -+ . @sysconfdir@/conf.d/zarafa-server - fi - - ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d diff --git a/net-mail/zarafa/files/7.1.7.42779/zarafa-7.0.8-va_list.patch b/net-mail/zarafa/files/7.1.7.42779/zarafa-7.0.8-va_list.patch deleted file mode 100644 index 1e7430f..0000000 --- a/net-mail/zarafa/files/7.1.7.42779/zarafa-7.0.8-va_list.patch +++ /dev/null @@ -1,44 +0,0 @@ -Patch by Robert Scheck for zarafa >= 7.0.8, which works -around the insane written C/C++ code. I am not a C/C++ developer, but you only can -use four macros for handling va_list at all: va_start, va_arg, va_copy and va_end. - -As a developer you should not assume that va_list is always internally typed as an -integer because it is case on i?86 and x86_64 for example. Architectures like ARM -handle va_list not as an integer and thus fail during compiling like this: - -Trace.cpp:129:16: error: invalid operands of types 'va_list {aka __va_list}' and - 'int' to binary 'operator!=' -Trace.cpp:142:16: error: invalid operands of types 'va_list {aka __va_list}' and - 'int' to binary 'operator!=' - -As it is unfortunately not safe to assume that format does not contain attributes -while va is empty this workaround is only applied on the affected ARM architecture -for now. The only real solution is a clean rewrite of the code that should happen -upstream. - ---- zarafa-7.0.8/common/Trace.cpp 2012-06-18 18:55:29.000000000 +0200 -+++ zarafa-7.0.8/common/Trace.cpp.va_list 2012-06-20 01:20:06.000000000 +0200 -@@ -126,7 +126,11 @@ - - len = pos + 3; - -+#if defined __ARM_EABI__ -+ if (format) { -+#else - if (format && va) { -+#endif - va_copy(va_lentest, va); - len += _vsnprintf(NULL, 0, format, va_lentest); - va_end(va_lentest); -@@ -139,7 +143,11 @@ - - memcpy(buffer, debug, pos); - -+#if defined __ARM_EABI__ -+ if (format) -+#else - if (format && va) -+#endif - pos = _vsnprintf(buffer+pos, len-pos, format, va); - - if(pos == -1) { diff --git a/net-mail/zarafa/files/7.1.7.42779/zarafa-7.1.4-tcmalloc.patch b/net-mail/zarafa/files/7.1.7.42779/zarafa-7.1.4-tcmalloc.patch deleted file mode 100644 index 0aa02be..0000000 --- a/net-mail/zarafa/files/7.1.7.42779/zarafa-7.1.4-tcmalloc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- zarafa-7.1.4/configure.ac.orig 2013-04-15 21:53:32.183138074 +0200 -+++ zarafa-7.1.4/configure.ac 2013-04-15 21:55:33.742618371 +0200 -@@ -493,7 +493,7 @@ - AC_HELP_STRING([--with-tcmalloc-prefix=PATH],[path to tcmalloc lib, e.g. /usr/lib/]), - [TCMALLOC_PREFIX=${withval}],[TCMALLOC_PREFIX=/usr/lib]) - AC_CHECK_LIB(tcmalloc_minimal, [open], -- [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.a" AC_DEFINE(HAVE_TCMALLOC, [1], [Google TCMalloc available]) ], -+ [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" AC_DEFINE(HAVE_TCMALLOC, [1], [Google TCMalloc available]) ], - [ WITH_TCMALLOC=no ]) - AC_SUBST(TCMALLOC_LIBS) - else diff --git a/net-mail/zarafa/files/7.1.7.42779/zarafa-7.1.5-gentoo-swig1.3.patch b/net-mail/zarafa/files/7.1.7.42779/zarafa-7.1.5-gentoo-swig1.3.patch deleted file mode 100644 index 62f8b94..0000000 --- a/net-mail/zarafa/files/7.1.7.42779/zarafa-7.1.5-gentoo-swig1.3.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -uNr zarafa-7.1.5.orig/autoconf/swig.m4 zarafa-7.1.5/autoconf/swig.m4 ---- zarafa-7.1.5.orig/autoconf/swig.m4 2013-08-15 17:10:38.483748612 +0200 -+++ zarafa-7.1.5/autoconf/swig.m4 2013-08-15 17:11:28.996117121 +0200 -@@ -12,9 +12,9 @@ - need_swig=no - fi - --AC_PATH_PROG(SWIG_EXEC, [swig]) -+AC_PATH_PROG(SWIG_EXEC, [swig1.3]) - if test "$need_swig" = "yes" -a "x$SWIG_EXEC" = "x"; then -- AC_MSG_ERROR([Current options require swig, but swig binary is not found]) -+ AC_MSG_ERROR([Current options require swig 1.3, but swig 1.3 binary is not found]) - fi - AM_CONDITIONAL([WITH_SWIG], [test "$want_swig" = "yes"]) - ]) diff --git a/net-mail/zarafa/files/zarafa.logrotate b/net-mail/zarafa/files/zarafa.logrotate deleted file mode 100644 index 74be9fd..0000000 --- a/net-mail/zarafa/files/zarafa.logrotate +++ /dev/null @@ -1,114 +0,0 @@ -# -# This is an example for the common logrotate system. -# Copy this file to /etc/logrotate.d/zarafa to activate it. -# Also, check the location of the logfiles, and replace if needed. -# - -/var/log/zarafa/server.log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - postrotate - killall -HUP zarafa-server - endscript -} - -/var/log/zarafa/spooler.log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - postrotate - killall -HUP zarafa-spooler - endscript -} - -/var/log/zarafa/monitor.log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - postrotate - killall -HUP zarafa-monitor - endscript -} - -/var/log/zarafa/gateway.log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - postrotate - killall -HUP zarafa-gateway - endscript -} - -/var/log/zarafa/ical.log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - postrotate - killall -HUP zarafa-ical - endscript -} - -/var/log/zarafa/dagent.log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - postrotate - killall -HUP zarafa-dagent - endscript -} - -/var/log/zarafa/indexer.log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - postrotate - killall -HUP zarafa-indexer - endscript -} - -/var/log/zarafa/licensed.log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - postrotate - killall -HUP zarafa-licensed - endscript -} - -/var/log/zarafa/search.log { - weekly - missingok - rotate 52 - compress - delaycompress - notifempty - postrotate - killall -HUP zarafa-search - endscript -} - diff --git a/net-mail/zarafa/zarafa-7.1.7.42779.ebuild b/net-mail/zarafa/zarafa-7.1.10.44973.ebuild similarity index 85% rename from net-mail/zarafa/zarafa-7.1.7.42779.ebuild rename to net-mail/zarafa/zarafa-7.1.10.44973.ebuild index 121e969..5569a7c 100644 --- a/net-mail/zarafa/zarafa-7.1.7.42779.ebuild +++ b/net-mail/zarafa/zarafa-7.1.10.44973.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" +EAPI="4" PHP_EXT_NAME="mapi" PHP_EXT_INI="yes" @@ -30,13 +30,13 @@ SRC_URI="http://download.zarafa.com/community/${ZARAFA_RELEASE}/${MY_PVM}/${MY_P amd64? ( licensed? ( http://download.zarafa.com/community/${ZARAFA_RELEASE}/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-ubuntu-12.04-x86_64-free.tar.gz https://launchpad.net/ubuntu/+archive/primary/+files/libboost-system1.46.1_1.46.1-7ubuntu3_amd64.deb https://launchpad.net/ubuntu/+archive/primary/+files/libboost-filesystem1.46.1_1.46.1-7ubuntu3_amd64.deb - https://launchpad.net/ubuntu/+archive/primary/+files/libssl1.0.0_1.0.1-4ubuntu5.10_amd64.deb - https://launchpad.net/ubuntu/+archive/primary/+files/libicu48_4.8.1.1-3_amd64.deb ) ) + https://launchpad.net/ubuntu/+archive/primary/+files/libssl1.0.0_1.0.1-4ubuntu5.16_amd64.deb + https://launchpad.net/ubuntu/+archive/primary/+files/libicu48_4.8.1.1-3ubuntu0.1_amd64.deb ) ) x86? ( licensed? ( http://download.zarafa.com/community/${ZARAFA_RELEASE}/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-ubuntu-12.04-i386-free.tar.gz https://launchpad.net/ubuntu/+archive/primary/+files/libboost-system1.46.1_1.46.1-7ubuntu3_i386.deb https://launchpad.net/ubuntu/+archive/primary/+files/libboost-filesystem1.46.1_1.46.1-7ubuntu3_i386.deb - https://launchpad.net/ubuntu/+archive/primary/+files/libssl1.0.0_1.0.1-4ubuntu5.10_i386.deb - https://launchpad.net/ubuntu/+archive/primary/+files/libicu48_4.8.1.1-3_i386.deb ) )" + https://launchpad.net/ubuntu/+archive/primary/+files/libssl1.0.0_1.0.1-4ubuntu5.16_i386.deb + https://launchpad.net/ubuntu/+archive/primary/+files/libicu48_4.8.1.1-3ubuntu0.1_i386.deb ) )" S="${WORKDIR}"/zarafa-${MY_PVR} ZARAFA_SERVICES="dagent gateway ical monitor search server spooler" @@ -45,7 +45,7 @@ LICENSE="AGPL-3" SLOT="0" KEYWORDS="~x86 ~amd64 ~arm" RESTRICT="mirror" -IUSE="debug kerberos icu ldap logrotate perl +python static +swig tcmalloc licensed sparsehash profiling pic" +IUSE="debug +kerberos +icu +ldap +logrotate +perl +python static +swig +tcmalloc +licensed sparsehash profiling +pic" RDEPEND=">=dev-libs/libical-0.44 >=dev-cpp/libvmime-0.9.2_pre512 @@ -82,10 +82,6 @@ src_prepare() { EPATCH_FORCE="yes" epatch edos2unix php-webclient-ajax/config.php.dist AT_M4DIR="autoconf" eautoreconf - if use licensed; then - # not a hack just correct a script - sed -i "s!/etc/default/zarafa-ssm!/etc/conf.d/zarafa-ssm!g" "${WORKDIR}"/licensed/usr/bin/zarafa-ssm || die "sed failed" - fi append-flags "-fPIC" } @@ -118,7 +114,6 @@ src_configure() { append-flags -fpermissive econf \ --enable-oss \ - --disable-testtools \ --enable-release \ --enable-unicode \ --enable-epoll \ @@ -131,7 +126,7 @@ src_configure() { $(use_enable perl) \ $(use_enable python) \ $(use_enable swig) \ - $(use_enable tcmalloc) + $(use_enable tcmalloc) \ $(use_enable profiling) \ $(use_enable sparsehash) \ $(use_enable debug) @@ -151,7 +146,6 @@ src_install() { if [[ "${ARCH}" == "x86" || "${ARCH}" == "amd64" ]]; then if use licensed; then - dobin "${WORKDIR}"/licensed/usr/bin/zarafa-ssm || die "Failed to install licensed binaries" make_wrapper zarafa-licensed "/opt/zarafa/bin/zarafa-licensed" /opt/zarafa/bin /opt/zarafa/$(get_libdir) make_wrapper zarafa-report "/opt/zarafa/bin/zarafa-report" /opt/zarafa/bin /opt/zarafa/$(get_libdir) ZARAFA_SERVICES="${ZARAFA_SERVICES} licensed" @@ -159,12 +153,9 @@ src_install() { dobin "${WORKDIR}"/licensed/usr/bin/zarafa-{licensed,report} || die "Failed to install licensed binaries" dolib.so $(find ${WORKDIR}/licensed -name "*.so*") doman "${WORKDIR}"/licensed/usr/share/man/*/zarafa-*.gz || die "Failed to install man files" - dodoc "${WORKDIR}"/licensed/usr/share/doc/zarafa-licensed/* || die "Failed to install docs" + dodoc -r "${WORKDIR}"/licensed/usr/share/doc/zarafa-licensed/* || die "Failed to install docs" insinto /etc/zarafa doins -r "${WORKDIR}"/licensed/etc/zarafa/* || die "Failed to install config files" - insinto /etc/cron.d - doins "${WORKDIR}"/licensed/etc/cron.d/* || die "Failed to install cron files" - doconfd "${WORKDIR}"/licensed/etc/default/zarafa-ssm || die "Failed to install sysconfig files" fi fi @@ -181,7 +172,7 @@ src_install() { if use logrotate; then insinto /etc/logrotate.d - newins "${FILESDIR}"/zarafa.logrotate zarafa || die "Failed to install logrotate" + newins installer/linux/zarafa.logrotate zarafa || die "Failed to install logrotate" fi if use ldap; then @@ -190,7 +181,7 @@ src_install() { fi insinto /etc/zarafa - doins "${S}"/installer/linux/*.cfg || die "Failed to install config files" + doins installer/linux/*.cfg || die "Failed to install config files" dodir /var/log/zarafa keepdir /var/log/zarafa diff --git a/net-mail/zarafa/zarafa-7.1.5.42059.ebuild b/net-mail/zarafa/zarafa-7.1.5.42059.ebuild deleted file mode 100644 index 448ab09..0000000 --- a/net-mail/zarafa/zarafa-7.1.5.42059.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -PHP_EXT_NAME="mapi" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -USE_PHP="php5-3 php5-4" - -PYTHON_DEPEND="python? 2" - -inherit eutils bash-completion flag-o-matic php-ext-base-r1 python unpacker autotools versionator systemd - -DESCRIPTION="Open Source Groupware Solution" -HOMEPAGE="http://zarafa.com/" - -ZARAFA_RELEASE="final" -MY_PV=$(replace_version_separator 3 '-' ) -MY_PVV=$(replace_version_separator 3 'beta' $MY_PV ) -MY_PVM=$(get_version_component_range 1-2 ) -MY_PVR=$(get_version_component_range 1-3 ) - -SRC_URI="http://download.zarafa.com/community/${ZARAFA_RELEASE}/${MY_PVM}/${MY_PV}/sourcecode/zcp-${MY_PVR}.tar.gz - amd64? ( licensed? ( http://download.zarafa.com/community/${ZARAFA_RELEASE}/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-ubuntu-12.04-x86_64-free.tar.gz - https://launchpad.net/ubuntu/+archive/primary/+files/libboost-system1.46.1_1.46.1-7ubuntu3_amd64.deb - https://launchpad.net/ubuntu/+archive/primary/+files/libboost-filesystem1.46.1_1.46.1-7ubuntu3_amd64.deb - https://launchpad.net/ubuntu/+archive/primary/+files/libssl1.0.0_1.0.1-4ubuntu5.10_amd64.deb - https://launchpad.net/ubuntu/+archive/primary/+files/libicu48_4.8.1.1-3_amd64.deb ) ) - x86? ( licensed? ( http://download.zarafa.com/community/${ZARAFA_RELEASE}/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-ubuntu-12.04-i386-free.tar.gz - https://launchpad.net/ubuntu/+archive/primary/+files/libboost-system1.46.1_1.46.1-7ubuntu3_i386.deb - https://launchpad.net/ubuntu/+archive/primary/+files/libboost-filesystem1.46.1_1.46.1-7ubuntu3_i386.deb - https://launchpad.net/ubuntu/+archive/primary/+files/libssl1.0.0_1.0.1-4ubuntu5.10_i386.deb - https://launchpad.net/ubuntu/+archive/primary/+files/libicu48_4.8.1.1-3_i386.deb ) )" -S="${WORKDIR}"/zarafa-${MY_PVR} - -ZARAFA_SERVICES="dagent gateway ical monitor search server spooler" - -LICENSE="AGPL-3" -SLOT="0" -KEYWORDS="~x86 ~amd64 ~arm" -RESTRICT="mirror" -IUSE="debug kerberos icu ldap logrotate perl +python static +swig tcmalloc licensed sparsehash profiling pic" - -RDEPEND=">=dev-libs/libical-0.44 - >=dev-cpp/libvmime-0.9.2_pre512 - virtual/httpd-php - virtual/mysql - dev-cpp/clucene - dev-db/kyotocabinet - dev-libs/boost - dev-libs/libxml2 - dev-libs/openssl - net-misc/curl - sys-libs/e2fsprogs-libs - sys-libs/zlib - icu? ( dev-libs/icu ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - logrotate? ( app-admin/logrotate ) - perl? ( dev-lang/perl ) - python? ( dev-lang/python ) - tcmalloc? ( dev-util/google-perftools ) - swig? ( =dev-lang/swig-1.3* )" -DEPEND="${RDEPEND} - sparsehash? ( dev-cpp/sparsehash ) - dev-util/pkgconfig - sys-devel/gettext" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_prepare() { - EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" epatch - edos2unix php-webclient-ajax/config.php.dist - AT_M4DIR="autoconf" eautoreconf - if use licensed; then - # not a hack just correct a script - sed -i "s!/etc/default/zarafa-ssm!/etc/conf.d/zarafa-ssm!g" "${WORKDIR}"/licensed/usr/bin/zarafa-ssm || die "sed failed" - fi - append-flags "-fPIC" -} - - -src_unpack() { - unpack zcp-${MY_PVR}.tar.gz - if use licensed; then - if [[ "${ARCH}" == "amd64" ]]; then - unpack zcp-${MY_PV}-ubuntu-12.04-x86_64-free.tar.gz - fi - - if [[ "${ARCH}" == "x86" ]]; then - unpack zcp-${MY_PV}-ubuntu-12.04-i386-free.tar.gz - fi - pushd "${WORKDIR}" - mkdir licensed - cd licensed - unpack_deb $(find ./../ -name "zarafa-licensed*.deb") - unpack_deb $(find ./../ -name "zarafa-client*.deb") - unpack_deb $(find ./../../ -name "libboost-system1.46.1*.deb") - unpack_deb $(find ./../../ -name "libboost-filesystem1.46.1*.deb") - unpack_deb $(find ./../../ -name "libssl1.0.0*.deb") - unpack_deb $(find ./../../ -name "libicu48*.deb") - popd - fi - cd "${S}" -} - -src_configure() { - append-flags -fpermissive - econf \ - --enable-oss \ - --disable-testtools \ - --enable-release \ - --enable-unicode \ - --enable-epoll \ - --with-userscript-prefix=/etc/zarafa/userscripts \ - --with-quotatemplate-prefix=/etc/zarafa/quotamails \ - --with-searchscripts-prefix=/etc/zarafa/searchscripts \ - $(use_with pic) \ - $(use_enable icu) \ - $(use_enable static) \ - $(use_enable perl) \ - $(use_enable python) \ - $(use_enable swig) \ - $(use_enable tcmalloc) - $(use_enable profiling) \ - $(use_enable sparsehash) \ - $(use_enable debug) -} - -src_compile() { - find swig -type f | xargs touch - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - make DESTDIR="${D}" install-ajax-webaccess || die "make install-ajax-webaccess failed" - #make DESTDIR="${D}" install-mobile-webaccess || die "make install-mobile-webaccess failed" - - php-ext-base-r1_src_install - - if [[ "${ARCH}" == "x86" || "${ARCH}" == "amd64" ]]; then - if use licensed; then - dobin "${WORKDIR}"/licensed/usr/bin/zarafa-ssm || die "Failed to install licensed binaries" - make_wrapper zarafa-licensed "/opt/zarafa/bin/zarafa-licensed" /opt/zarafa/bin /opt/zarafa/$(get_libdir) - make_wrapper zarafa-report "/opt/zarafa/bin/zarafa-report" /opt/zarafa/bin /opt/zarafa/$(get_libdir) - ZARAFA_SERVICES="${ZARAFA_SERVICES} licensed" - into /opt/zarafa - dobin "${WORKDIR}"/licensed/usr/bin/zarafa-{licensed,report} || die "Failed to install licensed binaries" - dolib.so $(find ${WORKDIR}/licensed -name "*.so*") - doman "${WORKDIR}"/licensed/usr/share/man/*/zarafa-*.gz || die "Failed to install man files" - dodoc "${WORKDIR}"/licensed/usr/share/doc/zarafa-licensed/* || die "Failed to install docs" - insinto /etc/zarafa - doins -r "${WORKDIR}"/licensed/etc/zarafa/* || die "Failed to install config files" - insinto /etc/cron.d - doins "${WORKDIR}"/licensed/etc/cron.d/* || die "Failed to install cron files" - doconfd "${WORKDIR}"/licensed/etc/default/zarafa-ssm || die "Failed to install sysconfig files" - fi - fi - - insinto /etc/apache2/modules.d - #newins "${FILESDIR}/50_zarafa-webaccess-mobile.conf" 50_zarafa-webaccess-mobile.conf || die "Failed to install apache config files" - newins "${FILESDIR}/50_zarafa-webaccess.conf" 50_zarafa-webaccess.conf || die "Failed to install apache config files" - - rm "${D}"/usr/share/zarafa-webaccess/*.conf || die "Failed to remove apache config files" - #rm "${D}"/usr/share/zarafa-webaccess-mobile/*.conf || die "Failed to remove apache config files" - rm "${D}"/etc/conf.d/zarafa || die "Failed to remove wrong file files" - - exeinto /etc/zarafa/userscripts/ - newexe "${FILESDIR}"/junklearn.dspam junklearn - - if use logrotate; then - insinto /etc/logrotate.d - newins "${FILESDIR}"/zarafa.logrotate zarafa || die "Failed to install logrotate" - fi - - if use ldap; then - insinto /etc/openldap/schema - doins installer/ldap/zarafa.* || die "Failed to install ldap schema files" - fi - - insinto /etc/zarafa - doins "${S}"/installer/linux/*.cfg || die "Failed to install config files" - - dodir /var/log/zarafa - keepdir /var/log/zarafa - - for service in ${ZARAFA_SERVICES}; do - newconfd "${FILESDIR}/zarafa-${service}.confd" "zarafa-${service}" - newinitd "${FILESDIR}/zarafa-${service}.initd" "zarafa-${service}" - systemd_newunit "${FILESDIR}/zarafa-${service}.service" "zarafa-${service}.service" - done - - dobashcompletion "${FILESDIR}/zarafa-bash-completion.sh" ${PN} -}