Update to 0.8.0

4 files changed, 41 insertions, 85 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c2d1906af55..48f8f0b4ff2b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Thu Feb 18 19:11:45 UTC 2016
 pkgbase = pykolab
 	pkgdesc = Kolab Python Utilities
-	pkgver = 0.7.17
+	pkgver = 0.8.0
 	pkgrel = 1
 	url = http://kolab.org
 	install = pykolab.install
@@ -33,17 +35,17 @@ pkgbase = pykolab
 	optdepends = kolab-syncroton: ActiveSync support
 	optdepends = kolab-webadmin: Administration tool
 	backup = etc/kolab/kolab.conf
-	source = http://mirror.kolabsys.com/pub/releases/pykolab-0.7.17.tar.gz
-	source = http://mirror.kolabsys.com/pub/releases/kolab-schema-3.2.tar.gz
+	source = http://mirror.kolabsys.com/pub/releases/pykolab-0.8.0.tar.gz
+	source = http://mirror.kolabsys.com/pub/releases/kolab-schema-3.3.tar.gz
 	source = systemd-services.patch
 	source = setup-script.patch
 	source = templates.patch
 	source = kolabd.tmpfiles
-	sha256sums = c01e8f81a8673fbd0bb38bb5447fc08659d8ebc961463af99a9a0aabd392c6bb
-	sha256sums = 6995524d755ea3cbf3d36fc572667629716a141e7f757af1a970c2e85f8fa4de
+	sha256sums = 4870cfe488b339c892ecfeb221ba412071cb7c26cfd7f1ef9aa9f7317133336e
+	sha256sums = c5d2129f944c4c15ed7b23adc2d6475e1247205b9c95b1f8ce65a820e04ec103
 	sha256sums = a515f068b5fe12c858f327fa0558087e61b4d39070d67dfba9a2b6d19a83c2c6
-	sha256sums = 0f9d45bb7784426b7515eac8158c6cf899b647b20763c5efd302535bd06b1480
-	sha256sums = bbf5b350b0cf5b11cf93710440965c91874652d008e5b6cbd6a541188318a2d5
+	sha256sums = 87fc4b8d1dcaaa23d5416ceecadeb85cba4f6668becf97092cdf84b62bb779f4
+	sha256sums = 61e30a1e35c592bdab2f0e0606500f7bd4a29de32874adef26f98dc4b7d6e393
 	sha256sums = 4bbb72695b20b7a4c1c0348a93c62f048f0eef9f3bc7135fa2720c62e98e4634
 
 pkgname = pykolab
diff --git a/PKGBUILD b/PKGBUILD
index 9ef2bb33c01d..87c5a9948c52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Jonas Heinrich <onny@project-insanity.org>
 
 pkgname=pykolab
-pkgver=0.7.17
+pkgver=0.8.0
 pkgrel=1
 pkgdesc='Kolab Python Utilities'
 arch=('any')
