Overview
pykolab.spec
Changed
x
1
2
3
Summary: Kolab Groupware Solution4
Name: pykolab5
-Version: 0.8.156
-Release: 1%{?dist}7
+Version: 0.8.168
+Release: 2%{?dist}9
License: GPLv3+10
Group: Applications/System11
URL: http://kolab.org/12
13
Source0: pykolab-%{version}.tar.gz14
Source1: pykolab.logrotate15
16
+Patch0001: 0001-restore-system-umask-after-fork-fix-T5659.patch17
+Patch0002: 0002-Fixes-T5665-kolabd-should-now-terminate-its-child-pr.patch18
+Patch0003: 0003-roundcubemail-plugin-owncload-is-no-longer-part-of-r.patch19
+20
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root21
BuildArch: noarch22
23
24
%prep25
%setup -q26
27
+%patch0001 -p128
+%patch0002 -p129
+%patch0003 -p130
+31
%build32
autoreconf -v || automake --add-missing && autoreconf -v33
%configure34
35
%attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace36
37
%changelog38
+* Tue Nov 18 2019 Daniel Hoffend <dh@dotlan.net> - 0.8.16-239
+- roundcubemail plugin owncload is no longer part of roundcubemail-plugins-kolab40
+- Fixes T5665: kolabd should now terminate its child processes on exit41
+- restore system umask after fork (fix T5659)42
+43
+* Tue Nov 18 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.16-144
+- Release of version 0.8.1645
+46
* Tue Sep 24 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.8.15-147
- Release of version 0.8.1548
49
0001-restore-system-umask-after-fork-fix-T5659.patch
Added
91
1
2
+From 17db4f8027ddbe1d887ebf0ebdc33ed46855d269 Mon Sep 17 00:00:00 20013
+From: Daniel Hoffend <dh@dotlan.net>4
+Date: Mon, 18 Nov 2019 12:02:28 +01005
+Subject: [PATCH 1/3] restore system umask after fork (fix T5659)6
+7
+Summary:8
+start-stop-daemon behaviour has changed. We must make sure the created9
+pidfile is "secure" and not world-wide-writeable.10
+11
+Reviewers: #pykolab_developers, vanmeeuwen12
+13
+Reviewed By: #pykolab_developers, vanmeeuwen14
+15
+Differential Revision: https://git.kolab.org/D84716
+---17
+ kolabd/__init__.py | 4 +++-18
+ saslauthd/__init__.py | 4 +++-19
+ wallace/__init__.py | 4 +++-20
+ 3 files changed, 9 insertions(+), 3 deletions(-)21
+22
+diff --git a/kolabd/__init__.py b/kolabd/__init__.py23
+index cefcc02..edeace2 10064424
+--- a/kolabd/__init__.py25
++++ b/kolabd/__init__.py26
+@@ -172,7 +172,7 @@ class KolabDaemon:27
+ # Give up the session, all control,28
+ # all open file descriptors, see #515129
+ os.chdir("/")30
+- os.umask(0)31
++ old_umask = os.umask(0)32
+ os.setsid()33
+ 34
+ pid = os.fork()35
+@@ -191,6 +191,8 @@ class KolabDaemon:36
+ os.open(os.devnull, os.O_WRONLY)37
+ os.open(os.devnull, os.O_WRONLY)38
+ 39
++ os.umask(old_umask)40
++41
+ log.remove_stdout_handler()42
+ self.set_signal_handlers()43
+ self.write_pid()44
+diff --git a/saslauthd/__init__.py b/saslauthd/__init__.py45
+index 2cb76d6..30e8189 10064446
+--- a/saslauthd/__init__.py47
++++ b/saslauthd/__init__.py48
+@@ -138,7 +138,7 @@ class SASLAuthDaemon(object):49
+ # Give up the session, all control,50
+ # all open file descriptors, see #515151
+ os.chdir("/")52
+- os.umask(0)53
++ old_umask = os.umask(0)54
+ os.setsid()55
+ 56
+ pid = os.fork()57
+@@ -153,6 +153,8 @@ class SASLAuthDaemon(object):58
+ os.close(1)59
+ os.close(2)60
+ 61
++ os.umask(old_umask)62
++63
+ self.thread_count += 164
+ log.remove_stdout_handler()65
+ self.set_signal_handlers()66
+diff --git a/wallace/__init__.py b/wallace/__init__.py67
+index 57443cd..4a22e3e 10064468
+--- a/wallace/__init__.py69
++++ b/wallace/__init__.py70
+@@ -618,7 +618,7 @@ class WallaceDaemon:71
+ # Give up the session, all control,72
+ # all open file descriptors, see #515173
+ os.chdir("/")74
+- os.umask(0)75
++ old_umask = os.umask(0)76
+ os.setsid()77
+ 78
+ pid = os.fork()79
+@@ -637,6 +637,8 @@ class WallaceDaemon:80
+ os.open(os.devnull, os.O_WRONLY)81
+ os.open(os.devnull, os.O_WRONLY)82
+ 83
++ os.umask(old_umask)84
++85
+ log.remove_stdout_handler()86
+ self.set_signal_handlers()87
+ self.write_pid()88
+-- 89
+2.20.190
+91
0002-Fixes-T5665-kolabd-should-now-terminate-its-child-pr.patch
Added
56
1
2
+From 6751e85733e746d58933e54cbf0acbfcc3ffd0d3 Mon Sep 17 00:00:00 20013
+From: Daniel Hoffend <dh@dotlan.net>4
+Date: Mon, 18 Nov 2019 12:02:54 +01005
+Subject: [PATCH 2/3] Fixes T5665: kolabd should now terminate its child6
+ processes on exit7
+8
+Summary: This patch ensures that kolabd will terminate his forked childs9
+10
+Test Plan: Tested on Debian 9 and Debian 1011
+12
+Reviewers: #pykolab_developers, vanmeeuwen13
+14
+Reviewed By: #pykolab_developers, vanmeeuwen15
+16
+Differential Revision: https://git.kolab.org/D85317
+---18
+ kolabd/__init__.py | 13 +++++++++----19
+ 1 file changed, 9 insertions(+), 4 deletions(-)20
+21
+diff --git a/kolabd/__init__.py b/kolabd/__init__.py22
+index edeace2..98cd6ed 10064423
+--- a/kolabd/__init__.py24
++++ b/kolabd/__init__.py25
+@@ -29,6 +29,7 @@ import shutil26
+ import sys27
+ import time28
+ import traceback29
++import multiprocessing30
+ 31
+ import pykolab32
+ 33
+@@ -372,11 +373,15 @@ class KolabDaemon:34
+ at the same time, and therefore we need to test if the PID file35
+ exists, and only try/except removing it.36
+ """37
+- if os.access(conf.pidfile, os.R_OK):38
+- try:39
++ try:40
++ for p in multiprocessing.active_children():41
++ p.terminate()42
++43
++ if os.access(conf.pidfile, os.R_OK):44
+ os.remove(conf.pidfile)45
+- except Exception:46
+- pass47
++48
++ except Exception:49
++ pass50
+ 51
+ raise SystemExit52
+ 53
+-- 54
+2.20.155
+56
0003-roundcubemail-plugin-owncload-is-no-longer-part-of-r.patch
Added
36
1
2
+From 181bcc08dcdd7e029aabc524b777fda24feb9cea Mon Sep 17 00:00:00 20013
+From: Daniel Hoffend <dh@dotlan.net>4
+Date: Mon, 18 Nov 2019 12:03:36 +01005
+Subject: [PATCH 3/3] roundcubemail plugin owncload is no longer part of6
+ roundcubemail-plugins-kolab7
+8
+Summary: there's no plugin ownload anymore, therefore the template for setup-kolab can safely get removed.9
+10
+Reviewers: #pykolab_developers, #roundcube_kolab_plugins_developers11
+12
+Differential Revision: https://git.kolab.org/D84113
+---14
+ share/templates/roundcubemail/owncloud.inc.php.tpl | 9 ---------15
+ 1 file changed, 9 deletions(-)16
+ delete mode 100644 share/templates/roundcubemail/owncloud.inc.php.tpl17
+18
+diff --git a/share/templates/roundcubemail/owncloud.inc.php.tpl b/share/templates/roundcubemail/owncloud.inc.php.tpl19
+deleted file mode 10064420
+index 513a482..000000021
+--- a/share/templates/roundcubemail/owncloud.inc.php.tpl22
++++ /dev/null23
+@@ -1,9 +0,0 @@24
+-<?php25
+- // ownCloud URL26
+- \$config['owncloud_url'] = 'http://' . \$_SERVER["HTTP_HOST"] . '/owncloud';27
+-28
+- if (file_exists(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__))) {29
+- include_once(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));30
+- }31
+-32
+-?>33
+-- 34
+2.20.135
+36
debian.changelog
Changed
14
1
2
+pykolab (0.8.16-0~kolab1) unstable; urgency=low3
+4
+ * Release of version 0.8.165
+ * roundcubemail plugin owncload is no longer part of roundcubemail-plugins-kolab6
+ * Fixes T5665: kolabd should now terminate its child processes on exit7
+ * restore system umask after fork (fix T5659)8
+9
+ -- Daniel Hoffend <dh@dotlan.net> Mon, 18 Nov 2019 16:56:02 +010010
+11
pykolab (0.8.15-0~kolab2) unstable; urgency=low12
13
* Fix init scripts for kolab-saslauthd and wallace14
debian.series
Changed
6
1
2
cyrus-imapd.conf-cert-paths.patch -p13
+0001-restore-system-umask-after-fork-fix-T5659.patch -p14
+0002-Fixes-T5665-kolabd-should-now-terminate-its-child-pr.patch -p15
+0003-roundcubemail-plugin-owncload-is-no-longer-part-of-r.patch -p16
pykolab.dsc
Changed
17
1
2
Source: pykolab3
Binary: pykolab, kolab-cli, kolab-conf, kolab-saslauthd, kolab-server, kolab-telemetry, kolab-xml, wallace4
Architecture: all5
-Version: 0.8.15-0~kolab26
+Version: 0.8.16-0~kolab17
Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>8
Uploaders: Paul Klos <kolab@klos2day.nl>9
Homepage: http://www.kolab.org10
11
pykolab deb python optional12
wallace deb python optional13
Files:14
- 00000000000000000000000000000000 0 pykolab-0.8.15.tar.gz15
+ 00000000000000000000000000000000 0 pykolab-0.8.16.tar.gz16
00000000000000000000000000000000 0 debian.tar.gz17
Refresh
Refresh
Login required, please
login
in order to comment
Request History
dhoffend created request over 5 years ago
Added new upstream patches, fixed dsc/spec files (they were still pointing to 0.8.15)
dhoffend accepted review over 5 years ago
fixed broken builds
dhoffend accepted request over 5 years ago