Sun Feb 10 01:12:35 PST 2013

2 files changed, 4 insertions, 78 deletions

diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index c5e4159f6..6c621590f 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176804 2013-01-31 17:39:45Z andyrtr $
+# $Id: PKGBUILD 177806 2013-02-09 09:15:39Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -8,7 +8,7 @@
 # --->>> remember to rebuild/bump pigeonhole in one step <<<---
 
 pkgname=dovecot
-pkgver=2.1.14
+pkgver=2.1.15
 pkgrel=1
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
@@ -23,11 +23,9 @@ provides=('imap-server' 'pop3-server')
 options=('!libtool')
 install=$pkgname.install
 source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig}
-        dovecot.sh
         dovecot.tmpfilesd)
-md5sums=('fad7544d7c6d09f9533106e53bfbd243'
-         'a6c15d4e1991900dcfb5eb42d0c030d1'
-         '587159e84e2da6f83d70b3c706ba87cc'
+md5sums=('8ce198c5ee22f4fe8ab525b9bd753d56'
+         'd8d1bad3cdcaf88644db7dca0e30715e'
          '342a28251d40f983c98c0d1f1bf3d07d')
 
 build() {
@@ -70,9 +68,6 @@ 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
diff --git a/extra/dovecot/dovecot.sh b/extra/dovecot/dovecot.sh
deleted file mode 100755
index e8966bd55..000000000
--- a/extra/dovecot/dovecot.sh
+++ /dev/null
@@ -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