@@ -13,7 +13,7 @@ url='http://kolab.org'
 install=pykolab.install
 backup=('etc/kolab/kolab.conf')
 source=("http://mirror.kolabsys.com/pub/releases/${pkgname}-${pkgver}.tar.gz"
-        "http://mirror.kolabsys.com/pub/releases/kolab-schema-3.2.tar.gz"
+        "http://mirror.kolabsys.com/pub/releases/kolab-schema-3.3.tar.gz"
         "systemd-services.patch"
         "setup-script.patch"
         "templates.patch"
@@ -35,11 +35,11 @@ optdepends=('cyrus-imapd-ldap: Only supported IMAP backend so far'
             'kolab-syncroton: ActiveSync support'
             'kolab-webadmin: Administration tool')
 
-sha256sums=('c01e8f81a8673fbd0bb38bb5447fc08659d8ebc961463af99a9a0aabd392c6bb'
-            '6995524d755ea3cbf3d36fc572667629716a141e7f757af1a970c2e85f8fa4de'
+sha256sums=('4870cfe488b339c892ecfeb221ba412071cb7c26cfd7f1ef9aa9f7317133336e'
+            'c5d2129f944c4c15ed7b23adc2d6475e1247205b9c95b1f8ce65a820e04ec103'
             'a515f068b5fe12c858f327fa0558087e61b4d39070d67dfba9a2b6d19a83c2c6'
-            '0f9d45bb7784426b7515eac8158c6cf899b647b20763c5efd302535bd06b1480'
-            'bbf5b350b0cf5b11cf93710440965c91874652d008e5b6cbd6a541188318a2d5'
+            '87fc4b8d1dcaaa23d5416ceecadeb85cba4f6668becf97092cdf84b62bb779f4'
+            '61e30a1e35c592bdab2f0e0606500f7bd4a29de32874adef26f98dc4b7d6e393'
             '4bbb72695b20b7a4c1c0348a93c62f048f0eef9f3bc7135fa2720c62e98e4634')
 
 
diff --git a/setup-script.patch b/setup-script.patch
index 4c3422c59db5..789ae457219d 100644
--- a/setup-script.patch
+++ b/setup-script.patch
@@ -79,24 +79,16 @@ index 57b4023..d967e8a 100644
      fp.write("\n".join(annotations))
      fp.close()
  
-@@ -145,7 +145,7 @@ def execute(*args, **kw):
+@@ -145,6 +145,8 @@
+     imapservice = 'cyrus-imapd.service'
+     if os.path.isfile('/usr/lib/systemd/system/cyrus.service'):
+         imapservice = 'cyrus.service'
++    elif os.path.isfile('/usr/lib/systemd/system/cyrus-master.service'):
++        imapservice = 'cyrus-master.service'
+ 
      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(['systemctl', 'restart', 'cyrus-master.service'])
-     elif os.path.isfile('/sbin/service'):
-         subprocess.call(['service', 'saslauthd', 'stop'])
-         subprocess.call(['service', 'kolab-saslauthd', 'restart'])
-@@ -160,7 +160,7 @@ def execute(*args, **kw):
-     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(['systemctl', 'enable', 'cyrus-master.service'])
-     elif os.path.isfile('/sbin/chkconfig'):
-         subprocess.call(['chkconfig', 'saslauthd', 'off'])
-         subprocess.call(['chkconfig', 'kolab-saslauthd', 'on'])
+
 diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
 index c805d20..1786438 100644
 --- a/pykolab/setup/setup_ldap.py
@@ -172,29 +164,11 @@ index 56109fe..b8f6485 100644
          }
  
      template_file = None
-@@ -438,7 +438,7 @@ result_format = "shared+%%s"
-     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', 'clamd.service'])
-         subprocess.call(['systemctl', 'restart', 'wallace.service'])
-     elif os.path.isfile('/sbin/service'):
-         subprocess.call(['service', 'postfix', 'restart'])
-@@ -456,7 +456,7 @@ result_format = "shared+%%s"
-     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', 'clamd.service'])
-         subprocess.call(['systemctl', 'enable', 'wallace.service'])
-     elif os.path.isfile('/sbin/chkconfig'):
-         subprocess.call(['chkconfig', 'postfix', 'on'])
 diff --git a/pykolab/setup/setup_mysql.py b/pykolab/setup/setup_mysql.py
 index 174cbc7..1e0d70f 100644
 --- a/pykolab/setup/setup_mysql.py
 +++ b/pykolab/setup/setup_mysql.py
-@@ -206,7 +206,7 @@ password='%s'
+@@ -208,7 +208,7 @@ password='%s'
          p2.communicate()
  
          conf.command_set('kolab_wap', 'sql_uri', 'mysql://kolab:%s@localhost/kolab' % (mysql_kolab_password))
@@ -229,19 +203,15 @@ diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py
 index 6558989..fad35fa 100644
 --- a/pykolab/setup/setup_roundcube.py
 +++ b/pykolab/setup/setup_roundcube.py
-@@ -89,9 +89,9 @@ def execute(*args, **kw):
-             'conf': conf
-         }
- 
--    if os.access('/usr/share/roundcubemail/skins/enterprise/', os.R_OK):
-+    if os.access('/usr/share/webapps/roundcubemail/skins/enterprise/', os.R_OK):
-         rc_settings['skin'] = 'enterprise'
--    elif os.access('/usr/share/roundcubemail/skins/chameleon/', os.R_OK):
-+    elif os.access('/usr/share/webapps/roundcubemail/skins/chameleon/', os.R_OK):
-         rc_settings['skin'] = 'chameleon'
-     else:
-         rc_settings['skin'] = 'larry'
-@@ -140,13 +140,15 @@ def execute(*args, **kw):
+@@ -92,6 +92,7 @@
+     rc_paths = [
+             "/usr/share/roundcubemail/",
+             "/usr/share/roundcube/",
++            "/usr/share/webapps/roundcubemail/",
+             "/srv/www/roundcubemail/",
+             "/var/www/roundcubemail/"
+         ]
+@@ -157,13 +158,15 @@ def execute(*args, **kw):
                  fp = open('/etc/roundcubemail/%s' % (want_file), 'w')
              elif os.path.isdir('/etc/roundcube'):
                  fp = open('/etc/roundcube/%s' % (want_file), 'w')
