Add zarafa 6.40.14. Include fix for ZCP-8842

4 files changed, 40 insertions, 9 deletions

diff --git a/net-mail/zarafa/ChangeLog b/net-mail/zarafa/ChangeLog
index 68ff08a..dd44902 100644
--- a/net-mail/zarafa/ChangeLog
+++ b/net-mail/zarafa/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for net-mail/zarafa
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*zarafa-6.40.14 (23 Jan 2012)
+
+  23 Jan 2012; Robert Piasek <dagger@gentoo.org> -zarafa-6.40.13.ebuild,
+  +zarafa-6.40.14.ebuild, +files/zarafa-fix-8842.patch:
+  Add ZCP 6.40.14. Include fix for bug ZCP-8842
+
 *zarafa-7.0.4 (29 Dec 2011)
 
   29 Dec 2011; Robert Piasek <dagger@gentoo.org> -zarafa-7.0.1.ebuild,
diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest
index e50c925..a1421a2 100644
--- a/net-mail/zarafa/Manifest
+++ b/net-mail/zarafa/Manifest
@@ -2,6 +2,7 @@ AUX zarafa-6.40.1-no-php-conf.patch 1634 RMD160 1bb4d4357aeeec0b005cd090beb96cb7
 AUX zarafa-6.40.1-uuid-link.patch 1416 RMD160 da5e90e883e1331a5ac1bf9891ece199b61b422d SHA1 f5277c620f78693b05500189fdd869569a1c1fd1 SHA256 ead0383bc69c3c2fce4f69e8dce19161d123dc5fb91b2abbefcf3a83299f855c
 AUX zarafa-6.40.5-add-missing-endif.patch 249 RMD160 ed06c81f50d6a4359ccaa001540a29b4c105e468 SHA1 b6a38c5af35fae2f79bd70846f057873109e9b90 SHA256 e4bb216f1eacebbaa628fad164bcc4f045e9d5b28a17566f2f6a076695a48ba4
 AUX zarafa-6.40.5-fix-missing-installation-file.patch 1221 RMD160 cdc3c85558de3fd35453a174b8af0a5631ea1922 SHA1 2b490e2fb5a27243a77cdbf97a82a859d5a51979 SHA256 41a73e36d939aa9e162ca6df175673329246610dc0e52d998c86d2581b0c5457
+AUX zarafa-fix-8842.patch 1150 RMD160 4467e6cf23bb6d9ce81bc13a359b2bb7de0b8ba5 SHA1 dde9c366ebea897e45b381c33209daf3e93e10b8 SHA256 af7481bd404d11622a057df0b38c06f398e44fa4ca0882bac97e925fa77763b9
 AUX zarafa-gateway.rc6 706 RMD160 341b4a029972290fdac747d65cf324a22d3ee8b0 SHA1 646f1aca42f5457b3beec2a60b0e70b2af17ef93 SHA256 c8d6f0a86338f7a7a68847abcb27c5f254bc837b63ce76d9541f02be70e4a699
 AUX zarafa-ical.rc6 663 RMD160 db306a10e7777889e9460488575cbdd1ddc9037e SHA1 8fa807d0da22ab4fc1f3156c3a7dc0fe3cdab1ad SHA256 1eec0c538a0264eb2757b5687c8285394f899740bc4cba913115f82ccab703e2
 AUX zarafa-indexer.rc6 720 RMD160 7ac4e46479cf7d1469df6a388aa6231cf1e2c5a5 SHA1 7b9e0e90bcdaee3f84fdeeb1214ee52c36d8c396 SHA256 ff10705b5b109b22448fdc01c45046f8984131f57094685af467e96f85a872a2
@@ -12,17 +13,17 @@ AUX zarafa-spooler.rc6 705 RMD160 a2981b8e9b60df19d5adce5507ec51ac6d5b12e8 SHA1
 AUX zarafa.logrotate 1227 RMD160 a0b3e0a50886d04cd28ad2ead2cc8589101f47f9 SHA1 d0f2b3a01641f821d60353ed77935b46abf451fc SHA256 f7276f0ccd48b3c9e71545630ad41cdc2748af45148bf0576f2ca14ee8f9d129
 DIST zcp-6.40.11.tar.gz 5493848 RMD160 8a4a91fcc800b79ef2adfe9b10f84dffa56b927c SHA1 a3a1914541906b1f5f025074278097a78ca6d0fe SHA256 d64997301fbe36e1ccadc254d0f892dc45e7250e445f14cf39d638d4274a1e1c
 DIST zcp-6.40.12.tar.gz 5521416 RMD160 e68f608d7da52947f82411c952d60f4d135333ea SHA1 3f036e5837d659086702882b09a8e1f519014d35 SHA256 4fcecd4dfaac335b174b6223f5ca0ad30b45bc1ff3839d9044acc0e887db1297
