Kolab Groupware OBS

pykolab.spec Changed

@@ -28,15 +28,13 @@
 
 Summary:            Kolab Groupware Solution
 Name:               pykolab
-Version:            0.7.9
-Release:            2%{?dist}
+Version:            0.7.10
+Release:            1%{?dist}
 License:            GPLv3+
 Group:              Applications/System
 URL:                http://kolab.org/
 
 Source0:            http://files.kolab.org/releases/%{name}-%{version}.tar.gz
-Patch0:             fix_wallace_pid_location_centos7.patch
-Patch1:             0001-set-default-kolab_freebusy_server-to-freebusy.patch
 
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:          noarch
@@ -202,9 +200,6 @@
 %prep
 %setup -q
 
-%patch0 -p1
-%patch1 -p1
-
 %build
 autoreconf -v || automake --add-missing && autoreconf -v
 %configure
@@ -527,6 +522,14 @@
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
 
 %changelog
+* Wed Feb 25 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.10-1
+- Release of version 0.7.10, see;
+
+  https://issues.kolab.org/buglist.cgi?target_milestone=0.7.10&product=pykolab
+
+* Mon Feb 23 2015 Daniel Hoffend <dh@dotlan.net> - 0.7.9-3
+- Default configuration now contains http-auth + trusted local ips
+
 * Mon Feb 23 2015 Daniel Hoffend <dh@dotlan.net> - 0.7.9-2
 - set default kolab_freebusy_server to /freebusy

0001-set-default-kolab_freebusy_server-to-freebusy.patch Deleted

