Hello community,
here is the log from the commit of package horde3-turba for openSUSE:Factory
checked in at Mon Jan 24 16:28:29 CET 2011.
--------
New Changes file:
--- /dev/null 2010-08-26 16:28:41.000000000 +0200
+++ /mounts/work_src_done/STABLE/horde3-turba/horde3-turba.changes 2010-12-09 12:07:27.000000000 +0100
@@ -0,0 +1,60 @@
+-------------------------------------------------------------------
+Wed Oct 13 15:16:25 UTC 2010 - lang@b1-systems.de
+
+- moved to external logfile
+- made build on SLE 11 & Friends
+
+-------------------------------------------------------------------
+Wed Oct 13 15:14:59 UTC 2010 - lang@b1-systems.de
+
+- added old log
+
+
+* Tue Oct 12 2010 Ralf Lang
+- upgraded to horde-turba-2.3.5
+- Changed description to fit into 79 character rule
+- removed the name to id patches
+- updated the php to php5 patch
+* Mon Mar 17 2008 Matthias Boettger
+- applied fixed turba-h3-2.2-rc3-php5_exec.patch to solve dependency problem
+- disabled Patch:
+ Patch9: HK-GW-turba_2.2_RC1-Ldap_read_only_fix.patch
+* Sun Mar 16 2008 Matthias Boettger
+- updated to 2.2-rc3
+- fixed turba-h3-2.1.2-php5_exec.patch
+ renamed to turba-h3-2.2-rc3-php5_exec.patch
+- added new %{_turbadir}/addressbooks
+* Sat Dec 08 2007 Marcus H�we
+- updated to 2.2-rc1
+- renamed package to horde-turba
+- disabled the following patches:
+ Patch1: HK-GW-Fix_notice_on_addressbook_creation.patch
+ Patch2: HK-GW-Fix_address_book_deletion_1.patch
+ Patch3: HK-GW-Changes_after_ALPHA.patch
+ Patch4: HK-GW-Fix_share_id_change.patch
+ Patch5: HK-GW-Fix_editing_contacts.patch
+ Patch6: HK-GW-Ldap_read_only_fix.patch
+- added the following patches:
+ Patch7: HK-GW-turba_2.2_RC1-Fix_editing_contacts.patch
+ Patch8: HK-GW-turba_2.2_RC1-Fix_share_id_change.patch
+ Patch9: HK-GW-turba_2.2_RC1-Ldap_read_only_fix.patch
+* Wed Nov 07 2007 Marcus H�we
+- updated to 2.2-alpha
+- updated Source1
+- updated Patch0 (turba-h3-2.1.2-php5_exec.patch)
+- the following patches were taken from kolab cvs in order to make
+ turba work with kolab:
+ Patch1: HK-GW-Fix_notice_on_addressbook_creation.patch
+ Patch2: HK-GW-Fix_address_book_deletion_1.patch
+ Patch3: HK-GW-Changes_after_ALPHA.patch
+ Patch4: HK-GW-Fix_share_id_change.patch
+ Patch5: HK-GW-Fix_editing_contacts.patch
+ Patch6: HK-GW-Ldap_read_only_fix.patch
+* Sun Nov 05 2006 Marcus Hüwe
+- new upstream version 2.1.3
+* Thu Aug 24 2006 Marcus Hüwe
+- new upstream version (2.1.2)
+- added turba-h3-2.1.2-php5_exec.patch
+* Sat Jun 17 2006 Marcus Hüwe
+- initial build
+
calling whatdependson for head-i586
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
horde3-turba.changes
horde3-turba.spec
turba-h3-2.2-alpha-sources.php.kolab
turba-h3-2.3.5-php5_exec.patch
turba-h3-2.3.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ horde3-turba.spec ++++++
#
# spec file for package horde3-turba
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
%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: 1
Summary: The Horde Groupware Address Book
License: Other License(s), see package, Other uncritical OpenSource License
Group: Productivity/Networking/Other
Url: http://www.horde.org/turba
Source0: turba-h3-%{_pversion}.tar.bz2
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
Requires: horde3 >= 3.3.0
Requires: php5-pear-mdb2
Requires: php5-pear-net_ldap
BuildRequires: apache2-devel
%if 0%{?sles_version} != 10
BuildRequires: fdupes
%endif
%description
Turba is a set of PHP scripts that implement a contacts directory
and management interface. Turba also provides an API for external
applications to interface with address books, providing adding and
searching features that you can hook right into other applications.
Authors:
--------
Chuck Hagenbuch
Jon Parise
Jan Schneider
Michael J. Rubinsky
%prep
%setup -qn turba-h3-%{_pversion}
%__cp %{S:1} ./config/sources.php.kolab
%patch0
%build
pushd config/
for i in *.dist; do %__mv $i ${i%.dist}; done
popd
%install
%__mkdir_p %{buildroot}%{_turbadir}
%__cp -r ./* %{buildroot}%{_turbadir}
%__rm -rf %{buildroot}%{_turbadir}/{docs,README,LICENSE}
# remove and link duplicate files if not SLES 10
%if 0%{?sles_version} != 10
%fdupes %buildroot/%{_turbadir}
%endif
%clean
%__rm -rf %{buildroot}
%files
%defattr(-, root, root)
%doc docs README LICENSE
%dir %{_hordedir}
%dir %{_turbadir}
%lang(ar_SY) %{_turbadir}/locale/ar_SY/LC_MESSAGES/turba.mo
%lang(bg_BG) %{_turbadir}/locale/bg_BG/LC_MESSAGES/turba.mo
%lang(ca_ES) %{_turbadir}/locale/ca_ES/LC_MESSAGES/turba.mo
%lang(cs_CZ) %{_turbadir}/locale/cs_CZ/LC_MESSAGES/turba.mo
%lang(el_GR) %{_turbadir}/locale/el_GR/LC_MESSAGES/turba.mo
%lang(et_EE) %{_turbadir}/locale/et_EE/LC_MESSAGES/turba.mo
%lang(da_DK) %{_turbadir}/locale/da_DK/LC_MESSAGES/turba.mo
%lang(de_DE) %{_turbadir}/locale/de_DE/LC_MESSAGES/turba.mo
%lang(es_ES) %{_turbadir}/locale/es_ES/LC_MESSAGES/turba.mo
%lang(eu_ES) %{_turbadir}/locale/eu_ES/LC_MESSAGES/turba.mo
%lang(fa_IR) %{_turbadir}/locale/fa_IR/LC_MESSAGES/turba.mo
%lang(fi_FI) %{_turbadir}/locale/fi_FI/LC_MESSAGES/turba.mo
%lang(fr_FR) %{_turbadir}/locale/fr_FR/LC_MESSAGES/turba.mo
%lang(gl_ES) %{_turbadir}/locale/gl_ES/LC_MESSAGES/turba.mo
%lang(hr_HR) %{_turbadir}/locale/hr_HR/LC_MESSAGES/turba.mo
%lang(hu_HU) %{_turbadir}/locale/hu_HU/LC_MESSAGES/turba.mo
%lang(is_IS) %{_turbadir}/locale/is_IS/LC_MESSAGES/turba.mo
%lang(it_IT) %{_turbadir}/locale/it_IT/LC_MESSAGES/turba.mo
%lang(ja_JP) %{_turbadir}/locale/ja_JP/LC_MESSAGES/turba.mo
%lang(ko_KR) %{_turbadir}/locale/ko_KR/LC_MESSAGES/turba.mo
%lang(lt_LT) %{_turbadir}/locale/lt_LT/LC_MESSAGES/turba.mo
%lang(lv_LV) %{_turbadir}/locale/lv_LV/LC_MESSAGES/turba.mo
%lang(mk_MK) %{_turbadir}/locale/mk_MK/LC_MESSAGES/turba.mo
%lang(nb_NO) %{_turbadir}/locale/nb_NO/LC_MESSAGES/turba.mo
%lang(nl_NL) %{_turbadir}/locale/nl_NL/LC_MESSAGES/turba.mo
%lang(nn_NO) %{_turbadir}/locale/nn_NO/LC_MESSAGES/turba.mo
%lang(pl_PL) %{_turbadir}/locale/pl_PL/LC_MESSAGES/turba.mo
%lang(pt_BR) %{_turbadir}/locale/pt_BR/LC_MESSAGES/turba.mo
%lang(pt_PT) %{_turbadir}/locale/pt_PT/LC_MESSAGES/turba.mo
%lang(ro_RO) %{_turbadir}/locale/ro_RO/LC_MESSAGES/turba.mo
%lang(ru_RU) %{_turbadir}/locale/ru_RU/LC_MESSAGES/turba.mo
%lang(sk_SK) %{_turbadir}/locale/sk_SK/LC_MESSAGES/turba.mo
%lang(sl_SI) %{_turbadir}/locale/sl_SI/LC_MESSAGES/turba.mo
%lang(sv_SE) %{_turbadir}/locale/sv_SE/LC_MESSAGES/turba.mo
%lang(tr_TR) %{_turbadir}/locale/tr_TR/LC_MESSAGES/turba.mo
%lang(zh_TW) %{_turbadir}/locale/zh_TW/LC_MESSAGES/turba.mo
%lang(uk_UA) %{_turbadir}/locale/uk_UA/LC_MESSAGES/turba.mo
%lang(zh_CN) %{_turbadir}/locale/zh_CN/LC_MESSAGES/turba.mo
%dir %{_turbadir}/locale
%dir %{_turbadir}/locale/*
%dir %{_turbadir}/locale/*/LC_MESSAGES
%{_turbadir}/locale/*/*.xml
%{_turbadir}/locale/.htaccess
%{_turbadir}/*.php
%{_turbadir}/addressbooks
%{_turbadir}/js
%{_turbadir}/lib
#%{_turbadir}/locale
%{_turbadir}/po
%{_turbadir}/scripts
%{_turbadir}/templates
%{_turbadir}/themes
%attr(0750, wwwrun, www) %dir %{_turbadir}/config
%attr(0640, wwwrun, www) %config(noreplace) %{_turbadir}/config/*
%attr(0640, wwwrun, www) %config(noreplace) %{_turbadir}/config/.htaccess
%changelog
++++++ 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);
+ }
+ }
+ }
+
}
++++++ turba-h3-2.2-alpha-sources.php.kolab ++++++
_("Global Address Book"),
'type' => 'ldap',
'params' => array(
'server' => $server,
'port' => $GLOBALS['conf']['kolab']['ldap']['port'],
'tls' => false,
'root' => $GLOBALS['conf']['kolab']['ldap']['basedn'],
'sizelimit' => 200,
'dn' => array('cn'),
'objectclass' => array(
'inetOrgPerson'
),
'scope' => 'one',
'charset' => 'utf-8',
'version' => 3,
'bind_dn' => '',
'bind_password' => '',
),
'map' => array(
'__key' => 'dn',
'name' => 'cn',
'firstname' => 'givenName',
'lastname' => 'sn',
'email' => 'mail',
'alias' => 'alias',
'title' => 'title',
'company' => 'o',
'workStreet' => 'street',
'workCity' => 'l',
'workProvince' => 'st',
'workPostalCode' => 'postalCode',
'workCountry' => 'c',
'homePhone' => 'homePhone',
'workPhone' => 'telephoneNumber',
'cellPhone' => 'mobile',
'fax' => 'fax',
'notes' => 'description',
'freebusyUrl' => 'kolabHomeServer',
),
'search' => array(
'name',
'firstname',
'lastname',
'email',
'title',
'company',
'workAddress',
'workCity',
'workProvince',
'workPostalCode',
'workCountry',
'homePhone',
'workPhone',
'cellPhone',
'fax',
'notes',
),
'strict' => array(
'dn',
),
'export' => true,
'browse' => true,
);
/**
* The local address books for a Kolab user. These are stored in specially
* flagged contact folder within the users Cyrus IMAP mailbox.
*/
$cfgSources['kolab'] = array(
'title' => _("Contacts"),
'type' => 'kolab',
'params' => array(
'charset' => 'utf-8',
),
'map' => array(
'__key' => 'uid',
'name' => 'full-name',
'firstname' => 'given-name',
'lastname' => 'last-name',
'title' => 'job-title',
'company' => 'organization',
'notes' => 'body',
'website' => 'web-page',
'nickname' => 'nick-name',
'emails' => 'emails',
'homePhone' => 'phone-home1',
'workPhone' => 'phone-business1',
'cellPhone' => 'phone-mobile',
'fax' => 'phone-businessfax',
'workStreet' => 'addr-business-street',
'workCity' => 'addr-business-locality',
'workProvince' => 'addr-business-region',
'workPostalCode' => 'addr-business-postal-code',
'workCountry' => 'addr-business-country',
'homeStreet' => 'addr-home-street',
'homeCity' => 'addr-home-locality',
'homeProvince' => 'addr-home-region',
'homePostalCode' => 'addr-home-postal-code',
'homeCountry' => 'addr-home-country',
),
'search' => array(
'name',
'firstname',
'lastname',
'emails',
'title',
'company',
'notes',
'homePhone',
'workPhone',
'cellPhone',
'fax',
'workStreet',
'workCity',
'workProvince',
'workPostalCode',
'workCountry',
'homeStreet',
'homeCity',
'homeProvince',
'homePostalCode',
'homeCountry',
'website',
'nickname'
),
'strict' => array(
'uid',
),
'export' => true,
'browse' => true,
'use_shares' => true,
'shares_only' => true,
);
}
/* End Kolab sources. */
++++++ turba-h3-2.3.5-php5_exec.patch ++++++
Index: scripts/import_squirrelmail_file_abook.php
===================================================================
--- scripts/import_squirrelmail_file_abook.php.orig
+++ scripts/import_squirrelmail_file_abook.php
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/php5
