File pykolab-0.6.11_suse_fixes.patch of Package pykolab

Overview Repositories Revisions Requests Users Attributes Meta

File pykolab-0.6.11_suse_fixes.patch of Package pykolab (Revision c7e521261d9845c3ff5fff012151ece7)

Currently displaying revision c7e521261d9845c3ff5fff012151ece7 , Show latest

diff -Ppru pykolab-0.6.11.orig/pykolab/conf/__init__.py pykolab-0.6.11.suse_fixes/pykolab/conf/__init__.py
--- pykolab-0.6.11.orig/pykolab/conf/__init__.py	2014-01-28 12:33:07.000000000 +0100
+++ pykolab-0.6.11.suse_fixes/pykolab/conf/__init__.py	2014-02-13 14:27:08.527547748 +0100
@@ -17,6 +17,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
+from platform import linux_distribution
 import logging
 import os
 import sys
@@ -570,6 +571,16 @@ class Conf(object):
                     except IOError, e:
                         log.error(_("Cannot start SASL authentication daemon"))
                         return False
+            elif os.path.isfile("/var/run/sasl2/mux"):
+                if os.path.isfile("/var/run/sasl2/saslauthd.pid"):
+                    log.error(_("Cannot start SASL authentication daemon"))
+                    return False
+                else:
+                    try:
+                        os.remove("/var/run/sasl2/mux")
+                    except IOError, e:
+                        log.error(_("Cannot start SASL authentication daemon"))
+                        return False
         return True
 
     def check_setting_use_imap(self, value):
diff -Ppru pykolab-0.6.11.orig/pykolab/setup/setup_imap.py pykolab-0.6.11.suse_fixes/pykolab/setup/setup_imap.py
--- pykolab-0.6.11.orig/pykolab/setup/setup_imap.py	2014-01-28 12:33:07.000000000 +0100
+++ pykolab-0.6.11.suse_fixes/pykolab/setup/setup_imap.py	2014-02-13 17:01:24.940236407 +0100
@@ -19,6 +19,7 @@
 
 from augeas import Augeas
 from Cheetah.Template import Template
+from platform import linux_distribution
 import os
 import subprocess
 
@@ -143,13 +144,19 @@ def execute(*args, **kw):
         myaugeas.close()
 
     if os.path.isfile('/bin/systemctl'):