-DIST zcp-6.40.13.tar.gz 5544429 RMD160 0207fe62a8fe3d36799e283505e4ced04f40358a SHA1 ea4b7eaef288e568dea5cb853126852461648666 SHA256 87c0143c92df1bed22a116f28e65d1362251fb3f026875c09bea9e96f7433264
+DIST zcp-6.40.14.tar.gz 5563665 RMD160 8b145f96b36ed7df275f0df75c42c0315f685516 SHA1 4b78112c7bf960621e2e3adb9ef1b055f6b31315 SHA256 871ac04d4f87e1868ff103edddfcfc6f91a1c9e6e0caeeb0f0c20dbc4424521a
 DIST zcp-6.40.9.tar.gz 5434001 RMD160 6a14d627dfbdf77c17839e1ab8840695af9e3b34 SHA1 7cf5b7d08d521571d00e06c9f97a8498b8fe49eb SHA256 23653649497b0b26322b8152c639eec1087727d2370947050c239dc3d7c1f03d
 DIST zcp-7.0.2.tar.gz 6095860 RMD160 d237e5cca5c481e6fd6b12c36bd0f06f1a3ef839 SHA1 5b4c1e1685b8e0e5434a0270f0dcadf0afefc105 SHA256 08cda8e13aae3baa902b1b6d075ac24e6a792082da91ede9ff26b625cc8f59b9
 DIST zcp-7.0.3.tar.gz 6137777 RMD160 bf0885470488cced567f6c9a519cdea51c57b317 SHA1 08365214254299382cf57fde2c2e1434c6d58c81 SHA256 ee63e43d597404c79712fd65deca13b1633e0a20bb2b4e3fdd31770795706014
 DIST zcp-7.0.4.tar.gz 6116000 RMD160 10fe2e070f6ae9278a8fe60f3fd71216790fada7 SHA1 ebfc7dbf09cbbffec982f4e9796be9b8cfee265f SHA256 b4be7f08a027a4ac7daa986fdb2791e069bdf23c155675181c117874dc4302cd
 EBUILD zarafa-6.40.11.ebuild 2999 RMD160 c57e4ee4d024c1955fe9f20c967c258a34568011 SHA1 ce98479aad4526f01d4ee46699f287725f5777c3 SHA256 8a2bc79b12a81116da9fc59e800dc4b8cc8323d312be16844973fce4164b1d3d
 EBUILD zarafa-6.40.12.ebuild 2999 RMD160 731766332a08f7f168326fc280120cba569ac894 SHA1 83b11e4b30b9ad7c8b313a7b9bbe14b1aaf118e9 SHA256 79c79eb97f5d26b38415fab472c8e3669e60dd9bf8a3d46c950c3b6ad2e943e3
-EBUILD zarafa-6.40.13.ebuild 2999 RMD160 34a0ae16142a282f6e9802b637f5175bef145d87 SHA1 6a819f53e67ebd2843184b4ab7d5147d98ea0918 SHA256 c9c3cb4a1f8f08b5d4fe50db99c841dfd960ed7c71db669651db1223cb491840
+EBUILD zarafa-6.40.14.ebuild 3048 RMD160 5a0d3a1f5b5e341fc79daf7ef8f95c23914c35fc SHA1 58b063601c57e6725433b1a4ec385bfec599da79 SHA256 df895211cd0eb40c65cc21d6bdfb0103d4e4a0f19da5db35ec96a6cd8e6251df
 EBUILD zarafa-6.40.9.ebuild 2999 RMD160 726e91dbca6c1776464ec635f14cead1215cb576 SHA1 e29a005ef553d3bb1ee56f562586638518dcf8c0 SHA256 1d718e2a2e1a7104a51412a516e7d3728a48fee483a162739c57b254ee17b26f
 EBUILD zarafa-7.0.2.ebuild 3402 RMD160 cdee5e04424bdddd50382e4e40539f8868399a7f SHA1 abcc49bcb0e790933a75cac47b46e219d2421a5f SHA256 df6c3559ccbb17069cd6b552baa812bffd0854908d065f50ef8fe7520f02b155
 EBUILD zarafa-7.0.3.ebuild 3402 RMD160 28e0597de4b30280b4b291d0da03500694184942 SHA1 26cf295f4301470ed55a4f86e80c4da23856c7e6 SHA256 f01b3517e2e348ea78e6dc2375c36894246a9ee6e91cf157e0d004df5301cd4f
 EBUILD zarafa-7.0.4.ebuild 3423 RMD160 34aba161e872046d6af62aae9f40d4277463650b SHA1 61ccc0c864566d97658572d87daba2010acd58ae SHA256 a5fd7c8c857bbfac823463a5425453ea81e6b8e974869b602e6f3c045715e5ce
