From 93459d09652d1c7c810cba27a25d9e54a5c9d661 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Tue, 5 Jun 2012 21:28:03 +0200 Subject: [PATCH] Bump --- dev-libs/icu/Manifest | 4 +- dev-libs/icu/icu-4.0.1.ebuild | 2 + net-mail/zarafa/Manifest | 24 ++ .../files/6.40.15.33766/Datux-sendas.patch | 25 ++ .../files/6.40.15.33766/Datux-spamhook.patch | 199 ++++++++++++++ .../files/6.40.15.33766/fix-pthread.patch | 51 ++++ .../fix-zarafaserver-uuid-linkage.patch | 26 ++ .../fix-zarafastats-uuid-linkage.patch | 24 ++ .../zarafa-6.40.1-no-php-conf.patch | 44 +++ .../zarafa-6.40.10-package.patch | 69 +++++ .../zarafa-6.40.2-libtcmalloc_shared-1.patch | 19 ++ .../zarafa-6.40.2-sysconfig2confd-1.patch | 187 +++++++++++++ .../zarafa-6.40.6-force_latin1.patch | 14 + .../files/6.40.16.34239/Datux-sendas.patch | 25 ++ .../files/6.40.16.34239/Datux-spamhook.patch | 199 ++++++++++++++ .../files/6.40.16.34239/fix-pthread.patch | 51 ++++ .../fix-zarafaserver-uuid-linkage.patch | 26 ++ .../fix-zarafastats-uuid-linkage.patch | 24 ++ .../zarafa-6.40.1-no-php-conf.patch | 44 +++ .../zarafa-6.40.10-package.patch | 69 +++++ .../zarafa-6.40.2-libtcmalloc_shared-1.patch | 19 ++ .../zarafa-6.40.2-sysconfig2confd-1.patch | 187 +++++++++++++ .../zarafa-6.40.6-force_latin1.patch | 14 + net-mail/zarafa/zarafa-6.40.15.33766.ebuild | 252 ++++++++++++++++++ net-mail/zarafa/zarafa-6.40.16.34239.ebuild | 252 ++++++++++++++++++ 25 files changed, 1849 insertions(+), 1 deletion(-) create mode 100644 net-mail/zarafa/files/6.40.15.33766/Datux-sendas.patch create mode 100644 net-mail/zarafa/files/6.40.15.33766/Datux-spamhook.patch create mode 100644 net-mail/zarafa/files/6.40.15.33766/fix-pthread.patch create mode 100644 net-mail/zarafa/files/6.40.15.33766/fix-zarafaserver-uuid-linkage.patch create mode 100644 net-mail/zarafa/files/6.40.15.33766/fix-zarafastats-uuid-linkage.patch create mode 100644 net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.1-no-php-conf.patch create mode 100644 net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.10-package.patch create mode 100644 net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.2-libtcmalloc_shared-1.patch create mode 100644 net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.2-sysconfig2confd-1.patch create mode 100644 net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.6-force_latin1.patch create mode 100644 net-mail/zarafa/files/6.40.16.34239/Datux-sendas.patch create mode 100644 net-mail/zarafa/files/6.40.16.34239/Datux-spamhook.patch create mode 100644 net-mail/zarafa/files/6.40.16.34239/fix-pthread.patch create mode 100644 net-mail/zarafa/files/6.40.16.34239/fix-zarafaserver-uuid-linkage.patch create mode 100644 net-mail/zarafa/files/6.40.16.34239/fix-zarafastats-uuid-linkage.patch create mode 100644 net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.1-no-php-conf.patch create mode 100644 net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.10-package.patch create mode 100644 net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.2-libtcmalloc_shared-1.patch create mode 100644 net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.2-sysconfig2confd-1.patch create mode 100644 net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.6-force_latin1.patch create mode 100644 net-mail/zarafa/zarafa-6.40.15.33766.ebuild create mode 100644 net-mail/zarafa/zarafa-6.40.16.34239.ebuild diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 51e2d1f..37497ec 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -4,9 +4,11 @@ AUX icu-4.4.1-arm.patch 991 RMD160 b3c38623023414e47280c5418744f05a96cd049e SHA1 AUX icu-4.4.1-et_EE.patch 861 RMD160 bd2041795f3b1781fb5ddef85566487912c92c77 SHA1 730cae8657a162d6410be41580d86c9203183a4b SHA256 4719ac0e19e89b6bf48e17af9ccc7c7bb26e8e171576c348eb7b68664459b80c AUX icu-4.4.1-pkgdata.patch 2316 RMD160 4dda06ef2791a5f986c4f0baada2e13e979ddf2c SHA1 9d40795b94650c76f5c5eebb7ce57ed8634059e0 SHA256 6eef0649b635286ea94d84076ea76c26049b97bfa9f858b3e1479bb7de7229c4 AUX icu-4.4.2-gcc-4.5.patch 1040 RMD160 2b59457c373693ccf07fa57af20d59347df19a52 SHA1 cc2b853a85e6f2b427f248bcd2cb9590bd0f8bb2 SHA256 2ce96779636acbf6eb189b2953368b397297f04160f0cc80b5faf52240935f10 +AUX icu-CVE-2009-0153.patch 38423 RMD160 38889946cf0b7b67d0489ed4b0cf636da57c18f0 SHA1 f05a37da72fd234639f18e6f7781c9ce8693d38f SHA256 4f25508d4b50d65e9cc113b0d84f0c1b63ae936413b21a79ff2925395320acf8 +AUX icu4c-3_6-src-setBreakType-public.diff 458 RMD160 f4c5c242aa03d17453d35612049177af997a8e43 SHA1 f6f5c6cea5bda013c20e002d63b15c5cb71d6b62 SHA256 c643c3c9eca3943e8987048dd3800eef823bd68bc7ec34d7c0fb5bb61650c648 DIST icu4c-4_0_1-src.tgz 12356471 RMD160 e40e7ffddd3134a34fe7e7bc98d776c5b67b637c SHA1 65a65e9cd5670e113031def9448f65fb8f84f47a SHA256 fe4d33cc7393c355df7b13080e1c3717ec1acac2f8cfe452b691f33c5f467259 DIST icu4c-4_4_2-src.tgz 16446776 RMD160 eb228e6fa9606855bbd881d98da738a61d72b74b SHA1 adc19231810eff2836a08b0e1f1a31a128d7a834 SHA256 2ecefdfb134b5b364ed01c2f613a9ccb11489dbae5857d63cd17ba5b6caca789 -EBUILD icu-4.0.1.ebuild 1806 RMD160 15c61a54941d47a93d0bd9126ab6ac4e474f06fb SHA1 77101ae57cd9942cb941fd2a3a2ba57d782f1bed SHA256 f1a7ead02fd141ec03758588771fe525be0b4d22e142651b6538291bce6c7aab +EBUILD icu-4.0.1.ebuild 1914 RMD160 e283821126e475b568f1d5004e905735c5d2aa0c SHA1 439e5afde5d05150f083393b33da64f43f3228a9 SHA256 15594dce8e8a7833bc96ecd718e3fd2cecf94dc6d52d2bd0cdbc38f10fb905a8 EBUILD icu-4.4.2.ebuild 1919 RMD160 20c395566df739b6a0c7b9e64cc20141c32d6f40 SHA1 f16e3c676493e6523bcffc03ba283bd7e75c2cb9 SHA256 00e6fc7e94e4fc64da93bf2dafc8ef970a70c470dc40ab3ea41c2084b75a9bde MISC ChangeLog 448 RMD160 77a7eb37febd49e4bf00939a98dd22e439f7ea8a SHA1 f9e76cd0901b740543e53e071b2427d4cefb127e SHA256 e3ee29f32d21a7bd6ab8835f83acc5cbab1ccf71de32b91c836f16b367e6e128 MISC metadata.xml 278 RMD160 bbc1c0098322bba7d2edbf4d41f05e1c010026c2 SHA1 1dcc071f84b18baeca49a6a29ab79a44ac18baa0 SHA256 2b995d31dcd9de1724232025cd606514b27a59bb28a9d6b6bcc8ac42c4cb9e9d diff --git a/dev-libs/icu/icu-4.0.1.ebuild b/dev-libs/icu/icu-4.0.1.ebuild index dc7978e..bc15d9e 100644 --- a/dev-libs/icu/icu-4.0.1.ebuild +++ b/dev-libs/icu/icu-4.0.1.ebuild @@ -40,6 +40,8 @@ src_prepare() { epatch "${FILESDIR}/${P}-fix_parallel_building.patch" epatch "${FILESDIR}/${P}-TestDisplayNamesMeta.patch" +# epatch "${FILESDIR}/icu-CVE-2009-0153.patch" + epatch "${FILESDIR}/icu4c-3_6-src-setBreakType-public.diff" } src_configure() { diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest index ad519e0..46788bb 100644 --- a/net-mail/zarafa/Manifest +++ b/net-mail/zarafa/Manifest @@ -105,6 +105,8 @@ DIST zarafa-bash-completion-6.40.11.28965.zip 2156 RMD160 7f00d115e0abd0d7707e8c DIST zarafa-bash-completion-6.40.12.29942.zip 2156 RMD160 7f00d115e0abd0d7707e8c0815a2beedeb29b28f SHA1 705d6a1dc7e55afdf2c8693de22dbd985842beec SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5 DIST zarafa-bash-completion-6.40.13.30778.zip 2156 RMD160 7f00d115e0abd0d7707e8c0815a2beedeb29b28f SHA1 705d6a1dc7e55afdf2c8693de22dbd985842beec SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5 DIST zarafa-bash-completion-6.40.14.31537.zip 2156 RMD160 7f00d115e0abd0d7707e8c0815a2beedeb29b28f SHA1 705d6a1dc7e55afdf2c8693de22dbd985842beec SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5 +DIST zarafa-bash-completion-6.40.15.33766.zip 2156 RMD160 7f00d115e0abd0d7707e8c0815a2beedeb29b28f SHA1 705d6a1dc7e55afdf2c8693de22dbd985842beec SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5 +DIST zarafa-bash-completion-6.40.16.34239.zip 2156 RMD160 7f00d115e0abd0d7707e8c0815a2beedeb29b28f SHA1 705d6a1dc7e55afdf2c8693de22dbd985842beec SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5 DIST zarafa-bash-completion-6.40.9.27553.zip 2156 RMD160 7f00d115e0abd0d7707e8c0815a2beedeb29b28f SHA1 705d6a1dc7e55afdf2c8693de22dbd985842beec SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5 DIST zarafa-bash-completion-7.0.3.30515.zip 2156 RMD160 7f00d115e0abd0d7707e8c0815a2beedeb29b28f SHA1 705d6a1dc7e55afdf2c8693de22dbd985842beec SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5 DIST zarafa-bash-completion-7.0.4.31235.zip 2156 RMD160 7f00d115e0abd0d7707e8c0815a2beedeb29b28f SHA1 705d6a1dc7e55afdf2c8693de22dbd985842beec SHA256 1343b8d279761f6aaf2263c6d7ba97d1ec21d7436a6f0277a34250fe587f28e5 @@ -114,6 +116,8 @@ DIST zarafa-webaccess-plugin-dspam-6.40.11.28965.tar.gz 5308 RMD160 57f6ce090490 DIST zarafa-webaccess-plugin-dspam-6.40.12.29942.tar.gz 5308 RMD160 57f6ce09049067892c48cd411aea848a4586fa1b SHA1 7134477b89efcdc3c7abada75df9a840b5cc90c0 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99 DIST zarafa-webaccess-plugin-dspam-6.40.13.30778.tar.gz 5308 RMD160 57f6ce09049067892c48cd411aea848a4586fa1b SHA1 7134477b89efcdc3c7abada75df9a840b5cc90c0 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99 DIST zarafa-webaccess-plugin-dspam-6.40.14.31537.tar.gz 5308 RMD160 57f6ce09049067892c48cd411aea848a4586fa1b SHA1 7134477b89efcdc3c7abada75df9a840b5cc90c0 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99 +DIST zarafa-webaccess-plugin-dspam-6.40.15.33766.tar.gz 5308 RMD160 57f6ce09049067892c48cd411aea848a4586fa1b SHA1 7134477b89efcdc3c7abada75df9a840b5cc90c0 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99 +DIST zarafa-webaccess-plugin-dspam-6.40.16.34239.tar.gz 5308 RMD160 57f6ce09049067892c48cd411aea848a4586fa1b SHA1 7134477b89efcdc3c7abada75df9a840b5cc90c0 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99 DIST zarafa-webaccess-plugin-dspam-6.40.9.27553.tar.gz 5308 RMD160 57f6ce09049067892c48cd411aea848a4586fa1b SHA1 7134477b89efcdc3c7abada75df9a840b5cc90c0 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99 DIST zarafa-webaccess-plugin-dspam-7.0.3.30515.tar.gz 5308 RMD160 57f6ce09049067892c48cd411aea848a4586fa1b SHA1 7134477b89efcdc3c7abada75df9a840b5cc90c0 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99 DIST zarafa-webaccess-plugin-dspam-7.0.4.31235.tar.gz 5308 RMD160 57f6ce09049067892c48cd411aea848a4586fa1b SHA1 7134477b89efcdc3c7abada75df9a840b5cc90c0 SHA256 04a550a60aa6b5eee4875be6d5f3161752223fd278c4b87d62a31e3a486c5d99 @@ -123,6 +127,8 @@ DIST zarafa-webaccess-plugin-google-maps-6.40.11.28965.zip 100943 RMD160 5f2598f DIST zarafa-webaccess-plugin-google-maps-6.40.12.29942.zip 100943 RMD160 5f2598f678d206fae94230cb7ceb150e8026cf82 SHA1 2d1cf0d5cf415ab1b4cc85ad8b4bc57f7eb34b0b SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e DIST zarafa-webaccess-plugin-google-maps-6.40.13.30778.zip 100943 RMD160 5f2598f678d206fae94230cb7ceb150e8026cf82 SHA1 2d1cf0d5cf415ab1b4cc85ad8b4bc57f7eb34b0b SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e DIST zarafa-webaccess-plugin-google-maps-6.40.14.31537.zip 100943 RMD160 5f2598f678d206fae94230cb7ceb150e8026cf82 SHA1 2d1cf0d5cf415ab1b4cc85ad8b4bc57f7eb34b0b SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e +DIST zarafa-webaccess-plugin-google-maps-6.40.15.33766.zip 100943 RMD160 5f2598f678d206fae94230cb7ceb150e8026cf82 SHA1 2d1cf0d5cf415ab1b4cc85ad8b4bc57f7eb34b0b SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e +DIST zarafa-webaccess-plugin-google-maps-6.40.16.34239.zip 100943 RMD160 5f2598f678d206fae94230cb7ceb150e8026cf82 SHA1 2d1cf0d5cf415ab1b4cc85ad8b4bc57f7eb34b0b SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e DIST zarafa-webaccess-plugin-google-maps-6.40.9.27553.zip 100943 RMD160 5f2598f678d206fae94230cb7ceb150e8026cf82 SHA1 2d1cf0d5cf415ab1b4cc85ad8b4bc57f7eb34b0b SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e DIST zarafa-webaccess-plugin-google-maps-7.0.3.30515.zip 100943 RMD160 5f2598f678d206fae94230cb7ceb150e8026cf82 SHA1 2d1cf0d5cf415ab1b4cc85ad8b4bc57f7eb34b0b SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e DIST zarafa-webaccess-plugin-google-maps-7.0.4.31235.zip 100943 RMD160 5f2598f678d206fae94230cb7ceb150e8026cf82 SHA1 2d1cf0d5cf415ab1b4cc85ad8b4bc57f7eb34b0b SHA256 0fd861ac242d6937cdc1bc8d53edd9dce5f6348342d4e71bf06c5f5ebea1031e @@ -132,6 +138,8 @@ DIST zarafa-webaccess-plugin-mobile-device-6.40.11.28965.zip 26916 RMD160 ee331c DIST zarafa-webaccess-plugin-mobile-device-6.40.12.29942.zip 26916 RMD160 ee331c6b01ff3d5360de833eaa4a8f0107613574 SHA1 92a9f572aa510e469290da05e421fab01546688f SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4 DIST zarafa-webaccess-plugin-mobile-device-6.40.13.30778.zip 26916 RMD160 ee331c6b01ff3d5360de833eaa4a8f0107613574 SHA1 92a9f572aa510e469290da05e421fab01546688f SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4 DIST zarafa-webaccess-plugin-mobile-device-6.40.14.31537.zip 26916 RMD160 ee331c6b01ff3d5360de833eaa4a8f0107613574 SHA1 92a9f572aa510e469290da05e421fab01546688f SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4 +DIST zarafa-webaccess-plugin-mobile-device-6.40.15.33766.zip 26916 RMD160 ee331c6b01ff3d5360de833eaa4a8f0107613574 SHA1 92a9f572aa510e469290da05e421fab01546688f SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4 +DIST zarafa-webaccess-plugin-mobile-device-6.40.16.34239.zip 26916 RMD160 ee331c6b01ff3d5360de833eaa4a8f0107613574 SHA1 92a9f572aa510e469290da05e421fab01546688f SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4 DIST zarafa-webaccess-plugin-mobile-device-6.40.9.27553.zip 26916 RMD160 ee331c6b01ff3d5360de833eaa4a8f0107613574 SHA1 92a9f572aa510e469290da05e421fab01546688f SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4 DIST zarafa-webaccess-plugin-mobile-device-7.0.3.30515.zip 26916 RMD160 ee331c6b01ff3d5360de833eaa4a8f0107613574 SHA1 92a9f572aa510e469290da05e421fab01546688f SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4 DIST zarafa-webaccess-plugin-mobile-device-7.0.4.31235.zip 26916 RMD160 ee331c6b01ff3d5360de833eaa4a8f0107613574 SHA1 92a9f572aa510e469290da05e421fab01546688f SHA256 0a641f3e521e4c3b29a8ab54972d7000059c84d37c50e32722cf8e09a5582ee4 @@ -141,6 +149,8 @@ DIST zarafa-webaccess-plugin-smime-6.40.11.28965.zip 3678929 RMD160 3c704ef7b0b0 DIST zarafa-webaccess-plugin-smime-6.40.12.29942.zip 3678929 RMD160 3c704ef7b0b0b41ae068c898fbab757d5c507582 SHA1 5e20346ae0f6777526d2d688f0a2eafbaa1f3d73 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a DIST zarafa-webaccess-plugin-smime-6.40.13.30778.zip 3678929 RMD160 3c704ef7b0b0b41ae068c898fbab757d5c507582 SHA1 5e20346ae0f6777526d2d688f0a2eafbaa1f3d73 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a DIST zarafa-webaccess-plugin-smime-6.40.14.31537.zip 3678929 RMD160 3c704ef7b0b0b41ae068c898fbab757d5c507582 SHA1 5e20346ae0f6777526d2d688f0a2eafbaa1f3d73 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a +DIST zarafa-webaccess-plugin-smime-6.40.15.33766.zip 3678929 RMD160 3c704ef7b0b0b41ae068c898fbab757d5c507582 SHA1 5e20346ae0f6777526d2d688f0a2eafbaa1f3d73 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a +DIST zarafa-webaccess-plugin-smime-6.40.16.34239.zip 3678929 RMD160 3c704ef7b0b0b41ae068c898fbab757d5c507582 SHA1 5e20346ae0f6777526d2d688f0a2eafbaa1f3d73 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a DIST zarafa-webaccess-plugin-smime-6.40.9.27553.zip 3678929 RMD160 3c704ef7b0b0b41ae068c898fbab757d5c507582 SHA1 5e20346ae0f6777526d2d688f0a2eafbaa1f3d73 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a DIST zarafa-webaccess-plugin-smime-7.0.3.30515.zip 3678929 RMD160 3c704ef7b0b0b41ae068c898fbab757d5c507582 SHA1 5e20346ae0f6777526d2d688f0a2eafbaa1f3d73 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a DIST zarafa-webaccess-plugin-smime-7.0.4.31235.zip 3678929 RMD160 3c704ef7b0b0b41ae068c898fbab757d5c507582 SHA1 5e20346ae0f6777526d2d688f0a2eafbaa1f3d73 SHA256 5c9b4c73cf3a649b7b5c3adb17f562490dba21102d8e4c64ccc58327b75b998a @@ -150,6 +160,8 @@ DIST zarafa-webaccess-plugin-z-merge-archive-6.40.11.28965.zip 25852 RMD160 61cb DIST zarafa-webaccess-plugin-z-merge-archive-6.40.12.29942.zip 25852 RMD160 61cbb0e75a243f65370c60ed7040a9804174685a SHA1 8c3c0b62f89fe09c0e4867a22995f64b22216b4f SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a DIST zarafa-webaccess-plugin-z-merge-archive-6.40.13.30778.zip 25852 RMD160 61cbb0e75a243f65370c60ed7040a9804174685a SHA1 8c3c0b62f89fe09c0e4867a22995f64b22216b4f SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a DIST zarafa-webaccess-plugin-z-merge-archive-6.40.14.31537.zip 25852 RMD160 61cbb0e75a243f65370c60ed7040a9804174685a SHA1 8c3c0b62f89fe09c0e4867a22995f64b22216b4f SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a +DIST zarafa-webaccess-plugin-z-merge-archive-6.40.15.33766.zip 25852 RMD160 61cbb0e75a243f65370c60ed7040a9804174685a SHA1 8c3c0b62f89fe09c0e4867a22995f64b22216b4f SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a +DIST zarafa-webaccess-plugin-z-merge-archive-6.40.16.34239.zip 25852 RMD160 61cbb0e75a243f65370c60ed7040a9804174685a SHA1 8c3c0b62f89fe09c0e4867a22995f64b22216b4f SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a DIST zarafa-webaccess-plugin-z-merge-archive-6.40.9.27553.zip 25852 RMD160 61cbb0e75a243f65370c60ed7040a9804174685a SHA1 8c3c0b62f89fe09c0e4867a22995f64b22216b4f SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a DIST zarafa-webaccess-plugin-z-merge-archive-7.0.3.30515.zip 25852 RMD160 61cbb0e75a243f65370c60ed7040a9804174685a SHA1 8c3c0b62f89fe09c0e4867a22995f64b22216b4f SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a DIST zarafa-webaccess-plugin-z-merge-archive-7.0.4.31235.zip 25852 RMD160 61cbb0e75a243f65370c60ed7040a9804174685a SHA1 8c3c0b62f89fe09c0e4867a22995f64b22216b4f SHA256 5b7884c9c19b1428fc5024ed9e674993366665358e0f1ca88610a4bcf534563a @@ -159,6 +171,8 @@ DIST zarafa-webaccess-theme-dark-6.40.11.28965.tar.gz 12902 RMD160 e749eb36f6071 DIST zarafa-webaccess-theme-dark-6.40.12.29942.tar.gz 12902 RMD160 e749eb36f607144ef3fb6edc1101f2ca6c143586 SHA1 9701c4bdd5be4f1a3b58bbf6f9ca5fb6987d538c SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58 DIST zarafa-webaccess-theme-dark-6.40.13.30778.tar.gz 12902 RMD160 e749eb36f607144ef3fb6edc1101f2ca6c143586 SHA1 9701c4bdd5be4f1a3b58bbf6f9ca5fb6987d538c SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58 DIST zarafa-webaccess-theme-dark-6.40.14.31537.tar.gz 12902 RMD160 e749eb36f607144ef3fb6edc1101f2ca6c143586 SHA1 9701c4bdd5be4f1a3b58bbf6f9ca5fb6987d538c SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58 +DIST zarafa-webaccess-theme-dark-6.40.15.33766.tar.gz 12902 RMD160 e749eb36f607144ef3fb6edc1101f2ca6c143586 SHA1 9701c4bdd5be4f1a3b58bbf6f9ca5fb6987d538c SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58 +DIST zarafa-webaccess-theme-dark-6.40.16.34239.tar.gz 12902 RMD160 e749eb36f607144ef3fb6edc1101f2ca6c143586 SHA1 9701c4bdd5be4f1a3b58bbf6f9ca5fb6987d538c SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58 DIST zarafa-webaccess-theme-dark-6.40.9.27553.tar.gz 12902 RMD160 e749eb36f607144ef3fb6edc1101f2ca6c143586 SHA1 9701c4bdd5be4f1a3b58bbf6f9ca5fb6987d538c SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58 DIST zarafa-webaccess-theme-dark-7.0.3.30515.tar.gz 12902 RMD160 e749eb36f607144ef3fb6edc1101f2ca6c143586 SHA1 9701c4bdd5be4f1a3b58bbf6f9ca5fb6987d538c SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58 DIST zarafa-webaccess-theme-dark-7.0.4.31235.tar.gz 12902 RMD160 e749eb36f607144ef3fb6edc1101f2ca6c143586 SHA1 9701c4bdd5be4f1a3b58bbf6f9ca5fb6987d538c SHA256 3ea4d26676c5be8b0ea862fd261600375fe00b1350985b222caa232c28c02b58 @@ -168,6 +182,8 @@ DIST zarafa-webaccess-theme-orange-6.40.11.28965.tar.gz 12828 RMD160 dbbf3dba6dc DIST zarafa-webaccess-theme-orange-6.40.12.29942.tar.gz 12828 RMD160 dbbf3dba6dce99fd94111635076f4abf65f0cbf3 SHA1 1a55492c99bf1f62b56c17394227b2308385b08e SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532 DIST zarafa-webaccess-theme-orange-6.40.13.30778.tar.gz 12828 RMD160 dbbf3dba6dce99fd94111635076f4abf65f0cbf3 SHA1 1a55492c99bf1f62b56c17394227b2308385b08e SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532 DIST zarafa-webaccess-theme-orange-6.40.14.31537.tar.gz 12828 RMD160 dbbf3dba6dce99fd94111635076f4abf65f0cbf3 SHA1 1a55492c99bf1f62b56c17394227b2308385b08e SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532 +DIST zarafa-webaccess-theme-orange-6.40.15.33766.tar.gz 12828 RMD160 dbbf3dba6dce99fd94111635076f4abf65f0cbf3 SHA1 1a55492c99bf1f62b56c17394227b2308385b08e SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532 +DIST zarafa-webaccess-theme-orange-6.40.16.34239.tar.gz 12828 RMD160 dbbf3dba6dce99fd94111635076f4abf65f0cbf3 SHA1 1a55492c99bf1f62b56c17394227b2308385b08e SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532 DIST zarafa-webaccess-theme-orange-6.40.9.27553.tar.gz 12828 RMD160 dbbf3dba6dce99fd94111635076f4abf65f0cbf3 SHA1 1a55492c99bf1f62b56c17394227b2308385b08e SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532 DIST zarafa-webaccess-theme-orange-7.0.3.30515.tar.gz 12828 RMD160 dbbf3dba6dce99fd94111635076f4abf65f0cbf3 SHA1 1a55492c99bf1f62b56c17394227b2308385b08e SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532 DIST zarafa-webaccess-theme-orange-7.0.4.31235.tar.gz 12828 RMD160 dbbf3dba6dce99fd94111635076f4abf65f0cbf3 SHA1 1a55492c99bf1f62b56c17394227b2308385b08e SHA256 6ee1c07a77efd38dc4f8ca292df4e0c2645de82d3f9454cf1cd8c119c0fdb532 @@ -187,6 +203,12 @@ DIST zcp-6.40.13.tar.gz 5544429 RMD160 0207fe62a8fe3d36799e283505e4ced04f40358a DIST zcp-6.40.14-31537-sles-11-i586-free.tar.gz 25371981 RMD160 e9369bffdcf3665bf92d181b210db6d47fdd2b00 SHA1 143e6e3d94e08dcfff4bcbf7f9a04d60184d7d83 SHA256 fb3a0509d47de4d4ec060bf1a38bfa988c70b57ee67b6532125df9b18e346222 DIST zcp-6.40.14-31537-sles-11-x86_64-free.tar.gz 25291142 RMD160 b980ce9bfffa1905f3f31488d0b9fef0873de76f SHA1 719cd2891ba69aa71353d9cfc1028ee97f15a575 SHA256 96dc0755963ba15abb54cbebce2eb16ec3a99488781ccd14616d32a1f384dab8 DIST zcp-6.40.14.tar.gz 5563665 RMD160 8b145f96b36ed7df275f0df75c42c0315f685516 SHA1 4b78112c7bf960621e2e3adb9ef1b055f6b31315 SHA256 871ac04d4f87e1868ff103edddfcfc6f91a1c9e6e0caeeb0f0c20dbc4424521a +DIST zcp-6.40.15-33766-sles-11-i586-free.tar.gz 25362067 RMD160 d1a6452f74520e14dc4ac6ddfea064c04f11fcc5 SHA1 7f52a433c25b48d4044e4fa4266ae8540d8472c2 SHA256 ec9ceaf5caf93337233e3390e2c7e9897cd880b4e403f3ece529022351e0ab88 +DIST zcp-6.40.15-33766-sles-11-x86_64-free.tar.gz 25283628 RMD160 01724165776e1b5768ce0fc2a4075b6c281c22b0 SHA1 a83cacac53871ea6650c12232bf5cf54af853f23 SHA256 b57ece5315c10bfa7b406835daac582c350d3d2e186d172895c5a9997ef6945b +DIST zcp-6.40.15.tar.gz 5565275 RMD160 4ffc2e709e6c486d8690726d75bca0f9b0b7747b SHA1 dfccb2a62937784b2f2a978a0b010213b2475741 SHA256 dffea016ce5fe663c61991495098995335ea8fb564eeffc8f817535a2e29872d +DIST zcp-6.40.16-34239-sles-11-i586-free.tar.gz 25369527 RMD160 d5e9318fc0d2ddd3d802410bc31397f4a1ec30d5 SHA1 ce5015a473bc35dd95cf94159d489f36f5a97f38 SHA256 665d855c2d4307ec79f357b2a91dcf2bc92a905339e3e321d22bac12b75db74e +DIST zcp-6.40.16-34239-sles-11-x86_64-free.tar.gz 25288428 RMD160 a16c2f1b78f3c077b3b295df9907a8dc70389b06 SHA1 c3110c3829819146f73a826c90e4c3103805b682 SHA256 7e1b1001cd8877fe5a9e4ea3c7a833640ebf5fec3df998bc7f3b8937dd579692 +DIST zcp-6.40.16.tar.gz 5563992 RMD160 0a9ab253fe746ffe81eaa9f2a884a16fdebc7a5a SHA1 edf87b669e9014a4fff954d73719044361c72d0a SHA256 1745d7cb1fc4f135f54f3e02c30067351d33daff36bb24fb92fe55d6eaa5d654 DIST zcp-6.40.8-27223-sles-11-i586-free.tar.gz 24048189 RMD160 442e433cb7a0da8081a5def4c8c6ac6770a24b10 SHA1 dec7d3e8fa8ad4bf5fd162ebb3b1fd2e2d3d71b4 SHA256 99a010e216e7d49d2d6b07fd33f265a08829f01d7ed85f2dd832e8809c1c72a1 DIST zcp-6.40.8-27223-sles-11-x86_64-free.tar.gz 24001656 RMD160 d4f8474b47378b28e8e8374141c03eedff9b3666 SHA1 775f53bb7d5c35cfb596f87e99b5278ef77420eb SHA256 ba5fed41d6fee39dc969e711a7edbf76e7640ca5c77e28c9be6d11f026a99b30 DIST zcp-6.40.8.tar.gz 5428506 RMD160 36ce2095a1d0126a43405ac50b289107910feeaf SHA1 6c342a725610fb38dc6a5cef6e0d9bc160252fd4 SHA256 206bb736731f5b3c3fdc0d34c495b8c2af9e3245770d8636bc97d06ff7363023 @@ -207,6 +229,8 @@ EBUILD zarafa-6.40.11.28965.ebuild 9054 RMD160 84c3d9d212f1582bd6bb1ce3b055f30f8 EBUILD zarafa-6.40.12.29942.ebuild 9061 RMD160 a1a36a7de8682190f341e150891bb0705edc0670 SHA1 f9e2c087750e95078b8b20e7e793fe1472178fc6 SHA256 66a9aea68004e599f46e3b0b4f9a09e1c238504c1c11db8185af7f97d71229f2 EBUILD zarafa-6.40.13.30778.ebuild 9061 RMD160 a1a36a7de8682190f341e150891bb0705edc0670 SHA1 f9e2c087750e95078b8b20e7e793fe1472178fc6 SHA256 66a9aea68004e599f46e3b0b4f9a09e1c238504c1c11db8185af7f97d71229f2 EBUILD zarafa-6.40.14.31537.ebuild 9061 RMD160 a1a36a7de8682190f341e150891bb0705edc0670 SHA1 f9e2c087750e95078b8b20e7e793fe1472178fc6 SHA256 66a9aea68004e599f46e3b0b4f9a09e1c238504c1c11db8185af7f97d71229f2 +EBUILD zarafa-6.40.15.33766.ebuild 9061 RMD160 a1a36a7de8682190f341e150891bb0705edc0670 SHA1 f9e2c087750e95078b8b20e7e793fe1472178fc6 SHA256 66a9aea68004e599f46e3b0b4f9a09e1c238504c1c11db8185af7f97d71229f2 +EBUILD zarafa-6.40.16.34239.ebuild 9061 RMD160 a1a36a7de8682190f341e150891bb0705edc0670 SHA1 f9e2c087750e95078b8b20e7e793fe1472178fc6 SHA256 66a9aea68004e599f46e3b0b4f9a09e1c238504c1c11db8185af7f97d71229f2 EBUILD zarafa-6.40.8.27223.ebuild 6567 RMD160 83e20fc877c6d5f50d4b85f7b9d6b957c97a5e15 SHA1 7b7637509d64c46bb52e1208e553a298cbb6e939 SHA256 74ab1f9061cada56505cd39e861d348f5b9007e85fa94d3dd48c811005dc4f95 EBUILD zarafa-6.40.9.27553.ebuild 9033 RMD160 bc86e8eadf58d619774ea62aaf869d00b477df5d SHA1 23d7461f0614ccabe5fe7377ee1590291937d5b7 SHA256 bcf13aaaeb85e536a6aed59ae670bef33c562c5d7efc6a38d79fd04b0bba8716 EBUILD zarafa-7.0.3.30515.ebuild 9864 RMD160 6906d05b84d9ddfcd44e7b4059317db111f1c349 SHA1 a87f520414186045eb8b1bbae1fb3823306aeb07 SHA256 84d3ceeb8d4ded58a0074037e307af5a593a39f15e686ba8f262e5425e3728aa diff --git a/net-mail/zarafa/files/6.40.15.33766/Datux-sendas.patch b/net-mail/zarafa/files/6.40.15.33766/Datux-sendas.patch new file mode 100644 index 0000000..d42326f --- /dev/null +++ b/net-mail/zarafa/files/6.40.15.33766/Datux-sendas.patch @@ -0,0 +1,25 @@ +diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp +--- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000 ++++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000 +@@ -935,6 +935,7 @@ + { "fax_domain", "", CONFIGSETTING_RELOADABLE }, + { "fax_international", "+", CONFIGSETTING_RELOADABLE }, + { "always_send_delegates", "no", CONFIGSETTING_RELOADABLE }, ++ { "always_send_as", "no", CONFIGSETTING_RELOADABLE }, + { "always_send_tnef", "no", CONFIGSETTING_RELOADABLE }, + { "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE }, + { "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE }, +diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp +--- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000 ++++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000 +@@ -1949,6 +1949,10 @@ + HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b) + { + bAllowSendAs = true; ++ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) { ++ //use always_send_as to allow everybody to send as someone else. ++ //(some users hate the 'on behalf of' text, and dont want to do the extra configuration) ++ bAllowSendAs = true; + } else { + + hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner); diff --git a/net-mail/zarafa/files/6.40.15.33766/Datux-spamhook.patch b/net-mail/zarafa/files/6.40.15.33766/Datux-spamhook.patch new file mode 100644 index 0000000..c35d6d2 --- /dev/null +++ b/net-mail/zarafa/files/6.40.15.33766/Datux-spamhook.patch @@ -0,0 +1,199 @@ +diff -rupN zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp +--- zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp 2010-05-31 19:28:59.000000000 +0200 ++++ zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp 2010-07-20 17:22:07.995625072 +0200 +@@ -7244,6 +7244,166 @@ typedef struct{ + SOURCEKEY sSourceKey; + SOURCEKEY sParentSourceKey; + }COPYITEM; ++//SPAM HOOK ++//This function parses an e-mail to the /etc/zarafa/userscripts/junklearn script. With 2 arguments: ++//ham or spam ++//message id ++//and pipes the mail header to the script. ++//This script wil be inhaled by MoveObjects(); ++///////////////////////////////////////////////////////////////////////////////////////////////// ++int SpamHook(ECDatabase *lpDatabase,int ulId,int ulDestFolderId) ++{ ++ ++ ALLOC_DBRESULT(); ++ ECRESULT er = erSuccess; ++ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script"); ++ ++ //If shScriptPath doesn't exist skip spam hook. ++ if(fopen(shScriptPath.c_str(),"r")) { ++ ++ //Get store object ID via message object id ++ unsigned int storeId; ++ er = g_lpSessionManager->GetCacheManager()->GetStore(ulId,&storeId,NULL); ++ if(er != erSuccess) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve source folder."); ++ goto exit; ++ } ++ ++ //get deleted items folder entry id ++ strQuery="SELECT val_binary FROM properties WHERE hierarchyid="+stringify(storeId)+" AND tag="+stringify(PROP_ID(PR_IPM_WASTEBASKET_ENTRYID)); ++ er = lpDatabase->DoSelect(strQuery, &lpDBResult); ++ if(er != erSuccess) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid from DB."); ++ goto exit; ++ } ++ lpDBRow = lpDatabase->FetchRow(lpDBResult); ++ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult); ++ int shNumRows=lpDatabase->GetNumRows(lpDBResult); ++ if(shNumRows<1) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, empty DB result."); ++ goto exit; ++ } ++ ++ //Convert 'deleted items' entryid to objectid. ++ entryId* wasteBucketEntryId = new entryId[0]; ++ wasteBucketEntryId->__ptr=(unsigned char*)lpDBRow[0]; ++ wasteBucketEntryId->__size=lpDBLen[0]; ++ unsigned int wasteBucketFolderId; ++ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(wasteBucketEntryId,&wasteBucketFolderId); ++ delete wasteBucketEntryId; ++ if(er!=erSuccess) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, converting to objectID."); ++ goto exit; ++ } ++ FREE_DBRESULT(); ++ ++ //Get 'junk folder' entryId. ++ strQuery="SELECT val_binary FROM receivefolder LEFT JOIN mvproperties ON receivefolder.objid=mvproperties.hierarchyid WHERE receivefolder.storeid="+stringify(storeId)+" AND receivefolder.messageclass='IPC' AND mvproperties.tag="+stringify(PROP_ID(PR_ADDITIONAL_REN_ENTRYIDS))+" AND mvproperties.orderid=4"; ++ er = lpDatabase->DoSelect(strQuery, &lpDBResult); ++ if(er != erSuccess) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryids from DB."); ++ goto exit; ++ } ++ lpDBRow = lpDatabase->FetchRow(lpDBResult); ++ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult); ++ shNumRows=lpDatabase->GetNumRows(lpDBResult); ++ if(shNumRows<1) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, empty DB result."); ++ goto exit; ++ } ++ ++ //Convert 'junk folder' entryid to objectid. ++ entryId* junkFolderEntryId = new entryId[0]; ++ junkFolderEntryId->__ptr=(unsigned char*)lpDBRow[0]; ++ junkFolderEntryId->__size=lpDBLen[0]; ++ unsigned int junkFolderId; ++ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(junkFolderEntryId,&junkFolderId); ++ delete junkFolderEntryId; ++ if(er!=erSuccess) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, converting to objectID."); ++ goto exit; ++ } ++ FREE_DBRESULT(); ++ ++ //Get source folder object ID. (Actually we should check if mail came from subfolders in the 'deleted items folder', which I think never happens.) ++ unsigned int srcFolderId; ++ er=g_lpSessionManager->GetCacheManager()->GetParent(ulId,&srcFolderId); ++ if(er!=erSuccess) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve src folder id."); ++ goto exit; ++ } ++ ++ //Check if object is ham or spam ++ string shMailStatus; ++ //if destination folder is junk, mark as spam ++ if(ulDestFolderId==junkFolderId) ++ shMailStatus="spam"; ++ else ++ { ++ //if destination folder is not TRASH and de source folder is JUNK, mark as ham ++ if(ulDestFolderId!=wasteBucketFolderId && srcFolderId==junkFolderId) ++ shMailStatus="ham"; ++ } ++ ++ //Only call hook script if the mail is marked as ham or spam. ++ if(!shMailStatus.empty()) { ++ ++ //Get the mail from the DB. ++ strQuery="SELECT val_string FROM properties WHERE tag="+stringify(PROP_ID(PR_TRANSPORT_MESSAGE_HEADERS))+" AND hierarchyid= "+stringify(ulId); ++ er = lpDatabase->DoSelect(strQuery, &lpDBResult); ++ if(er != erSuccess) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: db error while retrieve mail header."); ++ goto exit; ++ } ++ lpDBRow = lpDatabase->FetchRow(lpDBResult); ++ int shNumRows=lpDatabase->GetNumRows(lpDBResult); ++ ++ if(shNumRows>0) { ++ ++ // Execute the hook: ++ FILE *shFilePtr; ++ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId); ++ shFilePtr=popen(shScriptPath.c_str(),"w"); ++ fputs(lpDBRow[0],shFilePtr); ++ int shExitCode=pclose(shFilePtr); ++ if(!WIFEXITED(shExitCode)) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: "+shScriptPath+" was terminated abnormally."); ++ goto exit; ++ } ++ //If script exit with non 0, exit.. ++ if(WEXITSTATUS(shExitCode)!=0) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(shExitCode)); ++ er=ZARAFA_E_UNKNOWN; ++ goto exit; ++ } ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed."); ++ er=erSuccess; ++ } ++ else { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail"); ++ } ++ ++ // Free database results ++ FREE_DBRESULT(); ++ } ++ } ++ else { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found"); ++ er=erSuccess; ++ } ++exit: ++ // Free database results ++ FREE_DBRESULT(); ++ ++ return er; ++} ++ + + // Move one or more messages and/or moved a softdeleted message to a normal message + ECRESULT MoveObjects(ECSession *lpSession, ECDatabase *lpDatabase, ECListInt* lplObjectIds, unsigned int ulDestFolderId, unsigned int ulSyncId) +@@ -8096,6 +8256,17 @@ SOAP_ENTRY_START5(copyObjects, *result, + + // @note The object type checking wille be done in MoveObjects or CopyObject + ++//SPAMHOOK ++///////////////////////////////////// ++ //Iterate over all mail ids and initiate spamhook. ++ for(iObjectId = lObjectIds.begin(); iObjectId != lObjectIds.end(); iObjectId++) ++ { ++ //Ignore the result ++ int shResult=SpamHook(lpDatabase,*iObjectId,ulDestFolderId); ++ } ++//SPAMHOOK END ++//////////////////////////////////// ++ + //check copy or a move + if(ulFlags & FOLDER_MOVE ) { // A move + er = MoveObjects(lpecSession, lpDatabase, &lObjectIds, ulDestFolderId, ulSyncId); +diff -rupN zarafa-6.40.0-orig/provider/server/ECServer.cpp zarafa-6.40.0/provider/server/ECServer.cpp +--- zarafa-6.40.0-orig/provider/server/ECServer.cpp 2010-05-31 19:28:59.000000000 +0200 ++++ zarafa-6.40.0/provider/server/ECServer.cpp 2010-07-20 17:26:25.119624516 +0200 +@@ -670,6 +670,7 @@ int running_server(char *szName, char *s + { "deletegroup_script", "/etc/zarafa/userscripts/deletegroup", CONFIGSETTING_RELOADABLE}, + { "createcompany_script", "/etc/zarafa/userscripts/createcompany", CONFIGSETTING_RELOADABLE }, + { "deletecompany_script", "/etc/zarafa/userscripts/deletecompany", CONFIGSETTING_RELOADABLE }, ++ { "junklearn_script", "/etc/zarafa/userscripts/junklearn", CONFIGSETTING_RELOADABLE }, + { "user_safe_mode", "no", CONFIGSETTING_RELOADABLE }, + + // Storename format diff --git a/net-mail/zarafa/files/6.40.15.33766/fix-pthread.patch b/net-mail/zarafa/files/6.40.15.33766/fix-pthread.patch new file mode 100644 index 0000000..b374366 --- /dev/null +++ b/net-mail/zarafa/files/6.40.15.33766/fix-pthread.patch @@ -0,0 +1,51 @@ +diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh +--- zarafa-6.40.6.orig//autoconf/ltmain.sh 2011-03-20 08:23:21.000000000 +0100 ++++ zarafa-6.40.6/autoconf/ltmain.sh 2011-03-20 08:24:23.000000000 +0100 +@@ -1628,7 +1628,7 @@ + elif test "X$arg" = "X-lc_r"; then + case $host in + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) +- # Do not include libc_r directly, use -pthread flag. ++ # Do not include libc_r directly, use -lpthread flag. + continue + ;; + esac +@@ -1647,7 +1647,7 @@ + continue + ;; + +- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) ++ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads) + compiler_flags="$compiler_flags $arg" + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +@@ -2150,7 +2150,7 @@ + lib= + found=no + case $deplib in +- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) ++ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" +diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac +--- zarafa-6.40.6.orig//configure.ac 2011-03-20 08:23:20.000000000 +0100 ++++ zarafa-6.40.6/configure.ac 2011-03-20 08:23:44.000000000 +0100 +@@ -407,7 +407,7 @@ + CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX" + fi + # force add pthread in lucene test +-CXXFLAGS="$CXXFLAGS -pthread" ++CXXFLAGS="$CXXFLAGS -lpthread" + if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then + AC_CHECK_LIB(clucene, [open], + [ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a" +@@ -561,7 +561,7 @@ + AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([required library libpthread missing or unusable])) + LIBS=$libs_keep + # because it seems this is better... (gnu c/c++ only?) +-CXXFLAGS="$CXXFLAGS -pthread" ++CXXFLAGS="$CXXFLAGS -lpthread" + + # Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections + libs_keep=$LIBS diff --git a/net-mail/zarafa/files/6.40.15.33766/fix-zarafaserver-uuid-linkage.patch b/net-mail/zarafa/files/6.40.15.33766/fix-zarafaserver-uuid-linkage.patch new file mode 100644 index 0000000..610b74d --- /dev/null +++ b/net-mail/zarafa/files/6.40.15.33766/fix-zarafaserver-uuid-linkage.patch @@ -0,0 +1,26 @@ +Index: zarafa-6.40.0/provider/server/Makefile.in +=================================================================== +--- zarafa-6.40.0.orig/provider/server/Makefile.in ++++ zarafa-6.40.0/provider/server/Makefile.in +@@ -274,7 +274,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT + ${top_builddir}/common/libcommon_util.la \ + ${top_builddir}/common/libcommon_mapi.la \ + ${top_builddir}/common/libcommon_ssl.la \ +- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt ++ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt + + zarafa_server_SOURCES = ECServer.cpp \ + ECSoapServerConnection.h ECSoapServerConnection.cpp \ +Index: zarafa-6.40.0/provider/server/Makefile.am +=================================================================== +--- zarafa-6.40.0.orig/provider/server/Makefile.am ++++ zarafa-6.40.0/provider/server/Makefile.am +@@ -18,7 +18,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT + ${top_builddir}/common/libcommon_util.la \ + ${top_builddir}/common/libcommon_mapi.la \ + ${top_builddir}/common/libcommon_ssl.la \ +- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt ++ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt + + zarafa_server_SOURCES = ECServer.cpp \ + ECSoapServerConnection.h ECSoapServerConnection.cpp \ diff --git a/net-mail/zarafa/files/6.40.15.33766/fix-zarafastats-uuid-linkage.patch b/net-mail/zarafa/files/6.40.15.33766/fix-zarafastats-uuid-linkage.patch new file mode 100644 index 0000000..05e1406 --- /dev/null +++ b/net-mail/zarafa/files/6.40.15.33766/fix-zarafastats-uuid-linkage.patch @@ -0,0 +1,24 @@ +diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am +--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:37:49.561680215 +0300 ++++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:38:31.435806562 +0300 +@@ -13,7 +13,7 @@ + ${top_builddir}/mapi4linux/src/libmapi.la \ + ${top_builddir}/common/libcommon_mapi.la \ + ${top_builddir}/common/libcommon_util.la \ +- -lncurses ++ -lncurses -luuid + + zarafa_stats_SOURCES = zarafa-stats.cpp + +diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in +--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:37:49.561680215 +0300 ++++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:38:22.475687815 +0300 +@@ -250,7 +250,7 @@ + ${top_builddir}/mapi4linux/src/libmapi.la \ + ${top_builddir}/common/libcommon_mapi.la \ + ${top_builddir}/common/libcommon_util.la \ +- -lncurses ++ -lncurses -luuid + + zarafa_stats_SOURCES = zarafa-stats.cpp + all: all-am diff --git a/net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.1-no-php-conf.patch b/net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.1-no-php-conf.patch new file mode 100644 index 0000000..9e51f09 --- /dev/null +++ b/net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.1-no-php-conf.patch @@ -0,0 +1,44 @@ +--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100 ++++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100 +@@ -34,7 +34,7 @@ + build_triplet = @build@ + host_triplet = @host@ + subdir = php-ext +-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \ ++DIST_COMMON = $(dist_data_DATA) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.ac +@@ -86,7 +86,7 @@ + DIST_SOURCES = $(mapi_la_SOURCES) + dist_dataDATA_INSTALL = $(INSTALL_DATA) + dist_sysconfDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(dist_data_DATA) $(dist_sysconf_DATA) ++DATA = $(dist_data_DATA) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -406,23 +406,6 @@ + echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \ + rm -f "$(DESTDIR)$(datadir)/$$f"; \ + done +-install-dist_sysconfDATA: $(dist_sysconf_DATA) +- @$(NORMAL_INSTALL) +- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" +- @list='$(dist_sysconf_DATA)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ +- done +- +-uninstall-dist_sysconfDATA: +- @$(NORMAL_UNINSTALL) +- @list='$(dist_sysconf_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \ +- done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ diff --git a/net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.10-package.patch b/net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.10-package.patch new file mode 100644 index 0000000..a55300b --- /dev/null +++ b/net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.10-package.patch @@ -0,0 +1,69 @@ +Patch by Robert Scheck for zarafa >= 6.40.0, which only +removes the paths from autoconf/automake related files, that don't exist in the OSS +version of Zarafa. Having these paths not removed causes autoreconf to fail, but a +re-run of autoreconf is needed in order to get the rpaths completely out of all the +libraries and binaries built during the make process. + +forward patch by Mario Fetka + +diff -uNr zarafa-6.40.10.orig//ECtools/Makefile.am zarafa-6.40.10/ECtools/Makefile.am +--- zarafa-6.40.10.orig//ECtools/Makefile.am 2011-07-25 20:03:46.527000045 +0200 ++++ zarafa-6.40.10/ECtools/Makefile.am 2011-07-25 20:04:37.900000042 +0200 +@@ -1,10 +1,3 @@ +-if ! OSS_ONLY +-PROSUBS = zarafa-backup zarafa-report +-if WITH_PYTHON +-PROSUBS += za-extra +-endif +-endif +- + if WITH_TESTTOOLS + TESTSUBS = ECTestTools + endif +diff -uNr zarafa-6.40.10.orig//Makefile.am zarafa-6.40.10/Makefile.am +--- zarafa-6.40.10.orig//Makefile.am 2011-07-25 20:03:46.610000045 +0200 ++++ zarafa-6.40.10/Makefile.am 2011-07-25 20:05:12.960000054 +0200 +@@ -1,10 +1,6 @@ + AUTOMAKE_OPTIONS = 1.9 foreign + ACLOCAL_AMFLAGS = -Iautoconf + +-if ! OSS_ONLY +-PROSUBS = liblicense licensed +-endif +- + SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext ECtools spooler gateway caldav installer po doc + + if WITH_SWIG +@@ -26,10 +22,6 @@ + common/ecversion.h: versionheader.sh + sh ${top_srcdir}/versionheader.sh > common/ecversion.h + +-if ! OSS_ONLY +-CLEANFILES=common/ecversion.h +-endif +- + dist-hook: + find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true + if OSS_ONLY +diff -uNr zarafa-6.40.10.orig//configure.ac zarafa-6.40.10/configure.ac +--- zarafa-6.40.10.orig//configure.ac 2011-07-25 20:03:46.747000046 +0200 ++++ zarafa-6.40.10/configure.ac 2011-07-25 20:06:33.002000046 +0200 +@@ -819,18 +819,6 @@ + version + specialbuild + ]) +-dnl non-oss files +-if test -d `dirname $0`/licensed; then +-AC_CONFIG_FILES([ +- liblicense/Makefile +- licensed/Makefile +- ECtools/zarafa-backup/Makefile +- ECtools/zarafa-backup/helpers/Makefile +- ECtools/zarafa-report/Makefile +- debian/zarafa.install +- ECtools/za-extra/Makefile +-]) +-fi + + AC_OUTPUT + diff --git a/net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.2-libtcmalloc_shared-1.patch b/net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.2-libtcmalloc_shared-1.patch new file mode 100644 index 0000000..0c69fa7 --- /dev/null +++ b/net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.2-libtcmalloc_shared-1.patch @@ -0,0 +1,19 @@ +Submitted By: Mario Fetka ( mario.fetka@gmaail.com) +Date: 2010-10-11 +Initial Package Version: 6.40.2 +Origin: me +Upstream Status: unknown +Description: on gentoo libtcmalloc_minimal is only provided as shared lib + +diff -Naur zarafa-6.40.2.orig/configure.ac zarafa-6.40.2/configure.ac +--- zarafa-6.40.2.orig/configure.ac 2010-10-11 18:39:35.000000000 +0000 ++++ zarafa-6.40.2/configure.ac 2010-10-11 18:40:03.000000000 +0000 +@@ -441,7 +441,7 @@ + AC_HELP_STRING([--with-tcmalloc-prefix=PATH],[path to tcmalloc lib, e.g. /usr/lib/]), + [TCMALLOC_PREFIX=${withval}],[TCMALLOC_PREFIX=/usr/lib]) + AC_CHECK_LIB(tcmalloc_minimal, [open], +- [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.a" ], ++ [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" ], + [ WITH_TCMALLOC=no ]) + AC_SUBST(TCMALLOC_LIBS) + AC_LANG_POP diff --git a/net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.2-sysconfig2confd-1.patch b/net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.2-sysconfig2confd-1.patch new file mode 100644 index 0000000..ed8f328 --- /dev/null +++ b/net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.2-sysconfig2confd-1.patch @@ -0,0 +1,187 @@ +Submitted By: Mario Fetka (mario.fetka@gmail.com) +Date: 2010-10-13 +Initial Package Version: 6.40.2 +Origin: me +Upstream Status: gentoo specific +Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d + +diff -Naur zarafa-6.40.2.orig/installer/linux/Makefile.am zarafa-6.40.2/installer/linux/Makefile.am +--- zarafa-6.40.2.orig/installer/linux/Makefile.am 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/linux/Makefile.am 2010-10-13 08:28:26.000000000 +0000 +@@ -26,7 +26,7 @@ + sysconf_initdir=${sysconfdir}/init.d + sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files} + +-rhel_sysconfig_path = ${sysconfdir}/sysconfig ++rhel_sysconfig_path = ${sysconfdir}/conf.d + suse_sysconfig_path = ${localstatedir}/adm/fillup-templates + sles_sysconfig_path = ${localstatedir}/adm/fillup-templates + sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path} +diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany zarafa-6.40.2/installer/userscripts/createcompany +--- zarafa-6.40.2.orig/installer/userscripts/createcompany 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/createcompany 2010-10-13 08:26:53.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then +- . ${prefix}/etc/sysconfig/zarafa ++if [ -f ${prefix}/etc/conf.d/zarafa ]; then ++ . ${prefix}/etc/conf.d/zarafa + fi + + ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/createcompany.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany.in zarafa-6.40.2/installer/userscripts/createcompany.in +--- zarafa-6.40.2.orig/installer/userscripts/createcompany.in 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/createcompany.in 2010-10-13 08:27:00.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa ]; then ++ . @sysconfdir@/conf.d/zarafa + fi + + ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/createcompany.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup zarafa-6.40.2/installer/userscripts/creategroup +--- zarafa-6.40.2.orig/installer/userscripts/creategroup 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/creategroup 2010-10-13 08:27:04.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then +- . ${prefix}/etc/sysconfig/zarafa ++if [ -f ${prefix}/etc/conf.d/zarafa ]; then ++ . ${prefix}/etc/conf.d/zarafa + fi + + ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/creategroup.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup.in zarafa-6.40.2/installer/userscripts/creategroup.in +--- zarafa-6.40.2.orig/installer/userscripts/creategroup.in 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/creategroup.in 2010-10-13 08:27:08.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa ]; then ++ . @sysconfdir@/conf.d/zarafa + fi + + ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/creategroup.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser zarafa-6.40.2/installer/userscripts/createuser +--- zarafa-6.40.2.orig/installer/userscripts/createuser 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/createuser 2010-10-13 08:27:12.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then +- . ${prefix}/etc/sysconfig/zarafa ++if [ -f ${prefix}/etc/conf.d/zarafa ]; then ++ . ${prefix}/etc/conf.d/zarafa + fi + + ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/createuser.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser.in zarafa-6.40.2/installer/userscripts/createuser.in +--- zarafa-6.40.2.orig/installer/userscripts/createuser.in 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/createuser.in 2010-10-13 08:27:17.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa ]; then ++ . @sysconfdir@/conf.d/zarafa + fi + + ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/createuser.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany zarafa-6.40.2/installer/userscripts/deletecompany +--- zarafa-6.40.2.orig/installer/userscripts/deletecompany 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/deletecompany 2010-10-13 08:27:22.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then +- . ${prefix}/etc/sysconfig/zarafa ++if [ -f ${prefix}/etc/conf.d/zarafa ]; then ++ . ${prefix}/etc/conf.d/zarafa + fi + + ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/deletecompany.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany.in zarafa-6.40.2/installer/userscripts/deletecompany.in +--- zarafa-6.40.2.orig/installer/userscripts/deletecompany.in 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/deletecompany.in 2010-10-13 08:27:26.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa ]; then ++ . @sysconfdir@/conf.d/zarafa + fi + + ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup zarafa-6.40.2/installer/userscripts/deletegroup +--- zarafa-6.40.2.orig/installer/userscripts/deletegroup 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/deletegroup 2010-10-13 08:27:30.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then +- . ${prefix}/etc/sysconfig/zarafa ++if [ -f ${prefix}/etc/conf.d/zarafa ]; then ++ . ${prefix}/etc/conf.d/zarafa + fi + + ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/deletegroup.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup.in zarafa-6.40.2/installer/userscripts/deletegroup.in +--- zarafa-6.40.2.orig/installer/userscripts/deletegroup.in 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/deletegroup.in 2010-10-13 08:27:35.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa ]; then ++ . @sysconfdir@/conf.d/zarafa + fi + + ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser zarafa-6.40.2/installer/userscripts/deleteuser +--- zarafa-6.40.2.orig/installer/userscripts/deleteuser 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/deleteuser 2010-10-13 08:27:39.000000000 +0000 +@@ -9,8 +9,8 @@ + # that this string can contain any characters, so take heed to correct + # quoting. + +-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then +- . ${prefix}/etc/sysconfig/zarafa ++if [ -f ${prefix}/etc/conf.d/zarafa ]; then ++ . ${prefix}/etc/conf.d/zarafa + fi + + ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/deleteuser.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser.in zarafa-6.40.2/installer/userscripts/deleteuser.in +--- zarafa-6.40.2.orig/installer/userscripts/deleteuser.in 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/deleteuser.in 2010-10-13 08:27:43.000000000 +0000 +@@ -9,8 +9,8 @@ + # that this string can contain any characters, so take heed to correct + # quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa ]; then ++ . @sysconfdir@/conf.d/zarafa + fi + + ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d diff --git a/net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.6-force_latin1.patch b/net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.6-force_latin1.patch new file mode 100644 index 0000000..82ada47 --- /dev/null +++ b/net-mail/zarafa/files/6.40.15.33766/zarafa-6.40.6-force_latin1.patch @@ -0,0 +1,14 @@ +diff -uNr zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp +--- zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp 2011-03-20 23:50:06.000000000 +0100 ++++ zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp 2011-03-21 00:00:45.000000000 +0100 +@@ -343,6 +343,10 @@ + // this option was introduced in mysql 5.0, so let's not even try on 4.1 servers + strQuery = "SET SESSION sql_mode = 'STRICT_ALL_TABLES'"; + Query(strQuery); // ignore error ++ ++ // Latin1 is default charset ++ strQuery = "SET NAMES 'latin1'"; ++ Query(strQuery); + } + + exit: diff --git a/net-mail/zarafa/files/6.40.16.34239/Datux-sendas.patch b/net-mail/zarafa/files/6.40.16.34239/Datux-sendas.patch new file mode 100644 index 0000000..d42326f --- /dev/null +++ b/net-mail/zarafa/files/6.40.16.34239/Datux-sendas.patch @@ -0,0 +1,25 @@ +diff -u -r zarafa-6.40.3/spooler/Spooler.cpp zarafa-6.40.3.new/spooler/Spooler.cpp +--- zarafa-6.40.3/spooler/Spooler.cpp 2010-10-20 14:16:24.000000000 +0000 ++++ zarafa-6.40.3.new/spooler/Spooler.cpp 2010-11-10 15:58:43.000000000 +0000 +@@ -935,6 +935,7 @@ + { "fax_domain", "", CONFIGSETTING_RELOADABLE }, + { "fax_international", "+", CONFIGSETTING_RELOADABLE }, + { "always_send_delegates", "no", CONFIGSETTING_RELOADABLE }, ++ { "always_send_as", "no", CONFIGSETTING_RELOADABLE }, + { "always_send_tnef", "no", CONFIGSETTING_RELOADABLE }, + { "allow_redirect_spoofing", "yes", CONFIGSETTING_RELOADABLE }, + { "allow_delegate_meeting_request", "yes", CONFIGSETTING_RELOADABLE }, +diff -u -r zarafa-6.40.3/spooler/mailer.cpp zarafa-6.40.3.new/spooler/mailer.cpp +--- zarafa-6.40.3/spooler/mailer.cpp 2010-10-20 14:16:24.000000000 +0000 ++++ zarafa-6.40.3.new/spooler/mailer.cpp 2010-11-10 15:58:09.000000000 +0000 +@@ -1949,6 +1949,10 @@ + HrGetOneProp(lpMessage, PR_AUTO_FORWARDED, &lpAutoForward) == hrSuccess && lpAutoForward->Value.b) + { + bAllowSendAs = true; ++ } else if (strcmp(g_lpConfig->GetSetting("always_send_as"), "yes") == 0) { ++ //use always_send_as to allow everybody to send as someone else. ++ //(some users hate the 'on behalf of' text, and dont want to do the extra configuration) ++ bAllowSendAs = true; + } else { + + hr = HrGetOneProp(lpUserStore, PR_MAILBOX_OWNER_ENTRYID, &lpPropOwner); diff --git a/net-mail/zarafa/files/6.40.16.34239/Datux-spamhook.patch b/net-mail/zarafa/files/6.40.16.34239/Datux-spamhook.patch new file mode 100644 index 0000000..c35d6d2 --- /dev/null +++ b/net-mail/zarafa/files/6.40.16.34239/Datux-spamhook.patch @@ -0,0 +1,199 @@ +diff -rupN zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp +--- zarafa-6.40.0-orig/provider/libserver/ZarafaCmd.cpp 2010-05-31 19:28:59.000000000 +0200 ++++ zarafa-6.40.0/provider/libserver/ZarafaCmd.cpp 2010-07-20 17:22:07.995625072 +0200 +@@ -7244,6 +7244,166 @@ typedef struct{ + SOURCEKEY sSourceKey; + SOURCEKEY sParentSourceKey; + }COPYITEM; ++//SPAM HOOK ++//This function parses an e-mail to the /etc/zarafa/userscripts/junklearn script. With 2 arguments: ++//ham or spam ++//message id ++//and pipes the mail header to the script. ++//This script wil be inhaled by MoveObjects(); ++///////////////////////////////////////////////////////////////////////////////////////////////// ++int SpamHook(ECDatabase *lpDatabase,int ulId,int ulDestFolderId) ++{ ++ ++ ALLOC_DBRESULT(); ++ ECRESULT er = erSuccess; ++ std::string shScriptPath = g_lpSessionManager->GetConfig()->GetSetting("junklearn_script"); ++ ++ //If shScriptPath doesn't exist skip spam hook. ++ if(fopen(shScriptPath.c_str(),"r")) { ++ ++ //Get store object ID via message object id ++ unsigned int storeId; ++ er = g_lpSessionManager->GetCacheManager()->GetStore(ulId,&storeId,NULL); ++ if(er != erSuccess) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve source folder."); ++ goto exit; ++ } ++ ++ //get deleted items folder entry id ++ strQuery="SELECT val_binary FROM properties WHERE hierarchyid="+stringify(storeId)+" AND tag="+stringify(PROP_ID(PR_IPM_WASTEBASKET_ENTRYID)); ++ er = lpDatabase->DoSelect(strQuery, &lpDBResult); ++ if(er != erSuccess) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid from DB."); ++ goto exit; ++ } ++ lpDBRow = lpDatabase->FetchRow(lpDBResult); ++ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult); ++ int shNumRows=lpDatabase->GetNumRows(lpDBResult); ++ if(shNumRows<1) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, empty DB result."); ++ goto exit; ++ } ++ ++ //Convert 'deleted items' entryid to objectid. ++ entryId* wasteBucketEntryId = new entryId[0]; ++ wasteBucketEntryId->__ptr=(unsigned char*)lpDBRow[0]; ++ wasteBucketEntryId->__size=lpDBLen[0]; ++ unsigned int wasteBucketFolderId; ++ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(wasteBucketEntryId,&wasteBucketFolderId); ++ delete wasteBucketEntryId; ++ if(er!=erSuccess) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve wastebasket entryid, converting to objectID."); ++ goto exit; ++ } ++ FREE_DBRESULT(); ++ ++ //Get 'junk folder' entryId. ++ strQuery="SELECT val_binary FROM receivefolder LEFT JOIN mvproperties ON receivefolder.objid=mvproperties.hierarchyid WHERE receivefolder.storeid="+stringify(storeId)+" AND receivefolder.messageclass='IPC' AND mvproperties.tag="+stringify(PROP_ID(PR_ADDITIONAL_REN_ENTRYIDS))+" AND mvproperties.orderid=4"; ++ er = lpDatabase->DoSelect(strQuery, &lpDBResult); ++ if(er != erSuccess) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryids from DB."); ++ goto exit; ++ } ++ lpDBRow = lpDatabase->FetchRow(lpDBResult); ++ lpDBLen = lpDatabase->FetchRowLengths(lpDBResult); ++ shNumRows=lpDatabase->GetNumRows(lpDBResult); ++ if(shNumRows<1) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, empty DB result."); ++ goto exit; ++ } ++ ++ //Convert 'junk folder' entryid to objectid. ++ entryId* junkFolderEntryId = new entryId[0]; ++ junkFolderEntryId->__ptr=(unsigned char*)lpDBRow[0]; ++ junkFolderEntryId->__size=lpDBLen[0]; ++ unsigned int junkFolderId; ++ er=g_lpSessionManager->GetCacheManager()->GetObjectFromEntryId(junkFolderEntryId,&junkFolderId); ++ delete junkFolderEntryId; ++ if(er!=erSuccess) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve junkfolder entryid, converting to objectID."); ++ goto exit; ++ } ++ FREE_DBRESULT(); ++ ++ //Get source folder object ID. (Actually we should check if mail came from subfolders in the 'deleted items folder', which I think never happens.) ++ unsigned int srcFolderId; ++ er=g_lpSessionManager->GetCacheManager()->GetParent(ulId,&srcFolderId); ++ if(er!=erSuccess) ++ { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error while retrieve src folder id."); ++ goto exit; ++ } ++ ++ //Check if object is ham or spam ++ string shMailStatus; ++ //if destination folder is junk, mark as spam ++ if(ulDestFolderId==junkFolderId) ++ shMailStatus="spam"; ++ else ++ { ++ //if destination folder is not TRASH and de source folder is JUNK, mark as ham ++ if(ulDestFolderId!=wasteBucketFolderId && srcFolderId==junkFolderId) ++ shMailStatus="ham"; ++ } ++ ++ //Only call hook script if the mail is marked as ham or spam. ++ if(!shMailStatus.empty()) { ++ ++ //Get the mail from the DB. ++ strQuery="SELECT val_string FROM properties WHERE tag="+stringify(PROP_ID(PR_TRANSPORT_MESSAGE_HEADERS))+" AND hierarchyid= "+stringify(ulId); ++ er = lpDatabase->DoSelect(strQuery, &lpDBResult); ++ if(er != erSuccess) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: db error while retrieve mail header."); ++ goto exit; ++ } ++ lpDBRow = lpDatabase->FetchRow(lpDBResult); ++ int shNumRows=lpDatabase->GetNumRows(lpDBResult); ++ ++ if(shNumRows>0) { ++ ++ // Execute the hook: ++ FILE *shFilePtr; ++ shScriptPath=shScriptPath+" "+shMailStatus+" "+stringify(ulId); ++ shFilePtr=popen(shScriptPath.c_str(),"w"); ++ fputs(lpDBRow[0],shFilePtr); ++ int shExitCode=pclose(shFilePtr); ++ if(!WIFEXITED(shExitCode)) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: "+shScriptPath+" was terminated abnormally."); ++ goto exit; ++ } ++ //If script exit with non 0, exit.. ++ if(WEXITSTATUS(shExitCode)!=0) { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: error "+shScriptPath+" exits with: "+stringify(shExitCode)); ++ er=ZARAFA_E_UNKNOWN; ++ goto exit; ++ } ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: "+shScriptPath+" successfully executed."); ++ er=erSuccess; ++ } ++ else { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_WARNING,"SpamHook: warning mail header empty or this object is no e-mail"); ++ } ++ ++ // Free database results ++ FREE_DBRESULT(); ++ } ++ } ++ else { ++ g_lpSessionManager->GetLogger()->Log(EC_LOGLEVEL_INFO,"SpamHook: skipping, script "+shScriptPath+" not found"); ++ er=erSuccess; ++ } ++exit: ++ // Free database results ++ FREE_DBRESULT(); ++ ++ return er; ++} ++ + + // Move one or more messages and/or moved a softdeleted message to a normal message + ECRESULT MoveObjects(ECSession *lpSession, ECDatabase *lpDatabase, ECListInt* lplObjectIds, unsigned int ulDestFolderId, unsigned int ulSyncId) +@@ -8096,6 +8256,17 @@ SOAP_ENTRY_START5(copyObjects, *result, + + // @note The object type checking wille be done in MoveObjects or CopyObject + ++//SPAMHOOK ++///////////////////////////////////// ++ //Iterate over all mail ids and initiate spamhook. ++ for(iObjectId = lObjectIds.begin(); iObjectId != lObjectIds.end(); iObjectId++) ++ { ++ //Ignore the result ++ int shResult=SpamHook(lpDatabase,*iObjectId,ulDestFolderId); ++ } ++//SPAMHOOK END ++//////////////////////////////////// ++ + //check copy or a move + if(ulFlags & FOLDER_MOVE ) { // A move + er = MoveObjects(lpecSession, lpDatabase, &lObjectIds, ulDestFolderId, ulSyncId); +diff -rupN zarafa-6.40.0-orig/provider/server/ECServer.cpp zarafa-6.40.0/provider/server/ECServer.cpp +--- zarafa-6.40.0-orig/provider/server/ECServer.cpp 2010-05-31 19:28:59.000000000 +0200 ++++ zarafa-6.40.0/provider/server/ECServer.cpp 2010-07-20 17:26:25.119624516 +0200 +@@ -670,6 +670,7 @@ int running_server(char *szName, char *s + { "deletegroup_script", "/etc/zarafa/userscripts/deletegroup", CONFIGSETTING_RELOADABLE}, + { "createcompany_script", "/etc/zarafa/userscripts/createcompany", CONFIGSETTING_RELOADABLE }, + { "deletecompany_script", "/etc/zarafa/userscripts/deletecompany", CONFIGSETTING_RELOADABLE }, ++ { "junklearn_script", "/etc/zarafa/userscripts/junklearn", CONFIGSETTING_RELOADABLE }, + { "user_safe_mode", "no", CONFIGSETTING_RELOADABLE }, + + // Storename format diff --git a/net-mail/zarafa/files/6.40.16.34239/fix-pthread.patch b/net-mail/zarafa/files/6.40.16.34239/fix-pthread.patch new file mode 100644 index 0000000..b374366 --- /dev/null +++ b/net-mail/zarafa/files/6.40.16.34239/fix-pthread.patch @@ -0,0 +1,51 @@ +diff -uNr zarafa-6.40.6.orig//autoconf/ltmain.sh zarafa-6.40.6/autoconf/ltmain.sh +--- zarafa-6.40.6.orig//autoconf/ltmain.sh 2011-03-20 08:23:21.000000000 +0100 ++++ zarafa-6.40.6/autoconf/ltmain.sh 2011-03-20 08:24:23.000000000 +0100 +@@ -1628,7 +1628,7 @@ + elif test "X$arg" = "X-lc_r"; then + case $host in + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) +- # Do not include libc_r directly, use -pthread flag. ++ # Do not include libc_r directly, use -lpthread flag. + continue + ;; + esac +@@ -1647,7 +1647,7 @@ + continue + ;; + +- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) ++ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads) + compiler_flags="$compiler_flags $arg" + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" +@@ -2150,7 +2150,7 @@ + lib= + found=no + case $deplib in +- -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) ++ -mt|-mthreads|-kthread|-Kthread|-lpthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" +diff -uNr zarafa-6.40.6.orig//configure.ac zarafa-6.40.6/configure.ac +--- zarafa-6.40.6.orig//configure.ac 2011-03-20 08:23:20.000000000 +0100 ++++ zarafa-6.40.6/configure.ac 2011-03-20 08:23:44.000000000 +0100 +@@ -407,7 +407,7 @@ + CPPFLAGS="$CPPFLAGS -I$CLUCENE_INCLUDE_PREFIX" + fi + # force add pthread in lucene test +-CXXFLAGS="$CXXFLAGS -pthread" ++CXXFLAGS="$CXXFLAGS -lpthread" + if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then + AC_CHECK_LIB(clucene, [open], + [ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a" +@@ -561,7 +561,7 @@ + AC_CHECK_LIB([pthread], [pthread_create],, AC_MSG_ERROR([required library libpthread missing or unusable])) + LIBS=$libs_keep + # because it seems this is better... (gnu c/c++ only?) +-CXXFLAGS="$CXXFLAGS -pthread" ++CXXFLAGS="$CXXFLAGS -lpthread" + + # Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections + libs_keep=$LIBS diff --git a/net-mail/zarafa/files/6.40.16.34239/fix-zarafaserver-uuid-linkage.patch b/net-mail/zarafa/files/6.40.16.34239/fix-zarafaserver-uuid-linkage.patch new file mode 100644 index 0000000..610b74d --- /dev/null +++ b/net-mail/zarafa/files/6.40.16.34239/fix-zarafaserver-uuid-linkage.patch @@ -0,0 +1,26 @@ +Index: zarafa-6.40.0/provider/server/Makefile.in +=================================================================== +--- zarafa-6.40.0.orig/provider/server/Makefile.in ++++ zarafa-6.40.0/provider/server/Makefile.in +@@ -274,7 +274,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT + ${top_builddir}/common/libcommon_util.la \ + ${top_builddir}/common/libcommon_mapi.la \ + ${top_builddir}/common/libcommon_ssl.la \ +- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt ++ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt + + zarafa_server_SOURCES = ECServer.cpp \ + ECSoapServerConnection.h ECSoapServerConnection.cpp \ +Index: zarafa-6.40.0/provider/server/Makefile.am +=================================================================== +--- zarafa-6.40.0.orig/provider/server/Makefile.am ++++ zarafa-6.40.0/provider/server/Makefile.am +@@ -18,7 +18,7 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INT + ${top_builddir}/common/libcommon_util.la \ + ${top_builddir}/common/libcommon_mapi.la \ + ${top_builddir}/common/libcommon_ssl.la \ +- $(MYSQL_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt ++ $(MYSQL_LIBS) $(UUID_LIBS) $(SSL_LIBS) $(PAM_LIBS) $(KRB5_LIBS) $(TCMALLOC_LIBS) -lrt + + zarafa_server_SOURCES = ECServer.cpp \ + ECSoapServerConnection.h ECSoapServerConnection.cpp \ diff --git a/net-mail/zarafa/files/6.40.16.34239/fix-zarafastats-uuid-linkage.patch b/net-mail/zarafa/files/6.40.16.34239/fix-zarafastats-uuid-linkage.patch new file mode 100644 index 0000000..05e1406 --- /dev/null +++ b/net-mail/zarafa/files/6.40.16.34239/fix-zarafastats-uuid-linkage.patch @@ -0,0 +1,24 @@ +diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am +--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:37:49.561680215 +0300 ++++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.am 2010-04-26 11:38:31.435806562 +0300 +@@ -13,7 +13,7 @@ + ${top_builddir}/mapi4linux/src/libmapi.la \ + ${top_builddir}/common/libcommon_mapi.la \ + ${top_builddir}/common/libcommon_util.la \ +- -lncurses ++ -lncurses -luuid + + zarafa_stats_SOURCES = zarafa-stats.cpp + +diff -Nuar zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in +--- zarafa-6.40.0.orig/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:37:49.561680215 +0300 ++++ zarafa-6.40.0/ECtools/zarafa-stats/Makefile.in 2010-04-26 11:38:22.475687815 +0300 +@@ -250,7 +250,7 @@ + ${top_builddir}/mapi4linux/src/libmapi.la \ + ${top_builddir}/common/libcommon_mapi.la \ + ${top_builddir}/common/libcommon_util.la \ +- -lncurses ++ -lncurses -luuid + + zarafa_stats_SOURCES = zarafa-stats.cpp + all: all-am diff --git a/net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.1-no-php-conf.patch b/net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.1-no-php-conf.patch new file mode 100644 index 0000000..9e51f09 --- /dev/null +++ b/net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.1-no-php-conf.patch @@ -0,0 +1,44 @@ +--- php-ext/Makefile.in~ 2010-10-20 12:26:22.000000000 +0100 ++++ php-ext/Makefile.in 2010-10-28 13:40:48.830318647 +0100 +@@ -34,7 +34,7 @@ + build_triplet = @build@ + host_triplet = @host@ + subdir = php-ext +-DIST_COMMON = $(dist_data_DATA) $(dist_sysconf_DATA) \ ++DIST_COMMON = $(dist_data_DATA) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.ac +@@ -86,7 +86,7 @@ + DIST_SOURCES = $(mapi_la_SOURCES) + dist_dataDATA_INSTALL = $(INSTALL_DATA) + dist_sysconfDATA_INSTALL = $(INSTALL_DATA) +-DATA = $(dist_data_DATA) $(dist_sysconf_DATA) ++DATA = $(dist_data_DATA) + ETAGS = etags + CTAGS = ctags + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +@@ -406,23 +406,6 @@ + echo " rm -f '$(DESTDIR)$(datadir)/$$f'"; \ + rm -f "$(DESTDIR)$(datadir)/$$f"; \ + done +-install-dist_sysconfDATA: $(dist_sysconf_DATA) +- @$(NORMAL_INSTALL) +- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" +- @list='$(dist_sysconf_DATA)'; for p in $$list; do \ +- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +- f=$(am__strip_dir) \ +- echo " $(dist_sysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- $(dist_sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \ +- done +- +-uninstall-dist_sysconfDATA: +- @$(NORMAL_UNINSTALL) +- @list='$(dist_sysconf_DATA)'; for p in $$list; do \ +- f=$(am__strip_dir) \ +- echo " rm -f '$(DESTDIR)$(sysconfdir)/$$f'"; \ +- rm -f "$(DESTDIR)$(sysconfdir)/$$f"; \ +- done + + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ diff --git a/net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.10-package.patch b/net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.10-package.patch new file mode 100644 index 0000000..a55300b --- /dev/null +++ b/net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.10-package.patch @@ -0,0 +1,69 @@ +Patch by Robert Scheck for zarafa >= 6.40.0, which only +removes the paths from autoconf/automake related files, that don't exist in the OSS +version of Zarafa. Having these paths not removed causes autoreconf to fail, but a +re-run of autoreconf is needed in order to get the rpaths completely out of all the +libraries and binaries built during the make process. + +forward patch by Mario Fetka + +diff -uNr zarafa-6.40.10.orig//ECtools/Makefile.am zarafa-6.40.10/ECtools/Makefile.am +--- zarafa-6.40.10.orig//ECtools/Makefile.am 2011-07-25 20:03:46.527000045 +0200 ++++ zarafa-6.40.10/ECtools/Makefile.am 2011-07-25 20:04:37.900000042 +0200 +@@ -1,10 +1,3 @@ +-if ! OSS_ONLY +-PROSUBS = zarafa-backup zarafa-report +-if WITH_PYTHON +-PROSUBS += za-extra +-endif +-endif +- + if WITH_TESTTOOLS + TESTSUBS = ECTestTools + endif +diff -uNr zarafa-6.40.10.orig//Makefile.am zarafa-6.40.10/Makefile.am +--- zarafa-6.40.10.orig//Makefile.am 2011-07-25 20:03:46.610000045 +0200 ++++ zarafa-6.40.10/Makefile.am 2011-07-25 20:05:12.960000054 +0200 +@@ -1,10 +1,6 @@ + AUTOMAKE_OPTIONS = 1.9 foreign + ACLOCAL_AMFLAGS = -Iautoconf + +-if ! OSS_ONLY +-PROSUBS = liblicense licensed +-endif +- + SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext ECtools spooler gateway caldav installer po doc + + if WITH_SWIG +@@ -26,10 +22,6 @@ + common/ecversion.h: versionheader.sh + sh ${top_srcdir}/versionheader.sh > common/ecversion.h + +-if ! OSS_ONLY +-CLEANFILES=common/ecversion.h +-endif +- + dist-hook: + find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true + if OSS_ONLY +diff -uNr zarafa-6.40.10.orig//configure.ac zarafa-6.40.10/configure.ac +--- zarafa-6.40.10.orig//configure.ac 2011-07-25 20:03:46.747000046 +0200 ++++ zarafa-6.40.10/configure.ac 2011-07-25 20:06:33.002000046 +0200 +@@ -819,18 +819,6 @@ + version + specialbuild + ]) +-dnl non-oss files +-if test -d `dirname $0`/licensed; then +-AC_CONFIG_FILES([ +- liblicense/Makefile +- licensed/Makefile +- ECtools/zarafa-backup/Makefile +- ECtools/zarafa-backup/helpers/Makefile +- ECtools/zarafa-report/Makefile +- debian/zarafa.install +- ECtools/za-extra/Makefile +-]) +-fi + + AC_OUTPUT + diff --git a/net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.2-libtcmalloc_shared-1.patch b/net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.2-libtcmalloc_shared-1.patch new file mode 100644 index 0000000..0c69fa7 --- /dev/null +++ b/net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.2-libtcmalloc_shared-1.patch @@ -0,0 +1,19 @@ +Submitted By: Mario Fetka ( mario.fetka@gmaail.com) +Date: 2010-10-11 +Initial Package Version: 6.40.2 +Origin: me +Upstream Status: unknown +Description: on gentoo libtcmalloc_minimal is only provided as shared lib + +diff -Naur zarafa-6.40.2.orig/configure.ac zarafa-6.40.2/configure.ac +--- zarafa-6.40.2.orig/configure.ac 2010-10-11 18:39:35.000000000 +0000 ++++ zarafa-6.40.2/configure.ac 2010-10-11 18:40:03.000000000 +0000 +@@ -441,7 +441,7 @@ + AC_HELP_STRING([--with-tcmalloc-prefix=PATH],[path to tcmalloc lib, e.g. /usr/lib/]), + [TCMALLOC_PREFIX=${withval}],[TCMALLOC_PREFIX=/usr/lib]) + AC_CHECK_LIB(tcmalloc_minimal, [open], +- [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.a" ], ++ [ TCMALLOC_LIBS="${TCMALLOC_PREFIX}/libtcmalloc_minimal.so" ], + [ WITH_TCMALLOC=no ]) + AC_SUBST(TCMALLOC_LIBS) + AC_LANG_POP diff --git a/net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.2-sysconfig2confd-1.patch b/net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.2-sysconfig2confd-1.patch new file mode 100644 index 0000000..ed8f328 --- /dev/null +++ b/net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.2-sysconfig2confd-1.patch @@ -0,0 +1,187 @@ +Submitted By: Mario Fetka (mario.fetka@gmail.com) +Date: 2010-10-13 +Initial Package Version: 6.40.2 +Origin: me +Upstream Status: gentoo specific +Description: this patch correct the install dir for the default install target from /etc/sysconfig to the gentoo equivalent /etc/conf.d + +diff -Naur zarafa-6.40.2.orig/installer/linux/Makefile.am zarafa-6.40.2/installer/linux/Makefile.am +--- zarafa-6.40.2.orig/installer/linux/Makefile.am 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/linux/Makefile.am 2010-10-13 08:28:26.000000000 +0000 +@@ -26,7 +26,7 @@ + sysconf_initdir=${sysconfdir}/init.d + sysconf_init_SCRIPTS = ${@DISTRO@_initscript_files} + +-rhel_sysconfig_path = ${sysconfdir}/sysconfig ++rhel_sysconfig_path = ${sysconfdir}/conf.d + suse_sysconfig_path = ${localstatedir}/adm/fillup-templates + sles_sysconfig_path = ${localstatedir}/adm/fillup-templates + sysconf_sysconfigdir = ${@DISTRO@_sysconfig_path} +diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany zarafa-6.40.2/installer/userscripts/createcompany +--- zarafa-6.40.2.orig/installer/userscripts/createcompany 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/createcompany 2010-10-13 08:26:53.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then +- . ${prefix}/etc/sysconfig/zarafa ++if [ -f ${prefix}/etc/conf.d/zarafa ]; then ++ . ${prefix}/etc/conf.d/zarafa + fi + + ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/createcompany.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/createcompany.in zarafa-6.40.2/installer/userscripts/createcompany.in +--- zarafa-6.40.2.orig/installer/userscripts/createcompany.in 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/createcompany.in 2010-10-13 08:27:00.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa ]; then ++ . @sysconfdir@/conf.d/zarafa + fi + + ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/createcompany.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup zarafa-6.40.2/installer/userscripts/creategroup +--- zarafa-6.40.2.orig/installer/userscripts/creategroup 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/creategroup 2010-10-13 08:27:04.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then +- . ${prefix}/etc/sysconfig/zarafa ++if [ -f ${prefix}/etc/conf.d/zarafa ]; then ++ . ${prefix}/etc/conf.d/zarafa + fi + + ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/creategroup.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/creategroup.in zarafa-6.40.2/installer/userscripts/creategroup.in +--- zarafa-6.40.2.orig/installer/userscripts/creategroup.in 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/creategroup.in 2010-10-13 08:27:08.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa ]; then ++ . @sysconfdir@/conf.d/zarafa + fi + + ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/creategroup.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser zarafa-6.40.2/installer/userscripts/createuser +--- zarafa-6.40.2.orig/installer/userscripts/createuser 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/createuser 2010-10-13 08:27:12.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then +- . ${prefix}/etc/sysconfig/zarafa ++if [ -f ${prefix}/etc/conf.d/zarafa ]; then ++ . ${prefix}/etc/conf.d/zarafa + fi + + ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/createuser.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/createuser.in zarafa-6.40.2/installer/userscripts/createuser.in +--- zarafa-6.40.2.orig/installer/userscripts/createuser.in 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/createuser.in 2010-10-13 08:27:17.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa ]; then ++ . @sysconfdir@/conf.d/zarafa + fi + + ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/createuser.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany zarafa-6.40.2/installer/userscripts/deletecompany +--- zarafa-6.40.2.orig/installer/userscripts/deletecompany 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/deletecompany 2010-10-13 08:27:22.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then +- . ${prefix}/etc/sysconfig/zarafa ++if [ -f ${prefix}/etc/conf.d/zarafa ]; then ++ . ${prefix}/etc/conf.d/zarafa + fi + + ZARAFA_COMPANY_SCRIPTS=/etc/zarafa/userscripts/deletecompany.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletecompany.in zarafa-6.40.2/installer/userscripts/deletecompany.in +--- zarafa-6.40.2.orig/installer/userscripts/deletecompany.in 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/deletecompany.in 2010-10-13 08:27:26.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa ]; then ++ . @sysconfdir@/conf.d/zarafa + fi + + ZARAFA_COMPANY_SCRIPTS=@USERSCRIPTDIR@/deletecompany.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup zarafa-6.40.2/installer/userscripts/deletegroup +--- zarafa-6.40.2.orig/installer/userscripts/deletegroup 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/deletegroup 2010-10-13 08:27:30.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then +- . ${prefix}/etc/sysconfig/zarafa ++if [ -f ${prefix}/etc/conf.d/zarafa ]; then ++ . ${prefix}/etc/conf.d/zarafa + fi + + ZARAFA_GROUP_SCRIPTS=/etc/zarafa/userscripts/deletegroup.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/deletegroup.in zarafa-6.40.2/installer/userscripts/deletegroup.in +--- zarafa-6.40.2.orig/installer/userscripts/deletegroup.in 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/deletegroup.in 2010-10-13 08:27:35.000000000 +0000 +@@ -9,8 +9,8 @@ + # beware that this string can contain any characters, so take heed to + # correct quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa ]; then ++ . @sysconfdir@/conf.d/zarafa + fi + + ZARAFA_GROUP_SCRIPTS=@USERSCRIPTDIR@/deletegroup.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser zarafa-6.40.2/installer/userscripts/deleteuser +--- zarafa-6.40.2.orig/installer/userscripts/deleteuser 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/deleteuser 2010-10-13 08:27:39.000000000 +0000 +@@ -9,8 +9,8 @@ + # that this string can contain any characters, so take heed to correct + # quoting. + +-if [ -f ${prefix}/etc/sysconfig/zarafa ]; then +- . ${prefix}/etc/sysconfig/zarafa ++if [ -f ${prefix}/etc/conf.d/zarafa ]; then ++ . ${prefix}/etc/conf.d/zarafa + fi + + ZARAFA_USER_SCRIPTS=/etc/zarafa/userscripts/deleteuser.d +diff -Naur zarafa-6.40.2.orig/installer/userscripts/deleteuser.in zarafa-6.40.2/installer/userscripts/deleteuser.in +--- zarafa-6.40.2.orig/installer/userscripts/deleteuser.in 2010-10-13 08:26:21.000000000 +0000 ++++ zarafa-6.40.2/installer/userscripts/deleteuser.in 2010-10-13 08:27:43.000000000 +0000 +@@ -9,8 +9,8 @@ + # that this string can contain any characters, so take heed to correct + # quoting. + +-if [ -f @sysconfdir@/sysconfig/zarafa ]; then +- . @sysconfdir@/sysconfig/zarafa ++if [ -f @sysconfdir@/conf.d/zarafa ]; then ++ . @sysconfdir@/conf.d/zarafa + fi + + ZARAFA_USER_SCRIPTS=@USERSCRIPTDIR@/deleteuser.d diff --git a/net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.6-force_latin1.patch b/net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.6-force_latin1.patch new file mode 100644 index 0000000..82ada47 --- /dev/null +++ b/net-mail/zarafa/files/6.40.16.34239/zarafa-6.40.6-force_latin1.patch @@ -0,0 +1,14 @@ +diff -uNr zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp +--- zarafa-6.40.6.orig//provider/libserver/ECDatabaseMySQL.cpp 2011-03-20 23:50:06.000000000 +0100 ++++ zarafa-6.40.6/provider/libserver/ECDatabaseMySQL.cpp 2011-03-21 00:00:45.000000000 +0100 +@@ -343,6 +343,10 @@ + // this option was introduced in mysql 5.0, so let's not even try on 4.1 servers + strQuery = "SET SESSION sql_mode = 'STRICT_ALL_TABLES'"; + Query(strQuery); // ignore error ++ ++ // Latin1 is default charset ++ strQuery = "SET NAMES 'latin1'"; ++ Query(strQuery); + } + + exit: diff --git a/net-mail/zarafa/zarafa-6.40.15.33766.ebuild b/net-mail/zarafa/zarafa-6.40.15.33766.ebuild new file mode 100644 index 0000000..4b2279a --- /dev/null +++ b/net-mail/zarafa/zarafa-6.40.15.33766.ebuild @@ -0,0 +1,252 @@ +# Copyright 1999-2012 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" + +inherit php-ext-source-r2 eutils autotools rpm5 versionator + +MY_PV=$(replace_version_separator 3 '-' ) +MY_PVV=$(replace_version_separator 3 'beta' $MY_PV ) +MY_PVM=$(get_version_component_range 1-2 ) +MY_PVR=$(get_version_component_range 1-3 ) + +DESCRIPTION="Open Source Groupware Solution" +HOMEPAGE="http://zarafa.com/" +SRC_URI="http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/sourcecode/zcp-${MY_PVR}.tar.gz + amd64? ( licensed? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-x86_64-free.tar.gz ) ) + x86? ( licensed? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-i586-free.tar.gz ) ) + bash-completion? ( http://community.zarafa.com/mod/community_plugins/download.php?release_guid=434 -> ${PN}-bash-completion-${PV}.zip ) + smime? ( http://community.zarafa.com/mod/community_plugins/download.php?release_guid=554 -> ${PN}-webaccess-plugin-smime-${PV}.zip ) + dspam? ( http://community.zarafa.com/mod/community_plugins/download.php?release_guid=125 -> ${PN}-webaccess-plugin-dspam-${PV}.tar.gz ) + google-maps? ( http://community.zarafa.com/mod/community_plugins/download.php?release_guid=123 -> ${PN}-webaccess-plugin-google-maps-${PV}.zip ) + mobile-device? ( http://community.zarafa.com/mod/community_plugins/download.php?release_guid=152 -> ${PN}-webaccess-plugin-mobile-device-${PV}.zip ) + archive? ( http://community.zarafa.com/mod/community_plugins/download.php?release_guid=140 -> ${PN}-webaccess-plugin-z-merge-archive-${PV}.zip ) + themes? ( + http://community.zarafa.com/mod/community_plugins/download.php?release_guid=164 -> ${PN}-webaccess-theme-dark-${PV}.tar.gz + http://community.zarafa.com/mod/community_plugins/download.php?release_guid=162 -> ${PN}-webaccess-theme-orange-${PV}.tar.gz + ) + " + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +RESTRICT="" +IUSE="debug epoll ldap logrotate licensed static swig tcmalloc testtools perl pic profiling python kerberos sparsehash bash-completion smime dspam google-maps themes mobile-device archive" + +RDEPEND=">=dev-libs/libical-0.44 + dev-cpp/libvmime:0.7 + app-text/catdoc + app-text/poppler + dev-cpp/clucene + dev-db/mysql + dev-libs/libxml2 + dev-libs/openssl + net-misc/curl + sys-libs/e2fsprogs-libs + sys-libs/zlib + sys-libs/ncurses + sys-libs/pam + dev-libs/boost + sys-apps/util-linux + kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) ) + ldap? ( net-nds/openldap ) + logrotate? ( app-admin/logrotate ) + tcmalloc? ( dev-util/google-perftools ) + sparsehash? ( dev-cpp/sparsehash ) + perl? ( dev-lang/perl ) + python? ( dev-lang/python ) + swig? ( dev-lang/swig ) + testtools? ( dev-python/testtools ) + licensed? ( + dev-libs/openssl:0.9.8 + >=sys-libs/zlib-1.2.4 ) + bash-completion? ( app-shells/bash-completion )" + +S="${WORKDIR}"/zarafa-${MY_PVR}/ + +DEPEND="${RDEPEND} + dev-util/pkgconfig + sys-devel/gettext + dev-lang/php + app-arch/unzip" + +QA_PRESTRIPPED=" + usr/bin/zarafa-restore + usr/bin/zarafa-report + usr/bin/zarafa-backup + usr/bin/zarafa-licensed + usr/lib/zarafa/ldapmsplugin.so + usr/lib64/zarafa/ldapmsplugin.so" + +QA_DT_HASH=" + usr/bin/zarafa-restore + usr/bin/zarafa-report + usr/bin/zarafa-backup + usr/bin/zarafa-licensed + usr/lib/zarafa/ldapmsplugin.so + usr/lib64/zarafa/ldapmsplugin.so" + +src_unpack() { + unpack ${A} + if use licensed; then + cd "${WORKDIR}" + mkdir licensed + cd licensed + rpm5_unpack $(find ./../ -name "zarafa-licensed*.rpm") + cd "${S}" + fi +} + +src_prepare() { + EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" epatch + edos2unix php-webclient-ajax/config.php.dist + AT_M4DIR="autoconf" eautoreconf +} + +src_configure() { + econf \ + --enable-oss \ + --disable-testtools \ + --enable-release \ + --with-userscript-prefix=/etc/zarafa/userscripts \ + --with-quotatemplate-prefix=/etc/zarafa/quotamails \ + --with-indexerscripts-prefix=/etc/zarafa/indexerscripts \ + $(use_with pic) \ + $(use_enable perl) \ + $(use_enable python) \ + $(use_enable profiling) \ + $(use_enable static) \ + $(use_enable swig) \ + $(use_enable sparsehash) \ + $(use_enable tcmalloc) \ + $(use_enable testtools) \ + $(use_enable debug) +} + + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + make DESTDIR="${D}" install-ajax-webaccess || die "make install-ajax-webaccess failed" + make DESTDIR="${D}" install-mobile-webaccess || die "make install-mobile-webaccess failed" + + insinto /etc/apache2/modules.d + newins "${FILESDIR}/50_zarafa-webaccess-mobile.conf" 50_zarafa-webaccess-mobile.conf || die "Failed to install apache config files" + newins "${FILESDIR}/50_zarafa-webaccess.conf" 50_zarafa-webaccess.conf || die "Failed to install apache config files" + + rm "${D}"/usr/share/zarafa-webaccess/*.conf || die "Failed to remove apache config files" + rm "${D}"/usr/share/zarafa-webaccess-mobile/*.conf || die "Failed to remove apache config files" + + # Use only some parts of PHP eclass + php-ext-source-r2_buildinilist php${slot} + php-ext-source-r2_addextension "${PHP_EXT_NAME}.so" + + # Symlink the .ini files from ext/ to ext-active/ + for inifile in ${PHPINIFILELIST} ; do + inidir="${inifile/${PHP_EXT_NAME}.ini/}" + inidir="${inidir/ext/ext-active}" + dodir "/${inidir}" + dosym "/${inifile}" "/${inifile/ext/ext-active}" + done + + # Install PHP module + php-ext-source-r2_addtoinifiles ";mapi.cache_max_sessions" "128" + php-ext-source-r2_addtoinifiles ";mapi.cache_lifetime" "300" + + if use logrotate; then + insinto /etc/logrotate.d + newins "${FILESDIR}"/zarafa.logrotate zarafa || die "Failed to install logrotate" + fi + + # install ldap files + if use ldap; then + insinto /etc/openldap/schema + doins installer/ldap/zarafa.* || die "Failed to install ldap schema files" + fi + + insinto /etc/zarafa + doins installer/linux/*.cfg || die "Failed to install config files" + + exeinto /etc/zarafa/userscripts/ + newexe "${FILESDIR}"/junklearn.dspam junklearn + + dodir /var/log/zarafa + keepdir /var/log/zarafa + + if [[ "${ARCH}" == "x86" || "${ARCH}" == "amd64" ]]; then + if use licensed; then + dobin "${WORKDIR}"/licensed/usr/bin/* || die "Failed to install licensed binaries" + exeinto /usr/$(get_libdir)/zarafa/ + doexe "${WORKDIR}"/licensed/usr/$(get_libdir)/zarafa/*.so || die "Failed to install licensed lib" + doman "${WORKDIR}"/licensed/usr/share/man/*/*.gz || die "Failed to install man files" + exeinto /usr/share/zarafa/zarafa-backup-helpers/ + doexe "${WORKDIR}"/licensed/usr/share/zarafa/zarafa-backup-helpers/* || die "Failed to install helper scripts" + dodoc "${WORKDIR}"/licensed/usr/share/doc/packages/zarafa-licensed/* || die "Failed to install docs" + insinto /etc/zarafa + doins -r "${WORKDIR}"/licensed/etc/zarafa/* || die "Failed to install config files" + insinto /etc/cron.d + doins "${WORKDIR}"/licensed/etc/cron.d/* || die "Failed to install cron files" +# insinto /usr/share/zarafa-webaccess/ +# doins -r "${WORKDIR}"/licensed/usr/share/zarafa-webaccess/* || die "Failed to install webapp files" + newinitd "${FILESDIR}"/zarafa-licensed.rc6 zarafa-licensed || die "Failed to install init.d files" + fi + fi + + if use bash-completion; then + insinto /usr/share/bash-completion + doins "${WORKDIR}"/zarafa + fi + + if use smime; then + insinto /var/lib/zarafa-webaccess/plugins + doins -r "${WORKDIR}"/smime + dodoc "${WORKDIR}"/*.pdf + fi + + if use dspam; then + newdoc "${WORKDIR}"/dspam/README README.dspam + newdoc "${WORKDIR}"/dspam/INSTALL INSTALL.dspam + newdoc "${WORKDIR}"/dspam/CHANGELOG CHANGELOG.dspam + rm "${WORKDIR}"/dspam/README "${WORKDIR}"/dspam/INSTALL "${WORKDIR}"/dspam/CHANGELOG + + insinto /var/lib/zarafa-webaccess/plugins + doins -r "${WORKDIR}"/dspam + fi + + if use google-maps; then + insinto /var/lib/zarafa-webaccess/plugins + doins -r "${WORKDIR}"/contactgmap + doins -r "${WORKDIR}"/gmap + fi + + if use mobile-device; then + insinto /var/lib/zarafa-webaccess/plugins + doins -r "${WORKDIR}"/mdm + fi + + if use archive; then + insinto /var/lib/zarafa-webaccess/plugins + doins -r "${WORKDIR}"/zma + fi + + if use themes; then + insinto /usr/share/zarafa-webaccess/client/layout/themes + doins -r "${WORKDIR}"/dark + insinto /usr/share/zarafa-webaccess/client/layout/themes/orange + doins -r "${WORKDIR}"/zarafa-orange-theme/* + fi + + newinitd "${FILESDIR}"/zarafa-gateway.rc6 zarafa-gateway || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-ical.rc6 zarafa-ical || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-indexer.rc6 zarafa-indexer || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-monitor.rc6 zarafa-monitor || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-server.rc6 zarafa-server || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-spooler.rc6 zarafa-spooler || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-dagent.rc6 zarafa-dagent || die "Failed to install init.d files" +} diff --git a/net-mail/zarafa/zarafa-6.40.16.34239.ebuild b/net-mail/zarafa/zarafa-6.40.16.34239.ebuild new file mode 100644 index 0000000..4b2279a --- /dev/null +++ b/net-mail/zarafa/zarafa-6.40.16.34239.ebuild @@ -0,0 +1,252 @@ +# Copyright 1999-2012 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" + +inherit php-ext-source-r2 eutils autotools rpm5 versionator + +MY_PV=$(replace_version_separator 3 '-' ) +MY_PVV=$(replace_version_separator 3 'beta' $MY_PV ) +MY_PVM=$(get_version_component_range 1-2 ) +MY_PVR=$(get_version_component_range 1-3 ) + +DESCRIPTION="Open Source Groupware Solution" +HOMEPAGE="http://zarafa.com/" +SRC_URI="http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/sourcecode/zcp-${MY_PVR}.tar.gz + amd64? ( licensed? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-x86_64-free.tar.gz ) ) + x86? ( licensed? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-i586-free.tar.gz ) ) + bash-completion? ( http://community.zarafa.com/mod/community_plugins/download.php?release_guid=434 -> ${PN}-bash-completion-${PV}.zip ) + smime? ( http://community.zarafa.com/mod/community_plugins/download.php?release_guid=554 -> ${PN}-webaccess-plugin-smime-${PV}.zip ) + dspam? ( http://community.zarafa.com/mod/community_plugins/download.php?release_guid=125 -> ${PN}-webaccess-plugin-dspam-${PV}.tar.gz ) + google-maps? ( http://community.zarafa.com/mod/community_plugins/download.php?release_guid=123 -> ${PN}-webaccess-plugin-google-maps-${PV}.zip ) + mobile-device? ( http://community.zarafa.com/mod/community_plugins/download.php?release_guid=152 -> ${PN}-webaccess-plugin-mobile-device-${PV}.zip ) + archive? ( http://community.zarafa.com/mod/community_plugins/download.php?release_guid=140 -> ${PN}-webaccess-plugin-z-merge-archive-${PV}.zip ) + themes? ( + http://community.zarafa.com/mod/community_plugins/download.php?release_guid=164 -> ${PN}-webaccess-theme-dark-${PV}.tar.gz + http://community.zarafa.com/mod/community_plugins/download.php?release_guid=162 -> ${PN}-webaccess-theme-orange-${PV}.tar.gz + ) + " + +LICENSE="AGPL-3" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +RESTRICT="" +IUSE="debug epoll ldap logrotate licensed static swig tcmalloc testtools perl pic profiling python kerberos sparsehash bash-completion smime dspam google-maps themes mobile-device archive" + +RDEPEND=">=dev-libs/libical-0.44 + dev-cpp/libvmime:0.7 + app-text/catdoc + app-text/poppler + dev-cpp/clucene + dev-db/mysql + dev-libs/libxml2 + dev-libs/openssl + net-misc/curl + sys-libs/e2fsprogs-libs + sys-libs/zlib + sys-libs/ncurses + sys-libs/pam + dev-libs/boost + sys-apps/util-linux + kerberos? ( || ( app-crypt/mit-krb5 app-crypt/heimdal ) ) + ldap? ( net-nds/openldap ) + logrotate? ( app-admin/logrotate ) + tcmalloc? ( dev-util/google-perftools ) + sparsehash? ( dev-cpp/sparsehash ) + perl? ( dev-lang/perl ) + python? ( dev-lang/python ) + swig? ( dev-lang/swig ) + testtools? ( dev-python/testtools ) + licensed? ( + dev-libs/openssl:0.9.8 + >=sys-libs/zlib-1.2.4 ) + bash-completion? ( app-shells/bash-completion )" + +S="${WORKDIR}"/zarafa-${MY_PVR}/ + +DEPEND="${RDEPEND} + dev-util/pkgconfig + sys-devel/gettext + dev-lang/php + app-arch/unzip" + +QA_PRESTRIPPED=" + usr/bin/zarafa-restore + usr/bin/zarafa-report + usr/bin/zarafa-backup + usr/bin/zarafa-licensed + usr/lib/zarafa/ldapmsplugin.so + usr/lib64/zarafa/ldapmsplugin.so" + +QA_DT_HASH=" + usr/bin/zarafa-restore + usr/bin/zarafa-report + usr/bin/zarafa-backup + usr/bin/zarafa-licensed + usr/lib/zarafa/ldapmsplugin.so + usr/lib64/zarafa/ldapmsplugin.so" + +src_unpack() { + unpack ${A} + if use licensed; then + cd "${WORKDIR}" + mkdir licensed + cd licensed + rpm5_unpack $(find ./../ -name "zarafa-licensed*.rpm") + cd "${S}" + fi +} + +src_prepare() { + EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" epatch + edos2unix php-webclient-ajax/config.php.dist + AT_M4DIR="autoconf" eautoreconf +} + +src_configure() { + econf \ + --enable-oss \ + --disable-testtools \ + --enable-release \ + --with-userscript-prefix=/etc/zarafa/userscripts \ + --with-quotatemplate-prefix=/etc/zarafa/quotamails \ + --with-indexerscripts-prefix=/etc/zarafa/indexerscripts \ + $(use_with pic) \ + $(use_enable perl) \ + $(use_enable python) \ + $(use_enable profiling) \ + $(use_enable static) \ + $(use_enable swig) \ + $(use_enable sparsehash) \ + $(use_enable tcmalloc) \ + $(use_enable testtools) \ + $(use_enable debug) +} + + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + make DESTDIR="${D}" install-ajax-webaccess || die "make install-ajax-webaccess failed" + make DESTDIR="${D}" install-mobile-webaccess || die "make install-mobile-webaccess failed" + + insinto /etc/apache2/modules.d + newins "${FILESDIR}/50_zarafa-webaccess-mobile.conf" 50_zarafa-webaccess-mobile.conf || die "Failed to install apache config files" + newins "${FILESDIR}/50_zarafa-webaccess.conf" 50_zarafa-webaccess.conf || die "Failed to install apache config files" + + rm "${D}"/usr/share/zarafa-webaccess/*.conf || die "Failed to remove apache config files" + rm "${D}"/usr/share/zarafa-webaccess-mobile/*.conf || die "Failed to remove apache config files" + + # Use only some parts of PHP eclass + php-ext-source-r2_buildinilist php${slot} + php-ext-source-r2_addextension "${PHP_EXT_NAME}.so" + + # Symlink the .ini files from ext/ to ext-active/ + for inifile in ${PHPINIFILELIST} ; do + inidir="${inifile/${PHP_EXT_NAME}.ini/}" + inidir="${inidir/ext/ext-active}" + dodir "/${inidir}" + dosym "/${inifile}" "/${inifile/ext/ext-active}" + done + + # Install PHP module + php-ext-source-r2_addtoinifiles ";mapi.cache_max_sessions" "128" + php-ext-source-r2_addtoinifiles ";mapi.cache_lifetime" "300" + + if use logrotate; then + insinto /etc/logrotate.d + newins "${FILESDIR}"/zarafa.logrotate zarafa || die "Failed to install logrotate" + fi + + # install ldap files + if use ldap; then + insinto /etc/openldap/schema + doins installer/ldap/zarafa.* || die "Failed to install ldap schema files" + fi + + insinto /etc/zarafa + doins installer/linux/*.cfg || die "Failed to install config files" + + exeinto /etc/zarafa/userscripts/ + newexe "${FILESDIR}"/junklearn.dspam junklearn + + dodir /var/log/zarafa + keepdir /var/log/zarafa + + if [[ "${ARCH}" == "x86" || "${ARCH}" == "amd64" ]]; then + if use licensed; then + dobin "${WORKDIR}"/licensed/usr/bin/* || die "Failed to install licensed binaries" + exeinto /usr/$(get_libdir)/zarafa/ + doexe "${WORKDIR}"/licensed/usr/$(get_libdir)/zarafa/*.so || die "Failed to install licensed lib" + doman "${WORKDIR}"/licensed/usr/share/man/*/*.gz || die "Failed to install man files" + exeinto /usr/share/zarafa/zarafa-backup-helpers/ + doexe "${WORKDIR}"/licensed/usr/share/zarafa/zarafa-backup-helpers/* || die "Failed to install helper scripts" + dodoc "${WORKDIR}"/licensed/usr/share/doc/packages/zarafa-licensed/* || die "Failed to install docs" + insinto /etc/zarafa + doins -r "${WORKDIR}"/licensed/etc/zarafa/* || die "Failed to install config files" + insinto /etc/cron.d + doins "${WORKDIR}"/licensed/etc/cron.d/* || die "Failed to install cron files" +# insinto /usr/share/zarafa-webaccess/ +# doins -r "${WORKDIR}"/licensed/usr/share/zarafa-webaccess/* || die "Failed to install webapp files" + newinitd "${FILESDIR}"/zarafa-licensed.rc6 zarafa-licensed || die "Failed to install init.d files" + fi + fi + + if use bash-completion; then + insinto /usr/share/bash-completion + doins "${WORKDIR}"/zarafa + fi + + if use smime; then + insinto /var/lib/zarafa-webaccess/plugins + doins -r "${WORKDIR}"/smime + dodoc "${WORKDIR}"/*.pdf + fi + + if use dspam; then + newdoc "${WORKDIR}"/dspam/README README.dspam + newdoc "${WORKDIR}"/dspam/INSTALL INSTALL.dspam + newdoc "${WORKDIR}"/dspam/CHANGELOG CHANGELOG.dspam + rm "${WORKDIR}"/dspam/README "${WORKDIR}"/dspam/INSTALL "${WORKDIR}"/dspam/CHANGELOG + + insinto /var/lib/zarafa-webaccess/plugins + doins -r "${WORKDIR}"/dspam + fi + + if use google-maps; then + insinto /var/lib/zarafa-webaccess/plugins + doins -r "${WORKDIR}"/contactgmap + doins -r "${WORKDIR}"/gmap + fi + + if use mobile-device; then + insinto /var/lib/zarafa-webaccess/plugins + doins -r "${WORKDIR}"/mdm + fi + + if use archive; then + insinto /var/lib/zarafa-webaccess/plugins + doins -r "${WORKDIR}"/zma + fi + + if use themes; then + insinto /usr/share/zarafa-webaccess/client/layout/themes + doins -r "${WORKDIR}"/dark + insinto /usr/share/zarafa-webaccess/client/layout/themes/orange + doins -r "${WORKDIR}"/zarafa-orange-theme/* + fi + + newinitd "${FILESDIR}"/zarafa-gateway.rc6 zarafa-gateway || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-ical.rc6 zarafa-ical || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-indexer.rc6 zarafa-indexer || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-monitor.rc6 zarafa-monitor || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-server.rc6 zarafa-server || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-spooler.rc6 zarafa-spooler || die "Failed to install init.d files" + newinitd "${FILESDIR}"/zarafa-dagent.rc6 zarafa-dagent || die "Failed to install init.d files" +}