Kolab Groupware OBS

pykolab.spec Changed

@@ -28,17 +28,16 @@
 
 Summary:            Kolab Groupware Solution
 Name:               pykolab
-Version:            0.8.1
-Release:            2%{?dist}
+Version:            0.8.2
+Release:            1%{?dist}
 License:            GPLv3+
 Group:              Applications/System
 URL:                http://kolab.org/
 
-Source0:            pykolab-0.8.1.tar.gz
+Source0:            pykolab-0.8.2.tar.gz
 Source1:            pykolab.logrotate
 
-Patch0001:          0001-Use-the-correct-constants-import-and-__version__-val.patch
-Patch0002:          0002-ID-directly-after-authentication-before-asking-for-a.patch
+Patch0001:          pykolab-0.8-patch-out-manticore.patch
 
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:          noarch
@@ -232,8 +231,9 @@
 %prep
 %setup -q
 
+%if 0%{?kolab_enterprise}
 %patch0001 -p1
-%patch0002 -p1
+%endif
 
 %build
 autoreconf -v || automake --add-missing && autoreconf -v
@@ -281,6 +281,10 @@
 %fdupes %{buildroot}/%{python_sitelib}
 %endif
 
+%if 0%{?kolab_enterprise}
+rm -rf %{buildroot}%{python_sitelib}/pykolab/setup/setup_manticore.py*
+%endif
+
 %pre
 # Add the kolab user and group accounts
 getent group %{kolab_group} &>/dev/null || groupadd -r %{kolab_group} -g %{kolab_group_id} &>/dev/null

0001-Use-the-correct-constants-import-and-__version__-val.patch Deleted

@@ -1,35 +0,0 @@
-From f251c62827c1696dd2e0369800c82cc569c57011 Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Fri, 1 Jul 2016 16:31:50 +0200
-Subject: [PATCH 1/2] Use the correct constants import and __version__ value
- from it
-
----
- pykolab/imap/cyrus.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/pykolab/imap/cyrus.py b/pykolab/imap/cyrus.py
-index 63b0615..2057a38 100644
---- a/pykolab/imap/cyrus.py
-+++ b/pykolab/imap/cyrus.py
-@@ -25,7 +25,7 @@ from urlparse import urlparse
- 
- import pykolab
- 
--from pykolab.constants import *
-+from pykolab import constants
- from pykolab.imap import IMAP
- from pykolab.translate import _
- 
-@@ -278,7 +278,7 @@ class Cyrus(cyruslib.CYRUS):
- 
-     def _id(self, identity=None):
-         if identity is None:
--            identity = '("name" "Python/Kolab" "version" "%s")' % (__version__)
-+            identity = '("name" "Python/Kolab" "version" "%s")' % (constants.__version__)
- 
-         typ, dat = self.m._simple_command('ID', identity)
-         res, dat = self.m._untagged_response(typ, dat, 'ID')
--- 
-2.5.5
-

0002-ID-directly-after-authentication-before-asking-for-a.patch Deleted

