network/asterisk: Updated for version 1.8.20.1.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

3 files changed, 19 insertions, 15 deletions

diff --git a/network/asterisk/asterisk.SlackBuild b/network/asterisk/asterisk.SlackBuild
index fefdb974aa..695b17e7f3 100644
--- a/network/asterisk/asterisk.SlackBuild
+++ b/network/asterisk/asterisk.SlackBuild
@@ -9,7 +9,7 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -20,10 +20,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Updated by mario@slackverse.org, 2010-2011
+# Updated by mario@slackverse.org, 2010-2013
 
 PRGNAM="asterisk"
-VERSION=${VERSION:-1.8.7.2}
+VERSION=${VERSION:-1.8.20.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,16 +76,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
 
+make menuselect.makeopts
 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/' \
+  sed -i -e 's/^MENUSELECT_ADDONS=.*$/MENUSELECT_ADDONS=app_saycountpl chan_mobile chan_ooh323 format_mp3/' \
     menuselect.makeopts
   make addons DESTDIR=$PKG
 fi
 
+make installdirs DESTDIR=$PKG
 make samples DESTDIR=$PKG
 make install DESTDIR=$PKG
 
@@ -109,12 +110,15 @@ for i in \
   asterisk codecs extensions iax indications musiconhold sip modules ;
   do
   cat $PKG/usr/doc/$PRGNAM-$VERSION/sample_confs/${i}.conf > \
-    $PKG/etc/asterisk/${i}.conf.new ; 
+    $PKG/etc/asterisk/${i}.conf.new ;
 done
 
 mkdir -p $PKG/etc/rc.d
 install -m 0755 contrib/init.d/rc.slackware.asterisk $PKG/etc/rc.d/rc.asterisk.new
 
+# Fix pid file location in rc script
+sed -i 's/asterisk.pid/asterisk\/asterisk.pid/' $PKG/etc/rc.d/rc.asterisk.new
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/network/asterisk/asterisk.info b/network/asterisk/asterisk.info
index 2f48a5b237..d14b15c813 100644
--- a/network/asterisk/asterisk.info
+++ b/network/asterisk/asterisk.info
@@ -1,8 +1,8 @@
 PRGNAM="asterisk"
-VERSION="1.8.7.2"
+VERSION="1.8.20.1"
 HOMEPAGE="http://www.asterisk.org"
-DOWNLOAD="http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-1.8.7.2.tar.gz"
-MD5SUM="27ab62d75be35e623e4798d58a0959fc"
+DOWNLOAD="http://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-1.8.20.1.tar.gz"
+MD5SUM="99204257de80a42c4e287fc93dfe714a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/asterisk/slack-desc b/network/asterisk/slack-desc
index 69c0f8d367..8d9d37a8c3 100644
--- a/network/asterisk/slack-desc
+++ b/network/asterisk/slack-desc
@@ -1,16 +1,16 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
 asterisk: asterisk (Asterisk Open Source PBX)
 asterisk:
 asterisk: Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
 asterisk: sense, middleware between Internet and telephony channels on the
-asterisk: bottom, and Internet and telephony applications at the top. For 
+asterisk: bottom, and Internet and telephony applications at the top. For
 asterisk: more information on the project itself, please visit the Asterisk
 asterisk: home page at http://www.asterisk.org/
 asterisk: