Request 2662 (accepted)

pykolab.spec Changed

@@ -33,8 +33,8 @@
 
 Summary:            Kolab Groupware Solution
 Name:               pykolab
-Version:            0.8.16
-Release:            3%{?dist}
+Version:            0.8.17
+Release:            1%{?dist}
 License:            GPLv3+
 Group:              Applications/System
 URL:                http://kolab.org/
@@ -42,10 +42,6 @@
 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
 
@@ -236,10 +232,6 @@
 %prep
 %setup -q
 
-%patch0001 -p1
-%patch0002 -p1
-%patch0003 -p1
-
 %build
 autoreconf -v || automake --add-missing && autoreconf -v
 %configure
@@ -575,7 +567,8 @@
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
 
 %changelog
-* Wed Dec  4 2019 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.8.16-3
+* Wed Dec  4 2019 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.8.17-1
+- Release of version 0.8.17
 - Require python-six
 
 * Tue Nov 18 2019 Daniel Hoffend <dh@dotlan.net> - 0.8.16-2

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

@@ -1,89 +0,0 @@
-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 Deleted

@@ -1,54 +0,0 @@
-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 Deleted

@@ -1,34 +0,0 @@
-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-0.8.16.tar.gz/share/templates/roundcubemail/owncloud.inc.php.tpl Deleted

pykolab-0.8.16.tar.gz/configure.ac -> pykolab-0.8.17.tar.gz/configure.ac Changed

pykolab-0.8.16.tar.gz/kolabd/__init__.py -> pykolab-0.8.17.tar.gz/kolabd/__init__.py Changed

@@ -29,6 +29,7 @@
 import sys
 import time
 import traceback
+import multiprocessing
 
 import pykolab
 
@@ -172,7 +173,7 @@
                 # 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 +192,8 @@
                 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()
@@ -370,11 +373,15 @@
             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

pykolab-0.8.16.tar.gz/pykolab/auth/ldap/__init__.py -> pykolab-0.8.17.tar.gz/pykolab/auth/ldap/__init__.py Changed

pykolab-0.8.16.tar.gz/pykolab/setup/setup_mysql.py -> pykolab-0.8.17.tar.gz/pykolab/setup/setup_mysql.py Changed

@@ -45,7 +45,7 @@
         "--mysqlserver",
         dest="mysqlserver",
         action="store",