@@ -1,80 +0,0 @@
-From 132ea08148dfb903af3bffa1a2f74c7145a6e504 Mon Sep 17 00:00:00 2001
-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
-Date: Mon, 4 Jul 2016 09:36:48 +0200
-Subject: [PATCH 2/2] ID directly after authentication, before asking for admin
- or hierarchy separators
-
----
- cyruslib.py | 12 ++++++++----
- 1 file changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/cyruslib.py b/cyruslib.py
-index 3802c00..9e42f39 100644
---- a/cyruslib.py
-+++ b/cyruslib.py
-@@ -130,7 +130,7 @@ class IMAP4(imaplib.IMAP4):
- 
-     def id(self):
-         try:
--            typ, dat = self._simple_command('ID', 'NIL')
-+            typ, dat = self._simple_command('ID', '("name" "PyKolab/Kolab")')
-             res, dat = self._untagged_response(typ, dat, 'ID')
-         except:
-             return False, dat[0]
-@@ -211,7 +211,7 @@ class IMAP4_SSL(imaplib.IMAP4_SSL):
- 
-     def id(self):
-         try:
--            typ, dat = self._simple_command('ID', 'NIL')
-+            typ, dat = self._simple_command('ID', '("name" "PyKolab/Kolab")')
-             res, dat = self._untagged_response(typ, dat, 'ID')
-         except:
-             return False, dat[0]
-@@ -275,6 +275,7 @@ class IMAP4_SSL(imaplib.IMAP4_SSL):
-             encoded = b2a_base64("%s\0%s\0%s" % (admin, admin, password)).strip()
- 
-         res, data = self._simple_command('AUTHENTICATE', 'PLAIN', encoded)
-+        self.AUTH = True
-         if ok(res):
-             self.state = 'AUTH'
-         return res, data
-@@ -409,8 +410,11 @@ class CYRUS:
-             self.__doexception("LOGIN", self.ERROR.get("AUTH")[1])
-         try:
-             res, msg = self.m.login(username, password)
-+            self.AUTH = True
-+            self.id()
-             admin = self.m.isadmin()
-         except Exception, info:
-+            self.AUTH = False
-             error = str(info).split(':').pop().strip()
-             self.__doexception("LOGIN", error)
- 
-@@ -418,7 +422,6 @@ class CYRUS:
-             self.ADMIN = username
- 
-         self.SEP = self.m.getsep()
--        self.AUTH = True
-         self.__verbose( '[LOGIN %s] %s: %s' % (username, res, msg[0]) )
- 
-     def login_plain(self, username, password, asUser = None):
-@@ -430,6 +433,8 @@ class CYRUS:
-         self.__verbose( '[AUTHENTICATE PLAIN %s] %s: %s' % (username, res, msg[0]) )
- 
-         if ok(res):
-+            self.AUTH = True
-+            self.id()
-             if asUser is None:
-                 if self.m.isadmin():
-                     self.ADMIN = admin
-@@ -437,7 +442,6 @@ class CYRUS:
-                 self.ADMIN = asUser
-                 self.AUSER = asUser
-             self.SEP = self.m.getsep()
--            self.AUTH = True
- 
-     def logout(self):
-         try:
--- 
-2.5.5
-

pykolab-0.8-patch-out-manticore.patch Added

debian.changelog Changed

debian.control Changed

debian.series Changed

pykolab-0.8.1.tar.gz/configure.ac -> pykolab-0.8.2.tar.gz/configure.ac Changed

pykolab-0.8.1.tar.gz/cyruslib.py -> pykolab-0.8.2.tar.gz/cyruslib.py Changed

@@ -130,7 +130,7 @@
 
     def id(self):
         try:
-            typ, dat = self._simple_command('ID', 'NIL')
+            typ, dat = self._simple_command('ID', '("name" "PyKolab/Kolab")')
             res, dat = self._untagged_response(typ, dat, 'ID')
         except:
             return False, dat[0]
@@ -211,7 +211,7 @@
 
     def id(self):
         try:
-            typ, dat = self._simple_command('ID', 'NIL')
+            typ, dat = self._simple_command('ID', '("name" "PyKolab/Kolab")')
             res, dat = self._untagged_response(typ, dat, 'ID')
         except:
             return False, dat[0]
@@ -275,6 +275,7 @@
             encoded = b2a_base64("%s\0%s\0%s" % (admin, admin, password)).strip()
 
         res, data = self._simple_command('AUTHENTICATE', 'PLAIN', encoded)
+        self.AUTH = True
         if ok(res):
             self.state = 'AUTH'
         return res, data
@@ -409,8 +410,11 @@
             self.__doexception("LOGIN", self.ERROR.get("AUTH")[1])
         try:
             res, msg = self.m.login(username, password)
+            self.AUTH = True
+            self.id()
             admin = self.m.isadmin()
         except Exception, info:
+            self.AUTH = False
             error = str(info).split(':').pop().strip()
             self.__doexception("LOGIN", error)
 
@@ -418,7 +422,6 @@
             self.ADMIN = username
 
         self.SEP = self.m.getsep()
-        self.AUTH = True
         self.__verbose( '[LOGIN %s] %s: %s' % (username, res, msg[0]) )
 
     def login_plain(self, username, password, asUser = None):
@@ -430,6 +433,8 @@
         self.__verbose( '[AUTHENTICATE PLAIN %s] %s: %s' % (username, res, msg[0]) )
 
         if ok(res):
+            self.AUTH = True
+            self.id()
             if asUser is None:
                 if self.m.isadmin():
                     self.ADMIN = admin
