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

andyrtr at archlinux.org andyrtr at archlinux.org
Mon Apr 23 12:33:36 EDT 2012


    Date: Monday, April 23, 2012 @ 12:33:36
  Author: andyrtr
Revision: 157092

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

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

------------------------------+
 extra-i686/PKGBUILD          |  134 +++++++++++++++++++--------------------
 extra-i686/dovecot.install   |  116 +++++++++++++++++-----------------
 extra-i686/dovecot.sh        |  138 ++++++++++++++++++++---------------------
 extra-x86_64/PKGBUILD        |  134 +++++++++++++++++++--------------------
 extra-x86_64/dovecot.install |  116 +++++++++++++++++-----------------
 extra-x86_64/dovecot.sh      |  138 ++++++++++++++++++++---------------------
 6 files changed, 388 insertions(+), 388 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-04-23 16:32:39 UTC (rev 157091)
+++ extra-i686/PKGBUILD	2012-04-23 16:33:36 UTC (rev 157092)
@@ -1,67 +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>
-
-pkgname=dovecot
-pkgver=2.1.4
-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>=3.7.5' 'libmysqlclient>=5.5.10'
-        'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl')
-makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22' 'clucene')
-optdepends=('libldap: ldap plugin'
-           'clucene: alternative FTS indexer')
-provides=('imap-server' 'pop3-server')
-options=('!libtool')
-install=$pkgname.install
-source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh)
-md5sums=('9a360fc39462da71e2bfd1d6928f3902'
-         '1ba2a0f1f7b5f226ce867ea8243abe46'
-         '587159e84e2da6f83d70b3c706ba87cc')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  # configure with openssl, mysql, and postgresql support
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-  	--libexecdir=/usr/lib  --with-moduledir=/usr/lib/dovecot/modules \
-	--disable-static \
-	--with-nss \
-	--with-pam \
-	--with-mysql \
-	--with-pgsql \
-	--with-sqlite \
-	--with-ssl=openssl --with-ssldir=/etc/dovecot/ssl \
-	--with-gssapi \
-	--with-ldap=plugin \
-	--with-zlib --with-bzlib \
-	--with-libcap \
-	--with-solr \
-	--with-lucene \
-	--with-docs
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-
-  # install the launch script
-  install -D -m755 ${srcdir}/$pkgname.sh ${pkgdir}/etc/rc.d/$pkgname
-
-  # 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
-}

Copied: dovecot/repos/extra-i686/PKGBUILD (from rev 157091, dovecot/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-04-23 16:33:36 UTC (rev 157092)
@@ -0,0 +1,67 @@
+# $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>
+
+pkgname=dovecot
+pkgver=2.1.5
+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>=3.7.5' 'libmysqlclient>=5.5.10'
+        'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl')
+makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22' 'clucene')
+optdepends=('libldap: ldap plugin'
+           'clucene: alternative FTS indexer')
+provides=('imap-server' 'pop3-server')
+options=('!libtool')
+install=$pkgname.install
+source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh)
+md5sums=('c857e3442f2f14b3e46f1154b13b0b4b'
+         '4ef0a9647b82e0a1bdc667492a151881'
+         '587159e84e2da6f83d70b3c706ba87cc')
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  # configure with openssl, mysql, and postgresql support
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  	--libexecdir=/usr/lib  --with-moduledir=/usr/lib/dovecot/modules \
+	--disable-static \
+	--with-nss \
+	--with-pam \
+	--with-mysql \
+	--with-pgsql \
+	--with-sqlite \
+	--with-ssl=openssl --with-ssldir=/etc/dovecot/ssl \
+	--with-gssapi \
+	--with-ldap=plugin \
+	--with-zlib --with-bzlib \
+	--with-libcap \
+	--with-solr \
+	--with-lucene \
+	--with-docs
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make DESTDIR=${pkgdir} install
+
+  # install the launch script
+  install -D -m755 ${srcdir}/$pkgname.sh ${pkgdir}/etc/rc.d/$pkgname
+
+  # 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
+}

