[arch-commits] Commit in dovecot/repos (12 files)

Andreas Radke andyrtr at archlinux.org
Fri Feb 13 20:52:49 UTC 2015


    Date: Friday, February 13, 2015 @ 21:52:49
  Author: andyrtr
Revision: 231384

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  dovecot/repos/extra-i686/PKGBUILD
    (from rev 231383, dovecot/trunk/PKGBUILD)
  dovecot/repos/extra-i686/dovecot.install
    (from rev 231383, dovecot/trunk/dovecot.install)
  dovecot/repos/extra-i686/dovecot.tmpfilesd
    (from rev 231383, dovecot/trunk/dovecot.tmpfilesd)
  dovecot/repos/extra-x86_64/PKGBUILD
    (from rev 231383, dovecot/trunk/PKGBUILD)
  dovecot/repos/extra-x86_64/dovecot.install
    (from rev 231383, dovecot/trunk/dovecot.install)
  dovecot/repos/extra-x86_64/dovecot.tmpfilesd
    (from rev 231383, dovecot/trunk/dovecot.tmpfilesd)
Deleted:
  dovecot/repos/extra-i686/PKGBUILD
  dovecot/repos/extra-i686/dovecot.install
  dovecot/repos/extra-i686/dovecot.tmpfilesd
  dovecot/repos/extra-x86_64/PKGBUILD
  dovecot/repos/extra-x86_64/dovecot.install
  dovecot/repos/extra-x86_64/dovecot.tmpfilesd

--------------------------------+
 /PKGBUILD                      |  192 +++++++++++++++++++++++++++++++++++++++
 /dovecot.install               |   20 ++++
 /dovecot.tmpfilesd             |    2 
 extra-i686/PKGBUILD            |   88 -----------------
 extra-i686/dovecot.install     |   58 -----------
 extra-i686/dovecot.tmpfilesd   |    1 
 extra-x86_64/PKGBUILD          |   88 -----------------
 extra-x86_64/dovecot.install   |   58 -----------
 extra-x86_64/dovecot.tmpfilesd |    1 
 9 files changed, 214 insertions(+), 294 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2015-02-13 20:52:33 UTC (rev 231383)
+++ extra-i686/PKGBUILD	2015-02-13 20:52:49 UTC (rev 231384)
@@ -1,88 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: Paul Mattal <paul at mattal.com>
-# Contributor: Federico Quagliata (quaqo) <quaqo at despammed.com>
-# Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
-
-
-# --->>> remember to rebuild/bump pigeonhole in one step <<<---
-
-pkgname=dovecot
-pkgver=2.2.15
-pkgrel=1
-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')
-makedepends=('pam' 'libcap' 'libldap' 'clucene')
-optdepends=('libldap: ldap plugin'
-            'xz: imap zlib  plugin'
-            'clucene: alternative FTS indexer')
-provides=('imap-server' 'pop3-server')
-install=$pkgname.install
-source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig}
-        dovecot.tmpfilesd)
-md5sums=('c6c176943bd832c780fbb5d2f8850952'
-         'SKIP'
-         '342a28251d40f983c98c0d1f1bf3d07d')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # fix path in helper script
-  sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh
-}
-
-build() {
-  cd $pkgname-$pkgver
-  # configure with openssl, mysql, and postgresql support
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --sbindir=/usr/bin \
-    --localstatedir=/var \
-  	--libexecdir=/usr/lib \
-  	--with-moduledir=/usr/lib/dovecot/modules \
-  	--with-systemdsystemunitdir=/usr/lib/systemd/system \
-	--disable-static \
-	--with-nss \
-	--with-pam \
-	--with-mysql \
-	--with-pgsql \
-	--with-sqlite \
-	--with-ssl=openssl \
-	--with-ssldir=/etc/ssl \
-	--with-gssapi \
-	--with-ldap=plugin \
-	--with-zlib --with-bzlib \
-	--with-libcap \
-	--with-solr \
-	--with-lucene \
-	--with-docs
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-
-  # 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/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/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
-  
-  # systemd tmpfile
-  install -d -m755 ${pkgdir}/usr/lib/tmpfiles.d
-  install -m 644  ${srcdir}/dovecot.tmpfilesd ${pkgdir}/usr/lib/tmpfiles.d/dovecot.conf
-}

