Kolab Groupware OBS

pykolab.spec Changed

@@ -33,7 +33,7 @@
 
 Summary:            Kolab Groupware Solution
 Name:               pykolab
-Version:            0.8.11
+Version:            0.8.12
 Release:            1%{?dist}
 License:            GPLv3+
 Group:              Applications/System
@@ -42,10 +42,6 @@
 Source0:            pykolab-%{version}.tar.gz
 Source1:            pykolab.logrotate
 
-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
 
@@ -230,10 +226,6 @@
 %prep
 %setup -q
 
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-
 %build
 autoreconf -v || automake --add-missing && autoreconf -v
 %configure
@@ -569,6 +561,9 @@
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
 
 %changelog
+* Tue Jun  4 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.12-1
+- Release of version 0.8.12
+
 * Tue May 21 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.11-1
 - Release of version 0.8.11

0001-No-more-manticore.patch Deleted

0002-Fix-syntax-error.patch Deleted

0003-Fix-unicode-in-roundcube-config-templates.patch Deleted

@@ -1,496 +0,0 @@
-From 4db1d5e189b8b07f06092acbef623a3a0c2968ee 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 | 256 +++++++++++++++++--------------
- pykolab/translate.py             |  21 ++-
- 2 files changed, 159 insertions(+), 118 deletions(-)
-
-diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py
-index 9b6d664..b03a90f 100644
---- a/pykolab/setup/setup_roundcube.py
-+++ b/pykolab/setup/setup_roundcube.py
-@@ -17,7 +17,7 @@
- # along with this program.  If not, see <http://www.gnu.org/licenses/>.
- #
- 
--from Cheetah.Template import Template
-+import codecs
- import grp
- import hashlib
- import os
-@@ -27,6 +27,8 @@ import subprocess
- import sys
- import time
- 
-+from Cheetah.Template import Template
-+
- import components
- 
- import pykolab
-@@ -35,66 +37,70 @@ from pykolab import utils
- from pykolab.constants import *
- from pykolab.translate import _
- 
-+# pylint: disable=invalid-name
- 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:
-@@ -103,7 +109,7 @@ def execute(*args, **kw):
-             break
- 
-     if not os.path.isdir(rcpath):
--        log.error(_("Roundcube installation path not found."))
-+        log.error("Roundcube installation path not found.")
-         return
- 
-     if os.access(rcpath + 'skins/enterprise/', os.R_OK):
-@@ -114,22 +120,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,71 +143,77 @@ 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)))

debian.changelog Changed

debian.control Changed

debian.series Changed

pykolab-0.8.11.tar.gz/bin/kolab_smtp_access_policy.py -> pykolab-0.8.12.tar.gz/bin/kolab_smtp_access_policy.py Changed

pykolab-0.8.11.tar.gz/configure.ac -> pykolab-0.8.12.tar.gz/configure.ac Changed

pykolab-0.8.11.tar.gz/pykolab/auth/ldap/__init__.py -> pykolab-0.8.12.tar.gz/pykolab/auth/ldap/__init__.py Changed

pykolab-0.8.11.tar.gz/pykolab/cli/cmd_sync.py -> pykolab-0.8.12.tar.gz/pykolab/cli/cmd_sync.py Changed

pykolab-0.8.11.tar.gz/pykolab/setup/setup_mta.py -> pykolab-0.8.12.tar.gz/pykolab/setup/setup_mta.py Changed

@@ -235,6 +235,13 @@
                     },
         }
 
+    if not os.path.isfile('/etc/postfix/main.cf'):
+        if os.path.isfile('/usr/share/postfix/main.cf.debian'):
+            shutil.copy(
+                    '/usr/share/postfix/main.cf.debian',
+                    '/etc/postfix/main.cf'
+                )
+
     if not os.path.isdir('/etc/postfix/ldap'):
         os.mkdir('/etc/postfix/ldap/', 0770)
 
@@ -277,13 +284,9 @@
     if os.path.isfile('/etc/pki/tls/private/localhost.pem'):
         postfix_main_settings['smtpd_tls_cert_file'] = "/etc/pki/tls/private/localhost.pem"
         postfix_main_settings['smtpd_tls_key_file'] = "/etc/pki/tls/private/localhost.pem"
