Kolab Groupware OBS

kolab-webadmin.spec Changed

@@ -35,7 +35,7 @@
 
 Name:           kolab-webadmin
 Version:        3.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Kolab Groupware Server Web Administration Interface
 License:        AGPLv3+
 Group:          Productivity/Office/Organizers
@@ -43,6 +43,8 @@
 
 Source0:        http://mirror.kolabsys.com/pub/releases/kolab-webadmin-%{version}.tar.gz
 
+Patch0001:      0001-Fix-typos-in-memcache-related-methods.patch
+
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -69,6 +71,8 @@
 %prep
 %setup -q 
 
+%patch0001 -p1
+
 for file in `find . -type f -name "*.enterprise"`; do
     if [ 0%{?kolab_enterprise} -gt 0 ]; then
         mv -v $file $(echo $file | sed -e 's/.enterprise$//g')
@@ -154,6 +158,9 @@
 %attr(0770,%{httpd_user},%{httpd_group}) %{_var}/log/%{name}
 
 %changelog
+* Thu Jan  9 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.1.4-2
+- Fix typos in memcached related methods
+
 * Tue Jan  7 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 3.1.4-1
 - New upstream release

0001-Fix-typos-in-memcache-related-methods.patch Added

@@ -0,0 +1,36 @@
+From 62f17678edda693f0d7cdd929911f118e5c6b0a5 Mon Sep 17 00:00:00 2001
+From: Aleksander Machniak <alec@alec.pl>
+Date: Wed, 8 Jan 2014 18:32:25 +0100
+Subject: [PATCH] Fix typos in memcache-related methods
+
+---
+ lib/Auth/LDAP.php | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php
+index 5850672..0075166 100644
+--- a/lib/Auth/LDAP.php
++++ b/lib/Auth/LDAP.php
+@@ -1622,7 +1622,7 @@ class LDAP extends Net_LDAP3 {
+     public function get_cache_data($key)
+     {
+         if ($cache = $this->get_cache()) {
+-            return $cache->get($ckey);
++            return $cache->get($key);
+         }
+     }
+ 
+@@ -1638,8 +1638,8 @@ class LDAP extends Net_LDAP3 {
+     public function set_cache_data($key, $data, $ttl = 3600)
+     {
+         if ($cache = $this->get_cache()) {
+-            if (!$cache->replace($ckey, $data, MEMCACHE_COMPRESSED, $ttl)) {
+-                return $cache->set($ckey, $data, MEMCACHE_COMPRESSED, $ttl);
++            if (!$cache->replace($key, $data, MEMCACHE_COMPRESSED, $ttl)) {
++                return $cache->set($key, $data, MEMCACHE_COMPRESSED, $ttl);
+             }
+             else {
+                 return true;
+-- 
+1.8.3.1
+

debian.changelog Changed

debian.series Changed

kolab-webadmin.dsc Changed

Changes of Revision 28