Request 2645 (accepted)

Overview

Request 2645 (accepted)

Added new upstream patches, fixed dsc/spec files (they were still pointing to 0.8.15)

Created by dhoffend about 5 years ago
In state accepted
Open review for Admin

Submit pykolab

Submit package home:dhoffend:b...olab:Winterfell / pykolab to package Kolab:Winterfell / pykolab

pykolab.spec Changed

@@ -33,8 +33,8 @@
 
 Summary:            Kolab Groupware Solution
 Name:               pykolab
-Version:            0.8.15
-Release:            1%{?dist}
+Version:            0.8.16
+Release:            2%{?dist}
 License:            GPLv3+
 Group:              Applications/System
 URL:                http://kolab.org/
@@ -42,6 +42,10 @@
 Source0:            pykolab-%{version}.tar.gz
 Source1:            pykolab.logrotate
 
+Patch0001:          0001-restore-system-umask-after-fork-fix-T5659.patch
+Patch0002:          0002-Fixes-T5665-kolabd-should-now-terminate-its-child-pr.patch
+Patch0003:          0003-roundcubemail-plugin-owncload-is-no-longer-part-of-r.patch
+
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:          noarch
 
@@ -230,6 +234,10 @@
 %prep
 %setup -q
 
+%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+
 %build
 autoreconf -v || automake --add-missing && autoreconf -v
 %configure
@@ -565,6 +573,14 @@
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
 
 %changelog
+* Tue Nov 18 2019 Daniel Hoffend <dh@dotlan.net> - 0.8.16-2
+- roundcubemail plugin owncload is no longer part of roundcubemail-plugins-kolab
+- Fixes T5665: kolabd should now terminate its child processes on exit
+- restore system umask after fork (fix T5659)
+
+* Tue Nov 18 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.16-1
+- Release of version 0.8.16
+
 * Tue Sep 24 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.15-1
 - Release of version 0.8.15

0001-restore-system-umask-after-fork-fix-T5659.patch Added

@@ -0,0 +1,89 @@
+From 17db4f8027ddbe1d887ebf0ebdc33ed46855d269 Mon Sep 17 00:00:00 2001
+From: Daniel Hoffend <dh@dotlan.net>
+Date: Mon, 18 Nov 2019 12:02:28 +0100
+Subject: [PATCH 1/3] restore system umask after fork (fix T5659)
+
+Summary:
+start-stop-daemon behaviour has changed. We must make sure the created
+pidfile is "secure" and not world-wide-writeable.
+
+Reviewers: #pykolab_developers, vanmeeuwen
+
+Reviewed By: #pykolab_developers, vanmeeuwen
+
+Differential Revision: https://git.kolab.org/D847
+---
+ kolabd/__init__.py    | 4 +++-
+ saslauthd/__init__.py | 4 +++-
+ wallace/__init__.py   | 4 +++-
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/kolabd/__init__.py b/kolabd/__init__.py
+index cefcc02..edeace2 100644
+--- a/kolabd/__init__.py
++++ b/kolabd/__init__.py
+@@ -172,7 +172,7 @@ class KolabDaemon:
+                 # Give up the session, all control,
+                 # all open file descriptors, see #5151
+                 os.chdir("/")
+-                os.umask(0)
++                old_umask = os.umask(0)
+                 os.setsid()
+ 
+                 pid = os.fork()
+@@ -191,6 +191,8 @@ class KolabDaemon:
+                 os.open(os.devnull, os.O_WRONLY)
+                 os.open(os.devnull, os.O_WRONLY)
+ 
++                os.umask(old_umask)
++
+                 log.remove_stdout_handler()
+                 self.set_signal_handlers()
+                 self.write_pid()
+diff --git a/saslauthd/__init__.py b/saslauthd/__init__.py
+index 2cb76d6..30e8189 100644
+--- a/saslauthd/__init__.py
++++ b/saslauthd/__init__.py
+@@ -138,7 +138,7 @@ class SASLAuthDaemon(object):
+                 # Give up the session, all control,
+                 # all open file descriptors, see #5151
+                 os.chdir("/")
+-                os.umask(0)
++                old_umask = os.umask(0)
+                 os.setsid()
+ 
+                 pid = os.fork()
+@@ -153,6 +153,8 @@ class SASLAuthDaemon(object):
+                 os.close(1)
+                 os.close(2)
+ 
++                os.umask(old_umask)
++
+                 self.thread_count += 1
+                 log.remove_stdout_handler()
+                 self.set_signal_handlers()
+diff --git a/wallace/__init__.py b/wallace/__init__.py
+index 57443cd..4a22e3e 100644
+--- a/wallace/__init__.py
++++ b/wallace/__init__.py
+@@ -618,7 +618,7 @@ class WallaceDaemon:
+                 # Give up the session, all control,
+                 # all open file descriptors, see #5151
+                 os.chdir("/")
+-                os.umask(0)
++                old_umask = os.umask(0)
+                 os.setsid()
+ 
+                 pid = os.fork()
+@@ -637,6 +637,8 @@ class WallaceDaemon:
+                 os.open(os.devnull, os.O_WRONLY)
+                 os.open(os.devnull, os.O_WRONLY)
+ 
++                os.umask(old_umask)
++
+                 log.remove_stdout_handler()
+                 self.set_signal_handlers()
+                 self.write_pid()
+-- 
+2.20.1
+

