Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	multilib/wine/PKGBUILD
	multilib/zsnes/PKGBUILD
	testing/frozen-bubble/PKGBUILD
	testing/perl-sdl/PKGBUILD

6 files changed, 225 insertions, 4 deletions

diff --git a/community/courier-imap/PKGBUILD b/community/courier-imap/PKGBUILD
index e54fb7dd5..575b7d7b9 100644
--- a/community/courier-imap/PKGBUILD
+++ b/community/courier-imap/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 47569 2011-05-23 20:05:54Z svenstaro $
+# $Id: PKGBUILD 49375 2011-06-15 09:29:55Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: tobias <tobias@archlinux.org>
 # Committer: Manolis Tzanidakis <manolis@archlinux.org>
 
 pkgname=courier-imap
 pkgver=4.9.3
-pkgrel=1
+pkgrel=2
 pkgdesc="IMAP(s)/POP3(s) Server"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -20,10 +20,23 @@ provides=('imap-server' 'pop3-server')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/project/courier/imap/${pkgver}/${pkgname}-${pkgver}.tar.bz2
         courier-imap.conf.d
-		courier-imap.rc.d)
+		courier-imap.rc.d
+        imapd.rc.d
+        imapd-ssl.rc.d
+        pop3d.rc.d
+        pop3d-ssl.rc.d)
 md5sums=('703ddbb090569436dbda61d0d62b1eb8'
          '3e08f017f6c5a52dea28f6f0dbd50b86'
-         '3e4910c5a34af68dfdeed932e573a9f9')
+         '3e4910c5a34af68dfdeed932e573a9f9'
+         'ca799c7014d002fb9f8ff671610337bd'
+         '268693ccf3f081897b78490a70cf3211'
+         'c2e65d9b136f59eb0cf5377e7c46de88'
+         'e07c43fdf2e5ae6d73fc3281f6332b62')
+install=$pkgname.install
+
+# MIGRATION NOTE:
+# In 2012, support for courier-imap.conf.d and courier-imap.rc.d will be removed.
+# Remove those files and this note and also courier-imap.install
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
@@ -73,5 +86,9 @@ package() {
   done
   # install thingies
   install -D -m 755 ${srcdir}/courier-imap.rc.d ${pkgdir}/etc/rc.d/courier-imap
+  install -D -m 755 ${srcdir}/imapd.rc.d ${pkgdir}/etc/rc.d/imapd
+  install -D -m 755 ${srcdir}/imapd-ssl.rc.d ${pkgdir}/etc/rc.d/imapd-ssl
+  install -D -m 755 ${srcdir}/pop3d.rc.d ${pkgdir}/etc/rc.d/pop3d
+  install -D -m 755 ${srcdir}/pop3d-ssl.rc.d ${pkgdir}/etc/rc.d/pop3d-ssl
   install -D -m 644 ${srcdir}/courier-imap.conf.d ${pkgdir}/etc/conf.d/courier-imap
 }
diff --git a/community/courier-imap/courier-imap.install b/community/courier-imap/courier-imap.install
new file mode 100644
index 000000000..cf73119e2
--- /dev/null
+++ b/community/courier-imap/courier-imap.install
@@ -0,0 +1,16 @@
+post_upgrade() {
+  echo "Please migrate to the new daemon format:"
+  echo "/etc/rc.d/courier-imap has been split into separate daemons:"
+  echo "    imapd, imads-ssl, pop3d, pop3d-ssl"
+  echo "This elimates the need for /etc/conf.d/courier-imap"
+  echo "Update your /etc/rc.conf and manually add the desired daemons. Make sure"
+  echo "you first start authdaemond before any other of these daemons."
+  echo "Example prior to this change:"
+  echo "    DAEMONS=( ... courier-imap ...)"
+  echo "Example after this change:"
+  echo "    DAEMONS=( ... authdaemond imapd imapd-ssl pop3d pop3d-ssl .. )"
+  echo "This allows better control over the daemons and will generate"
+  echo "correct entries in /run/daemons"
+  echo "An old configuration will keep working but please do migrate in time"
+  echo "as support for this will be removed some time in 2012."
+}
diff --git a/community/courier-imap/imapd-ssl.rc.d b/community/courier-imap/imapd-ssl.rc.d
new file mode 100644
index 000000000..3430bd73e
--- /dev/null
+++ b/community/courier-imap/imapd-ssl.rc.d
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+
+    [ -d /var/run/courier ] || mkdir -p /var/run/courier
+	chown courier:courier /var/run/courier
+
+    if [ ! -f /var/run/daemons/authdaemond ]; then
+      echo "ERROR: authdaemond is not running"
+      stat_fail
+      exit 1
+    fi
+
+    stat_busy "Starting Courier imapd-ssl"
+    /usr/lib/courier-imap/imapd-ssl.rc start
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon imapd-ssl
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Courier imapd-ssl"
+    /usr/lib/courier-imap/imapd-ssl.rc stop > /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon imapd-ssl
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
+~                                                                                                                                                         
+~         
diff --git a/community/courier-imap/imapd.rc.d b/community/courier-imap/imapd.rc.d
new file mode 100644
index 000000000..ec4df03f5
--- /dev/null
+++ b/community/courier-imap/imapd.rc.d
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+
+    [ -d /var/run/courier ] || mkdir -p /var/run/courier
+	chown courier:courier /var/run/courier
+
+    if [ ! -f /var/run/daemons/authdaemond ]; then
+      echo "ERROR: authdaemond is not running"
+      stat_fail
+      exit 1
+    fi
+
+    stat_busy "Starting Courier imapd"
+    /usr/lib/courier-imap/imapd.rc start
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon imapd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Courier imapd"
+    /usr/lib/courier-imap/imapd.rc stop > /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon imapd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
+~                                                                                                                                                         
+~         
diff --git a/community/courier-imap/pop3d-ssl.rc.d b/community/courier-imap/pop3d-ssl.rc.d
new file mode 100644
index 000000000..8b147ff32
--- /dev/null
+++ b/community/courier-imap/pop3d-ssl.rc.d
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+
+    [ -d /var/run/courier ] || mkdir -p /var/run/courier
+	chown courier:courier /var/run/courier
+
+    if [ ! -f /var/run/daemons/authdaemond ]; then
+      echo "ERROR: authdaemond is not running"
+      stat_fail
+      exit 1
+    fi
+
+    stat_busy "Starting Courier pop3d-ssl"
+    /usr/lib/courier-imap/pop3d-ssl.rc start
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon pop3d-ssl
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Courier pop3d-ssl"
+    /usr/lib/courier-imap/pop3d-ssl.rc stop > /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon pop3d-ssl
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
+~                                                                                                                                                         
+~         
diff --git a/community/courier-imap/pop3d.rc.d b/community/courier-imap/pop3d.rc.d
new file mode 100644
index 000000000..6a2c66ad0
--- /dev/null
+++ b/community/courier-imap/pop3d.rc.d
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+case "$1" in
+  start)
+
+    [ -d /var/run/courier ] || mkdir -p /var/run/courier
+	chown courier:courier /var/run/courier
+
+    if [ ! -f /var/run/daemons/authdaemond ]; then
+      echo "ERROR: authdaemond is not running"
+      stat_fail
+      exit 1
+    fi
+
+    stat_busy "Starting Courier pop3d"
+    /usr/lib/courier-imap/pop3d.rc start
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon pop3d
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping Courier pop3d"
+    /usr/lib/courier-imap/pop3d.rc stop > /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon pop3d
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
+~                                                                                                                                                         
+~