diff --git a/Makefile.in b/Makefile.in index 4d69f887db8..86ba1ef45c9 100755 --- a/Makefile.in +++ b/Makefile.in @@ -13,7 +13,8 @@ DISTRO_VER = $(word 2,$(subst -, ,$(DISTRO))) DISTRO_ARCH = $(word 3,$(subst -, ,$(DISTRO))) DISTRO_RESULTS_DIR = $(strip \ $(subst fedora,Fedora, \ - $(subst centos,CentOS,$(DISTRO_OS)))_$(DISTRO_VER)) + $(subst centos,CentOS, \ + $(subst rocky,Rocky,$(DISTRO_OS))))_$(DISTRO_VER)) # utility empty := diff --git a/config/ax_boost_base.m4 b/config/ax_boost_base.m4 index 54a2a1bee74..c8f486c17a3 100644 --- a/config/ax_boost_base.m4 +++ b/config/ax_boost_base.m4 @@ -152,7 +152,6 @@ if test "x$want_boost" = "xyes"; then AC_LANG_POP([C++]) - dnl if we found no boost with system layout we search for boost libraries dnl built and installed without the --layout=system option or for a staged(not installed) version if test "x$succeeded" != "xyes"; then diff --git a/config/general.m4 b/config/general.m4 index 37d675bbab2..8c45a49fc0f 100644 --- a/config/general.m4 +++ b/config/general.m4 @@ -121,110 +121,35 @@ AC_DEFUN([CHECK_OPENFIRE], ]) # ============= C P P U N I T ================== +dnl Removed cppunit-config: dnl dnl AM_PATH_CPPUNIT(MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl AC_DEFUN([AM_PATH_CPPUNIT], [ + AC_MSG_CHECKING([for CppUnit >= $1 using pkg-config]) + + PKG_CHECK_MODULES([CPPUNIT], [cppunit >= $1], [ + AC_MSG_RESULT([found]) + CPPUNIT_CFLAGS=$CPPUNIT_CFLAGS + CPPUNIT_LIBS=$CPPUNIT_LIBS + ifelse([$2], , :, [$2]) + ], [ + AC_MSG_RESULT([not found]) + CPPUNIT_CFLAGS="" + CPPUNIT_LIBS="" + ifelse([$3], , :, [$3]) + ]) -AC_ARG_WITH(cppunit-prefix,[ --with-cppunit-prefix=PFX Prefix where CppUnit is installed (optional)], - cppunit_config_prefix="$withval", cppunit_config_prefix="") -AC_ARG_WITH(cppunit-exec-prefix,[ --with-cppunit-exec-prefix=PFX Exec prefix where CppUnit is installed (optional)], - cppunit_config_exec_prefix="$withval", cppunit_config_exec_prefix="") - - dnl Assemble the arguments to be passed to cppunit-config in cppunit_config_args. - dnl Construct the cppunit-config executable name in CPPUNIT_CONFIG. - cppunit_config_args= - if test x$cppunit_config_exec_prefix != x ; then - cppunit_config_args="$cppunit_config_args --exec-prefix=$cppunit_config_exec_prefix" - if test x${CPPUNIT_CONFIG+set} != xset ; then - CPPUNIT_CONFIG=$cppunit_config_exec_prefix/bin/cppunit-config - fi - fi - if test x$cppunit_config_prefix != x ; then - cppunit_config_args="$cppunit_config_args --prefix=$cppunit_config_prefix" - if test x${CPPUNIT_CONFIG+set} != xset ; then - CPPUNIT_CONFIG=$cppunit_config_prefix/bin/cppunit-config - fi - fi - - dnl Find cppunit-config, put path in CPPUNIT_CONFIG, but if CPPUNIT_CONFIG - dnl already has a value containing '/', use that value. - AC_PATH_PROG(CPPUNIT_CONFIG, cppunit-config, no) - cppunit_version_min=$1 - - AC_MSG_CHECKING(for Cppunit - version >= $cppunit_version_min) - no_cppunit="" - if test "$CPPUNIT_CONFIG" = "no" ; then - AC_MSG_RESULT(no) - no_cppunit=yes - else - dnl Get cppunit's recommendations for cflags and libraries. - CPPUNIT_CFLAGS=`$CPPUNIT_CONFIG $cppunit_config_args --cflags` - CPPUNIT_LIBS=`$CPPUNIT_CONFIG $cppunit_config_args --libs` - dnl Query cppunit to determine its version. - cppunit_version=`$CPPUNIT_CONFIG $cppunit_config_args --version` - - cppunit_major_version=`echo $cppunit_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - cppunit_minor_version=`echo $cppunit_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - cppunit_micro_version=`echo $cppunit_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - - cppunit_major_min=`echo $cppunit_version_min | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - if test "x${cppunit_major_min}" = "x" ; then - cppunit_major_min=0 - fi - - cppunit_minor_min=`echo $cppunit_version_min | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - if test "x${cppunit_minor_min}" = "x" ; then - cppunit_minor_min=0 - fi - - cppunit_micro_min=`echo $cppunit_version_min | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x${cppunit_micro_min}" = "x" ; then - cppunit_micro_min=0 - fi - - cppunit_version_proper=`expr \ - $cppunit_major_version \> $cppunit_major_min \| \ - $cppunit_major_version \= $cppunit_major_min \& \ - $cppunit_minor_version \> $cppunit_minor_min \| \ - $cppunit_major_version \= $cppunit_major_min \& \ - $cppunit_minor_version \= $cppunit_minor_min \& \ - $cppunit_micro_version \>= $cppunit_micro_min ` - - if test "$cppunit_version_proper" = "1" ; then - AC_MSG_RESULT([$cppunit_major_version.$cppunit_minor_version.$cppunit_micro_version]) - else - AC_MSG_RESULT(no) - no_cppunit=yes - fi - fi - - if test "x$no_cppunit" = x ; then - ifelse([$2], , :, [$2]) - else - CPPUNIT_CFLAGS="" - CPPUNIT_LIBS="" - ifelse([$3], , :, [$3]) - fi - - AC_SUBST(CPPUNIT_CFLAGS) - AC_SUBST(CPPUNIT_LIBS) + AC_SUBST([CPPUNIT_CFLAGS]) + AC_SUBST([CPPUNIT_LIBS]) ]) - AC_DEFUN([CHECK_CPPUNIT], [ AM_PATH_CPPUNIT(1.9, [], - [SF_MISSING_DEP("cppunit headers not found")] - ) + [SF_MISSING_DEP("CppUnit headers not found")]) ]) m4_include([config/check_jdk.m4]) @@ -335,6 +260,8 @@ AC_DEFUN([CHECK_SSL], AC_SUBST(SSL_CXXFLAGS,"$SSL_CFLAGS") ]) + + # ============ P O C O ========================= AC_DEFUN([CHECK_POCO], [ diff --git a/config/revision-gen b/config/revision-gen index 0633ddcfcd5..e8fdb142f9b 100755 --- a/config/revision-gen +++ b/config/revision-gen @@ -24,6 +24,9 @@ if test -d ../.git; then fi VERSION=$1 +if [ $VERSION == "25.01" ]; then + VERSION="4.6.0" +fi if [ $VERSION == "24.01" ]; then VERSION="4.6.0" fi diff --git a/config/test-driver b/config/test-driver index 32bf39e8377..89dba1e075c 100755 --- a/config/test-driver +++ b/config/test-driver @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2012-06-27.10; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2020 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ scriptversion=2012-06-27.10; # UTC # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -44,13 +44,12 @@ print_usage () Usage: test-driver --test-name=NAME --log-file=PATH --trs-file=PATH [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT + [--enable-hard-errors={yes|no}] [--] + TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] The '--test-name', '--log-file' and '--trs-file' options are mandatory. END } -# TODO: better error handling in option parsing (in particular, ensure -# TODO: $log_file, $trs_file and $test_name are defined). test_name= # Used for reporting. log_file= # Where to save the output of the test script. trs_file= # Where to save the metadata of the test run. @@ -69,10 +68,23 @@ while test $# -gt 0; do --enable-hard-errors) enable_hard_errors=$2; shift;; --) shift; break;; -*) usage_error "invalid option: '$1'";; + *) break;; esac shift done +missing_opts= +test x"$test_name" = x && missing_opts="$missing_opts --test-name" +test x"$log_file" = x && missing_opts="$missing_opts --log-file" +test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" +if test x"$missing_opts" != x; then + usage_error "the following mandatory options are missing:$missing_opts" +fi + +if test $# -eq 0; then + usage_error "missing argument" +fi + if test $color_tests = yes; then # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. red='' # Red. @@ -94,11 +106,14 @@ trap "st=143; $do_exit" 15 # Test script is run here. "$@" >$log_file 2>&1 estatus=$? + if test $enable_hard_errors = no && test $estatus -eq 99; then - estatus=1 + tweaked_estatus=1 +else + tweaked_estatus=$estatus fi -case $estatus:$expect_failure in +case $tweaked_estatus:$expect_failure in 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; 0:*) col=$grn res=PASS recheck=no gcopy=no;; 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; @@ -107,6 +122,12 @@ case $estatus:$expect_failure in *:*) col=$red res=FAIL recheck=yes gcopy=yes;; esac +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + # Report outcome to console. echo "${col}${res}${std}: $test_name" @@ -119,9 +140,9 @@ echo ":copy-in-global-log: $gcopy" >> $trs_file # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff --git a/configure.ac b/configure.ac index 2043ed04dbb..a28d9db547a 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ # AC_PREREQ(2.57) -AC_INIT(sipX, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipX, 25.01, sipxcom-dev@googlegroups.com) # Pass standard and sipxecs common params to ./configure switches on all sub-projects. # Doesn't have to handle ./configure vars like SIPX_PBXUSER because those diff --git a/doc/configure.ac b/doc/configure.ac index 306859b1929..09d2399a588 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -8,7 +8,7 @@ m4_include([config/sipXlib.m4]) SFAC_SIPX_INSTALL_PREFIX -AM_INIT_AUTOMAKE(foreign) +AM_INIT_AUTOMAKE(foreign subdir-objects) SFAC_AUTOMAKE_VERSION([1.6]) CHECK_AUTOCONF diff --git a/mak/build.mk.in b/mak/build.mk.in index ac3da99d1eb..df2575b6772 100644 --- a/mak/build.mk.in +++ b/mak/build.mk.in @@ -4,7 +4,9 @@ OPTIONS = @OPTIONS@ DOWNLOAD_LIB_CACHE = @DOWNLOAD_LIB_CACHE@ -git_submodules = $(shell sed -e '/^\[submodule/! d' -e 's/^\[submodule "\(.*\)"]$$/\1/g' $(wildcard $(SRC)/.gitmodules)) +git_submodules = $(shell if [ -f $(SRC)/.gitmodules ]; then \ + sed -e '/^\[submodule/! d' -e 's/^\[submodule "\(.*\)"]$$/\1/g' $(SRC)/.gitmodules; \ + fi) custommodules = git_custommodules_file = $(wildcard $(SRC)/custom/.gitmodules) ifneq ($(git_custommodules_file),) diff --git a/mak/list-dependencies.mk.in b/mak/list-dependencies.mk.in index 16de44494a1..61b9c0a2dc2 100644 --- a/mak/list-dependencies.mk.in +++ b/mak/list-dependencies.mk.in @@ -47,7 +47,7 @@ REWRITE_DEPS_suse = \ -e '/vixiecron/d' CURRENT_DISTRO := $(shell rpm --eval \ - '%{?fedora:Fedora}%{!?fedora:%{?suse_version:Suse}%{!?suse_version:CentOS}}') + '%{?fedora:Fedora}%{!?fedora:%{?suse_version:Suse}%{!?suse_version:%{?centos:CentOS}%{!?centos:Rocky}}}') ifeq ($(CURRENT_DISTRO),CentOS) RPMSPEC := $(SRC)/mak/rpmspec-rh6-x86_64 diff --git a/mak/mock/rocky-9-x86_64.cfg.in b/mak/mock/rocky-9-x86_64.cfg.in new file mode 100644 index 00000000000..54158a40f66 --- /dev/null +++ b/mak/mock/rocky-9-x86_64.cfg.in @@ -0,0 +1,99 @@ +config_opts['root'] = 'rocky-9-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) +config_opts['dist'] = 'el9' # only useful for --resultdir variable subst +config_opts['releasever'] = '9' +config_opts['basearc'] = 'x86_64' +config_opts['rltype'] = '' +config_opts['use_bootstrap'] = False +#config_opts['use_bootstrap_image'] = True +#config_opts['bootstrap_image'] = 'rockylinux:9' +config_opts['chroot_additional_packages'] = [ + 'rpm-build-libs', + 'redhat-rpm-config', + 'gcc-c++', + 'krb5-devel', + 'openssl-devel', + 'v8-devel', + 'libdb-devel', + 'libdb-cxx-devel' + ] + +config_opts['yum.conf'] = """ + +[main] +cachedir=/var/cache/yum +debuglevel=1 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +@DOWNLOAD_PROXY_CONFIG_LINE@ + +[baseos] +name=Rocky Linux $releasever - BaseOS +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=BaseOS-$releasever +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/BaseOS/$basearch/os/ +gpgcheck=1 +enabled=1 +countme=1 +metadata_expire=6h +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 + +[appstream] +name=Rocky Linux $releasever - AppStream +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=AppStream-$releasever +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/AppStream/$basearch/os/ +gpgcheck=1 +enabled=1 +countme=1 +metadata_expire=6h +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 + +[devel] +name=Rocky Linux $releasever - Devel WARNING! FOR BUILDROOT ONLY DO NOT LEAVE ENABLED +mirrorlist=https://mirrors.rockylinux.org/mirrorlist?arch=$basearch&repo=devel-$releasever +#baseurl=http://dl.rockylinux.org/$contentdir/$releasever/devel/$basearch/os/ +gpgcheck=1 +enabled=1 +countme=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-Rocky-9 + +[epel] +name=Extra Packages for Enterprise Linux $releasever - $basearch +# It is much more secure to use the metalink, but if you wish to use a local mirror +# place its address here. +#baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch/ +metalink=https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir +enabled=1 +gpgcheck=1 +countme=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$releasever + + +[sipxcom] +name=sipXcom +enabled=1 +baseurl=@UPSTREAM_URL@ +repo_gpgcheck=0 +gpgcheck=0 + + +# Normally from EPEL, just a list of rpms to create a basic build system +[buildsys-build] +name=buildsys-build +baseurl=@DOWNLOAD_BASE_URL@/buildsys-build +enabled=1 + +[build] +name=build +#baseurl=http://localhost:@REPO_PORT@/Rocky_9/x86_64/ +baseurl=file:///src/sipxecs/build/repo/Rocky_9/x86_64/ + +""" + + diff --git a/mak/mock/site-defaults.cfg.in b/mak/mock/site-defaults.cfg.in index f537f6bc512..435e79573ac 100644 --- a/mak/mock/site-defaults.cfg.in +++ b/mak/mock/site-defaults.cfg.in @@ -15,7 +15,7 @@ # # Things that we recommend you set in site-defaults.cfg: # -config_opts['basedir'] = '@abs_top_builddir@/mock/' +config_opts['basedir'] = '@abs_top_builddir@/mock' config_opts['cache_topdir'] = '@abs_top_builddir@/mock-cache' # Note: the path pointed to by basedir and cache_topdir must be owned # by group 'mock' and must have mode: g+rws diff --git a/mak/rpm.m4 b/mak/rpm.m4 index d1bc00063e3..67c69843827 100644 --- a/mak/rpm.m4 +++ b/mak/rpm.m4 @@ -74,8 +74,7 @@ fi ],) dnl NOTE: To support non-rpm based distos, write equivalent of this that defines DISTRO_* vars -AC_CHECK_FILE(/bin/rpm, -[ +if test -e /bin/rpm; then RPMBUILD_TOPDIR="\$(shell rpm --eval '%{_topdir}')" AC_SUBST(RPMBUILD_TOPDIR) @@ -85,18 +84,18 @@ AC_CHECK_FILE(/bin/rpm, DistroArchDefault=`rpm --eval '%{_target_cpu}'` dnl NOTE LIMITATION: default doesn't account for distros besides centos, redhat and suse or redhat 6 - DistroOsDefault=`rpm --eval '%{?fedora:fedora}%{!?fedora:%{?suse_version:suse}%{!?suse_version:centos}}'` + DistroOsDefault=`rpm --eval '%{?fedora:fedora}%{!?fedora:%{?suse_version:suse}%{!?suse_version:%{?centos:centos}%{!?centos:rocky}}}'` dnl NOTE LIMITATION: default doesn't account for distros besides centos, redhat and suse or redhat 6 - DistroVerDefault=`rpm --eval '%{?fedora:%fedora}%{!?fedora:%{?suse_version:%suse_version}%{!?suse_version:5}}'` + DistroVerDefault=`rpm --eval '%{?fedora:%fedora}%{!?fedora:%{?suse_version:%suse_version}%{!?suse_version:%{?centos:%centos}%{!?centos:%rocky}}}'` DistroDefault="${DistroOsDefault}-${DistroVerDefault}-${DistroArchDefault}" -]) +fi AC_ARG_VAR(DISTRO, [What operating system you are compiling for. Default is ${DistroDefault}]) -test -n "${DISTRO}" || DISTRO="centos-7-x86_64" +test -n "${DISTRO}" || DISTRO=${DistroDefault} -AllDistrosDefault="fedora-16-i386 fedora-16-x86_64 fedora-17-i386 fedora-17-x86_64 fedora-18-i386 fedora-18-x86_64 fedora-19-i386 fedora-19-x86_64 centos-6-i386 centos-6-x86_64 centos-7-x86_64" +AllDistrosDefault="fedora-16-i386 fedora-16-x86_64 fedora-17-i386 fedora-17-x86_64 fedora-18-i386 fedora-18-x86_64 fedora-19-i386 fedora-19-x86_64 centos-6-i386 centos-6-x86_64 centos-7-x86_64 centos-9-x86_64 rocky-9-x86_64" AC_ARG_VAR(ALL_DISTROS, [All distros which using cross distroy compiling (xc.* targets) Default is ${AllDistrosDefault}]) test -n "${ALL_DISTROS}" || ALL_DISTROS="${AllDistrosDefault}" @@ -166,6 +165,7 @@ AC_ARG_ENABLE(rpm, [--enable-rpm Using mock package to build rpms], AC_CONFIG_FILES([mak/mock/centos-6-x86_64.cfg]) AC_CONFIG_FILES([mak/mock/centos-7-x86_64.cfg]) AC_CONFIG_FILES([mak/mock/centos-9-x86_64.cfg]) + AC_CONFIG_FILES([mak/mock/rocky-9-x86_64.cfg]) AC_CONFIG_FILES([mak/mock/fedora-16-i386.cfg]) AC_CONFIG_FILES([mak/mock/fedora-16-x86_64.cfg]) AC_CONFIG_FILES([mak/mock/fedora-17-i386.cfg]) diff --git a/mod_bcg729/configure.ac b/mod_bcg729/configure.ac index 1322fe253c9..7114ffa7228 100644 --- a/mod_bcg729/configure.ac +++ b/mod_bcg729/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.57) -AC_INIT(mod_bcg729, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(mod_bcg729, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) SFAC_INIT_FLAGS diff --git a/oss_core/config/oss_lib.m4 b/oss_core/config/oss_lib.m4 index 0359db6dd52..f1acd5396ba 100644 --- a/oss_core/config/oss_lib.m4 +++ b/oss_core/config/oss_lib.m4 @@ -102,17 +102,6 @@ AC_DEFUN([SFAC_LIB_CORE_FLAGS], CFLAGS="-I${prefix}/include $CFLAGS" CXXFLAGS="-I${prefix}/include $CXXFLAGS" - OSS_CORE_VERSION_CURRENT="2" - OSS_CORE_VERSION_AGE="0" - OSS_CORE_VERSION_REVISION="3" - OSS_CORE_VERSION_FULL="$OSS_CORE_VERSION_CURRENT.$OSS_CORE_VERSION_REVISION.$OSS_CORE_VERSION_AGE" - OSS_CORE_VERSION_INFO="$OSS_CORE_VERSION_CURRENT:$OSS_CORE_VERSION_REVISION:$OSS_CORE_VERSION_AGE" - AC_SUBST(OSS_CORE_VERSION_CURRENT) - AC_SUBST(OSS_CORE_VERSION_REVISION) - AC_SUBST(OSS_CORE_VERSION_AGE) - AC_SUBST(OSS_CORE_VERSION_FULL) - AC_SUBST(OSS_CORE_VERSION_INFO) - # # Check if iproute2 is installed # diff --git a/oss_core/configure.ac b/oss_core/configure.ac index 7f4a6091f29..2a5e536b6dd 100644 --- a/oss_core/configure.ac +++ b/oss_core/configure.ac @@ -3,10 +3,10 @@ AC_PREREQ(2.57) # # Init library version # -AC_INIT(oss_core, 3.0.0, info@ossapp.com) -OSS_CORE_VERSION_CURRENT="3" -OSS_CORE_VERSION_AGE="0" -OSS_CORE_VERSION_REVISION="0" +AC_INIT(oss_core, 25.01, info@ossapp.com) +OSS_CORE_VERSION_CURRENT="25" +OSS_CORE_VERSION_REVISION="1" +OSS_CORE_VERSION_AGE="1" AC_CONFIG_AUX_DIR(config) AM_INIT_AUTOMAKE([subdir-objects foreign] ) diff --git a/oss_core/include/OSS/Exec/Process.h b/oss_core/include/OSS/Exec/Process.h index f8d62da5463..2dd671937d7 100644 --- a/oss_core/include/OSS/Exec/Process.h +++ b/oss_core/include/OSS/Exec/Process.h @@ -30,6 +30,7 @@ #ifndef OSS_EXEC_PROCESS_H_INCLUDED #define OSS_EXEC_PROCESS_H_INCLUDED +#include "OSS/OSS.h" #include "OSS/UTL/Thread.h" #include "OSS/Exec/Command.h" #include diff --git a/oss_core/include/OSS/JS/modules/include.am b/oss_core/include/OSS/JS/modules/include.am index e0720537594..edf951bbf0b 100644 --- a/oss_core/include/OSS/JS/modules/include.am +++ b/oss_core/include/OSS/JS/modules/include.am @@ -1,5 +1,6 @@ nobase_include_HEADERS += \ + OSS/JS/modules/Async.h \ OSS/JS/modules/BufferObject.h \ OSS/JS/modules/QueueObject.h \ OSS/JS/modules/ZMQSocketObject.h \ @@ -14,6 +15,7 @@ nobase_include_HEADERS += \ OSS/JS/modules/HttpResponseObject.h \ OSS/JS/modules/HttpServerObject.h \ OSS/JS/modules/HttpSSLContextObject.h \ + OSS/JS/modules/IsolateObject.h \ OSS/JS/modules/ESLEventObject.h \ OSS/JS/modules/ESLConnectionObject.h \ OSS/JS/modules/ResipSIPStack.h \ diff --git a/oss_core/include/OSS/JSON/JsonRpcClient.h b/oss_core/include/OSS/JSON/JsonRpcClient.h index 051cb3ad72e..b3b39ac4c38 100644 --- a/oss_core/include/OSS/JSON/JsonRpcClient.h +++ b/oss_core/include/OSS/JSON/JsonRpcClient.h @@ -21,16 +21,17 @@ #ifndef OSS_JSONRPCCLIENT_H_INCLUDED #define OSS_JSONRPCCLIENT_H_INCLUDED - -#include -#include -#include +#include "OSS/OSS.h" #include "OSS/JSON/Json.h" #include "OSS/UTL/BlockingQueue.h" #include "OSS/UTL/Thread.h" #include "OSS/UTL/Logger.h" #include "OSS/Net/ClientTransport.h" +#include +#include +#include + namespace OSS { namespace JSON { diff --git a/oss_core/include/OSS/Net/DTLSBio.h b/oss_core/include/OSS/Net/DTLSBio.h index e63b0533c1e..e2ec427adad 100644 --- a/oss_core/include/OSS/Net/DTLSBio.h +++ b/oss_core/include/OSS/Net/DTLSBio.h @@ -19,6 +19,7 @@ #ifndef OSS_DTLSBIO_H_INCLUDED #define OSS_DTLSBIO_H_INCLUDED +#include "OSS/OSS.h" #include #include @@ -30,8 +31,6 @@ #include #include -#include "OSS/OSS.h" - namespace OSS { diff --git a/oss_core/include/OSS/Net/Net.h b/oss_core/include/OSS/Net/Net.h index f4b7cb9f0f1..5157d135eed 100644 --- a/oss_core/include/OSS/Net/Net.h +++ b/oss_core/include/OSS/Net/Net.h @@ -30,7 +30,6 @@ #include #include #include -#include "OSS/OSS.h" namespace OSS { diff --git a/oss_core/include/OSS/Net/Pinger.h b/oss_core/include/OSS/Net/Pinger.h index 5216eb8e3a4..fa281fe5be3 100644 --- a/oss_core/include/OSS/Net/Pinger.h +++ b/oss_core/include/OSS/Net/Pinger.h @@ -11,6 +11,8 @@ #ifndef OSS_PINGER_H_INCLUDED #define OSS_PINGER_H_INCLUDED +#include "OSS/OSS.h" + #include #include #include diff --git a/oss_core/include/OSS/OSS.h b/oss_core/include/OSS/OSS.h index 4186ed9448b..3288e768afd 100644 --- a/oss_core/include/OSS/OSS.h +++ b/oss_core/include/OSS/OSS.h @@ -233,6 +233,9 @@ #define OSS_ARCH_BIG_ENDIAN 1 #endif +#define BOOST_BIND_GLOBAL_PLACEHOLDERS + + #include #include #include diff --git a/oss_core/include/OSS/SIP/B2BUA/SIPB2BHandler.h b/oss_core/include/OSS/SIP/B2BUA/SIPB2BHandler.h index 04752250dda..c3856d8d32d 100644 --- a/oss_core/include/OSS/SIP/B2BUA/SIPB2BHandler.h +++ b/oss_core/include/OSS/SIP/B2BUA/SIPB2BHandler.h @@ -23,6 +23,8 @@ #include "OSS/build.h" #if ENABLE_FEATURE_B2BUA +#include "OSS/OSS.h" + #include #include #include diff --git a/oss_core/include/OSS/SIP/SBC/SBCRegisterBehavior.h b/oss_core/include/OSS/SIP/SBC/SBCRegisterBehavior.h index 224d101b028..2d3f0480aaa 100644 --- a/oss_core/include/OSS/SIP/SBC/SBCRegisterBehavior.h +++ b/oss_core/include/OSS/SIP/SBC/SBCRegisterBehavior.h @@ -27,10 +27,7 @@ #include #include -#include -#include -#include - +#include "OSS/OSS.h" #include "OSS/SIP/SBC/SBC.h" #include "OSS/UTL/Thread.h" #include "OSS/Net/IPAddress.h" @@ -38,6 +35,11 @@ #include "OSS/SIP/SBC/SBCDefaultBehavior.h" #include "OSS/SIP/SBC/SBCRegistrationRecord.h" #include "OSS/Exec/Process.h" + +#include +#include +#include + #include "SBCWorkSpaceManager.h" #include "SBCConsole.h" diff --git a/oss_core/include/OSS/STUN/VovidaSTUN.inl b/oss_core/include/OSS/STUN/VovidaSTUN.inl index ece2e3da2c1..2ea1388b4ea 100644 --- a/oss_core/include/OSS/STUN/VovidaSTUN.inl +++ b/oss_core/include/OSS/STUN/VovidaSTUN.inl @@ -721,7 +721,7 @@ vovida_stun_RandomPort() static void computeHmac(char* hmac, const char* input, int length, const char* key, int sizeKey) { - strncpy(hmac,"hmac-not-implemented",20); + strcpy(hmac,"ssl-not-implemented"); } #else #include @@ -1098,6 +1098,7 @@ vovida_stun_ServerProcessMsg( char* buf, // need access to shared secret unsigned char hmac[20]; + hmac[0] = '\0'; #ifndef NOSSL unsigned int hmacSize=20; diff --git a/oss_core/include/OSS/UDNS/dnsresolver.h b/oss_core/include/OSS/UDNS/dnsresolver.h index 6acea617526..07c519bfb1a 100644 --- a/oss_core/include/OSS/UDNS/dnsresolver.h +++ b/oss_core/include/OSS/UDNS/dnsresolver.h @@ -20,6 +20,7 @@ #ifndef UDNSPP_DNSRESOLVER_INCLUDED #define UDNSPP_DNSRESOLVER_INCLUDED +#include "OSS/OSS.h" #include #include #include diff --git a/oss_core/include/OSS/UTL/BlockingQueue.h b/oss_core/include/OSS/UTL/BlockingQueue.h index 3edcb62798d..d17e46474a2 100644 --- a/oss_core/include/OSS/UTL/BlockingQueue.h +++ b/oss_core/include/OSS/UTL/BlockingQueue.h @@ -21,11 +21,13 @@ #ifndef OSS_BLOCKINGQUEUE_H_INCLUDED #define OSS_BLOCKINGQUEUE_H_INCLUDED +#include "OSS/OSS.h" +#include "OSS/UTL/Thread.h" + #include #include #include #include -#include "OSS/UTL/Thread.h" #include namespace OSS { diff --git a/oss_core/include/OSS/UTL/ServiceOptions.h b/oss_core/include/OSS/UTL/ServiceOptions.h index 8e59d542621..8666a85cb63 100644 --- a/oss_core/include/OSS/UTL/ServiceOptions.h +++ b/oss_core/include/OSS/UTL/ServiceOptions.h @@ -791,7 +791,7 @@ inline void ServiceOptions::catch_global() #define _catch_global_print(msg) \ std::ostringstream bt; \ bt << msg << std::endl; \ - void* trace_elems[20]; \ + void* trace_elems[21]; \ int trace_elem_count(backtrace( trace_elems, 20 )); \ char** stack_syms(backtrace_symbols(trace_elems, trace_elem_count)); \ for (int i = 0 ; i < trace_elem_count ; ++i ) \ diff --git a/oss_core/include/OSS/build.h.in b/oss_core/include/OSS/build.h.in index 9983ff01719..4b67d0aaf93 100644 --- a/oss_core/include/OSS/build.h.in +++ b/oss_core/include/OSS/build.h.in @@ -5,9 +5,9 @@ // Version information // #define OSS_CORE_VERSION_CURRENT "@OSS_CORE_VERSION_CURRENT@" +#define OSS_CORE_VERSION_INFO "@OSS_CORE_VERSION_INFO@" #define OSS_CORE_VERSION_REVISION "@OSS_CORE_VERSION_REVISION@" #define OSS_CORE_VERSION_AGE "@OSS_CORE_VERSION_AGE@" -#define OSS_CORE_VERSION_INFO "@OSS_CORE_VERSION_INFO@" // @@ -17,6 +17,7 @@ #define OSS_CXXFLAGS "@CXXFLAGS@" #define OSS_CORE_DEP_LIBS "@OSS_CORE_DEP_LIBS@" + // // Features // @@ -37,6 +38,7 @@ // // Libraries found by the configure script // + #define OSS_HAVE_BOOST_THREAD @OSS_HAVE_BOOST_THREAD@ #define OSS_HAVE_BOOST_FILESYSTEM @OSS_HAVE_BOOST_FILESYSTEM@ #define OSS_HAVE_BOOST_DATE_TIME @OSS_HAVE_BOOST_DATE_TIME@ diff --git a/oss_core/oss_core.m4 b/oss_core/oss_core.m4 index 2c9dd68be2c..af601aa13b5 100644 --- a/oss_core/oss_core.m4 +++ b/oss_core/oss_core.m4 @@ -4,8 +4,8 @@ OSS_CORE_VERSION_INFO="$OSS_CORE_VERSION_CURRENT:$OSS_CORE_VERSION_REVISION:$OSS_CORE_VERSION_AGE" AC_SUBST(OSS_CORE_VERSION_CURRENT) AC_SUBST(OSS_CORE_VERSION_REVISION) -AC_SUBST(OSS_CORE_VERSION_AGE) AC_SUBST(OSS_CORE_VERSION_INFO) +AC_SUBST(OSS_CORE_VERSION_AGE) # # Check if C++0x/11/14 is supported by the compiler @@ -314,6 +314,7 @@ AC_LANG_POP([C++]) # AC_LANG_PUSH([C++]) + AC_CHECK_HEADER(Poco/Foundation.h, [], [ERROR_MISSING_DEP(OSS_HAVE_POCO_FOUNDATION, "Poco C++ Foundation Library Headers not found")]) AC_CHECK_LIB(PocoFoundation, main, diff --git a/oss_core/oss_core.spec.in b/oss_core/oss_core.spec.in index 9ddca79e4b0..1f00cb3dfd8 100644 --- a/oss_core/oss_core.spec.in +++ b/oss_core/oss_core.spec.in @@ -20,8 +20,8 @@ BuildRequires: libtool-ltdl-devel Requires: libtool-ltdl BuildRequires: pcre-devel BuildRequires: findutils -BuildRequires: db4-devel -Requires: db4 +BuildRequires: libdb-devel +Requires: libdb Requires: openssl >= 0.9.7a Requires: pcre >= 4.5 BuildRequires: iptables @@ -41,8 +41,8 @@ Requires: libpcap BuildRequires: libdnet-devel Requires: libdnet -BuildRequires: zeromq3-devel -Requires: zeromq3 +BuildRequires: zeromq-devel +Requires: zeromq BuildRequires: poco-devel Requires: poco-crypto @@ -88,7 +88,7 @@ encapsulate functions and operations for: * CARP High Availability -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif @@ -196,8 +196,6 @@ rm -rf $RPM_BUILD_ROOT %dir %attr(755,root,root) %{_libdir}/oss_modules/lexer %dir %attr(755,root,root) %{_libdir}/oss_modules/sbc-hook -#%{_libdir}/oss_modules/*.js -#%{_libdir}/oss_modules/*.jso %{_libdir}/oss_modules/*/*.js %{_libdir}/oss_modules/*/*.jso diff --git a/oss_core/src/b2bua/SIPB2BTransaction.cpp b/oss_core/src/b2bua/SIPB2BTransaction.cpp index 8b80c8baff2..891f4ad8558 100644 --- a/oss_core/src/b2bua/SIPB2BTransaction.cpp +++ b/oss_core/src/b2bua/SIPB2BTransaction.cpp @@ -138,7 +138,15 @@ void SIPB2BTransaction::runTask() OSS::log_information(logMsg.str()); } - _isMidDialog = _pServerRequest->isMidDialog(); + if( _pServerRequest->isMidDialog() ) + { + _isMidDialog = true; + } + else + { + _isMidDialog = false; + } + // // Signal transaction creation // diff --git a/oss_core/src/boost_pch.hpp b/oss_core/src/boost_pch.hpp index ea603648f6e..b4a27fea1a9 100644 --- a/oss_core/src/boost_pch.hpp +++ b/oss_core/src/boost_pch.hpp @@ -8,6 +8,8 @@ #ifndef ALL_BOOST_H #define ALL_BOOST_H +#define BOOST_BIND_GLOBAL_PLACEHOLDERS + #include #include #include diff --git a/oss_core/src/js/modules/assert/module.am b/oss_core/src/js/modules/assert/module.am index 811e18f709d..083cfdce3f4 100644 --- a/oss_core/src/js/modules/assert/module.am +++ b/oss_core/src/js/modules/assert/module.am @@ -5,4 +5,4 @@ assert-install: INSTALL_PROCEDURES += assert-install -EXTRA_DIST += js/modules/assert/index.js \ No newline at end of file +EXTRA_DIST += ${srcdir}/js/modules/assert/index.js \ No newline at end of file diff --git a/oss_core/src/js/modules/async/module.am b/oss_core/src/js/modules/async/module.am index a537d02e0c0..f33e9c2f4fb 100644 --- a/oss_core/src/js/modules/async/module.am +++ b/oss_core/src/js/modules/async/module.am @@ -5,9 +5,9 @@ async-install: INSTALL_PROCEDURES += async-install -EXTRA_DIST += js/modules/async/*.js +EXTRA_DIST += ${srcdir}/js/modules/async/*.js lib_LTLIBRARIES += liboss_jsasync.la liboss_jsasync_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jsasync_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jsasync_la_SOURCES = js/modules/async/queue_object.cpp js/modules/async/async.cpp +liboss_jsasync_la_SOURCES = ${srcdir}/js/modules/async/queue_object.cpp ${srcdir}/js/modules/async/async.cpp diff --git a/oss_core/src/js/modules/buffer/module.am b/oss_core/src/js/modules/buffer/module.am index 550491cb041..f5b79bfd93c 100644 --- a/oss_core/src/js/modules/buffer/module.am +++ b/oss_core/src/js/modules/buffer/module.am @@ -5,9 +5,9 @@ buffer-install: INSTALL_PROCEDURES += buffer-install -EXTRA_DIST += js/modules/buffer/index.js +EXTRA_DIST += ${srcdir}/js/modules/buffer/index.js lib_LTLIBRARIES += liboss_jsbuffer.la liboss_jsbuffer_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jsbuffer_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jsbuffer_la_SOURCES = js/modules/buffer/buffer.cpp +liboss_jsbuffer_la_SOURCES = ${srcdir}/js/modules/buffer/buffer.cpp diff --git a/oss_core/src/js/modules/config/module.am b/oss_core/src/js/modules/config/module.am index d73ffa50f93..176ee539182 100644 --- a/oss_core/src/js/modules/config/module.am +++ b/oss_core/src/js/modules/config/module.am @@ -5,9 +5,9 @@ config-install: INSTALL_PROCEDURES += config-install -EXTRA_DIST += js/modules/config/index.js +EXTRA_DIST += ${srcdir}/js/modules/config/index.js lib_LTLIBRARIES += liboss_jsconfig.la liboss_jsconfig_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jsconfig_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jsconfig_la_SOURCES = js/modules/config/config.cpp +liboss_jsconfig_la_SOURCES = ${srcdir}/js/modules/config/config.cpp diff --git a/oss_core/src/js/modules/console/module.am b/oss_core/src/js/modules/console/module.am index c17fa0081a1..1135a74861e 100644 --- a/oss_core/src/js/modules/console/module.am +++ b/oss_core/src/js/modules/console/module.am @@ -4,6 +4,6 @@ console-install: INSTALL_PROCEDURES += console-install -EXTRA_DIST += js/modules/console/index.js +EXTRA_DIST += ${srcdir}/js/modules/console/index.js diff --git a/oss_core/src/js/modules/constants/module.am b/oss_core/src/js/modules/constants/module.am index bf277feae97..3437062c665 100644 --- a/oss_core/src/js/modules/constants/module.am +++ b/oss_core/src/js/modules/constants/module.am @@ -6,9 +6,9 @@ constants-install: INSTALL_PROCEDURES += constants-install -EXTRA_DIST += js/modules/constants/index.js +EXTRA_DIST += ${srcdir}/js/modules/constants/index.js lib_LTLIBRARIES += liboss_jsconstants.la liboss_jsconstants_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jsconstants_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jsconstants_la_SOURCES = js/modules/constants/constants.cpp +liboss_jsconstants_la_SOURCES = ${srcdir}/js/modules/constants/constants.cpp diff --git a/oss_core/src/js/modules/dns/module.am b/oss_core/src/js/modules/dns/module.am index 37da954ebd0..55a5ee4c798 100644 --- a/oss_core/src/js/modules/dns/module.am +++ b/oss_core/src/js/modules/dns/module.am @@ -5,10 +5,10 @@ dns-install: INSTALL_PROCEDURES += dns-install -EXTRA_DIST += js/modules/dns/index.js +EXTRA_DIST += ${srcdir}/js/modules/dns/index.js lib_LTLIBRARIES += liboss_jsdns.la liboss_jsdns_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jsdns_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jsdns_la_SOURCES = js/modules/dns/dns.cpp +liboss_jsdns_la_SOURCES = ${srcdir}/js/modules/dns/dns.cpp diff --git a/oss_core/src/js/modules/error/module.am b/oss_core/src/js/modules/error/module.am index afc3febd867..95896df563b 100644 --- a/oss_core/src/js/modules/error/module.am +++ b/oss_core/src/js/modules/error/module.am @@ -6,9 +6,9 @@ error-install: INSTALL_PROCEDURES += error-install -EXTRA_DIST += js/modules/error/index.js +EXTRA_DIST += ${srcdir}/js/modules/error/index.js lib_LTLIBRARIES += liboss_jserror.la liboss_jserror_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jserror_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jserror_la_SOURCES = js/modules/error/error.cpp +liboss_jserror_la_SOURCES = ${srcdir}/js/modules/error/error.cpp diff --git a/oss_core/src/js/modules/esl/module.am b/oss_core/src/js/modules/esl/module.am index 6ba0354dcde..7dae7a0e2cb 100644 --- a/oss_core/src/js/modules/esl/module.am +++ b/oss_core/src/js/modules/esl/module.am @@ -7,14 +7,14 @@ esl-install: INSTALL_PROCEDURES += esl-install -EXTRA_DIST += js/modules/esl/index.js +EXTRA_DIST += ${srcdir}/js/modules/esl/index.js lib_LTLIBRARIES += liboss_jseslevent.la liboss_jseslevent_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jseslevent_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jseslevent_la_SOURCES = js/modules/esl/esl_event.cpp +liboss_jseslevent_la_SOURCES = ${srcdir}/js/modules/esl/esl_event.cpp lib_LTLIBRARIES += liboss_jseslconnection.la liboss_jseslconnection_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jseslconnection_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jseslconnection_la_SOURCES = js/modules/esl/esl_connection.cpp +liboss_jseslconnection_la_SOURCES = ${srcdir}/js/modules/esl/esl_connection.cpp diff --git a/oss_core/src/js/modules/examples/src.am b/oss_core/src/js/modules/examples/src.am index 297f1794fbf..aaa5cd9b0dc 100644 --- a/oss_core/src/js/modules/examples/src.am +++ b/oss_core/src/js/modules/examples/src.am @@ -1,9 +1,9 @@ -EXTRA_DIST += js/modules/examples/*.js js/modules/examples/data/* +EXTRA_DIST += ${srcdir}/js/modules/examples/*.js ${srcdir}/js/modules/examples/data/* lib_LTLIBRARIES += liboss_jscpprpc_tester.la liboss_jscpprpc_tester_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jscpprpc_tester_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jscpprpc_tester_la_SOURCES = js/modules/examples/cpp_rpc_tester.cpp +liboss_jscpprpc_tester_la_SOURCES = ${srcdir}/js/modules/examples/cpp_rpc_tester.cpp examples-install: cd ${DESTDIR}${libdir}; mkdir -p oss_modules/examples diff --git a/oss_core/src/js/modules/fifo/module.am b/oss_core/src/js/modules/fifo/module.am index b3635639609..4f615663a02 100644 --- a/oss_core/src/js/modules/fifo/module.am +++ b/oss_core/src/js/modules/fifo/module.am @@ -4,5 +4,5 @@ fifo-install: INSTALL_PROCEDURES += fifo-install -EXTRA_DIST += js/modules/fifo/index.js +EXTRA_DIST += ${srcdir}/js/modules/fifo/index.js diff --git a/oss_core/src/js/modules/file/module.am b/oss_core/src/js/modules/file/module.am index 1815397c9f6..3381acc6cb1 100644 --- a/oss_core/src/js/modules/file/module.am +++ b/oss_core/src/js/modules/file/module.am @@ -5,10 +5,10 @@ file-install: INSTALL_PROCEDURES += file-install -EXTRA_DIST += js/modules/file/index.js +EXTRA_DIST += ${srcdir}/js/modules/file/index.js lib_LTLIBRARIES += liboss_jsfile.la liboss_jsfile_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jsfile_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jsfile_la_SOURCES = js/modules/file/file.cpp +liboss_jsfile_la_SOURCES = ${srcdir}/js/modules/file/file.cpp diff --git a/oss_core/src/js/modules/filesystem/module.am b/oss_core/src/js/modules/filesystem/module.am index 946c27619db..c8f654546ca 100644 --- a/oss_core/src/js/modules/filesystem/module.am +++ b/oss_core/src/js/modules/filesystem/module.am @@ -6,9 +6,9 @@ filesystem-install: INSTALL_PROCEDURES += filesystem-install -EXTRA_DIST += js/modules/filesystem/index.js +EXTRA_DIST += ${srcdir}/js/modules/filesystem/index.js lib_LTLIBRARIES += liboss_jsfilesystem.la liboss_jsfilesystem_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jsfilesystem_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jsfilesystem_la_SOURCES = js/modules/filesystem/filesystem.cpp +liboss_jsfilesystem_la_SOURCES = ${srcdir}/js/modules/filesystem/filesystem.cpp diff --git a/oss_core/src/js/modules/fork/module.am b/oss_core/src/js/modules/fork/module.am index 86f28b9ae07..87ca3ceec80 100644 --- a/oss_core/src/js/modules/fork/module.am +++ b/oss_core/src/js/modules/fork/module.am @@ -6,9 +6,9 @@ fork-install: INSTALL_PROCEDURES += fork-install -EXTRA_DIST += js/modules/fork/index.js +EXTRA_DIST += ${srcdir}/js/modules/fork/index.js lib_LTLIBRARIES += liboss_jsfork.la liboss_jsfork_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jsfork_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jsfork_la_SOURCES = js/modules/fork/fork.cpp +liboss_jsfork_la_SOURCES = ${srcdir}/js/modules/fork/fork.cpp diff --git a/oss_core/src/js/modules/getopt/module.am b/oss_core/src/js/modules/getopt/module.am index 8a37ca4b6ff..993a12ceb52 100644 --- a/oss_core/src/js/modules/getopt/module.am +++ b/oss_core/src/js/modules/getopt/module.am @@ -6,9 +6,9 @@ getopt-install: INSTALL_PROCEDURES += getopt-install -EXTRA_DIST += js/modules/getopt/index.js +EXTRA_DIST += ${srcdir}/js/modules/getopt/index.js lib_LTLIBRARIES += liboss_jsgetopt.la liboss_jsgetopt_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jsgetopt_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jsgetopt_la_SOURCES = js/modules/getopt/getopt.cpp +liboss_jsgetopt_la_SOURCES = ${srcdir}/js/modules/getopt/getopt.cpp diff --git a/oss_core/src/js/modules/http/module.am b/oss_core/src/js/modules/http/module.am index cf2a172ba54..435a283c06c 100644 --- a/oss_core/src/js/modules/http/module.am +++ b/oss_core/src/js/modules/http/module.am @@ -11,41 +11,41 @@ http-install: INSTALL_PROCEDURES += http-install EXTRA_DIST += \ - js/modules/http/index.js \ - js/modules/http/http_client.js \ - js/modules/http/http_server.js \ - js/modules/http/http_ssl_context.js + ${srcdir}/js/modules/http/index.js \ + ${srcdir}/js/modules/http/http_client.js \ + ${srcdir}/js/modules/http/http_server.js \ + ${srcdir}/js/modules/http/http_ssl_context.js lib_LTLIBRARIES += liboss_jshttpparser.la liboss_jshttpparser_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jshttpparser_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jshttpparser_la_SOURCES = js/modules/http/http_parser.cpp js/modules/http/http_parser/http_parser.c +liboss_jshttpparser_la_SOURCES = ${srcdir}/js/modules/http/http_parser.cpp js/modules/http/http_parser/http_parser.c lib_LTLIBRARIES += liboss_jshttpclient.la liboss_jshttpclient_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jshttpclient_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jshttpclient_la_SOURCES = js/modules/http/http_client.cpp +liboss_jshttpclient_la_SOURCES = ${srcdir}/js/modules/http/http_client.cpp lib_LTLIBRARIES += liboss_jshttpserver.la liboss_jshttpserver_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jshttpserver_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jshttpserver_la_SOURCES = js/modules/http/http_server.cpp +liboss_jshttpserver_la_SOURCES = ${srcdir}/js/modules/http/http_server.cpp lib_LTLIBRARIES += liboss_jshttprequest.la liboss_jshttprequest_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jshttprequest_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jshttprequest_la_SOURCES = js/modules/http/http_request.cpp +liboss_jshttprequest_la_SOURCES = ${srcdir}/js/modules/http/http_request.cpp lib_LTLIBRARIES += liboss_jshttpresponse.la liboss_jshttpresponse_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jshttpresponse_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jshttpresponse_la_SOURCES = js/modules/http/http_response.cpp +liboss_jshttpresponse_la_SOURCES = ${srcdir}/js/modules/http/http_response.cpp lib_LTLIBRARIES += liboss_jshttpsslcontext.la liboss_jshttpsslcontext_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jshttpsslcontext_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jshttpsslcontext_la_SOURCES = js/modules/http/http_ssl_context.cpp +liboss_jshttpsslcontext_la_SOURCES = ${srcdir}/js/modules/http/http_ssl_context.cpp diff --git a/oss_core/src/js/modules/inotify/inotify.cpp b/oss_core/src/js/modules/inotify/inotify.cpp index 6918951da18..493f59fd779 100644 --- a/oss_core/src/js/modules/inotify/inotify.cpp +++ b/oss_core/src/js/modules/inotify/inotify.cpp @@ -27,7 +27,7 @@ JS_METHOD_IMPL(__inotify_init) { - return js_method_int32(inotify_init()); + js_method_set_return_handle(js_method_int32(inotify_init())); } JS_METHOD_IMPL(__inotify_add_watch) @@ -41,7 +41,7 @@ JS_METHOD_IMPL(__inotify_add_watch) std::string pathname = js_method_arg_as_std_string(1); uint32_t mask = js_method_arg_as_uint32(2); - return js_method_int32(inotify_add_watch(fd, pathname.c_str(), mask)); + js_method_set_return_handle(js_method_int32(inotify_add_watch(fd, pathname.c_str(), mask))); } JS_METHOD_IMPL(__inotify_rm_watch) @@ -54,7 +54,7 @@ JS_METHOD_IMPL(__inotify_rm_watch) int32_t fd = js_method_arg_as_int32(0); int32_t wd = js_method_arg_as_int32(0); - return js_method_int32(inotify_rm_watch(fd, wd)); + js_method_set_return_handle(js_method_int32(inotify_rm_watch(fd, wd))); } JS_METHOD_IMPL(__inotify_get_events) @@ -90,7 +90,7 @@ JS_METHOD_IMPL(__inotify_get_events) } } - return JSUInt32(revents); + js_method_set_return_handle(js_method_int32(revents)); } diff --git a/oss_core/src/js/modules/inotify/module.am b/oss_core/src/js/modules/inotify/module.am index f649f310247..13e43825e70 100644 --- a/oss_core/src/js/modules/inotify/module.am +++ b/oss_core/src/js/modules/inotify/module.am @@ -8,10 +8,10 @@ inotify-install: INSTALL_PROCEDURES += inotify-install EXTRA_DIST += \ - js/modules/inotify/index.js \ - js/modules/inotify/monitored_file.js + ${srcdir}/js/modules/inotify/index.js \ + ${srcdir}/js/modules/inotify/monitored_file.js lib_LTLIBRARIES += liboss_jsinotify.la liboss_jsinotify_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jsinotify_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jsinotify_la_SOURCES = js/modules/inotify/inotify.cpp +liboss_jsinotify_la_SOURCES = ${srcdir}/js/modules/inotify/inotify.cpp diff --git a/oss_core/src/js/modules/isolate/module.am b/oss_core/src/js/modules/isolate/module.am index 905bfaf3e13..e43e62c363a 100644 --- a/oss_core/src/js/modules/isolate/module.am +++ b/oss_core/src/js/modules/isolate/module.am @@ -7,10 +7,10 @@ isolate-install: INSTALL_PROCEDURES += isolate-install EXTRA_DIST += \ - js/modules/isolate/index.js \ - js/modules/isolate/isolate.js + ${srcdir}/js/modules/isolate/index.js \ + ${srcdir}/js/modules/isolate/isolate.js lib_LTLIBRARIES += liboss_jsisolate.la liboss_jsisolate_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jsisolate_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jsisolate_la_SOURCES = js/modules/isolate/isolate.cpp +liboss_jsisolate_la_SOURCES = ${srcdir}/js/modules/isolate/isolate.cpp diff --git a/oss_core/src/js/modules/json_rpc/module.am b/oss_core/src/js/modules/json_rpc/module.am index 27fb61c30a4..b8fab20a192 100644 --- a/oss_core/src/js/modules/json_rpc/module.am +++ b/oss_core/src/js/modules/json_rpc/module.am @@ -4,5 +4,5 @@ json_rpc-install: INSTALL_PROCEDURES += json_rpc-install -EXTRA_DIST += js/modules/json_rpc/*.js +EXTRA_DIST += ${srcdir}/js/modules/json_rpc/*.js diff --git a/oss_core/src/js/modules/lexer/module.am b/oss_core/src/js/modules/lexer/module.am index bd73e692cd2..62bf54d903f 100644 --- a/oss_core/src/js/modules/lexer/module.am +++ b/oss_core/src/js/modules/lexer/module.am @@ -5,4 +5,4 @@ lexer-install: INSTALL_PROCEDURES += lexer-install -EXTRA_DIST += js/modules/lexer/index.js \ No newline at end of file +EXTRA_DIST += ${srcdir}/js/modules/lexer/index.js \ No newline at end of file diff --git a/oss_core/src/js/modules/logger/module.am b/oss_core/src/js/modules/logger/module.am index a7da44e79cb..c9351dfbec0 100644 --- a/oss_core/src/js/modules/logger/module.am +++ b/oss_core/src/js/modules/logger/module.am @@ -5,10 +5,10 @@ logger-install: INSTALL_PROCEDURES += logger-install -EXTRA_DIST += js/modules/logger/*.js +EXTRA_DIST += ${srcdir}/js/modules/logger/*.js lib_LTLIBRARIES += liboss_jslogger.la liboss_jslogger_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jslogger_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jslogger_la_SOURCES = js/modules/logger/logger.cpp +liboss_jslogger_la_SOURCES = ${srcdir}/js/modules/logger/logger.cpp diff --git a/oss_core/src/js/modules/object/module.am b/oss_core/src/js/modules/object/module.am index 198a73b8981..094d82aa3ac 100644 --- a/oss_core/src/js/modules/object/module.am +++ b/oss_core/src/js/modules/object/module.am @@ -5,5 +5,5 @@ object-install: INSTALL_PROCEDURES += object-install -EXTRA_DIST += js/modules/object/index.js +EXTRA_DIST += ${srcdir}/js/modules/object/index.js diff --git a/oss_core/src/js/modules/parser/module.am b/oss_core/src/js/modules/parser/module.am index dce5a5523ba..d4f1ad24ab6 100644 --- a/oss_core/src/js/modules/parser/module.am +++ b/oss_core/src/js/modules/parser/module.am @@ -6,6 +6,6 @@ parser-install: INSTALL_PROCEDURES += parser-install -EXTRA_DIST += js/modules/parser/*.js -EXTRA_DIST += js/modules/parser/transformers/*.js -EXTRA_DIST += js/modules/parser/lib/*.js +EXTRA_DIST += ${srcdir}/js/modules/parser/*.js +EXTRA_DIST += ${srcdir}/js/modules/parser/transformers/*.js +EXTRA_DIST += ${srcdir}/js/modules/parser/lib/*.js diff --git a/oss_core/src/js/modules/pinger/module.am b/oss_core/src/js/modules/pinger/module.am index ae9840ba278..2b0a1b21192 100644 --- a/oss_core/src/js/modules/pinger/module.am +++ b/oss_core/src/js/modules/pinger/module.am @@ -6,10 +6,10 @@ pinger-install: INSTALL_PROCEDURES += pinger-install -EXTRA_DIST += js/modules/pinger/index.js +EXTRA_DIST += ${srcdir}/js/modules/pinger/index.js lib_LTLIBRARIES += liboss_jspinger.la liboss_jspinger_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jspinger_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jspinger_la_SOURCES = js/modules/pinger/pinger.cpp +liboss_jspinger_la_SOURCES = ${srcdir}/js/modules/pinger/pinger.cpp diff --git a/oss_core/src/js/modules/pipe/module.am b/oss_core/src/js/modules/pipe/module.am index 0c47c8c1999..d217b50de34 100644 --- a/oss_core/src/js/modules/pipe/module.am +++ b/oss_core/src/js/modules/pipe/module.am @@ -5,9 +5,9 @@ pipe-install: INSTALL_PROCEDURES += pipe-install -EXTRA_DIST += js/modules/pipe/index.js +EXTRA_DIST += ${srcdir}/js/modules/pipe/index.js lib_LTLIBRARIES += liboss_jspipe.la liboss_jspipe_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jspipe_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jspipe_la_SOURCES = js/modules/pipe/pipe.cpp +liboss_jspipe_la_SOURCES = ${srcdir}/js/modules/pipe/pipe.cpp diff --git a/oss_core/src/js/modules/poll/module.am b/oss_core/src/js/modules/poll/module.am index 94252e14907..62c1f270fd3 100644 --- a/oss_core/src/js/modules/poll/module.am +++ b/oss_core/src/js/modules/poll/module.am @@ -5,10 +5,10 @@ poll-install: INSTALL_PROCEDURES += poll-install -EXTRA_DIST += js/modules/poll/index.js +EXTRA_DIST += ${srcdir}/js/modules/poll/index.js lib_LTLIBRARIES += liboss_jspoll.la liboss_jspoll_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jspoll_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jspoll_la_SOURCES = js/modules/poll/poll.cpp +liboss_jspoll_la_SOURCES = ${srcdir}/js/modules/poll/poll.cpp diff --git a/oss_core/src/js/modules/process/module.am b/oss_core/src/js/modules/process/module.am index 2675356cbe2..c761e7ec064 100644 --- a/oss_core/src/js/modules/process/module.am +++ b/oss_core/src/js/modules/process/module.am @@ -5,10 +5,10 @@ process-install: INSTALL_PROCEDURES += process-install -EXTRA_DIST += js/modules/process/index.js +EXTRA_DIST += ${srcdir}/js/modules/process/index.js lib_LTLIBRARIES += liboss_jsprocess.la liboss_jsprocess_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jsprocess_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jsprocess_la_SOURCES = js/modules/process/process.cpp +liboss_jsprocess_la_SOURCES = ${srcdir}/js/modules/process/process.cpp diff --git a/oss_core/src/js/modules/resip_ua/module.am b/oss_core/src/js/modules/resip_ua/module.am index 77e1868ac02..23c1c42b939 100644 --- a/oss_core/src/js/modules/resip_ua/module.am +++ b/oss_core/src/js/modules/resip_ua/module.am @@ -6,17 +6,17 @@ resip_ua-install: INSTALL_PROCEDURES += resip_ua-install -EXTRA_DIST += js/modules/resip_ua/index.js +EXTRA_DIST += ${srcdir}/js/modules/resip_ua/index.js lib_LTLIBRARIES += liboss_jsresip_ua.la liboss_jsresip_ua_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jsresip_ua_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) liboss_jsresip_ua_la_SOURCES = \ - js/modules/resip_ua/ResipSipStack.cpp \ - js/modules/resip_ua/ResipDialogUsageManager.cpp \ - js/modules/resip_ua/ResipUserProfile.cpp \ - js/modules/resip_ua/ResipMasterProfile.cpp \ - js/modules/resip_ua/ResipClientSubscriptionHandler.cpp \ - js/modules/resip_ua/ResipClientRegistrationHandler.cpp \ - js/modules/resip_ua/resip_ua.cpp + ${srcdir}/js/modules/resip_ua/ResipSipStack.cpp \ + ${srcdir}/js/modules/resip_ua/ResipDialogUsageManager.cpp \ + ${srcdir}/js/modules/resip_ua/ResipUserProfile.cpp \ + ${srcdir}/js/modules/resip_ua/ResipMasterProfile.cpp \ + ${srcdir}/js/modules/resip_ua/ResipClientSubscriptionHandler.cpp \ + ${srcdir}/js/modules/resip_ua/ResipClientRegistrationHandler.cpp \ + ${srcdir}/js/modules/resip_ua/resip_ua.cpp diff --git a/oss_core/src/js/modules/sbc-hook/module.am b/oss_core/src/js/modules/sbc-hook/module.am index 29c55220052..c8b23c0139c 100644 --- a/oss_core/src/js/modules/sbc-hook/module.am +++ b/oss_core/src/js/modules/sbc-hook/module.am @@ -9,7 +9,7 @@ INSTALL_PROCEDURES += sbc-hook-install lib_LTLIBRARIES += liboss_jssbchook.la liboss_jssbchook_la_LDFLAGS = -module -fpic -avoid-version liboss_jssbchook_la_LIBADD = $(OSS_CORE_LIBS) -liboss_jssbchook_la_SOURCES = js/modules/sbc-hook/sbc_hook.cpp +liboss_jssbchook_la_SOURCES = ${srcdir}/js/modules/sbc-hook/sbc_hook.cpp diff --git a/oss_core/src/js/modules/sip-parser/module.am b/oss_core/src/js/modules/sip-parser/module.am index 799c15ece38..f78401fb163 100644 --- a/oss_core/src/js/modules/sip-parser/module.am +++ b/oss_core/src/js/modules/sip-parser/module.am @@ -6,9 +6,9 @@ sipparser-install: INSTALL_PROCEDURES += sipparser-install -EXTRA_DIST += js/modules/sip-parser/index.js +EXTRA_DIST += ${srcdir}/js/modules/sip-parser/index.js lib_LTLIBRARIES += liboss_jssipparser.la liboss_jssipparser_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jssipparser_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jssipparser_la_SOURCES = js/modules/sip-parser/sip_parser.cpp +liboss_jssipparser_la_SOURCES = ${srcdir}/js/modules/sip-parser/sip_parser.cpp diff --git a/oss_core/src/js/modules/sip-parser/sip_parser.cpp b/oss_core/src/js/modules/sip-parser/sip_parser.cpp index 09f7100565e..3a1f0290c67 100644 --- a/oss_core/src/js/modules/sip-parser/sip_parser.cpp +++ b/oss_core/src/js/modules/sip-parser/sip_parser.cpp @@ -452,12 +452,28 @@ JS_METHOD_IMPL(msgIsRequest) { if (method.empty()) { - js_method_set_return_boolean(pMsg->isRequest()); + boost::tribool isRequest = pMsg->isRequest(); + if( isRequest ) + { + js_method_set_return_boolean(true); + } + else + { + js_method_set_return_boolean(false); + } return; } else { - js_method_set_return_boolean(pMsg->isRequest(method.c_str())); + boost::tribool isRequest = pMsg->isRequest(method.c_str()); + if( isRequest ) + { + js_method_set_return_boolean(true); + } + else + { + js_method_set_return_boolean(false); + } return; } } @@ -489,7 +505,15 @@ JS_METHOD_IMPL(msgIsResponse) try { - js_method_set_return_boolean(pMsg->isResponse()); + boost::tribool isResponse = pMsg->isResponse(); + if( isResponse ) + { + js_method_set_return_boolean(true); + } + else + { + js_method_set_return_boolean(false); + } } catch(const OSS::Exception& e) { @@ -518,7 +542,15 @@ JS_METHOD_IMPL(msgIs1xx) try { - js_method_set_return_boolean(pMsg->is1xx()); + boost::tribool is1xx = pMsg->is1xx(); + if( is1xx ) + { + js_method_set_return_boolean(true); + } + else + { + js_method_set_return_boolean(false); + } } catch(const OSS::Exception& e) { @@ -547,7 +579,15 @@ JS_METHOD_IMPL(msgIs2xx) try { - js_method_set_return_boolean(pMsg->is2xx()); + boost::tribool is2xx = pMsg->is2xx(); + if( is2xx ) + { + js_method_set_return_boolean(true); + } + else + { + js_method_set_return_boolean(false); + } } catch(const OSS::Exception& e) { @@ -576,7 +616,15 @@ JS_METHOD_IMPL(msgIs3xx) try { - js_method_set_return_boolean(pMsg->is3xx()); + boost::tribool is3xx = pMsg->is3xx(); + if( is3xx ) + { + js_method_set_return_boolean(true); + } + else + { + js_method_set_return_boolean(false); + } } catch(const OSS::Exception& e) { @@ -605,7 +653,15 @@ JS_METHOD_IMPL(msgIs4xx) try { - js_method_set_return_boolean(pMsg->is4xx()); + boost::tribool is4xx = pMsg->is4xx(); + if( is4xx ) + { + js_method_set_return_boolean(true); + } + else + { + js_method_set_return_boolean(false); + } } catch(const OSS::Exception& e) { @@ -634,7 +690,15 @@ JS_METHOD_IMPL(msgIs5xx) try { - js_method_set_return_boolean(pMsg->is5xx()); + boost::tribool is5xx = pMsg->is5xx(); + if( is5xx ) + { + js_method_set_return_boolean(true); + } + else + { + js_method_set_return_boolean(false); + } } catch(const OSS::Exception& e) { @@ -663,7 +727,15 @@ JS_METHOD_IMPL(msgIs6xx) try { - js_method_set_return_boolean(pMsg->is6xx()); + boost::tribool is6xx = pMsg->is6xx(); + if( is6xx ) + { + js_method_set_return_boolean(true); + } + else + { + js_method_set_return_boolean(false); + } } catch(const OSS::Exception& e) { @@ -694,7 +766,15 @@ JS_METHOD_IMPL(msgIsResponseFamily) try { - js_method_set_return_boolean(pMsg->isResponseFamily(responseCode)); + boost::tribool isResponseFamily = pMsg->isResponseFamily(responseCode); + if( isResponseFamily ) + { + js_method_set_return_boolean(true); + } + else + { + js_method_set_return_boolean(false); + } } catch(const OSS::Exception& e) { @@ -724,7 +804,15 @@ JS_METHOD_IMPL(msgIsErrorResponse) try { - js_method_set_return_boolean(pMsg->isErrorResponse()); + boost::tribool isErrorResponse = pMsg->isErrorResponse(); + if( isErrorResponse ) + { + js_method_set_return_boolean(true); + } + else + { + js_method_set_return_boolean(false); + } } catch(const OSS::Exception& e) { @@ -753,7 +841,15 @@ JS_METHOD_IMPL(msgIsMidDialog) try { - js_method_set_return_boolean(pMsg->isMidDialog()); + boost::tribool isMidDialog = pMsg->isMidDialog(); + if( isMidDialog ) + { + js_method_set_return_boolean(true); + } + else + { + js_method_set_return_boolean(false); + } } catch(const OSS::Exception& e) { diff --git a/oss_core/src/js/modules/socket/module.am b/oss_core/src/js/modules/socket/module.am index a46c83d8115..1307fe105e4 100644 --- a/oss_core/src/js/modules/socket/module.am +++ b/oss_core/src/js/modules/socket/module.am @@ -5,9 +5,9 @@ socket-install: INSTALL_PROCEDURES += socket-install -EXTRA_DIST += js/modules/socket/index.js +EXTRA_DIST += ${srcdir}/js/modules/socket/index.js lib_LTLIBRARIES += liboss_jsinetsocket.la liboss_jsinetsocket_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jsinetsocket_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jsinetsocket_la_SOURCES = js/modules/socket/c_inet_socket.c js/modules/socket/inet_socket.cpp \ No newline at end of file +liboss_jsinetsocket_la_SOURCES = ${srcdir}/js/modules/socket/c_inet_socket.c js/modules/socket/inet_socket.cpp \ No newline at end of file diff --git a/oss_core/src/js/modules/system/module.am b/oss_core/src/js/modules/system/module.am index 95fe1747f17..3e34b7064f4 100644 --- a/oss_core/src/js/modules/system/module.am +++ b/oss_core/src/js/modules/system/module.am @@ -5,9 +5,9 @@ system-install: INSTALL_PROCEDURES += system-install -EXTRA_DIST += js/modules/system/index.js +EXTRA_DIST += ${srcdir}/js/modules/system/index.js lib_LTLIBRARIES += liboss_jssystem.la liboss_jssystem_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jssystem_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jssystem_la_SOURCES = js/modules/system/system.cpp +liboss_jssystem_la_SOURCES = ${srcdir}/js/modules/system/system.cpp diff --git a/oss_core/src/js/modules/timer/module.am b/oss_core/src/js/modules/timer/module.am index caf833331ac..c06aec614fa 100644 --- a/oss_core/src/js/modules/timer/module.am +++ b/oss_core/src/js/modules/timer/module.am @@ -4,4 +4,4 @@ timer-install: INSTALL_PROCEDURES += timer-install -EXTRA_DIST += js/modules/timer/index.js +EXTRA_DIST += ${srcdir}/js/modules/timer/index.js diff --git a/oss_core/src/js/modules/url-parser/module.am b/oss_core/src/js/modules/url-parser/module.am index 90af6654cea..042ecda06a0 100644 --- a/oss_core/src/js/modules/url-parser/module.am +++ b/oss_core/src/js/modules/url-parser/module.am @@ -4,4 +4,4 @@ url-parser-install: INSTALL_PROCEDURES += url-parser-install -EXTRA_DIST += js/modules/url-parser/index.js +EXTRA_DIST += ${srcdir}/js/modules/url-parser/index.js diff --git a/oss_core/src/js/modules/utils/module.am b/oss_core/src/js/modules/utils/module.am index 38e9b28d6ee..8c631904e62 100644 --- a/oss_core/src/js/modules/utils/module.am +++ b/oss_core/src/js/modules/utils/module.am @@ -5,9 +5,9 @@ utils-install: INSTALL_PROCEDURES += utils-install -EXTRA_DIST += js/modules/utils/index.js +EXTRA_DIST += ${srcdir}/js/modules/utils/index.js lib_LTLIBRARIES += liboss_jsutils.la liboss_jsutils_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jsutils_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jsutils_la_SOURCES = js/modules/utils/utils.cpp +liboss_jsutils_la_SOURCES = ${srcdir}/js/modules/utils/utils.cpp diff --git a/oss_core/src/js/modules/xml-parser/module.am b/oss_core/src/js/modules/xml-parser/module.am index 22bd94e2b7d..34f1348cf67 100644 --- a/oss_core/src/js/modules/xml-parser/module.am +++ b/oss_core/src/js/modules/xml-parser/module.am @@ -4,4 +4,4 @@ xml-parser-install: INSTALL_PROCEDURES += xml-parser-install -EXTRA_DIST += js/modules/xml-parser/index.js +EXTRA_DIST += ${srcdir}/js/modules/xml-parser/index.js diff --git a/oss_core/src/js/modules/zmq/module.am b/oss_core/src/js/modules/zmq/module.am index f54f4dcaa07..11b37229536 100644 --- a/oss_core/src/js/modules/zmq/module.am +++ b/oss_core/src/js/modules/zmq/module.am @@ -5,10 +5,10 @@ zmq-install: INSTALL_PROCEDURES += zmq-install -EXTRA_DIST += js/modules/zmq/index.js +EXTRA_DIST += ${srcdir}/js/modules/zmq/index.js lib_LTLIBRARIES += liboss_jszmq.la liboss_jszmq_la_LDFLAGS = -module -fpic -version-info @OSS_CORE_VERSION_INFO@ liboss_jszmq_la_LIBADD = @OSS_CORE_DEP_LIBS@ $(corelibldadd) -liboss_jszmq_la_SOURCES = js/modules/zmq/zmq.cpp +liboss_jszmq_la_SOURCES = ${srcdir}/js/modules/zmq/zmq.cpp diff --git a/oss_core/src/js/src.am b/oss_core/src/js/src.am index d9e3e84c050..09898037485 100644 --- a/oss_core/src/js/src.am +++ b/oss_core/src/js/src.am @@ -25,7 +25,7 @@ endif JAVASCRIPT_SRC = \ js/OSSJS_modules.js.h -EXTRA_DIST += JAVASCRIPT_SRC +EXTRA_DIST += ${JAVASCRIPT_SRC} BUILT_SOURCES += ${JAVASCRIPT_SRC} CLEANFILES += ${JAVASCRIPT_SRC} diff --git a/oss_core/src/net/carp/ucarp.c b/oss_core/src/net/carp/ucarp.c index 50d74db75c6..19b14792336 100644 --- a/oss_core/src/net/carp/ucarp.c +++ b/oss_core/src/net/carp/ucarp.c @@ -261,12 +261,29 @@ int oss_carp_run(int argc, char *argv[]) #endif if (interface == NULL || *interface == 0) { char errbuf[PCAP_ERRBUF_SIZE]; - interface = pcap_lookupdev(errbuf); - if (interface == NULL || *interface == 0) { - logfile(LOG_ERR, _("You must supply a network interface")); + pcap_if_t *all_devs = NULL, *device = NULL; + + // Find all available devices + if (pcap_findalldevs(&all_devs, errbuf) == -1) { + logfile(LOG_ERR, _("Error finding devices: %s"), errbuf); + return 1; + } + + // Check if any devices are found + if (all_devs == NULL) { + logfile(LOG_ERR, _("No network interfaces found. You must supply a network interface")); return 1; } + + // Use the first available device + device = all_devs; + interface = device->name; + + // Log the selected network interface logfile(LOG_INFO, _("Using [%s] as a network interface"), interface); + + // Free the list of devices + pcap_freealldevs(all_devs); } if (vhid == 0) { logfile(LOG_ERR, _("You must supply a valid virtual host id")); diff --git a/oss_core/src/net/esl/esl.c b/oss_core/src/net/esl/esl.c index ab89b4c822d..62ceaa5a599 100644 --- a/oss_core/src/net/esl/esl.c +++ b/oss_core/src/net/esl/esl.c @@ -1397,7 +1397,8 @@ ESL_DECLARE(esl_status_t) esl_recv_event(esl_handle_t *handle, int check_q, esl_ hval = esl_event_get_header(revent, "reply-text"); if (!esl_strlen_zero(hval)) { - strncpy(handle->last_reply, hval, sizeof(handle->last_reply)); + strncpy(handle->last_reply, hval, sizeof(handle->last_reply) - 1); + handle->last_reply[sizeof(handle->last_reply) - 1] = '\0'; } hval = esl_event_get_header(revent, "content-type"); @@ -1595,7 +1596,8 @@ ESL_DECLARE(esl_status_t) esl_send_recv_timed(esl_handle_t *handle, const char * hval = esl_event_get_header(handle->last_sr_event, "reply-text"); if (!esl_strlen_zero(hval)) { - strncpy(handle->last_sr_reply, hval, sizeof(handle->last_sr_reply)); + strncpy(handle->last_sr_reply, hval, sizeof(handle->last_sr_reply) - 1); + handle->last_reply[sizeof(handle->last_reply) - 1] = '\0'; } } } diff --git a/oss_core/src/net/esl/include/esl.h b/oss_core/src/net/esl/include/esl.h index 0904b180309..7f4426b5cca 100644 --- a/oss_core/src/net/esl/include/esl.h +++ b/oss_core/src/net/esl/include/esl.h @@ -40,7 +40,7 @@ extern "C" { #endif /* defined(__cplusplus) */ -#define esl_copy_string(_x, _y, _z) strncpy(_x, _y, _z - 1) +#define esl_copy_string(_x, _y, _z) do { strncpy((_x), (_y), (_z) - 1); (_x)[(_z) - 1] = '\0'; } while (0) #define esl_set_string(_x, _y) esl_copy_string(_x, _y, sizeof(_x)) #define ESL_VA_NONE "%s", "" diff --git a/oss_core/src/net/ws/examples/chat_client/chat_client.cpp b/oss_core/src/net/ws/examples/chat_client/chat_client.cpp index 5eaaa38964b..09f969bbd4b 100644 --- a/oss_core/src/net/ws/examples/chat_client/chat_client.cpp +++ b/oss_core/src/net/ws/examples/chat_client/chat_client.cpp @@ -25,6 +25,8 @@ * */ +#include "OSS/OSS.h" + #include "chat_client_handler.hpp" #include "../../src/roles/client.hpp" diff --git a/oss_core/src/net/ws/examples/telemetry_server/telemetry_server.cpp b/oss_core/src/net/ws/examples/telemetry_server/telemetry_server.cpp index 8ffcd1294b1..156f55d92dd 100644 --- a/oss_core/src/net/ws/examples/telemetry_server/telemetry_server.cpp +++ b/oss_core/src/net/ws/examples/telemetry_server/telemetry_server.cpp @@ -25,6 +25,8 @@ * */ +#include "OSS/OSS.h" + #include "../../src/websocketpp.hpp" #include diff --git a/oss_core/src/net/ws/src/connection.hpp b/oss_core/src/net/ws/src/connection.hpp index c75da1a3ad2..4123a34975d 100644 --- a/oss_core/src/net/ws/src/connection.hpp +++ b/oss_core/src/net/ws/src/connection.hpp @@ -28,6 +28,8 @@ #ifndef WEBSOCKETPP_CONNECTION_HPP #define WEBSOCKETPP_CONNECTION_HPP +#include "OSS/OSS.h" + #include "common.hpp" #include "http/parser.hpp" #include "logger/logger.hpp" diff --git a/oss_core/src/net/ws/src/roles/client.hpp b/oss_core/src/net/ws/src/roles/client.hpp index 275dfa4d7c0..d946037af04 100644 --- a/oss_core/src/net/ws/src/roles/client.hpp +++ b/oss_core/src/net/ws/src/roles/client.hpp @@ -28,6 +28,9 @@ #ifndef WEBSOCKETPP_ROLE_CLIENT_HPP #define WEBSOCKETPP_ROLE_CLIENT_HPP +#include "OSS/OSS.h" +#include "OSS/UTL/CoreUtils.h" + #include #include @@ -41,7 +44,6 @@ #include "../uri.hpp" #include "../shared_const_buffer.hpp" -#include "OSS/UTL/CoreUtils.h" #ifdef _MSC_VER // Disable "warning C4355: 'this' : used in base member initializer list". diff --git a/oss_core/src/net/ws/src/roles/server.hpp b/oss_core/src/net/ws/src/roles/server.hpp index 39c1937c310..4156a10b91f 100644 --- a/oss_core/src/net/ws/src/roles/server.hpp +++ b/oss_core/src/net/ws/src/roles/server.hpp @@ -28,6 +28,8 @@ #ifndef WEBSOCKETPP_ROLE_SERVER_HPP #define WEBSOCKETPP_ROLE_SERVER_HPP +#include "OSS/OSS.h" + #include "../processors/hybi.hpp" #include "../processors/hybi_legacy.hpp" #include "../rng/blank_rng.hpp" diff --git a/oss_core/src/net/ws/src/sockets/tls.hpp b/oss_core/src/net/ws/src/sockets/tls.hpp index 1cdbf40c2fe..35e9aa688cb 100644 --- a/oss_core/src/net/ws/src/sockets/tls.hpp +++ b/oss_core/src/net/ws/src/sockets/tls.hpp @@ -28,6 +28,8 @@ #ifndef WEBSOCKETPP_SOCKET_TLS_HPP #define WEBSOCKETPP_SOCKET_TLS_HPP +#include "OSS/OSS.h" + #include "../common.hpp" #include "socket_base.hpp" diff --git a/oss_core/src/sbc/SBCRegisterBehavior.cpp b/oss_core/src/sbc/SBCRegisterBehavior.cpp index 3d0820c392e..6272c7e3caf 100644 --- a/oss_core/src/sbc/SBCRegisterBehavior.cpp +++ b/oss_core/src/sbc/SBCRegisterBehavior.cpp @@ -576,7 +576,7 @@ void SBCRegisterBehavior::onProcessResponseOutbound( std::string expires = pResponse->hdrGet("expires"); std::string hContactList = pResponse->hdrGet("contact"); - bool is2xx = pResponse->is2xx(); + boost::tribool is2xx = pResponse->is2xx(); bool isTrunkReg = pTransaction->hasProperty("is-trunk-reg"); ContactURI curi; diff --git a/oss_core/src/sipep/SIPEndpoint.cpp b/oss_core/src/sipep/SIPEndpoint.cpp index 7550e930924..a88538498d3 100644 --- a/oss_core/src/sipep/SIPEndpoint.cpp +++ b/oss_core/src/sipep/SIPEndpoint.cpp @@ -175,9 +175,9 @@ void SIPEndpoint::sendEndpointResponse( return; } - bool is2xx = pResponse->isResponseFamily(OSS::SIP::SIPMessage::CODE_200_Ok); - bool isInvite = pResponse->isResponseTo(OSS::SIP::REQ_INVITE); - bool isReliableTransport = pTransaction->transport()->isReliableTransport(); + boost::tribool is2xx = pResponse->isResponseFamily(OSS::SIP::SIPMessage::CODE_200_Ok); + boost::tribool isInvite = pResponse->isResponseTo(OSS::SIP::REQ_INVITE); + boost::tribool isReliableTransport = pTransaction->transport()->isReliableTransport(); Retransmitter::Ptr pRetran; if (!isReliableTransport && is2xx && isInvite) { @@ -230,7 +230,7 @@ void SIPEndpoint::handleAckOr2xxTransaction( const OSS::SIP::SIPMessage::Ptr& pMsg, const OSS::SIP::SIPTransportSession::Ptr& pTransport) { - bool isAck = pMsg->isRequest(OSS::SIP::REQ_ACK); + boost::tribool isAck = pMsg->isRequest(OSS::SIP::REQ_ACK); std::string logId = pMsg->createContextId(true); std::string msgType = "2xx"; diff --git a/oss_core/src/sipfsm/SIPFSMDispatch.cpp b/oss_core/src/sipfsm/SIPFSMDispatch.cpp index 2941b8b558e..6be905cd9d4 100644 --- a/oss_core/src/sipfsm/SIPFSMDispatch.cpp +++ b/oss_core/src/sipfsm/SIPFSMDispatch.cpp @@ -210,7 +210,6 @@ SIPTransaction::Ptr SIPFSMDispatch::createClientTransaction(const SIPMessage::Pt SIPTransaction::Ptr trn; SIPTransportSession::Ptr nullTransport; - bool isAck = false; if (OSS::string_caseless_starts_with(pRequest->startLine(), "invite")) { // @@ -223,7 +222,7 @@ SIPTransaction::Ptr SIPFSMDispatch::createClientTransaction(const SIPMessage::Pt // // This is an NICT // - isAck = pRequest->isRequest(OSS::SIP::REQ_ACK); + boost::tribool isAck = pRequest->isRequest(OSS::SIP::REQ_ACK); if (!isAck) { trn = _nict.findTransaction(pRequest, nullTransport); diff --git a/oss_core/src/sipfsm/SIPNict.cpp b/oss_core/src/sipfsm/SIPNict.cpp index 5c2fbe30e75..c8f414de8dc 100644 --- a/oss_core/src/sipfsm/SIPNict.cpp +++ b/oss_core/src/sipfsm/SIPNict.cpp @@ -103,7 +103,7 @@ void SIPNict::onReceivedMessage(SIPMessage::Ptr pMsg, SIPTransportSession::Ptr p if (!pMsg->isResponse() || state == SIPTransaction::TRN_STATE_TERMINATED || state == COMPLETED) return; - bool is2xx = pMsg->is2xx(); + boost::tribool is2xx = pMsg->is2xx(); SIPTransaction::Ptr pParent = pTransaction->getParent(); diff --git a/oss_core/src/sipfsm/SIPStack.cpp b/oss_core/src/sipfsm/SIPStack.cpp index 9269f4ad6f4..380d961607a 100644 --- a/oss_core/src/sipfsm/SIPStack.cpp +++ b/oss_core/src/sipfsm/SIPStack.cpp @@ -17,9 +17,8 @@ // DEALINGS IN THE SOFTWARE. // - -#include "OSS/SIP/SIPStack.h" #include "OSS/OSS.h" +#include "OSS/SIP/SIPStack.h" #include "OSS/SIP/SIPException.h" #include "OSS/Persistent/ClassType.h" #include "OSS/SIP/SIPVia.h" diff --git a/oss_core/src/sipfsm/SIPTransaction.cpp b/oss_core/src/sipfsm/SIPTransaction.cpp index 539a4d0a99d..aea9a9319a4 100644 --- a/oss_core/src/sipfsm/SIPTransaction.cpp +++ b/oss_core/src/sipfsm/SIPTransaction.cpp @@ -129,7 +129,7 @@ void SIPTransaction::onReceivedMessage(SIPMessage::Ptr pMsg, SIPTransportSession { OSS::mutex_lock lock(_mutex); - bool isAck = pMsg->isRequest("ACK"); + boost::tribool isAck = pMsg->isRequest("ACK"); if (pMsg->isRequest() && !_pInitialRequest && !isAck) _pInitialRequest = pMsg; diff --git a/oss_core/src/siptransport/SIPStreamedConnection.cpp b/oss_core/src/siptransport/SIPStreamedConnection.cpp index 66a2bc387bf..d03383d9fa0 100644 --- a/oss_core/src/siptransport/SIPStreamedConnection.cpp +++ b/oss_core/src/siptransport/SIPStreamedConnection.cpp @@ -47,11 +47,7 @@ //////////////////////////////////////////////////////////////////////////////// - -#include -#include -#include -#include +#include "OSS/OSS.h" #include "OSS/UTL/Logger.h" #include "OSS/SIP/SIPTransportSession.h" #include "OSS/SIP/SIPStreamedConnection.h" @@ -59,6 +55,13 @@ #include "OSS/SIP/SIPFSMDispatch.h" #include "OSS/SIP/SIPListener.h" +#include + +#include +#include +#include + + namespace OSS { namespace SIP { @@ -633,7 +636,7 @@ void SIPStreamedConnection::handleServerHandshake(const boost::system::error_cod { err = std::string(" (") +boost::lexical_cast(ERR_GET_LIB(e.value()))+"," - +boost::lexical_cast(ERR_GET_FUNC(e.value()))+"," + // +boost::lexical_cast(ERR_GET_FUNC(e.value()))+"," // Deprecated +boost::lexical_cast(ERR_GET_REASON(e.value()))+") " ; //ERR_PACK /* crypto/err/err.h */ diff --git a/oss_core/src/siptransport/SIPStreamedConnectionManager.cpp b/oss_core/src/siptransport/SIPStreamedConnectionManager.cpp index b930ee6e8ca..cfe2bf08a7e 100644 --- a/oss_core/src/siptransport/SIPStreamedConnectionManager.cpp +++ b/oss_core/src/siptransport/SIPStreamedConnectionManager.cpp @@ -17,13 +17,15 @@ // DEALINGS IN THE SOFTWARE. // - -#include -#include +#include "OSS/OSS.h" #include "OSS/SIP/SIPStreamedConnectionManager.h" #include "OSS/SIP/SIPFSMDispatch.h" #include "OSS/UTL/Logger.h" +#include +#include + + namespace OSS { namespace SIP { diff --git a/oss_core/src/siptransport/SIPTCPListener.cpp b/oss_core/src/siptransport/SIPTCPListener.cpp index c0374c818e6..841daeb4eb2 100644 --- a/oss_core/src/siptransport/SIPTCPListener.cpp +++ b/oss_core/src/siptransport/SIPTCPListener.cpp @@ -17,12 +17,15 @@ // DEALINGS IN THE SOFTWARE. // -#include -#include +#include "OSS/OSS.h" #include "OSS/SIP/SIPTCPListener.h" #include "OSS/SIP/SIPTransportService.h" #include "OSS/UTL/Logger.h" +#include +#include + + namespace OSS { namespace SIP { diff --git a/oss_core/src/siptransport/SIPTLSListener.cpp b/oss_core/src/siptransport/SIPTLSListener.cpp index 200030961ed..620a1461475 100644 --- a/oss_core/src/siptransport/SIPTLSListener.cpp +++ b/oss_core/src/siptransport/SIPTLSListener.cpp @@ -17,12 +17,15 @@ // DEALINGS IN THE SOFTWARE. // -#include -#include +#include "OSS/OSS.h" #include "OSS/SIP/SIPTLSListener.h" #include "OSS/SIP/SIPTransportService.h" #include "OSS/UTL/Logger.h" +#include +#include + + namespace OSS { namespace SIP { diff --git a/oss_core/src/siptransport/SIPTransportService.cpp b/oss_core/src/siptransport/SIPTransportService.cpp index 1ca4cd55c80..18097f5b73b 100644 --- a/oss_core/src/siptransport/SIPTransportService.cpp +++ b/oss_core/src/siptransport/SIPTransportService.cpp @@ -709,7 +709,25 @@ SIPTransportSession::Ptr SIPTransportService::createClientTransport( std::string logId = pMsg->createContextId(true); std::string requirePersistentValue; pMsg->getProperty(OSS::PropertyMap::PROP_RequirePersistentConnection, requirePersistentValue); - bool requirePersistent = pMsg->isResponse() || !requirePersistentValue.empty(); + + + boost::tribool isResponse = pMsg->isResponse(); + boost::tribool emptyRequirePersistentValue = requirePersistentValue.empty(); + + bool requirePersistent; + + if( isResponse ) + { + requirePersistent = true; + } + else if( !emptyRequirePersistentValue ) + { + requirePersistent = true; + } + else + { + requirePersistent = false; + } if (!transportId.empty()) { diff --git a/oss_core/src/siptransport/SIPUDPConnection.cpp b/oss_core/src/siptransport/SIPUDPConnection.cpp index 4c299af11ca..1fb188ae167 100644 --- a/oss_core/src/siptransport/SIPUDPConnection.cpp +++ b/oss_core/src/siptransport/SIPUDPConnection.cpp @@ -18,12 +18,6 @@ // #include "OSS/OSS.h" -#include -#include -#include -#include -#include -#include #include "OSS/SIP/SIPTransportSession.h" #include "OSS/SIP/SIPUDPConnection.h" #include "OSS/SIP/SIPUDPConnectionClone.h" @@ -34,6 +28,14 @@ #include "OSS/UTL/PropertyMap.h" #include "OSS/SIP/SIPListener.h" +#include +#include +#include +#include +#include +#include + + namespace OSS { namespace SIP { diff --git a/oss_core/src/siptransport/SIPUDPConnectionClone.cpp b/oss_core/src/siptransport/SIPUDPConnectionClone.cpp index f89f7ab70c7..a04c474f9c6 100644 --- a/oss_core/src/siptransport/SIPUDPConnectionClone.cpp +++ b/oss_core/src/siptransport/SIPUDPConnectionClone.cpp @@ -17,17 +17,19 @@ // DEALINGS IN THE SOFTWARE. // +#include "OSS/OSS.h" +#include "OSS/SIP/SIPTransportSession.h" +#include "OSS/SIP/SIPUDPConnectionClone.h" +#include "OSS/SIP/SIPFSMDispatch.h" +#include "OSS/SIP/SIPException.h" +#include "OSS/SIP/SIPListener.h" #include #include #include #include #include -#include "OSS/SIP/SIPTransportSession.h" -#include "OSS/SIP/SIPUDPConnectionClone.h" -#include "OSS/SIP/SIPFSMDispatch.h" -#include "OSS/SIP/SIPException.h" -#include "OSS/SIP/SIPListener.h" + namespace OSS { namespace SIP { diff --git a/oss_core/src/siptransport/SIPUDPListener.cpp b/oss_core/src/siptransport/SIPUDPListener.cpp index fa4929477c8..550c9934c27 100644 --- a/oss_core/src/siptransport/SIPUDPListener.cpp +++ b/oss_core/src/siptransport/SIPUDPListener.cpp @@ -17,14 +17,16 @@ // DEALINGS IN THE SOFTWARE. // - -#include -#include +#include "OSS/OSS.h" #include "OSS/SIP/SIPUDPListener.h" #include "OSS/SIP/SIPTransportService.h" #include "OSS/UTL/Logger.h" #include "OSS/Net/Net.h" +#include +#include + + namespace OSS { namespace SIP { diff --git a/oss_core/src/siptransport/SIPWebSocketConnectionManager.cpp b/oss_core/src/siptransport/SIPWebSocketConnectionManager.cpp index 393315735e7..aff6f3f3497 100644 --- a/oss_core/src/siptransport/SIPWebSocketConnectionManager.cpp +++ b/oss_core/src/siptransport/SIPWebSocketConnectionManager.cpp @@ -17,13 +17,15 @@ // DEALINGS IN THE SOFTWARE. // - -#include -#include +#include "OSS/OSS.h" #include "OSS/SIP/SIPWebSocketConnectionManager.h" #include "OSS/SIP/SIPFSMDispatch.h" #include "OSS/UTL/Logger.h" +#include +#include + + namespace OSS { namespace SIP { diff --git a/oss_core/src/siptransport/SIPWebSocketTlsConnectionManager.cpp b/oss_core/src/siptransport/SIPWebSocketTlsConnectionManager.cpp index ecbbbabab11..2819f7ff7e6 100644 --- a/oss_core/src/siptransport/SIPWebSocketTlsConnectionManager.cpp +++ b/oss_core/src/siptransport/SIPWebSocketTlsConnectionManager.cpp @@ -17,13 +17,15 @@ // DEALINGS IN THE SOFTWARE. // - -#include -#include +#include "OSS/OSS.h" #include "OSS/SIP/SIPWebSocketTlsConnectionManager.h" #include "OSS/SIP/SIPFSMDispatch.h" #include "OSS/UTL/Logger.h" +#include +#include + + namespace OSS { namespace SIP { diff --git a/oss_core/src/stun/STUNProto.cpp b/oss_core/src/stun/STUNProto.cpp index 407634564da..a230e7dbfb1 100644 --- a/oss_core/src/stun/STUNProto.cpp +++ b/oss_core/src/stun/STUNProto.cpp @@ -782,7 +782,7 @@ stunRandomPort() static void computeHmac(char* hmac, const char* input, int length, const char* key, int sizeKey) { - strncpy(hmac,"hmac-not-implemented",20); + strcpy(hmac,"ssl-not-implemented"); } #else #include @@ -1146,6 +1146,7 @@ stunServerProcessMsg( char* buf, // need access to shared secret unsigned char hmac[20]; + hmac[0] = '\0'; #ifndef NOSSL unsigned int hmacSize=20; diff --git a/oss_core/src/unit_test/TestFirewall.cpp b/oss_core/src/unit_test/TestFirewall.cpp index 3b8c666a7d2..e4cf9169142 100644 --- a/oss_core/src/unit_test/TestFirewall.cpp +++ b/oss_core/src/unit_test/TestFirewall.cpp @@ -16,9 +16,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301, USA */ +#include "OSS/OSS.h" +#include "OSS/Net/Firewall.h" #include "gtest/gtest.h" -#include "OSS/Net/Firewall.h" #include using namespace OSS; diff --git a/oss_core/src/utl/Application.cpp b/oss_core/src/utl/Application.cpp index 626bc0b27f6..fd58bfbf71b 100644 --- a/oss_core/src/utl/Application.cpp +++ b/oss_core/src/utl/Application.cpp @@ -646,8 +646,8 @@ void OSSApplication::setup() { poco_assert (_pInstance == 0); - _pConfig->add(new SystemConfiguration, PRIO_SYSTEM, false, false); - _pConfig->add(new MapConfiguration, PRIO_APPLICATION, true, false); + _pConfig->add(Poco::AutoPtr(new Poco::Util::SystemConfiguration)); + _pConfig->add(Poco::AutoPtr(new Poco::Util::MapConfiguration)); addSubsystem(new OSSLoggingSubsystem); @@ -774,8 +774,9 @@ int OSSApplication::loadConfiguration(int priority) // if (findAppConfigFile(appPath.getBaseName(), "properties", cfgPath)) { - _pConfig->add(new PropertyFileConfiguration(cfgPath.toString()), priority, false, false); - _pConfig->setString("application.configDir", cfgPath.parent().toString()); + _pConfig->add(Poco::AutoPtr( + new Poco::Util::PropertyFileConfiguration(cfgPath.toString()))); + _pConfig->setString("application.configDir", cfgPath.parent().toString()); return 1; } @@ -785,17 +786,21 @@ int OSSApplication::loadConfiguration(int priority) void OSSApplication::loadConfiguration(const std::string& path, int priority) { -Path confPath(path); -std::string ext = confPath.getExtension(); -if (icompare(ext, "properties") == 0) - _pConfig->add(new PropertyFileConfiguration(confPath.toString()), priority, false, false); -else - throw Poco::InvalidArgumentException("Unsupported configuration file type", ext); + Path confPath(path); + std::string ext = confPath.getExtension(); + if (icompare(ext, "properties") == 0) + _pConfig->add(Poco::AutoPtr( + new Poco::Util::PropertyFileConfiguration(confPath.toString()))); + else + throw Poco::InvalidArgumentException("Unsupported configuration file type", ext); } void OSSApplication::loadConfiguration(std::istream& strm, int priority) { - _pConfig->add(new PropertyFileConfiguration(strm), priority, false, false); + std::ostringstream oss; + oss << strm.rdbuf(); + _pConfig->add(Poco::AutoPtr( + new Poco::Util::PropertyFileConfiguration(oss.str()))); } std::string OSSApplication::commandName() const diff --git a/sipXAocBilling/configure.ac b/sipXAocBilling/configure.ac index 80d7d04b757..62f21d017aa 100644 --- a/sipXAocBilling/configure.ac +++ b/sipXAocBilling/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.57) -AC_INIT(sipxaocbilling, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxaocbilling, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) AC_CONFIG_SRCDIR([proxy-plugin/src/IantAocBilling.cpp]) diff --git a/sipXAocBilling/proxy-plugin/src/Makefile.am b/sipXAocBilling/proxy-plugin/src/Makefile.am index 3635aae5ec8..8cacb049d67 100644 --- a/sipXAocBilling/proxy-plugin/src/Makefile.am +++ b/sipXAocBilling/proxy-plugin/src/Makefile.am @@ -28,7 +28,7 @@ libsipxiantaocbilling_la_LDFLAGS = \ -version-info ${version_Current}:${version_Revision}:${version_Age} libsipxiantaocbilling_la_LIBADD = \ - -lboost_system-mt \ + -lboost_system \ @SIPXPORT_LIBS@ \ @SIPXCOMMSERVER_LIBS@ \ -lmongoclient \ No newline at end of file diff --git a/sipXaastra/configure.ac b/sipXaastra/configure.ac index f8d60994065..a5274506619 100644 --- a/sipXaastra/configure.ac +++ b/sipXaastra/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXaastra, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXaastra, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXaastra/sipxaastra.spec.in b/sipXaastra/sipxaastra.spec.in index 336e2397ab7..09c4ff8b1da 100644 --- a/sipXaastra/sipxaastra.spec.in +++ b/sipXaastra/sipxaastra.spec.in @@ -9,7 +9,7 @@ Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXacccode/configure.ac b/sipXacccode/configure.ac index 6839026b89d..98260e39929 100644 --- a/sipXacccode/configure.ac +++ b/sipXacccode/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXacccode, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXacccode, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXaudiocodes/configure.ac b/sipXaudiocodes/configure.ac index 11c56adf11a..0980ce97d09 100644 --- a/sipXaudiocodes/configure.ac +++ b/sipXaudiocodes/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXaudiocodes, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXaudiocodes, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([src/org/sipfoundry/sipxconfig/phone/audiocodesphone/AudioCodesPhone.java]) m4_include([config/sipXlib2.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_PROG_JAVA_CC([javac]) AC_PROG_JAVA([java]) PROG_JAVA_DEP diff --git a/sipXaudiocodes/sipxaudiocodes.spec.in b/sipXaudiocodes/sipxaudiocodes.spec.in index 5c74d5fa366..b479959710e 100644 --- a/sipXaudiocodes/sipxaudiocodes.spec.in +++ b/sipXaudiocodes/sipxaudiocodes.spec.in @@ -10,7 +10,7 @@ Packager: Engineering BuildArch: noarch Url: http://www.sipfoundry.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXbridge/configure.ac b/sipXbridge/configure.ac index fa4d12cab38..c5486bed87e 100644 --- a/sipXbridge/configure.ac +++ b/sipXbridge/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXbridge, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXbridge, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXcallController/configure.ac b/sipXcallController/configure.ac index 80a46147111..99ba0d51762 100644 --- a/sipXcallController/configure.ac +++ b/sipXcallController/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXcallController, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXcallController, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXcallLib/configure.ac b/sipXcallLib/configure.ac index ec5a3761ce3..ec539286be7 100644 --- a/sipXcallLib/configure.ac +++ b/sipXcallLib/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.57) -AC_INIT(sipXcallLib, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXcallLib, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_CONFIG_SRCDIR([src/cp/CallManager.cpp]) AM_CONFIG_HEADER([src/config.h]) diff --git a/sipXcallLib/sipxcalllib.spec.in b/sipXcallLib/sipxcalllib.spec.in index b94e9768dbe..ce9f9ae98fc 100644 --- a/sipXcallLib/sipxcalllib.spec.in +++ b/sipXcallLib/sipxcalllib.spec.in @@ -43,7 +43,7 @@ contains technologies related to call processing: * tao - A transport layer designed to decouple (and remote) the application layer from call processing. -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif diff --git a/sipXcallQueue/configure.ac b/sipXcallQueue/configure.ac index f1d53f31701..61bf3c3cede 100644 --- a/sipXcallQueue/configure.ac +++ b/sipXcallQueue/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.57) -AC_INIT(sipxcallqueue, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxcallqueue, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) SFAC_INIT_FLAGS diff --git a/sipXcallback/configure.ac b/sipXcallback/configure.ac index c46d2619c30..c4a6e70cb69 100644 --- a/sipXcallback/configure.ac +++ b/sipXcallback/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXcallback, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXcallback, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXcdr/configure.ac b/sipXcdr/configure.ac index 2d930fab68e..c440e0b817a 100644 --- a/sipXcdr/configure.ac +++ b/sipXcdr/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXcdr, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXcdr, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) AC_PROG_JAVA([java]) diff --git a/sipXcdr/sipxcdr.spec.in b/sipXcdr/sipxcdr.spec.in index 32b0e921e8f..c0b43b11736 100644 --- a/sipXcdr/sipxcdr.spec.in +++ b/sipXcdr/sipxcdr.spec.in @@ -29,7 +29,7 @@ Requires: rubygems %if 0%{?rhel} >= 7 Requires: rubygem-pg %else -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" Requires: rubygem-postgres %else Requires: ruby-libs diff --git a/sipXcdrLog/configure.ac b/sipXcdrLog/configure.ac index 5117dfa7cef..ee3f292227e 100644 --- a/sipXcdrLog/configure.ac +++ b/sipXcdrLog/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXcdrLog, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXcdrLog, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXcisco/configure.ac b/sipXcisco/configure.ac index 43b12b7a7e4..ae6919019a7 100644 --- a/sipXcisco/configure.ac +++ b/sipXcisco/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXcisco, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXcisco, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXcisco/sipxcisco.spec.in b/sipXcisco/sipxcisco.spec.in index a273b25e1fb..15d52c4da65 100644 --- a/sipXcisco/sipxcisco.spec.in +++ b/sipXcisco/sipxcisco.spec.in @@ -9,7 +9,7 @@ Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXclearone/configure.ac b/sipXclearone/configure.ac index 92f2800dc29..2d20f23690a 100644 --- a/sipXclearone/configure.ac +++ b/sipXclearone/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXclearone, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXclearone, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXclearone/sipxclearone.spec.in b/sipXclearone/sipxclearone.spec.in index 0b4a48492e2..66de93ba22a 100644 --- a/sipXclearone/sipxclearone.spec.in +++ b/sipXclearone/sipxclearone.spec.in @@ -9,7 +9,7 @@ Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXcom/.classpath b/sipXcom/.classpath index dec88061e38..d0d89eac000 100644 --- a/sipXcom/.classpath +++ b/sipXcom/.classpath @@ -1,6 +1,6 @@ - + diff --git a/sipXcom/configure.ac b/sipXcom/configure.ac index 954fa4be09d..588cff2f41d 100644 --- a/sipXcom/configure.ac +++ b/sipXcom/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.57) -AC_INIT(sipXcom, 24.01, sipx-dev@list.sipxcom.org) +AC_INIT(sipXcom, 25.01, sipx-dev@list.sipxcom.org) AC_CONFIG_AUX_DIR(config) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/sipXlib2.m4]) diff --git a/sipXcommons/configure.ac b/sipXcommons/configure.ac index b10c4e03fda..d2016c2b07e 100644 --- a/sipXcommons/configure.ac +++ b/sipXcommons/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXcommons, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXcommons, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/java2.m4]) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) LT_INIT([disable-static]) AC_PROG_JAVA_CC([javac]) AC_PROG_JAVA([java]) diff --git a/sipXcommons/sipxcommons.spec.in b/sipXcommons/sipxcommons.spec.in index b8ef00656fa..0100e6b3ec1 100644 --- a/sipXcommons/sipxcommons.spec.in +++ b/sipXcommons/sipxcommons.spec.in @@ -10,7 +10,7 @@ Group: Productivity/Telephony/SIP/Servers Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org/sipXcommons -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel @@ -19,7 +19,7 @@ BuildRequires: automake %if %{_vendor} == redhat BuildRequires: shadow-utils %endif -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: pwdutils %endif BuildRequires: zip @@ -30,7 +30,7 @@ BuildRequires: rsync Source: %name-%version.tar.gz -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" Requires: pwdutils %else Requires: shadow-utils @@ -43,7 +43,7 @@ Requires: java-ibm-unrestricted Requires: java-1.8.0-openjdk %endif -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" Requires: openssl >= 0.9.8 %endif diff --git a/sipXcommserverLib/configure.ac b/sipXcommserverLib/configure.ac index bb060bab25b..e58b57287a4 100644 --- a/sipXcommserverLib/configure.ac +++ b/sipXcommserverLib/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.57) -AC_INIT(sipXcommserverLib, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXcommserverLib, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_DISABLE_STATIC AC_CONFIG_SRCDIR([src/sipdb/EntityDB.cpp]) diff --git a/sipXcommserverLib/sipxcommserverlib.spec.in b/sipXcommserverLib/sipxcommserverlib.spec.in index b0e4a379547..44cd8cacce3 100755 --- a/sipXcommserverLib/sipxcommserverlib.spec.in +++ b/sipXcommserverLib/sipxcommserverlib.spec.in @@ -30,7 +30,7 @@ BuildRequires: mongo-cxx-driver-devel >= 2.6.7 Source: %name-%version.tar.gz Requires: rpm -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: apache2-devel BuildRequires: xerces-c-devel = 2.8.0 Requires: xerces-c >= 2.6.0 @@ -75,14 +75,14 @@ This project is used to hold code used in common by a number of the sipX family servers. It is not intended to be useful as a standalone project. -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif # Install header files %package devel Requires: %name -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" Requires: xerces-c-devel >= 2.6.0 %endif %if %{_vendor} == redhat diff --git a/sipXcommserverLib/src/Makefile.am b/sipXcommserverLib/src/Makefile.am index 99c3e987fc1..fd7701d730f 100755 --- a/sipXcommserverLib/src/Makefile.am +++ b/sipXcommserverLib/src/Makefile.am @@ -47,8 +47,8 @@ libsipXcommserver_la_LIBADD = \ @SIPXTACK_LIBS@ \ @ODBC_LIBS@ \ sipdb/libsipdb.la \ - -lboost_regex-mt \ - -lboost_program_options-mt + -lboost_regex \ + -lboost_program_options libsipXcommserver_la_SOURCES = \ digitmaps/UrlMapping.cpp \ diff --git a/sipXcommserverLib/src/sipdb/Makefile.am b/sipXcommserverLib/src/sipdb/Makefile.am index 82c4d90afa7..abbda04a800 100755 --- a/sipXcommserverLib/src/sipdb/Makefile.am +++ b/sipXcommserverLib/src/sipdb/Makefile.am @@ -35,7 +35,7 @@ libsipdb_la_CXXFLAGS = \ libsipdb_la_LIBADD = \ @SIPXTACK_LIBS@ \ - -lboost_system-mt + -lboost_system libsipdb_la_SOURCES = \ MongoDB.cpp \ diff --git a/sipXconfig/configure.ac b/sipXconfig/configure.ac index aa1171462d2..5ff4e151cc4 100644 --- a/sipXconfig/configure.ac +++ b/sipXconfig/configure.ac @@ -1,12 +1,12 @@ AC_PREREQ(2.57) -AC_INIT(sipXconfig, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXconfig, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java.m4]) m4_include([config/java2.m4]) m4_include([config/dart.m4]) -AM_INIT_AUTOMAKE(foreign tar-pax) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-pax) SFAC_AUTOMAKE_VERSION([1.6]) AC_CONFIG_SRCDIR([neoconf/src/org/sipfoundry/sipxconfig/common/User.java]) SFAC_INIT_FLAGS diff --git a/sipXconfig/etc/.classpath b/sipXconfig/etc/.classpath index afc741f23e0..969acbdc9c7 100644 --- a/sipXconfig/etc/.classpath +++ b/sipXconfig/etc/.classpath @@ -1,7 +1,7 @@ - + diff --git a/sipXconfig/sipxconfig.spec.in b/sipXconfig/sipxconfig.spec.in index 0aff954e013..504374f05ef 100644 --- a/sipXconfig/sipxconfig.spec.in +++ b/sipXconfig/sipxconfig.spec.in @@ -23,7 +23,7 @@ BuildRequires: cronie BuildRequires: vixie-cron %endif %endif -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: pwdutils BuildRequires: cron %endif @@ -134,7 +134,7 @@ Obsoletes: sipxevent Obsoletes: mongodb Obsoletes: mongodb-server -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" Requires: apache2-prefork Requires: pwdutils %endif @@ -177,7 +177,7 @@ SOAP, postgresql and other JEE technologies to get the job done. %if %{_vendor} == redhat Requires: tftp-server %endif -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" Requires: tftp %endif Requires: %{name} >= %{version} diff --git a/sipXcounterpath/configure.ac b/sipXcounterpath/configure.ac index c6e11417071..a2cd34a0de1 100644 --- a/sipXcounterpath/configure.ac +++ b/sipXcounterpath/configure.ac @@ -1,11 +1,11 @@ AC_PREREQ(2.57) -AC_INIT(sipXcounterpath, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXcounterpath, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([device]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXcounterpath/sipxcounterpath.spec.in b/sipXcounterpath/sipxcounterpath.spec.in index 5be2b066b24..dd844681fcb 100644 --- a/sipXcounterpath/sipxcounterpath.spec.in +++ b/sipXcounterpath/sipxcounterpath.spec.in @@ -9,7 +9,7 @@ Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXcustomCallerId/configure.ac b/sipXcustomCallerId/configure.ac index ee603a11a6a..8e420e07fa2 100644 --- a/sipXcustomCallerId/configure.ac +++ b/sipXcustomCallerId/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.57) -AC_INIT(sipxcustomcallerid, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxcustomcallerid, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) AC_CONFIG_SRCDIR([proxy-plugin/src/CallerID.cpp]) diff --git a/sipXcustomCallerId/proxy-plugin/src/Makefile.am b/sipXcustomCallerId/proxy-plugin/src/Makefile.am index be41b1d1411..e34ae420504 100644 --- a/sipXcustomCallerId/proxy-plugin/src/Makefile.am +++ b/sipXcustomCallerId/proxy-plugin/src/Makefile.am @@ -32,7 +32,7 @@ authplugins_libsipxcustomcallerid_la_LDFLAGS = \ authplugins_libsipxcustomcallerid_la_LIBADD = \ @SIPXCOMMSERVER_LIBS@ \ -lmongoclient \ - -lboost_system-mt + -lboost_system authplugins_libsipxcustomcallerid_la_SOURCES = \ CallerID.cpp \ diff --git a/sipXdashboard/configure.ac b/sipXdashboard/configure.ac index f5e7a400ddb..b75c7b56d2e 100644 --- a/sipXdashboard/configure.ac +++ b/sipXdashboard/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.57) -AC_INIT(sipxdashboard, 24.01, sipx-dev@list.sipxcom.org) +AC_INIT(sipxdashboard, 25.01, sipx-dev@list.sipxcom.org) AC_CONFIG_AUX_DIR(config) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/sipXlib2.m4]) diff --git a/sipXecs/configure.ac b/sipXecs/configure.ac index e25aa684203..3840c284540 100644 --- a/sipXecs/configure.ac +++ b/sipXecs/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxecs, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxecs, 25.01, sipxcom-dev@googlegroups.com) m4_include([config/sipXlib2.m4]) AC_CONFIG_AUX_DIR(config) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_FILES([ Makefile ]) diff --git a/sipXeslLib/configure.ac b/sipXeslLib/configure.ac index ab737e5ba96..90a828cc612 100644 --- a/sipXeslLib/configure.ac +++ b/sipXeslLib/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.57) -AC_INIT(sipXeslLib, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXeslLib, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_CONFIG_SRCDIR([src/EslConnection.cpp]) diff --git a/sipXeslLib/sipxesllib.spec.in b/sipXeslLib/sipxesllib.spec.in index 5a4d428fca9..6057406663e 100644 --- a/sipXeslLib/sipxesllib.spec.in +++ b/sipXeslLib/sipxesllib.spec.in @@ -23,7 +23,7 @@ BuildRoot: %{_tmppath}/%name-%version-root %description This project provides a C++ wrapper for FreeSwitch Event Socket Layer -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif diff --git a/sipXeslLib/src/Makefile.am b/sipXeslLib/src/Makefile.am index 6cf046edcb9..80579f8280f 100644 --- a/sipXeslLib/src/Makefile.am +++ b/sipXeslLib/src/Makefile.am @@ -22,9 +22,9 @@ version_Revision=0 version_Age=0 LDADD = \ - -lboost_system-mt \ - -lboost_thread-mt \ - -lboost_filesystem-mt \ + -lboost_system \ + -lboost_thread \ + -lboost_filesystem \ -lpthread LDFLAGS = -rdynamic diff --git a/sipXeslLib/src/esl.h b/sipXeslLib/src/esl.h index 53b98ae72b0..589c6f95d90 100644 --- a/sipXeslLib/src/esl.h +++ b/sipXeslLib/src/esl.h @@ -40,7 +40,7 @@ extern "C" { #endif /* defined(__cplusplus) */ -#define esl_copy_string(_x, _y, _z) strncpy(_x, _y, _z - 1) +#define esl_copy_string(_x, _y, _z) do { strncpy((_x), (_y), (_z) - 1); (_x)[(_z) - 1] = '\0'; } while (0) #define esl_set_string(_x, _y) esl_copy_string(_x, _y, sizeof(_x)) #define ESL_VA_NONE "%s", "" diff --git a/sipXevent/configure.ac b/sipXevent/configure.ac index 9e84ed0b212..e91944489b9 100644 --- a/sipXevent/configure.ac +++ b/sipXevent/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXevent, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXevent, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXexample/configure.ac b/sipXexample/configure.ac index aad2a9bb65c..c3fae756754 100644 --- a/sipXexample/configure.ac +++ b/sipXexample/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.57) -AC_INIT(sipxexample, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxexample, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) diff --git a/sipXgrandstream/configure.ac b/sipXgrandstream/configure.ac index ee72989010a..5895f791f0a 100644 --- a/sipXgrandstream/configure.ac +++ b/sipXgrandstream/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXgrandstream, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXgrandstream, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXgrandstream/sipxgrandstream.spec.in b/sipXgrandstream/sipxgrandstream.spec.in index a87e24b148b..fbfb4e5eb1d 100644 --- a/sipXgrandstream/sipxgrandstream.spec.in +++ b/sipXgrandstream/sipxgrandstream.spec.in @@ -9,7 +9,7 @@ Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXgtek/configure.ac b/sipXgtek/configure.ac index f652c925c11..3803441cfbf 100644 --- a/sipXgtek/configure.ac +++ b/sipXgtek/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXgtek, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXgtek, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXgtek/sipxgtek.spec.in b/sipXgtek/sipxgtek.spec.in index 80af1c72b7b..fbacd088bbe 100644 --- a/sipXgtek/sipxgtek.spec.in +++ b/sipXgtek/sipxgtek.spec.in @@ -9,7 +9,7 @@ Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXhitachi/configure.ac b/sipXhitachi/configure.ac index fd022054eee..ae1ac9e04fc 100644 --- a/sipXhitachi/configure.ac +++ b/sipXhitachi/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXhitachi, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXhitachi, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXhitachi/sipxhitachi.spec.in b/sipXhitachi/sipxhitachi.spec.in index 1b92a208b25..d294f69a527 100644 --- a/sipXhitachi/sipxhitachi.spec.in +++ b/sipXhitachi/sipxhitachi.spec.in @@ -9,7 +9,7 @@ Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXimbot/configure.ac b/sipXimbot/configure.ac index ccce48f0181..29e20b23ecc 100644 --- a/sipXimbot/configure.ac +++ b/sipXimbot/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXimbot, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXimbot, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_INIT_FLAGS SFAC_AUTOMAKE_VERSION([1.6]) AC_PROG_JAVA_CC([javac]) diff --git a/sipXipdialog/configure.ac b/sipXipdialog/configure.ac index 36f60073619..0e57d707747 100644 --- a/sipXipdialog/configure.ac +++ b/sipXipdialog/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXipdialog, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXipdialog, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXipdialog/sipxipdialog.spec.in b/sipXipdialog/sipxipdialog.spec.in index d11a9d31f21..784d3126532 100644 --- a/sipXipdialog/sipxipdialog.spec.in +++ b/sipXipdialog/sipxipdialog.spec.in @@ -9,7 +9,7 @@ Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXisphone/configure.ac b/sipXisphone/configure.ac index 6e5968e6a72..28f4ffe6699 100644 --- a/sipXisphone/configure.ac +++ b/sipXisphone/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXisphone, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXisphone, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXisphone/sipxisphone.spec.in b/sipXisphone/sipxisphone.spec.in index d7775ba1aef..ea94896cab5 100644 --- a/sipXisphone/sipxisphone.spec.in +++ b/sipXisphone/sipxisphone.spec.in @@ -9,7 +9,7 @@ Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXivr/configure.ac b/sipXivr/configure.ac index cb30b5fee9a..707cc5b82e1 100644 --- a/sipXivr/configure.ac +++ b/sipXivr/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXivr, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXivr, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXjitsi/configure.ac b/sipXjitsi/configure.ac index 52f50f8de77..218e14fbfce 100644 --- a/sipXjitsi/configure.ac +++ b/sipXjitsi/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXjitsi, 24.01, sipx-dev@list.sipxcom.org) +AC_INIT(sipXjitsi, 25.01, sipx-dev@list.sipxcom.org) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXjitsi/sipxjitsi.spec.in b/sipXjitsi/sipxjitsi.spec.in index 179d84439aa..16a3bca5fb0 100644 --- a/sipXjitsi/sipxjitsi.spec.in +++ b/sipXjitsi/sipxjitsi.spec.in @@ -9,7 +9,7 @@ Vendor: SipXcom Packager: SIPfoundry Url: http://www.sipxcom.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXlang-abitibi-fr_CA/configure.ac b/sipXlang-abitibi-fr_CA/configure.ac index 3f15dc1ef27..961286fc7b6 100644 --- a/sipXlang-abitibi-fr_CA/configure.ac +++ b/sipXlang-abitibi-fr_CA/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxlang-abitibi-fr_CA, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxlang-abitibi-fr_CA, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([sipxpbx/sipxplugin.beans.xml]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_SUBST(LANG_ID, abitibi-fr_CA) AC_CONFIG_FILES([ diff --git a/sipXlang-ch/configure.ac b/sipXlang-ch/configure.ac index e09ed607259..8d99cd3af69 100644 --- a/sipXlang-ch/configure.ac +++ b/sipXlang-ch/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxlang-ch, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxlang-ch, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([sipxpbx/sipxplugin.beans.xml]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_SUBST(LANG_ID, ch) AC_CONFIG_FILES([ diff --git a/sipXlang-cs/configure.ac b/sipXlang-cs/configure.ac index 22654aeebc6..84047ff689b 100644 --- a/sipXlang-cs/configure.ac +++ b/sipXlang-cs/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxlang-cs, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxlang-cs, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([sipxpbx/sipxplugin.beans.xml]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_SUBST(LANG_ID, cs) AC_CONFIG_FILES([ diff --git a/sipXlang-de/configure.ac b/sipXlang-de/configure.ac index b33bde52192..fc1db0964bd 100644 --- a/sipXlang-de/configure.ac +++ b/sipXlang-de/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxlang-de, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxlang-de, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([sipxpbx/sipxplugin.beans.xml]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_SUBST(LANG_ID, de) AC_CONFIG_FILES([ diff --git a/sipXlang-en_GB/configure.ac b/sipXlang-en_GB/configure.ac index c242630bc88..f8efcefaf94 100644 --- a/sipXlang-en_GB/configure.ac +++ b/sipXlang-en_GB/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxlang-en_GB, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxlang-en_GB, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([sipxpbx/sipxplugin.beans.xml]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_SUBST(LANG_ID, en_GB) AC_CONFIG_FILES([ diff --git a/sipXlang-es/configure.ac b/sipXlang-es/configure.ac index 75d06cada21..6806d0ebf07 100644 --- a/sipXlang-es/configure.ac +++ b/sipXlang-es/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxlang-es, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxlang-es, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([sipxpbx/sipxplugin.beans.xml]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_SUBST(LANG_ID, es) AC_CONFIG_FILES([ diff --git a/sipXlang-es_MX/configure.ac b/sipXlang-es_MX/configure.ac index f608d20972a..be9e7e2d75b 100644 --- a/sipXlang-es_MX/configure.ac +++ b/sipXlang-es_MX/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxlang-es_MX, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxlang-es_MX, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([sipxpbx/sipxplugin.beans.xml]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_SUBST(LANG_ID, es_MX) AC_CONFIG_FILES([ diff --git a/sipXlang-fr/configure.ac b/sipXlang-fr/configure.ac index f509dc629bd..63e06a0436e 100644 --- a/sipXlang-fr/configure.ac +++ b/sipXlang-fr/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxlang-fr, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxlang-fr, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([sipxpbx/sipxplugin.beans.xml]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_SUBST(LANG_ID, fr) AC_CONFIG_FILES([ diff --git a/sipXlang-fr_CA/configure.ac b/sipXlang-fr_CA/configure.ac index cc1abd95ae8..e4cb7c1cb32 100644 --- a/sipXlang-fr_CA/configure.ac +++ b/sipXlang-fr_CA/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxlang-fr_CA, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxlang-fr_CA, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([sipxpbx/sipxplugin.beans.xml]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_SUBST(LANG_ID, fr_CA) AC_CONFIG_FILES([ diff --git a/sipXlang-it/configure.ac b/sipXlang-it/configure.ac index 6bd360b2545..a95661aec66 100644 --- a/sipXlang-it/configure.ac +++ b/sipXlang-it/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxlang-it, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxlang-it, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([stdprompts/01.wav]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_SUBST(LANG_ID,it) AC_CONFIG_FILES([ diff --git a/sipXlang-ja/configure.ac b/sipXlang-ja/configure.ac index 5864b1440c3..4de81010ee4 100644 --- a/sipXlang-ja/configure.ac +++ b/sipXlang-ja/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxlang-ja, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxlang-ja, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([stdprompts/01.wav]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_SUBST(LANG_ID, ja) AC_CONFIG_FILES([ diff --git a/sipXlang-nl/configure.ac b/sipXlang-nl/configure.ac index da1b4dd9ada..f2192fb899c 100644 --- a/sipXlang-nl/configure.ac +++ b/sipXlang-nl/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxlang-nl, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxlang-nl, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([sipxpbx/sipxplugin.beans.xml]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_SUBST(LANG_ID, nl) AC_CONFIG_FILES([ diff --git a/sipXlang-pl/configure.ac b/sipXlang-pl/configure.ac index 5ddecb5d3b1..2129b642806 100644 --- a/sipXlang-pl/configure.ac +++ b/sipXlang-pl/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxlang-pl, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxlang-pl, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([sipxpbx/WEB-INF/sipXconfig-web_pl.properties]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_SUBST(LANG_ID, pl) AC_CONFIG_FILES([ diff --git a/sipXlang-pt/configure.ac b/sipXlang-pt/configure.ac index 8c472048e71..22bd5ecdeaa 100644 --- a/sipXlang-pt/configure.ac +++ b/sipXlang-pt/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxlang-pt, 24.01, sipx-dev@sipxcom.org) +AC_INIT(sipxlang-pt, 25.01, sipx-dev@sipxcom.org) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([stdprompts/01.wav]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_SUBST(LANG_ID,pt) AC_CONFIG_FILES([ diff --git a/sipXlang-pt_BR/configure.ac b/sipXlang-pt_BR/configure.ac index b6a725c370b..4fcfb1fe8a0 100644 --- a/sipXlang-pt_BR/configure.ac +++ b/sipXlang-pt_BR/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxlang-pt_BR, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxlang-pt_BR, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([stdprompts/01.wav]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_SUBST(LANG_ID,pt_BR) AC_CONFIG_FILES([ diff --git a/sipXlang-zh/configure.ac b/sipXlang-zh/configure.ac index eb4791d3ecb..4ce2a48d4ae 100644 --- a/sipXlang-zh/configure.ac +++ b/sipXlang-zh/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ(2.57) -AC_INIT(sipxlang-zh, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxlang-zh, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) AC_CONFIG_SRCDIR([stdprompts/01.wav]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_SUBST(LANG_ID,zh) AC_CONFIG_FILES([ diff --git a/sipXlg-nortel/configure.ac b/sipXlg-nortel/configure.ac index f5c3e4248bc..0b97023eec7 100644 --- a/sipXlg-nortel/configure.ac +++ b/sipXlg-nortel/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXlg-nortel, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXlg-nortel, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXlg-nortel/sipxlg-nortel.spec.in b/sipXlg-nortel/sipxlg-nortel.spec.in index 65617542d29..92ae1423c8f 100644 --- a/sipXlg-nortel/sipxlg-nortel.spec.in +++ b/sipXlg-nortel/sipxlg-nortel.spec.in @@ -9,7 +9,7 @@ Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXmediaAdapterLib/configure.ac b/sipXmediaAdapterLib/configure.ac index 8f52065de6d..4166f86ac5b 100644 --- a/sipXmediaAdapterLib/configure.ac +++ b/sipXmediaAdapterLib/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.57) -AC_INIT(sipXmediaAdapterLib, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXmediaAdapterLib, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_CONFIG_SRCDIR([sipXmediaMediaProcessing/src/sipXmediaFactoryImpl.cpp]) AC_PROG_LIBTOOL diff --git a/sipXmediaAdapterLib/sipxmediaadapterlib.spec.in b/sipXmediaAdapterLib/sipxmediaadapterlib.spec.in index 8ea9e1c0ac2..7df28506e9e 100644 --- a/sipXmediaAdapterLib/sipxmediaadapterlib.spec.in +++ b/sipXmediaAdapterLib/sipxmediaadapterlib.spec.in @@ -37,7 +37,7 @@ GIPS VoiceEngine, and GIPS ConferenceEngine. The applications must select an appropriate library during the link time in order to use the right media subsystem. -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif diff --git a/sipXmediaLib/configure.ac b/sipXmediaLib/configure.ac index 4414c40b1c8..6abb7bb816c 100644 --- a/sipXmediaLib/configure.ac +++ b/sipXmediaLib/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.57) -AC_INIT(sipXmediaLib, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXmediaLib, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_CONFIG_SRCDIR([src/mp/MpCallFlowGraph.cpp]) AM_CONFIG_HEADER([src/config.h]) diff --git a/sipXmediaLib/sipxmedialib.spec.in b/sipXmediaLib/sipxmedialib.spec.in index 51c503fe554..3f70352ac49 100644 --- a/sipXmediaLib/sipxmedialib.spec.in +++ b/sipXmediaLib/sipxmedialib.spec.in @@ -30,7 +30,7 @@ sipXphone and sipXvxml projects. For example, the library contains audio bridges, audio splitters, echo supression, tone generation (e.g. DTMF), streaming support, RTCP, G711 codecs, etc. -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif diff --git a/sipXmitel/configure.ac b/sipXmitel/configure.ac index 9708ba7beb3..37c9d142187 100644 --- a/sipXmitel/configure.ac +++ b/sipXmitel/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXmitel, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXmitel, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXmitel/sipxmitel.spec.in b/sipXmitel/sipxmitel.spec.in index e23d86b223f..dd90bee6dae 100644 --- a/sipXmitel/sipxmitel.spec.in +++ b/sipXmitel/sipxmitel.spec.in @@ -9,7 +9,7 @@ Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXnortel/configure.ac b/sipXnortel/configure.ac index 83661c80f31..d4eccef8e07 100644 --- a/sipXnortel/configure.ac +++ b/sipXnortel/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXnortel, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXnortel, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXnortel/sipxnortel.spec.in b/sipXnortel/sipxnortel.spec.in index 895e0fcf9fc..8b97a00f3e5 100644 --- a/sipXnortel/sipxnortel.spec.in +++ b/sipXnortel/sipxnortel.spec.in @@ -9,7 +9,7 @@ Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXopenfire/configure.ac b/sipXopenfire/configure.ac index 40a745f52a1..876311c16f1 100644 --- a/sipXopenfire/configure.ac +++ b/sipXopenfire/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXopenfire, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXopenfire, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_INIT_FLAGS CHECK_POSTGRES CHECK_OPENFIRE diff --git a/sipXpage/configure.ac b/sipXpage/configure.ac index b67b24cf290..4af20ae3899 100644 --- a/sipXpage/configure.ac +++ b/sipXpage/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXpage, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXpage, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXpbx/configure.ac b/sipXpbx/configure.ac index 0265c92e697..0900b88249c 100644 --- a/sipXpbx/configure.ac +++ b/sipXpbx/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.57) -AC_INIT(sipXpbx, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXpbx, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_PROG_LN_S AC_PATH_PROG([BASH], [bash]) diff --git a/sipXpbx/sipxpbx.spec.in b/sipXpbx/sipxpbx.spec.in index b0e9f863367..a5a56e76913 100644 --- a/sipXpbx/sipxpbx.spec.in +++ b/sipXpbx/sipxpbx.spec.in @@ -27,7 +27,7 @@ BuildRequires: sipxtacklib-devel >= %version %if %{_vendor} == redhat BuildRequires: httpd-devel >= 2.0.46 %endif -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: apache2-devel %endif @@ -39,7 +39,7 @@ Requires: expat >= 1.95 %if %{_vendor} == redhat Requires: httpd >= 2.0.46 %endif -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" Requires: apache2-prefork %endif @@ -72,7 +72,7 @@ Requires: ntp %if %{_vendor} == redhat Requires: smtpdaemon %endif -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" Requires: sendmail %endif @@ -86,7 +86,7 @@ Requires: newt-python Requires: newt %endif %endif -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" Requires: python-newt %endif @@ -102,7 +102,7 @@ The sipXpbx project is a comprehensive small/medium scale Enterprise SIP PBX. It * Media Server sipXvxml with auto-attendant and voice mail applications, * PBX and phone configuration support from sipXconfig. -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif diff --git a/sipXpolycom/configure.ac b/sipXpolycom/configure.ac index 61e87e79a4a..0ef72f9d95e 100644 --- a/sipXpolycom/configure.ac +++ b/sipXpolycom/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXpolycom, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXpolycom, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXpolycom/sipxpolycom.spec.in b/sipXpolycom/sipxpolycom.spec.in index e4645b0f57d..65febc131c8 100755 --- a/sipXpolycom/sipxpolycom.spec.in +++ b/sipXpolycom/sipxpolycom.spec.in @@ -9,7 +9,7 @@ Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXportLib/configure.ac b/sipXportLib/configure.ac index 59acd2bad18..9101d63b2a9 100644 --- a/sipXportLib/configure.ac +++ b/sipXportLib/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXportLib, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXportLib, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/ax_boost_base.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_CONFIG_SRCDIR([src/os/OsConfigDb.cpp]) AM_CONFIG_HEADER([src/config.h]) @@ -18,8 +18,6 @@ AC_PROG_CC CHECK_XARGS_REPLACE CHECK_MSG_NOSIGNAL CHECK_LIBRT -AX_BOOST_BASE([1.39],, - SF_MISSING_DEP([no compatible boost library found])) AC_SEARCH_LIBS([dlopen], [dl]) CHECK_CPPUNIT CHECK_PCRE diff --git a/sipXportLib/include/os/OsEncryption.h b/sipXportLib/include/os/OsEncryption.h index ca455ce9e94..6142f79de7e 100644 --- a/sipXportLib/include/os/OsEncryption.h +++ b/sipXportLib/include/os/OsEncryption.h @@ -27,6 +27,31 @@ #include "os/OsStatus.h" #include "os/OsTime.h" + +#if defined(OSENCRYPTION) +#if OPENSSL_VERSION_NUMBER < 0x10100000L + +/* OpenSSL 1.x and earlier */ +#define COMPAT_SSLeay_add_all_algorithms() SSLeay_add_all_algorithms() +#define COMPAT_ERR_load_ERR_strings() ERR_load_ERR_strings() +#define COMPAT_ERR_func_error_string(err) ERR_func_error_string(err) +#define COMPAT_ERR_remove_state(pid) ERR_remove_state(pid) + +#define USE_LEGACY_OPENSLL_LOCKS + +#else + +/* OpenSSL 3.x and later */ +#define COMPAT_SSLeay_add_all_algorithms() OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS, NULL) +#define COMPAT_ERR_load_ERR_strings() ((void)0) +#define COMPAT_ERR_func_error_string(err) ERR_error_string(err, NULL) +#define COMPAT_ERR_remove_state(pid) ((void)0) + +#endif + +#endif + + // DEFINES // MACROS // EXTERNAL FUNCTIONS @@ -118,7 +143,7 @@ class OsEncryption #if defined (OSENCRYPTION) X509_ALGOR *mAlgorithm; - EVP_CIPHER_CTX mContext; + EVP_CIPHER_CTX* mContext; #endif unsigned char *mSalt; // defeats brute force decryption via appling dictionary diff --git a/sipXportLib/include/os/OsLogger.h b/sipXportLib/include/os/OsLogger.h index f476437dade..f2a4ec4fb4b 100644 --- a/sipXportLib/include/os/OsLogger.h +++ b/sipXportLib/include/os/OsLogger.h @@ -21,6 +21,10 @@ #include #include #include + +// Needed for backwards compatibility for Rocky Linux 9 builds +#define BOOST_BIND_GLOBAL_PLACEHOLDERS 1 + #include #include #include diff --git a/sipXportLib/include/os/OsLoggerHelper.h b/sipXportLib/include/os/OsLoggerHelper.h index 692316e082c..54e516ff9e6 100644 --- a/sipXportLib/include/os/OsLoggerHelper.h +++ b/sipXportLib/include/os/OsLoggerHelper.h @@ -203,7 +203,7 @@ namespace Os // We dump emergency level to syslog as well // if (level == PRI_EMERG) - syslog (LOG_EMERG, message.c_str()); + syslog (LOG_EMERG, "%s", message.c_str()); } return false; // Tell the subsystem that we are not consuming the log by returning false diff --git a/sipXportLib/include/os/OsPooledTask.h b/sipXportLib/include/os/OsPooledTask.h index 596745fdc01..d3af1abbfb5 100644 --- a/sipXportLib/include/os/OsPooledTask.h +++ b/sipXportLib/include/os/OsPooledTask.h @@ -16,7 +16,6 @@ #ifndef OSPOOLEDTASK_H_INCLUDED #define OSPOOLEDTASK_H_INCLUDED - #include #include #include diff --git a/sipXportLib/include/os/OsSSL.h b/sipXportLib/include/os/OsSSL.h index f9053fc5fbf..09578fcca8b 100644 --- a/sipXportLib/include/os/OsSSL.h +++ b/sipXportLib/include/os/OsSSL.h @@ -18,14 +18,7 @@ #include "os/OsLogger.h" #include "openssl/ssl.h" -// DEFINES -// MACROS -// EXTERNAL FUNCTIONS -// EXTERNAL VARIABLES -// CONSTANTS -// STRUCTS -// TYPEDEFS -// FORWARD DECLARATIONS + class UtlString; class UtlSList; @@ -133,8 +126,10 @@ class OsSSL /// callback for OpenSSL CRYPTO_set_id_callback static unsigned long OpenSSL_id_function(void); +#if defined(USE_LEGACY_OPENSLL_LOCKS) /// callback for OpenSSL CRYPTO_set_locking_callback static void OpenSSL_locking_function(int mode, int n, const char *file, int line); +#endif /* ============================ INQUIRY =================================== */ @@ -158,7 +153,9 @@ class OsSSL * @note See 'man SSL_CTX_set_verify' */ +#if defined(USE_LEGACY_OPENSLL_LOCKS) static OsMutex* spOpenSSL_locks[CRYPTO_NUM_LOCKS]; +#endif /// Disable copy constructor OsSSL(const OsSSL& rOsSSL); diff --git a/sipXportLib/sipxportlib.spec.in b/sipXportLib/sipxportlib.spec.in index 727472813be..81e4b1c9eb8 100644 --- a/sipXportLib/sipxportlib.spec.in +++ b/sipXportLib/sipxportlib.spec.in @@ -17,7 +17,7 @@ BuildRequires: openssl-devel BuildRequires: gperftools-devel BuildRequires: pcre-devel BuildRequires: findutils -BuildRequires: boost-devel >= 1.39 +BuildRequires: boost-devel BuildRequires: poco-devel # sipXphone would require 0.9.7c to decrypt profiles to get access to @@ -28,7 +28,7 @@ BuildRequires: poco-devel # security package to a RH uncertified version. Requires: openssl >= 0.9.7a Requires: pcre >= 4.5 -Requires: boost >= 1.39 +Requires: boost Requires: poco-crypto Requires: poco-data Requires: poco-foundation @@ -65,7 +65,7 @@ encapsulate functions and operations for: * Operating System Processes * Dynamic loading of shared libraries and symbols -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif @@ -73,7 +73,7 @@ encapsulate functions and operations for: %package devel Requires: %name Requires: openssl-devel -Requires: boost-devel >= 1.39 +Requires: boost-devel Requires: poco-devel Requires: cppunit-devel Requires: pcre-devel diff --git a/sipXportLib/src/Makefile.am b/sipXportLib/src/Makefile.am index 3d4f403255e..abb65306ede 100644 --- a/sipXportLib/src/Makefile.am +++ b/sipXportLib/src/Makefile.am @@ -17,8 +17,7 @@ version_Age=0 libsipXport_la_LDFLAGS = \ -version-info ${version_Current}:${version_Revision}:${version_Age} \ @PCRE_LDFLAGS@ \ - @SSL_LDFLAGS@ \ - @BOOST_LDFLAGS@ + @SSL_LDFLAGS@ libsipXport_la_LIBADD = \ @PCRE_LIBS@ \ @@ -27,10 +26,10 @@ libsipXport_la_LIBADD = \ -ltcmalloc \ -lpthread \ -lstdc++ \ - -lboost_system-mt \ - -lboost_thread-mt \ - -lboost_filesystem-mt \ - -lboost_program_options-mt + -lboost_system \ + -lboost_thread \ + -lboost_filesystem \ + -lboost_program_options # this is helpful if you're debugging something with lots of inlines (like the UtlLink code) # -fno-gcse -O0 -fno-implement-inlines -fno-default-inline diff --git a/sipXportLib/src/os/OsEncryption.cpp b/sipXportLib/src/os/OsEncryption.cpp index 8ffe93c9ee8..26b9d71ce56 100644 --- a/sipXportLib/src/os/OsEncryption.cpp +++ b/sipXportLib/src/os/OsEncryption.cpp @@ -44,6 +44,8 @@ #include "os/OsEncryption.h" #include "os/OsSocket.h" #include "os/OsLogger.h" +#include "os/OsSSL.h" + // EXTERNAL FUNCTIONS // EXTERNAL VARIABLES @@ -64,6 +66,7 @@ UtlBoolean OsEncryption::sIgnoreEncryption = FALSE; // For OpenSLL API information + /* //////////////////////////// PUBLIC //////////////////////////////////// */ OsEncryption::OsEncryption(void) { @@ -79,11 +82,10 @@ OsEncryption::OsEncryption(void) mHeaderLen = 0; #if defined (OSENCRYPTION) mAlgorithm = NULL; - memset(&mContext, 0, sizeof(mContext)); + mContext = EVP_CIPHER_CTX_new(); #endif } - OsEncryption::~OsEncryption(void) { release(); // open encryption algorithms @@ -163,6 +165,8 @@ OsStatus OsEncryption::release(void) mResultsLen = 0; } + EVP_CIPHER_CTX_free(mContext); + retval = OS_SUCCESS; #endif @@ -181,17 +185,17 @@ OsStatus OsEncryption::init(Direction direction) { ERR_clear_error(); - SSLeay_add_all_algorithms(); + COMPAT_SSLeay_add_all_algorithms(); mAlgorithm = PKCS5_pbe_set(NID_pbeWithMD5AndDES_CBC, PKCS5_DEFAULT_ITER, mSalt, mSaltLen); if (mAlgorithm != NULL) { - EVP_CIPHER_CTX_init(&(mContext)); + EVP_CIPHER_CTX_init(mContext); if (EVP_PBE_CipherInit(mAlgorithm->algorithm, (const char *)mKey, mKeyLen, - mAlgorithm->parameter, &(mContext), (int)direction)) + mAlgorithm->parameter, mContext, (int)direction)) { - int blockSize = EVP_CIPHER_CTX_block_size(&mContext); + int blockSize = EVP_CIPHER_CTX_block_size(mContext); int allocLen = mDataLen + mHeaderLen + blockSize + 1; // plus 1 for null terminator on decrypt mResults = (unsigned char *)OPENSSL_malloc(allocLen); if (mResults == NULL) @@ -219,6 +223,8 @@ OsStatus OsEncryption::init(Direction direction) Os::Logger::instance().log(FAC_AUTH, PRI_ERR, "No encryption key(%d) or data(%d) set.\n", mKeyLen, mDataLen); } + + #endif return retval; @@ -262,11 +268,11 @@ OsStatus OsEncryption::crypto(Direction direction) } int outLenPart1 = 0; - if (EVP_CipherUpdate(&(mContext), out, &outLenPart1, in, inLen)) + if (EVP_CipherUpdate(mContext, out, &outLenPart1, in, inLen)) { out += outLenPart1; int outLenPart2 = 0; - if (EVP_CipherFinal(&(mContext), out, &outLenPart2)) + if (EVP_CipherFinal(mContext, out, &outLenPart2)) { outLen += outLenPart1 + outLenPart2; retval = OS_SUCCESS; @@ -295,13 +301,13 @@ UtlBoolean OsEncryption::openSslError(void) if (err != 0) { ERR_load_crypto_strings(); - ERR_load_ERR_strings(); + COMPAT_ERR_load_ERR_strings(); char errbuff[256]; errbuff[0] = 0; ERR_error_string_n(err, errbuff, sizeof(errbuff)); osPrintf("OpenSLL ERROR:\n\tlib:%s\n\tfunction:%s\n\treason:%s\n", ERR_lib_error_string(err), - ERR_func_error_string(err), + COMPAT_ERR_func_error_string(err), ERR_reason_error_string(err)); ERR_free_strings(); diff --git a/sipXportLib/src/os/OsSSL.cpp b/sipXportLib/src/os/OsSSL.cpp index d4f05d561ac..02334c74110 100644 --- a/sipXportLib/src/os/OsSSL.cpp +++ b/sipXportLib/src/os/OsSSL.cpp @@ -17,6 +17,7 @@ #include "os/OsSSL.h" #include "os/OsLock.h" #include "os/OsLogger.h" +#include "os/OsEncryption.h" #include "utl/UtlString.h" #include "utl/UtlSList.h" @@ -31,7 +32,10 @@ static UtlString defaultCAFile = SIPX_CONFDIR "/ssl/ca.crt"; static bool isCertificateAuthorityEnabled = false; bool OsSSL::sInitialized = false; + +#if defined(USE_LEGACY_OPENSLL_LOCKS) OsMutex* OsSSL::spOpenSSL_locks[]; +#endif /* //////////////////////////// PUBLIC //////////////////////////////////// */ @@ -199,7 +203,7 @@ OsSSL::~OsSSL() { // Since error queue data structures are allocated automatically for new threads, // they must be freed when threads are terminated in order to avoid memory leaks. - ERR_remove_state(0); + COMPAT_ERR_remove_state(0); if (mCTX) { @@ -242,13 +246,16 @@ void OsSSL::OpenSSL_thread_setup() return; } +#if defined(USE_LEGACY_OPENSLL_LOCKS) for (int i=0 ; irelease(); } } +#endif /* ============================ ACCESSORS ================================= */ @@ -341,7 +352,7 @@ void OsSSL::releaseConnection(SSL*& connection) if (connection) { SSL_free(connection); - ERR_remove_state(0); + COMPAT_ERR_remove_state(0); connection = NULL; } } diff --git a/sipXportLib/src/os/OsSSLConnectionSocket.cpp b/sipXportLib/src/os/OsSSLConnectionSocket.cpp index 2bc69c61a7c..c779062fa2d 100644 --- a/sipXportLib/src/os/OsSSLConnectionSocket.cpp +++ b/sipXportLib/src/os/OsSSLConnectionSocket.cpp @@ -43,11 +43,13 @@ #include "os/OsUtil.h" #include "os/OsLogger.h" #include "os/OsTask.h" +#include "os/OsEncryption.h" #ifdef VALGRIND_MAKE_READABLE #include "valgrind/memcheck.h" #endif + // EXTERNAL FUNCTIONS // EXTERNAL VARIABLES @@ -155,7 +157,7 @@ void OsSSLConnectionSocket::close() if (mSSL) { SSL_free(mSSL); - ERR_remove_state(0); + COMPAT_ERR_remove_state(0); mSSL = NULL; } diff --git a/sipXportLib/src/os/OsSSLServerSocket.cpp b/sipXportLib/src/os/OsSSLServerSocket.cpp index 0bdb69f09b6..28500dec906 100644 --- a/sipXportLib/src/os/OsSSLServerSocket.cpp +++ b/sipXportLib/src/os/OsSSLServerSocket.cpp @@ -31,10 +31,10 @@ #endif // APPLICATION INCLUDES -#include "os/OsSSL.h" #include "os/OsSSLServerSocket.h" #include "os/OsDefs.h" #include "os/OsLogger.h" +#include "os/OsSSL.h" // EXTERNAL FUNCTIONS // EXTERNAL VARIABLES diff --git a/sipXportLib/src/os/OsUtil.cpp b/sipXportLib/src/os/OsUtil.cpp index 664c6e780a5..ca905e1b84f 100644 --- a/sipXportLib/src/os/OsUtil.cpp +++ b/sipXportLib/src/os/OsUtil.cpp @@ -383,7 +383,7 @@ void OsUtil::getCurTime(UtlString& timeStr, const struct tm* pCurTime, { int hour; UtlBoolean isAm; - char str[10]; + char str[100]; // convert from 24 hour to 12 hour representation hour = pCurTime->tm_hour; diff --git a/sipXportLib/src/test/utl/UtlDList.cpp b/sipXportLib/src/test/utl/UtlDList.cpp index 3c61021a746..d885edf2de9 100644 --- a/sipXportLib/src/test/utl/UtlDList.cpp +++ b/sipXportLib/src/test/utl/UtlDList.cpp @@ -166,7 +166,7 @@ class UtlDListTest : public CppUnit::TestCase UtlContainable* ucExpected = commonContainables[i] ; UtlContainable* ucActual = commonList.at(i) ; string msg ; - char strItr[33] ; + char strItr[100] ; sprintf(strItr, "%d", i); TestUtilities::createMessage(3, &msg, "Verify that the at(n) method, where n = ", \ strItr, " ;") ; diff --git a/sipXportLib/src/test/utl/UtlSList.cpp b/sipXportLib/src/test/utl/UtlSList.cpp index 17a3359f62f..33b72b24430 100644 --- a/sipXportLib/src/test/utl/UtlSList.cpp +++ b/sipXportLib/src/test/utl/UtlSList.cpp @@ -166,7 +166,7 @@ class UtlSListTest : public CppUnit::TestCase UtlContainable* ucExpected = commonContainables[i] ; UtlContainable* ucActual = commonList.at(i) ; string msg ; - char strItr[33] ; + char strItr[100] ; sprintf(strItr, "%d", i); TestUtilities::createMessage(3, &msg, "Verify that the at(n) method, where n = ", \ strItr, " ;") ; diff --git a/sipXportLib/src/test/utl/UtlSortedList.cpp b/sipXportLib/src/test/utl/UtlSortedList.cpp index b094ce4be7f..21e7cd594c0 100644 --- a/sipXportLib/src/test/utl/UtlSortedList.cpp +++ b/sipXportLib/src/test/utl/UtlSortedList.cpp @@ -173,7 +173,7 @@ class UtlSortedListTest : public CppUnit::TestCase size_t expectedIndex = testDataForStringList[i].expectedIndex ; const UtlContainable* ucAct = stringList.at(expectedIndex) ; string msg ; - char strItr[33] ; + char strItr[100] ; sprintf(strItr, "%zu", expectedIndex); TestUtilities::createMessage(3, &msg, prefix1, suffix, strItr) ; CPPUNIT_ASSERT_EQUAL_MESSAGE(msg.data(), @@ -185,7 +185,7 @@ class UtlSortedListTest : public CppUnit::TestCase size_t expectedIndex = testDataForIntList[j].expectedIndex ; const UtlContainable* ucAct = intList.at(expectedIndex) ; string msg ; - char strItr[33] ; + char strItr[100] ; sprintf(strItr, "%zu", expectedIndex); TestUtilities::createMessage(3, &msg, prefix2, suffix, strItr) ; CPPUNIT_ASSERT_EQUAL_MESSAGE(msg.data(), @@ -261,8 +261,8 @@ class UtlSortedListTest : public CppUnit::TestCase for (int k=0; k < stringListCount; k++) { size_t expectedIndex = testDataForStringList[k].expectedIndex ; - char strOldItr[33] ; - char strItr[33] ; + char strOldItr[100] ; + char strItr[100] ; sprintf(strOldItr, "%d", k) ; sprintf(strItr, "%zu", expectedIndex); diff --git a/sipXpreflight/configure.ac b/sipXpreflight/configure.ac index 3f0e3685999..129e0a6384f 100644 --- a/sipXpreflight/configure.ac +++ b/sipXpreflight/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXpreflight, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXpreflight, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_CONFIG_SRCDIR([src/org/sipfoundry/preflight/ConsoleTestRunner.java]) AC_PATH_PROG([BASH], [bash]) diff --git a/sipXpresence/configure.ac b/sipXpresence/configure.ac index 5c74d1e78f0..f3cf7ada31b 100644 --- a/sipXpresence/configure.ac +++ b/sipXpresence/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.57) -AC_INIT(sipXpresence, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXpresence, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AM_CONFIG_HEADER([src/config.h]) AC_PROG_LIBTOOL diff --git a/sipXpresence/sipxpresence.spec.in b/sipXpresence/sipxpresence.spec.in index ed35fab6a47..09cfd08cd6b 100644 --- a/sipXpresence/sipxpresence.spec.in +++ b/sipXpresence/sipxpresence.spec.in @@ -34,7 +34,7 @@ BuildRoot: %{_tmppath}/%name-%version-root %description TBD -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif diff --git a/sipXprompts/configure.ac b/sipXprompts/configure.ac index c35df415bdb..1fcbedf2b9d 100644 --- a/sipXprompts/configure.ac +++ b/sipXprompts/configure.ac @@ -1,7 +1,7 @@ AC_PREREQ(2.57) -AC_INIT(sipxprompts, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipxprompts, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) SFAC_INIT_FLAGS diff --git a/sipXprovision/configure.ac b/sipXprovision/configure.ac index f27c17be0d7..0c6db94177b 100644 --- a/sipXprovision/configure.ac +++ b/sipXprovision/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXprovision, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXprovision, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXproxy/configure.ac b/sipXproxy/configure.ac index 490594ad468..76525c89786 100644 --- a/sipXproxy/configure.ac +++ b/sipXproxy/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.57) -AC_INIT(sipXproxy, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXproxy, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_DISABLE_STATIC AC_CONFIG_SRCDIR([src/sipXproxymain.cpp]) diff --git a/sipXproxy/lib/authplugins/Makefile.am b/sipXproxy/lib/authplugins/Makefile.am index 5eda117fcda..416ed069dcd 100755 --- a/sipXproxy/lib/authplugins/Makefile.am +++ b/sipXproxy/lib/authplugins/Makefile.am @@ -11,7 +11,7 @@ AUTHPLUGIN_COMMON_CXX_FLAGS = \ version_Current=1 # Revision - set to 0 if Current was incremented # increment if -lmongoclient \ - -lboost_system-mtany implementation has changed + -lboost_systemany implementation has changed version_Revision=0 # Age - set to 0 of any interfaces have been removed # increment if any interfaces have been added @@ -46,7 +46,7 @@ authplugins_libCallerAlias_la_LDFLAGS = \ authplugins_libCallerAlias_la_LIBADD = \ @SIPXCOMMSERVER_LIBS@ \ -lmongoclient \ - -lboost_system-mt + -lboost_system authplugins_libCallerAlertInfo_la_SOURCES = \ @@ -76,7 +76,7 @@ authplugins_libEnforceAuthRules_la_LDFLAGS = \ authplugins_libEnforceAuthRules_la_LIBADD = \ @SIPXCOMMSERVER_LIBS@ \ -lmongoclient \ - -lboost_system-mt + -lboost_system authplugins_libRequestLinter_la_SOURCES = \ RequestLinter.h \ @@ -91,7 +91,7 @@ authplugins_libRequestLinter_la_LDFLAGS = \ authplugins_libRequestLinter_la_LIBADD = \ @SIPXCOMMSERVER_LIBS@ \ -lmongoclient \ - -lboost_system-mt + -lboost_system authplugins_libTransferControl_la_SOURCES = \ TransferControl.h \ @@ -106,7 +106,7 @@ authplugins_libTransferControl_la_LDFLAGS = \ authplugins_libTransferControl_la_LIBADD = \ @SIPXCOMMSERVER_LIBS@ \ -lmongoclient \ - -lboost_system-mt + -lboost_system authplugins_libMSFT_ExchangeTransferHack_la_SOURCES = \ MSFT_ExchangeTransferHack.h \ @@ -121,7 +121,7 @@ authplugins_libMSFT_ExchangeTransferHack_la_LDFLAGS = \ authplugins_libMSFT_ExchangeTransferHack_la_LIBADD = \ @SIPXCOMMSERVER_LIBS@ \ -lmongoclient \ - -lboost_system-mt + -lboost_system authplugins_libSubscriptionAuth_la_SOURCES = \ SubscriptionAuth.h \ @@ -136,7 +136,7 @@ authplugins_libSubscriptionAuth_la_LDFLAGS = \ authplugins_libSubscriptionAuth_la_LIBADD = \ @SIPXCOMMSERVER_LIBS@ \ -lmongoclient \ - -lboost_system-mt + -lboost_system authplugins_libCallDestination_la_SOURCES = \ CallDestination.h \ @@ -151,7 +151,7 @@ authplugins_libCallDestination_la_LDFLAGS = \ authplugins_libCallDestination_la_LIBADD = \ @SIPXCOMMSERVER_LIBS@ \ -lmongoclient \ - -lboost_system-mt + -lboost_system authplugins_libEmergencyLineIdentifier_la_SOURCES = \ EmergencyDB.h \ @@ -167,7 +167,7 @@ authplugins_libEmergencyLineIdentifier_la_LDFLAGS = \ authplugins_libEmergencyLineIdentifier_la_LIBADD = \ @SIPXCOMMSERVER_LIBS@ \ -lmongoclient \ - -lboost_system-mt + -lboost_system authplugins_libV8Engine_la_SOURCES = \ V8Engine.h \ @@ -182,4 +182,4 @@ authplugins_libV8Engine_la_LDFLAGS = \ authplugins_libV8Engine_la_LIBADD = \ @SIPXCOMMSERVER_LIBS@ \ -lmongoclient \ - -lboost_system-mt + -lboost_system diff --git a/sipXproxy/lib/authplugins/test/Makefile.am b/sipXproxy/lib/authplugins/test/Makefile.am index 2d4c681796b..233f959fbb4 100644 --- a/sipXproxy/lib/authplugins/test/Makefile.am +++ b/sipXproxy/lib/authplugins/test/Makefile.am @@ -30,7 +30,7 @@ COMMON_LIBS = \ @SIPXUNIT_LIBS@ \ @SIPXCOMMSERVER_LIBS@ \ -lmongoclient \ - -lboost_system-mt + -lboost_system #enforcerulestest_CXXFLAGS = \ # $(COMMON_CXX_FLAGS) diff --git a/sipXproxy/lib/transactionplugins/Makefile.am b/sipXproxy/lib/transactionplugins/Makefile.am index 05808f99960..6373fff9ed9 100644 --- a/sipXproxy/lib/transactionplugins/Makefile.am +++ b/sipXproxy/lib/transactionplugins/Makefile.am @@ -28,6 +28,6 @@ libGatewayDestPlugin_la_LDFLAGS = \ -version-info ${version_Current}:${version_Revision}:${version_Age} libGatewayDestPlugin_la_LIBADD = \ - -lboost_system-mt \ + -lboost_system \ @SIPXPORT_LIBS@ \ @SIPXCOMMSERVER_LIBS@ diff --git a/sipXproxy/sipxproxy.spec.in b/sipXproxy/sipxproxy.spec.in index 9c61d6bf237..d1a3c096acb 100644 --- a/sipXproxy/sipxproxy.spec.in +++ b/sipXproxy/sipxproxy.spec.in @@ -29,7 +29,7 @@ BuildRequires: libtool-ltdl-devel BuildRequires: libconfig-devel BuildRequires: boost-devel -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: pwdutils %else BuildRequires: shadow-utils @@ -40,7 +40,7 @@ BuildRequires: sipxtacklib-devel >= %version Source: %name-%version.tar.gz -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" Requires: pwdutils Requires: cron %else @@ -69,7 +69,7 @@ may also be used with the sipXproxy though it is not necessary. The sipXproxy provides service level routing, parallel and serial forking and AAA services. -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif diff --git a/sipXproxy/src/Makefile.am b/sipXproxy/src/Makefile.am index 05719dec9a0..82c22d3e6ef 100755 --- a/sipXproxy/src/Makefile.am +++ b/sipXproxy/src/Makefile.am @@ -24,7 +24,7 @@ sipXproxy_LDADD = \ @OSSCORE_LIBS@ \ -lzmq \ -lmongoclient \ - -lboost_system-mt + -lboost_system sipXproxy_SOURCES = \ sipXproxymain.cpp diff --git a/sipXproxy/src/test/Makefile.am b/sipXproxy/src/test/Makefile.am index 9a4fdfee6e8..3bbe1f9d661 100644 --- a/sipXproxy/src/test/Makefile.am +++ b/sipXproxy/src/test/Makefile.am @@ -55,7 +55,7 @@ COMMON_LIBS = \ @SIPXCOMMSERVER_LIBS@ \ ../libsipXproxy.la \ -lmongoclient \ - -lboost_system-mt + -lboost_system diff --git a/sipXpublisher/configure.ac b/sipXpublisher/configure.ac index 38bb0d254b4..8d563f4da8c 100644 --- a/sipXpublisher/configure.ac +++ b/sipXpublisher/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.57) -AC_INIT(sipXpublisher, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXpublisher, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_CONFIG_SRCDIR([src/statusserver/main.cpp]) AM_CONFIG_HEADER([src/statusserver/config.h]) diff --git a/sipXpublisher/sipxpublisher.spec.in b/sipXpublisher/sipxpublisher.spec.in index 31d981990d2..6025bfe18f6 100644 --- a/sipXpublisher/sipxpublisher.spec.in +++ b/sipXpublisher/sipxpublisher.spec.in @@ -30,7 +30,7 @@ A modular server for handling SIP event subscriptions; event package types can be added through a dynamically linked library interface, configured through a simple XML plugin configuration file. -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif diff --git a/sipXpublisher/src/Makefile.am b/sipXpublisher/src/Makefile.am index a8050262425..5c6441b74a5 100644 --- a/sipXpublisher/src/Makefile.am +++ b/sipXpublisher/src/Makefile.am @@ -9,8 +9,8 @@ bin_PROGRAMS = sipstatus sipstatus_LDADD = \ -lmongoclient \ @SIPXCOMMSERVER_LIBS@ \ - -lboost_system-mt \ - -lboost_thread-mt \ + -lboost_system \ + -lboost_thread \ -lpthread sipstatus_CXXFLAGS = \ diff --git a/sipXrecording/configure.ac b/sipXrecording/configure.ac index 099105f9999..425c9332215 100644 --- a/sipXrecording/configure.ac +++ b/sipXrecording/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXrecording, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXrecording, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXregistry/configure.ac b/sipXregistry/configure.ac index 7dadafdf1ac..b323dbe8f35 100644 --- a/sipXregistry/configure.ac +++ b/sipXregistry/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.57) -AC_INIT(sipXregistry, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXregistry, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_DISABLE_STATIC AM_CONFIG_HEADER([src/config.h]) diff --git a/sipXregistry/sipxregistry.spec.in b/sipXregistry/sipxregistry.spec.in index 5c090d45daa..50aaab5a10e 100644 --- a/sipXregistry/sipxregistry.spec.in +++ b/sipXregistry/sipxregistry.spec.in @@ -30,7 +30,7 @@ sipXregistry is the registry/redirect server component of the sipX family. It shares a number of common components with the rest of the family, but can be used as a standalone server. -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif diff --git a/sipXregistry/src/Makefile.am b/sipXregistry/src/Makefile.am index a7bbb6fe6c2..ca1d4c95db2 100755 --- a/sipXregistry/src/Makefile.am +++ b/sipXregistry/src/Makefile.am @@ -31,7 +31,7 @@ libsipXregistry_la_LIBADD = \ libsipXregistry_la_LIBADD = \ @SIPXCOMMSERVER_LIBS@ \ -lmongoclient \ - -lboost_system-mt + -lboost_system libsipXregistry_la_SOURCES = \ RedirectPlugin.cpp \ diff --git a/sipXrelay/configure.ac b/sipXrelay/configure.ac index 7533c428542..1fc27293012 100644 --- a/sipXrelay/configure.ac +++ b/sipXrelay/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXrelay, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXrelay, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS diff --git a/sipXrelease/configure.ac b/sipXrelease/configure.ac index e84f37c763f..2bdde26ab8a 100644 --- a/sipXrelease/configure.ac +++ b/sipXrelease/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.57) -AC_INIT(sipxrelease, 24.01, sipxcom-dev@googlegroups.com) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AC_INIT(sipxrelease, 25.01, sipxcom-dev@googlegroups.com) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) m4_include([config/sipXlib2.m4]) AC_CONFIG_FILES(Makefile) AC_OUTPUT diff --git a/sipXrelease/release b/sipXrelease/release index 1e8b3149621..573541ac970 100644 --- a/sipXrelease/release +++ b/sipXrelease/release @@ -1 +1 @@ -6 +0 diff --git a/sipXrest/configure.ac b/sipXrest/configure.ac index c6b606a3012..968fbf36be8 100644 --- a/sipXrest/configure.ac +++ b/sipXrest/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXrest, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXrest, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXrls/configure.ac b/sipXrls/configure.ac index e7c20f0cfa6..10d00ca5dd4 100644 --- a/sipXrls/configure.ac +++ b/sipXrls/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.57) -AC_INIT(sipXrls, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXrls, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AM_CONFIG_HEADER([src/config.h]) AC_PROG_LIBTOOL diff --git a/sipXrls/sipxrls.spec.in b/sipXrls/sipxrls.spec.in index 5281e3db19d..9d82b25197a 100644 --- a/sipXrls/sipxrls.spec.in +++ b/sipXrls/sipxrls.spec.in @@ -36,7 +36,7 @@ BuildRoot: %{_tmppath}/%name-%version-root %description TBD -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif diff --git a/sipXrls/src/Makefile.am b/sipXrls/src/Makefile.am index 97bf6a54987..a81c208ab5d 100755 --- a/sipXrls/src/Makefile.am +++ b/sipXrls/src/Makefile.am @@ -11,7 +11,7 @@ sipxrls_LDADD = \ @SIPXMEDIAADAPTER_LIBS@ \ @SIPXCOMMSERVER_LIBS@ \ @GIPS_NEQ_OBJS@ \ - -lboost_thread-mt \ + -lboost_thread \ -lmongoclient \ -lzmq diff --git a/sipXsaa/configure.ac b/sipXsaa/configure.ac index 0ab0e199830..33c096c8e72 100644 --- a/sipXsaa/configure.ac +++ b/sipXsaa/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.57) -AC_INIT(sipXsaa, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXsaa, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AM_CONFIG_HEADER([src/config.h]) AC_PROG_LIBTOOL diff --git a/sipXsaa/sipxsaa.spec.in b/sipXsaa/sipxsaa.spec.in index cc49cedfd4f..9454ed4a7e7 100644 --- a/sipXsaa/sipxsaa.spec.in +++ b/sipXsaa/sipxsaa.spec.in @@ -14,7 +14,7 @@ BuildRequires: gcc-c++ BuildRequires: cppunit-devel BuildRequires: pcre-devel >= 4.5 BuildRequires: openssl-devel -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: apache2-devel BuildRequires: libapr1-devel %else @@ -41,7 +41,7 @@ BuildRoot: %{_tmppath}/%name-%version-root %description Manages shared appearances for sipx. -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif diff --git a/sipXsaa/src/Makefile.am b/sipXsaa/src/Makefile.am index 0aeb042d74e..97235a50dd3 100644 --- a/sipXsaa/src/Makefile.am +++ b/sipXsaa/src/Makefile.am @@ -10,7 +10,7 @@ EXTRA_DIST = sipxsaa_LDADD = \ @SIPXCOMMSERVER_LIBS@ \ -lmongoclient \ - -lboost_system-mt + -lboost_system sipxsaa_CXXFLAGS = \ -I$(top_builddir)/config \ diff --git a/sipXsnom/configure.ac b/sipXsnom/configure.ac index 90dba9d4ea6..fb4b5a5ebe7 100644 --- a/sipXsnom/configure.ac +++ b/sipXsnom/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXsnom, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXsnom, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXsnom/sipxsnom.spec.in b/sipXsnom/sipxsnom.spec.in index 7e15831cacc..ec9e4c9236a 100644 --- a/sipXsnom/sipxsnom.spec.in +++ b/sipXsnom/sipxsnom.spec.in @@ -9,7 +9,7 @@ Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXsqa/configure.ac b/sipXsqa/configure.ac index 38e63b7ce15..251edb5c9b4 100644 --- a/sipXsqa/configure.ac +++ b/sipXsqa/configure.ac @@ -1,11 +1,11 @@ AC_PREREQ(2.57) -AC_INIT(sipXsqa, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXsqa, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_DISABLE_STATIC AC_CONFIG_SRCDIR([src/StateQueueAgent.cpp]) diff --git a/sipXsqa/sipxsqa.spec.in b/sipXsqa/sipxsqa.spec.in index 2ad03308ce4..b8ad2e74fc5 100644 --- a/sipXsqa/sipxsqa.spec.in +++ b/sipXsqa/sipxsqa.spec.in @@ -9,7 +9,7 @@ Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org/ -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel @@ -38,7 +38,7 @@ BuildRoot: %{_tmppath}/%name-%version-root State Queue Agent is a network event queue using a proprietary RPC protocol combined with ZeroMQ Message Queue . -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif diff --git a/sipXsqa/src/Makefile.am b/sipXsqa/src/Makefile.am index 44907c52fdf..6bb6b60bf31 100755 --- a/sipXsqa/src/Makefile.am +++ b/sipXsqa/src/Makefile.am @@ -28,11 +28,11 @@ sipxsqa_LDADD = \ libsipXsqa.la \ @SIPXPORT_LIBS@ \ @SIPXCOMMSERVER_LIBS@ \ - -lboost_date_time-mt \ - -lboost_filesystem-mt \ - -lboost_system-mt \ - -lboost_thread-mt \ - -lboost_program_options-mt \ + -lboost_date_time \ + -lboost_filesystem \ + -lboost_system \ + -lboost_thread \ + -lboost_program_options \ -lpthread \ -lzmq \ -lmongoclient \ diff --git a/sipXsqa/src/plugin/Makefile.am b/sipXsqa/src/plugin/Makefile.am index c9f4f0f8f79..b2425b94ec9 100755 --- a/sipXsqa/src/plugin/Makefile.am +++ b/sipXsqa/src/plugin/Makefile.am @@ -14,7 +14,7 @@ SQAPLUGIN_COMMON_CXX_FLAGS = \ version_Current=1 # Revision - set to 0 if Current was incremented # increment if -lmongoclient \ - -lboost_system-mtany implementation has changed + -lboost_systemany implementation has changed version_Revision=0 # Age - set to 0 of any interfaces have been removed # increment if any interfaces have been added @@ -38,11 +38,11 @@ plugin_libsqaclient_plugin_la_LDFLAGS = \ plugin_libsqaclient_plugin_la_LIBADD = \ @SIPXCOMMSERVER_LIBS@ \ - -lboost_date_time-mt \ - -lboost_filesystem-mt \ - -lboost_system-mt \ - -lboost_thread-mt \ - -lboost_program_options-mt \ + -lboost_date_time \ + -lboost_filesystem \ + -lboost_system \ + -lboost_thread \ + -lboost_program_options \ -lpthread \ -lzmq \ -lmongoclient \ diff --git a/sipXsqa/src/swig/Makefile.am b/sipXsqa/src/swig/Makefile.am index d8e2ed3c57a..24538300536 100644 --- a/sipXsqa/src/swig/Makefile.am +++ b/sipXsqa/src/swig/Makefile.am @@ -30,11 +30,11 @@ libsqaclient_la_CXXFLAGS = \ -DSIPX_CONFDIR=\"@SIPX_CONFDIR@\" libsqaclient_la_LIBADD = \ - -lboost_date_time-mt \ - -lboost_filesystem-mt \ - -lboost_system-mt \ - -lboost_thread-mt \ - -lboost_program_options-mt \ + -lboost_date_time \ + -lboost_filesystem \ + -lboost_system \ + -lboost_thread \ + -lboost_program_options \ -lpthread \ -lzmq \ @SIPXPORT_LIBS@ diff --git a/sipXsqa/src/test/Makefile.am b/sipXsqa/src/test/Makefile.am index bc786b3ec4c..39b88c46d17 100644 --- a/sipXsqa/src/test/Makefile.am +++ b/sipXsqa/src/test/Makefile.am @@ -21,11 +21,11 @@ testsuite_LDADD = \ @SIPXPORT_LIBS@ \ @SIPXCOMMSERVER_LIBS@ \ ../libsipXsqa.la \ - -lboost_date_time-mt \ - -lboost_filesystem-mt \ - -lboost_system-mt \ - -lboost_thread-mt \ - -lboost_program_options-mt \ + -lboost_date_time \ + -lboost_filesystem \ + -lboost_system \ + -lboost_thread \ + -lboost_program_options \ -lpthread \ -lzmq \ -lmongoclient \ diff --git a/sipXsupervisor/configure.ac b/sipXsupervisor/configure.ac index 3152d78ccb0..e83ecd48301 100644 --- a/sipXsupervisor/configure.ac +++ b/sipXsupervisor/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.57) -AC_INIT(sipXsupervisor, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXsupervisor, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) SFAC_INIT_FLAGS CHECK_SERVICEDIR diff --git a/sipXsupervisor/etc/sipx.cf.in b/sipXsupervisor/etc/sipx.cf.in index 6640b7805da..4a66f6f8926 100644 --- a/sipXsupervisor/etc/sipx.cf.in +++ b/sipXsupervisor/etc/sipx.cf.in @@ -83,7 +83,7 @@ bundle common sipx { "primary" expression => strcmp("$(location_id)", "1"); fedora|centos:: - "fedora16_or_greater" expression => "fedora_16|fedora_17|fedora_18|fedora_19|fedora_20|centos_7"; + "fedora16_or_greater" expression => "fedora_16|fedora_17|fedora_18|fedora_19|fedora_20|centos_7|centos_9|rocky_9"; } # add a crontab. Will automaticall reload crontab service diff --git a/sipXsupervisor/sipxsupervisor.spec.in b/sipXsupervisor/sipxsupervisor.spec.in index bc7be5672ec..4fba3552901 100644 --- a/sipXsupervisor/sipxsupervisor.spec.in +++ b/sipXsupervisor/sipxsupervisor.spec.in @@ -22,7 +22,7 @@ Requires: cfengine >= 3.2.3 %if %{_vendor} == redhat Requires: chkconfig %endif -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" Requires: net-snmp >= 5.3.1 BuildRequires: net-snmp-devel >= 5.3.1 %else @@ -65,7 +65,7 @@ distributed configuration system. The fact cfengine is used in this project should not interfere with any configuration systems an IT infrastruture might already have like puppet, chef or even cfengine. -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif diff --git a/sipXtackLib/configure.ac b/sipXtackLib/configure.ac index 85dcb53be46..2c484ccddcb 100644 --- a/sipXtackLib/configure.ac +++ b/sipXtackLib/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.57) -AC_INIT(sipXtackLib, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXtackLib, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_CONFIG_SRCDIR([src/net/SipMessage.cpp]) AM_CONFIG_HEADER([src/config.h]) diff --git a/sipXtackLib/dialogwatch/Makefile.am b/sipXtackLib/dialogwatch/Makefile.am index 85b7c2763c5..81e673e5b9d 100644 --- a/sipXtackLib/dialogwatch/Makefile.am +++ b/sipXtackLib/dialogwatch/Makefile.am @@ -13,6 +13,6 @@ bin_SCRIPTS = dialogdisplay # Program that monitors dialog events. dialogwatch_CXXFLAGS = -dialogwatch_LDADD = $(top_builddir)/src/libsipXtack.la -lboost_system-mt -lboost_thread-mt +dialogwatch_LDADD = $(top_builddir)/src/libsipXtack.la -lboost_system -lboost_thread dialogwatch_SOURCES = \ dialogwatch.cpp diff --git a/sipXtackLib/siptest/src/siptest/HelpCommand.cpp b/sipXtackLib/siptest/src/siptest/HelpCommand.cpp index b90376415a9..5fe24e578dc 100644 --- a/sipXtackLib/siptest/src/siptest/HelpCommand.cpp +++ b/sipXtackLib/siptest/src/siptest/HelpCommand.cpp @@ -75,7 +75,7 @@ int HelpCommand::execute(int argc, char* argv[]) { status = CommandProcessor::COMMAND_SUCCESS; getUsage(argv[0], &usage); - printf(usage.data()); + printf("%s", usage.data()); } else if(argc == 2) { @@ -90,7 +90,7 @@ int HelpCommand::execute(int argc, char* argv[]) //printf("found help for: \"%s\" command\n", argv[1]); status = CommandProcessor::COMMAND_SUCCESS; command->getUsage(argv[1], &usage); - printf(usage.data()); + printf("%s", usage.data()); } } if(status != CommandProcessor::COMMAND_SUCCESS) diff --git a/sipXtackLib/sipxtacklib.spec.in b/sipXtackLib/sipxtacklib.spec.in index a9946e0639b..98d9c38f050 100644 --- a/sipXtackLib/sipxtacklib.spec.in +++ b/sipXtackLib/sipxtacklib.spec.in @@ -32,7 +32,7 @@ functionality to achieve the ability to embed the stacks). The primary interface to the SIP stack is through the SipUserAgent class. This project depends upon the sipXportLib OS abstraction layer. -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif diff --git a/sipXtackLib/src/net/SipMessage.cpp b/sipXtackLib/src/net/SipMessage.cpp index 356ac0e7e71..5895b93bfd9 100644 --- a/sipXtackLib/src/net/SipMessage.cpp +++ b/sipXtackLib/src/net/SipMessage.cpp @@ -3926,13 +3926,13 @@ void SipMessage::addLastRouteUri(const char* routeUri) routeString.append(SIP_MULTIFIELD_SEPARATOR); } // Make sure the route is in name-addr format - if(strstr(routeUri,"<") <= 0) + if(strstr(routeUri,"<") == NULL ) { routeString.append("<"); } routeString.append(routeUri); - if(strstr(routeUri, ">") <= 0) + if(strstr(routeUri, ">") == NULL) { routeString.append(">"); } @@ -4199,13 +4199,13 @@ void SipMessage::addLastPathUri(const char* pathUri) pathString.append(SIP_MULTIFIELD_SEPARATOR); } // Make sure the route is in name-addr format - if(strstr(pathUri,"<") <= 0) + if(strstr(pathUri,"<") == NULL) { pathString.append("<"); } pathString.append(pathUri); - if(strstr(pathUri, ">") <= 0) + if(strstr(pathUri, ">") == NULL ) { pathString.append(">"); } diff --git a/sipXtackLib/src/resparse/res_info.c b/sipXtackLib/src/resparse/res_info.c index d9eecbda5de..cc8e3fbde78 100644 --- a/sipXtackLib/src/resparse/res_info.c +++ b/sipXtackLib/src/resparse/res_info.c @@ -44,7 +44,7 @@ const char* res_error_str() return(_res_errors[h_reserrno]); } -#ifdef NEED_RES_OPCODES +#ifdef __pingtel_on_posix__ extern const char *_res_opcodes[] = { "QUERY", "IQUERY", diff --git a/sipXtcpdumplog/configure.ac b/sipXtcpdumplog/configure.ac index 2721ad62bb6..1b57a1c369f 100644 --- a/sipXtcpdumplog/configure.ac +++ b/sipXtcpdumplog/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXtcpdumplog, 24.01, ucap.team@karel.com.tr) +AC_INIT(sipXtcpdumplog, 25.01, ucap.team@karel.com.tr) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXtcpdumplog/sipxtcpdumplog.spec.in b/sipXtcpdumplog/sipxtcpdumplog.spec.in index 8d08ed46f7e..e6dd8f6ca51 100755 --- a/sipXtcpdumplog/sipxtcpdumplog.spec.in +++ b/sipXtcpdumplog/sipxtcpdumplog.spec.in @@ -29,7 +29,7 @@ BuildRoot: %{_tmppath}/%name-%version-root %description Tcpdump Log Server -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" %debug_package %endif diff --git a/sipXtools/configure.ac b/sipXtools/configure.ac index f9afc6d23f9..d402bbb0f89 100644 --- a/sipXtools/configure.ac +++ b/sipXtools/configure.ac @@ -1,9 +1,9 @@ AC_PREREQ(2.57) -AC_INIT(sipXtools, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXtools, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_PROG_LIBTOOL AC_PATH_PROG([BASH], [bash]) diff --git a/sipXunidata/configure.ac b/sipXunidata/configure.ac index 1c2844374b2..6e88cb3ac52 100644 --- a/sipXunidata/configure.ac +++ b/sipXunidata/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXunidata, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXunidata, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXunidata/sipxunidata.spec.in b/sipXunidata/sipxunidata.spec.in index f15abf4ce36..14b7c0d957e 100644 --- a/sipXunidata/sipxunidata.spec.in +++ b/sipXunidata/sipxunidata.spec.in @@ -9,7 +9,7 @@ Vendor: SIPfoundry Packager: SIPfoundry Url: http://www.sipfoundry.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipXviewer/configure.ac b/sipXviewer/configure.ac index ff4dad1f07b..6e1b85d0ee6 100644 --- a/sipXviewer/configure.ac +++ b/sipXviewer/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXviewer, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXviewer, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_CONFIG_SRCDIR([src/com/pingtel/sipviewer/SIPViewer.java]) SFAC_INIT_FLAGS diff --git a/sipXwiki/building.rst b/sipXwiki/building.rst index e8afa957e9d..0a16d0d3cb3 100644 --- a/sipXwiki/building.rst +++ b/sipXwiki/building.rst @@ -141,7 +141,7 @@ The sipxecs-build script has the following additional options: **-s | --subproject**: subproject to build or sipx for building all RPMs, e.g. sipx (default), sipXconfig, sipXproxy - **-v | --version**: sipXcom cersion to build, e.g 24.01 (default), 24.07 + **-v | --version**: sipXcom cersion to build, e.g 25.01 (default), 24.07 **-r | --rpm**: Include this option if building rpms diff --git a/sipXwiki/conf.py b/sipXwiki/conf.py index 08422b0586e..dbf34cf4e93 100644 --- a/sipXwiki/conf.py +++ b/sipXwiki/conf.py @@ -26,7 +26,7 @@ # The short X.Y version version = '' # The full version, including alpha/beta/rc tags -release = '24.01' +release = '25.01' # -- General configuration --------------------------------------------------- diff --git a/sipXyealink/configure.ac b/sipXyealink/configure.ac index 1d9c7454097..ccbcb1d9f39 100644 --- a/sipXyealink/configure.ac +++ b/sipXyealink/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXyealink, 24.01, info@siplabs.ru) +AC_INIT(sipXyealink, 25.01, info@siplabs.ru) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) AC_CONFIG_SRCDIR([src]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXyealink/sipxyealink.spec.in b/sipXyealink/sipxyealink.spec.in index f48ac22bd1d..6717239a0bf 100644 --- a/sipXyealink/sipxyealink.spec.in +++ b/sipXyealink/sipxyealink.spec.in @@ -9,7 +9,7 @@ Vendor: SIPLABS Packager: SIPLABS Url: http://www.siplabs.ru -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-devel >= 1.6 diff --git a/sipXzmqLib/configure.ac b/sipXzmqLib/configure.ac index 6b804fb8bbc..898ad62056c 100644 --- a/sipXzmqLib/configure.ac +++ b/sipXzmqLib/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXzmqLib, 24.01, sipxcom-dev@googlegroups.com) +AC_INIT(sipXzmqLib, 25.01, sipxcom-dev@googlegroups.com) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/ax_boost_base.m4]) m4_include([config/sipXlib.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) AC_CONFIG_SRCDIR([src/ZMQMessage.cpp]) AM_CONFIG_HEADER([src/config.h]) diff --git a/sipXzmqLib/src/Makefile.am b/sipXzmqLib/src/Makefile.am index e6f6ddbd9f6..1d29d5adbd8 100644 --- a/sipXzmqLib/src/Makefile.am +++ b/sipXzmqLib/src/Makefile.am @@ -16,16 +16,15 @@ version_Age=0 libsipXzmq_la_LDFLAGS = \ -version-info ${version_Current}:${version_Revision}:${version_Age} \ - @SSL_LDFLAGS@ \ - @BOOST_LDFLAGS@ + @SSL_LDFLAGS@ libsipXzmq_la_LIBADD = \ @SSL_LIBS@ \ -lpthread \ -lstdc++ \ - -lboost_system-mt \ - -lboost_thread-mt \ - -lboost_filesystem-mt \ + -lboost_system \ + -lboost_thread \ + -lboost_filesystem \ -lzmq # this is helpful if you're debugging something with lots of inlines (like the UtlLink code) diff --git a/sipXzoiper/configure.ac b/sipXzoiper/configure.ac index d63da6ae79d..713435d5c2e 100644 --- a/sipXzoiper/configure.ac +++ b/sipXzoiper/configure.ac @@ -1,10 +1,10 @@ AC_PREREQ(2.57) -AC_INIT(sipXzoiper, 24.01, sipx-dev@list.sipxcom.org) +AC_INIT(sipXzoiper, 25.01, sipx-dev@list.sipxcom.org) AC_CONFIG_AUX_DIR(config) m4_include([config/general.m4]) m4_include([config/sipXlib.m4]) m4_include([config/java2.m4]) -AM_INIT_AUTOMAKE(foreign tar-ustar) +AM_INIT_AUTOMAKE(foreign subdir-objects tar-ustar) SFAC_AUTOMAKE_VERSION([1.6]) SFAC_INIT_FLAGS AC_PROG_JAVA_CC([javac]) diff --git a/sipXzoiper/sipxzoiper.spec.in b/sipXzoiper/sipxzoiper.spec.in index 469f7e6fcd4..80426fa8f74 100644 --- a/sipXzoiper/sipxzoiper.spec.in +++ b/sipXzoiper/sipxzoiper.spec.in @@ -9,7 +9,7 @@ Vendor: SipXcom Packager: SIPfoundry Url: http://www.sipxcom.org -%if %{_vendor} == suse +%if "%{_vendor}" == "suse" BuildRequires: java-1_6_0-sun-devel %else BuildRequires: java-1.8.0-openjdk-devel diff --git a/sipxecs-build b/sipxecs-build index 02717ed8684..8ded2afda2d 100755 --- a/sipxecs-build +++ b/sipxecs-build @@ -8,7 +8,7 @@ DEFAULT_ARCHITECTURE=x86_64 DEFAULT_SUBPROJECT=sipx -DEFAULT_VERSION=24.01 +DEFAULT_VERSION=25.01 SIPXCOM_USER_GROUP=sipxcom-dev@googlegroups.com @@ -97,7 +97,7 @@ function checkInput() -i|--install: include if installing rpms locally Sample: - sudo sipxecs-build --platform=centos-7 --subproject=sipXconfig --version=24.01 --rpm --install + sudo sipxecs-build --platform=centos-7 --subproject=sipXconfig --version=25.01 --rpm --install sudo sipxecs-build -p=rocky-9 -a=x86_64 -s=sipXconfig -v=24.07 " exit @@ -110,23 +110,41 @@ function checkInput() if [ -z "${PLATFORM}" ] then - CENTOS_VERSION=$(cat /etc/centos-release) - CENTOS_VERSION=$(echo $CENTOS_VERSION | sed -e 's/^CentOS.*release //') - CENTOS_VERSION=$(echo $CENTOS_VERSION | cut -d "." -f1) - - case $CENTOS_VERSION in - - "7") - PLATFORM=centos-7 - ;; - "9") - PLATFORM=centos-9 - ;; - *) - PLATFORM=${DEFAULT_PLATFORM} - ;; - esac - + if [ -f /etc/centos-release ]; then + + CENTOS_VERSION=$(cat /etc/centos-release) + CENTOS_VERSION=$(echo $CENTOS_VERSION | sed -e 's/^CentOS.*release //') + CENTOS_VERSION=$(echo $CENTOS_VERSION | cut -d "." -f1) + + case $CENTOS_VERSION in + + "7") + PLATFORM=centos-7 + ;; + "9") + PLATFORM=centos-9 + ;; + *) + PLATFORM=${DEFAULT_PLATFORM} + ;; + esac + + elif [ -f /etc/rocky-release ]; then + + ROCKY_VERSION=$(cat /etc/rocky-release) + ROCKY_VERSION=$(echo $ROCKY_VERSION | sed -e 's/^Rocky.*release //') + ROCKY_VERSION=$(echo $ROCKY_VERSION | cut -d "." -f1) + + case $ROCKY_VERSION in + + "9") + PLATFORM=rocky-9 + ;; + *) + PLATFORM=${DEFAULT_PLATFORM} + ;; + esac + fi else case $PLATFORM in @@ -170,6 +188,9 @@ function checkInput() "24.01") ;; + "25.01") + ;; + *) echo "Error: Unknown version ${VERSION}" exit 1 @@ -215,8 +236,6 @@ function setupRepos() { echo "Begin setupRepos()" - yum remove -y epel-release - wget -O /etc/yum.repos.d/sipxcom.repo \ https://storage.googleapis.com/sipxecs/sipxcom/${VERSION}/${PLATFORM}-${ARCHITECTURE}/sipxcom.repo @@ -247,6 +266,14 @@ function setupCentOS7() { echo "Begin setupCentOS7()" + yum remove -y epel-release + + ERROR=$? + if [ ${ERROR} -ne 0 ]; then + echo "error removing epel-release, exiting sipxecs-build" + exit ${ERROR} + fi + sudo yum install -y make autoconf automake ERROR=$? @@ -285,6 +312,14 @@ function setupCentOS7() cd ${BUILD_DIR} sudo echo oss_core > .modules-exclude + if [ "${RPM}" != "" ]; then + sudo yum install -y createrepo rpm-build mock + sudo wget http://li.nux.ro/download/nux/misc/el7/x86_64/thttpd-2.25b-33.el7.nux.x86_64.rpm + sudo rpm -ivh thttpd-2.25b-33.el7.nux.x86_64.rpm + rm -f thttpd-2.25b-33.el7.nux.x86_64.rpm + sudo usermod -a -G mock sipx + fi + echo "Done setupCentOS7()" } @@ -292,7 +327,6 @@ function setupCentOS9() { echo "Begin setupCentOS9()" - setupCentOS7 echo "Done setupCentOS9()" } @@ -301,13 +335,151 @@ function setupRocky9() { echo "Begin setupRocky9()" + echo "installing build tools" + sudo dnf install -y make autoconf automake libtool epel-release + + ERROR=$? + if [ ${ERROR} -ne 0 ]; then + echo "dnf install error, exiting sipxecs-build" + exit ${ERROR} + fi + + echo "installing rpms from sipxcom repo" + # sudo dnf install -y + + ERROR=$? + if [ ${ERROR} -ne 0 ]; then + echo "dnf install error, exiting sipxecs-build" + exit ${ERROR} + fi + + echo "installing standard OS repo tools" + sudo dnf install -y boost-devel dnf-plugins-core gcc-c++ krb5-devel + + ERROR=$? + if [ ${ERROR} -ne 0 ]; then + echo "dnf install error, exiting sipxecs-build" + exit ${ERROR} + fi + + echo "installing standard devel repo tools" + dnf config-manager --enable devel + sudo dnf install -y v8-devel + + ERROR=$? + if [ ${ERROR} -ne 0 ]; then + echo "dnf install error, exiting sipxecs-build" + exit ${ERROR} + fi + + echo "installing epel repo tools" + dnf config-manager --enable epel + sudo dnf install -y gperftools-devel poco-devel zeromq-devel gtest-devel hiredis-devel leveldb-devel libdnet-devel libmcrypt-devel + + ERROR=$? + if [ ${ERROR} -ne 0 ]; then + echo "dnf install error, exiting sipxecs-build" + exit ${ERROR} + fi + + echo "installing crb repo tools" + dnf config-manager --enable crb + sudo dnf install -y cppunit-devel poco-devel zeromq-devel libconfig-devel libpcap-devel libsrtp-devel libdb-cxx-devel + + ERROR=$? + if [ ${ERROR} -ne 0 ]; then + echo "dnf install error, exiting sipxecs-build" + exit ${ERROR} + fi + + + if [ "${RPM}" != "" ]; then + + echo "installing standard RPM tools" + sudo yum install -y createrepo rpm-build podman + + ERROR=$? + if [ ${ERROR} -ne 0 ]; then + echo "dnf install error, exiting sipxecs-build" + exit ${ERROR} + fi + + echo "installing crb RPM tools" + dnf config-manager --enable crb + sudo yum install -y mock + + ERROR=$? + if [ ${ERROR} -ne 0 ]; then + echo "dnf install error, exiting sipxecs-build" + exit ${ERROR} + fi + sudo usermod -a -G mock sipx + + ERROR=$? + if [ ${ERROR} -ne 0 ]; then + echo "dnf install error, exiting sipxecs-build" + exit ${ERROR} + fi + + echo "installing other sipxcom RPM tools" + sudo yum install -y thttpd + + ERROR=$? + if [ ${ERROR} -ne 0 ]; then + echo "dnf install error, exiting sipxecs-build" + exit ${ERROR} + fi + fi + + echo "Done setupRocky9()" } -function configure() +function configureCentOS7() { - echo "Begin configure()" + echo "Begin configureCentOS7()" + + sed -i "/^AC_INIT.*/ s//AC_INIT(sipX, ${VERSION}, ${SIPXCOM_USER_GROUP})/" ${SOURCE_DIR}/configure.ac + + cd ${SOURCE_DIR} + sudo autoreconf -ivf + + ERROR=$? + if [ ${ERROR} -ne 0 ]; then + echo "autoreconf error, exiting sipxecs-build" + exit ${ERROR} + fi + + cd ${BUILD_DIR} + + sudo echo '$(sipx_all)' > .modules-include + + if [ -z "${RPM}" ]; then + sudo ../configure + else + sudo ../configure --enable-rpm DISTRO="${PLATFORM}-${ARCHITECTURE}" + fi + + ERROR=$? + if [ ${ERROR} -ne 0 ]; then + echo "configure error, exiting sipxecs-build" + exit ${ERROR} + fi + + echo "Done configureCentOS7()" +} + +function configureCentOS9() +{ + echo "Begin configureCentOS9()" + + echo "Done configureCentOS9()" +} + +function configureRocky9() +{ + echo "Begin configureRocky9()" sed -i "/^AC_INIT.*/ s//AC_INIT(sipX, ${VERSION}, ${SIPXCOM_USER_GROUP})/" ${SOURCE_DIR}/configure.ac @@ -327,12 +499,6 @@ function configure() if [ -z "${RPM}" ]; then sudo ../configure else - sudo yum install -y createrepo rpm-build mock - sudo wget http://li.nux.ro/download/nux/misc/el7/x86_64/thttpd-2.25b-33.el7.nux.x86_64.rpm - sudo rpm -ivh thttpd-2.25b-33.el7.nux.x86_64.rpm - rm -f thttpd-2.25b-33.el7.nux.x86_64.rpm - sudo usermod -a -G mock sipx - sudo ../configure --enable-rpm DISTRO="${PLATFORM}-${ARCHITECTURE}" fi @@ -342,7 +508,7 @@ function configure() exit ${ERROR} fi - echo "Done configure()" + echo "Done configureRocky9()" } @@ -352,7 +518,6 @@ function build() cd ${BUILD_DIR} - # The make command may kick a permission error when creating RPMs @@ -407,14 +572,17 @@ function main() "centos-7") setupCentOS7 + configureCentOS7 ;; "centos-9") setupCentOS9 + configureCentOS9 ;; "rocky-9") setupRocky9 + configureRocky9 ;; *) @@ -423,8 +591,6 @@ function main() ;; esac - configure - build if [ ! -z "${INSTALL}" ]; then