network/asterisk: Updated for version 16.1.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 116 insertions, 51 deletions

diff --git a/network/asterisk/README.SBo b/network/asterisk/README.SBo
index c9df08f3fb..81175ea960 100644
--- a/network/asterisk/README.SBo
+++ b/network/asterisk/README.SBo
@@ -1,8 +1,8 @@
 ** IMPORTANT **
 ===============
 As of version 16, Asterisk no longer supports an external PJSIP package.
-If you are using PJSIP with Asterisk 13, you will need to remove the
-pjsip package and use the pjsip libraries included as part of Asterisk
+If you were using PJSIP with Asterisk 13, you will need to remove the
+pjsip package and use an internally built version of the pjsip libraries
 by setting the PJSIP flag to 'yes'.
 
 Plugins
@@ -17,7 +17,7 @@ need to install libpri, again before compiling Asterisk.
 
 Examples
 ========
-Be sure to see /usr/doc/asterisk-16.0.0/sample_confs/ after
+Be sure to see /usr/doc/asterisk-16.1.0/sample_confs/ after
 installation for any additional configuration files you may need.
 
 Database Support
@@ -27,7 +27,7 @@ want to install the alembic package. Since version 12.0 the database
 schemas that Asterisk uses are being captured in the form of python
 script files that use alembic to create/update database schemas. The
 asterisk package places these database scripts in the
-/usr/doc/asterisk-16.0.0/ast-db-manage directory.
+/usr/doc/asterisk-16.1.0/ast-db-manage directory.
 
 Build Flags
 ===========
@@ -39,19 +39,12 @@ This build script supports the following flags:
    code. This requires a more powerful machine than would be normally
    required.
 
- * JANSSON : [default = no]
+ * JANSSON : [default = yes]
 
-   Set this flag to 'yes' if you would like to build the projects
-   internal jansson libraries. The default for this option is 'no',
-   which requires you to have jansson >= 2.11 installed on your system.
-   Set this to 'yes' if you would like to ignore the system requirement
-   and have Asterisk build an internal version of the library.
-
- * LANGUAGE : [default = EN]
-
-   Set this flag to change the language used by Asterisk. This flag
-   supports the following values: EN, EN_AU, EN_GB, EN_NX, ES, FR, IT,
-   RU, JA, and SV.
+   By default, this package will build a version of jansson internal to
+   Asterisks. Set this flag to 'no' if you already have jansson installed
+   as a shared library and wish to use that instead. Setting this flag to
+   'no' will require you to have jansson >= 2.11 installed on your system.
 
  * MEETME : [default = no]
 
@@ -63,23 +56,20 @@ This build script supports the following flags:
  * MOH : [default = no]
 
    Set this flag to 'yes' if you would like to include some royalty-free
-   music on hold sound files with your installation. Setting this
-   option will cause the build to download some sound files from the
-   internet.
+   music on hold sound files with your installation.
 
  * PJSIP : [default = no]
 
    Set this flag to 'yes' if you would like to build the projects
    internal pjsip libraries. Asterisk no longer supports an external
-   system-wide install of pjsip. If you need pjsip support it is
-   strongly recommended that you uninstall pjsip and use Asterisks
-   internal pjsip library.
+   system-wide install of pjsip and it is strongly recommended that
+   you uninstall any external pjsip packages and use Asterisks internal
+   pjsip library.
 
  * SOUNDS_EXTRA : [default = no]
 
    Set this flag to 'yes' if you would like to include the extra sound
-   package with your installation. Setting this option will cause the
-   build to download some sound files from the internet.
+   package with your installation.
 
  * VM_ODBC : [default = no]
 
diff --git a/network/asterisk/asterisk.SlackBuild b/network/asterisk/asterisk.SlackBuild
index 0716c1c051..be719726a0 100644
--- a/network/asterisk/asterisk.SlackBuild
+++ b/network/asterisk/asterisk.SlackBuild
@@ -23,8 +23,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=asterisk
-VERSION=${VERSION:-16.0.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-16.1.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -45,7 +45,8 @@ ASTERISKGRP=${ASTERISKGRP:-asterisk}
 ASTERISKUID=${ASTERISKUID:-267}
 ASTERISKGID=${ASTERISKGID:-267}
 
-IMAPDIR=imap-2007f
+CACHEDIR=$TMP/$PRGNAM-cache
+IMAPDIR=$TMP/imap-2007f
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
@@ -74,10 +75,13 @@ getent passwd ${ASTERISKUSR} >/dev/null || do_exit
 
 set -e
 
-rm -fr $PKG $TMP/$PRGNAM-$VERSION $TMP/$IMAPDIR
-mkdir -p $TMP $PKG $OUTPUT
+rm -fr $PKG $TMP/$PRGNAM-$VERSION $IMAPDIR $CACHEDIR
+mkdir -p $TMP $PKG $OUTPUT $CACHEDIR
 cd $TMP
 
+# The following configuration options are determined by the users passed
+# in command-line options. Build the configuration parameters for the
+# configure script.
 CONFIGURE_OPTS=
 
 if [ "${VM_IMAP:-no}" != "no" ] && [ "${VM_ODBC:-no}" = "no" ]; then
@@ -96,10 +100,10 @@ if [ "${VM_IMAP:-no}" != "no" ] && [ "${VM_ODBC:-no}" = "no" ]; then
       make slx EXTRACFLAGS="-I/usr/include/openssl"
     fi
   )
