@@ -37,8 +37,8 @@

 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}

 Name:           iRony

-Version:        0.4.2

-Release:       4%{?dist}

+Version:        0.4.3

+Release:       1%{?dist}

 Summary:        DAV for Kolab Groupware

 Group:          Applications/Internet

@@ -50,9 +50,6 @@

 Source1:        iRony.conf

 Source2:        iRony.logrotate

-Patch0001:      0001-Avoid-refering-to-kolab_auth-if-it-isn-t-actually-th.patch

-Patch0002:      0001-Support-shortlogins-via-the-username_domain-configur.patch

-

 BuildArch:      noarch

 Requires:       chwala >= 0.5.2

@@ -104,9 +101,6 @@

 %prep

 %setup -q

-%patch0001 -p1

-%patch0002 -p1

-

 %build

 rm -rvf vendor/sabre

@@ -191,6 +185,9 @@

 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name}

 %changelog

+* Thu Jan 16 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.3-1

+- Release of version 0.4.3

+

 * Tue Apr 23 2019 Christian Mollekopf (Kolab Systems) <mollekopf@kolabsys.com> - 0.4.2-4

 - Support shortlogins via the username_domain configuration option

​

@@ -1,27 +0,0 @@

-From ea645099ea398310270218c32ef9b6d068fb58fa Mon Sep 17 00:00:00 2001

-From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>

-Date: Thu, 11 Apr 2019 12:47:47 +0200

-Subject: [PATCH] Avoid refering to kolab_auth if it isn't actually there

-

----

- lib/Kolab/DAV/Auth/HTTPBasic.php | 4 +++-

- 1 file changed, 3 insertions(+), 1 deletion(-)

-

-diff --git a/lib/Kolab/DAV/Auth/HTTPBasic.php b/lib/Kolab/DAV/Auth/HTTPBasic.php

-index 4ba5ddf..616c752 100644

---- a/lib/Kolab/DAV/Auth/HTTPBasic.php

-+++ b/lib/Kolab/DAV/Auth/HTTPBasic.php

-@@ -101,7 +101,9 @@ class HTTPBasic extends DAV\Auth\Backend\AbstractBasic

-             $error_str = rcube::get_instance()->get_storage()->get_error_str();

-         }

- 

--        \kolab_auth::log_login_error($auth['user'], $error_str ?: $error);

-+        if (class_exists('kolab_auth')) {

-+            \kolab_auth::log_login_error($auth['user'], $error_str ?: $error);

-+        }

- 

-         // IMAP server failure... send 503 error

-         if ($error == rcube_imap_generic::ERROR_BAD) {

--- 

-2.20.1

-

​

@@ -1,53 +0,0 @@

-From 51ba8a44fbe920b901b1cdd07777dfe3a45b80db Mon Sep 17 00:00:00 2001

-From: Christian Mollekopf <mollekopf@kolabsys.com>

-Date: Wed, 17 Apr 2019 11:48:36 +0200

-Subject: [PATCH] Support shortlogins via the username_domain configuration

- option.

-

-Summary: Same logic as roundcubemail/program/lib/Roundcube/rcube_imap.php

-

-Differential Revision: https://git.kolab.org/D755

----

- lib/Kolab/DAV/Auth/HTTPBasic.php | 19 +++++++++++++++++++

- 1 file changed, 19 insertions(+)

-

-diff --git a/lib/Kolab/DAV/Auth/HTTPBasic.php b/lib/Kolab/DAV/Auth/HTTPBasic.php

-index 616c752..687c4a5 100644

---- a/lib/Kolab/DAV/Auth/HTTPBasic.php

-+++ b/lib/Kolab/DAV/Auth/HTTPBasic.php

-@@ -175,6 +175,7 @@ class HTTPBasic extends DAV\Auth\Backend\AbstractBasic

-         $storage      = $rcube->get_storage();

-         $login_lc     = $rcube->config->get('login_lc');

-         $default_port = $rcube->config->get('default_port', 143);

-+        $username_domain = $rcube->config->get('username_domain');

- 

-         // parse $host

-         $a_host = parse_url($host);

-@@ -193,6 +194,24 @@ class HTTPBasic extends DAV\Auth\Backend\AbstractBasic

-             $port = $default_port;

-         }

- 

-+        // Check if we need to add/force domain to username

-+        if (!empty($username_domain)) {

-+            $domain = is_array($username_domain) ? $username_domain[$host] : $username_domain;

-+

-+            if ($domain = rcube_utils::parse_host((string)$domain, $host)) {

-+                $pos = strpos($username, '@');

-+

-+                // force configured domains

-+                if ($pos !== false && $rcube->config->get('username_domain_forced')) {

-+                    $username = substr($username, 0, $pos) . '@' . $domain;

-+                }

-+                // just add domain if not specified

-+                else if ($pos === false) {

-+                    $username .= '@' . $domain;

-+                }

-+            }

-+        }

-+

-         // Convert username to lowercase. If storage backend

-         // is case-insensitive we need to store always the same username

-         if ($login_lc) {

--- 

-2.20.1

-

​

@@ -1,3 +1,9 @@

+irony (0.4.3-1~kolab1) unstable; urgency=low

+

+  * Release of version 0.4.3

+

+ -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Thu, 16 Jan 2020 12:12:13 +0100

+

 irony (0.4.2-1~kolab6) unstable; urgency=low

   * Support shortlogins via the username_domain configuration option.

​

@@ -1,3 +1,1 @@

 add-sabre21-path-for-debian.patch -p1

-0001-Avoid-refering-to-kolab_auth-if-it-isn-t-actually-th.patch -p1

-0001-Support-shortlogins-via-the-username_domain-configur.patch -p1

​

@@ -2,7 +2,7 @@

 Source: irony

 Binary: irony

 Architecture: all

-Version: 0.4.2-1~kolab6

+Version: 0.4.3-1~kolab1

 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>

 Uploaders: Paul Klos <kolab@klos2day.nl>

 Homepage: http://www.kolab.org/

@@ -22,5 +22,5 @@

 Package-List:

  iRony deb admin extra

 Files:

- 00000000000000000000000000000000 0 iRony-0.4.2.tar.gz

+ 00000000000000000000000000000000 0 iRony-0.4.3.tar.gz

  00000000000000000000000000000000 0 debian.tar.gz

​