summaryrefslogtreecommitdiff
path: root/php-kolab/Kolab_Format
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2009-04-02 07:29:45 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2009-04-02 07:29:45 (GMT)
commit1c5ae64941644130177d102c12b3e3606b3af563 (patch)
treeba65b7eb1c03cf85dcea646f909cb877d1ffdc6a /php-kolab/Kolab_Format
parentcd791fc5fa79f4aabd54e237f7045feb57458682 (diff)
downloadserver-1c5ae64941644130177d102c12b3e3606b3af563.tar.gz
kolab/issue3525 (free/busy regeneration aborts for unparsable events)
Diffstat (limited to 'php-kolab/Kolab_Format')
-rw-r--r--php-kolab/Kolab_Format/ChangeLog5
-rw-r--r--php-kolab/Kolab_Format/Kolab_Format.spec15
-rw-r--r--php-kolab/Kolab_Format/issue3525.patch12
3 files changed, 29 insertions, 3 deletions
diff --git a/php-kolab/Kolab_Format/ChangeLog b/php-kolab/Kolab_Format/ChangeLog
index 66a9ab1..b8d61b3 100644
--- a/php-kolab/Kolab_Format/ChangeLog
+++ b/php-kolab/Kolab_Format/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-02 Gunnar Wrobel <p@rdus.de>
+
+ * Kolab_Format.spec: kolab/issue3525 (free/busy regeneration
+ aborts for unparsable events)
+
2008-12-12 Gunnar Wrobel <p@rdus.de>
* Kolab_Format.spec: Update to 1.0.0.
diff --git a/php-kolab/Kolab_Format/Kolab_Format.spec b/php-kolab/Kolab_Format/Kolab_Format.spec
index 5e2bf6b..a87f752 100644
--- a/php-kolab/Kolab_Format/Kolab_Format.spec
+++ b/php-kolab/Kolab_Format/Kolab_Format.spec
@@ -1,7 +1,8 @@
# Variables
%define V_package Kolab_Format
%define V_version 1.0.0
-%define V_release 20081212
+%define V_release 20090402
+%define V_sourceurl http://pear.horde.org/get
# Package Information
Name: %{V_package}
@@ -14,7 +15,11 @@ License: LGPL
Group: Development/Libraries
Distribution: OpenPKG
-Source: http://pear.horde.org/get/%{V_package}-%{V_version}.tgz
+# List of Sources
+Source: %{V_sourceurl}/%{V_package}-%{V_version}.tgz
+
+# List of patches
+Patch0: issue3525.patch
# Build Info
Prefix: %{l_prefix}
@@ -37,12 +42,16 @@ A package for reading/writing Kolab data formats.
%prep
%setup -n %{V_package}-%{V_version}
+ %patch -p3 -P 0
+
+ cat ../package.xml | sed -e 's/md5sum="[^"]*"//' > package.xml
+
%build
%install
env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M" \
PHP_PEAR_CACHE_DIR="/tmp/pear/cache" \
- %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT $RPM_SOURCE_DIR/%{V_package}-%{V_version}.tgz
+ %{l_prefix}/bin/pear install --offline --force --nodeps -P $RPM_BUILD_ROOT package.xml
rm -rf $RPM_BUILD_ROOT/%{l_prefix}/lib/php/{.filemap,.lock,.channels,.depdb,.depdblock}
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
diff --git a/php-kolab/Kolab_Format/issue3525.patch b/php-kolab/Kolab_Format/issue3525.patch
new file mode 100644
index 0000000..4e83fc5
--- /dev/null
+++ b/php-kolab/Kolab_Format/issue3525.patch
@@ -0,0 +1,12 @@
+diff --git a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php b/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php
+index 03a5318..0a9859e 100644
+--- a/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php
++++ b/framework/Kolab_Format/lib/Horde/Kolab/Format/XML.php
+@@ -416,6 +416,6 @@ class Horde_Kolab_Format_XML
+ function load(&$xmltext)
+ {
+ $noderoot = $this->_parseXml($xmltext);
+- if ($noderoot === false) {
++ if (empty($noderoot)) {
+ return false;
+ }