network/asterisk: Updated for version 1.8.7.2 (+new maintainer)

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

5 files changed, 40 insertions, 19 deletions

diff --git a/network/asterisk/README b/network/asterisk/README
index ff2c2e9f49..fa81ba9ccf 100644
--- a/network/asterisk/README
+++ b/network/asterisk/README
@@ -5,9 +5,16 @@ Asterisk.  If you will instead use digital telephony hardware (not IP
 phones) such as T1/E1 lines or a PRI, you'll need to install libpri,
 again before compiling Asterisk.
 
-Be sure to see /usr/doc/asterisk-1.6.1.6/sample_confs/ after installation
+Be sure to see /usr/doc/asterisk-1.8.7.2/sample_confs/ after installation
 for any additional configuration files you may need.
 
+With 1.8+ release of Asterisk, Add-ons are shipped in the main package.
+but disabled by default. Since some of the add-ons are quite useful, this
+script will build them, unless ofcourse, the ADDON variable is set as:
+ADDONS=no ./asterisk.SlackBuild
+The list of pre-selected add-ons is as follows:
+app_mysql cdr_mysql chan_ooh323 res_config_mysql
+
 Note that dahdi-linux and dahdi-tools are currently not available in
 our repository due to broken download links; we hope that will be
 resolved soonish.
diff --git a/network/asterisk/asterisk.SlackBuild b/network/asterisk/asterisk.SlackBuild
index 85ba95813f..0bc1f559f1 100644
--- a/network/asterisk/asterisk.SlackBuild
+++ b/network/asterisk/asterisk.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 # Copyright 2006, Alan Hicks, Lizella, GA
+# Updated by mario@slackverse.org, 2010-2011
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,23 +22,23 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM="asterisk"
-VERSION="1.6.1.6"
+VERSION=${VERSION:-1.8.7.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
+ADDONS=${ADDONS:-yes}
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG="$TMP/pkg-$PRGNAM"
+PKG="$TMP/package-$PRGNAM"
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
@@ -75,6 +76,15 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
+make installdirs DESTDIR=$PKG
+
+if [ "$ADDONS" = "yes" ]; then
+  # Select some addons (the list is actualy inverted, and deselected addons are shown here)
+  sed -i -e 's/^MENUSELECT_ADDONS=.*$/MENUSELECT_ADDONS=app_saycountpl chan_mobile format_mp3/' \
+    menuselect.makeopts
+  make addons DESTDIR=$PKG
+fi
+
 make samples DESTDIR=$PKG
 make install DESTDIR=$PKG
 
diff --git a/network/asterisk/asterisk.info b/network/asterisk/asterisk.info
index 743be7d33c..18ab3e2ff5 100644
--- a/network/asterisk/asterisk.info
+++ b/network/asterisk/asterisk.info
@@ -1,10 +1,10 @@
 PRGNAM="asterisk"
-VERSION="1.6.1.6"
+VERSION="1.8.7.2"
 HOMEPAGE="http://www.asterisk.org"
-DOWNLOAD="http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-1.6.1.6.tar.gz"
-MD5SUM="63a928373e741524aac09d8c078df7d5"
+DOWNLOAD="http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-1.8.7.2.tar.gz"
+MD5SUM="27ab62d75be35e623e4798d58a0959fc"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Alan Hicks"
-EMAIL="alan@lizella.net"
-APPROVED="rworkman"
+MAINTAINER="mario"
+EMAIL="mario@slackverse.org"
+APPROVED="rworkman,Niels Horn"
diff --git a/network/asterisk/doinst.sh b/network/asterisk/doinst.sh
index 7b36afe22b..47afb7f73a 100644
--- a/network/asterisk/doinst.sh
+++ b/network/asterisk/doinst.sh
@@ -10,14 +10,18 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-# Keep same perms on rc.asterisk.new:
-if [ -e etc/rc.d/rc.asterisk ]; then
-  cp -a etc/rc.d/rc.asterisk etc/rc.d/rc.asterisk.new.incoming
-  cat etc/rc.d/rc.asterisk.new > etc/rc.d/rc.asterisk.new.incoming
-  mv etc/rc.d/rc.asterisk.new.incoming etc/rc.d/rc.asterisk.new
-fi
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
 
-config etc/rc.d/rc.asterisk.new
+preserve_perms etc/rc.d/rc.asterisk.new
 config etc/logrotate.d/asterisk.new
 config etc/asterisk/asterisk.conf.new
 config etc/asterisk/codecs.conf.new
diff --git a/network/asterisk/slack-desc b/network/asterisk/slack-desc
index 200434038a..69c0f8d367 100644
--- a/network/asterisk/slack-desc
+++ b/network/asterisk/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-        |-----handy-ruler---------------------------------------------------|
+        |-----handy-ruler------------------------------------------------------|
 asterisk: asterisk (Asterisk Open Source PBX)
 asterisk:
 asterisk: Asterisk is an Open Source PBX and telephony toolkit.  It is, in a