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

[andyrtr at archlinux.org]

    Date: Thursday, September 9, 2010 @ 13:05:28
  Author: andyrtr
Revision: 90239

upgpkg: dovecot 2.0.2-1
new version 2.0.2; fix #20533

Modified:
  dovecot/trunk/PKGBUILD
  dovecot/trunk/dovecot.install

-----------------+
 PKGBUILD        |   16 ++++++++--------
 dovecot.install |    4 ++++
 2 files changed, 12 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-09-09 13:38:59 UTC (rev 90238)
+++ PKGBUILD	2010-09-09 17:05:28 UTC (rev 90239)
@@ -6,8 +6,8 @@
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 
 pkgname=dovecot
-pkgver=2.0.1
-pkgrel=2
+pkgver=2.0.2
+pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
 url="http://dovecot.org/"
@@ -28,7 +28,7 @@
 	etc/ssl/dovecot-openssl.cnf)
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.0/${pkgname}-${pkgver}.tar.gz dovecot.sh)
-md5sums=('f58749dae7826d82b96fccf2c9e3bbf7'
+md5sums=('e6386f44d027bd3f3f21400e162cf4f6'
          'd020d43eab4ded6fb379dadc570a9490')
 
 build() {
@@ -68,9 +68,9 @@
   install -m 644  ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf ${pkgdir}/etc/ssl/
 
   rm ${pkgdir}/etc/dovecot/README
-  
-  # fix paths in the config example file where we have a different layout
-#  sed -i 's|/usr/lib/dovecot|/usr/lib/dovecot/modules|g;
-#	  s|libexec|lib|g;
-#	  s|lib/sendmail|sbin/sendmail|g' $pkgdir/etc/dovecot/dovecot.conf || return 1
+
+  # install dovecot userdir - https://bugs.archlinux.org/task/20533
+  install -d -m755 ${pkgdir}/var/run/dovecot/{login,empty}
+  chmod 755 ${pkgdir}/var/run/dovecot
+  chmod 750 ${pkgdir}/var/run/dovecot/login
 }

Modified: dovecot.install
===================================================================
--- dovecot.install	2010-09-09 13:38:59 UTC (rev 90238)
+++ dovecot.install	2010-09-09 17:05:28 UTC (rev 90239)
@@ -28,6 +28,9 @@
   else
     useradd -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/run/dovecot/login -u 74 -g dovenull -m -r dovenull &> /dev/null
   fi 
+  
+  # harden some permissions
+  chgrp dovenull /var/run/dovecot/login
 }
 
 # arg 1:  the new package version
@@ -50,4 +53,5 @@
     userdel dovenull &> /dev/null
     groupdel dovecot &> /dev/null || /bin/true
     groupdel dovenull &> /dev/null || /bin/true
+    rm -rf /var/run/dovecot/ &> /dev/null || /bin/true
 }