File pykolab-0.6.13.suse_fixes2.patch of Package pykolab

Overview Repositories Revisions Requests Users Attributes Meta

File pykolab-0.6.13.suse_fixes2.patch of Package pykolab (Revision 9c62fdec329f5d9c6750be544a5d7e8f)

Currently displaying revision 9c62fdec329f5d9c6750be544a5d7e8f , Show latest

diff -Ppru pykolab-0.6.13.orig/.directory pykolab-0.6.13.suse_fixes/.directory
--- pykolab-0.6.13.orig/.directory	1970-01-01 01:00:00.000000000 +0100
+++ pykolab-0.6.13.suse_fixes/.directory	2014-08-04 20:58:23.587431002 +0200
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2014,8,4,20,58,23
+Version=3
+ViewMode=1
diff -Ppru pykolab-0.6.13.orig/pykolab/setup/setup_mta.py pykolab-0.6.13.suse_fixes/pykolab/setup/setup_mta.py
--- pykolab-0.6.13.orig/pykolab/setup/setup_mta.py	2014-04-04 08:58:32.000000000 +0200
+++ pykolab-0.6.13.suse_fixes/pykolab/setup/setup_mta.py	2014-08-04 21:08:32.563495815 +0200
@@ -19,6 +19,7 @@
 
 from augeas import Augeas
 from Cheetah.Template import Template
+from platform import linux_distribution
 import os
 import shutil
 import subprocess
@@ -368,7 +369,9 @@ 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'):
@@ -388,6 +391,8 @@ result_format = shared+%%s
             fp = open('/etc/amavisd/amavisd.conf', 'w')
         elif os.path.isdir('/etc/amavis'):
             fp = open('/etc/amavis/amavisd.conf', 'w')
+        elif os.path.isfile('/etc/amavisd.conf'):
+            fp = open('/etc/amavisd.conf', 'w')
 
         if not fp == None:
             fp.write(t.__str__())
@@ -419,15 +424,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'])
@@ -437,15 +450,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.13.orig/saslauthd/__init__.py pykolab-0.6.13.suse_fixes/saslauthd/__init__.py
--- pykolab-0.6.13.orig/saslauthd/__init__.py	2014-04-04 08:58:32.000000000 +0200
+++ pykolab-0.6.13.suse_fixes/saslauthd/__init__.py	2014-08-04 21:26:45.185672747 +0200
@@ -68,6 +68,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",
@@ -159,15 +168,14 @@ class SASLAuthDaemon(object):
 
         s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
 
-        # TODO: The saslauthd socket path could be a setting.
         try:
-            os.remove('/var/run/saslauthd/mux')
+            os.remove(conf.socketfile)
         except:
             # TODO: Do the "could not remove, could not start" dance
             pass
 
-        s.bind('/var/run/saslauthd/mux')
-        os.chmod('/var/run/saslauthd/mux', 0777)
+        s.bind(conf.socketfile)
+        os.chmod(conf.socketfile, 0777)
 
         s.listen(5)
 
@@ -262,7 +270,7 @@ class SASLAuthDaemon(object):
 
     def _ensure_socket_dir(self):
         utils.ensure_directory(
-                '/var/run/saslauthd/',
+                os.path.dirname(conf.socketfile),
                 conf.process_username,
                 conf.process_groupname
             )

Places

File pykolab-0.6.13.suse_fixes2.patch of Package pykolab (Revision 9c62fdec329f5d9c6750be544a5d7e8f)

Places