sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

app_osplookup: Remove deprecated module. 

ASTERISK-30302

Change-Id: I2268189646fa0b587675d8619322818143172474
This commit is contained in:
Mike Bradeen 2022-11-18 13:06:31 -07:00 committed by Friendly Automation
parent 8d652ab4be
commit d0140fc7fe
12 changed files with 7 additions and 3437 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3173
apps/app_osplookup.c
View File

File diff suppressed because it is too large Load Diff

66
autoconf/ast_check_osptk.m4
View File

@ -1,66 +0,0 @@
dnl
dnl @synopsis AST_CHECK_OSPTK([REQ_VER_MAJOR],[REQ_VER_MINOR],[REQ_VER_BUGFIX])
dnl
dnl @summary check for existence of OSP Toolkit package
dnl
dnl This macro check for existence of OSP Toolkit package by checking osp/osp.h
dnl header file, OSPPInit function and OSP Toolkit version.
dnl
AC_DEFUN([AST_CHECK_OSPTK],
[
# if OSPTK has not been checked and is not excluded
if test "x${PBX_OSPTK}" != "x1" -a "${USE_OSPTK}" != "no"; then
# if --with-osptk=DIR has been specified, use it.
if test "x${OSPTK_DIR}" != "x"; then
osptk_cflags="-I${OSPTK_DIR}/include"
osptk_ldflags="-L${OSPTK_DIR}/lib"
else
osptk_cflags=""
osptk_ldflags=""
fi
# check for the header
osptk_saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${osptk_cflags}"
AC_CHECK_HEADER([osp/osp.h], [osptk_header_found=yes], [osptk_header_found=no])
CPPFLAGS="${osptk_saved_cppflags}"
# check for the library
if test "${osptk_header_found}" = "yes"; then
osptk_extralibs="-lssl -lcrypto"
AC_CHECK_LIB([osptk], [OSPPInit], [osptk_library_found=yes], [osptk_library_found=no], ${osptk_ldflags} ${osptk_extralibs})
# check OSP Toolkit version
if test "${osptk_library_found}" = "yes"; then
AC_MSG_CHECKING(if OSP Toolkit version is compatible with app_osplookup)
osptk_saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${osptk_cflags}"
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
#include <osp/osp.h>
int main(void) {
int ver = OSP_CLIENT_TOOLKIT_VERSION_MAJOR * 10000 + OSP_CLIENT_TOOLKIT_VERSION_MINOR * 100 + OSP_CLIENT_TOOLKIT_VERSION_BUGFIX;
int req = $1 * 10000 + $2 * 100 + $3;
return (ver < req) ? 1 : 0;
}
]])],
[osptk_compatible=yes],
[osptk_compatible=no]
)
CPPFLAGS="${osptk_saved_cppflags}"
if test "${osptk_compatible}" = "yes"; then
AC_MSG_RESULT(yes)
PBX_OSPTK=1
OSPTK_INCLUDE="${osptk_cflags}"
OSPTK_LIB="${osptk_ldflags} -losptk ${osptk_extralibs}"
AC_DEFINE_UNQUOTED([HAVE_OSPTK], 1, [Define this to indicate the ${OSPTK_DESCRIP} library])
else
AC_MSG_RESULT(no)
fi
fi
fi
fi
])

1
build_tools/menuselect-deps.in
View File

@ -42,7 +42,6 @@ NEON29=@PBX_NEON29@
OGG=@PBX_OGG@
OPUS=@PBX_OPUS@
OPUSFILE=@PBX_OPUSFILE@
OSPTK=@PBX_OSPTK@
PGSQL=@PBX_PGSQL@
PJPROJECT=@PBX_PJPROJECT@
POPT=@PBX_POPT@

171
configure vendored
View File

