From a7a58f9dda6883ef2d48de746a486425dead2dab Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sun, 7 Feb 2010 21:27:31 +0000 Subject: [PATCH 01/11] Initialize branch F-12 for zarafa --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From a5bc1de7ffa277d4b5d0216e06acafb6dda7bb83 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 8 Feb 2010 14:21:32 +0000 Subject: [PATCH 02/11] Initial import of Zarafa into Fedora and EPEL --- .cvsignore | 1 + sources | 1 + zarafa-6.30.10-chmod.patch | 13 + zarafa-6.30.10-undefined-symbol.patch | 35 ++ zarafa-6.30.4-brodowski.patch | 774 ++++++++++++++++++++++++ zarafa-6.30.4-package.patch | 48 ++ zarafa-6.30.4-perl.patch | 53 ++ zarafa.ini | 2 + zarafa.spec | 824 ++++++++++++++++++++++++++ 9 files changed, 1751 insertions(+) create mode 100644 zarafa-6.30.10-chmod.patch create mode 100644 zarafa-6.30.10-undefined-symbol.patch create mode 100644 zarafa-6.30.4-brodowski.patch create mode 100644 zarafa-6.30.4-package.patch create mode 100644 zarafa-6.30.4-perl.patch create mode 100644 zarafa.ini create mode 100644 zarafa.spec diff --git a/.cvsignore b/.cvsignore index e69de29..0e7e07b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +zarafa-6.30.10.tar.gz diff --git a/sources b/sources index e69de29..2a2ea20 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +da636f09fb149cf60db1c6f91a734ca3 zarafa-6.30.10.tar.gz diff --git a/zarafa-6.30.10-chmod.patch b/zarafa-6.30.10-chmod.patch new file mode 100644 index 0000000..ef7a706 --- /dev/null +++ b/zarafa-6.30.10-chmod.patch @@ -0,0 +1,13 @@ +Patch by Robert Scheck for zarafa >= 6.30.10, which adds a missing include for +the later in the code used chmod() command. Without this include, building on Fedora 13 fails. + +--- zarafa-6.30.10/provider/server/ECSoapServerConnection.cpp 2010-01-26 17:34:51.000000000 +0100 ++++ zarafa-6.30.10/provider/server/ECSoapServerConnection.cpp.chmod 2010-02-06 12:36:22.000000000 +0100 +@@ -51,6 +51,7 @@ + + #include "ECLogger.h" + ++#include + #ifdef HAVE_SYS_UN_H + #include + #endif diff --git a/zarafa-6.30.10-undefined-symbol.patch b/zarafa-6.30.10-undefined-symbol.patch new file mode 100644 index 0000000..c4b2083 --- /dev/null +++ b/zarafa-6.30.10-undefined-symbol.patch @@ -0,0 +1,35 @@ +diff -ur zarafa-6.30.10.orig/mapi4linux/src/m4lguids.cpp zarafa-6.30.10/mapi4linux/src/m4lguids.cpp +--- zarafa-6.30.10.orig/mapi4linux/src/m4lguids.cpp 2010-01-26 17:34:48.000000000 +0100 ++++ zarafa-6.30.10/mapi4linux/src/m4lguids.cpp 2010-02-04 09:53:48.459239670 +0100 +@@ -48,6 +48,7 @@ + */ + + #include "platform.h" ++/*#ifndef WINCE + #define USES_IID_IUnknown + #define USES_IID_IStream + #define USES_IID_ISequentialStream +@@ -60,7 +61,8 @@ + #define USES_IID_IMAPIProp + #define USES_IID_IMAPIFolder + #define USES_IID_IMAPITable ++#endif + #include +- ++*/ + #include "mapiguid.h" + #include "m4l.mapiutil.h" +diff -ur zarafa-6.30.10.orig/mapi4linux/src/Makefile.am zarafa-6.30.10/mapi4linux/src/Makefile.am +--- zarafa-6.30.10.orig/mapi4linux/src/Makefile.am 2010-01-26 12:05:22.000000000 +0100 ++++ zarafa-6.30.10/mapi4linux/src/Makefile.am 2010-02-04 09:51:39.285239878 +0100 +@@ -3,7 +3,9 @@ + AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX -I$(top_srcdir)/mapi4linux/include -I$(top_srcdir)/provider/common -I${top_srcdir}/common -I${top_srcdir}/libfreebusy + AM_LDFLAGS = $(DL_LIBS) -export-symbols ${top_srcdir}/mapi4linux/src/mapi-exports.sym + +-libmapi_la_LIBADD = ${top_builddir}/common/libcommon_util.la ++libmapi_la_LIBADD = ${top_builddir}/common/libcommon_util.la \ ++ ${top_builddir}/common/libcommon_mapi.la \ ++ $(PROG_LIBS) + + # required because we're exporting extern "C" functions and want to filter with 'export-symbols' + CXXLD=--tag=none gcc diff --git a/zarafa-6.30.4-brodowski.patch b/zarafa-6.30.4-brodowski.patch new file mode 100644 index 0000000..9c97208 --- /dev/null +++ b/zarafa-6.30.4-brodowski.patch @@ -0,0 +1,774 @@ +diff -ruN /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/class.autoarchivesettings.php mapi/class.autoarchivesettings.php +--- /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/class.autoarchivesettings.php Thu Jan 1 01:00:00 1970 ++++ mapi/class.autoarchivesettings.php Sat Aug 8 11:49:05 2009 +@@ -0,0 +1,218 @@ ++. ++ * ++ */ ++ ++?> ++ ++ */ ++ ++class AutoArchiveSettings { ++ ++ var $session; ++ var $store; ++ var $folder; ++ var $proptags; ++ ++ function agingproperties() { ++ $properties = array(); ++ $properties["entryid"] = PR_ENTRYID; ++ $properties["parent_entryid"] = PR_PARENT_ENTRYID; ++ $properties["message_class"] = PR_MESSAGE_CLASS; ++ $properties["icon_index"] = PR_ICON_INDEX; ++ $properties["display_to"] = PR_DISPLAY_TO; ++ $properties["display_cc"] = PR_DISPLAY_CC; ++ $properties["subject"] = PR_SUBJECT; ++ $properties["importance"] = PR_IMPORTANCE; ++ $properties["sent_representing_name"] = PR_SENT_REPRESENTING_NAME; ++ $properties["sent_representing_email_address"] = PR_SENT_REPRESENTING_EMAIL_ADDRESS; ++ $properties["sent_representing_addrtype"] = PR_SENT_REPRESENTING_ADDRTYPE; ++ $properties["sent_representing_entryid"] = PR_SENT_REPRESENTING_ENTRYID; ++ $properties["sender_email_address"] = PR_SENDER_EMAIL_ADDRESS; ++ $properties["sender_name"] = PR_SENDER_NAME; ++ $properties["received_by_name"] = PR_RECEIVED_BY_NAME; ++ $properties["received_by_email_address"] = PR_RECEIVED_BY_EMAIL_ADDRESS; ++ $properties["message_delivery_time"] = PR_MESSAGE_DELIVERY_TIME; ++ $properties["last_modification_time"] = PR_LAST_MODIFICATION_TIME; ++ $properties["last_verb_executed"] = PR_LAST_VERB_EXECUTED; ++ $properties["last_verb_execution_time"] = PR_LAST_VERB_EXECUTION_TIME; ++ $properties["hasattach"] = PR_HASATTACH; ++ $properties["message_size"] = PR_MESSAGE_SIZE; ++ $properties["message_flags"] = PR_MESSAGE_FLAGS; ++ $properties["flag_status"] = PR_FLAG_STATUS; ++ $properties["flag_complete_time"] = PR_FLAG_COMPLETE_TIME; ++ $properties["flag_icon"] = PR_FLAG_ICON; ++ $properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:0x8502"; ++ $properties["reminder_set"] = "PT_BOOLEAN:PSETID_Common:0x8503"; ++ $properties["flag_request"] = "PT_STRING8:PSETID_Common:0x8530"; ++ $properties["flag_due_by"] = "PT_SYSTIME:PSETID_Common:0x8560"; ++ $properties["reply_requested"] = PR_REPLY_REQUESTED; ++ $properties["reply_time"] = PR_REPLY_TIME; ++ $properties["response_requested"] = PR_RESPONSE_REQUESTED; ++ $properties["client_submit_time"] = PR_CLIENT_SUBMIT_TIME; ++ $properties["sensitivity"] = PR_SENSITIVITY; ++ $properties["read_receipt_requested"] = PR_READ_RECEIPT_REQUESTED; ++ $properties["location"] = "PT_STRING8:PSETID_Appointment:0x8208"; ++ $properties["categories"] = "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords"; ++ $properties["transport_message_headers"] = PR_TRANSPORT_MESSAGE_HEADERS; ++ $properties["contacts"] = "PT_MV_STRING8:PSETID_Common:0x853A"; ++ $properties["contacts_string"] = "PT_STRING8:PSETID_Common:0x8586"; ++ ++ $properties["aging_period"] = PR_AGING_PERIOD; // max 3 digits ++ $properties["aging_granularity"] = PR_AGING_GRANULARITY; // 0=month, 1=weeks, 2=days ++ $properties["aging_filename"] = PR_AGING_FILENAME; ++ $properties["aging_age_folder"] = PR_AGING_AGE_FOLDER; ++ $properties["aging_deleted_items"] = PR_AGING_DELETE_ITEMS; ++ $properties["aging_dont_age_me"] = PR_AGING_DONT_AGE_ME; ++ $properties["aging_file_name_after9"] = PR_AGING_FILE_NAME_AFTER9; ++ $properties["aging_when_deleted_on_server"] = PR_AGING_WHEN_DELETED_ON_SERVER; ++ $properties["aging_wait_until_expired"] = PR_AGING_WAIT_UNTIL_EXPIRED; ++ $properties["aging_version"] = PR_AGING_VERSION; ++ $properties["aging_default"] = PR_AGING_DEFAULT; ++ ++ $properties["deleted_on"] = PR_DELETED_ON; ++ $properties["updatecounter"] = "PT_LONG:PSETID_Appointment:0x8201"; ++ $properties["hideattachments"] = "PT_BOOLEAN:PSETID_Common:0x8514"; ++ ++ return $properties; ++ } ++ ++ /** ++ * Constuctor ++ * ++ * @param mapi_session $session MAPI Session ++ * @param mapi_folder $folder Folder to use for AutoArchive Settings retrival ++ */ ++ ++ function retrieveSettings($session, $store, $folder, $properties = NULL) ++ { ++ if ($properties == NULL) { ++ $properties = $this->agingproperties(); ++ }; ++ ++ $this->proptags = getPropIdsFromStrings($store, $properties); ++ ++ $this->session = $session; ++ $this->store = $store; ++ $this->folder = $folder; ++ ++ $msg = $this->getMessage(); ++ ++ $props = mapi_getprops($msg,$this->proptags); ++ ++ $data = $props; ++ ++ return $data; ++ } ++ ++ function getMessage() { ++ $table = mapi_folder_getcontentstable($this->folder, MAPI_ASSOCIATED); ++ mapi_table_sort($table, array(PR_RECEIPT_TIME => TABLE_SORT_ASCEND)); ++ $restriction = array ( RES_PROPERTY, ++ array ( RELOP => RELOP_EQ, ++ ULPROPTAG => PR_MESSAGE_CLASS, ++ VALUE => array (PR_MESSAGE_CLASS => "IPC.MS.Outlook.AgingProperties") ++ ) ++ ); ++ $msgs = mapi_table_queryallrows($table,array(PR_ENTRYID),$restriction); ++ if (isset($msgs[0][PR_ENTRYID])) { ++ $msg = mapi_msgstore_openentry($this->store,$msgs[0][PR_ENTRYID]); ++ } else { ++ $this->createMessage(); ++ $msg = $this->getMessage(); ++ } ++ return $msg; ++ } ++ ++ function updateSettings($session, $store, $folder, $uprops) { ++ $properties = $this->agingproperties(); ++ ++ $this->session = $session; ++ $this->store = $store; ++ $this->folder = $folder; ++ ++ $msg = $this->getMessage(); ++ ++ $write_props = array(); ++ ++ if (isset($uprops["aging_period"])) $write_props[$properties["aging_period"]] = $uprops["aging_period"]; ++ if (isset($uprops["aging_granularity"])) $write_props[$properties["aging_granularity"]] = $uprops["aging_granularity"]; ++ if (isset($uprops["aging_age_folder"])) $write_props[$properties["aging_age_folder"]] = $uprops["aging_age_folder"]; ++ if (isset($uprops["aging_deleted_items"])) $write_props[$properties["aging_deleted_items"]] = $uprops["aging_deleted_items"]; ++ if (isset($uprops["aging_filename"])) $write_props[$properties["aging_filename"]] = $uprops["aging_filename"]; ++ if (isset($uprops["aging_file_name_after9"])) $write_props[$properties["aging_file_name_after9"]] = $uprops["aging_file_name_after9"]; ++ if (isset($uprops["aging_version"])) $write_props[$properties["aging_version"]] = $uprops["aging_version"]; ++ if (isset($uprops["aging_default"])) $write_props[$properties["aging_default"]] = $uprops["aging_default"]; ++ ++ mapi_setprops($msg,$write_props); ++ ++ mapi_savechanges($msg); ++ ++ } ++ ++ function createMessage() { ++ ++ $properties = $this->agingproperties(); ++ ++ $write_props = array( $properties["message_class"] => "IPC.MS.Outlook.AgingProperties", ++ $properties["display_to"] => NULL, ++ $properties["display_cc"] => NULL, ++ $properties["aging_period"] => "3", ++ $properties["aging_granularity"] => "0", ++ $properties["aging_age_folder"] => "0", ++ $properties["aging_deleted_items"] => "0", ++ $properties["aging_filename"] => "", ++ $properties["aging_file_name_after9"] => "", ++ $properties["aging_version"] => "2", ++ $properties["aging_default"] => "0" ++ ); ++ ++ $msg = mapi_folder_createmessage($this->folder,MAPI_ASSOCIATED); ++ ++ mapi_setprops($msg,$write_props); ++ ++ mapi_savechanges($msg); ++ ++ } ++ ++} ++?> +diff -ruN /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/class.linkedappointment.php mapi/class.linkedappointment.php +--- /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/class.linkedappointment.php Thu Jan 1 01:00:00 1970 ++++ mapi/class.linkedappointment.php Fri Aug 14 11:16:18 2009 +@@ -0,0 +1,393 @@ ++. ++ * ++ */ ++?> ++ ++ */ ++ ++class linkedAppointment ++{ ++ ++ /** ++ * @var object Mapi Message Store (may be null if readonly) ++ */ ++ var $_store; ++ ++ var $_contactmapping = array ( ++ "fileas" => "PT_STRING8:{00062004-0000-0000-C000-000000000046}:0x8005", ++ "birthday_event_entryid" => "PT_BINARY:{00062004-0000-0000-C000-000000000046}:0x804d", ++ "anniversary_event_entryid" => "PT_BINARY:{00062004-0000-0000-C000-000000000046}:0x804e", ++ "birthday" => PR_BIRTHDAY, ++ "anniversary" => PR_WEDDING_ANNIVERSARY, ++ "entryid" => PR_ENTRYID, ++ "search_key" => PR_SEARCH_KEY ++ ); ++ ++ var $_appointmentmapping = array ( ++ "alldayevent" => "PT_BOOLEAN:{00062002-0000-0000-C000-000000000046}:0x8215", ++ "body" => PR_BODY, ++ "busystatus" => "PT_LONG:{00062002-0000-0000-C000-000000000046}:0x8205", ++ "categories" => "PT_MV_STRING8:{00020329-0000-0000-C000-000000000046}:Keywords", ++ "rtf" => PR_RTF_COMPRESSED, ++ "dtstamp" => PR_LAST_MODIFICATION_TIME, ++ "endtime" => "PT_SYSTIME:{00062002-0000-0000-C000-000000000046}:0x820e", ++ "location" => "PT_STRING8:{00062002-0000-0000-C000-000000000046}:0x8208", ++ "meetingstatus" => "PT_LONG:{00062002-0000-0000-C000-000000000046}:0x8217", ++ "reminder" => "PT_LONG:{00062008-0000-0000-C000-000000000046}:0x8501", ++ "sensitivity" => PR_SENSITIVITY, ++ "subject" => PR_SUBJECT, ++ "starttime" => "PT_SYSTIME:{00062002-0000-0000-C000-000000000046}:0x820d", ++ "uid" => "PT_BINARY:{6ED8DA90-450B-101B-98DA-00AA003F1305}:0x3", ++ // Append the appointment attributes since we need them for appointment creation ++ "label" => "PT_LONG:{00062002-0000-0000-C000-000000000046}:0x8214", ++ "recurring" => "PT_BOOLEAN:{00062002-0000-0000-C000-000000000046}:0x8223", ++ "recurring_data" => "PT_BINARY:{00062002-0000-0000-C000-000000000046}:0x8216", ++ "recurring_pattern" => "PT_STRING8:{00062002-0000-0000-C000-000000000046}:0x8232", ++ "basedate" => "PT_SYSTIME:{00062002-0000-0000-C000-000000000046}:0x8228", ++ "icon_index" => PR_ICON_INDEX, ++ "entryid" => PR_ENTRYID, ++ "message_class" => PR_MESSAGE_CLASS, ++ "parententryid" => PR_PARENT_ENTRYID, ++ "message_flags" => PR_MESSAGE_FLAGS, ++ "importance" => PR_IMPORTANCE, ++ // Append the common attributes since we need them for appointment creation ++ "contacts" => "PT_MV_STRING8:{00062008-0000-0000-C000-000000000046}:0x853a", ++ "contacts_string" => "PT_STRING8:{00062008-0000-0000-C000-000000000046}:0x8586", ++ "commonstart" => "PT_SYSTIME:{00062008-0000-0000-C000-000000000046}:0x8516", ++ "commonend" => "PT_SYSTIME:{00062008-0000-0000-C000-000000000046}:0x8517", ++ "remindertime" => "PT_SYSTIME:{00062008-0000-0000-C000-000000000046}:0x8502", ++ "duration" => "PT_LONG:{00062002-0000-0000-C000-000000000046}:0x8213", ++ "reminder_minutes" => "PT_LONG:{00062008-0000-0000-C000-000000000046}:0x8501", ++ "reminder" => "PT_BOOLEAN:{00062008-0000-0000-C000-000000000046}:0x8503", ++ "flagdueby" => "PT_SYSTIME:{00062008-0000-0000-C000-000000000046}:0x8560", ++ "lid_contact_link_search_key" => "PT_BINARY:{00062008-0000-0000-C000-000000000046}:0x8584", ++ "lid_contact_link_entryid" => "PT_BINARY:{00062008-0000-0000-C000-000000000046}:0x8585" ++ ); ++ ++ /** ++ * Constructor ++ * @param resource $store MAPI Message Store Object ++ * @param resource $message the MAPI Source message ++ */ ++ function linkedAppointment($_store) ++ { ++ $this->_store = $_store; ++ } ++ ++ function setLinkedContact($mapimessage) ++ { ++ // get the linked contact (if any) ++ // Set the appointment attributes ++ $aprops = $this->_appointmentmapping; ++ // Get the id's of the above... ++ foreach ($aprops as $key => $value) { ++ $aprops[$key] = $this->GetPropIDFromString($this->_store, $value); ++ } ++ $appointment = mapi_getprops($mapimessage, $aprops); ++ $recurrence = new Recurrence($this->_store, $mapimessage); ++ $recur = $recurrence->getRecurrence(); ++ if (isset($appointment[$aprops["lid_contact_link_entryid"]])) { ++ // we have a linked contact. so continue here, otherwise exit silently... ++ $entryid = $this->_unpackContactLinkEntryIDS(bin2hex($appointment[$aprops["lid_contact_link_entryid"]])); ++ // Set the contact attributes ++ $cprops = $this->_contactmapping; ++ // Get the id's of the above... ++ foreach ($cprops as $key => $value) { ++ $cprops[$key] = $this->GetPropIDFromString($this->_store, $value); ++ } ++ foreach ($entryid as $value) { ++ if (($contact_msg = mapi_msgstore_openentry($this->_store,$value))) { ++ $contact = mapi_getprops($contact_msg, $cprops); ++ switch ($appointment[$aprops["entryid"]]) { ++ case $contact[$cprops["birthday_event_entryid"]] : ++ if ($contact[$cprops["birthday"]] != $recur["start"]) { ++ mapi_setprops($contact_msg,array($cprops["birthday"] => $recur["start"])); ++ mapi_savechanges($contact_msg); ++ } ++ break; ++ case $contact[$cprops["anniversary_event_entryid"]] : ++ if ($contact[$cprops["anniversary"]] != $recur["start"]) { ++ mapi_setprops($contact_msg,array($cprops["anniversary"] => $recur["start"])); ++ mapi_savechanges($contact_msg); ++ } ++ break; ++ } ++ } ++ } ++ } ++ } ++ // $what 0x01 = birthday 0x02 = anniversary ++ function setLinkedAppointment($mapimessage,$what) ++ { ++ // We love MS for this... ++ $arrayMonth = array(0,44640,84960,129600,172800,217440,260640,305280,348480,393120,437760,480960); ++ ++ // Set the appointment attributes ++ $aprops = $this->_appointmentmapping; ++ // Get the id's of the above... ++ foreach ($aprops as $key => $value) { ++ $aprops[$key] = $this->GetPropIDFromString($this->_store, $value); ++ } ++ ++ // Set the contact attributes ++ $cprops = $this->_contactmapping; ++ // Get the id's of the above... ++ foreach ($cprops as $key => $value) { ++ $cprops[$key] = $this->GetPropIDFromString($this->_store, $value); ++ } ++ ++ // Get the contact properties ++ $contact = mapi_getprops($mapimessage,$cprops); ++ ++ // open root container, if not existing, leave this function... ++ $rootcontainer = mapi_msgstore_openentry($this->_store); ++ if ($rootcontainer) { ++ // find the appointment container, if this fails, leave this function since we cannot proceed... ++ if (($rootcontainerprops = mapi_getprops($rootcontainer, array(PR_IPM_APPOINTMENT_ENTRYID)))) { ++ $parententryid = $rootcontainerprops[PR_IPM_APPOINTMENT_ENTRYID]; ++ ++ $entryid = false; ++ switch ($what) { ++ case 0x01 : if (isset($contact[$cprops["birthday_event_entryid"]])) ++ $entryid = $contact[$cprops["birthday_event_entryid"]]; ++ $entrydate = $contact[$cprops["birthday"]]; ++ $entryprop = $cprops["birthday_event_entryid"]; ++ $entrylabel = 8; ++ $entrysubject = _("Birthday")." "._("of")." ".$contact[$cprops["fileas"]]; ++ break; ++ case 0x02 : if (isset($contact[$cprops["anniversary_event_entryid"]])) ++ $entryid = $contact[$cprops["anniversary_event_entryid"]]; ++ $entrydate = $contact[$cprops["anniversary"]]; ++ $entryprop = $cprops["anniversary_event_entryid"]; ++ $entrylabel = 9; ++ $entrysubject = _("Special Date")." "._("of")." ".$contact[$cprops["fileas"]]; ++ break; ++ } ++ ++ if ($entrydate) { ++ // open if there is a linked appointment and it can be opened (no one deleted it by accident...) ++ // otherwise create it. ++ if ($entryid && ++ ($appointment_msg = mapi_msgstore_openentry($this->_store,$entryid))) { ++ $appointment = mapi_getprops($appointment_msg); ++ } else { ++ // create with base settings ++ $folder = mapi_msgstore_openentry($this->_store,$parententryid); ++ $appointment_msg = mapi_folder_createmessage($folder); ++ $appointment = array($aprops["message_class"] => "IPM.Appointment", ++ $aprops["location"] => "", ++ $aprops["body"] => "", ++ $aprops["busystatus"] => 0 ++ ); ++ mapi_setprops($appointment_msg,$appointment); ++ } ++ // Have the starttime im GMT ++ $starttime = gmmktime(0,0,0, ++ date("m",$entrydate), ++ date("j",$entrydate), ++ date("Y",$entrydate)); ++ // Just update something in case changes occured to reduce amount ++ // of sync activities... ++ ++ if ($entrydate != $appointment[$aprops["starttime"]] || ++ $entrysubject != $appointment[$aprops["subject"]]) { ++ // Reset the subject in case the name has changed ++ $appointment[$aprops["subject"]] = $entrysubject; ++ // Set the label to 8 = birthday and 9 = anniversary ++ $appointment[$aprops["label"]] = $entrylabel; ++ // Instead of having rubbish inside... ++ $appointment[$aprops["recurring_pattern"]] = ""; ++ // Setting the reminder values ++ $appointment[$aprops["reminder"]] = true; ++ $appointment[$aprops["reminder_minutes"]] = 15; ++ $appointment[$aprops["remindertime"]] = $starttime-(15*60); ++ // Setting start & Endtime ++ $appointment[$aprops["starttime"]] = $starttime; ++ $appointment[$aprops["endtime"]] = $starttime + 86400; ++ // Set duration upon diff between start and endtime in minutes. ++ $appointment[$aprops["duration"]] = ($appointment[$aprops["endtime"]] - $appointment[$aprops["starttime"]]) / 60; ++ // Sure... birthdays and anniversaries occur on daily base :-) ++ $appointment[$aprops["recurring"]] = true; ++ $appointment[$aprops["alldayevent"]] = true; ++ // Update the id's and search keys ++ $appointment[$aprops["lid_contact_link_entryid"]] = hex2bin($this->_packContactLinkEntryIDS(array($contact[$cprops["entryid"]]))); ++ $appointment[$aprops["lid_contact_link_search_key"]] = hex2bin($this->_packContactLinkSearchKeys(array($contact[$cprops["search_key"]]))); ++ // Set the changed properties ++ mapi_setprops($appointment_msg,$appointment); ++ $recurrence = new Recurrence($this->_store, $appointment_msg); ++ $tz = array(); ++ $tz["timezone"] = (($entrydate-$starttime)/3600)*60; ++ $tz["timezonedst"] = 0; ++ $tz["dstendmonth"] = 0; ++ $tz["dstendweek"] = 0; ++ $tz["dstendhour"] = 0; ++ $tz["dststartmonth"] = 0; ++ $tz["dststartweek"] = 0; ++ $tz["dststarthour"] = 0; ++ // Set the iconindex to be recurring ++ $appointment[$aprops["icon_index"]] = 1025; ++ // Set the changed properties ++ $appointment = mapi_setprops($appointment_msg,$appointment); ++ // Recurring values ++ $recur["type"] = 13; ++ $recur["subtype"] = 2; ++ $recur["month"] = $arrayMonth[gmdate("m",$starttime)-1]; ++ $recur["everyn"] = 12; ++ $recur["regen"] = 1; ++ $recur["monthday"] = gmdate("j",$starttime); ++ $recur["term"] = 0x23; ++ $recur["numoccur"] = 0; ++ $recur["start"] = $starttime; ++ $recur["end"] = 79870662000; // no end ++ $recur["startocc"] = 0; ++ $recur["endocc"] = 1440; ++ // Let class.recurrence do its job. ++ $recurrence->setRecurrence($tz, $recur); ++ // Save the changes to message ++ mapi_savechanges($appointment_msg); ++ $appointment = mapi_getprops($appointment_msg); ++ mapi_setprops($mapimessage,array($entryprop => $appointment[$aprops['entryid']])); ++ mapi_savechanges($mapimessage); ++ } ++ } ++ } ++ } ++ } ++ /** ++ * unpacks the Contact Link Entry IDs ++ * ++ * @param string in hex with the value ++ * @return array with all binary Contact Link Entry IDS ++ * ++ */ ++ function _unpackContactLinkEntryIDS($value) ++ { ++ $contact_link_entry_ids = unpack("Vcount",hex2bin(substr($value,0,8))); ++ $contact_link_entry_ids["entry_ids"] = array(); ++ $length=8; ++ for ($j=0,$i=8;$j<$contact_link_entry_ids["count"];$j++,$i=$i+$length+8) { ++ $l = unpack("Vlength",hex2bin(substr($value,$i,8))); ++ $length=$l["length"]; ++ $temp = unpack ("VFlags/A16ProviderUID/VVersion/VType/VIndext/Vcbid/A*abeid",hex2bin(substr($value,$i+8,($length*2)))); ++ $temp["abeid"] = hex2bin(substr(bin2hex($temp["abeid"]),0,$temp["cbid"]*2)); ++ $contact_link_entry_ids["entry_ids"][]=$temp["abeid"]; ++ } ++ return $contact_link_entry_ids["entry_ids"]; ++ } ++ ++ /** ++ * packs the Contact Link Entry IDs ++ * ++ * @param array with all binary Contact Link Entry IDs ++ * @return string in hex with the value ++ * ++ */ ++ function _packContactLinkEntryIDS($values) { ++ $temp=""; ++ for ($i=0;$i +diff -ruN /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/class.recurrence.php mapi/class.recurrence.php +--- /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/class.recurrence.php Fri Oct 16 21:05:22 2009 ++++ mapi/class.recurrence.php Tue Oct 20 19:29:54 2009 +@@ -363,9 +363,13 @@ + * @param array $exception_props the exception properties (same properties as normal recurring items) + * @param date $base_date the base date of the exception (actual GMT time of non-exception occurrence) + * @param boolean $delete true - delete occurrence, false - create new exception or modify existing ++ * @param boolean $islocal true - expect the base_date in local time (happens in case basedate is returned from WA! + */ +- function createException($exception_props, $base_date, $delete = false) ++ function createException($exception_props, $base_date, $delete = false, $islocal=false) + { ++ // CHANGED dw2412 to support local base_date as delivered from WebAccess ++ if ($islocal == true) $base_date = $this->toGMT($this->tz, $base_date); ++ + $baseday = $this->dayStartOf($this->fromGMT($this->tz, $base_date)); + $basetime = $baseday + $this->recur["startocc"] * 60; + +@@ -447,8 +451,10 @@ + * Modifies an existing exception, but only updates the given properties + * NOTE: You can't remove properites from an exception, only add new ones + */ +- function modifyException($exception_props, $base_date) ++ function modifyException($exception_props, $base_date, $islocal=false) + { ++ // ADDED dw2412 to support local base_date as delivered from WebAccess ++ if ($islocal == true) $base_date = $this->toGMT($this->tz, $base_date); + if(!$this->isValidExceptionDate($base_date, $exception_props[$this->proptags["startdate"]])) + return false; + +@@ -573,13 +579,17 @@ + + // Returns the start or end time of the occurrence on the given base date. + // This assumes that the basedate you supply is correct .. ! +- function getOccurrenceStart($basedate) { +- $daystart = $this->dayStartOf($this->fromGMT($this->tz, $basedate)); ++ function getOccurrenceStart($basedate, $islocal = false) { ++ // CHANGED dw2412 to support local base_date as delivered from WebAccess ++ if ($islocal == false) $daystart = $this->dayStartOf($this->fromGMT($this->tz, $basedate)); ++ else $daystart = $this->dayStartOf($basedate); + return $this->toGMT($this->tz, $daystart + $this->recur["startocc"] * 60); + } + +- function getOccurrenceEnd($basedate) { +- $daystart = $this->dayStartOf($this->fromGMT($this->tz, $basedate)); ++ function getOccurrenceEnd($basedate, $islocal = false) { ++ // CHANGED dw2412 to support local base_date as delivered from WebAccess ++ if ($islocal == false) $daystart = $this->dayStartOf($this->fromGMT($this->tz, $basedate)); ++ else $daystart = $this->dayStartOf($basedate); + return $this->toGMT($this->tz, $daystart + $this->recur["endocc"] * 60); + } + +@@ -1229,8 +1239,12 @@ + /** + * Returns the exception if there is a CHANGE exception on the given base date, or FALSE otherwise + */ +- function getChangeException($basedate) ++ function getChangeException($basedate, $islocal) + { ++ // CHANGED dw2412 to support local base_date as delivered from WebAccess ++ if ($islocal == true) $basedate = $this->toGMT($this->tz, $basedate); ++ ++ + // Check if the occurrence is modified on the specified date + foreach($this->recur["changed_occurences"] as $changed) + { +@@ -1263,7 +1277,6 @@ + function dayStartOf($date) + { + $time1 = $this->gmtime($date); +- + return gmmktime(0, 0, 0, $time1["tm_mon"] + 1, $time1["tm_mday"], $time1["tm_year"] + 1900); + } + +diff -ruN /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/mapiguid.php mapi/mapiguid.php +--- /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/mapiguid.php Fri Oct 16 21:05:22 2009 ++++ mapi/mapiguid.php Tue Oct 20 19:29:54 2009 +@@ -67,4 +67,7 @@ + define('PS_MAPI', makeguid("{00020328-0000-0000-C000-000000000046}")); + define('PS_PUBLIC_STRINGS', makeguid("{00020329-0000-0000-C000-000000000046}")); + define('PS_INTERNET_HEADERS', makeguid("{00020386-0000-0000-c000-000000000046}")); ++ ++define('MAPIUID_LinkContactEntryID', makeguid("{0aaa42fe-c718-101a-e885-0b651c240000}")); // http://msdn.microsoft.com/en-us/library/bb820924.aspx misc2 in CONTAB structure in Internet This parameter is reserved for Outlook internal use and is not supported. ++ + ?> +diff -ruN /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/mapitags.php mapi/mapitags.php +--- /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/mapitags.php Fri Oct 16 21:05:22 2009 ++++ mapi/mapitags.php Tue Oct 20 19:29:54 2009 +@@ -601,7 +601,25 @@ + define('PR_FINDER_ENTRYID' ,mapi_prop_tag(PT_BINARY, 0x35E7)); + define('PR_IPM_FAVORITES_ENTRYID' ,mapi_prop_tag(PT_BINARY, 0x6630)); + define('PR_IPM_PUBLIC_FOLDERS_ENTRYID' ,mapi_prop_tag(PT_BINARY, 0x6631)); ++//* start: Added dw2412 source www.cdolive.com/cdo10.htm ++define('PR_HAS_RULES' ,mapi_prop_tag(PT_BINARY, 0x663A)); + ++// Outlook AutoArchive Properties ++define('PR_AGING_PERIOD' ,mapi_prop_tag(PT_LONG, 0x36EC)); ++define('PR_AGING_GRANULARITY' ,mapi_prop_tag(PT_LONG, 0x36EE)); ++define('PR_AGING_FILENAME' ,mapi_prop_tag(PT_TSTRING, 0x6856)); ++define('PR_AGING_AGE_FOLDER' ,mapi_prop_tag(PT_BOOLEAN, 0x6857)); ++define('PR_AGING_DELETE_ITEMS' ,mapi_prop_tag(PT_BOOLEAN, 0x6855)); ++define('PR_AGING_FILE_NAME_AFTER9' ,mapi_prop_tag(PT_TSTRING, 0x6859)); ++define('PR_AGING_DONT_AGE_ME' ,mapi_prop_tag(PT_BOOLEAN, 0x6858)); ++define('PR_AGING_WHEN_DELETED_ON_SERVER' ,mapi_prop_tag(PT_BOOLEAN, 0x685B)); ++define('PR_AGING_WAIT_UNTIL_EXPIRED' ,mapi_prop_tag(PT_BOOLEAN, 0x685C)); ++define('PR_AGING_VERSION' ,mapi_prop_tag(PT_LONG, 0x685D)); ++define('PR_AGING_DEFAULT' ,mapi_prop_tag(PT_LONG, 0x685E)); ++ ++ ++ ++//* End : added dw2412 + + /* Proptags 0x35E8-0x35FF reserved for folders "guaranteed" by 'PR_VALID_FOLDER_MASK */ + +@@ -637,6 +655,19 @@ + define('PR_DEFAULT_VIEW_ENTRYID' ,mapi_prop_tag(PT_BINARY, 0x3616)); + define('PR_ASSOC_CONTENT_COUNT' ,mapi_prop_tag(PT_LONG, 0x3617)); + ++//* start: Added dw2412 source www.cdolive.com/cdo10.htm ++define('PR_DEF_FORM_ALLOWED' ,mapi_prop_tag(PT_LONG, 0x3FE2)); ++define('PR_PUBLISH_IN_ADDRESS_BOOK' ,mapi_prop_tag(PT_BOOLEAN, 0x3FE6)); ++define('PR_WEBPAGE' ,mapi_prop_tag(PT_TSTRING, 0x36DF)); ++define('PR_FOLDER_VIEWS_ONLY' ,mapi_prop_tag(PT_LONG, 0x36E1)); ++define('PR_DEF_MSG_CLASS' ,mapi_prop_tag(PT_TSTRING, 0x36E5)); ++define('PR_DEF_FORM_NAME' ,mapi_prop_tag(PT_TSTRING, 0x36E6)); ++define('PR_GENERATE_EXCHANGE_VIEWS' ,mapi_prop_tag(PT_BOOLEAN, 0x36E9)); ++define('PR_VIEW_NAME' ,mapi_prop_tag(PT_TSTRING, 0x7006)); ++define('PR_OFFLINE_FLAG' ,mapi_prop_tag(PT_LONG, 0x663D)); ++define('PR_REPLICA_VERSION' ,mapi_prop_tag(PT_LONG, 0x664B)); ++//* end : Added dw2412 ++ + define('PR_RIGHTS' ,mapi_prop_tag(PT_LONG, 0x6639)); + + /* Reserved 0x36C0-0x36FF */ +@@ -1231,6 +1262,9 @@ + + define('PR_PROCESSED', mapi_prop_tag(PT_BOOLEAN, 0x7D01)); + ++// ADDED dw2412 Contact Photo Attachment ++define('PR_ATTACHMENT_CONTACTPHOTO' ,mapi_prop_tag(PT_BOOLEAN, 0x7FFF)); ++ + // Delegates properties + define('PR_DELEGATES_SEE_PRIVATE', mapi_prop_tag(PT_MV_LONG, 0x686B)); + define('PR_SCHDINFO_DELEGATE_ENTRYIDS', mapi_prop_tag(PT_MV_BINARY, 0x6845)); +--- /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/Makefile.am 2009-10-16 15:55:59.000000000 +0200 ++++ zarafa-6.30.4/php-ext/Makefile.am.brodowski 2009-10-24 23:48:37.000000000 +0200 +@@ -23,7 +23,7 @@ + # and be missing at runtime. + # therefore, we explicitly link mapi.so with -lpthread :( + +-dist_data_DATA = include/mapi/mapicode.php include/mapi/mapidefs.php include/mapi/mapitags.php include/mapi/mapi.util.php include/mapi/class.recurrence.php include/mapi/class.meetingrequest.php include/mapi/class.freebusypublish.php include/mapi/mapiguid.php ++dist_data_DATA = include/mapi/mapicode.php include/mapi/mapidefs.php include/mapi/mapitags.php include/mapi/mapi.util.php include/mapi/class.recurrence.php include/mapi/class.meetingrequest.php include/mapi/class.freebusypublish.php include/mapi/mapiguid.php include/mapi/class.autoarchivesettings.php include/mapi/class.linkedappointment.php + datadir = ${datarootdir}/php/mapi + + mapi_la_SOURCES = main.cpp Session.cpp SessionPool.cpp util.cpp \ diff --git a/zarafa-6.30.4-package.patch b/zarafa-6.30.4-package.patch new file mode 100644 index 0000000..3c42aa1 --- /dev/null +++ b/zarafa-6.30.4-package.patch @@ -0,0 +1,48 @@ +Patch by Robert Scheck for zarafa >= 6.30.4, 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. + +--- zarafa-6.30.4/configure.ac 2009-03-17 17:30:45.000000000 +0100 ++++ zarafa-6.30.4/configure.ac.fedora 2009-03-31 20:34:29.000000000 +0200 +@@ -591,17 +591,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 + +--- zarafa-6.30.4/ECtools/Makefile.am 2009-04-23 22:10:44.000000000 +0200 ++++ zarafa-6.30.4/ECtools/Makefile.am.fedora 2009-04-25 21:20:43.000000000 +0200 +@@ -1,7 +1,3 @@ +-if ! OSS_ONLY +-PROSUBS = zarafa-backup zarafa-report +-endif +- + if WITH_TESTTOOLS + TESTSUBS = ECTestTools + endif +--- zarafa-6.30.4/Makefile.am 2009-04-23 22:10:44.000000000 +0200 ++++ zarafa-6.30.4/Makefile.am.fedora 2009-04-25 21:20:26.000000000 +0200 +@@ -1,9 +1,5 @@ + AUTOMAKE_OPTIONS = 1.8 foreign + +-if ! OSS_ONLY +-PROSUBS = liblicense licensed +-endif +- + SUBDIRS = common libfreebusy mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext spooler gateway caldav ECtools installer po doc + + if WITH_PERL diff --git a/zarafa-6.30.4-perl.patch b/zarafa-6.30.4-perl.patch new file mode 100644 index 0000000..3c5bed5 --- /dev/null +++ b/zarafa-6.30.4-perl.patch @@ -0,0 +1,53 @@ +Patch by Robert Scheck for Zarafa >= 6.30.3, which +replaces the hardcoded perl directories by correct ones (in a dynamic way). Only +Debian and Ubuntu have ExtUtils in /usr/share, openSUSE, Fedora and RHEL/CentOS +use /usr/lib. So let us use the correct way to detect the directory. + +This patch should be an advantage to OSS users on non-Debian distributions when +using Perl API, as the correct directory will get picked up. + +--- zarafa-6.30.0/configure.ac 2009-07-20 18:41:07.000000000 +0200 ++++ zarafa-6.30.0/configure.ac.perl 2009-10-16 00:23:52.000000000 +0200 +@@ -127,6 +127,22 @@ + # build perl stuff + AC_ARG_ENABLE(perl, AC_HELP_STRING([--enable-perl], [enable building perl bindings]), [want_perl=${enableval}], [want_perl=no]) + AM_CONDITIONAL(WITH_PERL, test "$want_perl" = "yes") ++if test "x$want_perl" = "xyes"; then ++ AC_PATH_PROG([PERL], [perl], [no]) ++ if test "x$PERL" = "xno"; then ++ AC_MSG_ERROR([perl is required for building perl bindings]) ++ fi ++ ++ AC_MSG_CHECKING([for perl installarchlib]) ++ PERL_ARCHLIB=`$PERL -V:installarchlib | sed -e "s/^.*='//" -e "s/';$//"` ++ AC_MSG_RESULT([$PERL_ARCHLIB]) ++ AC_SUBST(PERL_ARCHLIB) ++ ++ AC_MSG_CHECKING([for perl privlib]) ++ PERL_PRIVLIB=`$PERL -V:privlib | sed -e "s/^.*='//" -e "s/';$//"` ++ AC_MSG_RESULT([$PERL_PRIVLIB]) ++ AC_SUBST(PERL_PRIVLIB) ++fi + + # testtools require ncurses + if test "$want_tests" = "yes"; then +--- zarafa-6.30.0/perl/Makefile.am 2009-07-20 18:41:06.000000000 +0200 ++++ zarafa-6.30.0/perl/Makefile.am.perl 2009-10-16 00:24:51.000000000 +0200 +@@ -1,7 +1,6 @@ + lib_LTLIBRARIES = libperlmapi.la + +-PVERSION=5.8.8 +-AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX -I$(top_srcdir)/mapi4linux/include -I$(top_srcdir)/provider/common -I${top_srcdir}/common -I/usr/lib/perl/$(PVERSION)/CORE ++AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX -I$(top_srcdir)/mapi4linux/include -I$(top_srcdir)/provider/common -I${top_srcdir}/common -I$(PERL_ARCHLIB)/CORE + + libperlmapi_la_LIBADD = ${top_builddir}/mapi4linux/src/libmapi.la \ + ${top_builddir}/common/libcommon_mapi.la \ +@@ -12,7 +11,7 @@ + CLEANFILES = MAPI.cpp + + .xs.cpp: typemap +- xsubpp -noprototypes -nolinenumbers -C++ -typemap /usr/share/perl/$(PVERSION)/ExtUtils/typemap $< > $@; \ ++ xsubpp -noprototypes -nolinenumbers -C++ -typemap $(PERL_PRIVLIB)/ExtUtils/typemap $< > $@; \ + if [ $$? -ne 0 ]; then rm $@; fi + + check-syntax: diff --git a/zarafa.ini b/zarafa.ini new file mode 100644 index 0000000..160434a --- /dev/null +++ b/zarafa.ini @@ -0,0 +1,2 @@ +; Enable Zarafa mapi extension module +extension=mapi.so diff --git a/zarafa.spec b/zarafa.spec new file mode 100644 index 0000000..a034b78 --- /dev/null +++ b/zarafa.spec @@ -0,0 +1,824 @@ +# +# Releasing with this .spec, for fun and profit; +# +# = Beta Release or Release Candidate = +# +# 1. Set beta_or_rc to 1 +# 2. Set actual_release to the actual_release value of the previous +# build attempt, +1 +# - The release tag in case of a beta_or_rc release is (statically) +# prefixed with "0.", so that the first final release ("1") is always +# newer (in rpm-compver). +# 3. Set the SVN revision to the current SVN revision; +# - This ensures a future SVN revision is always *more* recent in +# rpm-compver +# - Lacking a unique zarafa-.svn.tar.gz source +# tarball, setting the correct SVN revision in the .spec is +# critical in order to be able to determine exactly what was in +# the tarball at the time of this build. You may recover the exact +# SVN revision used from the resulting SRPM and RPMs because it ends +# up in the RPM release tag. +# 4. Update %%changelog, considering the following; +# - Possibly change only the release tag for the most recent changelog +# %%changelog entry, if appropriate +# - Add a message about the changes to either the product or the RPM +# packaging +# 5. Build locally +# 6. Build in mock for; +# a) fedora-rawhide-x86_64, +# b) fedora-12-x86_64, +# c) fedora-11-x86_64, +# d) epel-5-x86_64, +# e) epel-4-x86_64 +# +# or scratch build in koji; +# +# for tag in dist-f13 dist-f12-updates-candidate dist-f11-updates-candidate \ +# dist-5E-epel dist-4E-epel; do +# echo "- $tag: `koji build --scratch --nowait $tag $srpm 2>&1 | grep \"Task info\" | awk '{print $3}'`" +# done +# +# 7. Should builds fail, repeat the process. +# +# = Final Release = +# +# NOTE: A final release of a version, or multiple final releases of the +# same version, of Zarafa 6.30.10 requires one unique tarball, probably +# named similar to zarafa-6.30.10.tar.gz. +# +# Once this tarball is used for an RPM package that is actually released, +# the .tar.gz source should not change anymore. You may, though, include +# patches for the 6.30.10 RPM package in this .spec and bumping the release +# number. +# +# When you do so, however, you will need to take into account upgrade paths +# between distribution versions. E.g., when releasing 6.30.10-2 to F-11, you +# would also need to release 6.30.10-2 to F-12. +# +# An alternative is to release 6.30.10.1 with a zarafa-6.30.10.1.tar.gz (yet +# again ensuring there is an upgrade path to later distribution versions) +# +# The point behind this has to do with reproducibility, though admittedly, +# the Source RPM corresponding to the binary RPM (comparing the +# -.src.rpm vs. the installed +# -..rpm) does reveal the actual SVN revision number, +# and should thus also build the exact same thing running in production (euh, +# at customers, that is). +# +# 1. Set beta_or_rc to 0 +# 2. Set actual_release to 1, or the value of actual_release of +# the previous stable release, +1 in case have already released +# this SVN revision as a stable product. +# 3. Set the SVN revision to the current SVN revision; +# - Lacking a unique zarafa-.svn.tar.gz source +# tarball, setting the correct SVN revision in the .spec is +# critical in order to be able to determine exactly what was in +# the tarball at the time of this build. You may recover the exact +# SVN revision used from the resulting SRPM, as the .spec in that +# SRPM contains the SVN revision number (but not the resulting RPMs +# just for the sake of appearance). +# 4. Update %%changelog, considering the following; +# - Remove all %%changelog stamps that have a beta_or_rc type of versioning, +# again just for appearances sake, possibly preserving the important +# messages from each beta_or_rc type of changelog entries, e.g.: +# +# * Some Time Your Name - 6.30.10-0.1svn12345 +# - Improve packaging +# +# might, in a final release, become: +# +# * Some Time Zarafa Release Engineering - 6.30.10-1 +# - Release 6.30.10 +# - Improve packaging +# +# - Possibly change only the release tag for the most recent changelog +# %%changelog entry, if appropriate. This is assuming there is no +# important or significant changes between the beta_or_rc and the final +# product. +# - Add a message about the changes to either the product or the RPM +# packaging if appropriate. +# 5. Build locally +# 6. Build in mock for; +# a) fedora-rawhide-x86_64, +# b) fedora-12-x86_64, +# c) fedora-11-x86_64, +# d) epel-5-x86_64, +# e) epel-4-x86_64 +# +# or scratch build in koji; +# +# for tag in dist-f13 dist-f12-updates-candidate dist-f11-updates-candidate \ +# dist-5E-epel dist-4E-epel; do +# echo "- $tag: `koji build --scratch --nowait $tag $srpm 2>&1 | grep \"Task info\" | awk '{print $3}'`" +# done +# +# 7. When mock or koji scratch builds fail, repeat the process. +# + +%define beta_or_rc 0 +%define actual_release 1 +%define svnrevision 18495 +%define with_ldap 1 +%define with_xmlto 1 + +Summary: Zarafa Outlook Sharing and Open Source Collaboration +Name: zarafa +Version: 6.30.10 +%if %{beta_or_rc} +Release: 0.%{actual_release}.svn%{svnrevision}%{?dist} +%else +Release: %{actual_release}%{?dist} +%endif +# Red Hat Legal has been advised by email from Zarafa that no license is +# required in order to use the letter string "zarafa" (combined with other +# words) in the package naming, to refer to the software as "Zarafa" to +# indicate its intended purpose, and to modify packages with bug fixes and +# enhancements. +License: AGPLv3 with exceptions +Group: Applications/Productivity +URL: http://www.zarafa.com/ +# http://www.zarafa.com/download-community -> "Zarafa Source Package" +Source0: %{name}-%{version}.tar.gz +Source1: %{name}.ini + +Patch0: zarafa-6.30.4-package.patch +# Patch 1, 2 and 3 were sent to upstream +Patch1: zarafa-6.30.4-perl.patch +Patch2: zarafa-6.30.10-undefined-symbol.patch +Patch3: zarafa-6.30.10-chmod.patch +# http://www.brodowski.org/zarafa/php-mapi/6.30.10.18495/18495_patch.diff +Patch10: zarafa-6.30.4-brodowski.patch + +BuildRequires: bison +BuildRequires: gcc-c++ +BuildRequires: byacc +BuildRequires: flex +BuildRequires: gettext +BuildRequires: libical-devel >= 0.42 +BuildRequires: libvmime07-devel +BuildRequires: libxml2-devel +BuildRequires: mysql-devel >= 4.1 +BuildRequires: ncurses-devel +BuildRequires: pam-devel +BuildRequires: php-devel +BuildRequires: libtool, automake, autoconf + +%if 0%{?fedora} > 8 +BuildRequires: libcurl-devel +BuildRequires: perl-devel +%else +BuildRequires: curl-devel +BuildRequires: perl +%endif + +%if 0%{?fedora} >= 12 +BuildRequires: libuuid-devel +%endif + +%if %{with_ldap} +BuildRequires: openldap-devel +%endif + +%if %{with_xmlto} +BuildRequires: xmlto +%endif + +# The normal zarafa package pulls in all of zarafa +Requires: zarafa(ical) = %{version}-%{release} +Requires: zarafa(dagent) = %{version}-%{release} +Requires: zarafa(gateway) = %{version}-%{release} +Requires: zarafa(monitor) = %{version}-%{release} +Requires: zarafa(server) = %{version}-%{release} +Requires: zarafa(spooler) = %{version}-%{release} +Requires: zarafa(utils) = %{version}-%{release} +Requires: zarafa(config) = %{version}-%{release} + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +%description +Zarafa Outlook Sharing is a Microsoft Exchange replacement. The Open Source +Collaboration provides an integration with your existing Linux mail server, +native mobile phone support by ActiveSync compatiblity and a webaccess with +'Look & Feel' similar to Outlook using Ajax. Including an IMAP4 and a POP3 +gateway as well as an iCal/CalDAV gateway, Zarafa can combine the usability +with the stability and flexibility of a Linux server. + +The proven Zarafa groupware solution is using MAPI objects, provides a MAPI +client library as well as programming interfaces for C++, PHP and Perl. The +other Zarafa related packages need to be installed to gain all the features +and benefits of Zarafa Outlook Sharing and Open Source Collaboration. + +## +## Zarafa Client +## +%package client +Summary: Zarafa Client Library +Group: System Environment/Libraries +Requires: zarafa(common) = %{version}-%{release} +Provides: zarafa(client) = %{version}-%{release} + +%description client +Zarafa client libraries for use with integrated MAPI clients. + +## +## Zarafa Common files +## +%package common +Summary: Zarafa common files +Group: System Environment/Daemons +Requires(pre): shadow-utils +Provides: zarafa(common) = %{version}-%{release} + +%description common +Common files and directories required by most Zarafa packages. + +## +## Zarafa Delivery Agent +## +%package dagent +Summary: Zarafa Delivery Agent +Group: System Environment/Daemons +Requires: zarafa(client) = %{version}-%{release} +Requires: zarafa(common) = %{version}-%{release} +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(postun): /sbin/service +Provides: zarafa(dagent) = %{version}-%{release} +Provides: zarafa(config::dagent) = %{version}-%{release} + +%description dagent +The delivery agent delivers e-mails into the Zarafa server. +It can be used to trigger the local mailer or act as the LMTP +server. + +## +## Zarafa Development Headers +## +%package devel +Summary: Development files for several Zarafa libraries +Group: Development/Libraries +Requires: %{name} = %{version}-%{release}, pkgconfig +Requires: zarafa(common) = %{version}-%{release} +Provides: %{name}-static = %{version}-%{release} + +%description devel +The zarafa-devel package includes header files and libraries necessary for +developing programs which use features from the Zarafa Outlook Sharing and +Open Source Collaboration. The proven Zarafa groupware solution is using +MAPI objects, provides a MAPI client library and programming interfaces for +C++, PHP and Perl. + +## +## Zarafa Gateway +## +%package gateway +Summary: Zarafa Gateway server (POP3/IMAP access) +Group: System Environment/Daemons +Requires: zarafa(client) = %{version}-%{release} +Requires: zarafa(common) = %{version}-%{release} +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(postun): /sbin/service +Provides: zarafa(gateway) = %{version}-%{release} +Provides: zarafa(config::gateway) = %{version}-%{release} + +%description gateway +The gateway enables other e-mail clients to connect through +POP3 or IMAP to the Zarafa server to read their e-mail. With +IMAP, it is also possible to view the contents of shared +folders and subfolders. The gateway can be configured to +listen for POP3, POP3S, IMAP and/or IMAPS. + +## +## Zarafa iCal/CalDAV server +## +%package ical +Summary: The Zarafa iCal/CalDAV gateway +Group: System Environment/Daemons +Requires: zarafa(client) = %{version}-%{release} +Requires: zarafa(common) = %{version}-%{release} +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(postun): /sbin/service +Provides: zarafa(ical) = %{version}-%{release} +Provides: zarafa(caldav) = %{version}-%{release} +Provides: zarafa(config::ical) = %{version}-%{release} +Provides: zarafa(config::caldav) = %{version}-%{release} + +%description ical +The iCal/CalDAV gateway enables users to retrieve their +calendar using iCalendar compliant clients. The iCal/CalDAV +gateway can be configured to listen for HTTP and HTTPS +requests. + +## +## Zarafa CalDAV package, merely an alias for zarafa-ical +## +%package caldav +Summary: The Zarafa iCal/CalDAV gateway +Group: System Environment/Daemons +Requires: zarafa(ical) = %{version}-%{release} + +%description caldav +The iCal/CalDAV gateway enables users to retrieve their +calendar using iCalendar compliant clients. The iCal/CalDAV +gateway can be configured to listen for HTTP and HTTPS +requests. + +## +## Zarafa Monitor Service +## +%package monitor +Summary: Zarafa Monitoring service +Group: System Environment/Daemons +Requires: zarafa(client) = %{version}-%{release} +Requires: zarafa(common) = %{version}-%{release} +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(postun): /sbin/service +Provides: zarafa(monitor) = %{version}-%{release} +Provides: zarafa(config::monitor) = %{version}-%{release} + +%description monitor +The monitor checks user mailbox sizes. When a quotum is reached +the monitor sends a quota notification email. + +## +## Zarafa Backend Server +## +%package server +Summary: Zarafa Backend Server +Group: System Environment/Daemons +Requires: zarafa(common) = %{version}-%{release} +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(postun): /sbin/service +Provides: zarafa(server) = %{version}-%{release} +Provides: zarafa(config) = %{version}-%{release} +Provides: zarafa(config::server) = %{version}-%{release} + +%description server +The Zarafa groupware backend server + +## +## Zarafa Spooler Service +## +%package spooler +Summary: Zarafa Spooler Service +Group: System Environment/Daemons +Requires: zarafa(client) = %{version}-%{release} +Requires: zarafa(common) = %{version}-%{release} +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(postun): /sbin/service +Provides: zarafa(spooler) = %{version}-%{release} +Provides: zarafa(config::spooler) = %{version}-%{release} + +%description spooler +The spooler sends all pending Zarafa e-mail to the recipients, +from the Outbox of a user/all users. + +## +## Zarafa Utilities +## +%package utils +Summary: Zarafa Utilities +Group: Applications/System +Requires: zarafa(client) = %{version}-%{release} +Requires: zarafa(common) = %{version}-%{release} +Provides: zarafa(utils) = %{version}-%{release} + +%description utils +Administration utilities for the Zarafa Groupware environment +including reporting and password management. + +## +## MAPI System Libraries +## +%package -n libmapi +Summary: Mapi libraries by Zarafa +Group: System Environment/Libraries +Requires: zarafa(client) = %{version}-%{release} +Requires(post): /sbin/ldconfig +Requires(postun): /sbin/ldconfig + +%description -n libmapi +MAPI libraries by Zarafa. + +## +## MAPI Perl extension +## +%package -n perl-libmapi +Summary: Perl Mapi extension libraries by Zarafa +Group: System Environment/Libraries +Requires: perl + +%description -n perl-libmapi +Perl MAPI extension libraries by Zarafa. + +## +## MAPI PHP Extension +## +%package -n php-mapi +Summary: A PHP Mapi client by Zarafa +Group: Applications/Communications +# Bug: Without mod_ssl, reloading httpd causes core dump +Requires: mod_ssl +Requires: php >= 4.3 +Provides: php(mapi) = %{version}-%{release} + +%description -n php-mapi +PHP MAPI extension by Zarafa to enable MAPI communication in PHP. + +%prep +%setup -q +%patch0 -p1 -b .package +%patch1 -p1 -b .perl +%patch2 -p1 -b .symbol +%patch3 -p1 -b .chmod +#%%patch10 -p5 -b .brodowski + +# Needed to get rid of rpath +libtoolize --force +autoreconf --force --install + +%build +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -g -ggdb" +export CFLAGS +%configure \ + --with-userscript-prefix=%{_sysconfdir}/%{name}/userscripts \ + --with-quotatemplate-prefix=%{_sysconfdir}/%{name}/quotamail \ +%if 0%{?rhel} > 0 + --enable-release \ +%endif + --disable-static \ + --disable-testtools \ + --enable-perl +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make \ +%if 0%{?rhel} > 0 + docdir=%{_datadir}/doc/%{name}/ \ + datarootdir=%{_datadir} \ +%endif + DESTDIR=$RPM_BUILD_ROOT \ + INSTALL='install -p' \ + install + +# Nuke all overlefts from licensed, managed or other proprietary items +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/report-ca +rm -f $RPM_BUILD_ROOT%{_mandir}/man?/zarafa-{backup,restore,ldapms.cfg,licensed{,.cfg}}.* + +# Move all the initscripts to their appropriate place and +# ensure that all services are off by default at boot time +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/ +for service in server spooler dagent gateway monitor ical; do + if [ -f $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/%{name}-$service.init.fc ]; then + sed -e 's@345@-@' $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/%{name}-$service.init.fc > \ + $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}-$service + chmod 755 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}-$service + touch -c -r $RPM_BUILD_ROOT{%{_datadir}/doc/%{name}/%{name}-$service.init.fc,%{_sysconfdir}/rc.d/init.d/%{name}-$service} + fi +done + +# Move the configuration files to their correct place and handle +# /usr/lib vs. /usr/lib64 for all architectures correct and set +# run_as_user, run_as_group and local_admin_users values correct +for config in $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/*.cfg; do + config=$(basename $config) + if [ -f $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/$config ]; then + sed -e 's@\(run_as_\(user\|group\)[[:space:]]*=\).*@\1 %{name}@' -e 's@/usr/lib/zarafa@%{_libdir}/%{name}@' \ + -e 's@\(local_admin_users[[:space:]]*=[[:space:]]*root.*\)@\1 %{name}@' \ + $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/$config > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$config + chmod 640 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$config + touch -c -r $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/$config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$config + fi +done + +# Move the logrotate configuration file to it's correct place +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ +sed -e 's@\(}\)@ create 0644 %{name} %{name}\n\1@' -e '1,6d' \ + $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/%{name}.logrotate > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} +touch -c -r $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/%{name}.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} + +# Install the PHP module configuration file appropriate +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/php.d/ +install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/php.d/%{name}.ini + +# Create missing userscript directories for packaging them +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/userscripts/{create,delete}{user,group,company}.d/ + +# Move the userscripts to their correct place and symlink them +mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/userscripts/ +for userscript in companies_common.sh groups_common.sh users_common.sh \ + createcompany creategroup createuser deletecompany deletegroup deleteuser; do + mv -f $RPM_BUILD_ROOT{%{_sysconfdir},%{_datadir}}/%{name}/userscripts/$userscript + ln -sf ../../..%{_datadir}/%{name}/userscripts/$userscript $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/userscripts/$userscript +done + +# Create the data directory and install some files into +mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/ +install -p -m 755 installer/linux/db-{calc-storesize,convert-attachments-to-files} $RPM_BUILD_ROOT%{_datadir}/%{name}/ +install -p -m 755 installer/linux/ssl-certificates.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/ + +# Create the default log and lib directory for packaging +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{log,lib}/%{name}/ + +# Remove all libtool .la files to avoid packaging of them +rm -f $RPM_BUILD_ROOT%{_libdir}/{,php/modules,%{name}}/*.la + +# Remove files that are anyway in %doc or %{_datadir}/%{name}/ +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/ + +%find_lang %{name} + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre common +getent group %{name} > /dev/null || %{_sbindir}/groupadd -r %{name} +getent passwd %{name} > /dev/null || %{_sbindir}/useradd -r -g %{name} -d %{_localstatedir}/lib/%{name} -s /sbin/nologin -c "Zarafa Service Account" %{name} +exit 0 + +%post dagent +[ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-dagent +# Ensure correct log file ownership after upgrade from official packages +chown %{name}:%{name} %{_localstatedir}/log/%{name}/dagent.* > /dev/null 2>&1 || : + +%post ical +[ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-ical +# Ensure correct log file ownership after upgrade from official packages +chown %{name}:%{name} %{_localstatedir}/log/%{name}/ical.* > /dev/null 2>&1 || : + +%post gateway +[ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-gateway +# Ensure correct log file ownership after upgrade from official packages +chown %{name}:%{name} %{_localstatedir}/log/%{name}/gateway.* > /dev/null 2>&1 || : + +%post monitor +[ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-monitor +# Ensure correct log file ownership after upgrade from official packages +chown %{name}:%{name} %{_localstatedir}/log/%{name}/monitor.* > /dev/null 2>&1 || : + +%post server +[ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-server +# Ensure correct log file ownership after upgrade from official packages +chown %{name}:%{name} %{_localstatedir}/log/%{name}/server.* > /dev/null 2>&1 || : + +%post spooler +[ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-spooler +# Ensure correct log file ownership after upgrade from official packages +chown %{name}:%{name} %{_localstatedir}/log/%{name}/spooler.* > /dev/null 2>&1 || : + +%post -n libmapi -p /sbin/ldconfig + +%preun dagent +if [ $1 -eq 0 ]; then + /sbin/service %{name}-dagent stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name}-dagent +fi + +%preun ical +if [ $1 -eq 0 ]; then + /sbin/service %{name}-ical stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name}-ical +fi + +%preun gateway +if [ $1 -eq 0 ]; then + /sbin/service %{name}-gateway stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name}-gateway +fi + +%preun monitor +if [ $1 -eq 0 ]; then + /sbin/service %{name}-monitor stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name}-monitor +fi + +%preun server +if [ $1 -eq 0 ]; then + /sbin/service %{name}-server stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name}-server +fi + +%preun spooler +if [ $1 -eq 0 ]; then + /sbin/service %{name}-spooler stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name}-spooler +fi + +%postun dagent +if [ $1 -ne 0 ]; then + /sbin/service %{name}-dagent condrestart > /dev/null 2>&1 || : +fi + +%postun ical +if [ $1 -ne 0 ]; then + /sbin/service %{name}-ical condrestart > /dev/null 2>&1 || : +fi + +%postun gateway +if [ $1 -ne 0 ]; then + /sbin/service %{name}-gateway condrestart > /dev/null 2>&1 || : +fi + +%postun monitor +if [ $1 -ne 0 ]; then + /sbin/service %{name}-monitor condrestart > /dev/null 2>&1 || : +fi + +%postun server +if [ $1 -ne 0 ]; then + /sbin/service %{name}-server condrestart > /dev/null 2>&1 || : +fi + +%postun spooler +if [ $1 -ne 0 ]; then + /sbin/service %{name}-spooler condrestart > /dev/null 2>&1 || : +fi + +%postun -n libmapi -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 + +%files caldav +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 + +%files client +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 +%{_libdir}/libzarafaclient.so + +%files common +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 doc/performance-tuning.txt +%dir %{_sysconfdir}/%{name}/ +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name} +%dir %{_libdir}/%{name}/ +%{_mandir}/man1/%{name}.1* +%dir %{_datadir}/%{name}/ +%dir %attr(0755,%{name},%{name}) %{_localstatedir}/lib/%{name}/ +%dir %attr(0755,%{name},%{name}) %{_localstatedir}/log/%{name}/ + +%files dagent +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 installer/linux/createuser.dotforward +%{_bindir}/%{name}-autorespond +%{_bindir}/%{name}-dagent +%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/dagent.cfg +%{_sysconfdir}/rc.d/init.d/%{name}-dagent +%{_mandir}/man1/%{name}-dagent.1* +%{_mandir}/man5/%{name}-dagent.cfg.5* + +%files devel +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 +%{_libdir}/libicalmapi.so +%{_libdir}/libinetmapi.so +%{_libdir}/libmapi.so +%{_libdir}/libperlmapi.so +%{_libdir}/libcommon_mapi.a +%{_libdir}/libcommon_ssl.a +%{_libdir}/libcommon_util.a +%{_libdir}/libfreebusy.a +%{_includedir}/icalmapi/ +%{_includedir}/inetmapi/ +%{_includedir}/mapi4linux/ +%{_includedir}/%{name}/ +%{_libdir}/pkgconfig/%{name}.pc + +%files gateway +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 +%{_bindir}/%{name}-gateway +%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/gateway.cfg +%{_sysconfdir}/rc.d/init.d/%{name}-gateway +%{_mandir}/man1/%{name}-gateway.1* +%{_mandir}/man5/%{name}-gateway.cfg.5* + +%files ical +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 +%{_bindir}/%{name}-ical +%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/ical.cfg +%{_sysconfdir}/rc.d/init.d/%{name}-ical +%{_mandir}/man1/%{name}-ical.1* +%{_mandir}/man5/%{name}-ical.cfg.5* + +%files monitor +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 +%{_bindir}/%{name}-monitor +%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/monitor.cfg +%dir %{_sysconfdir}/%{name}/quotamail/ +%config(noreplace) %{_sysconfdir}/%{name}/quotamail/companyhard.mail +%config(noreplace) %{_sysconfdir}/%{name}/quotamail/companysoft.mail +%config(noreplace) %{_sysconfdir}/%{name}/quotamail/companywarning.mail +%config(noreplace) %{_sysconfdir}/%{name}/quotamail/userhard.mail +%config(noreplace) %{_sysconfdir}/%{name}/quotamail/usersoft.mail +%config(noreplace) %{_sysconfdir}/%{name}/quotamail/userwarning.mail +%{_sysconfdir}/rc.d/init.d/%{name}-monitor +%{_mandir}/man1/%{name}-monitor.1* +%{_mandir}/man5/%{name}-monitor.cfg.5* + +%files server -f %{name}.lang +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 +%{_bindir}/%{name}-server +%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/server.cfg +%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/unix.cfg +%{_sysconfdir}/rc.d/init.d/%{name}-server +%dir %{_sysconfdir}/%{name}/userscripts/ +%{_sysconfdir}/%{name}/userscripts/createuser +%{_sysconfdir}/%{name}/userscripts/creategroup +%{_sysconfdir}/%{name}/userscripts/createcompany +%{_sysconfdir}/%{name}/userscripts/deleteuser +%{_sysconfdir}/%{name}/userscripts/deletegroup +%{_sysconfdir}/%{name}/userscripts/deletecompany +%{_sysconfdir}/%{name}/userscripts/*common.sh +%dir %{_sysconfdir}/%{name}/userscripts/createuser.d/ +%dir %{_sysconfdir}/%{name}/userscripts/creategroup.d/ +%dir %{_sysconfdir}/%{name}/userscripts/createcompany.d/ +%dir %{_sysconfdir}/%{name}/userscripts/deleteuser.d/ +%dir %{_sysconfdir}/%{name}/userscripts/deletegroup.d/ +%dir %{_sysconfdir}/%{name}/userscripts/deletecompany.d/ +%config(noreplace) %{_sysconfdir}/%{name}/userscripts/createcompany.d/00createpublic +%config(noreplace) %{_sysconfdir}/%{name}/userscripts/createuser.d/00createstore +%{_datadir}/%{name}/userscripts/ +%{_libdir}/%{name}/dbplugin.so +%{_libdir}/%{name}/unixplugin.so +%{_mandir}/man1/%{name}-server.1* +%{_mandir}/man5/%{name}-server.cfg.5* +%{_mandir}/man5/%{name}-unix.cfg.5* +%if %{with_ldap} +%doc installer/ldap/%{name}.schema +%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/ldap.active-directory.cfg +%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/ldap.openldap.cfg +%{_libdir}/%{name}/ldapplugin.so +%{_mandir}/man5/%{name}-ldap.cfg.5* +%endif + +%files spooler +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 +%{_bindir}/%{name}-spooler +%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/spooler.cfg +%{_sysconfdir}/rc.d/init.d/%{name}-spooler +%{_mandir}/man1/%{name}-spooler.1* +%{_mandir}/man5/%{name}-spooler.cfg.5* + +%files utils +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 +%{_bindir}/%{name}-admin +%{_bindir}/%{name}-fsck +%{_bindir}/%{name}-passwd +%{_bindir}/%{name}-stats +%{_datadir}/%{name}/db-calc-storesize +%{_datadir}/%{name}/db-convert-attachments-to-files +%{_datadir}/%{name}/ssl-certificates.sh +%{_mandir}/man1/%{name}-admin.1* +%{_mandir}/man1/%{name}-fsck.1* +%{_mandir}/man1/%{name}-passwd.1* +%{_mandir}/man1/%{name}-stats.1* + +%files -n libmapi +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 +%{_libdir}/libicalmapi.so.* +%{_libdir}/libinetmapi.so.* +%{_libdir}/libmapi.so.* + +%files -n perl-libmapi +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 +%{_libdir}/libperlmapi.so.* + +%files -n php-mapi +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 +%config(noreplace) %{_sysconfdir}/php.d/%{name}.ini +%{_datadir}/php/mapi/ +%if 0%{?rhel}%{?fedora} > 4 +%{_libdir}/php/modules/mapi.so +%else +%{_libdir}/php4/mapi.so +%endif + +%changelog +* Sat Feb 06 2010 Robert Scheck 6.30.10-1 +- Upgrade to 6.30.10 (#498194) +- Initial spec file for Fedora and Red Hat Enterprise Linux (thanks + to Jeroen van Meeuwen, John van der Kamp and Steve Hardy) From 1cd5ed1bfa774044a0218792565d0e0c38b3e67c Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Tue, 23 Feb 2010 21:24:36 +0000 Subject: [PATCH 03/11] - Backported a patch from trunk to avoid the crash of zarafa-server when creating new user with db or unix plugin (#564282, #567262) - Backported another patch from trunk to avoid the crash of httpd caused by PHP mapi.so during the logon in the webaccess (#564129) --- zarafa-6.30.10-fortify.patch | 36 ++++++++++ zarafa-6.30.10-long-ulong.patch | 123 ++++++++++++++++++++++++++++++++ zarafa.spec | 15 +++- 3 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 zarafa-6.30.10-fortify.patch create mode 100644 zarafa-6.30.10-long-ulong.patch diff --git a/zarafa-6.30.10-fortify.patch b/zarafa-6.30.10-fortify.patch new file mode 100644 index 0000000..3a4a4a1 --- /dev/null +++ b/zarafa-6.30.10-fortify.patch @@ -0,0 +1,36 @@ +Remerged changeset of Subversion Revision 18952 from 6.40.0 (trunk) to 6.30.10 + +--- zarafa-6.30.10/provider/common/ZarafaUtil.cpp 2010-01-26 17:34:51.000000000 +0100 ++++ zarafa-6.30.10/provider/common/ZarafaUtil.cpp.fortify 2010-02-22 15:52:11.000000000 +0100 +@@ -355,7 +355,8 @@ + if (!strExternId.empty()) + { + lpUserEid->ulVersion = 1; +- lstrcpy(lpUserEid->szExId, strEncExId.c_str()); ++ // avoid FORTIFY_SOURCE checks in strcpy to an address that the compiler thinks is 1 size large ++ memcpy(lpUserEid->szExId, strEncExId.c_str(), strEncExId.length()+1); + } + + lpsEntryId->__size = ulLen; +--- zarafa-6.30.10/provider/libserver/ECUserManagement.cpp 2010-01-26 17:34:51.000000000 +0100 ++++ zarafa-6.30.10/provider/libserver/ECUserManagement.cpp.fortify 2010-02-22 16:03:33.000000000 +0100 +@@ -4152,7 +4152,8 @@ + if (!strEncExId.empty()) + { + lpAbeid->ulVersion = 1; +- strcpy(lpAbeid->szExId, strEncExId.c_str()); ++ // avoid FORTIFY_SOURCE checks in strcpy to an address that the compiler thinks is 1 size large ++ memcpy(lpAbeid->szExId, strEncExId.c_str(), strEncExId.length()+1); + } + + *lpsSourceKey = SOURCEKEY(ulLen, (char*)lpAbeid); +@@ -4190,7 +4191,8 @@ + memset(lpEid, 0, CbNewABEID(strEncExId.c_str())); + + lpEid->ulVersion = 1; +- lstrcpy(lpEid->szExId, strEncExId.c_str()); ++ // avoid FORTIFY_SOURCE checks in strcpy to an address that the compiler thinks is 1 size large ++ memcpy(lpEid->szExId, strEncExId.c_str(), strEncExId.length()+1); + + } + diff --git a/zarafa-6.30.10-long-ulong.patch b/zarafa-6.30.10-long-ulong.patch new file mode 100644 index 0000000..97e07e0 --- /dev/null +++ b/zarafa-6.30.10-long-ulong.patch @@ -0,0 +1,123 @@ +Remerged changeset of Subversion Revision 18968 from 6.40.0 (trunk) to 6.30.10 + +--- zarafa-6.30.10/php-ext/main.cpp 2010-01-26 17:34:48.000000000 +0100 ++++ zarafa-6.30.10/php-ext/main.cpp.php.long-ulong 2010-02-23 20:39:15.000000000 +0100 +@@ -2125,10 +2125,11 @@ + { + // params + zval * res; +- LPMAPITABLE lpTable = NULL; + zval * sortArray; ++ long ulFlags = 0; ++ // local ++ LPMAPITABLE lpTable = NULL; + LPSSortOrderSet lpSortCriteria = NULL; +- ULONG ulFlags = 0; + + RETVAL_FALSE; + MAPI_G(hr) = hrSuccess; +@@ -2189,10 +2190,11 @@ + { + // params + zval *res; ++ zval *restrictionArray; ++ ulong ulFlags = 0; ++ // local + LPMAPITABLE lpTable = NULL; +- zval *restrictionArray; + LPSRestriction lpRestrict = NULL; +- ULONG ulFlags = 0; + + RETVAL_FALSE; + MAPI_G(hr) = hrSuccess; +@@ -2213,7 +2215,7 @@ + } + } + +- MAPI_G(hr) = lpTable->Restrict(lpRestrict, ulFlags); // TODO: set flags from php? ++ MAPI_G(hr) = lpTable->Restrict(lpRestrict, ulFlags); + if(MAPI_G(hr) != hrSuccess) + goto exit; + +@@ -3696,11 +3698,13 @@ + } + + ZEND_FUNCTION(mapi_folder_getsearchcriteria) { ++ // params + zval *res = NULL; + zval *restriction = NULL; + zval *folderlist = NULL; + LPMAPIFOLDER lpFolder = NULL; + long ulFlags = 0; ++ // local + LPSRestriction lpRestriction = NULL; + LPENTRYLIST lpFolderList = NULL; + ULONG ulSearchState = 0; +@@ -3734,13 +3738,15 @@ + } + + ZEND_FUNCTION(mapi_folder_setsearchcriteria) { +- LPMAPIFOLDER lpFolder = NULL; +- LPENTRYLIST lpFolderList = NULL; +- LPSRestriction lpRestriction = NULL; +- long ulFlags = 0; ++ // param + zval *res = NULL; + zval *restriction = NULL; + zval *folderlist = NULL; ++ long ulFlags = 0; ++ // local ++ LPMAPIFOLDER lpFolder = NULL; ++ LPENTRYLIST lpFolderList = NULL; ++ LPSRestriction lpRestriction = NULL; + + RETVAL_FALSE; + MAPI_G(hr) = hrSuccess; +@@ -6396,9 +6402,11 @@ + + ZEND_FUNCTION(mapi_freebusyupdate_publish) + { ++ // params ++ zval* resFBUpdate = NULL; + zval* aBlocks = NULL; + IFreeBusyUpdate* lpFBUpdate = NULL; +- zval* resFBUpdate = NULL; ++ // local + FBBlock_1* lpBlocks = NULL; + ULONG cBlocks = 0; + HashTable* target_hash = NULL; +@@ -6495,12 +6503,14 @@ + + ZEND_FUNCTION(mapi_freebusyupdate_savechanges) + { +- IFreeBusyUpdate* lpFBUpdate = NULL; ++ // params + zval* resFBUpdate = NULL; +- FILETIME ftmStart; +- FILETIME ftmEnd; + time_t ulUnixStart = 0; + time_t ulUnixEnd = 0; ++ IFreeBusyUpdate* lpFBUpdate = NULL; ++ // local ++ FILETIME ftmStart; ++ FILETIME ftmEnd; + + RETVAL_FALSE; + MAPI_G(hr) = hrSuccess; +@@ -6523,13 +6533,14 @@ + + ZEND_FUNCTION(mapi_favorite_add) + { ++ // params + zval * resSession = NULL; + zval * resFolder = NULL; + Session *lpSession = NULL; +- LPMAPIFOLDER lpShortCutFolder = NULL; +- + LPMAPIFOLDER lpFolder = NULL; + long ulFlags = 0; ++ // local ++ LPMAPIFOLDER lpShortCutFolder = NULL; + ULONG cbAliasName = 0; + LPSTR lpszAliasName = NULL; + diff --git a/zarafa.spec b/zarafa.spec index a034b78..fae8eb8 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -116,7 +116,7 @@ # %define beta_or_rc 0 -%define actual_release 1 +%define actual_release 2 %define svnrevision 18495 %define with_ldap 1 %define with_xmlto 1 @@ -146,6 +146,9 @@ Patch0: zarafa-6.30.4-package.patch Patch1: zarafa-6.30.4-perl.patch Patch2: zarafa-6.30.10-undefined-symbol.patch Patch3: zarafa-6.30.10-chmod.patch +# Patch 4 and 5 are backports from upstream +Patch4: zarafa-6.30.10-fortify.patch +Patch5: zarafa-6.30.10-long-ulong.patch # http://www.brodowski.org/zarafa/php-mapi/6.30.10.18495/18495_patch.diff Patch10: zarafa-6.30.4-brodowski.patch @@ -198,7 +201,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} - %description Zarafa Outlook Sharing is a Microsoft Exchange replacement. The Open Source Collaboration provides an integration with your existing Linux mail server, -native mobile phone support by ActiveSync compatiblity and a webaccess with +native mobile phone support by ActiveSync compatibility and a webaccess with 'Look & Feel' similar to Outlook using Ajax. Including an IMAP4 and a POP3 gateway as well as an iCal/CalDAV gateway, Zarafa can combine the usability with the stability and flexibility of a Linux server. @@ -442,6 +445,8 @@ PHP MAPI extension by Zarafa to enable MAPI communication in PHP. %patch1 -p1 -b .perl %patch2 -p1 -b .symbol %patch3 -p1 -b .chmod +%patch4 -p1 -b .fortify +%patch5 -p1 -b .long-ulong #%%patch10 -p5 -b .brodowski # Needed to get rid of rpath @@ -818,6 +823,12 @@ fi %endif %changelog +* Tue Feb 23 2010 Robert Scheck 6.30.10-2 +- Backported a patch from trunk to avoid the crash of zarafa-server + when creating new user with db or unix plugin (#564282, #567262) +- Backported another patch from trunk to avoid the crash of httpd + caused by PHP mapi.so during the logon in the webaccess (#564129) + * Sat Feb 06 2010 Robert Scheck 6.30.10-1 - Upgrade to 6.30.10 (#498194) - Initial spec file for Fedora and Red Hat Enterprise Linux (thanks From 7d0d1b56bc14b80a0adf4772fbb8cfdb80baeb7a Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Thu, 18 Mar 2010 23:33:22 +0000 Subject: [PATCH 04/11] Upgrade to 6.30.11 --- .cvsignore | 2 +- sources | 2 +- zarafa.spec | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0e7e07b..2272e42 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zarafa-6.30.10.tar.gz +zarafa-6.30.11.tar.gz diff --git a/sources b/sources index 2a2ea20..596764d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -da636f09fb149cf60db1c6f91a734ca3 zarafa-6.30.10.tar.gz +bb5ba3037499dfd85ae509e02534924b zarafa-6.30.11.tar.gz diff --git a/zarafa.spec b/zarafa.spec index fae8eb8..e3ad186 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -116,14 +116,14 @@ # %define beta_or_rc 0 -%define actual_release 2 -%define svnrevision 18495 +%define actual_release 1 +%define svnrevision 18984 %define with_ldap 1 %define with_xmlto 1 Summary: Zarafa Outlook Sharing and Open Source Collaboration Name: zarafa -Version: 6.30.10 +Version: 6.30.11 %if %{beta_or_rc} Release: 0.%{actual_release}.svn%{svnrevision}%{?dist} %else @@ -480,7 +480,7 @@ make \ # Nuke all overlefts from licensed, managed or other proprietary items rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/report-ca -rm -f $RPM_BUILD_ROOT%{_mandir}/man?/zarafa-{backup,restore,ldapms.cfg,licensed{,.cfg}}.* +rm -f $RPM_BUILD_ROOT%{_mandir}/man?/zarafa-{backup,restore,report,ldapms.cfg,licensed{,.cfg}}.* # Move all the initscripts to their appropriate place and # ensure that all services are off by default at boot time @@ -823,6 +823,9 @@ fi %endif %changelog +* Fri Mar 19 2010 Robert Scheck 6.30.11-1 +- Upgrade to 6.30.11 + * Tue Feb 23 2010 Robert Scheck 6.30.10-2 - Backported a patch from trunk to avoid the crash of zarafa-server when creating new user with db or unix plugin (#564282, #567262) From 2c4ded98b5d0fa55f58e4e86058590c175d8b57b Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 20 Mar 2010 11:54:39 +0000 Subject: [PATCH 05/11] Upgrade to 6.30.12 --- .cvsignore | 2 +- sources | 2 +- zarafa.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2272e42..69f5881 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zarafa-6.30.11.tar.gz +zarafa-6.30.12.tar.gz diff --git a/sources b/sources index 596764d..d2e9a9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bb5ba3037499dfd85ae509e02534924b zarafa-6.30.11.tar.gz +959801e02912fbc6b74dd2b3ac3a599d zarafa-6.30.12.tar.gz diff --git a/zarafa.spec b/zarafa.spec index e3ad186..8f1cb99 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -117,13 +117,13 @@ %define beta_or_rc 0 %define actual_release 1 -%define svnrevision 18984 +%define svnrevision 19435 %define with_ldap 1 %define with_xmlto 1 Summary: Zarafa Outlook Sharing and Open Source Collaboration Name: zarafa -Version: 6.30.11 +Version: 6.30.12 %if %{beta_or_rc} Release: 0.%{actual_release}.svn%{svnrevision}%{?dist} %else @@ -823,6 +823,9 @@ fi %endif %changelog +* Sat Mar 20 2010 Robert Scheck 6.30.12-1 +- Upgrade to 6.30.12 + * Fri Mar 19 2010 Robert Scheck 6.30.11-1 - Upgrade to 6.30.11 From 20c31ab2b7e3eb640995e5c50e07fea1d8444e1b Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sun, 25 Apr 2010 17:06:16 +0000 Subject: [PATCH 06/11] - Upgrade to 6.30.13 - Moved zarafa.schema file from %doc to %{_datadir}/%{name} --- .cvsignore | 2 +- sources | 2 +- zarafa-6.30.10-fortify.patch | 36 ---------- zarafa-6.30.10-long-ulong.patch | 123 -------------------------------- zarafa.spec | 16 ++--- 5 files changed, 10 insertions(+), 169 deletions(-) delete mode 100644 zarafa-6.30.10-fortify.patch delete mode 100644 zarafa-6.30.10-long-ulong.patch diff --git a/.cvsignore b/.cvsignore index 69f5881..d2059e6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zarafa-6.30.12.tar.gz +zarafa-6.30.13.tar.gz diff --git a/sources b/sources index d2e9a9a..7519e15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -959801e02912fbc6b74dd2b3ac3a599d zarafa-6.30.12.tar.gz +50b4399ace1499bc9175fcaa26571c7b zarafa-6.30.13.tar.gz diff --git a/zarafa-6.30.10-fortify.patch b/zarafa-6.30.10-fortify.patch deleted file mode 100644 index 3a4a4a1..0000000 --- a/zarafa-6.30.10-fortify.patch +++ /dev/null @@ -1,36 +0,0 @@ -Remerged changeset of Subversion Revision 18952 from 6.40.0 (trunk) to 6.30.10 - ---- zarafa-6.30.10/provider/common/ZarafaUtil.cpp 2010-01-26 17:34:51.000000000 +0100 -+++ zarafa-6.30.10/provider/common/ZarafaUtil.cpp.fortify 2010-02-22 15:52:11.000000000 +0100 -@@ -355,7 +355,8 @@ - if (!strExternId.empty()) - { - lpUserEid->ulVersion = 1; -- lstrcpy(lpUserEid->szExId, strEncExId.c_str()); -+ // avoid FORTIFY_SOURCE checks in strcpy to an address that the compiler thinks is 1 size large -+ memcpy(lpUserEid->szExId, strEncExId.c_str(), strEncExId.length()+1); - } - - lpsEntryId->__size = ulLen; ---- zarafa-6.30.10/provider/libserver/ECUserManagement.cpp 2010-01-26 17:34:51.000000000 +0100 -+++ zarafa-6.30.10/provider/libserver/ECUserManagement.cpp.fortify 2010-02-22 16:03:33.000000000 +0100 -@@ -4152,7 +4152,8 @@ - if (!strEncExId.empty()) - { - lpAbeid->ulVersion = 1; -- strcpy(lpAbeid->szExId, strEncExId.c_str()); -+ // avoid FORTIFY_SOURCE checks in strcpy to an address that the compiler thinks is 1 size large -+ memcpy(lpAbeid->szExId, strEncExId.c_str(), strEncExId.length()+1); - } - - *lpsSourceKey = SOURCEKEY(ulLen, (char*)lpAbeid); -@@ -4190,7 +4191,8 @@ - memset(lpEid, 0, CbNewABEID(strEncExId.c_str())); - - lpEid->ulVersion = 1; -- lstrcpy(lpEid->szExId, strEncExId.c_str()); -+ // avoid FORTIFY_SOURCE checks in strcpy to an address that the compiler thinks is 1 size large -+ memcpy(lpEid->szExId, strEncExId.c_str(), strEncExId.length()+1); - - } - diff --git a/zarafa-6.30.10-long-ulong.patch b/zarafa-6.30.10-long-ulong.patch deleted file mode 100644 index 97e07e0..0000000 --- a/zarafa-6.30.10-long-ulong.patch +++ /dev/null @@ -1,123 +0,0 @@ -Remerged changeset of Subversion Revision 18968 from 6.40.0 (trunk) to 6.30.10 - ---- zarafa-6.30.10/php-ext/main.cpp 2010-01-26 17:34:48.000000000 +0100 -+++ zarafa-6.30.10/php-ext/main.cpp.php.long-ulong 2010-02-23 20:39:15.000000000 +0100 -@@ -2125,10 +2125,11 @@ - { - // params - zval * res; -- LPMAPITABLE lpTable = NULL; - zval * sortArray; -+ long ulFlags = 0; -+ // local -+ LPMAPITABLE lpTable = NULL; - LPSSortOrderSet lpSortCriteria = NULL; -- ULONG ulFlags = 0; - - RETVAL_FALSE; - MAPI_G(hr) = hrSuccess; -@@ -2189,10 +2190,11 @@ - { - // params - zval *res; -+ zval *restrictionArray; -+ ulong ulFlags = 0; -+ // local - LPMAPITABLE lpTable = NULL; -- zval *restrictionArray; - LPSRestriction lpRestrict = NULL; -- ULONG ulFlags = 0; - - RETVAL_FALSE; - MAPI_G(hr) = hrSuccess; -@@ -2213,7 +2215,7 @@ - } - } - -- MAPI_G(hr) = lpTable->Restrict(lpRestrict, ulFlags); // TODO: set flags from php? -+ MAPI_G(hr) = lpTable->Restrict(lpRestrict, ulFlags); - if(MAPI_G(hr) != hrSuccess) - goto exit; - -@@ -3696,11 +3698,13 @@ - } - - ZEND_FUNCTION(mapi_folder_getsearchcriteria) { -+ // params - zval *res = NULL; - zval *restriction = NULL; - zval *folderlist = NULL; - LPMAPIFOLDER lpFolder = NULL; - long ulFlags = 0; -+ // local - LPSRestriction lpRestriction = NULL; - LPENTRYLIST lpFolderList = NULL; - ULONG ulSearchState = 0; -@@ -3734,13 +3738,15 @@ - } - - ZEND_FUNCTION(mapi_folder_setsearchcriteria) { -- LPMAPIFOLDER lpFolder = NULL; -- LPENTRYLIST lpFolderList = NULL; -- LPSRestriction lpRestriction = NULL; -- long ulFlags = 0; -+ // param - zval *res = NULL; - zval *restriction = NULL; - zval *folderlist = NULL; -+ long ulFlags = 0; -+ // local -+ LPMAPIFOLDER lpFolder = NULL; -+ LPENTRYLIST lpFolderList = NULL; -+ LPSRestriction lpRestriction = NULL; - - RETVAL_FALSE; - MAPI_G(hr) = hrSuccess; -@@ -6396,9 +6402,11 @@ - - ZEND_FUNCTION(mapi_freebusyupdate_publish) - { -+ // params -+ zval* resFBUpdate = NULL; - zval* aBlocks = NULL; - IFreeBusyUpdate* lpFBUpdate = NULL; -- zval* resFBUpdate = NULL; -+ // local - FBBlock_1* lpBlocks = NULL; - ULONG cBlocks = 0; - HashTable* target_hash = NULL; -@@ -6495,12 +6503,14 @@ - - ZEND_FUNCTION(mapi_freebusyupdate_savechanges) - { -- IFreeBusyUpdate* lpFBUpdate = NULL; -+ // params - zval* resFBUpdate = NULL; -- FILETIME ftmStart; -- FILETIME ftmEnd; - time_t ulUnixStart = 0; - time_t ulUnixEnd = 0; -+ IFreeBusyUpdate* lpFBUpdate = NULL; -+ // local -+ FILETIME ftmStart; -+ FILETIME ftmEnd; - - RETVAL_FALSE; - MAPI_G(hr) = hrSuccess; -@@ -6523,13 +6533,14 @@ - - ZEND_FUNCTION(mapi_favorite_add) - { -+ // params - zval * resSession = NULL; - zval * resFolder = NULL; - Session *lpSession = NULL; -- LPMAPIFOLDER lpShortCutFolder = NULL; -- - LPMAPIFOLDER lpFolder = NULL; - long ulFlags = 0; -+ // local -+ LPMAPIFOLDER lpShortCutFolder = NULL; - ULONG cbAliasName = 0; - LPSTR lpszAliasName = NULL; - diff --git a/zarafa.spec b/zarafa.spec index 8f1cb99..719f618 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -117,13 +117,13 @@ %define beta_or_rc 0 %define actual_release 1 -%define svnrevision 19435 +%define svnrevision 19788 %define with_ldap 1 %define with_xmlto 1 Summary: Zarafa Outlook Sharing and Open Source Collaboration Name: zarafa -Version: 6.30.12 +Version: 6.30.13 %if %{beta_or_rc} Release: 0.%{actual_release}.svn%{svnrevision}%{?dist} %else @@ -146,9 +146,6 @@ Patch0: zarafa-6.30.4-package.patch Patch1: zarafa-6.30.4-perl.patch Patch2: zarafa-6.30.10-undefined-symbol.patch Patch3: zarafa-6.30.10-chmod.patch -# Patch 4 and 5 are backports from upstream -Patch4: zarafa-6.30.10-fortify.patch -Patch5: zarafa-6.30.10-long-ulong.patch # http://www.brodowski.org/zarafa/php-mapi/6.30.10.18495/18495_patch.diff Patch10: zarafa-6.30.4-brodowski.patch @@ -445,8 +442,6 @@ PHP MAPI extension by Zarafa to enable MAPI communication in PHP. %patch1 -p1 -b .perl %patch2 -p1 -b .symbol %patch3 -p1 -b .chmod -%patch4 -p1 -b .fortify -%patch5 -p1 -b .long-ulong #%%patch10 -p5 -b .brodowski # Needed to get rid of rpath @@ -533,6 +528,7 @@ done mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/ install -p -m 755 installer/linux/db-{calc-storesize,convert-attachments-to-files} $RPM_BUILD_ROOT%{_datadir}/%{name}/ install -p -m 755 installer/linux/ssl-certificates.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/ +install -p -m 644 installer/ldap/%{name}.schema $RPM_BUILD_ROOT%{_datadir}/%{name}/ # Create the default log and lib directory for packaging mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{log,lib}/%{name}/ @@ -768,7 +764,7 @@ fi %{_mandir}/man5/%{name}-server.cfg.5* %{_mandir}/man5/%{name}-unix.cfg.5* %if %{with_ldap} -%doc installer/ldap/%{name}.schema +%{_datadir}/%{name}/%{name}.schema %config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/ldap.active-directory.cfg %config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/ldap.openldap.cfg %{_libdir}/%{name}/ldapplugin.so @@ -823,6 +819,10 @@ fi %endif %changelog +* Sun Apr 25 2010 Robert Scheck 6.30.13-1 +- Upgrade to 6.30.13 +- Moved zarafa.schema file from %%doc to %%{_datadir}/%%{name} + * Sat Mar 20 2010 Robert Scheck 6.30.12-1 - Upgrade to 6.30.12 From 9d16066d6193d49e76e46c66092e38e525c80e6b Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Sat, 1 May 2010 12:14:13 +0000 Subject: [PATCH 07/11] Upgrade to 6.30.14 --- .cvsignore | 2 +- sources | 2 +- zarafa.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index d2059e6..7bd5793 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zarafa-6.30.13.tar.gz +zarafa-6.30.14.tar.gz diff --git a/sources b/sources index 7519e15..8af1e15 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -50b4399ace1499bc9175fcaa26571c7b zarafa-6.30.13.tar.gz +fa3183f71027b8025373b05f27aaf742 zarafa-6.30.14.tar.gz diff --git a/zarafa.spec b/zarafa.spec index 719f618..ea52ca7 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -117,13 +117,13 @@ %define beta_or_rc 0 %define actual_release 1 -%define svnrevision 19788 +%define svnrevision 20002 %define with_ldap 1 %define with_xmlto 1 Summary: Zarafa Outlook Sharing and Open Source Collaboration Name: zarafa -Version: 6.30.13 +Version: 6.30.14 %if %{beta_or_rc} Release: 0.%{actual_release}.svn%{svnrevision}%{?dist} %else @@ -819,6 +819,9 @@ fi %endif %changelog +* Sat May 01 2010 Robert Scheck 6.30.14-1 +- Upgrade to 6.30.14 + * Sun Apr 25 2010 Robert Scheck 6.30.13-1 - Upgrade to 6.30.13 - Moved zarafa.schema file from %%doc to %%{_datadir}/%%{name} From 0e6d95ec6061802a6320f50ac5236a748aaf0703 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Thu, 10 Jun 2010 19:50:36 +0000 Subject: [PATCH 08/11] Upgrade to 6.40.0 (#564135, #565252, #600993) --- .cvsignore | 2 +- sources | 2 +- zarafa-6.30.10-chmod.patch | 13 - zarafa-6.30.10-undefined-symbol.patch | 35 -- zarafa-6.30.4-brodowski.patch | 774 -------------------------- zarafa-6.30.4-package.patch | 48 -- zarafa-6.30.4-perl.patch | 53 -- zarafa-6.40.0-clucene.patch | 56 ++ zarafa-6.40.0-krb5.patch | 20 + zarafa-6.40.0-openssl.patch | 23 + zarafa-6.40.0-package.patch | 61 ++ zarafa-6.40.0-undefined-symbol.patch | 42 ++ zarafa-webaccess.conf | 32 ++ zarafa.logrotate | 13 + zarafa.spec | 505 +++++++++++------ 15 files changed, 591 insertions(+), 1088 deletions(-) delete mode 100644 zarafa-6.30.10-chmod.patch delete mode 100644 zarafa-6.30.10-undefined-symbol.patch delete mode 100644 zarafa-6.30.4-brodowski.patch delete mode 100644 zarafa-6.30.4-package.patch delete mode 100644 zarafa-6.30.4-perl.patch create mode 100644 zarafa-6.40.0-clucene.patch create mode 100644 zarafa-6.40.0-krb5.patch create mode 100644 zarafa-6.40.0-openssl.patch create mode 100644 zarafa-6.40.0-package.patch create mode 100644 zarafa-6.40.0-undefined-symbol.patch create mode 100644 zarafa-webaccess.conf create mode 100644 zarafa.logrotate diff --git a/.cvsignore b/.cvsignore index 7bd5793..86578d6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -zarafa-6.30.14.tar.gz +zarafa-6.40.0.tar.gz diff --git a/sources b/sources index 8af1e15..5c51e95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fa3183f71027b8025373b05f27aaf742 zarafa-6.30.14.tar.gz +389d195eb7659ccd05769208686e4b0d zarafa-6.40.0.tar.gz diff --git a/zarafa-6.30.10-chmod.patch b/zarafa-6.30.10-chmod.patch deleted file mode 100644 index ef7a706..0000000 --- a/zarafa-6.30.10-chmod.patch +++ /dev/null @@ -1,13 +0,0 @@ -Patch by Robert Scheck for zarafa >= 6.30.10, which adds a missing include for -the later in the code used chmod() command. Without this include, building on Fedora 13 fails. - ---- zarafa-6.30.10/provider/server/ECSoapServerConnection.cpp 2010-01-26 17:34:51.000000000 +0100 -+++ zarafa-6.30.10/provider/server/ECSoapServerConnection.cpp.chmod 2010-02-06 12:36:22.000000000 +0100 -@@ -51,6 +51,7 @@ - - #include "ECLogger.h" - -+#include - #ifdef HAVE_SYS_UN_H - #include - #endif diff --git a/zarafa-6.30.10-undefined-symbol.patch b/zarafa-6.30.10-undefined-symbol.patch deleted file mode 100644 index c4b2083..0000000 --- a/zarafa-6.30.10-undefined-symbol.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -ur zarafa-6.30.10.orig/mapi4linux/src/m4lguids.cpp zarafa-6.30.10/mapi4linux/src/m4lguids.cpp ---- zarafa-6.30.10.orig/mapi4linux/src/m4lguids.cpp 2010-01-26 17:34:48.000000000 +0100 -+++ zarafa-6.30.10/mapi4linux/src/m4lguids.cpp 2010-02-04 09:53:48.459239670 +0100 -@@ -48,6 +48,7 @@ - */ - - #include "platform.h" -+/*#ifndef WINCE - #define USES_IID_IUnknown - #define USES_IID_IStream - #define USES_IID_ISequentialStream -@@ -60,7 +61,8 @@ - #define USES_IID_IMAPIProp - #define USES_IID_IMAPIFolder - #define USES_IID_IMAPITable -+#endif - #include -- -+*/ - #include "mapiguid.h" - #include "m4l.mapiutil.h" -diff -ur zarafa-6.30.10.orig/mapi4linux/src/Makefile.am zarafa-6.30.10/mapi4linux/src/Makefile.am ---- zarafa-6.30.10.orig/mapi4linux/src/Makefile.am 2010-01-26 12:05:22.000000000 +0100 -+++ zarafa-6.30.10/mapi4linux/src/Makefile.am 2010-02-04 09:51:39.285239878 +0100 -@@ -3,7 +3,9 @@ - AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX -I$(top_srcdir)/mapi4linux/include -I$(top_srcdir)/provider/common -I${top_srcdir}/common -I${top_srcdir}/libfreebusy - AM_LDFLAGS = $(DL_LIBS) -export-symbols ${top_srcdir}/mapi4linux/src/mapi-exports.sym - --libmapi_la_LIBADD = ${top_builddir}/common/libcommon_util.la -+libmapi_la_LIBADD = ${top_builddir}/common/libcommon_util.la \ -+ ${top_builddir}/common/libcommon_mapi.la \ -+ $(PROG_LIBS) - - # required because we're exporting extern "C" functions and want to filter with 'export-symbols' - CXXLD=--tag=none gcc diff --git a/zarafa-6.30.4-brodowski.patch b/zarafa-6.30.4-brodowski.patch deleted file mode 100644 index 9c97208..0000000 --- a/zarafa-6.30.4-brodowski.patch +++ /dev/null @@ -1,774 +0,0 @@ -diff -ruN /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/class.autoarchivesettings.php mapi/class.autoarchivesettings.php ---- /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/class.autoarchivesettings.php Thu Jan 1 01:00:00 1970 -+++ mapi/class.autoarchivesettings.php Sat Aug 8 11:49:05 2009 -@@ -0,0 +1,218 @@ -+. -+ * -+ */ -+ -+?> -+ -+ */ -+ -+class AutoArchiveSettings { -+ -+ var $session; -+ var $store; -+ var $folder; -+ var $proptags; -+ -+ function agingproperties() { -+ $properties = array(); -+ $properties["entryid"] = PR_ENTRYID; -+ $properties["parent_entryid"] = PR_PARENT_ENTRYID; -+ $properties["message_class"] = PR_MESSAGE_CLASS; -+ $properties["icon_index"] = PR_ICON_INDEX; -+ $properties["display_to"] = PR_DISPLAY_TO; -+ $properties["display_cc"] = PR_DISPLAY_CC; -+ $properties["subject"] = PR_SUBJECT; -+ $properties["importance"] = PR_IMPORTANCE; -+ $properties["sent_representing_name"] = PR_SENT_REPRESENTING_NAME; -+ $properties["sent_representing_email_address"] = PR_SENT_REPRESENTING_EMAIL_ADDRESS; -+ $properties["sent_representing_addrtype"] = PR_SENT_REPRESENTING_ADDRTYPE; -+ $properties["sent_representing_entryid"] = PR_SENT_REPRESENTING_ENTRYID; -+ $properties["sender_email_address"] = PR_SENDER_EMAIL_ADDRESS; -+ $properties["sender_name"] = PR_SENDER_NAME; -+ $properties["received_by_name"] = PR_RECEIVED_BY_NAME; -+ $properties["received_by_email_address"] = PR_RECEIVED_BY_EMAIL_ADDRESS; -+ $properties["message_delivery_time"] = PR_MESSAGE_DELIVERY_TIME; -+ $properties["last_modification_time"] = PR_LAST_MODIFICATION_TIME; -+ $properties["last_verb_executed"] = PR_LAST_VERB_EXECUTED; -+ $properties["last_verb_execution_time"] = PR_LAST_VERB_EXECUTION_TIME; -+ $properties["hasattach"] = PR_HASATTACH; -+ $properties["message_size"] = PR_MESSAGE_SIZE; -+ $properties["message_flags"] = PR_MESSAGE_FLAGS; -+ $properties["flag_status"] = PR_FLAG_STATUS; -+ $properties["flag_complete_time"] = PR_FLAG_COMPLETE_TIME; -+ $properties["flag_icon"] = PR_FLAG_ICON; -+ $properties["reminder_time"] = "PT_SYSTIME:PSETID_Common:0x8502"; -+ $properties["reminder_set"] = "PT_BOOLEAN:PSETID_Common:0x8503"; -+ $properties["flag_request"] = "PT_STRING8:PSETID_Common:0x8530"; -+ $properties["flag_due_by"] = "PT_SYSTIME:PSETID_Common:0x8560"; -+ $properties["reply_requested"] = PR_REPLY_REQUESTED; -+ $properties["reply_time"] = PR_REPLY_TIME; -+ $properties["response_requested"] = PR_RESPONSE_REQUESTED; -+ $properties["client_submit_time"] = PR_CLIENT_SUBMIT_TIME; -+ $properties["sensitivity"] = PR_SENSITIVITY; -+ $properties["read_receipt_requested"] = PR_READ_RECEIPT_REQUESTED; -+ $properties["location"] = "PT_STRING8:PSETID_Appointment:0x8208"; -+ $properties["categories"] = "PT_MV_STRING8:PS_PUBLIC_STRINGS:Keywords"; -+ $properties["transport_message_headers"] = PR_TRANSPORT_MESSAGE_HEADERS; -+ $properties["contacts"] = "PT_MV_STRING8:PSETID_Common:0x853A"; -+ $properties["contacts_string"] = "PT_STRING8:PSETID_Common:0x8586"; -+ -+ $properties["aging_period"] = PR_AGING_PERIOD; // max 3 digits -+ $properties["aging_granularity"] = PR_AGING_GRANULARITY; // 0=month, 1=weeks, 2=days -+ $properties["aging_filename"] = PR_AGING_FILENAME; -+ $properties["aging_age_folder"] = PR_AGING_AGE_FOLDER; -+ $properties["aging_deleted_items"] = PR_AGING_DELETE_ITEMS; -+ $properties["aging_dont_age_me"] = PR_AGING_DONT_AGE_ME; -+ $properties["aging_file_name_after9"] = PR_AGING_FILE_NAME_AFTER9; -+ $properties["aging_when_deleted_on_server"] = PR_AGING_WHEN_DELETED_ON_SERVER; -+ $properties["aging_wait_until_expired"] = PR_AGING_WAIT_UNTIL_EXPIRED; -+ $properties["aging_version"] = PR_AGING_VERSION; -+ $properties["aging_default"] = PR_AGING_DEFAULT; -+ -+ $properties["deleted_on"] = PR_DELETED_ON; -+ $properties["updatecounter"] = "PT_LONG:PSETID_Appointment:0x8201"; -+ $properties["hideattachments"] = "PT_BOOLEAN:PSETID_Common:0x8514"; -+ -+ return $properties; -+ } -+ -+ /** -+ * Constuctor -+ * -+ * @param mapi_session $session MAPI Session -+ * @param mapi_folder $folder Folder to use for AutoArchive Settings retrival -+ */ -+ -+ function retrieveSettings($session, $store, $folder, $properties = NULL) -+ { -+ if ($properties == NULL) { -+ $properties = $this->agingproperties(); -+ }; -+ -+ $this->proptags = getPropIdsFromStrings($store, $properties); -+ -+ $this->session = $session; -+ $this->store = $store; -+ $this->folder = $folder; -+ -+ $msg = $this->getMessage(); -+ -+ $props = mapi_getprops($msg,$this->proptags); -+ -+ $data = $props; -+ -+ return $data; -+ } -+ -+ function getMessage() { -+ $table = mapi_folder_getcontentstable($this->folder, MAPI_ASSOCIATED); -+ mapi_table_sort($table, array(PR_RECEIPT_TIME => TABLE_SORT_ASCEND)); -+ $restriction = array ( RES_PROPERTY, -+ array ( RELOP => RELOP_EQ, -+ ULPROPTAG => PR_MESSAGE_CLASS, -+ VALUE => array (PR_MESSAGE_CLASS => "IPC.MS.Outlook.AgingProperties") -+ ) -+ ); -+ $msgs = mapi_table_queryallrows($table,array(PR_ENTRYID),$restriction); -+ if (isset($msgs[0][PR_ENTRYID])) { -+ $msg = mapi_msgstore_openentry($this->store,$msgs[0][PR_ENTRYID]); -+ } else { -+ $this->createMessage(); -+ $msg = $this->getMessage(); -+ } -+ return $msg; -+ } -+ -+ function updateSettings($session, $store, $folder, $uprops) { -+ $properties = $this->agingproperties(); -+ -+ $this->session = $session; -+ $this->store = $store; -+ $this->folder = $folder; -+ -+ $msg = $this->getMessage(); -+ -+ $write_props = array(); -+ -+ if (isset($uprops["aging_period"])) $write_props[$properties["aging_period"]] = $uprops["aging_period"]; -+ if (isset($uprops["aging_granularity"])) $write_props[$properties["aging_granularity"]] = $uprops["aging_granularity"]; -+ if (isset($uprops["aging_age_folder"])) $write_props[$properties["aging_age_folder"]] = $uprops["aging_age_folder"]; -+ if (isset($uprops["aging_deleted_items"])) $write_props[$properties["aging_deleted_items"]] = $uprops["aging_deleted_items"]; -+ if (isset($uprops["aging_filename"])) $write_props[$properties["aging_filename"]] = $uprops["aging_filename"]; -+ if (isset($uprops["aging_file_name_after9"])) $write_props[$properties["aging_file_name_after9"]] = $uprops["aging_file_name_after9"]; -+ if (isset($uprops["aging_version"])) $write_props[$properties["aging_version"]] = $uprops["aging_version"]; -+ if (isset($uprops["aging_default"])) $write_props[$properties["aging_default"]] = $uprops["aging_default"]; -+ -+ mapi_setprops($msg,$write_props); -+ -+ mapi_savechanges($msg); -+ -+ } -+ -+ function createMessage() { -+ -+ $properties = $this->agingproperties(); -+ -+ $write_props = array( $properties["message_class"] => "IPC.MS.Outlook.AgingProperties", -+ $properties["display_to"] => NULL, -+ $properties["display_cc"] => NULL, -+ $properties["aging_period"] => "3", -+ $properties["aging_granularity"] => "0", -+ $properties["aging_age_folder"] => "0", -+ $properties["aging_deleted_items"] => "0", -+ $properties["aging_filename"] => "", -+ $properties["aging_file_name_after9"] => "", -+ $properties["aging_version"] => "2", -+ $properties["aging_default"] => "0" -+ ); -+ -+ $msg = mapi_folder_createmessage($this->folder,MAPI_ASSOCIATED); -+ -+ mapi_setprops($msg,$write_props); -+ -+ mapi_savechanges($msg); -+ -+ } -+ -+} -+?> -diff -ruN /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/class.linkedappointment.php mapi/class.linkedappointment.php ---- /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/class.linkedappointment.php Thu Jan 1 01:00:00 1970 -+++ mapi/class.linkedappointment.php Fri Aug 14 11:16:18 2009 -@@ -0,0 +1,393 @@ -+. -+ * -+ */ -+?> -+ -+ */ -+ -+class linkedAppointment -+{ -+ -+ /** -+ * @var object Mapi Message Store (may be null if readonly) -+ */ -+ var $_store; -+ -+ var $_contactmapping = array ( -+ "fileas" => "PT_STRING8:{00062004-0000-0000-C000-000000000046}:0x8005", -+ "birthday_event_entryid" => "PT_BINARY:{00062004-0000-0000-C000-000000000046}:0x804d", -+ "anniversary_event_entryid" => "PT_BINARY:{00062004-0000-0000-C000-000000000046}:0x804e", -+ "birthday" => PR_BIRTHDAY, -+ "anniversary" => PR_WEDDING_ANNIVERSARY, -+ "entryid" => PR_ENTRYID, -+ "search_key" => PR_SEARCH_KEY -+ ); -+ -+ var $_appointmentmapping = array ( -+ "alldayevent" => "PT_BOOLEAN:{00062002-0000-0000-C000-000000000046}:0x8215", -+ "body" => PR_BODY, -+ "busystatus" => "PT_LONG:{00062002-0000-0000-C000-000000000046}:0x8205", -+ "categories" => "PT_MV_STRING8:{00020329-0000-0000-C000-000000000046}:Keywords", -+ "rtf" => PR_RTF_COMPRESSED, -+ "dtstamp" => PR_LAST_MODIFICATION_TIME, -+ "endtime" => "PT_SYSTIME:{00062002-0000-0000-C000-000000000046}:0x820e", -+ "location" => "PT_STRING8:{00062002-0000-0000-C000-000000000046}:0x8208", -+ "meetingstatus" => "PT_LONG:{00062002-0000-0000-C000-000000000046}:0x8217", -+ "reminder" => "PT_LONG:{00062008-0000-0000-C000-000000000046}:0x8501", -+ "sensitivity" => PR_SENSITIVITY, -+ "subject" => PR_SUBJECT, -+ "starttime" => "PT_SYSTIME:{00062002-0000-0000-C000-000000000046}:0x820d", -+ "uid" => "PT_BINARY:{6ED8DA90-450B-101B-98DA-00AA003F1305}:0x3", -+ // Append the appointment attributes since we need them for appointment creation -+ "label" => "PT_LONG:{00062002-0000-0000-C000-000000000046}:0x8214", -+ "recurring" => "PT_BOOLEAN:{00062002-0000-0000-C000-000000000046}:0x8223", -+ "recurring_data" => "PT_BINARY:{00062002-0000-0000-C000-000000000046}:0x8216", -+ "recurring_pattern" => "PT_STRING8:{00062002-0000-0000-C000-000000000046}:0x8232", -+ "basedate" => "PT_SYSTIME:{00062002-0000-0000-C000-000000000046}:0x8228", -+ "icon_index" => PR_ICON_INDEX, -+ "entryid" => PR_ENTRYID, -+ "message_class" => PR_MESSAGE_CLASS, -+ "parententryid" => PR_PARENT_ENTRYID, -+ "message_flags" => PR_MESSAGE_FLAGS, -+ "importance" => PR_IMPORTANCE, -+ // Append the common attributes since we need them for appointment creation -+ "contacts" => "PT_MV_STRING8:{00062008-0000-0000-C000-000000000046}:0x853a", -+ "contacts_string" => "PT_STRING8:{00062008-0000-0000-C000-000000000046}:0x8586", -+ "commonstart" => "PT_SYSTIME:{00062008-0000-0000-C000-000000000046}:0x8516", -+ "commonend" => "PT_SYSTIME:{00062008-0000-0000-C000-000000000046}:0x8517", -+ "remindertime" => "PT_SYSTIME:{00062008-0000-0000-C000-000000000046}:0x8502", -+ "duration" => "PT_LONG:{00062002-0000-0000-C000-000000000046}:0x8213", -+ "reminder_minutes" => "PT_LONG:{00062008-0000-0000-C000-000000000046}:0x8501", -+ "reminder" => "PT_BOOLEAN:{00062008-0000-0000-C000-000000000046}:0x8503", -+ "flagdueby" => "PT_SYSTIME:{00062008-0000-0000-C000-000000000046}:0x8560", -+ "lid_contact_link_search_key" => "PT_BINARY:{00062008-0000-0000-C000-000000000046}:0x8584", -+ "lid_contact_link_entryid" => "PT_BINARY:{00062008-0000-0000-C000-000000000046}:0x8585" -+ ); -+ -+ /** -+ * Constructor -+ * @param resource $store MAPI Message Store Object -+ * @param resource $message the MAPI Source message -+ */ -+ function linkedAppointment($_store) -+ { -+ $this->_store = $_store; -+ } -+ -+ function setLinkedContact($mapimessage) -+ { -+ // get the linked contact (if any) -+ // Set the appointment attributes -+ $aprops = $this->_appointmentmapping; -+ // Get the id's of the above... -+ foreach ($aprops as $key => $value) { -+ $aprops[$key] = $this->GetPropIDFromString($this->_store, $value); -+ } -+ $appointment = mapi_getprops($mapimessage, $aprops); -+ $recurrence = new Recurrence($this->_store, $mapimessage); -+ $recur = $recurrence->getRecurrence(); -+ if (isset($appointment[$aprops["lid_contact_link_entryid"]])) { -+ // we have a linked contact. so continue here, otherwise exit silently... -+ $entryid = $this->_unpackContactLinkEntryIDS(bin2hex($appointment[$aprops["lid_contact_link_entryid"]])); -+ // Set the contact attributes -+ $cprops = $this->_contactmapping; -+ // Get the id's of the above... -+ foreach ($cprops as $key => $value) { -+ $cprops[$key] = $this->GetPropIDFromString($this->_store, $value); -+ } -+ foreach ($entryid as $value) { -+ if (($contact_msg = mapi_msgstore_openentry($this->_store,$value))) { -+ $contact = mapi_getprops($contact_msg, $cprops); -+ switch ($appointment[$aprops["entryid"]]) { -+ case $contact[$cprops["birthday_event_entryid"]] : -+ if ($contact[$cprops["birthday"]] != $recur["start"]) { -+ mapi_setprops($contact_msg,array($cprops["birthday"] => $recur["start"])); -+ mapi_savechanges($contact_msg); -+ } -+ break; -+ case $contact[$cprops["anniversary_event_entryid"]] : -+ if ($contact[$cprops["anniversary"]] != $recur["start"]) { -+ mapi_setprops($contact_msg,array($cprops["anniversary"] => $recur["start"])); -+ mapi_savechanges($contact_msg); -+ } -+ break; -+ } -+ } -+ } -+ } -+ } -+ // $what 0x01 = birthday 0x02 = anniversary -+ function setLinkedAppointment($mapimessage,$what) -+ { -+ // We love MS for this... -+ $arrayMonth = array(0,44640,84960,129600,172800,217440,260640,305280,348480,393120,437760,480960); -+ -+ // Set the appointment attributes -+ $aprops = $this->_appointmentmapping; -+ // Get the id's of the above... -+ foreach ($aprops as $key => $value) { -+ $aprops[$key] = $this->GetPropIDFromString($this->_store, $value); -+ } -+ -+ // Set the contact attributes -+ $cprops = $this->_contactmapping; -+ // Get the id's of the above... -+ foreach ($cprops as $key => $value) { -+ $cprops[$key] = $this->GetPropIDFromString($this->_store, $value); -+ } -+ -+ // Get the contact properties -+ $contact = mapi_getprops($mapimessage,$cprops); -+ -+ // open root container, if not existing, leave this function... -+ $rootcontainer = mapi_msgstore_openentry($this->_store); -+ if ($rootcontainer) { -+ // find the appointment container, if this fails, leave this function since we cannot proceed... -+ if (($rootcontainerprops = mapi_getprops($rootcontainer, array(PR_IPM_APPOINTMENT_ENTRYID)))) { -+ $parententryid = $rootcontainerprops[PR_IPM_APPOINTMENT_ENTRYID]; -+ -+ $entryid = false; -+ switch ($what) { -+ case 0x01 : if (isset($contact[$cprops["birthday_event_entryid"]])) -+ $entryid = $contact[$cprops["birthday_event_entryid"]]; -+ $entrydate = $contact[$cprops["birthday"]]; -+ $entryprop = $cprops["birthday_event_entryid"]; -+ $entrylabel = 8; -+ $entrysubject = _("Birthday")." "._("of")." ".$contact[$cprops["fileas"]]; -+ break; -+ case 0x02 : if (isset($contact[$cprops["anniversary_event_entryid"]])) -+ $entryid = $contact[$cprops["anniversary_event_entryid"]]; -+ $entrydate = $contact[$cprops["anniversary"]]; -+ $entryprop = $cprops["anniversary_event_entryid"]; -+ $entrylabel = 9; -+ $entrysubject = _("Special Date")." "._("of")." ".$contact[$cprops["fileas"]]; -+ break; -+ } -+ -+ if ($entrydate) { -+ // open if there is a linked appointment and it can be opened (no one deleted it by accident...) -+ // otherwise create it. -+ if ($entryid && -+ ($appointment_msg = mapi_msgstore_openentry($this->_store,$entryid))) { -+ $appointment = mapi_getprops($appointment_msg); -+ } else { -+ // create with base settings -+ $folder = mapi_msgstore_openentry($this->_store,$parententryid); -+ $appointment_msg = mapi_folder_createmessage($folder); -+ $appointment = array($aprops["message_class"] => "IPM.Appointment", -+ $aprops["location"] => "", -+ $aprops["body"] => "", -+ $aprops["busystatus"] => 0 -+ ); -+ mapi_setprops($appointment_msg,$appointment); -+ } -+ // Have the starttime im GMT -+ $starttime = gmmktime(0,0,0, -+ date("m",$entrydate), -+ date("j",$entrydate), -+ date("Y",$entrydate)); -+ // Just update something in case changes occured to reduce amount -+ // of sync activities... -+ -+ if ($entrydate != $appointment[$aprops["starttime"]] || -+ $entrysubject != $appointment[$aprops["subject"]]) { -+ // Reset the subject in case the name has changed -+ $appointment[$aprops["subject"]] = $entrysubject; -+ // Set the label to 8 = birthday and 9 = anniversary -+ $appointment[$aprops["label"]] = $entrylabel; -+ // Instead of having rubbish inside... -+ $appointment[$aprops["recurring_pattern"]] = ""; -+ // Setting the reminder values -+ $appointment[$aprops["reminder"]] = true; -+ $appointment[$aprops["reminder_minutes"]] = 15; -+ $appointment[$aprops["remindertime"]] = $starttime-(15*60); -+ // Setting start & Endtime -+ $appointment[$aprops["starttime"]] = $starttime; -+ $appointment[$aprops["endtime"]] = $starttime + 86400; -+ // Set duration upon diff between start and endtime in minutes. -+ $appointment[$aprops["duration"]] = ($appointment[$aprops["endtime"]] - $appointment[$aprops["starttime"]]) / 60; -+ // Sure... birthdays and anniversaries occur on daily base :-) -+ $appointment[$aprops["recurring"]] = true; -+ $appointment[$aprops["alldayevent"]] = true; -+ // Update the id's and search keys -+ $appointment[$aprops["lid_contact_link_entryid"]] = hex2bin($this->_packContactLinkEntryIDS(array($contact[$cprops["entryid"]]))); -+ $appointment[$aprops["lid_contact_link_search_key"]] = hex2bin($this->_packContactLinkSearchKeys(array($contact[$cprops["search_key"]]))); -+ // Set the changed properties -+ mapi_setprops($appointment_msg,$appointment); -+ $recurrence = new Recurrence($this->_store, $appointment_msg); -+ $tz = array(); -+ $tz["timezone"] = (($entrydate-$starttime)/3600)*60; -+ $tz["timezonedst"] = 0; -+ $tz["dstendmonth"] = 0; -+ $tz["dstendweek"] = 0; -+ $tz["dstendhour"] = 0; -+ $tz["dststartmonth"] = 0; -+ $tz["dststartweek"] = 0; -+ $tz["dststarthour"] = 0; -+ // Set the iconindex to be recurring -+ $appointment[$aprops["icon_index"]] = 1025; -+ // Set the changed properties -+ $appointment = mapi_setprops($appointment_msg,$appointment); -+ // Recurring values -+ $recur["type"] = 13; -+ $recur["subtype"] = 2; -+ $recur["month"] = $arrayMonth[gmdate("m",$starttime)-1]; -+ $recur["everyn"] = 12; -+ $recur["regen"] = 1; -+ $recur["monthday"] = gmdate("j",$starttime); -+ $recur["term"] = 0x23; -+ $recur["numoccur"] = 0; -+ $recur["start"] = $starttime; -+ $recur["end"] = 79870662000; // no end -+ $recur["startocc"] = 0; -+ $recur["endocc"] = 1440; -+ // Let class.recurrence do its job. -+ $recurrence->setRecurrence($tz, $recur); -+ // Save the changes to message -+ mapi_savechanges($appointment_msg); -+ $appointment = mapi_getprops($appointment_msg); -+ mapi_setprops($mapimessage,array($entryprop => $appointment[$aprops['entryid']])); -+ mapi_savechanges($mapimessage); -+ } -+ } -+ } -+ } -+ } -+ /** -+ * unpacks the Contact Link Entry IDs -+ * -+ * @param string in hex with the value -+ * @return array with all binary Contact Link Entry IDS -+ * -+ */ -+ function _unpackContactLinkEntryIDS($value) -+ { -+ $contact_link_entry_ids = unpack("Vcount",hex2bin(substr($value,0,8))); -+ $contact_link_entry_ids["entry_ids"] = array(); -+ $length=8; -+ for ($j=0,$i=8;$j<$contact_link_entry_ids["count"];$j++,$i=$i+$length+8) { -+ $l = unpack("Vlength",hex2bin(substr($value,$i,8))); -+ $length=$l["length"]; -+ $temp = unpack ("VFlags/A16ProviderUID/VVersion/VType/VIndext/Vcbid/A*abeid",hex2bin(substr($value,$i+8,($length*2)))); -+ $temp["abeid"] = hex2bin(substr(bin2hex($temp["abeid"]),0,$temp["cbid"]*2)); -+ $contact_link_entry_ids["entry_ids"][]=$temp["abeid"]; -+ } -+ return $contact_link_entry_ids["entry_ids"]; -+ } -+ -+ /** -+ * packs the Contact Link Entry IDs -+ * -+ * @param array with all binary Contact Link Entry IDs -+ * @return string in hex with the value -+ * -+ */ -+ function _packContactLinkEntryIDS($values) { -+ $temp=""; -+ for ($i=0;$i -diff -ruN /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/class.recurrence.php mapi/class.recurrence.php ---- /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/class.recurrence.php Fri Oct 16 21:05:22 2009 -+++ mapi/class.recurrence.php Tue Oct 20 19:29:54 2009 -@@ -363,9 +363,13 @@ - * @param array $exception_props the exception properties (same properties as normal recurring items) - * @param date $base_date the base date of the exception (actual GMT time of non-exception occurrence) - * @param boolean $delete true - delete occurrence, false - create new exception or modify existing -+ * @param boolean $islocal true - expect the base_date in local time (happens in case basedate is returned from WA! - */ -- function createException($exception_props, $base_date, $delete = false) -+ function createException($exception_props, $base_date, $delete = false, $islocal=false) - { -+ // CHANGED dw2412 to support local base_date as delivered from WebAccess -+ if ($islocal == true) $base_date = $this->toGMT($this->tz, $base_date); -+ - $baseday = $this->dayStartOf($this->fromGMT($this->tz, $base_date)); - $basetime = $baseday + $this->recur["startocc"] * 60; - -@@ -447,8 +451,10 @@ - * Modifies an existing exception, but only updates the given properties - * NOTE: You can't remove properites from an exception, only add new ones - */ -- function modifyException($exception_props, $base_date) -+ function modifyException($exception_props, $base_date, $islocal=false) - { -+ // ADDED dw2412 to support local base_date as delivered from WebAccess -+ if ($islocal == true) $base_date = $this->toGMT($this->tz, $base_date); - if(!$this->isValidExceptionDate($base_date, $exception_props[$this->proptags["startdate"]])) - return false; - -@@ -573,13 +579,17 @@ - - // Returns the start or end time of the occurrence on the given base date. - // This assumes that the basedate you supply is correct .. ! -- function getOccurrenceStart($basedate) { -- $daystart = $this->dayStartOf($this->fromGMT($this->tz, $basedate)); -+ function getOccurrenceStart($basedate, $islocal = false) { -+ // CHANGED dw2412 to support local base_date as delivered from WebAccess -+ if ($islocal == false) $daystart = $this->dayStartOf($this->fromGMT($this->tz, $basedate)); -+ else $daystart = $this->dayStartOf($basedate); - return $this->toGMT($this->tz, $daystart + $this->recur["startocc"] * 60); - } - -- function getOccurrenceEnd($basedate) { -- $daystart = $this->dayStartOf($this->fromGMT($this->tz, $basedate)); -+ function getOccurrenceEnd($basedate, $islocal = false) { -+ // CHANGED dw2412 to support local base_date as delivered from WebAccess -+ if ($islocal == false) $daystart = $this->dayStartOf($this->fromGMT($this->tz, $basedate)); -+ else $daystart = $this->dayStartOf($basedate); - return $this->toGMT($this->tz, $daystart + $this->recur["endocc"] * 60); - } - -@@ -1229,8 +1239,12 @@ - /** - * Returns the exception if there is a CHANGE exception on the given base date, or FALSE otherwise - */ -- function getChangeException($basedate) -+ function getChangeException($basedate, $islocal) - { -+ // CHANGED dw2412 to support local base_date as delivered from WebAccess -+ if ($islocal == true) $basedate = $this->toGMT($this->tz, $basedate); -+ -+ - // Check if the occurrence is modified on the specified date - foreach($this->recur["changed_occurences"] as $changed) - { -@@ -1263,7 +1277,6 @@ - function dayStartOf($date) - { - $time1 = $this->gmtime($date); -- - return gmmktime(0, 0, 0, $time1["tm_mon"] + 1, $time1["tm_mday"], $time1["tm_year"] + 1900); - } - -diff -ruN /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/mapiguid.php mapi/mapiguid.php ---- /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/mapiguid.php Fri Oct 16 21:05:22 2009 -+++ mapi/mapiguid.php Tue Oct 20 19:29:54 2009 -@@ -67,4 +67,7 @@ - define('PS_MAPI', makeguid("{00020328-0000-0000-C000-000000000046}")); - define('PS_PUBLIC_STRINGS', makeguid("{00020329-0000-0000-C000-000000000046}")); - define('PS_INTERNET_HEADERS', makeguid("{00020386-0000-0000-c000-000000000046}")); -+ -+define('MAPIUID_LinkContactEntryID', makeguid("{0aaa42fe-c718-101a-e885-0b651c240000}")); // http://msdn.microsoft.com/en-us/library/bb820924.aspx misc2 in CONTAB structure in Internet This parameter is reserved for Outlook internal use and is not supported. -+ - ?> -diff -ruN /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/mapitags.php mapi/mapitags.php ---- /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/include/mapi/mapitags.php Fri Oct 16 21:05:22 2009 -+++ mapi/mapitags.php Tue Oct 20 19:29:54 2009 -@@ -601,7 +601,25 @@ - define('PR_FINDER_ENTRYID' ,mapi_prop_tag(PT_BINARY, 0x35E7)); - define('PR_IPM_FAVORITES_ENTRYID' ,mapi_prop_tag(PT_BINARY, 0x6630)); - define('PR_IPM_PUBLIC_FOLDERS_ENTRYID' ,mapi_prop_tag(PT_BINARY, 0x6631)); -+//* start: Added dw2412 source www.cdolive.com/cdo10.htm -+define('PR_HAS_RULES' ,mapi_prop_tag(PT_BINARY, 0x663A)); - -+// Outlook AutoArchive Properties -+define('PR_AGING_PERIOD' ,mapi_prop_tag(PT_LONG, 0x36EC)); -+define('PR_AGING_GRANULARITY' ,mapi_prop_tag(PT_LONG, 0x36EE)); -+define('PR_AGING_FILENAME' ,mapi_prop_tag(PT_TSTRING, 0x6856)); -+define('PR_AGING_AGE_FOLDER' ,mapi_prop_tag(PT_BOOLEAN, 0x6857)); -+define('PR_AGING_DELETE_ITEMS' ,mapi_prop_tag(PT_BOOLEAN, 0x6855)); -+define('PR_AGING_FILE_NAME_AFTER9' ,mapi_prop_tag(PT_TSTRING, 0x6859)); -+define('PR_AGING_DONT_AGE_ME' ,mapi_prop_tag(PT_BOOLEAN, 0x6858)); -+define('PR_AGING_WHEN_DELETED_ON_SERVER' ,mapi_prop_tag(PT_BOOLEAN, 0x685B)); -+define('PR_AGING_WAIT_UNTIL_EXPIRED' ,mapi_prop_tag(PT_BOOLEAN, 0x685C)); -+define('PR_AGING_VERSION' ,mapi_prop_tag(PT_LONG, 0x685D)); -+define('PR_AGING_DEFAULT' ,mapi_prop_tag(PT_LONG, 0x685E)); -+ -+ -+ -+//* End : added dw2412 - - /* Proptags 0x35E8-0x35FF reserved for folders "guaranteed" by 'PR_VALID_FOLDER_MASK */ - -@@ -637,6 +655,19 @@ - define('PR_DEFAULT_VIEW_ENTRYID' ,mapi_prop_tag(PT_BINARY, 0x3616)); - define('PR_ASSOC_CONTENT_COUNT' ,mapi_prop_tag(PT_LONG, 0x3617)); - -+//* start: Added dw2412 source www.cdolive.com/cdo10.htm -+define('PR_DEF_FORM_ALLOWED' ,mapi_prop_tag(PT_LONG, 0x3FE2)); -+define('PR_PUBLISH_IN_ADDRESS_BOOK' ,mapi_prop_tag(PT_BOOLEAN, 0x3FE6)); -+define('PR_WEBPAGE' ,mapi_prop_tag(PT_TSTRING, 0x36DF)); -+define('PR_FOLDER_VIEWS_ONLY' ,mapi_prop_tag(PT_LONG, 0x36E1)); -+define('PR_DEF_MSG_CLASS' ,mapi_prop_tag(PT_TSTRING, 0x36E5)); -+define('PR_DEF_FORM_NAME' ,mapi_prop_tag(PT_TSTRING, 0x36E6)); -+define('PR_GENERATE_EXCHANGE_VIEWS' ,mapi_prop_tag(PT_BOOLEAN, 0x36E9)); -+define('PR_VIEW_NAME' ,mapi_prop_tag(PT_TSTRING, 0x7006)); -+define('PR_OFFLINE_FLAG' ,mapi_prop_tag(PT_LONG, 0x663D)); -+define('PR_REPLICA_VERSION' ,mapi_prop_tag(PT_LONG, 0x664B)); -+//* end : Added dw2412 -+ - define('PR_RIGHTS' ,mapi_prop_tag(PT_LONG, 0x6639)); - - /* Reserved 0x36C0-0x36FF */ -@@ -1231,6 +1262,9 @@ - - define('PR_PROCESSED', mapi_prop_tag(PT_BOOLEAN, 0x7D01)); - -+// ADDED dw2412 Contact Photo Attachment -+define('PR_ATTACHMENT_CONTACTPHOTO' ,mapi_prop_tag(PT_BOOLEAN, 0x7FFF)); -+ - // Delegates properties - define('PR_DELEGATES_SEE_PRIVATE', mapi_prop_tag(PT_MV_LONG, 0x686B)); - define('PR_SCHDINFO_DELEGATE_ENTRYIDS', mapi_prop_tag(PT_MV_BINARY, 0x6845)); ---- /usr/src/zarafa/zarafa-6.30.4.17264/php-ext/Makefile.am 2009-10-16 15:55:59.000000000 +0200 -+++ zarafa-6.30.4/php-ext/Makefile.am.brodowski 2009-10-24 23:48:37.000000000 +0200 -@@ -23,7 +23,7 @@ - # and be missing at runtime. - # therefore, we explicitly link mapi.so with -lpthread :( - --dist_data_DATA = include/mapi/mapicode.php include/mapi/mapidefs.php include/mapi/mapitags.php include/mapi/mapi.util.php include/mapi/class.recurrence.php include/mapi/class.meetingrequest.php include/mapi/class.freebusypublish.php include/mapi/mapiguid.php -+dist_data_DATA = include/mapi/mapicode.php include/mapi/mapidefs.php include/mapi/mapitags.php include/mapi/mapi.util.php include/mapi/class.recurrence.php include/mapi/class.meetingrequest.php include/mapi/class.freebusypublish.php include/mapi/mapiguid.php include/mapi/class.autoarchivesettings.php include/mapi/class.linkedappointment.php - datadir = ${datarootdir}/php/mapi - - mapi_la_SOURCES = main.cpp Session.cpp SessionPool.cpp util.cpp \ diff --git a/zarafa-6.30.4-package.patch b/zarafa-6.30.4-package.patch deleted file mode 100644 index 3c42aa1..0000000 --- a/zarafa-6.30.4-package.patch +++ /dev/null @@ -1,48 +0,0 @@ -Patch by Robert Scheck for zarafa >= 6.30.4, 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. - ---- zarafa-6.30.4/configure.ac 2009-03-17 17:30:45.000000000 +0100 -+++ zarafa-6.30.4/configure.ac.fedora 2009-03-31 20:34:29.000000000 +0200 -@@ -591,17 +591,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 - ---- zarafa-6.30.4/ECtools/Makefile.am 2009-04-23 22:10:44.000000000 +0200 -+++ zarafa-6.30.4/ECtools/Makefile.am.fedora 2009-04-25 21:20:43.000000000 +0200 -@@ -1,7 +1,3 @@ --if ! OSS_ONLY --PROSUBS = zarafa-backup zarafa-report --endif -- - if WITH_TESTTOOLS - TESTSUBS = ECTestTools - endif ---- zarafa-6.30.4/Makefile.am 2009-04-23 22:10:44.000000000 +0200 -+++ zarafa-6.30.4/Makefile.am.fedora 2009-04-25 21:20:26.000000000 +0200 -@@ -1,9 +1,5 @@ - AUTOMAKE_OPTIONS = 1.8 foreign - --if ! OSS_ONLY --PROSUBS = liblicense licensed --endif -- - SUBDIRS = common libfreebusy mapi4linux $(PROSUBS) provider libicalmapi inetmapi php-ext spooler gateway caldav ECtools installer po doc - - if WITH_PERL diff --git a/zarafa-6.30.4-perl.patch b/zarafa-6.30.4-perl.patch deleted file mode 100644 index 3c5bed5..0000000 --- a/zarafa-6.30.4-perl.patch +++ /dev/null @@ -1,53 +0,0 @@ -Patch by Robert Scheck for Zarafa >= 6.30.3, which -replaces the hardcoded perl directories by correct ones (in a dynamic way). Only -Debian and Ubuntu have ExtUtils in /usr/share, openSUSE, Fedora and RHEL/CentOS -use /usr/lib. So let us use the correct way to detect the directory. - -This patch should be an advantage to OSS users on non-Debian distributions when -using Perl API, as the correct directory will get picked up. - ---- zarafa-6.30.0/configure.ac 2009-07-20 18:41:07.000000000 +0200 -+++ zarafa-6.30.0/configure.ac.perl 2009-10-16 00:23:52.000000000 +0200 -@@ -127,6 +127,22 @@ - # build perl stuff - AC_ARG_ENABLE(perl, AC_HELP_STRING([--enable-perl], [enable building perl bindings]), [want_perl=${enableval}], [want_perl=no]) - AM_CONDITIONAL(WITH_PERL, test "$want_perl" = "yes") -+if test "x$want_perl" = "xyes"; then -+ AC_PATH_PROG([PERL], [perl], [no]) -+ if test "x$PERL" = "xno"; then -+ AC_MSG_ERROR([perl is required for building perl bindings]) -+ fi -+ -+ AC_MSG_CHECKING([for perl installarchlib]) -+ PERL_ARCHLIB=`$PERL -V:installarchlib | sed -e "s/^.*='//" -e "s/';$//"` -+ AC_MSG_RESULT([$PERL_ARCHLIB]) -+ AC_SUBST(PERL_ARCHLIB) -+ -+ AC_MSG_CHECKING([for perl privlib]) -+ PERL_PRIVLIB=`$PERL -V:privlib | sed -e "s/^.*='//" -e "s/';$//"` -+ AC_MSG_RESULT([$PERL_PRIVLIB]) -+ AC_SUBST(PERL_PRIVLIB) -+fi - - # testtools require ncurses - if test "$want_tests" = "yes"; then ---- zarafa-6.30.0/perl/Makefile.am 2009-07-20 18:41:06.000000000 +0200 -+++ zarafa-6.30.0/perl/Makefile.am.perl 2009-10-16 00:24:51.000000000 +0200 -@@ -1,7 +1,6 @@ - lib_LTLIBRARIES = libperlmapi.la - --PVERSION=5.8.8 --AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX -I$(top_srcdir)/mapi4linux/include -I$(top_srcdir)/provider/common -I${top_srcdir}/common -I/usr/lib/perl/$(PVERSION)/CORE -+AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX -I$(top_srcdir)/mapi4linux/include -I$(top_srcdir)/provider/common -I${top_srcdir}/common -I$(PERL_ARCHLIB)/CORE - - libperlmapi_la_LIBADD = ${top_builddir}/mapi4linux/src/libmapi.la \ - ${top_builddir}/common/libcommon_mapi.la \ -@@ -12,7 +11,7 @@ - CLEANFILES = MAPI.cpp - - .xs.cpp: typemap -- xsubpp -noprototypes -nolinenumbers -C++ -typemap /usr/share/perl/$(PVERSION)/ExtUtils/typemap $< > $@; \ -+ xsubpp -noprototypes -nolinenumbers -C++ -typemap $(PERL_PRIVLIB)/ExtUtils/typemap $< > $@; \ - if [ $$? -ne 0 ]; then rm $@; fi - - check-syntax: diff --git a/zarafa-6.40.0-clucene.patch b/zarafa-6.40.0-clucene.patch new file mode 100644 index 0000000..2badd27 --- /dev/null +++ b/zarafa-6.40.0-clucene.patch @@ -0,0 +1,56 @@ +Patch by Robert Scheck for zarafa >= 6.40.0, which adds +some more flexibility to detect CLucene headers and libraries. Right now, Zarafa is +linking static to CLucene, which is a no-go at Fedora. That means CLucene on Fedora +doesn't provide static library files at all. To keep Zarafa's behaviour for their +own builds, the patch looks for "libclucene.a" and links static; otherwise (Fedora) +it links dynamically using -lclucene. More details about static linking and Fedora: +http://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_Static_Libraries + +Zarafa's internal CLucene build for Zarafa seems to violate upstream's decision, as +CLucene upstream decided with 0.9.20 release to put "CLucene/clucene-config.h" file +into /usr/lib{,64}/CLucene/clucene-config.h because of arch-specific values. Fedora +is shipping CLucene using upstream's decision, thus ./configure needs to handle the +include path with GCC CPP, too. To avoid CPP telling "rejected by the preprocessor" +as of the missing include path (/usr/include is standard, but /usr/lib{,64} isn't), +$CXXCPP needs to be temporarily extended to contain this special path as well. + +--- zarafa-6.40.0/configure.ac 2010-06-06 14:47:37.000000000 +0200 ++++ zarafa-6.40.0/configure.ac.clucene 2010-06-06 15:16:18.000000000 +0200 +@@ -394,17 +394,26 @@ + [CLUCENE_INCLUDE_PREFIX=${withval}],[CLUCENE_INCLUDE_PREFIX=/usr/include]) + cflags_keep=$CFLAGS + cxxflags_keep=$CXXFLAGS ++cxxcpp_keep=$CXXCPP + if test "x$CLUCENE_LIB_PREFIX" != "x"; then + CFLAGS="$CFLAGS -I$CLUCENE_LIB_PREFIX" + CXXFLAGS="$CFLAGS -I$CLUCENE_LIB_PREFIX" ++ CXXCPP="$CXXCPP -I$CLUCENE_LIB_PREFIX" + fi + if test "x$CLUCENE_INCLUDE_PREFIX" != "x"; then + CFLAGS="$CFLAGS -I$CLUCENE_INCLUDE_PREFIX" + CXXFLAGS="$CFLAGS -I$CLUCENE_INCLUDE_PREFIX" ++ CXXCPP="$CXXCPP -I$CLUCENE_INCLUDE_PREFIX" ++fi ++if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then ++ AC_CHECK_LIB(clucene, [open], ++ [ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a" ], ++ [ WITH_CLUCENE=no ]) ++else ++ AC_CHECK_LIB(clucene, [open], ++ [ CLUCENE_LIBS="-lclucene" ], ++ [ WITH_CLUCENE=no ]) + fi +-AC_CHECK_LIB(clucene, [open], +- [ CLUCENE_LIBS="${CLUCENE_LIB_PREFIX}/libclucene.a" ], +- [ WITH_CLUCENE=no ]) + AC_CHECK_HEADERS([CLucene.h], + [ CLUCENE_CFLAGS="-DLUCENE_DISABLE_MEMTRACKING" ], + [ WITH_CLUCENE=no ]) +@@ -419,6 +428,7 @@ + AC_SUBST(CLUCENE_LIBS) + CFLAGS=$cflags_keep + CXXFLAGS=$cxxflags_keep ++CXXCPP=$cxxcpp_keep + AC_LANG_POP + + # Check for google perftools tcmalloc availability diff --git a/zarafa-6.40.0-krb5.patch b/zarafa-6.40.0-krb5.patch new file mode 100644 index 0000000..b7016df --- /dev/null +++ b/zarafa-6.40.0-krb5.patch @@ -0,0 +1,20 @@ +Patch by Robert Scheck for zarafa >= 6.40.0, which removes a +wrong include causing a build failure on native Fedora 11 and/or later as well as on RHEL +4 and/or later. According to some Kerberos people, "com_err.h" is already included by the +"krb5.h" include and thus doesn't need to be included once more. + +The build failure on RHEL/Fedora is caused due the non-existence of this include, on RHEL/ +Fedora, only "" would be available. If you really need the "com_err.h" for +some other Linux distributions (where I didn't find a real difference so far), you have to +conditionalize the include using preprocessor flags after detection in ./configure. + +--- zarafa-6.40.0/provider/libserver/ECKrbAuth.cpp 2010-05-31 19:28:59.000000000 +0200 ++++ zarafa-6.40.0/provider/libserver/ECKrbAuth.cpp.krb5 2010-06-05 21:48:51.000000000 +0200 +@@ -58,7 +58,6 @@ + // error_message() is wrongly typed in c++ context + extern "C" { + #include +-#include + } + + ECRESULT ECKrb5AuthenticateUser(const std::string &strUsername, const std::string &strPassword, std::string *lpstrError) diff --git a/zarafa-6.40.0-openssl.patch b/zarafa-6.40.0-openssl.patch new file mode 100644 index 0000000..23219a1 --- /dev/null +++ b/zarafa-6.40.0-openssl.patch @@ -0,0 +1,23 @@ +Patch by Robert Scheck for zarafa >= 6.40.0, which adds some +forward compatibility regarding OpenSSL 1.0.0. Without this patch, compiling while using +OpenSSL 1.0.0 will fail with "stdsoap2.cpp:4095: error: invalid conversion from 'const +X509V3_EXT_METHOD*' to 'X509V3_EXT_METHOD*'". Right now, Fedora 12 and/or later as well +as RHEL 6 and/or later are using OpenSSL 1.0.0 and thus depend on this patch. In order to +get OpenSSL 0.9.x and OpenSSL 1.0.0 working, the preprocessor condition is required. + +--- zarafa-6.40.0/provider/soap/stdsoap2.cpp 2010-05-31 19:28:55.000000000 +0200 ++++ zarafa-6.40.0/provider/soap/stdsoap2.cpp.openssl 2010-06-05 21:29:00.000000000 +0200 +@@ -4092,7 +4092,12 @@ + { X509_EXTENSION *ext = X509_get_ext(peer, i); + const char *ext_str = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext))); + if (ext_str && !strcmp(ext_str, "subjectAltName")) +- { X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext); ++ { ++#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) ++ const X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext); ++#else ++ X509V3_EXT_METHOD *meth = X509V3_EXT_get(ext); ++#endif + void *ext_data; + #if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) + const unsigned char *data; diff --git a/zarafa-6.40.0-package.patch b/zarafa-6.40.0-package.patch new file mode 100644 index 0000000..1a4877e --- /dev/null +++ b/zarafa-6.40.0-package.patch @@ -0,0 +1,61 @@ +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. + +--- zarafa-6.40.0/configure.ac 2010-05-31 15:45:19.000000000 +0200 ++++ zarafa-6.40.0/configure.ac.package 2010-06-06 02:48:22.000000000 +0200 +@@ -772,19 +772,6 @@ + version + specialbuild + ]) +-dnl non-oss files +-if test -d `dirname $0`/licensed; then +-AC_CONFIG_FILES([ +- liblicense/Makefile +- licensed/Makefile +- ECtools/zarafa-backup/Makefile +- ECtools/zarafa-backup/helpers/Makefile +- ECtools/zarafa-report/Makefile +- ECtools/libarchiver/Makefile +- ECtools/zarafa-archiver/Makefile +- debian/zarafa.install +-]) +-fi + + AC_OUTPUT + +--- zarafa-6.40.0/Makefile.am 2010-05-31 15:45:19.000000000 +0200 ++++ zarafa-6.40.0/Makefile.am.package 2010-06-06 02:51:29.000000000 +0200 +@@ -1,9 +1,5 @@ + AUTOMAKE_OPTIONS = 1.9 foreign + +-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_PERL +@@ -17,10 +13,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 +--- zarafa-6.40.0/ECtools/Makefile.am 2010-05-31 15:45:18.000000000 +0200 ++++ zarafa-6.40.0/ECtools/Makefile.am.package 2010-06-06 02:48:37.000000000 +0200 +@@ -1,7 +1,3 @@ +-if ! OSS_ONLY +-PROSUBS = zarafa-backup zarafa-report libarchiver zarafa-archiver +-endif +- + if WITH_TESTTOOLS + TESTSUBS = ECTestTools + endif diff --git a/zarafa-6.40.0-undefined-symbol.patch b/zarafa-6.40.0-undefined-symbol.patch new file mode 100644 index 0000000..0e569fe --- /dev/null +++ b/zarafa-6.40.0-undefined-symbol.patch @@ -0,0 +1,42 @@ +Re-merged patch by Robert Scheck for zarafa >= 6.40.0, which corrects +the linking between the libraries. Without this patch, any PHP usage causes the PHP error message +"undefined symbol: _ZN10ECMemTable6CreateEP14_SPropTagArrayjPPS_". The second hunk is required to +avoid linking errors like "(.rodata+0x0): multiple definition of `IID_IUnknown'". This patch was +originally by Michel de Ron (Zarafa); http://forums.zarafa.com/viewtopic.php?f=1&t=2418&start=15 +is providing some more details and information. + +--- zarafa-6.40.0/mapi4linux/src/Makefile.am 2010-05-31 15:44:42.000000000 +0200 ++++ zarafa-6.40.0/mapi4linux/src/Makefile.am.undefined-symbol 2010-06-08 22:32:12.000000000 +0200 +@@ -3,7 +3,9 @@ + AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX -I$(top_srcdir)/mapi4linux/include -I$(top_srcdir)/provider/common -I${top_srcdir}/common -I${top_srcdir}/libfreebusy + AM_LDFLAGS = $(DL_LIBS) -export-symbols ${top_srcdir}/mapi4linux/src/mapi-exports.sym + +-libmapi_la_LIBADD = ${top_builddir}/common/libcommon_util.la ++libmapi_la_LIBADD = ${top_builddir}/common/libcommon_util.la \ ++ ${top_builddir}/common/libcommon_mapi.la \ ++ $(PROG_LIBS) + + # required because we're exporting extern "C" functions and want to filter with 'export-symbols' + CXXLD=--tag=none gcc +--- zarafa-6.40.0/mapi4linux/src/m4lguids.cpp 2010-05-31 19:28:56.000000000 +0200 ++++ zarafa-6.40.0/mapi4linux/src/m4lguids.cpp.undefined-symbol 2010-06-08 22:47:30.000000000 +0200 +@@ -48,19 +48,5 @@ + */ + + #include "platform.h" +-#define USES_IID_IUnknown +-#define USES_IID_IStream +-#define USES_IID_ISequentialStream +-#define USES_IID_IProfAdmin +-#define USES_IID_IProviderAdmin +-#define USES_IID_IMAPIAdviseSink +-#define USES_IID_IMsgServiceAdmin +-#define USES_IID_IProfSect +-#define USES_IID_IMAPISession +-#define USES_IID_IMAPIProp +-#define USES_IID_IMAPIFolder +-#define USES_IID_IMAPITable +-#include +- + #include "mapiguid.h" + #include "m4l.mapiutil.h" diff --git a/zarafa-webaccess.conf b/zarafa-webaccess.conf new file mode 100644 index 0000000..7e6a7f6 --- /dev/null +++ b/zarafa-webaccess.conf @@ -0,0 +1,32 @@ +# +# Zarafa Webaccess featuring a 'Look & Feel' similar to Outlook +# + +Alias /webaccess /usr/share/zarafa-webaccess/ + +# Following Apache and PHP settings need to be set to work correct +# + + # Some apache settings + Options -Indexes +FollowSymLinks + + # Register globals must be off + php_flag register_globals off + + # Magic quotes must be off + php_flag magic_quotes_gpc off + php_flag magic_quotes_runtime off + + # The maximum POST limit. To upload large files, this value must + # be larger than upload_max_filesize. + php_value post_max_size 31M + php_value upload_max_filesize 30M + + # Short open tags must be on + php_flag short_open_tag on + + # Uncomment for debugging purposes only. Make sure Apache/PHP can + # write to this file or no errors will be logged! +# php_flag log_errors on +# php_value error_log /var/lib/zarafa-webaccess/error_log + diff --git a/zarafa.logrotate b/zarafa.logrotate new file mode 100644 index 0000000..f2a0b80 --- /dev/null +++ b/zarafa.logrotate @@ -0,0 +1,13 @@ +/var/log/zarafa/SERVICE.log { + weekly + missingok + rotate 52 + compress + delaycompress + notifempty + postrotate + killall -HUP zarafa-SERVICE 2> /dev/null || true + endscript + create 0644 zarafa zarafa +} + diff --git a/zarafa.spec b/zarafa.spec index ea52ca7..d83acd9 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -26,15 +26,15 @@ # 5. Build locally # 6. Build in mock for; # a) fedora-rawhide-x86_64, -# b) fedora-12-x86_64, -# c) fedora-11-x86_64, -# d) epel-5-x86_64, -# e) epel-4-x86_64 +# b) fedora-13-x86_64, +# c) fedora-12-x86_64, +# d) epel-6-x86_64, +# e) epel-5-x86_64 # # or scratch build in koji; # -# for tag in dist-f13 dist-f12-updates-candidate dist-f11-updates-candidate \ -# dist-5E-epel dist-4E-epel; do +# for tag in dist-f14 dist-f13-updates-candidate dist-f12-updates-candidate \ +# dist-6E-epel dist-5E-epel; do # echo "- $tag: `koji build --scratch --nowait $tag $srpm 2>&1 | grep \"Task info\" | awk '{print $3}'`" # done # @@ -43,19 +43,19 @@ # = Final Release = # # NOTE: A final release of a version, or multiple final releases of the -# same version, of Zarafa 6.30.10 requires one unique tarball, probably -# named similar to zarafa-6.30.10.tar.gz. +# same version, of Zarafa 6.40.0 requires one unique tarball, probably +# named similar to zarafa-6.40.0.tar.gz. # # Once this tarball is used for an RPM package that is actually released, # the .tar.gz source should not change anymore. You may, though, include -# patches for the 6.30.10 RPM package in this .spec and bumping the release +# patches for the 6.40.0 RPM package in this .spec and bumping the release # number. # # When you do so, however, you will need to take into account upgrade paths -# between distribution versions. E.g., when releasing 6.30.10-2 to F-11, you -# would also need to release 6.30.10-2 to F-12. +# between distribution versions. E.g., when releasing 6.40.0-2 to F-12, you +# would also need to release 6.40.0-2 to F-13. # -# An alternative is to release 6.30.10.1 with a zarafa-6.30.10.1.tar.gz (yet +# An alternative is to release 6.40.1 with a zarafa-6.40.1.tar.gz (yet # again ensuring there is an upgrade path to later distribution versions) # # The point behind this has to do with reproducibility, though admittedly, @@ -82,13 +82,13 @@ # again just for appearances sake, possibly preserving the important # messages from each beta_or_rc type of changelog entries, e.g.: # -# * Some Time Your Name - 6.30.10-0.1svn12345 +# * Some Time Your Name - 6.40.0-0.1svn12345 # - Improve packaging # # might, in a final release, become: # -# * Some Time Zarafa Release Engineering - 6.30.10-1 -# - Release 6.30.10 +# * Some Time Zarafa Release Engineering - 6.40.0-1 +# - Release 6.40.0 # - Improve packaging # # - Possibly change only the release tag for the most recent changelog @@ -100,15 +100,15 @@ # 5. Build locally # 6. Build in mock for; # a) fedora-rawhide-x86_64, -# b) fedora-12-x86_64, -# c) fedora-11-x86_64, -# d) epel-5-x86_64, -# e) epel-4-x86_64 +# b) fedora-13-x86_64, +# c) fedora-12-x86_64, +# d) epel-6-x86_64, +# e) epel-5-x86_64 # # or scratch build in koji; # -# for tag in dist-f13 dist-f12-updates-candidate dist-f11-updates-candidate \ -# dist-5E-epel dist-4E-epel; do +# for tag in dist-f14 dist-f13-updates-candidate dist-f12-updates-candidate \ +# dist-6E-epel dist-5E-epel; do # echo "- $tag: `koji build --scratch --nowait $tag $srpm 2>&1 | grep \"Task info\" | awk '{print $3}'`" # done # @@ -117,13 +117,15 @@ %define beta_or_rc 0 %define actual_release 1 -%define svnrevision 20002 +%define svnrevision 20653 +%define with_clucene 1 %define with_ldap 1 %define with_xmlto 1 +%define php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1) -Summary: Zarafa Outlook Sharing and Open Source Collaboration +Summary: The Open Source Zarafa Collaboration Platform Name: zarafa -Version: 6.30.14 +Version: 6.40.0 %if %{beta_or_rc} Release: 0.%{actual_release}.svn%{svnrevision}%{?dist} %else @@ -140,14 +142,15 @@ URL: http://www.zarafa.com/ # http://www.zarafa.com/download-community -> "Zarafa Source Package" Source0: %{name}-%{version}.tar.gz Source1: %{name}.ini +Source2: %{name}.logrotate +Source3: %{name}-webaccess.conf -Patch0: zarafa-6.30.4-package.patch -# Patch 1, 2 and 3 were sent to upstream -Patch1: zarafa-6.30.4-perl.patch -Patch2: zarafa-6.30.10-undefined-symbol.patch -Patch3: zarafa-6.30.10-chmod.patch -# http://www.brodowski.org/zarafa/php-mapi/6.30.10.18495/18495_patch.diff -Patch10: zarafa-6.30.4-brodowski.patch +Patch0: zarafa-6.40.0-package.patch +# Patch 1, 2, 3 and 4 were sent to upstream +Patch1: zarafa-6.40.0-undefined-symbol.patch +Patch2: zarafa-6.40.0-openssl.patch +Patch3: zarafa-6.40.0-krb5.patch +Patch4: zarafa-6.40.0-clucene.patch BuildRequires: bison BuildRequires: gcc-c++ @@ -160,19 +163,14 @@ BuildRequires: libxml2-devel BuildRequires: mysql-devel >= 4.1 BuildRequires: ncurses-devel BuildRequires: pam-devel -BuildRequires: php-devel +BuildRequires: php-devel >= 4.3 BuildRequires: libtool, automake, autoconf +BuildRequires: %{_includedir}/uuid/uuid.h +BuildRequires: %{_includedir}/curl/curl.h +BuildRequires: %{_bindir}/xsubpp -%if 0%{?fedora} > 8 -BuildRequires: libcurl-devel -BuildRequires: perl-devel -%else -BuildRequires: curl-devel -BuildRequires: perl -%endif - -%if 0%{?fedora} >= 12 -BuildRequires: libuuid-devel +%if %{with_clucene} +BuildRequires: clucene-core-devel >= 0.9.21b-1 %endif %if %{with_ldap} @@ -183,7 +181,7 @@ BuildRequires: openldap-devel BuildRequires: xmlto %endif -# The normal zarafa package pulls in all of zarafa +# The normal zarafa package pulls in all of zarafa except indexer Requires: zarafa(ical) = %{version}-%{release} Requires: zarafa(dagent) = %{version}-%{release} Requires: zarafa(gateway) = %{version}-%{release} @@ -196,49 +194,56 @@ Requires: zarafa(config) = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -Zarafa Outlook Sharing is a Microsoft Exchange replacement. The Open Source -Collaboration provides an integration with your existing Linux mail server, -native mobile phone support by ActiveSync compatibility and a webaccess with -'Look & Feel' similar to Outlook using Ajax. Including an IMAP4 and a POP3 -gateway as well as an iCal/CalDAV gateway, Zarafa can combine the usability -with the stability and flexibility of a Linux server. +The Zarafa Collaboration Platform is a Microsoft Exchange replacement. The +Open Source Collaboration provides an integration with your existing Linux +mail server, native mobile phone support by ActiveSync compatibility and a +webaccess with 'Look & Feel' similar to Outlook using Ajax. Including an +IMAP and a POP3 gateway as well as an iCal/CalDAV gateway, the Zarafa Open +Source Collaboration can combine the usability with the stability and the +flexibility of a Linux server. The proven Zarafa groupware solution is using MAPI objects, provides a MAPI client library as well as programming interfaces for C++, PHP and Perl. The other Zarafa related packages need to be installed to gain all the features -and benefits of Zarafa Outlook Sharing and Open Source Collaboration. +and benefits of the Zarafa Collaboration Platform (ZCP). ## -## Zarafa Client +## Zarafa Client library ## %package client -Summary: Zarafa Client Library +Summary: The Zarafa Client library Group: System Environment/Libraries Requires: zarafa(common) = %{version}-%{release} Provides: zarafa(client) = %{version}-%{release} %description client -Zarafa client libraries for use with integrated MAPI clients. +The zarafa-client package provides the Zarafa Client library, which gets +used by the Open Source MAPI (Messaging Application Programming Interface) +implementation of Zarafa as provider between MAPI and Zarafa. ## -## Zarafa Common files +## Common Zarafa files and directories ## %package common -Summary: Zarafa common files -Group: System Environment/Daemons +Summary: Common Zarafa files and directories +Group: Applications/Productivity Requires(pre): shadow-utils Provides: zarafa(common) = %{version}-%{release} +%if 0%{?rhel}%{?fedora} > 5 +BuildArch: noarch +%endif %description common -Common files and directories required by most Zarafa packages. +The zarafa-common package provides the filesystem structure and includes +common files required by most other Zarafa packages. It also provides the +creation of the zarafa user for the different Zarafa services. ## ## Zarafa Delivery Agent ## %package dagent -Summary: Zarafa Delivery Agent +Summary: The Zarafa Delivery Agent Group: System Environment/Daemons -Requires: zarafa(client) = %{version}-%{release} Requires: zarafa(common) = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(preun): /sbin/service @@ -248,12 +253,13 @@ Provides: zarafa(dagent) = %{version}-%{release} Provides: zarafa(config::dagent) = %{version}-%{release} %description dagent -The delivery agent delivers e-mails into the Zarafa server. -It can be used to trigger the local mailer or act as the LMTP +The zarafa-dagent package includes the Zarafa Delivery Agent to import +e-mail messages from Internet Mail format to Zarafa. The Zarafa Delivery +Agent can be used trigger the local mailer (MDA) or even act as the LMTP server. ## -## Zarafa Development Headers +## Zarafa development files ## %package devel Summary: Development files for several Zarafa libraries @@ -264,18 +270,16 @@ Provides: %{name}-static = %{version}-%{release} %description devel The zarafa-devel package includes header files and libraries necessary for -developing programs which use features from the Zarafa Outlook Sharing and -Open Source Collaboration. The proven Zarafa groupware solution is using -MAPI objects, provides a MAPI client library and programming interfaces for -C++, PHP and Perl. +developing own programs which use functions and interfaces from the Zarafa +Collaboration Platform. The Zarafa Open Source Collaboration is using MAPI +objects, provides a MAPI client library and a C++ programming interface. ## -## Zarafa Gateway +## Zarafa POP3/IMAP Gateway service ## %package gateway -Summary: Zarafa Gateway server (POP3/IMAP access) +Summary: The Zarafa POP3/IMAP Gateway service Group: System Environment/Daemons -Requires: zarafa(client) = %{version}-%{release} Requires: zarafa(common) = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(preun): /sbin/service @@ -285,19 +289,19 @@ Provides: zarafa(gateway) = %{version}-%{release} Provides: zarafa(config::gateway) = %{version}-%{release} %description gateway -The gateway enables other e-mail clients to connect through -POP3 or IMAP to the Zarafa server to read their e-mail. With -IMAP, it is also possible to view the contents of shared -folders and subfolders. The gateway can be configured to -listen for POP3, POP3S, IMAP and/or IMAPS. +The zarafa-gateway package includes the Zarafa POP3/IMAP Gateway service +to enable regular non-MAPI e-mail clients to connect through POP3 or IMAP +to the Zarafa server to access their e-mails. Using IMAP, it is possible +as well to view the contents of shared folders and subfolders. The Zarafa +POP3/IMAP Gateway service can be configured to listen for POP3, POP3S, +IMAP and/or IMAPS. ## -## Zarafa iCal/CalDAV server +## Zarafa iCal/CalDAV gateway ## %package ical Summary: The Zarafa iCal/CalDAV gateway Group: System Environment/Daemons -Requires: zarafa(client) = %{version}-%{release} Requires: zarafa(common) = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(preun): /sbin/service @@ -309,13 +313,37 @@ Provides: zarafa(config::ical) = %{version}-%{release} Provides: zarafa(config::caldav) = %{version}-%{release} %description ical -The iCal/CalDAV gateway enables users to retrieve their -calendar using iCalendar compliant clients. The iCal/CalDAV -gateway can be configured to listen for HTTP and HTTPS -requests. +The zarafa-ical package includes the Zarafa iCal/CalDAV gateway service +to enable users to access their calendar using iCalendar (RFC 2445/5545) +or CalDAV (RFC 4791) compliant clients. The iCal/CalDAV gateway service +can be configured to listen for HTTP and HTTPS requests. + +%if %{with_clucene} +## +## Zarafa Indexing service +## +%package indexer +Summary: The Zarafa Indexing service +Group: System Environment/Daemons +Requires: zarafa(common) = %{version}-%{release}, file +Requires: catdoc, libxslt, lynx, unzip, %{_bindir}/pdftotext +Requires(post): /sbin/chkconfig +Requires(preun): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(postun): /sbin/service +Provides: zarafa(indexer) = %{version}-%{release} +Provides: zarafa(config::indexer) = %{version}-%{release} + +%description indexer +The zarafa-indexer package includes the Zarafa Indexing service for fast +and full-text searching. Using CLucene search engine, this service makes +an index per user of messages and attachments for the Zarafa server. At +search queries, the server will use this index to quickly find messages, +items and even in contents of attached documents. +%endif ## -## Zarafa CalDAV package, merely an alias for zarafa-ical +## Zarafa CalDAV gateway (merely an alias for zarafa-ical) ## %package caldav Summary: The Zarafa iCal/CalDAV gateway @@ -323,18 +351,17 @@ Group: System Environment/Daemons Requires: zarafa(ical) = %{version}-%{release} %description caldav -The iCal/CalDAV gateway enables users to retrieve their -calendar using iCalendar compliant clients. The iCal/CalDAV -gateway can be configured to listen for HTTP and HTTPS -requests. +The zarafa-caldav package includes the Zarafa CalDAV gateway service to +enable users to access their calendar using iCalendar (RFC 2445/5545) or +CalDAV (RFC 4791) compliant clients. The iCal/CalDAV gateway service can +be configured to listen for HTTP and HTTPS requests. ## -## Zarafa Monitor Service +## Zarafa Monitoring service ## %package monitor -Summary: Zarafa Monitoring service +Summary: The Zarafa Monitoring service Group: System Environment/Daemons -Requires: zarafa(client) = %{version}-%{release} Requires: zarafa(common) = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(preun): /sbin/service @@ -344,14 +371,15 @@ Provides: zarafa(monitor) = %{version}-%{release} Provides: zarafa(config::monitor) = %{version}-%{release} %description monitor -The monitor checks user mailbox sizes. When a quotum is reached -the monitor sends a quota notification email. +The zarafa-monitor package includes the Zarafa Monitoring service which +is responsible for checking the users store (mailbox) size, and sending +them (and administrators) a warning e-mail when limits are exceeded. ## -## Zarafa Backend Server +## Zarafa Server service ## %package server -Summary: Zarafa Backend Server +Summary: The main Zarafa Server service Group: System Environment/Daemons Requires: zarafa(common) = %{version}-%{release} Requires(post): /sbin/chkconfig @@ -363,15 +391,17 @@ Provides: zarafa(config) = %{version}-%{release} Provides: zarafa(config::server) = %{version}-%{release} %description server -The Zarafa groupware backend server +The zarafa-server package includes the main Zarafa Server and Storage +process. It contacts a database server and provides services to Zarafa +clients. The user base can be either retrieved from an external source +or can be setup with a separate list of users. ## -## Zarafa Spooler Service +## Zarafa Spooler service ## %package spooler -Summary: Zarafa Spooler Service +Summary: The Zarafa Spooler service Group: System Environment/Daemons -Requires: zarafa(client) = %{version}-%{release} Requires: zarafa(common) = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(preun): /sbin/service @@ -381,80 +411,130 @@ Provides: zarafa(spooler) = %{version}-%{release} Provides: zarafa(config::spooler) = %{version}-%{release} %description spooler -The spooler sends all pending Zarafa e-mail to the recipients, -from the Outbox of a user/all users. +The zarafa-spooler package includes the Zarafa Spooler service which is +responsible for converting the Zarafa e-mails from outboxes to Internet +Mail and send it using the configured SMTP server to the recipients. ## ## Zarafa Utilities ## %package utils -Summary: Zarafa Utilities +Summary: Zarafa Utilities for administration and management Group: Applications/System -Requires: zarafa(client) = %{version}-%{release} Requires: zarafa(common) = %{version}-%{release} Provides: zarafa(utils) = %{version}-%{release} %description utils -Administration utilities for the Zarafa Groupware environment -including reporting and password management. +The zarafa-utils package includes various administration and management +utilities for the Zarafa Open Source Collaboration environment including +reporting, user and password management. ## -## MAPI System Libraries +## Zarafa Webaccess +## +%package webaccess +Summary: Zarafa Webaccess featuring a 'Look & Feel' similar to Outlook +Group: Applications/Productivity +Requires: httpd +Requires: php >= 4.3 +Requires: php(mapi) = %{version}-%{release} +%if 0%{?rhel}%{?fedora} > 5 +BuildArch: noarch +%endif + +%description webaccess +Zarafa Webaccess features the familiar Outlook 'Look & Feel' interface +and you can keep using the features in Outlook that have always allowed +you to work efficiently. View your e-mail, calendar and contacts via a +web browser. And opening your colleagues calendar or sending a meeting +request is only a piece of cake. The Zarafa Webaccess is using the ajax +technology to give a more interactive feeling to the users. + +## +## MAPI library ## %package -n libmapi -Summary: Mapi libraries by Zarafa +Summary: MAPI implementation and library by Zarafa Group: System Environment/Libraries Requires: zarafa(client) = %{version}-%{release} Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description -n libmapi -MAPI libraries by Zarafa. +The libmapi package provides the Open Source MAPI (Messaging Application +Programming Interface) implementation by Zarafa. The MAPI is a messaging +architecture and a Component Object Model based API for Microsoft Windows +which allows control over the messaging system on the client computer, +creation and management of messages, management of the client mailbox, +service providers, etc. This MAPI implementation by Zarafa is also known +as MAPI4Linux. ## -## MAPI Perl extension +## Perl MAPI extension ## -%package -n perl-libmapi -Summary: Perl Mapi extension libraries by Zarafa -Group: System Environment/Libraries -Requires: perl +%package -n perl-MAPI +Summary: The Perl MAPI extension by Zarafa +Group: Development/Libraries +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Provides: perl-libmapi = %{version}-%{release} +Obsoletes: perl-libmapi < 6.40.0-1 -%description -n perl-libmapi -Perl MAPI extension libraries by Zarafa. +%description -n perl-MAPI +The perl-MAPI package contains the Perl MAPI extension to provide access +to Microsoft MAPI functions while using Perl. ## -## MAPI PHP Extension +## PHP MAPI extension ## %package -n php-mapi -Summary: A PHP Mapi client by Zarafa -Group: Applications/Communications +Summary: The PHP MAPI extension by Zarafa +Group: Development/Languages # Bug: Without mod_ssl, reloading httpd causes core dump Requires: mod_ssl +%if 0%{?rhel}%{?fedora} > 4 +%if 0%{?php_zend_api} +Requires: php(zend-abi) = %{php_zend_api}, php(api) = %{php_core_api} +%else +Requires: php-api = %{php_apiver} +%endif +%else Requires: php >= 4.3 +%endif Provides: php(mapi) = %{version}-%{release} %description -n php-mapi -PHP MAPI extension by Zarafa to enable MAPI communication in PHP. +The php-mapi package contains the PHP MAPI extension to provide access to +Microsoft MAPI functions while using PHP. Although not all MAPI functions +and interfaces are supported so far, most functions have a PHP counterpart +in this extension. Using this PHP MAPI extension, developers can create +e.g. webbased e-mail and calendaring systems and interfaces with existing +PHP projects, using the MAPI functions like a normal MAPI program. %prep %setup -q %patch0 -p1 -b .package -%patch1 -p1 -b .perl -%patch2 -p1 -b .symbol -%patch3 -p1 -b .chmod -#%%patch10 -p5 -b .brodowski +%patch1 -p1 -b .undefined-symbol +%patch2 -p1 -b .openssl +%patch3 -p1 -b .krb5 +%patch4 -p1 -b .clucene # Needed to get rid of rpath libtoolize --force autoreconf --force --install %build -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -g -ggdb" -export CFLAGS +export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -g -ggdb" %configure \ --with-userscript-prefix=%{_sysconfdir}/%{name}/userscripts \ --with-quotatemplate-prefix=%{_sysconfdir}/%{name}/quotamail \ -%if 0%{?rhel} > 0 + --with-indexerscripts-prefix=%{_datadir}/%{name}/indexerscripts \ +%if %{with_clucene} + --with-clucene-lib-prefix=%{_libdir} \ + --with-clucene-include-prefix=%{_includedir} \ +%else + --with-clucene-lib-prefix= \ +%endif +%if 0%{?rhel}%{?fedora} < 6 --enable-release \ %endif --disable-static \ @@ -465,56 +545,52 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make \ -%if 0%{?rhel} > 0 +%if 0%{?rhel}%{?fedora} < 6 docdir=%{_datadir}/doc/%{name}/ \ datarootdir=%{_datadir} \ %endif DESTDIR=$RPM_BUILD_ROOT \ INSTALL='install -p' \ - install + install \ + install-ajax-webaccess # Nuke all overlefts from licensed, managed or other proprietary items -rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/report-ca +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/{license,licensed.cfg,report-ca} rm -f $RPM_BUILD_ROOT%{_mandir}/man?/zarafa-{backup,restore,report,ldapms.cfg,licensed{,.cfg}}.* # Move all the initscripts to their appropriate place and # ensure that all services are off by default at boot time +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/init.d/ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/ -for service in server spooler dagent gateway monitor ical; do - if [ -f $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/%{name}-$service.init.fc ]; then - sed -e 's@345@-@' $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/%{name}-$service.init.fc > \ +for service in dagent gateway ical indexer monitor server spooler; do + if [ -f installer/linux/%{name}-$service.init.rhel ]; then + sed -e 's@345@-@' installer/linux/%{name}-$service.init.rhel > \ $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}-$service chmod 755 $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}-$service - touch -c -r $RPM_BUILD_ROOT{%{_datadir}/doc/%{name}/%{name}-$service.init.fc,%{_sysconfdir}/rc.d/init.d/%{name}-$service} + touch -c -r installer/linux/%{name}-$service.init.rhel $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/%{name}-$service fi done # Move the configuration files to their correct place and handle # /usr/lib vs. /usr/lib64 for all architectures correct and set # run_as_user, run_as_group and local_admin_users values correct -for config in $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/*.cfg; do +for config in $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/example-config/*.cfg; do config=$(basename $config) - if [ -f $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/$config ]; then + if [ -f $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/example-config/$config ]; then sed -e 's@\(run_as_\(user\|group\)[[:space:]]*=\).*@\1 %{name}@' -e 's@/usr/lib/zarafa@%{_libdir}/%{name}@' \ -e 's@\(local_admin_users[[:space:]]*=[[:space:]]*root.*\)@\1 %{name}@' \ - $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/$config > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$config + $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/example-config/$config > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$config chmod 640 $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$config - touch -c -r $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/$config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$config + touch -c -r $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/example-config/$config $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/$config fi done -# Move the logrotate configuration file to it's correct place -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ -sed -e 's@\(}\)@ create 0644 %{name} %{name}\n\1@' -e '1,6d' \ - $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/%{name}.logrotate > $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} -touch -c -r $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/%{name}.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} - -# Install the PHP module configuration file appropriate -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/php.d/ -install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/php.d/%{name}.ini - -# Create missing userscript directories for packaging them -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/userscripts/{create,delete}{user,group,company}.d/ +# Move the logrotate configuration file to its correct place +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/* +for service in dagent gateway ical indexer licensed monitor server spooler; do + sed -e "s@SERVICE@$service@" %{SOURCE2} >> $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} +done +touch -c -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name} # Move the userscripts to their correct place and symlink them mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/userscripts/ @@ -526,18 +602,56 @@ done # Create the data directory and install some files into mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/ -install -p -m 755 installer/linux/db-{calc-storesize,convert-attachments-to-files} $RPM_BUILD_ROOT%{_datadir}/%{name}/ -install -p -m 755 installer/linux/ssl-certificates.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/ +install -p -m 644 installer/linux/db-{calc-storesize,convert-attachments-to-files} $RPM_BUILD_ROOT%{_datadir}/%{name}/ +install -p -m 644 installer/linux/ssl-certificates.sh $RPM_BUILD_ROOT%{_datadir}/%{name}/ +%if %{with_ldap} +install -p -m 644 installer/linux/{db-upgrade-objectsid-to-objectguid,ldap-switch-sendas}.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/ install -p -m 644 installer/ldap/%{name}.schema $RPM_BUILD_ROOT%{_datadir}/%{name}/ +%else +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ldap.{active-directory,openldap,propmap}.cfg +rm -f $RPM_BUILD_ROOT%{_mandir}/man5/%{name}-ldap.cfg.5* +%endif # Create the default log and lib directory for packaging mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/{log,lib}/%{name}/ # Remove all libtool .la files to avoid packaging of them -rm -f $RPM_BUILD_ROOT%{_libdir}/{,php/modules,%{name}}/*.la +rm -f $RPM_BUILD_ROOT{%{_libdir}/{,php/modules,php4,%{name}},%{perl_vendorarch}/auto/MAPI}/*.la # Remove files that are anyway in %doc or %{_datadir}/%{name}/ -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}/ +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}{,-indexer}/ + +# Remove unwanted/unused files that shouldn't exist anyway... +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}-indexer + +# Move Indexer/CLucene related files to its correct places +%if %{with_clucene} +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/indexerscripts/ +mv -f $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/%{name}/indexerscripts/attachments_parser.db +for helper in attachments_parser xmltotext.xslt zmktemp; do + ln -s ../../..%{_datadir}/%{name}/indexerscripts/$helper $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/indexerscripts/$helper +done +%else +rm -f $RPM_BUILD_ROOT{%{_sysconfdir}/{rc.d/init.d,sysconfig},%{_mandir}/man?}/%{name}-indexer* +rm -rf $RPM_BUILD_ROOT{%{_sysconfdir}/%{name}/indexer.cfg,%{_datadir}/%{name}/indexerscripts/} +%endif + +# Move the webaccess configuration file to its correct place +mv -f $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/webaccess{-ajax,} +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}-webaccess/config.php +ln -sf ../../..%{_sysconfdir}/%{name}/webaccess/config.php $RPM_BUILD_ROOT%{_datadir}/%{name}-webaccess/config.php + +# Install the apache configuration file for webaccess +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ +install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}-webaccess.conf + +# Move the webaccess plugins directory to its correct place +rm -rf $RPM_BUILD_ROOT{%{_datadir},%{_localstatedir}/lib}/%{name}-webaccess/plugins +mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}-webaccess/plugins/ + +# Remove unwanted language connectors and webaccess files +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}-webaccess/client/widgets/fckeditor/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.{cfm,pl} +rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}-webaccess/{.htaccess,%{name}-webaccess.conf} %find_lang %{name} @@ -554,15 +668,22 @@ exit 0 # Ensure correct log file ownership after upgrade from official packages chown %{name}:%{name} %{_localstatedir}/log/%{name}/dagent.* > /dev/null 2>&1 || : +%post gateway +[ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-gateway +# Ensure correct log file ownership after upgrade from official packages +chown %{name}:%{name} %{_localstatedir}/log/%{name}/gateway.* > /dev/null 2>&1 || : + %post ical [ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-ical # Ensure correct log file ownership after upgrade from official packages chown %{name}:%{name} %{_localstatedir}/log/%{name}/ical.* > /dev/null 2>&1 || : -%post gateway -[ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-gateway +%if %{with_clucene} +%post indexer +[ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-indexer # Ensure correct log file ownership after upgrade from official packages -chown %{name}:%{name} %{_localstatedir}/log/%{name}/gateway.* > /dev/null 2>&1 || : +chown %{name}:%{name} %{_localstatedir}/log/%{name}/indexer.* > /dev/null 2>&1 || : +%endif %post monitor [ $1 -eq 1 ] && /sbin/chkconfig --add %{name}-monitor @@ -587,17 +708,25 @@ if [ $1 -eq 0 ]; then /sbin/chkconfig --del %{name}-dagent fi +%preun gateway +if [ $1 -eq 0 ]; then + /sbin/service %{name}-gateway stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name}-gateway +fi + %preun ical if [ $1 -eq 0 ]; then /sbin/service %{name}-ical stop > /dev/null 2>&1 || : /sbin/chkconfig --del %{name}-ical fi -%preun gateway +%if %{with_clucene} +%preun indexer if [ $1 -eq 0 ]; then - /sbin/service %{name}-gateway stop > /dev/null 2>&1 || : - /sbin/chkconfig --del %{name}-gateway + /sbin/service %{name}-indexer stop > /dev/null 2>&1 || : + /sbin/chkconfig --del %{name}-indexer fi +%endif %preun monitor if [ $1 -eq 0 ]; then @@ -622,15 +751,22 @@ if [ $1 -ne 0 ]; then /sbin/service %{name}-dagent condrestart > /dev/null 2>&1 || : fi +%postun gateway +if [ $1 -ne 0 ]; then + /sbin/service %{name}-gateway condrestart > /dev/null 2>&1 || : +fi + %postun ical if [ $1 -ne 0 ]; then /sbin/service %{name}-ical condrestart > /dev/null 2>&1 || : fi -%postun gateway +%if %{with_clucene} +%postun indexer if [ $1 -ne 0 ]; then - /sbin/service %{name}-gateway condrestart > /dev/null 2>&1 || : + /sbin/service %{name}-indexer condrestart > /dev/null 2>&1 || : fi +%endif %postun monitor if [ $1 -ne 0 ]; then @@ -664,10 +800,9 @@ fi %files common %defattr(-,root,root,-) -%doc installer/licenseagreement/AGPL-3 doc/performance-tuning.txt %dir %{_sysconfdir}/%{name}/ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} -%dir %{_libdir}/%{name}/ +%config(noreplace) %{_sysconfdir}/sysconfig/%{name} %{_mandir}/man1/%{name}.1* %dir %{_datadir}/%{name}/ %dir %attr(0755,%{name},%{name}) %{_localstatedir}/lib/%{name}/ @@ -679,6 +814,7 @@ fi %{_bindir}/%{name}-autorespond %{_bindir}/%{name}-dagent %config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/dagent.cfg +%config(noreplace) %{_sysconfdir}/%{name}/autorespond %{_sysconfdir}/rc.d/init.d/%{name}-dagent %{_mandir}/man1/%{name}-dagent.1* %{_mandir}/man5/%{name}-dagent.cfg.5* @@ -689,14 +825,16 @@ fi %{_libdir}/libicalmapi.so %{_libdir}/libinetmapi.so %{_libdir}/libmapi.so -%{_libdir}/libperlmapi.so %{_libdir}/libcommon_mapi.a %{_libdir}/libcommon_ssl.a %{_libdir}/libcommon_util.a %{_libdir}/libfreebusy.a +%{_libdir}/libzarafasync.a %{_includedir}/icalmapi/ %{_includedir}/inetmapi/ %{_includedir}/mapi4linux/ +%{_includedir}/libfreebusy/ +%{_includedir}/libzarafasync/ %{_includedir}/%{name}/ %{_libdir}/pkgconfig/%{name}.pc @@ -718,6 +856,26 @@ fi %{_mandir}/man1/%{name}-ical.1* %{_mandir}/man5/%{name}-ical.cfg.5* +%if %{with_clucene} +%files indexer +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 +%{_bindir}/%{name}-indexer +%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/indexer.cfg +%{_sysconfdir}/rc.d/init.d/%{name}-indexer +%dir %{_sysconfdir}/%{name}/indexerscripts/ +%config(noreplace) %{_sysconfdir}/%{name}/indexerscripts/attachments_parser.db +%{_sysconfdir}/%{name}/indexerscripts/attachments_parser +%{_sysconfdir}/%{name}/indexerscripts/xmltotext.xslt +%{_sysconfdir}/%{name}/indexerscripts/zmktemp +%dir %{_datadir}/%{name}/indexerscripts/ +%{_datadir}/%{name}/indexerscripts/attachments_parser +%{_datadir}/%{name}/indexerscripts/xmltotext.xslt +%{_datadir}/%{name}/indexerscripts/zmktemp +%{_mandir}/man1/%{name}-indexer.1* +%{_mandir}/man5/%{name}-indexer.cfg.5* +%endif + %files monitor %defattr(-,root,root,-) %doc installer/licenseagreement/AGPL-3 @@ -758,6 +916,7 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/userscripts/createcompany.d/00createpublic %config(noreplace) %{_sysconfdir}/%{name}/userscripts/createuser.d/00createstore %{_datadir}/%{name}/userscripts/ +%dir %{_libdir}/%{name}/ %{_libdir}/%{name}/dbplugin.so %{_libdir}/%{name}/unixplugin.so %{_mandir}/man1/%{name}-server.1* @@ -765,8 +924,11 @@ fi %{_mandir}/man5/%{name}-unix.cfg.5* %if %{with_ldap} %{_datadir}/%{name}/%{name}.schema +%{_datadir}/%{name}/db-upgrade-objectsid-to-objectguid.pl +%{_datadir}/%{name}/ldap-switch-sendas.pl %config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/ldap.active-directory.cfg %config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/ldap.openldap.cfg +%config(noreplace) %attr(0640,%{name},%{name}) %{_sysconfdir}/%{name}/ldap.propmap.cfg %{_libdir}/%{name}/ldapplugin.so %{_mandir}/man5/%{name}-ldap.cfg.5* %endif @@ -784,6 +946,7 @@ fi %defattr(-,root,root,-) %doc installer/licenseagreement/AGPL-3 %{_bindir}/%{name}-admin +%{_bindir}/%{name}-cfgchecker %{_bindir}/%{name}-fsck %{_bindir}/%{name}-passwd %{_bindir}/%{name}-stats @@ -791,10 +954,22 @@ fi %{_datadir}/%{name}/db-convert-attachments-to-files %{_datadir}/%{name}/ssl-certificates.sh %{_mandir}/man1/%{name}-admin.1* +%{_mandir}/man1/%{name}-cfgchecker.1* %{_mandir}/man1/%{name}-fsck.1* %{_mandir}/man1/%{name}-passwd.1* %{_mandir}/man1/%{name}-stats.1* +%files webaccess +%defattr(-,root,root,-) +%doc installer/licenseagreement/AGPL-3 +%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}-webaccess.conf +%dir %{_sysconfdir}/%{name}/ +%dir %{_sysconfdir}/%{name}/webaccess/ +%config(noreplace) %{_sysconfdir}/%{name}/webaccess/config.php +%{_datadir}/%{name}-webaccess/ +%dir %{_localstatedir}/lib/%{name}-webaccess/ +%attr(-,apache,apache) %dir %{_localstatedir}/lib/%{name}-webaccess/tmp/ + %files -n libmapi %defattr(-,root,root,-) %doc installer/licenseagreement/AGPL-3 @@ -802,10 +977,11 @@ fi %{_libdir}/libinetmapi.so.* %{_libdir}/libmapi.so.* -%files -n perl-libmapi +%files -n perl-MAPI %defattr(-,root,root,-) %doc installer/licenseagreement/AGPL-3 -%{_libdir}/libperlmapi.so.* +%{perl_vendorarch}/MAPI.pm +%{perl_vendorarch}/auto/MAPI/ %files -n php-mapi %defattr(-,root,root,-) @@ -819,6 +995,9 @@ fi %endif %changelog +* Thu Jun 10 2010 Robert Scheck 6.40.0-1 +- Upgrade to 6.40.0 (#564135, #565252, #600993) + * Sat May 01 2010 Robert Scheck 6.30.14-1 - Upgrade to 6.30.14 From 7447fdfb4bc05dffc7da234f5939ee8526a7b601 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Thu, 10 Jun 2010 22:12:35 +0000 Subject: [PATCH 09/11] Added patch to ensure -pthread for -lclucene configure test --- zarafa.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/zarafa.spec b/zarafa.spec index d83acd9..a21fb31 100644 --- a/zarafa.spec +++ b/zarafa.spec @@ -116,7 +116,7 @@ # %define beta_or_rc 0 -%define actual_release 1 +%define actual_release 2 %define svnrevision 20653 %define with_clucene 1 %define with_ldap 1 @@ -146,11 +146,12 @@ Source2: %{name}.logrotate Source3: %{name}-webaccess.conf Patch0: zarafa-6.40.0-package.patch -# Patch 1, 2, 3 and 4 were sent to upstream +# Patch 1, 2, 3, 4 and 5 were sent to upstream Patch1: zarafa-6.40.0-undefined-symbol.patch Patch2: zarafa-6.40.0-openssl.patch Patch3: zarafa-6.40.0-krb5.patch Patch4: zarafa-6.40.0-clucene.patch +Patch5: zarafa-6.40.0-pthread.patch BuildRequires: bison BuildRequires: gcc-c++ @@ -517,6 +518,7 @@ PHP projects, using the MAPI functions like a normal MAPI program. %patch2 -p1 -b .openssl %patch3 -p1 -b .krb5 %patch4 -p1 -b .clucene +%patch5 -p1 -b .pthread # Needed to get rid of rpath libtoolize --force @@ -995,6 +997,9 @@ fi %endif %changelog +* Fri Jun 11 2010 Robert Scheck 6.40.0-2 +- Added patch to ensure -pthread for -lclucene configure test + * Thu Jun 10 2010 Robert Scheck 6.40.0-1 - Upgrade to 6.40.0 (#564135, #565252, #600993) From 25cd23f3df8c43ff011cfa4d5369e2eb91062d52 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Thu, 10 Jun 2010 22:15:21 +0000 Subject: [PATCH 10/11] Really add & commit zarafa-6.40.0-pthread.patch --- zarafa-6.40.0-pthread.patch | 59 +++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 zarafa-6.40.0-pthread.patch diff --git a/zarafa-6.40.0-pthread.patch b/zarafa-6.40.0-pthread.patch new file mode 100644 index 0000000..4908fc5 --- /dev/null +++ b/zarafa-6.40.0-pthread.patch @@ -0,0 +1,59 @@ +Patch by Robert Scheck for zarafa >= 6.40.0, which adds +the missing -pthread linking to $CXXFLAGS for the later compile check whether open +is in -lclucene/libclucene.a. Unfortunately, Fedora was shipping CLucene 0.9.21 so +far; today the update to the important 0.9.21b happened. If -pthread is not passed +to $CXXFLAGS, the g++ compiling check fails simply with "undefined reference to +`pthread_mutexattr_settype'" and "undefined reference to `pthread_mutexattr_init'" +on Fedora >= 12 and RHEL >= 6. + +Beside of that, the -pthread check must be moved before the CLucene check or the +CLucene check must be moved post -pthread. This patch is completing the previously +suggested and applied zarafa-6.40.0-clucene.patch. + +--- zarafa-6.40.0/configure.ac 2010-06-10 23:12:32.000000000 +0200 ++++ zarafa-6.40.0/configure.ac.pthread 2010-06-10 23:54:21.000000000 +0200 +@@ -384,6 +384,14 @@ + AC_SUBST(ICAL_LIBS) + CFLAGS=$cflags_keep + ++# Everything links with pthread ++libs_keep=$LIBS ++# check lib, but do not set in link list ++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" ++ + # Check for CLucene availability + AC_LANG_PUSH(C++) + AC_ARG_WITH(clucene-lib-prefix, +@@ -397,12 +405,12 @@ + cxxcpp_keep=$CXXCPP + if test "x$CLUCENE_LIB_PREFIX" != "x"; then + CFLAGS="$CFLAGS -I$CLUCENE_LIB_PREFIX" +- CXXFLAGS="$CFLAGS -I$CLUCENE_LIB_PREFIX" ++ CXXFLAGS="$CFLAGS $CXXFLAGS -I$CLUCENE_LIB_PREFIX" + CXXCPP="$CXXCPP -I$CLUCENE_LIB_PREFIX" + fi + if test "x$CLUCENE_INCLUDE_PREFIX" != "x"; then + CFLAGS="$CFLAGS -I$CLUCENE_INCLUDE_PREFIX" +- CXXFLAGS="$CFLAGS -I$CLUCENE_INCLUDE_PREFIX" ++ CXXFLAGS="$CFLAGS $CXXFLAGS -I$CLUCENE_INCLUDE_PREFIX" + CXXCPP="$CXXCPP -I$CLUCENE_INCLUDE_PREFIX" + fi + if test -e "${CLUCENE_LIB_PREFIX}/libclucene.a"; then +@@ -546,14 +554,6 @@ + LIBS=$libs_keep + AC_SUBST(CRYPT_LIBS) + +-# Everything links with pthread +-libs_keep=$LIBS +-# check lib, but do not set in link list +-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" +- + # Only specific links with uuid and dl, clients only with crypto and ssl for ssl connections + libs_keep=$LIBS + AC_CHECK_LIB([crypto], [BIO_accept],, AC_MSG_ERROR([required library libcrypto missing or unusable])) From 0a1352a10c6e6118311ebda819ad148c3686cc7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:27:58 +0000 Subject: [PATCH 11/11] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index e73f362..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zarafa -# $Id$ -NAME := zarafa -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12