@@ -51,15 +51,17 @@

 %endif

 %endif

+%global upstream_version 0.9.0

+

 Summary:            Kolab Groupware Solution

 Name:               pykolab

-Version:            0.9.0

+Version: 0.9.0.3

 Release:            1%{?dist}

 License:            GPLv3+

 Group:              Applications/System

 URL:                http://kolab.org/

-Source0:            pykolab-%{version}.tar.gz

+Source0:            pykolab-%{upstream_version}.tar.gz

 Source1:            pykolab.logrotate

 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root

@@ -248,7 +250,7 @@

 This is the Kolab Content Filter, with plugins

 %prep

-%setup -q

+%setup -q -n %{name}-%{upstream_version}

 %build

 autoreconf -v || automake --add-missing && autoreconf -v

​

@@ -1,4 +1,4 @@

-pykolab (0.9.0-0~kolab4) unstable; urgency=low

+pykolab (0.9.0.3-0~kolab4) unstable; urgency=low

   * Release of version 0.9.0

​

@@ -14,6 +14,9 @@

     pass

 def contact_from_string(string):

+    if isinstance(string, bytes):

+        string = string.decode('utf-8')

+

     _xml = kolabformat.readContact(string, False)

     return Contact(_xml)

​

@@ -31,6 +31,8 @@

     return Event(from_ical=ical, from_string=string)

 def event_from_string(string):

+    if isinstance(string, bytes):

+        string = string.decode('utf-8')

     return Event(from_string=string)

 def event_from_message(message):

​

@@ -7,6 +7,8 @@

 from pykolab.xml.utils import ustr

 def note_from_string(string):

+    if isinstance(string, bytes):

+        string = string.decode('utf-8')

     _xml = kolabformat.readNote(string, False)

     return Note(_xml)

​

@@ -19,6 +19,8 @@

     return Todo(from_ical=ical, from_string=string)

 def todo_from_string(string):

+    if isinstance(string, bytes):

+        string = string.decode('utf-8')

     return Todo(from_string=string)

 def todo_from_message(message):

​

@@ -21,7 +21,6 @@

 import tempfile

 import time

-from email import message_from_string

 from email.mime.base import MIMEBase

 from email.mime.text import MIMEText

 from email.parser import Parser

​

@@ -34,7 +34,7 @@

 import traceback

 import re

-from email import message_from_string

+from email import message_from_bytes

 from email.parser import Parser

 from email.utils import formataddr

 from email.utils import getaddresses

@@ -858,33 +858,25 @@

             if len(_ns for _ns in ns_shared if folder.startswith(_ns)) > 0:

                 continue

-        key = ('/shared' + FOLDER_TYPE_ANNOTATION).encode('utf-8')

-        if key in metadata:

-            if metadatakey.startswith(_type):

-                result.append(folder)

-

         key = ('/private' + FOLDER_TYPE_ANNOTATION).encode('utf-8')

-        if key in metadata:

-            if metadatakey.startswith(_type):

-                result.append(folder)

-

-            # store default folder in user record

+        if key in metadata and metadatakey.startswith(_type):

+            # store default,private and confidential folders in user record

             if metadatakey.endswith(b'.default'):

-                user_rec'_default_folder' = folder

-                continue

-

-            # store private and confidential folders in user record

-            if metadatakey.endswith(b'.confidential'):

+                if '_default_folder' not in user_rec:

+                    user_rec'_default_folder' = folder

+            elif metadatakey.endswith(b'.confidential'):

                 if '_confidential_folder' not in user_rec:

                     user_rec'_confidential_folder' = folder

-

-                continue

-

-            if metadatakey.endswith(b'.private'):

+            elif metadatakey.endswith(b'.private'):

                 if '_private_folder' not in user_rec:

                     user_rec'_private_folder' = folder

-                continue

+            result.append(folder)

+            continue

+

+        key = ('/shared' + FOLDER_TYPE_ANNOTATION).encode('utf-8')

+        if key in metadata and metadatakey.startswith(_type):

+            result.append(folder)

     # cache with user record

     user_rec'_imap_folders' = result

@@ -915,16 +907,16 @@

             res, data = imap.imap.m.fetch(num, '(UID RFC822)')

             try:

-                msguid = re.search(r"\WUID (\d+)", data00).group(1)

+                msguid = re.search(r"\WUID (\d+)", data00.decode('utf-8')).group(1)

             except Exception:

                 log.error(_("No UID found in IMAP response: %r") % (data00))

                 continue

             try:

                 if type == 'task':

