Date: Monday, February 27, 2012 @ 13:19:51 Author: andyrtr Revision: 151572
archrelease: copy trunk to extra-i686, extra-x86_64 Added: dovecot/repos/extra-i686/PKGBUILD (from rev 151571, dovecot/trunk/PKGBUILD) dovecot/repos/extra-i686/dovecot.install (from rev 151571, dovecot/trunk/dovecot.install) dovecot/repos/extra-i686/dovecot.sh (from rev 151571, dovecot/trunk/dovecot.sh) dovecot/repos/extra-x86_64/PKGBUILD (from rev 151571, dovecot/trunk/PKGBUILD) dovecot/repos/extra-x86_64/dovecot.install (from rev 151571, dovecot/trunk/dovecot.install) dovecot/repos/extra-x86_64/dovecot.sh (from rev 151571, 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 | 139 +++++++++++++++++++---------------------- extra-i686/dovecot.install | 116 +++++++++++++++++----------------- extra-i686/dovecot.sh | 138 ++++++++++++++++++++-------------------- extra-x86_64/PKGBUILD | 139 +++++++++++++++++++---------------------- extra-x86_64/dovecot.install | 116 +++++++++++++++++----------------- extra-x86_64/dovecot.sh | 138 ++++++++++++++++++++-------------------- 6 files changed, 388 insertions(+), 398 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-02-27 18:16:43 UTC (rev 151571) +++ extra-i686/PKGBUILD 2012-02-27 18:19:51 UTC (rev 151572) @@ -1,72 +0,0 @@ -# $Id$ -# Maintainer: Andreas Radke <andy...@archlinux.org> -# Contributor: Paul Mattal <p...@mattal.com> -# Contributor: Federico Quagliata (quaqo) <qu...@despammed.com> -# Contributor: GARETTE Emmanuel <gnunux at laposte dot net> - -pkgname=dovecot -pkgver=2.1.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' 'sqlite3>=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') -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' - 'e3bf2c4989ccb8a30a5d80ae89b06f76' - '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/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 -d -m755 ${pkgdir}/etc/ssl - install -m 644 ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf ${pkgdir}/etc/ssl/ - - rm ${pkgdir}/etc/dovecot/README -} Copied: dovecot/repos/extra-i686/PKGBUILD (from rev 151571, dovecot/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-02-27 18:19:51 UTC (rev 151572) @@ -0,0 +1,67 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> +# Contributor: Paul Mattal <p...@mattal.com> +# Contributor: Federico Quagliata (quaqo) <qu...@despammed.com> +# Contributor: GARETTE Emmanuel <gnunux at laposte dot net> + +pkgname=dovecot +pkgver=2.1.1 +pkgrel=3 +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' 'sqlite3>=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=('db41a4de848d2bc834c30af0eb5575fd' + 'e3bf2c4989ccb8a30a5d80ae89b06f76' + '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-02-27 18:16:43 UTC (rev 151571) +++ extra-i686/dovecot.install 2012-02-27 18:19:51 UTC (rev 151572) @@ -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 151571, dovecot/trunk/dovecot.install) =================================================================== --- extra-i686/dovecot.install (rev 0) +++ extra-i686/dovecot.install 2012-02-27 18:19:51 UTC (rev 151572) @@ -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-02-27 18:16:43 UTC (rev 151571) +++ extra-i686/dovecot.sh 2012-02-27 18:19:51 UTC (rev 151572) @@ -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 151571, dovecot/trunk/dovecot.sh) =================================================================== --- extra-i686/dovecot.sh (rev 0) +++ extra-i686/dovecot.sh 2012-02-27 18:19:51 UTC (rev 151572) @@ -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-02-27 18:16:43 UTC (rev 151571) +++ extra-x86_64/PKGBUILD 2012-02-27 18:19:51 UTC (rev 151572) @@ -1,72 +0,0 @@ -# $Id$ -# Maintainer: Andreas Radke <andy...@archlinux.org> -# Contributor: Paul Mattal <p...@mattal.com> -# Contributor: Federico Quagliata (quaqo) <qu...@despammed.com> -# Contributor: GARETTE Emmanuel <gnunux at laposte dot net> - -pkgname=dovecot -pkgver=2.1.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' 'sqlite3>=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') -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' - 'e3bf2c4989ccb8a30a5d80ae89b06f76' - '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/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 -d -m755 ${pkgdir}/etc/ssl - install -m 644 ${srcdir}/$pkgname-$pkgver/doc/dovecot-openssl.cnf ${pkgdir}/etc/ssl/ - - rm ${pkgdir}/etc/dovecot/README -} Copied: dovecot/repos/extra-x86_64/PKGBUILD (from rev 151571, dovecot/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-02-27 18:19:51 UTC (rev 151572) @@ -0,0 +1,67 @@ +# $Id$ +# Maintainer: Andreas Radke <andy...@archlinux.org> +# Contributor: Paul Mattal <p...@mattal.com> +# Contributor: Federico Quagliata (quaqo) <qu...@despammed.com> +# Contributor: GARETTE Emmanuel <gnunux at laposte dot net> + +pkgname=dovecot +pkgver=2.1.1 +pkgrel=3 +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' 'sqlite3>=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=('db41a4de848d2bc834c30af0eb5575fd' + 'e3bf2c4989ccb8a30a5d80ae89b06f76' + '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-02-27 18:16:43 UTC (rev 151571) +++ extra-x86_64/dovecot.install 2012-02-27 18:19:51 UTC (rev 151572) @@ -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 151571, dovecot/trunk/dovecot.install) =================================================================== --- extra-x86_64/dovecot.install (rev 0) +++ extra-x86_64/dovecot.install 2012-02-27 18:19:51 UTC (rev 151572) @@ -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-02-27 18:16:43 UTC (rev 151571) +++ extra-x86_64/dovecot.sh 2012-02-27 18:19:51 UTC (rev 151572) @@ -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 151571, dovecot/trunk/dovecot.sh) =================================================================== --- extra-x86_64/dovecot.sh (rev 0) +++ extra-x86_64/dovecot.sh 2012-02-27 18:19:51 UTC (rev 151572) @@ -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