Deleted: extra-i686/dovecot.install
===================================================================
--- extra-i686/dovecot.install	2012-04-23 16:32:39 UTC (rev 157091)
+++ extra-i686/dovecot.install	2012-04-23 16:33:36 UTC (rev 157092)
@@ -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 157091, dovecot/trunk/dovecot.install)
===================================================================
--- extra-i686/dovecot.install	                        (rev 0)
+++ extra-i686/dovecot.install	2012-04-23 16:33:36 UTC (rev 157092)
@@ -0,0 +1,58 @@
+# 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
+}

Deleted: extra-i686/dovecot.sh
===================================================================
--- extra-i686/dovecot.sh	2012-04-23 16:32:39 UTC (rev 157091)
+++ extra-i686/dovecot.sh	2012-04-23 16:33:36 UTC (rev 157092)
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-daemon_name=dovecot
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-#. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-        pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-        start)
-                stat_busy "Starting $daemon_name daemon"
-
-                PID=$(get_pid)
-                if [[ -z $PID ]]; then
-                        [[ -f /var/run/$daemon_name.pid ]] &&
-                                rm -f /var/run/$daemon_name.pid
-                # RUN
-                $daemon_name
-                #
-                if [[ $? -gt 0 ]]; then
-                        stat_fail
-                        exit 1
-                else
-                        echo $(get_pid) > /var/run/$daemon_name.pid
-                        add_daemon $daemon_name
-                        stat_done
-                fi
-                else
-                        stat_fail
-                        exit 1
-                fi
-                ;;
-
-        stop)
-                stat_busy "Stopping $daemon_name daemon"
-                PID=$(get_pid)
-                # KILL
-                [[ -n $PID ]] && kill $PID &> /dev/null
-                #
-                if [[ $? -gt 0 ]]; then
-                        stat_fail
-                        exit 1
-                else
-                        rm -f /var/run/$daemon_name.pid &> /dev/null
-                        rm_daemon $daemon_name
-                        stat_done
-                fi
-                ;;
-
-        restart)
-                $0 stop
-                sleep 3
-                $0 start
-                ;;
-
-        status)
-                stat_busy "Checking $daemon_name status";
-                ck_status $daemon_name
-                ;;
-
-        *)
-                echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0

