From feae4e66771f3fea8a956cf58e709edb318cd31d Mon Sep 17 00:00:00 2001 From: geos_one Date: Sun, 20 Mar 2011 23:06:29 +0000 Subject: [PATCH] net-mail/zarafa: add more configure parameters (Portage version: 2.2.0_alpha28-r1/svn/Linux x86_64, RepoMan options: --force) git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/mds@2868 6952d904-891a-0410-993b-d76249ca496b --- net-mail/zarafa/ChangeLog | 22 ++ net-mail/zarafa/Manifest | 34 ++- .../fix-pthread.patch | 0 .../fix-zarafaserver-uuid-linkage.patch | 0 .../fix-zarafastats-uuid-linkage.patch | 0 .../zarafa-6.40.0-package.patch | 0 .../zarafa-6.40.1-no-php-conf.patch | 0 .../zarafa-6.40.2-libtcmalloc_shared-1.patch | 0 .../zarafa-6.40.2-sysconfig2confd-1.patch | 0 .../zarafa-6.40.5-add-missing-endif.patch | 0 ...6.40.5-fix-missing-installation-file.patch | 0 .../files/6.40.6.25584/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.2-libtcmalloc_shared-1.patch | 19 ++ .../zarafa-6.40.2-sysconfig2confd-1.patch | 187 ++++++++++++++++ .../zarafa-6.40.6-force_latin1.patch | 14 ++ .../6.40.6.25584/zarafa-6.40.6-package.patch | 65 ++++++ net-mail/zarafa/zarafa-6.40.5.24860.ebuild | 2 +- net-mail/zarafa/zarafa-6.40.6.25584.ebuild | 200 ++++++++++++++++++ 21 files changed, 676 insertions(+), 12 deletions(-) rename net-mail/zarafa/files/{patches => 6.40.5.24860}/fix-pthread.patch (100%) rename net-mail/zarafa/files/{patches => 6.40.5.24860}/fix-zarafaserver-uuid-linkage.patch (100%) rename net-mail/zarafa/files/{patches => 6.40.5.24860}/fix-zarafastats-uuid-linkage.patch (100%) rename net-mail/zarafa/files/{patches => 6.40.5.24860}/zarafa-6.40.0-package.patch (100%) rename net-mail/zarafa/files/{patches => 6.40.5.24860}/zarafa-6.40.1-no-php-conf.patch (100%) rename net-mail/zarafa/files/{patches => 6.40.5.24860}/zarafa-6.40.2-libtcmalloc_shared-1.patch (100%) rename net-mail/zarafa/files/{patches => 6.40.5.24860}/zarafa-6.40.2-sysconfig2confd-1.patch (100%) rename net-mail/zarafa/files/{patches => 6.40.5.24860}/zarafa-6.40.5-add-missing-endif.patch (100%) rename net-mail/zarafa/files/{patches => 6.40.5.24860}/zarafa-6.40.5-fix-missing-installation-file.patch (100%) create mode 100644 net-mail/zarafa/files/6.40.6.25584/fix-pthread.patch create mode 100644 net-mail/zarafa/files/6.40.6.25584/fix-zarafaserver-uuid-linkage.patch create mode 100644 net-mail/zarafa/files/6.40.6.25584/fix-zarafastats-uuid-linkage.patch create mode 100644 net-mail/zarafa/files/6.40.6.25584/zarafa-6.40.1-no-php-conf.patch create mode 100644 net-mail/zarafa/files/6.40.6.25584/zarafa-6.40.2-libtcmalloc_shared-1.patch create mode 100644 net-mail/zarafa/files/6.40.6.25584/zarafa-6.40.2-sysconfig2confd-1.patch create mode 100644 net-mail/zarafa/files/6.40.6.25584/zarafa-6.40.6-force_latin1.patch create mode 100644 net-mail/zarafa/files/6.40.6.25584/zarafa-6.40.6-package.patch create mode 100644 net-mail/zarafa/zarafa-6.40.6.25584.ebuild diff --git a/net-mail/zarafa/ChangeLog b/net-mail/zarafa/ChangeLog index af983b7..c6bb987 100644 --- a/net-mail/zarafa/ChangeLog +++ b/net-mail/zarafa/ChangeLog @@ -2,6 +2,28 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*zarafa-6.40.6.25584 (20 Mar 2011) + + 20 Mar 2011; Mario Fetka + -files/6.40.6.25584/zarafa-6.40.0-package.patch, + -files/patches/zarafa-6.40.0-package.patch, + -files/patches/zarafa-6.40.1-no-php-conf.patch, + -files/patches/zarafa-6.40.2-libtcmalloc_shared-1.patch, + -files/patches/zarafa-6.40.2-sysconfig2confd-1.patch, + zarafa-6.40.5.24860.ebuild, + -files/6.40.6.25584/zarafa-6.40.5-add-missing-endif.patch, + -files/patches/zarafa-6.40.5-add-missing-endif.patch, + -files/6.40.6.25584/zarafa-6.40.5-fix-missing-installation-file.patch, + -files/patches/zarafa-6.40.5-fix-missing-installation-file.patch, + +zarafa-6.40.6.25584.ebuild, + +files/6.40.6.25584/zarafa-6.40.6-force_latin1.patch, + +files/6.40.6.25584/zarafa-6.40.6-package.patch, + -files/patches/fix-pthread.patch, + -files/patches/fix-zarafaserver-uuid-linkage.patch, + -files/patches/fix-zarafastats-uuid-linkage.patch, + files/6.40.6.25584/fix-pthread.patch: + add more configure parameters + *zarafa-6.40.5.24860 (29 Jan 2011) 29 Jan 2011; Mario Fetka diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest index 0582141..88d4946 100644 --- a/net-mail/zarafa/Manifest +++ b/net-mail/zarafa/Manifest @@ -1,14 +1,22 @@ AUX 50_zarafa-webaccess-mobile.conf 298 RMD160 06cc5aed60486f78327aa20c0d03fd7ab10b52be SHA1 bef2feeb930d36403a48545045969b2556513dee SHA256 7019d90fae91e2efb54c2b002ff3ee40de5a684686a74753385514b6abbe8581 AUX 50_zarafa-webaccess.conf 270 RMD160 226eb8c9661ff57347e2f917223a7823e666324a SHA1 fbd9efab7f9a1f85e55df142c0d553317eab1436 SHA256 ddf11e70107c2d6eaf40ba8253e2118822ee66eddaf471afebca248ba71e85a6 -AUX patches/fix-pthread.patch 1779 RMD160 48976038f579e5472395efdcec860b131e6be6da SHA1 ae10a342780d7699c30fb64d43f6c5c7795d89ab SHA256 8bfd5987ff8bf4d754b1ff69aa491ac56b3f12dafa3354566218c3f573f15160 -AUX patches/fix-zarafaserver-uuid-linkage.patch 1394 RMD160 f88c3d41e5af48713d5ba5a4f9a9add75724bb45 SHA1 59aadb0eb993c7a552018c37e715bee7caaa1a12 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 -AUX patches/fix-zarafastats-uuid-linkage.patch 1051 RMD160 9713fa23bd16cb69111ecb39f840f8b7026d8f21 SHA1 ca04f80dce737ad10821c2e1bb84cd8f4ea5b9c5 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 -AUX patches/zarafa-6.40.0-package.patch 1938 RMD160 48ec724a787bd2b4db3b81b763fc1726a55eec3b SHA1 30aee89b4d186d2371568911ccfa245f1e39b4b7 SHA256 546ae930ee2f167987f336d873e68110394dad7573d9397c39f5c10166aa8eab -AUX patches/zarafa-6.40.1-no-php-conf.patch 1634 RMD160 1bb4d4357aeeec0b005cd090beb96cb73905f58d SHA1 3da975c330bf09eca894db87aa1888536ee1e206 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f -AUX patches/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 7112bfd1b5c1bf628f33521138d76ebdc9e8fa84 SHA1 638f39aa252c644362952becd5eb28fe06db8743 SHA256 c66f888d89a07c2c962f60aae81dee5b97cc2f0c0d4b5f725309f9f7509bea55 -AUX patches/zarafa-6.40.2-sysconfig2confd-1.patch 8497 RMD160 1838567e668a32833d22e286defa73877cb515d2 SHA1 4ce13564cfc80598636b1c94028db3613feeb98c SHA256 cd1128ec66f18c887b6b304648e3a94b9aea782e363a303fc636b8f66b43fc5f -AUX patches/zarafa-6.40.5-add-missing-endif.patch 249 RMD160 ed06c81f50d6a4359ccaa001540a29b4c105e468 SHA1 b6a38c5af35fae2f79bd70846f057873109e9b90 SHA256 e4bb216f1eacebbaa628fad164bcc4f045e9d5b28a17566f2f6a076695a48ba4 -AUX patches/zarafa-6.40.5-fix-missing-installation-file.patch 1221 RMD160 cdc3c85558de3fd35453a174b8af0a5631ea1922 SHA1 2b490e2fb5a27243a77cdbf97a82a859d5a51979 SHA256 41a73e36d939aa9e162ca6df175673329246610dc0e52d998c86d2581b0c5457 +AUX 6.40.5.24860/fix-pthread.patch 1779 RMD160 48976038f579e5472395efdcec860b131e6be6da SHA1 ae10a342780d7699c30fb64d43f6c5c7795d89ab SHA256 8bfd5987ff8bf4d754b1ff69aa491ac56b3f12dafa3354566218c3f573f15160 +AUX 6.40.5.24860/fix-zarafaserver-uuid-linkage.patch 1394 RMD160 f88c3d41e5af48713d5ba5a4f9a9add75724bb45 SHA1 59aadb0eb993c7a552018c37e715bee7caaa1a12 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 +AUX 6.40.5.24860/fix-zarafastats-uuid-linkage.patch 1051 RMD160 9713fa23bd16cb69111ecb39f840f8b7026d8f21 SHA1 ca04f80dce737ad10821c2e1bb84cd8f4ea5b9c5 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 +AUX 6.40.5.24860/zarafa-6.40.0-package.patch 1938 RMD160 48ec724a787bd2b4db3b81b763fc1726a55eec3b SHA1 30aee89b4d186d2371568911ccfa245f1e39b4b7 SHA256 546ae930ee2f167987f336d873e68110394dad7573d9397c39f5c10166aa8eab +AUX 6.40.5.24860/zarafa-6.40.1-no-php-conf.patch 1634 RMD160 1bb4d4357aeeec0b005cd090beb96cb73905f58d SHA1 3da975c330bf09eca894db87aa1888536ee1e206 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f +AUX 6.40.5.24860/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 7112bfd1b5c1bf628f33521138d76ebdc9e8fa84 SHA1 638f39aa252c644362952becd5eb28fe06db8743 SHA256 c66f888d89a07c2c962f60aae81dee5b97cc2f0c0d4b5f725309f9f7509bea55 +AUX 6.40.5.24860/zarafa-6.40.2-sysconfig2confd-1.patch 8497 RMD160 1838567e668a32833d22e286defa73877cb515d2 SHA1 4ce13564cfc80598636b1c94028db3613feeb98c SHA256 cd1128ec66f18c887b6b304648e3a94b9aea782e363a303fc636b8f66b43fc5f +AUX 6.40.5.24860/zarafa-6.40.5-add-missing-endif.patch 249 RMD160 ed06c81f50d6a4359ccaa001540a29b4c105e468 SHA1 b6a38c5af35fae2f79bd70846f057873109e9b90 SHA256 e4bb216f1eacebbaa628fad164bcc4f045e9d5b28a17566f2f6a076695a48ba4 +AUX 6.40.5.24860/zarafa-6.40.5-fix-missing-installation-file.patch 1221 RMD160 cdc3c85558de3fd35453a174b8af0a5631ea1922 SHA1 2b490e2fb5a27243a77cdbf97a82a859d5a51979 SHA256 41a73e36d939aa9e162ca6df175673329246610dc0e52d998c86d2581b0c5457 +AUX 6.40.6.25584/fix-pthread.patch 2101 RMD160 aafbca78c32dc5c248ff044b9fd35ae3e5882649 SHA1 44f7ac8d8e36209c811b0e1cde5dbfdcc1cdab0d SHA256 f3e8324db43fb626aadb0bf334852d7a1b194333b120c7de643a89a37a1cc99c +AUX 6.40.6.25584/fix-zarafaserver-uuid-linkage.patch 1394 RMD160 f88c3d41e5af48713d5ba5a4f9a9add75724bb45 SHA1 59aadb0eb993c7a552018c37e715bee7caaa1a12 SHA256 c452efb1f6b4deec5f32471b3998d6b9a40a2eacba959b76b3abae7d82e80e22 +AUX 6.40.6.25584/fix-zarafastats-uuid-linkage.patch 1051 RMD160 9713fa23bd16cb69111ecb39f840f8b7026d8f21 SHA1 ca04f80dce737ad10821c2e1bb84cd8f4ea5b9c5 SHA256 a1c0febb372dba9241cd87eded9d0e5940748cf01285a8eee0e43fa38a63fc03 +AUX 6.40.6.25584/zarafa-6.40.1-no-php-conf.patch 1634 RMD160 1bb4d4357aeeec0b005cd090beb96cb73905f58d SHA1 3da975c330bf09eca894db87aa1888536ee1e206 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f +AUX 6.40.6.25584/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 7112bfd1b5c1bf628f33521138d76ebdc9e8fa84 SHA1 638f39aa252c644362952becd5eb28fe06db8743 SHA256 c66f888d89a07c2c962f60aae81dee5b97cc2f0c0d4b5f725309f9f7509bea55 +AUX 6.40.6.25584/zarafa-6.40.2-sysconfig2confd-1.patch 8497 RMD160 1838567e668a32833d22e286defa73877cb515d2 SHA1 4ce13564cfc80598636b1c94028db3613feeb98c SHA256 cd1128ec66f18c887b6b304648e3a94b9aea782e363a303fc636b8f66b43fc5f +AUX 6.40.6.25584/zarafa-6.40.6-force_latin1.patch 618 RMD160 8fc093050c3368c770d11326cf2402511f8d7c14 SHA1 5a7a6669308166ffb8117090411c3df9827408aa SHA256 e8caa41fb4a285e59ab8b3a2a6c0b5733423f70dbc55798d6c1472202deab496 +AUX 6.40.6.25584/zarafa-6.40.6-package.patch 2135 RMD160 30804eb455510967a5cfc2f9fe9bd699f906a9df SHA1 725f55210166e3453eae6bb58d1a417c6b0021ad SHA256 e441b08807753388e561653adcb9e3de8def54e3c343105dc25d95c1a1e0997d AUX zarafa-dagent.rc6 2016 RMD160 45cbcb81da30a34be4202f3d9b84f38b12ecf57b SHA1 aaccebd9658dc8da88a32f7300922557fd4c621c SHA256 696d0f7b0c41814ca15d775b0595eb46b95fc59e1cf2a30935eba2c717ff16d6 AUX zarafa-gateway.rc6 747 RMD160 c6094f036814bb289eade6f309b9c48ed6b683d5 SHA1 6182824447f9373badf2b2536d41190451fbceb0 SHA256 d08eb9eb5e548dca24e644aee4196aa135ef79d74d244675eeb9ea47594311b0 AUX zarafa-ical.rc6 663 RMD160 db306a10e7777889e9460488575cbdd1ddc9037e SHA1 8fa807d0da22ab4fc1f3156c3a7dc0fe3cdab1ad SHA256 1eec0c538a0264eb2757b5687c8285394f899740bc4cba913115f82ccab703e2 @@ -20,7 +28,11 @@ AUX zarafa-spooler.rc6 705 RMD160 a2981b8e9b60df19d5adce5507ec51ac6d5b12e8 SHA1 AUX zarafa.logrotate 1857 RMD160 d295f5307be6577d3f8fdc89edc7995adae2fd47 SHA1 7188133da91ad6d453811ff5e67d84fde49b4fb9 SHA256 44e26d9ad5eff2e159388698a068df72d9626d91e9be478be00b3e3eaa15913f DIST zcp-6.40.5-24860-sles-11-i586-free.tgz 23140783 RMD160 0ad70bf6be5ce481d2dbcaaea05297aa0f1e658a SHA1 e1cc20e6e4cac7f67a6f7b1826bcb6e793abec73 SHA256 312559d65514e7de9924b2f8a8f8cb78502b057b1464495ef3243705da260888 DIST zcp-6.40.5-24860-sles-11-x86_64-free.tgz 23195063 RMD160 8633a69b08f21003bc3c02b4bc10956461144630 SHA1 0b5a1b7c3591597f30be00629e71e496a0d83ab7 SHA256 606dc5c5da4cf6d7566ce1ba077317f4e41fe72831f07ced1bf0f70ad7a3e26e +DIST zcp-6.40.6-25584-sles-11-i586-free.tar.gz 23940552 RMD160 4525c28ee575c9751350f1fee9f5a7c279d46af6 SHA1 6323b440f8eb8f44f4705b25d6b40f53b628577d SHA256 8b8405e2fcd8ab3ea947fb39ff8833f7d6a665dd1183b24d75d447c743002253 +DIST zcp-6.40.6-25584-sles-11-x86_64-free.tar.gz 23897316 RMD160 6b51e08bec4e10403c01b7a3edbbdf41db35d006 SHA1 b694de1727709adaa04266440c703f153567888f SHA256 75a1e5956844b87e8de331d0bad6f0fcbbe442348a12b63a200f618de5c7766a +DIST zcp-6.40.6.tar.gz 5355842 RMD160 32e46041df4efcc1a4943b1af79a6347a99dda97 SHA1 4d7553e73b22934f8a2dde747fc79a2175cf1885 SHA256 b5297458ed98e2d07f138ac99c386900c2df4d6367ffc1923c4ff1de4da68799 DIST zcp-source-6.40.5-24860.tgz 7075378 RMD160 1d350cb5dd0df326f3c96ace088f8a40783193aa SHA1 b7c00fae3e49af8e733cb76dfb5a6ba57867a14f SHA256 dbc69d9261bd19479f81024d0482b641b4b6a65089e67076d29eec116edcb546 -EBUILD zarafa-6.40.5.24860.ebuild 6479 RMD160 853f423f883e39217a15a8b2a10cc7a0dfa05d25 SHA1 0cbd37f019b1b08717eec50fb4bd8d0801c76af5 SHA256 96d306f6eecc951fc6d4a943cd173c9f34f20765f838ca56a232710a769cc349 -MISC ChangeLog 1612 RMD160 cae47445fb7711a247f9cc743acea4adcc92412c SHA1 8a5ab6b3a4bd1f93cafd07345717398b36d0e37e SHA256 e41ade50675ffb02147c03bf4db21696c5a3503e719fd65da09a3521dd262a23 +EBUILD zarafa-6.40.5.24860.ebuild 6477 RMD160 8eaabfabf480dc46d5eac5e237951c1bc75bff9f SHA1 cc05fa3a7ac388c250f5f7935c08ab51a1597961 SHA256 b296f4d589b2b0d8ae64aff1bfe37a98d316d2d659af802d9b316a2c0986028b +EBUILD zarafa-6.40.6.25584.ebuild 6723 RMD160 72550113d78f6864caa8122ffeb08bb3c79412b3 SHA1 76ffb4521e5465ad31af130d1d332212f4835cae SHA256 42dcf7aa4750b6bf7e8574f7894441bac4595371462c57371be9c0800083bba9 +MISC ChangeLog 2603 RMD160 abf1fccbd8ab57a5dc14a33dc91401e872983e91 SHA1 d6fee005fe66d2262e19f50b549278400e66971b SHA256 672730eb70c7b8aa65231ee35c763af05237330969cd740593a42ad3e723cb1f MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/net-mail/zarafa/files/patches/fix-pthread.patch b/net-mail/zarafa/files/6.40.5.24860/fix-pthread.patch similarity index 100% rename from net-mail/zarafa/files/patches/fix-pthread.patch rename to net-mail/zarafa/files/6.40.5.24860/fix-pthread.patch diff --git a/net-mail/zarafa/files/patches/fix-zarafaserver-uuid-linkage.patch b/net-mail/zarafa/files/6.40.5.24860/fix-zarafaserver-uuid-linkage.patch similarity index 100% rename from net-mail/zarafa/files/patches/fix-zarafaserver-uuid-linkage.patch rename to net-mail/zarafa/files/6.40.5.24860/fix-zarafaserver-uuid-linkage.patch diff --git a/net-mail/zarafa/files/patches/fix-zarafastats-uuid-linkage.patch b/net-mail/zarafa/files/6.40.5.24860/fix-zarafastats-uuid-linkage.patch similarity index 100% rename from net-mail/zarafa/files/patches/fix-zarafastats-uuid-linkage.patch rename to net-mail/zarafa/files/6.40.5.24860/fix-zarafastats-uuid-linkage.patch diff --git a/net-mail/zarafa/files/patches/zarafa-6.40.0-package.patch b/net-mail/zarafa/files/6.40.5.24860/zarafa-6.40.0-package.patch similarity index 100% rename from net-mail/zarafa/files/patches/zarafa-6.40.0-package.patch rename to net-mail/zarafa/files/6.40.5.24860/zarafa-6.40.0-package.patch diff --git a/net-mail/zarafa/files/patches/zarafa-6.40.1-no-php-conf.patch b/net-mail/zarafa/files/6.40.5.24860/zarafa-6.40.1-no-php-conf.patch similarity index 100% rename from net-mail/zarafa/files/patches/zarafa-6.40.1-no-php-conf.patch rename to net-mail/zarafa/files/6.40.5.24860/zarafa-6.40.1-no-php-conf.patch diff --git a/net-mail/zarafa/files/patches/zarafa-6.40.2-libtcmalloc_shared-1.patch b/net-mail/zarafa/files/6.40.5.24860/zarafa-6.40.2-libtcmalloc_shared-1.patch similarity index 100% rename from net-mail/zarafa/files/patches/zarafa-6.40.2-libtcmalloc_shared-1.patch rename to net-mail/zarafa/files/6.40.5.24860/zarafa-6.40.2-libtcmalloc_shared-1.patch diff --git a/net-mail/zarafa/files/patches/zarafa-6.40.2-sysconfig2confd-1.patch b/net-mail/zarafa/files/6.40.5.24860/zarafa-6.40.2-sysconfig2confd-1.patch similarity index 100% rename from net-mail/zarafa/files/patches/zarafa-6.40.2-sysconfig2confd-1.patch rename to net-mail/zarafa/files/6.40.5.24860/zarafa-6.40.2-sysconfig2confd-1.patch diff --git a/net-mail/zarafa/files/patches/zarafa-6.40.5-add-missing-endif.patch b/net-mail/zarafa/files/6.40.5.24860/zarafa-6.40.5-add-missing-endif.patch similarity index 100% rename from net-mail/zarafa/files/patches/zarafa-6.40.5-add-missing-endif.patch rename to net-mail/zarafa/files/6.40.5.24860/zarafa-6.40.5-add-missing-endif.patch diff --git a/net-mail/zarafa/files/patches/zarafa-6.40.5-fix-missing-installation-file.patch b/net-mail/zarafa/files/6.40.5.24860/zarafa-6.40.5-fix-missing-installation-file.patch similarity index 100% rename from net-mail/zarafa/files/patches/zarafa-6.40.5-fix-missing-installation-file.patch rename to net-mail/zarafa/files/6.40.5.24860/zarafa-6.40.5-fix-missing-installation-file.patch diff --git a/net-mail/zarafa/files/6.40.6.25584/fix-pthread.patch b/net-mail/zarafa/files/6.40.6.25584/fix-pthread.patch new file mode 100644 index 0000000..b374366 --- /dev/null +++ b/net-mail/zarafa/files/6.40.6.25584/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.6.25584/fix-zarafaserver-uuid-linkage.patch b/net-mail/zarafa/files/6.40.6.25584/fix-zarafaserver-uuid-linkage.patch new file mode 100644 index 0000000..610b74d --- /dev/null +++ b/net-mail/zarafa/files/6.40.6.25584/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.6.25584/fix-zarafastats-uuid-linkage.patch b/net-mail/zarafa/files/6.40.6.25584/fix-zarafastats-uuid-linkage.patch new file mode 100644 index 0000000..05e1406 --- /dev/null +++ b/net-mail/zarafa/files/6.40.6.25584/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.6.25584/zarafa-6.40.1-no-php-conf.patch b/net-mail/zarafa/files/6.40.6.25584/zarafa-6.40.1-no-php-conf.patch new file mode 100644 index 0000000..9e51f09 --- /dev/null +++ b/net-mail/zarafa/files/6.40.6.25584/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.6.25584/zarafa-6.40.2-libtcmalloc_shared-1.patch b/net-mail/zarafa/files/6.40.6.25584/zarafa-6.40.2-libtcmalloc_shared-1.patch new file mode 100644 index 0000000..28dcc78 --- /dev/null +++ b/net-mail/zarafa/files/6.40.6.25584/zarafa-6.40.2-libtcmalloc_shared-1.patch @@ -0,0 +1,19 @@ +Submitted By: Your Name (your at email dot address) +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.6.25584/zarafa-6.40.2-sysconfig2confd-1.patch b/net-mail/zarafa/files/6.40.6.25584/zarafa-6.40.2-sysconfig2confd-1.patch new file mode 100644 index 0000000..93e4d0f --- /dev/null +++ b/net-mail/zarafa/files/6.40.6.25584/zarafa-6.40.2-sysconfig2confd-1.patch @@ -0,0 +1,187 @@ +Submitted By: Your Name (your at email dot address) +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.6.25584/zarafa-6.40.6-force_latin1.patch b/net-mail/zarafa/files/6.40.6.25584/zarafa-6.40.6-force_latin1.patch new file mode 100644 index 0000000..82ada47 --- /dev/null +++ b/net-mail/zarafa/files/6.40.6.25584/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.6.25584/zarafa-6.40.6-package.patch b/net-mail/zarafa/files/6.40.6.25584/zarafa-6.40.6-package.patch new file mode 100644 index 0000000..e311bb2 --- /dev/null +++ b/net-mail/zarafa/files/6.40.6.25584/zarafa-6.40.6-package.patch @@ -0,0 +1,65 @@ +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.6,orig//ECtools/Makefile.am zarafa-6.40.6/ECtools/Makefile.am +--- zarafa-6.40.6,orig//ECtools/Makefile.am 2011-03-20 08:34:03.000000000 +0100 ++++ zarafa-6.40.6/ECtools/Makefile.am 2011-03-20 08:36:31.000000000 +0100 +@@ -1,7 +1,3 @@ +-if ! OSS_ONLY +-PROSUBS = zarafa-backup zarafa-report +-endif +- + if WITH_TESTTOOLS + TESTSUBS = ECTestTools + endif +diff -uNr zarafa-6.40.6,orig//Makefile.am zarafa-6.40.6/Makefile.am +--- zarafa-6.40.6,orig//Makefile.am 2011-03-20 08:34:03.000000000 +0100 ++++ zarafa-6.40.6/Makefile.am 2011-03-20 08:35:57.000000000 +0100 +@@ -1,10 +1,6 @@ + AUTOMAKE_OPTIONS = 1.9 foreign + ACLOCAL_AMFLAGS = -Iautoconf + +-if ! OSS_ONLY +-PROSUBS = liblicense licensed +-endif +- + SUBDIRS = common libfreebusy zarafa-libsync mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext spooler gateway caldav ECtools installer po doc + + if WITH_SWIG +@@ -26,10 +22,6 @@ + common/ecversion.h: versionheader.sh + sh ${top_srcdir}/versionheader.sh > common/ecversion.h + +-if ! OSS_ONLY +-CLEANFILES=common/ecversion.h +-endif +- + dist-hook: + find $(distdir) -type d -name .svn -exec rm -rf {} \; 2>/dev/null || true + if OSS_ONLY +diff -uNr zarafa-6.40.6,orig//configure.ac zarafa-6.40.6/configure.ac +--- zarafa-6.40.6,orig//configure.ac 2011-03-20 08:34:03.000000000 +0100 ++++ zarafa-6.40.6/configure.ac 2011-03-20 08:35:16.000000000 +0100 +@@ -808,17 +808,6 @@ + version + specialbuild + ]) +-dnl non-oss files +-if test -d `dirname $0`/licensed; then +-AC_CONFIG_FILES([ +- liblicense/Makefile +- licensed/Makefile +- ECtools/zarafa-backup/Makefile +- ECtools/zarafa-backup/helpers/Makefile +- ECtools/zarafa-report/Makefile +- debian/zarafa.install +-]) +-fi + + AC_OUTPUT + diff --git a/net-mail/zarafa/zarafa-6.40.5.24860.ebuild b/net-mail/zarafa/zarafa-6.40.5.24860.ebuild index 5843a6d..bcf5fe1 100644 --- a/net-mail/zarafa/zarafa-6.40.5.24860.ebuild +++ b/net-mail/zarafa/zarafa-6.40.5.24860.ebuild @@ -96,7 +96,7 @@ src_unpack() { } src_prepare() { - EPATCH_SOURCE="${FILESDIR}/patches" EPATCH_SUFFIX="patch" \ + EPATCH_SOURCE="${FILESDIR}/${PV}" EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" epatch edos2unix php-webclient-ajax/config.php.dist AT_M4DIR="autoconf" eautoreconf diff --git a/net-mail/zarafa/zarafa-6.40.6.25584.ebuild b/net-mail/zarafa/zarafa-6.40.6.25584.ebuild new file mode 100644 index 0000000..765789b --- /dev/null +++ b/net-mail/zarafa/zarafa-6.40.6.25584.ebuild @@ -0,0 +1,200 @@ +# Copyright 1999-2011 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" + +inherit php-ext-source-r2 eutils autotools rpm5 versionator + +MY_PV=$(replace_version_separator 3 '-' ) +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 + !arm? ( licensed? ( + amd64? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-x86_64-free.tar.gz ) + x86? ( http://download.zarafa.com/community/final/${MY_PVM}/${MY_PV}/zcp-${MY_PV}-sles-11-i586-free.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" + +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 + 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 ) + !arm? ( licensed? ( + dev-libs/openssl:0.9.8 + >=sys-libs/zlib-1.2.4 + ) )" + +S="${WORKDIR}"/zarafa-${MY_PVR}/ + +DEPEND="${RDEPEND} + dev-util/pkgconfig + sys-devel/gettext + dev-lang/php" + +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 arm; then + if use licensed; then + cd "${WORKDIR}" + mkdir licensed + cd licensed + if use x86; then + rpm5_unpack $(find ./../ -name "zarafa-licensed*") +# rpm5_unpack $(find ./../ -name "zarafa-webaccess-muc*") + fi + if use amd64; then + rpm5_unpack $(find ./../ -name "zarafa-licensed*") +# rpm5_unpack $(find ./../ -name "zarafa-webaccess-muc*") + fi + cd "${S}" + fi + 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" + + dodir /var/log/zarafa + keepdir /var/log/zarafa + + if ! use arm; 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 + + 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" +}