thomas: server/php-kolab/Kolab_Filter issue3192.patch, NONE, 1.1 issue3441.patch, NONE, 1.1 ChangeLog, 1.28, 1.29 Kolab_Filter.spec, 1.18, 1.19 Makefile, 1.7, 1.8
cvs at kolab.org
cvs at kolab.org
Tue Mar 3 17:25:09 CET 2009
Author: thomas
Update of /kolabrepository/server/php-kolab/Kolab_Filter
In directory doto:/tmp/cvs-serv13048/php-kolab/Kolab_Filter
Modified Files:
ChangeLog Kolab_Filter.spec Makefile
Added Files:
issue3192.patch issue3441.patch
Log Message:
Add patches for kolab/issue3192 and kolab/issue3441:
kolab/issue3192 (Forwarding an invitation with Outlook failed)
kolab/issue3441 (Resources with policy "always accept" do not work if
domain != kolabhost)
--- NEW FILE: issue3192.patch ---
diff -urN Kolab_Filter-0.1.4.orig/lib/Horde/Kolab/Filter/Outlook.php Kolab_Filter-0.1.4/lib/Horde/Kolab/Filter/Outlook.php
--- Kolab_Filter-0.1.4.orig/lib/Horde/Kolab/Filter/Outlook.php 2009-02-24 12:20:50.000000000 +0100
+++ Kolab_Filter-0.1.4/lib/Horde/Kolab/Filter/Outlook.php 2009-03-03 16:44:54.365444005 +0100
@@ -104,7 +104,8 @@
$iCal->parsevCalendar($icaltxt);
$vevent =& $iCal->findComponent('VEVENT');
if ($vevent) {
- if (!$vevent->organizerName()) {
+ $organizer = $vevent->getAttribute('ORGANIZER', true);
+ if (is_a($organizer, 'PEAR_Error')) {
$adrs = imap_rfc822_parse_adrlist($from, $email_domain);
if (count($adrs) > 0) {
$org_email = 'mailto:'.$adrs[0]->mailbox.'@'.$adrs[0]->host;
--- NEW FILE: issue3441.patch ---
diff -urN Kolab_Filter-0.1.4.orig/lib/Horde/Kolab/Filter/Base.php Kolab_Filter-0.1.4/lib/Horde/Kolab/Filter/Base.php
--- Kolab_Filter-0.1.4.orig/lib/Horde/Kolab/Filter/Base.php 2009-02-24 12:20:50.000000000 +0100
+++ Kolab_Filter-0.1.4/lib/Horde/Kolab/Filter/Base.php 2009-03-03 16:51:34.667295919 +0100
@@ -253,7 +253,7 @@
/* This is used as the default domain for unqualified adresses */
global $_SERVER;
if (!array_key_exists('SERVER_NAME', $_SERVER)) {
- $_SERVER['SERVER_NAME'] = $conf['kolab']['filter']['email_domain'];
+ $_SERVER['SERVER_NAME'] = $conf['kolab']['imap']['server'];
}
if (!array_key_exists('REMOTE_ADDR', $_SERVER)) {
Index: ChangeLog
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- ChangeLog 26 Feb 2009 16:56:51 -0000 1.28
+++ ChangeLog 3 Mar 2009 16:25:07 -0000 1.29
@@ -1,3 +1,10 @@
+2009-03-03 Thomas Arendsen Hein <thomas at intevation.de>
+
+ * issue3192.patch, issue3441.patch, Kolab_Filter.spec, Makefile: Add
+ patches for kolab/issue3192 (Forwarding an invitation with Outlook
+ failed) and kolab/issue3441 (Resources with policy "always accept" do
+ not work if domain != kolabhost) and bump release number.
+
2009-02-26 Gunnar Wrobel <p at rdus.de>
* issue3435.patch: Fix kolab/issue3435 (Delivery of invitations
Index: Kolab_Filter.spec
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Kolab_Filter.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Kolab_Filter.spec 26 Feb 2009 16:56:51 -0000 1.18
+++ Kolab_Filter.spec 3 Mar 2009 16:25:07 -0000 1.19
@@ -1,7 +1,7 @@
# Variables
%define V_package Kolab_Filter
%define V_version 0.1.4
-%define V_release 20090226
+%define V_release 20090303
# Package Information
Name: %{V_package}
@@ -20,6 +20,8 @@
# List of patches
Patch0: issue3435.patch
+Patch1: issue3192.patch
+Patch2: issue3441.patch
# Build Info
Prefix: %{l_prefix}
@@ -55,6 +57,8 @@
%setup -n %{V_package}-%{V_version}
%patch -p3 -P 0
+ %patch -p1 -P 1
+ %patch -p1 -P 2
cp %{S:1} .
%build
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Kolab_Filter/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile 26 Feb 2009 16:29:11 -0000 1.7
+++ Makefile 3 Mar 2009 16:25:07 -0000 1.8
@@ -21,7 +21,7 @@
SOURCE_URL=http://pear.horde.org/get
SOURCE_0=$(PACKAGE)-$(VERSION).tgz
-EXTRA=ChangeLog issue3435.patch package.xml
+EXTRA=ChangeLog issue3435.patch issue3192.patch issue3441.patch package.xml
.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
More information about the commits
mailing list