-        subprocess.call(['systemctl', 'stop', 'saslauthd.service'])
-        subprocess.call(['systemctl', 'restart', 'kolab-saslauthd.service'])
-        subprocess.call(['systemctl', 'restart', 'cyrus-imapd.service'])
+        subprocess.call(['/bin/systemctl', 'stop', 'saslauthd.service'])
+        subprocess.call(['/bin/systemctl', 'restart', 'kolab-saslauthd.service'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/bin/systemctl', 'restart', 'cyrus.service'])
+        else:
+            subprocess.call(['/bin/systemctl', 'restart', 'cyrus-imapd.service'])
     elif os.path.isfile('/sbin/service'):
-        subprocess.call(['service', 'saslauthd', 'stop'])
-        subprocess.call(['service', 'kolab-saslauthd', 'restart'])
-        subprocess.call(['service', 'cyrus-imapd', 'restart'])
+        subprocess.call(['/sbin/service', 'saslauthd', 'stop'])
+        subprocess.call(['/sbin/service', 'kolab-saslauthd', 'restart'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/sbin/service', 'cyrus', 'restart'])
+        else:
+            subprocess.call(['/sbin/service', 'cyrus-imapd', 'restart'])
     elif os.path.isfile('/usr/sbin/service'):
         subprocess.call(['/usr/sbin/service','saslauthd','stop'])
         subprocess.call(['/usr/sbin/service','kolab-saslauthd','restart'])
@@ -158,13 +165,19 @@ def execute(*args, **kw):
         log.error(_("Could not start the cyrus-imapd and kolab-saslauthd services."))
 
     if os.path.isfile('/bin/systemctl'):
-        subprocess.call(['systemctl', 'disable', 'saslauthd.service'])
-        subprocess.call(['systemctl', 'enable', 'kolab-saslauthd.service'])
-        subprocess.call(['systemctl', 'enable', 'cyrus-imapd.service'])
+        subprocess.call(['/bin/systemctl', 'disable', 'saslauthd.service'])
+        subprocess.call(['/bin/systemctl', 'enable', 'kolab-saslauthd.service'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/bin/systemctl', 'enable', 'cyrus.service'])
+        else:
+            subprocess.call(['/bin/systemctl', 'enable', 'cyrus-imapd.service'])
     elif os.path.isfile('/sbin/chkconfig'):
-        subprocess.call(['chkconfig', 'saslauthd', 'off'])
-        subprocess.call(['chkconfig', 'kolab-saslauthd', 'on'])
-        subprocess.call(['chkconfig', 'cyrus-imapd', 'on'])
+        subprocess.call(['/sbin/chkconfig', 'saslauthd', 'off'])
+        subprocess.call(['/sbin/chkconfig', 'kolab-saslauthd', 'on'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/sbin/chkconfig', 'cyrus', 'on'])
+        else:
+            subprocess.call(['/sbin/chkconfig', 'cyrus-imapd', 'on'])
     elif os.path.isfile('/usr/sbin/update-rc.d'):
         subprocess.call(['/usr/sbin/update-rc.d', 'saslauthd', 'disable'])
         subprocess.call(['/usr/sbin/update-rc.d', 'kolab-saslauthd', 'defaults'])
diff -Ppru pykolab-0.6.11.orig/pykolab/setup/setup_ldap.py pykolab-0.6.11.suse_fixes/pykolab/setup/setup_ldap.py
--- pykolab-0.6.11.orig/pykolab/setup/setup_ldap.py	2014-01-28 12:33:07.000000000 +0100
+++ pykolab-0.6.11.suse_fixes/pykolab/setup/setup_ldap.py	2014-02-21 17:30:11.219462031 +0100
@@ -317,6 +317,8 @@ ServerAdminPwd = %(admin_pass)s
         setup_ds_admin = "/usr/sbin/setup-ds-admin.pl"
     #elif os.path.isfile("/usr/sbin/setup-ds-admin"):
         #setup_ds_admin = "/usr/sbin/setup-ds-admin"
+    elif os.path.isfile("/usr/sbin/setup-ds.pl"):
+        setup_ds_admin = "/usr/sbin/setup-ds.pl"
     elif os.path.isfile("/usr/sbin/setup-ds"):
         setup_ds_admin = "/usr/sbin/setup-ds"
     else:
diff -Ppru pykolab-0.6.11.orig/pykolab/setup/setup_mta.py pykolab-0.6.11.suse_fixes/pykolab/setup/setup_mta.py
--- pykolab-0.6.11.orig/pykolab/setup/setup_mta.py	2014-01-28 12:33:07.000000000 +0100
+++ pykolab-0.6.11.suse_fixes/pykolab/setup/setup_mta.py	2014-02-24 11:16:41.219642893 +0100
@@ -19,6 +19,7 @@
 
 from augeas import Augeas
 from Cheetah.Template import Template
+from platform import linux_distribution
 import os
 import shutil
 import subprocess
@@ -348,7 +349,7 @@ result_format = shared+%%s
     template_file = None
 
     # On RPM installations, Amavis configuration is contained within a single file.
-    if os.path.isfile("/etc/amavisd/amavisd.conf"):
+    if os.path.isfile("/etc/amavisd/amavisd.conf") or os.path.isfile("/etc/amavisd.conf") or os.path.isfile("/etc/amavis/amavisd.conf"):
         if os.path.isfile('/etc/kolab/templates/amavisd.conf.tpl'):
             template_file = '/etc/kolab/templates/amavisd.conf.tpl'
         elif os.path.isfile('/usr/share/kolab/templates/amavisd.conf.tpl'):
@@ -363,15 +364,17 @@ result_format = shared+%%s
 
             t = Template(template_definition, searchList=[amavisd_settings])
 
-        if os.path.isdir('/etc/amavisd'):
-            fp = open('/etc/amavisd/amavisd.conf', 'w')
-        elif os.path.isdir('/etc/amavis'):
-            fp = open('/etc/amavis/amavisd.conf', 'w')
+            if os.path.isdir('/etc/amavisd'):
+                fp = open('/etc/amavisd/amavisd.conf', 'w')
+            elif os.path.isfile('/etc/amavisd.conf'):
+                fp = open('/etc/amavisd.conf', 'w')
+            elif os.path.isdir('/etc/amavis'):
+                fp = open('/etc/amavis/amavisd.conf', 'w')
             fp.write(t.__str__())
             fp.close()
 
         else:
-            log.error(_("Could not write out Amavis configuration file /etc/amavisd/amavisd.conf"))
+            log.error(_("Could not write out Amavis configuration file amavisd.conf"))
             return
 
     # On APT installations, /etc/amavis/conf.d/ is a directory with many more files.
@@ -396,15 +399,23 @@ result_format = shared+%%s
         myaugeas.close()
 
     if os.path.isfile('/bin/systemctl'):
-        subprocess.call(['systemctl', 'restart', 'postfix.service'])
-        subprocess.call(['systemctl', 'restart', 'amavisd.service'])
-        subprocess.call(['systemctl', 'restart', 'clamd.amavisd.service'])
-        subprocess.call(['systemctl', 'restart', 'wallace.service'])
+        subprocess.call(['/bin/systemctl', 'restart', 'postfix.service'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/bin/systemctl', 'restart', 'amavis.service'])
+            subprocess.call(['/bin/systemctl', 'restart', 'clamd.service'])
+        else:
+            subprocess.call(['/bin/systemctl', 'restart', 'amavisd.service'])
+            subprocess.call(['/bin/systemctl', 'restart', 'clamd.amavisd.service'])
+        subprocess.call(['/bin/systemctl', 'restart', 'wallace.service'])
     elif os.path.isfile('/sbin/service'):
-        subprocess.call(['service', 'postfix', 'restart'])
-        subprocess.call(['service', 'amavisd', 'restart'])
-        subprocess.call(['service', 'clamd.amavisd', 'restart'])
-        subprocess.call(['service', 'wallace', 'restart'])
+        subprocess.call(['/sbin/service', 'postfix', 'restart'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/sbin/service', 'amavis', 'restart'])
+            subprocess.call(['/sbin/service', 'clamd', 'restart'])
+        else:
+            subprocess.call(['/sbin/service', 'amavisd', 'restart'])
+            subprocess.call(['/sbin/service', 'clamd.amavisd', 'restart'])
+        subprocess.call(['/sbin/service', 'wallace', 'restart'])
     elif os.path.isfile('/usr/sbin/service'):
         subprocess.call(['/usr/sbin/service','postfix','restart'])
         subprocess.call(['/usr/sbin/service','amavis','restart'])
@@ -414,15 +425,23 @@ result_format = shared+%%s
         log.error(_("Could not start the postfix, clamav and amavisd services services."))
 
     if os.path.isfile('/bin/systemctl'):
-        subprocess.call(['systemctl', 'enable', 'postfix.service'])
-        subprocess.call(['systemctl', 'enable', 'amavisd.service'])
-        subprocess.call(['systemctl', 'enable', 'clamd.amavisd.service'])
-        subprocess.call(['systemctl', 'enable', 'wallace.service'])
+        subprocess.call(['/bin/systemctl', 'enable', 'postfix.service'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/bin/systemctl', 'enable', 'amavis.service'])
+            subprocess.call(['/bin/systemctl', 'enable', 'clamd.service'])
+        else:
+            subprocess.call(['/bin/systemctl', 'enable', 'amavisd.service'])
+            subprocess.call(['/bin/systemctl', 'enable', 'clamd.amavisd.service'])
+        subprocess.call(['/bin/systemctl', 'enable', 'wallace.service'])
     elif os.path.isfile('/sbin/chkconfig'):
-        subprocess.call(['chkconfig', 'postfix', 'on'])
-        subprocess.call(['chkconfig', 'amavisd', 'on'])
-        subprocess.call(['chkconfig', 'clamd.amavisd', 'on'])
-        subprocess.call(['chkconfig', 'wallace', 'on'])
+        subprocess.call(['/sbin/chkconfig', 'postfix', 'on'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/sbin/chkconfig', 'amavis', 'on'])
+            subprocess.call(['/sbin/chkconfig', 'clamd', 'on'])
+        else:
+            subprocess.call(['/sbin/chkconfig', 'amavisd', 'on'])
+            subprocess.call(['/sbin/chkconfig', 'clamd.amavisd', 'on'])
+        subprocess.call(['/sbin/chkconfig', 'wallace', 'on'])
     elif os.path.isfile('/usr/sbin/update-rc.d'):
         subprocess.call(['/usr/sbin/update-rc.d', 'postfix', 'defaults'])
         subprocess.call(['/usr/sbin/update-rc.d', 'amavis', 'defaults'])
diff -Ppru pykolab-0.6.11.orig/pykolab/setup/setup_mysql.py pykolab-0.6.11.suse_fixes/pykolab/setup/setup_mysql.py
--- pykolab-0.6.11.orig/pykolab/setup/setup_mysql.py	2014-01-28 12:33:07.000000000 +0100
+++ pykolab-0.6.11.suse_fixes/pykolab/setup/setup_mysql.py	2014-02-13 13:41:27.442972292 +0100
@@ -17,6 +17,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
+from platform import linux_distribution
 import os
 import subprocess
 import tempfile
@@ -40,18 +41,30 @@ def description():
 
 def execute(*args, **kw):
     if os.path.isfile('/bin/systemctl'):
-        subprocess.call(['/bin/systemctl', 'restart', 'mysqld.service'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/bin/systemctl', 'restart', 'mysql.service'])
+        else:
+            subprocess.call(['/bin/systemctl', 'restart', 'mysqld.service'])
     elif os.path.isfile('/sbin/service'):
-        subprocess.call(['/sbin/service', 'mysqld', 'restart'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/sbin/service', 'mysql', 'restart'])
+        else:
+            subprocess.call(['/sbin/service', 'mysqld', 'restart'])
     elif os.path.isfile('/usr/sbin/service'):
         subprocess.call(['/usr/sbin/service','mysql','restart'])
     else:
         log.error(_("Could not start the MySQL database service."))
 
     if os.path.isfile('/bin/systemctl'):
-        subprocess.call(['/bin/systemctl', 'enable', 'mysqld.service'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/bin/systemctl', 'enable', 'mysql.service'])
+        else:
+            subprocess.call(['/bin/systemctl', 'enable', 'mysqld.service'])
     elif os.path.isfile('/sbin/chkconfig'):
-        subprocess.call(['/sbin/chkconfig', 'mysqld', 'on'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/sbin/chkconfig', 'mysql', 'on'])
+        else:
+            subprocess.call(['/sbin/chkconfig', 'mysqld', 'on'])
     elif os.path.isfile('/usr/sbin/update-rc.d'):
         subprocess.call(['/usr/sbin/update-rc.d', 'mysql', 'defaults'])
     else:
@@ -64,7 +77,7 @@ def execute(*args, **kw):
         }
 
     answer = 0
-    if os.path.exists('/var/run/mysqld/mysqld.sock'):
+    if os.path.exists('/var/run/mysqld/mysqld.sock') or os.path.exists('/var/run/mysql/mysql.sock'):
         answer = utils.ask_menu(_("What MySQL server are we setting up?"), options)
 
     if answer == "1" or answer == 1:
diff -Ppru pykolab-0.6.11.orig/pykolab/setup/setup_roundcube.py pykolab-0.6.11.suse_fixes/pykolab/setup/setup_roundcube.py
--- pykolab-0.6.11.orig/pykolab/setup/setup_roundcube.py	2014-01-28 12:33:07.000000000 +0100
+++ pykolab-0.6.11.suse_fixes/pykolab/setup/setup_roundcube.py	2014-02-23 21:02:57.334965727 +0100
@@ -18,6 +18,7 @@
 #
 
 from Cheetah.Template import Template
+from platform import linux_distribution
 import hashlib
 import os
 import random
@@ -135,10 +136,14 @@ def execute(*args, **kw):
             fp.close()
 
     schema_files = []
-    for root, directories, filenames in os.walk('/usr/share/doc/'):
+    if 'SUSE' in linux_distribution()[0]:
+        docdir = '/usr/share/doc/packages/'
+    else:
+        docdir = '/usr/share/doc/'
+    for root, directories, filenames in os.walk(docdir):
         for directory in directories:
             if directory.startswith("roundcubemail"):
-                for root, directories, filenames in os.walk(os.path.join('/usr/share/doc/', directory)):
+                for root, directories, filenames in os.walk(os.path.join(docdir, directory)):
                     for filename in filenames:
                         if filename.startswith('mysql.initial') and filename.endswith('.sql'):
                             schema_filepath = os.path.join(root,filename)
@@ -152,6 +157,8 @@ def execute(*args, **kw):
         rcpath = '/usr/share/roundcubemail/'
     elif os.path.isdir('/usr/share/roundcube'):
         rcpath = '/usr/share/roundcube/'
+    elif os.path.isdir('/srv/www/roundcubemail'):
+        rcpath = '/srv/www/roundcubemail/'
     else:
         log.error(_("Roundcube installation path not found."))
         return
@@ -215,18 +222,30 @@ password='%s'
     time.sleep(2)
 
     if os.path.isfile('/bin/systemctl'):
-        subprocess.call(['/bin/systemctl', 'restart', 'httpd.service'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/bin/systemctl', 'restart', 'apache2.service'])
+        else:
+            subprocess.call(['/bin/systemctl', 'restart', 'httpd.service'])
     elif os.path.isfile('/sbin/service'):
-        subprocess.call(['/sbin/service', 'httpd', 'restart'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/sbin/service', 'apache2', 'restart'])
+        else:
+            subprocess.call(['/sbin/service', 'httpd', 'restart'])
     elif os.path.isfile('/usr/sbin/service'):
         subprocess.call(['/usr/sbin/service','apache2','restart'])
     else:
         log.error(_("Could not start the webserver server service."))
 
     if os.path.isfile('/bin/systemctl'):
-        subprocess.call(['/bin/systemctl', 'enable', 'httpd.service'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/bin/systemctl', 'enable', 'apache2.service'])
+        else:
+            subprocess.call(['/bin/systemctl', 'enable', 'httpd.service'])
     elif os.path.isfile('/sbin/chkconfig'):
-        subprocess.call(['/sbin/chkconfig', 'httpd', 'on'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/sbin/chkconfig', 'apache2', 'on'])
+        else:
+            subprocess.call(['/sbin/chkconfig', 'httpd', 'on'])
     elif os.path.isfile('/usr/sbin/update-rc.d'):
         subprocess.call(['/usr/sbin/update-rc.d', 'apache2', 'defaults'])
     else:
diff -Ppru pykolab-0.6.11.orig/pykolab/setup/setup_syncroton.py pykolab-0.6.11.suse_fixes/pykolab/setup/setup_syncroton.py
--- pykolab-0.6.11.orig/pykolab/setup/setup_syncroton.py	2014-01-28 12:33:07.000000000 +0100
+++ pykolab-0.6.11.suse_fixes/pykolab/setup/setup_syncroton.py	2014-02-13 13:46:03.294573605 +0100
@@ -17,6 +17,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 
+from platform import linux_distribution
 import os
 import subprocess
 import sys
@@ -84,18 +85,30 @@ password='%s'
     time.sleep(2)
 
     if os.path.isfile('/bin/systemctl'):
-        subprocess.call(['/bin/systemctl', 'restart', 'httpd.service'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/bin/systemctl', 'restart', 'apache2.service'])
+        else:
+            subprocess.call(['/bin/systemctl', 'restart', 'httpd.service'])
     elif os.path.isfile('/sbin/service'):
-        subprocess.call(['/sbin/service', 'httpd', 'restart'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/sbin/service', 'apache2', 'restart'])
+        else:
+            subprocess.call(['/sbin/service', 'httpd', 'restart'])
     elif os.path.isfile('/usr/sbin/service'):
         subprocess.call(['/usr/sbin/service','apache2','restart'])
     else:
         log.error(_("Could not start the webserver server service."))
 
     if os.path.isfile('/bin/systemctl'):
-        subprocess.call(['/bin/systemctl', 'enable', 'httpd.service'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/bin/systemctl', 'enable', 'apache2.service'])
+        else:
+            subprocess.call(['/bin/systemctl', 'enable', 'httpd.service'])
     elif os.path.isfile('/sbin/chkconfig'):
-        subprocess.call(['/sbin/chkconfig', 'httpd', 'on'])
+        if 'SUSE' in linux_distribution()[0]:
+            subprocess.call(['/sbin/chkconfig', 'apache2', 'on'])
+        else:
+            subprocess.call(['/sbin/chkconfig', 'httpd', 'on'])
     elif os.path.isfile('/usr/sbin/update-rc.d'):
         subprocess.call(['/usr/sbin/update-rc.d', 'apache2', 'defaults'])
     else:
diff -Ppru pykolab-0.6.11.orig/saslauthd/__init__.py pykolab-0.6.11.suse_fixes/saslauthd/__init__.py
--- pykolab-0.6.11.orig/saslauthd/__init__.py	2014-01-28 12:33:07.000000000 +0100
+++ pykolab-0.6.11.suse_fixes/saslauthd/__init__.py	2014-02-23 20:59:53.933902050 +0100
@@ -66,6 +66,15 @@ class SASLAuthDaemon(object):
             )
 
         daemon_group.add_option(
+                "-s",
+                "--socket",
+                dest    = "socketfile",
+                action  = "store",
+                default = "/var/run/saslauthd/mux",
+                help    = _("Socket file to bind to.")
+            )
+
+        daemon_group.add_option(
                 "-u",
                 "--user",
                 dest    = "process_username",
@@ -97,6 +106,16 @@ class SASLAuthDaemon(object):
             log.error(_("Could not create %r: %r") % (os.path.dirname(conf.pidfile), errmsg))
             sys.exit(1)
 
+        try:
+            utils.ensure_directory(
+                    os.path.dirname(conf.socketfile),
+                    conf.process_username,
+                    conf.process_groupname
+                )
+        except Exception, errmsg:
+            log.error(_("Could not create %r: %r") % (os.path.dirname(conf.socketfile), errmsg))
+            sys.exit(1)
+
         self.thread_count = 0
 
     def run(self):
@@ -153,23 +172,23 @@ class SASLAuthDaemon(object):
 
         s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
 
-        utils.ensure_directory(
-                '/var/run/saslauthd/',
-                conf.process_username,
-                conf.process_groupname
-            )
-
-        # TODO: The saslauthd socket path could be a setting.
-        try:
-            os.remove('/var/run/saslauthd/mux')
-        except:
-            # TODO: Do the "could not remove, could not start" dance
-            pass
+        if os.path.exists(conf.socketfile):
+            try:
+                os.remove(conf.socketfile)
+            except IOError, e:
+                log.error(_("Cannot start SASL authentication daemon"))
+                return False
 
-        s.bind('/var/run/saslauthd/mux')
-        os.chmod('/var/run/saslauthd/mux', 0777)
+        else:
+            utils.ensure_directory(
+                    os.path.dirname(conf.socketfile),
+                    conf.process_username,
+                    conf.process_groupname
+                )
 
-        s.listen(5)
+            s.bind(conf.socketfile)
+            os.chmod(conf.socketfile, 0777)
+            s.listen(5)
 
         while 1:
             max_tries = 20
diff -Ppru pykolab-0.6.11.orig/saslauthd/kolab-saslauthd.sysvinit pykolab-0.6.11.suse_fixes/saslauthd/kolab-saslauthd.sysvinit
--- pykolab-0.6.11.orig/saslauthd/kolab-saslauthd.sysvinit	2014-01-28 12:33:07.000000000 +0100
+++ pykolab-0.6.11.suse_fixes/saslauthd/kolab-saslauthd.sysvinit	2014-02-13 14:36:41.433221148 +0100
@@ -24,7 +24,11 @@ if [ -f  /etc/init.d/functions ]; then
 fi
 
 # Source our configuration file for these variables.
+if [[ -d /var/run/sasl2 ]]; then
+SOCKETDIR=/var/run/sasl2
+else
 SOCKETDIR=/var/run/saslauthd
+fi
 FLAGS="--fork -l warning"
 
 if [ -f /etc/sysconfig/kolab-saslauthd ] ; then

Places

File pykolab-0.6.11_suse_fixes.patch of Package pykolab (Revision c7e521261d9845c3ff5fff012151ece7)

Places