diff options
author | Javier Torres | 2015-08-07 21:03:42 +0200 |
---|---|---|
committer | Javier Torres | 2015-08-07 21:03:42 +0200 |
commit | 0128e0a51d7f6474cf19ce8163447a3c022a9e66 (patch) | |
tree | 0d725ca5ac922ed8c7e5042b276911ad38d0d3d3 | |
parent | 38d482fb1eaae26a2fda088d46cee08eee3e7c10 (diff) | |
download | aur-0128e0a51d7f6474cf19ce8163447a3c022a9e66.tar.gz |
Change /var/lib/imap to /var/imap for consistency with cyrus-imapd
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 6 | ||||
-rw-r--r-- | setup-script.patch | 18 | ||||
-rw-r--r-- | templates.patch | 25 |
4 files changed, 49 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = pykolab pkgdesc = Kolab Python Utilities pkgver = 0.7.13 - pkgrel = 1 + pkgrel = 2 url = http://kolab.org install = pykolab.install arch = any @@ -42,8 +42,8 @@ pkgbase = pykolab sha256sums = 842586765921ae4f25acbcb53dc71c1d89907a1b8a9c70f83349d9367c4ecfee sha256sums = 6995524d755ea3cbf3d36fc572667629716a141e7f757af1a970c2e85f8fa4de sha256sums = a515f068b5fe12c858f327fa0558087e61b4d39070d67dfba9a2b6d19a83c2c6 - sha256sums = c9436d7a3199b0503b6193166dddaeb5843377750d462eb3070e7c7c2c4e10b2 - sha256sums = fcf45ffb13dd6a64baefa30bb245f7ec239e92bd3cbbc42f141817fff8544dc3 + sha256sums = 1ff05a0f7f503443cab6d7b81ce723202df4f10cbbe8f483056d7f4aaea7d460 + sha256sums = 653b49d20dbb0b492962e87009c53acaa9acb2d9825bd22d8335c43386ddd8c7 sha256sums = 4bbb72695b20b7a4c1c0348a93c62f048f0eef9f3bc7135fa2720c62e98e4634 pkgname = pykolab @@ -3,7 +3,7 @@ pkgname=pykolab pkgver=0.7.13 -pkgrel=1 +pkgrel=2 pkgdesc='Kolab Python Utilities' arch=('any') license=('GPL3') @@ -38,8 +38,8 @@ optdepends=('cyrus-imapd-ldap: Only supported IMAP backend so far' sha256sums=('842586765921ae4f25acbcb53dc71c1d89907a1b8a9c70f83349d9367c4ecfee' '6995524d755ea3cbf3d36fc572667629716a141e7f757af1a970c2e85f8fa4de' 'a515f068b5fe12c858f327fa0558087e61b4d39070d67dfba9a2b6d19a83c2c6' - 'c9436d7a3199b0503b6193166dddaeb5843377750d462eb3070e7c7c2c4e10b2' - 'fcf45ffb13dd6a64baefa30bb245f7ec239e92bd3cbbc42f141817fff8544dc3' + '1ff05a0f7f503443cab6d7b81ce723202df4f10cbbe8f483056d7f4aaea7d460' + '653b49d20dbb0b492962e87009c53acaa9acb2d9825bd22d8335c43386ddd8c7' '4bbb72695b20b7a4c1c0348a93c62f048f0eef9f3bc7135fa2720c62e98e4634') diff --git a/setup-script.patch b/setup-script.patch index 3a8223adeeaa..630dbe3245a0 100644 --- a/setup-script.patch +++ b/setup-script.patch @@ -132,6 +132,24 @@ diff --git a/pykolab/setup/setup_mta.py b/pykolab/setup/setup_mta.py index 56109fe..b8f6485 100644 --- a/pykolab/setup/setup_mta.py +++ b/pykolab/setup/setup_mta.py +@@ -165,7 +165,7 @@ + + query_filter = (&(|(mailAlternateAddress=%%s)(alias=%%s)(mail=%%s))(objectclass=kolabinetorgperson)) + result_attribute = mail +-result_format = lmtp:unix:/var/lib/imap/socket/lmtp ++result_format = lmtp:unix:/var/imap/socket/lmtp + """ % { + "base_dn": conf.get('ldap', 'base_dn'), + "server_host": server_host, +@@ -244,7 +244,7 @@ + fp.close() + + fp = open('/etc/postfix/transport', 'a') +- fp.write("\n# Shared Folder Delivery for %(domain)s:\nshared@%(domain)s\t\tlmtp:unix:/var/lib/imap/socket/lmtp\n" % {'domain': conf.get('kolab', 'primary_domain')}) ++ fp.write("\n# Shared Folder Delivery for %(domain)s:\nshared@%(domain)s\t\tlmtp:unix:/var/imap/socket/lmtp\n" % {'domain': conf.get('kolab', 'primary_domain')}) + fp.close() + + subprocess.call(["postmap", "/etc/postfix/transport"]) @@ -274,9 +274,9 @@ result_format = "shared+%%s" if os.path.isfile('/etc/pki/tls/certs/make-dummy-cert') and not os.path.isfile('/etc/pki/tls/private/localhost.pem'): subprocess.call(['/etc/pki/tls/certs/make-dummy-cert', '/etc/pki/tls/private/localhost.pem']) diff --git a/templates.patch b/templates.patch index 56f7cf016619..f469c4331bee 100644 --- a/templates.patch +++ b/templates.patch @@ -22,6 +22,31 @@ index 1fa43fb..794292a 100644 #NOTE: create directories \$MYHOME/tmp, \$MYHOME/var, \$MYHOME/db manually \$log_level = 9; # verbosity 0..5, -d +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 + +- ptloader cmd="ptloader" listen="/var/lib/imap/ptclient/ptsock" prefork=0 ++ ptloader cmd="ptloader" listen="/var/imap/ptclient/ptsock" prefork=0 + + # these are only necessary if receiving/exporting usenet via NNTP + #nntp cmd="nntpd" listen="nntp" prefork=3 +@@ -25,10 +25,10 @@ + + # 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 + + # 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 + } + + EVENTS { diff --git a/share/templates/imapd.conf.tpl b/share/templates/imapd.conf.tpl index 194135e..2d397a7 100644 --- a/share/templates/imapd.conf.tpl |