[arch-commits] CVS update of extra/daemons/exim (PKGBUILD exim)

[Aaron Griffin]

    Date: Tuesday, November 20, 2007 @ 13:49:09
  Author: aaron
    Path: /home/cvs-extra/extra/daemons/exim

Modified: PKGBUILD (1.79 -> 1.80) exim (1.9 -> 1.10)

upgpkg: exim 4.68-4
Fix the rc.d script to be more arch standard - FS#8420


----------+
 PKGBUILD |   10 +++-------
 exim     |   46 +++++++++++++++++++---------------------------
 2 files changed, 22 insertions(+), 34 deletions(-)


Index: extra/daemons/exim/PKGBUILD
diff -u extra/daemons/exim/PKGBUILD:1.79 extra/daemons/exim/PKGBUILD:1.80
--- extra/daemons/exim/PKGBUILD:1.79	Thu Nov 15 12:12:00 2007
+++ extra/daemons/exim/PKGBUILD	Tue Nov 20 13:49:09 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.79 2007/11/15 17:12:00 aaron Exp $
+# $Id: PKGBUILD,v 1.80 2007/11/20 18:49:09 aaron Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=exim
 pkgver=4.68
-pkgrel=3
+pkgrel=4
 pkgdesc="A Message Transfer Agent"
 arch=(i686 x86_64)
 url="http://www.exim.org/"
@@ -15,14 +15,10 @@
 provides=('smtp-server')
 conflicts=('smtp-server')
 source=(ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/exim-$pkgver.tar.bz2 aliases newaliases exim exim.logrotate exim.conf.d)
-
-# NOTE:  If you're building this as an unprivileged user and don't have exim
-#        already installed, the build will fail.  It requires an exim
-#        user/group (79/79) to build.
 md5sums=('94c46a8bc24b3ad4ad892228449f378b'
          '4874006f0585253ddab027d441009757'
          'ea39f58bffc16f5e3bbe59dffcf09449'
-         'b01c5f057bac2da61b4513281865d92f'
+         '9aed772e87223213e8da9ca5e7376869'
          'd788c26f86a9d72a0aebb3b849fe74f2'
          'b75fe4c6e960a59a25b5f51e8f61ba3a')
 
Index: extra/daemons/exim/exim
diff -u extra/daemons/exim/exim:1.9 extra/daemons/exim/exim:1.10
--- extra/daemons/exim/exim:1.9	Wed Aug 24 17:59:17 2005
+++ extra/daemons/exim/exim	Tue Nov 20 13:49:09 2007
@@ -9,40 +9,32 @@
 
 PID=`pidof -o %PPID /usr/sbin/exim`
 
-start() {
-  stat_busy "Starting Exim"
-  [ -z "$PID" ] && /usr/sbin/exim $EXIM_ARGS
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    add_daemon exim
-    stat_done
-  fi
-}
-
-stop() {
-  stat_busy "Stopping Exim"
-  [ ! -z "$PID" ]  && kill $PID &> /dev/null
-  if [ $? -gt 0 ]; then
-    stat_fail
-  else
-    rm /var/run/exim.pid
-    rm_daemon exim
-    stat_done
-  fi
-}
-
 case "$1" in
   start)
-    start
+    stat_busy "Starting Exim"
+    [ -z "$PID" ] && /usr/sbin/exim $EXIM_ARGS
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon exim
+      stat_done
+    fi
     ;;
   stop)
-    stop
+    stat_busy "Stopping Exim"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm /var/run/exim.pid
+      rm_daemon exim
+      stat_done
+    fi
     ;;
   restart)
-    stop
+    $0 stop
     sleep 2
-    start
+    $0 start
     ;;
   *)
     echo "usage: $0 {start|stop|restart}"