Copied: dovecot/repos/extra-i686/PKGBUILD (from rev 231383, dovecot/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2015-02-13 20:52:49 UTC (rev 231384)
@@ -0,0 +1,96 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Paul Mattal <paul at mattal.com>
+# Contributor: Federico Quagliata (quaqo) <quaqo at despammed.com>
+# Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
+
+
+# --->>> remember to rebuild/bump pigeonhole in one step <<<---
+
+pkgname=dovecot
+pkgver=2.2.15
+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' 'lz4' 'expat' 'curl')
+makedepends=('pam' 'libcap' 'libldap' 'clucene')
+optdepends=('libldap: ldap plugin'
+            'xz: imap zlib  plugin'
+            'clucene: alternative FTS indexer')
+provides=('imap-server' 'pop3-server')
+install=$pkgname.install
+source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig}
+        dovecot.tmpfilesd)
+md5sums=('c6c176943bd832c780fbb5d2f8850952'
+         'SKIP'
+         '342a28251d40f983c98c0d1f1bf3d07d')
+validpgpkeys=('E643F0BDFDCD04D9FFCB6279C948525140558AC9') # Timo Sirainen <tss at iki.fi>
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # fix path in helper script
+  sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh
+}
+
+build() {
+  cd $pkgname-$pkgver
+  # configure with openssl, mysql, and postgresql support
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --sbindir=/usr/bin \
+    --localstatedir=/var \
+  	--libexecdir=/usr/lib \
+  	--with-moduledir=/usr/lib/dovecot/modules \
+  	--with-systemdsystemunitdir=/usr/lib/systemd/system \
+	--disable-static \
+	--with-nss \
+	--with-pam \
+	--with-mysql \
+	--with-pgsql \
+	--with-sqlite \
+	--with-ssl=openssl \
+	--with-ssldir=/etc/ssl \
+	--with-gssapi \
+	--with-ldap=plugin \
+	--with-zlib \
+	--with-bzlib \
+	--with-lzma \
+	--with-lz4 \
+	--with-libcap \
+	--with-solr \
+	--with-lucene \
+	--with-docs #--help
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make
+}
+
+package() {
+	
+  # system user/group dovenull - 74
+  # system user/group dovecot  - 76
+  
+  cd $pkgname-$pkgver
+  make DESTDIR=${pkgdir} install
+
+  # 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/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/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
+  
+  # systemd tmpfile
+  install -d -m755 ${pkgdir}/usr/lib/tmpfiles.d
+  install -m 644  ${srcdir}/dovecot.tmpfilesd ${pkgdir}/usr/lib/tmpfiles.d/dovecot.conf
+}

Deleted: extra-i686/dovecot.install
===================================================================
--- extra-i686/dovecot.install	2015-02-13 20:52:33 UTC (rev 231383)
+++ extra-i686/dovecot.install	2015-02-13 20:52:49 UTC (rev 231384)
@@ -1,58 +0,0 @@
-# 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 
-}
-
-# 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
-}
-
-# 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
-}

Copied: dovecot/repos/extra-i686/dovecot.install (from rev 231383, dovecot/trunk/dovecot.install)
===================================================================
--- extra-i686/dovecot.install	                        (rev 0)
+++ extra-i686/dovecot.install	2015-02-13 20:52:49 UTC (rev 231384)
@@ -0,0 +1,10 @@
+post_install() {
+  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
+}
+
+post_remove() {
+  rm -rf /var/run/dovecot/ &> /dev/null || /bin/true
+}

