Projects
Kolab:16
pykolab
Log In
Username
Password
We truncated the diff of some files because they were too big. If you want to see the full diff for every file,
click here
.
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 28
View file
pykolab.spec
Changed
@@ -2,12 +2,21 @@ #!BuildIgnore: systemd %endif +<<<<<<< ./pykolab/pykolab.spec.mine + +%if 0%{?fedora} || 0%{?rhel} >= 8 +%global pyver 2 +%endif + +%{!?python_sitelib: %define python_sitelib %(python%{?pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +======= %if 0%{?fedora} || 0%{?rhel} >= 8 %global py2 2 %endif %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} +>>>>>>> ./pykolab/pykolab.spec.r40 %if 0%{?suse_version} || 0%{?fedora} > 17 || 0%{?rhel} > 6 %global with_systemd 1 @@ -34,8 +43,8 @@ Summary: Kolab Groupware Solution Name: pykolab -Version: 0.8.11 -Release: 2%{?dist} +Version: 0.8.10 +Release: 1%{?dist} License: GPLv3+ Group: Applications/System URL: http://kolab.org/ @@ -43,8 +52,9 @@ Source0: pykolab-%{version}.tar.gz Source1: pykolab.logrotate -Patch0001: pykolab-0.8-patch-out-manticore.patch -Patch0002: pykolab-sender-rejection-hotfix.patch +Patch0001: 0001-No-more-manticore.patch +Patch0002: 0002-Fix-syntax-error.patch +Patch0003: 0003-Fix-unicode-in-roundcube-config-templates.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildArch: noarch @@ -70,6 +80,32 @@ BuildRequires: MySQL-python %endif +<<<<<<< ./pykolab/pykolab.spec.mine +BuildRequires: python%{?pyver} +BuildRequires: python%{?pyver}-augeas +BuildRequires: python%{?pyver}-gnupg +BuildRequires: python-icalendar +BuildRequires: python%{?pyver}-kolab >= 2.0 +BuildRequires: python%{?pyver}-kolabformat +BuildRequires: python%{?pyver}-ldap +BuildRequires: python%{?pyver}-nose +BuildRequires: python%{?pyver}-pep8 +BuildRequires: python%{?pyver}-pyasn1 +BuildRequires: python%{?pyver}-pyasn1-modules +%if 0%{?fedora} || 0%{?rhel} >= 8 +BuildRequires: python%{?pyver}-pytz +%else +BuildRequires: pytz +%endif +BuildRequires: python%{?pyver}-sievelib +BuildRequires: python%{?pyver}-sqlalchemy +%if 0%{?fedora} || 0%{?rhel} >= 8 +BuildRequires: python%{?pyver}-twisted +%else +BuildRequires: python-twisted-core +%endif +BuildRequires: python%{?pyver}-tzlocal +======= BuildRequires: python%{?py2} BuildRequires: python%{?py2}-augeas BuildRequires: python%{?py2}-gnupg @@ -84,13 +120,20 @@ BuildRequires: python%{?py2}-pytz BuildRequires: python%{?py2}-sievelib BuildRequires: python%{?py2}-sqlalchemy -BuildRequires: python%{?py2}-twisted-core +BuildRequires: python%{?py2}-twisted BuildRequires: python%{?py2}-tzlocal +>>>>>>> ./pykolab/pykolab.spec.r40 Requires: kolab-cli = %{version}-%{release} +<<<<<<< ./pykolab/pykolab.spec.mine +Requires: python%{?pyver}-ldap >= 2.4 +Requires: python%{?pyver}-pyasn1 +Requires: python%{?pyver}-pyasn1-modules +======= Requires: python%{?py2}-ldap >= 2.4 Requires: python%{?py2}-pyasn1 Requires: python%{?py2}-pyasn1-modules +>>>>>>> ./pykolab/pykolab.spec.r40 Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/usermod Requires(pre): /usr/sbin/groupadd @@ -232,6 +275,7 @@ %patch0001 -p1 %patch0002 -p1 +%patch0003 -p1 %build autoreconf -v || automake --add-missing && autoreconf -v @@ -568,12 +612,6 @@ %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace %changelog -* Sun May 19 2019 Christoph Erhardt <kolab@sicherha.de> - 0.8.11-2 -- Add hotfix for rejection of all senders (T5363) - -* Fri May 17 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.11-1 -- Release of version 0.8.11 - * Fri Jul 27 2018 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.10-1 - Release of version 0.8.10
View file
0001-No-more-manticore.patch
Added
@@ -0,0 +1,25 @@ +From cd170966b9098e34ddcb1e0b3e12ecb3350b5ff9 Mon Sep 17 00:00:00 2001 +From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> +Date: Fri, 17 May 2019 10:46:11 +0200 +Subject: [PATCH 1/3] No more manticore + +--- + share/templates/roundcubemail/config.inc.php.tpl | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl +index 5e80898..888478e 100644 +--- a/share/templates/roundcubemail/config.inc.php.tpl ++++ b/share/templates/roundcubemail/config.inc.php.tpl +@@ -244,8 +244,6 @@ + 'ssl_verify_peer' => false, + ); + +- \$config['fileapi_manticore'] = 'http://' . \$_SERVER['HTTP_HOST'] . ':8080'; +- + @include('/etc/roundcubemail/kolab_syncroton.inc.php'); + + ?> +-- +2.21.0 +
View file
0002-Fix-syntax-error.patch
Added
@@ -0,0 +1,25 @@ +From 92abbdb81676e7dde541bbaa915c5d752765a3c1 Mon Sep 17 00:00:00 2001 +From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> +Date: Mon, 20 May 2019 11:23:21 +0200 +Subject: [PATCH 2/3] Fix syntax error + +--- + bin/kolab_smtp_access_policy.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bin/kolab_smtp_access_policy.py b/bin/kolab_smtp_access_policy.py +index 21169f8..d2766de 100755 +--- a/bin/kolab_smtp_access_policy.py ++++ b/bin/kolab_smtp_access_policy.py +@@ -1284,7 +1284,7 @@ def cache_insert( + sasl_sender='', + data=None): + +- if cache is notTrue: ++ if cache is not True: + return [] + + log.debug( +-- +2.21.0 +
View file
0003-Fix-unicode-in-roundcube-config-templates.patch
Added
@@ -0,0 +1,459 @@ +From 423c0ead53fa34c3f0ddc7c987ad66b121cce6ca Mon Sep 17 00:00:00 2001 +From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com> +Date: Tue, 21 May 2019 17:36:34 +0200 +Subject: [PATCH 3/3] Fix unicode in roundcube config templates + +--- + pykolab/setup/setup_roundcube.py | 229 +++++++++++++++++-------------- + pykolab/translate.py | 21 ++- + 2 files changed, 142 insertions(+), 108 deletions(-) + +diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py +index 9b6d664..9c0c347 100644 +--- a/pykolab/setup/setup_roundcube.py ++++ b/pykolab/setup/setup_roundcube.py +@@ -17,7 +17,6 @@ + # along with this program. If not, see <http://www.gnu.org/licenses/>. + # + +-from Cheetah.Template import Template + import grp + import hashlib + import os +@@ -27,6 +26,8 @@ import subprocess + import sys + import time + ++from Cheetah.Template import Template ++ + import components + + import pykolab +@@ -38,63 +39,66 @@ from pykolab.translate import _ + log = pykolab.getLogger('pykolab.setup') + conf = pykolab.getConf() + ++ + def __init__(): +- components.register('roundcube', execute, description=description(), after=['mysql','ldap']) ++ components.register('roundcube', execute, description=description(), after=['mysql', 'ldap']) ++ + + def description(): + return _("Setup Roundcube.") + ++ + def execute(*args, **kw): + print >> sys.stderr, utils.multiline_message( +- _(""" +- Please supply a password for the MySQL user 'roundcube'. +- This password will be used by the Roundcube webmail +- interface. +- """) +- ) ++ _(""" ++ Please supply a password for the MySQL user 'roundcube'. ++ This password will be used by the Roundcube webmail ++ interface. ++ """) ++ ) + + mysql_roundcube_password = utils.ask_question( +- _("MySQL roundcube password"), +- default=utils.generate_password(), +- password=True, +- confirm=True +- ) ++ _("MySQL roundcube password"), ++ default=utils.generate_password(), ++ password=True, ++ confirm=True ++ ) + + conf.mysql_roundcube_password = mysql_roundcube_password + + rc_settings = { +- 'des_key': re.sub( +- r'[^a-zA-Z0-9]', +- "", +- "%s%s" % ( +- hashlib.md5("%s" % random.random()).digest().encode("base64"), +- hashlib.md5("%s" % random.random()).digest().encode("base64") +- ) +- )[:24], +- +- 'imap_admin_login': conf.get('cyrus-imap', 'admin_login'), +- 'imap_admin_password': conf.get('cyrus-imap', 'admin_password'), +- 'ldap_base_dn': conf.get('ldap', 'base_dn'), +- 'ldap_group_base_dn': conf.get('ldap', 'group_base_dn'), +- 'ldap_group_filter': conf.get('ldap', 'group_filter'), +- 'ldap_ldap_uri': conf.get('ldap', 'ldap_uri'), +- 'ldap_resource_base_dn': conf.get('ldap', 'resource_base_dn'), +- 'ldap_resource_filter': conf.get('ldap', 'resource_filter'), +- 'ldap_service_bind_dn': conf.get('ldap', 'service_bind_dn'), +- 'ldap_service_bind_pw': conf.get('ldap', 'service_bind_pw'), +- 'ldap_user_base_dn': conf.get('ldap', 'user_base_dn'), +- 'ldap_user_filter': conf.get('ldap', 'user_filter'), +- 'primary_domain': conf.get('kolab','primary_domain'), +- 'mysql_uri': 'mysqli://roundcube:%s@localhost/roundcube' % (mysql_roundcube_password), +- 'conf': conf +- } ++ 'des_key': re.sub( ++ r'[^a-zA-Z0-9]', ++ "", ++ "%s%s" % ( ++ hashlib.md5("%s" % random.random()).digest().encode("base64"), ++ hashlib.md5("%s" % random.random()).digest().encode("base64") ++ ) ++ )[:24], ++ ++ 'imap_admin_login': conf.get('cyrus-imap', 'admin_login'), ++ 'imap_admin_password': conf.get('cyrus-imap', 'admin_password'), ++ 'ldap_base_dn': conf.get('ldap', 'base_dn'), ++ 'ldap_group_base_dn': conf.get('ldap', 'group_base_dn'), ++ 'ldap_group_filter': conf.get('ldap', 'group_filter'), ++ 'ldap_ldap_uri': conf.get('ldap', 'ldap_uri'), ++ 'ldap_resource_base_dn': conf.get('ldap', 'resource_base_dn'), ++ 'ldap_resource_filter': conf.get('ldap', 'resource_filter'), ++ 'ldap_service_bind_dn': conf.get('ldap', 'service_bind_dn'), ++ 'ldap_service_bind_pw': conf.get('ldap', 'service_bind_pw'), ++ 'ldap_user_base_dn': conf.get('ldap', 'user_base_dn'), ++ 'ldap_user_filter': conf.get('ldap', 'user_filter'), ++ 'primary_domain': conf.get('kolab', 'primary_domain'), ++ 'mysql_uri': 'mysqli://roundcube:%s@localhost/roundcube' % (mysql_roundcube_password), ++ 'conf': conf ++ } + + rc_paths = [ +- "/usr/share/roundcubemail/", +- "/usr/share/roundcube/", +- "/srv/www/roundcubemail/", +- "/var/www/roundcubemail/" +- ] ++ "/usr/share/roundcubemail/", ++ "/usr/share/roundcube/", ++ "/srv/www/roundcubemail/", ++ "/var/www/roundcubemail/" ++ ] + + rcpath = '' + for rc_path in rc_paths: +@@ -114,22 +118,22 @@ def execute(*args, **kw): + rc_settings['skin'] = 'larry' + + want_files = [ +- 'acl.inc.php', +- 'calendar.inc.php', +- 'config.inc.php', +- 'kolab_addressbook.inc.php', +- 'kolab_auth.inc.php', +- 'kolab_delegation.inc.php', +- 'kolab_files.inc.php', +- 'kolab_folders.inc.php', +- 'libkolab.inc.php', +- 'managesieve.inc.php', +- 'owncloud.inc.php', +- 'password.inc.php', +- 'recipient_to_contact.inc.php', +- 'terms.html', +- 'terms.inc.php' +- ] ++ 'acl.inc.php', ++ 'calendar.inc.php', ++ 'config.inc.php', ++ 'kolab_addressbook.inc.php', ++ 'kolab_auth.inc.php', ++ 'kolab_delegation.inc.php', ++ 'kolab_files.inc.php', ++ 'kolab_folders.inc.php', ++ 'libkolab.inc.php', ++ 'managesieve.inc.php', ++ 'owncloud.inc.php', ++ 'password.inc.php', ++ 'recipient_to_contact.inc.php', ++ 'terms.html', ++ 'terms.inc.php' ++ ] + + for want_file in want_files: + template_file = None +@@ -137,29 +141,30 @@ def execute(*args, **kw): + template_file = '/etc/kolab/templates/roundcubemail/%s.tpl' % (want_file) + elif os.path.isfile('/usr/share/kolab/templates/roundcubemail/%s.tpl' % (want_file)): + template_file = '/usr/share/kolab/templates/roundcubemail/%s.tpl' % (want_file) +- elif os.path.isfile(os.path.abspath(os.path.join(__file__, '..', '..', '..', 'share', 'templates', 'roundcubemail', '%s.tpl' % (want_file)))): +- template_file = os.path.abspath(os.path.join(__file__, '..', '..', '..', 'share', 'templates', 'roundcubemail', '%s.tpl' % (want_file))) + +- if not template_file == None: ++ if template_file is not None: + log.debug(_("Using template file %r") % (template_file), level=8) +- fp = open(template_file, 'r') ++ fp = codecs.open(template_file, 'r', encoding='utf-8') + template_definition = fp.read() + fp.close() + + t = Template(template_definition, searchList=[rc_settings]) + log.debug( +- _("Successfully compiled template %r, writing out to %r") % (template_file, want_file), +- level=8 +- )
View file
pykolab-0.8-patch-out-manticore.patch
Deleted
@@ -1,19 +0,0 @@ -commit cd170966b9098e34ddcb1e0b3e12ecb3350b5ff9 -Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> -Date: Fri May 17 10:46:11 2019 +0200 - - No more manticore - -diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl -index 5e80898..888478e 100644 ---- a/share/templates/roundcubemail/config.inc.php.tpl -+++ b/share/templates/roundcubemail/config.inc.php.tpl -@@ -244,8 +244,6 @@ - 'ssl_verify_peer' => false, - ); - -- \$config['fileapi_manticore'] = 'http://' . \$_SERVER['HTTP_HOST'] . ':8080'; -- - @include('/etc/roundcubemail/kolab_syncroton.inc.php'); - - ?>
View file
pykolab-sender-rejection-hotfix.patch
Deleted
@@ -1,12 +0,0 @@ -diff '--color=auto' -r -u -N pykolab-0.8.11.orig/bin/kolab_smtp_access_policy.py pykolab-0.8.11/bin/kolab_smtp_access_policy.py ---- pykolab-0.8.11.orig/bin/kolab_smtp_access_policy.py 2019-05-17 10:20:56.000000000 +0200 -+++ pykolab-0.8.11/bin/kolab_smtp_access_policy.py 2019-05-19 09:48:40.044115772 +0200 -@@ -1284,7 +1284,7 @@ - sasl_sender='', - data=None): - -- if cache is notTrue: -+ if cache is not True: - return [] - - log.debug(
View file
debian.changelog
Changed
@@ -1,3 +1,10 @@ + +pykolab (0.8.11-0~kolab4) unstable; urgency=low + + * Fix unicode templates for roundcube + + -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Tue, 21 May 2019 01:49:00 +0100 + pykolab (0.8.11-0~kolab3) unstable; urgency=low * Add hotfix for rejection of all senders (T5363)
View file
debian.series
Changed
@@ -1,3 +1,4 @@ cyrus-imapd.conf-cert-paths.patch -p1 -pykolab-0.8-patch-out-manticore.patch -p1 -pykolab-sender-rejection-hotfix.patch -p1 +0001-No-more-manticore.patch -p1 +0002-Fix-syntax-error.patch -p1 +0003-Fix-unicode-in-roundcube-config-templates.patch -p1
View file
pykolab.dsc
Changed
@@ -2,7 +2,7 @@ Source: pykolab Binary: pykolab, kolab-cli, kolab-conf, kolab-saslauthd, kolab-server, kolab-telemetry, kolab-xml, wallace Architecture: all -Version: 0.8.11-0~kolab3 +Version: 0.8.11-0~kolab4 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Uploaders: Paul Klos <kolab@klos2day.nl> Homepage: http://www.kolab.org
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.