-  CONFIGURE_OPTS="--with-imap=$TMP/$IMAPDIR"
+  CONFIGURE_OPTS="--with-imap=$IMAPDIR"
 fi
 
-if [ "${JANSSON:-no}" != "yes" ]; then
+if [ "${JANSSON:-yes}" = "yes" ]; then
   CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-jansson-bundled"
 else
   CONFIGURE_OPTS="${CONFIGURE_OPTS} --without-jansson-bundled"
@@ -111,6 +115,13 @@ else
   CONFIGURE_OPTS="${CONFIGURE_OPTS} --without-pjproject-bundled"
 fi
 
+# The configure script will download additional files from the internet.
+# Make sure the additional files can be found by the configure script
+# before configuring the package.
+cp $CWD/asterisk-core-sounds* $CWD/asterisk-extra-sounds* \
+   $CWD/asterisk-moh-opsound* $CWD/jansson-*.tar.bz2 $CWD/pjproject-*.tar.bz2 \
+   $CACHEDIR
+
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -128,6 +139,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --with-download-cache=$CACHEDIR \
   $CONFIGURE_OPTS \
   --build=$ARCH-slackware-linux
 
@@ -136,6 +148,12 @@ CXXFLAGS="$SLKCFLAGS" \
 )
 make menuselect-tree
 
+# Supported values for LANGUAGE are: EN, EN_AU, EN_GB, EN_NX, ES, FR, IT
+# RU, JA, and SV. Until I can get around to individually listing the
+# additional files as part of this package I'm going to leave this
+# option undocumented in the README and README.SBo. Specifying anything
+# other than EN will cause the makefile to download additional sound
+# files.
 LANGUAGE=${LANGUAGE:-EN}
 
 menuselect/menuselect \
@@ -143,24 +161,16 @@ menuselect/menuselect \
   --enable CORE-SOUNDS-${LANGUAGE}-WAV \
   --enable CORE-SOUNDS-${LANGUAGE}-ULAW \
   --enable CORE-SOUNDS-${LANGUAGE}-ALAW \
-  --enable CORE-SOUNDS-${LANGUAGE}-GSM \
   --enable CORE-SOUNDS-${LANGUAGE}-G729 \
   --enable CORE-SOUNDS-${LANGUAGE}-G722 \
-  --enable CORE-SOUNDS-${LANGUAGE}-SLN16 \
-  --enable CORE-SOUNDS-${LANGUAGE}-SIREN6 \
-  --enable CORE-SOUNDS-${LANGUAGE}-SIREN17 \
   menuselect.makeopts
 
 if [ "${MOH:-no}" != "no" ]; then
   menuselect/menuselect \
     --enable MOH-OPSOUND-ULAW \
     --enable MOH-OPSOUND-ALAW \
-    --enable MOH-OPSOUND-GSM \
     --enable MOH-OPSOUND-G729 \
     --enable MOH-OPSOUND-G722 \
-    --enable MOH-OPSOUND-SLN16 \
-    --enable MOH-OPSOUND-SIREN7 \
-    --enable MOH-OPSOUND-SIREN14 \
     menuselect.makeopts
 fi
 
@@ -174,12 +184,8 @@ if [ "${SOUNDS_EXTRA:-no}" != "no" ]; then
     --enable EXTRA-SOUNDS-${LANGUAGE_EXTRA}-WAV \
     --enable EXTRA-SOUNDS-${LANGUAGE_EXTRA}-ULAW \
     --enable EXTRA-SOUNDS-${LANGUAGE_EXTRA}-ALAW \
-    --enable EXTRA-SOUNDS-${LANGUAGE_EXTRA}-GSM \
     --enable EXTRA-SOUNDS-${LANGUAGE_EXTRA}-G729 \
     --enable EXTRA-SOUNDS-${LANGUAGE-EXTRA}-G722 \
-    --enable EXTRA-SOUNDS-${LANGUAGE-EXTRA}-SLN16 \
-    --enable EXTRA-SOUNDS-${LANGUAGE_EXTRA}-SIREN7 \
-    --enable EXTRA-SOUNDS-${LANGUAGE_EXTRA}-SIREN14 \
     menuselect.makeopts
 fi
 
@@ -225,7 +231,9 @@ cp -a CHANGES COPYING CREDITS ChangeLog LICENSE README* UPGRADE* doc/ contrib/as
   $PKG/usr/doc/$PRGNAM-$VERSION/
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Install a few typical config files for common asterisk servers
+# Install config files for a typical asterisk server; some of these
+# files don't make sense, but recent changes in the module autoloader
+# will require empty files to be in place for some items to work
 for i in \
   asterisk codecs extensions iax indications musiconhold sip smdi modules voicemail ;
   do