-
-    if not os.path.isfile('/etc/postfix/main.cf'):
-        if os.path.isfile('/usr/share/postfix/main.cf.debian'):
-            shutil.copy(
-                    '/usr/share/postfix/main.cf.debian',
-                    '/etc/postfix/main.cf'
-                )
+    elif os.path.isfile('/etc/ssl/private/cyrus-imapd.pem'): # Debian 9
+        postfix_main_settings['smtpd_tls_cert_file'] = "/etc/ssl/private/cyrus-imapd.pem"
+        postfix_main_settings['smtpd_tls_key_file'] = "/etc/ssl/private/cyrus-imapd.pem"
 
     # Copy header checks files
     for hc_file in [ 'inbound', 'internal', 'submission' ]:

pykolab-0.8.11.tar.gz/pykolab/setup/setup_roundcube.py -> pykolab-0.8.12.tar.gz/pykolab/setup/setup_roundcube.py Changed

@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from Cheetah.Template import Template
+import codecs
 import grp
 import hashlib
 import os
@@ -27,6 +27,8 @@
 import sys
 import time
 
+from Cheetah.Template import Template
+
 import components
 
 import pykolab
@@ -35,66 +37,70 @@
 from pykolab.constants import *
 from pykolab.translate import _
 
+# pylint: disable=invalid-name
 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:
@@ -103,7 +109,7 @@
             break
 
     if not os.path.isdir(rcpath):
-        log.error(_("Roundcube installation path not found."))
+        log.error("Roundcube installation path not found.")
         return
 
     if os.access(rcpath + 'skins/enterprise/', os.R_OK):
@@ -114,22 +120,22 @@
         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,71 +143,77 @@
             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:
-            log.debug(_("Using template file %r") % (template_file), level=8)
-            fp = open(template_file, 'r')
-            template_definition = fp.read()
-            fp.close()
+        if template_file is not None:
+            # pylint: disable=logging-not-lazy
+            log.debug("Using template file %r" % (template_file), level=8)
+            filep = codecs.open(template_file, 'r', encoding='utf-8')
+            template_definition = filep.read()
+            filep.close()
 
             t = Template(template_definition, searchList=[rc_settings])
+            # pylint: disable=logging-not-lazy

pykolab-0.8.11.tar.gz/pykolab/setup/setup_syncroton.py -> pykolab-0.8.12.tar.gz/pykolab/setup/setup_syncroton.py Changed

pykolab-0.8.11.tar.gz/pykolab/translate.py -> pykolab-0.8.12.tar.gz/pykolab/translate.py Changed

@@ -25,19 +25,24 @@
 import gettext
 import os
 
-N_ = lambda x: x
+N_ = lambda x: x  # noqa: E731
 
 # This function as such may, at times, cause tracebacks.
-#_ = lambda x: current.lgettext(x)
+# _ = lambda x: current.lgettext(x)
 
+# pylint: disable=invalid-name
 current = gettext.translation(domain, fallback=True)
 
+
 def _(x):
     try:
         return current.lgettext(x)
-    except Exception, errmsg:
+
+    # pylint: disable=broad-except
+    except Exception:
         return x
 
+
 def getDefaultLangs():
     languages = []
     for envar in ('LANGUAGE', 'LC_ALL', 'LC_MESSAGES', 'LANG'):
@@ -51,24 +56,32 @@
     # now normalize and expand the languages
     nelangs = []
     for lang in languages:
+
+        # pylint: disable=protected-access
         for nelang in gettext._expand_lang(lang):
             if nelang not in nelangs:
                 nelangs.append(nelang)
 
     return nelangs
 
+
 def setUserLanguage(lang):
+    # pylint: disable=global-statement
     global current
 
     if not len(lang.split('.')) > 1 and not lang.endswith('.UTF-8'):
         lang = "%s.UTF-8" % (lang)
 
     langs = []
+
+    # pylint: disable=protected-access
     for l in gettext._expand_lang(lang):
         if l not in langs:
             langs.append(l)
 
     try:
         current = gettext.translation(domain, languages=langs, fallback=True)
-    except:
+
+    # pylint: disable=broad-except
+    except Exception:
         pass

pykolab-0.8.11.tar.gz/share/templates/roundcubemail/config.inc.php.tpl -> pykolab-0.8.12.tar.gz/share/templates/roundcubemail/config.inc.php.tpl Changed

pykolab.dsc Changed

Changes of Revision 36