@@ -258,12 +228,3 @@ index 6558989..fad35fa 100644
          directories.sort()
          for directory in directories:
              if directory.startswith("roundcubemail"):
-@@ -165,6 +167,8 @@ def execute(*args, **kw):
-         rcpath = '/usr/share/roundcubemail/'
-     elif os.path.isdir('/usr/share/roundcube'):
-         rcpath = '/usr/share/roundcube/'
-+    elif os.path.isdir('/usr/share/webapps/roundcubemail'):
-+        rcpath = '/usr/share/webapps/roundcubemail/'
-     else:
-         log.error(_("Roundcube installation path not found."))
-         return
diff --git a/templates.patch b/templates.patch
index 24be1dc2ab87..a4536ceb52c1 100644
--- a/templates.patch
+++ b/templates.patch
@@ -25,25 +25,18 @@ index 1fa43fb..794292a 100644
 diff --git a/share/templates/cyrus.conf.tpl b/share/templates/cyrus.conf.tpl
 --- a/share/templates/cyrus.conf.tpl
 +++ b/share/templates/cyrus.conf.tpl
-@@ -17,7 +17,7 @@
-     pop3s		cmd="pop3d -s" listen="pop3s" prefork=1
-     sieve		cmd="timsieved" listen="sieve" prefork=0
+@@ -13,11 +13,11 @@
  
--    ptloader    cmd="ptloader" listen="/var/lib/imap/ptclient/ptsock" prefork=0
-+    ptloader    cmd="ptloader" listen="/var/imap/ptclient/ptsock" prefork=0
+     sieve       cmd="timsieved" listen="sieve"                          prefork=0
  
-     # these are only necessary if receiving/exporting usenet via NNTP
-     #nntp		cmd="nntpd" listen="nntp" prefork=3
-@@ -25,10 +25,10 @@
+-    ptloader    cmd="ptloader"  listen="/var/lib/imap/ptclient/ptsock"  prefork=0
++    ptloader    cmd="ptloader"  listen="/var/imap/ptclient/ptsock"      prefork=0
  
-     # at least one LMTP is required for delivery
-     #lmtp		cmd="lmtpd" listen="lmtp" prefork=0
--    lmtpunix	cmd="lmtpd" listen="/var/lib/imap/socket/lmtp" prefork=1
-+    lmtpunix	cmd="lmtpd" listen="/var/imap/socket/lmtp" prefork=1
+-    lmtpunix    cmd="lmtpd"     listen="/var/lib/imap/socket/lmtp"      prefork=1
++    lmtpunix    cmd="lmtpd"     listen="/var/imap/socket/lmtp"          prefork=1
  
-     # this is only necessary if using notifications
--    notify	cmd="notifyd" listen="/var/lib/imap/socket/notify" proto="udp" prefork=1
-+    notify	cmd="notifyd" listen="/var/imap/socket/notify" proto="udp" prefork=1
+-    notify      cmd="notifyd"   listen="/var/lib/imap/socket/notify"    proto="udp" prefork=1
++    notify      cmd="notifyd"   listen="/var/imap/socket/notify"        proto="udp" prefork=1
  }
  
  EVENTS {