@@ -437,7 +442,6 @@
                 self.ADMIN = asUser
                 self.AUSER = asUser
             self.SEP = self.m.getsep()
-            self.AUTH = True
 
     def logout(self):
         try:

pykolab-0.8.1.tar.gz/kolabd/__init__.py -> pykolab-0.8.2.tar.gz/kolabd/__init__.py Changed

@@ -268,21 +268,47 @@
                 time.sleep(5)
                 continue
 
-            # domains now is a list of tuples in the format of
-            # ('primary',[secondaries]), we want the primary_domains
-            domain_base_dns = []
-            primary_domains = []
-            for primary_domain in list(set(domains.values())):
-                domain_base_dn = primary_auth.domain_naming_context(primary_domain)
-                log.debug(_("Domain Base DN for domain %r is %r") % (primary_domain, domain_base_dn), level=8)
-
-                if domain_base_dn is not None:
-                    if domain_base_dn not in domain_base_dns:
-                        domain_base_dns.append(domain_base_dn)
-                        primary_domain = primary_auth.primary_domain_for_naming_context(domain_base_dn)
-                        primary_domains.append(primary_domain)
-
-            log.debug(_("Naming contexts to synchronize: %r") % (primary_domains), level=8)
+            # domains now is a list of key-valye pairs in the format of
+            # {'secondary': 'primary'}, we want the primaries
+            primaries = list(set(domains.values()))
+
+            # Store the naming contexts for the domains as
+            #
+            #   {'domain': 'naming context'}
+            #
+            # and the domain root dns as
+            #
+            #   {'domain': 'domain root dn'}
+            #
+            domain_root_dns = {}
+            naming_contexts = {}
+
+            for primary in primaries:
+                naming_context = primary_auth.domain_naming_context(primary)
+                domain_root_dn = primary_auth.domain_root_dn(primary)
+                log.debug(
+                        _("Domain %r naming context: %r, root dn: %r") % (
+                                primary,
+                                naming_context,
+                                domain_root_dn
+                            ),
+                        level=8
+                    )
+
+                domain_root_dns[primary] = domain_root_dn
+                naming_contexts[primary] = naming_context
+
+            log.debug(
+                    _("Naming contexts to synchronize: %r") % (
+                            list(set(naming_contexts.values()))
+                        ),
+                    level=8
+                )
+
+            # Find however many naming contexts we have, and what the
+            # corresponding domain name is for them.
+            naming_contexts = list(set(naming_contexts.values()))
+            primary_domains = [x for x,y in naming_contexts.iteritems() if domain_root_dns[x] == y]
 
             # Now we can check if any changes happened.
             added_domains = []
@@ -292,7 +318,7 @@
             # accounted for locally.
             all_domains = list(set(primary_domains + domain_auth.keys()))
 
-            log.debug(_("All naming contexts: %r") % (all_domains), level=8)
+            log.debug(_("Result set of domains: %r") % (all_domains), level=8)
 
             for domain in all_domains:
                 log.debug(_("Checking for domain %s") % (domain), level=8)

pykolab-0.8.1.tar.gz/pykolab/imap/__init__.py -> pykolab-0.8.2.tar.gz/pykolab/imap/__init__.py Changed

pykolab-0.8.1.tar.gz/pykolab/imap/cyrus.py -> pykolab-0.8.2.tar.gz/pykolab/imap/cyrus.py Changed

pykolab-0.8.1.tar.gz/wallace/__init__.py -> pykolab-0.8.2.tar.gz/wallace/__init__.py Changed

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.1-0~kolab1
+Version: 0.8.2-0~kolab1
 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
 Uploaders: Paul Klos <kolab@klos2day.nl>
 Homepage: http://www.kolab.org
@@ -28,8 +28,8 @@
                 python-icalendar,
                 python-minimal,
                 python-nose,
-                univention-config-dev | bash
-Package-List: 
+                univention-config-dev | bash (>= 1.0)
+Package-List:
  kolab-cli deb python optional
  kolab-conf deb python optional
  kolab-saslauthd deb python optional
@@ -38,6 +38,6 @@
  kolab-xml deb python optional
  pykolab deb python optional
  wallace deb python optional
-Files: 
- 00000000000000000000000000000000 0 pykolab-0.8.1.tar.gz
+Files:
+ 00000000000000000000000000000000 0 pykolab-0.8.2.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

Changes of Revision 16