@ -1013,10 +1013,6 @@ PBX_PGSQL
PGSQL_DIR
PGSQL_INCLUDE
PGSQL_LIB
PBX_OSPTK
OSPTK_DIR
OSPTK_INCLUDE
OSPTK_LIB
PBX_OPUSFILE
OPUSFILE_DIR
OPUSFILE_INCLUDE
@ -1428,7 +1424,6 @@ with_ogg
with_openr2
with_opus
with_opusfile
with_osptk
with_postgres
with_beanstalk
with_pjproject
@ -2199,7 +2194,6 @@ Optional Packages:
--with-openr2=PATH use MFR2 files in PATH
--with-opus=PATH use Opus files in PATH
--with-opusfile=PATH use Opusfile files in PATH
--with-osptk=PATH use OSP Toolkit files in PATH
--with-postgres=PATH use PostgreSQL files in PATH
--with-beanstalk=PATH use Beanstalk Job Queue files in PATH
--with-pjproject=PATH use PJPROJECT files in PATH
@ -12857,39 +12851,6 @@ fi
OSPTK_DESCRIP="OSP Toolkit"
OSPTK_OPTION="osptk"
PBX_OSPTK=0
# Check whether --with-osptk was given.
if test ${with_osptk+y}
then :
withval=$with_osptk;
case ${withval} in
n|no)
USE_OSPTK=no
# -1 is a magic value used by menuselect to know that the package
# was disabled, other than 'not found'
PBX_OSPTK=-1
;;
y|ye|yes)
ac_mandatory_list="${ac_mandatory_list} OSPTK"
;;
*)
OSPTK_DIR="${withval}"
ac_mandatory_list="${ac_mandatory_list} OSPTK"
;;
esac
fi
PGSQL_DESCRIP="PostgreSQL"
PGSQL_OPTION="postgres"
PBX_PGSQL=0
@ -32853,138 +32814,6 @@ printf "%s\n" "#define HAVE_CRYPT_R 1" >>confdefs.h
fi
if test "$PBX_OPENSSL" = "1";
then
# if OSPTK has not been checked and is not excluded
if test "x${PBX_OSPTK}" != "x1" -a "${USE_OSPTK}" != "no"; then
# if --with-osptk=DIR has been specified, use it.
if test "x${OSPTK_DIR}" != "x"; then
osptk_cflags="-I${OSPTK_DIR}/include"
osptk_ldflags="-L${OSPTK_DIR}/lib"
else
osptk_cflags=""
osptk_ldflags=""
fi
# check for the header
osptk_saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${osptk_cflags}"
ac_fn_c_check_header_compile "$LINENO" "osp/osp.h" "ac_cv_header_osp_osp_h" "$ac_includes_default"
if test "x$ac_cv_header_osp_osp_h" = xyes
then :
osptk_header_found=yes
else $as_nop
osptk_header_found=no
fi
CPPFLAGS="${osptk_saved_cppflags}"
# check for the library
if test "${osptk_header_found}" = "yes"; then
osptk_extralibs="-lssl -lcrypto"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OSPPInit in -losptk" >&5
printf %s "checking for OSPPInit in -losptk... " >&6; }
if test ${ac_cv_lib_osptk_OSPPInit+y}
then :
printf %s "(cached) " >&6
else $as_nop
ac_check_lib_save_LIBS=$LIBS
LIBS="-losptk ${osptk_ldflags} ${osptk_extralibs} $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
char OSPPInit ();
int
main (void)
{
return OSPPInit ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"
then :
ac_cv_lib_osptk_OSPPInit=yes
else $as_nop
ac_cv_lib_osptk_OSPPInit=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.beam \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_osptk_OSPPInit" >&5
printf "%s\n" "$ac_cv_lib_osptk_OSPPInit" >&6; }
if test "x$ac_cv_lib_osptk_OSPPInit" = xyes
then :
osptk_library_found=yes
else $as_nop
osptk_library_found=no
fi
# check OSP Toolkit version
if test "${osptk_library_found}" = "yes"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if OSP Toolkit version is compatible with app_osplookup" >&5
printf %s "checking if OSP Toolkit version is compatible with app_osplookup... " >&6; }
osptk_saved_cppflags="${CPPFLAGS}"
CPPFLAGS="${CPPFLAGS} ${osptk_cflags}"
if test "$cross_compiling" = yes
then :
{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
See \`config.log' for more details" "$LINENO" 5; }
else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <osp/osp.h>
int main(void) {
int ver = OSP_CLIENT_TOOLKIT_VERSION_MAJOR * 10000 + OSP_CLIENT_TOOLKIT_VERSION_MINOR * 100 + OSP_CLIENT_TOOLKIT_VERSION_BUGFIX;
int req = 4 * 10000 + 0 * 100 + 0;
return (ver < req) ? 1 : 0;
}
_ACEOF
if ac_fn_c_try_run "$LINENO"
then :
osptk_compatible=yes
else $as_nop
osptk_compatible=no
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
fi
CPPFLAGS="${osptk_saved_cppflags}"
if test "${osptk_compatible}" = "yes"; then
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
printf "%s\n" "yes" >&6; }
PBX_OSPTK=1
OSPTK_INCLUDE="${osptk_cflags}"
OSPTK_LIB="${osptk_ldflags} -losptk ${osptk_extralibs}"
printf "%s\n" "#define HAVE_OSPTK 1" >>confdefs.h
else
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
printf "%s\n" "no" >&6; }
fi
fi
fi
fi
fi
if test "x${PBX_SRTP}" != "x1" -a "${USE_SRTP}" != "no"; then
pbxlibdir=""
# if --with-SRTP=DIR has been specified, use it.

6
configure.ac
View File

@ -568,7 +568,6 @@ AST_EXT_LIB_SETUP([OGG], [OGG], [ogg])
AST_EXT_LIB_SETUP([OPENR2], [MFR2], [openr2])
AST_EXT_LIB_SETUP([OPUS], [Opus], [opus])
AST_EXT_LIB_SETUP([OPUSFILE], [Opusfile], [opusfile])
AST_EXT_LIB_SETUP([OSPTK], [OSP Toolkit], [osptk])
AST_EXT_LIB_SETUP([PGSQL], [PostgreSQL], [postgres])
AST_EXT_LIB_SETUP([BEANSTALK], [Beanstalk Job Queue], [beanstalk])
@ -2684,11 +2683,6 @@ AC_SUBST(CRYPT_INCLUDE)
AC_CHECK_LIB([crypt], [crypt_r],
[AC_DEFINE([HAVE_CRYPT_R], [1], [Define to 1 if you have the 'crypt_r' function.])])
if test "$PBX_OPENSSL" = "1";
then
AST_CHECK_OSPTK([4], [0], [0])
fi
AST_EXT_LIB_CHECK([SRTP], [srtp2], [srtp_init], [srtp2/srtp.h], [], [], [2])
AST_EXT_LIB_CHECK_SHARED([SRTP], [srtp2], [srtp_init], [srtp2/srtp.h], [], [], [], [
AC_MSG_WARN([***])

2
contrib/scripts/install_prereq
View File

@ -25,7 +25,7 @@ PACKAGES_DEBIAN="$PACKAGES_DEBIAN libedit-dev libjansson-dev libsqlite3-dev uuid
# Asterisk: for addons:
PACKAGES_DEBIAN="$PACKAGES_DEBIAN libspeex-dev libspeexdsp-dev libogg-dev libvorbis-dev libasound2-dev portaudio19-dev libcurl4-openssl-dev xmlstarlet bison flex"
PACKAGES_DEBIAN="$PACKAGES_DEBIAN libpq-dev unixodbc-dev libneon27-dev libgmime-2.6-dev libgmime-3.0-dev liblua5.2-dev liburiparser-dev libxslt1-dev libssl-dev"
PACKAGES_DEBIAN="$PACKAGES_DEBIAN libmysqlclient-dev libbluetooth-dev libradcli-dev freetds-dev libosptk-dev libjack-jackd2-dev bash libcap-dev"
PACKAGES_DEBIAN="$PACKAGES_DEBIAN libmysqlclient-dev libbluetooth-dev libradcli-dev freetds-dev libjack-jackd2-dev bash libcap-dev"
PACKAGES_DEBIAN="$PACKAGES_DEBIAN libsnmp-dev libiksemel-dev libcorosync-common-dev libcpg-dev libcfg-dev libnewt-dev libpopt-dev libical-dev libspandsp-dev"
PACKAGES_DEBIAN="$PACKAGES_DEBIAN libresample1-dev libc-client2007e-dev binutils-dev libsrtp0-dev libsrtp2-dev libgsm1-dev doxygen graphviz zlib1g-dev libldap2-dev"
PACKAGES_DEBIAN="$PACKAGES_DEBIAN libcodec2-dev libfftw3-dev libsndfile1-dev libunbound-dev"

6
doc/UPGRADE-staging/app_osplookup_removal.txt Normal file
View File

@ -0,0 +1,6 @@
Subject: app_osplookup
Master-Only: True
This module was deprecated in Asterisk 19
and is now being removed in accordance with
the Asterisk Module Deprecation policy.

3
include/asterisk/autoconfig.h.in
View File

@ -580,9 +580,6 @@
/* Define to 1 if you have the Opusfile library. */
#undef HAVE_OPUSFILE
/* Define this to indicate the ${OSPTK_DESCRIP} library */
#undef HAVE_OSPTK
/* Define to 1 if your system defines the file flag O_EVTONLY in fcntl.h */
#undef HAVE_O_EVTONLY

3
makeopts.in
View File

@ -224,9 +224,6 @@ OPUS_LIB=@OPUS_LIB@
OPUSFILE_INCLUDE=@OPUSFILE_INCLUDE@
OPUSFILE_LIB=@OPUSFILE_LIB@
OSPTK_INCLUDE=@OSPTK_INCLUDE@
OSPTK_LIB=@OSPTK_LIB@
PGSQL_INCLUDE=@PGSQL_INCLUDE@
PGSQL_LIB=@PGSQL_LIB@

8
menuselect/example_menuselect-tree
View File

@ -76,10 +76,6 @@
<member name="app_morsecode" displayname="Morse code" remove_on_change="apps/app_morsecode.o apps/app_morsecode.so">
</member>
<member name="app_mp3" displayname="Silly MP3 Application" remove_on_change="apps/app_mp3.o apps/app_mp3.so">
</member>
<member name="app_osplookup" displayname="Open Settlement Protocol Applications" remove_on_change="apps/app_osplookup.o apps/app_osplookup.so">
<depend>libosptk</depend>
<depend>ssl</depend>
</member>
<member name="app_page" displayname="Page Multiple Phones" remove_on_change="apps/app_page.o apps/app_page.so">
<depend>zaptel</depend>
@ -371,10 +367,6 @@
</member>
<member name="res_odbc" displayname="ODBC Resource" remove_on_change="res/res_odbc.o res/res_odbc.so">
<depend>unixodbc</depend>
</member>
<member name="res_osp" displayname="Open Settlement Protocol Support" remove_on_change="res/res_osp.o res/res_osp.so">
<depend>libosptk</depend>
<depend>ssl</depend>
</member>
<member name="res_smdi" displayname="Asterisk Simplified Message Desk Interface (SMDI) Module" remove_on_change="res/res_smdi.o res/res_smdi.so">
</member>

1
menuselect/test/build_tools/menuselect-deps
View File

@ -25,7 +25,6 @@ NETSNMP=0
NEWT=1
OGG=1
OPENH323=0
OSPTK=1
OSSAUDIO=1
PGSQL=1
POPT=1

4
menuselect/test/menuselect-tree
View File

@ -88,10 +88,6 @@
</member>
<member name="app_mp3" displayname="Silly MP3 Application" remove_on_change="apps/app_mp3.o apps/app_mp3.so">
</member>
<member name="app_osplookup" displayname="Open Settlement Protocol Applications" remove_on_change="apps/app_osplookup.o apps/app_osplookup.so">
<depend>osptk</depend>
<depend>ssl</depend>
</member>
<member name="app_page" displayname="Page Multiple Phones" remove_on_change="apps/app_page.o apps/app_page.so">
<depend name="dahdi">DAHDI</depend>
<depend>app_meetme</depend>