0002-Fixes-T5665-kolabd-should-now-terminate-its-child-pr.patch Added

@@ -0,0 +1,54 @@
+From 6751e85733e746d58933e54cbf0acbfcc3ffd0d3 Mon Sep 17 00:00:00 2001
+From: Daniel Hoffend <dh@dotlan.net>
+Date: Mon, 18 Nov 2019 12:02:54 +0100
+Subject: [PATCH 2/3] Fixes T5665: kolabd should now terminate its child
+ processes on exit
+
+Summary: This patch ensures that kolabd will terminate his forked childs
+
+Test Plan: Tested on Debian 9 and Debian 10
+
+Reviewers: #pykolab_developers, vanmeeuwen
+
+Reviewed By: #pykolab_developers, vanmeeuwen
+
+Differential Revision: https://git.kolab.org/D853
+---
+ kolabd/__init__.py | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/kolabd/__init__.py b/kolabd/__init__.py
+index edeace2..98cd6ed 100644
+--- a/kolabd/__init__.py
++++ b/kolabd/__init__.py
+@@ -29,6 +29,7 @@ import shutil
+ import sys
+ import time
+ import traceback
++import multiprocessing
+ 
+ import pykolab
+ 
+@@ -372,11 +373,15 @@ class KolabDaemon:
+             at the same time, and therefore we need to test if the PID file
+             exists, and only try/except removing it.
+         """
+-        if os.access(conf.pidfile, os.R_OK):
+-            try:
++        try:
++            for p in multiprocessing.active_children():
++                p.terminate()
++
++            if os.access(conf.pidfile, os.R_OK):
+                 os.remove(conf.pidfile)
+-            except Exception:
+-                pass
++
++        except Exception:
++            pass
+ 
+         raise SystemExit
+ 
+-- 
+2.20.1
+

0003-roundcubemail-plugin-owncload-is-no-longer-part-of-r.patch Added

@@ -0,0 +1,34 @@
+From 181bcc08dcdd7e029aabc524b777fda24feb9cea Mon Sep 17 00:00:00 2001
+From: Daniel Hoffend <dh@dotlan.net>
+Date: Mon, 18 Nov 2019 12:03:36 +0100
+Subject: [PATCH 3/3] roundcubemail plugin owncload is no longer part of
+ roundcubemail-plugins-kolab
+
+Summary: there's no plugin ownload anymore, therefore the template for setup-kolab can safely get removed.
+
+Reviewers: #pykolab_developers, #roundcube_kolab_plugins_developers
+
+Differential Revision: https://git.kolab.org/D841
+---
+ share/templates/roundcubemail/owncloud.inc.php.tpl | 9 ---------
+ 1 file changed, 9 deletions(-)
+ delete mode 100644 share/templates/roundcubemail/owncloud.inc.php.tpl
+
+diff --git a/share/templates/roundcubemail/owncloud.inc.php.tpl b/share/templates/roundcubemail/owncloud.inc.php.tpl
+deleted file mode 100644
+index 513a482..0000000
+--- a/share/templates/roundcubemail/owncloud.inc.php.tpl
++++ /dev/null
+@@ -1,9 +0,0 @@
+-<?php
+-    // ownCloud URL
+-    \$config['owncloud_url'] = 'http://' . \$_SERVER["HTTP_HOST"] . '/owncloud';
+-
+-    if (file_exists(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__))) {
+-        include_once(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
+-    }
+-
+-?>
+-- 
+2.20.1
+

debian.changelog Changed

debian.series Changed

pykolab.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2645 0

Request History

dhoffend created request about 5 years ago

Added new upstream patches, fixed dsc/spec files (they were still pointing to 0.8.15)

dhoffend accepted review about 5 years ago

fixed broken builds

dhoffend accepted request about 5 years ago