-MISC ChangeLog 3058 RMD160 2838f62b4ffadc77556b11e39bf977d24bd46321 SHA1 5d310d91007590187725346b2d8432cc64f9f5d5 SHA256 6e10606c7be6fc460ea5cf1d772117464e4ffc880bada70f1f9663d8792f2944
+MISC ChangeLog 3267 RMD160 61f17d98632b87b81deb8136f40dd6aa1aeed8a8 SHA1 10dcaab8bce323af7ee7936fec4b0a40c2762465 SHA256 18ac69c82b2a7cfa125e01dd01fd203aa3f43065c938418ac66d8e41f32b99ae
 MISC metadata.xml 232 RMD160 1003df9706c53108377113d61c9c95bf485cc494 SHA1 fc994415ecad6f285541b567143cb40f2ef5f155 SHA256 1a507fc874f29bab501db0ca4cf1328971a64d415d35c7e050c59747eb0d2d1a
diff --git a/net-mail/zarafa/files/zarafa-fix-8842.patch b/net-mail/zarafa/files/zarafa-fix-8842.patch
new file mode 100644
index 0000000..5f79f22
--- /dev/null
+++ b/net-mail/zarafa/files/zarafa-fix-8842.patch
@@ -0,0 +1,23 @@
+Index: trunk/zcp/provider/libserver/ZarafaCmd.cpp
+===================================================================
+diff -u -N -r31009 -r31058
+--- trunk/zcp/provider/libserver/ZarafaCmd.cpp	(.../ZarafaCmd.cpp)	(revision 31009)
++++ trunk/zcp/provider/libserver/ZarafaCmd.cpp	(.../ZarafaCmd.cpp)	(revision 31058)
+@@ -824,13 +824,15 @@
+ 	ECRESULT	er = erSuccess;
+ 	ECSession 	*lpecSession = NULL;
+ 
+-	er = g_lpSessionManager->ValidateSession(soap, ulSessionId, &lpecSession, false);
++	er = g_lpSessionManager->ValidateSession(soap, ulSessionId, &lpecSession, true);
+ 	if(er != erSuccess)
+ 		goto exit;
+ 
+     if(lpecSession->GetAuthMethod() == ECSession::METHOD_USERPASSWORD || lpecSession->GetAuthMethod() == ECSession::METHOD_SSO)
+         SaveLogonTime(lpecSession, false);
+ 
++	lpecSession->Unlock();
++
+     // lpecSession is discarded. It is not locked, so we can do that. We only did the 'validatesession'
+     // call to see if the session id existed in the first place, and the request is coming from the correct
+     // IP address. Another logoff() call called at the same time may remove the session *here*, in which case the following call
+
diff --git a/net-mail/zarafa/zarafa-6.40.13.ebuild b/net-mail/zarafa/zarafa-6.40.14.ebuild
index 2e904ab..a5bf60a 100644
--- a/net-mail/zarafa/zarafa-6.40.13.ebuild
+++ b/net-mail/zarafa/zarafa-6.40.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -14,7 +14,7 @@ inherit versionator php-ext-source-r2 eutils
 ZARAFA_MAJOR=$(get_version_component_range 1 ${PV})
 ZARAFA_MINOR=$(get_version_component_range 2 ${PV})
 ZARAFA_MICRO=$(get_version_component_range 3 ${PV})
-ZARAFA_REV=30778
+ZARAFA_REV=31537
 
 DESCRIPTION="Open Source Groupware Solution"
 HOMEPAGE="http://zarafa.com/"
@@ -49,12 +49,13 @@ DEPEND="${RDEPEND}
 #}
 
 src_prepare() {
-	# Fixes zarafa-server linking
-	epatch "${FILESDIR}"/"${PN}"-6.40.1-uuid-link.patch
-
 	# Don't install php ini file, as installation doesn't
 	# respect Gentoo way of handling SAPIs
 	epatch "${FILESDIR}"/"${PN}"-6.40.1-no-php-conf.patch
+
+	# Fix for zarafa-server crash - bug ID 8842
+	# https://jira.zarafa.com/browse/ZCP-8842
+	epatch "${FILESDIR}"/"${PN}"-fix-8842.patch
 }
 
 src_configure() {