[arch-commits] Commit in dovecot/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Monday, February 27, 2012 @ 12:30:27
  Author: andyrtr
Revision: 151554

upgpkg: dovecot 2.1.1-3

don't install sample config files to /etc direclty, they break dovecot start way too often - FS#20809; add mkcert helper script

Modified:
  dovecot/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-27 17:17:02 UTC (rev 151553)
+++ PKGBUILD	2012-02-27 17:30:27 UTC (rev 151554)
@@ -6,7 +6,7 @@
 
 pkgname=dovecot
 pkgver=2.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
 url="http://dovecot.org/"
@@ -18,12 +18,6 @@
            'clucene: alternative FTS indexer')
 provides=('imap-server' 'pop3-server')
 options=('!libtool')
-backup=(etc/dovecot/dovecot.conf
-	etc/dovecot/conf.d/{10-auth,10-director,10-logging,10-mail,10-master,10-ssl}.conf
-	etc/dovecot/conf.d/{15-lda,20-imap,20-lmtp,20-pop3}.conf
-	etc/dovecot/conf.d/{90-acl,90-plugin,90-quota}.conf
-	etc/dovecot/conf.d/auth-{checkpassword,deny,ldap,master,passwdfile,sql,static,system,vpopmail}.conf.ext
-	etc/ssl/dovecot-openssl.cnf)
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh)
 md5sums=('db41a4de848d2bc834c30af0eb5575fd'
@@ -62,11 +56,12 @@
 
   # install example conf files and ssl.conf
   install -d -m755 ${pkgdir}/etc/dovecot/conf.d
-  install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/conf.d/*.conf ${pkgdir}/etc/dovecot/conf.d
-  install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/conf.d/*.conf.ext ${pkgdir}/etc/dovecot/conf.d
-  install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/dovecot.conf ${pkgdir}/etc/dovecot/
+  install -m 644 ${pkgdir}/usr/share/doc/dovecot/example-config/dovecot.conf ${pkgdir}/etc/dovecot/dovecot.conf.sample
   install -d -m755 ${pkgdir}/etc/ssl
-  install -m 644  ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf ${pkgdir}/etc/ssl/
+  install -m 644  ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf ${pkgdir}/etc/ssl/dovecot-openssl.cnf.sample
 
+  # install mkcert helper script
+  install -m 755  ${srcdir}/$pkgname-$pkgver/doc/mkcert.sh ${pkgdir}/usr/lib/dovecot/mkcert.sh
+
   rm ${pkgdir}/etc/dovecot/README
 }