Hello community,
here is the log from the commit of package horde3-turba for openSUSE:Factory
checked in at Mon Aug 15 11:48:39 CEST 2011.
--------
--- horde3-turba/horde3-turba.changes 2011-01-31 13:49:33.000000000 +0100
+++ /mounts/work_src_done/STABLE/horde3-turba/horde3-turba.changes
2011-08-13 23:00:57.000000000 +0200
@@ -1,0 +2,20 @@
+Sat Aug 13 21:01:19 UTC 2011 - l...@b1-systems.de
+
+- minor update for 2.3.6
+- [mjr] Fix issue that caused erroneous file listings for objects in sources
+ without a __uid value.
+- [jan] Allow to export photo/logo fields to vCard without MIME type.
+- [jan] Support X-EPOCSECONDNAME fields of Nokia phones.
+- [jan] Add upgrade scripts for next-generation SQL share driver.
+- [jan] Fix splitting up names when exporting to N properties of vCards.
+- [jan] Only set the encoding parameter for binary data in vCards, if data is
not
+ empty (Bug #9413).
+- [jan] Fix searching for fields matching an email address if using 'emails'
+ attribute instead of 'email' (Bug #9472).
+- [jan] Use personal address books first if determining the default one
(Valentin
+ Vidic, Request #9367).
+- [jan] Use name format preference not only for paging, but for sorting too
+ (Request #8806).
+- [jan] Fix photo corruption when exporting to vCard 3.0 (Bug #9100).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
turba-h3-2.3.5-php5_exec.patch
turba-h3-2.3.5.tar.bz2
New:
----
HK-GW-turba_2.2_RC1-Fix_editing_contacts.patch
HK-GW-turba_2.2_RC1-Fix_share_id_change.patch
HK-GW-turba_2.2_RC1-Ldap_read_only_fix.patch
turba-h3-2.3.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ horde3-turba.spec ++++++
--- /var/tmp/diff_new_pack.UCotRt/_old 2011-08-15 11:48:14.000000000 +0200
+++ /var/tmp/diff_new_pack.UCotRt/_new 2011-08-15 11:48:14.000000000 +0200
@@ -19,22 +19,20 @@
%define _hordedir %(%{_sbindir}/apxs2 -q datadir)/htdocs/horde
%define _turbadir %{_hordedir}/turba
-%define _pversion 2.3.5
Name: horde3-turba
-Version: 2.3.5
-Release: 2
+Version: 2.3.6
+Release: 1
Summary: The Horde Groupware Address Book
License: Horde Apache-like License
Group: Productivity/Networking/Other
Url: http://www.horde.org/turba
-Source0: turba-h3-%{_pversion}.tar.bz2
+Source0: ftp://ftp.horde.org/pub/turba/turba-h3-%{version}.tar.gz
Source1: turba-h3-2.2-alpha-sources.php.kolab
-Patch0: turba-h3-2.3.5-php5_exec.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: turba = %{version}
-Obsoletes: turba <= 2.3.4
+Obsoletes: turba < %{version}
Requires: horde3 >= 3.3.0
Requires: php5-pear-MDB2
@@ -60,9 +58,8 @@
Michael J. Rubinsky
%prep
-%setup -qn turba-h3-%{_pversion}
+%setup -qn turba-h3-%{version}
%__cp %{S:1} ./config/sources.php.kolab
-%patch0
%build
pushd config/
@@ -135,7 +132,6 @@
%{_turbadir}/addressbooks
%{_turbadir}/js
%{_turbadir}/lib
-#%{_turbadir}/locale
%{_turbadir}/po
%{_turbadir}/scripts
%{_turbadir}/templates
++++++ HK-GW-turba_2.2_RC1-Fix_editing_contacts.patch ++++++
Fixes editing contacts.
diff -r e2bcaaed2d6b turba/lib/Driver/share.php
--- a/turba/lib/Driver/share.php Wed Nov 28 17:23:14 2007 +0100
+++ b/turba/lib/Driver/share.php Wed Nov 28 17:24:17 2007 +0100
@@ -58,7 +58,7 @@ class Turba_Driver_share extends Turba_D
*/
function getName()
{
- $share_parts = explode(':', $this->_share->getName());
+ $share_parts = explode(':', $this->_share->getId());
return array_pop($share_parts);
}
++++++ HK-GW-turba_2.2_RC1-Fix_share_id_change.patch ++++++
This fixes a problem with the way the Kolab share driver handles ids.
diff -r 0ffb2574c923 turba/lib/Turba.php
--- a/turba/lib/Turba.php Wed Nov 28 17:04:21 2007 +0100
+++ b/turba/lib/Turba.php Wed Nov 28 17:23:14 2007 +0100
@@ -439,7 +439,7 @@ class Turba {
$source_config = $sources[$source];
$source_config['params']['share'] = &$share;
- $sources[$sourceKey] = $source_config;
+ $sources[$share->getId()] = $source_config;
} else {
$notification->push($driver, 'horde.error');
}
@@ -564,7 +564,7 @@ class Turba {
/* Add the new addressbook to the user's list of visible
* address books. */
$prefs = explode("\n", $GLOBALS['prefs']->getValue('addressbooks'));
- if (array_search($share_id, $prefs) === false) {
+ if (array_search($share->getId(), $prefs) === false) {
$GLOBALS['prefs']->setValue('addressbooks',
$GLOBALS['prefs']->getValue('addressbooks') . "\n" . $share_id);
}
return $share;
++++++ HK-GW-turba_2.2_RC1-Ldap_read_only_fix.patch ++++++
This is a temporary fix to mark the ldap addressbook as read-only. This should
be solved with the Horde Perms package but this needs a new driver.
diff -r 449ef255c5ff turba/lib/Driver/ldap.php
--- a/turba/lib/Driver/ldap.php Wed Nov 28 17:24:17 2007 +0100
+++ b/turba/lib/Driver/ldap.php Wed Nov 28 17:26:17 2007 +0100
@@ -53,6 +53,9 @@ class Turba_Driver_ldap extends Turba_Dr
}
if (empty($params['deref'])) {
$params['deref'] = LDAP_DEREF_NEVER;
+ }
+ if (empty($params['read_only'])) {
+ $params['read_only'] = false;
}
parent::Turba_Driver($params);
@@ -749,4 +752,25 @@ class Turba_Driver_ldap extends Turba_Dr
return $dn;
}
+ /**
+ * Checks if the current user has the requested permission
+ * on this source.
+ *
+ * @param integer $perm The permission to check for.
+ *
+ * @return boolean true if user has permission, false otherwise.
+ */
+ function hasPermission($perm)
+ {
+ if ($this->_params['read_only'] === false) {
+ return parent::hasPermission($perm);
+ } else {
+ switch ($perm) {
+ case PERMS_EDIT: return false;
+ case PERMS_DELETE: return false;
+ default: return parent::hasPermission($perm);
+ }
+ }
+ }
+
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
