Date: Friday, February 13, 2015 @ 21:52:33 Author: andyrtr Revision: 231383
upgpkg: dovecot 2.2.15-2 don't groupdel/userdel in .install - simplify install file; add lz4 dep Modified: dovecot/trunk/PKGBUILD dovecot/trunk/dovecot.install -----------------+ PKGBUILD | 15 +++++++++---- dovecot.install | 60 +++++------------------------------------------------- 2 files changed, 17 insertions(+), 58 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-02-13 18:14:57 UTC (rev 231382) +++ PKGBUILD 2015-02-13 20:52:33 UTC (rev 231383) @@ -9,13 +9,13 @@ pkgname=dovecot pkgver=2.2.15 -pkgrel=1 +pkgrel=2 pkgdesc="An IMAP and POP3 server written with security primarily in mind" arch=('i686' 'x86_64') url="http://dovecot.org/" license=("LGPL") depends=('krb5' 'openssl' 'sqlite' 'libmariadbclient' - 'postgresql-libs' 'bzip2' 'expat' 'curl') + 'postgresql-libs' 'bzip2' 'lz4' 'expat' 'curl') makedepends=('pam' 'libcap' 'libldap' 'clucene') optdepends=('libldap: ldap plugin' 'xz: imap zlib plugin' @@ -55,11 +55,14 @@ --with-ssldir=/etc/ssl \ --with-gssapi \ --with-ldap=plugin \ - --with-zlib --with-bzlib \ + --with-zlib \ + --with-bzlib \ + --with-lzma \ + --with-lz4 \ --with-libcap \ --with-solr \ --with-lucene \ - --with-docs + --with-docs #--help make } @@ -69,6 +72,10 @@ } package() { + + # system user/group dovenull - 74 + # system user/group dovecot - 76 + cd $pkgname-$pkgver make DESTDIR=${pkgdir} install Modified: dovecot.install =================================================================== --- dovecot.install 2015-02-13 18:14:57 UTC (rev 231382) +++ dovecot.install 2015-02-13 20:52:33 UTC (rev 231383) @@ -1,58 +1,10 @@ -# arg 1: the new package version post_install() { - - # Make sure the group and user "dovecot"+"dovenull exists on this system and have the correct values - - # dovecot - if grep -q "^dovecot:" /etc/group &> /dev/null ; then - groupmod -g 76 -n dovecot dovecot &> /dev/null - else - groupadd -g 76 dovecot &> /dev/null - fi - - if grep -q "^dovecot:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot dovecot &> /dev/null - else - useradd -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot -r dovecot &> /dev/null - fi - - # dovenull - if grep -q "^dovenull:" /etc/group &> /dev/null ; then - groupmod -g 74 -n dovenull dovenull &> /dev/null - else - groupadd -g 74 dovenull &> /dev/null - fi - - if grep -q "^dovenull:" /etc/passwd 2> /dev/null ; then - usermod -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull dovenull &> /dev/null - else - useradd -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull -r dovenull &> /dev/null - fi + getent group dovenull &> /dev/null || groupadd -g 74 dovenull &> /dev/null + getent group dovecot &> /dev/null || groupadd -g 76 dovecot &> /dev/null + getent passwd dovenull &> /dev/null || useradd -s /sbin/nologin -c "Dovecot user for completely untrustworthy processes" -d /var/empty -u 74 -g dovenull -r dovenull &> /dev/null + getent passwd dovecot &> /dev/null || useradd -s /sbin/nologin -c "Dovecot user" -d /var/empty -u 76 -g dovecot -r dovecot &> /dev/null } -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if [ "`vercmp $2 2.0.0`" -lt 0 ]; then - # important upgrade notice - echo "> IMPORTANT DOVECOT 2.0 UPGRADE NOTICE" - echo "> ------------------------------------" - echo "> see http://wiki2.dovecot.org/Upgrading/2.0" - echo "> make sure, you convert the dovecot.conf file" - fi - if [ "`vercmp $2 2.0.13-2`" -lt 0 ]; then - # to remove no more existant usersdirs simply remove the dovecot users and let them recreate later - userdel dovecot &> /dev/null - userdel dovenull &> /dev/null - fi - post_install $1 +post_remove() { + rm -rf /var/run/dovecot/ &> /dev/null || /bin/true } - -# arg 1: the old package version -pre_remove() { - userdel dovecot &> /dev/null - 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 -}