Deleted: extra-i686/dovecot.tmpfilesd
===================================================================
--- extra-i686/dovecot.tmpfilesd	2015-02-13 20:52:33 UTC (rev 231383)
+++ extra-i686/dovecot.tmpfilesd	2015-02-13 20:52:49 UTC (rev 231384)
@@ -1 +0,0 @@
-d /var/run/dovecot 0755 root dovecot -

Copied: dovecot/repos/extra-i686/dovecot.tmpfilesd (from rev 231383, dovecot/trunk/dovecot.tmpfilesd)
===================================================================
--- extra-i686/dovecot.tmpfilesd	                        (rev 0)
+++ extra-i686/dovecot.tmpfilesd	2015-02-13 20:52:49 UTC (rev 231384)
@@ -0,0 +1 @@
+d /var/run/dovecot 0755 root dovecot -

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2015-02-13 20:52:33 UTC (rev 231383)
+++ extra-x86_64/PKGBUILD	2015-02-13 20:52:49 UTC (rev 231384)
@@ -1,88 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: Paul Mattal <paul at mattal.com>
-# Contributor: Federico Quagliata (quaqo) <quaqo at despammed.com>
-# Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
-
-
-# --->>> remember to rebuild/bump pigeonhole in one step <<<---
-
-pkgname=dovecot
-pkgver=2.2.15
-pkgrel=1
-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')
-makedepends=('pam' 'libcap' 'libldap' 'clucene')
-optdepends=('libldap: ldap plugin'
-            'xz: imap zlib  plugin'
-            'clucene: alternative FTS indexer')
-provides=('imap-server' 'pop3-server')
-install=$pkgname.install
-source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig}
-        dovecot.tmpfilesd)
-md5sums=('c6c176943bd832c780fbb5d2f8850952'
-         'SKIP'
-         '342a28251d40f983c98c0d1f1bf3d07d')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # fix path in helper script
-  sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh
-}
-
-build() {
-  cd $pkgname-$pkgver
-  # configure with openssl, mysql, and postgresql support
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --sbindir=/usr/bin \
-    --localstatedir=/var \
-  	--libexecdir=/usr/lib \
-  	--with-moduledir=/usr/lib/dovecot/modules \
-  	--with-systemdsystemunitdir=/usr/lib/systemd/system \
-	--disable-static \
-	--with-nss \
-	--with-pam \
-	--with-mysql \
-	--with-pgsql \
-	--with-sqlite \
-	--with-ssl=openssl \
-	--with-ssldir=/etc/ssl \
-	--with-gssapi \
-	--with-ldap=plugin \
-	--with-zlib --with-bzlib \
-	--with-libcap \
-	--with-solr \
-	--with-lucene \
-	--with-docs
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-
-  # 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/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/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
-  
-  # systemd tmpfile
-  install -d -m755 ${pkgdir}/usr/lib/tmpfiles.d
-  install -m 644  ${srcdir}/dovecot.tmpfilesd ${pkgdir}/usr/lib/tmpfiles.d/dovecot.conf
-}