Copied: dovecot/repos/extra-i686/dovecot.sh (from rev 157091, dovecot/trunk/dovecot.sh)
===================================================================
--- extra-i686/dovecot.sh	                        (rev 0)
+++ extra-i686/dovecot.sh	2012-04-23 16:33:36 UTC (rev 157092)
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+daemon_name=dovecot
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+#. /etc/conf.d/$daemon_name.conf
+
+get_pid() {
+        pidof -o %PPID $daemon_name
+}
+
+case "$1" in
+        start)
+                stat_busy "Starting $daemon_name daemon"
+
+                PID=$(get_pid)
+                if [[ -z $PID ]]; then
+                        [[ -f /var/run/$daemon_name.pid ]] &&
+                                rm -f /var/run/$daemon_name.pid
+                # RUN
+                $daemon_name
+                #
+                if [[ $? -gt 0 ]]; then
+                        stat_fail
+                        exit 1
+                else
+                        echo $(get_pid) > /var/run/$daemon_name.pid
+                        add_daemon $daemon_name
+                        stat_done
+                fi
+                else
+                        stat_fail
+                        exit 1
+                fi
+                ;;
+
+        stop)
+                stat_busy "Stopping $daemon_name daemon"
+                PID=$(get_pid)
+                # KILL
+                [[ -n $PID ]] && kill $PID &> /dev/null
+                #
+                if [[ $? -gt 0 ]]; then
+                        stat_fail
+                        exit 1
+                else
+                        rm -f /var/run/$daemon_name.pid &> /dev/null
+                        rm_daemon $daemon_name
+                        stat_done
+                fi
+                ;;
+
+        restart)
+                $0 stop
+                sleep 3
+                $0 start
+                ;;
+
+        status)
+                stat_busy "Checking $daemon_name status";
+                ck_status $daemon_name
+                ;;
+
+        *)
+                echo "usage: $0 {start|stop|restart|status}"
+esac
+
+exit 0

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-04-23 16:32:39 UTC (rev 157091)
+++ extra-x86_64/PKGBUILD	2012-04-23 16:33:36 UTC (rev 157092)
@@ -1,67 +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>
-
-pkgname=dovecot
-pkgver=2.1.4
-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>=3.7.5' 'libmysqlclient>=5.5.10'
-        'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl')
-makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22' 'clucene')
-optdepends=('libldap: ldap plugin'
-           'clucene: alternative FTS indexer')
-provides=('imap-server' 'pop3-server')
-options=('!libtool')
-install=$pkgname.install
-source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh)
-md5sums=('9a360fc39462da71e2bfd1d6928f3902'
-         '1ba2a0f1f7b5f226ce867ea8243abe46'
-         '587159e84e2da6f83d70b3c706ba87cc')
-
-build() {
-  cd ${srcdir}/$pkgname-$pkgver
-
-  # configure with openssl, mysql, and postgresql support
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-  	--libexecdir=/usr/lib  --with-moduledir=/usr/lib/dovecot/modules \
-	--disable-static \
-	--with-nss \
-	--with-pam \
-	--with-mysql \
-	--with-pgsql \
-	--with-sqlite \
-	--with-ssl=openssl --with-ssldir=/etc/dovecot/ssl \
-	--with-gssapi \
-	--with-ldap=plugin \
-	--with-zlib --with-bzlib \
-	--with-libcap \
-	--with-solr \
-	--with-lucene \
-	--with-docs
-  make
-}
-
-package() {
-  cd ${srcdir}/$pkgname-$pkgver
-  make DESTDIR=${pkgdir} install
-
-  # install the launch script
-  install -D -m755 ${srcdir}/$pkgname.sh ${pkgdir}/etc/rc.d/$pkgname
-
-  # 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
-}

Copied: dovecot/repos/extra-x86_64/PKGBUILD (from rev 157091, dovecot/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-04-23 16:33:36 UTC (rev 157092)
@@ -0,0 +1,67 @@
+# $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>
+
+pkgname=dovecot
+pkgver=2.1.5
+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>=3.7.5' 'libmysqlclient>=5.5.10'
+        'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl')
+makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22' 'clucene')
+optdepends=('libldap: ldap plugin'
+           'clucene: alternative FTS indexer')
+provides=('imap-server' 'pop3-server')
+options=('!libtool')
+install=$pkgname.install
+source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig} dovecot.sh)
+md5sums=('c857e3442f2f14b3e46f1154b13b0b4b'
+         '4ef0a9647b82e0a1bdc667492a151881'
+         '587159e84e2da6f83d70b3c706ba87cc')
+
+build() {
+  cd ${srcdir}/$pkgname-$pkgver
+
+  # configure with openssl, mysql, and postgresql support
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+  	--libexecdir=/usr/lib  --with-moduledir=/usr/lib/dovecot/modules \
+	--disable-static \
+	--with-nss \
+	--with-pam \
+	--with-mysql \
+	--with-pgsql \
+	--with-sqlite \
+	--with-ssl=openssl --with-ssldir=/etc/dovecot/ssl \
+	--with-gssapi \
+	--with-ldap=plugin \
+	--with-zlib --with-bzlib \
+	--with-libcap \
+	--with-solr \
+	--with-lucene \
+	--with-docs
+  make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
+  make DESTDIR=${pkgdir} install
+
+  # install the launch script
+  install -D -m755 ${srcdir}/$pkgname.sh ${pkgdir}/etc/rc.d/$pkgname
+
+  # 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
+}

Deleted: extra-x86_64/dovecot.install
===================================================================
--- extra-x86_64/dovecot.install	2012-04-23 16:32:39 UTC (rev 157091)
+++ extra-x86_64/dovecot.install	2012-04-23 16:33:36 UTC (rev 157092)
@@ -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 157091, dovecot/trunk/dovecot.install)
===================================================================
--- extra-x86_64/dovecot.install	                        (rev 0)
+++ extra-x86_64/dovecot.install	2012-04-23 16:33:36 UTC (rev 157092)
@@ -0,0 +1,58 @@
+# 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
+}

