Update to 0.7.13

4 files changed, 16 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9b8178bfee8f..e1da399583f2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pykolab
 	pkgdesc = Kolab Python Utilities
-	pkgver = 0.7.11
-	pkgrel = 2
+	pkgver = 0.7.13
+	pkgrel = 0
 	url = http://kolab.org
 	install = pykolab.install
 	arch = any
@@ -33,17 +33,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.11.tar.gz
+	source = http://mirror.kolabsys.com/pub/releases/pykolab-0.7.13.tar.gz
 	source = http://mirror.kolabsys.com/pub/releases/kolab-schema-3.2.tar.gz
 	source = systemd-services.patch
 	source = setup-script.patch
 	source = templates.patch
 	source = kolabd.tmpfiles
-	sha256sums = ef3c2d462f06e3d3a9206b611b77c11c8281dc7979283436edd587a8e6b83bad
+	sha256sums = 842586765921ae4f25acbcb53dc71c1d89907a1b8a9c70f83349d9367c4ecfee
 	sha256sums = 6995524d755ea3cbf3d36fc572667629716a141e7f757af1a970c2e85f8fa4de
 	sha256sums = a515f068b5fe12c858f327fa0558087e61b4d39070d67dfba9a2b6d19a83c2c6
-	sha256sums = 27c2505eed62ae3f74494d93aed7f0a4c5b72df1bf4cb797189be6d398459b7b
-	sha256sums = 49816a6a7e0f6ec200c559d4c54fc9ae70d4de299409838113f3654729d6b694
+	sha256sums = c9436d7a3199b0503b6193166dddaeb5843377750d462eb3070e7c7c2c4e10b2
+	sha256sums = fcf45ffb13dd6a64baefa30bb245f7ec239e92bd3cbbc42f141817fff8544dc3
 	sha256sums = 4bbb72695b20b7a4c1c0348a93c62f048f0eef9f3bc7135fa2720c62e98e4634
 
 pkgname = pykolab
diff --git a/PKGBUILD b/PKGBUILD
index a8f5522da5ce..7a56cd19d1eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Jonas Heinrich <onny@project-insanity.org>
 
 pkgname=pykolab
-pkgver=0.7.11
-pkgrel=2
+pkgver=0.7.13
+pkgrel=0
 pkgdesc='Kolab Python Utilities'
 arch=('any')
 license=('GPL3')
@@ -35,11 +35,11 @@ optdepends=('cyrus-imapd-ldap: Only supported IMAP backend so far'
             'kolab-syncroton: ActiveSync support'
             'kolab-webadmin: Administration tool')
 
-sha256sums=('ef3c2d462f06e3d3a9206b611b77c11c8281dc7979283436edd587a8e6b83bad'
+sha256sums=('842586765921ae4f25acbcb53dc71c1d89907a1b8a9c70f83349d9367c4ecfee'
             '6995524d755ea3cbf3d36fc572667629716a141e7f757af1a970c2e85f8fa4de'
             'a515f068b5fe12c858f327fa0558087e61b4d39070d67dfba9a2b6d19a83c2c6'
-            '27c2505eed62ae3f74494d93aed7f0a4c5b72df1bf4cb797189be6d398459b7b'
-            '49816a6a7e0f6ec200c559d4c54fc9ae70d4de299409838113f3654729d6b694'
+            'c9436d7a3199b0503b6193166dddaeb5843377750d462eb3070e7c7c2c4e10b2'
+            'fcf45ffb13dd6a64baefa30bb245f7ec239e92bd3cbbc42f141817fff8544dc3'
             '4bbb72695b20b7a4c1c0348a93c62f048f0eef9f3bc7135fa2720c62e98e4634')
 
 
diff --git a/setup-script.patch b/setup-script.patch
index 36343c35c4cd..3a8223adeeaa 100644
--- a/setup-script.patch
+++ b/setup-script.patch
@@ -101,7 +101,7 @@ diff --git a/pykolab/setup/setup_ldap.py b/pykolab/setup/setup_ldap.py
 index c805d20..1786438 100644
 --- a/pykolab/setup/setup_ldap.py
 +++ b/pykolab/setup/setup_ldap.py
-@@ -321,6 +321,8 @@ ServerAdminPwd = %(admin_pass)s
+@@ -332,6 +332,8 @@ ServerAdminPwd = %(admin_pass)s
          setup_ds_admin = "/usr/sbin/setup-ds.pl"
      elif os.path.isfile("/usr/sbin/setup-ds"):
          setup_ds_admin = "/usr/sbin/setup-ds"
@@ -110,7 +110,7 @@ index c805d20..1786438 100644
      else:
          log.error(_("No directory server setup tool available."))
          sys.exit(1)
-@@ -406,7 +408,7 @@ ServerAdminPwd = %(admin_pass)s
+@@ -417,7 +419,7 @@ ServerAdminPwd = %(admin_pass)s
          schema_error = True
  
      if os.path.isfile('/bin/systemctl'):
@@ -119,7 +119,7 @@ index c805d20..1786438 100644
      elif os.path.isfile('/sbin/service'):
          subprocess.call(['/sbin/service', 'dirsrv', 'restart'])
      elif os.path.isfile('/usr/sbin/service'):
-@@ -417,7 +419,7 @@ ServerAdminPwd = %(admin_pass)s
+@@ -428,7 +430,7 @@ ServerAdminPwd = %(admin_pass)s
          log.error(_("Could not start the directory server service."))
  
      if os.path.isfile('/bin/systemctl'):
@@ -176,7 +176,7 @@ 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
-@@ -170,7 +170,7 @@ password='%s'
+@@ -186,7 +186,7 @@ password='%s'
          p2.communicate()
  
          conf.command_set('kolab_wap', 'sql_uri', 'mysql://kolab:%s@localhost/kolab' % (mysql_kolab_password))
diff --git a/templates.patch b/templates.patch
index 5d8d723ce68b..56f7cf016619 100644
--- a/templates.patch
+++ b/templates.patch
@@ -34,7 +34,7 @@ index 194135e..2d397a7 100644
 -sievedir: /var/lib/imap/sieve
 +sievedir: /var/imap/sieve
  sendmail: /usr/sbin/sendmail
- sasl_pwcheck_method: auxprop saslauthd
+ sasl_pwcheck_method: saslauthd
  sasl_mech_list: PLAIN LOGIN
  allowplaintext: no
 -tls_server_cert: /etc/pki/cyrus-imapd/cyrus-imapd.pem