Projects
Kolab:3.4
kolab-webadmin
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 45
View file
kolab-webadmin.spec
Changed
@@ -35,7 +35,7 @@ Name: kolab-webadmin Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Kolab Groupware Server Web Administration Interface License: AGPLv3+ Group: Productivity/Office/Organizers @@ -44,6 +44,7 @@ Source0: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}.tar.gz Patch1: 0001-updated-translations.patch +Patch2: 0002-remove-debugging.patch BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -82,6 +83,7 @@ %setup -q %patch1 -p1 +%patch2 -p1 for file in `find . -type f -name "*.enterprise"`; do if [ 0%{?kolab_enterprise} -gt 0 ]; then @@ -171,6 +173,9 @@ %attr(0770,%{httpd_user},%{httpd_group}) %{_var}/log/%{name} %changelog +* Fri Aug 29 2014 Daniel Hoffend <dh@dotlan.net> - 3.2.1-3 +- removed debugging + * Fri Aug 29 2014 Daniel Hoffend <dh@dotlan.net> - 3.2.1-2 - updated translations
View file
0002-remove-debugging.patch
Added
@@ -0,0 +1,41 @@ +From da397091f63d3bfd0cf33165f9128fee47df9f39 Mon Sep 17 00:00:00 2001 +From: Aleksander Machniak <machniak@kolabsys.com> +Date: Tue, 26 Aug 2014 01:14:26 +0000 +Subject: Fix so LDAP internal debug is enabled only when debug_mode=trace (#3535) + +--- +diff --git a/lib/Auth/LDAP.php b/lib/Auth/LDAP.php +index 7763205..2dfe084 100644 +--- a/lib/Auth/LDAP.php ++++ b/lib/Auth/LDAP.php +@@ -43,7 +43,7 @@ class LDAP extends Net_LDAP3 { + // Causes nesting levels to be too deep...? + //$this->config_set('config_get_hook', array($this, "_config_get")); + +- $this->config_set("debug", true); ++ $this->config_set("debug", Log::mode() == Log::TRACE); + $this->config_set("log_hook", array($this, "_log")); + + $this->config_set("config_root_dn", "cn=config"); +@@ -1208,6 +1208,9 @@ class LDAP extends Net_LDAP3 { + Log::debug($str . $msg); + break; + case LOG_ERR: ++ case LOG_ALERT: ++ case LOG_CRIT: ++ case LOG_EMERG: + Log::error($str . $msg); + break; + case LOG_INFO: +@@ -1216,9 +1219,6 @@ class LDAP extends Net_LDAP3 { + case LOG_WARNING: + Log::warning($str . $msg); + break; +- case LOG_ALERT: +- case LOG_CRIT: +- case LOG_EMERG: + case LOG_NOTICE: + default: + Log::trace($str . $msg); +-- +cgit v0.9.0.2
View file
debian.changelog
Changed
@@ -1,3 +1,9 @@ +kolab-webadmin (3.2.1-0~kolab3) unstable; urgency=low + + * removed debugging + + -- Daniel Hoffend <dh@dotlan.net> Fri, 29 Aug 2014 22:08:00 +0100 + kolab-webadmin (3.2.1-0~kolab2) unstable; urgency=low * updated translations
View file
debian.series
Changed
@@ -1,1 +1,2 @@ 0001-updated-translations.patch -p1 +0002-remove-debugging.patch -p1
View file
kolab-webadmin.dsc
Changed
@@ -2,7 +2,7 @@ Source: kolab-webadmin Binary: kolab-webadmin Architecture: all -Version: 3.2.1-0~kolab2 +Version: 3.2.1-0~kolab3 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
.