@@ -1,24 +0,0 @@
-From c031071888487b5ab2d3d4501e8583e15f7ed6ce Mon Sep 17 00:00:00 2001
-From: Daniel Hoffend <dh@dotlan.net>
-Date: Tue, 24 Feb 2015 10:41:54 +0100
-Subject: [PATCH] set default kolab_freebusy_server to /freebusy
-
----
- share/templates/roundcubemail/libkolab.inc.php.tpl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/share/templates/roundcubemail/libkolab.inc.php.tpl b/share/templates/roundcubemail/libkolab.inc.php.tpl
-index 1e5ff60..cd34d07 100644
---- a/share/templates/roundcubemail/libkolab.inc.php.tpl
-+++ b/share/templates/roundcubemail/libkolab.inc.php.tpl
-@@ -1,6 +1,6 @@
- <?php
- 
--    \$config['kolab_freebusy_server'] = 'http://' . \$_SERVER["HTTP_HOST"] . '/freebusy';
-+    \$config['kolab_freebusy_server'] = '/freebusy';
- 
-     if (file_exists(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__))) {
-         include_once(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
--- 
-1.9.1
-

fix_wallace_pid_location_centos7.patch Deleted

@@ -1,40 +0,0 @@
-From 2560d642b84828e6feba4d934b3b7f8e589d141a Mon Sep 17 00:00:00 2001
-From: Timotheus Pokorra <tp@tbits.net>
-Date: Mon, 23 Feb 2015 07:31:21 +0100
-Subject: [PATCH] CentOS7 systemd: use /run/wallaced as location for the pid file (#4673)
- instead of a mix of /var/run/wallaced and /run/wallaced
-
----
- wallace/wallace.systemd         |    4 ++--
- wallace/wallace.tmpfiles.d.conf |    2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/wallace/wallace.systemd b/wallace/wallace.systemd
-index 38a6604..c033269 100644
---- a/wallace/wallace.systemd
-+++ b/wallace/wallace.systemd
-@@ -4,11 +4,11 @@ After=syslog.target network.target
- 
- [Service]
- Type=forking
--PIDFile=/var/run/wallaced/wallaced.pid
-+PIDFile=/run/wallaced/wallaced.pid
- User=kolab
- Group=kolab
- EnvironmentFile=/etc/sysconfig/wallace
--ExecStart=/usr/sbin/wallaced $FLAGS
-+ExecStart=/usr/sbin/wallaced $FLAGS --pid-file /run/wallaced/wallaced.pid
- ExecReload=/bin/kill -HUP $MAINPID
- ExecStop=/bin/kill -TERM $MAINPID
- 
-diff --git a/wallace/wallace.tmpfiles.d.conf b/wallace/wallace.tmpfiles.d.conf
-index 7dd659a..b072311 100644
---- a/wallace/wallace.tmpfiles.d.conf
-+++ b/wallace/wallace.tmpfiles.d.conf
-@@ -1,2 +1,2 @@
--d /var/run/wallaced   750   kolab kolab
-+d /run/wallaced   750   kolab kolab
- 
--- 
-1.7.1
-

debian.changelog Changed

debian.series Changed

pykolab-0.7.9.tar.gz/configure.ac -> pykolab-0.7.10.tar.gz/configure.ac Changed

pykolab-0.7.9.tar.gz/po/POTFILES.skip -> pykolab-0.7.10.tar.gz/po/POTFILES.skip Changed

@@ -1,34 +1,1 @@
-._conf.py
-pykolab/auth/.___init__.py
-pykolab/auth/ldap/._auth_cache.py
-pykolab/auth/ldap/.___init__.py
-pykolab/._base.py
-pykolab/cli/._cmd_add_alias.py
-pykolab/cli/._cmd_list_messages.py
-pykolab/conf/._defaults.py
-pykolab/conf/.___init__.py
 pykolab/constants.py
-pykolab/imap/._cyrus.py
-pykolab/imap/.___init__.py
-pykolab/.___init__.py
-pykolab/itip/.___init__.py
-pykolab/._translate.py
-pykolab/._utils.py
-pykolab/xml/._event.py
-pykolab/xml/._todo.py
-pykolab/xml/._utils.py
-tests/functional/._resource_func.py
-tests/functional/._synchronize.py
-tests/functional/test_wallace/._test_005_resource_invitation.py
-tests/functional/test_wallace/._test_007_invitationpolicy.py
-tests/unit/._test-003-event.py
-tests/unit/._test-004-icalendar.py
-tests/unit/._test-011-itip.py
-tests/unit/._test-011-wallace_resources.py
-tests/unit/._test-012-wallace_invitationpolicy.py
-._test-wallace.py
-wallace/.___init__.py
-wallace/._module_invitationpolicy.py
-wallace/._module_resources.py
-wallace/._modules.py
-._wallace.py

pykolab-0.7.9.tar.gz/po/pykolab.pot -> pykolab-0.7.10.tar.gz/po/pykolab.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-14 01:36+0100\n"
+"POT-Creation-Date: 2015-02-23 21:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -368,7 +368,7 @@
 msgid "Could not connect to LDAP, is it running?"
 msgstr ""
 
-#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2242
+#: ../kolabd/__init__.py:233 ../pykolab/auth/ldap/__init__.py:2261
 #: ../pykolab/cli/cmd_sync.py:67
 msgid "Listing domains..."
 msgstr ""
@@ -510,254 +510,254 @@
 "ldap search: (%r, %r, filterstr='(objectclass=*)', attrlist=[ 'dn' ] + %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:481
+#: ../pykolab/auth/ldap/__init__.py:500
 #, python-format
 msgid "Finding recipient with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:557
+#: ../pykolab/auth/ldap/__init__.py:576
 #, python-format
 msgid "Finding resource with filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:588
+#: ../pykolab/auth/ldap/__init__.py:607
 #, python-format
 msgid "Using timestamp %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:625
+#: ../pykolab/auth/ldap/__init__.py:644
 #, python-format
 msgid "Not applying recipient policy for %s "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:635
+#: ../pykolab/auth/ldap/__init__.py:654
 #, python-format
 msgid "Applying recipient policy to %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:652
+#: ../pykolab/auth/ldap/__init__.py:671
 #, python-format
 msgid "Using mail attributes: %r, with primary %r and "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:663
+#: ../pykolab/auth/ldap/__init__.py:682
 #, python-format
 msgid "key %r not in entry"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:665
+#: ../pykolab/auth/ldap/__init__.py:684
 #, python-format
 msgid "key %r is the prim. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:667
+#: ../pykolab/auth/ldap/__init__.py:686
 msgid "prim. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:670
+#: ../pykolab/auth/ldap/__init__.py:689
 #, python-format
 msgid "key %r is the sec. mail attr."
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:672
+#: ../pykolab/auth/ldap/__init__.py:691
 msgid "sec. mail pol. is not empty"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:676 ../pykolab/auth/ldap/__init__.py:690
+#: ../pykolab/auth/ldap/__init__.py:695 ../pykolab/auth/ldap/__init__.py:709
 #, python-format
 msgid "Attributes %r are not yet available for entry %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:729
+#: ../pykolab/auth/ldap/__init__.py:748
 #, python-format
 msgid "No results for mail address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:740
+#: ../pykolab/auth/ldap/__init__.py:759
 #, python-format
 msgid "1 result for address %s found, verifying"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:750
+#: ../pykolab/auth/ldap/__init__.py:769
 #, python-format
 msgid "Too bad, primary email address %s "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:761 ../pykolab/auth/ldap/__init__.py:850
+#: ../pykolab/auth/ldap/__init__.py:780 ../pykolab/auth/ldap/__init__.py:869
 msgid "Address assigned to us"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:816
+#: ../pykolab/auth/ldap/__init__.py:835
 #, python-format
 msgid "No results for address %s found"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:827
+#: ../pykolab/auth/ldap/__init__.py:846
 #, python-format
 msgid "1 result for address %s found, "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:838
+#: ../pykolab/auth/ldap/__init__.py:857
 msgid "Too bad, secondary email "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:865
+#: ../pykolab/auth/ldap/__init__.py:884
 msgid "Recipient policy composed the following set of secondary "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:876
+#: ../pykolab/auth/ldap/__init__.py:895
 #, python-format
 msgid "Secondary mail addresses that we want is not None: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:887
+#: ../pykolab/auth/ldap/__init__.py:906
 msgid "Avoiding the duplication of the primary mail "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:898
+#: ../pykolab/auth/ldap/__init__.py:917
 #, python-format
 msgid "Entry is getting secondary mail addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:906
+#: ../pykolab/auth/ldap/__init__.py:925
 msgid "Entry did not have any secondary mail "
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:923 ../pykolab/auth/ldap/__init__.py:929
+#: ../pykolab/auth/ldap/__init__.py:942 ../pykolab/auth/ldap/__init__.py:948
 #, python-format
 msgid "secondary_mail_addresses: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:924 ../pykolab/auth/ldap/__init__.py:930
+#: ../pykolab/auth/ldap/__init__.py:943 ../pykolab/auth/ldap/__init__.py:949
 #, python-format
 msgid "entry[%s]: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:941
+#: ../pykolab/auth/ldap/__init__.py:960
 #, python-format
 msgid "Entry modifications list: %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:969
+#: ../pykolab/auth/ldap/__init__.py:988
 #, python-format
 msgid "Setting entry attribute %r to %r for %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1005
+#: ../pykolab/auth/ldap/__init__.py:1024
 #, python-format
 msgid ""
 "Could not update dn %r:\n"
 "%r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1031
+#: ../pykolab/auth/ldap/__init__.py:1050
 #, python-format
 msgid "Using filter %r"
 msgstr ""
 
-#: ../pykolab/auth/ldap/__init__.py:1046
+#: ../pykolab/auth/ldap/__init__.py:1065
 #, python-format

pykolab-0.7.9.tar.gz/pykolab/setup/setup_freebusy.py -> pykolab-0.7.10.tar.gz/pykolab/setup/setup_freebusy.py Changed

@@ -21,6 +21,7 @@
 import os
 import sys
 import time
+import socket
 from urlparse import urlparse
 
 import components
@@ -92,6 +93,17 @@
     users_imap_uri = '%s://%%s:%s@%s:%s/?proxy_auth=%s' % (scheme, admin_password, hostname, port, admin_login)
 
     freebusy_settings = {
+            'httpauth': {
+                    'type': 'ldap',
+                    'host': conf.get('ldap', 'ldap_uri'),
+                    'base_dn': conf.get('ldap', 'base_dn'),
+                    'bind_dn': conf.get('ldap', 'service_bind_dn'),
+                    'bind_pw': conf.get('ldap', 'service_bind_pw'),
+                    'filter': '(&(objectClass=kolabInetOrgPerson)(|(mail=%s)(alias=%s)(uid=%s)))',
+                },
+            'trustednetworks': {
+                    'allow': ','.join(get_local_ips())
+                },
             'directory "local"': {
                     'type': 'static',
                     'fbsource': 'file:/var/lib/kolab-freebusy/%s.ifb',
@@ -167,3 +179,13 @@
     cfg_parser.write(fp)
     fp.close()
 
+def get_local_ips():
+    ips = ['::1','127.0.0.1']
+    for family in [socket.AF_INET, socket.AF_INET6]:
+        try:
+            for ip in socket.getaddrinfo(socket.getfqdn(), None, family):
+                if ip[4][0] not in ips:
+                    ips.append(ip[4][0])
+        except:
+            pass
+    return ips

pykolab-0.7.9.tar.gz/pykolab/translate.py -> pykolab-0.7.10.tar.gz/pykolab/translate.py Changed

pykolab-0.7.9.tar.gz/pykolab/xml/event.py -> pykolab-0.7.10.tar.gz/pykolab/xml/event.py Changed

pykolab-0.7.9.tar.gz/share/templates/roundcubemail/libkolab.inc.php.tpl -> pykolab-0.7.10.tar.gz/share/templates/roundcubemail/libkolab.inc.php.tpl Changed

pykolab-0.7.9.tar.gz/tests/unit/test-003-event.py -> pykolab-0.7.10.tar.gz/tests/unit/test-003-event.py Changed

@@ -690,6 +690,33 @@
         occurrence = event.get_next_instance(event.get_start())
         self.assertEqual(occurrence.get_summary(), "Exception")
 
+    def test_021_allday_recurrence(self):
+        rrule = kolabformat.RecurrenceRule()
+        rrule.setFrequency(kolabformat.RecurrenceRule.Daily)
+        rrule.setCount(10)
+
+        self.event = Event()
+        self.event.set_summary('alldays')
+        self.event.set_recurrence(rrule);
+
+        _start = datetime.date(2015,1,1)
+        self.event.set_start(_start)
+        self.event.set_end(_start)
+
+        exdate = datetime.date(2015,1,5)
+        xmlexception = Event(from_string=str(self.event))
+        xmlexception.set_start(exdate)
+        xmlexception.set_end(exdate)
+        xmlexception.set_recurrence_id(exdate, False)
+        xmlexception.set_status('CANCELLED')
+        self.event.add_exception(xmlexception)
+
+        inst3 = self.event.get_instance(datetime.date(2015,1,3))
+        self.assertEqual(inst3.get_start(), datetime.date(2015,1,3))
+
+        inst5 = self.event.get_instance(exdate)
+        self.assertEqual(inst5.get_status(True), 'CANCELLED')
+
     def test_021_ical_exceptions(self):
         self.event.set_summary("test")
         self.event.set_start(datetime.datetime(2014, 05, 23, 11, 00, 00, tzinfo=pytz.timezone("Europe/London")))

pykolab-0.7.9.tar.gz/wallace/module_invitationpolicy.py -> pykolab-0.7.10.tar.gz/wallace/module_invitationpolicy.py Changed

pykolab-0.7.9.tar.gz/wallace/wallace.systemd -> pykolab-0.7.10.tar.gz/wallace/wallace.systemd Changed

pykolab-0.7.9.tar.gz/wallace/wallace.tmpfiles.d.conf -> pykolab-0.7.10.tar.gz/wallace/wallace.tmpfiles.d.conf Changed

pykolab.dsc Changed

Changes of Revision 150