Projects
Kolab:Winterfell
iRony
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 30
View file
iRony.spec
Changed
@@ -38,7 +38,7 @@ Name: iRony Version: 0.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: DAV for Kolab Groupware Group: Applications/Internet @@ -50,6 +50,8 @@ Source1: iRony.conf Source2: iRony.logrotate +Patch0001: 0001-Avoid-refering-to-kolab_auth-if-it-isn-t-actually-th.patch + BuildArch: noarch Requires: chwala >= 0.5.2 @@ -101,6 +103,8 @@ %prep %setup -q +%patch0001 -p1 + %build rm -rvf vendor/sabre @@ -185,6 +189,9 @@ %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name} %changelog +* Thu Apr 11 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.4.2-2 +- Avoid referring to kolab_auth if it isn't actually installed + * Thu Mar 14 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.4.2-1 - Release 0.4.2
View file
0001-Avoid-refering-to-kolab_auth-if-it-isn-t-actually-th.patch
Added
@@ -0,0 +1,27 @@ +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 +
View file
debian.changelog
Changed
@@ -1,3 +1,9 @@ +irony (0.4.2-1~kolab2) unstable; urgency=low + + * Avoid referring to kolab_auth if it isn't actually installed + + -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Thu, 11 Apr 2019 12:12:13 +0100 + irony (0.4.2-1~kolab1) unstable; urgency=low * Release of version 0.4.2
View file
debian.series
Changed
@@ -1,1 +1,2 @@ add-sabre21-path-for-debian.patch -p1 +0001-Avoid-refering-to-kolab_auth-if-it-isn-t-actually-th.patch -p1
View file
iRony.dsc
Changed
@@ -2,7 +2,7 @@ Source: irony Binary: irony Architecture: all -Version: 0.4.2-1~kolab1 +Version: 0.4.2-1~kolab2 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Uploaders: Paul Klos <kolab@klos2day.nl> Homepage: http://www.kolab.org/
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.