-                    event = todo_from_message(message_from_string(data01))

+                    event = todo_from_message(message_from_bytes(data01))

                 else:

-                    event = event_from_message(message_from_string(data01))

+                    event = event_from_message(message_from_bytes(data01))

                 # find instance in a recurring series

                 if recurrence_id and (event.is_recurring() or event.has_exceptions() or event.get_recurrence_id()):

@@ -982,7 +974,7 @@

             res, data = imap.imap.m.fetch(num, '(RFC822)')

             try:

-                event = event_from_message(message_from_string(data01))

+                event = event_from_message(message_from_bytes(data01))

             except Exception as errmsg:

                 log.error(_("Failed to parse event from message %s/%s: %r") % (folder, num, errmsg))

                 continue

@@ -1056,7 +1048,7 @@

 def get_lock_key(user, uid):

-    return hashlib.md5("%s/%s" % (user'mail', uid)).hexdigest()

+    return hashlib.md5(("%s/%s" % (user'mail', uid)).encode('utf-8')).hexdigest()

 def update_object(object, user_rec, master=None):

​

@@ -22,7 +22,7 @@

 import datetime

 import sys

-from email import message_from_string

+from email import message_from_bytes

 from email.parser import Parser

 from email.utils import formataddr

 from email.utils import getaddresses

@@ -665,7 +665,7 @@

         typ, data = imap.imap.m.fetch(num, '(RFC822)')

         try:

-            event = event_from_message(message_from_string(data01))

+            event = event_from_message(message_from_bytes(data01))

         # pylint: disable=broad-except

         except Exception as errmsg:

             log.error(_("Failed to parse event from message %s/%s: %r") % (mailbox, num, errmsg))

@@ -915,14 +915,14 @@

         typ, data = imap.imap.m.fetch(num, '(UID RFC822)')

         try:

-            msguid = re.search(r"\WUID (\d+)", data00).group(1)

+            msguid = re.search(r"\WUID (\d+)", data00.decode('utf-8')).group(1)

         # pylint: disable=broad-except

         except Exception:

             log.error(_("No UID found in IMAP response: %r") % (data00))

             continue

         try:

-            event = event_from_message(message_from_string(data01))

+            event = event_from_message(message_from_bytes(data01))

         # pylint: disable=broad-except

         except Exception as e:

             log.error(_("Failed to parse event from message %s/%s: %r") % (mailbox, num, e))

@@ -977,14 +977,14 @@

         typ, data = imap.imap.m.fetch(num, '(UID RFC822)')

         try:

-            msguid = re.search(r"\WUID (\d+)", data00).group(1)

+            msguid = re.search(r"\WUID (\d+)", data00.decode('utf-8')).group(1)

         # pylint: disable=broad-except

         except Exception:

             log.error(_("No UID found in IMAP response: %r") % (data00))

             continue

         try:

-            event = event_from_message(message_from_string(data01))

+            event = event_from_message(message_from_bytes(data01))

             # find instance in a recurring series

             if recurrence_id and (event.is_recurring() or event.has_exceptions()):

​

@@ -24,7 +24,6 @@

 import sys

 import time

-from email import message_from_string

 from email.message import Message

 from email.mime.base import MIMEBase

 from email.mime.message import MIMEMessage

​

@@ -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.9.0-0~kolab4

+Version: 0.9.0.3-1~kolab1

 DEBTRANSFORM-RELEASE: 1

 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>

 Uploaders: Paul Klos <kolab@klos2day.nl>

​

@@ -0,0 +1,15 @@

+#!/bin/bash

+

+./buildtarball.sh

+

+# Autobump the version

+CURRENT_VERSION=$(grep '^Version: ' ./*.spec | sed 's/Version: //') 

+NEW_VERSION=$(echo "$CURRENT_VERSION" | awk -F. '/0-9+\./{$NF++;print}' OFS=.)

+echo "Bumping from $CURRENT_VERSION to $NEW_VERSION"

+

+sed -i "s/$CURRENT_VERSION/$NEW_VERSION/" debian.changelog

+sed -i "s/^Version:.*/Version: $NEW_VERSION-1~kolab1/" ./*.dsc

+sed -i "s/^Version:.*/Version: $NEW_VERSION/" ./*.spec

+

+osc ci -m "New release $NEW_VERSION"

+osc sr Kolab:16 --yes -m "New release $NEW_VERSION"

​