Deleted: extra-x86_64/dovecot.sh
===================================================================
--- extra-x86_64/dovecot.sh	2012-04-23 16:32:39 UTC (rev 157091)
+++ extra-x86_64/dovecot.sh	2012-04-23 16:33:36 UTC (rev 157092)
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-daemon_name=dovecot
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-#. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
-        pidof -o %PPID $daemon_name
-}
-
-case "$1" in
-        start)
-                stat_busy "Starting $daemon_name daemon"
-
-                PID=$(get_pid)
-                if [[ -z $PID ]]; then
-                        [[ -f /var/run/$daemon_name.pid ]] &&
-                                rm -f /var/run/$daemon_name.pid
-                # RUN
-                $daemon_name
-                #
-                if [[ $? -gt 0 ]]; then
-                        stat_fail
-                        exit 1
-                else
-                        echo $(get_pid) > /var/run/$daemon_name.pid
-                        add_daemon $daemon_name
-                        stat_done
-                fi
-                else
-                        stat_fail
-                        exit 1
-                fi
-                ;;
-
-        stop)
-                stat_busy "Stopping $daemon_name daemon"
-                PID=$(get_pid)
-                # KILL
-                [[ -n $PID ]] && kill $PID &> /dev/null
-                #
-                if [[ $? -gt 0 ]]; then
-                        stat_fail
-                        exit 1
-                else
-                        rm -f /var/run/$daemon_name.pid &> /dev/null
-                        rm_daemon $daemon_name
-                        stat_done
-                fi
-                ;;
-
-        restart)
-                $0 stop
-                sleep 3
-                $0 start
-                ;;
-
-        status)
-                stat_busy "Checking $daemon_name status";
-                ck_status $daemon_name
-                ;;
-
-        *)
-                echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0

Copied: dovecot/repos/extra-x86_64/dovecot.sh (from rev 157091, dovecot/trunk/dovecot.sh)
===================================================================
--- extra-x86_64/dovecot.sh	                        (rev 0)
+++ extra-x86_64/dovecot.sh	2012-04-23 16:33:36 UTC (rev 157092)
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+daemon_name=dovecot
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+#. /etc/conf.d/$daemon_name.conf
+
+get_pid() {
+        pidof -o %PPID $daemon_name
+}
+
+case "$1" in
+        start)
+                stat_busy "Starting $daemon_name daemon"
+
+                PID=$(get_pid)
+                if [[ -z $PID ]]; then
+                        [[ -f /var/run/$daemon_name.pid ]] &&
+                                rm -f /var/run/$daemon_name.pid
+                # RUN
+                $daemon_name
+                #
+                if [[ $? -gt 0 ]]; then
+                        stat_fail
+                        exit 1
+                else
+                        echo $(get_pid) > /var/run/$daemon_name.pid
+                        add_daemon $daemon_name
+                        stat_done
+                fi
+                else
+                        stat_fail
+                        exit 1
+                fi
+                ;;
+
+        stop)
+                stat_busy "Stopping $daemon_name daemon"
+                PID=$(get_pid)
+                # KILL
+                [[ -n $PID ]] && kill $PID &> /dev/null
+                #
+                if [[ $? -gt 0 ]]; then
+                        stat_fail
+                        exit 1
+                else
+                        rm -f /var/run/$daemon_name.pid &> /dev/null
+                        rm_daemon $daemon_name
+                        stat_done
+                fi
+                ;;
+
+        restart)
+                $0 stop
+                sleep 3
+                $0 start
+                ;;
+
+        status)
+                stat_busy "Checking $daemon_name status";
+                ck_status $daemon_name
+                ;;
+
+        *)
+                echo "usage: $0 {start|stop|restart|status}"
+esac
+
+exit 0



More information about the arch-commits mailing list