network/asterisk: Updated for version 16.0.0.

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

4 files changed, 71 insertions, 34 deletions

diff --git a/network/asterisk/README b/network/asterisk/README
index 145dea9a10..bdd0c78c9c 100644
--- a/network/asterisk/README
+++ b/network/asterisk/README
@@ -5,4 +5,8 @@ conference servers and other custom solutions. It is used by small
 businesses, large businesses, call centers, carriers and government
 agencies, worldwide.
 
-Optional dependencies: alembic, dahdi-complete, libpri, unixODBC, pjsip
+Asterisk now includes an internal version of pjsip. As such, pjsip
+conflicts with this package and should be removed.
+
+Optional dependencies: alembic, dahdi-complete, jansson, libpri,
+                       unixODBC
diff --git a/network/asterisk/README.SBo b/network/asterisk/README.SBo
index fea0840e4e..816ee923b2 100644
--- a/network/asterisk/README.SBo
+++ b/network/asterisk/README.SBo
@@ -1,3 +1,12 @@
+** 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
+by setting the PJSIP flag to 'yes'.
+
+Plugins
+=======
 Asterisk has a number of optional build dependencies.  If you intend to
 use any analogue PSTN hardware such as a DigiumTDM400P or plan on
 implementing a key system which uses the app_meetme conferencing plugin
@@ -6,18 +15,46 @@ drivers before compiling 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-13.23.1/sample_confs/ after
+Examples
+========
+Be sure to see /usr/doc/asterisk-16.0.0/sample_confs/ after
 installation for any additional configuration files you may need.
 
+Database Support
+================
 If you have plans of using Asterisk with a database backend you may
 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-13.23.1/ast-db-manage directory.
+/usr/doc/asterisk-16.0.0/ast-db-manage directory.
 
+Build Flags
+===========
 This build script supports the following flags:
 
+ * G711_NEW : [default = no]
+
+   Set this flag to 'yes' if you would like to use the newer G711 codec
+   code. This requires a more powerful machine than would be normally
+   required.
+
+ * JANSSON : [default = no]
+
+   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
+   system. Set this to 'yes' if you would like to ignore the system
+   requirement and have Asterisk build an internal version of the
+   library.
+
+ * MEETME : [default = no]
+
+   Set this flag to 'yes' if you would like to build the app_meetme
+   plugin. This plugin is required for key style systems and
+   conferencing using meetme. This plugin requires the dahdi-linux
+   package for timing purposes.
+
  * MOH : [default = no]
 
    Set this flag to 'yes' if you would like to include some royalty-free
@@ -25,6 +62,14 @@ This build script supports the following flags:
    option will cause the build to download some sound files from the
    internet.
 
+ * 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.
+
  * SOUNDS_EXTRA : [default = no]
 
    Set this flag to 'yes' if you would like to include the extra sound
@@ -46,15 +91,3 @@ This build script supports the following flags:
    Washingtons IMAP server source. This flag will be overridden by the
    VM_ODBC flag if both are set to 'yes'.
 
- * G711_NEW : [default = no]
-
-   Set this flag to 'yes' if you would like to use the newer G711 codec
-   code. This requires a more powerful machine than would be normally
-   required.
-
- * MEETME : [default = no]
-
-   Set this flag to 'yes' if you would like to build the app_meetme
-   plugin. This plugin is required for key style systems and
-   conferencing using meetme. This plugin requires the dahdi-linux
-   package for timing purposes.
diff --git a/network/asterisk/asterisk.SlackBuild b/network/asterisk/asterisk.SlackBuild
index 8558434cf4..174ab9aba4 100644
--- a/network/asterisk/asterisk.SlackBuild
+++ b/network/asterisk/asterisk.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=asterisk
-VERSION=${VERSION:-13.23.1}
+VERSION=${VERSION:-16.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -78,10 +78,9 @@ rm -fr $PKG $TMP/$PRGNAM-$VERSION $TMP/$IMAPDIR
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 
-VM_IMAP=${VM_IMAP:-"no"}
 CONFIGURE_OPTS=
 
-if [ "$VM_IMAP" != "no" ] && [ "${VM_ODBC:-no}" = "no" ]; then
+if [ "${VM_IMAP:-no}" != "no" ] && [ "${VM_ODBC:-no}" = "no" ]; then
   tar xvf $CWD/imap.tar.Z
   ( cd imap-2007f
     chown -R root:root .
@@ -100,6 +99,18 @@ if [ "$VM_IMAP" != "no" ] && [ "${VM_ODBC:-no}" = "no" ]; then
   CONFIGURE_OPTS="--with-imap=$TMP/$IMAPDIR"
 fi
 
+if [ "${JANSSON:-no}" != "no" ]; then
+  CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-jansson-bundled"
+else
+  CONFIGURE_OPTS="${CONFIGURE_OPTS} --without-jansson-bundled"
+fi
+
+if [ "${PJSIP:-no}" != "no" ]; then
+  CONFIGURE_OPTS="${CONFIGURE_OPTS} --with-pjproject-bundled"
+else
+  CONFIGURE_OPTS="${CONFIGURE_OPTS} --without-pjproject-bundled"
+fi
+
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -129,17 +140,6 @@ menuselect/menuselect \
   --enable res_config_mysql \
   menuselect.makeopts
 
-#
-# Did asterisk menuselect discover the pjsip library?
-if [ "$(menuselect/menuselect --list-options menuselect.makeopts | grep -c '+ res_pjsip')" -gt 0 ]; then
-  #
-  # Asterisk menuselect discovered the pjsip library and is trying to use it.
-  # Need to modify header file so asterisk will build properly.
-  sed -i -r \
-    -e "s/\/\*\s+#undef\s+(HAVE_PJ_TRANSACTION_GRP_LOCK)\s+\*\//#define \1 1/" \
-    include/asterisk/autoconfig.h
-fi
-
 if [ "${MOH:-no}" != "no" ]; then
   menuselect/menuselect \
     --enable MOH-OPSOUND-ULAW \
@@ -163,7 +163,7 @@ if [ "${VM_ODBC:-no}" != "no" ]; then
   menuselect/menuselect \
     --enable ODBC_STORAGE \
     menuselect.makeopts
-elif [ "$VM_IMAP" != "no" ]; then
+elif [ "${VM_IMAP:-no}" != "no" ]; then
   menuselect/menuselect \
     --enable IMAP_STORAGE \
     menuselect.makeopts
diff --git a/network/asterisk/asterisk.info b/network/asterisk/asterisk.info
index dd37895740..e725296635 100644
--- a/network/asterisk/asterisk.info
+++ b/network/asterisk/asterisk.info
@@ -1,12 +1,12 @@
 PRGNAM="asterisk"
-VERSION="13.23.1"
+VERSION="16.0.0"
 HOMEPAGE="https://www.asterisk.org"
-DOWNLOAD="http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/asterisk-13.23.1.tar.gz \
+DOWNLOAD="http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-16.0.0.tar.gz
           http://ponce.cc/slackware/sources/repo/imap.tar.Z"
-MD5SUM="caac235ebfcbc9ba193b0038c676d14a \
+MD5SUM="438589d5baf8e8a38a5bd08671bf6ccc \
         d9f7fd4e1d93ad9fca1df8717a79d1c5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jansson"
+REQUIRES="libedit jansson"
 MAINTAINER="Chris Walker"
 EMAIL="kris240376@gmail.com"