Copied: dovecot/repos/extra-x86_64/PKGBUILD (from rev 231383, dovecot/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2015-02-13 20:52:49 UTC (rev 231384)
@@ -0,0 +1,96 @@
+# $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: Paul Mattal <paul at mattal.com>
+# Contributor: Federico Quagliata (quaqo) <quaqo at despammed.com>
+# Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
+
+
+# --->>> remember to rebuild/bump pigeonhole in one step <<<---
+
+pkgname=dovecot
+pkgver=2.2.15
+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' 'lz4' 'expat' 'curl')
+makedepends=('pam' 'libcap' 'libldap' 'clucene')
+optdepends=('libldap: ldap plugin'
+            'xz: imap zlib  plugin'
+            'clucene: alternative FTS indexer')
+provides=('imap-server' 'pop3-server')
+install=$pkgname.install
+source=(http://dovecot.org/releases/2.2/${pkgname}-${pkgver}.tar.gz{,.sig}
+        dovecot.tmpfilesd)
+md5sums=('c6c176943bd832c780fbb5d2f8850952'
+         'SKIP'
+         '342a28251d40f983c98c0d1f1bf3d07d')
+validpgpkeys=('E643F0BDFDCD04D9FFCB6279C948525140558AC9') # Timo Sirainen <tss at iki.fi>
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # fix path in helper script
+  sed -i 's:OPENSSLCONFIG=${OPENSSLCONFIG-dovecot-openssl.cnf}:OPENSSLCONFIG=${OPENSSLCONFIG- /etc/ssl/dovecot-openssl.cnf}:' doc/mkcert.sh
+}
+
+build() {
+  cd $pkgname-$pkgver
+  # configure with openssl, mysql, and postgresql support
+  ./configure --prefix=/usr --sysconfdir=/etc \
+    --sbindir=/usr/bin \
+    --localstatedir=/var \
+  	--libexecdir=/usr/lib \
+  	--with-moduledir=/usr/lib/dovecot/modules \
+  	--with-systemdsystemunitdir=/usr/lib/systemd/system \
+	--disable-static \
+	--with-nss \
+	--with-pam \
+	--with-mysql \
+	--with-pgsql \
+	--with-sqlite \
+	--with-ssl=openssl \
+	--with-ssldir=/etc/ssl \
+	--with-gssapi \
+	--with-ldap=plugin \
+	--with-zlib \
+	--with-bzlib \
+	--with-lzma \
+	--with-lz4 \
+	--with-libcap \
+	--with-solr \
+	--with-lucene \
+	--with-docs #--help
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make
+}
+
+package() {
+	
+  # system user/group dovenull - 74
+  # system user/group dovecot  - 76
+  
+  cd $pkgname-$pkgver
+  make DESTDIR=${pkgdir} install
+
+  # 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/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/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
+  
+  # systemd tmpfile
+  install -d -m755 ${pkgdir}/usr/lib/tmpfiles.d
+  install -m 644  ${srcdir}/dovecot.tmpfilesd ${pkgdir}/usr/lib/tmpfiles.d/dovecot.conf
+}

Deleted: extra-x86_64/dovecot.install
===================================================================
--- extra-x86_64/dovecot.install	2015-02-13 20:52:33 UTC (rev 231383)
+++ extra-x86_64/dovecot.install	2015-02-13 20:52:49 UTC (rev 231384)
@@ -1,58 +0,0 @@
-# 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 
-}
-
-# 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
-}
-
-# 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
-}

Copied: dovecot/repos/extra-x86_64/dovecot.install (from rev 231383, dovecot/trunk/dovecot.install)
===================================================================
--- extra-x86_64/dovecot.install	                        (rev 0)
+++ extra-x86_64/dovecot.install	2015-02-13 20:52:49 UTC (rev 231384)
@@ -0,0 +1,10 @@
+post_install() {
+  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
+}
+
+post_remove() {
+  rm -rf /var/run/dovecot/ &> /dev/null || /bin/true
+}

Deleted: extra-x86_64/dovecot.tmpfilesd
===================================================================
--- extra-x86_64/dovecot.tmpfilesd	2015-02-13 20:52:33 UTC (rev 231383)
+++ extra-x86_64/dovecot.tmpfilesd	2015-02-13 20:52:49 UTC (rev 231384)
@@ -1 +0,0 @@
-d /var/run/dovecot 0755 root dovecot -

Copied: dovecot/repos/extra-x86_64/dovecot.tmpfilesd (from rev 231383, dovecot/trunk/dovecot.tmpfilesd)
===================================================================
--- extra-x86_64/dovecot.tmpfilesd	                        (rev 0)
+++ extra-x86_64/dovecot.tmpfilesd	2015-02-13 20:52:49 UTC (rev 231384)
@@ -0,0 +1 @@
+d /var/run/dovecot 0755 root dovecot -



More information about the arch-commits mailing list