-        help=_("Specify whether to use an (existing) or (new) MySQL server.")
+        help=_("Specify whether to use an (existing), (unix_socket) or (new) MySQL server.")
     )
 
     mysql_group.add_option(
@@ -121,7 +121,8 @@
 
     options = {
         1: "Existing MySQL server (with root password already set).",
-        2: "New MySQL server (needs to be initialized)."
+        2: "Existing MySQL server (with unix_socket authentication plugin).",
+        3: "New MySQL server (needs to be initialized)."
     }
 
     answer = 0
@@ -130,8 +131,10 @@
             if conf.mysqlserver:
                 if conf.mysqlserver == 'existing':
                     answer = 1
-                elif conf.mysqlserver == 'new':
+                elif conf.mysqlserver == 'unix_socket':
                     answer = 2
+                elif conf.mysqlserver == 'new':
+                    answer = 3
             if answer == 0:
                 answer = utils.ask_menu(_("What MySQL server are we setting up?"), options)
     else:
@@ -154,6 +157,9 @@
         else:
             mysql_root_password = conf.mysqlrootpw
 
+    elif answer == "2" or answer == 2:
+        mysql_root_password = 'unix_socket'
+
     else:
         print >> sys.stderr, utils.multiline_message(
             _("""
@@ -222,13 +228,33 @@
         p1.stdout.close()
         p2.communicate()
 
-    data = """
+    socket_path = None
+    socket_paths = [
+        "/var/lib/mysql/mysql.sock",
+        "/var/run/mysqld/mysqld.sock",
+        "/var/run/mysql/mysql.sock"
+    ]
+    for sp in socket_paths:
+        if os.path.exists(sp):
+            socket_path = sp
+
+    if mysql_root_password == "unix_socket" and socket_path is not None:
+        data = """
+[mysql]
+user=root
+password=
+host=localhost
+socket=%s
+""" % (socket_path)
+    else:
+        data = """
 [mysql]
 user=root
 password='%s'
 host=%s
 """ % (mysql_root_password, conf.mysqlhost)
 
+
     fp = open('/tmp/kolab-setup-my.cnf', 'w')
     os.chmod('/tmp/kolab-setup-my.cnf', 600)
     fp.write(data)

pykolab-0.8.16.tar.gz/pykolab/setup/setup_roundcube.py -> pykolab-0.8.17.tar.gz/pykolab/setup/setup_roundcube.py Changed

@@ -132,7 +132,6 @@
         'kolab_folders.inc.php',
         'libkolab.inc.php',
         'managesieve.inc.php',
-        'owncloud.inc.php',
         'password.inc.php',
         'recipient_to_contact.inc.php',
         'terms.html',
@@ -224,11 +223,35 @@
             break
 
     if not os.path.isfile('/tmp/kolab-setup-my.cnf'):
-        utils.multiline_message("""Please supply the MySQL root password""")
+        print >> sys.stderr, utils.multiline_message(
+                """Please supply the MySQL root password (use 'unix_socket' for socket based authentication)"""
+            )
 
-        mysql_root_password = utils.ask_question("MySQL root password", password=True)
+        mysql_root_password = utils.ask_question(
+                _("MySQL root password"),
+                password=True
+            )
 
-        data = """
+        socket_path = None
+        socket_paths = [
+            "/var/lib/mysql/mysql.sock",
+            "/var/run/mysqld/mysqld.sock",
+            "/var/run/mysql/mysql.sock"
+        ]
+        for sp in socket_paths:
+            if os.path.exists(sp):
+                socket_path = sp
+
+        if mysql_root_password == "unix_socket" and socket_path is not None:
+            data = """
+[mysql]
+user=root
+password=
+host=localhost
+socket=%s
+""" % (socket_path)
+        else:
+            data = """
 [mysql]
 user=root
 password='%s'

pykolab-0.8.16.tar.gz/pykolab/setup/setup_syncroton.py -> pykolab-0.8.17.tar.gz/pykolab/setup/setup_syncroton.py Changed

@@ -66,8 +66,8 @@
             break
 
     if not os.path.isfile('/tmp/kolab-setup-my.cnf'):
-        utils.multiline_message(
-                """Please supply the MySQL root password"""
+        print >> sys.stderr, utils.multiline_message(
+                """Please supply the MySQL root password (use 'unix_socket' for socket based authentication)"""
             )
 
         mysql_root_password = utils.ask_question(
@@ -75,6 +75,32 @@
                 password=True
             )
 
+        socket_path = None
+        socket_paths = [
+            "/var/lib/mysql/mysql.sock",
+            "/var/run/mysqld/mysqld.sock",
+            "/var/run/mysql/mysql.sock"
+        ]
+        for sp in socket_paths:
+            if os.path.exists(sp):
+                socket_path = sp
+
+        if mysql_root_password == "unix_socket" and socket_path is not None:
+            data = """
+[mysql]
+user=root
+password=
+host=localhost
+socket=%s
+""" % (socket_path)
+        else:
+            data = """
+[mysql]
+user=root
+password='%s'
+host=%s
+""" % (mysql_root_password, conf.mysqlhost)
+
         data = """
 [mysql]
 user=root

pykolab-0.8.16.tar.gz/saslauthd/__init__.py -> pykolab-0.8.17.tar.gz/saslauthd/__init__.py Changed

pykolab-0.8.16.tar.gz/wallace/__init__.py -> pykolab-0.8.17.tar.gz/wallace/__init__.py Changed

pykolab-0.8.16.tar.gz/wallace/module_signature.py -> pykolab-0.8.17.tar.gz/wallace/module_signature.py Changed

pykolab.dsc Changed

Overview

Request 2662 (accepted)

Request History