@@ -247,9 +255,8 @@ chown -R $ASTERISKUSR:$ASTERISKGRP $PKG/var/log/asterisk
 chown -R $ASTERISKUSR:$ASTERISKGRP $PKG/var/run/asterisk
 chown $ASTERISKUSR:$ASTERISKGRP $PKG/usr/sbin/asterisk
 
-# The following permissions are a bit weird; if you have the voicemail config
-# file needs to writeable by the asterisk user otherwise password changes aren't
-# preserved
+# The voicemail config file needs to writeable by the asterisk user
+# otherwise password changes aren't preserved
 chown -R root:$ASTERISKGRP $PKG/etc/asterisk
 chmod 664 $PKG/etc/asterisk/voicemail.conf.new
 
diff --git a/network/asterisk/asterisk.info b/network/asterisk/asterisk.info
index e725296635..a528dc6eab 100644
--- a/network/asterisk/asterisk.info
+++ b/network/asterisk/asterisk.info
@@ -1,12 +1,80 @@
 PRGNAM="asterisk"
-VERSION="16.0.0"
+VERSION="16.1.0"
 HOMEPAGE="https://www.asterisk.org"
-DOWNLOAD="http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-16.0.0.tar.gz
+DOWNLOAD="http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-16.1.0.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz.sha1 \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.6.1.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.6.1.tar.gz.sha1 \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.6.1.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.6.1.tar.gz.sha1 \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.6.1.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.6.1.tar.gz.sha1 \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.6.1.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.6.1.tar.gz.sha1 \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.6.1.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.6.1.tar.gz.sha1 \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.5.2.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.5.2.tar.gz.sha1 \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.5.2.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.5.2.tar.gz.sha1 \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.5.2.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.5.2.tar.gz.sha1 \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.5.2.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.5.2.tar.gz.sha1 \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.5.2.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.5.2.tar.gz.sha1 \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-alaw-2.03.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-alaw-2.03.tar.gz.sha1 \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g722-2.03.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g722-2.03.tar.gz.sha1 \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g729-2.03.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g729-2.03.tar.gz.sha1 \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-ulaw-2.03.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-ulaw-2.03.tar.gz.sha1 \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz \
+          http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz.sha1 \
+          https://raw.githubusercontent.com/asterisk/third-party/master/jansson/2.12/jansson-2.12.tar.bz2 \
+          https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.8/pjproject-2.8.tar.bz2 \
           http://ponce.cc/slackware/sources/repo/imap.tar.Z"
-MD5SUM="438589d5baf8e8a38a5bd08671bf6ccc \
+MD5SUM="5082325720249d465908a3c32ec5a7fe \
+        d90e24e30d707e2932cf419cfccff25a \
+        3c071029c1ab648367666d1e384394bb \
+        e4a9ee348028fc0e47148f783e7f945b \
+        c07dd9856157b26e75a8ab3f0994a305 \
+        771c548bfaa528af2403ac65a7298d3d \
+        81299f927413cdcce5b918df1aa2117f \
+        19a02ed4e02721209b2880273c5fb308 \
+        465304529c327c9a00a324dd8ecec41b \
+        124fe01bebe2e1d3b0cd3a6d289369a1 \
+        2b4f430f80493b702f47ff9215423513 \
+        a45ad8b545fa4a4189b3ad235844dda2 \
+        3cde6159d56f4481b1c38a5925cb96ca \
+        215273f4a97c0d00274d88b039ddcc67 \
+        a9f51a428bc46865157cfb5dcc064ec6 \
+        b65bca37aad6f7491e5bad3293342248 \
+        cd2e27a0caf04de586b5d3da5dcb2427 \
+        ffb520603b9c74a3a32f4d6da46fd324 \
+        bcbf0a0f30322113b01d58de7ec552f7 \
+        c04c438976157871493b49e30e0669b4 \
+        0df8058a39d4a812bd91be38787b0643 \
+        8124d8d9b93fd20aba78fb93a9a92c85 \
+        83cd9bd2d9d06874a60d57e75a93ac2e \
+        386b8acb431760ea40d405fec69f67bb \
+        ef1ea42412bc79552e0d6019bf44d04d \
+        c1c4218146c589d519a273bbd43ec178 \
+        d9241e49eb322958c45345313cc4f6f6 \
+        6c3b81fa38c5e940932f5e7600c94a11 \
+        30cac0b0e7a1733de07bd6b511d77163 \
+        d5107998109f3bda5f528e548dd838dc \
+        c45fcb1b2044f3929a5f36464006e9f6 \
+        8277e2c693fd056773b1c15e4d52077d \
+        011fa4dc9fe35dc3d34ed557bb04263f \
+        317dbaf90a9f85ea0ec7b12d080d173d \
+        6487d54213f270d307eaa60efc9f56f3 \
         d9f7fd4e1d93ad9fca1df8717a79d1c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="libedit jansson"
+REQUIRES="libedit"
 MAINTAINER="Chris Walker"
 EMAIL="kris240376@gmail.com"