Kolab Groupware OBS

pykolab.spec Changed

@@ -28,7 +28,7 @@
 
 Summary:            Kolab Groupware Solution
 Name:               pykolab
-Version:            0.7.4
+Version:            0.7.5
 Release:            1%{?dist}
 License:            GPLv3+
 Group:              Applications/System
@@ -36,12 +36,6 @@
 
 Source0:            http://files.kolab.org/releases/%{name}-%{version}.tar.gz
 
-Patch0001:          0001-Configure-the-skin-based-on-the-available-skins.patch
-Patch0002:          0002-Use-the-correct-scheme-hostname-and-port-if-so-confi.patch
-Patch0003:          0003-Fix-typo-Thanks-Timotheus.patch
-Patch0004:          0004-Use-the-configured-ldap-domain_filter-setting-in-_ko.patch
-Patch0005:          0005-Fix-a-parse-error-in-creating-additional-folders-for.patch
-
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:          noarch
 %if 0%{?suse_version}
@@ -206,12 +200,6 @@
 %prep
 %setup -q
 
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-%patch0004 -p1
-%patch0005 -p1
-
 %build
 autoreconf -v
 %configure
@@ -534,6 +522,11 @@
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
 
 %changelog
+* Wed Dec 31 2014 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.7.5-1
+- New upstream release
+- Fix default configuration for Roundcube plugin managesieve (#4103)
+- Fix error due to missing 'domain_name_attribute' variable
+
 * Thu Dec 11 2014 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.7.4-5
 - Fix #4076 domain filter inconsistency.
 - Fix creating additional user folders

0001-Configure-the-skin-based-on-the-available-skins.patch Deleted

@@ -1,43 +0,0 @@
-From 5f711b830a66fd1795953193b8bfb82986568193 Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Tue, 9 Dec 2014 13:01:47 +0100
-Subject: [PATCH 1/4] Configure the skin based on the available skins
-
----
- pykolab/setup/setup_roundcube.py                 | 6 ++++++
- share/templates/roundcubemail/config.inc.php.tpl | 2 +-
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py
-index 259f676..d7442b4 100644
---- a/pykolab/setup/setup_roundcube.py
-+++ b/pykolab/setup/setup_roundcube.py
-@@ -88,6 +88,12 @@ def execute(*args, **kw):
-             'conf': conf
-         }
- 
-+    if os.access('/usr/share/roundcubemail/skins/enterprise/', os.R_OK):
-+        rc_settings['skin'] = 'enterprise'
-+    elif os.access('/usr/share/roundcubemail/skin/chameleon/', os_R_OK):
-+        rc_settings['skin'] = 'chameleon'
-+    else:
-+        rc_settings['skin'] = 'larry'
- 
-     want_files = [
-             'acl.inc.php',
-diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl
-index 6383a5c..15cd25f 100644
---- a/share/templates/roundcubemail/config.inc.php.tpl
-+++ b/share/templates/roundcubemail/config.inc.php.tpl
-@@ -128,7 +128,7 @@
-     \$config['ldap_debug'] = false;
-     \$config['smtp_debug'] = false;
- 
--    \$config['skin'] = 'chameleon';
-+    \$config['skin'] = '$skin';
-     \$config['skin_include_php'] = false;
-     \$config['mime_magic'] = null;
-     \$config['im_identify_path'] = '/usr/bin/identify';
--- 
-1.9.3
-

0002-Use-the-correct-scheme-hostname-and-port-if-so-confi.patch Deleted

@@ -1,55 +0,0 @@
-From 5db950d92bebf130d09fc7aeb53e3d0241aa84af Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Tue, 9 Dec 2014 19:18:08 +0100
-Subject: [PATCH 2/4] Use the correct scheme, hostname and port if so
- configured
-
----
- pykolab/imap/__init__.py | 21 +++++++++++++++++----
- 1 file changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/pykolab/imap/__init__.py b/pykolab/imap/__init__.py
-index 23bf4a9..cf6ff07 100644
---- a/pykolab/imap/__init__.py
-+++ b/pykolab/imap/__init__.py
-@@ -122,7 +122,15 @@ class IMAP(object):
- 
-         result = urlparse(uri)
- 
--        if hasattr(result, 'hostname'):
-+        if hasattr(result, 'netloc'):
-+            scheme = result.scheme
-+            if len(result.netloc.split(':')) > 1:
-+                hostname = result.netloc.split(':')[0]
-+                port = result.netloc.split(':')[1]
-+            else:
-+                hostname = result.netloc
-+
-+        elif hasattr(result, 'hostname'):
-             hostname = result.hostname
-         else:
-             scheme = uri.split(':')[0]
-@@ -131,12 +139,17 @@ class IMAP(object):
-         if not server == None:
-             hostname = server
- 
--        if port == None:
--            port = 993
--
-         if scheme == None or scheme == "":
-             scheme = 'imaps'
- 
-+        if port == None:
-+            if scheme == "imaps":
-+                port = 993
-+            elif scheme == "imap":
-+                port = 143
-+            else:
-+                port = 993
-+
-         uri = '%s://%s:%s' % (scheme, hostname, port)
- 
-         # Get the credentials
--- 
-1.9.3
-

0003-Fix-typo-Thanks-Timotheus.patch Deleted

0004-Use-the-configured-ldap-domain_filter-setting-in-_ko.patch Deleted

@@ -1,58 +0,0 @@
-From cdfc34e7de1d8174d97d5ba2e1caf828a7f6bae7 Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Thu, 11 Dec 2014 14:33:16 +0100
-Subject: [PATCH 4/4] Use the configured [ldap] domain_filter setting in
- _kolab_find_root_dn() (#4076)
-
----
- pykolab/auth/ldap/__init__.py | 13 +++++++++----
- 1 file changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/pykolab/auth/ldap/__init__.py b/pykolab/auth/ldap/__init__.py
-index c5b98c3..e6f43b3 100644
---- a/pykolab/auth/ldap/__init__.py
-+++ b/pykolab/auth/ldap/__init__.py
-@@ -2140,19 +2140,22 @@ class LDAP(pykolab.base.Base):
- 
-         domain_base_dn = conf.get('ldap', 'domain_base_dn', quiet=True)
- 
--        if not domain_base_dn == "":
-+        domain_filter = conf.get('ldap', 'domain_filter')
-+
-+        if not domain == None:
-+            domain_filter = domain_filter.replace('*', domain)
- 
--            # If we haven't returned already, let's continue searching
--            domain_name_attribute = conf.get('ldap', 'domain_name_attribute')
-+        if not domain_base_dn == "":
- 
-             _results = self._search(
-                     domain_base_dn,
-                     ldap.SCOPE_SUBTREE,
--                    "(%s=%s)" % (domain_name_attribute,domain),
-+                    domain_filter,
-                     override_search='_regular_search'
-                 )
- 
-             domains = []
-+
-             for _domain in _results:
-                 (domain_dn, _domain_attrs) = _domain
-                 domain_rootdn_attribute = conf.get(
-@@ -2163,11 +2166,13 @@ class LDAP(pykolab.base.Base):
-                 if _domain_attrs.has_key(domain_rootdn_attribute):
-                     self.domain_rootdns[domain] = _domain_attrs[domain_rootdn_attribute]
-                     return _domain_attrs[domain_rootdn_attribute]
-+
-                 else:
-                     if isinstance(_domain_attrs[domain_name_attribute], list):
-                         domain = _domain_attrs[domain_name_attribute][0]
-                     else:
-                         domain = _domain_attrs[domain_name_attribute]
-+
-         else:
-             if conf.has_option('ldap', 'base_dn'):
-                 return conf.get('ldap', 'base_dn')
--- 
-1.9.3
-

0005-Fix-a-parse-error-in-creating-additional-folders-for.patch Deleted

@@ -1,78 +0,0 @@
-From af36c305dad7016ef02a64699f78704e8ce638b3 Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Thu, 11 Dec 2014 17:57:14 +0100
-Subject: [PATCH 5/5] Fix a parse error in creating additional folders for user
- mailboxes
-
----
- pykolab/imap/__init__.py | 20 +++++++++++---------
- 1 file changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/pykolab/imap/__init__.py b/pykolab/imap/__init__.py
-index cf6ff07..4acc58f 100644
---- a/pykolab/imap/__init__.py
-+++ b/pykolab/imap/__init__.py
-@@ -554,9 +554,9 @@ class IMAP(object):
- 
-         return folder_name
- 
--    def user_mailbox_create_additional_folders(self, folder, additional_folders):
-+    def user_mailbox_create_additional_folders(self, user, additional_folders):
-         log.debug(
--                _("Creating additional folders for user %s") % (folder),
-+                _("Creating additional folders for user %s") % (user),
-                 level=8
-             )
- 
-@@ -565,6 +565,8 @@ class IMAP(object):
-         admin_login = conf.get(backend, 'admin_login')
-         admin_password = conf.get(backend, 'admin_password')
- 
-+        folder = 'user%s%s' % (self.get_separator(), user)
-+
-         if self.imap_murder():
-             server = self.user_mailbox_server(folder)
-         else:
-@@ -577,7 +579,7 @@ class IMAP(object):
- 
-                 self.disconnect()
-                 self.connect(login=False, server=server)
--                self.login_plain(admin_login, admin_password, folder)
-+                self.login_plain(admin_login, admin_password, user)
-                 (personal, other, shared) = self.namespaces()
-                 success = True
-             except Exception, errmsg:
-@@ -635,12 +637,12 @@ class IMAP(object):
-                             "%s" % (additional_folders[additional_folder]["acls"][acl])
-                         )
- 
--        if len(folder.split('@')) > 1:
--            localpart = folder.split('@')[0]
--            domain = folder.split('@')[1]
-+        if len(user.split('@')) > 1:
-+            localpart = user.split('@')[0]
-+            domain = user.split('@')[1]
-             domain_suffix = "@%s" % (domain)
-         else:
--            localpart = folder
-+            localpart = user
-             domain = None
-             domain_suffix = ""
- 
-@@ -684,11 +686,11 @@ class IMAP(object):
-                     _subscribe = False
- 
-             if _subscribe:
--                log.debug(_("Subscribing %s to folder %s") % (folder, _folder), level=8)
-+                log.debug(_("Subscribing %s to folder %s") % (user, _folder), level=8)
-                 try:
-                     self.subscribe(_folder)
-                 except Exception, errmsg:
--                    log.error(_("Subscribing %s to folder %s failed: %r") % (folder, _folder, errmsg))
-+                    log.error(_("Subscribing %s to folder %s failed: %r") % (user, _folder, errmsg))
- 
-         self.logout()
-         self.connect(domain=self.domain)
--- 
-1.9.3
-

debian.changelog Changed

debian.series Changed

pykolab-0.7.4.tar.gz/configure.ac -> pykolab-0.7.5.tar.gz/configure.ac Changed

pykolab-0.7.4.tar.gz/pykolab/auth/ldap/__init__.py -> pykolab-0.7.5.tar.gz/pykolab/auth/ldap/__init__.py Changed

@@ -2140,19 +2140,22 @@
 
         domain_base_dn = conf.get('ldap', 'domain_base_dn', quiet=True)
 
-        if not domain_base_dn == "":
+        domain_filter = conf.get('ldap', 'domain_filter')
+
+        if not domain == None:
+            domain_filter = domain_filter.replace('*', domain)
 
-            # If we haven't returned already, let's continue searching
-            domain_name_attribute = conf.get('ldap', 'domain_name_attribute')
+        if not domain_base_dn == "":
 
             _results = self._search(
                     domain_base_dn,
                     ldap.SCOPE_SUBTREE,
-                    "(%s=%s)" % (domain_name_attribute,domain),
+                    domain_filter,
                     override_search='_regular_search'
                 )
 
             domains = []
+
             for _domain in _results:
                 (domain_dn, _domain_attrs) = _domain
                 domain_rootdn_attribute = conf.get(
@@ -2163,11 +2166,17 @@
                 if _domain_attrs.has_key(domain_rootdn_attribute):
                     self.domain_rootdns[domain] = _domain_attrs[domain_rootdn_attribute]
                     return _domain_attrs[domain_rootdn_attribute]
+
                 else:
+                    domain_name_attribute = self.config_get('domain_name_attribute')
+                    if domain_name_attribute == None:
+                        domain_name_attribute = 'associateddomain'
+
                     if isinstance(_domain_attrs[domain_name_attribute], list):
                         domain = _domain_attrs[domain_name_attribute][0]
                     else:
                         domain = _domain_attrs[domain_name_attribute]
+
         else:
             if conf.has_option('ldap', 'base_dn'):
                 return conf.get('ldap', 'base_dn')

pykolab-0.7.4.tar.gz/pykolab/cli/cmd_mailbox_cleanup.py -> pykolab-0.7.5.tar.gz/pykolab/cli/cmd_mailbox_cleanup.py Changed

@@ -17,12 +17,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+import ldap
 import sys
 
 import commands
 
 import pykolab
 
+from pykolab import imap_utf7
 from pykolab.auth import Auth
 from pykolab.imap import IMAP
 from pykolab.translate import _
@@ -33,6 +35,16 @@
 def __init__():
     commands.register('mailbox_cleanup', execute, description=description())
 
+def cli_options():
+    my_option_group = conf.add_cli_parser_option_group(_("CLI Options"))
+    my_option_group.add_option(
+            '--dry-run',
+            dest    = "dryrun",
+            action  = "store_true",
+            default = False,
+            help    = _("Do not actually delete mailboxes, but report what mailboxes would have been deleted.")
+        )
+
 def description():
     return _("Clean up mailboxes that do no longer have an owner.")
 
@@ -47,19 +59,132 @@
     imap = IMAP()
     imap.connect()
 
-    folders = []
+    domain_folders = {}
 
-    for domain,aliases in domains:
-        folders.extend(imap.lm("user/%%@%s" % (domain)))
+    subjects = []
+    # Placeholder for subjects that would have already been deleted
+    subjects_deleted = []
 
-    for folder in folders:
-        user = folder.replace('user/','')
+    for domain in domains.keys():
+        domain_folders[domain] = imap.lm("user/%%@%s" % (domain))
+
+    for domain in domain_folders.keys():
+        auth = Auth(domain=domain)
+        auth.connect(domain)
 
-        recipient = auth.find_recipient(user)
+        for folder in domain_folders[domain]:
+            user = folder.replace('user/','')
 
-        if len(recipient) == 0 or recipient == []:
-            log.info(_("Deleting folder 'user/%s'") % (user))
             try:
-                imap.dm(folder)
-            except:
-                pass
\ No newline at end of file
+                recipient = auth.find_recipient(user)
+            except ldap.NO_SUCH_OBJECT, errmsg:
+                if not user in subjects_deleted and conf.dryrun:
+                    subjects_deleted.append(user)
+
+                if conf.dryrun:
+                    log.info(_("Would have deleted folder 'user/%s' (dryrun)") % (user))
+                else:
+                    log.info(_("Deleting folder 'user/%s'") % (user))
+                continue
+
+            if len(recipient) == 0 or recipient == []:
+                if not user in subjects_deleted and conf.dryrun:
+                    subjects_deleted.append(user)
+
+                if conf.dryrun:
+                    log.info(_("Would have deleted folder 'user/%s' (dryrun)") % (user))
+                else:
+                    log.info(_("Deleting folder 'user/%s'") % (user))
+                    try:
+                        imap.dm(folder)
+                    except:
+                        log.error(_("Error deleting folder 'user/%s'") % (user))
+            else:
+                log.debug(_("Valid recipient found for 'user/%s'") % (user), level=6)
+
+                if not user in subjects:
+                    subjects.append(user)
+
+    imap_domains = []
+    folders = imap.lm()
+    for folder in folders:
+        namespace = folder.split('/')[0]
+        mailbox = folder.split('/')[1]
+
+        if len(mailbox.split('@')) > 1:
+            domain = mailbox.split('@')[1]
+            if not domain in domains.keys() and not domain in imap_domains:
+                imap_domains.append(domain)
+
+    for domain in imap_domains:
+        for folder in imap.lm('user/%%@%s' % (domain)):
+
+            user = folder.replace('user/', '')
+
+            if not user in subjects_deleted and conf.dryrun:
+                subjects_deleted.append(user)
+
+            if conf.dryrun:
+                log.info(_("Would have deleted folder '%s' (dryrun)") % (folder))
+            else:
+                log.info(_("Deleting folder '%s'") % (folder))
+                try:
+                    imap.dm(folder)
+                except:
+                    log.error(_("Error deleting folder '%s'") % (folder))
+
+        for folder in imap.lm('shared/%%@%s' % (domain)):
+            if conf.dryrun:
+                log.info(_("Would have deleted folder '%s' (dryrun)") % (folder))
+            else:
+                log.info(_("Deleting folder '%s'") % (folder))
+                try:
+                    imap.dm(folder)
+                except:
+                    log.error(_("Error deleting folder '%s'") % (folder))
+
+    for folder in [x for x in imap.lm() if not x.startswith('DELETED/')]:
+        folder = imap_utf7.decode(folder)
+        acls = imap.list_acls(folder)
+
+        for subject in acls.keys():
+            if subject == 'anyone':
+                log.info(
+                        _("Skipping removal of ACL %s for subject %s on folder %s") % (
+                                acls[subject],
+                                subject,
+                                folder
+                            )
+                    )
+
+                continue
+
+            if not subject in subjects and not subject in subjects_deleted:
+                if conf.dryrun:
+                    log.info(
+                            _("Would have deleted ACL %s for subject %s on folder %s") % (
+                                    acls[subject],
+                                    subject,
+                                    folder
+                                )
+                        )
+                else:
+                    log.info(
+                            _("Deleting ACL %s for subject %s on folder %s") % (
+                                    acls[subject],
+                                    subject,
+                                    folder
+                                )
+                        )
+
+                    try:
+                        imap.set_acl(folder, aci_subject, '')
+                    except:
+                        log.error(
+                                _("Error removing ACL %s for subject %s from folder %s") % (
+                                        acls[subject],
+                                        subject,
+                                        folder
+                                    )
+                            )
+

pykolab-0.7.4.tar.gz/pykolab/cli/cmd_user_info.py -> pykolab-0.7.5.tar.gz/pykolab/cli/cmd_user_info.py Changed

pykolab-0.7.4.tar.gz/pykolab/imap/__init__.py -> pykolab-0.7.5.tar.gz/pykolab/imap/__init__.py Changed

@@ -122,7 +122,15 @@
 
         result = urlparse(uri)
 
-        if hasattr(result, 'hostname'):
+        if hasattr(result, 'netloc'):
+            scheme = result.scheme
+            if len(result.netloc.split(':')) > 1:
+                hostname = result.netloc.split(':')[0]
+                port = result.netloc.split(':')[1]
+            else:
+                hostname = result.netloc
+
+        elif hasattr(result, 'hostname'):
             hostname = result.hostname
         else:
             scheme = uri.split(':')[0]
@@ -131,12 +139,17 @@
         if not server == None:
             hostname = server
 
-        if port == None:
-            port = 993
-
         if scheme == None or scheme == "":
             scheme = 'imaps'
 
+        if port == None:
+            if scheme == "imaps":
+                port = 993
+            elif scheme == "imap":
+                port = 143
+            else:
+                port = 993
+
         uri = '%s://%s:%s' % (scheme, hostname, port)
 
         # Get the credentials
@@ -541,9 +554,9 @@
 
         return folder_name
 
-    def user_mailbox_create_additional_folders(self, folder, additional_folders):
+    def user_mailbox_create_additional_folders(self, user, additional_folders):
         log.debug(
-                _("Creating additional folders for user %s") % (folder),
+                _("Creating additional folders for user %s") % (user),
                 level=8
             )
 
@@ -552,6 +565,8 @@
         admin_login = conf.get(backend, 'admin_login')
         admin_password = conf.get(backend, 'admin_password')
 
+        folder = 'user%s%s' % (self.get_separator(), user)
+
         if self.imap_murder():
             server = self.user_mailbox_server(folder)
         else:
@@ -564,7 +579,7 @@
 
                 self.disconnect()
                 self.connect(login=False, server=server)
-                self.login_plain(admin_login, admin_password, folder)
+                self.login_plain(admin_login, admin_password, user)
                 (personal, other, shared) = self.namespaces()
                 success = True
             except Exception, errmsg:
@@ -622,12 +637,12 @@
                             "%s" % (additional_folders[additional_folder]["acls"][acl])
                         )
 
-        if len(folder.split('@')) > 1:
-            localpart = folder.split('@')[0]
-            domain = folder.split('@')[1]
+        if len(user.split('@')) > 1:
+            localpart = user.split('@')[0]
+            domain = user.split('@')[1]
             domain_suffix = "@%s" % (domain)
         else:
-            localpart = folder
+            localpart = user
             domain = None
             domain_suffix = ""
 
@@ -671,11 +686,11 @@
                     _subscribe = False
 
             if _subscribe:
-                log.debug(_("Subscribing %s to folder %s") % (folder, _folder), level=8)
+                log.debug(_("Subscribing %s to folder %s") % (user, _folder), level=8)
                 try:
                     self.subscribe(_folder)
                 except Exception, errmsg:
-                    log.error(_("Subscribing %s to folder %s failed: %r") % (folder, _folder, errmsg))
+                    log.error(_("Subscribing %s to folder %s failed: %r") % (user, _folder, errmsg))
 
         self.logout()
         self.connect(domain=self.domain)

pykolab-0.7.4.tar.gz/pykolab/setup/setup_roundcube.py -> pykolab-0.7.5.tar.gz/pykolab/setup/setup_roundcube.py Changed

pykolab-0.7.4.tar.gz/share/templates/roundcubemail/config.inc.php.tpl -> pykolab-0.7.5.tar.gz/share/templates/roundcubemail/config.inc.php.tpl Changed

pykolab-0.7.4.tar.gz/share/templates/roundcubemail/managesieve.inc.php.tpl -> pykolab-0.7.5.tar.gz/share/templates/roundcubemail/managesieve.inc.php.tpl Changed

pykolab.dsc Changed

Changes of Revision 126