Request 1762 (accepted)

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

Request 1762 (accepted)

Check in 0.8.3

Created by vanmeeuwen almost 8 years ago
In state accepted

Submit pykolab

Submit package Kolab:Winterfell / pykolab to package Kolab:16 / pykolab

pykolab.spec Changed

@@ -28,17 +28,17 @@
 
 Summary:            Kolab Groupware Solution
 Name:               pykolab
-Version:            0.8.1
-Release:            2%{?dist}
+Version:            0.8.3
+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
+Patch0002:          0001-Call-the-correct-functions.patch
 
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:          noarch
@@ -232,7 +232,10 @@
 %prep
 %setup -q
 
+%if 0%{?kolab_enterprise}
 %patch0001 -p1
+%endif
+
 %patch0002 -p1
 
 %build
@@ -281,6 +284,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
@@ -560,6 +567,9 @@
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
 
 %changelog
+* Fri Jul 22 2016 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.3-1
+- Release of version 0.8.3
+
 * Wed Mar 09 2016 Timotheus Pokorra <tp@tbits.net> - 0.8.1-2
 - wallace requires python-gnupg to be installed. avoid ImportError: No module named gnupg

0001-Call-the-correct-functions.patch Added

@@ -0,0 +1,33 @@
+From 8e7ae3827770acf071eaea187f017d099d210e95 Mon Sep 17 00:00:00 2001
+From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
+Date: Fri, 8 Jul 2016 13:16:55 +0200
+Subject: [PATCH] Call the correct functions
+
+---
+ kolabd/__init__.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/kolabd/__init__.py b/kolabd/__init__.py
+index 9629836..a5869d5 100644
+--- a/kolabd/__init__.py
++++ b/kolabd/__init__.py
+@@ -285,7 +285,7 @@ class KolabDaemon(object):
+ 
+             for primary in primaries:
+                 naming_context = primary_auth.domain_naming_context(primary)
+-                domain_root_dn = primary_auth.domain_root_dn(primary)
++                domain_root_dn = primary_auth._auth._kolab_domain_root_dn(primary)
+                 log.debug(
+                         _("Domain %r naming context: %r, root dn: %r") % (
+                                 primary,
+@@ -307,7 +307,6 @@ class KolabDaemon(object):
+ 
+             # 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.
+-- 
+2.7.4
+

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

@@ -1,3 +1,15 @@
+pykolab (0.8.3-0~kolab1) unstable; urgency=low
+
+  * Upstream release of version 0.8.3
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Fri, 22 Jul 2016 01:49:00 +0100
+
+pykolab (0.8.2-0~kolab1) unstable; urgency=low
+
+  * Release of 0.8.2
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu,  7 Jul 2016 01:49:00 +0100
+
 pykolab (0.8.1-0~kolab1) unstable; urgency=low
 
   * Fix setup
@@ -32,7 +44,7 @@
 
   * Leave changes related to #4459 in, dpkg-source cannot deal with them
 
- -- Christoph Wickert <wickert@kolabsys.com>  Mon, Jun 08 2015 17:30:46 +0200
+ -- Christoph Wickert <wickert@kolabsys.com>  Mon, 08 Jun 2015 17:30:46 +0200
 
 pykolab (0.7.14-0~kolab3) unstable; urgency=low
 
@@ -41,7 +53,7 @@
   * Fix lock check after changed in rP929e67a6
   * Make 'kolab sync' properly create mailboxes (#3975)
 
- -- Christoph Wickert <wickert@kolabsys.com>  Mon, Jun 08 2015 16:42:47 +0200
+ -- Christoph Wickert <wickert@kolabsys.com>  Mon, 08 Jun 2015 16:42:47 +0200
 
 pykolab (0.7.14-0~kolab2) unstable; urgency=low

debian.control Changed

debian.series Changed

pykolab-0.8.1.tar.gz -> pykolab-0.8.3.tar.gz 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.3-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.3.tar.gz
  00000000000000000000000000000000 0 debian.tar.gz

Build Results
RPM Lint

Refresh

Comments for request 1762 0

Request History

vanmeeuwen created request almost 8 years ago

Check in 0.8.3

vanmeeuwen accepted review almost 8 years ago

vanmeeuwen approved review almost 8 years ago

vanmeeuwen accepted review almost 8 years ago

vanmeeuwen accepted request almost 8 years ago